Merge remote-tracking branch 'origin/master' into Eden

addons/repository.xbmc.org/addon.xml

@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="repository.xbmc.org"
 		name="XBMC.org Add-ons"
-		version="2.0.1"
+		version="2.0.3"
 		provider-name="Team XBMC">
+  <requires>
+    <import addon="xbmc.addon" version="11.0"/>
+  </requires>
 	<extension point="xbmc.addon.repository"
 		name="Official XBMC.org Add-on Repository">
-		<info compressed="true">http://mirrors.xbmc.org/addons/eden-pre/addons.xml</info>
-		<checksum>http://mirrors.xbmc.org/addons/eden-pre/addons.xml.md5</checksum>
-		<datadir zip="true">http://mirrors.xbmc.org/addons/eden-pre</datadir>
+		<info compressed="true">http://mirrors.xbmc.org/addons/eden/addons.xml</info>
+		<checksum>http://mirrors.xbmc.org/addons/eden/addons.xml.md5</checksum>
+		<datadir zip="true">http://mirrors.xbmc.org/addons/eden</datadir>
 		<hashes>true</hashes>
 	</extension>
 	<extension point="xbmc.addon.metadata">

addons/skin.confluence/language/Korean/strings.xml

@@ -108,7 +108,7 @@
   <string id="31300">현재 온도</string>
   <string id="31301">마지막 업데이트</string>
   <string id="31302">메뉴</string>
-  <string id="31303"></string>
+  <string id="31303">날씨 정보 제공</string>
   <string id="31304">사진</string>
   <string id="31305">디스크 미디어 감지되지 않음</string>
   <string id="31306">꺼내기</string>

addons/weather.wunderground/addon.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="weather.wunderground" name="Weather Underground" version="0.0.4" provider-name="Team XBMC">
+<addon id="weather.wunderground" name="Weather Underground" version="0.0.5" provider-name="Team XBMC">
 	<requires>
 		<import addon="xbmc.python" version="2.0"/>
 		<import addon="script.module.simplejson" version="2.0.10"/>

addons/weather.wunderground/changelog.txt

@@ -1,3 +1,8 @@
+v0.0.5
+- add geoip support
+- fetch 7 day forecast
+- workaround: when user switches weather addon, xbmc may call the script with a location id that has not been setup. try to fallback to id 1 in this case.
+
 v0.0.4
 - don't fetch weather when no locations are set up
 - fix incrementing values on each weather refresh when no locations are set up

addons/weather.wunderground/default.py

@@ -28,8 +28,10 @@
 
 LOCATION_URL    = 'http://autocomplete.wunderground.com/aq?query=%s&format=JSON'
 WEATHER_URL     = 'http://api.wunderground.com/api/%s/conditions/forecast7day/hourly%s.json'
+GEOIP_URL       = 'http://api.wunderground.com/api/%s/geolookup/q/autoip.json'
 A_I_K           = 'NDEzNjBkMjFkZjFhMzczNg=='
 WEATHER_WINDOW  = xbmcgui.Window(12600)
+MAXDAYS         = 6
 
 socket.setdefaulttimeout(10)
 
@@ -82,6 +84,16 @@ def location(string):
         locid.append(locationid)
     return loc, locid
 
+def geoip():
+    data = fetch(GEOIP_URL % aik[::-1])
+    if data != '' and data.has_key('location'):
+        location = data['location']['l']
+        __addon__.setSetting('Location1', data['location']['city'])
+        __addon__.setSetting('Location1id', location)
+    else:
+        location = ''
+    return location
+
 def forecast(city):
     data = fetch(WEATHER_URL % (aik[::-1], city))
     if data != '':
@@ -108,7 +120,7 @@ def properties(query):
         set_property('Day%i.Outlook'     % count, item['conditions'])
         set_property('Day%i.OutlookIcon' % count, '%s.png' % weathercode)
         set_property('Day%i.FanartCode'  % count, weathercode)
