sync in-trunk scrapers with scrapers-git

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@30476 568bbfeb-2a22-0410-94d2-cc84cf5bfa90

13 files changed, 66 insertions, 46 deletions

diff --git a/addons/metadata.allmusic.com/allmusic.xml b/addons/metadata.allmusic.com/allmusic.xml
index 316779a537..aca6c1c0f9 100644
--- a/addons/metadata.allmusic.com/allmusic.xml
+++ b/addons/metadata.allmusic.com/allmusic.xml
@@ -1,34 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <scraper framework="1.1" date="2009-09-30" language="en">
-	<GetSettings dest="3">
-		<RegExp input="$$5" output="&lt;settings&gt;\1&lt;/settings&gt;" dest="3">
-			<RegExp input="$$1" output="&lt;setting label=&quot;Enable Fanart&quot; type=&quot;bool&quot; id=&quot;htbfanart&quot; default=&quot;true&quot;&gt;&lt;/setting&gt;" dest="5+">
-				<expression/>
-			</RegExp>
-			<RegExp input="$$1" output="&lt;setting label=&quot;Grab artist thumbs from Allmusic.com&quot; type=&quot;bool&quot; id=&quot;allmusicartistthumbs&quot; default=&quot;true&quot;&gt;&lt;/setting&gt;" dest="5+">
- 				<expression></expression>
- 			</RegExp>
-			<RegExp input="$$1" output="&lt;setting label=&quot;Grab album thumbs from Allmusic.com&quot; type=&quot;bool&quot; id=&quot;allmusicalbumthumbs&quot; default=&quot;true&quot;&gt;&lt;/setting&gt;" dest="5+">
-				<expression></expression>
-			</RegExp>
-			<RegExp input="$$1" output="&lt;setting label=&quot;Grab artist thumbs from Last.fm&quot; type=&quot;bool&quot; id=&quot;lastfmartistthumbs&quot; default=&quot;false&quot;&gt;&lt;/setting&gt;" dest="5+">
-				<expression></expression>
-			</RegExp>
-			<RegExp input="$$1" output="&lt;setting label=&quot;Grab album thumbs from Last.fm&quot; type=&quot;bool&quot; id=&quot;lastfmalbumthumbs&quot; default=&quot;false&quot;&gt;&lt;/setting&gt;" dest="5+">
-				<expression></expression>
-			</RegExp>
-<!--			<RegExp input="$$1" output="&lt;setting label=&quot;Grab artist thumbs from Discogs&quot; type=&quot;bool&quot; id=&quot;discogsartistthumbs&quot; default=&quot;false&quot;&gt;&lt;/setting&gt;" dest="5+">
-				<expression></expression>
-			</RegExp>
-			<RegExp input="$$1" output="&lt;setting label=&quot;Grab album thumbs from Discogs&quot; type=&quot;bool&quot; id=&quot;discogsalbumthumbs&quot; default=&quot;false&quot;&gt;&lt;/setting&gt;" dest="5+">
-				<expression></expression>
-			</RegExp> -->
-			<RegExp input="$$1" output="&lt;setting label=&quot;Grab artist thumbs from HTBackdrops&quot; type=&quot;bool&quot; id=&quot;htbthumbs&quot; default=&quot;true&quot;&gt;&lt;/setting&gt;" dest="5+">
-				<expression></expression>
-			</RegExp>
-			<expression noclean="1"/>
-		</RegExp>
-	</GetSettings>
 	<NfoUrl dest="3">
 		<RegExp input="$$1" output="http://www.\1" dest="3">
 			<expression>(allmusic.com/cg/.*)</expression>
