diff options
89 files changed, 531 insertions, 390 deletions
diff --git a/addons/metadata.album.universal/addon.xml b/addons/metadata.album.universal/addon.xml index d11722d614..3a0527a36f 100644 --- a/addons/metadata.album.universal/addon.xml +++ b/addons/metadata.album.universal/addon.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <addon id="metadata.album.universal" name="Universal Album Scraper" - version="2.2.3" + version="2.2.5" provider-name="Olympia, Team XBMC"> <requires> <import addon="xbmc.metadata" version="2.1.0"/> diff --git a/addons/metadata.album.universal/albumuniversal.xml b/addons/metadata.album.universal/albumuniversal.xml index 27f23408a1..46f9c6fd69 100644 --- a/addons/metadata.album.universal/albumuniversal.xml +++ b/addons/metadata.album.universal/albumuniversal.xml @@ -27,28 +27,28 @@ <GetAlbumSearchResults 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>(?:<packaging>[^<]*</packaging>)?<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[^<]*</alias>)*</alias-list>)*</artist></name-credit>(?:<name-credit(?:>)*(?:\sjoinphrase="[^"]*">)*(?:<name>[^<]*</name)*(?:>)*<artist\sid="[^"]*"><name>[^<]*</name>(?:<sort-name>[^<]*</sort-name>)*(?:<disambiguation>[^<]*</disambiguation>)*(?:<alias-list>(?:<alias[^<]*</alias>)*</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>(?:<packaging>[^<]*</packaging>)?<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[^<]*</alias>)*</alias-list>)*</artist></name-credit>(?:<name-credit(?:>)*(?:\sjoinphrase="[^"]*">)*(?:<name>[^<]*</name)*(?:>)*<artist\sid="[^"]*"><name>[^<]*</name>(?:<sort-name>[^<]*</sort-name>)*(?:<disambiguation>[^<]*</disambiguation>)*(?:<alias-list>(?:<alias[^<]*</alias>)*</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>(?:<packaging>[^<]*</packaging>)?<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[^<]*</alias>)*</alias-list>)*</artist></name-credit>(?:<name-credit(?:>)*(?:\sjoinphrase="[^"]*">)*(?:<name>[^<]*</name)*(?:>)*<artist\sid="[^"]*"><name>[^<]*</name>(?:<sort-name>[^<]*</sort-name>)*(?:<disambiguation>[^<]*</disambiguation>)*(?:<alias-list>(?:<alias[^<]*</alias>)*</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>(?:<packaging>[^<]*</packaging>)?<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[^<]*</alias>)*</alias-list>)*</artist></name-credit>(?:<name-credit(?:>)*(?:\sjoinphrase="[^"]*">)*(?:<name>[^<]*</name)*(?:>)*<artist\sid="[^"]*"><name>[^<]*</name>(?:<sort-name>[^<]*</sort-name>)*(?:<disambiguation>[^<]*</disambiguation>)*(?:<alias-list>(?:<alias[^<]*</alias>)*</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> <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>(?:<disambiguation>[^<]*</disambiguation>)*<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>(?:<disambiguation>[^<]*</disambiguation>)*(?:<packaging>[^<]*</packaging>)?<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[^<]*</alias>)*</alias-list>)*</artist></name-credit>(?:<name-credit(?:>)*(?:\sjoinphrase="[^"]*">)*(?:<name>[^<]*</name)*(?:>)*<artist\sid="[^"]*"><name>[^<]*</name>(?:<sort-name>[^<]*</sort-name>)*(?:<disambiguation>[^<]*</disambiguation>)*(?:<alias-list>(?:<alias[^<]*</alias>)*</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>(?:<disambiguation>[^<]*</disambiguation>)*<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>(?:<disambiguation>[^<]*</disambiguation>)*(?:<packaging>[^<]*</packaging>)?<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[^<]*</alias>)*</alias-list>)*</artist></name-credit>(?:<name-credit(?:>)*(?:\sjoinphrase="[^"]*">)*(?:<name>[^<]*</name)*(?:>)*<artist\sid="[^"]*"><name>[^<]*</name>(?:<sort-name>[^<]*</sort-name>)*(?:<disambiguation>[^<]*</disambiguation>)*(?:<alias-list>(?:<alias[^<]*</alias>)*</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>(?:<disambiguation>[^<]*</disambiguation>)*<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>(?:<disambiguation>[^<]*</disambiguation>)*(?:<packaging>[^<]*</packaging>)?<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[^<]*</alias>)*</alias-list>)*</artist></name-credit>(?:<name-credit(?:>)*(?:\sjoinphrase="[^"]*">)*(?:<name>[^<]*</name)*(?:>)*<artist\sid="[^"]*"><name>[^<]*</name>(?:<sort-name>[^<]*</sort-name>)*(?:<disambiguation>[^<]*</disambiguation>)*(?:<alias-list>(?:<alias[^<]*</alias>)*</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>(?:<disambiguation>[^<]*</disambiguation>)*<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>(?:<disambiguation>[^<]*</disambiguation>)*(?:<packaging>[^<]*</packaging>)?<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[^<]*</alias>)*</alias-list>)*</artist></name-credit>(?:<name-credit(?:>)*(?:\sjoinphrase="[^"]*">)*(?:<name>[^<]*</name)*(?:>)*<artist\sid="[^"]*"><name>[^<]*</name>(?:<sort-name>[^<]*</sort-name>)*(?:<disambiguation>[^<]*</disambiguation>)*(?:<alias-list>(?:<alias[^<]*</alias>)*</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 4cecaf6480..967ecc77c5 100644 --- a/addons/metadata.album.universal/changelog.txt +++ b/addons/metadata.album.universal/changelog.txt @@ -1,3 +1,10 @@ +[B]2.2.5[/B] +Fixed: allow multiple secondary-type's (thanks and credits to elrodro83) +Fixed: won't get details for an album when a release of another type (single or compilation) with the same name exists (thanks and credits to elrodro83) + +[B]2.2.4[/B] +Fix album releases with the "Packaging" field populated on MB (thanks and credits to elrodro83) + [B]2.2.3[/B] Updated language files from Transifex diff --git a/addons/metadata.themoviedb.org/addon.xml b/addons/metadata.themoviedb.org/addon.xml index 53e57d2f09..5de97d0230 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.7" + version="3.7.8" provider-name="Team XBMC"> <requires> <import addon="xbmc.metadata" version="2.1.0"/> @@ -24,12 +24,14 @@ <summary lang="de">TMDB Filmscraper</summary> <summary lang="el">Scraper Ταινιών του TMDb</summary> <summary lang="en">TMDB Movie Scraper</summary> + <summary lang="en_NZ">TMDB Movie Scraper</summary> <summary lang="es">Scraper de películas de TheMovieDB</summary> <summary lang="es_AR">Scraper de Películas de TheMovieDB</summary> <summary lang="es_MX">Scraper de Películas TMDb</summary> <summary lang="et">TMDB Filmi kaabits</summary> <summary lang="fi">TMDB elokuvatietojen lataaja</summary> <summary lang="fr">Collecteur de Films TMDB</summary> + <summary lang="fr_CA">Extracteur de films TMDB</summary> <summary lang="gl">Scraper de Filme de TMDB</summary> <summary lang="he">TMDB סקרייפר סרטים</summary> <summary lang="hr">TMDB filmski sakupljač informacija</summary> @@ -61,7 +63,7 @@ <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="bg">themoviedb.org е безплатна и отворена филмова база данни. Задвижва се изцяло от потребителите си, от хора като вас. Милиони хора по света всеки месец ползват TMDb. Благодарение на многофункционално API може да се ползва от най-различни и популярни медийни центрове като XBMC, които извличат метаданни, постери и фанарти за филмите с цел за красивото оформяне на интерфейса.</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> @@ -69,15 +71,17 @@ <description lang="de">TheMovieDB.org ist eine freie und offene Filmdatenbank. Sie wird von Benutzern wie dir angetrieben. TheMovieDB wird zur Zeit von millionen Nutzern jeden Monat genutzt und dank ihrer mächtigen API ist sie auch von vielen Media-Center, wie z.B. XBMC, implementiert, um Film-Metadaten, -Poster und -Fanarts zu beziehen, die das Benutzererlebnis verbessern.</description> <description lang="el">Το themoviedb.org είναι μία δωρεάν και ανοικτή βάση δεδομένων ταινιών. Διαχειρίζεται πλήρως από ανθρώπους σαν και εσάς. Το TMDb χρησιμοποιείται από εκατομμύρια ανθρώπους κάθε μήνα, και με το πανίσχυρο API τους, χρησιμοποιείται και από πολλά δημοφιλή κέντρα πολυμέσων όπως το XBMC για να λαμβάνουν μετα-δεδομένα Ταινιών, Αφίσες και Fanart για εμπλουτισμό της εμπειρίας του χρήστη.</description> <description lang="en">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="en_NZ">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="es">themovieDB.org es una base de datos de películas gratuita y abierta. Es una página web que se basa en contenido subido por los usuarios. TMDb es usada diariamente por mucha gente gracias a su API, que es usada por más programas aparte de XBMC para descargar información de películas así como Posters o Fanart (Fondos de escritorio basados en películas usados en distintos skins) para enriquecer la experiencia de usar XBMC.</description> <description lang="es_AR">themovieDB.org es una base de datos de películas gratuita y abierta. Está formada con contenido subido por usuarios como vos. TMDb es actualmente utilizada por millones de personas cada mes y, gracias a su poderosa API, es usada por muchos programas populares como XBMC para descargar Información de Películas, Posters y Fanart para enriquecer la experiencia de usar XBMC.</description> <description lang="es_MX">themoviedb.org es una base de datos de películas gratis y abierta. Es completamente manejada por usuarios y personas como tu. Actualmente TMDb es usada por millones de personas cada mes, y dado a su poderosa API, es usada también por varios media centers populares como XBMC para obtener Metada de Películas, Posters y Fanarts, enriqueciendo de esta manera la experiencia del usuario.</description> <description lang="et">themoviedb.org on tasuta ja vaba juurdepääsuga filmide andmebaas.See on täielikult koostatud sinu sarnaste inimeste poolt. TMDb on hetkel igapäevaselt kasutuses miljonite inimeste poolt ja seda kasutavad paljud populaarsed meediakeskused, nagu ka XBMC, filmiandmete, fännikunsti ja posterite leidmiseks.</description> <description lang="fi">themoviedb.org on vapaa ja avoin elokuvatietokanta. Se on täysin käyttäjien ylläpitämä. TMDb:a käyttää miljoonat ihmiset joka kuukausi, sitä käytetään käyttäjäkokemuksen rikastuttamiseen monissa muissakin suosituissa XBMC:n kaltaisissa ohjelmissa lataamalla elokuvien tietoja, julisteita ja fanitaidetta.</description> <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="fr_CA">themoviedb.org est une base de données libre et ouverte. Elle est complètement gérée par des gens comme vous. TMDb est actuellement utilisée par des millions de personnes chaque mois et avec son API puissante, elle est également utilisée par de nombreux centres multimédias populaires comme XBMC pour récupérer les métadonnées des films, les affiches et le fanart afin d'enrichir 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 otvorena baza filmskih podataka. TMDb trenutno koriste milijuni ljudi svaki mjesec uz pomoću njegovog snažnog API-ja, isto tako se koristi u mnogim popularnim medijskim centrima poput XBMC-a, kako bi mogli sakupljati informacije o filmovima, filmske postere , omote filmova i na kraju obogatili korisničko iskustvo.</description> + <description lang="hr">themoviedb.org je besplatna i otvorena baza filmskih podataka. TMDb trenutno koriste milijuni ljudi svaki mjesec uz pomoću njegovog snažnog API-ja, isto tako se koristi u mnogim popularnim medijskim centrima poput XBMC-a, kako bi mogli sakupljati informacije o filmovima, filmske postere, omote filmova i na kraju obogatili 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> @@ -88,7 +92,7 @@ <description lang="ms">themoviedb.org adalah pangkalan data cakera terbuka. Ia sepenuhnya dipacu oleh individu seperti anda. TMDb buat masa ini diguna oleh berjuta-juta individu setiap bulan dan dengan API hebat mereka, ia juga digunakan oleh banyak pusat media popular seperti XBMC untuk mendapatkan Data Meta, Poster, Seni Peminat Cereka untuk memperkayakan pengalaman pengguna.</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="pl">themoviedb.org jest wolną i otwartą filmową bazą danych. Jest zarządzana 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 centrach multimedialnych, takich jak XBMC, do pobierania informacji o filmach, plakatów i tapet.</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> <description lang="ro">themoviedb.org este o bază de date de filme gratuită și deschisă. Este actualizată de oameni ca și tine. TMDb este curent folosită de milioane de oameni în fiecare lună și datorită API-ului puternic, este de asemena folosită de multe centre media populare ca XBMC pentru a obține informații despre filme, afișe și imagini produse de fani (Fanart) care îmbogățesc experiența utilizatorului.</description> @@ -105,10 +109,10 @@ <description lang="zh">themoviedb.org是一个开放和自由的电影数据库。它完全由象你一样的用户来掌控。TMDb每月为上百万用户提供服务，并通过强大的API界面为许多流行的媒体中心系统如XBMC提供电影资料、封面海报和同人画以丰富用户的体验。</description> <description lang="zh_TW">themoviedb.org是一個免費和開放的電影資料庫。它是完全由與您一樣的廣大使用者來更新資訊。 TMDb目前擁有數以百萬計的使用人次並且有著強大的API，許多受歡迎的媒體中心平台像XBMC藉由TMDb獲取電影的數據資料庫，海報和影片資訊，以豐富使用者體驗。</description> <platform>all</platform> + <license>GPL v2.0</license> + <forum></forum> <website></website> - <source></source> <email></email> - <forum></forum> - <license>GPL v2.0</license> + <source></source> </extension> </addon> diff --git a/addons/metadata.themoviedb.org/changelog.txt b/addons/metadata.themoviedb.org/changelog.txt index 51d75435f5..14b07ee32f 100644 --- a/addons/metadata.themoviedb.org/changelog.txt +++ b/addons/metadata.themoviedb.org/changelog.txt @@ -1,3 +1,6 @@ +[B]3.7.8[/B] +- updated language files from Transifex + [B]3.7.7[/B] - updated language files from Transifex diff --git a/addons/metadata.themoviedb.org/resources/language/Afrikaans/strings.xml b/addons/metadata.themoviedb.org/resources/language/Afrikaans/strings.xml index 19f2f2afcb..4024d630ea 100644 --- a/addons/metadata.themoviedb.org/resources/language/Afrikaans/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Afrikaans/strings.xml @@ -1,11 +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! --> -<!-- Afrikaans language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/af/ --> -<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> +<!-- Afrikaans language-Team URL: http://www.transifex.com/projects/p/xbmc-addons/language/af/ --> +<!-- Report language file syntax bugs at: alanwww1@xbmc.org --> <strings> <string id="30000">Stel Ondersteunerkuns in staat</string> - <string id="30001">Verkies Voorskou vanaf HD-Trailers.net</string> + <string id="30001">Verkies Voorskou van HD-Trailers.net</string> <string id="30002">Verkose Taal</string> <string id="30003">Kry Gradering vanaf</string> <string id="30004">Stel Voorskou in staat (YouTube)</string> diff --git a/addons/metadata.themoviedb.org/resources/language/Albanian/strings.xml b/addons/metadata.themoviedb.org/resources/language/Albanian/strings.xml index e960a5db1f..a058b1d961 100644 --- a/addons/metadata.themoviedb.org/resources/language/Albanian/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Albanian/strings.xml @@ -1,7 +1,7 @@ <?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/ --> +<!-- Albanian language-Team URL: http://www.transifex.com/projects/p/xbmc-addons/language/sq/ --> +<!-- Report language file syntax bugs at: alanwww1@xbmc.org --> <strings> <string id="30000">Aktivo "Fanart'in"</string> diff --git a/addons/metadata.themoviedb.org/resources/language/Amharic/strings.xml b/addons/metadata.themoviedb.org/resources/language/Amharic/strings.xml index 0160016ea5..7b26b81e1b 100644 --- a/addons/metadata.themoviedb.org/resources/language/Amharic/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Amharic/strings.xml @@ -1,7 +1,7 @@ <?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/ --> +<!-- Amharic language-Team URL: http://www.transifex.com/projects/p/xbmc-addons/language/am/ --> +<!-- Report language file syntax bugs at: alanwww1@xbmc.org --> <strings> <string id="30002">የተመረጠው ቋንቋ</string> diff --git a/addons/metadata.themoviedb.org/resources/language/Basque/strings.xml b/addons/metadata.themoviedb.org/resources/language/Basque/strings.xml index a1048de9d1..b7fd82f7a5 100644 --- a/addons/metadata.themoviedb.org/resources/language/Basque/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Basque/strings.xml @@ -1,7 +1,7 @@ <?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/ --> +<!-- Basque language-Team URL: http://www.transifex.com/projects/p/xbmc-addons/language/eu/ --> +<!-- Report language file syntax bugs at: alanwww1@xbmc.org --> <strings> <string id="30000">Gaitu Fanarta</string> diff --git a/addons/metadata.themoviedb.org/resources/language/Belarusian/strings.xml b/addons/metadata.themoviedb.org/resources/language/Belarusian/strings.xml index 3df1a72b8f..160f24eec7 100644 --- a/addons/metadata.themoviedb.org/resources/language/Belarusian/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Belarusian/strings.xml @@ -1,7 +1,7 @@ <?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! --> -<!-- Belarusian language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/be/ --> -<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> +<!-- Belarusian language-Team URL: http://www.transifex.com/projects/p/xbmc-addons/language/be/ --> +<!-- Report language file syntax bugs at: alanwww1@xbmc.org --> <strings> <string id="30000">Enable Fanart</string> diff --git a/addons/metadata.themoviedb.org/resources/language/Bulgarian/strings.xml b/addons/metadata.themoviedb.org/resources/language/Bulgarian/strings.xml index f3e2161666..df8a9b07c2 100644 --- a/addons/metadata.themoviedb.org/resources/language/Bulgarian/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Bulgarian/strings.xml @@ -1,14 +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! --> -<!-- Bulgarian language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/bg/ --> -<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> +<!-- Bulgarian language-Team URL: http://www.transifex.com/projects/p/xbmc-addons/language/bg/ --> +<!-- Report language file syntax bugs at: alanwww1@xbmc.org --> <strings> - <string id="30000">Разреши ползването на Fanart</string> - <string id="30001">Предимство на трейлърите от HD-Trailers.net</string> + <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> + <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/Burmese/strings.xml b/addons/metadata.themoviedb.org/resources/language/Burmese/strings.xml index 164c51a429..c20ca37f46 100644 --- a/addons/metadata.themoviedb.org/resources/language/Burmese/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Burmese/strings.xml @@ -1,10 +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! --> -<!-- 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/ --> +<!-- Burmese language-Team URL: http://www.transifex.com/projects/p/xbmc-addons/language/my/ --> +<!-- Report language file syntax bugs at: alanwww1@xbmc.org --> <strings> - <string id="30000">Enable Fanart</string> + <string id="30000">Fanart ကို လုပ်ဆောင်ခွင့်</string> <string id="30001">HD-Trailers.net မှသင့်လျှော်သော ကြော်ငြာ</string> <string id="30002">သင့်လျှော်သော ဘာသာစကား</string> <string id="30004">ကြော်ငြာများရယူမည်(You Tube)</string> diff --git a/addons/metadata.themoviedb.org/resources/language/Catalan/strings.xml b/addons/metadata.themoviedb.org/resources/language/Catalan/strings.xml index d38bdd6851..60aaa070ef 100644 --- a/addons/metadata.themoviedb.org/resources/language/Catalan/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Catalan/strings.xml @@ -1,7 +1,7 @@ <?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! --> -<!-- Catalan language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/ca/ --> -<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> +<!-- Catalan language-Team URL: http://www.transifex.com/projects/p/xbmc-addons/language/ca/ --> +<!-- Report language file syntax bugs at: alanwww1@xbmc.org --> <strings> <string id="30000">Habilita el fanart</string> diff --git a/addons/metadata.themoviedb.org/resources/language/Chinese (Simple)/strings.xml b/addons/metadata.themoviedb.org/resources/language/Chinese (Simple)/strings.xml index c188f2f462..61fe72a505 100644 --- a/addons/metadata.themoviedb.org/resources/language/Chinese (Simple)/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Chinese (Simple)/strings.xml @@ -1,7 +1,7 @@ <?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 (Simple) language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/zh/ --> -<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> +<!-- Chinese (Simple) language-Team URL: http://www.transifex.com/projects/p/xbmc-addons/language/zh/ --> +<!-- Report language file syntax bugs at: alanwww1@xbmc.org --> <strings> <string id="30000">启用同人画</string> 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 0fa9678c2f..5bb4d96f60 100644 --- a/addons/metadata.themoviedb.org/resources/language/Chinese (Traditional)/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Chinese (Traditional)/strings.xml @@ -1,10 +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! --> -<!-- 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/ --> +<!-- Chinese (Traditional) language-Team URL: http://www.transifex.com/projects/p/xbmc-addons/language/zh_TW/ --> +<!-- Report language file syntax bugs at: alanwww1@xbmc.org --> <strings> - <string id="30000">啟用 Fanart</string> + <string id="30000">啟用專輯資訊</string> <string id="30001">偏好從HD-Trailers.net取得預告片</string> <string id="30002">偏好的語言</string> <string id="30003">從...取得評價</string> diff --git a/addons/metadata.themoviedb.org/resources/language/Croatian/strings.xml b/addons/metadata.themoviedb.org/resources/language/Croatian/strings.xml index dee262bf5d..ded3374c97 100644 --- a/addons/metadata.themoviedb.org/resources/language/Croatian/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Croatian/strings.xml @@ -1,13 +1,13 @@ <?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/ --> +<!-- Croatian language-Team URL: http://www.transifex.com/projects/p/xbmc-addons/language/hr/ --> +<!-- Report language file syntax bugs at: alanwww1@xbmc.org --> <strings> - <string id="30000">Omogući omot filma</string> - <string id="30001">Preferiraj najave filmova sa HD-Trailers.net</string> + <string id="30000">Omogući omote</string> + <string id="30001">Preferiraj najave filmova s HD-Trailers.net</string> <string id="30002">Željeni jezik</string> - <string id="30003">Nabavi ocijene sa</string> + <string id="30003">Nabavi ocijene s</string> <string id="30004">Omogući najave filmova (YouTube)</string> <string id="30005">Zadrži izvorni naslov</string> <string id="30006">Željena država ovjere</string> diff --git a/addons/metadata.themoviedb.org/resources/language/Czech/strings.xml b/addons/metadata.themoviedb.org/resources/language/Czech/strings.xml index 65a87a4828..633d0cbdea 100644 --- a/addons/metadata.themoviedb.org/resources/language/Czech/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Czech/strings.xml @@ -1,10 +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! --> -<!-- Czech language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/cs/ --> -<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> +<!-- Czech language-Team URL: http://www.transifex.com/projects/p/xbmc-addons/language/cs/ --> +<!-- Report language file syntax bugs at: alanwww1@xbmc.org --> <strings> - <string id="30000">Povolit fanart</string> + <string id="30000">Povolit Fanart</string> <string id="30001">Upřednostňovat upoutávku z HD-Trailers.net</string> <string id="30002">Upřednostňovaný jazyk</string> <string id="30003">Získat hodnocení z</string> diff --git a/addons/metadata.themoviedb.org/resources/language/Danish/strings.xml b/addons/metadata.themoviedb.org/resources/language/Danish/strings.xml index ed87772741..00ea946885 100644 --- a/addons/metadata.themoviedb.org/resources/language/Danish/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Danish/strings.xml @@ -1,10 +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! --> -<!-- Danish language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/da/ --> -<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> +<!-- Danish language-Team URL: http://www.transifex.com/projects/p/xbmc-addons/language/da/ --> +<!-- Report language file syntax bugs at: alanwww1@xbmc.org --> <strings> - <string id="30000">Aktivér Fankunst</string> + <string id="30000">Aktiver Fankunst</string> <string id="30001">Foretræk Trailer fra HD-trailers.net</string> <string id="30002">Foretrukket Sprog</string> <string id="30003">Hent bedømmelse fra</string> diff --git a/addons/metadata.themoviedb.org/resources/language/Dutch/strings.xml b/addons/metadata.themoviedb.org/resources/language/Dutch/strings.xml index 5ff01f8072..6233580359 100644 --- a/addons/metadata.themoviedb.org/resources/language/Dutch/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Dutch/strings.xml @@ -1,7 +1,7 @@ <?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! --> -<!-- Dutch language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/nl/ --> -<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> +<!-- Dutch language-Team URL: http://www.transifex.com/projects/p/xbmc-addons/language/nl/ --> +<!-- Report language file syntax bugs at: alanwww1@xbmc.org --> <strings> <string id="30000">Fanart inschakelen</string> diff --git a/addons/metadata.themoviedb.org/resources/language/English (New Zealand)/strings.xml b/addons/metadata.themoviedb.org/resources/language/English (New Zealand)/strings.xml new file mode 100644 index 0000000000..e4d410b500 --- /dev/null +++ b/addons/metadata.themoviedb.org/resources/language/English (New Zealand)/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! --> +<!-- English (New Zealand) language-Team URL: http://www.transifex.com/projects/p/xbmc-addons/language/en_NZ/ --> +<!-- Report language file syntax bugs at: alanwww1@xbmc.org --> + +<strings> + <string id="30000">Enable Fanart</string> + <string id="30001">Prefer Trailer from HD-Trailers.net</string> + <string id="30002">Preferred Language</string> + <string id="30003">Get Rating from</string> + <string id="30004">Enable Trailer (YouTube)</string> + <string id="30005">Keep Original Title</string> + <string id="30006">Preferred Certification Country</string> +</strings> diff --git a/addons/metadata.themoviedb.org/resources/language/English (US)/strings.xml b/addons/metadata.themoviedb.org/resources/language/English (US)/strings.xml new file mode 100644 index 0000000000..927005cf19 --- /dev/null +++ b/addons/metadata.themoviedb.org/resources/language/English (US)/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! --> +<!-- English (US) language-Team URL: http://www.transifex.com/projects/p/xbmc-addons/language/en_US/ --> +<!-- Report language file syntax bugs at: alanwww1@xbmc.org --> + +<strings> + <string id="30000">Enable Fanart</string> +</strings> diff --git a/addons/metadata.themoviedb.org/resources/language/English/strings.xml b/addons/metadata.themoviedb.org/resources/language/English/strings.xml index 5be2abcf51..7f803fe904 100644 --- a/addons/metadata.themoviedb.org/resources/language/English/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/English/strings.xml @@ -1,7 +1,7 @@ <?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! --> -<!-- English language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/en/ --> -<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> +<!-- English language-Team URL: http://www.transifex.com/projects/p/xbmc-addons/language/en/ --> +<!-- Report language file syntax bugs at: alanwww1@xbmc.org --> <strings> <string id="30000">Enable Fanart</string> diff --git a/addons/metadata.themoviedb.org/resources/language/Estonian/strings.xml b/addons/metadata.themoviedb.org/resources/language/Estonian/strings.xml index f8ef766378..db34fdaaf2 100644 --- a/addons/metadata.themoviedb.org/resources/language/Estonian/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Estonian/strings.xml @@ -1,7 +1,7 @@ <?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/ --> +<!-- Estonian language-Team URL: http://www.transifex.com/projects/p/xbmc-addons/language/et/ --> +<!-- Report language file syntax bugs at: alanwww1@xbmc.org --> <strings> <string id="30000">Võimalda fännikunst</string> diff --git a/addons/metadata.themoviedb.org/resources/language/Finnish/strings.xml b/addons/metadata.themoviedb.org/resources/language/Finnish/strings.xml index e9fae2fe82..b77716ea81 100644 --- a/addons/metadata.themoviedb.org/resources/language/Finnish/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Finnish/strings.xml @@ -1,7 +1,7 @@ <?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/ --> +<!-- Finnish language-Team URL: http://www.transifex.com/projects/p/xbmc-addons/language/fi/ --> +<!-- Report language file syntax bugs at: alanwww1@xbmc.org --> <strings> <string id="30000">Fanitaide käytössä</string> diff --git a/addons/metadata.themoviedb.org/resources/language/French (Canada)/strings.xml b/addons/metadata.themoviedb.org/resources/language/French (Canada)/strings.xml new file mode 100644 index 0000000000..589fbc9b19 --- /dev/null +++ b/addons/metadata.themoviedb.org/resources/language/French (Canada)/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! --> +<!-- French (Canada) language-Team URL: http://www.transifex.com/projects/p/xbmc-addons/language/fr_CA/ --> +<!-- Report language file syntax bugs at: alanwww1@xbmc.org --> + +<strings> + <string id="30000">Activer le fanart</string> + <string id="30001">Préférer les bandes-annonces de HD-Trailers.net</string> + <string id="30002">Langue préférée</string> + <string id="30003">Obtenir les évaluations sur</string> + <string id="30004">Activer les bandes-annonces (YouTube)</string> + <string id="30005">Conserver le titre original</string> + <string id="30006">Pays de certification préféré</string> +</strings> diff --git a/addons/metadata.themoviedb.org/resources/language/French/strings.xml b/addons/metadata.themoviedb.org/resources/language/French/strings.xml index 64734568de..c75983299c 100644 --- a/addons/metadata.themoviedb.org/resources/language/French/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/French/strings.xml @@ -1,11 +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! --> -<!-- French language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/fr/ --> -<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> +<!-- French language-Team URL: http://www.transifex.com/projects/p/xbmc-addons/language/fr/ --> +<!-- Report language file syntax bugs at: alanwww1@xbmc.org --> <strings> <string id="30000">Activer les Fanarts</string> - <string id="30001">Récupérer les bandes-annonces sur HD-Trailers.net</string> + <string id="30001">Préférer les bandes-annonces de HD-Trailers.net</string> <string id="30002">Langue préférée</string> <string id="30003">Obtenir la note à partir de</string> <string id="30004">Activer les bandes-annonces (You Tube)</string> diff --git a/addons/metadata.themoviedb.org/resources/language/Galician/strings.xml b/addons/metadata.themoviedb.org/resources/language/Galician/strings.xml index bc684aea4d..086eed8176 100644 --- a/addons/metadata.themoviedb.org/resources/language/Galician/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Galician/strings.xml @@ -1,7 +1,7 @@ <?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! --> -<!-- Galician language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/gl/ --> -<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> +<!-- Galician language-Team URL: http://www.transifex.com/projects/p/xbmc-addons/language/gl/ --> +<!-- Report language file syntax bugs at: alanwww1@xbmc.org --> <strings> <string id="30000">Habilitar Fanart</string> diff --git a/addons/metadata.themoviedb.org/resources/language/German/strings.xml b/addons/metadata.themoviedb.org/resources/language/German/strings.xml index 0d4f4586f5..adf2f879bb 100644 --- a/addons/metadata.themoviedb.org/resources/language/German/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/German/strings.xml @@ -1,7 +1,7 @@ <?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! --> -<!-- German language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/de/ --> -<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> +<!-- German language-Team URL: http://www.transifex.com/projects/p/xbmc-addons/language/de/ --> +<!-- Report language file syntax bugs at: alanwww1@xbmc.org --> <strings> <string id="30000">Aktiviere Fanart</string> diff --git a/addons/metadata.themoviedb.org/resources/language/Greek/strings.xml b/addons/metadata.themoviedb.org/resources/language/Greek/strings.xml index d67c0e8eb4..781ab53afb 100644 --- a/addons/metadata.themoviedb.org/resources/language/Greek/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Greek/strings.xml @@ -1,7 +1,7 @@ <?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! --> -<!-- Greek language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/el/ --> -<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> +<!-- Greek language-Team URL: http://www.transifex.com/projects/p/xbmc-addons/language/el/ --> +<!-- Report language file syntax bugs at: alanwww1@xbmc.org --> <strings> <string id="30000">Ενεργοποίηση Fanart</string> diff --git a/addons/metadata.themoviedb.org/resources/language/Hebrew/strings.xml b/addons/metadata.themoviedb.org/resources/language/Hebrew/strings.xml index 69b931a57c..87adf779cd 100644 --- a/addons/metadata.themoviedb.org/resources/language/Hebrew/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Hebrew/strings.xml @@ -1,10 +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! --> -<!-- Hebrew language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/he/ --> -<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> +<!-- Hebrew language-Team URL: http://www.transifex.com/projects/p/xbmc-addons/language/he/ --> +<!-- Report language file syntax bugs at: alanwww1@xbmc.org --> <strings> - <string id="30000">הפעל פאנראט</string> + <string id="30000">אפשר עטיפות דיסק</string> <string id="30001">העדף קדימון מ-HD-Trailers.net</string> <string id="30002">שפה מועדפת</string> <string id="30003">השג דירוג מ-</string> diff --git a/addons/metadata.themoviedb.org/resources/language/Hindi (Devanagiri)/strings.xml b/addons/metadata.themoviedb.org/resources/language/Hindi (Devanagiri)/strings.xml index c4f3ac6235..50105d19d9 100644 --- a/addons/metadata.themoviedb.org/resources/language/Hindi (Devanagiri)/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Hindi (Devanagiri)/strings.xml @@ -1,7 +1,7 @@ <?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! --> -<!-- Hindi (Devanagiri) language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/hi/ --> -<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> +<!-- Hindi (Devanagiri) language-Team URL: http://www.transifex.com/projects/p/xbmc-addons/language/hi/ --> +<!-- Report language file syntax bugs at: alanwww1@xbmc.org --> <strings> <string id="30000">फ़ानर्ट को एनेबल करे</string> diff --git a/addons/metadata.themoviedb.org/resources/language/Hungarian/strings.xml b/addons/metadata.themoviedb.org/resources/language/Hungarian/strings.xml index e0a3033aa5..3a0572653d 100644 --- a/addons/metadata.themoviedb.org/resources/language/Hungarian/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Hungarian/strings.xml @@ -1,7 +1,7 @@ <?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! --> -<!-- Hungarian language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/hu/ --> -<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> +<!-- Hungarian language-Team URL: http://www.transifex.com/projects/p/xbmc-addons/language/hu/ --> +<!-- Report language file syntax bugs at: alanwww1@xbmc.org --> <strings> <string id="30000">Fanartképek engedélyezése</string> diff --git a/addons/metadata.themoviedb.org/resources/language/Italian/strings.xml b/addons/metadata.themoviedb.org/resources/language/Italian/strings.xml index c763e04c17..d3fb30c063 100644 --- a/addons/metadata.themoviedb.org/resources/language/Italian/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Italian/strings.xml @@ -1,7 +1,7 @@ <?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! --> -<!-- Italian language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/it/ --> -<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> +<!-- Italian language-Team URL: http://www.transifex.com/projects/p/xbmc-addons/language/it/ --> +<!-- Report language file syntax bugs at: alanwww1@xbmc.org --> <strings> <string id="30000">Abilita Fanart</string> diff --git a/addons/metadata.themoviedb.org/resources/language/Japanese/strings.xml b/addons/metadata.themoviedb.org/resources/language/Japanese/strings.xml index 1863d1ae47..903a5705f4 100644 --- a/addons/metadata.themoviedb.org/resources/language/Japanese/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Japanese/strings.xml @@ -1,11 +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! --> -<!-- Japanese language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/ja/ --> -<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> +<!-- Japanese language-Team URL: http://www.transifex.com/projects/p/xbmc-addons/language/ja/ --> +<!-- Report language file syntax bugs at: alanwww1@xbmc.org --> <strings> - <string id="30000">ファンアートを有効にする</string> - <string id="30001">HD-Trailers.net の予告編を優先</string> + <string id="30000">ファンアートを有効に</string> + <string id="30001">HD-Trailers.net からの予告編を優先</string> <string id="30002">優先する言語</string> <string id="30003">評価の取得先</string> <string id="30004">予告編を有効にする (YouTube)</string> diff --git a/addons/metadata.themoviedb.org/resources/language/Korean/strings.xml b/addons/metadata.themoviedb.org/resources/language/Korean/strings.xml index 8a9602ad29..3d605e3bd7 100644 --- a/addons/metadata.themoviedb.org/resources/language/Korean/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Korean/strings.xml @@ -1,7 +1,7 @@ <?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! --> -<!-- Korean language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/ko/ --> -<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> +<!-- Korean language-Team URL: http://www.transifex.com/projects/p/xbmc-addons/language/ko/ --> +<!-- Report language file syntax bugs at: alanwww1@xbmc.org --> <strings> <string id="30000">팬아트 사용</string> diff --git a/addons/metadata.themoviedb.org/resources/language/Lithuanian/strings.xml b/addons/metadata.themoviedb.org/resources/language/Lithuanian/strings.xml index 797e042bd5..a8de24d584 100644 --- a/addons/metadata.themoviedb.org/resources/language/Lithuanian/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Lithuanian/strings.xml @@ -1,10 +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! --> -<!-- Lithuanian language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/lt/ --> -<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> +<!-- Lithuanian language-Team URL: http://www.transifex.com/projects/p/xbmc-addons/language/lt/ --> +<!-- Report language file syntax bugs at: alanwww1@xbmc.org --> <strings> - <string id="30000">Atidaryti Fanart</string> + <string id="30000">Įjungti Fanart</string> <string id="30001">Pageidaujamas filmo anonsas iš HD-Trailers.net</string> <string id="30002">Pageidaujama kalba</string> <string id="30003">Gauti įvertinimą iš</string> diff --git a/addons/metadata.themoviedb.org/resources/language/Macedonian/strings.xml b/addons/metadata.themoviedb.org/resources/language/Macedonian/strings.xml index 0275c4a3ef..666c299bb1 100644 --- a/addons/metadata.themoviedb.org/resources/language/Macedonian/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Macedonian/strings.xml @@ -1,7 +1,7 @@ <?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! --> -<!-- Macedonian language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/mk/ --> -<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> +<!-- Macedonian language-Team URL: http://www.transifex.com/projects/p/xbmc-addons/language/mk/ --> +<!-- Report language file syntax bugs at: alanwww1@xbmc.org --> <strings> <string id="30000">Овозможи сликички</string> diff --git a/addons/metadata.themoviedb.org/resources/language/Malay/strings.xml b/addons/metadata.themoviedb.org/resources/language/Malay/strings.xml index c9b6f5c629..df58bdf8f9 100644 --- a/addons/metadata.themoviedb.org/resources/language/Malay/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Malay/strings.xml @@ -1,7 +1,7 @@ <?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/ --> +<!-- Malay language-Team URL: http://www.transifex.com/projects/p/xbmc-addons/language/ms/ --> +<!-- Report language file syntax bugs at: alanwww1@xbmc.org --> <strings> <string id="30000">Benarkan Seni Peminat</string> diff --git a/addons/metadata.themoviedb.org/resources/language/Malayalam/strings.xml b/addons/metadata.themoviedb.org/resources/language/Malayalam/strings.xml index 5309ad5ce7..00d88fe3cf 100644 --- a/addons/metadata.themoviedb.org/resources/language/Malayalam/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Malayalam/strings.xml @@ -1,7 +1,7 @@ <?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! --> -<!-- Malayalam language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/ml/ --> -<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> +<!-- Malayalam language-Team URL: http://www.transifex.com/projects/p/xbmc-addons/language/ml/ --> +<!-- Report language file syntax bugs at: alanwww1@xbmc.org --> <strings> <string id="30002">ഇഷ്ടപ്പെട്ട ഭാഷ</string> diff --git a/addons/metadata.themoviedb.org/resources/language/Norwegian/strings.xml b/addons/metadata.themoviedb.org/resources/language/Norwegian/strings.xml index 65d6c81283..935032b9e6 100644 --- a/addons/metadata.themoviedb.org/resources/language/Norwegian/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Norwegian/strings.xml @@ -1,7 +1,7 @@ <?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! --> -<!-- Norwegian language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/no/ --> -<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> +<!-- Norwegian language-Team URL: http://www.transifex.com/projects/p/xbmc-addons/language/no/ --> +<!-- Report language file syntax bugs at: alanwww1@xbmc.org --> <strings> <string id="30000">Hent fanart</string> diff --git a/addons/metadata.themoviedb.org/resources/language/Polish/strings.xml b/addons/metadata.themoviedb.org/resources/language/Polish/strings.xml index bdf08701bf..2fc7dd4127 100644 --- a/addons/metadata.themoviedb.org/resources/language/Polish/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Polish/strings.xml @@ -1,10 +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! --> -<!-- Polish language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/pl/ --> -<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> +<!-- Polish language-Team URL: http://www.transifex.com/projects/p/xbmc-addons/language/pl/ --> +<!-- Report language file syntax bugs at: alanwww1@xbmc.org --> <strings> - <string id="30000">Włącz fanart</string> + <string id="30000">Używaj tapet</string> <string id="30001">Włącz zwiastuny z HD-Trailers.net</string> <string id="30002">Preferowany język</string> <string id="30003">Pobierz ocenę z</string> diff --git a/addons/metadata.themoviedb.org/resources/language/Portuguese (Brazil)/strings.xml b/addons/metadata.themoviedb.org/resources/language/Portuguese (Brazil)/strings.xml index fae53d2695..107edd6195 100644 --- a/addons/metadata.themoviedb.org/resources/language/Portuguese (Brazil)/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Portuguese (Brazil)/strings.xml @@ -1,10 +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! --> -<!-- Portuguese (Brazil) language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/pt_BR/ --> -<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> +<!-- Portuguese (Brazil) language-Team URL: http://www.transifex.com/projects/p/xbmc-addons/language/pt_BR/ --> +<!-- Report language file syntax bugs at: alanwww1@xbmc.org --> <strings> - <string id="30000">Ativar Fanart</string> + <string id="30000">Habilitar Fanart</string> <string id="30001">Preferir trailer de HD-Trailers.net</string> <string id="30002">Idioma preferido</string> <string id="30003">Obter classificação de</string> diff --git a/addons/metadata.themoviedb.org/resources/language/Portuguese/strings.xml b/addons/metadata.themoviedb.org/resources/language/Portuguese/strings.xml index 124f6f012c..da4cbb8848 100644 --- a/addons/metadata.themoviedb.org/resources/language/Portuguese/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Portuguese/strings.xml @@ -1,7 +1,7 @@ <?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! --> -<!-- Portuguese language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/pt/ --> -<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> +<!-- Portuguese language-Team URL: http://www.transifex.com/projects/p/xbmc-addons/language/pt/ --> +<!-- Report language file syntax bugs at: alanwww1@xbmc.org --> <strings> <string id="30000">Activar Fanart</string> diff --git a/addons/metadata.themoviedb.org/resources/language/Romanian/strings.xml b/addons/metadata.themoviedb.org/resources/language/Romanian/strings.xml index c20521f646..33ce821708 100644 --- a/addons/metadata.themoviedb.org/resources/language/Romanian/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Romanian/strings.xml @@ -1,7 +1,7 @@ <?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! --> -<!-- Romanian language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/ro/ --> -<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> +<!-- Romanian language-Team URL: http://www.transifex.com/projects/p/xbmc-addons/language/ro/ --> +<!-- Report language file syntax bugs at: alanwww1@xbmc.org --> <strings> <string id="30000">Activează Fanart</string> diff --git a/addons/metadata.themoviedb.org/resources/language/Russian/strings.xml b/addons/metadata.themoviedb.org/resources/language/Russian/strings.xml index df18dfb476..3fff6d4bc9 100644 --- a/addons/metadata.themoviedb.org/resources/language/Russian/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Russian/strings.xml @@ -1,7 +1,7 @@ <?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! --> -<!-- Russian language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/ru/ --> -<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> +<!-- Russian language-Team URL: http://www.transifex.com/projects/p/xbmc-addons/language/ru/ --> +<!-- Report language file syntax bugs at: alanwww1@xbmc.org --> <strings> <string id="30000">Использовать фанарт</string> diff --git a/addons/metadata.themoviedb.org/resources/language/Slovak/strings.xml b/addons/metadata.themoviedb.org/resources/language/Slovak/strings.xml index 319ac9c9f0..0fffdceb33 100644 --- a/addons/metadata.themoviedb.org/resources/language/Slovak/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Slovak/strings.xml @@ -1,11 +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! --> -<!-- Slovak language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/sk/ --> -<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> +<!-- Slovak language-Team URL: http://www.transifex.com/projects/p/xbmc-addons/language/sk/ --> +<!-- Report language file syntax bugs at: alanwww1@xbmc.org --> <strings> - <string id="30000">Povoliť fanart</string> - <string id="30001">Daj prednosť upútavkám z HD-Trailers.net</string> + <string id="30000">Povoliť umeleckú grafiku</string> + <string id="30001">Uprednostniť upútavky zo stránky HD-Trailers.net</string> <string id="30002">Uprednostňovaný jazyk</string> <string id="30003">Hodnotenie získaj z </string> <string id="30004">Povoliť upútavky (YouTube)</string> diff --git a/addons/metadata.themoviedb.org/resources/language/Slovenian/strings.xml b/addons/metadata.themoviedb.org/resources/language/Slovenian/strings.xml index 4faaa4dccc..17a4cd886b 100644 --- a/addons/metadata.themoviedb.org/resources/language/Slovenian/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Slovenian/strings.xml @@ -1,11 +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! --> -<!-- Slovenian language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/sl/ --> -<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> +<!-- Slovenian language-Team URL: http://www.transifex.com/projects/p/xbmc-addons/language/sl/ --> +<!-- Report language file syntax bugs at: alanwww1@xbmc.org --> <strings> <string id="30000">Vključi grafike</string> - <string id="30001">Privzeti napovedniki s HD-Trailers.net</string> + <string id="30001">Napovedniki s HD-Trailers.net</string> <string id="30002">Privzet jezik</string> <string id="30003">Prenesi ocene z</string> <string id="30004">Vključi napovednike (YouTube)</string> diff --git a/addons/metadata.themoviedb.org/resources/language/Spanish (Argentina)/strings.xml b/addons/metadata.themoviedb.org/resources/language/Spanish (Argentina)/strings.xml index 1e6bfeafd3..b997b53b3c 100644 --- a/addons/metadata.themoviedb.org/resources/language/Spanish (Argentina)/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Spanish (Argentina)/strings.xml @@ -1,7 +1,7 @@ <?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! --> -<!-- Spanish (Argentina) language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/es_AR/ --> -<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> +<!-- Spanish (Argentina) language-Team URL: http://www.transifex.com/projects/p/xbmc-addons/language/es_AR/ --> +<!-- Report language file syntax bugs at: alanwww1@xbmc.org --> <strings> <string id="30000">Descargar Fanart</string> diff --git a/addons/metadata.themoviedb.org/resources/language/Spanish (Mexico)/strings.xml b/addons/metadata.themoviedb.org/resources/language/Spanish (Mexico)/strings.xml index 9730e7010c..5627126996 100644 --- a/addons/metadata.themoviedb.org/resources/language/Spanish (Mexico)/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Spanish (Mexico)/strings.xml @@ -1,7 +1,7 @@ <?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! --> -<!-- Spanish (Mexico) language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/es_MX/ --> -<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> +<!-- Spanish (Mexico) language-Team URL: http://www.transifex.com/projects/p/xbmc-addons/language/es_MX/ --> +<!-- Report language file syntax bugs at: alanwww1@xbmc.org --> <strings> <string id="30000">Activar Fanart</string> diff --git a/addons/metadata.themoviedb.org/resources/language/Spanish/strings.xml b/addons/metadata.themoviedb.org/resources/language/Spanish/strings.xml index 84e0bf24a5..bef50f99b3 100644 --- a/addons/metadata.themoviedb.org/resources/language/Spanish/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Spanish/strings.xml @@ -1,7 +1,7 @@ <?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! --> -<!-- Spanish language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/es/ --> -<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> +<!-- Spanish language-Team URL: http://www.transifex.com/projects/p/xbmc-addons/language/es/ --> +<!-- Report language file syntax bugs at: alanwww1@xbmc.org --> <strings> <string id="30000">Descargar Fanart</string> diff --git a/addons/metadata.themoviedb.org/resources/language/Swedish/strings.xml b/addons/metadata.themoviedb.org/resources/language/Swedish/strings.xml index 34c7f59d87..3f791b0b6f 100644 --- a/addons/metadata.themoviedb.org/resources/language/Swedish/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Swedish/strings.xml @@ -1,7 +1,7 @@ <?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! --> -<!-- Swedish language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/sv/ --> -<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> +<!-- Swedish language-Team URL: http://www.transifex.com/projects/p/xbmc-addons/language/sv/ --> +<!-- Report language file syntax bugs at: alanwww1@xbmc.org --> <strings> <string id="30000">Aktivera fanart</string> diff --git a/addons/metadata.themoviedb.org/resources/language/Tamil (India)/strings.xml b/addons/metadata.themoviedb.org/resources/language/Tamil (India)/strings.xml index bd2db7938f..423faa687a 100644 --- a/addons/metadata.themoviedb.org/resources/language/Tamil (India)/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Tamil (India)/strings.xml @@ -1,7 +1,7 @@ <?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/ --> +<!-- Tamil (India) language-Team URL: http://www.transifex.com/projects/p/xbmc-addons/language/ta_IN/ --> +<!-- Report language file syntax bugs at: alanwww1@xbmc.org --> <strings> <string id="30000">விசிறிபடத்தை காண்பி</string> diff --git a/addons/metadata.themoviedb.org/resources/language/Thai/strings.xml b/addons/metadata.themoviedb.org/resources/language/Thai/strings.xml index 15ff77835e..d124d5b04d 100644 --- a/addons/metadata.themoviedb.org/resources/language/Thai/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Thai/strings.xml @@ -1,7 +1,7 @@ <?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! --> -<!-- Thai language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/th/ --> -<!-- Report language file syntax bugs at: http://trac.xbmc.org/ --> +<!-- Thai language-Team URL: http://www.transifex.com/projects/p/xbmc-addons/language/th/ --> +<!-- Report language file syntax bugs at: alanwww1@xbmc.org --> <strings> <string id="30000">เปิดใช้ แฟนอาร์ต</string> diff --git a/addons/metadata.themoviedb.org/resources/language/Turkish/strings.xml b/addons/metadata.themoviedb.org/resources/language/Turkish/strings.xml index 6b9c3535b3..f6d67d98fc 100644 --- a/addons/metadata.themoviedb.org/resources/language/Turkish/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Turkish/strings.xml @@ -1,7 +1,7 @@ <?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/ --> +<!-- Turkish language-Team URL: http://www.transifex.com/projects/p/xbmc-addons/language/tr/ --> +<!-- Report language file syntax bugs at: alanwww1@xbmc.org --> <strings> <string id="30000">Fanart Etkinleştir</string> diff --git a/addons/metadata.themoviedb.org/resources/language/Ukrainian/strings.xml b/addons/metadata.themoviedb.org/resources/language/Ukrainian/strings.xml index 468a24576e..fdb3c4f2e4 100644 --- a/addons/metadata.themoviedb.org/resources/language/Ukrainian/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Ukrainian/strings.xml @@ -1,7 +1,7 @@ <?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/ --> +<!-- Ukrainian language-Team URL: http://www.transifex.com/projects/p/xbmc-addons/language/uk/ --> +<!-- Report language file syntax bugs at: alanwww1@xbmc.org --> <strings> <string id="30000">Завантажувати фанарт</string> diff --git a/addons/metadata.themoviedb.org/resources/language/Uzbek/strings.xml b/addons/metadata.themoviedb.org/resources/language/Uzbek/strings.xml index 8051b4cac5..2ab4e27b2f 100644 --- a/addons/metadata.themoviedb.org/resources/language/Uzbek/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Uzbek/strings.xml @@ -1,7 +1,7 @@ <?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/ --> +<!-- Uzbek language-Team URL: http://www.transifex.com/projects/p/xbmc-addons/language/uz/ --> +<!-- Report language file syntax bugs at: alanwww1@xbmc.org --> <strings> <string id="30002">Afzal til</string> diff --git a/addons/metadata.themoviedb.org/resources/language/Vietnamese/strings.xml b/addons/metadata.themoviedb.org/resources/language/Vietnamese/strings.xml index c99544f1ae..b9d40d655e 100644 --- a/addons/metadata.themoviedb.org/resources/language/Vietnamese/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Vietnamese/strings.xml @@ -1,7 +1,7 @@ <?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/ --> +<!-- Vietnamese language-Team URL: http://www.transifex.com/projects/p/xbmc-addons/language/vi/ --> +<!-- Report language file syntax bugs at: alanwww1@xbmc.org --> <strings> <string id="30000">Sử dụng Fanart</string> diff --git a/addons/metadata.themoviedb.org/resources/language/Welsh/strings.xml b/addons/metadata.themoviedb.org/resources/language/Welsh/strings.xml index 28d08f8184..837da3257c 100644 --- a/addons/metadata.themoviedb.org/resources/language/Welsh/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Welsh/strings.xml @@ -1,7 +1,7 @@ <?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/ --> +<!-- Welsh language-Team URL: http://www.transifex.com/projects/p/xbmc-addons/language/cy/ --> +<!-- Report language file syntax bugs at: alanwww1@xbmc.org --> <strings> <string id="30000">Galluogi Celf</string> diff --git a/docs/README.linux b/docs/README.linux index 4d6f687735..32f83307c9 100644 --- a/docs/README.linux +++ b/docs/README.linux @@ -10,24 +10,28 @@ TOC 1. Introduction ----------------------------------------------------------------------------- -A gfx-adapter with OpenGL acceleration is highly recommended and 24/32 bitdepth -is required with OpenGL. - -NOTE TO NEW LINUX USERS: All lines that are prefixed with the '$' -character are commands that need to be typed into a terminal window / -console (similar to the command prompt for Windows). Note that the '$' -character itself should NOT be typed as part of the command. +A graphics-adapter with OpenGL acceleration is highly recommended. +24/32 bitdepth is required along with OpenGL. +Note to new Linux users. +All lines that are prefixed with the '$' character are commands, +that need to be typed into a terminal window / console. The '$' equals the prompt. +Note: The '$' character itself should NOT be typed as part of the command. ----------------------------------------------------------------------------- 2. Getting the source code ----------------------------------------------------------------------------- -You will have to grab the source code of course. First install the git -package provided by your distribution. Then from a terminal, type: +You will have to grab the source code of course, here we use git as example. +First install the git package provided by your distribution. +Then from a terminal, type: + +.0 $ cd $HOME +.1 $ git clone git://github.com/xbmc/xbmc.git xbmc + +Note: You can clone any specific branch. - $ cd $HOME - $ git clone git://github.com/xbmc/xbmc.git xbmc +.1 $ git clone -b <branch> git://github.com/xbmc/xbmc.git xbmc ----------------------------------------------------------------------------- 3. Installing the required libraries and headers @@ -42,36 +46,40 @@ Build-Depends: autoconf, automake, autopoint, autotools-dev, cmake, curl, libass-dev (>= 0.9.8), libavahi-client-dev, libavahi-common-dev, libavcodec-dev, libavfilter-dev, libavformat-dev, libavutil-dev, libbluetooth-dev, libbluray-dev, libboost-dev, libboost-thread-dev, libbz2-dev, libcap-dev, libcdio-dev, libcec-dev, - libcrystalhd-dev, libcurl4-gnutls-dev | libcurl-dev, libcwiid-dev, libdbus-1-dev, - libenca-dev, libflac-dev, libfontconfig-dev, libfreetype6-dev, libfribidi-dev, - libgl1-mesa-dev | libgl-dev, libglew-dev, libglu1-mesa-dev | libglu-dev, libhal-dev, - libhal-storage-dev, libiso9660-dev, libjasper-dev, libjpeg-dev, libltdl-dev, liblzo2-dev, - libmad0-dev, libmicrohttpd-dev, libmodplug-dev, libmpcdec-dev, libmpeg2-4-dev, libmysqlclient-dev, - libnfs-dev, libogg-dev, libpcre3-dev, libplist-dev, libpng12-dev | libpng-dev, libpostproc-dev, + libcrystalhd-dev, libcurl4-gnutls-dev | libcurl4-openssl-dev | libcurl-dev, + libcwiid-dev, libdbus-1-dev, libenca-dev, libflac-dev, libfontconfig-dev, + libfreetype6-dev, libfribidi-dev, libgl1-mesa-dev | libgl-dev, libglew-dev, + libglu1-mesa-dev | libglu-dev, libhal-dev, libhal-storage-dev, libiso9660-dev, + libjasper-dev, libjpeg-dev, libltdl-dev, liblzo2-dev, libmad0-dev, libmicrohttpd-dev, + libmodplug-dev, libmpcdec-dev, libmpeg2-4-dev, libmysqlclient-dev, libnfs-dev, + libogg-dev, libpcre3-dev, libplist-dev, libpng12-dev | libpng-dev, libpostproc-dev, libpulse-dev, librtmp-dev, libsdl-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev, - libshairplay-dev, libsmbclient-dev, libsqlite3-dev, libssh-dev, libssl-dev, libswscale-dev, - libtag1-dev (>= 1.8), libtiff-dev, libtinyxml-dev, libtool, libudev-dev, libusb-dev, libva-dev, - libvdpau-dev, libvorbis-dev, libxinerama-dev, libxml2-dev, libxmu-dev, libxrandr-dev, libxslt1-dev, - libxt-dev, libyajl-dev, lsb-release, nasm [!amd64], python-dev, python-imaging, python-support, swig, + libshairplay-dev, libsmbclient-dev, libsqlite3-dev, libssh-dev, libssl-dev, + libswscale-dev, libtag1-dev (>= 1.8), libtiff-dev, libtinyxml-dev, libtool, + libudev-dev, libusb-dev, libva-dev, libvdpau-dev, libvorbis-dev, libxinerama-dev, + libxml2-dev, libxmu-dev, libxrandr-dev, libxslt1-dev, libxt-dev, libyajl-dev, + lsb-release, nasm [!amd64], python-dev, python-imaging, python-support, swig, unzip, yasm, zip, zlib1g-dev -*** For developers and anyone else who compiles frequently it is recommended to -use ccache +Note: For developers and anyone else who compiles frequently it is recommended to use ccache. --------------------------------------------------------------- + $ sudo apt-get install ccache + +----------------------------------------------------------------------------- 3.1. Using the XBMC PPA to get all build dependencies (Debian/Ubuntu only) --------------------------------------------------------------- +----------------------------------------------------------------------------- -For this, you need to specify the PPA in your apt sources. Please find them on -the forum. +For this, you need to specify the PPA in your apt sources. +Please find them on the following wiki link: +Note: See README.ubuntu as well -http://forum.xbmc.org/showthread.php?t=33327 +http://wiki.xbmc.org/index.php?title=Team_XBMC_PPA Update apt: $ sudo apt-get update -Here is the magic command to get the build dependencies (used to compile the -version on the PPA). +The command to get the build dependencies, used to compile the version on the PPA. + $ sudo apt-get build-dep xbmc ----------------------------------------------------------------------------- @@ -83,24 +91,25 @@ To create the XBMC executable manually perform these steps: .0 $ ./bootstrap .1 $ ./configure <option1> <option2> ... (See --help for available options) - -A full listing of supported options can be viewed by typing -'./configure --help'. + A full listing of supported options can be viewed by typing './configure --help'. .2 $ make -Tip: by adding -j<number> to the make command, you describe how many - concurrent jobs will be used. So for dualcore the command is: +Tip: By adding -j<number> to the make command, you describe how many + concurrent jobs will be used. So for dualcore the command is: $ make -j2 +Note: From v14 with commit 4090a5f a new API for binary audio encoder addons is available, if you need to compile them do: + + $ make -C tools/depends/target/xbmc-audioencoder-addons PREFIX=/<system prefix you added on step 4.1 + .3 $ make install This will install XBMC in the prefix provided in 4.1 as well as a launcher script. -NOTE: You may need to run this with sudo (sudo make install) if your user -doesn't have write permissions to the prefix you have provided (as in the -default case, /usr/local). +Note: You may need to run this with sudo (sudo make install) if your user doesn't have write permissions +to the prefix you have provided (as in the default case, /usr/local). Tip: To override the location that XBMC is installed, use PREFIX=<path>. For example. @@ -110,14 +119,15 @@ For example. ----------------------------------------------------------------------------- 4.1. Test Suite ----------------------------------------------------------------------------- -XBMC has a test suite which uses the Google C++ Testing Framework. The -framework is provided directly in XBMC's source tree and has very little -requirements in order to build and run. See the README file for the framework -at 'lib/gtest/README' for specific requirements. -To compile and run XBMC's test suite, the configure option '--enable-gtest' -has to be explicitely set during the configure stage. Once configured, to -build the testsuite, type the following. +XBMC has a test suite which uses the Google C++ Testing Framework. +This framework is provided directly in XBMC's source tree. +It has very little requirements, in order to build and run. +See the README file for the framework at 'lib/gtest/README' for specific requirements. + +To compile and run XBMC's test suite: +The configure option '--enable-gtest' is enabled by default during the configure stage. +Once configured, to build the testsuite, type the following: $ make check @@ -125,43 +135,53 @@ To compile the test suite without running it, type the following. $ make testsuite -The test suite program can be run manually as well. The name of the test suite -program is 'xbmc-test' and will build in the XBMC source tree. To bring up the -'help' notes for the program, type the following. +The test suite program can be run manually as well. +The name of the test suite program is 'xbmc-test' and will build in the XBMC source tree. +To bring up the 'help' notes for the program, type the following: $ ./xbmc-test --gtest_help The most useful options are, - --gtest_list_tests - List the names of all tests instead of running them. The name of - TEST(Foo, Bar) is "Foo.Bar". - --gtest_filter=POSTIVE_PATTERNS[-NEGATIVE_PATTERNS] + --gtest_list_tests + List the names of all tests instead of running them. + The name of TEST(Foo, Bar) is "Foo.Bar". + + --gtest_filter=POSTIVE_PATTERNS[-NEGATIVE_PATTERNS] Run only the tests whose name matches one of the positive patterns but none of the negative patterns. '?' matches any single character; '*' matches any substring; ':' separates two patterns. -NOTE: If the '--enable-gtest' option is not set during the configure -stage, the make targets 'check,' 'testsuite,' and 'testframework' will -simply show a message saying the framework has not been configured, and then -silently succeed (i.e. it will not return an error). +Note: If the '--enable-gtest' option is not set during the configure stage, +the make targets 'check,' 'testsuite,' and 'testframework' will simply show a message saying +the framework has not been configured, and then silently succeed (i.e. it will not return an error). ----------------------------------------------------------------------------- 5. How to run ----------------------------------------------------------------------------- -How to run xbmc depends on the type of installation you have done. It is -possible to run XBMC without the requirement to install xbmc anywhere else. In -this case, type the following from the top source directory. + +How to run XBMC depends on the type of installation you have done. +It is possible to run XBMC without the requirement to install XBMC anywhere else. +In this case, type the following from the top source directory. $ ./xbmc.bin -If you chose to install XBMC using '/usr' or '/usr/local' as the PREFIX, you -can just issue 'xbmc' in a terminal session. +Or run in 'portable' mode + + $ ./xbmc.bin -p + +If you chose to install XBMC using '/usr' or '/usr/local' as the PREFIX, +you can just issue 'xbmc' in a terminal session. If you have overridden PREFIX to install XBMC into some non-standard location, -you will have to run xbmc by directly running 'xbmc.bin'. For example. +you will have to run XBMC by directly running 'xbmc.bin'. + +For example: + + $ $HOME/xbmc/usr/lib/xbmc.bin - $ $HOME/xbmc/usr/share/xbmc.bin +You should still run the wrapper via + $ $PREFIX/bin/xbmc If you wish to use VDPAU decoding you will now have to change the Render Method in Settings->Videos->Player from "Auto Detect" to "VDPAU". @@ -169,13 +189,19 @@ in Settings->Videos->Player from "Auto Detect" to "VDPAU". ----------------------------------------------------------------------------- 6. Uninstalling ----------------------------------------------------------------------------- -Issue "make uninstall" from your source tree (or "sudo make uninstall" if your -user doesn't have write permission to the install directory). If you would like -to also remove any settings and 3rd party addons (skins, scripts, etc) you -should also run "rm -rf ~/.xbmc". -NOTE: If you have rerun configure with a different prefix, you will either need -to rerun configure with the correct prefix for this step to work correctly. +Issue the commands prepending "sudo", if your user doesn't have write permission, +to the install directory. -EOF +Note: If you have rerun configure with a different prefix, +you will either need to rerun configure with the correct prefix for this step to work correctly. + + $ make uninstall +.0 $ sudo make uninstall + +If you would like to also remove any settings and 3rd party addons (skins, scripts, etc) +you should also run: +.1 $ rm -rf ~/.xbmc + +EOF diff --git a/docs/README.ubuntu b/docs/README.ubuntu index fe20abefd2..1233002072 100644 --- a/docs/README.ubuntu +++ b/docs/README.ubuntu @@ -9,22 +9,24 @@ TOC 1. Introduction ----------------------------------------------------------------------------- -We currently recommend Ubuntu Precise(12.04) or later. -A gfx-adapter with OpenGL acceleration is highly recommended and 24/32 -bitdepth is required with OpenGL. +A graphics-adapter with OpenGL acceleration is highly recommended. +24/32 bitdepth is required along with OpenGL. -NOTE TO NEW LINUX USERS: All lines that are prefixed with the '$' -character are commands that need to be typed into a terminal window / -console (similar to the command prompt for Windows). Note that the '$' -character itself should NOT be typed as part of the command. +Note to new Linux users. +All lines that are prefixed with the '$' character are commands, that need to be typed +into a terminal window / console (similar to the command prompt for Windows). +Note that the '$' character itself should NOT be typed as part of the command. ----------------------------------------------------------------------------- 2. Getting the source code ----------------------------------------------------------------------------- - $ sudo apt-get install git-core - $ cd $HOME - $ git clone git://github.com/xbmc/xbmc.git xbmc +.0 $ cd $HOME +.1 $ git clone git://github.com/xbmc/xbmc.git xbmc + +Note: You can clone any specific branch. + +.1 $ git clone -b <branch> git://github.com/xbmc/xbmc.git xbmc ----------------------------------------------------------------------------- 3. Installing the required Ubuntu packages @@ -32,74 +34,73 @@ character itself should NOT be typed as part of the command. Two methods exist to install the required Ubuntu packages: -[NOTICE] For supported old Ubuntu versions, some packages might be outdated. +[NOTICE] For supported older Ubuntu versions, some packages might be outdated. For those, you can either compile them manually, or use our backports available from our official stable PPA: http://launchpad.net/~team-xbmc/+archive/ppa --------------------------------------------------------------- +----------------------------------------------------------------------------- 3a. Use a single command to get all build dependencies --------------------------------------------------------------- -[NOTICE] Supported on ubuntu >= 11.10 (oneiric) +----------------------------------------------------------------------------- +[NOTICE] Supported on Ubuntu >= 11.10 (oneiric) You can get all build dependencies used for building the packages on the PPA Add the unstable and build-depends PPAs: - $ sudo apt-get install python-software-properties software-properties-common - $ sudo add-apt-repository ppa:team-xbmc/unstable - $ sudo add-apt-repository ppa:team-xbmc/xbmc-ppa-build-depends - $ sudo apt-get update +.0 $ sudo apt-get install python-software-properties software-properties-common +.1 $ sudo add-apt-repository ppa:team-xbmc/xbmc-nightly +.2 $ sudo add-apt-repository ppa:team-xbmc/xbmc-ppa-build-depends +.3 $ sudo apt-get update Here is the magic command to get the build dependencies (used to compile the version on the PPA). - $ sudo apt-get build-dep xbmc + $ sudo apt-get build-dep xbmc -* Optional: If you do not want xbmc to be installed via PPA, you can removed the PPAs again: - $ sudo add-apt-repository -r ppa:team-xbmc/unstable - $ sudo add-apt-repository -r ppa:team-xbmc/xbmc-ppa-build-depends +Optional: If you do not want XBMC to be installed via PPA, you can removed the PPAs again: + $ sudo add-apt-repository -r ppa:team-xbmc/xbmc-nightly + $ sudo add-apt-repository -r ppa:team-xbmc/xbmc-ppa-build-depends -*** Avoid using "aptitude" for the build-dep command. It doesn't resolve everything. +Note: Do not use "aptitude" for the build-dep command. It doesn't resolve everything properly. + For developers and anyone else who compiles frequently it is recommended to use ccache + $ sudo apt-get install ccache -*** For developers and anyone else who compiles frequently it is recommended to use ccache - $ sudo apt-get install ccache +Tip: For those with multiple computers at home is to try out distcc + (fully unsupported from XBMC of course) + $ sudo apt-get install distcc -*** A tip for those with multiple computers at home is to check out distcc (totally unsupported from xbmc of course) - $ sudo apt-get install distcc - - --------------------------------------------------------------------- +----------------------------------------------------------------------------- 3b. Alternative: Manual dependency installation --------------------------------------------------------------------- +----------------------------------------------------------------------------- For Ubuntu (all versions >= 7.04): - $ sudo apt-get install automake bison build-essential cmake curl cvs default-jre fp-compiler gawk gdc gettext git-core gperf libasound2-dev libass-dev libboost-dev libboost-thread-dev libbz2-dev libcap-dev libcdio-dev libcurl3 libcurl4-gnutls-dev libdbus-1-dev libenca-dev libflac-dev libfontconfig-dev libfreetype6-dev libfribidi-dev libglew-dev libiso9660-dev libjasper-dev libjpeg-dev liblzo2-dev libmad0-dev libmicrohttpd-dev libmodplug-dev libmpeg2-4-dev libmpeg3-dev libmysqlclient-dev libnfs-dev libogg-dev libogg-dev libpcre3-dev libplist-dev libpng-dev libpulse-dev libsdl-dev libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsmbclient-dev libsqlite3-dev libssh-dev libssl-dev libtiff-dev libtinyxml-dev libtool libudev-dev libusb-dev libvdpau-dev libvorbisenc2 libxml2-dev libxmu-dev libxrandr-dev libxrender-dev libxslt1-dev libxt-dev libyajl-dev mesa-utils nasm pmount python-dev python-imaging python-sqlite swig unzip yasm zip zlib1g-dev + $ sudo apt-get install automake bison build-essential cmake curl cvs default-jre fp-compiler gawk gdc gettext git-core gperf libasound2-dev libass-dev libboost-dev libboost-thread-dev libbz2-dev libcap-dev libcdio-dev libcurl3 libcurl4-gnutls-dev libdbus-1-dev libenca-dev libflac-dev libfontconfig-dev libfreetype6-dev libfribidi-dev libglew-dev libiso9660-dev libjasper-dev libjpeg-dev liblzo2-dev libmad0-dev libmicrohttpd-dev libmodplug-dev libmpeg2-4-dev libmpeg3-dev libmysqlclient-dev libnfs-dev libogg-dev libogg-dev libpcre3-dev libplist-dev libpng-dev libpulse-dev libsdl-dev libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsmbclient-dev libsqlite3-dev libssh-dev libssl-dev libtiff-dev libtinyxml-dev libtool libudev-dev libusb-dev libvdpau-dev libvorbisenc2 libxml2-dev libxmu-dev libxrandr-dev libxrender-dev libxslt1-dev libxt-dev libyajl-dev mesa-utils nasm pmount python-dev python-imaging python-sqlite swig unzip yasm zip zlib1g-dev For >= 10.10: - $ sudo apt-get install autopoint libltdl-dev + $ sudo apt-get install autopoint libltdl-dev On 8.10 and older versions, libcurl is outdated and thus XBMC will not compile properly. In this case you will have to manually compile the latest version. - $ wget http://curl.sourceforge.net/download/curl-7.19.7.tar.gz - $ tar -xzf curl-7.19.7.tar.gz - $ cd curl-7.19.7 - $ ./configure --disable-ipv6 --without-libidn --disable-ldap --prefix=/usr - $ make - $ sudo make install - -For >= 12.10 - $ sudo apt-get install libtag1-dev + $ wget http://curl.sourceforge.net/download/curl-7.19.7.tar.gz + $ tar -xzf curl-7.19.7.tar.gz + $ cd curl-7.19.7 + $ ./configure --disable-ipv6 --without-libidn --disable-ldap --prefix=/usr + $ make + $ sudo make install For <= 12.04 -We need a new version of taglib than what is available. We supply a Makefile in -lib/taglib to make it easy to install into /usr/local. - $ sudo apt-get remove libtag1-dev - $ make -C lib/taglib - $ sudo make -C lib/taglib install +XBMC needs a new version of taglib other than what is available at this time. +We supply a Makefile in lib/taglib to make it easy to install into /usr/local. + $ sudo apt-get remove libtag1-dev + $ make -C lib/taglib + $ sudo make -C lib/taglib install -Unless you are proficient with how linux libraries and versions work, do not -try to provide it yourself, as you will likely mess up for other programs. +or use prepackaged from the XBMC PPA. + $ sudo apt-get install libtag1-dev + +Unless you are proficient with how Linux libraries and versions work, do not +try to provide it yourself, as you will likely mess up for other programs. ----------------------------------------------------------------------------- 4. How to compile @@ -114,7 +115,8 @@ See README.linux ----------------------------------------------------------------------------- 5. Uninstalling ----------------------------------------------------------------------------- -$ sudo apt-get remove xbmc* +Remove any PPA installed XBMC. + $ sudo apt-get remove xbmc* +See README.linux/Uninstalling for removing compiled versions of XBMC. EOF - diff --git a/language/English/strings.po b/language/English/strings.po index d56f687c37..f472040408 100755 --- a/language/English/strings.po +++ b/language/English/strings.po @@ -11725,6 +11725,9 @@ msgctxt "#22019" msgid "Recordings by title" msgstr "" +#. Electronic program guide, used as label in the menu of the PVR section and the MythDirectory +#: addons/skin/confluence +#: xbmc/filesystem/MythDirectory.cpp msgctxt "#22020" msgid "Guide" msgstr "" diff --git a/project/cmake/addons/CMakeLists.txt b/project/cmake/addons/CMakeLists.txt index f5e276a4fc..e449078e75 100644 --- a/project/cmake/addons/CMakeLists.txt +++ b/project/cmake/addons/CMakeLists.txt @@ -18,7 +18,7 @@ else() endif() get_filename_component(XBMCROOT "${XBMCROOT}" ABSOLUTE) -if (NOT DEPENDS_PATH) +if(NOT DEPENDS_PATH) set(DEPENDS_PATH "${CMAKE_BINARY_DIR}/addons") else() file(TO_CMAKE_PATH "${DEPENDS_PATH}" DEPENDS_PATH) @@ -27,7 +27,7 @@ endif() get_filename_component(prefix "${DEPENDS_PATH}" ABSOLUTE) #make sure CMAKE_PREFIX_PATH is set -if (NOT CMAKE_PREFIX_PATH) +if(NOT CMAKE_PREFIX_PATH) set(CMAKE_PREFIX_PATH "${DEPENDS_PATH}") else() file(TO_CMAKE_PATH "${CMAKE_PREFIX_PATH}" CMAKE_PREFIX_PATH) @@ -42,6 +42,8 @@ list(APPEND CMAKE_PREFIX_PATH ${CMAKE_INSTALL_PREFIX}) set(BUILD_ARGS -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_BUILD_TYPE=Release + -DCMAKE_USER_MAKE_RULES_OVERRIDE=${CMAKE_USER_MAKE_RULES_OVERRIDE} + -DCMAKE_USER_MAKE_RULES_OVERRIDE_CXX=${CMAKE_USER_MAKE_RULES_OVERRIDE_CXX} -DBUILD_SHARED_LIBS=1) if(PACKAGE_ZIP) diff --git a/project/cmake/addons/README b/project/cmake/addons/README index e0b7a6c5d2..d34039c3dd 100644 --- a/project/cmake/addons/README +++ b/project/cmake/addons/README @@ -54,7 +54,7 @@ http://www.cmake.org/cmake/help/v2.8.8/cmake.html#section_Generators for a list. In case of additional options the call might look like this - cmake <path> -G <generator> \ + cmake <path> [-G <generator>] \ -DCMAKE_BUILD_TYPE=Release \ -DXBMCROOT="<path-to-xbmc-root>" \ -DARCH_DEFINES="-DTARGET_LINUX" \ diff --git a/project/cmake/xbmc-c-flag-overrides.cmake b/project/cmake/xbmc-c-flag-overrides.cmake new file mode 100644 index 0000000000..ab19701707 --- /dev/null +++ b/project/cmake/xbmc-c-flag-overrides.cmake @@ -0,0 +1,5 @@ +if(MSVC) + set(CMAKE_C_FLAGS "/MP /DWIN32 /D_WINDOWS /W3 /Zi /arch:SSE2") + set(CMAKE_C_FLAGS_DEBUG "/D_DEBUG /MDd /Ob0 /Od /RTC1 /D_HAS_ITERATOR_DEBUGGING=0 /D_SECURE_SCL=0") + set(CMAKE_C_FLAGS_RELEASE "/MD /Ox /Ob2 /Oi /Ot /Oy /GL /DNDEBUG") +endif(MSVC)
\ No newline at end of file diff --git a/project/cmake/xbmc-cxx-flag-overrides.cmake b/project/cmake/xbmc-cxx-flag-overrides.cmake new file mode 100644 index 0000000000..ad3a0908ef --- /dev/null +++ b/project/cmake/xbmc-cxx-flag-overrides.cmake @@ -0,0 +1,5 @@ +if(MSVC) + set(CMAKE_CXX_FLAGS "/MP /DWIN32 /D_WINDOWS /W3 /GR /Zi /EHsc /arch:SSE2") + set(CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG /MDd /Ob0 /Od /RTC1 /D_HAS_ITERATOR_DEBUGGING=0 /D_SECURE_SCL=0") + set(CMAKE_CXX_FLAGS_RELEASE "/MD /Ox /Ob2 /Oi /Ot /Oy /GL /DNDEBUG") +endif(MSVC)
\ No newline at end of file diff --git a/tools/buildsteps/win32/make-addon-depends.bat b/tools/buildsteps/win32/make-addon-depends.bat index 3016b83043..e1c3fdab5e 100644 --- a/tools/buildsteps/win32/make-addon-depends.bat +++ b/tools/buildsteps/win32/make-addon-depends.bat @@ -4,12 +4,24 @@ SETLOCAL SET EXITCODE=0 +SET noclean=false +SET dependency= +FOR %%b in (%1, %2) DO ( + IF %%b == noclean ( + SET noclean=true + ) ELSE ( IF %%b == clean ( + SET noclean=false + ) ELSE ( + SET dependency=%%b + )) +) + rem set Visual C++ build environment call "%VS120COMNTOOLS%..\..\VC\bin\vcvars32.bat" SET WORKDIR=%WORKSPACE% -IF "%WORKDIR%"=="" ( +IF "%WORKDIR%" == "" ( SET WORKDIR=%CD%\..\..\.. ) @@ -24,24 +36,23 @@ SET ADDON_DEPENDS_BUILD_PATH=%ADDON_DEPENDS_PATH%\build SET ERRORFILE=%BASE_PATH%\make-addon-depends.error -rem remove the output directory if it exists -IF EXIST "%ADDONS_OUTPUT_PATH%" ( - RMDIR "%ADDONS_OUTPUT_PATH%" /S /Q > NUL +IF %noclean% == false ( + rem remove the output directory if it exists + IF EXIST "%ADDONS_OUTPUT_PATH%" ( + RMDIR "%ADDONS_OUTPUT_PATH%" /S /Q > NUL + ) + + rem remove the build directory if it exists + IF EXIST "%ADDON_DEPENDS_BUILD_PATH%" ( + RMDIR "%ADDON_DEPENDS_BUILD_PATH%" /S /Q > NUL + ) ) rem create the output directory -MKDIR "%ADDONS_OUTPUT_PATH%" - -rem go into the addon depends directory -CD %ADDON_DEPENDS_PATH% - -rem remove the build directory if it exists -IF EXIST "%ADDON_DEPENDS_BUILD_PATH%" ( - RMDIR "%ADDON_DEPENDS_BUILD_PATH%" /S /Q > NUL -) +IF NOT EXIST "%ADDONS_OUTPUT_PATH%" MKDIR "%ADDONS_OUTPUT_PATH%" rem create the build directory -MKDIR "%ADDON_DEPENDS_BUILD_PATH%" +IF NOT EXIST "%ADDON_DEPENDS_BUILD_PATH%" MKDIR "%ADDON_DEPENDS_BUILD_PATH%" rem go into the build directory CD "%ADDON_DEPENDS_BUILD_PATH%" @@ -51,15 +62,15 @@ cmake "%ADDON_DEPENDS_PATH%" -G "NMake Makefiles" ^ -DCMAKE_BUILD_TYPE=Release ^ -DCMAKE_INSTALL_PREFIX=%ADDONS_OUTPUT_PATH% IF ERRORLEVEL 1 ( - ECHO cmake error level: %ERRORLEVEL% > %ERRORFILE% - GOTO ERROR + ECHO cmake error level: %ERRORLEVEL% > %ERRORFILE% + GOTO ERROR ) rem execute nmake to build the addon depends -nmake +nmake %dependency% IF ERRORLEVEL 1 ( - ECHO nmake error level: %ERRORLEVEL% > %ERRORFILE% - GOTO ERROR + ECHO nmake error level: %ERRORLEVEL% > %ERRORFILE% + GOTO ERROR ) rem everything was fine diff --git a/tools/buildsteps/win32/make-addons.bat b/tools/buildsteps/win32/make-addons.bat index b6bb3664dc..10a2a8bc4d 100644 --- a/tools/buildsteps/win32/make-addons.bat +++ b/tools/buildsteps/win32/make-addons.bat @@ -5,8 +5,21 @@ SETLOCAL SET EXITCODE=0 SET getdepends=true -FOR %%b in (%1) DO ( - IF %%b==nodepends SET getdepends=false +SET install=false +SET noclean=false +SET addon= +FOR %%b in (%1, %2, %3, %4) DO ( + IF %%b == nodepends ( + SET getdepends=false + ) ELSE ( IF %%b == install ( + SET install=true + ) ELSE ( IF %%b == noclean ( + SET noclean=true + ) ELSE ( IF %%b == clean ( + SET noclean=false + ) ELSE ( + SET addon=%%b + )))) ) rem set Visual C++ build environment @@ -14,7 +27,7 @@ call "%VS120COMNTOOLS%..\..\VC\bin\vcvars32.bat" SET WORKDIR=%WORKSPACE% -IF "%WORKDIR%"=="" ( +IF "%WORKDIR%" == "" ( SET WORKDIR=%CD%\..\..\.. ) @@ -30,53 +43,75 @@ SET ERRORFILE=%BASE_PATH%\make-addons.error SET XBMC_INCLUDE_PATH=%ADDON_DEPENDS_PATH%\include\xbmc SET XBMC_LIB_PATH=%ADDON_DEPENDS_PATH%\lib\xbmc -IF %getdepends%==true ( - CALL make-addon-depends.bat +rem determine whether make-addon-depends.bat should be called with noclean or not +SET addon_depends_mode=clean +IF %noclean% == true ( + SET addon_depends_mode=noclean +) + +IF %getdepends% == true ( + ECHO -------------------------------------------------- + ECHO Building addon dependencies + ECHO -------------------------------------------------- + + CALL make-addon-depends.bat %addon_depends_mode% IF ERRORLEVEL 1 ( ECHO make-addon-depends error level: %ERRORLEVEL% > %ERRORFILE% GOTO ERROR ) -) -rem make sure the xbmc include and library paths exist -IF EXIST "%XBMC_INCLUDE_PATH%" ( - RMDIR "%XBMC_INCLUDE_PATH%" /S /Q > NUL -) -IF EXIST "%XBMC_LIB_PATH%" ( - RMDIR "%XBMC_LIB_PATH%" /S /Q > NUL + ECHO. ) -MKDIR "%XBMC_INCLUDE_PATH%" -MKDIR "%XBMC_LIB_PATH%" -rem go into the addons directory -CD %ADDONS_PATH% +IF %noclean% == false ( + rem remove the build directory if it exists + IF EXIST "%ADDONS_BUILD_PATH%" ( + RMDIR "%ADDONS_BUILD_PATH%" /S /Q > NUL + ) +) -rem remove the build directory if it exists -IF EXIST "%ADDONS_BUILD_PATH%" ( - RMDIR "%ADDONS_BUILD_PATH%" /S /Q > NUL +rem make sure the xbmc include and library paths exist +IF NOT EXIST "%XBMC_INCLUDE_PATH%" ( + MKDIR "%XBMC_INCLUDE_PATH%" +) +IF NOT EXIST "%XBMC_LIB_PATH%" ( + MKDIR "%XBMC_LIB_PATH%" ) rem create the build directory -MKDIR "%ADDONS_BUILD_PATH%" +IF NOT EXIST "%ADDONS_BUILD_PATH%" MKDIR "%ADDONS_BUILD_PATH%" rem go into the build directory CD "%ADDONS_BUILD_PATH%" +rem determine the proper install path for the built addons +IF %install% == true ( + SET ADDONS_INSTALL_PATH=%WORKDIR%\addons +) ELSE ( + SET ADDONS_INSTALL_PATH=%WORKDIR%\project\Win32BuildSetup\BUILD_WIN32\Xbmc\xbmc-addons +) + +ECHO -------------------------------------------------- +ECHO Building addons +ECHO -------------------------------------------------- + rem execute cmake to generate makefiles processable by nmake cmake "%ADDONS_PATH%" -G "NMake Makefiles" ^ -DCMAKE_BUILD_TYPE=Release ^ + -DCMAKE_USER_MAKE_RULES_OVERRIDE="%BASE_PATH%/xbmc-c-flag-overrides.cmake" ^ + -DCMAKE_USER_MAKE_RULES_OVERRIDE_CXX="%BASE_PATH%/xbmc-cxx-flag-overrides.cmake" ^ + -DCMAKE_INSTALL_PREFIX=%ADDONS_INSTALL_PATH% ^ -DXBMCROOT=%WORKDIR% ^ -DDEPENDS_PATH=%ADDON_DEPENDS_PATH% ^ - -DCMAKE_INSTALL_PREFIX=%WORKDIR%\project\Win32BuildSetup\BUILD_WIN32\Xbmc\xbmc-addons ^ -DPACKAGE_ZIP=1 ^ - -DARCH_DEFINES="-DTARGET_WINDOWS -DNOMINMAX" + -DARCH_DEFINES="-DTARGET_WINDOWS -DNOMINMAX -D_CRT_SECURE_NO_WARNINGS -D_USE_32BIT_TIME_T -D_WINSOCKAPI_" IF ERRORLEVEL 1 ( ECHO cmake error level: %ERRORLEVEL% > %ERRORFILE% GOTO ERROR ) rem execute nmake to build the addons -nmake +nmake %addon% IF ERRORLEVEL 1 ( ECHO nmake error level: %ERRORLEVEL% > %ERRORFILE% GOTO ERROR diff --git a/tools/depends/target/ffmpeg/Makefile b/tools/depends/target/ffmpeg/Makefile index 51e191887f..0e08dcf1e5 100644 --- a/tools/depends/target/ffmpeg/Makefile +++ b/tools/depends/target/ffmpeg/Makefile @@ -62,7 +62,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); sed -i".bak" -e "s%pkg_config_default=pkg-config%export PKG_CONFIG_LIBDIR=$(PREFIX)/lib/pkgconfig\npkg_config_default=$(NATIVEPREFIX)/bin/pkg-config%" configure + cd $(PLATFORM); sed -i".bak" -e "s%pkg_config_default=pkg-config%export PKG_CONFIG_LIBDIR=$(PREFIX)/lib/pkgconfig \&\& pkg_config_default=$(NATIVEPREFIX)/bin/pkg-config%" configure cd $(PLATFORM);\ CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \ ./configure $(ffmpg_config) diff --git a/xbmc/addons/AddonCallbacksGUI.cpp b/xbmc/addons/AddonCallbacksGUI.cpp index ba4b2078e9..d5cab6e198 100644 --- a/xbmc/addons/AddonCallbacksGUI.cpp +++ b/xbmc/addons/AddonCallbacksGUI.cpp @@ -507,9 +507,9 @@ void CAddonCallbacksGUI::Window_SetProperty(void *addonData, GUIHANDLE handle, c CAddonCallbacksGUI* guiHelper = helper->GetHelperGUI(); - if (!handle) + if (!handle || !key || !value) { - CLog::Log(LOGERROR, "Window_SetProperty: %s/%s - No Window", TranslateType(guiHelper->m_addon->Type()).c_str(), guiHelper->m_addon->Name().c_str()); + CLog::Log(LOGERROR, "Window_SetProperty: %s/%s - No Window or NULL key or value", TranslateType(guiHelper->m_addon->Type()).c_str(), guiHelper->m_addon->Name().c_str()); return; } @@ -534,9 +534,9 @@ void CAddonCallbacksGUI::Window_SetPropertyInt(void *addonData, GUIHANDLE handle CAddonCallbacksGUI* guiHelper = helper->GetHelperGUI(); - if (!handle) + if (!handle || !key) { - CLog::Log(LOGERROR, "Window_SetPropertyInt: %s/%s - No Window", TranslateType(guiHelper->m_addon->Type()).c_str(), guiHelper->m_addon->Name().c_str()); + CLog::Log(LOGERROR, "Window_SetPropertyInt: %s/%s - No Window or NULL key", TranslateType(guiHelper->m_addon->Type()).c_str(), guiHelper->m_addon->Name().c_str()); return; } @@ -561,9 +561,9 @@ void CAddonCallbacksGUI::Window_SetPropertyBool(void *addonData, GUIHANDLE handl CAddonCallbacksGUI* guiHelper = helper->GetHelperGUI(); - if (!handle) + if (!handle || !key) { - CLog::Log(LOGERROR, "Window_SetPropertyBool: %s/%s - No Window", TranslateType(guiHelper->m_addon->Type()).c_str(), guiHelper->m_addon->Name().c_str()); + CLog::Log(LOGERROR, "Window_SetPropertyBool: %s/%s - No Window or NULL key", TranslateType(guiHelper->m_addon->Type()).c_str(), guiHelper->m_addon->Name().c_str()); return; } @@ -588,9 +588,9 @@ void CAddonCallbacksGUI::Window_SetPropertyDouble(void *addonData, GUIHANDLE han CAddonCallbacksGUI* guiHelper = helper->GetHelperGUI(); - if (!handle) + if (!handle || !key) { - CLog::Log(LOGERROR, "Window_SetPropertyDouble: %s/%s - No Window", TranslateType(guiHelper->m_addon->Type()).c_str(), guiHelper->m_addon->Name().c_str()); + CLog::Log(LOGERROR, "Window_SetPropertyDouble: %s/%s - No Window or NULL key", TranslateType(guiHelper->m_addon->Type()).c_str(), guiHelper->m_addon->Name().c_str()); return; } @@ -615,9 +615,9 @@ const char* CAddonCallbacksGUI::Window_GetProperty(void *addonData, GUIHANDLE ha CAddonCallbacksGUI* guiHelper = helper->GetHelperGUI(); - if (!handle) + if (!handle || !key) { - CLog::Log(LOGERROR, "Window_GetProperty: %s/%s - No Window", TranslateType(guiHelper->m_addon->Type()).c_str(), guiHelper->m_addon->Name().c_str()); + CLog::Log(LOGERROR, "Window_GetProperty: %s/%s - No Window or NULL key", TranslateType(guiHelper->m_addon->Type()).c_str(), guiHelper->m_addon->Name().c_str()); return NULL; } @@ -644,9 +644,9 @@ int CAddonCallbacksGUI::Window_GetPropertyInt(void *addonData, GUIHANDLE handle, CAddonCallbacksGUI* guiHelper = helper->GetHelperGUI(); - if (!handle) + if (!handle || !key) { - CLog::Log(LOGERROR, "Window_GetPropertyInt: %s/%s - No Window", TranslateType(guiHelper->m_addon->Type()).c_str(), guiHelper->m_addon->Name().c_str()); + CLog::Log(LOGERROR, "Window_GetPropertyInt: %s/%s - No Window or NULL key", TranslateType(guiHelper->m_addon->Type()).c_str(), guiHelper->m_addon->Name().c_str()); return -1; } @@ -673,9 +673,9 @@ bool CAddonCallbacksGUI::Window_GetPropertyBool(void *addonData, GUIHANDLE handl CAddonCallbacksGUI* guiHelper = helper->GetHelperGUI(); - if (!handle) + if (!handle || !key) { - CLog::Log(LOGERROR, "Window_GetPropertyBool: %s/%s - No Window", TranslateType(guiHelper->m_addon->Type()).c_str(), guiHelper->m_addon->Name().c_str()); + CLog::Log(LOGERROR, "Window_GetPropertyBool: %s/%s - No Window or NULL key", TranslateType(guiHelper->m_addon->Type()).c_str(), guiHelper->m_addon->Name().c_str()); return false; } @@ -702,9 +702,9 @@ double CAddonCallbacksGUI::Window_GetPropertyDouble(void *addonData, GUIHANDLE h CAddonCallbacksGUI* guiHelper = helper->GetHelperGUI(); - if (!handle) + if (!handle || !key) { - CLog::Log(LOGERROR, "Window_GetPropertyDouble: %s/%s - No Window", TranslateType(guiHelper->m_addon->Type()).c_str(), guiHelper->m_addon->Name().c_str()); + CLog::Log(LOGERROR, "Window_GetPropertyDouble: %s/%s - No Window or NULL key", TranslateType(guiHelper->m_addon->Type()).c_str(), guiHelper->m_addon->Name().c_str()); return 0.0; } diff --git a/xbmc/addons/AddonManager.cpp b/xbmc/addons/AddonManager.cpp index 6a46ef7d36..ddacd450b6 100644 --- a/xbmc/addons/AddonManager.cpp +++ b/xbmc/addons/AddonManager.cpp @@ -629,7 +629,7 @@ std::string CAddonMgr::GetTranslatedString(const cp_cfg_element_t *root, const c { // see if we have a "lang" attribute const char *lang = m_cpluff->lookup_cfg_value((cp_cfg_element_t*)&child, "@lang"); if (lang && 0 == strcmp(lang,g_langInfo.GetLanguageLocale(true).c_str())) - return child.value; + return child.value ? child.value : ""; if (!lang || 0 == strcmp(lang, "en")) eng = &child; } diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPVRClient.cpp b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPVRClient.cpp index 192f9db003..4ed2d5c428 100644 --- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPVRClient.cpp +++ b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPVRClient.cpp @@ -119,7 +119,6 @@ bool CDVDDemuxPVRClient::Open(CDVDInputStream* pInput) if (!g_PVRClients->GetPlayingClient(m_pvrClient)) return false; - RequestStreams(); return true; } diff --git a/xbmc/epg/EpgInfoTag.cpp b/xbmc/epg/EpgInfoTag.cpp index 4b23ec9706..e2000d1adf 100644 --- a/xbmc/epg/EpgInfoTag.cpp +++ b/xbmc/epg/EpgInfoTag.cpp @@ -98,7 +98,30 @@ CEpgInfoTag::CEpgInfoTag(const EPG_TAG &data) : CPVRTimerInfoTagPtr emptyTimer; m_timer = emptyTimer; - Update(data); + SetStartFromUTC(data.startTime + g_advancedSettings.m_iPVRTimeCorrection); + SetEndFromUTC(data.endTime + g_advancedSettings.m_iPVRTimeCorrection); + SetGenre(data.iGenreType, data.iGenreSubType, data.strGenreDescription); + SetParentalRating(data.iParentalRating); + SetUniqueBroadcastID(data.iUniqueBroadcastId); + SetNotify(data.bNotify); + SetFirstAiredFromUTC(data.firstAired + g_advancedSettings.m_iPVRTimeCorrection); + SetEpisodeNum(data.iEpisodeNumber); + SetEpisodePart(data.iEpisodePartNumber); + SetStarRating(data.iStarRating); + + // explicit NULL check, because there is no implicit NULL constructor for std::string + if (data.strTitle) + SetTitle(data.strTitle); + if (data.strPlotOutline) + SetPlotOutline(data.strPlotOutline); + if (data.strPlot) + SetPlot(data.strPlot); + if (data.strEpisodeName) + SetEpisodeName(data.strEpisodeName); + if (data.strIconPath) + SetIcon(data.strIconPath); + if (data.strRecordingId) + SetRecordingId(data.strRecordingId); } CEpgInfoTag::CEpgInfoTag(const CEpgInfoTag &tag) : @@ -883,27 +906,6 @@ const PVR::CPVRChannelPtr CEpgInfoTag::ChannelTag(void) const return m_pvrChannel; } -void CEpgInfoTag::Update(const EPG_TAG &tag) -{ - CSingleLock lock(m_critSection); - SetStartFromUTC(tag.startTime + g_advancedSettings.m_iPVRTimeCorrection); - SetEndFromUTC(tag.endTime + g_advancedSettings.m_iPVRTimeCorrection); - SetTitle(tag.strTitle); - SetPlotOutline(tag.strPlotOutline); - SetPlot(tag.strPlot); - SetGenre(tag.iGenreType, tag.iGenreSubType, tag.strGenreDescription); - SetParentalRating(tag.iParentalRating); - SetUniqueBroadcastID(tag.iUniqueBroadcastId); - SetNotify(tag.bNotify); - SetFirstAiredFromUTC(tag.firstAired + g_advancedSettings.m_iPVRTimeCorrection); - SetEpisodeNum(tag.iEpisodeNumber); - SetEpisodePart(tag.iEpisodePartNumber); - SetEpisodeName(tag.strEpisodeName); - SetStarRating(tag.iStarRating); - SetIcon(tag.strIconPath); - SetRecordingId(tag.strRecordingId); -} - bool CEpgInfoTag::Update(const CEpgInfoTag &tag, bool bUpdateBroadcastId /* = true */) { bool bChanged(false); diff --git a/xbmc/epg/EpgInfoTag.h b/xbmc/epg/EpgInfoTag.h index 8e3f98fd6b..3d839fd6be 100644 --- a/xbmc/epg/EpgInfoTag.h +++ b/xbmc/epg/EpgInfoTag.h @@ -460,12 +460,6 @@ namespace EPG /*! * @brief Update the information in this tag with the info in the given tag. * @param tag The new info. - */ - void Update(const EPG_TAG &tag); - - /*! - * @brief Update the information in this tag with the info in the given tag. - * @param tag The new info. * @param bUpdateBroadcastId If set to false, the tag BroadcastId (locally unique) will not be chacked/updated * @return True if something changed, false otherwise. */ diff --git a/xbmc/filesystem/CurlFile.cpp b/xbmc/filesystem/CurlFile.cpp index 07bd760274..7c1a328259 100644 --- a/xbmc/filesystem/CurlFile.cpp +++ b/xbmc/filesystem/CurlFile.cpp @@ -745,8 +745,6 @@ void CCurlFile::ParseAndCorrectUrl(CURL &url2) url2.GetProtocolOptions(options); if (options.size() > 0) { - // clear protocol options - url2.SetProtocolOptions(""); // set xbmc headers for (std::map<std::string,std::string>::const_iterator it = options.begin(); it != options.end(); ++it) { @@ -783,6 +781,9 @@ void CCurlFile::ParseAndCorrectUrl(CURL &url2) } } } + + // Unset the protocol options to have an url without protocol options + url2.SetProtocolOptions(""); if (m_username.length() > 0 && m_password.length() > 0) m_url = url2.GetWithoutUserDetails(); diff --git a/xbmc/interfaces/legacy/WindowXML.cpp b/xbmc/interfaces/legacy/WindowXML.cpp index b3467de528..375b0759bc 100644 --- a/xbmc/interfaces/legacy/WindowXML.cpp +++ b/xbmc/interfaces/legacy/WindowXML.cpp @@ -438,7 +438,7 @@ namespace XBMCAddon std::string strPathLower = strPath; StringUtils::ToLower(strPathLower); - if (xmlDoc.LoadFile(strPath) <= 0 && xmlDoc.LoadFile(strPathLower) <= 0 && xmlDoc.LoadFile(strLowerPath) <= 0) + if (!xmlDoc.LoadFile(strPath) && !xmlDoc.LoadFile(strPathLower) && !xmlDoc.LoadFile(strLowerPath)) { // fail - can't load the file CLog::Log(LOGERROR, "%s: Unable to load skin file %s", __FUNCTION__, strPath.c_str()); diff --git a/xbmc/linux/HALManager.cpp b/xbmc/linux/HALManager.cpp index 3f322d14ee..a6b63d4e61 100644 --- a/xbmc/linux/HALManager.cpp +++ b/xbmc/linux/HALManager.cpp @@ -598,7 +598,7 @@ bool CHALManager::ApproveDevice(CStorageDevice *device) approve = false; // Ignore some mountpoints, unless a weird setup these should never contain anything usefull for an enduser. - if (strcmp(device->MountPoint, "/") == 0 || strcmp(device->MountPoint, "/boot/") == 0 || strcmp(device->MountPoint, "/mnt/") == 0 || strcmp(device->MountPoint, "/home/") == 0) + if (strcmp(device->MountPoint.c_str(), "/") == 0 || strcmp(device->MountPoint.c_str(), "/boot/") == 0 || strcmp(device->MountPoint.c_str(), "/mnt/") == 0 || strcmp(device->MountPoint.c_str(), "/home/") == 0) approve = false; if (device->HalIgnore) @@ -612,7 +612,7 @@ bool CHALManager::Eject(const std::string& path) { for (unsigned int i = 0; i < m_Volumes.size(); i++) { - if (m_Volumes[i].MountPoint.Equals(path)) + if (m_Volumes[i].MountPoint == path) return m_Volumes[i].HotPlugged ? UnMount(m_Volumes[i]) : false; } @@ -693,7 +693,7 @@ bool CHALManager::Mount(CStorageDevice *volume, const std::string &mountpath) std::string temporaryString; - if (volume->FileSystem.Equals("vfat")) + if (volume->FileSystem == "vfat") { int mask = umask (0); temporaryString = StringUtils::Format("umask=%#o", mask); diff --git a/xbmc/pvr/windows/GUIWindowPVRBase.cpp b/xbmc/pvr/windows/GUIWindowPVRBase.cpp index 6b7cda84e8..96df61405e 100644 --- a/xbmc/pvr/windows/GUIWindowPVRBase.cpp +++ b/xbmc/pvr/windows/GUIWindowPVRBase.cpp @@ -61,7 +61,7 @@ CGUIWindowPVRBase::~CGUIWindowPVRBase(void) void CGUIWindowPVRBase::Notify(const Observable &obs, const ObservableMessage msg) { - CGUIMessage m(GUI_MSG_REFRESH_LIST, GetID(), msg); + CGUIMessage m(GUI_MSG_REFRESH_LIST, GetID(), 0, msg); CApplicationMessenger::Get().SendGUIMessage(m); } @@ -131,6 +131,14 @@ bool CGUIWindowPVRBase::OnMessage(CGUIMessage& message) return CGUIMediaWindow::OnMessage(message); } +void CGUIWindowPVRBase::SetInvalid() +{ + VECFILEITEMS items = m_vecItems->GetList(); + for (VECFILEITEMS::iterator it = items.begin(); it != items.end(); ++it) + (*it)->SetInvalid(); + CGUIMediaWindow::SetInvalid(); +} + bool CGUIWindowPVRBase::OpenGroupSelectionDialog(void) { CGUIDialogSelect *dialog = (CGUIDialogSelect*)g_windowManager.GetWindow(WINDOW_DIALOG_SELECT); @@ -179,7 +187,7 @@ void CGUIWindowPVRBase::SetGroup(CPVRChannelGroupPtr group) // we need to register the window to receive changes from the new group m_group->RegisterObserver(this); g_PVRManager.SetPlayingGroup(m_group); - Update(); + Refresh(); } } @@ -519,7 +527,7 @@ bool CGUIWindowPVRBase::ActionDeleteChannel(CFileItem *item) return false; g_PVRChannelGroups->GetGroupAll(channel->IsRadio())->RemoveFromGroup(*channel); - Update(); + Refresh(true); return true; } diff --git a/xbmc/pvr/windows/GUIWindowPVRBase.h b/xbmc/pvr/windows/GUIWindowPVRBase.h index 7cc02a88e4..4d603d97e7 100644 --- a/xbmc/pvr/windows/GUIWindowPVRBase.h +++ b/xbmc/pvr/windows/GUIWindowPVRBase.h @@ -52,13 +52,14 @@ namespace PVR public: virtual void OnInitWindow(void); virtual bool OnMessage(CGUIMessage& message); - virtual bool Update(const std::string &strDirectory = "", bool updateFilterPath = true); + virtual bool Update(const std::string &strDirectory, bool updateFilterPath = true); virtual void UpdateButtons(void); virtual bool OnAction(const CAction &action); virtual bool OnBack(int actionID); virtual bool OpenGroupSelectionDialog(void); virtual void ResetObservers(void) {}; virtual void Notify(const Observable &obs, const ObservableMessage msg); + virtual void SetInvalid(); protected: CGUIWindowPVRBase(bool bRadio, int id, const std::string &xmlFile); diff --git a/xbmc/pvr/windows/GUIWindowPVRChannels.cpp b/xbmc/pvr/windows/GUIWindowPVRChannels.cpp index 338dd685ca..72f19cd197 100644 --- a/xbmc/pvr/windows/GUIWindowPVRChannels.cpp +++ b/xbmc/pvr/windows/GUIWindowPVRChannels.cpp @@ -144,7 +144,7 @@ bool CGUIWindowPVRChannels::Update(const std::string &strDirectory, bool updateF /* show the visible channels instead */ m_bShowHiddenChannels = false; lock.Leave(); - Update(); + Refresh(true); } return bReturn; @@ -228,7 +228,7 @@ bool CGUIWindowPVRChannels::OnMessage(CGUIMessage& message) case ObservableMessageChannelGroupReset: { if (IsActive()) - Update(); + Refresh(true); bReturn = true; break; } @@ -289,7 +289,7 @@ bool CGUIWindowPVRChannels::OnContextButtonHide(CFileItem *item, CONTEXT_BUTTON return bReturn; g_PVRManager.GetPlayingGroup(m_bRadio)->RemoveFromGroup(*channel); - Update(); + Refresh(true); bReturn = true; } @@ -312,7 +312,7 @@ bool CGUIWindowPVRChannels::OnContextButtonLock(CFileItem *item, CONTEXT_BUTTON return bReturn; group->ToggleChannelLocked(*item); - Update(); + Refresh(true); bReturn = true; } @@ -351,7 +351,7 @@ bool CGUIWindowPVRChannels::OnContextButtonMove(CFileItem *item, CONTEXT_BUTTON if (newIndex != channel->ChannelNumber()) { g_PVRManager.GetPlayingGroup()->MoveChannel(channel->ChannelNumber(), newIndex); - Update(); + Refresh(true); } bReturn = true; @@ -434,7 +434,7 @@ bool CGUIWindowPVRChannels::OnContextButtonSetThumb(CFileItem *item, CONTEXT_BUT channelPtr->SetIconPath(strThumb, true); channelPtr->Persist(); - Update(); + Refresh(true); } bReturn = true; @@ -450,7 +450,7 @@ bool CGUIWindowPVRChannels::OnContextButtonShowHidden(CFileItem *item, CONTEXT_B if (button == CONTEXT_BUTTON_SHOW_HIDDEN) { m_bShowHiddenChannels = !m_bShowHiddenChannels; - Update(); + Refresh(true); bReturn = true; } diff --git a/xbmc/pvr/windows/GUIWindowPVRChannels.h b/xbmc/pvr/windows/GUIWindowPVRChannels.h index 49b0bac001..4b2d275017 100644 --- a/xbmc/pvr/windows/GUIWindowPVRChannels.h +++ b/xbmc/pvr/windows/GUIWindowPVRChannels.h @@ -33,7 +33,7 @@ namespace PVR bool OnMessage(CGUIMessage& message); void GetContextButtons(int itemNumber, CContextButtons &buttons); bool OnContextButton(int itemNumber, CONTEXT_BUTTON button); - bool Update(const std::string &strDirectory = "", bool updateFilterPath = true); + bool Update(const std::string &strDirectory, bool updateFilterPath = true); void UpdateButtons(void); void ResetObservers(void); void UnregisterObservers(void); diff --git a/xbmc/pvr/windows/GUIWindowPVRGuide.cpp b/xbmc/pvr/windows/GUIWindowPVRGuide.cpp index 35e1dfd449..f28eeba828 100644 --- a/xbmc/pvr/windows/GUIWindowPVRGuide.cpp +++ b/xbmc/pvr/windows/GUIWindowPVRGuide.cpp @@ -187,7 +187,7 @@ bool CGUIWindowPVRGuide::OnMessage(CGUIMessage& message) { // let's set the view mode first before update CGUIWindowPVRBase::OnMessage(message); - Update(); + Refresh(true); bReturn = true; } break; @@ -202,7 +202,7 @@ bool CGUIWindowPVRGuide::OnMessage(CGUIMessage& message) m_bUpdateRequired = true; /* update the current window if the EPG timeline view is visible */ if (IsActive() && m_viewControl.GetCurrentControl() == GUIDE_VIEW_TIMELINE) - Update(); + Refresh(true); bReturn = true; break; } @@ -337,9 +337,6 @@ void CGUIWindowPVRGuide::UpdateViewTimeline() SET_CONTROL_LABEL(CONTROL_LABEL_HEADER1, g_localizeStrings.Get(19032)); SET_CONTROL_LABEL(CONTROL_LABEL_HEADER2, GetGroup()->GroupName()); -// FIXPVR -// if (bUpdateSelectedFile) -// SelectPlayingFile(); m_viewControl.SetItems(*m_vecItems); } diff --git a/xbmc/pvr/windows/GUIWindowPVRGuide.h b/xbmc/pvr/windows/GUIWindowPVRGuide.h index bc2df7e2bd..9777905684 100644 --- a/xbmc/pvr/windows/GUIWindowPVRGuide.h +++ b/xbmc/pvr/windows/GUIWindowPVRGuide.h @@ -39,7 +39,7 @@ namespace PVR bool OnAction(const CAction &action); void GetContextButtons(int itemNumber, CContextButtons &buttons); bool OnContextButton(int itemNumber, CONTEXT_BUTTON button); - bool Update(const std::string &strDirectory = "", bool updateFilterPath = true); + bool Update(const std::string &strDirectory, bool updateFilterPath = true); void ResetObservers(void); void UnregisterObservers(void); diff --git a/xbmc/pvr/windows/GUIWindowPVRRecordings.cpp b/xbmc/pvr/windows/GUIWindowPVRRecordings.cpp index d372ece9c2..4f273c87fd 100644 --- a/xbmc/pvr/windows/GUIWindowPVRRecordings.cpp +++ b/xbmc/pvr/windows/GUIWindowPVRRecordings.cpp @@ -243,7 +243,7 @@ bool CGUIWindowPVRRecordings::OnMessage(CGUIMessage &message) case ObservableMessageTimersReset: { if (IsActive()) - Update(); + Refresh(true); bReturn = true; break; } @@ -299,7 +299,7 @@ bool CGUIWindowPVRRecordings::OnContextButtonRename(CFileItem *item, CONTEXT_BUT if (CGUIKeyboardFactory::ShowAndGetInput(strNewName, g_localizeStrings.Get(19041), false)) { if (g_PVRRecordings->RenameRecording(*item, strNewName)) - Update(); + Refresh(true); } } @@ -318,7 +318,7 @@ bool CGUIWindowPVRRecordings::OnContextButtonMarkWatched(const CFileItemPtr &ite g_PVRRecordings->SetRecordingsPlayCount(item, 1); m_viewControl.SetSelectedItem(newSelection); - Update(); + Refresh(true); } if (button == CONTEXT_BUTTON_MARK_UNWATCHED) @@ -327,7 +327,7 @@ bool CGUIWindowPVRRecordings::OnContextButtonMarkWatched(const CFileItemPtr &ite g_PVRRecordings->SetRecordingsPlayCount(item, 0); - Update(); + Refresh(true); } return bReturn; diff --git a/xbmc/pvr/windows/GUIWindowPVRRecordings.h b/xbmc/pvr/windows/GUIWindowPVRRecordings.h index 577138e31c..0e74ca9195 100644 --- a/xbmc/pvr/windows/GUIWindowPVRRecordings.h +++ b/xbmc/pvr/windows/GUIWindowPVRRecordings.h @@ -38,7 +38,7 @@ namespace PVR bool OnAction(const CAction &action); void GetContextButtons(int itemNumber, CContextButtons &buttons); bool OnContextButton(int itemNumber, CONTEXT_BUTTON button); - bool Update(const std::string &strDirectory = "", bool updateFilterPath = true); + bool Update(const std::string &strDirectory, bool updateFilterPath = true); void UnregisterObservers(void); void ResetObservers(void); diff --git a/xbmc/pvr/windows/GUIWindowPVRSearch.cpp b/xbmc/pvr/windows/GUIWindowPVRSearch.cpp index ec52e9e430..6c2c4433d5 100644 --- a/xbmc/pvr/windows/GUIWindowPVRSearch.cpp +++ b/xbmc/pvr/windows/GUIWindowPVRSearch.cpp @@ -187,7 +187,7 @@ bool CGUIWindowPVRSearch::OnContextButtonClear(CFileItem *item, CONTEXT_BUTTON b m_bSearchConfirmed = false; m_searchfilter.Reset(); - Update(); + Refresh(true); } return bReturn; @@ -270,6 +270,6 @@ void CGUIWindowPVRSearch::ShowSearchResults() if (pDlgInfo->IsConfirmed()) { m_bSearchConfirmed = true; - Update(); + Refresh(true); } } diff --git a/xbmc/pvr/windows/GUIWindowPVRSearch.h b/xbmc/pvr/windows/GUIWindowPVRSearch.h index 0fd1764009..b10ad65592 100644 --- a/xbmc/pvr/windows/GUIWindowPVRSearch.h +++ b/xbmc/pvr/windows/GUIWindowPVRSearch.h @@ -34,7 +34,7 @@ namespace PVR bool OnMessage(CGUIMessage& message); void GetContextButtons(int itemNumber, CContextButtons &buttons); bool OnContextButton(int itemNumber, CONTEXT_BUTTON button); - bool Update(const std::string &strDirectory = "", bool updateFilterPath = true); + bool Update(const std::string &strDirectory, bool updateFilterPath = true); private: void Search(void); diff --git a/xbmc/pvr/windows/GUIWindowPVRTimers.cpp b/xbmc/pvr/windows/GUIWindowPVRTimers.cpp index 2d708de575..8b76cd6182 100644 --- a/xbmc/pvr/windows/GUIWindowPVRTimers.cpp +++ b/xbmc/pvr/windows/GUIWindowPVRTimers.cpp @@ -143,7 +143,7 @@ bool CGUIWindowPVRTimers::OnMessage(CGUIMessage &message) case ObservableMessageTimersReset: { if (IsActive()) - Update(); + Refresh(true); bReturn = true; break; } diff --git a/xbmc/pvr/windows/GUIWindowPVRTimers.h b/xbmc/pvr/windows/GUIWindowPVRTimers.h index 6ebbfeee76..6cadedff79 100644 --- a/xbmc/pvr/windows/GUIWindowPVRTimers.h +++ b/xbmc/pvr/windows/GUIWindowPVRTimers.h @@ -33,7 +33,7 @@ namespace PVR bool OnMessage(CGUIMessage& message); void GetContextButtons(int itemNumber, CContextButtons &buttons); bool OnContextButton(int itemNumber, CONTEXT_BUTTON button); - bool Update(const std::string &strDirectory = "", bool updateFilterPath = true); + bool Update(const std::string &strDirectory, bool updateFilterPath = true); void UnregisterObservers(void); void ResetObservers(void); diff --git a/xbmc/utils/StringUtils.cpp b/xbmc/utils/StringUtils.cpp index 0cc474dab4..b01db4f631 100644 --- a/xbmc/utils/StringUtils.cpp +++ b/xbmc/utils/StringUtils.cpp @@ -443,11 +443,11 @@ std::string& StringUtils::Trim(std::string &str, const char* const chars) return TrimRight(str, chars); } -// hack to ensure that std::string::iterator will be dereferenced as _unsigned_ char -// without this hack "TrimX" functions failed on Win32 with UTF-8 strings +// hack to check only first byte of UTF-8 character +// without this hack "TrimX" functions failed on Win32 and OS X with UTF-8 strings static int isspace_c(char c) { - return ::isspace((unsigned char)c); + return (c & 0x80) == 0 && ::isspace(c); } std::string& StringUtils::TrimLeft(std::string &str) |