-        if count == 3:
+        if count == MAXDAYS:
             break
 
 if sys.argv[1].startswith('Location'):
@@ -129,9 +141,12 @@ def properties(query):
 else:
     location = __addon__.getSetting('Location%sid' % sys.argv[1])
     aik = base64.b64decode(A_I_K)
+    if (location == '') and (sys.argv[1] != '1'):
+        location = __addon__.getSetting('Location1id')
+    if location == '':
+        location = geoip()
     if not location == '':
         forecast(location)
-        refresh_locations()
     else:
         # workaround to fix incrementing values on each weather refresh when no locations are set up:
         set_property('Current.Condition'     , 'N/A')
@@ -144,14 +159,13 @@ def properties(query):
         set_property('Current.DewPoint'      , '0')
         set_property('Current.OutlookIcon'   , 'na.png')
         set_property('Current.FanartCode'    , 'na')
-        for count in range (0, 3):
+        for count in range (0, MAXDAYS):
             set_property('Day%i.Title'       % count, 'N/A')
             set_property('Day%i.HighTemp'    % count, '0')
             set_property('Day%i.LowTemp'     % count, '0')
             set_property('Day%i.Outlook'     % count, 'N/A')
             set_property('Day%i.OutlookIcon' % count, 'na.png')
             set_property('Day%i.FanartCode'  % count, 'na')
-        # workaround to stop xbmc from running the script in a loop when no locations are set up:
-        set_property('Locations', '1')
 
+refresh_locations()
 set_property('WeatherProvider', 'Weather Underground')

addons/weather.wunderground/resources/language/Dutch/strings.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<strings>
+	<string id="30101">Plaatsen Instellen</string>
+	<string id="30111">Wijzig plaats 1</string>
+	<string id="30112">Wijzig plaats 2</string>
+	<string id="30113">Wijzig plaats 3</string>
+</strings>

addons/webinterface.default/addon.xml

@@ -6,7 +6,7 @@
   provider-name="Team XBMC">
   <requires>
     <import addon="xbmc.gui" version="3.00"/>
-    <import addon="xbmc.json" version="2.00"/>
+    <import addon="xbmc.json" version="4.00"/>
   </requires>
   <extension
     point="xbmc.gui.webinterface"/>

addons/xbmc.addon/addon.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<addon id="xbmc.addon" version="1.0" provider-name="Team XBMC">
+<addon id="xbmc.addon" version="11.0" provider-name="Team XBMC">
   <requires>
     <import addon="xbmc.core" version="0.1"/>
   </requires>

addons/xbmc.gui/addon.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon id="xbmc.gui" version="3.00" provider-name="Team XBMC">
-  <backwards-compatibility abi="2.1"/>
   <requires>
     <import addon="xbmc.core" version="0.1"/>
   </requires>

addons/xbmc.json/addon.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<addon id="xbmc.json" version="2.0" provider-name="Team XBMC">
+<addon id="xbmc.json" version="4.0" provider-name="Team XBMC">
   <requires>
     <import addon="xbmc.core" version="0.1"/>
   </requires>

language/Chinese (Simple)/strings.xml

@@ -1768,7 +1768,7 @@
   <string id="20326">这个操作会重新校准%s的配置</string>
   <string id="20327">还原为初时配置</string>
   <string id="20328">选择指定位置</string>
-
+  <string id="20329">电影在以片名命名的单独目录中</string>
   <string id="20330">以文件夹名来查找</string>
   <string id="20331">文件</string>
   <string id="20332">用文件夹名或文件名进行查找？</string>
@@ -1858,7 +1858,7 @@
   <string id="20416">最初发表</string>
   <string id="20417">编剧</string>
   <string id="20418"></string>
-  <string id="20419">文件视图显示媒体标识信息</string>
+  <string id="20419">用资料库标题替换文件名</string>
 
   <string id="20420">从不</string>
   <string id="20421">如果只有一季</string>