diff --git a/addons/metadata.allmusic.com/resources/language/English/strings.xml b/addons/metadata.allmusic.com/resources/language/English/strings.xml
new file mode 100644
index 0000000000..0ccf546c3a
--- /dev/null
+++ b/addons/metadata.allmusic.com/resources/language/English/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<strings>
+    <string id="30000">Enable Fanart</string>
+    <string id="30001">Grab artist thumbs from Allmusic.com</string>
+    <string id="30002">Grab album thumbs from Allmusic.com</string>
+    <string id="30003">Grab artist thumbs from Last.fm</string>
+    <string id="30004">Grab album thumbs from Last.fm</string>
+    <string id="30005">Grab artist thumbs from HTBackdrops</string>
+</strings>
diff --git a/addons/metadata.allmusic.com/resources/language/Korean/strings.xml b/addons/metadata.allmusic.com/resources/language/Korean/strings.xml
new file mode 100644
index 0000000000..d7417bb5e5
--- /dev/null
+++ b/addons/metadata.allmusic.com/resources/language/Korean/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<strings>
+    <string id="30000">팬아트 가져오기</string>
+    <string id="30001">Allmusic.com 에서 음악가 사진 가져오기</string>
+    <string id="30002">Allmusic.com 에서 앨범 사진 가져오기</string>
+    <string id="30003">Last.fm 에서 음악가 사진 가져오기</string>
+    <string id="30004">Last.fm 에서 앨범 사진 가져오기</string>
+    <string id="30005">HTBackdrops 에서 음악가 사진 가져오기</string>
+</strings>
diff --git a/addons/metadata.allmusic.com/resources/settings.xml b/addons/metadata.allmusic.com/resources/settings.xml
new file mode 100644
index 0000000000..d79e4ad3b3
--- /dev/null
+++ b/addons/metadata.allmusic.com/resources/settings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<settings>
+    <setting label="30000" type="bool" id="htbfanart" default="true"/>
+    <setting label="30001" type="bool" id="allmusicartistthumbs" default="true"/>
+    <setting label="30002" type="bool" id="allmusicalbumthumbs" default="true"/>
+    <setting label="30003" type="bool" id="lastfmartistthumbs" default="false"/>
+    <setting label="30004" type="bool" id="lastfmalbumthumbs" default="false"/>
+    <setting label="30005" type="bool" id="htbthumbs" default="true"/>
+</settings>
diff --git a/addons/metadata.themoviedb.org/resources/language/English/strings.xml b/addons/metadata.themoviedb.org/resources/language/English/strings.xml
new file mode 100644
index 0000000000..5d297d209e
--- /dev/null
+++ b/addons/metadata.themoviedb.org/resources/language/English/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<strings>
+    <string id="30000">Enable Fanart</string>
+    <string id="30001">Enable Trailers from Dtrailer.com</string>
+</strings>
diff --git a/addons/metadata.themoviedb.org/resources/language/Korean/strings.xml b/addons/metadata.themoviedb.org/resources/language/Korean/strings.xml
new file mode 100644
index 0000000000..e373a110cc
--- /dev/null
+++ b/addons/metadata.themoviedb.org/resources/language/Korean/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<strings>
+    <string id="30000">팬아트 사용</string>
+    <string id="30001">Dtrailer.com 에서 예고편 가져오기</string>
+</strings>
diff --git a/addons/metadata.themoviedb.org/resources/settings.xml b/addons/metadata.themoviedb.org/resources/settings.xml
new file mode 100644
index 0000000000..f0146c6730
--- /dev/null
+++ b/addons/metadata.themoviedb.org/resources/settings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<settings>
+    <setting label="30000" type="bool" id="fanart" default="true"/>
+    <setting label="30001" type="bool" id="dtrailer" default="false"/>
+</settings>
diff --git a/addons/metadata.themoviedb.org/tmdb.xml b/addons/metadata.themoviedb.org/tmdb.xml
index 1070cd7723..5439584bbb 100644
--- a/addons/metadata.themoviedb.org/tmdb.xml
+++ b/addons/metadata.themoviedb.org/tmdb.xml
@@ -1,16 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <scraper framework="1.1" date="2010-02-24" language="en">
-	<GetSettings dest="3">
-		<RegExp input="$$5" output="&lt;settings&gt;\1&lt;/settings&gt;" dest="3">
-			<RegExp input="$$1" output="&lt;setting label=&quot;Enable Fanart&quot; type=&quot;bool&quot; id=&quot;fanart&quot; default=&quot;true&quot;&gt;&lt;/setting&gt;" dest="5+">
-				<expression/>
-			</RegExp>
-			<RegExp input="$$1" output="&lt;setting label=&quot;Enable Trailers from Dtrailer.com&quot; type=&quot;bool&quot; id=&quot;dtrailer&quot; default=&quot;false&quot;&gt;&lt;/setting&gt;" dest="5+">
-				<expression/>
-			</RegExp>
-			<expression noclean="1"/>
-		</RegExp>
-	</GetSettings>
 	<CreateSearchUrl dest="3">
 		<RegExp input="$$1" output="&lt;url&gt;http://api.themoviedb.org/2.1/Movie.search/en/xml/57983e31fb435df4df77afb854740ea9/\1&lt;/url&gt;" dest="3">
 			<RegExp input="$$2" output="%20(\1)" dest="4">
