diff options
| author | vdrfan <vdrfan-nospam-@xbmc.org> | 2012-01-16 09:13:55 +0100 |
|---|---|---|
| committer | vdrfan <vdrfan-nospam-@xbmc.org> | 2012-01-16 09:16:16 +0100 |
| commit | bc73e42d9a96208e31da3370b74b5c88bdb4972c (patch) | |
| tree | c7227ad7ff306e317bec717428c81d52ec2e6808 /addons/metadata.themoviedb.org | |
| parent | 7ee989003d35a92a36e15c426cad69b0a8500256 (diff) | |
[metadata.themoviedb.org] changed wording on trailer options and made it conditional - only one trailer source selectable (addresses PR 631)
Diffstat (limited to 'addons/metadata.themoviedb.org')
7 files changed, 16 insertions, 16 deletions
diff --git a/addons/metadata.themoviedb.org/resources/language/English/strings.xml b/addons/metadata.themoviedb.org/resources/language/English/strings.xml index 664a610fc2..7efd3a3b72 100644 --- a/addons/metadata.themoviedb.org/resources/language/English/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/English/strings.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <strings> <string id="30000">Enable Fanart</string> - <string id="30004">Enable Trailer</string> - <string id="30001">Prefer Trailer from HD-Trailers.net</string> + <string id="30004">Enable Trailer (YouTube)</string> + <string id="30001">Enable Trailer (HD-Trailers.net)</string> <string id="30002">Preferred language</string> <string id="30003">Get rating from IMDb</string> <string id="30005">Keep Original Title</string> diff --git a/addons/metadata.themoviedb.org/resources/language/Finnish/strings.xml b/addons/metadata.themoviedb.org/resources/language/Finnish/strings.xml index ab425a5364..2e7122283b 100644 --- a/addons/metadata.themoviedb.org/resources/language/Finnish/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Finnish/strings.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <strings> <string id="30000">Fanitaide käytössä</string> - <string id="30004">Trailerit käytössä</string> - <string id="30001">Valitse ensisijaisesti trailerit HD-Trailers.net -sivustolta</string> + <string id="30004">Trailerit käytössä (YouTube)</string> + <string id="30001">Trailerit käytössä (HD-Trailers.net)</string> <string id="30002">Ensisijainen kieli</string> <string id="30003">Hae arvosana IMDb:stä</string> <string id="30005">Näytä alkuperäinen nimi</string> diff --git a/addons/metadata.themoviedb.org/resources/language/German/strings.xml b/addons/metadata.themoviedb.org/resources/language/German/strings.xml index 091b7cd742..c09cbb48f8 100644 --- a/addons/metadata.themoviedb.org/resources/language/German/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/German/strings.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <strings> <string id="30000">Aktiviere Fanart</string> - <string id="30001">Aktiviere Trailer von HD-Trailers.net</string> + <string id="30001">Aktiviere Trailer (HD-Trailers.net)</string> <string id="30002">Bevorzugte Sprache</string> <string id="30003">Bewertung von IMDb nutzen</string> - <string id="30004">Aktiviere Trailer</string> - <string id="30005">Behalte original Filmtitel bei</string> + <string id="30004">Aktiviere Trailer (YouTube)</string> + <string id="30005">Behalte original Filmtitel bei</string> </strings> diff --git a/addons/metadata.themoviedb.org/resources/language/Hungarian/strings.xml b/addons/metadata.themoviedb.org/resources/language/Hungarian/strings.xml index 8d2eb32aae..aac4afcabb 100644 --- a/addons/metadata.themoviedb.org/resources/language/Hungarian/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Hungarian/strings.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <strings> <string id="30000">Fanartképek engedélyezése</string> - <string id="30004">Filmelőzetesek engedélyezése</string> - <string id="30001">Filmelőzetesek inkább a HD-Trailers.net-ről</string> + <string id="30004">Filmelőzetesek engedélyezése (YouTube)</string> + <string id="30001">Filmelőzetesek engedélyezése (HD-Trailers.net)</string> <string id="30002">Preferált nyelv</string> <string id="30003">Értékelés az IMDb-ről</string> <string id="30005">Eredeti filmcím megtartása</string> diff --git a/addons/metadata.themoviedb.org/resources/language/Swedish/strings.xml b/addons/metadata.themoviedb.org/resources/language/Swedish/strings.xml index 5ad39906ce..4beab0fe34 100644 --- a/addons/metadata.themoviedb.org/resources/language/Swedish/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Swedish/strings.xml @@ -6,9 +6,9 @@ <!--$Revision$--> <strings> <string id="30000">Aktivera fanart</string> - <string id="30001">Aktivera trailers från HD-Trailers.net</string> + <string id="30001">Aktivera trailers (HD-Trailers.net)</string> <string id="30002">Föredraget språk</string> <string id="30003">Hämta betyg från IMDb</string> - <string id="30004">Aktivera trailers</string> + <string id="30004">Aktivera trailers (YouTube)</string> <string id="30005">Behåll originaltitel</string> -</strings>
\ No newline at end of file +</strings> diff --git a/addons/metadata.themoviedb.org/resources/settings.xml b/addons/metadata.themoviedb.org/resources/settings.xml index 4180a3d6f8..db46cdbf55 100644 --- a/addons/metadata.themoviedb.org/resources/settings.xml +++ b/addons/metadata.themoviedb.org/resources/settings.xml @@ -3,7 +3,7 @@ <setting label="30005" type="bool" id="keeporiginaltitle" default="false"/> <setting label="30000" type="bool" id="fanart" default="true"/> <setting label="30004" type="bool" id="trailer" default="true" enable="System.HasAddon(plugin.video.youtube)"/> - <setting label="30001" type="labelenum" values="No|480p|720p|1080p" id="TrailerQ" default="No"/> + <setting label="30001" type="labelenum" values="No|480p|720p|1080p" id="TrailerQ" default="No" enable="eq(-1,false)"/> <setting label="30002" type="labelenum" values="da|fi|nl|de|it|es|fr|pl|hu|el|tr|ru|he|ja|pt|zh|cs|sl|hr|ko|en|sv|no" id="language" default="en"/> <setting label="30003" type="bool" id="imdbrating" default="false"/> </settings> diff --git a/addons/metadata.themoviedb.org/tmdb.xml b/addons/metadata.themoviedb.org/tmdb.xml index baba466877..72b7cf34ea 100644 --- a/addons/metadata.themoviedb.org/tmdb.xml +++ b/addons/metadata.themoviedb.org/tmdb.xml @@ -112,19 +112,19 @@ <RegExp conditional="trailer" input="$$2" output="<chain function="GetTMDBTrailerByIdChain">$$2</chain>" dest="5+"> <expression /> </RegExp> - <RegExp input="$INFO[TrailerQ]" output="<chain function="GetHDTrailersnet480p">$$6</chain>" dest="5+"> + <RegExp conditional="!trailer" input="$INFO[TrailerQ]" output="<chain function="GetHDTrailersnet480p">$$6</chain>" dest="5+"> <RegExp input="$$1" output="\1" dest="6"> <expression noclean="1">"original_name":"([^"]*)</expression> </RegExp> <expression>480p</expression> </RegExp> - <RegExp input="$INFO[TrailerQ]" output="<chain function="GetHDTrailersnet720p">$$6</chain>" dest="5+"> + <RegExp conditional="!trailer" input="$INFO[TrailerQ]" output="<chain function="GetHDTrailersnet720p">$$6</chain>" dest="5+"> <RegExp input="$$1" output="\1" dest="6"> <expression noclean="1">"original_name":"([^"]*)</expression> </RegExp> <expression>720p</expression> </RegExp> - <RegExp input="$INFO[TrailerQ]" output="<chain function="GetHDTrailersnet1080p">$$6</chain>" dest="5+"> + <RegExp conditional="!trailer" input="$INFO[TrailerQ]" output="<chain function="GetHDTrailersnet1080p">$$6</chain>" dest="5+"> <RegExp input="$$1" output="\1" dest="6"> <expression noclean="1">"original_name":"([^"]*)</expression> </RegExp> |