@@ -1898,6 +1898,7 @@
   <string id="20455">听众</string>
   <string id="20456">设置影片集同人画</string>
   <string id="20457">影片集</string>
+  <string id="20458">电影按影片集分组</string>
   <!-- up to 21329 is reserved for the video db !! !-->
 
   <string id="21330">显示隐藏文件和目录</string>
@@ -2005,6 +2006,8 @@
   <string id="21451">需要访问互联网。</string>
   <string id="21452">获取更多...</string>
   <string id="21453">根文件系统</string>
+  <string id="21454">缓存满</string>
+  <string id="21455">缓存在达到连续播放所需数量之前已满</string>
 
   <string id="21460">字幕位置</string>
   <string id="21461">固定</string>
@@ -2325,6 +2328,8 @@
   <string id="33102">事件服务器</string>
   <string id="33103">远程通信服务器</string>
 
+  <string id="33200">检测到新的连接</string>
+
   <!-- translators: no need to add these to your language files -->
   <string id="34000">Lame</string>
   <string id="34001">Vorbis</string>
@@ -2349,6 +2354,14 @@
   <string id="34201">未找到下一播放项目</string>
   <string id="34202">未找到上一播放项目</string>
 
+  <string id="34300">启动 zeroconf 失败</string>
+  <string id="34301">Apple 的 Bonjour 服务是否已安装？更多信息见日志记录。</string>
+
+  <string id="34400">视频渲染</string>
+  <string id="34401">视频滤镜/缩放器初始化失败，使用双线性缩放</string>
+  <string id="34402">音频设备初始化失败</string>
+  <string id="34403">检查你的音频设置</string>
+
   <string id="35000">外部设备</string>
 
   <string id="35001">通用 HID 设备</string>

language/Dutch/strings.xml

@@ -877,8 +877,11 @@
   <string id="10020">Scripts</string>
   <string id="10021">Webbrowser</string>
 
+  <string id="10025">Video's</string>
   <string id="10028">Video/Afspeellijst</string>
+  <string id="10029">Aanmeld scherm</string>
   <string id="10034">Instellingen - Profielen</string>
+  <string id="10040">Addon verkenner</string>
 
   <string id="10100">Ja/Nee</string>
   <string id="10101">Voortgang</string>
@@ -1648,10 +1651,10 @@
   <string id="20109">- Verschalen </string>
   <string id="20110">UPnP-client</string>
   <string id="20111">Automatisch starten</string>
-  <string id="20112">Vorige login: %s</string>
+  <string id="20112">Vorige aanmelding: %s</string>
   <string id="20113">Nog nooit ingelogd</string>
   <string id="20114">Profiel %i / %i</string>
-  <string id="20115">Gebruikerslogin / Selecteer een profiel</string>
+  <string id="20115">Gebruikersaanmelding / Selecteer een profiel</string>
   <string id="20116">Inlogscherm vergrendelen</string>
   <string id="20117">Ongeldige vergrendelcode.</string>
   <string id="20118">Dit vereist een actieve hoofdvergrendeling.</string>