diff --git a/addons/metadata.tvdb.com/addon.xml b/addons/metadata.tvdb.com/addon.xml
index c64c059841..9f22463b1e 100644
--- a/addons/metadata.tvdb.com/addon.xml
+++ b/addons/metadata.tvdb.com/addon.xml
@@ -14,6 +14,8 @@
     <summary>TV show scraper</summary>
     <description>TheTVDB.com is a TV Scraper. The site is a massive open database that can be modified by anybody and contains full meta data for many shows in different languages. All content and images on the site have been contributed by their users for users and have a high standard or quality.  The database schema and website are open source under the GPL.</description>
     <description lang="nl">TheTVDB.com is een TV-show Scraper. De site is een gigantische open databank die door iedereen kan aangepast en uitgebreid worden. Het bevat informatie voor vele TV-shows in verschillende talen. Alle inhoud en afbeeldingen zijn bijgedragen door en voor gebruikers met een hoge kwaliteitsnorm. Het databank schema en de website zijn vrijgegeven onder de open source GPL licentie.</description>
-    <content>tvshows</content>
+    <supportedcontent>
+      <content>tvshows</content>
+    </supportedcontent>
   </extension>
 </addon>
diff --git a/addons/metadata.tvdb.com/icon.png b/addons/metadata.tvdb.com/icon.png
index 2ccab58700..5cd0b47b6a 100644
--- a/addons/metadata.tvdb.com/icon.png
+++ b/addons/metadata.tvdb.com/icon.png
diff --git a/addons/metadata.tvdb.com/resources/language/English/strings.xml b/addons/metadata.tvdb.com/resources/language/English/strings.xml
new file mode 100644
index 0000000000..f19baffd2c
--- /dev/null
+++ b/addons/metadata.tvdb.com/resources/language/English/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<strings>
+    <string id="30000">Use DVD Order</string>
+    <string id="30001">Use Absolute Ordering (Single Season)</string>
+    <string id="30002">Enable Fanart</string>
+    <string id="30003">Prefer Posters</string>
+    <string id="30004">Language</string>
+</strings>
diff --git a/addons/metadata.tvdb.com/resources/language/Korean/strings.xml b/addons/metadata.tvdb.com/resources/language/Korean/strings.xml
new file mode 100644
index 0000000000..fd2cee8801
--- /dev/null
+++ b/addons/metadata.tvdb.com/resources/language/Korean/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<strings>
+    <string id="30000">디비디 순서 사용</string>
+    <string id="30001">절대 순서 사용(하나의 시즌)</string>
+    <string id="30002">팬아트 사용</string>
+    <string id="30003">포스트 우선</string>
+    <string id="30004">언어</string>
+</strings>
diff --git a/addons/metadata.tvdb.com/tvdb.xml b/addons/metadata.tvdb.com/tvdb.xml
index 6f986fbe2f..13f37bec5f 100644
--- a/addons/metadata.tvdb.com/tvdb.xml
+++ b/addons/metadata.tvdb.com/tvdb.xml
@@ -6,19 +6,19 @@
 			<RegExp input="$$1" output="&lt;url function=&quot;GetLanguages&quot;&gt;http://www.thetvdb.com/api/1D62F2F90030C444/languages.xml&lt;/url&gt;" dest="5">
 				<expression/>
 			</RegExp>
