diff options
198 files changed, 1737 insertions, 1999 deletions
diff --git a/addons/metadata.album.universal/addon.xml b/addons/metadata.album.universal/addon.xml index b4b3f1704c..248230c990 100644 --- a/addons/metadata.album.universal/addon.xml +++ b/addons/metadata.album.universal/addon.xml @@ -1,26 +1,28 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <addon id="metadata.album.universal" name="Universal Album Scraper" - version="1.6.4" + version="1.7.6" provider-name="Olympia, Team XBMC"> <requires> - <import addon="xbmc.metadata" version="1.0"/> - <import addon="metadata.common.last.fm" version="1.3.2"/> - <import addon="metadata.common.allmusic.com" version="2.3.1"/> + <import addon="xbmc.metadata" version="2.1.0"/> + <import addon="metadata.common.last.fm" version="1.5.1"/> + <import addon="metadata.common.allmusic.com" version="2.5.2"/> <import addon="metadata.common.musicbrainz.org" version="1.2.3"/> - <import addon="metadata.common.fanart.tv" version="2.0.0"/> + <import addon="metadata.common.fanart.tv" version="2.1.2"/> <import addon="metadata.common.amazon.de" version="1.0.0"/> - <import addon="metadata.common.theaudiodb.com" version="1.3.0"/> + <import addon="metadata.common.theaudiodb.com" version="1.4.0"/> </requires> <extension point="xbmc.metadata.scraper.albums" language="en" library="albumuniversal.xml"/> <extension point="xbmc.addon.metadata"> <summary lang="af">Universele Skraper vir Albums</summary> + <summary lang="ast">Scraper universal pa álbumes</summary> <summary lang="be">Universal Scraper for Albums</summary> <summary lang="bg">Универсален източник за информация за албуми</summary> <summary lang="ca">Arreplegador universal per àlbums</summary> <summary lang="cs">Univerzální zdroj získávání dat pro alba</summary> + <summary lang="cy">Crafwr Albymau Cyffredinol</summary> <summary lang="da">Universel Scraper til Albummer</summary> <summary lang="de">Universeller Scraper für Alben</summary> <summary lang="el">Universal Scraper Άλμπουμ</summary> @@ -28,9 +30,10 @@ <summary lang="es">Scraper universal para álbumes</summary> <summary lang="es_AR">Scraper Universal para Albumes</summary> <summary lang="es_MX">Scraper Universal para Álbumes</summary> + <summary lang="et">Universaalne albumite kraabits</summary> <summary lang="fi">Universaali tiedonhakija albumitiedoille</summary> <summary lang="fr">Scraper universel pour les Albums</summary> - <summary lang="gl">Scraper universal para os álbumes</summary> + <summary lang="gl">Scraper Universal para Álbums</summary> <summary lang="he">סקרייפר אוניברסלי עבור אלבומים</summary> <summary lang="hu">Univerzális album leolvasó</summary> <summary lang="it">Ricercatore Universale per Albums</summary> @@ -48,12 +51,18 @@ <summary lang="sk">Univerzálny zdroj získavania dát pre albumy</summary> <summary lang="sl">Univerzalni ponudnik informacij o albumih</summary> <summary lang="sv">Universiell albumskrapa</summary> + <summary lang="ta_IN">ஆல்பங்களின் ஒட்டு மொத்தமான சுரண்டி</summary> + <summary lang="uk">Універсальний здирач для альбомів</summary> + <summary lang="vi">Trình lấy dữ liệu album từ nhiều nguồn</summary> <summary lang="zh">通用音乐专辑信息刮削器</summary> + <summary lang="zh_TW">通用音樂專輯訊息搜刮器</summary> <description lang="af">Hierdie skraper kollekteer inligting vanaf die volgende ondersteunde werwe: MusicBrainz, last.fm, allmusic.com en amazon.de, terwyl kunswerke gegryp word vanaf: fanart.tv, last.fm en allmusic.com. Dit kan veld vir veld gestel word vanaf watter werf jy die spesifieke inligting wil hê. Die aanvaklike soektog word altyd op MusicBrainz gedoen. Ingeval skakels van allmusic en/of amazon.de nie bygevoeg is op die MusicBrainz werf, kan velde vanaf allmusic.com en/of amazon.de nie gaan haal word nie (egter baie maklik om daardie ontbrekende skakels by te voeg).</description> + <description lang="ast">Esti scraper recueye información de les siguientes webs: MusicBrainz, last.fm, allmusic.com y amazon.de, mentanto obtién les imáxenes de fanart.tv, last.fm y allmusic.com. Permite especificar de qué web se quier obtener la información pa cada campu. ⏎ ⏎ La gueta inicial faise siempre en MusicBrainz. En casu de que los enllaces a allmusic y/o amazon.de nun tean amestaos na web de MusicBrainz, nun van poder obtenese los campos d'información d' estos dos sitios (magar que ye mui fácil amestar esos enllaces que falten)</description> <description lang="be">This scraper collects information from the following supported sites: MusicBrainz, last.fm, allmusic.com and amazon.de, while grabs artwork from: fanart.tv, last.fm and allmusic.com. It can be set field by field that from which site you want that specific information. The initial search is always done on MusicBrainz. In case allmusic and/or amazon.de links are not added on the MusicBrainz site, fields from allmusic.com and/or amazon.de cannot be fetched (very easy to add those missing links though).</description> <description lang="bg">Сваля информация от следните сайтове: MusicBrainz, last.fm, allmusic.com и amazon.de. Изобрания извлича от: fanart.tv, last.fm и allmusic.com. Можете да определите от кой сайт каква информация да се сваля. Първоначалното търсене винаги се прави в MusicBrainz. Когато не са налични препратки към allmusic и/или amazon.de на сайта на MusicBrainz извличането на информация от allmusic.com и/или amazon.de става невъзможно (добавянето им е много лесно).</description> <description lang="ca">Aquest arreplegador recull informació dels següents llocs: MusicBrainz, last.fm, allmusic.com i amazon.de, alhora que agafa art de: fanart.tv, last.fm i allmusic.com. Es pot configurar camp a camp des de quin lloc voleu aquella informació específica. La cerca inicial es realitza sempre a MusicBrainz. En el cas que els enllaços d'allmusic i amazon.de no s'afegeixin al lloc MusicBrainz els camps d'allmusic i amazon.de i/o amazon.com no es poden obtenir (tot i que són fàcils d'afegir aquests enllaços restants).</description> <description lang="cs">Tento zdroj získává data z následujících podporovaných stránek: MusicBrainz, last.fm, allmusic.com and amazon.de, while grabs artwork from: fanart.tv, last.fm a allmusic.com. Je možno podrobně nastavit, které informace si přejete získat ze kterých stránek. Prvotní vyhledání je vžy provedeno na MusicBrainz. V případě, že odkaz pro allmusic a nebo amazon.de není přidaný na stránku MusicBrainz, není možné údaje z allmusic.com a amazon.de stáhnout (avšak je velmi snadné tyto chybějící odkazy přidat).</description> + <description lang="cy">Mae'r crafwr yn casglu gwybodaeth o'r gwefannau canlynol: MusicBrainz, last.fm, allmusic.com ac amazon.de, tra'n cipio gwaith celf o: fanart.tv, last.fm and allmusic.com. Mae modd ei osod fesul maes i ddewis pa wefan i gasglu gwybodaeth benodol. Bydd y chwilio cychwynnol yn cael ei wneud ar MusicBrainz. Rhag ofn nad yw dolen allmusic wedi ei osod ar wefan MusicBrainz nid oes modd estyn meysydd o allmusic.com (mae'n hawdd gosod y dolenni coll hynny)</description> <description lang="da">Denne scraper samler information fra følgende sider: MusicBrainz, last.fm, allmusic.com og amazon.de og henter illustrationer fra: fanart.tv, last.fm og allmusic.com. Det kan vælges felt for felt, hvilke sider du ønsker, at få den pågældende information fra. Den første søgning er altid på MusicBrainz. Hvis ikke allmusic og/eller amazon.de linkene er tilføjet på MusicBrainz side, kan felter fra allmusic.com og/eller amazon.de ikke hentes (men det er helt enkelt at tilføje de manglende links).</description> <description lang="de">Dieser Scaper sammelt Informationen von den folgenden unterstützten Seiten: MusicBrainz, Last.fm, Allmusic.com und Amazon.de und lädt dabei Grafiken von: Fanart.tv, Last.fm und Allmusic.com. Es kann eingestellt werden, von welcher Seite die spezifischen Informationen stammen.⏎ ⏎ Die initialie Suche wird immer über MusicBrainz durchgeführt. Sollten keine Allmusic- und/oder Amazon.de-Links auf der MusicBrainz-Seite gesetzt worden sein, können Felder von Allmusic.com und/oder Amazon.de nicht geladen werden (fehlende Links können jedoch sehr einfach hinzugefügt werden).</description> <description lang="el">Αυτό το scraper συλλέγει πληροφορίες από τις ακόλουθες υποστηριζόμενες ιστοσελίδες: MusicBrainz, last.fm, allmusic.com και amazon.de, ενώ λαμβάνει εικόνες από τα: fanart.tv, last.fm και allmusic.com. Μπορεί να οριστεί πεδίο ανά πεδίο αναλόγως των πληροφοριών που επιθυμείτε από την εκάστοτε ιστοσελίδα. Η αρχική αναζήτηση γίνεται πάντα στο MusicBrainz. Σε περίπτωση που δεν έχουν προστεθεί σύνδεσμοι για το allmusic ή/και το amazon.de στο MusicBrainz, δε θα μπορούν να ληφθούν πεδία από το allmusic.com ή/και το amazon.de (ωστόσο είναι πολύ εύκολο να προστεθούν αυτοί οι ελλιπείς σύνδεσμοι).</description> @@ -61,6 +70,7 @@ <description lang="es">Este scraper recolecta información de las siguientes webs: MusicBrainz, last.fm, allmusic.com y amazon.de, mientras obtiene las imágenes de fanart.tv, last.fm y allmusic.com. Permite especificar de qué web se quiere obtener la información para cada campo. ⏎ ⏎ La búsqueda inicial se realiza siempre en MusicBrainz. En caso de que los enlaces a allmusic y/o amazon.de no estén añadidos en la web de MusicBrainz, no se podrán obtener los campos de información de estos dos sitios (aunque es muy fácil añadir esos enlaces que faltan).</description> <description lang="es_AR">Este scraper recolecta información de las siguientes webs: MusicBrainz, last.fm, allmusic.com y amazon.de, mientras obtiene las imágenes de fanart.tv, last.fm y allmusic.com. Permite especificar de qué web se quiere obtener la información para cada campo. ⏎ ⏎ La búsqueda inicial se realiza siempre en MusicBrainz. En caso de que los enlaces a allmusic y/o amazon.de no estén añadidos en la web de MusicBrainz, no se podrán obtener los campos de información de estos dos sitios (aunque es muy fácil añadir esos enlaces que faltan).</description> <description lang="es_MX">Este scraper obtiene información de los siguientes sitios soportados: MusicBrainz, last.fm, allmusic.com y amazon.de, mientras obtiene artwork de: fanart.tv, last.fm y allmusic.com. Puede ser configurado campo por campo de que sitio quieres esa información específica.⏎ ⏎ La búsqueda inicial siempre es hecha en MusicBrainz. En el caso en que los enlaces de allmusic y/o amazon.de no son agregados en el sitio de MusicBrainz, campos de allmusic.com y/o amazon.de no pueden ser obtenidos. (De cualquier manera es muy fácil agregar esos enlaces no encontrados).</description> + <description lang="et">See kraabits kogub infot järgmistelt lehtedelt: MusicBrainz, last.fm, allmusic.com ja amazon.de, pilte: fanart.tv, last.fm ja allmusic.com. Saad välja kaupa määrata, milliselt lehelt mis infot soovid. Esmane otsing tehakse alati saidilt MusicBrainz. Kui MusicBrainz lehele pole allmusic ja/või amazon.de linke lisatud, siis neilt lehtedelt sisu hankida ei saa (puuduvaid linke saad ise lihtsalt lisada).</description> <description lang="fi">Tämä tiedonhakija käyttää tietolähteinään seuraavia sivustoja:MusicBrainz, last.fm, allmusic.com ja amazon.de. Kuvat ja grafiikat haetaan seuraavilta sivustoilta: fanart.tv, last.fm ja allmusic.com. Voit määrittää tarkasti, miltä sivustoilta mitäkin tietoa haetaan. Ensimmäinen haku tehdään aina lähteestä MusicBrainz. Mikäli allmusic- ja/tai amazon.de-linkkejä ei ole lisätty MusicBrainz-sivustolle, haku ei onnistu (mutta puuttuvien linkkien lisääminen on helppoa).</description> <description lang="fr">Ce collecteur utilise les informations des sites suivant : MusicBrainz, last.fm, allmusic.com et amazon.de et télécharge les artwork depuis : fanart.tv, last.fm et allmusic.com. Vous pouvez spécifier quel site utiliser pour chaque information à employer. Le premier résultat est toujours en provenance de MusicBrainz. Dans le cas où allmusic et/ou amazon.de ne sont pas ajoutés sur le site MusicBrainz, les champs de allmusic.com et/ou amazon.de ne peuvent pas être traités (il est toutefois très simple d'ajouter ces liens manquants).</description> <description lang="gl">Este scraper obtén a información dende os seguintes sitios soportados: MusicBrainz, last.fm, allmusic.com e amazon.de, mentres que as ilustracións as obtén dende: fanart.tv, last.fm e allmusic.com. Pódese definir dende que sitios se obterá a información específica de cada campo. A busca inicial faise sempre en MusicBrainz. No caso de non estar engadidas as ligazón de allmusic e/ou amazon.de no sitio de MusicBrainz, os campos de allmusic.com e/ou amazon.de non se poderán obter (aínda que é moi doado de engadir as ligazóns).</description> @@ -68,7 +78,7 @@ <description lang="hu">A leolvasó szöveges infókat gyűjt a támogatott oldalakról: MusicBrainz, last.fm, allmusic.com and amazon.de, valamint képeket a : fanart.tv, last.fm and allmusic.com-ról. Beállítható hogy honnan, és milyen infót gyűjtsön. A keresés mindig a MusicBrainz-on folyik, de könnyen hozzáadhatjuk a hiányzó találatokat az allmusic.com, vagy az amazon.de-ről.</description> <description lang="it">Questo ricercatore prende informazioni dai seguenti siti: MusicBrainz, last.fm, allmusic.com e amazon.de, mentre prende grafica da: fanart.tv, last.fm e allmusic.com. Puoi impostare campo per campo cosa prendere e da dove.⏎ ⏎La ricerca iniziale viene sempre fatta su MusicBrainz. In caso i links a allmusic e/o amazon.de non sono stati messi su MusicBrainz, i campi da questi siti non possono essere recuperati (è molto facile aggiungere quei link, comunque).</description> <description lang="ja">このスクレーパーは、以下のサイトから情報を取得します：MusicBrainz, last.fm, allmusic.com, amazon.de。アートワークは以下のサイトから取得します：fanart.tv, last.fm, allmusic.com。各フィールドごとに、どの情報をどのサイトから取得するか、個別に指定することもできます。 最初は MusicBrainz を使って検索が行われます。MusicBrainz サイトに allmusic や amazon.de のリンクが追加されていない場合は、allmusic.com / amazon.de からのフィールドは取得できません (リンクを追加するのは簡単ですが)。</description> - <description lang="ko">This scraper collects information from the following supported sites: MusicBrainz, last.fm, allmusic.com and amazon.de, while grabs artwork from: fanart.tv, last.fm and allmusic.com. It can be set field by field that from which site you want that specific information. The initial search is always done on MusicBrainz. In case allmusic and/or amazon.de links are not added on the MusicBrainz site, fields from allmusic.com and/or amazon.de cannot be fetched (very easy to add those missing links though).</description> + <description lang="ko">이 자료수집기는 다음의 사이트에서 정보를 가져옵니다: MusicBrainz, last.fm, allmusic.com, amazon.de. 아트워크는 다음의 사이트에서 가져옵니다: fanart.tv, last.fm and allmusic.com. 특정 정보를 지정한 사이트에서 가져오도록 필드별로 설정할 수 있습니다 The initial search is always done on MusicBrainz. In case allmusic and/or amazon.de links are not added on the MusicBrainz site, fields from allmusic.com and/or amazon.de cannot be fetched (very easy to add those missing links though).</description> <description lang="lt">Šis Scrapers renka informaciją iš šių palaikomų svetainių: MusicBrainz, last.fm, allmusic.com ir/arba amazon.de, o scrap meno kūrinius iš: fanart.tv, last.fm ir/arba allmusic.com. Jis gali būti nustatytas srities lauke, iš kurio puslapio norite, kad konkrečią informaciją paimtu. Pradinė paieška visada atliekama remiantis MusicBrainz. Jei Allmusic ir/ar amazon.de nuorodos nėra įdėtos MusicBrainz svetainėje, laukuose allmusic.com ir/arba amazon.de negali būti realūs (nors įtraukti tas trūkstamas grandis labai lengva).</description> <description lang="mk">This scraper collects information from the following supported sites: MusicBrainz, last.fm, allmusic.com and amazon.de, while grabs artwork from: fanart.tv, last.fm and allmusic.com. It can be set field by field that from which site you want that specific information.⏎ ⏎ The initial search is always done on MusicBrainz. In case allmusic and/or amazon.de links are not added on the MusicBrainz site, fields from allmusic.com and/or amazon.de cannot be fetched (very easy to add those missing links though).</description> <description lang="nl">Deze scraper verzamelt informatie van de volgende ondersteunde sites: MusicBrainz, Last.fm, allmusic.com en amazon.de. Afbeeldingen worden verzameld van de volgende sites: fanart.tv, Last.fm en allmusic.com. Per veld kan aangegeven worden van welke site je de specifieke informatie wil halen. De initiële zoekopdracht wordt altijd gedaan van MusicBrainz. In het geval dat links naar allmusic en/of amazon.de niet zijn toegevoegd op de MusicBrainz site, kunnen velden niet worden opgehaald bij deze sites. (Het is niet moeilijk om de ontbrekende links toe te voegen.)</description> @@ -81,7 +91,11 @@ <description lang="sk">Tento zdroj získavania dát zbiera informácie z nasledujúcich podporovaných stránok: MusicBrainz, last.fm, allmusic.com a amazon.de, zatiaľ čo umeleckú grafiku získava zo stránok: fanart.tv, last.fm a allmusic.com. Je možné podrobne nastaviť, z ktorej stránky chcete získať konkrétne informácie. Počiatočné hľadanie je vždy na stránke MusicBrainz. V prípade, že odkaz pre allmusic a/alebo amazon.de nie je pridaný na stránku MusicBrainz, nie je možné získať údaje zo stránky allmusic.com a/alebo amazon.de (je ale veľmi jednoduché tieto chýbajúce odkazy pridať).</description> <description lang="sl">Ta ponudnik združuje informacije s sledečih strani: MusicBrainz, last.fm, allmusic.com in amazon.de; grafike prenaša z: fanart.tv, last.fm in allmusic.com. Vsako informacijo lahko prenesete z različne strani. Začeno iskanje je vedn na MusicBrainz. V primeru, da na MusicBrainz ni povezave do allmusic.com in/ali amazon.de, informacij od tam ne morete prenesti (a to težavo hitro lahko odpravite).</description> <description lang="sv">Denna skrapa samlar information från följande sajter: MusicBrainz, last.fm, allmusic.com och amazon.de, och konstverk från: fanart.tv, last.fm och allmusic.com. Det kan anges fält för fält vilken sajt du vill få den specifika informationen.⏎ ⏎ Den initiala sökningen är alltid utförd på MusicBrainz sajt, fälten från allmusic.com och/eller amazon.de länkarna läggs inte till på MusicBrainz sajten, fälten från allmusic.com och/eller amazon.de kan inte hämtas (väldigt enkelt att lägga till dom saknade länkarna dock).</description> + <description lang="ta_IN">இந்த சுரண்டியானது MusicBrainz, last.fm, allmusic.com மற்றும் amazon.de ஆகிய இணையதளத்தில் இருந்து தகவல்களை சேகரிக்கும். திரை குறும்படங்களை fanart.tv, last.fm மற்றும் allmusic.com ஆகிய இணையதளத்தில் இருந்து தகவல்களை சேகரிக்கும். ⏎ ⏎ முதன்மை தேடல் எப்போதும் MusicBrainz தான் நடக்கும். allmusic மற்றும் amazon.de சேர்க்கபடாவிட்டால் அவற்றில் இருந்து தகவல்கள் செமிக்கபடமாட்டது (தவறிய இணைப்புகளை சேர்ப்பது மிகவும் எளிது).</description> + <description lang="uk">Здирач збирає інформацію з наступних сторінок: MusicBrainz, last.fm, allmusic.com та amazon.de, тоді як отримує обкладинки з: fanart.tv, last.fm та allmusic.com. Початковий пошук завжди робиться на MusicBrainz. Якщо посилання з allmusic і/або amazon.de не додаються на сторінку MusicBrainz, тоді поля з allmusic.com і/або amazon.de неможливо отримати (однак дуже легко додати ці пропущені посилання).</description> + <description lang="vi">Trình này thu thập thông tin từ những site được hỗ trợ như: MusicBrainz, last.fm, allmusic.com, amazon.de, và lấy ảnh bìa từ các nguồn: fanart.tv, last.fm và allmusic.com. Bạn có thể tùy chỉnh chọn từng thứ riêng biệt để lấy từ site bạn muốn.\n \n Lần tìm kiếm đầu tiên luôn luôn được sử dụng từ MusicBrainz. Trong trường hợp các link allmusic và/hoặc amazon.de không có trên MusicBrainz, các trường từ allmusic.com và/hoặc amazon.de sẽ không thể lấy về được (tuy nhiên rất dễ để tự thêm vào các link này bằng tay).</description> <description lang="zh">本刮削器支持从以下网站获取信息：MusicBrainz、last.fm、allmusic.com和amazon.de，并从以下网站获取艺术图片：fanart.tv、last.fm和allmusic.com。你可以指定每一项内容的来源网站。 初始结果总是先从MusicBrainz获取。如果MusicBrainz网站没有到allmusic和/或amazon.de的外部链接，则无法获取allmusic.com的/或amazon.de的信息（当然你能很容易地加入缺失的链接）。</description> + <description lang="zh_TW">本搜刮器支援從以下網站取得資訊：MusicBrainz、last.fm、allmusic.com和amazon.de，並從以下網站取得專輯照片：fanart.tv、last.fm和allmusic.com。您並可以指定每一項內容的來源網站。 初始搜尋結果總是先從MusicBrainz取得。如果MusicBrainz網站沒有加入到allmusic和/或amazon.de的外部連結，則無法取得allmusic.com的/或amazon.de的信息(當然您能很輕易地加入遺失的連結)。</description> <platform>all</platform> </extension> </addon> diff --git a/addons/metadata.album.universal/albumuniversal.xml b/addons/metadata.album.universal/albumuniversal.xml index 05afe2a952..94ed3db07c 100644 --- a/addons/metadata.album.universal/albumuniversal.xml +++ b/addons/metadata.album.universal/albumuniversal.xml @@ -6,7 +6,7 @@ </RegExp> </NfoUrl> <CreateAlbumSearchUrl dest="3"> - <RegExp input="$$1" output="<url>http://search.musicbrainz.org/ws/2/release/?fmt=xml&query=release:\1%20AND%20artist:$$4</url>" dest="3"> + <RegExp input="$$1" output="<url>http://search.musicbrainz.org/ws/2/release/?fmt=xml&query=release:\1%20AND%20artist:"$$4"</url>" dest="3"> <RegExp input="$$2" output="\1" dest="4"> <expression noclean="1">(.+)</expression> </RegExp> @@ -20,18 +20,18 @@ </RegExp> </CreateAlbumSearchUrl> <GetAlbumSearchResults dest="8"> - <RegExp input="$$5" output="<results>\1</results>" dest="8"> + <RegExp input="$$5" output="<results sorted="yes">\1</results>" dest="8"> <RegExp input="$$1" output="<entity><year>\5-\4-T#\6</year><artist>\3</artist><title>\2</title><url cache="mb-\1-album.xml">http://musicbrainz.org/ws/2/release/\1?inc=recordings+release-groups+artists+labels+ratings</url></entity>" dest="5"> - <expression repeat="yes">id="([^"]*)"><title>([^<]*)</title><status>Official</status><text-representation><language>[^<]*</language><script>[^<]*</script></text-representation><artist-credit><name-credit(?:>)*(?:\sjoinphrase="[^"]*">)*(?:<name>[^<]*</name)*(?:>)*<artist\sid="[^"]*"><name>([^<]*)</name>(?:<sort-name>[^<]*</sort-name>)*(?:<disambiguation>[^<]*</disambiguation>)*(?:<alias-list>.*?</alias-list>)*</artist></name-credit>(?:<name-credit(?:>)*(?:\sjoinphrase="[^"]*">)*(?:<name>[^<]*</name)*(?:>)*<artist\sid="[^"]*"><name>[^<]*</name>(?:<sort-name>[^<]*</sort-name>)*(?:<disambiguation>[^<]*</disambiguation>)*(?:<alias-list>.*?</alias-list>)*</artist></name-credit>)*</artist-credit><release-group\stype="Album"\sid="[^"]*">(?:<primary-type>[^<]*</primary-type>)*(?:<secondary-type-list><secondary-type>[^<]*</secondary-type></secondary-type-list>)*</release-group><date>(\d{4})[^<]*</date>(?:<country>)*([^<]*)?.*?<track-list\scount="(\d+)</expression> + <expression repeat="yes">id="([^"]*)"><title>([^<]*)</title><status>Official</status><text-representation>(?:<language>[^<]*</language>)*(?:<script>[^<]*</script>)*</text-representation><artist-credit><name-credit(?:>)*(?:\sjoinphrase="[^"]*">)*(?:<name>[^<]*</name)*(?:>)*<artist\sid="[^"]*"><name>([^<]*)</name>(?:<sort-name>[^<]*</sort-name>)*(?:<disambiguation>[^<]*</disambiguation>)*(?:<alias-list>.*?</alias-list>)*</artist></name-credit>(?:<name-credit(?:>)*(?:\sjoinphrase="[^"]*">)*(?:<name>[^<]*</name)*(?:>)*<artist\sid="[^"]*"><name>[^<]*</name>(?:<sort-name>[^<]*</sort-name>)*(?:<disambiguation>[^<]*</disambiguation>)*(?:<alias-list>.*?</alias-list>)*</artist></name-credit>)*</artist-credit><release-group\stype="Album"\sid="[^"]*">(?:<primary-type>[^<]*</primary-type>)*(?:<secondary-type-list><secondary-type>[^<]*</secondary-type></secondary-type-list>)*</release-group><date>(\d{4})[^<]*</date>(?:<country>)*([^<]*)?.*?<track-list\scount="(\d+)</expression> </RegExp> <RegExp input="$$1" output="<entity><year>\5-\4-T#\6</year><artist>\3</artist><title>\2</title><url cache="mb-\1-album.xml">http://musicbrainz.org/ws/2/release/\1?inc=recordings+release-groups+artists+labels+ratings</url></entity>" dest="5+"> - <expression repeat="yes">id="([^"]*)"><title>([^<]*)</title><status>Official</status><text-representation><language>[^<]*</language><script>[^<]*</script></text-representation><artist-credit><name-credit(?:>)*(?:\sjoinphrase="[^"]*">)*(?:<name>[^<]*</name)*(?:>)*<artist\sid="[^"]*"><name>([^<]*)</name>(?:<sort-name>[^<]*</sort-name>)*(?:<disambiguation>[^<]*</disambiguation>)*(?:<alias-list>.*?</alias-list>)*</artist></name-credit>(?:<name-credit(?:>)*(?:\sjoinphrase="[^"]*">)*(?:<name>[^<]*</name)*(?:>)*<artist\sid="[^"]*"><name>[^<]*</name>(?:<sort-name>[^<]*</sort-name>)*(?:<disambiguation>[^<]*</disambiguation>)*(?:<alias-list>.*?</alias-list>)*</artist></name-credit>)*</artist-credit><release-group(?:\stype="[^"]*")*\sid="[^"]*">(?:<primary-type>[^<]*</primary-type>)*(?:<secondary-type-list><secondary-type>[^<]*</secondary-type></secondary-type-list>)*</release-group><date>(\d{4})[^<]*</date>(?:<country>)*([^<]*)?.*?<track-list\scount="(\d+)</expression> + <expression repeat="yes">id="([^"]*)"><title>([^<]*)</title><status>Official</status><text-representation>(?:<language>[^<]*</language>)*(?:<script>[^<]*</script>)*</text-representation><artist-credit><name-credit(?:>)*(?:\sjoinphrase="[^"]*">)*(?:<name>[^<]*</name)*(?:>)*<artist\sid="[^"]*"><name>([^<]*)</name>(?:<sort-name>[^<]*</sort-name>)*(?:<disambiguation>[^<]*</disambiguation>)*(?:<alias-list>.*?</alias-list>)*</artist></name-credit>(?:<name-credit(?:>)*(?:\sjoinphrase="[^"]*">)*(?:<name>[^<]*</name)*(?:>)*<artist\sid="[^"]*"><name>[^<]*</name>(?:<sort-name>[^<]*</sort-name>)*(?:<disambiguation>[^<]*</disambiguation>)*(?:<alias-list>.*?</alias-list>)*</artist></name-credit>)*</artist-credit><release-group(?:\stype="[^"]*")*\sid="[^"]*">(?:<primary-type>[^<]*</primary-type>)*(?:<secondary-type-list><secondary-type>[^<]*</secondary-type></secondary-type-list>)*</release-group><date>(\d{4})[^<]*</date>(?:<country>)*([^<]*)?.*?<track-list\scount="(\d+)</expression> </RegExp> <RegExp input="$$1" output="<entity><year>\5-\4-T#\6</year><artist>\3</artist><title>\2</title><url cache="mb-\1-album.xml">http://musicbrainz.org/ws/2/release/\1?inc=recordings+release-groups+artists+labels+ratings</url></entity>" dest="5"> - <expression repeat="yes">id="([^"]*)" ext:score="[^"]*"><title>([^<]*)</title><status>Official</status><text-representation><language>[^<]*</language><script>[^<]*</script></text-representation><artist-credit><name-credit(?:>)*(?:\sjoinphrase="[^"]*">)*(?:<name>[^<]*</name)*(?:>)*<artist\sid="[^"]*"><name>([^<]*)</name>(?:<sort-name>[^<]*</sort-name>)*(?:<disambiguation>[^<]*</disambiguation>)*(?:<alias-list>.*?</alias-list>)*</artist></name-credit>(?:<name-credit(?:>)*(?:\sjoinphrase="[^"]*">)*(?:<name>[^<]*</name)*(?:>)*<artist\sid="[^"]*"><name>[^<]*</name>(?:<sort-name>[^<]*</sort-name>)*(?:<disambiguation>[^<]*</disambiguation>)*(?:<alias-list>.*?</alias-list>)*</artist></name-credit>)*</artist-credit><release-group\sid="[^"]*"\stype="Album">(?:<primary-type>[^<]*</primary-type>)*(?:<secondary-type-list><secondary-type>[^<]*</secondary-type></secondary-type-list>)*</release-group><date>(\d{4})[^<]*</date>(?:<country>)*([^<]*)?.*?<track-list\scount="(\d+)</expression> + <expression repeat="yes">id="([^"]*)" ext:score="[^"]*"><title>([^<]*)</title><status>Official</status><text-representation>(?:<language>[^<]*</language>)*(?:<script>[^<]*</script>)*</text-representation><artist-credit><name-credit(?:>)*(?:\sjoinphrase="[^"]*">)*(?:<name>[^<]*</name)*(?:>)*<artist\sid="[^"]*"><name>([^<]*)</name>(?:<sort-name>[^<]*</sort-name>)*(?:<disambiguation>[^<]*</disambiguation>)*(?:<alias-list>.*?</alias-list>)*</artist></name-credit>(?:<name-credit(?:>)*(?:\sjoinphrase="[^"]*">)*(?:<name>[^<]*</name)*(?:>)*<artist\sid="[^"]*"><name>[^<]*</name>(?:<sort-name>[^<]*</sort-name>)*(?:<disambiguation>[^<]*</disambiguation>)*(?:<alias-list>.*?</alias-list>)*</artist></name-credit>)*</artist-credit><release-group\sid="[^"]*"\stype="Album">(?:<primary-type>[^<]*</primary-type>)*(?:<secondary-type-list><secondary-type>[^<]*</secondary-type></secondary-type-list>)*</release-group><date>(\d{4})[^<]*</date>(?:<country>)*([^<]*)?.*?<track-list\scount="(\d+)</expression> </RegExp> <RegExp input="$$1" output="<entity><year>\5-\4-T#\6</year><artist>\3</artist><title>\2</title><url cache="mb-\1-album.xml">http://musicbrainz.org/ws/2/release/\1?inc=recordings+release-groups+artists+labels+ratings</url></entity>" dest="5+"> - <expression repeat="yes">id="([^"]*)" ext:score="[^"]*"><title>([^<]*)</title><status>Official</status><text-representation><language>[^<]*</language><script>[^<]*</script></text-representation><artist-credit><name-credit(?:>)*(?:\sjoinphrase="[^"]*">)*(?:<name>[^<]*</name)*(?:>)*<artist\sid="[^"]*"><name>([^<]*)</name>(?:<sort-name>[^<]*</sort-name>)*(?:<disambiguation>[^<]*</disambiguation>)*(?:<alias-list>.*?</alias-list>)*</artist></name-credit>(?:<name-credit(?:>)*(?:\sjoinphrase="[^"]*">)*(?:<name>[^<]*</name)*(?:>)*<artist\sid="[^"]*"><name>[^<]*</name>(?:<sort-name>[^<]*</sort-name>)*(?:<disambiguation>[^<]*</disambiguation>)*(?:<alias-list>.*?</alias-list>)*</artist></name-credit>)*</artist-credit><release-group\sid="[^"]*"(?:\stype="[^"]*")*>(?:<primary-type>[^<]*</primary-type>)*(?:<secondary-type-list><secondary-type>[^<]*</secondary-type></secondary-type-list>)*</release-group><date>(\d{4})[^<]*</date>(?:<country>)*([^<]*)?.*?<track-list\scount="(\d+)</expression> + <expression repeat="yes">id="([^"]*)" ext:score="[^"]*"><title>([^<]*)</title><status>Official</status><text-representation>(?:<language>[^<]*</language>)*(?:<script>[^<]*<)*/script></text-representation><artist-credit><name-credit(?:>)*(?:\sjoinphrase="[^"]*">)*(?:<name>[^<]*</name)*(?:>)*<artist\sid="[^"]*"><name>([^<]*)</name>(?:<sort-name>[^<]*</sort-name>)*(?:<disambiguation>[^<]*</disambiguation>)*(?:<alias-list>.*?</alias-list>)*</artist></name-credit>(?:<name-credit(?:>)*(?:\sjoinphrase="[^"]*">)*(?:<name>[^<]*</name)*(?:>)*<artist\sid="[^"]*"><name>[^<]*</name>(?:<sort-name>[^<]*</sort-name>)*(?:<disambiguation>[^<]*</disambiguation>)*(?:<alias-list>.*?</alias-list>)*</artist></name-credit>)*</artist-credit><release-group\sid="[^"]*"(?:\stype="[^"]*")*>(?:<primary-type>[^<]*</primary-type>)*(?:<secondary-type-list><secondary-type>[^<]*</secondary-type></secondary-type-list>)*</release-group><date>(\d{4})[^<]*</date>(?:<country>)*([^<]*)?.*?<track-list\scount="(\d+)</expression> </RegExp> <expression noclean="1" /> </RegExp> diff --git a/addons/metadata.album.universal/changelog.txt b/addons/metadata.album.universal/changelog.txt index c3dc51782d..5624e3ee43 100644 --- a/addons/metadata.album.universal/changelog.txt +++ b/addons/metadata.album.universal/changelog.txt @@ -1,3 +1,25 @@ +[B]1.7.6[/B] +Updated language files from Transifex + +[B]1.7.5[/B] +Re-aply changes in 1.7.3 what lost in space with 1.7.4 + +[B]1.7.4[/B] +Changed: tighten search query and trust musicbrainz results sorting + +[B]1.7.3[/B] +Fixed: album won't find some times (thanks and credits to crankylemur) + +[B]1.7.2[/B] +Fix settings after last.fm removal + +[B]1.7.1[/B] +Disable last.fm options because last.fm is now truncating biogs + +[B]1.7.0[/B] +Added: option to select language from TheAudioDB.com +Added back the option to scrape from last.fm + [B]1.6.4[/B] Disable last.fm options because last.fm suspended XBMC's API account diff --git a/addons/metadata.album.universal/resources/language/Amharic/strings.xml b/addons/metadata.album.universal/resources/language/Amharic/strings.xml new file mode 100644 index 0000000000..65938f6340 --- /dev/null +++ b/addons/metadata.album.universal/resources/language/Amharic/strings.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- Translated using Transifex web application. For support, or if you would like to to help out, please visit your language team! --> +<!-- Amharic language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/am/ --> +<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> + +<strings> + <string id="30003">የመረጡት ቋንቋ </string> +</strings> diff --git a/addons/metadata.album.universal/resources/language/Asturian/strings.xml b/addons/metadata.album.universal/resources/language/Asturian/strings.xml new file mode 100644 index 0000000000..a40a002cb0 --- /dev/null +++ b/addons/metadata.album.universal/resources/language/Asturian/strings.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- Translated using Transifex web application. For support, or if you would like to to help out, please visit your language team! --> +<!-- Asturian language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/ast/ --> +<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> + +<strings> + <string id="30000">Obtener miniatures d'álbum de fanart.tv</string> + <string id="30001">Obtener miniatures d'álbum de Last.fm</string> + <string id="30002">Obtener reseña del álbum de</string> + <string id="30003">Llingua preferida</string> + <string id="30004">Obtener calificación del álbum de</string> + <string id="30005">Obtener estilos del álbum de</string> + <string id="30006">Obtener estaos d'ánimu del álbum de</string> + <string id="30007">Obtener temes del álbum de</string> + <string id="30008">Conseguir miniatures de álbum de allmusic.com</string> + <string id="30009">Imáxenes</string> + <string id="30010">Descargar miniatures de álbum dende theaudiodb.com</string> +</strings> diff --git a/addons/metadata.album.universal/resources/language/Belarusian/strings.po b/addons/metadata.album.universal/resources/language/Belarusian/strings.po deleted file mode 100644 index b49c655cde..0000000000 --- a/addons/metadata.album.universal/resources/language/Belarusian/strings.po +++ /dev/null @@ -1,58 +0,0 @@ -# XBMC Media Center language file -# Addon Name: Universal Album Scraper -# Addon id: metadata.album.universal -# Addon version: 1.6.0 -# Addon Provider: Olympia, Team XBMC -msgid "" -msgstr "" -"Project-Id-Version: XBMC Main Translation Project (Frodo)\n" -"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n" -"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: XBMC Translation Team\n" -"Language-Team: Belarusian (http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/be/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: be\n" -"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" - -msgctxt "#30000" -msgid "Grab Album Thumbs from fanart.tv" -msgstr "Grab Album Thumbs from fanart.tv" - -msgctxt "#30001" -msgid "Grab Album Thumbs from Last.fm" -msgstr "Grab Album Thumbs from Last.fm" - -msgctxt "#30002" -msgid "Get Album Review from" -msgstr "Get Album Review from" - -msgctxt "#30003" -msgid " Preferred Language" -msgstr " Пераважная мова" - -msgctxt "#30004" -msgid "Get Album Rating from" -msgstr "Get Album Rating from" - -msgctxt "#30005" -msgid "Get Album Styles from" -msgstr "Get Album Styles from" - -msgctxt "#30006" -msgid "Get Album Moods from" -msgstr "Get Album Moods from" - -msgctxt "#30007" -msgid "Get Album Themes from" -msgstr "Get Album Themes from" - -msgctxt "#30008" -msgid "Grab Album Thumbs from allmusic.com" -msgstr "Grab Album Thumbs from allmusic.com" - -msgctxt "#30009" -msgid "Artwork" -msgstr "Artwork" diff --git a/addons/metadata.album.universal/resources/language/Bulgarian/strings.po b/addons/metadata.album.universal/resources/language/Bulgarian/strings.po deleted file mode 100644 index cd1671e5a5..0000000000 --- a/addons/metadata.album.universal/resources/language/Bulgarian/strings.po +++ /dev/null @@ -1,58 +0,0 @@ -# XBMC Media Center language file -# Addon Name: Universal Album Scraper -# Addon id: metadata.album.universal -# Addon version: 1.6.0 -# Addon Provider: Olympia, Team XBMC -msgid "" -msgstr "" -"Project-Id-Version: XBMC Main Translation Project (Frodo)\n" -"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n" -"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: XBMC Translation Team\n" -"Language-Team: Bulgarian (http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/bg/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: bg\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -msgctxt "#30000" -msgid "Grab Album Thumbs from fanart.tv" -msgstr "Сваляй миниатюри за албумите от fanart.tv" - -msgctxt "#30001" -msgid "Grab Album Thumbs from Last.fm" -msgstr "Сваляй миниатюри за албумите от Last.fm" - -msgctxt "#30002" -msgid "Get Album Review from" -msgstr "Сваляй отзиви за албумите от" - -msgctxt "#30003" -msgid " Preferred Language" -msgstr "Предпочитан език" - -msgctxt "#30004" -msgid "Get Album Rating from" -msgstr "Сваляй рейтинги за албумите от" - -msgctxt "#30005" -msgid "Get Album Styles from" -msgstr "Сваляй стилове на албумите от" - -msgctxt "#30006" -msgid "Get Album Moods from" -msgstr "Сваляй настроения за албумите от" - -msgctxt "#30008" -msgid "Grab Album Thumbs from allmusic.com" -msgstr "Сваляй миниатюри за албумите от allmusic.com" - -msgctxt "#30009" -msgid "Artwork" -msgstr "Изображения" - -msgctxt "#30010" -msgid "Grab Album Thumbs from theaudiodb.com" -msgstr "Сваляй миниатюри за албумите от theaudiodb.com" diff --git a/addons/metadata.album.universal/resources/language/Burmese/strings.xml b/addons/metadata.album.universal/resources/language/Burmese/strings.xml new file mode 100644 index 0000000000..69708df005 --- /dev/null +++ b/addons/metadata.album.universal/resources/language/Burmese/strings.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- Translated using Transifex web application. For support, or if you would like to to help out, please visit your language team! --> +<!-- Burmese language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/my/ --> +<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> + +<strings> + <string id="30003">သင့်လျှော်သော ဘာသာစကား</string> + <string id="30009">အနုပညာလက်ရာ</string> +</strings> diff --git a/addons/metadata.album.universal/resources/language/Catalan/strings.po b/addons/metadata.album.universal/resources/language/Catalan/strings.po deleted file mode 100644 index 1995c9a034..0000000000 --- a/addons/metadata.album.universal/resources/language/Catalan/strings.po +++ /dev/null @@ -1,58 +0,0 @@ -# XBMC Media Center language file -# Addon Name: Universal Album Scraper -# Addon id: metadata.album.universal -# Addon version: 1.6.0 -# Addon Provider: Olympia, Team XBMC -msgid "" -msgstr "" -"Project-Id-Version: XBMC Main Translation Project (Frodo)\n" -"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n" -"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: XBMC Translation Team\n" -"Language-Team: Catalan (http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/ca/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: ca\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -msgctxt "#30000" -msgid "Grab Album Thumbs from fanart.tv" -msgstr "Obté les miniatures d'àlbums des de fanart.tv" - -msgctxt "#30001" -msgid "Grab Album Thumbs from Last.fm" -msgstr "Obté les miniatures d'àlbums des de Last.fm" - -msgctxt "#30002" -msgid "Get Album Review from" -msgstr "Obté l'anàlisi d'àlbums des de" - -msgctxt "#30003" -msgid " Preferred Language" -msgstr "Idioma preferit" - -msgctxt "#30004" -msgid "Get Album Rating from" -msgstr "Obté la qualificació d'àlbums des de" - -msgctxt "#30005" -msgid "Get Album Styles from" -msgstr "Obté els estils d'àlbums des de" - -msgctxt "#30006" -msgid "Get Album Moods from" -msgstr "Obté l'estat d'ànim dels àlbums des de" - -msgctxt "#30007" -msgid "Get Album Themes from" -msgstr "Obté el temes dels àlbums des de" - -msgctxt "#30008" -msgid "Grab Album Thumbs from allmusic.com" -msgstr "Obté les miniatures dels àlbums des de allmusic.com" - -msgctxt "#30009" -msgid "Artwork" -msgstr "Art" diff --git a/addons/metadata.album.universal/resources/language/Chinese (Simple)/strings.po b/addons/metadata.album.universal/resources/language/Chinese (Simple)/strings.po deleted file mode 100644 index e2d165b515..0000000000 --- a/addons/metadata.album.universal/resources/language/Chinese (Simple)/strings.po +++ /dev/null @@ -1,62 +0,0 @@ -# XBMC Media Center language file -# Addon Name: Universal Album Scraper -# Addon id: metadata.album.universal -# Addon version: 1.6.0 -# Addon Provider: Olympia, Team XBMC -msgid "" -msgstr "" -"Project-Id-Version: XBMC Main Translation Project (Frodo)\n" -"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n" -"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: XBMC Translation Team\n" -"Language-Team: Chinese (Simple) (http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/zh/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: zh\n" -"Plural-Forms: nplurals=1; plural=0;\n" - -msgctxt "#30000" -msgid "Grab Album Thumbs from fanart.tv" -msgstr "启用fanart.tv专辑图片" - -msgctxt "#30001" -msgid "Grab Album Thumbs from Last.fm" -msgstr "启用Last.fm专辑图片" - -msgctxt "#30002" -msgid "Get Album Review from" -msgstr "专辑评论获取于" - -msgctxt "#30003" -msgid " Preferred Language" -msgstr " 首选语言" - -msgctxt "#30004" -msgid "Get Album Rating from" -msgstr "专辑评分获取于" - -msgctxt "#30005" -msgid "Get Album Styles from" -msgstr "专辑风格获取于" - -msgctxt "#30006" -msgid "Get Album Moods from" -msgstr "专辑心情获取于" - -msgctxt "#30007" -msgid "Get Album Themes from" -msgstr "专辑主题获取于" - -msgctxt "#30008" -msgid "Grab Album Thumbs from allmusic.com" -msgstr "启用allmusic.com专辑图片" - -msgctxt "#30009" -msgid "Artwork" -msgstr "艺术图片" - -msgctxt "#30010" -msgid "Grab Album Thumbs from theaudiodb.com" -msgstr "启用 theaudiodb.com 专辑图片" diff --git a/addons/metadata.album.universal/resources/language/Chinese (Traditional)/strings.xml b/addons/metadata.album.universal/resources/language/Chinese (Traditional)/strings.xml new file mode 100644 index 0000000000..848708f2dd --- /dev/null +++ b/addons/metadata.album.universal/resources/language/Chinese (Traditional)/strings.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- Translated using Transifex web application. For support, or if you would like to to help out, please visit your language team! --> +<!-- Chinese (Traditional) language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/zh_TW/ --> +<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> + +<strings> + <string id="30000">啟用fanart.tv專輯縮圖</string> + <string id="30001">啟用 Last.fm專輯縮圖</string> + <string id="30002">專輯評論取得於</string> + <string id="30003">偏好的語言</string> + <string id="30004">專輯評分取得於</string> + <string id="30005">專輯風格取得於</string> + <string id="30006">專輯意境取得於</string> + <string id="30007">專輯主題取得於</string> + <string id="30008">從allmusic.com取得專輯縮圖</string> + <string id="30009">圖片</string> + <string id="30010">從 theaudiodb.com取得專輯縮圖</string> +</strings> diff --git a/addons/metadata.album.universal/resources/language/Croatian/strings.xml b/addons/metadata.album.universal/resources/language/Croatian/strings.xml new file mode 100644 index 0000000000..02ac12cb87 --- /dev/null +++ b/addons/metadata.album.universal/resources/language/Croatian/strings.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- Translated using Transifex web application. For support, or if you would like to to help out, please visit your language team! --> +<!-- Croatian language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/hr/ --> +<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> + +<strings> + <string id="30000">Dohvati </string> +</strings> diff --git a/addons/metadata.album.universal/resources/language/Czech/strings.po b/addons/metadata.album.universal/resources/language/Czech/strings.po deleted file mode 100644 index dd416df541..0000000000 --- a/addons/metadata.album.universal/resources/language/Czech/strings.po +++ /dev/null @@ -1,58 +0,0 @@ -# XBMC Media Center language file -# Addon Name: Universal Album Scraper -# Addon id: metadata.album.universal -# Addon version: 1.6.0 -# Addon Provider: Olympia, Team XBMC -msgid "" -msgstr "" -"Project-Id-Version: XBMC Main Translation Project (Frodo)\n" -"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n" -"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: XBMC Translation Team\n" -"Language-Team: Czech (http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/cs/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: cs\n" -"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" - -msgctxt "#30000" -msgid "Grab Album Thumbs from fanart.tv" -msgstr "Získat náhledy alb z fanart.tv" - -msgctxt "#30001" -msgid "Grab Album Thumbs from Last.fm" -msgstr "Získat náhledy alb z Last.fm" - -msgctxt "#30002" -msgid "Get Album Review from" -msgstr "Získat recenzi alba z" - -msgctxt "#30003" -msgid " Preferred Language" -msgstr "Upřednostňovaný jazyk" - -msgctxt "#30004" -msgid "Get Album Rating from" -msgstr "Získat hodnocení alba z" - -msgctxt "#30005" -msgid "Get Album Styles from" -msgstr "Získat styly alba z" - -msgctxt "#30006" -msgid "Get Album Moods from" -msgstr "Získat náladu alba z" - -msgctxt "#30007" -msgid "Get Album Themes from" -msgstr "Získat téma alba z" - -msgctxt "#30008" -msgid "Grab Album Thumbs from allmusic.com" -msgstr "Získat náhledy alb z allmusic.com" - -msgctxt "#30009" -msgid "Artwork" -msgstr "Grafika" diff --git a/addons/metadata.album.universal/resources/language/Danish/strings.po b/addons/metadata.album.universal/resources/language/Danish/strings.po deleted file mode 100644 index 3a72ef84c8..0000000000 --- a/addons/metadata.album.universal/resources/language/Danish/strings.po +++ /dev/null @@ -1,58 +0,0 @@ -# XBMC Media Center language file -# Addon Name: Universal Album Scraper -# Addon id: metadata.album.universal -# Addon version: 1.6.0 -# Addon Provider: Olympia, Team XBMC -msgid "" -msgstr "" -"Project-Id-Version: XBMC Main Translation Project (Frodo)\n" -"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n" -"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: XBMC Translation Team\n" -"Language-Team: Danish (http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/da/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: da\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -msgctxt "#30000" -msgid "Grab Album Thumbs from fanart.tv" -msgstr "Hent album miniaturebilleder fra fanart.tv" - -msgctxt "#30001" -msgid "Grab Album Thumbs from Last.fm" -msgstr "Hent album miniaturebilleder fra Last.fm" - -msgctxt "#30002" -msgid "Get Album Review from" -msgstr "Hent album anmeldelse fra" - -msgctxt "#30003" -msgid " Preferred Language" -msgstr "Foretrukken sprog" - -msgctxt "#30004" -msgid "Get Album Rating from" -msgstr "Hent album bedømmelse fra" - -msgctxt "#30005" -msgid "Get Album Styles from" -msgstr "Hent album stilarter fra" - -msgctxt "#30006" -msgid "Get Album Moods from" -msgstr "Hent album stemning fra" - -msgctxt "#30007" -msgid "Get Album Themes from" -msgstr "Hent album temaer fra" - -msgctxt "#30008" -msgid "Grab Album Thumbs from allmusic.com" -msgstr "Hent album miniaturebilleder fra allmusic.com" - -msgctxt "#30009" -msgid "Artwork" -msgstr "Illustrationer" diff --git a/addons/metadata.album.universal/resources/language/Dutch/strings.po b/addons/metadata.album.universal/resources/language/Dutch/strings.po deleted file mode 100644 index da8b8fccf4..0000000000 --- a/addons/metadata.album.universal/resources/language/Dutch/strings.po +++ /dev/null @@ -1,26 +0,0 @@ -# XBMC Media Center language file -# Addon Name: Universal Album Scraper -# Addon id: metadata.album.universal -# Addon version: 1.6.0 -# Addon Provider: Olympia, Team XBMC -msgid "" -msgstr "" -"Project-Id-Version: XBMC Main Translation Project (Frodo)\n" -"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n" -"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: XBMC Translation Team\n" -"Language-Team: Dutch (http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/nl/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: nl\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -msgctxt "#30003" -msgid " Preferred Language" -msgstr "Voorkeurs- taal" - -msgctxt "#30009" -msgid "Artwork" -msgstr "Artwork" diff --git a/addons/metadata.album.universal/resources/language/English/strings.po b/addons/metadata.album.universal/resources/language/English/strings.po deleted file mode 100644 index 8a0d52e410..0000000000 --- a/addons/metadata.album.universal/resources/language/English/strings.po +++ /dev/null @@ -1,62 +0,0 @@ -# XBMC Media Center language file -# Addon Name: Universal Album Scraper -# Addon id: metadata.album.universal -# Addon version: 1.6.0 -# Addon Provider: Olympia, Team XBMC -msgid "" -msgstr "" -"Project-Id-Version: XBMC Main Translation Project (Frodo)\n" -"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n" -"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: XBMC Translation Team\n" -"Language-Team: English (http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/en/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: en\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -msgctxt "#30000" -msgid "Grab Album Thumbs from fanart.tv" -msgstr "" - -msgctxt "#30001" -msgid "Grab Album Thumbs from Last.fm" -msgstr "" - -msgctxt "#30002" -msgid "Get Album Review from" -msgstr "" - -msgctxt "#30003" -msgid " Preferred Language" -msgstr "" - -msgctxt "#30004" -msgid "Get Album Rating from" -msgstr "" - -msgctxt "#30005" -msgid "Get Album Styles from" -msgstr "" - -msgctxt "#30006" -msgid "Get Album Moods from" -msgstr "" - -msgctxt "#30007" -msgid "Get Album Themes from" -msgstr "" - -msgctxt "#30008" -msgid "Grab Album Thumbs from allmusic.com" -msgstr "" - -msgctxt "#30009" -msgid "Artwork" -msgstr "" - -msgctxt "#30010" -msgid "Grab Album Thumbs from theaudiodb.com" -msgstr "" diff --git a/addons/metadata.album.universal/resources/language/Estonian/strings.xml b/addons/metadata.album.universal/resources/language/Estonian/strings.xml index 407dcfe0ca..bd00442169 100644 --- a/addons/metadata.album.universal/resources/language/Estonian/strings.xml +++ b/addons/metadata.album.universal/resources/language/Estonian/strings.xml @@ -4,5 +4,15 @@ <!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> <strings> + <string id="30000">Hangi albumi pisipildid fanart.tv-st</string> + <string id="30001">Hangi albumi pisipildid Last.fm-st</string> + <string id="30002">Hangi albumi arvustused</string> + <string id="30003">Eelistatud keel</string> + <string id="30004">Hangi albumi hinnang</string> + <string id="30005">Hangi albumi stiil</string> + <string id="30006">Hangi albumi meeleolu</string> + <string id="30007">Hangi albumi teema</string> + <string id="30008">Hangi albumi pisipildid allmusic.com-st</string> <string id="30009">Kunst</string> + <string id="30010">Hangi albumi pisipildid theaudiodb.com-st</string> </strings> diff --git a/addons/metadata.album.universal/resources/language/French/strings.po b/addons/metadata.album.universal/resources/language/French/strings.po deleted file mode 100644 index bbcbc69c8e..0000000000 --- a/addons/metadata.album.universal/resources/language/French/strings.po +++ /dev/null @@ -1,62 +0,0 @@ -# XBMC Media Center language file -# Addon Name: Universal Album Scraper -# Addon id: metadata.album.universal -# Addon version: 1.6.0 -# Addon Provider: Olympia, Team XBMC -msgid "" -msgstr "" -"Project-Id-Version: XBMC Main Translation Project (Frodo)\n" -"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n" -"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: XBMC Translation Team\n" -"Language-Team: French (http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/fr/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: fr\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" - -msgctxt "#30000" -msgid "Grab Album Thumbs from fanart.tv" -msgstr " Récupérer les vignettes d'albums depuis fanart.tv" - -msgctxt "#30001" -msgid "Grab Album Thumbs from Last.fm" -msgstr "Récupérer les vignettes d'albums depuis Last.fm" - -msgctxt "#30002" -msgid "Get Album Review from" -msgstr "Récupérer les critiques des album depuis " - -msgctxt "#30003" -msgid " Preferred Language" -msgstr "Langue préférée" - -msgctxt "#30004" -msgid "Get Album Rating from" -msgstr "Récupérer les notes des albums depuis " - -msgctxt "#30005" -msgid "Get Album Styles from" -msgstr "Récupérer les styles des albums depuis " - -msgctxt "#30006" -msgid "Get Album Moods from" -msgstr "Récupérer les ambiances des albums depuis " - -msgctxt "#30007" -msgid "Get Album Themes from" -msgstr "Récupérer les thèmes des albums depuis " - -msgctxt "#30008" -msgid "Grab Album Thumbs from allmusic.com" -msgstr "Récupérer les vignettes d'albums depuis allmusic.com" - -msgctxt "#30009" -msgid "Artwork" -msgstr "Artwork" - -msgctxt "#30010" -msgid "Grab Album Thumbs from theaudiodb.com" -msgstr "Récupérer les vignettes d'albums depuis theaudiodb.com" diff --git a/addons/metadata.album.universal/resources/language/German/strings.po b/addons/metadata.album.universal/resources/language/German/strings.po deleted file mode 100644 index 02b01dbfd1..0000000000 --- a/addons/metadata.album.universal/resources/language/German/strings.po +++ /dev/null @@ -1,62 +0,0 @@ -# XBMC Media Center language file -# Addon Name: Universal Album Scraper -# Addon id: metadata.album.universal -# Addon version: 1.6.0 -# Addon Provider: Olympia, Team XBMC -msgid "" -msgstr "" -"Project-Id-Version: XBMC Main Translation Project (Frodo)\n" -"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n" -"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: XBMC Translation Team\n" -"Language-Team: German (http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/de/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: de\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -msgctxt "#30000" -msgid "Grab Album Thumbs from fanart.tv" -msgstr "Lade Albenvorschaubilder von Fanart.tv" - -msgctxt "#30001" -msgid "Grab Album Thumbs from Last.fm" -msgstr "Lade Albenvorschaubilder von Last.fm" - -msgctxt "#30002" -msgid "Get Album Review from" -msgstr "Lade Albenrezensionen von" - -msgctxt "#30003" -msgid " Preferred Language" -msgstr "Bevorzugte Sprache" - -msgctxt "#30004" -msgid "Get Album Rating from" -msgstr "Lade Albrenbewertung von" - -msgctxt "#30005" -msgid "Get Album Styles from" -msgstr "Lade Albenstile von" - -msgctxt "#30006" -msgid "Get Album Moods from" -msgstr "Lade Albenstimmungen von" - -msgctxt "#30007" -msgid "Get Album Themes from" -msgstr "Lade Albenthemen von" - -msgctxt "#30008" -msgid "Grab Album Thumbs from allmusic.com" -msgstr "Lade Albenvorschaubilder von Allmusic.com" - -msgctxt "#30009" -msgid "Artwork" -msgstr "Grafiken" - -msgctxt "#30010" -msgid "Grab Album Thumbs from theaudiodb.com" -msgstr "Albumvorschaubilder von theaudiodb.com übernehmen" diff --git a/addons/metadata.album.universal/resources/language/Greek/strings.po b/addons/metadata.album.universal/resources/language/Greek/strings.po deleted file mode 100644 index 46df4ce0d5..0000000000 --- a/addons/metadata.album.universal/resources/language/Greek/strings.po +++ /dev/null @@ -1,62 +0,0 @@ -# XBMC Media Center language file -# Addon Name: Universal Album Scraper -# Addon id: metadata.album.universal -# Addon version: 1.6.0 -# Addon Provider: Olympia, Team XBMC -msgid "" -msgstr "" -"Project-Id-Version: XBMC Main Translation Project (Frodo)\n" -"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n" -"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: XBMC Translation Team\n" -"Language-Team: Greek (http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/el/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: el\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -msgctxt "#30000" -msgid "Grab Album Thumbs from fanart.tv" -msgstr "Μικρογραφίες Άλμπουμ από το fanart.tv" - -msgctxt "#30001" -msgid "Grab Album Thumbs from Last.fm" -msgstr "Μικρογραφίες Άλμπουμ από το Last.fm" - -msgctxt "#30002" -msgid "Get Album Review from" -msgstr "Κριτική Άλμπουμ από" - -msgctxt "#30003" -msgid " Preferred Language" -msgstr "Προτιμώμενη Γλώσσα" - -msgctxt "#30004" -msgid "Get Album Rating from" -msgstr "Αξιολόγηση Άλμπουμ από" - -msgctxt "#30005" -msgid "Get Album Styles from" -msgstr "Στυλ Άλμπουμ από" - -msgctxt "#30006" -msgid "Get Album Moods from" -msgstr "Διαθέσεις Άλμπουμ από" - -msgctxt "#30007" -msgid "Get Album Themes from" -msgstr "Θέματα Άλμπουμ από" - -msgctxt "#30008" -msgid "Grab Album Thumbs from allmusic.com" -msgstr "Μικρογραφίες Άλμπουμ από το allmusic.com" - -msgctxt "#30009" -msgid "Artwork" -msgstr "Εικόνες" - -msgctxt "#30010" -msgid "Grab Album Thumbs from theaudiodb.com" -msgstr "Μικρογραφίες Άλμπουμ από το theaudiodb.com" diff --git a/addons/metadata.album.universal/resources/language/Hebrew/strings.po b/addons/metadata.album.universal/resources/language/Hebrew/strings.po deleted file mode 100644 index b465fdad81..0000000000 --- a/addons/metadata.album.universal/resources/language/Hebrew/strings.po +++ /dev/null @@ -1,62 +0,0 @@ -# XBMC Media Center language file -# Addon Name: Universal Album Scraper -# Addon id: metadata.album.universal -# Addon version: 1.6.0 -# Addon Provider: Olympia, Team XBMC -msgid "" -msgstr "" -"Project-Id-Version: XBMC Main Translation Project (Frodo)\n" -"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n" -"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: XBMC Translation Team\n" -"Language-Team: Hebrew (http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/he/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: he\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -msgctxt "#30000" -msgid "Grab Album Thumbs from fanart.tv" -msgstr "משוך תמונות אלבום מ- fanart.tv" - -msgctxt "#30001" -msgid "Grab Album Thumbs from Last.fm" -msgstr "משוך תמונות אלבום מ- Last.fm" - -msgctxt "#30002" -msgid "Get Album Review from" -msgstr "השג סקירת אלבום מ-" - -msgctxt "#30003" -msgid " Preferred Language" -msgstr " שפה מועדפת" - -msgctxt "#30004" -msgid "Get Album Rating from" -msgstr "השג דירוג אלבום מ-" - -msgctxt "#30005" -msgid "Get Album Styles from" -msgstr "השג סגנונות אלבום מ-" - -msgctxt "#30006" -msgid "Get Album Moods from" -msgstr "השג מצבי אלבום מ-" - -msgctxt "#30007" -msgid "Get Album Themes from" -msgstr "השג ערכות נושא אלבום מ-" - -msgctxt "#30008" -msgid "Grab Album Thumbs from allmusic.com" -msgstr "משוך תמונות אלבום מ- allmusic.com" - -msgctxt "#30009" -msgid "Artwork" -msgstr "גרפיקה" - -msgctxt "#30010" -msgid "Grab Album Thumbs from theaudiodb.com" -msgstr "משוך תמונות אלבום מ- theaudiodb.com" diff --git a/addons/metadata.album.universal/resources/language/Hungarian/strings.po b/addons/metadata.album.universal/resources/language/Hungarian/strings.po deleted file mode 100644 index 3dd7aba0df..0000000000 --- a/addons/metadata.album.universal/resources/language/Hungarian/strings.po +++ /dev/null @@ -1,58 +0,0 @@ -# XBMC Media Center language file -# Addon Name: Universal Album Scraper -# Addon id: metadata.album.universal -# Addon version: 1.6.0 -# Addon Provider: Olympia, Team XBMC -msgid "" -msgstr "" -"Project-Id-Version: XBMC Main Translation Project (Frodo)\n" -"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n" -"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: XBMC Translation Team\n" -"Language-Team: Hungarian (http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/hu/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: hu\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -msgctxt "#30000" -msgid "Grab Album Thumbs from fanart.tv" -msgstr "Album miniképek letöltése a fanart.tv-ről" - -msgctxt "#30001" -msgid "Grab Album Thumbs from Last.fm" -msgstr "Album miniképek letöltése a Last.fm-ről" - -msgctxt "#30002" -msgid "Get Album Review from" -msgstr "Album értékelése" - -msgctxt "#30003" -msgid " Preferred Language" -msgstr "Használni kívánt nyelv" - -msgctxt "#30004" -msgid "Get Album Rating from" -msgstr "Album értékelés" - -msgctxt "#30005" -msgid "Get Album Styles from" -msgstr "Album stílus" - -msgctxt "#30006" -msgid "Get Album Moods from" -msgstr "Album hangulatok a " - -msgctxt "#30007" -msgid "Get Album Themes from" -msgstr "Album témák" - -msgctxt "#30008" -msgid "Grab Album Thumbs from allmusic.com" -msgstr "Album miniképek az allmusic.com-ról" - -msgctxt "#30009" -msgid "Artwork" -msgstr "Artwork" diff --git a/addons/metadata.album.universal/resources/language/Italian/strings.po b/addons/metadata.album.universal/resources/language/Italian/strings.po deleted file mode 100644 index bdaa7e9238..0000000000 --- a/addons/metadata.album.universal/resources/language/Italian/strings.po +++ /dev/null @@ -1,58 +0,0 @@ -# XBMC Media Center language file -# Addon Name: Universal Album Scraper -# Addon id: metadata.album.universal -# Addon version: 1.6.0 -# Addon Provider: Olympia, Team XBMC -msgid "" -msgstr "" -"Project-Id-Version: XBMC Main Translation Project (Frodo)\n" -"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n" -"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: XBMC Translation Team\n" -"Language-Team: Italian (http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/it/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: it\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -msgctxt "#30000" -msgid "Grab Album Thumbs from fanart.tv" -msgstr "Prendi i Provini degli Album da fanart.tv" - -msgctxt "#30001" -msgid "Grab Album Thumbs from Last.fm" -msgstr "Prendi i Provini degli Album da Last.fm" - -msgctxt "#30002" -msgid "Get Album Review from" -msgstr "Prendi Recensioni Albums da" - -msgctxt "#30003" -msgid " Preferred Language" -msgstr "Lingua Preferita" - -msgctxt "#30004" -msgid "Get Album Rating from" -msgstr "Prendi Votazioni Albums da" - -msgctxt "#30005" -msgid "Get Album Styles from" -msgstr "Prendi Generi Musicali Albums da" - -msgctxt "#30006" -msgid "Get Album Moods from" -msgstr "Prendi Atmosfere Albums da" - -msgctxt "#30007" -msgid "Get Album Themes from" -msgstr "Prendi Temi Albums da" - -msgctxt "#30008" -msgid "Grab Album Thumbs from allmusic.com" -msgstr "Prendi i Provini degli Album da allmusic.com" - -msgctxt "#30009" -msgid "Artwork" -msgstr "Artwork" diff --git a/addons/metadata.album.universal/resources/language/Korean/strings.po b/addons/metadata.album.universal/resources/language/Korean/strings.po deleted file mode 100644 index 73a1c954f9..0000000000 --- a/addons/metadata.album.universal/resources/language/Korean/strings.po +++ /dev/null @@ -1,58 +0,0 @@ -# XBMC Media Center language file -# Addon Name: Universal Album Scraper -# Addon id: metadata.album.universal -# Addon version: 1.6.0 -# Addon Provider: Olympia, Team XBMC -msgid "" -msgstr "" -"Project-Id-Version: XBMC Main Translation Project (Frodo)\n" -"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n" -"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: XBMC Translation Team\n" -"Language-Team: Korean (http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/ko/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: ko\n" -"Plural-Forms: nplurals=1; plural=0;\n" - -msgctxt "#30000" -msgid "Grab Album Thumbs from fanart.tv" -msgstr "fanart.tv 에서 앨범 커버 가져오기" - -msgctxt "#30001" -msgid "Grab Album Thumbs from Last.fm" -msgstr "Last.fm 에서 앨범 커버 가져오기" - -msgctxt "#30002" -msgid "Get Album Review from" -msgstr "앨범 리뷰 가져오기" - -msgctxt "#30003" -msgid " Preferred Language" -msgstr "선호 언어" - -msgctxt "#30004" -msgid "Get Album Rating from" -msgstr "앨범 평점 가져오기" - -msgctxt "#30005" -msgid "Get Album Styles from" -msgstr "앨범 스타일 가져오기" - -msgctxt "#30006" -msgid "Get Album Moods from" -msgstr "앨범 분위기 가져오기" - -msgctxt "#30007" -msgid "Get Album Themes from" -msgstr "앨범 테마 가져오기" - -msgctxt "#30008" -msgid "Grab Album Thumbs from allmusic.com" -msgstr "allmusic.com 에서 앨범 커버 가져오기" - -msgctxt "#30009" -msgid "Artwork" -msgstr "아트워크" diff --git a/addons/metadata.album.universal/resources/language/Lithuanian/strings.po b/addons/metadata.album.universal/resources/language/Lithuanian/strings.po deleted file mode 100644 index b9e1017cc9..0000000000 --- a/addons/metadata.album.universal/resources/language/Lithuanian/strings.po +++ /dev/null @@ -1,58 +0,0 @@ -# XBMC Media Center language file -# Addon Name: Universal Album Scraper -# Addon id: metadata.album.universal -# Addon version: 1.6.0 -# Addon Provider: Olympia, Team XBMC -msgid "" -msgstr "" -"Project-Id-Version: XBMC Main Translation Project (Frodo)\n" -"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n" -"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: XBMC Translation Team\n" -"Language-Team: Lithuanian (http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/lt/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: lt\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n" - -msgctxt "#30000" -msgid "Grab Album Thumbs from fanart.tv" -msgstr "Paimti albumų miniatiūras iš fanart.tv" - -msgctxt "#30001" -msgid "Grab Album Thumbs from Last.fm" -msgstr "Paimti albumų miniatiūras iš Last.fm" - -msgctxt "#30002" -msgid "Get Album Review from" -msgstr "Gauti albumo apžvalgą iš" - -msgctxt "#30003" -msgid " Preferred Language" -msgstr " Pageidaujama kalba" - -msgctxt "#30004" -msgid "Get Album Rating from" -msgstr "Gauti albumo reitingą iš" - -msgctxt "#30005" -msgid "Get Album Styles from" -msgstr "Gauti albumo stilių iš" - -msgctxt "#30006" -msgid "Get Album Moods from" -msgstr "Gauti albumo žanrą iš" - -msgctxt "#30007" -msgid "Get Album Themes from" -msgstr "Gauti albumo temą iš" - -msgctxt "#30008" -msgid "Grab Album Thumbs from allmusic.com" -msgstr "Paimti albumų miniatiūras iš allmusic.com" - -msgctxt "#30009" -msgid "Artwork" -msgstr "Iliustracijos" diff --git a/addons/metadata.album.universal/resources/language/Macedonian/strings.po b/addons/metadata.album.universal/resources/language/Macedonian/strings.po deleted file mode 100644 index 297c3e981c..0000000000 --- a/addons/metadata.album.universal/resources/language/Macedonian/strings.po +++ /dev/null @@ -1,58 +0,0 @@ -# XBMC Media Center language file -# Addon Name: Universal Album Scraper -# Addon id: metadata.album.universal -# Addon version: 1.6.0 -# Addon Provider: Olympia, Team XBMC -msgid "" -msgstr "" -"Project-Id-Version: XBMC Main Translation Project (Frodo)\n" -"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n" -"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: XBMC Translation Team\n" -"Language-Team: Macedonian (http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/mk/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: mk\n" -"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n" - -msgctxt "#30000" -msgid "Grab Album Thumbs from fanart.tv" -msgstr "Грабни Сликички за Албум од fanart.tv" - -msgctxt "#30001" -msgid "Grab Album Thumbs from Last.fm" -msgstr "Грабни Сликички за Албум од Last.fm" - -msgctxt "#30002" -msgid "Get Album Review from" -msgstr "Грабни преглед на Албум од" - -msgctxt "#30003" -msgid " Preferred Language" -msgstr "Посакуван јазик" - -msgctxt "#30004" -msgid "Get Album Rating from" -msgstr "Превземи рејтинг за албум од" - -msgctxt "#30005" -msgid "Get Album Styles from" -msgstr "Превземи стилови на албум од" - -msgctxt "#30006" -msgid "Get Album Moods from" -msgstr "Get Album Moods from" - -msgctxt "#30007" -msgid "Get Album Themes from" -msgstr "Превземи Теми на албуми од" - -msgctxt "#30008" -msgid "Grab Album Thumbs from allmusic.com" -msgstr "Превземи сликички на албуми од allmusic.com" - -msgctxt "#30009" -msgid "Artwork" -msgstr "Уметнини" diff --git a/addons/metadata.album.universal/resources/language/Norwegian/strings.po b/addons/metadata.album.universal/resources/language/Norwegian/strings.po deleted file mode 100644 index dfdb771e9d..0000000000 --- a/addons/metadata.album.universal/resources/language/Norwegian/strings.po +++ /dev/null @@ -1,58 +0,0 @@ -# XBMC Media Center language file -# Addon Name: Universal Album Scraper -# Addon id: metadata.album.universal -# Addon version: 1.6.0 -# Addon Provider: Olympia, Team XBMC -msgid "" -msgstr "" -"Project-Id-Version: XBMC Main Translation Project (Frodo)\n" -"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n" -"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: XBMC Translation Team\n" -"Language-Team: Norwegian (http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/no/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: no\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -msgctxt "#30000" -msgid "Grab Album Thumbs from fanart.tv" -msgstr "Hent Album Thumbs fra fanart.tv" - -msgctxt "#30001" -msgid "Grab Album Thumbs from Last.fm" -msgstr "Hent Album Thumbs fra Last.fm" - -msgctxt "#30002" -msgid "Get Album Review from" -msgstr "Hent Album Omtaler fra" - -msgctxt "#30003" -msgid " Preferred Language" -msgstr "Foretrukket Språk" - -msgctxt "#30004" -msgid "Get Album Rating from" -msgstr "Hent Album Omtale fra" - -msgctxt "#30005" -msgid "Get Album Styles from" -msgstr "Hent Album Stiler fra" - -msgctxt "#30006" -msgid "Get Album Moods from" -msgstr "Hent Album Humør fra" - -msgctxt "#30007" -msgid "Get Album Themes from" -msgstr "Hent Album Temaer fra" - -msgctxt "#30008" -msgid "Grab Album Thumbs from allmusic.com" -msgstr "Hent Album Thumbs fra allmusic.com" - -msgctxt "#30009" -msgid "Artwork" -msgstr "Artwork" diff --git a/addons/metadata.album.universal/resources/language/Polish/strings.po b/addons/metadata.album.universal/resources/language/Polish/strings.po deleted file mode 100644 index e542ca0fec..0000000000 --- a/addons/metadata.album.universal/resources/language/Polish/strings.po +++ /dev/null @@ -1,58 +0,0 @@ -# XBMC Media Center language file -# Addon Name: Universal Album Scraper -# Addon id: metadata.album.universal -# Addon version: 1.6.0 -# Addon Provider: Olympia, Team XBMC -msgid "" -msgstr "" -"Project-Id-Version: XBMC Main Translation Project (Frodo)\n" -"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n" -"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: XBMC Translation Team\n" -"Language-Team: Polish (http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/pl/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: pl\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" - -msgctxt "#30000" -msgid "Grab Album Thumbs from fanart.tv" -msgstr "Pobierz miniatury Albumu z fanart.tv" - -msgctxt "#30001" -msgid "Grab Album Thumbs from Last.fm" -msgstr "Pobierz miniatury Albumu z Last.fm" - -msgctxt "#30002" -msgid "Get Album Review from" -msgstr "Pobierz recenzje albumu z " - -msgctxt "#30003" -msgid " Preferred Language" -msgstr "Preferowany język" - -msgctxt "#30004" -msgid "Get Album Rating from" -msgstr "Pobierz ocene albumu z" - -msgctxt "#30005" -msgid "Get Album Styles from" -msgstr "Pobierz style Albumu z" - -msgctxt "#30006" -msgid "Get Album Moods from" -msgstr "Pobierz nastroje Albumu z" - -msgctxt "#30007" -msgid "Get Album Themes from" -msgstr "Pobierz motywy Albumu z" - -msgctxt "#30008" -msgid "Grab Album Thumbs from allmusic.com" -msgstr "Pobierz miniatury Albumu z allmusic.com" - -msgctxt "#30009" -msgid "Artwork" -msgstr "Artwork" diff --git a/addons/metadata.album.universal/resources/language/Portuguese (Brazil)/strings.po b/addons/metadata.album.universal/resources/language/Portuguese (Brazil)/strings.po deleted file mode 100644 index bab8c1a275..0000000000 --- a/addons/metadata.album.universal/resources/language/Portuguese (Brazil)/strings.po +++ /dev/null @@ -1,58 +0,0 @@ -# XBMC Media Center language file -# Addon Name: Universal Album Scraper -# Addon id: metadata.album.universal -# Addon version: 1.6.0 -# Addon Provider: Olympia, Team XBMC -msgid "" -msgstr "" -"Project-Id-Version: XBMC Main Translation Project (Frodo)\n" -"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n" -"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: XBMC Translation Team\n" -"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/pt_BR/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: pt_BR\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" - -msgctxt "#30000" -msgid "Grab Album Thumbs from fanart.tv" -msgstr "Pegar Miniaturas dos Álbuns de fanart.tv" - -msgctxt "#30001" -msgid "Grab Album Thumbs from Last.fm" -msgstr "Pegar Miniaturas dos Álbuns do Last.fm" - -msgctxt "#30002" -msgid "Get Album Review from" -msgstr "Pegar Review dos Álbuns de" - -msgctxt "#30003" -msgid " Preferred Language" -msgstr " Linguagem Preferida" - -msgctxt "#30004" -msgid "Get Album Rating from" -msgstr "Pegar Avaliação dos álbuns de" - -msgctxt "#30005" -msgid "Get Album Styles from" -msgstr "Obter Estilos dos Álbuns de" - -msgctxt "#30006" -msgid "Get Album Moods from" -msgstr "Obter Moods dos Álbuns de " - -msgctxt "#30007" -msgid "Get Album Themes from" -msgstr "Obter Temas dos Álbuns de" - -msgctxt "#30008" -msgid "Grab Album Thumbs from allmusic.com" -msgstr "Pegar Miniaturas Álbuns de allmusic.com" - -msgctxt "#30009" -msgid "Artwork" -msgstr "Artwork" diff --git a/addons/metadata.album.universal/resources/language/Portuguese/strings.po b/addons/metadata.album.universal/resources/language/Portuguese/strings.po deleted file mode 100644 index 49b4298517..0000000000 --- a/addons/metadata.album.universal/resources/language/Portuguese/strings.po +++ /dev/null @@ -1,62 +0,0 @@ -# XBMC Media Center language file -# Addon Name: Universal Album Scraper -# Addon id: metadata.album.universal -# Addon version: 1.6.0 -# Addon Provider: Olympia, Team XBMC -msgid "" -msgstr "" -"Project-Id-Version: XBMC Main Translation Project (Frodo)\n" -"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n" -"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: XBMC Translation Team\n" -"Language-Team: Portuguese (http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/pt/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: pt\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -msgctxt "#30000" -msgid "Grab Album Thumbs from fanart.tv" -msgstr "Obter as miniaturas do álbum de fanart.tv" - -msgctxt "#30001" -msgid "Grab Album Thumbs from Last.fm" -msgstr "Obter as miniaturas do álbum de Last.fm" - -msgctxt "#30002" -msgid "Get Album Review from" -msgstr "Obter a critica do álbum de" - -msgctxt "#30003" -msgid " Preferred Language" -msgstr "Idioma preferido" - -msgctxt "#30004" -msgid "Get Album Rating from" -msgstr "Obter a classificação do álbum de" - -msgctxt "#30005" -msgid "Get Album Styles from" -msgstr "Obter o estilo do álbum de" - -msgctxt "#30006" -msgid "Get Album Moods from" -msgstr "Obter Ambiências do Album de" - -msgctxt "#30007" -msgid "Get Album Themes from" -msgstr "Obter o tema do álbum de" - -msgctxt "#30008" -msgid "Grab Album Thumbs from allmusic.com" -msgstr "Obter as miniaturas do álbum de allmusic.com" - -msgctxt "#30009" -msgid "Artwork" -msgstr "Artwork" - -msgctxt "#30010" -msgid "Grab Album Thumbs from theaudiodb.com" -msgstr "Obter miniaturas de álbum de theaudiodb.com" diff --git a/addons/metadata.album.universal/resources/language/Russian/strings.po b/addons/metadata.album.universal/resources/language/Russian/strings.po deleted file mode 100644 index 87a7c45feb..0000000000 --- a/addons/metadata.album.universal/resources/language/Russian/strings.po +++ /dev/null @@ -1,58 +0,0 @@ -# XBMC Media Center language file -# Addon Name: Universal Album Scraper -# Addon id: metadata.album.universal -# Addon version: 1.6.0 -# Addon Provider: Olympia, Team XBMC -msgid "" -msgstr "" -"Project-Id-Version: XBMC Main Translation Project (Frodo)\n" -"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n" -"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: XBMC Translation Team\n" -"Language-Team: Russian (http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/ru/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: ru\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" - -msgctxt "#30000" -msgid "Grab Album Thumbs from fanart.tv" -msgstr "Получать иконки альбома с fanart.tv" - -msgctxt "#30001" -msgid "Grab Album Thumbs from Last.fm" -msgstr "Получать иконки альбома с Last.fm" - -msgctxt "#30002" -msgid "Get Album Review from" -msgstr "Получать обзор альбома с" - -msgctxt "#30003" -msgid " Preferred Language" -msgstr "Язык предпочтения" - -msgctxt "#30004" -msgid "Get Album Rating from" -msgstr "Получать рейтинг альбома с" - -msgctxt "#30005" -msgid "Get Album Styles from" -msgstr "Получать стиль альбома с" - -msgctxt "#30006" -msgid "Get Album Moods from" -msgstr "Получать направление альбома с" - -msgctxt "#30007" -msgid "Get Album Themes from" -msgstr "Получать темы альбома с" - -msgctxt "#30008" -msgid "Grab Album Thumbs from allmusic.com" -msgstr "Получать иконки альбома с allmusic.com" - -msgctxt "#30009" -msgid "Artwork" -msgstr "Обложка" diff --git a/addons/metadata.album.universal/resources/language/Slovak/strings.po b/addons/metadata.album.universal/resources/language/Slovak/strings.po deleted file mode 100644 index 4d0b0706d1..0000000000 --- a/addons/metadata.album.universal/resources/language/Slovak/strings.po +++ /dev/null @@ -1,58 +0,0 @@ -# XBMC Media Center language file -# Addon Name: Universal Album Scraper -# Addon id: metadata.album.universal -# Addon version: 1.6.0 -# Addon Provider: Olympia, Team XBMC -msgid "" -msgstr "" -"Project-Id-Version: XBMC Main Translation Project (Frodo)\n" -"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n" -"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: XBMC Translation Team\n" -"Language-Team: Slovak (http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/sk/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: sk\n" -"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" - -msgctxt "#30000" -msgid "Grab Album Thumbs from fanart.tv" -msgstr "Získať náhľady albumu zo stránky fanart.tv" - -msgctxt "#30001" -msgid "Grab Album Thumbs from Last.fm" -msgstr "Získať náhľady albumu zo stránky Last.fm" - -msgctxt "#30002" -msgid "Get Album Review from" -msgstr "Získať recenziu na album zo stránky" - -msgctxt "#30003" -msgid " Preferred Language" -msgstr "Uprednostňovaný jazyk" - -msgctxt "#30004" -msgid "Get Album Rating from" -msgstr "Získať hodnotenie albumu zo stránky" - -msgctxt "#30005" -msgid "Get Album Styles from" -msgstr "Získať štýly albumu zo stránky" - -msgctxt "#30006" -msgid "Get Album Moods from" -msgstr "Získať náladu albumu zo stránky" - -msgctxt "#30007" -msgid "Get Album Themes from" -msgstr "Získať motívy albumu zo stránky" - -msgctxt "#30008" -msgid "Grab Album Thumbs from allmusic.com" -msgstr "Získať náhľady albumu zo stránky allmusic.com" - -msgctxt "#30009" -msgid "Artwork" -msgstr "Umelecká grafika" diff --git a/addons/metadata.album.universal/resources/language/Spanish (Argentina)/strings.po b/addons/metadata.album.universal/resources/language/Spanish (Argentina)/strings.po deleted file mode 100644 index a22e3a2387..0000000000 --- a/addons/metadata.album.universal/resources/language/Spanish (Argentina)/strings.po +++ /dev/null @@ -1,58 +0,0 @@ -# XBMC Media Center language file -# Addon Name: Universal Album Scraper -# Addon id: metadata.album.universal -# Addon version: 1.6.0 -# Addon Provider: Olympia, Team XBMC -msgid "" -msgstr "" -"Project-Id-Version: XBMC Main Translation Project (Frodo)\n" -"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n" -"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: XBMC Translation Team\n" -"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/es_AR/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: es_AR\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -msgctxt "#30000" -msgid "Grab Album Thumbs from fanart.tv" -msgstr "Obtener Miniaturas de Álbum de fanart.tv" - -msgctxt "#30001" -msgid "Grab Album Thumbs from Last.fm" -msgstr "Obtener Miniaturas de Álbum de Last.fm" - -msgctxt "#30002" -msgid "Get Album Review from" -msgstr "Obtener Reseña del Álbum de" - -msgctxt "#30003" -msgid " Preferred Language" -msgstr "Idioma Preferido" - -msgctxt "#30004" -msgid "Get Album Rating from" -msgstr "Obtener Calificación del Álbum de " - -msgctxt "#30005" -msgid "Get Album Styles from" -msgstr "Obtener Estilos del Álbum de" - -msgctxt "#30006" -msgid "Get Album Moods from" -msgstr "Obtener Estados de Ánimo del Álbum de" - -msgctxt "#30007" -msgid "Get Album Themes from" -msgstr "Obtener Temas del Álbum de" - -msgctxt "#30008" -msgid "Grab Album Thumbs from allmusic.com" -msgstr "Conseguir Miniaturas de Álbum de allmusic.com" - -msgctxt "#30009" -msgid "Artwork" -msgstr "Imágenes" diff --git a/addons/metadata.album.universal/resources/language/Spanish (Mexico)/strings.po b/addons/metadata.album.universal/resources/language/Spanish (Mexico)/strings.po deleted file mode 100644 index e1f311b990..0000000000 --- a/addons/metadata.album.universal/resources/language/Spanish (Mexico)/strings.po +++ /dev/null @@ -1,58 +0,0 @@ -# XBMC Media Center language file -# Addon Name: Universal Album Scraper -# Addon id: metadata.album.universal -# Addon version: 1.6.0 -# Addon Provider: Olympia, Team XBMC -msgid "" -msgstr "" -"Project-Id-Version: XBMC Main Translation Project (Frodo)\n" -"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n" -"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: XBMC Translation Team\n" -"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/es_MX/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: es_MX\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -msgctxt "#30000" -msgid "Grab Album Thumbs from fanart.tv" -msgstr "Obtener Miniaturas de Álbumes de fanart.tv" - -msgctxt "#30001" -msgid "Grab Album Thumbs from Last.fm" -msgstr "Obtener Miniaturas de Álbumes de Last.fm" - -msgctxt "#30002" -msgid "Get Album Review from" -msgstr "Obtener Reviews de Álbumes de" - -msgctxt "#30003" -msgid " Preferred Language" -msgstr "Lenguaje Preferido" - -msgctxt "#30004" -msgid "Get Album Rating from" -msgstr "Obtener Ratings de Álbumes de" - -msgctxt "#30005" -msgid "Get Album Styles from" -msgstr "Obtener Estilos de Álbumes de" - -msgctxt "#30006" -msgid "Get Album Moods from" -msgstr "Obtener Atmósfera de Álbumes de" - -msgctxt "#30007" -msgid "Get Album Themes from" -msgstr "Obtener Temas de Álbumes de" - -msgctxt "#30008" -msgid "Grab Album Thumbs from allmusic.com" -msgstr "Obtener Miniaturas de Álbumes de allmusic.com" - -msgctxt "#30009" -msgid "Artwork" -msgstr "Artwork" diff --git a/addons/metadata.album.universal/resources/language/Spanish/strings.po b/addons/metadata.album.universal/resources/language/Spanish/strings.po deleted file mode 100644 index a418921e27..0000000000 --- a/addons/metadata.album.universal/resources/language/Spanish/strings.po +++ /dev/null @@ -1,58 +0,0 @@ -# XBMC Media Center language file -# Addon Name: Universal Album Scraper -# Addon id: metadata.album.universal -# Addon version: 1.6.0 -# Addon Provider: Olympia, Team XBMC -msgid "" -msgstr "" -"Project-Id-Version: XBMC Main Translation Project (Frodo)\n" -"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n" -"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: XBMC Translation Team\n" -"Language-Team: Spanish (http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/es/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: es\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -msgctxt "#30000" -msgid "Grab Album Thumbs from fanart.tv" -msgstr "Obtener miniaturas de álbum de fanart.tv" - -msgctxt "#30001" -msgid "Grab Album Thumbs from Last.fm" -msgstr "Obtener miniaturas de álbum de Last.fm" - -msgctxt "#30002" -msgid "Get Album Review from" -msgstr "Obtener reseña del álbum de" - -msgctxt "#30003" -msgid " Preferred Language" -msgstr "Idioma preferido" - -msgctxt "#30004" -msgid "Get Album Rating from" -msgstr "Obtener calificación del álbum de " - -msgctxt "#30005" -msgid "Get Album Styles from" -msgstr "Obtener estilos del álbum de" - -msgctxt "#30006" -msgid "Get Album Moods from" -msgstr "Obtener estados de ánimo del álbum de" - -msgctxt "#30007" -msgid "Get Album Themes from" -msgstr "Obtener temas del álbum de" - -msgctxt "#30008" -msgid "Grab Album Thumbs from allmusic.com" -msgstr "Conseguir miniaturas de álbum de allmusic.com" - -msgctxt "#30009" -msgid "Artwork" -msgstr "Imágenes" diff --git a/addons/metadata.album.universal/resources/language/Swedish/strings.po b/addons/metadata.album.universal/resources/language/Swedish/strings.po deleted file mode 100644 index ed20b3da73..0000000000 --- a/addons/metadata.album.universal/resources/language/Swedish/strings.po +++ /dev/null @@ -1,62 +0,0 @@ -# XBMC Media Center language file -# Addon Name: Universal Album Scraper -# Addon id: metadata.album.universal -# Addon version: 1.6.0 -# Addon Provider: Olympia, Team XBMC -msgid "" -msgstr "" -"Project-Id-Version: XBMC Main Translation Project (Frodo)\n" -"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n" -"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: XBMC Translation Team\n" -"Language-Team: Swedish (http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/sv/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: sv\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -msgctxt "#30000" -msgid "Grab Album Thumbs from fanart.tv" -msgstr "Hämta albumminiatyrer från fanart.tv" - -msgctxt "#30001" -msgid "Grab Album Thumbs from Last.fm" -msgstr "Hämta albumminiatyrer från Last.fm" - -msgctxt "#30002" -msgid "Get Album Review from" -msgstr "Hämta albumrecensioner från" - -msgctxt "#30003" -msgid " Preferred Language" -msgstr "Föredraget språk" - -msgctxt "#30004" -msgid "Get Album Rating from" -msgstr "Hämta albumbetyg från" - -msgctxt "#30005" -msgid "Get Album Styles from" -msgstr "Hämta albumstilar från" - -msgctxt "#30006" -msgid "Get Album Moods from" -msgstr "Hämta albumstämningar från" - -msgctxt "#30007" -msgid "Get Album Themes from" -msgstr "Hämta albumteman från" - -msgctxt "#30008" -msgid "Grab Album Thumbs from allmusic.com" -msgstr "Hämta albumminiatyrer från allmusic.com" - -msgctxt "#30009" -msgid "Artwork" -msgstr "Konstverk" - -msgctxt "#30010" -msgid "Grab Album Thumbs from theaudiodb.com" -msgstr "Hämta albumminiatyrer från theaudiodb.com" diff --git a/addons/metadata.album.universal/resources/language/Tamil (India)/strings.xml b/addons/metadata.album.universal/resources/language/Tamil (India)/strings.xml new file mode 100644 index 0000000000..e130bbd28d --- /dev/null +++ b/addons/metadata.album.universal/resources/language/Tamil (India)/strings.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- Translated using Transifex web application. For support, or if you would like to to help out, please visit your language team! --> +<!-- Tamil (India) language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/ta_IN/ --> +<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> + +<strings> + <string id="30000">ஆல்பம் குருபடங்களை fanart.tv இருந்து கைப்பற்று</string> + <string id="30001">ஆல்பம் குருபடங்களை Last.fm இருந்து கைப்பற்று</string> + <string id="30002">ஆல்பம் விமர்சனத்தை கைப்பற்று</string> + <string id="30003">விரும்பிய மொழி</string> + <string id="30004">ஆல்பம் தரத்தை கைப்பற்று</string> + <string id="30005">ஆல்பம் பாணி கைப்பற்று</string> + <string id="30006">ஆல்பம் விதம்கள் கைப்பற்று</string> + <string id="30007">ஆல்பம் அலங்காரங்கள் கைப்பற்று</string> + <string id="30008">ஆல்பம் குருபடங்களை allmusic.com இருந்து கைப்பற்று</string> + <string id="30009">குறுப்படம்</string> + <string id="30010">ஆல்பம் குருபடங்களை theaudiodb.com இருந்து கைப்பற்று</string> +</strings> diff --git a/addons/metadata.album.universal/resources/language/Turkish/strings.xml b/addons/metadata.album.universal/resources/language/Turkish/strings.xml new file mode 100644 index 0000000000..ea037785f9 --- /dev/null +++ b/addons/metadata.album.universal/resources/language/Turkish/strings.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- Translated using Transifex web application. For support, or if you would like to to help out, please visit your language team! --> +<!-- Turkish language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/tr/ --> +<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> + +<strings> + <string id="30000">Albüm Kapaklarını fanart.tv'den al</string> + <string id="30003">Tercih Edilen Dil</string> + <string id="30009">Çizim</string> +</strings> diff --git a/addons/metadata.album.universal/resources/language/Ukrainian/strings.xml b/addons/metadata.album.universal/resources/language/Ukrainian/strings.xml new file mode 100644 index 0000000000..4fc1e7e264 --- /dev/null +++ b/addons/metadata.album.universal/resources/language/Ukrainian/strings.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- Translated using Transifex web application. For support, or if you would like to to help out, please visit your language team! --> +<!-- Ukrainian language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/uk/ --> +<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> + +<strings> + <string id="30000">Отримати малюнки альбомів з fanart.tv</string> + <string id="30001">Отримати малюнки альбому з Last.fm</string> + <string id="30002">Отримати огляд альбому з</string> + <string id="30003">Улюблена мова</string> + <string id="30004">Отримати рейтинг альбому з</string> + <string id="30005">Отримати стилі альбому з</string> + <string id="30006">Отримати настрої альбому з</string> + <string id="30007">Отримати теми альбому з</string> + <string id="30008">Отримати малюнки альбому з allmusic.com</string> + <string id="30009">Обкладинка</string> + <string id="30010">Отримати малюнки альбому з theaudiodb.com</string> +</strings> diff --git a/addons/metadata.album.universal/resources/language/Vietnamese/strings.xml b/addons/metadata.album.universal/resources/language/Vietnamese/strings.xml new file mode 100644 index 0000000000..06d7dbc247 --- /dev/null +++ b/addons/metadata.album.universal/resources/language/Vietnamese/strings.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- Translated using Transifex web application. For support, or if you would like to to help out, please visit your language team! --> +<!-- Vietnamese language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/vi/ --> +<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> + +<strings> + <string id="30000">Lấy hình đại diện album từ nguồn fanart.tv</string> + <string id="30001">Lấy hình đại diện album từ nguồn Last.fm</string> + <string id="30002">Lấy bài đánh giá album từ</string> + <string id="30003">Ưu tiên ngôn ngữ</string> + <string id="30004">Lấy Album Rating từ</string> + <string id="30005">Lấy Album Styles từ</string> + <string id="30006">Lấy Album Moods từ</string> + <string id="30007">Lấy Album Themes từ</string> + <string id="30008">Lấy hình đại diện album từ nguồn allmusic.com</string> + <string id="30009">Ảnh bìa</string> + <string id="30010">Lấy hình đại diện album từ nguồn theaudiodb.com</string> +</strings> diff --git a/addons/metadata.album.universal/resources/language/Welsh/strings.xml b/addons/metadata.album.universal/resources/language/Welsh/strings.xml new file mode 100644 index 0000000000..2dbc969d27 --- /dev/null +++ b/addons/metadata.album.universal/resources/language/Welsh/strings.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- Translated using Transifex web application. For support, or if you would like to to help out, please visit your language team! --> +<!-- Welsh language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/cy/ --> +<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> + +<strings> + <string id="30000">Estyn Lluniau Bach Album o fanart.tv</string> + <string id="30001">Estyn Lluniau Bach Album o Last.fm</string> + <string id="30002">Estyn Adolygiad Album</string> + <string id="30003">Dewis Iaith</string> + <string id="30004">Estyn Graddio Album o</string> + <string id="30005">Estyn Arddulliau Album o</string> + <string id="30006">Estyn Naws Album o</string> + <string id="30007">Estyn Themau Album o</string> + <string id="30008">Estyn Lluniau Bach Album o allmusic.com</string> + <string id="30009">Gwaith Celf</string> + <string id="30010">Estyn Lluniau Bach Album o theaudiodb.com</string> +</strings> diff --git a/addons/metadata.album.universal/resources/settings.xml b/addons/metadata.album.universal/resources/settings.xml index b77bc72696..f75639eb20 100644 --- a/addons/metadata.album.universal/resources/settings.xml +++ b/addons/metadata.album.universal/resources/settings.xml @@ -3,6 +3,7 @@ <category label="128"> <setting type="lsep" label="General Settings"/> <setting label="30002" type="labelenum" values="TheAudioDb.com|amazon.de|None" id="albumreviewsource" default="TheAudioDb.com"/> + <setting label="30003" type="labelenum" values="en|de|es|fr|it|cn|jp|ru|pt|se|nl|hu" id="tadbalbumlanguage" default="en" visible="eq(-1,0)"/> <setting type="sep"/> <setting label="30004" type="labelenum" values="MusicBrainz|allmusic.com|None" id="albumratingsource" default="MusicBrainz"/> <setting label="30005" type="labelenum" values="allmusic.com|None" id="albumstylessource" default="allmusic.com"/> @@ -14,6 +15,7 @@ <setting type="lsep" label="Artwork Settings"/> <setting label="30000" type="bool" id="fanarttvalbumthumbs" default="true"/> <setting label="30010" type="bool" id="tadbalbumthumbs" default="true"/> - <setting label="30008" type="bool" id="allmusicalbumthumbs" default="true"/> + <setting label="30001" type="bool" id="lastfmalbumthumbs" default="false"/> + <setting label="30008" type="bool" id="allmusicalbumthumbs" default="false"/> </category> </settings> diff --git a/addons/metadata.artists.universal/addon.xml b/addons/metadata.artists.universal/addon.xml index 2fe29b9a8b..1bc15a7e2a 100644 --- a/addons/metadata.artists.universal/addon.xml +++ b/addons/metadata.artists.universal/addon.xml @@ -1,26 +1,28 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <addon id="metadata.artists.universal" name="Universal Artist Scraper" - version="2.4.3" - provider-name="Team XBMC"> + version="2.6.5" + provider-name="Olympia, Team XBMC"> <requires> - <import addon="xbmc.metadata" version="1.0"/> - <import addon="metadata.common.last.fm" version="1.5.1"/> - <import addon="metadata.common.allmusic.com" version="2.5.2"/> - <import addon="metadata.common.musicbrainz.org" version="1.2.1"/> + <import addon="xbmc.metadata" version="2.1.0"/> + <import addon="metadata.common.last.fm" version="1.6.0"/> + <import addon="metadata.common.allmusic.com" version="2.6.0"/> + <import addon="metadata.common.musicbrainz.org" version="1.3.0"/> <import addon="metadata.common.htbackdrops.com" version="1.2.0"/> - <import addon="metadata.common.fanart.tv" version="2.0.0"/> - <import addon="metadata.common.theaudiodb.com" version="1.3.0"/> + <import addon="metadata.common.fanart.tv" version="2.1.2"/> + <import addon="metadata.common.theaudiodb.com" version="1.5.0"/> </requires> <extension point="xbmc.metadata.scraper.artists" language="en" library="artistuniversal.xml"/> <extension point="xbmc.addon.metadata"> <summary lang="af">Universal Skraper vir Kunstenaars</summary> + <summary lang="ar">ماسحة الفنان العالمية</summary> <summary lang="be">Universal Scraper for Artists</summary> <summary lang="bg">Универсален източник за информация за артисти</summary> <summary lang="ca">Arreplegador universal per artistes</summary> <summary lang="cs">Univerzální zdroj získávání dat pro umělce</summary> + <summary lang="cy">Crafwr Cyffredinol ar gyfer Artistiaid</summary> <summary lang="da">Universel Scraper til Kunstnere</summary> <summary lang="de">Universal Scraper für Interpreten</summary> <summary lang="el">Universal Scraper Καλλιτεχνών</summary> @@ -28,6 +30,7 @@ <summary lang="es">Scraper universal para artistas</summary> <summary lang="es_AR">Scraper Universal para Artistas</summary> <summary lang="es_MX">Scraper Universal de Artistas</summary> + <summary lang="et">Universaalne artistide kraabits</summary> <summary lang="fi">Universaali artistien tiedonhakija</summary> <summary lang="fr">Collecteur universel d'artistes</summary> <summary lang="gl">Scraper Universal para Artistas</summary> @@ -38,7 +41,9 @@ <summary lang="ko">Universal Scraper for Artists</summary> <summary lang="lt">Universalus Artistų Scrapers</summary> <summary lang="mk">Universal Scraper for Artists</summary> + <summary lang="my">အနုပညာရှင်များအတွက် Universal Scraper</summary> <summary lang="nl">Universele scraper voor artiesten</summary> + <summary lang="no">Universalskraper for artister</summary> <summary lang="pl">Universal Scraper dla Artystów muzycznych</summary> <summary lang="pt">Scraper universal para Artistas</summary> <summary lang="pt_BR">Scraper Universal para Artistas</summary> @@ -47,12 +52,18 @@ <summary lang="sk">Univerzálny zdroj získavania dát pre umelcov</summary> <summary lang="sl">Univerzalen ponudnik informacij o izvajalcih</summary> <summary lang="sv">Universiell artistskrapa</summary> + <summary lang="ta_IN">கலைஞர்களின் ஒட்டு மொத்தமான சுரண்டி</summary> + <summary lang="uk">Універсальний здирач для виконавців</summary> + <summary lang="vi">Trình lấy dữ liệu Nghệ sĩ từ nhiều nguồn</summary> <summary lang="zh">通用艺术家信息刮削器</summary> + <summary lang="zh_TW">通用演出者訊息搜括器</summary> <description lang="af">Hierdie skraper versamel informasie van die volgende ondersteunde werwe: TheAudioDb.com, MusicBrainz, last.fm, en allmusic.com, terwyl kunswerke gryp van: fanart.tv, htbackdrops.com, last.fm en allmusic.com. Dit kan veld vir veld gestel word vanaf watter werf jy die spesifike informasie wil hê. Die aanvanklike soektog word altyd op MusicBrainz gedoen. Ingeval die allmusic skakel nie bygevoeg is op die MusicBrainz werf, kan velde van allmusic.com nie gaan haal word nie (egter baie maklik om daardie ontbrekende skakels by te voeg).</description> + <description lang="ar">هذه الماسحة تجمع المعلومات من المواقع المدعومة التالية: TheAudioDb.com, MusicBrainz, last.fm, and allmusic.com, في حين تأخذ عناوين الأعمال الفنية من: fanart.tv, htbackdrops.com, last.fm and allmusic.com. يمكن أن ترتب حقل تلو حقل حسب الموقع الذي تريد منه تلك المعلومة المحددة. البحث الابتدائي يتم دائما على ميوزك برينز. في حال أن رابط كل الموسيقى غير مضاف على حقول موقع ميوزك برينز من allmusic.com لا يمكن الحصول عليها(على الرغم من سهولة إضافة هذه الروابط المفقودة).</description> <description lang="be">This scraper collects information from the following supported sites: TheAudioDb.com, MusicBrainz, last.fm, and allmusic.com, while grabs artwork from: fanart.tv, htbackdrops.com, last.fm and allmusic.com. It can be set field by field that from which site you want that specific information. The initial search is always done on MusicBrainz. In case allmusic link is not added on the MusicBrainz site fields from allmusic.com cannot be fetched (very easy to add those missing links though).</description> <description lang="bg">Сваля информация от следните сайтове: TheAudioDb.com, MusicBrainz, last.fm, and allmusic.com. Изобрания извлича от: fanart.tv, htbackdrops.com, last.fm and allmusic.com. Можете да определите от кой сайт каква информация да се сваля. Първоначалното търсене винаги се прави в MusicBrainz. Когато не е налична препратка към allmusic.com на сайта на MusicBrainz извличането на информация от allmusic.com става невъзможно (добавянето на препратка е много лесно).</description> <description lang="ca">Aquest arreplegador recull informació dels següents llocs suportats</description> <description lang="cs">Tento zdroj dat získává informace z následujících podporovaných stránek: TheAudioDb.com, MusicBrainz, last.fm, and allmusic.com, while grabs artwork from: fanart.tv, htbackdrops.com, last.fm a allmusic.com. Lze nastavit jakou informaci stahovat z jakých stránek. Základní hledání je vždy provedeno na MusicBrainz. V případě, že schází odkaz allmusic na stránce MusicBrains, nelze stáhnout informace z allmusic.com (avšak je velmi snadné chybějící odkazy přidat).</description> + <description lang="cy">Mae'r crafwr yn casglu gwybodaeth o'r gwefannau canlynol: TheAudioDb.com, MusicBrainz, last.fm, a allmusic.com, tra'n cipio gwaith celf o: fanart.tv, htbackdrops.com, last.fm a allmusic.com. Mae modd ei osod fesul maes i ddewis pa wefan i gasglu gwybodaeth benodol. Bydd y chwilio cychwynnol yn cael ei wneud ar MusicBrainz. Rhag ofn nad yw dolen allmusic wedi ei osod ar wefan MusicBrainz nid oes modd estyn meysydd o allmusic.com (mae'n hawdd gosod y dolenni coll hynny).</description> <description lang="da">Denne scraper samler information fra følgende sider: TheAudioDb.com, MusicBrainz, last.fm, og allmusic.com, og henter illustrationer fra: fanart.tv, htbackdrops.com, last.fm og allmusic.com. Det kan vælges felt for felt, fra hvilke sider du ønsker, at få de pågældende informationer fra. Den første søgning er altid på MusicBrainz. Hvis ikke allmusic linket er tilføjet på MusicBrainz side, kan felter fra allmusic.com ikke hentes (men det er helt enkelt at tilføje de manglende links).</description> <description lang="de">Dieser Scraper unterstützt das Sammeln von Informationen von den folgenden Seiten: TheAudioDb.com, MusicBrainz, last.fm, und allmusic.com, Grafiken werden geladen von: fanart.tv, htbackdrops.com, last.fm und allmusic.com. Es kann Feld für Feld festgelegt werden welche Information von welcher Seite geladen werden soll. Die erste Suche wird immer auf MusicBrainz durchgeführt. Sollte der allmusic link auf der MusicBrainz Seite fehlen, können keine Informationen von allmusic geladen werden. (diese fehlenden links können sehr leicht nachgetragen werden).</description> <description lang="el">Αυτό το scraper συλλέγει πληροφορίες από τις ακόλουθες υποστηριζόμενες ιστοσελίδες: TheAudioDb.com, MusicBrainz, last.fm και allmusic.com, ενώ λαμβάνει εικόνες από τα: fanart.tv, htbackdrops.com, last.fm και allmusic.com. Μπορεί να οριστεί πεδίο ανά πεδίο αναλόγως των πληροφοριών που επιθυμείτε από την εκάστοτε ιστοσελίδα. Η αρχική αναζήτηση γίνεται πάντα στο MusicBrainz. Σε περίπτωση που δεν έχουν προστεθεί σύνδεσμοι για το allmusic στο MusicBrainz, δε θα μπορούν να ληφθούν πεδία από το allmusic.com (ωστόσο είναι πολύ εύκολο να προστεθούν αυτοί οι ελλιπείς σύνδεσμοι).</description> @@ -60,6 +71,7 @@ <description lang="es">Este scraper recopila información de las siguientes webs: TheAudioDb.com, MusicBrainz, last.fm y allmusic.com, mientras obtiene las imágenes de fanart.tv, htbackdrops.com, last.fm y allmusic.com. Permite especificar de qué web se quiere obtener la información específica. ⏎ ⏎ La búsqueda inicial se realiza siempre en MusicBrainz. En caso de que los enlaces a allmusic no estén añadidos en la web de MusicBrainz, no se podrán obtener los campos de información de este sitio (aunque es muy fácil añadir esos enlaces que faltan).</description> <description lang="es_AR">Este scraper recopila información de las siguientes webs: TheAudioDb.com, MusicBrainz, last.fm y allmusic.com, mientras que obtiene las imágenes de fanart.tv, htbackdrops.com, last.fm y allmusic.com. Permite especificar de qué web se quiere obtener la información específica. ⏎ ⏎ La búsqueda inicial se realiza siempre en MusicBrainz. En caso de que los enlaces a allmusic no estén añadidos en la web de MusicBrainz, no se podrán obtener los campos de información de este sitio (aunque es muy fácil añadir esos enlaces que faltan).</description> <description lang="es_MX">Este scraper obtiene información de los siguientes sitios soportados: TheAudioDb.com, MusicBrainz, last.fm y allmusic.com, mientras obtiene artwork de: fanart.tv, htbackdrops.com, last.fm y allmusic.com. Puede ser configurado campo por campo de que sitio quieres esa información específica.⏎ ⏎ La búsqueda inicial siempre es hecha en MusicBrainz. En el caso en que los enlaces de allmusic no son agregados en el sitio de MusicBrainz, campos de allmusic.com no pueden ser obtenidos. (De cualquier manera es muy fácil agregar esos enlaces no encontrados).</description> + <description lang="et">See kraabits kogub infot järgmistelt lehtedelt: TheAudioDb.com, MusicBrainz, last.fm ja allmusic.com, pilte: fanart.tv, htbackdrops.com, last.fm ja allmusic.com. Saad välja kaupa määrata, milliselt lehelt mis infot soovid. Esmane otsing tehakse alati saidilt MusicBrainz. Kui MusicBrainz lehele pole allmusic linki lisatud, siis allmusic.com lehelt sisu hankida ei saa (puuduvaid linke saad ise lihtsalt lisada).</description> <description lang="fi">Tämä tiedonhakija käyttää tietolähteinään seuraavia sivustoja: TheAudioDb.com, MusicBrainz, last.fm, and allmusic.com. Kuvat ja grafiikat haetaan seuraavilta sivustoilta: fanart.tv, htbackdrops.com, last.fm and allmusic.com. Voit määrittää tarkasti, miltä sivustoilta mitäkin tietoa haetaan. Ensimmäinen haku tehdään aina lähteestä MusicBrainz. Mikäli allmusic-linkkiä ei ole lisätty MusicBrainz-sivustolle allmusic.com-osoitteessa, haku ei onnistu (mutta puuttuvien linkkien lisääminen on helppoa).</description> <description lang="fr">Ce collecteur répertorie les informations des sites suivants : TheAudioDb.com, MusicBrainz, Last.fm et allmusic.com tout en assemblant les illustrations depuis : fanart.tv, htbackdrops.com, last.fm et allmusic.com. Vous pouvez définir la source d'information pour chaque champ. La recherche initiale est toujours faite à partir de MusicBrainz. xxxxxxxx (en attente du retour de l'équipe xbmc) xxxxxxxxxxx</description> <description lang="gl">Este scraper recolle información dos seguintes sitios: TheAudioDb.com, MusicBrainz, last.fm e allmusic.com, mentres que, obtén as imaxes de: fanart.tv, htbackdrops.com, last.fm e allmusic.com. Pode definir en cada campo o sitio de onde quere obter a información. A busca inicial é feita sempre no MusicBrainz, no caso de que a ligazón a allmusic non se teña engadido nos campos do sítio MusicBrainz dende allmusic.com, non se poderán obter (aínda que, é moi doado engadir as ligazóns que faltan).</description> @@ -67,10 +79,11 @@ <description lang="hu">Ez a leolvasó a következő weboldalakról gyűjti be az adatokat: TheAudioDb.com, MusicBrainz, last.fm és allmusic.com, míg képeket a következő oldalakról gyűjt: fanart.tv, htbackdrops.com, last.fm és allmusic.com. Egyenként beállítható, hogy az adott mezőt melyik weboldalról töltse fel⏎ ⏎ A kiinduló keresés mindig a MusicBrainz. Amennyiben az allmusic utalás nincs hozzáadva MusicBrainz oldalhoz, a mezők nem tölthetők le az allmusic.com oldalról (a hiányzó utalások hozzáadása azonban nagyon egyszerű).</description> <description lang="it">Lo scraper colleziona informazioni da questi siti supportati: TheAudioDb.com, MusicBrainz, last.fm, e allmusic.com, mentre ottiene le grafiche da: fanart.tv, htbackdrops.com, last.fm e allmusic.com. Può essere impostato campo per campo da quale sito vuoi la specifica informazione. La ricerca iniziale è sempre fatta su MusicBrainz. Nel caso che il link allmusic non è stato aggiunto al campo del sito MusicBrainz da allmusic.com; non possono essere ottenute (è comunque veramente facile aggiungere questi link mancanti).</description> <description lang="ja">このスクレーパーは、以下のサイトから情報を取得します：TheAudioDb.com, MusicBrainz, last.fm, allmusic.com。アートワークは以下のサイトから取得します：fanart.tv, htbackdrops.com, last.fm, allmusic.com。各フィールドごとに、どの情報をどのサイトから取得するか、個別に指定することもできます。 最初は MusicBrainz を使って検索が行われます。MusicBrainz サイトに allmusic のリンクが追加されていない場合は、allmusic.com からのフィールドは取得できません (リンクを追加するのは簡単ですが)。</description> - <description lang="ko">This scraper collects information from the following supported sites: TheAudioDb.com, MusicBrainz, last.fm, and allmusic.com, while grabs artwork from: fanart.tv, htbackdrops.com, last.fm and allmusic.com. It can be set field by field that from which site you want that specific information. The initial search is always done on MusicBrainz. In case allmusic link is not added on the MusicBrainz site fields from allmusic.com cannot be fetched (very easy to add those missing links though).</description> + <description lang="ko">이 자료수집기는 다음의 사이트에서 정보를 가져옵니다: TheAudioDb.com, MusicBrainz, last.fm, allmusic.com.아트워크는 다음의 사이트에서 가져옵니다: fanart.tv, htbackdrops.com, last.fm, allmusic.com. 특정 정보를 지정한 사이트에서 가져오도록 필드별로 설정할 수 있습니다. The initial search is always done on MusicBrainz. In case allmusic link is not added on the MusicBrainz site fields from allmusic.com cannot be fetched (very easy to add those missing links though).</description> <description lang="lt">Šis Scrapers renka informaciją iš šių palaikomų svetainių: TheAudioDb.com, MusicBrainz, last.fm, ir allmusic.com, ir atsiunčia meno kūrinius iš: fanart.tv, htbackdrops.com, last.fm ir allmusic.com. Jis gali būti nustatyti lauko srityje, kurioje svetainėje norite, kad konkrečiu atveju pradinė informacijos pradinis paieška visada bus atlikta remiantis MusicBrainz. Allmusic nuoroda įdėta į MusicBrainz vietoje laukų allmusic.com negali būti (nors tas trūkstamas grandis labai lengva įtraukti).</description> <description lang="mk">This scraper collects information from the following supported sites: TheAudioDb.com, MusicBrainz, last.fm, and allmusic.com, while grabs artwork from: fanart.tv, htbackdrops.com, last.fm and allmusic.com. It can be set field by field that from which site you want that specific information. The initial search is always done on MusicBrainz. In case allmusic link is not added on the MusicBrainz site fields from allmusic.com cannot be fetched (very easy to add those missing links though).</description> <description lang="nl">Deze scraper verzamelt informatie van de volgende ondersteunde websites: TheAudioDb.com, MusicBrainz, last.fm, en allmusic.com en tevens pakt hij afbeeldingen van fanart.tv, htbackdrops.com, last.fm en allmusic.com. Het is mogelijk om per veld aan te geven van welke website je de specifieke informatie wil halen. De initiële zoekopdracht wordt altijd uitgevoerd op MusicBrainz. Wanneer de allmusic link niet is toegevoegd in de juiste velden op de MusicBrainz website kan de informatie van allmusic.com niet worden opgehaald. (Het is erg makkelijk om deze ontbrekende links toe te voegen.)</description> + <description lang="no">Denne skraperen samler informasjon fra følgende støttede steder: TheAudioDb.com, MusicBrainz, last.fm og allmusic.com, mens den henter artwork fra: fanart.tv, htbackdrops.com, last.fm og allmusic.com. Du kan stegvis velge hvilken kilde du ønsker og hente spesifikk informasjon fra. Det første søket er alltid gjort hos MusicBrainz. I tilfeller hvor allmusic-linker ikke er lagt til hos MusicBrainz-siden, kan ikke felter fra allmusic.com hentes (det er veldig lett å legge til de manglende linkene).</description> <description lang="pl">Ten scraper zbiera informacje z następujących stron: TheAudioDb.com, MusicBrainz, last.fm, and allmusic.com, a grafiki pobiera z: </description> <description lang="pt">Este scraper recolhe informações dos seguintes sítios: TheAudioDb.com, MusicBrainz, last.fm e allmusic.com, enquanto obtém artwork de: fanart.tv, htbackdrops.com, last.fm e allmusic.com. Pode definir em cada campo o sítio de onde quer obter as informações.⏎ ⏎ A pesquisa inicial é sempre feita no MusicBrainz. Caso uma ligação allmusic não tenha sido adicionada no sítio MusicBrainz, os campos do allmusic.com não serão obtidos (no entanto, é muito fácil adicionar os links em falta).</description> <description lang="pt_BR">Este scraper coleta informações nos seguintes sites: MusicBrainz, last.fm, allmusic.com e amazon.de, enquanto pega os artwork de: fanart.tv, last.fm and allmusic.com. O Mesmo pode ser configurara campo a campo em que site você quer obter informações específicas. A procura inicial é sempre feita no MusicBrainz. No caso allmusic e/ou amazon.de não terem sido adicionados no site MusicBrainz, campos de allmusic.com e/ou amazona.de não serão buscados (embora seja muito fácil adicionar os links faltantes). </description> @@ -79,7 +92,10 @@ <description lang="sk">Tento zdroj získavania dát zbiera infomácie z nasledujúcich podporovaných stránok: TheAudioDb.com, MusicBrainz, last.fm a allmusic.com. Grafiku získava zo stránok: fanart.tv, htbackdrops.com, last.fm a allmusic.com. Je možné podrobne nastaviť, z ktorej stránky chcete získať konkrétne informácie. Počiatočné hľadanie je vždy na stránke MusicBrainz. V prípade, že odkaz pre allmusic nie je pridaný na stránku MusicBrainz, nie je možné získať údaje zo stránky allmusic.com (je ale veľmi jednoduché tieto chýbajúce odkazy pridať).</description> <description lang="sl">Ta ponudnik združuje informacije s sledečih strani: TheAudioDb.com, MusicBrainz, last.fm in allmusic.com; grafike prenaša z: fanart.tv, htbackdrops.com, last.fm in allmusic.com. Vsako informacijo lahko prenesete z različne strani. Začeno iskanje je vedn na MusicBrainz. V primeru, da na MusicBrainz ni povezave do allmusic.com, informacij od tam ne morete prenesti (a to težavo hitro lahko odpravite).</description> <description lang="sv">Denna skrapa samlar information från följande sajter: TheAudioDb.com, MusicBrainz, last.fm och allmusic.com, medans den samlar konstverk från: fanart.tv, htbackdrops.com, last.fm och allmusic.com. Du kan ange fält för fält från vilken sajt du vill ha den specifika inforamtionen från. Den initiala sökningen är alltid gjord på MusicBrainz. Om inte allmusic.com länken läggs till på MusicBrainz sajten, kan inte fält från allmusic.com hämtas (väldigt enkelt att lägga till dom saknade länkarna dock).</description> + <description lang="ta_IN">இந்த சுரண்டியானது TheAudioDb.com, MusicBrainz, last.fm, allmusic.com ஆகிய இணையதளத்தில் இருந்து தகவல்களை சேகரிக்கும். திரை குறும்படங்களை fanart.tv, htbackdrops.com, last.fm மற்றும் allmusic.com ஆகிய இணையதளத்தில் இருந்து தகவல்களை சேகரிக்கும். ⏎ ⏎ முதன்மை தேடல் எப்போதும் MusicBrainz தான் நடக்கும். allmusic மற்றும் amazon.de சேர்க்கபடாவிட்டால் அவற்றில் இருந்து தகவல்கள் செமிக்கபடமாட்டது (தவறிய இணைப்புகளை சேர்ப்பது மிகவும் எளிது).</description> + <description lang="vi">Trình này thu thập thông tin từ những site được hỗ trợ như: TheAudioDb.com, MusicBrainz, last.fm, allmusic.com, và lấy ảnh bìa từ các nguồn: fanart.tv, htbackdrops.com, last.fm và allmusic.com. Bạn có thể tùy chỉnh chọn từng thứ riêng biệt để lấy từ site bạn muốn.\n \n Lần tìm kiếm đầu tiên luôn luôn được sử dụng từ MusicBrainz. Trong trường hợp các link allmusic không có trên MusicBrainz, các trường từ allmusic.com sẽ không thể lấy về được (tuy nhiên rất dễ để tự thêm vào các link này bằng tay).</description> <description lang="zh">本刮削器支持从以下网站获取信息：TheAudioDb.com、MusicBrainz、last.fm和allmusic.com，并从以下网站获取艺术图片：fanart.tv、htbackdrops.com、last.fm和allmusic.com。你可以指定每一项内容的来源网站。 初始结果总是先从MusicBrainz获取，如果MusicBrainz网站未加入到allmusic的外部链接，则无法获取allmusic.com的信息（当然你能很容易地加入缺失的链接）。</description> + <description lang="zh_TW">本搜刮器支援從以下網站取得資訊：TheAudioDb.com、MusicBrainz、last.fm和allmusic.com，並從以下網站取得專輯圖片：fanart.tv、htbackdrops.com、last.fm和allmusic.com。您可以指定每一項內容的來源網站。 初始搜尋結果總是先從MusicBrainz取得，如果MusicBrainz網站未加入到allmusic的外部連結，則無法取得allmusic.com的資訊 (當然您能很輕易地加入遺失的連結)。</description> <platform>all</platform> </extension> </addon> diff --git a/addons/metadata.artists.universal/artistuniversal.xml b/addons/metadata.artists.universal/artistuniversal.xml index ea4c514351..48945d7182 100644 --- a/addons/metadata.artists.universal/artistuniversal.xml +++ b/addons/metadata.artists.universal/artistuniversal.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<scraper framework="1.1" date="2012-05-28"> +<scraper framework="1.1" date="2013-02-27"> <NfoUrl dest="3"> <RegExp input="$$1" output="<url>http://www.musicbrainz.org/ws/2/artist/\1?inc=url-rels</url>" dest="3"> <expression>http://musicbrainz.org/artist/(.+)</expression> </RegExp> </NfoUrl> <CreateArtistSearchUrl dest="3"> - <RegExp input="$$1" output="<url>http://search.musicbrainz.org/ws/2/artist/?fmt=xml&query=artist:$$4&limit=100</url>" dest="3"> + <RegExp input="$$1" output="<url>http://search.musicbrainz.org/ws/2/artist/?fmt=xml&query=artist:"$$4"&limit=100</url>" dest="3"> <RegExp input="$$1" output="\1" dest="4"> <expression noclean="1">(.+)</expression> </RegExp> @@ -20,7 +20,7 @@ </RegExp> </CreateArtistSearchUrl> <GetArtistSearchResults dest="8"> - <RegExp input="$$5" output="<results>\1</results>" dest="8"> + <RegExp input="$$5" output="<results sorted="yes">\1</results>" dest="8"> <RegExp input="$$1" output="<entity><title>\2</title><genre>\7</genre><url cache="mb-\1-artist.xml">http://www.musicbrainz.org/ws/2/artist/\1?inc=url-rels</url></entity>" dest="9"> <expression repeat="yes" noclean="1">artist id="([^"]*)"(?:\stype="[^"]*")* ext:score="[^"]*"><name>([^<]*)</name>(<sort-name>[^<]*</sort-name>)?(<gender>[^<]*</gender>)?(<country>[^<]*</country>)?(<disambiguation>([^<]*))?</expression> </RegExp> @@ -41,7 +41,7 @@ </RegExp> <!--AMGID - Artist--> <RegExp input="$$1" output="\2" dest="9"> - <expression noclean="1">><relation type="allmusic"><target>http://(www.)?allmusic.com/artist/([^<]*)</expression> + <expression noclean="1">>http://(www.)?allmusic.com/artist/([^<]*)</expression> </RegExp> <RegExp input="$$1" output="<name>\1</name>" dest="5"> <expression noclean="1"><artist(?:\stype="[^"]*")* id="[^"]*"><name>([^<]*)</expression> @@ -94,6 +94,15 @@ <RegExp input="$INFO[biogsource]" output="<chain function="GetTADBBiographyByMBID">$$8</chain>" dest="5+"> <expression>TheAudioDb.com</expression> </RegExp> + <RegExp input="$INFO[genressource]" output="<chain function="GetTADBArtistGenresByMBID">$$8</chain>" dest="5+"> + <expression>TheAudioDb.com</expression> + </RegExp> + <RegExp input="$INFO[discogsource]" output="<chain function="GetTADBDiscographyByMBID">$$8</chain>" dest="5+"> + <expression>TheAudioDb.com</expression> + </RegExp> + <RegExp input="$INFO[lifespansource]" output="<chain function="GetTADBLifeSpanByMBID">$$8</chain>" dest="5+"> + <expression>TheAudioDb.com</expression> + </RegExp> <expression noclean="1"/> </RegExp> </GetArtistDetails> diff --git a/addons/metadata.artists.universal/changelog.txt b/addons/metadata.artists.universal/changelog.txt index e51222cb4d..34f7905b00 100644 --- a/addons/metadata.artists.universal/changelog.txt +++ b/addons/metadata.artists.universal/changelog.txt @@ -1,3 +1,25 @@ +[B]2.6.5[/B] +Updated language files from Transifex + +[B]2.6.4[/B] +Changed: tighten search query and trust musicbrainz results sorting + +[B]2.6.3[/B] +Fixed: AMGData + +[B]2.6.2[/B] +Added: option to fall back on artist life span from TheAudioDb.com + +[B]2.6.1[/B] +Disable last.fm options because last.fm is now truncating biogs + +[B]2.6.0[/B] +Added: option to fetch discography and artist life span from TheAudioDb.com + +[B]2.5.0[/B] +Added: option to select language from TheAudioDB.com +Added back the option to scrape from last.fm + [B]2.4.3[/B] Disable last.fm options because last.fm suspended XBMC's API account diff --git a/addons/metadata.artists.universal/resources/language/Amharic/strings.xml b/addons/metadata.artists.universal/resources/language/Amharic/strings.xml new file mode 100644 index 0000000000..f063fe1374 --- /dev/null +++ b/addons/metadata.artists.universal/resources/language/Amharic/strings.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- Translated using Transifex web application. For support, or if you would like to to help out, please visit your language team! --> +<!-- Amharic language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/am/ --> +<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> + +<strings> + <string id="30015">የመረጡት ቋንቋ </string> +</strings> diff --git a/addons/metadata.artists.universal/resources/language/Arabic/strings.xml b/addons/metadata.artists.universal/resources/language/Arabic/strings.xml new file mode 100644 index 0000000000..152d4894d4 --- /dev/null +++ b/addons/metadata.artists.universal/resources/language/Arabic/strings.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- Translated using Transifex web application. For support, or if you would like to to help out, please visit your language team! --> +<!-- Arabic language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/ar/ --> +<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> + +<strings> + <string id="30000">تمكين فان آرتس الفنان من HTBackdrops.com</string> + <string id="30001">تمكين مصغرات الفنان من allmusic.com</string> + <string id="30002">تمكين مصغرات الفنان من last.fm</string> +</strings> diff --git a/addons/metadata.artists.universal/resources/language/Asturian/strings.xml b/addons/metadata.artists.universal/resources/language/Asturian/strings.xml new file mode 100644 index 0000000000..34f5f63ada --- /dev/null +++ b/addons/metadata.artists.universal/resources/language/Asturian/strings.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- Translated using Transifex web application. For support, or if you would like to to help out, please visit your language team! --> +<!-- Asturian language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/ast/ --> +<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> + +<strings> + <string id="30007">Imáxenes</string> + <string id="30015">Llingua preferida</string> +</strings> diff --git a/addons/metadata.artists.universal/resources/language/Burmese/strings.xml b/addons/metadata.artists.universal/resources/language/Burmese/strings.xml new file mode 100644 index 0000000000..57e4b67bab --- /dev/null +++ b/addons/metadata.artists.universal/resources/language/Burmese/strings.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- Translated using Transifex web application. For support, or if you would like to to help out, please visit your language team! --> +<!-- Burmese language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/my/ --> +<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> + +<strings> + <string id="30000">HTBackdrops.com မှ Artist Fanarts ကိုဖွင့်ထားမည်</string> + <string id="30001">allmusic.com မှ အနုပညာရှင် Thumbs ကိုဖွင့်မည်</string> + <string id="30002">last.fm မှ အနုပညာရှင် Thumbs ကိုဖွင့်မည်</string> + <string id="30003">HTBackdrops.com မှ အနုပညာရှင် Thumbs ကိုဖွင့်မည်</string> + <string id="30004">fanart.tv မှArtist Fanarts ကိုဖွင့်ထားမည်</string> + <string id="30005">fanart.tv မှ အနုပညာရှင် Thumbs ကိုဖွင့်မည်</string> + <string id="30006">အနုပညာရှင် အတ္ထုပတ္တိကိုရယူရန်</string> + <string id="30007">အနုပညာလက်ရာ</string> + <string id="30010">အနုပညာရှင်စတိုင်များရယူရန်</string> + <string id="30015">သင့်လျှော်သော ဘာသာစကား</string> + <string id="30022">theaudiodb.com မှ အနုပညာရှင် Thumb များဖွင့်ထားမည်</string> + <string id="30023">theaudiodb.com မှ Artist Fanarts ကိုဖွင့်ထားမည်</string> +</strings> diff --git a/addons/metadata.artists.universal/resources/language/Chinese (Traditional)/strings.xml b/addons/metadata.artists.universal/resources/language/Chinese (Traditional)/strings.xml new file mode 100644 index 0000000000..d38b611fb2 --- /dev/null +++ b/addons/metadata.artists.universal/resources/language/Chinese (Traditional)/strings.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- Translated using Transifex web application. For support, or if you would like to to help out, please visit your language team! --> +<!-- Chinese (Traditional) language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/zh_TW/ --> +<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> + +<strings> + <string id="30000">啟用HTBackdrops.com演出者資訊</string> + <string id="30001">啟用allmusic.com演出者縮圖</string> + <string id="30002">啟用last.fm演出者縮圖</string> + <string id="30003">啟用HTBackdrops.com演出者縮圖</string> + <string id="30004">啟用fanart.tv演出者資料庫</string> + <string id="30005">啟用 fanart.tv演出者縮圖</string> + <string id="30006">演出者簡介取得於</string> + <string id="30007">圖片</string> + <string id="30008">演出者專輯目錄取得於</string> + <string id="30009">演出者類型取得於</string> + <string id="30010">演出者風格取得於</string> + <string id="30011">演出者生日資訊取得於</string> + <string id="30012">演出者意境取得於</string> + <string id="30014">演出者活躍的年代取得於</string> + <string id="30015">偏好的語言</string> + <string id="30016">備選演出者簡介取得於</string> + <string id="30017">備選演出者專輯目錄取得於</string> + <string id="30018">備選演出者類型取得於</string> + <string id="30019">備選演出者風格取得於</string> + <string id="30020">備選演出者生日資訊取得於</string> + <string id="30021">備選</string> + <string id="30022">啟用theaudiaodb.com演出者縮圖</string> + <string id="30023">啟用theaudiaodb.com演出者專輯資訊</string> +</strings> diff --git a/addons/metadata.artists.universal/resources/language/Croatian/strings.xml b/addons/metadata.artists.universal/resources/language/Croatian/strings.xml new file mode 100644 index 0000000000..171099c700 --- /dev/null +++ b/addons/metadata.artists.universal/resources/language/Croatian/strings.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- Translated using Transifex web application. For support, or if you would like to to help out, please visit your language team! --> +<!-- Croatian language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/hr/ --> +<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> + +<strings> + <string id="30004">Omogućite Fanart-s iz fanart.tv</string> + <string id="30005">Omogućite Umjetnine iz fanart.tv</string> + <string id="30023">Omogućiti Artist Fanarts iz theaudiodb.com</string> +</strings> diff --git a/addons/metadata.artists.universal/resources/language/Estonian/strings.xml b/addons/metadata.artists.universal/resources/language/Estonian/strings.xml index 94c3a943e3..1397a59256 100644 --- a/addons/metadata.artists.universal/resources/language/Estonian/strings.xml +++ b/addons/metadata.artists.universal/resources/language/Estonian/strings.xml @@ -4,5 +4,18 @@ <!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> <strings> + <string id="30000">Võimalda HTBackdrops.com artisti fännikunst</string> + <string id="30001">Võimalda allmusic.com artisti pisipildid</string> + <string id="30002">Võimalda last.fm artisti pisipildid</string> + <string id="30003">Võimalda HTBackdrops.com artisti pisipildid</string> + <string id="30004">Võimalda fanart.tv artisti fännikunst</string> + <string id="30005">Võimalda fanart.tv artisti pisipildid</string> + <string id="30006">Hangi artisti elulugu</string> <string id="30007">Kunst</string> + <string id="30008">Hangi artisti diskograafia</string> + <string id="30009">Hangi artisti žanr</string> + <string id="30010">Hangi artisti stiilid</string> + <string id="30015">Eelistatud keel</string> + <string id="30022">Hangi artistide pisipildid theaudiodb.com-st</string> + <string id="30023">Võimalda theaudiodb.com artisti fännikunst</string> </strings> diff --git a/addons/metadata.artists.universal/resources/language/Icelandic/strings.xml b/addons/metadata.artists.universal/resources/language/Icelandic/strings.xml index 28eb80690e..2cf66fb81e 100644 --- a/addons/metadata.artists.universal/resources/language/Icelandic/strings.xml +++ b/addons/metadata.artists.universal/resources/language/Icelandic/strings.xml @@ -5,4 +5,5 @@ <strings> <string id="30007">Myndskreytingar</string> + <string id="30021">Til vara</string> </strings> diff --git a/addons/metadata.artists.universal/resources/language/Korean/strings.xml b/addons/metadata.artists.universal/resources/language/Korean/strings.xml index b63ab4ebc0..46936682fb 100644 --- a/addons/metadata.artists.universal/resources/language/Korean/strings.xml +++ b/addons/metadata.artists.universal/resources/language/Korean/strings.xml @@ -15,7 +15,7 @@ <string id="30008">아티스트 디스코그래피 가져오기</string> <string id="30009">아티스트 장르 가져오기</string> <string id="30010">아티스트 스타일 가져오기</string> - <string id="30011">아티스트 수명 가져오기</string> + <string id="30011">아티스트 생몰 가져오기</string> <string id="30012">아티스트 분위기 가져오기</string> <string id="30014">아티스트 활동 기간 가져오기</string> <string id="30015">선호 언어</string> @@ -23,7 +23,7 @@ <string id="30017">아티스트 디스코그래피 가져오기 대체</string> <string id="30018">아티스트 장르 가져오기 대체</string> <string id="30019">아티스트 스타일 가져오기 대체</string> - <string id="30020">아티스트 수명 가져오기 대체</string> + <string id="30020">아티스트 생몰 가져오기 대체</string> <string id="30021">대체</string> <string id="30022">theaudiodb.com 에서 아티스트 미리보기 가져오기</string> <string id="30023">theaudiodb.com 에서 아티스트 팬아트 가져오기</string> diff --git a/addons/metadata.artists.universal/resources/language/Norwegian/strings.xml b/addons/metadata.artists.universal/resources/language/Norwegian/strings.xml index 6cc07bc1ce..0981e082ac 100644 --- a/addons/metadata.artists.universal/resources/language/Norwegian/strings.xml +++ b/addons/metadata.artists.universal/resources/language/Norwegian/strings.xml @@ -4,6 +4,27 @@ <!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> <strings> + <string id="30000">Aktiv artist-fanart fra HTBackdrops.com</string> + <string id="30001">Aktiver Artist Thumbs fra allmusic.com</string> + <string id="30002">Aktiver Artist Thumbs fra last.fm</string> + <string id="30003">Aktiver Artist Thumbs fra HTBackdrops.com</string> + <string id="30004">Aktiver Artist Fanarts fra fanart.tv</string> + <string id="30005">Aktiv artist-forhåndsvisninger fra fanart.tv</string> + <string id="30006">Hent artistbiografi fra</string> <string id="30007">Artwork</string> - <string id="30015">Foretrukket Språk</string> + <string id="30008">Hent artist-diskografi fra</string> + <string id="30009">Hent artistsjangere fra</string> + <string id="30010">Hent artiststiler fra</string> + <string id="30011">Hent artistlevetid fra</string> + <string id="30012">Hent artisthumør fra</string> + <string id="30014">Hent artistens aktive år fra</string> + <string id="30015">Foretrukket språk</string> + <string id="30016">Fall tilbake til artistbiografi fra</string> + <string id="30017">Fall tilbake til artist-diskografi fra</string> + <string id="30018">Fall tilbake til artistsjangere fra</string> + <string id="30019">Fall tilbake til artiststiler fra</string> + <string id="30020">Fall tilbake til artistlevetid fra</string> + <string id="30021">Tilbakefallinger</string> + <string id="30022">Aktiver artist-forhåndsvisning fra theaudiodb.com</string> + <string id="30023">Aktiver artist-fanart fra theaudiodb.com</string> </strings> diff --git a/addons/metadata.artists.universal/resources/language/Tamil (India)/strings.xml b/addons/metadata.artists.universal/resources/language/Tamil (India)/strings.xml new file mode 100644 index 0000000000..89bc8a780a --- /dev/null +++ b/addons/metadata.artists.universal/resources/language/Tamil (India)/strings.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- Translated using Transifex web application. For support, or if you would like to to help out, please visit your language team! --> +<!-- Tamil (India) language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/ta_IN/ --> +<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> + +<strings> + <string id="30000">HTBackdrops.com இருந்து கலைஞர் விசிறிபடங்களை செயல்படுத்து</string> + <string id="30001">allmusic.com இருந்து கலைஞர் குறும்படம்களை செயல்படுத்து</string> + <string id="30002">last.fm இருந்து கலைஞர் குறும்படம்களை செயல்படுத்து</string> + <string id="30003">HTBackdrops.com இருந்து கலைஞர் குறும்படம்களை செயல்படுத்து</string> + <string id="30004">Fanart.tv இருந்து கலைஞர் விசிறிபடங்களை செயல்படுத்து</string> + <string id="30005">Fanart.tv இருந்து கலைஞர் குறும்படம்களை செயல்படுத்து</string> + <string id="30006">கலைஞர் வாழ்க்கை வரலாறு கைப்பற்று</string> + <string id="30007">குறுப்படம்</string> + <string id="30008">கலைஞர் டிஸ்கோகிராபி கைப்பற்று</string> + <string id="30009">கலைஞர் வகைகள் கைப்பற்று</string> + <string id="30010">கலைஞர் பாணிகள் கைப்பற்று</string> + <string id="30011">கலைஞர் ஆயுள் கைப்பற்று</string> + <string id="30012">கலைஞர் மனநிலை கைப்பற்று</string> + <string id="30014">கலைஞர் எந்த ஆண்டு முதல் நடிக்க துவங்கியதை கைப்பற்று</string> + <string id="30015">விரும்பிய மொழி</string> + <string id="30016">கலைஞர் வாழ்க்கை வரலாறு இதற்க்கு பின்தள்ளு</string> + <string id="30017">கலைஞர் டிஸ்கோகிராபி இதற்க்கு பின்தள்ளு</string> + <string id="30018">கலைஞர் வகைகள் இதற்க்கு பின்தள்ளு</string> + <string id="30019">கலைஞர் பாணிகள் இதற்க்கு பின்தள்ளு</string> + <string id="30020">கலைஞர் ஆயுள் இதற்க்கு பின்தள்ளு</string> + <string id="30021">பின்தள்ளு</string> + <string id="30022">theaudiodb.com இருந்து கலைஞர் குறும்படம்களை செயல்படுத்து</string> + <string id="30023">theaudiodb.com இருந்து கலைஞர் விசிறிபடங்களை செயல்படுத்து</string> +</strings> diff --git a/addons/metadata.artists.universal/resources/language/Turkish/strings.xml b/addons/metadata.artists.universal/resources/language/Turkish/strings.xml new file mode 100644 index 0000000000..258edb0a48 --- /dev/null +++ b/addons/metadata.artists.universal/resources/language/Turkish/strings.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- Translated using Transifex web application. For support, or if you would like to to help out, please visit your language team! --> +<!-- Turkish language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/tr/ --> +<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> + +<strings> + <string id="30007">Çizim</string> + <string id="30015">Tercih Edilen Dil</string> +</strings> diff --git a/addons/metadata.artists.universal/resources/language/Ukrainian/strings.xml b/addons/metadata.artists.universal/resources/language/Ukrainian/strings.xml new file mode 100644 index 0000000000..b1de3c2231 --- /dev/null +++ b/addons/metadata.artists.universal/resources/language/Ukrainian/strings.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- Translated using Transifex web application. For support, or if you would like to to help out, please visit your language team! --> +<!-- Ukrainian language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/uk/ --> +<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> + +<strings> + <string id="30004">Отримати обкладинки виконавця з fanart.tv</string> + <string id="30005">Включити малюнки виконавця з fanart.tv</string> + <string id="30006">Отримати біографію виконавця з</string> + <string id="30007">Обкладинка</string> + <string id="30008">Отримати дискографію виконавця з</string> + <string id="30009">Отримати жанри виконавця з</string> + <string id="30010">Отримати стилі виконавця з</string> + <string id="30012">Отримати настрої виконавця з</string> + <string id="30014">Отримати роки активності виконавця з</string> + <string id="30015">Улюблена мова</string> +</strings> diff --git a/addons/metadata.artists.universal/resources/language/Vietnamese/strings.xml b/addons/metadata.artists.universal/resources/language/Vietnamese/strings.xml new file mode 100644 index 0000000000..308024fbe0 --- /dev/null +++ b/addons/metadata.artists.universal/resources/language/Vietnamese/strings.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- Translated using Transifex web application. For support, or if you would like to to help out, please visit your language team! --> +<!-- Vietnamese language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/vi/ --> +<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> + +<strings> + <string id="30000">Lấy Fanart từ nguồn HTBackdrops.com</string> + <string id="30001">Lấy hình đại diện từ nguồn allmusic.com</string> + <string id="30002">Lấy hình đại diện từ nguồn last.fm</string> + <string id="30003">Lấy hình đại diện cho nghệ sĩ từ nguồn HTBackdrops.com</string> + <string id="30004">Sử dụng Fanart từ fanart.tv</string> + <string id="30005">Lấy hình đại diện từ nguồn fanart.tv</string> + <string id="30006">Lấy tiểu sử nghệ sĩ từ</string> + <string id="30007">Ảnh bìa</string> + <string id="30008">Lấy quá trình nghệ thuật cho nghệ sĩ từ</string> + <string id="30009">Lấy thể loại nhạc cho nghệ sĩ từ</string> + <string id="30010">Lấy phong cách nhạc cho nghệ sĩ từ</string> + <string id="30011">Lấy tuổi đời nghệ sĩ từ</string> + <string id="30012">Lấy tính miêu tả âm nhạc từ</string> + <string id="30014">Lấy năm hoạt động nhạc cho nghệ sĩ từ</string> + <string id="30015">Ưu tiên ngôn ngữ</string> + <string id="30016">Dự trữ tiểu sử từ</string> + <string id="30017">Dự trữ quá trình nghệ thuật nhạc từ</string> + <string id="30018">Dự trữ thể loại nhạc từ</string> + <string id="30019">Dự trữ phong cách nhạc từ</string> + <string id="30020">Dự trữ tuổi đời từ</string> + <string id="30021">Dự trữ</string> + <string id="30022">Lấy hình đại diện từ nguồn theaudiodb.com</string> + <string id="30023">Lấy hình Fanart từ nguồn theaudiodb.com</string> +</strings> diff --git a/addons/metadata.artists.universal/resources/language/Welsh/strings.xml b/addons/metadata.artists.universal/resources/language/Welsh/strings.xml new file mode 100644 index 0000000000..e34aa58e2f --- /dev/null +++ b/addons/metadata.artists.universal/resources/language/Welsh/strings.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- Translated using Transifex web application. For support, or if you would like to to help out, please visit your language team! --> +<!-- Welsh language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/cy/ --> +<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> + +<strings> + <string id="30000">Galluogi celf artisiaid o HTBackdrops.com</string> + <string id="30001">Galluogi lluniau bach artistiaid o allmusic.com</string> + <string id="30002">Galluogi lluniau bach artistiaid o last.fm</string> + <string id="30003">Galluogi lluniau bach artistiaid o HTBackdrops.com</string> + <string id="30004">Galluogi celf artistiaid o fanart.tv</string> + <string id="30005">Galluogi lluniau bach artistiaid o fanart.tv</string> + <string id="30006">Estyn bywgraffiad artist o</string> + <string id="30007">Gwaith Celf</string> + <string id="30008">Estyn disgograffeg artist o</string> + <string id="30009">Estyn Genres Artistiaid o</string> + <string id="30010">Estyn Arddulliau Artistiaid o</string> + <string id="30011">Estyn Hyd Oes Artistiaid o</string> + <string id="30012">Estyn Naws Artistiaid o</string> + <string id="30014">Estyn Blynyddoedd Cynhyrchiol Artistiaid o</string> + <string id="30015">Dewis Iaith</string> + <string id="30016">Camu nol Bywgraffiad Artist o</string> + <string id="30017">Cammu nol i Ddisgograffeg Artist o</string> + <string id="30018">Cammu nol i Genres Artistiaid o</string> + <string id="30019">Cammu nol i Arddulliau Artistiaid o</string> + <string id="30020">Cammu nol i Hyd Oes Artisitiaid o</string> + <string id="30021">Cammu nol</string> + <string id="30022">Galluogi lluniau bach artistiaid o theaudiodb.com</string> + <string id="30023">Galluogi Celf Artistiaid o theaudiodb.com</string> +</strings> diff --git a/addons/metadata.artists.universal/resources/settings.xml b/addons/metadata.artists.universal/resources/settings.xml index 5030489b18..434725a8d8 100644 --- a/addons/metadata.artists.universal/resources/settings.xml +++ b/addons/metadata.artists.universal/resources/settings.xml @@ -2,23 +2,26 @@ <settings> <category label="128"> <setting label="30006" type="labelenum" values="TheAudioDb.com|None" id="biogsource" default="TheAudioDb.com"/> + <setting label="30015" type="labelenum" values="en|de|es|fr|it|cn|jp|ru|pt|se|nl|hu" id="tadbartistlanguage" default="en" visible="eq(-1,0)"/> <setting type="sep"/> - <setting label="30008" type="labelenum" values="MusicBrainz|allmusic.com|None" id="discogsource" default="MusicBrainz"/> + <setting label="30008" type="labelenum" values="MusicBrainz|allmusic.com|TheAudioDb.com|None" id="discogsource" default="MusicBrainz"/> <setting type="sep"/> - <setting label="30009" type="labelenum" values="allmusic.com|None" id="genressource" default="allmusic.com"/> + <setting label="30011" type="labelenum" values="TheAudioDb.com|allmusic.com|MusicBrainz|None" id="lifespansource" default="TheAudioDb.com"/> + <setting label="30014" type="labelenum" values="allmusic.com|None" id="yearsasource" default="allmusic.com"/> + <setting type="sep"/> + <setting label="30009" type="labelenum" values="TheAudioDb.com|allmusic.com|None" id="genressource" default="TheAudioDb.com"/> <setting label="30010" type="labelenum" values="allmusic.com|None" id="stylessource" default="allmusic.com"/> - <setting label="30011" type="labelenum" values="allmusic.com|MusicBrainz|None" id="lifespansource" default="allmusic.com"/> <setting label="30012" type="labelenum" values="allmusic.com|None" id="moodssource" default="allmusic.com"/> - <setting label="30014" type="labelenum" values="allmusic.com|None" id="yearsasource" default="allmusic.com"/> </category> <category label="30021"> <setting label="30016" type="labelenum" values="TheAudioDb.com|None" id="biogfbsource" default="None"/> + <setting label="30015" type="labelenum" values="en|de|es|fr|it|cn|jp|ru|pt|se|nl|hu" id="tadbartistlanguage" default="en" visible="eq(-1,0)"/> + <setting type="sep"/> + <setting label="30020" type="labelenum" values="TheAudioDb.com|MusicBrainz|allmusic.com|None" id="lifespanfbsource" default="None"/> <setting type="sep"/> - <setting label="30017" type="labelenum" values="MusicBrainz|None" id="discogfbsource" default="None" visible="false"/> - <setting label="30018" type="labelenum" values="allmusic.com|None" id="genresfbsource" default="None"/> + <setting label="30018" type="labelenum" values="TheAudioDb.com|allmusic.com|None" id="genresfbsource" default="None"/> <setting label="30019" type="labelenum" values="allmusic.com|None" id="stylesfbsource" default="None"/> - <setting label="30020" type="labelenum" values="MusicBrainz|allmusic.com|None" id="lifespanfbsource" default="None"/> </category> <category label="30007"> @@ -26,6 +29,7 @@ <setting label="30005" type="bool" id="fanarttvthumbs" default="true"/> <setting label="30022" type="bool" id="tadbthumbs" default="true"/> <setting label="30003" type="bool" id="htbthumbs" default="true"/> + <setting label="30002" type="bool" id="lastfmartistthumbs" default="false"/> <setting label="30001" type="bool" id="allmusicartistthumbs" default="true"/> <setting type="lsep" label="Fanart Sources"/> <setting label="30004" type="bool" id="fanarttvfanart" default="true"/> diff --git a/addons/metadata.common.allmusic.com/addon.xml b/addons/metadata.common.allmusic.com/addon.xml index 68f2b21da7..750870ebbd 100644 --- a/addons/metadata.common.allmusic.com/addon.xml +++ b/addons/metadata.common.allmusic.com/addon.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <addon id="metadata.common.allmusic.com" name="AllMusic" - version="2.5.2" + version="2.6.0" provider-name="Team XBMC"> <requires> - <import addon="xbmc.metadata" version="1.0"/> + <import addon="xbmc.metadata" version="2.1.0"/> </requires> <extension point="xbmc.metadata.scraper.library" library="allmusic.xml"/> diff --git a/addons/metadata.common.allmusic.com/allmusic.xml b/addons/metadata.common.allmusic.com/allmusic.xml index edcd5081a9..51d57fbaf3 100644 --- a/addons/metadata.common.allmusic.com/allmusic.xml +++ b/addons/metadata.common.allmusic.com/allmusic.xml @@ -105,6 +105,9 @@ <RegExp input="$INFO[lifespanfbsource]" output="<chain function="GetMBFallbackLafeSpanByMBID">$$8</chain>" dest="12"> <expression>MusicBrainz</expression> </RegExp> + <RegExp input="$INFO[lifespanfbsource]" output="<chain function="GetTADBFallbackLifeSpanByMBID">$$8</chain>" dest="12"> + <expression>TheAudioDb.com</expression> + </RegExp> <expression>^$</expression> </RegExp> <RegExp input="$$11" output="$$11" dest="2"> @@ -180,6 +183,9 @@ <RegExp input="$INFO[genresfbsource]" output="<chain function="GetLastFMFallbackArtistGenresByMBID">$$8</chain>" dest="12"> <expression>last.fm</expression> </RegExp> + <RegExp input="$INFO[genresfbsource]" output="<chain function="GetTADBFallbackArtistGenresByMBID">$$8</chain>" dest="12"> + <expression>TheAudioDb.com</expression> + </RegExp> <expression><genre></genre></expression> </RegExp> <RegExp input="$$11" output="$$11" dest="2"> @@ -277,10 +283,10 @@ <RegExp input="" output="" dest="2"> <expression /> </RegExp> - <RegExp input="$$1" output="\1" dest="8"> + <RegExp input="$$1" output="\1" dest="10"> <expression noclean="1"><h4>artist moods</h4>(.*?)</ul></expression> </RegExp> - <RegExp input="$$8" output="<mood>\1</mood>" dest="2"> + <RegExp input="$$10" output="<mood>\1</mood>" dest="2"> <expression repeat="yes" noclean="1"><li>[^>]*>([^<]*)</a></li></expression> </RegExp> <expression noclean="1" /> diff --git a/addons/metadata.common.fanart.tv/addon.xml b/addons/metadata.common.fanart.tv/addon.xml index ef673f184d..b88455c675 100644 --- a/addons/metadata.common.fanart.tv/addon.xml +++ b/addons/metadata.common.fanart.tv/addon.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <addon id="metadata.common.fanart.tv" name="fanart.tv" - version="2.1.1" + version="2.1.2" provider-name="Team XBMC"> <requires> - <import addon="xbmc.metadata" version="1.0"/> + <import addon="xbmc.metadata" version="2.1.0"/> </requires> <extension point="xbmc.metadata.scraper.library" library="fanarttv.xml"/> diff --git a/addons/metadata.common.fanart.tv/fanarttv.xml b/addons/metadata.common.fanart.tv/fanarttv.xml index caff441454..09120f610f 100644 --- a/addons/metadata.common.fanart.tv/fanarttv.xml +++ b/addons/metadata.common.fanart.tv/fanarttv.xml @@ -39,7 +39,7 @@ <expression /> </RegExp> <RegExp input="$$1" output="\1" dest="16"> - <expression noclean="1">"artistbackground":\[(.*?)\],"</expression> + <expression noclean="1">"artistbackground":\[(.*?)\}\]</expression> </RegExp> <RegExp input="$$16" output="<thumb preview="\1/preview">\1</thumb>" dest="14"> <expression repeat="yes" noclean="1">"id":"\d*","url":"([^"]*)</expression> diff --git a/addons/metadata.common.hdtrailers.net/addon.xml b/addons/metadata.common.hdtrailers.net/addon.xml index 199d3a6da1..0a71e092de 100644 --- a/addons/metadata.common.hdtrailers.net/addon.xml +++ b/addons/metadata.common.hdtrailers.net/addon.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <addon id="metadata.common.hdtrailers.net" name="HD-Trailers common scraper functions" - version="1.0.8" + version="1.0.9" provider-name="Bence Nádas (olympia)"> <requires> - <import addon="xbmc.metadata" version="1.0"/> + <import addon="xbmc.metadata" version="2.1.0"/> </requires> <extension point="xbmc.metadata.scraper.library" library="hdtrailers.xml"/> diff --git a/addons/metadata.common.hdtrailers.net/hdtrailers.xml b/addons/metadata.common.hdtrailers.net/hdtrailers.xml index 98a179e115..485e72b4a3 100644 --- a/addons/metadata.common.hdtrailers.net/hdtrailers.xml +++ b/addons/metadata.common.hdtrailers.net/hdtrailers.xml @@ -27,10 +27,10 @@ <RegExp input="$$6" output="<details><trailer>\1</trailer></details>" dest="5"> <!--fetch 480p trailer link from hdtrailers.net--> <RegExp input="$$1" output="http://playlist.yahoo.com/makeplaylist.dll?sdm=web&pt=rd&sid=\2" dest="6"> - <expression noclean="1">">(Theatrical )?Trailer</td>.*?sid=(\d*)" rel="lightbox\[res480p</expression> + <expression noclean="1">">(Theatrical )?Trailer</span></td>.*?sid=(\d*)" rel="lightbox\[res480p</expression> </RegExp> <RegExp input="$$1" output="http://playlist.yahoo.com/makeplaylist.dll?sdm=web&pt=rd&sid=\2" dest="6+"> - <expression noclean="1">">(Teaser )?Trailer</td>.*?sid=(\d*)" rel="lightbox\[res480p</expression> + <expression noclean="1">">(Teaser )?Trailer</span></td>.*?sid=(\d*)" rel="lightbox\[res480p</expression> </RegExp> <expression noclean="1" /> </RegExp> @@ -39,17 +39,17 @@ <RegExp input="$$6" output="<details><trailer>\1</trailer></details>" dest="5"> <!--Fallback to fetch 480p trailer link if 720p is not available--> <RegExp input="$$1" output="http://playlist.yahoo.com/makeplaylist.dll?sdm=web&pt=rd&sid=\2" dest="6"> - <expression noclean="1">">(Theatrical )?Trailer</td>.*?sid=(\d*)" rel="lightbox\[res480p</expression> + <expression noclean="1">">(Theatrical )?Trailer</span></td>.*?sid=(\d*)" rel="lightbox\[res480p</expression> </RegExp> <RegExp input="$$1" output="http://playlist.yahoo.com/makeplaylist.dll?sdm=web&pt=rd&sid=\2" dest="6+"> - <expression noclean="1">">(Teaser )?Trailer</td>.*?sid=(\d*)" rel="lightbox\[res480p</expression> + <expression noclean="1">">(Teaser )?Trailer</span></td>.*?sid=(\d*)" rel="lightbox\[res480p</expression> </RegExp> <!--Fetch 720p trailer link from hdtrailers.net--> <RegExp input="$$1" output="http://playlist.yahoo.com/makeplaylist.dll?sdm=web&pt=rd&sid=\2" dest="6"> - <expression noclean="1">">(Theatrical )?Trailer</td>.*?sid=(\d*)" rel="lightbox\[res720p</expression> + <expression noclean="1">">(Theatrical )?Trailer</span></td>.*?sid=(\d*)" rel="lightbox\[res720p</expression> </RegExp> <RegExp input="$$1" output="http://playlist.yahoo.com/makeplaylist.dll?sdm=web&pt=rd&sid=\2" dest="6+"> - <expression noclean="1">">(Teaser )?Trailer</td>.*?sid=(\d*)" rel="lightbox\[res720p</expression> + <expression noclean="1">">(Teaser )?Trailer</span></td>.*?sid=(\d*)" rel="lightbox\[res720p</expression> </RegExp> <expression noclean="1" /> </RegExp> @@ -58,24 +58,24 @@ <RegExp input="$$6" output="<details><trailer>\1</trailer></details>" dest="5"> <!--Fallback to fetch 480p trailer link if 720p and 1080p are not available--> <RegExp input="$$1" output="http://playlist.yahoo.com/makeplaylist.dll?sdm=web&pt=rd&sid=\2" dest="6"> - <expression noclean="1">">(Theatrical )?Trailer</td>.*?sid=(\d*)" rel="lightbox\[res480p</expression> + <expression noclean="1">">(Theatrical )?Trailer</span></td>.*?sid=(\d*)" rel="lightbox\[res480p</expression> </RegExp> <RegExp input="$$1" output="http://playlist.yahoo.com/makeplaylist.dll?sdm=web&pt=rd&sid=\2" dest="6+"> - <expression noclean="1">">(Teaser )?Trailer</td>.*?sid=(\d*)" rel="lightbox\[res480p</expression> + <expression noclean="1">">(Teaser )?Trailer</span></td>.*?sid=(\d*)" rel="lightbox\[res480p</expression> </RegExp> <!--Fallback to fetch 720p trailer link if 1080p is not available--> <RegExp input="$$1" output="http://playlist.yahoo.com/makeplaylist.dll?sdm=web&pt=rd&sid=\2" dest="6"> - <expression noclean="1">">(Theatrical )?Trailer</td>.*?sid=(\d*)" rel="lightbox\[res720p</expression> + <expression noclean="1">">(Theatrical )?Trailer</span></td>.*?sid=(\d*)" rel="lightbox\[res720p</expression> </RegExp> <RegExp input="$$1" output="http://playlist.yahoo.com/makeplaylist.dll?sdm=web&pt=rd&sid=\2" dest="6+"> - <expression noclean="1">">(Teaser )?Trailer</td>.*?sid=(\d*)" rel="lightbox\[res720p</expression> + <expression noclean="1">">(Teaser )?Trailer</span></td>.*?sid=(\d*)" rel="lightbox\[res720p</expression> </RegExp> <!--Fetch 1080p trailer link from hdtrailers.net--> <RegExp input="$$1" output="http://playlist.yahoo.com/makeplaylist.dll?sdm=web&pt=rd&sid=\2" dest="6"> - <expression noclean="1">">(Theatrical )?Trailer</td>.*?sid=(\d*)" rel="lightbox\[res1080p</expression> + <expression noclean="1">">(Theatrical )?Trailer</span></td>.*?sid=(\d*)" rel="lightbox\[res1080p</expression> </RegExp> <RegExp input="$$1" output="http://playlist.yahoo.com/makeplaylist.dll?sdm=web&pt=rd&sid=\2" dest="6+"> - <expression noclean="1">">(Teaser )?Trailer</td>.*?sid=(\d*)" rel="lightbox\[res1080p</expression> + <expression noclean="1">">(Teaser )?Trailer</span></td>.*?sid=(\d*)" rel="lightbox\[res1080p</expression> </RegExp> <expression noclean="1" /> </RegExp> diff --git a/addons/metadata.common.imdb.com/addon.xml b/addons/metadata.common.imdb.com/addon.xml index 6bc71f8585..4658980204 100644 --- a/addons/metadata.common.imdb.com/addon.xml +++ b/addons/metadata.common.imdb.com/addon.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <addon id="metadata.common.imdb.com" - name="IMDB common scraper functions" - version="2.6.2" + name="IMDB Scraper Library" + version="2.7.6" provider-name="Team XBMC"> <requires> - <import addon="xbmc.metadata" version="1.0"/> + <import addon="xbmc.metadata" version="2.1.0"/> </requires> <extension point="xbmc.metadata.scraper.library" library="imdb.xml"/> diff --git a/addons/metadata.common.imdb.com/changelog.txt b/addons/metadata.common.imdb.com/changelog.txt index fc2a75779c..95d20ec2b6 100644 --- a/addons/metadata.common.imdb.com/changelog.txt +++ b/addons/metadata.common.imdb.com/changelog.txt @@ -1,3 +1,25 @@ +[B]2.7.6[/B] +- fixed: IMDb studio/director/writer after layout change + +[B]2.7.5[/B] +- fixed: OutlineToPlot function +- fixed: USACert + +[B]2.7.4[/B] +- fixed: MetaCritic Score + +[B]2.7.3[/B] +- fixed: orginal title won't scrape in some cases + +[B]2.7.2[/B] +- changed: make sure to parse the intended page + +[B]2.7.1[/B] +- fixed: IMDb genre after layout change + +[B]2.7.0[/B] +- fixed: IMDb scraping after layout changes + [B]2.6.2[/B] - fixed: director(s) and writer(s) scraping in case of IMDbFull is selected diff --git a/addons/metadata.common.imdb.com/imdb.xml b/addons/metadata.common.imdb.com/imdb.xml index 6c321bf66a..7d92f3647c 100644 --- a/addons/metadata.common.imdb.com/imdb.xml +++ b/addons/metadata.common.imdb.com/imdb.xml @@ -1,34 +1,34 @@ <scraperfunctions> <GetIMDBGenresById dest="5"> - <RegExp input="$$1" output="<details><url cache="$$1-main.html" function="ParseIMDBGenres">http://akas.imdb.com/title/$$1/</url></details>" dest="5"> + <RegExp input="$$1" output="<details><url cache="$$1-main.html" function="ParseIMDBGenres">http://akas.imdb.com/title/$$1/|accept-language=en-us</url></details>" dest="5"> <expression noclean="1" /> </RegExp> </GetIMDBGenresById> <ParseIMDBGenres dest="5"> <RegExp input="$$2" output="<details>\1</details>" dest="5"> <RegExp input="$$1" output="<genre>\1</genre>" dest="2"> - <expression repeat="yes">itemprop="genre"[^>]+>([^<]+)</a></expression> + <expression repeat="yes">tt_stry_gnr"\s>\s([^<]+)</expression> </RegExp> <expression noclean="1" /> </RegExp> </ParseIMDBGenres> <GetIMDBRatingById dest="5"> - <RegExp input="$$1" output="<details><url cache="$$1-main.html" function="ParseIMDBRating">http://akas.imdb.com/title/$$1/</url></details>" dest="5"> + <RegExp input="$$1" output="<details><url cache="$$1-main.html" function="ParseIMDBRating">http://akas.imdb.com/title/$$1/|accept-language=en-us</url></details>" dest="5"> <expression noclean="1" /> </RegExp> </GetIMDBRatingById> <ParseIMDBRating dest="5"> <RegExp input="$$2" output="<details>\1</details>" dest="5"> <RegExp input="$$1" output="<rating>\1</rating><votes>\2</votes>" dest="2"> - <expression><span itemprop="ratingValue">([0-9.]+).*?>.*?title="([0-9,]+)\s</expression> + <expression><span\sitemprop="ratingValue">([0-9.]+).*?>.*?title="([0-9,]+)\s</expression> </RegExp> <expression noclean="1" /> </RegExp> </ParseIMDBRating> <GetIMDBTOP250ById dest="5"> - <RegExp input="$$1" output="<details><url cache="$$1-main.html" function="ParseIMDBTOP250">http://akas.imdb.com/title/$$1/</url></details>" dest="5"> + <RegExp input="$$1" output="<details><url cache="$$1-main.html" function="ParseIMDBTOP250">http://akas.imdb.com/title/$$1/|accept-language=en-us</url></details>" dest="5"> <expression noclean="1" /> </RegExp> </GetIMDBTOP250ById> @@ -42,21 +42,21 @@ </ParseIMDBTOP250> <GetIMDBStudioById dest="5"> - <RegExp input="$$1" output="<details><url cache="$$1-main.html" function="ParseIMDBStudio">http://akas.imdb.com/title/$$1/</url></details>" dest="5"> + <RegExp input="$$1" output="<details><url cache="$$1-main.html" function="ParseIMDBStudio">http://akas.imdb.com/title/$$1/|accept-language=en-us</url></details>" dest="5"> <expression noclean="1" /> </RegExp> </GetIMDBStudioById> <ParseIMDBStudio dest="5"> <RegExp input="$$2" output="<details>\1</details>" dest="5"> <RegExp input="$$1" output="<studio>\1</studio>" dest="2"> - <expression>"/company/[^>]+>([^<]+)</a></expression> + <expression>"/company/[^>]+>[^<]*<[^>]*>([^<]+)</span></expression> </RegExp> <expression noclean="1" /> </RegExp> </ParseIMDBStudio> <GetIMDBCountryById dest="5"> - <RegExp input="$$1" output="<details><url cache="$$1-main.html" function="ParseIMDBCountry">http://akas.imdb.com/title/$$1/</url></details>" dest="5"> + <RegExp input="$$1" output="<details><url cache="$$1-main.html" function="ParseIMDBCountry">http://akas.imdb.com/title/$$1/|accept-language=en-us</url></details>" dest="5"> <expression noclean="1" /> </RegExp> </GetIMDBCountryById> @@ -70,35 +70,35 @@ </ParseIMDBCountry> <GetMetaCriticRatingById dest="5"> - <RegExp input="$$1" output="<details><url cache="$$1-main.html" function="ParseMetaCriticRating">http://akas.imdb.com/title/$$1/</url></details>" dest="5"> + <RegExp input="$$1" output="<details><url cache="$$1-main.html" function="ParseMetaCriticRating">http://akas.imdb.com/title/$$1/|accept-language=en-us</url></details>" dest="5"> <expression noclean="1" /> </RegExp> </GetMetaCriticRatingById> <ParseMetaCriticRating dest="5"> <RegExp input="$$2" output="<details>\1</details>" dest="5"> <RegExp input="$$1" output="<rating>\1.\2</rating>" dest="2"> - <expression><a href="criticreviews">(\d)(\d*)</expression> + <expression><a\shref="criticreviews[^"]*?"\stitle[^>]*?>\s(\d)(\d*)</expression> </RegExp> <expression noclean="1" /> </RegExp> </ParseMetaCriticRating> <GetIMDBPlotById dest="5"> - <RegExp input="$$1" output="<details><url cache="$$1-main.html" function="ParseIMDBPlot">http://akas.imdb.com/title/$$1/</url></details>" dest="5"> + <RegExp input="$$1" output="<details><url cache="$$1-main.html" function="ParseIMDBPlot">http://akas.imdb.com/title/$$1/|accept-language=en-us</url></details>" dest="5"> <expression noclean="1" /> </RegExp> </GetIMDBPlotById> <ParseIMDBPlot dest="5"> <RegExp input="$$2" output="<details>\1</details>" dest="5"> <RegExp input="$$1" output="<plot>\1</plot>" dest="2"> - <expression fixchars="1" trim="1"><h2>Storyline</h2>\n+<p>(.*?)<[^a/]</expression> + <expression fixchars="1" trim="1"><h2>Storyline</h2>\s+<div\sclass="inline\scanwrap"\sitemprop="description">\s+<p>(.*?)<[^a/]</expression> </RegExp> <expression noclean="1" /> </RegExp> </ParseIMDBPlot> <GetIMDBTaglineById dest="5"> - <RegExp input="$$1" output="<details><url cache="$$1-main.html" function="ParseIMDBTagline">http://akas.imdb.com/title/$$1/</url></details>" dest="5"> + <RegExp input="$$1" output="<details><url cache="$$1-main.html" function="ParseIMDBTagline">http://akas.imdb.com/title/$$1/|accept-language=en-us</url></details>" dest="5"> <expression noclean="1" /> </RegExp> </GetIMDBTaglineById> @@ -112,34 +112,48 @@ </ParseIMDBTagline> <GetIMDBOutlineById dest="5"> - <RegExp input="$$1" output="<details><url cache="$$1-main.html" function="ParseIMDBOutline">http://akas.imdb.com/title/$$1/</url></details>" dest="5"> + <RegExp input="$$1" output="<details><url cache="$$1-main.html" function="ParseIMDBOutline">http://akas.imdb.com/title/$$1/|accept-language=en-us</url></details>" dest="5"> <expression noclean="1" /> </RegExp> </GetIMDBOutlineById> <ParseIMDBOutline dest="5"> <RegExp input="$$2" output="<details>\1</details>" dest="5"> <RegExp input="$$1" output="<outline>\1</outline>" dest="2"> - <expression fixchars="1" trim="1"><p>\n?<p itemprop="description">([^<]+)</p></expression> + <expression fixchars="1" trim="1"></p>\n?\s+<p\sitemprop="description">([^<]+)</p></expression> </RegExp> <expression noclean="1" /> </RegExp> </ParseIMDBOutline> + <GetIMDBOutlineToPlotById dest="5"> + <RegExp input="$$1" output="<details><url cache="$$1-main.html" function="ParseIMDBOutlineToPlot">http://akas.imdb.com/title/$$1/|accept-language=en-us</url></details>" dest="5"> + <expression noclean="1" /> + </RegExp> + </GetIMDBOutlineToPlotById> + <ParseIMDBOutlineToPlot dest="5"> + <RegExp input="$$2" output="<details>\1</details>" dest="5"> + <RegExp input="$$1" output="<plot>\1</plot>" dest="2"> + <expression fixchars="1" trim="1"></p>\n?\s+<p\sitemprop="description">([^<]+)</p></expression> + </RegExp> + <expression noclean="1" /> + </RegExp> + </ParseIMDBOutlineToPlot> + <GetIMDBCastById dest="5"> - <RegExp input="$$1" output="<details><url cache="$$1-main.html" function="ParseIMDBCast">http://akas.imdb.com/title/$$1/</url></details>" dest="5"> + <RegExp input="$$1" output="<details><url cache="$$1-main.html" function="ParseIMDBCast">http://akas.imdb.com/title/$$1/|accept-language=en-us</url></details>" dest="5"> <expression noclean="1" /> </RegExp> </GetIMDBCastById> <ParseIMDBCast dest="5"> <RegExp input="$$2" output="<details>\1</details>" dest="5"> <RegExp input="$$1" output="\1" dest="6"> - <expression noclean="1"><table class="cast_list">(.*?)</table></expression> + <expression noclean="1"><table\sclass="cast_list">(.*?)</table></expression> </RegExp> - <RegExp input="$$6" output="<actor><thumb>\2_SX1024_SY1024_\3</thumb><name>\1</name><role>\5</role></actor>" dest="7"> - <expression repeat="yes" clear="yes" trim="3,4" noclean="1,2"><noscript><img \n[^a]*alt="([^"]*)"[^"]*"[^"]*"[^s]*src="(?:([^"]*\.)[^"]*(\.jpg))[^>]*.*?ter">[^>]*>\n\s*(<[^>]*>)?([^<\(]*)?</expression> + <RegExp input="$$6" output="<actor><thumb>\2\3SX1024_SY1024_.jpg</thumb><name>\1</name><role>\5</role></actor>" dest="7"> + <expression repeat="yes" clear="yes" trim="3,4" noclean="1,2"><img[^a]*alt="([^"]*)"[^"]*"[^"]*"[^s]*src="(?:[^"]*\.[^"]*"class="loadlate\shidden\s"\sloadlate="([^"]*)(_V._))[^>]*.*?ter">[^>]*>\n\s*(<[^>]*>)?([^<\(]*)?</expression> </RegExp> <RegExp input="$$6" output="<actor><thumb></thumb><name>\1</name><role>\3</role></actor>" dest="7+"> - <expression repeat="yes" trim="1,2,3" fixchars="3" noclean="1,2"><img \n[^a]*alt="([^"]*)"[^"]*"[^"]*"[^s]*src="(?:[^"]*\.[^"]*\.png)" class="" />*.*?ter">[^>]*>\n\s*(<[^>]*>)?([^<\(]*)?</expression> + <expression repeat="yes" trim="1,2,3" fixchars="3" noclean="1,2"><img[^a]*alt="([^"]*)"[^"]*"[^"]*"[^s]*src="(?:[^"]*\.[^"]*\.png)"\sclass=".*?"\s/>*.*?ter">[^>]*>\n\s*(<[^>]*>)?([^<\(]*)?</expression> </RegExp> <RegExp input="$$7" output="<actor><thumb>\1</thumb>\2</actor>" dest="2+"> <expression repeat="yes" clear="yes" noclean="1,2,3"><actor><thumb>(?:(http.*?)|_SX[0-9]+_SY[0-9]+_)?</thumb>(.*?)</actor></expression> @@ -149,7 +163,7 @@ </ParseIMDBCast> <GetIMDBDirectorsById dest="5"> - <RegExp input="$$1" output="<details><url cache="$$1-main.html" function="ParseIMDBDirectors">http://akas.imdb.com/title/$$1/</url></details>" dest="5"> + <RegExp input="$$1" output="<details><url cache="$$1-main.html" function="ParseIMDBDirectors">http://akas.imdb.com/title/$$1/|accept-language=en-us</url></details>" dest="5"> <expression noclean="1" /> </RegExp> </GetIMDBDirectorsById> @@ -159,14 +173,14 @@ <expression clear="yes" noclean="1">Director(?:s)?:.*?</h4>(.*?)<div class</expression> </RegExp> <RegExp input="$$6" output="<director>\1</director>" dest="2"> - <expression repeat="yes" fixchars="1" clear="yes">href="/name[^>]*>([^<]*)<</expression> + <expression repeat="yes" fixchars="1" clear="yes">href="/name[^>]*>[^<]*<[^>]*>([^<]*)<</expression> </RegExp> <expression noclean="1" /> </RegExp> </ParseIMDBDirectors> <GetIMDBWritersById dest="5"> - <RegExp input="$$1" output="<details><url cache="$$1-main.html" function="ParseIMDBWriters">http://akas.imdb.com/title/$$1/</url></details>" dest="5"> + <RegExp input="$$1" output="<details><url cache="$$1-main.html" function="ParseIMDBWriters">http://akas.imdb.com/title/$$1/|accept-language=en-us</url></details>" dest="5"> <expression noclean="1" /> </RegExp> </GetIMDBWritersById> @@ -176,14 +190,14 @@ <expression clear="yes" noclean="1">Writer(?:s)?:.*?</h4>(.*?)<div class</expression> </RegExp> <RegExp input="$$6" output="<credits>\1</credits>" dest="2"> - <expression repeat="yes" fixchars="1" clear="yes">href="/name[^>]*>([^<]*)<</expression> + <expression repeat="yes" fixchars="1" clear="yes">href="/name[^>]*>[^<]*<[^>]*>([^<]*)<</expression> </RegExp> <expression noclean="1" /> </RegExp> </ParseIMDBWriters> <GetIMDBFullCastById dest="5"> - <RegExp input="$$1" output="<details><url cache="$$1-combined.html" function="ParseIMDBFullCast">http://akas.imdb.com/title/$$1/combined</url></details>" dest="5"> + <RegExp input="$$1" output="<details><url cache="$$1-combined.html" function="ParseIMDBFullCast">http://akas.imdb.com/title/$$1/combined|accept-language=en-us</url></details>" dest="5"> <expression noclean="1" /> </RegExp> </GetIMDBFullCastById> @@ -203,7 +217,7 @@ </ParseIMDBFullCast> <GetIMDBFullDirectorsById dest="5"> - <RegExp input="$$1" output="<details><url cache="$$1-combined.html" function="ParseIMDBFullDirectors">http://akas.imdb.com/title/$$1/combined</url></details>" dest="5"> + <RegExp input="$$1" output="<details><url cache="$$1-combined.html" function="ParseIMDBFullDirectors">http://akas.imdb.com/title/$$1/combined|accept-language=en-us</url></details>" dest="5"> <expression noclean="1" /> </RegExp> </GetIMDBFullDirectorsById> @@ -220,14 +234,14 @@ </ParseIMDBFullDirectors> <GetIMDBFullWritersById dest="5"> - <RegExp input="$$1" output="<details><url cache="$$1-combined.html" function="ParseIMDBFullWriters">http://akas.imdb.com/title/$$1/combined</url></details>" dest="5"> + <RegExp input="$$1" output="<details><url cache="$$1-combined.html" function="ParseIMDBFullWriters">http://akas.imdb.com/title/$$1/combined|accept-language=en-us</url></details>" dest="5"> <expression noclean="1" /> </RegExp> </GetIMDBFullWritersById> <ParseIMDBFullWriters dest="5"> <RegExp input="$$2" output="<details>\1</details>" dest="5"> <RegExp input="$$1" output="\1" dest="6"> - <expression noclean="1">Writing credits(.*?)name="</expression> + <expression noclean="1">Writing\scredits(.*?)name="</expression> </RegExp> <RegExp input="$$6" output="<credits>\1</credits>" dest="2"> <expression repeat="yes" fixchars="1"><a href="/name/[^>]*>([^<]*)<</expression> @@ -237,14 +251,14 @@ </ParseIMDBFullWriters> <GetIMDBThumbsById dest="5"> - <RegExp input="$$1" output="<details><url cache="$$1-posters.html" function="ParseIMDBThumbs">http://akas.imdb.com/title/$$1/posters</url></details>" dest="5"> + <RegExp input="$$1" output="<details><url cache="$$1-posters.html" function="ParseIMDBThumbs">http://akas.imdb.com/title/$$1/posters|accept-language=en-us</url></details>" dest="5"> <expression noclean="1" /> </RegExp> </GetIMDBThumbsById> <ParseIMDBThumbs dest="5"> <RegExp input="$$6" output="<details>\1</details>" dest="5"> <RegExp input="$$1" output="\1_SX1024_SY1024_\2" dest="4"> - <expression noclean="1,2"><a name="poster".*?src="(.*?)_S.*?(.jpg)".*?</a></expression> + <expression noclean="1,2"><a\sname="poster".*?src="(.*?)_S.*?(.jpg)".*?</a></expression> </RegExp> <RegExp input="$$4" output="<thumb aspect="poster">\1</thumb>" dest="6"> <expression noclean="1">(.*?_SX[0-9]+_SY[0-9]+_.jpg)</expression> @@ -254,18 +268,18 @@ </ParseIMDBThumbs> <GetIMDBUSACert dest="5"> - <RegExp input="$$1" output="<details><url cache="$$1-main.html" function="ParseIMDBUSACert">http://akas.imdb.com/title/$$1/</url></details>" dest="5"> + <RegExp input="$$1" output="<details><url cache="$$1-combined.html" function="ParseIMDBUSACert">http://akas.imdb.com/title/$$1/combined|accept-language=en-us</url></details>" dest="5"> <expression noclean="1" /> </RegExp> </GetIMDBUSACert> <ParseIMDBUSACert dest="5"> <RegExp input="$$1" output="<details><mpaa>$INFO[certprefix]\1</mpaa></details>" dest="5"> - <expression>MPAA</a>\)</h4>\n?<span itemprop="contentRating">Rated\s([^<]*)</expression> + <expression>MPAA</a>:</h5><div\sclass="info-content">Rated\s([^<]*)</expression> </RegExp> </ParseIMDBUSACert> <GetIMDBCountryCert dest="5"> - <RegExp input="$$1" output="<details><url cache="$$1-combined.html" function="ParseIMDBCountryCert">http://akas.imdb.com/title/$$1/combined</url></details>" dest="5"> + <RegExp input="$$1" output="<details><url cache="$$1-combined.html" function="ParseIMDBCountryCert">http://akas.imdb.com/title/$$1/combined|accept-language=en-us</url></details>" dest="5"> <expression noclean="1" /> </RegExp> </GetIMDBCountryCert> @@ -276,7 +290,7 @@ </ParseIMDBCountryCert> <GetIMDBAKATitlesById dest="5"> - <RegExp input="$$1" output="<details><url cache="$$1-combined.html" function="ParseIMDBAKATitles">http://akas.imdb.com/title/$$1/combined</url></details>" dest="5"> + <RegExp input="$$1" output="<details><url cache="$$1-combined.html" function="ParseIMDBAKATitles">http://akas.imdb.com/title/$$1/combined|accept-language=en-us</url></details>" dest="5"> <expression noclean="1" /> </RegExp> </GetIMDBAKATitlesById> @@ -287,13 +301,13 @@ </RegExp> <RegExp input="$$10" output="\1" dest="4"> <RegExp input="$$1" output="\2" dest="9"> - <expression fixchars="2"><meta name="title" content="(IMDb - )?(?:&#x22;)?([^"]*?)(?:&#x22;)? \([^\(]*?([0-9]{4})\)</expression> + <expression fixchars="2"><meta\sname="title"\scontent="(IMDb\s-\s)?(?:&#x22;)?([^"]*?)(?:&#x22;)? \([^\(]*?([0-9]{4})(?:–\s)?\)</expression> </RegExp> <RegExp input="$$9" output="\1" dest="10"> <expression /> </RegExp> <RegExp input="$$1" output="\1" dest="11"> - <expression fixchars="1" clear="yes">>\s*?"([^<]+)"[^<]+[<em>]?[^"]+Hong Kong [<em>][^"]+English</expression> + <expression fixchars="1" clear="yes">>\s*?"([^<]+)"[^<]+[<em>]?[^"]+Hong Kong\s[<em>][^"]+English</expression> </RegExp> <RegExp input="$$11" output="\1" dest="10"> <expression>(.+)</expression> @@ -311,25 +325,25 @@ <expression>(.+)</expression> </RegExp> <RegExp input="$$1" output="\1" dest="11"> - <expression fixchars="1" clear="yes">>\s*?"([^<]+)"[^"]+International\s(<em>)?\(English title\)(</em>)?(,|<)( |b)</expression> + <expression fixchars="1" clear="yes">>\s*?"([^<]+)"[^"]+International\s(<em>)?\(English\stitle\)(</em>)?(,|<)( |b)</expression> </RegExp> <RegExp input="$$11" output="\1" dest="10"> <expression>(.+)</expression> </RegExp> <RegExp input="$$1" output="\1" dest="11"> - <expression fixchars="1" clear="yes">>\s*?"([^<]+)"[^"]+International\s(<em>)?\(English title\)(</em>)? (<em>)?\(imdb</expression> + <expression fixchars="1" clear="yes">>\s*?"([^<]+)"[^"]+International\s(<em>)?\(English\stitle\)(</em>)? (<em>)?\(imdb</expression> </RegExp> <RegExp input="$$11" output="\1" dest="10"> <expression>(.+)</expression> </RegExp> <RegExp input="$$1" output="\1" dest="12"> - <expression fixchars="1" clear="yes"><a href="/country/[^>]+>(UK</a></div>)</expression> + <expression fixchars="1" clear="yes"><a\shref="/country/[^>]+>(UK</a></div>)</expression> </RegExp> <RegExp input="$$12" output="$$9" dest="10"> <expression>(.+)</expression> </RegExp> <RegExp input="$$1" output="\1" dest="12"> - <expression clear="yes"><a href="/country/[^>]+>(USA</a></div>)</expression> + <expression clear="yes"><a\shref="/country/[^>]+>(USA</a></div>)</expression> </RegExp> <RegExp input="$$12" output="$$9" dest="10"> <expression>(.+)</expression> @@ -347,7 +361,7 @@ <expression>(.+)</expression> </RegExp> <RegExp input="$$1" output="\1" dest="11"> - <expression fixchars="1" clear="yes">>\s*?"([^<]+)"[^<]+[<em>]?[^"]+((USA)\s(<em>)?\((new title))</expression> + <expression fixchars="1" clear="yes">>\s*?"([^<]+)"[^<]+[<em>]?[^"]+((USA)\s(<em>)?\((new\stitle))</expression> </RegExp> <RegExp input="$$11" output="\1" dest="10"> <expression>(.+)</expression> @@ -364,13 +378,13 @@ <expression>(.+)</expression> </RegExp> <RegExp input="$$1" output="\1" dest="4"> - <expression fixchars="1">>\s*?"([^<]+)"[^<]+[<em>]?[^"]+$INFO[imdbakatitles]\s(<em>)?\((imdb display)</expression> + <expression fixchars="1">>\s*?"([^<]+)"[^<]+[<em>]?[^"]+$INFO[imdbakatitles]\s(<em>)?\((imdb\sdisplay)</expression> </RegExp> <RegExp input="$$4" output="\1" dest="2"> <expression>(.+)</expression> </RegExp> <RegExp input="$$1" output="\1" dest="5"> - <expression><a href="/country/[^>]+>($INFO[imdbakatitles])</expression> + <expression><a\shref="/country/[^>]+>($INFO[imdbakatitles])</expression> </RegExp> <RegExp input="$$5" output="$$9" dest="4"> <expression>($INFO[imdbakatitles])</expression> diff --git a/addons/metadata.common.last.fm/addon.xml b/addons/metadata.common.last.fm/addon.xml index 561026f8f1..98c914dbd8 100644 --- a/addons/metadata.common.last.fm/addon.xml +++ b/addons/metadata.common.last.fm/addon.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <addon id="metadata.common.last.fm" name="Last.FM" - version="1.5.1" + version="1.6.0" provider-name="Team XBMC"> <requires> - <import addon="xbmc.metadata" version="1.0"/> + <import addon="xbmc.metadata" version="2.1.0"/> </requires> <extension point="xbmc.metadata.scraper.library" library="lastfm.xml"/> diff --git a/addons/metadata.common.last.fm/lastfm.xml b/addons/metadata.common.last.fm/lastfm.xml index c47a42e32b..364e70714b 100644 --- a/addons/metadata.common.last.fm/lastfm.xml +++ b/addons/metadata.common.last.fm/lastfm.xml @@ -87,6 +87,9 @@ <RegExp input="$INFO[genresfbsource]" output="<chain function="GetAMGFallbackArtistGenresByAMGID">$$9</chain>" dest="12"> <expression>allmusic.com</expression> </RegExp> + <RegExp input="$INFO[genresfbsource]" output="<chain function="GetTADBFallbackArtistGenresByMBID">$$8</chain>" dest="12"> + <expression>TheAudioDb.com</expression> + </RegExp> <expression><genre></genre></expression> </RegExp> <RegExp input="$$11" output="$$11" dest="4"> diff --git a/addons/metadata.common.musicbrainz.org/addon.xml b/addons/metadata.common.musicbrainz.org/addon.xml index 42a26355a0..df66d41263 100644 --- a/addons/metadata.common.musicbrainz.org/addon.xml +++ b/addons/metadata.common.musicbrainz.org/addon.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <addon id="metadata.common.musicbrainz.org" name="musicbrainz" - version="1.2.3" + version="1.3.0" provider-name="Team XBMC"> <requires> - <import addon="xbmc.metadata" version="1.0"/> + <import addon="xbmc.metadata" version="2.1.0"/> </requires> <extension point="xbmc.metadata.scraper.library" library="musicbrainz.xml"/> diff --git a/addons/metadata.common.musicbrainz.org/musicbrainz.xml b/addons/metadata.common.musicbrainz.org/musicbrainz.xml index 16e539b23b..5ee46d5dc4 100644 --- a/addons/metadata.common.musicbrainz.org/musicbrainz.xml +++ b/addons/metadata.common.musicbrainz.org/musicbrainz.xml @@ -45,6 +45,9 @@ <RegExp input="$INFO[lifespanfbsource]" output="<chain function="GetAMGFallbackArtistLifeSpanByAMGID">$$9</chain>" dest="12"> <expression>allmusic.com</expression> </RegExp> + <RegExp input="$INFO[lifespanfbsource]" output="<chain function="GetTADBFallbackLifeSpanByMBID">$$8</chain>" dest="12"> + <expression>TheAudioDb.com</expression> + </RegExp> <expression>^$</expression> </RegExp> <RegExp input="$$11" output="$$11" dest="2"> diff --git a/addons/metadata.common.theaudiodb.com/addon.xml b/addons/metadata.common.theaudiodb.com/addon.xml index dbf44f6f8f..432763702a 100644 --- a/addons/metadata.common.theaudiodb.com/addon.xml +++ b/addons/metadata.common.theaudiodb.com/addon.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <addon id="metadata.common.theaudiodb.com" name="TheAudioDb Common Scraper Functions" - version="1.3.0" + version="1.6.1" provider-name="Team XBMC"> <requires> - <import addon="xbmc.metadata" version="1.0"/> + <import addon="xbmc.metadata" version="2.1.0"/> </requires> <extension point="xbmc.metadata.scraper.library" library="tadb.xml"/> diff --git a/addons/metadata.common.theaudiodb.com/tadb.xml b/addons/metadata.common.theaudiodb.com/tadb.xml index 5cce462cea..7c1a807a05 100644 --- a/addons/metadata.common.theaudiodb.com/tadb.xml +++ b/addons/metadata.common.theaudiodb.com/tadb.xml @@ -64,8 +64,14 @@ <RegExp input="" output="" dest="2"> <expression /> </RegExp> + <RegExp input="" output="" dest="11"> + <expression /> + </RegExp> + <RegExp input="$$1" output="\1" dest="11"> + <expression fixchars="1">strBiographyEN":"(.*?)","</expression> + </RegExp> <RegExp input="$$1" output="\1" dest="11"> - <expression clear="yes" fixchars="1">strBiography":"(.*?)","</expression> + <expression fixchars="1">strBiography$INFO[tadbartistlanguage]":"(.*?)","</expression> </RegExp> <RegExp input="$$11" output="$$12" dest="2"> <RegExp input="$INFO[biogfbsource]" output="<chain function="GetLastFMFallbackBiographyByMBID">$$8</chain>" dest="12"> @@ -94,7 +100,10 @@ <expression /> </RegExp> <RegExp input="$$1" output="<biography>\1</biography>" dest="2"> - <expression clear="yes" fixchars="1">strBiography":"(.*?)","</expression> + <expression fixchars="1">strBiographyen":"(.*?)","</expression> + </RegExp> + <RegExp input="$$1" output="\1" dest="2"> + <expression fixchars="1">strBiography$INFO[tadbartistlanguage]":"(.*?)","</expression> </RegExp> <expression noclean="1"/> </RegExp> @@ -105,6 +114,11 @@ <expression noclean="1" /> </RegExp> </GetTADBDiscographyByID> + <GetTADBDiscographyByMBID dest="5" clearbuffers="no"> + <RegExp input="$$1" output="<details><url function="ParseTADBDiscography">http://www.theaudiodb.com/api/v1/json/58424d43204d6564696120/discography-mb.php?s=\1</url></details>" dest="5"> + <expression noclean="1" /> + </RegExp> + </GetTADBDiscographyByMBID> <ParseTADBDiscography dest="5" clearbuffers="no"> <RegExp input="$$2" output="<details>\1</details>" dest="5"> <RegExp input="" output="" dest="2"> @@ -122,6 +136,11 @@ <expression noclean="1" /> </RegExp> </GetTADBLifeSpanByID> + <GetTADBLifeSpanByMBID dest="5" clearbuffers="no"> + <RegExp input="$$1" output="<details><url function="ParseTADBLifeSpan" cache="tadb-\1-artist.json">http://www.theaudiodb.com/api/v1/json/58424d43204d6564696120/artist-mb.php?i=\1</url></details>" dest="5"> + <expression noclean="1"/> + </RegExp> + </GetTADBLifeSpanByMBID> <ParseTADBLifeSpan dest="5" clearbuffers="no"> <RegExp input="$$2" output="<details>\1</details>" dest="5"> <RegExp input="" output="" dest="2"> @@ -130,18 +149,27 @@ <RegExp input="" output="" dest="11"> <expression /> </RegExp> - <RegExp input="$$1" output="<formed>\1</formed>" dest="11"> - <expression noclean="1">intFormedYear":"([^"]*)</expression> + <RegExp input="$$1" output="<formed>\2 (\1)</formed>" dest="11"> + <expression fixchars="2" noclean="1">intFormedYear":"([^"]*).*?strCountry":"([^"]*)</expression> </RegExp> <RegExp input="$$1" output="<disbanded>\1</disbanded>" dest="11+"> <expression noclean="1">strDisbanded":"([^"]*)</expression> </RegExp> - <RegExp input="$$1" output="<born>\1</born>" dest="11"> - <expression noclean="1">intBornYear":"([^"]*)</expression> + <RegExp input="$$1" output="<born>\2 (\1)</born>" dest="11"> + <expression fixchars="2" noclean="1">intBornYear":"([^"]*).*?strCountry":"([^"]*)</expression> </RegExp> <RegExp input="$$1" output="<died>\1</died>" dest="11+"> <expression noclean="1">intDiedYear":"([^"]*)</expression> </RegExp> + <RegExp input="$$11" output="$$12" dest="2"> + <RegExp input="$INFO[lifespanfbsource]" output="<chain function="GetMBFallbackLafeSpanByMBID">$$8</chain>" dest="12"> + <expression>MusicBrainz</expression> + </RegExp> + <RegExp input="$INFO[lifespanfbsource]" output="<chain function="GetAMGFallbackArtistLifeSpanByAMGID">$$9</chain>" dest="12"> + <expression>allmusic.com</expression> + </RegExp> + <expression>^$</expression> + </RegExp> <RegExp input="$$11" output="$$11" dest="2"> <expression noclean="1"><(?:born|formed)*>(.+)</(?:born|formed)*></expression> </RegExp> @@ -149,23 +177,92 @@ </RegExp> </ParseTADBLifeSpan> + <GetTADBFallbackLifeSpanByMBID dest="5" clearbuffers="no"> + <RegExp input="$$1" output="<details><url function="ParseTADBFallbackLifeSpan" cache="tadb-\1-artist.json">http://www.theaudiodb.com/api/v1/json/58424d43204d6564696120/artist-mb.php?i=\1</url></details>" dest="5"> + <expression noclean="1"/> + </RegExp> + </GetTADBFallbackLifeSpanByMBID> + <ParseTADBFallbackLifeSpan dest="5" clearbuffers="no"> + <RegExp input="$$2" output="<details>\1</details>" dest="5"> + <RegExp input="" output="" dest="2"> + <expression /> + </RegExp> + <RegExp input="" output="" dest="11"> + <expression /> + </RegExp> + <RegExp input="$$1" output="<formed>\2 (\1)</formed>" dest="11"> + <expression fixchars="2" noclean="1">intFormedYear":"([^"]*).*?strCountry":"([^"]*)</expression> + </RegExp> + <RegExp input="$$1" output="<disbanded>\1</disbanded>" dest="11+"> + <expression noclean="1">strDisbanded":"([^"]*)</expression> + </RegExp> + <RegExp input="$$1" output="<born>\2 (\1)</born>" dest="11"> + <expression fixchars="2" noclean="1">intBornYear":"([^"]*).*?strCountry":"([^"]*)</expression> + </RegExp> + <RegExp input="$$1" output="<died>\1</died>" dest="11+"> + <expression noclean="1">intDiedYear":"([^"]*)</expression> + </RegExp> + <RegExp input="$$11" output="$$11" dest="2"> + <expression noclean="1"><(?:born|formed)*>(.+)</(?:born|formed)*></expression> + </RegExp> + <expression noclean="1"/> + </RegExp> + </ParseTADBFallbackLifeSpan> + <GetTADBArtistGenresByID dest="5" clearbuffers="no"> <RegExp input="$$1" output="<details><url function="ParseTADBArtistGenres" cache="tadb-\1-artist.json">http://www.theaudiodb.com/api/v1/json/58424d43204d6564696120/artist.php?i=\1</url></details>" dest="5"> <expression noclean="1"/> </RegExp> </GetTADBArtistGenresByID> + <GetTADBArtistGenresByMBID dest="5" clearbuffers="no"> + <RegExp input="$$1" output="<details><url function="ParseTADBArtistGenres" cache="tadb-\1-artist.json">http://www.theaudiodb.com/api/v1/json/58424d43204d6564696120/artist-mb.php?i=\1</url></details>" dest="5"> + <expression noclean="1"/> + </RegExp> + </GetTADBArtistGenresByMBID> <ParseTADBArtistGenres dest="5" clearbuffers="no"> <RegExp input="$$2" output="<details>\1</details>" dest="5"> <RegExp input="" output="" dest="2"> <expression /> </RegExp> - <RegExp input="$$1" output="<genre>\1</genre>" dest="2"> - <expression noclean="1">strGenre":"([^"]*)</expression> + <RegExp input="" output="" dest="11"> + <expression /> + </RegExp> + <RegExp input="$$1" output="\1" dest="11"> + <expression fixchars="1">strSubGenre":"([^"]*)</expression> + </RegExp> + <RegExp input="$$11" output="$$12" dest="2"> + <RegExp input="$INFO[genresfbsource]" output="<chain function="GetLastFMFallbackArtistGenresByMBID">$$8</chain>" dest="12"> + <expression>last.fm</expression> + </RegExp> + <RegExp input="$INFO[genresfbsource]" output="<chain function="GetAMGFallbackArtistGenresByAMGID">$$9</chain>" dest="12"> + <expression>allmusic.com</expression> + </RegExp> + <expression>^$</expression> + </RegExp> + <RegExp input="$$11" output="<genre>\1</genre>" dest="2"> + <expression>(.+)</expression> </RegExp> <expression noclean="1" /> </RegExp> </ParseTADBArtistGenres> + <GetTADBFallbackArtistGenresByMBID dest="5" clearbuffers="no"> + <RegExp input="$$1" output="<details><url function="ParseTADBArtistGenres" cache="tadb-\1-artist.json">http://www.theaudiodb.com/api/v1/json/58424d43204d6564696120/artist-mb.php?i=\1</url></details>" dest="5"> + <expression noclean="1"/> + </RegExp> + </GetTADBFallbackArtistGenresByMBID> + <ParseTADBFallbackArtistGenres dest="5" clearbuffers="no"> + <RegExp input="$$2" output="<details>\1</details>" dest="5"> + <RegExp input="" output="" dest="2"> + <expression /> + </RegExp> + <RegExp input="$$1" output="<genre>\1</genre>" dest="2"> + <expression noclean="1">strSubGenre":"([^"]*)</expression> + </RegExp> + <expression noclean="1" /> + </RegExp> + </ParseTADBFallbackArtistGenres> + <GetTADBAlbumReviewByID dest="5"> <RegExp input="$$1" output="<details><url function="ParseTADBAlbumReview" cache="tadb-\1-album.json">http://www.theaudiodb.com/api/v1/json/58424d43204d6564696120/album.php?m=\1</url></details>" dest="5"> @@ -180,7 +277,10 @@ <ParseTADBAlbumReview dest="5"> <RegExp input="$$2" output="<details>\1</details>" dest="5"> <RegExp input="$$1" output="<review>\1</review>" dest="2"> - <expression fixchars="1">strDescription":"(.*?)","</expression> + <expression fixchars="1">strDescriptionEN":"(.*?)","</expression> + </RegExp> + <RegExp input="$$1" output="<review>\1</review>" dest="2"> + <expression fixchars="1">strDescription$INFO[tadbalbumlanguage]":"(.*?)","</expression> </RegExp> <expression noclean="1" /> </RegExp> @@ -219,6 +319,11 @@ <expression noclean="1"/> </RegExp> </GetTADBAlbumDateByID> + <GetTADBAlbumDateByMBID dest="5"> + <RegExp input="$$1" output="<details><url function="ParseTADBAlbumDate" cache="tadb-\1-album.json">http://www.theaudiodb.com/api/v1/json/58424d43204d6564696120/album-mb.php?i=\1</url></details>" dest="5"> + <expression noclean="1"/> + </RegExp> + </GetTADBAlbumDateByMBID> <ParseTADBAlbumDate dest="5"> <RegExp input="$$2" output="<details>\1</details>" dest="5"> <RegExp input="$$1" output="<year>\1</year>" dest="2"> @@ -233,10 +338,15 @@ <expression noclean="1"/> </RegExp> </GetTADBAlbumGenresByID> + <GetTADBAlbumGenresByMBID dest="5"> + <RegExp input="$$1" output="<details><url function="ParseTADBAlbumGenres" cache="tadb-\1-album.json">http://www.theaudiodb.com/api/v1/json/58424d43204d6564696120/album-mb.php?i=\1</url></details>" dest="5"> + <expression noclean="1"/> + </RegExp> + </GetTADBAlbumGenresByMBID> <ParseTADBAlbumGenres dest="5"> <RegExp input="$$2" output="<details>\1</details>" dest="5"> <RegExp input="$$1" output="<genre>\1</genre>" dest="2"> - <expression noclean="1">strGenre":"([^"]*)</expression> + <expression noclean="1">strSubGenre":"([^"]*)</expression> </RegExp> <expression noclean="1" /> </RegExp> diff --git a/addons/metadata.common.themoviedb.org/addon.xml b/addons/metadata.common.themoviedb.org/addon.xml index 1c00e6069d..fc9a87aea6 100644 --- a/addons/metadata.common.themoviedb.org/addon.xml +++ b/addons/metadata.common.themoviedb.org/addon.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <addon id="metadata.common.themoviedb.org" - name="The MovieDB common scraper functions" - version="2.9.1" + name="The Movie Database Scraper Library" + version="2.9.3" provider-name="Team XBMC"> <requires> - <import addon="xbmc.metadata" version="1.0"/> + <import addon="xbmc.metadata" version="2.1.0"/> </requires> <extension point="xbmc.metadata.scraper.library" library="tmdb.xml"/> diff --git a/addons/metadata.common.themoviedb.org/tmdb.xml b/addons/metadata.common.themoviedb.org/tmdb.xml index ab8b3df1b8..675bf672d6 100644 --- a/addons/metadata.common.themoviedb.org/tmdb.xml +++ b/addons/metadata.common.themoviedb.org/tmdb.xml @@ -132,17 +132,23 @@ </RegExp> </ParseFallbackTMDBTagline> - <GetTMDBSetByIdChain dest="4"> + <GetTMDBSetByIdChain clearbuffers="no" dest="4"> <RegExp input="$$5" output="<details>\1</details>" dest="4"> - <RegExp input="$$1" output="<url function="ParseTMDBSet" cache="tmdb-$INFO[language]-\1.json">http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]</url>" dest="5"> + <RegExp input="$$1" output="\1" dest="8"> + <expression clear="yes" noclean="1" /> + </RegExp> + <RegExp input="$$8" output="<url function="ParseTMDBSet" cache="tmdb-$INFO[language]-\1.json">http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]</url>" dest="5"> <expression /> </RegExp> <expression noclean="1" /> </RegExp> </GetTMDBSetByIdChain> - <GetTMDBLangSetByIdChain dest="4"> + <GetTMDBLangSetByIdChain clearbuffers="no" dest="4"> <RegExp input="$$5" output="<details>\1</details>" dest="4"> - <RegExp input="$$1" output="<url function="ParseTMDBSet" cache="tmdb-$INFO[tmdbsetlanguage]-\1.json">http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[tmdbsetlanguage]</url>" dest="5"> + <RegExp input="$$1" output="\1" dest="8"> + <expression clear="yes" noclean="1" /> + </RegExp> + <RegExp input="$$8" output="<url function="ParseTMDBSet" cache="tmdb-$INFO[tmdbsetlanguage]-\1.json">http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[tmdbsetlanguage]</url>" dest="5"> <expression /> </RegExp> <expression noclean="1" /> diff --git a/addons/metadata.musicvideos.theaudiodb.com/addon.xml b/addons/metadata.musicvideos.theaudiodb.com/addon.xml index 37ab5a46c6..b05009b271 100644 --- a/addons/metadata.musicvideos.theaudiodb.com/addon.xml +++ b/addons/metadata.musicvideos.theaudiodb.com/addon.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <addon id="metadata.musicvideos.theaudiodb.com" name="TheAudioDb.com for Music Videos" - version="1.0.3" + version="1.2.2" provider-name="Team XBMC"> <requires> - <import addon="xbmc.metadata" version="1.0"/> - <import addon="metadata.common.fanart.tv" version="1.0.1"/> + <import addon="xbmc.metadata" version="2.1.0"/> + <import addon="metadata.common.theaudiodb.com" version="1.6.0"/> + <import addon="metadata.common.fanart.tv" version="2.1.2"/> </requires> <extension point="xbmc.metadata.scraper.musicvideos" language="en" @@ -15,23 +16,27 @@ <summary lang="be">theaudiodb.com Music Video Scraper</summary> <summary lang="bg">Сваля инф. за музикални клипове от theaudiodb.com</summary> <summary lang="cs">Zdroj dat o hudebních videích theaudiodb.com</summary> + <summary lang="cy">Crafwr Fideo Cerddoriaeth theaudiodb.com</summary> <summary lang="da">theaudiodb.com Musikvideo-scraper</summary> <summary lang="de">theaudiodb.com Musikvideo-Scraper</summary> <summary lang="el">Scraper Μουσικών Βίντεο του theaudiodb.com</summary> <summary lang="en">theaudiodb.com Music Video Scraper</summary> <summary lang="es">Buscador de videoclips de theaudiodb.com</summary> - <summary lang="es_AR">Scraper de Videos de Música de TheAudioDb.com</summary> + <summary lang="es_AR">Scraper de Videos de Música de theaudiodb.com</summary> + <summary lang="et">theaudiodb.com muusikavideo kraabits</summary> <summary lang="fi">theaudiodb.com musiikkivideotietojen lataaja</summary> <summary lang="fr">theaudiodb.com Scraper Clip Vidéo</summary> <summary lang="gl">Scraper de vídeo e música de theaudiodb.com</summary> <summary lang="he">theaudiodb.com סקרייפר וידאו קליפ</summary> + <summary lang="hr">theaudiodb.com Muzika i Video strugač</summary> <summary lang="hu">theaudiodb.com videóklip leolvasó</summary> <summary lang="it">Lo scraper di video musicali theaudiodb.com</summary> <summary lang="ja">theaudiodb.com 音楽ビデオスクレーパー</summary> - <summary lang="ko">야후! 뮤직 비디오 스크래퍼</summary> + <summary lang="ko">theaudiodb.com 뮤직 비디오 자료수집기</summary> <summary lang="lt">theaudiodb.com vaizdo klipų Scraper</summary> <summary lang="mk">theaudiodb.com Music Video Scraper</summary> - <summary lang="nl">theaudiodb.com Muziek Video Scraper</summary> + <summary lang="my">theaudiodb.com Music Video Scraper</summary> + <summary lang="nl">theaudiodb.com Muziekvideo-scraper</summary> <summary lang="no">theaudiodb.com Skraper for musikkvideo</summary> <summary lang="pl">Scraper teledysków theaudiodb.com</summary> <summary lang="pt">Scraper de música theaudiodb.com</summary> @@ -42,18 +47,23 @@ <summary lang="sk">Zdroj získavania dát o hudobných videách zo stránky theaudiodb.com</summary> <summary lang="sl">Ponudnik informacij o videospotih theaudiodb.com</summary> <summary lang="sv">theaudiodb.com musikvideoskrapa</summary> + <summary lang="ta_IN">theaudiodb.com இசை நிகழ்படம் சுரண்டி</summary> <summary lang="th">ตัวดึงข้อมูลวิดีโอเพลง theaudiodb.com</summary> + <summary lang="uk">Здирач музичного відео з theaudiodb.com</summary> + <summary lang="vi">Trình lấy dữ liệu Video nhạc từ theaudiodb.com</summary> <summary lang="zh">theaudiodb.com音乐电视刮削器</summary> + <summary lang="zh_TW">theaudiodb.com音樂影片搜括器</summary> <description lang="af">Laai Musiek Video informasie af</description> <description lang="am">የሙዚቃ ቪዲዮ መረጃ ማውረጃ</description> <description lang="be">Download Music Video information</description> <description lang="bg">Сваля информация за музикални клипове</description> <description lang="ca">Baixa informació de videos musicals</description> <description lang="cs">Stáhnout informace o hudebním videu</description> + <description lang="cy">Mae'r crafwr yn llwytho i lawr gwybodaeth am Gerddoriaeth Fideo o TheAudioDB.com. Oherwydd amryw o anawsterau chwilio mae'r crafwr yn disgwyl i'r ffolder/enw ffeil fod wedi ei fformatio fel 'artist - enw track' neu ni fydd yn dychwelyd canlyniadau.</description> <description lang="da">Hent Musikvideo-information</description> <description lang="de">Musik Video Information herunterladen</description> <description lang="el">Λήψη πληροφοριών Μουσικών Βίντεο</description> - <description lang="en">Download Music Video information</description> + <description lang="en">This scraper is downloading Music Video information from TheAudioDB.com. Due to various search difficulties the scraper currently expects the folder/filename to be formatted as 'artist - trackname' otherwise it will not return results.</description> <description lang="es">Descarga información del videoclip</description> <description lang="es_AR">Descarga información del Video Clip</description> <description lang="es_MX">Descarga Información de Vídeos de Músca</description> diff --git a/addons/metadata.musicvideos.theaudiodb.com/changelog.txt b/addons/metadata.musicvideos.theaudiodb.com/changelog.txt new file mode 100644 index 0000000000..d3fcfb8d5c --- /dev/null +++ b/addons/metadata.musicvideos.theaudiodb.com/changelog.txt @@ -0,0 +1,19 @@ +[B]1.2.1[/B] +- Fixed: Allow for dashes in artist/title (v12.2+ required) + +[B]1.2.0[/B] +- Added: NfoURL function +- Added: Album thumbs from theaudiodb.com + +[B]1.1.1[/B] +- Fixed Workaround: Scraper won't return 'Unable to Connect to Remote Server' in case of year is available from the folder/file name + +[B]1.1.0[/B] +- Workaround: Scraper won't return 'Unable to Connect to Remote Server' in case of unexpected folder/file naming conventions +- Added: Music Video Director +- Added: Music Video Studio +- Changed: Scrape Music Video screenshot instead of album thumb if available +- Changed: Trust search result ordering from TheAudioDb.com +- Changed: Scrape Album genre instead of track genre for now +- Added: Scrape Album Year +- Added: Scraper description (stating current limitations) diff --git a/addons/metadata.musicvideos.theaudiodb.com/resources/language/Burmese/strings.xml b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Burmese/strings.xml new file mode 100644 index 0000000000..8db0298e4f --- /dev/null +++ b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Burmese/strings.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- Translated using Transifex web application. For support, or if you would like to to help out, please visit your language team! --> +<!-- Burmese language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/my/ --> +<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> + +<strings> + <string id="30000">fanart.tv မှ album thumbs များရယူမည်</string> +</strings> diff --git a/addons/metadata.musicvideos.theaudiodb.com/resources/language/Catalan/strings.xml b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Catalan/strings.xml index d38a9ad2b5..bc941dec1a 100644 --- a/addons/metadata.musicvideos.theaudiodb.com/resources/language/Catalan/strings.xml +++ b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Catalan/strings.xml @@ -5,4 +5,5 @@ <strings> <string id="30000">Agafa les miniatures d'àlbums de fanart.tv</string> + <string id="30001">Agafa les miniatures d'àlbums de theaudiodb.com</string> </strings> diff --git a/addons/metadata.musicvideos.theaudiodb.com/resources/language/Chinese (Simple)/strings.xml b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Chinese (Simple)/strings.xml index 1b4badd576..89816a3958 100644 --- a/addons/metadata.musicvideos.theaudiodb.com/resources/language/Chinese (Simple)/strings.xml +++ b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Chinese (Simple)/strings.xml @@ -5,4 +5,5 @@ <strings> <string id="30000">从fanart.tv获取专辑图片</string> + <string id="30001">从theaudiodb.com获取专辑图片</string> </strings> diff --git a/addons/metadata.musicvideos.theaudiodb.com/resources/language/Chinese (Traditional)/strings.xml b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Chinese (Traditional)/strings.xml new file mode 100644 index 0000000000..1b15ed9957 --- /dev/null +++ b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Chinese (Traditional)/strings.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- Translated using Transifex web application. For support, or if you would like to to help out, please visit your language team! --> +<!-- Chinese (Traditional) language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/zh_TW/ --> +<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> + +<strings> + <string id="30000">從fanart.tv取得專輯縮圖</string> + <string id="30001">從 theaudiodb.com取得專輯縮圖</string> +</strings> diff --git a/addons/metadata.musicvideos.theaudiodb.com/resources/language/Croatian/strings.xml b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Croatian/strings.xml new file mode 100644 index 0000000000..44d7b00a10 --- /dev/null +++ b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Croatian/strings.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- Translated using Transifex web application. For support, or if you would like to to help out, please visit your language team! --> +<!-- Croatian language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/hr/ --> +<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> + +<strings> + <string id="30000">Zahvati sličice za Albume sa fanart.tv</string> +</strings> diff --git a/addons/metadata.musicvideos.theaudiodb.com/resources/language/Czech/strings.xml b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Czech/strings.xml index 138d80502b..75b442e8f3 100644 --- a/addons/metadata.musicvideos.theaudiodb.com/resources/language/Czech/strings.xml +++ b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Czech/strings.xml @@ -5,4 +5,5 @@ <strings> <string id="30000">Získat náhledy alb z fanart.tv</string> + <string id="30001">Získat náhledy alb z theaudiodb.com</string> </strings> diff --git a/addons/metadata.musicvideos.theaudiodb.com/resources/language/Dutch/strings.xml b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Dutch/strings.xml index 521473130c..b97fbd2d74 100644 --- a/addons/metadata.musicvideos.theaudiodb.com/resources/language/Dutch/strings.xml +++ b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Dutch/strings.xml @@ -4,5 +4,6 @@ <!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> <strings> - <string id="30000">Verkrijg album thumbs van fanart.tv</string> + <string id="30000">Pak albumminiaturen van fanart.tv</string> + <string id="30001">Haal Albumminiaturen van theaudiodb.com</string> </strings> diff --git a/addons/metadata.musicvideos.theaudiodb.com/resources/language/English/strings.xml b/addons/metadata.musicvideos.theaudiodb.com/resources/language/English/strings.xml index 8b5221e453..c581ca412a 100644 --- a/addons/metadata.musicvideos.theaudiodb.com/resources/language/English/strings.xml +++ b/addons/metadata.musicvideos.theaudiodb.com/resources/language/English/strings.xml @@ -5,4 +5,5 @@ <strings> <string id="30000">Grab album thumbs from fanart.tv</string> + <string id="30001">Grab album thumbs from theaudiodb.com</string> </strings> diff --git a/addons/metadata.musicvideos.theaudiodb.com/resources/language/Estonian/strings.xml b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Estonian/strings.xml new file mode 100644 index 0000000000..1d7f626d2b --- /dev/null +++ b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Estonian/strings.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- Translated using Transifex web application. For support, or if you would like to to help out, please visit your language team! --> +<!-- Estonian language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/et/ --> +<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> + +<strings> + <string id="30000">Hangi albumi pisipildid fanart.tv-st</string> +</strings> diff --git a/addons/metadata.musicvideos.theaudiodb.com/resources/language/French/strings.xml b/addons/metadata.musicvideos.theaudiodb.com/resources/language/French/strings.xml index bdd7dd3229..c0f8967641 100644 --- a/addons/metadata.musicvideos.theaudiodb.com/resources/language/French/strings.xml +++ b/addons/metadata.musicvideos.theaudiodb.com/resources/language/French/strings.xml @@ -5,4 +5,5 @@ <strings> <string id="30000">Récupérer les vignettes d'albums depuis fanart.tv</string> + <string id="30001">Récupère les vignettes des albums depuis theaudiodb.com</string> </strings> diff --git a/addons/metadata.musicvideos.theaudiodb.com/resources/language/Galician/strings.xml b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Galician/strings.xml index 17b6ffa5f8..7300abd2be 100644 --- a/addons/metadata.musicvideos.theaudiodb.com/resources/language/Galician/strings.xml +++ b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Galician/strings.xml @@ -5,4 +5,5 @@ <strings> <string id="30000">Obter as miniaturas do álbum dende fanart.tv</string> + <string id="30001">Obter as miniaturas do álbum dende theaudiodb.com</string> </strings> diff --git a/addons/metadata.musicvideos.theaudiodb.com/resources/language/Greek/strings.xml b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Greek/strings.xml index a30f60c67e..cc11ca8113 100644 --- a/addons/metadata.musicvideos.theaudiodb.com/resources/language/Greek/strings.xml +++ b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Greek/strings.xml @@ -5,4 +5,5 @@ <strings> <string id="30000">Μικρογραφίες άλμπουμ από fanart.tv</string> + <string id="30001">Μικρογραφίες Άλμπουμ από το theaudiodb.com</string> </strings> diff --git a/addons/metadata.musicvideos.theaudiodb.com/resources/language/Hungarian/strings.xml b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Hungarian/strings.xml index 1df352ce4b..717f9bb4c0 100644 --- a/addons/metadata.musicvideos.theaudiodb.com/resources/language/Hungarian/strings.xml +++ b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Hungarian/strings.xml @@ -5,4 +5,5 @@ <strings> <string id="30000">Album miniképek letőltésea fanart.tv-ről</string> + <string id="30001">Album miniképek a theaudiodb.com-ról</string> </strings> diff --git a/addons/metadata.musicvideos.theaudiodb.com/resources/language/Italian/strings.xml b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Italian/strings.xml index 0c8c8b1219..ba7082dcb1 100644 --- a/addons/metadata.musicvideos.theaudiodb.com/resources/language/Italian/strings.xml +++ b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Italian/strings.xml @@ -5,4 +5,5 @@ <strings> <string id="30000">Scarica le copertine album da fanart.tv</string> + <string id="30001">Prendi miniature album da theaudiodb.com</string> </strings> diff --git a/addons/metadata.musicvideos.theaudiodb.com/resources/language/Korean/strings.xml b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Korean/strings.xml index da27bae11d..1c276a0eeb 100644 --- a/addons/metadata.musicvideos.theaudiodb.com/resources/language/Korean/strings.xml +++ b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Korean/strings.xml @@ -5,4 +5,5 @@ <strings> <string id="30000">fanart.tv 에서 앨범 커버 가져오기</string> + <string id="30001">theaudiodb.com 에서 앨범 커버 가져오기</string> </strings> diff --git a/addons/metadata.musicvideos.theaudiodb.com/resources/language/Polish/strings.xml b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Polish/strings.xml index 157ccb2a27..4802268d61 100644 --- a/addons/metadata.musicvideos.theaudiodb.com/resources/language/Polish/strings.xml +++ b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Polish/strings.xml @@ -5,4 +5,5 @@ <strings> <string id="30000">Pobierz ikony albumu z fanart.tv</string> + <string id="30001">Pobierz miniatury albumu z theaudiodb.com</string> </strings> diff --git a/addons/metadata.musicvideos.theaudiodb.com/resources/language/Portuguese (Brazil)/strings.xml b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Portuguese (Brazil)/strings.xml index 32bff6a511..9419790121 100644 --- a/addons/metadata.musicvideos.theaudiodb.com/resources/language/Portuguese (Brazil)/strings.xml +++ b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Portuguese (Brazil)/strings.xml @@ -5,4 +5,5 @@ <strings> <string id="30000">Obter miniaturas de álbuns de fanart.tv</string> + <string id="30001">Pegar miniaturas de álbum de theaudiodb.com</string> </strings> diff --git a/addons/metadata.musicvideos.theaudiodb.com/resources/language/Portuguese/strings.xml b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Portuguese/strings.xml index d31d2b9d60..2f36fc37da 100644 --- a/addons/metadata.musicvideos.theaudiodb.com/resources/language/Portuguese/strings.xml +++ b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Portuguese/strings.xml @@ -5,4 +5,5 @@ <strings> <string id="30000">Obter miniaturas de álbum em fanart.tv</string> + <string id="30001">Obter miniaturas de álbum em theaudiodb.com</string> </strings> diff --git a/addons/metadata.musicvideos.theaudiodb.com/resources/language/Romanian/strings.xml b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Romanian/strings.xml index 555f442a6b..94321b72ec 100644 --- a/addons/metadata.musicvideos.theaudiodb.com/resources/language/Romanian/strings.xml +++ b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Romanian/strings.xml @@ -5,4 +5,5 @@ <strings> <string id="30000">Obţine imagini albume de la fanart.tv</string> + <string id="30001">Obţine imagini albume de la theaudiodb.com</string> </strings> diff --git a/addons/metadata.musicvideos.theaudiodb.com/resources/language/Spanish (Argentina)/strings.xml b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Spanish (Argentina)/strings.xml index 27fb72c87f..e747f649c8 100644 --- a/addons/metadata.musicvideos.theaudiodb.com/resources/language/Spanish (Argentina)/strings.xml +++ b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Spanish (Argentina)/strings.xml @@ -4,5 +4,6 @@ <!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> <strings> - <string id="30000">Obtener miniatura de album de fanart.tv</string> + <string id="30000">Obtener miniaturas de álbum de fanart.tv</string> + <string id="30001">Descargar miniaturas de álbum de theaudiodb.com</string> </strings> diff --git a/addons/metadata.musicvideos.theaudiodb.com/resources/language/Spanish/strings.xml b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Spanish/strings.xml index 54d3c5dabd..1ed1694bab 100644 --- a/addons/metadata.musicvideos.theaudiodb.com/resources/language/Spanish/strings.xml +++ b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Spanish/strings.xml @@ -5,4 +5,5 @@ <strings> <string id="30000">Obtener miniatura de álbum de fanart.tv</string> + <string id="30001">Descargar miniaturas de álbum desde theaudiodb.com</string> </strings> diff --git a/addons/metadata.musicvideos.theaudiodb.com/resources/language/Tamil (India)/strings.xml b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Tamil (India)/strings.xml new file mode 100644 index 0000000000..2206e4558f --- /dev/null +++ b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Tamil (India)/strings.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- Translated using Transifex web application. For support, or if you would like to to help out, please visit your language team! --> +<!-- Tamil (India) language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/ta_IN/ --> +<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> + +<strings> + <string id="30000">ஆல்பம் குருபடங்களை fanart.tv இருந்து கைப்பற்று</string> + <string id="30001">ஆல்பம் குருபடங்களை theaudiodb.com இருந்து கைப்பற்று</string> +</strings> diff --git a/addons/metadata.musicvideos.theaudiodb.com/resources/language/Turkish/strings.xml b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Turkish/strings.xml new file mode 100644 index 0000000000..683e8d52d8 --- /dev/null +++ b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Turkish/strings.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- Translated using Transifex web application. For support, or if you would like to to help out, please visit your language team! --> +<!-- Turkish language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/tr/ --> +<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> + +<strings> + <string id="30000">Albüm kapaklarını fanart.tv'den al</string> +</strings> diff --git a/addons/metadata.musicvideos.theaudiodb.com/resources/language/Ukrainian/strings.xml b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Ukrainian/strings.xml new file mode 100644 index 0000000000..e0a757787f --- /dev/null +++ b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Ukrainian/strings.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- Translated using Transifex web application. For support, or if you would like to to help out, please visit your language team! --> +<!-- Ukrainian language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/uk/ --> +<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> + +<strings> + <string id="30000">Отримати малюнки альбому з fanart.tv</string> +</strings> diff --git a/addons/metadata.musicvideos.theaudiodb.com/resources/language/Vietnamese/strings.xml b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Vietnamese/strings.xml new file mode 100644 index 0000000000..43f5a0c618 --- /dev/null +++ b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Vietnamese/strings.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- Translated using Transifex web application. For support, or if you would like to to help out, please visit your language team! --> +<!-- Vietnamese language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/vi/ --> +<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> + +<strings> + <string id="30000">Lấy hình đại diện album từ nguồn fanart.tv</string> +</strings> diff --git a/addons/metadata.musicvideos.theaudiodb.com/resources/language/Welsh/strings.xml b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Welsh/strings.xml new file mode 100644 index 0000000000..bcc3a8e13a --- /dev/null +++ b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Welsh/strings.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- Translated using Transifex web application. For support, or if you would like to to help out, please visit your language team! --> +<!-- Welsh language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/cy/ --> +<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> + +<strings> + <string id="30000">Estyn lluniau bach album o fanart.tv</string> + <string id="30001">Estynnwch luniau bach albwm o theaudiodb.com</string> +</strings> diff --git a/addons/metadata.musicvideos.theaudiodb.com/resources/settings.xml b/addons/metadata.musicvideos.theaudiodb.com/resources/settings.xml index ea430f171c..fa23fe04ab 100644 --- a/addons/metadata.musicvideos.theaudiodb.com/resources/settings.xml +++ b/addons/metadata.musicvideos.theaudiodb.com/resources/settings.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <settings> - <setting label="30000" type="bool" id="fanarttvalbumthumbs" default="true"/> + <setting label="30001" type="bool" id="tadbalbumthumbs" default="true"/> + <setting label="30000" type="bool" id="fanarttvalbumthumbs" default="false"/> </settings> diff --git a/addons/metadata.musicvideos.theaudiodb.com/tadb.xml b/addons/metadata.musicvideos.theaudiodb.com/tadb.xml index 2305e2d09b..100c0bd6fe 100644 --- a/addons/metadata.musicvideos.theaudiodb.com/tadb.xml +++ b/addons/metadata.musicvideos.theaudiodb.com/tadb.xml @@ -1,12 +1,26 @@ <?xml version="1.0" encoding="UTF-8"?> -<scraper framework="1.1" date="2012-06-10"> +<scraper framework="1.1" date="2013-04-03"> + <NfoUrl dest="3"> + <RegExp input="$$1" output="<url>http://www.theaudiodb.com/api/v1/json/58424d43204d6564696120/track.php?h=\1</url>" dest="3"> + <expression>http://www.theaudiodb.com/track/(.+)</expression> + </RegExp> + </NfoUrl> <CreateSearchUrl dest="3"> - <RegExp input="$$1" output="<url>http://www.theaudiodb.com/api/v1/json/58424d43204d6564696120/searchtrack.php?s=\1&t=\2</url>" dest="3"> - <expression trim="1,2">(.+)%20%20%20(.+)</expression> + <RegExp input="$$5" output="\1" dest="3"> + <RegExp input="$$1" output="<url>http://www.theaudiodb.com/api/v1/json/58424d43204d6564696120/searchtrack.php?s=\1&amp;t=\2</url>" dest="6"> + <expression trim="1,2">(.+)%20(?:%20|-)%20(.+)</expression> + </RegExp> + <RegExp input="$$6" output="\1" dest="5"> + <expression noclean="1" /> + </RegExp> + <RegExp input="$$6" output="<url>http://www.theaudiodb.com/api/v1/json/58424d43204d6564696120/searchtrack.php?s=$$1&amp;t=</url>" dest="5"> + <expression>^$</expression> + </RegExp> + <expression noclean="1" /> </RegExp> </CreateSearchUrl> <GetSearchResults dest="3"> - <RegExp input="$$5" output="<results>\1</results>" dest="3"> + <RegExp input="$$5" output="<results sorted="yes">\1</results>" dest="3"> <RegExp input="$$1" output="<entity><title>\5 - \3 [\4]</title><url cache="tadb-\1.json">http://www.theaudiodb.com/api/v1/json/58424d43204d6564696120/track.php?h=\1</url></entity>" dest="5"> <expression repeat="yes" clear="yes" fixchars="1" noclean="1">idTrack":"([^"]*)","idAlbum":"([^"]*).*?"strTrack":"([^"]*)","strAlbum":"([^"]*)","strArtist":"([^"]*)</expression> </RegExp> @@ -25,13 +39,25 @@ <expression fixchars="1" noclean="1">strAlbum":"([^"]*)"</expression> </RegExp> <RegExp input="$$1" output="<plot>\1</plot>" dest="5+"> - <expression fixchars="1" noclean="1">strDescription":"(.*?)","</expression> + <expression fixchars="1" noclean="1">strDescriptionEN":"(.*?)","</expression> + </RegExp> + <RegExp input="$$1" output="<director>\1</director>" dest="5+"> + <expression fixchars="1" noclean="1">strMusicVidDirector":"(.*?)","</expression> </RegExp> - <RegExp input="$$1" output="<genre>\1</genre>" dest="5+"> - <expression fixchars="1" noclean="1">strGenre":"([^"]*)"</expression> + <RegExp input="$$1" output="<studio>\1</studio>" dest="5+"> + <expression fixchars="1" noclean="1">strMusicVidCompany":"(.*?)","</expression> </RegExp> <RegExp input="$$1" output="<thumb>\1</thumb>" dest="5+"> - <expression fixchars="1" noclean="1">strTrackThumb":"([^"]*)"</expression> + <expression repeat="yes">strMusicVidScreen1\d?":"([^"]*)</expression> + </RegExp> + <RegExp input="$$1" output="<chain function="GetTADBAlbumGenresByMBID">\1</chain>" dest="5+"> + <expression fixchars="1" noclean="1">strMusicBrainzAlbumID":"([^"]*)"</expression> + </RegExp> + <RegExp input="$$1" output="<chain function="GetTADBAlbumDateByMBID">\1</chain>" dest="5+"> + <expression fixchars="1" noclean="1">strMusicBrainzAlbumID":"([^"]*)"</expression> + </RegExp> + <RegExp conditional="tadbalbumthumbs" input="$$1" output="<chain function="GetTADBAlbumThumbsByMBID">\1</chain>" dest="5+"> + <expression fixchars="1" noclean="1">strMusicBrainzAlbumID":"([^"]*)"</expression> </RegExp> <RegExp conditional="fanarttvalbumthumbs" input="$$1" output="<chain function="GetFanartTvAlbumThumbsByMBID">\1</chain>" dest="5+"> <expression fixchars="1" noclean="1">strMusicBrainzAlbumID":"([^"]*)"</expression> diff --git a/addons/metadata.themoviedb.org/addon.xml b/addons/metadata.themoviedb.org/addon.xml index 15568ca168..5130cce1b1 100644 --- a/addons/metadata.themoviedb.org/addon.xml +++ b/addons/metadata.themoviedb.org/addon.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <addon id="metadata.themoviedb.org" name="The Movie Database" - version="3.7.2" + version="3.7.3" provider-name="Team XBMC"> <requires> <import addon="xbmc.metadata" version="1.0"/> @@ -19,6 +19,7 @@ <summary lang="bg">Сваля инф. за филми от TMDB</summary> <summary lang="ca">Arreplegador de pel·lícules TMDB</summary> <summary lang="cs">Zdroj zisku dat k filmům TMDB</summary> + <summary lang="cy">Crafwr Ffilmiau TMDB</summary> <summary lang="da">TMDB Scraper til Film</summary> <summary lang="de">Film Scraper für TheMovieDB</summary> <summary lang="el">Scraper Ταινιών του TMDb</summary> @@ -31,6 +32,7 @@ <summary lang="fr">Collecteur de Films TMDB</summary> <summary lang="gl">Scraper de Filme de TMDB</summary> <summary lang="he">TMDB סקרייפר סרטים</summary> + <summary lang="hr">TMDB Oboogatite svoje Filmske Informacije</summary> <summary lang="hu">TMDB filmadat leolvasó</summary> <summary lang="it">Ricercatore per TMDB Movie</summary> <summary lang="ja">TMDB映画のスクレーパー</summary> @@ -38,7 +40,9 @@ <summary lang="lt">TMDB Filmų Scraper</summary> <summary lang="mk">TMDB инфо за филмови</summary> <summary lang="ml">മൂവി ഡി ബി, വിവരശേഖരം</summary> + <summary lang="my">TMDB Movie Scraper</summary> <summary lang="nl">TMDb-filmscraper</summary> + <summary lang="no">TMDb filminformasjon</summary> <summary lang="pl">Scraper filmowy TMDB</summary> <summary lang="pt">Scraper de filmes TMDb</summary> <summary lang="pt_BR">Scraper de Filmes TMDb</summary> @@ -48,13 +52,17 @@ <summary lang="sk">TheMovieDB filmový sťahovač</summary> <summary lang="sl">Ponudnik informacij o filmih TMDB</summary> <summary lang="sv">TMDB Filmskrapa</summary> + <summary lang="ta_IN">LastFM நிகழ்படம் சுரண்டி</summary> <summary lang="th">ตัวรับข้อมูลภาพยนต์ TMDB</summary> + <summary lang="vi">Trình lấy dữ liệu Phim từ TMDB</summary> <summary lang="zh">TMDB电影刮削器</summary> + <summary lang="zh_TW">TMDB 電影搜括器</summary> <description lang="af">themoviedb.org is 'n verniet en oop fliek databasis. Dit is totaal gebruiker gedryf deur mense soos jy. TMDB word huidiglik deur miljoene mense elke maand gebruik, en met hulle kragtige API word dit ook deur baie gewilde media sentrums soos XBMC gebruik om Fliek Metadata, Plakkate en Ondersteunerkuns te onttrek om die gebruiker se ondervinding te verryk.</description> <description lang="be">themoviedb.org is a free and open movie database. It's completely user driven by people like you. TMDb is currently used by millions of people every month and with their powerful API, it is also used by many popular media centers like XBMC to retrieve Movie Metadata, Posters and Fanart to enrich the user's experience.</description> <description lang="bg">themoviedb.org е безплатна и отворена база от данни за филми. Задвижва се изцяло от потребителите си - хора като вас. Милиони хора по света всеки месец ползват TMDb, благодарение на многофункционалното API. Едновременно с това е и източник на информация за медийни центрове, като XBMC, които извличат метаинформация за филми, постери и Fanart.</description> <description lang="ca">themoviedb.org és una base de dades oberta i lliure. Es manté completament per usuaris, per gent com tu. TMDb s'utilitza actualment per milions de persones cada mes i amb la seva potent API també és utilitzada per molts centre media populas com l'XBMC per obtenir les meta-dades de pel·lícules, pósters i fanart per enriquir l'experiència d'usuari.</description> <description lang="cs">themoviedb.org je otevřená a svobodná databáze filmů. Je řízena uživateli, tedy lidmi jako vy. TMDB je každý měsíc používána milióny lidí a se svým výborným API je také používano mnoha populárními mediálními centry jako je XBMC, k získávání metadat, plagátů a fanartu filmů pro obohacení uživatelského zážitku.</description> + <description lang="cy">Mae themoviedb.org yn gronfa ddata ffilmiau rhydd ac agored. Mae'n cael ei yrru gan ddefnyddwyr fel chi. Mae TMDb yn cael ei ddefnyddio gan filiynau o bobl bob mis a gyda'i API pwerus, mae'n cael ei ddefnyddio gan lawer o'r canolfannau cyfrwng fel XBMC i estyn metadata ffilmiau, posteri a chelf er mwyn cyfoethogi profiad defnyddwyr.</description> <description lang="da">themoviedb.org er en fri og åben filmdatabase. Den er helt og aldeles brugerdrevet af folk som dig. TMDb bruges i dag af millioner af mennesker hver måned, og med deres kraftfulde API er den også brugt af mange populære mediecentre såsom XBMC til at hente metadata, plakater og fankunst til film, for at berige brugerens oplevelse.</description> <description lang="de">TheMovieDB.org ist eine freie und offene Filmdatenbank. Sie wird von Benutzern wie Dir betrieben. TheMovieDB wird zur Zeit monatlich von Millionen genutzt. Mit der mächtigen API wird sie auch von vielen Media-Center, wie z.B. XBMC, genutzt um Film Metadaten, Poster und Fanarts zu beziehen, damit der Benutzer sein Media-Center verschönern kann.</description> <description lang="el">Το themoviedb.org είναι μία δωρεάν και ανοικτή βάση δεδομένων ταινιών. Διαχειρίζεται πλήρως από ανθρώπους σαν και εσάς. Το TMDb χρησιμοποιείται από εκατομμύρια ανθρώπους κάθε μήνα, και με το πανίσχυρο API τους, χρησιμοποιείται και από πολλά δημοφιλή κέντρα πολυμέσων όπως το XBMC για να λαμβάνουν μετα-δεδομένα Ταινιών, Αφίσες και Fanart για εμπλουτισμό της εμπειρίας του χρήστη.</description> @@ -67,6 +75,7 @@ <description lang="fr">themoviedb.org est une base de données gratuite et libre d'accès de films. Elle est totalement gérée par les utilisateurs. TMDb est actuellement utilisée par des millions de personnes chaque mois et, grâce à ses puissantes fonctions et routines, elle est également utilisée par de nombreux Media Centers populaires comme XBMC aux fins de récupération des Métadonnées, Posters et Fanarts des films en vue d'améliorer l'expérience de l'utilisateur.</description> <description lang="gl">themoviedb.org é una base de datos sobre filmes libre e aberta, impulsada por xente coma ti. Na actualidade TMDb é usada por millóns de persoas todos os meses, e grazas ó seu potente API, usado por algúns dos centros multimedia máis populares como XBMC para obter a información dos filmes, Posters e Fanart e así mellorar a experiencia do usuario.</description> <description lang="he">themoviedb.org is a free and open movie database. It's completely user driven by people like you. TMDb is currently used by millions of people every month and with their powerful API, it is also used by many popular media centers like XBMC to retrieve Movie Metadata, Posters and Fanart to enrich the user's experience.</description> + <description lang="hr">themoviedb.org je besplatna i open surce baza podataka za Filmske informacije. TMDb trenutno koriste milijuni ljudi svaki mjesec, on se također koristi od strane mnogih popularnih medijskih centara poput XBMC.Besplatno dohvatite Filmske metapodatake, plakate i Fanart-ove. Obogatiti si korisničko iskustvo.</description> <description lang="hu">A themoviedb.org egy ingyenes és nyílt filmadatbázis. Teljes egészében olyan felhasználók töltik fel, mint például Te. A TMDb-t havonta emberek milliói használják és a hatékony API-n keresztül számos népszerű média center is, mint például az XBMC a filmadatok, poszterek, fanartképek letöltésére.</description> <description lang="it">themoviedb.org è un database libero e aperto. E' gestito da utenti e persone come te. Viene usato correntemente da millioni di persone ogni mese e con le sue potenti API, è anche utilizzato da molti popolari media centers come XBMC per ottenere Metadati, Posters e Fanart di film per arricchire la loro esperienza utente.</description> <description lang="ja">themoviedb.org は自由でオープンな映画データベースです。その運営は、完全にユーザ主導で行われています。TMDb は現在毎月何百万人もの人に利用されているほか、XBMC のようなメディアセンターも、TMDb のパワフルな API を介して映画メタデータ、ポスター、ファンアートを取得し、使い勝手を向上させるなどして使っています。</description> @@ -75,6 +84,7 @@ <description lang="mk">themoviedb.org is a free and open movie database. It's completely user driven by people like you. TMDb is currently used by millions of people every month and with their powerful API, it is also used by many popular media centers like XBMC to retrieve Movie Metadata, Posters and Fanart to enrich the user's experience.</description> <description lang="ml">മൂവി ഡി ബി, എല്ലാവർക്കും കൈവക്കാവുന്ന ഒരു സൗജന്യ വിവരശേഖരമാണ്. ഇതുമൂലം ലോകം മുഴുവനും സിനിമാ പോസ്റ്ററുകൾ എല്ലവരും കാണുന്നു</description> <description lang="nl">Themoviedb.org is een vrije en open filmdatabank. Gebruikers zoals jij vormen de motor van deze site. Op dit moment gebruiken elke maand miljoenen mensen TMDb. De krachtige API van de site laat mediacenters zoals XBMC toe om metadata, posters en fanart op te halen en zo de gebruikerservaring te verrijken.</description> + <description lang="no">themoviedb.org er en gratis og åpen filmdatabase. Den drives helt og fullt av mennesker som deg. TMDb brukes av millioner av mennesker hver måned og med sitt gode API, brukes den også av mange popluære mediasenterløsninger som XBMC for å hente metadata for filmer, plakater og fanart for å gi en bedre brukeropplevelse.</description> <description lang="pl">themoviedb.org jest wolną i otwartą filmową bazą danych. Jest zarządzana całkowicie przez osoby takie jak Ty. Obecnie odwiedzają ją miliony osób miesięcznie, a dzięki dostępności API jest używana w wielu media center, takich jak XBMC, do pobierania informacji o filmach, plakatów i fanartów.</description> <description lang="pt">O themoviedb.org é uma base de dados de filmes livre e aberta. É actualizado inteiramente por pessoas como você e usado por milhões todos os meses. Com o poderoso motor de busca disponível, também se tornou no favorito para muitos programas de centro de média, como o popular XBMC, para obter informação, posters e fanart que enriquecem a experiência do utilizador.</description> <description lang="pt_BR">O themoviedb.org é um banco de dados aberto e gratuito. É completamente operado por pessoas como você. O TMDb é atualmente usado por milhares de pessoas a cada mês e com sua poderosa API, é usado por muitas centrais de mídia populares como o XBMC para buscar metadados, cartazes e fanart de filmes para enriquecer a experiência do usuário.</description> @@ -84,8 +94,12 @@ <description lang="sk">themoviedb.org je voľná a otvorená databáza filmov. Je výlučne vedená užívateľmi ako si ty. TMDb je každý mesiac používaná miliónmi ľudí, a vďaka svojmu výkonnému API je veľmi populárna medzi 'media centrami' ako XBMC pre sťahovanie filmových metadát, plagátov a fanartov pre obohatenie zážitkov.</description> <description lang="sl">themoviedb.org je brezplačna in prosta baza filmov. Je v celoti ustvarjena s strani uporabnikov kot ste vi. TMDB uporablja miljone ljudi in z njihovo močno API, jo lahko uporabljate tudi v multimedijskih centrih kot XBMC, s tem prenesete informacije o filmih, plakate in ozadja ter s tem popestrite uporabniško izkušnjo.</description> <description lang="sv">themoviedb.org är en gratis och öppen filmdatabas. Den drivs helt av människor som du. TMDb används för närvarande av miljoner människor varje månad och med deras kraftfulla API används den även av många populära mediacenter som t.ex. XBMC för att hämta metadata om filmer, affischer och fanart för att berika användarens upplevelse.</description> + <description lang="ta_IN">themoviedb.org ஒரு இலவச மற்றும் திறந்த திரைப்பட தரவுத்தளம் ஆகும். இந்த தரவுத்தளம் முற்றிலும் பயனர் மக்களால் இயக்கப்படுகிறது. TMDb அவர்களது சக்திவாய்ந்த API இனால் தற்போது பல இலட்சக்கணக்கான மக்களால் ஒவ்வொரு மாதமும் பயன்படுத்தப்படுகிறது, இது XBMC போன்ற பல பிரபல ஊடக மையங்களில் பயனர் அனுபவத்தை மேம்படுத்த பயன்படுத்தப்படுகிறது.</description> <description lang="th">themoviedb.org เป็นฐานข้อมูลภาพยนตร์ที่ฟรีและเปิดกว้าง. มันถูกขับเคลื่อนจากผู้ใช้ โดยคนเช่นคุณ. TMDb ปัจจุบันมีการใช้โดยคนนับล้านในแต่ละเดือน และมีประสิทธิภาพด้วย API ของพวกเขา , มันยังถูกใช้โดยหลายศูนย์สื่อที่นิยมเช่น XBMC เพื่อดึง อธิบายข้อมูลภาพยนตร์, โปสเตอร์และ แฟนอาร์ต เพื่อเพิ่มประสบการณ์ของผู้ใช้</description> + <description lang="uk">themoviedb.org - це безкоштовна і відкрита база даних фільмів. Вона повністю підтримується звичайними людьми. В даний момент сайт TMDb використовують мільйони людей кожен місяць, і завдяки потужному API, його можуть використовувати різні популярні медіацентри, такі як XBMC, щоб отримувати метадані, постери і фанарт для фільмів з метою оформлення інтерфейсу.</description> + <description lang="vi">themoviedb.org là cơ sở dữ liệu về phim ảnh mở và miễn phí. Nó hoàn toàn được kiểm soát bởi những người như bạn. TMDb hiện tại đang được sử dụng bởi hàng triệu người dùng hàng tháng và với sự hỗ trợ của bộ API mạnh mẽ nó cũng được sử dụng bởi những thiết bị giải trí cá nhân như XBMC cho việc lấy dữ liệu về Phim ảnh, Poster và Fanart để làm tăng trải nghiệm của người sử dụng</description> <description lang="zh">themoviedb.org是一个开放和自由的电影数据库。它完全由象你一样的用户来掌控。TMDb每月为上百万用户提供服务，并通过强大的API界面为许多流行的媒体中心系统如XBMC提供电影资料、封面海报和同人画以丰富用户的体验。</description> + <description lang="zh_TW">themoviedb.org是一個免費和開放的電影資料庫。它是完全由與您一樣的廣大使用者來更新資訊。 TMDb目前擁有數以百萬計的使用人次並且有著強大的API，許多受歡迎的媒體中心平台像XBMC藉由TMDb獲取電影的數據資料庫，海報和影片資訊，以豐富使用者體驗。</description> <platform>all</platform> </extension> </addon> diff --git a/addons/metadata.themoviedb.org/changelog.txt b/addons/metadata.themoviedb.org/changelog.txt index c242425df3..63196789f7 100644 --- a/addons/metadata.themoviedb.org/changelog.txt +++ b/addons/metadata.themoviedb.org/changelog.txt @@ -1,3 +1,6 @@ +[B]3.7.3[/B] +- updated language files from Transifex + [B]3.7.2[/B] - updated language files from Transifex diff --git a/addons/metadata.themoviedb.org/resources/language/Albanian/strings.xml b/addons/metadata.themoviedb.org/resources/language/Albanian/strings.xml new file mode 100644 index 0000000000..e960a5db1f --- /dev/null +++ b/addons/metadata.themoviedb.org/resources/language/Albanian/strings.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- Translated using Transifex web application. For support, or if you would like to to help out, please visit your language team! --> +<!-- Albanian language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/sq/ --> +<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> + +<strings> + <string id="30000">Aktivo "Fanart'in"</string> +</strings> diff --git a/addons/metadata.themoviedb.org/resources/language/Amharic/strings.xml b/addons/metadata.themoviedb.org/resources/language/Amharic/strings.xml new file mode 100644 index 0000000000..0160016ea5 --- /dev/null +++ b/addons/metadata.themoviedb.org/resources/language/Amharic/strings.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- Translated using Transifex web application. For support, or if you would like to to help out, please visit your language team! --> +<!-- Amharic language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/am/ --> +<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> + +<strings> + <string id="30002">የተመረጠው ቋንቋ</string> + <string id="30003">ደረጃ ያግኙ ከ </string> + <string id="30005">ዋናውን አርእስት ጠብቅ </string> + <string id="30006">የተመረጠው የምስክር ወረቀት አገር </string> +</strings> diff --git a/addons/metadata.themoviedb.org/resources/language/Basque/strings.xml b/addons/metadata.themoviedb.org/resources/language/Basque/strings.xml new file mode 100644 index 0000000000..a1048de9d1 --- /dev/null +++ b/addons/metadata.themoviedb.org/resources/language/Basque/strings.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- Translated using Transifex web application. For support, or if you would like to to help out, please visit your language team! --> +<!-- Basque language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/eu/ --> +<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> + +<strings> + <string id="30000">Gaitu Fanarta</string> +</strings> diff --git a/addons/metadata.themoviedb.org/resources/language/Burmese/strings.xml b/addons/metadata.themoviedb.org/resources/language/Burmese/strings.xml new file mode 100644 index 0000000000..164c51a429 --- /dev/null +++ b/addons/metadata.themoviedb.org/resources/language/Burmese/strings.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- Translated using Transifex web application. For support, or if you would like to to help out, please visit your language team! --> +<!-- Burmese language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/my/ --> +<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> + +<strings> + <string id="30000">Enable Fanart</string> + <string id="30001">HD-Trailers.net မှသင့်လျှော်သော ကြော်ငြာ</string> + <string id="30002">သင့်လျှော်သော ဘာသာစကား</string> + <string id="30004">ကြော်ငြာများရယူမည်(You Tube)</string> + <string id="30005">မူလခေါင်းစဉ်အတိုင်းထားမည်</string> +</strings> diff --git a/addons/metadata.themoviedb.org/resources/language/Chinese (Traditional)/strings.xml b/addons/metadata.themoviedb.org/resources/language/Chinese (Traditional)/strings.xml index 84f20c29af..0fa9678c2f 100644 --- a/addons/metadata.themoviedb.org/resources/language/Chinese (Traditional)/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Chinese (Traditional)/strings.xml @@ -5,4 +5,10 @@ <strings> <string id="30000">啟用 Fanart</string> + <string id="30001">偏好從HD-Trailers.net取得預告片</string> + <string id="30002">偏好的語言</string> + <string id="30003">從...取得評價</string> + <string id="30004">啟用預告片 (YouTube)</string> + <string id="30005">保留原始標題</string> + <string id="30006">偏好的認證國家</string> </strings> diff --git a/addons/metadata.themoviedb.org/resources/language/Croatian/strings.xml b/addons/metadata.themoviedb.org/resources/language/Croatian/strings.xml new file mode 100644 index 0000000000..0427392b8c --- /dev/null +++ b/addons/metadata.themoviedb.org/resources/language/Croatian/strings.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- Translated using Transifex web application. For support, or if you would like to to help out, please visit your language team! --> +<!-- Croatian language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/hr/ --> +<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> + +<strings> + <string id="30000">Omogući "Fanart"</string> + <string id="30001">Preferiraj Najave filmova kroz HD-Trailers.net</string> + <string id="30002">Preferirani Jezik</string> + <string id="30003">Nabavite ocijene od</string> + <string id="30004">Omogući Najave (YouTube)</string> + <string id="30005">Zadržite izvorni naslov</string> + <string id="30006">Preferiraj Cerfikate Država</string> +</strings> diff --git a/addons/metadata.themoviedb.org/resources/language/Finnish/strings.xml b/addons/metadata.themoviedb.org/resources/language/Finnish/strings.xml index ab425a5364..e9fae2fe82 100644 --- a/addons/metadata.themoviedb.org/resources/language/Finnish/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Finnish/strings.xml @@ -1,9 +1,8 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- Translated using Transifex web application. For support, or if you would like to to help out, please visit your language team! --> +<!-- Finnish language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/fi/ --> +<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> + <strings> <string id="30000">Fanitaide käytössä</string> - <string id="30004">Trailerit käytössä</string> - <string id="30001">Valitse ensisijaisesti trailerit HD-Trailers.net -sivustolta</string> - <string id="30002">Ensisijainen kieli</string> - <string id="30003">Hae arvosana IMDb:stä</string> - <string id="30005">Näytä alkuperäinen nimi</string> </strings> diff --git a/addons/metadata.themoviedb.org/resources/language/Malay/strings.xml b/addons/metadata.themoviedb.org/resources/language/Malay/strings.xml new file mode 100644 index 0000000000..dffdc26135 --- /dev/null +++ b/addons/metadata.themoviedb.org/resources/language/Malay/strings.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- Translated using Transifex web application. For support, or if you would like to to help out, please visit your language team! --> +<!-- Malay language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/ms/ --> +<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> + +<strings> + <string id="30000">Membolehkan Fanart</string> +</strings> diff --git a/addons/metadata.themoviedb.org/resources/language/Norwegian/strings.xml b/addons/metadata.themoviedb.org/resources/language/Norwegian/strings.xml index 82168519e4..65d6c81283 100644 --- a/addons/metadata.themoviedb.org/resources/language/Norwegian/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Norwegian/strings.xml @@ -4,9 +4,11 @@ <!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> <strings> + <string id="30000">Hent fanart</string> <string id="30001">Foretrekk trailer fra HD-Trailers.net</string> <string id="30002">Foretrukket språk</string> <string id="30003">Hent rangering fra</string> <string id="30004">Aktive trailer (YouTube)</string> <string id="30005">Bruk originaltittel</string> + <string id="30006">Foretrukket land for aldersgrense</string> </strings> diff --git a/addons/metadata.themoviedb.org/resources/language/Polish/strings.xml b/addons/metadata.themoviedb.org/resources/language/Polish/strings.xml index 8044cf8f90..bdf08701bf 100644 --- a/addons/metadata.themoviedb.org/resources/language/Polish/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Polish/strings.xml @@ -10,5 +10,5 @@ <string id="30003">Pobierz ocenę z</string> <string id="30004">Włącz zwiastuny (YouTube)</string> <string id="30005">Zachowaj oryginalny tytuł</string> - <string id="30006">Prefeowany kraj certyfikacji</string> + <string id="30006">Preferowany kraj certyfikacji</string> </strings> diff --git a/addons/metadata.themoviedb.org/resources/language/Tamil (India)/strings.xml b/addons/metadata.themoviedb.org/resources/language/Tamil (India)/strings.xml new file mode 100644 index 0000000000..bd2db7938f --- /dev/null +++ b/addons/metadata.themoviedb.org/resources/language/Tamil (India)/strings.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- Translated using Transifex web application. For support, or if you would like to to help out, please visit your language team! --> +<!-- Tamil (India) language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/ta_IN/ --> +<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> + +<strings> + <string id="30000">விசிறிபடத்தை காண்பி</string> + <string id="30001">HD-Trailers.net இருந்து வரும் டிரெய்லர்களை விரும்பு</string> + <string id="30002">விரும்பிய மொழி</string> + <string id="30003">தரத்தை கைப்பற்று</string> + <string id="30004">டிரெய்லர் செயல்படுத்த (YouTube)</string> + <string id="30005">அசல் தலைப்பை வைக்க</string> + <string id="30006">விருப்பமான சான்றிதழ் நாடு</string> +</strings> diff --git a/addons/metadata.themoviedb.org/resources/language/Turkish/strings.xml b/addons/metadata.themoviedb.org/resources/language/Turkish/strings.xml index f30e711c24..85703d1b83 100644 --- a/addons/metadata.themoviedb.org/resources/language/Turkish/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Turkish/strings.xml @@ -4,6 +4,7 @@ <!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> <strings> + <string id="30000">Fanart Etkinleştir</string> <string id="30002">Tercih Edilen Dil</string> <string id="30004">Fragmanı Etkinleştir (YouTube)</string> <string id="30005">Özgün Başlığı Koru</string> diff --git a/addons/metadata.themoviedb.org/resources/language/Ukrainian/strings.xml b/addons/metadata.themoviedb.org/resources/language/Ukrainian/strings.xml new file mode 100644 index 0000000000..468a24576e --- /dev/null +++ b/addons/metadata.themoviedb.org/resources/language/Ukrainian/strings.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- Translated using Transifex web application. For support, or if you would like to to help out, please visit your language team! --> +<!-- Ukrainian language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/uk/ --> +<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> + +<strings> + <string id="30000">Завантажувати фанарт</string> + <string id="30002">Вибір мови</string> + <string id="30003">Отримати рейтинг з</string> +</strings> diff --git a/addons/metadata.themoviedb.org/resources/language/Uzbek/strings.xml b/addons/metadata.themoviedb.org/resources/language/Uzbek/strings.xml new file mode 100644 index 0000000000..8051b4cac5 --- /dev/null +++ b/addons/metadata.themoviedb.org/resources/language/Uzbek/strings.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- Translated using Transifex web application. For support, or if you would like to to help out, please visit your language team! --> +<!-- Uzbek language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/uz/ --> +<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> + +<strings> + <string id="30002">Afzal til</string> +</strings> diff --git a/addons/metadata.themoviedb.org/resources/language/Vietnamese/strings.xml b/addons/metadata.themoviedb.org/resources/language/Vietnamese/strings.xml new file mode 100644 index 0000000000..c99544f1ae --- /dev/null +++ b/addons/metadata.themoviedb.org/resources/language/Vietnamese/strings.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- Translated using Transifex web application. For support, or if you would like to to help out, please visit your language team! --> +<!-- Vietnamese language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/vi/ --> +<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> + +<strings> + <string id="30000">Sử dụng Fanart</string> + <string id="30001">Ưu tiên Phim giới thiệu từ HD-Trailers.net</string> + <string id="30002">Ưu tiên ngôn ngữ</string> + <string id="30003">Lấy Đánh giá từ</string> + <string id="30004">Sử dụng Phim giới thiệu (YouTube)</string> + <string id="30005">Giữ nguyên tên phim gốc</string> + <string id="30006">Ưu tiên chứng chỉ của quốc gia</string> +</strings> diff --git a/addons/metadata.themoviedb.org/resources/language/Welsh/strings.xml b/addons/metadata.themoviedb.org/resources/language/Welsh/strings.xml new file mode 100644 index 0000000000..28d08f8184 --- /dev/null +++ b/addons/metadata.themoviedb.org/resources/language/Welsh/strings.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- Translated using Transifex web application. For support, or if you would like to to help out, please visit your language team! --> +<!-- Welsh language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/cy/ --> +<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> + +<strings> + <string id="30000">Galluogi Celf</string> + <string id="30001">Dewis Cyflwyniadau o HD-Trailers.net</string> + <string id="30002">Dewis Iaith</string> + <string id="30003">Graddio gan</string> + <string id="30004">Galluogi Cyflwyniadau (YouTube)</string> + <string id="30005">Cadw'r Teitl Gwreiddiol</string> + <string id="30006">Gwlad Tysytysgrifo Dewisol</string> +</strings> diff --git a/addons/metadata.tvdb.com/addon.xml b/addons/metadata.tvdb.com/addon.xml index 4e0bcb7bdd..80db092cb4 100644 --- a/addons/metadata.tvdb.com/addon.xml +++ b/addons/metadata.tvdb.com/addon.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <addon id="metadata.tvdb.com" name="The TVDB" - version="1.4.5" + version="1.5.4" provider-name="Team XBMC"> <requires> - <import addon="xbmc.metadata" version="1.0"/> + <import addon="xbmc.metadata" version="2.1.0"/> </requires> <extension point="xbmc.metadata.scraper.tvshows" language="multi" @@ -15,6 +15,7 @@ <summary lang="be">Fetch TV show metadata from TheTVDB.com</summary> <summary lang="bg">Изтегля информация за ТВ Сериали от TheTVDB.com</summary> <summary lang="cs">Získat metadata televizního pořadu z TheTVDB.com</summary> + <summary lang="cy">Estyn metadata sioeau Teledu o TheTVDB.com</summary> <summary lang="da">Hent metadata til TV-serier fra TheTVDB.com</summary> <summary lang="de">Scraper für Fernsehserien von TheTVDB.com</summary> <summary lang="el">Λήψη μετα-δεδομένων σειρών από το TVDB.com</summary> @@ -22,10 +23,12 @@ <summary lang="es">Recuperar metadatos de series de TV en TheTVDB.com</summary> <summary lang="es_AR">Recuperar metadatos de series de TV en TheTVDB.com</summary> <summary lang="es_MX">Obtener metadata de Series desde TheTVDB.com</summary> + <summary lang="et">Hangi tv seriaalide metainfo TheTVDB.com-ist</summary> <summary lang="fi">Nouda TV-ohjelmien tietoja TheTVDB.com -sivustolta</summary> <summary lang="fr">Collecter les métadonnées des séries TV depuis TheTVDB.com</summary> <summary lang="gl">Obter os metadatos das series de TV dende TheTVDB.com</summary> <summary lang="he">הבא מידע </summary> + <summary lang="hr">Dohvati podatke za TV serije sa TheTVDB.com</summary> <summary lang="hu">TV műsor információk a TheTVDB.com-ról</summary> <summary lang="is">Sækja Sjónvarpsþátta lýsigögn frá TheTVDB.com</summary> <summary lang="it">Scarica informazioni programma TV da TheTVDB.com</summary> @@ -33,7 +36,10 @@ <summary lang="ko">TheTVDB.com 에서 TV 쇼 정보 가져오기</summary> <summary lang="lt">Parsiųsti TV šou (serialo) metaduomenis iš TheTVDB.com</summary> <summary lang="mk">Превземи ТВ шоу метаподаток од TVDB.com</summary> + <summary lang="ms">Ambil metadata rancangan TV dari TheTVDB.com</summary> + <summary lang="my">TV show နှင့်ပတ်သက်သည့် အချက်အလက်များကို TheTVDB.com မှ ရယူရန်</summary> <summary lang="nl">Seriemetadata ophalen van TheTVDB.com</summary> + <summary lang="no">Hent TV program data fra TheTVDB.com</summary> <summary lang="pl">Pobieraj dane o serialach TV z TheTVDB.com</summary> <summary lang="pt">Obtenha dados para séries TV de TVDB.com</summary> <summary lang="pt_BR">Obtenha dados dos seriados do TheTVDB.com</summary> @@ -42,15 +48,20 @@ <summary lang="se">Skrapa för TV-seriemetadata från TVDB.com</summary> <summary lang="sk">Získať metadáta o televíznej relácii zo stránky TheTVDB.com</summary> <summary lang="sl">Prenesite informacije o TV serijah z TheTVDB.com</summary> + <summary lang="sq">Merr "metadata" mbi TV serialet nga TheTVDB.com</summary> <summary lang="sv">Hämta TV-seriemetadata från TVDB.com</summary> + <summary lang="ta_IN">TheTVDB.com இருந்து தொலைக்காட்சி நிகழ்ச்சி மெட்டாடேட்டா எடுக்கபடுகின்றது</summary> <summary lang="th">เรียกข้อมูลหลักของรายการทีวี จาก TheTVDB.com</summary> + <summary lang="tr">TV programı meta verilerini TheTVDB.com'dan al</summary> <summary lang="uk">Отримання відомостей про серіали із TheTVDB.com</summary> + <summary lang="vi">Trình lấy TV show từ TheTVDB.com</summary> <summary lang="zh">从TheTVDB.com获取电视剧集信息</summary> <summary lang="zh_TW">從 TheTVDB.com 取得電視節目資訊</summary> <description lang="af">TheTVDB.com is 'n TV Skraper. Die werf is 'n massiewe oop databasis wat deur enige iemand verander kan word en bevat vol meta data vir baie vertonings in verskillende tale. Alle inhoud en prente op die werf is bygedra deur sy gebruikers vir sy gebruikers en het 'n hoë standaard van kwaliteit. Die databasis skema en webruimte is oopbron onder die GPL.</description> <description lang="be">TheTVDB.com is a TV Scraper. The site is a massive open database that can be modified by anybody and contains full meta data for many shows in different languages. All content and images on the site have been contributed by their users for users and have a high standard or quality. The database schema and website are open source under the GPL.</description> <description lang="bg">TheTVDB.com предоставя информация за ТВ Сериали. Сайтът представлява една огромна, безплатна и отворена база от данни. Всеки може да редактира (наличната информация) или да добавя нова. Съдържа подробни данни за много сериали и на различни езици. Цялото съдържание на сайта и публикуваните изображения са предоставени от потребители за потребителите. Съдържанието на сайтът и базата от данни е с отворен код под лиценза GPL.</description> <description lang="cs">TheTVDB.com je zdroj metadat pro televizní pořady. Stránka je masivní otevřená databáze, kterou může kdokoliv upravovat a obsahuje veškerá metadata v různých jazycích k mnoha pořadům. Všechen obsah a obrázky jsou poskytnuty uživateli pro uživatele a mají vysokou kvalitu. Návrhový vzor databáze a webová stránka jsou svobodný software licencovaný pod GPL.</description> + <description lang="cy">Mae TheTVDB.com yn Grafwr Teledu. Mae'r wefan yn gronfa ddata anferthol agored y mae modd ei addasu gan unrhyw un ac yn cynnwys meta data llaw llawer o sioeau mewn ieithoedd gwahanol. Mae'r holl gynnwys a delweddau ar y wefan wedi ei gyfrannu gan eu defnyddwyr ac i safon uchel . Mae cynllun y gronfa ddata a'r wefan yn god agored o dan y GPL.</description> <description lang="da">TheTVDB.com er en TV-scraper. Siden er en massiv åben database, som alle kan modificere, og den indeholder fyldestgørende metadata for mange serier på forskellige sprog. Alt indhold og alle billeder på siden er tilføjet af brugere og har en høj standard eller kvalitet. Databasens model og webside er open source under GPL.</description> <description lang="de">TheTVDB.com ist ein Scraper für TV-Serien. Die Seite hat eine riesige offene Datenbank, welche von jedem geändert werden kann. Sie enthält weitreichende Meta-Daten für viele TV-Serien in verschiedenen Sprachen. Alle Inhalte und Bilder dieser Seite stammen von User für User und haben eine hohe Qualität. Das Datenbankschema und die Webseite sind OpenSource unter dem GPL-Recht</description> <description lang="el">Το TVDB.com είναι ένα Scraper Τηλεόρασης. Η ιστοσελίδα είναι μία τεράστια ανοικτή βάση δεδομένων η οποία μπορεί να τροποποιηθεί από τον καθένα και περιέχει πλήρη μετα-δεδομένα για πολλές σειρές σε διάφορες γλώσσες. Όλο το περιεχόμενο και οι εικόνες στην ιστοσελίδα προέρχονται από τους χρήστες του, και έχουν υψηλά πρότυπα ποιότητας. Το σχήμα της βάσης δεδομένων και της ιστοσελίδας είναι ανοικτού κώδικα υπό το GPL.</description> @@ -58,6 +69,7 @@ <description lang="es">TheTVDB.com es un scraper de TV. El sitio es una enorme base de datos abierta que puede ser modificada por cualquiera y que contiene metadatos completos de muchas series en diferentes idiomas. Todos los contenidos e imágenes del sitio han sido aportados por sus usuarios y tienen una alta calidad. El esquema de base de datos y sitio web son de código abierto bajo la licencia GPL.</description> <description lang="es_AR">TheTVDB.com es un scraper de TV. El sitio es una enorme base de datos abierta que puede ser modificada por cualquiera y que contiene metadatos completos de muchas series en diferentes idiomas. Todos los contenidos e imágenes del sitio han sido aportados por sus usuarios y tienen una alta calidad. El esquema de base de datos y sitio web son de código abierto bajo la licencia GPL.</description> <description lang="es_MX">TheTVDB.com es un scraper de series de TV. Este sitio es una base de datos masiva y abierta que puede ser modicada por cualquiera y contiene metadata completa para muchas series en diferentes lenguajes. Todo el contenido e imágenes del sitio han sido contribuidos por sus usuarios para usuarios, los cuales tienen un alto estándar de calidad. El esquema de la base de datos y el sitio web son de código abierto bajo GPL.</description> + <description lang="et">TheTVDB.com on seriaalide kraabits. See leht on mahukas avatud andmebaas mida saavad täiendad kõik ja sisaldab palju metaandmeid suure hulga seriaalide kohta. Kõik sisu ja pildid lehel on kasutajate poolt sisestatud ning vastavad kõrgele kvaliteedile. TheTVDB.com andmebaasi struktuur ja kood on avaldatud GPLi all.</description> <description lang="fi">TheTVDB.com on TV-ohjelmatietojen lataaja. Sivusto on massiivinen avoin tietokanta, jonka tietoja kaikki pystyy muokkaamaan ja se sisältää täydet tiedot monista TV-ohjelmista usealla eri kielellä. Kaikki sivuston sisältö ja kuvat on korkealaatuisia ja käyttäjien lahjoittamia. Tietokanta ja sivusto ovat GPL-lisenssin alaisia.</description> <description lang="fr">TheTVDB.com est un collecteur TV. Le site est une immense base de données libre pouvant être modifiée par tout le monde et contenant toutes les informations de nombreuses séries en différentes langues. Les informations et images du site proviennent de contributions d'utilisateurs pour les usagers et sont d'excellentes qualités. Le schéma de la base de données et le site Web sont en open source sous licence GPL.</description> <description lang="gl">TheTVDB.com é un Scraper de TV. O sitio é unha enorme base de datos aberta que calquera pode modificar e contén todos os metadatos de centos de series en diferentes idiomas. Todo o contido e imaxes do sitio foi proporcionado polos seus usuarios e amosa un grande estándar de calidade. O esquema da base de datos e o sitio web son de código aberto baixo licenza GPL.</description> @@ -68,7 +80,10 @@ <description lang="ko">TheTVDB.com 은 TV 자료수집기입니다. 위 사이트는 이용자가 직접 수정할 수 있으며 다양한 언어의 완전한 메타 데이터를 포함하는 방대한 오픈 데이터베이스입니다. 사이트의 모든 콘텐츠와 이미지들은 사이트 이용자들이 다른 이용자들을 위해 제공한 것이며 높은 품질을 가지고 있습니다. 웹사이트와 데이터베이스 스키마는 GLP 오픈소스입니다.</description> <description lang="lt">TheTVDB.com yra TV Scraper. Ši svetainė yra didžiulė atvira duomenų bazė, kuria gali pakeisti bet kas ir kurioje visa meta duomenis bazė daugelo šou įvairiomis kalbomis. Visas svetainės turinys atnaujinamas/papyldomasvartotojų ir turi aukštą kokybės standartą. Duomenų bazės ir svetainės yra atviro kodo pagal GPL standartą.</description> <description lang="mk">TheTVDB.com is a TV Scraper. The site is a massive open database that can be modified by anybody and contains full meta data for many shows in different languages. All content and images on the site have been contributed by their users for users and have a high standard or quality. The database schema and website are open source under the GPL.</description> + <description lang="ms">TheTVDB.com adalah TV Scraper. Laman tersebut merupakan pangkalan data terbuka yang amat besar dan boleh diubahsuai oleh sesiapa pun dan juga mengandungi metadata pelbagai rancangan dalam pelbagai bahasa. Semua kandungan dan imej di laman ini disumbang oleh pengguna mereka untuk pengguna mereka dan mempunyai pemiawaian dan kualiti yang amat tinggi. Skema pangkalan data dan laman adalah sumber terbuka dibawah GPL.</description> + <description lang="my">TheTVDB.com သည် TV Scraper ဖြစ်သည်။ database ထဲတွင် အချက်အလက်များစွာရှိနေပြီး မည်သူမဆို မည်သည့် ဘာသာစကားနှင့် မဆို ဝင်ရောက်ပြုပြင် နိုင်သည်။ အချက်အလက်များနှင့် ပုံများသည် ၎င်းတို့၏ အသုံးပြုသူများမှ အခြားအသုံးပြုသူများအတွက် ပံ့ပိုးထားသော အဆင်မြင့် အရေအသွေးများဖြစ်သည်။ website နှင့် database သည် open source GPL လိုင်စင် ကို အသုံးပြုထားသည်။</description> <description lang="nl">TheTVDB.com is een seriescraper. De site is een gigantische open databank die iedereen kan aanpassen en uitbreiden, en biedt metadata aan voor TV-series in verschillende talen. Alle inhoud en afbeeldingen zijn afkomstig van gebruikers en moeten een grondige kwaliteitscontrole doorstaan. Het databankschema en de websitecode zijn vrijgegeven onder de open source GPL-licentie.</description> + <description lang="no">TheTVDB.com er en Tv Skraper. Siden er en massiv åpen database som kan endres av alle og inneholder data for mange forskjellige programmer på mange språk. Alt innholdet og bildene på siden er lagt til av brukere for brukere og har høy standard og kvalitet. Database skjemaet og websiden er åpen kildekode underlagt GPL.</description> <description lang="pl">TheTVDB.com jest scraperem TV. Ten serwis jest ogromną, wielojęzykową i otwartą bazą danych o serialach, którą może edytować każdy. Zawartość tego serwisu została dostarczona przez użytkowników, dla użytkowników. Dostępne materiały są najwyższej jakości.</description> <description lang="pt">O TheTVDB.com é um scraper para séries TV. O site é uma gigantesca base de dados livre que pode ser alterada por qualquer pessoa e contém informação em várias línguas. Todos os conteúdos do site foram enviados por utilizadores e têm um elevado padrão de qualidade. A base de dados e o site funcionam sob uma licença GPL de software livre.</description> <description lang="pt_BR">TheTVDB.com é um scraper de seriados. O site é um enorme banco de dados aberto que pode ser modificado por qualquer pessoa e contém metadados completos de muitos seriados em diferentes idiomas. Todos os conteúdos e imagens no site foram contribuições de usuários para usuários e têm um alto padrão de qualidade. O esquema do banco de dados e do site são de código aberto sob a licença GPL.</description> @@ -77,9 +92,14 @@ <description lang="se">TVDB.com är en TV-skrapa. Sajten är en massiv öppen databas som kan ändras av vem som helst och innehåller full metadata för mängder av serier på olika språk. Allt innehåll och bilder på sajten har bidragits av användare för användare och har en hög standard eller kvalitet. Databasschemat och webbsidan är licensierat som GPL.</description> <description lang="sk">TheTVDB.com je zdroj získavania dát ohľadom TV. Táto stránka je obrovskou otvorenou databázou, ktorú môže upravovať ktokoľvek a obsahuje úplne metadáta pre mnoho relácií v rôznych jazykoch. Všetok obsah a obrázky na stránke bol dodaný samotnými používateľmi pre používateľov a udržuje si vysoký štandard a kvalitu. Schéma databázy a webová stránka sú dostupné vo forme open source v súlade s licenciou GPL.</description> <description lang="sl">TheTVDB.com je ponudnik informacij o TV serijah. Stran je masovna odprta baza podatkov, ki jo lahko dopolni kdorkoli, in vsebuje informacije o najrazličnejših TV serijah v več jezikih. Vsa vsebina in slike so bile dodane s strani uporabnikov in imajo visok nivo kvalitete. Shema baze in spletna stran sta odprtokodni pod GPL.</description> + <description lang="sq">TheTVDB.com është një "TV Scraper". Kjo faqe është nje bazë e të dhënave e hapur që mund të modifikohet nga si cili dhe përmbanë metadata për shumë seriale në gjuhë të ndryshme. Gjitha të dhënat dhe imazhet në këtë faqe janë kontribuar nga përdoruesit për përdoruesit dhe kanë një standard dhe kualitet të lartë. Skema e bazës së të dhënave dhe sajti i uebit janë open source nën liçensën GPL. </description> <description lang="sv">TVDB.com är en TV-skrapa. Sajten är en massiv öppen databas som kan bli modifierad av vem som helst och innehåller all metadata för många serier på olika språk. Allt innehåll och bilder på sidan har bidragits av användare för användare och har hög standard eller kvalitet. Databasschemat och sidan är öppen källkod licensierat under GPL.</description> + <description lang="ta_IN">TheTVDB.com ஒரு தொலைக்காட்சி சுரண்டி. இந்த இணையத்தளத்தில் ஒரு பெரிய தரவுத்தளம் உள்ளது. இதில் எல்லா மொழிகளின் மேட்டாடேட்டா உள்ளது. அனைத்து தகவல்களும் படங்களும் அதன் பயனர்களின் சேகரிப்புஆகும். GPL லைசன்சில் உள்ளது.</description> <description lang="th">TheTVDB.com เป็นตัวดึงข้อมูลทีวี เว็บไซต์เป็นฐานข้อมูลเปิดขนาดใหญ่ที่สามารถแก้ไขได้โดยทุกคนและมีข้อมูลขั้นสูงเต็มรูปแบบ สำหรับหลาย ๆ รายการ ในแต่ละภาษาที่แตกต่างกัน เนื้อหาและรูปภาพทั้งหมดในเว็บไซต์ ได้รับการสนับสนุนโดยผู้ใช้เพื่อผู้ใช้ มีคุณภาพและมาตรฐานที่สูง schemaของฐานข้อมูลและเว็บไซต์ได้เปิดภายใต้ GPL</description> + <description lang="uk">TheTVDB.com є збирачем TV. На порталі є масивні відкриті бази даних, які можуть мінятися ким завгодно, і містить повні мета-дані для багатьох шоу різними мовами. Весь вміст та зображення на сайті були надані користувачами для користувачів і мають високий стандарт і якість. Бази даних і веб-сайт мають відкритий вихідний код під ліцензією GPL.</description> + <description lang="vi">TheTVDB.com là trình lấy dữ liệu TV show. Site chứa một số lượng khổng lồ cơ sở dữ liệu mở, có thể được thay đổi bởi mọi người và đầy đủ dữ liệu lớn các show trên nhiều ngôn ngữ. Tất cả nội dung và hình ảnh trên site này đều được đóng góp bởi toàn bộ người dùng của nó và có chất lượng cao. Mô hình cơ sở dữ liệu và website đều là mã nguồn mở được hỗ trợ bởi GPL.</description> <description lang="zh">TheTVDB.com是一个电视刮削器。该网站是一个巨大的开放式数据库，任何人都可以修改，包含多语言的许多电视剧集资料。网站设定了高品质标准，所有图片和内容都由用户提供。数据库结构和网站均在GPL许可下开源。</description> + <description lang="zh_TW">TheTVDB.com是一個電視節目。該網站是一個龐大並可以由任何人修改的開放性資料庫，並包含可以以多國語言顯示的完整的數據資料。所有內容和圖片都是經由用戶提供使用，有一定的標準或質量。數據庫架構和網站是在GPL下的開放性源碼。</description> <platform>all</platform> </extension> </addon> diff --git a/addons/metadata.tvdb.com/changelog.txt b/addons/metadata.tvdb.com/changelog.txt index 01a0e682ac..652593d0d2 100644 --- a/addons/metadata.tvdb.com/changelog.txt +++ b/addons/metadata.tvdb.com/changelog.txt @@ -1,3 +1,20 @@ +[B]1.5.4[/B] +- Updated: language files from Transifex + +[B]1.5.3[/B] +- Fixed: Language tag caching - round two (thx and credits to pgit) + +[B]1.5.2[/B] +- Changed: Dropped the www from thetvdb URLs + +[B]1.5.1[/B] +- Updated: Versioning for xbmc.metadata + +[B]1.5.0[/B] +- Added: Language tag to caching (thx and credits to pgit) +- Added: Caching for search results (thx and credits to pgit) +- Removed: Poster preference as this is not needed for Frodo + [B]1.4.5[/B] - Fixed: dvdorder setting won't apply in GetEpisodeDetails (thx and credits to scudlee) diff --git a/addons/metadata.tvdb.com/resources/language/Albanian/strings.xml b/addons/metadata.tvdb.com/resources/language/Albanian/strings.xml new file mode 100644 index 0000000000..dbd922ee5f --- /dev/null +++ b/addons/metadata.tvdb.com/resources/language/Albanian/strings.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- Translated using Transifex web application. For support, or if you would like to to help out, please visit your language team! --> +<!-- Albanian language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/sq/ --> +<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> + +<strings> + <string id="30000">Përdor rendin e "DVD'së"</string> + <string id="30001">Përdor renditjen absolute (Sezon i veçantë)</string> + <string id="30002">Aktivo "Fanart'in"</string> + <string id="30003">Prefero Posterë</string> + <string id="30004">Gjuha</string> +</strings> diff --git a/addons/metadata.tvdb.com/resources/language/Basque/strings.xml b/addons/metadata.tvdb.com/resources/language/Basque/strings.xml index 90d1d2ca76..07c046d6c5 100644 --- a/addons/metadata.tvdb.com/resources/language/Basque/strings.xml +++ b/addons/metadata.tvdb.com/resources/language/Basque/strings.xml @@ -4,5 +4,6 @@ <!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> <strings> + <string id="30002">Gaitu Fanarta</string> <string id="30004">Hizkuntza</string> </strings> diff --git a/addons/metadata.tvdb.com/resources/language/Burmese/strings.xml b/addons/metadata.tvdb.com/resources/language/Burmese/strings.xml new file mode 100644 index 0000000000..d27205c50b --- /dev/null +++ b/addons/metadata.tvdb.com/resources/language/Burmese/strings.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- Translated using Transifex web application. For support, or if you would like to to help out, please visit your language team! --> +<!-- Burmese language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/my/ --> +<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> + +<strings> + <string id="30000">DVD order ကို အသုံးပြုရန်</string> + <string id="30002">Enable Fanart</string> + <string id="30003">ပိုစတာ ပုံစံကို သဘောကျသည်</string> + <string id="30004">ဘာသာစကား</string> +</strings> diff --git a/addons/metadata.tvdb.com/resources/language/Catalan/strings.xml b/addons/metadata.tvdb.com/resources/language/Catalan/strings.xml index c796f793b5..26adad4e41 100644 --- a/addons/metadata.tvdb.com/resources/language/Catalan/strings.xml +++ b/addons/metadata.tvdb.com/resources/language/Catalan/strings.xml @@ -4,5 +4,6 @@ <!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> <strings> + <string id="30002">Activar fanart</string> <string id="30004">Idioma</string> </strings> diff --git a/addons/metadata.tvdb.com/resources/language/Croatian/strings.xml b/addons/metadata.tvdb.com/resources/language/Croatian/strings.xml index fa1cc874a5..d3e159c96d 100644 --- a/addons/metadata.tvdb.com/resources/language/Croatian/strings.xml +++ b/addons/metadata.tvdb.com/resources/language/Croatian/strings.xml @@ -4,5 +4,7 @@ <!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> <strings> + <string id="30002">Omogući "Fanart"</string> + <string id="30003">Preferirani poster</string> <string id="30004">Jezik</string> </strings> diff --git a/addons/metadata.tvdb.com/resources/language/Estonian/strings.xml b/addons/metadata.tvdb.com/resources/language/Estonian/strings.xml index ef95aee088..2f4dd47d27 100644 --- a/addons/metadata.tvdb.com/resources/language/Estonian/strings.xml +++ b/addons/metadata.tvdb.com/resources/language/Estonian/strings.xml @@ -4,5 +4,9 @@ <!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> <strings> + <string id="30000">Kasuta DVD järjestust</string> + <string id="30001">Kasuta absoluutset järjestust (Üks hooaeg)</string> + <string id="30002">Võimalda fännikunst</string> + <string id="30003">Eelista postreid</string> <string id="30004">Keel</string> </strings> diff --git a/addons/metadata.tvdb.com/resources/language/Faroese/strings.xml b/addons/metadata.tvdb.com/resources/language/Faroese/strings.xml new file mode 100644 index 0000000000..e619bb1510 --- /dev/null +++ b/addons/metadata.tvdb.com/resources/language/Faroese/strings.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- Translated using Transifex web application. For support, or if you would like to to help out, please visit your language team! --> +<!-- Faroese language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/fo/ --> +<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> + +<strings> + <string id="30004">Mál</string> +</strings> diff --git a/addons/metadata.tvdb.com/resources/language/Latvian/strings.xml b/addons/metadata.tvdb.com/resources/language/Latvian/strings.xml new file mode 100644 index 0000000000..8903bbed54 --- /dev/null +++ b/addons/metadata.tvdb.com/resources/language/Latvian/strings.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- Translated using Transifex web application. For support, or if you would like to to help out, please visit your language team! --> +<!-- Latvian language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/lv/ --> +<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> + +<strings> + <string id="30004">Valoda</string> +</strings> diff --git a/addons/metadata.tvdb.com/resources/language/Malay/strings.xml b/addons/metadata.tvdb.com/resources/language/Malay/strings.xml new file mode 100644 index 0000000000..f744f97806 --- /dev/null +++ b/addons/metadata.tvdb.com/resources/language/Malay/strings.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- Translated using Transifex web application. For support, or if you would like to to help out, please visit your language team! --> +<!-- Malay language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/ms/ --> +<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> + +<strings> + <string id="30000">Gunakan susunan DVD</string> + <string id="30001">Gunakan susunan mutlak (untuk satu musim)</string> + <string id="30002">Membolehkan Fanart</string> + <string id="30003">Poster pilihan</string> + <string id="30004">Bahasa</string> +</strings> diff --git a/addons/metadata.tvdb.com/resources/language/Maltese/strings.xml b/addons/metadata.tvdb.com/resources/language/Maltese/strings.xml new file mode 100644 index 0000000000..0efb3102e5 --- /dev/null +++ b/addons/metadata.tvdb.com/resources/language/Maltese/strings.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- Translated using Transifex web application. For support, or if you would like to to help out, please visit your language team! --> +<!-- Maltese language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/mt/ --> +<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> + +<strings> + <string id="30004">Lingwa</string> +</strings> diff --git a/addons/metadata.tvdb.com/resources/language/Norwegian/strings.xml b/addons/metadata.tvdb.com/resources/language/Norwegian/strings.xml index 84c859b280..be5fe19520 100644 --- a/addons/metadata.tvdb.com/resources/language/Norwegian/strings.xml +++ b/addons/metadata.tvdb.com/resources/language/Norwegian/strings.xml @@ -4,5 +4,9 @@ <!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> <strings> + <string id="30000">Bruk DVD sortering</string> + <string id="30001">Bruk Absolutt sortering (Enkel Sesong)</string> + <string id="30002">Vis Fanart</string> + <string id="30003">Foretrekke Postere</string> <string id="30004">Språk</string> </strings> diff --git a/addons/metadata.tvdb.com/resources/language/Persian (Iran)/strings.xml b/addons/metadata.tvdb.com/resources/language/Persian (Iran)/strings.xml new file mode 100644 index 0000000000..bb073ae860 --- /dev/null +++ b/addons/metadata.tvdb.com/resources/language/Persian (Iran)/strings.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- Translated using Transifex web application. For support, or if you would like to to help out, please visit your language team! --> +<!-- Persian (Iran) language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/fa_IR/ --> +<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> + +<strings> + <string id="30004">زبان</string> +</strings> diff --git a/addons/metadata.tvdb.com/resources/language/Tamil (India)/strings.xml b/addons/metadata.tvdb.com/resources/language/Tamil (India)/strings.xml new file mode 100644 index 0000000000..ef2285e5ef --- /dev/null +++ b/addons/metadata.tvdb.com/resources/language/Tamil (India)/strings.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- Translated using Transifex web application. For support, or if you would like to to help out, please visit your language team! --> +<!-- Tamil (India) language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/ta_IN/ --> +<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> + +<strings> + <string id="30000">டிவிடி வரிசை பயன்படுத்து</string> + <string id="30001">தனி வரிசை (தனி சீசன்) பயன்படுத்து</string> + <string id="30002">விசிறிபடத்தை காண்பி</string> + <string id="30003">சுவரொட்டிகள் விருப்பு</string> + <string id="30004">மொழி</string> +</strings> diff --git a/addons/metadata.tvdb.com/resources/language/Turkish/strings.xml b/addons/metadata.tvdb.com/resources/language/Turkish/strings.xml index c91f88124f..06a7c1a0bf 100644 --- a/addons/metadata.tvdb.com/resources/language/Turkish/strings.xml +++ b/addons/metadata.tvdb.com/resources/language/Turkish/strings.xml @@ -4,6 +4,8 @@ <!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> <strings> + <string id="30000">DVD Sıralama Kullan</string> + <string id="30001">Mutlak Sıralama Kullan (Tek Sezon)</string> <string id="30002">Fanart'ı Etkinleştir</string> <string id="30003">Posterleri Tercih Et</string> <string id="30004">Dil</string> diff --git a/addons/metadata.tvdb.com/resources/language/Uzbek/strings.xml b/addons/metadata.tvdb.com/resources/language/Uzbek/strings.xml new file mode 100644 index 0000000000..02d02b8b48 --- /dev/null +++ b/addons/metadata.tvdb.com/resources/language/Uzbek/strings.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- Translated using Transifex web application. For support, or if you would like to to help out, please visit your language team! --> +<!-- Uzbek language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/uz/ --> +<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> + +<strings> + <string id="30004">Til</string> +</strings> diff --git a/addons/metadata.tvdb.com/resources/language/Vietnamese/strings.xml b/addons/metadata.tvdb.com/resources/language/Vietnamese/strings.xml new file mode 100644 index 0000000000..73adc1fd20 --- /dev/null +++ b/addons/metadata.tvdb.com/resources/language/Vietnamese/strings.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- Translated using Transifex web application. For support, or if you would like to to help out, please visit your language team! --> +<!-- Vietnamese language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/vi/ --> +<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> + +<strings> + <string id="30000">Sử dụng DVD Order</string> + <string id="30001">Sử dụng sắp đặt cố định (Theo Season)</string> + <string id="30002">Sử dụng Fanart</string> + <string id="30003">Ưu tiên các poster</string> + <string id="30004">Ngôn ngữ</string> +</strings> diff --git a/addons/metadata.tvdb.com/resources/language/Welsh/strings.xml b/addons/metadata.tvdb.com/resources/language/Welsh/strings.xml new file mode 100644 index 0000000000..0dcd86f2b4 --- /dev/null +++ b/addons/metadata.tvdb.com/resources/language/Welsh/strings.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- Translated using Transifex web application. For support, or if you would like to to help out, please visit your language team! --> +<!-- Welsh language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/cy/ --> +<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> + +<strings> + <string id="30000">Defnyddio Trefn DVD</string> + <string id="30001">Defnyddio Trefnu Absoliwt (Un Tymor)</string> + <string id="30002">Galluogi Celf Selogion</string> + <string id="30003">Cyfeirio Cofnodwyr</string> + <string id="30004">Iaith</string> +</strings> diff --git a/addons/metadata.tvdb.com/resources/settings.xml b/addons/metadata.tvdb.com/resources/settings.xml index 2396b769b9..14b802a123 100644 --- a/addons/metadata.tvdb.com/resources/settings.xml +++ b/addons/metadata.tvdb.com/resources/settings.xml @@ -4,7 +4,6 @@ <setting label="30001" type="bool" id="absolutenumber" default="false" enable="!eq(-1,true)" /> <setting type="sep" /> <setting label="30002" type="bool" id="fanart" default="true" /> - <setting label="30003" type="bool" id="posters" default="false" /> <setting type="sep" /> <setting label="30004" type="labelenum" id="language" values="da|fi|nl|de|it|es|fr|pl|hu|el|tr|ru|he|ja|pt|zh|cs|sl|hr|ko|en|sv|no" sort="yes" default="en" /> </settings> diff --git a/addons/metadata.tvdb.com/tvdb.xml b/addons/metadata.tvdb.com/tvdb.xml index 844f94501b..4e2cc2fd61 100644 --- a/addons/metadata.tvdb.com/tvdb.xml +++ b/addons/metadata.tvdb.com/tvdb.xml @@ -1,20 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- should be self-explanatory --> -<scraper framework="1.1" date="2009-01-27"> +<scraper framework="1.1" date="2013-04-04"> <NfoUrl dest="3"> - <RegExp input="$$1" output="<url cache="\1.xml">http://www.thetvdb.com/api/1D62F2F90030C444/series/\1/all/$INFO[language].zip</url><id>\1</id>" dest="3"> + <RegExp input="$$1" output="<url cache="\1-$INFO[language].xml">http://thetvdb.com/api/1D62F2F90030C444/series/\1/all/$INFO[language].zip</url><id>\1</id>" dest="3"> <expression>http://(?:www\.)?thetvdb.com/(?:index\.php)?\?tab=series&id=([0-9]+)</expression> </RegExp> - <RegExp input="$$1" output="<details><url cache="tt\1.xml" function="GetTVDBId">http://www.thetvdb.com/api/GetSeriesByRemoteID.php?imdbid=tt\1&amp;language=$INFO[language]</url></details>" dest="3+"> + <RegExp input="$$1" output="<details><url cache="tt\1.xml" function="GetTVDBId">http://thetvdb.com/api/GetSeriesByRemoteID.php?imdbid=tt\1&amp;language=$INFO[language]</url></details>" dest="3+"> <expression>imdb....?/title/tt([0-9]*)</expression> </RegExp> - <RegExp input="$$1" output="<details><url cache="tt\1.xml" function="GetTVDBId">http://www.thetvdb.com/api/GetSeriesByRemoteID.php?imdbid=tt\1&amp;language=$INFO[language]</url></details>" dest="3+"> + <RegExp input="$$1" output="<details><url cache="tt\1.xml" function="GetTVDBId">http://thetvdb.com/api/GetSeriesByRemoteID.php?imdbid=tt\1&amp;language=$INFO[language]</url></details>" dest="3+"> <expression>imdb....?/Title\?([0-9]*)</expression> </RegExp> </NfoUrl> <GetTVDBId dest="3"> - <RegExp input="$$1" output="<details><url cache="\1.xml">http://www.thetvdb.com/api/1D62F2F90030C444/series/\1/all/$INFO[language].zip</url><id>\1</id></details>" dest="3"> + <RegExp input="$$1" output="<details><url cache="\1-$INFO[language].xml">http://thetvdb.com/api/1D62F2F90030C444/series/\1/all/$INFO[language].zip</url><id>\1</id></details>" dest="3"> <expression><seriesid>([0-9]*)</seriesid></expression> </RegExp> </GetTVDBId> @@ -31,7 +31,7 @@ <!-- input: $1=query string --> <!-- returns: the url we should use to do the search --> <CreateSearchUrl dest="3"> - <RegExp input="$$1" output="<url>http://www.thetvdb.com/api/GetSeries.php?seriesname=\1$$4&amp;language=$INFO[language]</url>" dest="3"> + <RegExp input="$$1" output="<url cache="cache-\1$$4.xml">http://thetvdb.com/api/GetSeries.php?seriesname=\1$$4&amp;language=$INFO[language]</url>" dest="3"> <RegExp input="$$2" output="%20(\1)" dest="4"> <expression clear="yes">(.+)</expression> </RegExp> @@ -43,7 +43,7 @@ <!-- returns: results in xml format <results><movie><title>*</title><url>*</url>*#urls<extra>*</extra></movie>*</results> --> <GetSearchResults dest="1"> <RegExp input="$$4" output="<?xml version="1.0" encoding="utf-8" standalone="yes"?><results>\1</results>" dest="1"> - <RegExp input="$$1" output="<entity><title>\3</title><language>\2</language><url cache="\1.xml">http://www.thetvdb.com/api/1D62F2F90030C444/series/\1/all/\2.zip</url><id>\1</id></entity>" dest="4"> + <RegExp input="$$1" output="<entity><title>\3</title><language>\2</language><url cache="\1-\2.xml">http://thetvdb.com/api/1D62F2F90030C444/series/\1/all/\2.zip</url><id>\1</id></entity>" dest="4"> <expression repeat="yes"><seriesid>([0-9]*)</seriesid>[^<]*<language>([^<]*)</language>[^<]*<SeriesName>([^<]*)</SeriesName></expression> </RegExp> <expression noclean="1"/> @@ -99,9 +99,6 @@ <RegExp input="$$5" output="<actor><name>\2</name><role>\3</role></actor>" dest="4+"> <expression repeat="yes" noclean="1,2,3"><Actor>.*?<Image>([^<]*)</Image>.*?<Name>([^<]*)</Name>.*?<Role>([^<]*)</expression> </RegExp> - <RegExp conditional="posters" output="<thumb aspect="poster">http://thetvdb.com/banners/\1</thumb>" dest="4+"> - <expression repeat="yes"><BannerPath>([^<]*)</BannerPath>[^<]*<BannerType>poster</BannerType></expression> - </RegExp> <RegExp input="$$5" output="<thumb aspect="banner">http://thetvdb.com/banners/\1</thumb>" dest="4+"> <expression repeat="yes"><BannerPath>([^<]*)</BannerPath>[^<]*<BannerType>series</BannerType>[^<]*<BannerType2>graphical</BannerType2>[^<]*<Language>$INFO[language]</Language></expression> </RegExp> @@ -129,7 +126,7 @@ <RegExp input="$$5" output="<thumb aspect="banner" type="season" season="\3">http://thetvdb.com/banners/\1</thumb>" dest="4+"> <expression repeat="yes"><BannerPath>([^<]*)</BannerPath>[^<]*<BannerType>season</BannerType>[^<]*<BannerType2>seasonwide</BannerType2>[^<]*<Language>((?!$INFO[language])[a-z])*</Language>[^<]*[^S]*Season>([0-9]+)</Season></expression> </RegExp> - <RegExp input="$$5" conditional="!posters" output="<thumb aspect="poster">http://thetvdb.com/banners/\1</thumb>" dest="4+"> + <RegExp input="$$5" output="<thumb aspect="poster">http://thetvdb.com/banners/\1</thumb>" dest="4+"> <expression repeat="yes"><BannerPath>([^<]*)</BannerPath>[^<]*<BannerType>poster</BannerType></expression> </RegExp> <RegExp input="$$5" output="<thumb aspect="poster" type="season" season="-1">http://thetvdb.com/banners/\1</thumb>" dest="4+"> @@ -144,7 +141,10 @@ </RegExp> <expression noclean="1"/> </RegExp> - <RegExp input="$$2" output="<episodeguide><url cache="$$2.xml">http://www.thetvdb.com/api/1D62F2F90030C444/series/\1/all/$INFO[language].zip</url></episodeguide>" dest="4+"> + <RegExp input="$$3" output="\1" dest="6"> + <expression>.*/(.*).zip</expression> + </RegExp> + <RegExp input="$$3" output="<episodeguide><url cache="$$2-$$6.xml">\1</url></episodeguide>" dest="4+"> <expression/> </RegExp> <expression noclean="1"/> @@ -156,8 +156,8 @@ <!-- returns: results in xml format <episodeguide><episode><title>*</title><url>*</url><season>*</season><epnum>*</epnum><thumb>*</thumb><id>*</id><aired>*</aired></episode>*</episodeguide> !--> <GetEpisodeList dest="3"> <RegExp input="$$4" output="<episodeguide>\1</episodeguide>" dest="3"> - <RegExp input="$$2" output="\2" dest="10"> - <expression>http://(?:www\.)thetvdb.com/api/(.+)/series/([0-9]*)/all/(.+).zip</expression> + <RegExp input="$$2" output="\2-\3" dest="10"> + <expression>http://(?:www\.)?thetvdb.com/api/(.+)/series/([0-9]*)/all/(.+).zip</expression> </RegExp> <RegExp conditional="!dvdorder"> <!-- Regular episodes (Absolute order) --> diff --git a/docs/README.android b/docs/README.android index 6ff28ab93c..86ecc6b06a 100644 --- a/docs/README.android +++ b/docs/README.android @@ -164,8 +164,9 @@ on with the Android toolchain and creating an Android Application Package -------------------------------------------------------------------- # cd $HOME/xbmc-android - # make -C tools/android/xbmc + # make -C tools/depends/target/xbmc # make + # make apk After the first build (assuming bootstrap and configure are successful), subsequent builds can be run with a simple 'make' and 'make apk'. diff --git a/docs/README.raspberrypi b/docs/README.raspberrypi index 6b6f1b1d74..aadcc418c7 100644 --- a/docs/README.raspberrypi +++ b/docs/README.raspberrypi @@ -6,7 +6,7 @@ TOC 1. Introduction ----------------------------------------------------------------------------- -For developemnt you can use a customized buildroot to produce a small +For development you can use a customized buildroot to produce a small raspberrypi system image which is used to boot the raspberrypi and as crosscompile environment. diff --git a/language/Galician/langinfo.xml b/language/Galician/langinfo.xml index 314540df02..4271cb4d14 100644 --- a/language/Galician/langinfo.xml +++ b/language/Galician/langinfo.xml @@ -11,15 +11,15 @@ </dvd> <regions> <region name="Santiago, Galicia" locale="GL"> - <dateshort>D/M/YYYY</dateshort> - <datelong>DDD, DD' de 'MMMM' de 'YYYY</datelong> + <dateshort>DD/MM/YYYY</dateshort> + <datelong>DDDD, DD' de 'MMMM' de 'YYYY</datelong> <time symbolAM="AM" symbolPM="PM">H:mm:ss</time> <tempunit>C</tempunit> <speedunit>kmh</speedunit> </region> <region name="La Coruna, Galicia" locale="GL"> - <dateshort>D/M/YYYY</dateshort> - <datelong>DDD, DD' de 'MMMM' de 'YYYY</datelong> + <dateshort>DD/MM/YYYY</dateshort> + <datelong>DDDD, DD' de 'MMMM' de 'YYYY</datelong> <time symbolAM="AM" symbolPM="PM">H:mm:ss</time> <tempunit>C</tempunit> <speedunit>kmh</speedunit> diff --git a/language/Spanish (Argentina)/langinfo.xml b/language/Spanish (Argentina)/langinfo.xml index ea186f5f69..3036587b25 100644 --- a/language/Spanish (Argentina)/langinfo.xml +++ b/language/Spanish (Argentina)/langinfo.xml @@ -13,8 +13,8 @@ <regions> <region name="Argentina" locale="AR"> - <dateshort>D/M/YYYY</dateshort> - <datelong>DDD, DD' de 'MMMM' de 'YYYY</datelong> + <dateshort>DD/MM/YYYY</dateshort> + <datelong>DDDD, DD' de 'MMMM' de 'YYYY</datelong> <time symbolAM="" symbolPM="">H:mm:ss</time> <tempunit>C</tempunit> <speedunit>kmh</speedunit> diff --git a/language/Spanish/langinfo.xml b/language/Spanish/langinfo.xml index 3d8bb65801..6a94d8a79e 100644 --- a/language/Spanish/langinfo.xml +++ b/language/Spanish/langinfo.xml @@ -13,32 +13,32 @@ <regions> <region name="España (12 horas)" locale="ES"> - <dateshort>D/M/YYYY</dateshort> - <datelong>DDD, DD' de 'MMMM' de 'YYYY</datelong> + <dateshort>DD/MM/YYYY</dateshort> + <datelong>DDDD, DD' de 'MMMM' de 'YYYY</datelong> <time symbolAM="AM" symbolPM="PM">h:mm:ss xx</time> <tempunit>C</tempunit> <speedunit>kmh</speedunit> <timezone>CEST</timezone> </region> <region name="España (24 horas)" locale="ES"> - <dateshort>D/M/YYYY</dateshort> - <datelong>DDD, DD' de 'MMMM' de 'YYYY</datelong> + <dateshort>DD/MM/YYYY</dateshort> + <datelong>DDDD, DD' de 'MMMM' de 'YYYY</datelong> <time symbolAM="" symbolPM="">H:mm:ss</time> <tempunit>C</tempunit> <speedunit>kmh</speedunit> <timezone>CEST</timezone> </region> <region name="Canarias (12 horas)" locale="ES"> - <dateshort>D/M/YYYY</dateshort> - <datelong>DDD, DD' de 'MMMM' de 'YYYY</datelong> + <dateshort>DD/MM/YYYY</dateshort> + <datelong>DDDD, DD' de 'MMMM' de 'YYYY</datelong> <time symbolAM="AM" symbolPM="PM">h:mm:ss xx</time> <tempunit>C</tempunit> <speedunit>kmh</speedunit> <timezone>GMT</timezone> </region> <region name="Canarias (24 horas)" locale="ES"> - <dateshort>D/M/YYYY</dateshort> - <datelong>DDD, DD' de 'MMMM' de 'YYYY</datelong> + <dateshort>DD/MM/YYYY</dateshort> + <datelong>DDDD, DD' de 'MMMM' de 'YYYY</datelong> <time symbolAM="" symbolPM="">H:mm:ss</time> <tempunit>C</tempunit> <speedunit>kmh</speedunit> diff --git a/lib/DllAvFormat.h b/lib/DllAvFormat.h index 7fc831e875..b0dcb54d3f 100644 --- a/lib/DllAvFormat.h +++ b/lib/DllAvFormat.h @@ -42,13 +42,14 @@ extern "C" { #else #include <ffmpeg/avformat.h> #endif - /* av_read_frame_flush() is defined for us in lib/xbmc-dll-symbols/DllAvFormat.c */ - // void av_read_frame_flush(AVFormatContext *s); // av_read_frame_flush decrepated - void ff_read_frame_flush(AVFormatContext *s); // internal replacement + /* xbmc_read_frame_flush() is defined for us in lib/xbmc-dll-symbols/DllAvFormat.c */ + void xbmc_read_frame_flush(AVFormatContext *s); #else #include "libavformat/avformat.h" - void ff_read_frame_flush(AVFormatContext *s); // internal replacement - + #if defined(TARGET_DARWIN) + void ff_read_frame_flush(AVFormatContext *s); // internal replacement + #define xbmc_read_frame_flush ff_read_frame_flush + #endif #endif } @@ -118,7 +119,7 @@ public: virtual AVInputFormat *av_find_input_format(const char *short_name) { return ::av_find_input_format(short_name); } virtual void avformat_close_input(AVFormatContext **s) { ::avformat_close_input(s); } virtual int av_read_frame(AVFormatContext *s, AVPacket *pkt) { return ::av_read_frame(s, pkt); } - virtual void av_read_frame_flush(AVFormatContext *s) { ::ff_read_frame_flush(s); } // av_read_frame_flush decrepated + virtual void av_read_frame_flush(AVFormatContext *s) { ::xbmc_read_frame_flush(s); } virtual int av_read_play(AVFormatContext *s) { return ::av_read_play(s); } virtual int av_read_pause(AVFormatContext *s) { return ::av_read_pause(s); } virtual int av_seek_frame(AVFormatContext *s, int stream_index, int64_t timestamp, int flags) { return ::av_seek_frame(s, stream_index, timestamp, flags); } diff --git a/lib/xbmc-dll-symbols/DllAvFormat.c b/lib/xbmc-dll-symbols/DllAvFormat.c index 61ffdf4507..4b09663441 100644 --- a/lib/xbmc-dll-symbols/DllAvFormat.c +++ b/lib/xbmc-dll-symbols/DllAvFormat.c @@ -76,8 +76,10 @@ static void flush_packet_queue(AVFormatContext *s) } #endif -/* Taken from libavformat/utils.c */ -void av_read_frame_flush(AVFormatContext *s) +/* Taken from libavformat/utils.c + * Original name is ff_read_frame_flush + * */ +void xbmc_read_frame_flush(AVFormatContext *s) { AVStream *st; int i, j; diff --git a/tools/buildsteps/defaultenv b/tools/buildsteps/defaultenv index 9547e835c0..98c011e611 100644 --- a/tools/buildsteps/defaultenv +++ b/tools/buildsteps/defaultenv @@ -30,10 +30,15 @@ case $XBMC_PLATFORM_DIR in DEFAULT_XBMC_DEPENDS_ROOT=$WORKSPACE/tools/depends/xbmc-depends DEFAULT_CONFIGURATION="Debug" ;; + android) DEFAULT_SDK_VERSION=10 DEFAULT_XBMC_DEPENDS_ROOT=$WORKSPACE/tools/depends/xbmc-depends DEFAULT_CONFIGURATION="Debug" + ;; + + linux*) + DEFAULT_XBMC_DEPENDS_ROOT=$WORKSPACE/tools/depends/xbmc-depends esac if [ $SDK_VERSION == "Default" ] diff --git a/tools/buildsteps/linux32/configure-depends b/tools/buildsteps/linux32/configure-depends new file mode 100755 index 0000000000..757951be87 --- /dev/null +++ b/tools/buildsteps/linux32/configure-depends @@ -0,0 +1,9 @@ +WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )} +XBMC_PLATFORM_DIR=linux32 +. $WORKSPACE/tools/buildsteps/defaultenv + +if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ] +then + cd $WORKSPACE/tools/depends;./configure \ + --with-toolchain=/usr --prefix=$XBMC_DEPENDS_ROOT --host=i386-linux-gnu +fi diff --git a/tools/buildsteps/linux32/configure-xbmc b/tools/buildsteps/linux32/configure-xbmc new file mode 100755 index 0000000000..5e532760bf --- /dev/null +++ b/tools/buildsteps/linux32/configure-xbmc @@ -0,0 +1,5 @@ +WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )} +XBMC_PLATFORM_DIR=linux32 +. $WORKSPACE/tools/buildsteps/defaultenv + +cd $WORKSPACE/;./configure diff --git a/tools/buildsteps/linux32/make-depends b/tools/buildsteps/linux32/make-depends new file mode 100755 index 0000000000..73e21a6ada --- /dev/null +++ b/tools/buildsteps/linux32/make-depends @@ -0,0 +1,9 @@ +WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )} +XBMC_PLATFORM_DIR=linux32 +. $WORKSPACE/tools/buildsteps/defaultenv + +if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ] +then + cd $WORKSPACE/tools/depends;make -j $BUILDTHREADS && tagSuccessFulBuild . +fi + diff --git a/tools/buildsteps/linux32/make-xbmc b/tools/buildsteps/linux32/make-xbmc new file mode 100755 index 0000000000..a2bc0a7afc --- /dev/null +++ b/tools/buildsteps/linux32/make-xbmc @@ -0,0 +1,5 @@ +WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )} +XBMC_PLATFORM_DIR=linux32 +. $WORKSPACE/tools/buildsteps/defaultenv + +cd $WORKSPACE;make -j$BUILDTHREADS diff --git a/tools/buildsteps/linux32/package b/tools/buildsteps/linux32/package new file mode 100755 index 0000000000..45dc4c34cf --- /dev/null +++ b/tools/buildsteps/linux32/package @@ -0,0 +1,10 @@ +WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )} +XBMC_PLATFORM_DIR=linux32 +. $WORKSPACE/tools/buildsteps/defaultenv + +#nothing for linux atm + +#rename for upload +#e.x. xbmc-20130314-8c2fb31-Frodo-armeabi-v7a.apk +UPLOAD_FILENAME="xbmc-$(getBuildRevDateStr)-armeabi-v7a.apk" +#mv xbmcapp-armeabi-*.apk $UPLOAD_FILENAME diff --git a/tools/buildsteps/linux32/prepare-depends b/tools/buildsteps/linux32/prepare-depends new file mode 100755 index 0000000000..51878d9f1a --- /dev/null +++ b/tools/buildsteps/linux32/prepare-depends @@ -0,0 +1,13 @@ +WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )} +XBMC_PLATFORM_DIR=linux32 +. $WORKSPACE/tools/buildsteps/defaultenv + +#clean without depends for skipping depends build if possible +cd $WORKSPACE;git clean -xfd -e "tools/depends" + +if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ] +then + #clean up the rest too + cd $WORKSPACE;git clean -xfd + cd $WORKSPACE/tools/depends/;./bootstrap +fi diff --git a/tools/buildsteps/linux32/prepare-xbmc b/tools/buildsteps/linux32/prepare-xbmc new file mode 100755 index 0000000000..ca3a3d2774 --- /dev/null +++ b/tools/buildsteps/linux32/prepare-xbmc @@ -0,0 +1,5 @@ +WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )} +XBMC_PLATFORM_DIR=linux32 +. $WORKSPACE/tools/buildsteps/defaultenv + +#nothing on linux diff --git a/tools/buildsteps/linux64/configure-depends b/tools/buildsteps/linux64/configure-depends new file mode 100755 index 0000000000..1460e3c630 --- /dev/null +++ b/tools/buildsteps/linux64/configure-depends @@ -0,0 +1,9 @@ +WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )} +XBMC_PLATFORM_DIR=linux64 +. $WORKSPACE/tools/buildsteps/defaultenv + +if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ] +then + cd $WORKSPACE/tools/depends;./configure \ + --with-toolchain=/usr --prefix=$XBMC_DEPENDS_ROOT --host=x86_64-linux-gnu +fi diff --git a/tools/buildsteps/linux64/configure-xbmc b/tools/buildsteps/linux64/configure-xbmc new file mode 100755 index 0000000000..38a5e2d862 --- /dev/null +++ b/tools/buildsteps/linux64/configure-xbmc @@ -0,0 +1,5 @@ +WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )} +XBMC_PLATFORM_DIR=linux64 +. $WORKSPACE/tools/buildsteps/defaultenv + +cd $WORKSPACE/;./configure diff --git a/tools/buildsteps/linux64/make-depends b/tools/buildsteps/linux64/make-depends new file mode 100755 index 0000000000..c9c98aa09a --- /dev/null +++ b/tools/buildsteps/linux64/make-depends @@ -0,0 +1,9 @@ +WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )} +XBMC_PLATFORM_DIR=linux64 +. $WORKSPACE/tools/buildsteps/defaultenv + +if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ] +then + cd $WORKSPACE/tools/depends;make -j $BUILDTHREADS && tagSuccessFulBuild . +fi + diff --git a/tools/buildsteps/linux64/make-xbmc b/tools/buildsteps/linux64/make-xbmc new file mode 100755 index 0000000000..10200c8529 --- /dev/null +++ b/tools/buildsteps/linux64/make-xbmc @@ -0,0 +1,5 @@ +WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )} +XBMC_PLATFORM_DIR=linux64 +. $WORKSPACE/tools/buildsteps/defaultenv + +cd $WORKSPACE;make -j$BUILDTHREADS diff --git a/tools/buildsteps/linux64/package b/tools/buildsteps/linux64/package new file mode 100755 index 0000000000..243f5097ff --- /dev/null +++ b/tools/buildsteps/linux64/package @@ -0,0 +1,10 @@ +WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )} +XBMC_PLATFORM_DIR=linux64 +. $WORKSPACE/tools/buildsteps/defaultenv + +#nothing for linux atm + +#rename for upload +#e.x. xbmc-20130314-8c2fb31-Frodo-armeabi-v7a.apk +UPLOAD_FILENAME="xbmc-$(getBuildRevDateStr)-armeabi-v7a.apk" +#mv xbmcapp-armeabi-*.apk $UPLOAD_FILENAME diff --git a/tools/buildsteps/linux64/prepare-depends b/tools/buildsteps/linux64/prepare-depends new file mode 100755 index 0000000000..710ad5b8ff --- /dev/null +++ b/tools/buildsteps/linux64/prepare-depends @@ -0,0 +1,13 @@ +WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )} +XBMC_PLATFORM_DIR=linux64 +. $WORKSPACE/tools/buildsteps/defaultenv + +#clean without depends for skipping depends build if possible +cd $WORKSPACE;git clean -xfd -e "tools/depends" + +if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ] +then + #clean up the rest too + cd $WORKSPACE;git clean -xfd + cd $WORKSPACE/tools/depends/;./bootstrap +fi diff --git a/tools/buildsteps/linux64/prepare-xbmc b/tools/buildsteps/linux64/prepare-xbmc new file mode 100755 index 0000000000..f71fcf6fef --- /dev/null +++ b/tools/buildsteps/linux64/prepare-xbmc @@ -0,0 +1,5 @@ +WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )} +XBMC_PLATFORM_DIR=linux64 +. $WORKSPACE/tools/buildsteps/defaultenv + +#nothing on linux diff --git a/tools/depends/native/zlib-native/Makefile b/tools/depends/native/zlib-native/Makefile index 31154eec93..125258fdb6 100644 --- a/tools/depends/native/zlib-native/Makefile +++ b/tools/depends/native/zlib-native/Makefile @@ -8,7 +8,6 @@ LIBNAME=zlib VERSION=1.2.7 SOURCE=$(LIBNAME)-$(VERSION) ARCHIVE=$(SOURCE).tar.gz -BASE_URL=http://zlib.net/ # configuration settings CONFIGURE= CC="$(CC_FOR_BUILD)" CFLAGS="$(BUILD_CFLAGS)" ./configure --prefix=$(PREFIX) diff --git a/tools/depends/target/libgcrypt/01-inline-gcc.patch b/tools/depends/target/libgcrypt/01-inline-gcc.patch new file mode 100644 index 0000000000..3a0fe015ac --- /dev/null +++ b/tools/depends/target/libgcrypt/01-inline-gcc.patch @@ -0,0 +1,42 @@ +From 5abc06114e91beca0177331e1c79815f5fb6d7be Mon Sep 17 00:00:00 2001 +From: Werner Koch <wk@gnupg.org> +Date: Thu, 8 Nov 2012 15:38:44 +0100 +Subject: [PATCH] Fix extern inline use for gcc > 4.3 in c99 mode + +* mpi/mpi-inline.h [!G10_MPI_INLINE_DECL]: Take care of changed extern +inline semantics in gcc. +-- + +I am not use how this will work out with non-gcc. However, we had no +problems in the past and thus this change is the least invasive for +non-gcc compilers. + +GnuPG-bug-id: 1406, 1435 +--- + mpi/mpi-inline.h | 9 ++++++++- + 1 files changed, 8 insertions(+), 1 deletions(-) + +diff --git a/mpi/mpi-inline.h b/mpi/mpi-inline.h +index 88d9f56..94e2aec 100644 +--- a/mpi/mpi-inline.h ++++ b/mpi/mpi-inline.h +@@ -28,8 +28,15 @@ + #ifndef G10_MPI_INLINE_H + #define G10_MPI_INLINE_H + ++/* Starting with gcc 4.3 "extern inline" conforms in c99 mode to the ++ c99 semantics. To keep the useful old semantics we use an ++ attribute. */ + #ifndef G10_MPI_INLINE_DECL +-#define G10_MPI_INLINE_DECL extern __inline__ ++# ifdef __GNUC_STDC_INLINE__ ++# define G10_MPI_INLINE_DECL extern inline __attribute__ ((__gnu_inline__)) ++# else ++# define G10_MPI_INLINE_DECL extern __inline__ ++# endif + #endif + + G10_MPI_INLINE_DECL mpi_limb_t +-- +1.7.2.5 + diff --git a/tools/depends/target/libgcrypt/01-static-mpi_mpi-internal.patch b/tools/depends/target/libgcrypt/01-static-mpi_mpi-internal.patch deleted file mode 100644 index 5a1f60f8d6..0000000000 --- a/tools/depends/target/libgcrypt/01-static-mpi_mpi-internal.patch +++ /dev/null @@ -1,53 +0,0 @@ -*** mpi/mpi-internal.h Sun May 6 17:39:56 2012 ---- mpi/mpi-internal_new.h Sun May 6 17:45:59 2012 -*************** void _gcry_mpi_lshift_limbs( gcry_mpi_t -*** 183,206 **** - - - /*-- mpih-add.c --*/ -! mpi_limb_t _gcry_mpih_add_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, -! mpi_size_t s1_size, mpi_limb_t s2_limb ); - mpi_limb_t _gcry_mpih_add_n( mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, -! mpi_ptr_t s2_ptr, mpi_size_t size); -! mpi_limb_t _gcry_mpih_add(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size, -! mpi_ptr_t s2_ptr, mpi_size_t s2_size); -! - /*-- mpih-sub.c --*/ -! mpi_limb_t _gcry_mpih_sub_1( mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, -! mpi_size_t s1_size, mpi_limb_t s2_limb ); - mpi_limb_t _gcry_mpih_sub_n( mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, -! mpi_ptr_t s2_ptr, mpi_size_t size); -! mpi_limb_t _gcry_mpih_sub(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size, -! mpi_ptr_t s2_ptr, mpi_size_t s2_size); -! - /*-- mpih-cmp.c --*/ -! int _gcry_mpih_cmp( mpi_ptr_t op1_ptr, mpi_ptr_t op2_ptr, mpi_size_t size ); -! - /*-- mpih-mul.c --*/ - - struct karatsuba_ctx { ---- 183,206 ---- - - - /*-- mpih-add.c --*/ -! static mpi_limb_t _gcry_mpih_add_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, -! mpi_size_t s1_size, mpi_limb_t s2_limb ); - mpi_limb_t _gcry_mpih_add_n( mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, -! mpi_ptr_t s2_ptr, mpi_size_t size); -! static mpi_limb_t _gcry_mpih_add(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size, -! mpi_ptr_t s2_ptr, mpi_size_t s2_size); -! - /*-- mpih-sub.c --*/ -! static mpi_limb_t _gcry_mpih_sub_1( mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, -! mpi_size_t s1_size, mpi_limb_t s2_limb ); - mpi_limb_t _gcry_mpih_sub_n( mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, -! mpi_ptr_t s2_ptr, mpi_size_t size); -! static mpi_limb_t _gcry_mpih_sub(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size, -! mpi_ptr_t s2_ptr, mpi_size_t s2_size); -! - /*-- mpih-cmp.c --*/ -! static int _gcry_mpih_cmp( mpi_ptr_t op1_ptr, mpi_ptr_t op2_ptr, mpi_size_t size ); -! - /*-- mpih-mul.c --*/ - - struct karatsuba_ctx { diff --git a/tools/depends/target/libgcrypt/Makefile b/tools/depends/target/libgcrypt/Makefile index e4e121fb60..3e21bd5f7d 100644 --- a/tools/depends/target/libgcrypt/Makefile +++ b/tools/depends/target/libgcrypt/Makefile @@ -27,7 +27,7 @@ $(TARBALLS_LOCATION)/$(ARCHIVE): $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS) rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM) cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - cd $(PLATFORM); patch -p0 < ../01-static-mpi_mpi-internal.patch + cd $(PLATFORM); patch -p1 < ../01-inline-gcc.patch cd $(PLATFORM); patch -p0 < ../02-armasm.patch cd $(PLATFORM); patch -p0 < ../03-gcrypt-android-select.patch cd $(PLATFORM); patch -p0 < ../04-oflagmunging.patch diff --git a/tools/depends/target/zlib/Makefile b/tools/depends/target/zlib/Makefile index e40f21582d..551301ca57 100644 --- a/tools/depends/target/zlib/Makefile +++ b/tools/depends/target/zlib/Makefile @@ -6,7 +6,6 @@ LIBNAME=zlib VERSION=1.2.7 SOURCE=$(LIBNAME)-$(VERSION) ARCHIVE=$(SOURCE).tar.gz -BASE_URL=http://zlib.net/ # configuration settings CONFIGURE= CC="$(CC)" CFLAGS="$(CFLAGS)" ./configure --prefix=$(PREFIX) --static diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp index d99703a731..af8c742900 100644 --- a/xbmc/Application.cpp +++ b/xbmc/Application.cpp @@ -4546,7 +4546,8 @@ void CApplication::UpdateFileState() // Check whether we're *really* playing video else we may race when getting eg. stream details if (IsPlayingVideo()) { - // Special case for DVDs: Only extract streamdetails if title length > 15m. Should yield more correct info + /* Always update streamdetails, except for DVDs where we only update + streamdetails if title length > 15m (Should yield more correct info) */ if (!(m_progressTrackingItem->IsDVDImage() || m_progressTrackingItem->IsDVDFile()) || m_pPlayer->GetTotalTime() > 15*60*1000) { CStreamDetails details; @@ -5001,11 +5002,22 @@ bool CApplication::OnMessage(CGUIMessage& message) } #endif - // ok - send the file to the player if it wants it - if (m_pPlayer && m_pPlayer->QueueNextFile(file)) - { // player wants the next file - m_nextPlaylistItem = iNext; + // ok - send the file to the player, if it accepts it + if (m_pPlayer) + { + if (m_pPlayer->QueueNextFile(file)) + { + // player accepted the next file + m_nextPlaylistItem = iNext; + } + else + { + /* Player didn't accept next file: *ALWAYS* advance playlist in this case so the player can + queue the next (if it wants to) and it doesn't keep looping on this song */ + g_playlistPlayer.SetCurrentSong(iNext); + } } + return true; } break; diff --git a/xbmc/Makefile.in b/xbmc/Makefile.in index 1a995f779a..5a9bd6b178 100644 --- a/xbmc/Makefile.in +++ b/xbmc/Makefile.in @@ -10,10 +10,10 @@ SRCS=Application.cpp \ DynamicDll.cpp \ Favourites.cpp \ FileItem.cpp \ - LangInfo.cpp \ GUIInfoManager.cpp \ GUILargeTextureManager.cpp \ GUIPassword.cpp \ + LangInfo.cpp \ MediaSource.cpp \ NfoFile.cpp \ PasswordManager.cpp \ diff --git a/xbmc/cores/AudioEngine/Engines/CoreAudio/CoreAudioAE.cpp b/xbmc/cores/AudioEngine/Engines/CoreAudio/CoreAudioAE.cpp index ce3b0c4158..6435c87a27 100644 --- a/xbmc/cores/AudioEngine/Engines/CoreAudio/CoreAudioAE.cpp +++ b/xbmc/cores/AudioEngine/Engines/CoreAudio/CoreAudioAE.cpp @@ -105,8 +105,8 @@ CCoreAudioAE::CCoreAudioAE() : CCoreAudioAE::~CCoreAudioAE() { - Shutdown(); RegisterDeviceChangedCB(false, this); + Shutdown(); } void CCoreAudioAE::Shutdown() @@ -150,6 +150,10 @@ void CCoreAudioAE::AudioDevicesChanged() // again (yeah that really is the case - duh) Sleep(500); CSingleLock engineLock(m_engineLock); + + // re-check initialized since it can have changed when we waited and grabbed the lock + if (!m_Initialized) + return; OpenCoreAudio(m_lastSampleRate, COREAUDIO_IS_RAW(m_lastStreamFormat), m_lastStreamFormat); } @@ -173,7 +177,7 @@ bool CCoreAudioAE::Initialize() bool CCoreAudioAE::OpenCoreAudio(unsigned int sampleRate, bool forceRaw, enum AEDataFormat rawDataFormat) { - + unsigned int maxChannelCountInStreams = 0; // remove any deleted streams CSingleLock streamLock(m_streamLock); for (StreamList::iterator itt = m_streams.begin(); itt != m_streams.end();) @@ -190,6 +194,10 @@ bool CCoreAudioAE::OpenCoreAudio(unsigned int sampleRate, bool forceRaw, // close all converter stream->CloseConverter(); } + + if (stream->GetChannelCount() > maxChannelCountInStreams) + maxChannelCountInStreams = stream->GetChannelCount(); + ++itt; } @@ -263,7 +271,16 @@ bool CCoreAudioAE::OpenCoreAudio(unsigned int sampleRate, bool forceRaw, m_format.m_dataFormat = AE_FMT_S16NE; break; case AE_FMT_LPCM: - m_format.m_channelLayout = CAEChannelInfo(AE_CH_LAYOUT_7_1); + // audio midi setup can be setup to 2.0 or 7.1 + // if we have the number of max channels from streams we use that for + // selecting either 2.0 or 7.1 setup depending on that. + // This allows DPII modes on amps for enhancing stereo sound + // (when switching to 7.1 - all 8 channels will be pushed out preventing most amps + // to switch to DPII mode) + if (maxChannelCountInStreams == 1 || maxChannelCountInStreams == 2) + m_format.m_channelLayout = CAEChannelInfo(AE_CH_LAYOUT_2_0); + else + m_format.m_channelLayout = CAEChannelInfo(AE_CH_LAYOUT_7_1); m_format.m_sampleRate = sampleRate; m_format.m_dataFormat = AE_FMT_FLOAT; break; diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp index 80930a0ef7..147225797a 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp @@ -97,9 +97,12 @@ bool CDVDAudioCodecFFmpeg::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options if( hints.extradata && hints.extrasize > 0 ) { - m_pCodecContext->extradata_size = hints.extrasize; m_pCodecContext->extradata = (uint8_t*)m_dllAvUtil.av_mallocz(hints.extrasize + FF_INPUT_BUFFER_PADDING_SIZE); - memcpy(m_pCodecContext->extradata, hints.extradata, hints.extrasize); + if(m_pCodecContext->extradata) + { + m_pCodecContext->extradata_size = hints.extrasize; + memcpy(m_pCodecContext->extradata, hints.extradata, hints.extrasize); + } } if (m_dllAvCodec.avcodec_open2(m_pCodecContext, pCodec, NULL) < 0) diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp index 7f7b304fdd..0eb1fcfa01 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp @@ -186,7 +186,8 @@ int CDVDOverlayCodecFFmpeg::Decode(DemuxPacket *pPacket) // for pgs subtitles the packet pts of the end_segments are wrong // instead use the subtitle pts to calc the offset here // see http://git.videolan.org/?p=ffmpeg.git;a=commit;h=2939e258f9d1fff89b3b68536beb931b54611585 - if (m_Subtitle.pts != DVD_NOPTS_VALUE) + + if (m_Subtitle.pts != AV_NOPTS_VALUE && pPacket->pts != DVD_NOPTS_VALUE) { pts_offset = m_Subtitle.pts - pPacket->pts ; } diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp index 0f2deaf0bb..1257052f88 100644 --- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp +++ b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp @@ -1007,7 +1007,7 @@ void CDVDDemuxFFmpeg::AddStream(int iId) AVDictionaryEntry *rtag = m_dllAvUtil.av_dict_get(pStream->metadata, "rotate", NULL, 0); if (rtag) - st->iOrientation = atoi(rtag->value); + st->iOrientation = atoi(rtag->value); if ( m_pInput->IsStreamType(DVDSTREAM_TYPE_DVD) ) { diff --git a/xbmc/guilib/GUIFadeLabelControl.cpp b/xbmc/guilib/GUIFadeLabelControl.cpp index 706d073219..ecbd69ebbc 100644 --- a/xbmc/guilib/GUIFadeLabelControl.cpp +++ b/xbmc/guilib/GUIFadeLabelControl.cpp @@ -35,7 +35,7 @@ CGUIFadeLabelControl::CGUIFadeLabelControl(int parentID, int controlID, float po m_lastLabel = -1; m_scrollSpeed = labelInfo.scrollSpeed; // save it for later m_resetOnLabelChange = resetOnLabelChange; - m_shortText = false; + m_shortText = true; } CGUIFadeLabelControl::CGUIFadeLabelControl(const CGUIFadeLabelControl &from) diff --git a/xbmc/input/linux/LinuxInputDevices.cpp b/xbmc/input/linux/LinuxInputDevices.cpp index 1d3d3155ff..458f74081b 100644 --- a/xbmc/input/linux/LinuxInputDevices.cpp +++ b/xbmc/input/linux/LinuxInputDevices.cpp @@ -986,7 +986,6 @@ bool CLinuxInputDevices::CheckDevice(const char *device) { int fd; - CLog::Log(LOGDEBUG, "Checking device: %s\n", device); /* Check if we are able to open the device */ fd = open(device, O_RDWR); if (fd < 0) diff --git a/xbmc/interfaces/json-rpc/JSONRPC.cpp b/xbmc/interfaces/json-rpc/JSONRPC.cpp index 0b5b9cd04e..03e5497b10 100644 --- a/xbmc/interfaces/json-rpc/JSONRPC.cpp +++ b/xbmc/interfaces/json-rpc/JSONRPC.cpp @@ -281,7 +281,6 @@ bool CJSONRPC::HandleMethodCall(const CVariant& request, CVariant& response, ITr JSONRPC::MethodCall method; CVariant params; - CLog::Log(LOGDEBUG, "JSONRPC: Calling %s", methodName.c_str()); if ((errorCode = CJSONServiceDescription::CheckCall(methodName, request["params"], transport, client, isNotification, method, params)) == OK) errorCode = method(methodName, transport, client, params, result); else diff --git a/xbmc/interfaces/json-rpc/JSONServiceDescription.cpp b/xbmc/interfaces/json-rpc/JSONServiceDescription.cpp index ab38267aad..6267ee8630 100644 --- a/xbmc/interfaces/json-rpc/JSONServiceDescription.cpp +++ b/xbmc/interfaces/json-rpc/JSONServiceDescription.cpp @@ -591,14 +591,12 @@ JSONRPC_STATUS JSONSchemaTypeDefinition::Check(const CVariant &value, CVariant & // Let's check the type of the provided parameter if (!IsType(value, type)) { - CLog::Log(LOGDEBUG, "JSONRPC: Type mismatch in type %s", name.c_str()); errorMessage.Format("Invalid type %s received", ValueTypeToString(value.type())); errorData["message"] = errorMessage.c_str(); return InvalidParams; } else if (value.isNull() && !HasType(type, NullValue)) { - CLog::Log(LOGDEBUG, "JSONRPC: Value is NULL in type %s", name.c_str()); errorData["message"] = "Received value is null"; return InvalidParams; } @@ -621,7 +619,6 @@ JSONRPC_STATUS JSONSchemaTypeDefinition::Check(const CVariant &value, CVariant & if (!ok) { - CLog::Log(LOGDEBUG, "JSONRPC: Value in type %s does not match any of the union type definitions", name.c_str()); errorData["message"] = "Received value does not match any of the union type definitions"; return InvalidParams; } diff --git a/xbmc/music/Album.cpp b/xbmc/music/Album.cpp index 21011e4679..95f2cc1310 100644 --- a/xbmc/music/Album.cpp +++ b/xbmc/music/Album.cpp @@ -99,7 +99,7 @@ bool CAlbum::Load(const TiXmlElement *album, bool append, bool prioritise) { CSong song; - XMLUtils::GetInt(node,"position",song.iTrack); + XMLUtils::GetInt(node, "position", song.iTrack); if (song.iTrack == 0) bIncrement = true; @@ -163,20 +163,9 @@ bool CAlbum::Save(TiXmlNode *node, const CStdString &tag, const CStdString& strP // add a <song> tag TiXmlElement cast("track"); TiXmlNode *node = album->InsertEndChild(cast); - TiXmlElement title("title"); - TiXmlNode *titleNode = node->InsertEndChild(title); - TiXmlText name(it->strTitle); - titleNode->InsertEndChild(name); - TiXmlElement year("position"); - TiXmlNode *yearNode = node->InsertEndChild(year); - CStdString strTrack; - strTrack.Format("%i",it->iTrack); - TiXmlText name2(strTrack); - yearNode->InsertEndChild(name2); - TiXmlElement duration("duration"); - TiXmlNode *durNode = node->InsertEndChild(duration); - TiXmlText name3(StringUtils::SecondsToTimeString(it->iDuration)); - durNode->InsertEndChild(name3); + XMLUtils::SetString(node, "title", it->strTitle); + XMLUtils::SetInt(node, "position", it->iTrack); + XMLUtils::SetString(node, "duration", StringUtils::SecondsToTimeString(it->iDuration)); } return true; diff --git a/xbmc/music/Artist.cpp b/xbmc/music/Artist.cpp index 1c72531dea..8d85c960b1 100644 --- a/xbmc/music/Artist.cpp +++ b/xbmc/music/Artist.cpp @@ -37,10 +37,10 @@ bool CArtist::Load(const TiXmlElement *artist, bool append, bool prioritise) XMLUtils::GetStringArray(artist, "yearsactive", yearsActive, prioritise, g_advancedSettings.m_musicItemSeparator); XMLUtils::GetStringArray(artist, "instruments", instruments, prioritise, g_advancedSettings.m_musicItemSeparator); - XMLUtils::GetString(artist, "born", strBorn); - XMLUtils::GetString(artist, "formed", strFormed); + XMLUtils::GetString(artist, "born", strBorn); + XMLUtils::GetString(artist, "formed", strFormed); XMLUtils::GetString(artist, "biography", strBiography); - XMLUtils::GetString(artist, "died", strDied); + XMLUtils::GetString(artist, "died", strDied); XMLUtils::GetString(artist, "disbanded", strDisbanded); size_t iThumbCount = thumbURL.m_url.size(); diff --git a/xbmc/music/MusicDatabase.cpp b/xbmc/music/MusicDatabase.cpp index 3c4e3cf04a..c74e09afc4 100644 --- a/xbmc/music/MusicDatabase.cpp +++ b/xbmc/music/MusicDatabase.cpp @@ -896,7 +896,7 @@ CSong CMusicDatabase::GetSongFromDataset(bool bWithMusicDbPath/*=false*/) song.genre = StringUtils::Split(m_pDS->fv(song_strGenres).get_asString(), g_advancedSettings.m_musicItemSeparator); // and the rest... song.strAlbum = m_pDS->fv(song_strAlbum).get_asString(); - song.iAlbumId = m_pDS->fv(song_idAlbum).get_asInt(); + song.idAlbum = m_pDS->fv(song_idAlbum).get_asInt(); song.iTrack = m_pDS->fv(song_iTrack).get_asInt() ; song.iDuration = m_pDS->fv(song_iDuration).get_asInt() ; song.iYear = m_pDS->fv(song_iYear).get_asInt() ; @@ -5405,7 +5405,7 @@ bool CMusicDatabase::GetFilter(CDbUrl &musicUrl, Filter &filter, SortDescription // and always show any artists linked to an album (may be different from above due to album artist tag) strSQL += "(SELECT album_artist.idArtist FROM album_artist"; // All artists linked to an album if (albumArtistsOnly) - strSQL += " WHERE album_artist.boolFeatured = 0"; // then exclude those that have no extra artists + strSQL += " JOIN album ON album.idAlbum = album_artist.idAlbum WHERE album.bCompilation = 0 "; // then exclude those that have no extra artists strSQL += ")"; } diff --git a/xbmc/music/MusicDatabase.h b/xbmc/music/MusicDatabase.h index 6c66afa1c2..502494cd59 100644 --- a/xbmc/music/MusicDatabase.h +++ b/xbmc/music/MusicDatabase.h @@ -102,63 +102,152 @@ public: bool LookupCDDBInfo(bool bRequery=false); void DeleteCDDBInfo(); + ///////////////////////////////////////////////// + // Song CRUD + ///////////////////////////////////////////////// /*! \brief Add an album and all its songs to the database \param album the album to add \param songIDs [out] the ids of the added songs \return the id of the album */ - int AddAlbum(const CAlbum &album, std::vector<int> &songIDs); + int AddSong(const CSong& song, bool bCheck = true, int idAlbum = -1); + bool GetSongById(int idSong, CSong& song); + int UpdateSong(const CSong& song, int idSong = -1); + // bool DeleteSong(int idSong); + + //// Misc Song + bool GetSongByFileName(const CStdString& strFileName, CSong& song, int startOffset = 0); + bool GetSongsByPath(const CStdString& strPath, MAPSONGS& songs, bool bAppendToMap = false); + bool Search(const CStdString& search, CFileItemList &items); + bool RemoveSongsFromPath(const CStdString &path, MAPSONGS& songs, bool exact=true); + bool SetSongRating(const CStdString &filePath, char rating); + int GetSongByArtistAndAlbumAndTitle(const CStdString& strArtist, const CStdString& strAlbum, const CStdString& strTitle); + + ///////////////////////////////////////////////// + // Album + ///////////////////////////////////////////////// + /*! \brief Add an album and all its songs to the database + \param album the album to add + \param songIDs [out] the ids of the added songs + \return the id of the album + */ + int AddAlbum(const CAlbum &album, std::vector<int> &songIDs); + int AddAlbum(const CStdString& strAlbum, const CStdString& strArtist, const CStdString& strGenre, int year, bool bCompilation); + bool GetAlbum(int idAlbum, CAlbum& album); + int UpdateAlbum(int idAlbum, const CAlbum &album); + bool DeleteAlbum(int idAlbum); + + //// Misc Album + int GetAlbumIdByPath(const CStdString& path); + bool GetAlbumFromSong(int idSong, CAlbum &album); + bool GetAlbumFromSong(const CSong &song, CAlbum &album); + int GetAlbumByName(const CStdString& strAlbum, const CStdString& strArtist=""); + int GetAlbumByName(const CStdString& strAlbum, const std::vector<std::string>& artist); + CStdString GetAlbumById(int id); - int UpdateSong(const CSong& song, int idSong = -1); + ///////////////////////////////////////////////// + // Artist CRUD + ///////////////////////////////////////////////// + int AddArtist(const CStdString& strArtist); + bool GetArtist(int idArtist, CArtist& artist); + int UpdateArtist(int idArtist, const CArtist& artist); + bool DeleteArtist(int idArtist); + + CStdString GetArtistById(int id); + int GetArtistByName(const CStdString& strArtist); + + ///////////////////////////////////////////////// + // Paths + ///////////////////////////////////////////////// + int AddPath(const CStdString& strPath); + + bool GetPaths(std::set<CStdString> &paths); + bool SetPathHash(const CStdString &path, const CStdString &hash); + bool GetPathHash(const CStdString &path, CStdString &hash); + bool GetAlbumPath(int idAlbum, CStdString &path); + bool GetArtistPath(int idArtist, CStdString &path); + + ///////////////////////////////////////////////// + // Genres + ///////////////////////////////////////////////// + int AddGenre(const CStdString& strGenre); + CStdString GetGenreById(int id); + int GetGenreByName(const CStdString& strGenre); + + ///////////////////////////////////////////////// + // AlbumInfo + ///////////////////////////////////////////////// + bool HasAlbumInfo(int idAlbum); int SetAlbumInfo(int idAlbum, const CAlbum& album, const VECSONGS& songs, bool bTransaction=true); - bool DeleteAlbumInfo(int idArtist); - int SetArtistInfo(int idArtist, const CArtist& artist); - bool DeleteArtistInfo(int idArtist); bool GetAlbumInfo(int idAlbum, CAlbum &info, VECSONGS* songs, bool scrapedInfo = false); - bool HasAlbumInfo(int idAlbum); - bool GetArtistInfo(int idArtist, CArtist &info, bool needAll=true); + bool DeleteAlbumInfo(int idArtist); + bool SetAlbumInfoSongs(int idAlbumInfo, const VECSONGS& songs); + bool GetAlbumInfoSongs(int idAlbumInfo, VECSONGS& songs); + ///////////////////////////////////////////////// + // ArtistInfo + ///////////////////////////////////////////////// /*! \brief Check if an artist entity has additional metadata (scraped) \param idArtist the id of the Artist to check \return true or false - whether the artist has metadata */ bool HasArtistInfo(int idArtist); - bool GetSongByFileName(const CStdString& strFileName, CSong& song, int startOffset = 0); - int GetAlbumIdByPath(const CStdString& path); - bool GetSongById(int idSong, CSong& song); - bool GetSongByKaraokeNumber( int number, CSong& song ); - bool SetKaraokeSongDelay( int idSong, int delay ); - bool GetSongsByPath(const CStdString& strPath, MAPSONGS& songs, bool bAppendToMap = false); - bool Search(const CStdString& search, CFileItemList &items); + int SetArtistInfo(int idArtist, const CArtist& artist); + bool GetArtistInfo(int idArtist, CArtist &info, bool needAll=true); + bool DeleteArtistInfo(int idArtist); - bool GetAlbumFromSong(int idSong, CAlbum &album); - bool GetAlbumFromSong(const CSong &song, CAlbum &album); - + ///////////////////////////////////////////////// + // Link tables + ///////////////////////////////////////////////// + bool AddAlbumArtist(int idArtist, int idAlbum, bool featured, int iOrder); bool GetAlbumsByArtist(int idArtist, bool includeFeatured, std::vector<int>& albums); bool GetArtistsByAlbum(int idAlbum, bool includeFeatured, std::vector<int>& artists); + + bool AddSongArtist(int idArtist, int idSong, bool featured, int iOrder); bool GetSongsByArtist(int idArtist, bool includeFeatured, std::vector<int>& songs); bool GetArtistsBySong(int idSong, bool includeFeatured, std::vector<int>& artists); - bool GetGenresByAlbum(int idAlbum, std::vector<int>& genres); + bool AddSongGenre(int idGenre, int idSong, int iOrder); bool GetGenresBySong(int idSong, std::vector<int>& genres); + bool AddAlbumGenre(int idGenre, int idAlbum, int iOrder); + bool GetGenresByAlbum(int idAlbum, std::vector<int>& genres); + + ///////////////////////////////////////////////// + // Top 100 + ///////////////////////////////////////////////// bool GetTop100(const CStdString& strBaseDir, CFileItemList& items); bool GetTop100Albums(VECALBUMS& albums); bool GetTop100AlbumSongs(const CStdString& strBaseDir, CFileItemList& item); + + ///////////////////////////////////////////////// + // Recently added + ///////////////////////////////////////////////// bool GetRecentlyAddedAlbums(VECALBUMS& albums, unsigned int limit=0); bool GetRecentlyAddedAlbumSongs(const CStdString& strBaseDir, CFileItemList& item, unsigned int limit=0); bool GetRecentlyPlayedAlbums(VECALBUMS& albums); bool GetRecentlyPlayedAlbumSongs(const CStdString& strBaseDir, CFileItemList& item); + + ///////////////////////////////////////////////// + // Compilations + ///////////////////////////////////////////////// + bool GetCompilationAlbums(const CStdString& strBaseDir, CFileItemList& items); + bool GetCompilationSongs(const CStdString& strBaseDir, CFileItemList& items); + int GetCompilationAlbumsCount(); + bool GetVariousArtistsAlbums(const CStdString& strBaseDir, CFileItemList& items); + bool GetVariousArtistsAlbumsSongs(const CStdString& strBaseDir, CFileItemList& items); + int GetVariousArtistsAlbumsCount(); + /*! \brief Increment the playcount of an item Increments the playcount and updates the last played date \param item CFileItem to increment the playcount for */ void IncrementPlayCount(const CFileItem &item); - bool RemoveSongsFromPath(const CStdString &path, MAPSONGS& songs, bool exact=true); bool CleanupOrphanedItems(); - bool GetPaths(std::set<CStdString> &paths); - bool SetPathHash(const CStdString &path, const CStdString &hash); - bool GetPathHash(const CStdString &path, CStdString &hash); + + ///////////////////////////////////////////////// + // VIEWS + ///////////////////////////////////////////////// bool GetGenresNav(const CStdString& strBaseDir, CFileItemList& items, const Filter &filter = Filter(), bool countOnly = false); bool GetYearsNav(const CStdString& strBaseDir, CFileItemList& items, const Filter &filter = Filter()); bool GetArtistsNav(const CStdString& strBaseDir, CFileItemList& items, bool albumArtistsOnly = false, int idGenre = -1, int idAlbum = -1, int idSong = -1, const Filter &filter = Filter(), const SortDescription &sortDescription = SortDescription(), bool countOnly = false); @@ -173,56 +262,56 @@ public: bool GetAlbumsByWhere(const CStdString &baseDir, const Filter &filter, CFileItemList &items, const SortDescription &sortDescription = SortDescription(), bool countOnly = false); bool GetArtistsByWhere(const CStdString& strBaseDir, const Filter &filter, CFileItemList& items, const SortDescription &sortDescription = SortDescription(), bool countOnly = false); bool GetRandomSong(CFileItem* item, int& idSong, const Filter &filter); - int GetKaraokeSongsCount(); int GetSongsCount(const Filter &filter = Filter()); unsigned int GetSongIDs(const Filter &filter, std::vector<std::pair<int,int> > &songIDs); + virtual bool GetFilter(CDbUrl &musicUrl, Filter &filter, SortDescription &sorting); - bool GetAlbumPath(int idAlbum, CStdString &path); - bool SaveAlbumThumb(int idAlbum, const CStdString &thumb); - bool GetArtistPath(int idArtist, CStdString &path); - - CStdString GetGenreById(int id); - CStdString GetArtistById(int id); - CStdString GetAlbumById(int id); - - int GetArtistByName(const CStdString& strArtist); - int GetAlbumByName(const CStdString& strAlbum, const CStdString& strArtist=""); - int GetAlbumByName(const CStdString& strAlbum, const std::vector<std::string>& artist); - int GetGenreByName(const CStdString& strGenre); - int GetSongByArtistAndAlbumAndTitle(const CStdString& strArtist, const CStdString& strAlbum, const CStdString& strTitle); - - bool GetCompilationAlbums(const CStdString& strBaseDir, CFileItemList& items); - bool GetCompilationSongs(const CStdString& strBaseDir, CFileItemList& items); - int GetCompilationAlbumsCount(); - bool GetVariousArtistsAlbums(const CStdString& strBaseDir, CFileItemList& items); - bool GetVariousArtistsAlbumsSongs(const CStdString& strBaseDir, CFileItemList& items); - int GetVariousArtistsAlbumsCount(); - - bool SetSongRating(const CStdString &filePath, char rating); + ///////////////////////////////////////////////// + // Scraper + ///////////////////////////////////////////////// bool SetScraperForPath(const CStdString& strPath, const ADDON::ScraperPtr& info); bool GetScraperForPath(const CStdString& strPath, ADDON::ScraperPtr& info, const ADDON::TYPE &type); - + /*! \brief Check whether a given scraper is in use. \param scraperID the scraper to check for. \return true if the scraper is in use, false otherwise. */ bool ScraperInUse(const CStdString &scraperID) const; - // retrieve a list of items + ///////////////////////////////////////////////// + // Karaoke + ///////////////////////////////////////////////// + void AddKaraokeData(int idSong, const CSong& song); + bool GetSongByKaraokeNumber( int number, CSong& song ); + bool SetKaraokeSongDelay( int idSong, int delay ); + int GetKaraokeSongsCount(); + void ExportKaraokeInfo(const CStdString &outFile, bool asHTML ); + void ImportKaraokeInfo(const CStdString &inputFile ); + + ///////////////////////////////////////////////// + // Filters + ///////////////////////////////////////////////// bool GetItems(const CStdString &strBaseDir, CFileItemList &items, const Filter &filter = Filter(), const SortDescription &sortDescription = SortDescription()); bool GetItems(const CStdString &strBaseDir, const CStdString &itemType, CFileItemList &items, const Filter &filter = Filter(), const SortDescription &sortDescription = SortDescription()); CStdString GetItemById(const CStdString &itemType, int id); + ///////////////////////////////////////////////// + // XML + ///////////////////////////////////////////////// void ExportToXML(const CStdString &xmlFile, bool singleFiles = false, bool images=false, bool overwrite=false); void ImportFromXML(const CStdString &xmlFile); - void ExportKaraokeInfo(const CStdString &outFile, bool asHTML ); - void ImportKaraokeInfo(const CStdString &inputFile ); - + ///////////////////////////////////////////////// + // Properties + ///////////////////////////////////////////////// void SetPropertiesForFileItem(CFileItem& item); static void SetPropertiesFromArtist(CFileItem& item, const CArtist& artist); static void SetPropertiesFromAlbum(CFileItem& item, const CAlbum& album); + ///////////////////////////////////////////////// + // Art + ///////////////////////////////////////////////// + bool SaveAlbumThumb(int idAlbum, const CStdString &thumb); /*! \brief Sets art for a database item. Sets a single piece of art for a database item. \param mediaId the id in the media (song/artist/album) table. @@ -282,8 +371,6 @@ public: */ std::string GetArtistArtForItem(int mediaId, const std::string &mediaType, const std::string &artType); - virtual bool GetFilter(CDbUrl &musicUrl, Filter &filter, SortDescription &sorting); - protected: std::map<CStdString, int> m_artistCache; std::map<CStdString, int> m_genreCache; @@ -295,20 +382,7 @@ protected: virtual int GetMinVersion() const; const char *GetBaseDBName() const { return "MyMusic"; }; - int AddSong(const CSong& song, bool bCheck = true, int idAlbum = -1); - int AddAlbum(const CStdString& strAlbum1, const CStdString &strArtist1, const CStdString& strGenre, int year, bool bCompilation); - int AddGenre(const CStdString& strGenre); - int AddArtist(const CStdString& strArtist); - int AddPath(const CStdString& strPath); - bool AddAlbumArtist(int idArtist, int idAlbum, bool featured, int iOrder); - bool AddSongArtist(int idArtist, int idSong, bool featured, int iOrder); - bool AddSongGenre(int idGenre, int idSong, int iOrder); - bool AddAlbumGenre(int idGenre, int idAlbum, int iOrder); - - void AddKaraokeData(int idSong, const CSong& song); - bool SetAlbumInfoSongs(int idAlbumInfo, const VECSONGS& songs); - bool GetAlbumInfoSongs(int idAlbumInfo, VECSONGS& songs); private: /*! \brief (Re)Create the generic database views for songs and albums */ diff --git a/xbmc/music/Song.cpp b/xbmc/music/Song.cpp index 3c96f67528..1fde6b3f59 100644 --- a/xbmc/music/Song.cpp +++ b/xbmc/music/Song.cpp @@ -54,7 +54,7 @@ CSong::CSong(CMusicInfoTag& tag) iTimesPlayed = 0; iKaraokeNumber = 0; iKaraokeDelay = 0; //! Karaoke song lyrics-music delay in 1/10 seconds. - iAlbumId = -1; + idAlbum = -1; } CSong::CSong() @@ -83,7 +83,7 @@ void CSong::Serialize(CVariant& value) const value["timesplayed"] = iTimesPlayed; value["lastplayed"] = lastPlayed.IsValid() ? lastPlayed.GetAsDBDateTime() : ""; value["karaokenumber"] = (int64_t) iKaraokeNumber; - value["albumid"] = iAlbumId; + value["albumid"] = idAlbum; } void CSong::Clear() @@ -113,7 +113,7 @@ void CSong::Clear() iKaraokeNumber = 0; strKaraokeLyrEncoding.Empty(); iKaraokeDelay = 0; - iAlbumId = -1; + idAlbum = -1; bCompilation = false; embeddedArt.clear(); } diff --git a/xbmc/music/Song.h b/xbmc/music/Song.h index e346212808..0a3b641a60 100644 --- a/xbmc/music/Song.h +++ b/xbmc/music/Song.h @@ -78,6 +78,7 @@ public: bool ArtMatches(const CSong &right) const; long idSong; + int idAlbum; CStdString strFileName; CStdString strTitle; std::vector<std::string> artist; @@ -100,7 +101,6 @@ public: CDateTime lastPlayed; int iStartOffset; int iEndOffset; - int iAlbumId; bool bCompilation; // Karaoke-specific information diff --git a/xbmc/music/infoscanner/MusicInfoScanner.cpp b/xbmc/music/infoscanner/MusicInfoScanner.cpp index c088d64616..14f4b4c052 100644 --- a/xbmc/music/infoscanner/MusicInfoScanner.cpp +++ b/xbmc/music/infoscanner/MusicInfoScanner.cpp @@ -58,7 +58,7 @@ using namespace MUSIC_INFO; using namespace XFILE; using namespace MUSIC_GRABBER; -CMusicInfoScanner::CMusicInfoScanner() : CThread("MusicInfoScanner") +CMusicInfoScanner::CMusicInfoScanner() : CThread("MusicInfoScanner"), m_fileCountReader(this, "MusicFileCounter") { m_bRunning = false; m_showDialog = false; @@ -104,9 +104,8 @@ void CMusicInfoScanner::Process() // Create the thread to count all files to be scanned SetPriority( GetMinPriority() ); - CThread fileCountReader(this, "MusicFileCounter"); if (m_handle) - fileCountReader.Create(); + m_fileCountReader.Create(); // Database operations should not be canceled // using Interupt() while scanning as it could @@ -151,7 +150,7 @@ void CMusicInfoScanner::Process() } } - fileCountReader.StopThread(); + m_fileCountReader.StopThread(); m_musicDatabase.EmptyCache(); @@ -219,6 +218,8 @@ void CMusicInfoScanner::Process() void CMusicInfoScanner::Start(const CStdString& strDirectory, int flags) { + m_fileCountReader.StopThread(); + StopThread(); m_pathsToScan.clear(); m_albumsScanned.clear(); m_artistsScanned.clear(); @@ -235,7 +236,6 @@ void CMusicInfoScanner::Start(const CStdString& strDirectory, int flags) m_pathsToScan.insert(strDirectory); m_pathsToCount = m_pathsToScan; m_scanType = 0; - StopThread(); Create(); m_bRunning = true; } @@ -244,6 +244,8 @@ void CMusicInfoScanner::FetchAlbumInfo(const CStdString& strDirectory, bool refresh) { m_albumsToScan.clear(); + m_fileCountReader.StopThread(); + StopThread(); m_albumsScanned.clear(); CFileItemList items; @@ -285,7 +287,6 @@ void CMusicInfoScanner::FetchAlbumInfo(const CStdString& strDirectory, m_musicDatabase.Close(); m_scanType = 1; - StopThread(); Create(); m_bRunning = true; } @@ -294,6 +295,8 @@ void CMusicInfoScanner::FetchArtistInfo(const CStdString& strDirectory, bool refresh) { m_artistsToScan.clear(); + m_fileCountReader.StopThread(); + StopThread(); m_artistsScanned.clear(); CFileItemList items; @@ -334,7 +337,6 @@ void CMusicInfoScanner::FetchArtistInfo(const CStdString& strDirectory, m_musicDatabase.Close(); m_scanType = 2; - StopThread(); Create(); m_bRunning = true; } @@ -853,53 +855,6 @@ void CMusicInfoScanner::FindArtForAlbums(VECALBUMS &albums, const CStdString &pa } } -// This function is run by another thread -void CMusicInfoScanner::Run() -{ - int count = 0; - while (!m_bStop && m_pathsToCount.size()) - count+=CountFilesRecursively(*m_pathsToCount.begin()); - m_itemCount = count; -} - -// Recurse through all folders we scan and count files -int CMusicInfoScanner::CountFilesRecursively(const CStdString& strPath) -{ - // load subfolder - CFileItemList items; -// CLog::Log(LOGDEBUG, __FUNCTION__" - processing dir: %s", strPath.c_str()); - CDirectory::GetDirectory(strPath, items, g_advancedSettings.m_musicExtensions, DIR_FLAG_NO_FILE_DIRS); - - if (m_bStop) - return 0; - - // true for recursive counting - int count = CountFiles(items, true); - - // remove this path from the list we're processing - set<CStdString>::iterator it = m_pathsToCount.find(strPath); - if (it != m_pathsToCount.end()) - m_pathsToCount.erase(it); - -// CLog::Log(LOGDEBUG, __FUNCTION__" - finished processing dir: %s", strPath.c_str()); - return count; -} - -int CMusicInfoScanner::CountFiles(const CFileItemList &items, bool recursive) -{ - int count = 0; - for (int i=0; i<items.Size(); ++i) - { - const CFileItemPtr pItem=items[i]; - - if (recursive && pItem->m_bIsFolder) - count+=CountFilesRecursively(pItem->GetPath()); - else if (pItem->IsAudio() && !pItem->IsPlayList() && !pItem->IsNFO()) - count++; - } - return count; -} - int CMusicInfoScanner::GetPathHash(const CFileItemList &items, CStdString &hash) { // Create a hash based on the filenames, filesize and filedate. Also count the number of files @@ -1359,3 +1314,50 @@ map<string, string> CMusicInfoScanner::GetArtistArtwork(long id, const CArtist * return artwork; } + +// This function is the Run() function of the IRunnable +// CFileCountReader and runs in a separate thread. +void CMusicInfoScanner::Run() +{ + int count = 0; + while (!m_bStop && m_pathsToCount.size()) + { + count+=CountFilesRecursively(*m_pathsToCount.begin()); + } + m_itemCount = count; +} + +// Recurse through all folders we scan and count files +int CMusicInfoScanner::CountFilesRecursively(const CStdString& strPath) +{ + // load subfolder + CFileItemList items; + CDirectory::GetDirectory(strPath, items, g_advancedSettings.m_musicExtensions, DIR_FLAG_NO_FILE_DIRS); + + if (m_bStop) + return 0; + + int count = CountFiles(items, true); + + // true for recursive counting + set<CStdString>::iterator it = m_pathsToCount.find(strPath); + if (it != m_pathsToCount.end()) + m_pathsToCount.erase(it); + + return count; +} + +int CMusicInfoScanner::CountFiles(const CFileItemList &items, bool recursive) +{ + int count = 0; + for (int i=0; i<items.Size(); ++i) + { + const CFileItemPtr pItem=items[i]; + + if (recursive && pItem->m_bIsFolder) + count+=CountFilesRecursively(pItem->GetPath()); + else if (pItem->IsAudio() && !pItem->IsPlayList() && !pItem->IsNFO()) + count++; + } + return count; +} diff --git a/xbmc/music/infoscanner/MusicInfoScanner.h b/xbmc/music/infoscanner/MusicInfoScanner.h index ff62721138..65afcfacd9 100644 --- a/xbmc/music/infoscanner/MusicInfoScanner.h +++ b/xbmc/music/infoscanner/MusicInfoScanner.h @@ -145,5 +145,6 @@ protected: std::vector<long> m_artistsScanned; std::vector<long> m_albumsScanned; int m_flags; + CThread m_fileCountReader; }; } diff --git a/xbmc/music/tags/MusicInfoTag.cpp b/xbmc/music/tags/MusicInfoTag.cpp index 2806ebf570..fe88fc4095 100644 --- a/xbmc/music/tags/MusicInfoTag.cpp +++ b/xbmc/music/tags/MusicInfoTag.cpp @@ -560,7 +560,7 @@ void CMusicInfoTag::SetSong(const CSong& song) m_type = "song"; m_bLoaded = true; m_iTimesPlayed = song.iTimesPlayed; - m_iAlbumId = song.iAlbumId; + m_iAlbumId = song.idAlbum; } void CMusicInfoTag::Serialize(CVariant& value) const diff --git a/xbmc/threads/platform/win/Win32Exception.cpp b/xbmc/threads/platform/win/Win32Exception.cpp index a709244c9f..ca2b1c5ce4 100644 --- a/xbmc/threads/platform/win/Win32Exception.cpp +++ b/xbmc/threads/platform/win/Win32Exception.cpp @@ -24,6 +24,7 @@ #include "Util.h" #include "WIN32Util.h" #include "utils/StringUtils.h" +#include "utils/CharsetConverter.h" #define LOG if(logger) logger->Log @@ -115,6 +116,7 @@ bool win32_exception::write_minidump(EXCEPTION_POINTERS* pEp) // Create the dump file where the xbmc.exe resides bool returncode = false; CStdString dumpFileName; + CStdStringW dumpFileNameW; SYSTEMTIME stLocalTime; GetLocalTime(&stLocalTime); @@ -125,7 +127,8 @@ bool win32_exception::write_minidump(EXCEPTION_POINTERS* pEp) dumpFileName.Format("%s\\%s", CWIN32Util::GetProfilePath().c_str(), CUtil::MakeLegalFileName(dumpFileName)); - HANDLE hDumpFile = CreateFile(dumpFileName.c_str(), GENERIC_WRITE, 0, 0, CREATE_ALWAYS, 0, 0); + g_charsetConverter.utf8ToW(dumpFileName, dumpFileNameW, false); + HANDLE hDumpFile = CreateFileW(dumpFileNameW.c_str(), GENERIC_WRITE, 0, 0, CREATE_ALWAYS, 0, 0); if (hDumpFile == INVALID_HANDLE_VALUE) { @@ -186,6 +189,7 @@ bool win32_exception::write_stacktrace(EXCEPTION_POINTERS* pEp) #define STACKWALK_MAX_NAMELEN 1024 std::string dumpFileName, strOutput; + CStdStringW dumpFileNameW; CHAR cTemp[STACKWALK_MAX_NAMELEN]; DWORD dwBytes; SYSTEMTIME stLocalTime; @@ -223,7 +227,8 @@ bool win32_exception::write_stacktrace(EXCEPTION_POINTERS* pEp) dumpFileName = StringUtils::Format("%s\\%s", CWIN32Util::GetProfilePath().c_str(), CUtil::MakeLegalFileName(dumpFileName)); - HANDLE hDumpFile = CreateFile(dumpFileName.c_str(), GENERIC_WRITE, 0, 0, CREATE_ALWAYS, 0, 0); + g_charsetConverter.utf8ToW(dumpFileName, dumpFileNameW, false); + HANDLE hDumpFile = CreateFileW(dumpFileNameW.c_str(), GENERIC_WRITE, 0, 0, CREATE_ALWAYS, 0, 0); if (hDumpFile == INVALID_HANDLE_VALUE) { @@ -304,7 +309,7 @@ cleanup: } access_violation::access_violation(EXCEPTION_POINTERS* info) : - win32_exception(info,"access_voilation"), mAccessType(Invalid), mBadAddress(0) + win32_exception(info,"access_violation"), mAccessType(Invalid), mBadAddress(0) { switch(info->ExceptionRecord->ExceptionInformation[0]) { diff --git a/xbmc/utils/LangCodeExpander.cpp b/xbmc/utils/LangCodeExpander.cpp index 0f1c58525c..706beebc8b 100644 --- a/xbmc/utils/LangCodeExpander.cpp +++ b/xbmc/utils/LangCodeExpander.cpp @@ -32,8 +32,8 @@ typedef struct LCENTRY const char *name; } LCENTRY; -extern const struct LCENTRY g_iso639_1[143]; -extern const struct LCENTRY g_iso639_2[536]; +extern const struct LCENTRY g_iso639_1[144]; +extern const struct LCENTRY g_iso639_2[537]; struct CharCodeConvertionWithHack { @@ -312,10 +312,11 @@ bool CLangCodeExpander::LookupInDb(CStdString& desc, const CStdString& code) return false; } -extern const LCENTRY g_iso639_1[143] = +extern const LCENTRY g_iso639_1[144] = { { MAKECODE('\0','\0','c','c'), "Closed Caption" }, { MAKECODE('\0','\0','a','a'), "Afar" }, + { MAKECODE('\0','\0','a','b'), "Abkhaz" }, { MAKECODE('\0','\0','a','b'), "Abkhazian" }, { MAKECODE('\0','\0','a','f'), "Afrikaans" }, { MAKECODE('\0','\0','a','m'), "Amharic" }, @@ -336,7 +337,7 @@ extern const LCENTRY g_iso639_1[143] = { MAKECODE('\0','\0','c','s'), "Czech" }, { MAKECODE('\0','\0','c','y'), "Welsh" }, { MAKECODE('\0','\0','d','a'), "Dansk" }, - { MAKECODE('\0','\0','d','e'), "Deutsch" }, + { MAKECODE('\0','\0','d','e'), "German" }, { MAKECODE('\0','\0','d','z'), "Bhutani" }, { MAKECODE('\0','\0','e','l'), "Greek" }, { MAKECODE('\0','\0','e','n'), "English" }, @@ -407,7 +408,7 @@ extern const LCENTRY g_iso639_1[143] = { MAKECODE('\0','\0','p','a'), "Punjabi" }, { MAKECODE('\0','\0','p','l'), "Polish" }, { MAKECODE('\0','\0','p','s'), "Pashto, Pushto" }, - { MAKECODE('\0','\0','p','t'), "Portugues" }, + { MAKECODE('\0','\0','p','t'), "Portuguese" }, { MAKECODE('\0','\0','q','u'), "Quechua" }, { MAKECODE('\0','\0','r','m'), "Rhaeto-Romance" }, { MAKECODE('\0','\0','r','n'), "Kirundi" }, @@ -459,9 +460,10 @@ extern const LCENTRY g_iso639_1[143] = { MAKECODE('\0','\0','z','u'), "Zulu" }, }; -extern const LCENTRY g_iso639_2[536] = +extern const LCENTRY g_iso639_2[537] = { - { MAKECODE('\0','a','b','k'), "Abkhazian" }, + { MAKECODE('\0','a','b','k'), "Abkhaz" }, + { MAKECODE('\0','a','b','k'), "Abkhazian" }, { MAKECODE('\0','a','c','e'), "Achinese" }, { MAKECODE('\0','a','c','h'), "Acoli" }, { MAKECODE('\0','a','d','a'), "Adangme" }, diff --git a/xbmc/utils/Makefile b/xbmc/utils/Makefile index eec7e1f9ee..57c67ef385 100644 --- a/xbmc/utils/Makefile +++ b/xbmc/utils/Makefile @@ -37,8 +37,8 @@ SRCS=AlarmClock.cpp \ LangCodeExpander.cpp \ log.cpp \ md5.cpp \ - Observer.cpp \ Mime.cpp \ + Observer.cpp \ PerformanceSample.cpp \ PerformanceStats.cpp \ POUtils.cpp \ diff --git a/xbmc/utils/SaveFileStateJob.h b/xbmc/utils/SaveFileStateJob.h index 3b2c727618..123bbd86bb 100644 --- a/xbmc/utils/SaveFileStateJob.h +++ b/xbmc/utils/SaveFileStateJob.h @@ -31,13 +31,14 @@ public: bool CSaveFileStateJob::DoWork() { CStdString progressTrackingFile = m_item.GetPath(); + if (m_item.HasVideoInfoTag() && m_item.GetVideoInfoTag()->m_strFileNameAndPath.Find("removable://") == 0) progressTrackingFile = m_item.GetVideoInfoTag()->m_strFileNameAndPath; // this variable contains removable:// suffixed by disc label+uniqueid or is empty if label not uniquely identified else if (m_item.HasProperty("original_listitem_url")) { - // only use original_listitem_url for Python & UPnP sources + // only use original_listitem_url for Python, UPnP and Bluray sources CStdString original = m_item.GetProperty("original_listitem_url").asString(); - if (URIUtils::IsPlugin(original) || URIUtils::IsUPnP(original)) + if (URIUtils::IsPlugin(original) || URIUtils::IsUPnP(original) || URIUtils::IsBluray(m_item.GetPath())) progressTrackingFile = original; } @@ -122,10 +123,9 @@ bool CSaveFileStateJob::DoWork() if (m_item.HasVideoInfoTag() && m_item.GetVideoInfoTag()->HasStreamDetails()) { CFileItem dbItem(m_item); - videodatabase.GetStreamDetails(dbItem); // Fetch stream details from the db (if any) // Check whether the item's db streamdetails need updating - if (!dbItem.GetVideoInfoTag()->HasStreamDetails() || dbItem.GetVideoInfoTag()->m_streamDetails != m_item.GetVideoInfoTag()->m_streamDetails) + if (!videodatabase.GetStreamDetails(dbItem) || dbItem.GetVideoInfoTag()->m_streamDetails != m_item.GetVideoInfoTag()->m_streamDetails) { videodatabase.SetStreamDetailsForFile(m_item.GetVideoInfoTag()->m_streamDetails, progressTrackingFile); updateListing = true; diff --git a/xbmc/video/windows/GUIWindowVideoNav.cpp b/xbmc/video/windows/GUIWindowVideoNav.cpp index edc74e9c07..84621736b1 100644 --- a/xbmc/video/windows/GUIWindowVideoNav.cpp +++ b/xbmc/video/windows/GUIWindowVideoNav.cpp @@ -269,8 +269,6 @@ CStdString CGUIWindowVideoNav::GetQuickpathName(const CStdString& strPath) const bool CGUIWindowVideoNav::GetDirectory(const CStdString &strDirectory, CFileItemList &items) { - CFileItem directory(strDirectory, true); - if (m_thumbLoader.IsLoading()) m_thumbLoader.StopThread(); @@ -1063,8 +1061,7 @@ void CGUIWindowVideoNav::GetContextButtons(int itemNumber, CContextButtons &butt if (info && info->Content() != CONTENT_NONE) { buttons.Add(CONTEXT_BUTTON_SET_CONTENT, 20442); - if (info && g_application.IsVideoScanning()) - buttons.Add(CONTEXT_BUTTON_SCAN, 13349); + buttons.Add(CONTEXT_BUTTON_SCAN, 13349); } else buttons.Add(CONTEXT_BUTTON_SET_CONTENT, 20333); |