Merge remote branch 'origin/master' into AE

* origin/master: [WIN32] updated ffmpeg dlls [WIN32] fixed build added: identify DTS-HD profiles in audio stream list added: [Confluence] audio codec flagging images for DTS-HD MA/HRA added: dtshd_ma and dtshd_hra identifiers for DTS-HD added: show profile information in codec info when available added: export DTS profile information in ffmpeg Add seekpercentage argument to the PlayerControl built in function. See ticket 11096. Zero sockaddr struct when initializing. Thanks yuvalt updated: ticket xbmc#11093 - icelandic translation. thanks to kristjan cosmetics fixed: apparently cwiid doesn't pull the bluetooth library properly on all distros (ubuntu 11.04 in this case). thus link to it explicitly.
theuni · Jan 22, 2011 · cb5cb11 · cb5cb11
2 parents c5d348b + 9985528
commit cb5cb11
Show file tree

Hide file tree

Showing 37 changed files with 1,465 additions and 155 deletions.
diff --git a/addons/skin.confluence/language/Icelandic/strings.xml b/addons/skin.confluence/language/Icelandic/strings.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Translator: Kristján Bjarni Guðmundsson-->
 <!--Email: kristjanbjarni@gmail.com-->
-<!--Date of translation: 2010-11-18-->
+<!--Date of translation: 2011-01-19-->
 <!--$Revision$-->
-<!--Based on english strings version 35254-->
+<!--Based on english strings version 35672-->
 <strings>
   <!-- Misc labels -->
   <string id="31000">Breyta -</string>
@@ -60,7 +60,7 @@
   <string id="31102">Bakgrunnur</string>
   <string id="31103">Sýna "Í bið" í myndasýningu</string>
   <string id="31104">Spila kvikmyndasýnishorn í glugga [COLOR=grey3](Aðeins myndbandaupplýsingarglugga)[/COLOR]</string>
-  <string id="31105"></string>
+  <string id="31105">Sýna myndatitla í bakgrunnsleit</string>
   <string id="31106">Ýmsir valkostir</string>
   <string id="31107">Fela flagg lesið frá skráarnöfnum [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]</string>
   <string id="31108">Fela hnapp í aðalvalmynd</string>
@@ -87,13 +87,16 @@
   <string id="31128">Lagatextar</string>
   <string id="31129"/>  <!-- blanked 2010-11-12 -->
   <string id="31130"/>  <!-- blanked 2010-11-12 -->
-
-  <string id="31131"></string>
+  
+  <string id="31131"/> <!-- blanked 2010-12-23 -->
   <string id="31132">Viðbót fyrir lagatexta</string>
   <string id="31133">Viðbót fyrir þýðingartexta</string>
+  <string id="31134">Undirvalmynd myndbandaheimasíðu</string>
+  <string id="31135">Undirvalmynd tónlistarheimasíðu</string>
+  <string id="31136">Undirvalmynd ljósmyndaheimasíðu</string>
 
-  <string id="31140">Tónlistarskjár</string>
-  <string id="31141">Myndbandaskjár</string>
+  <string id="31140">Tónlist</string>
+  <string id="31141">Myndefni</string>
 
   <!-- Script labels -->
   <string id="31200">Flýtileiðir</string>

diff --git a/addons/skin.confluence/media/flagging/audio/dtshd_hra.png b/addons/skin.confluence/media/flagging/audio/dtshd_hra.png
diff --git a/addons/skin.confluence/media/flagging/audio/dtshd_ma.png b/addons/skin.confluence/media/flagging/audio/dtshd_ma.png