-			<RegExp input="$$1" output="&lt;setting label=&quot;Use DVD Order&quot; type=&quot;bool&quot; id=&quot;dvdorder&quot; default=&quot;false&quot; enable=&quot;!eq(1,true)&quot;&gt;&lt;/setting&gt;" dest="5+">
+			<RegExp input="$$1" output="&lt;setting label=&quot;30000&quot; type=&quot;bool&quot; id=&quot;dvdorder&quot; default=&quot;false&quot; enable=&quot;!eq(1,true)&quot;&gt;&lt;/setting&gt;" dest="5+">
 				<expression/>
 			</RegExp>
-			<RegExp input="$$1" output="&lt;setting label=&quot;Use Absolute Ordering (Single Season)&quot; type=&quot;bool&quot; id=&quot;absolutenumber&quot; default=&quot;false&quot; enable=&quot;!eq(-1,true)&quot;&gt;&lt;/setting&gt;" dest="5+">
+			<RegExp input="$$1" output="&lt;setting label=&quot;30001&quot; type=&quot;bool&quot; id=&quot;absolutenumber&quot; default=&quot;false&quot; enable=&quot;!eq(-1,true)&quot;&gt;&lt;/setting&gt;" dest="5+">
 				<expression/>
 			</RegExp>
 			<RegExp input="$$1" output="&lt;setting type=&quot;sep&quot;&gt;&lt;/setting&gt;" dest="5+">
 				<expression/>
 			</RegExp>
-			<RegExp input="$$1" output="&lt;setting label=&quot;Enable Fanart&quot; type=&quot;bool&quot; id=&quot;fanart&quot; default=&quot;true&quot;&gt;&lt;/setting&gt;" dest="5+">
+			<RegExp input="$$1" output="&lt;setting label=&quot;30002&quot; type=&quot;bool&quot; id=&quot;fanart&quot; default=&quot;true&quot;&gt;&lt;/setting&gt;" dest="5+">
 				<expression/>
 			</RegExp>
-			<RegExp input="$$1" output="&lt;setting label=&quot;Prefer Posters&quot; type=&quot;bool&quot; id=&quot;posters&quot; default=&quot;false&quot;&gt;&lt;/setting&gt;" dest="5+">
+			<RegExp input="$$1" output="&lt;setting label=&quot;30003&quot; type=&quot;bool&quot; id=&quot;posters&quot; default=&quot;false&quot;&gt;&lt;/setting&gt;" dest="5+">
 				<expression/>
 			</RegExp>
 			<RegExp input="$$1" output="&lt;setting type=&quot;sep&quot;&gt;&lt;/setting&gt;" dest="5+">
@@ -286,7 +286,7 @@
 	</GetEpisodeDetails>
 
 	<GetLanguages dest="3">
-		<RegExp input="$$2" output="&lt;settings&gt;&lt;setting label=&quot;Language&quot; type=&quot;labelenum&quot; id=&quot;language&quot; values=&quot;$$8&quot; sort=&quot;yes&quot; default=&quot;en&quot;&gt;&lt;/setting&gt;&lt;/settings&gt;" dest="3">
+		<RegExp input="$$2" output="&lt;settings&gt;&lt;setting label=&quot;30004&quot; type=&quot;labelenum&quot; id=&quot;language&quot; values=&quot;$$8&quot; sort=&quot;yes&quot; default=&quot;en&quot;&gt;&lt;/setting&gt;&lt;/settings&gt;" dest="3">
 			<RegExp input="$$1" output="\1|" dest="8+">
 				<expression repeat="yes">&lt;abbreviation&gt;([^&lt;]*)&lt;/abbreviation&gt;</expression>
 			</RegExp>