@@ -1742,7 +1745,7 @@
   <string id="20252">Glazen vullen (video's)</string>
   <string id="20253">WebDAV-server (HTTP)</string>
   <string id="20254">WebDAV-server (HTTPS)</string>
-  <string id="20255">Eerste login, profiel bijwerken</string>
+  <string id="20255">Eerste aanmelding, profiel bijwerken</string>
   <string id="20256">HTS tvheadend client</string>
   <string id="20257">VDR streamdev client</string>
   <string id="20258">MythTV client</string>
@@ -1772,7 +1775,7 @@
   <string id="20326">Dit zet de kalibratiewaarden voor %s</string>
   <string id="20327">terug naar de standaardwaarden.</string>
   <string id="20328">een locatie om naar te kopiëren</string>
-
+  <string id="20329">Films staan in aparte folders die overeenkomen met de film titel</string>
   <string id="20330">Gebruik mapnamen bij zoeken</string>
   <string id="20331">Bestand</string>
   <string id="20332">Ook in bestands- of mapnamen zoeken?</string>
@@ -1862,7 +1865,7 @@
   <string id="20416">Eerst uitgez.</string>
   <string id="20417">Schrijver</string>
   <string id="20418"></string>
-  <string id="20419">Laat metadata zien in bestandslayout</string>
+  <string id="20419">Vervang bestandsnamen met bibliotheek titels</string>
 
   <string id="20420">Nooit</string>
   <string id="20421">Alleen indien &#xe9;&#xe9;n seizoen</string>
@@ -1902,6 +1905,7 @@
   <string id="20455">Luisteraars</string>
   <string id="20456">Kies filmset fanart</string>
   <string id="20457">Filmsets</string>
+  <string id="20458">Groepeer films in sets</string>
   <!-- up to 21329 is reserved for the video db !! !-->
 
   <string id="21330">Verborgen bestanden en mappen weergeven</string>
@@ -1971,7 +1975,7 @@
   <string id="21414">Standaard tv-serie scraper</string>
   <string id="21415">Standaard muziekvideo scraper</string>
   <string id="21416">Alternatieven toestaan op basis van originele scraper taal</string>
-  <string id="21417">- Instellingen schermbeveiliging</string>
+  <string id="21417">- Instellingen</string>
   <string id="21418">Meertalig</string>
   <string id="21419">Geen scrapers beschikbaar</string>
   <string id="21420">Waarde gelijk aan</string>
@@ -2009,6 +2013,9 @@
   <string id="21452">Add-ons installeren</string>
   <string id="21453">Rootbestandsysteem</string>
 
+  <string id="21454">Cache is vol</string>
+  <string id="21455">Cache is vol voordat benodigde hoeveelheid is bereikt voor continu afspelen</string>
+
   <string id="21460">Plaats van de ondertitels</string>
   <string id="21461">Vast</string>
   <string id="21462">Onderaan video</string>
@@ -2326,6 +2333,8 @@
   <string id="33102">Event Server</string>
   <string id="33103">Remote communication server</string>
 
+  <string id="33200">Detecteer nieuwe verbinding</string>
+
   <!-- translators: no need to add these to your language files -->
   <string id="34000">Lame</string>
   <string id="34001">Vorbis</string>
@@ -2349,7 +2358,15 @@
 
   <string id="34201">Kan volgende item niet vinden om af te spelen</string>
   <string id="34202">Kan vorige item niet vinden om af te spelen</string>
-
+
+  <string id="34300">Niet gelukt om zeroconf te starten</string>
+  <string id="34301">Is Apple's Bonjour Service geinstalleerd? Zie log voor meer info.</string>
+  <string id="34400">Video Rendering</string>
+  <string id="34401">Niet gelukt om video filters/scalers initialiseren, terugvallen naar bilinear scaling</string>
+  <string id="34402"></string>
+  <string id="34402">Niet gelukt om audio apparaat te initialiseren</string>
+  <string id="34403">Controleer je audio-instellingen</string>
+
   <string id="35000">Randapparatuur</string>
 
   <string id="35001">Generiek HID apparaat</string>
@@ -2386,4 +2403,4 @@
   <string id="36016">Verbonden</string> <!-- max. 13 characters -->
   <string id="36017">Adapter gevonden, maar libcec is niet beschikbaar</string>
   <string id="36018">Gebruik de taalinstelling van de TV</string>
-</strings>
+</strings>

language/English/strings.xml

@@ -874,9 +874,11 @@
   <string id="10019">Settings - Appearance</string>
   <string id="10020">Scripts</string>
   <string id="10021">Web Browser</string>
-
+  <string id="10025">Videos</string>
   <string id="10028">Videos/Playlist</string>
+  <string id="10029">Login screen</string>
   <string id="10034">Settings - Profiles</string>
+  <string id="10040">Addon browser</string>
 
   <string id="10100">Yes/No dialog</string>
   <string id="10101">Progress dialog</string>