XBMC Media Center

Revision: 34992
          http://xbmc.svn.sourceforge.net/xbmc/?rev=34992&view=rev
Author:   vdrfan
Date:     2010-10-24 17:40:34 +0000 (Sun, 24 Oct 2010)

Log Message:
-----------
removed: obsolete xbox universalremote (obc) code

(cherry picked from commit 48276d14aa9d0d642513eb15e2579809bcbb79ad)

Modified Paths:
--------------
    branches/Dharma/system/keymaps/gamepad.xml
    branches/Dharma/system/keymaps/joystick.Alienware.Dual.Compatible.Controller.xml
    branches/Dharma/system/keymaps/joystick.AppleRemote.xml
    branches/Dharma/system/keymaps/joystick.Harmony.xml
    branches/Dharma/system/keymaps/joystick.Interact.AxisPad.xml
    branches/Dharma/system/keymaps/joystick.Microsoft.Xbox.360.Controller.xml
    branches/Dharma/system/keymaps/joystick.Microsoft.Xbox.Controller.S.xml
    branches/Dharma/system/keymaps/joystick.PS3.Remote.Keyboard.xml
    branches/Dharma/system/keymaps/joystick.Sony.PLAYSTATION(R)3.Controller.xml
    branches/Dharma/system/keymaps/joystick.WiiRemote.xml
    branches/Dharma/system/keymaps/keyboard.xml
    branches/Dharma/system/keymaps/remote.xml
    branches/Dharma/xbmc/AdvancedSettings.cpp
    branches/Dharma/xbmc/AdvancedSettings.h
    branches/Dharma/xbmc/ButtonTranslator.cpp
    branches/Dharma/xbmc/ButtonTranslator.h
    branches/Dharma/xbmc/utils/EventClient.cpp

Modified: branches/Dharma/system/keymaps/gamepad.xml
===================================================================
--- branches/Dharma/system/keymaps/gamepad.xml	2010-10-24 17:39:55 UTC (rev 34991)
+++ branches/Dharma/system/keymaps/gamepad.xml	2010-10-24 17:40:34 UTC (rev 34992)
@@ -10,14 +10,6 @@
 <!--      <button>action</button>        -->
 <!--    </device>                        -->
 
-<!-- To map keys from other remotes using the RCA protocol, you may add <universalremote> blocks -->
-<!-- In this case, the tags used are <obc#> where # is the original button code (OBC) of the key -->
-<!-- You set it up by adding a <universalremote> block to the window or <global> section:       -->
-<!--    <universalremote>             -->
-<!--       <obc45>Stop</obc45>         -->
-<!--    </universalremote>            -->
-<!-- To find out the OBC's of your remote, try enabling the <displayremotecodes> tag in AdvancedSettings.xml -->
-
 <!-- Note that the action can be a built-in function.                 -->
 <!--  eg <B>XBMC.ActivateWindow(MyMusic)</B>                         -->
 <!-- would automatically go to My Music on the press of the B button. -->

Modified: branches/Dharma/system/keymaps/joystick.Alienware.Dual.Compatible.Controller.xml
===================================================================
--- branches/Dharma/system/keymaps/joystick.Alienware.Dual.Compatible.Controller.xml	2010-10-24 17:39:55 UTC (rev 34991)
+++ branches/Dharma/system/keymaps/joystick.Alienware.Dual.Compatible.Controller.xml	2010-10-24 17:40:34 UTC (rev 34992)
@@ -10,14 +10,6 @@
 <!--      <button>action</button>        -->
 <!--    </device>                        -->
 
-<!-- To map keys from other remotes using the RCA protocol, you may add <universalremote> blocks -->
-<!-- In this case, the tags used are <obc#> where # is the original button code (OBC) of the key -->
-<!-- You set it up by adding a <universalremote> block to the window or <global> section:       -->
-<!--    <universalremote>             -->
-<!--       <obc45>Stop</obc45>         -->
-<!--    </universalremote>            -->
-<!-- To find out the OBC's of your remote, try enabling the <displayremotecodes> tag in AdvancedSettings.xml -->
-
 <!-- Note that the action can be a built-in function.                 -->
 <!--  eg <B>XBMC.ActivateWindow(MyMusic)</B>                         -->
 <!-- would automatically go to My Music on the press of the B button. -->

Modified: branches/Dharma/system/keymaps/joystick.AppleRemote.xml
===================================================================
--- branches/Dharma/system/keymaps/joystick.AppleRemote.xml	2010-10-24 17:39:55 UTC (rev 34991)
+++ branches/Dharma/system/keymaps/joystick.AppleRemote.xml	2010-10-24 17:40:34 UTC (rev 34992)
@@ -10,14 +10,6 @@
 <!--      <button>action</button>        -->
 <!--    </device>                        -->
 
-<!-- To map keys from other remotes using the RCA protocol, you may add <universalremote> blocks -->
-<!-- In this case, the tags used are <obc#> where # is the original button code (OBC) of the key -->
-<!-- You set it up by adding a <universalremote> block to the window or <global> section:       -->
-<!--    <universalremote>             -->
-<!--       <obc45>Stop</obc45>         -->
-<!--    </universalremote>            -->
-<!-- To find out the OBC's of your remote, try enabling the <displayremotecodes> tag in AdvancedSettings.xml -->
-
 <!-- Note that the action can be a built-in function.                 -->
 <!--  eg <B>XBMC.ActivateWindow(MyMusic)</B>                         -->
 <!-- would automatically go to My Music on the press of the B button. -->

Modified: branches/Dharma/system/keymaps/joystick.Harmony.xml
===================================================================
--- branches/Dharma/system/keymaps/joystick.Harmony.xml	2010-10-24 17:39:55 UTC (rev 34991)
+++ branches/Dharma/system/keymaps/joystick.Harmony.xml	2010-10-24 17:40:34 UTC (rev 34992)
@@ -10,14 +10,6 @@
 <!--      <button>action</button>        -->
 <!--    </device>                        -->
 
-<!-- To map keys from other remotes using the RCA protocol, you may add <universalremote> blocks -->
-<!-- In this case, the tags used are <obc#> where # is the original button code (OBC) of the key -->
-<!-- You set it up by adding a <universalremote> block to the window or <global> section:       -->
-<!--    <universalremote>             -->
-<!--       <obc45>Stop</obc45>         -->
-<!--    </universalremote>            -->
-<!-- To find out the OBC's of your remote, try enabling the <displayremotecodes> tag in AdvancedSettings.xml -->
-
 <!-- Note that the action can be a built-in function.                 -->
 <!--  eg <B>XBMC.ActivateWindow(MyMusic)</B>                         -->
 <!-- would automatically go to My Music on the press of the B button. -->

Modified: branches/Dharma/system/keymaps/joystick.Interact.AxisPad.xml
===================================================================
--- branches/Dharma/system/keymaps/joystick.Interact.AxisPad.xml	2010-10-24 17:39:55 UTC (rev 34991)
+++ branches/Dharma/system/keymaps/joystick.Interact.AxisPad.xml	2010-10-24 17:40:34 UTC (rev 34992)
@@ -10,14 +10,6 @@
 <!--      <button>action</button>        -->
 <!--    </device>                        -->
 
-<!-- To map keys from other remotes using the RCA protocol, you may add <universalremote> blocks -->
-<!-- In this case, the tags used are <obc#> where # is the original button code (OBC) of the key -->
-<!-- You set it up by adding a <universalremote> block to the window or <global> section:       -->
-<!--    <universalremote>             -->
-<!--       <obc45>Stop</obc45>         -->
-<!--    </universalremote>            -->
-<!-- To find out the OBC's of your remote, try enabling the <displayremotecodes> tag in AdvancedSettings.xml -->
-
 <!-- Note that the action can be a built-in function.                 -->
 <!--  eg <B>XBMC.ActivateWindow(MyMusic)</B>                         -->
 <!-- would automatically go to My Music on the press of the B button. -->

Modified: branches/Dharma/system/keymaps/joystick.Microsoft.Xbox.360.Controller.xml
===================================================================
--- branches/Dharma/system/keymaps/joystick.Microsoft.Xbox.360.Controller.xml	2010-10-24 17:39:55 UTC (rev 34991)
+++ branches/Dharma/system/keymaps/joystick.Microsoft.Xbox.360.Controller.xml	2010-10-24 17:40:34 UTC (rev 34992)
@@ -10,14 +10,6 @@
 <!--      <button>action</button>        -->
 <!--    </device>                        -->
 
-<!-- To map keys from other remotes using the RCA protocol, you may add <universalremote> blocks -->
-<!-- In this case, the tags used are <obc#> where # is the original button code (OBC) of the key -->
-<!-- You set it up by adding a <universalremote> block to the window or <global> section:       -->
-<!--    <universalremote>             -->
-<!--       <obc45>Stop</obc45>         -->
-<!--    </universalremote>            -->
-<!-- To find out the OBC's of your remote, try enabling the <displayremotecodes> tag in AdvancedSettings.xml -->
-
 <!-- Note that the action can be a built-in function.                 -->
 <!--  eg <B>XBMC.ActivateWindow(MyMusic)</B>                         -->
 <!-- would automatically go to My Music on the press of the B button. -->

Modified: branches/Dharma/system/keymaps/joystick.Microsoft.Xbox.Controller.S.xml
===================================================================
--- branches/Dharma/system/keymaps/joystick.Microsoft.Xbox.Controller.S.xml	2010-10-24 17:39:55 UTC (rev 34991)
+++ branches/Dharma/system/keymaps/joystick.Microsoft.Xbox.Controller.S.xml	2010-10-24 17:40:34 UTC (rev 34992)
@@ -10,14 +10,6 @@
 <!--      <button>action</button>        -->
 <!--    </device>                        -->
 
-<!-- To map keys from other remotes using the RCA protocol, you may add <universalremote> blocks -->
-<!-- In this case, the tags used are <obc#> where # is the original button code (OBC) of the key -->
-<!-- You set it up by adding a <universalremote> block to the window or <global> section:       -->
-<!--    <universalremote>             -->
-<!--       <obc45>Stop</obc45>         -->
-<!--    </universalremote>            -->
-<!-- To find out the OBC's of your remote, try enabling the <displayremotecodes> tag in AdvancedSettings.xml -->
-
 <!-- Note that the action can be a built-in function.                 -->
 <!--  eg <B>XBMC.ActivateWindow(MyMusic)</B>                         -->
 <!-- would automatically go to My Music on the press of the B button. -->

Modified: branches/Dharma/system/keymaps/joystick.PS3.Remote.Keyboard.xml
===================================================================
--- branches/Dharma/system/keymaps/joystick.PS3.Remote.Keyboard.xml	2010-10-24 17:39:55 UTC (rev 34991)
+++ branches/Dharma/system/keymaps/joystick.PS3.Remote.Keyboard.xml	2010-10-24 17:40:34 UTC (rev 34992)
@@ -10,14 +10,6 @@
 <!--      <button>action</button>        -->
 <!--    </device>                        -->
 
-<!-- To map keys from other remotes using the RCA protocol, you may add <universalremote> blocks -->
-<!-- In this case, the tags used are <obc#> where # is the original button code (OBC) of the key -->
-<!-- You set it up by adding a <universalremote> block to the window or <global> section:       -->
-<!--    <universalremote>             -->
-<!--       <obc45>Stop</obc45>         -->
-<!--    </universalremote>            -->
-<!-- To find out the OBC's of your remote, try enabling the <displayremotecodes> tag in AdvancedSettings.xml -->
-
 <!-- Note that the action can be a built-in function.                 -->
 <!--  eg <B>XBMC.ActivateWindow(MyMusic)</B>                         -->
 <!-- would automatically go to My Music on the press of the B button. -->

Modified: branches/Dharma/system/keymaps/joystick.Sony.PLAYSTATION(R)3.Controller.xml
===================================================================
--- branches/Dharma/system/keymaps/joystick.Sony.PLAYSTATION(R)3.Controller.xml	2010-10-24 17:39:55 UTC (rev 34991)
+++ branches/Dharma/system/keymaps/joystick.Sony.PLAYSTATION(R)3.Controller.xml	2010-10-24 17:40:34 UTC (rev 34992)
@@ -10,14 +10,6 @@
 <!--      <button>action</button>        -->
 <!--    </device>                        -->
 
-<!-- To map keys from other remotes using the RCA protocol, you may add <universalremote> blocks -->
-<!-- In this case, the tags used are <obc#> where # is the original button code (OBC) of the key -->
-<!-- You set it up by adding a <universalremote> block to the window or <global> section:       -->
-<!--    <universalremote>             -->
-<!--       <obc45>Stop</obc45>         -->
-<!--    </universalremote>            -->
-<!-- To find out the OBC's of your remote, try enabling the <displayremotecodes> tag in AdvancedSettings.xml -->
-
 <!-- Note that the action can be a built-in function.                 -->
 <!--  eg <B>XBMC.ActivateWindow(MyMusic)</B>                         -->
 <!-- would automatically go to My Music on the press of the B button. -->

Modified: branches/Dharma/system/keymaps/joystick.WiiRemote.xml
===================================================================
--- branches/Dharma/system/keymaps/joystick.WiiRemote.xml	2010-10-24 17:39:55 UTC (rev 34991)
+++ branches/Dharma/system/keymaps/joystick.WiiRemote.xml	2010-10-24 17:40:34 UTC (rev 34992)
@@ -10,14 +10,6 @@
 <!--      <button>action</button>        -->
 <!--    </device>                        -->
 
-<!-- To map keys from other remotes using the RCA protocol, you may add <universalremote> blocks -->
-<!-- In this case, the tags used are <obc#> where # is the original button code (OBC) of the key -->
-<!-- You set it up by adding a <universalremote> block to the window or <global> section:       -->
-<!--    <universalremote>             -->
-<!--       <obc45>Stop</obc45>         -->
-<!--    </universalremote>            -->
-<!-- To find out the OBC's of your remote, try enabling the <displayremotecodes> tag in AdvancedSettings.xml -->
-
 <!-- Note that the action can be a built-in function.                 -->
 <!--  eg <B>XBMC.ActivateWindow(MyMusic)</B>                         -->
 <!-- would automatically go to My Music on the press of the B button. -->

Modified: branches/Dharma/system/keymaps/keyboard.xml
===================================================================
--- branches/Dharma/system/keymaps/keyboard.xml	2010-10-24 17:39:55 UTC (rev 34991)
+++ branches/Dharma/system/keymaps/keyboard.xml	2010-10-24 17:40:34 UTC (rev 34992)
@@ -10,14 +10,6 @@
 <!--      <button>action</button>        -->
 <!--    </device>                        -->
 
-<!-- To map keys from other remotes using the RCA protocol, you may add <universalremote> blocks -->
-<!-- In this case, the tags used are <obc#> where # is the original button code (OBC) of the key -->
-<!-- You set it up by adding a <universalremote> block to the window or <global> section:       -->
-<!--    <universalremote>             -->
-<!--       <obc45>Stop</obc45>         -->
-<!--    </universalremote>            -->
-<!-- To find out the OBC's of your remote, try enabling the <displayremotecodes> tag in AdvancedSettings.xml -->
-
 <!-- Note that the action can be a built-in function.                 -->
 <!--  eg <B>XBMC.ActivateWindow(MyMusic)</B>                         -->
 <!-- would automatically go to My Music on the press of the B button. -->

Modified: branches/Dharma/system/keymaps/remote.xml
===================================================================
--- branches/Dharma/system/keymaps/remote.xml	2010-10-24 17:39:55 UTC (rev 34991)
+++ branches/Dharma/system/keymaps/remote.xml	2010-10-24 17:40:34 UTC (rev 34992)
@@ -10,14 +10,6 @@
 <!--      <button>action</button>        -->
 <!--    </device>                        -->
 
-<!-- To map keys from other remotes using the RCA protocol, you may add <universalremote> blocks -->
-<!-- In this case, the tags used are <obc#> where # is the original button code (OBC) of the key -->
-<!-- You set it up by adding a <universalremote> block to the window or <global> section:       -->
-<!--    <universalremote>             -->
-<!--       <obc45>Stop</obc45>         -->
-<!--    </universalremote>            -->
-<!-- To find out the OBC's of your remote, try enabling the <displayremotecodes> tag in AdvancedSettings.xml -->
-
 <!-- Note that the action can be a built-in function.                 -->
 <!--  eg <B>XBMC.ActivateWindow(MyMusic)</B>                         -->
 <!-- would automatically go to My Music on the press of the B button. -->

Modified: branches/Dharma/xbmc/AdvancedSettings.cpp
===================================================================
--- branches/Dharma/xbmc/AdvancedSettings.cpp	2010-10-24 17:39:55 UTC (rev 34991)
+++ branches/Dharma/xbmc/AdvancedSettings.cpp	2010-10-24 17:40:34 UTC (rev 34992)
@@ -134,7 +134,6 @@
   m_fullScreenOnMovieStart = true;
   m_noDVDROM = false;
   m_cachePath = "special://temp/";
-  m_displayRemoteCodes = false;
 
   m_videoCleanDateTimeRegExp = "(.*[^ _\\,\\.\\(\\)\\[\\]\\-])[ _\\.\\(\\)\\[\\]\\-]+(19[0-9][0-9]|20[0-1][0-9])([ _\\,\\.\\(\\)\\[\\]\\-]|[^0-9]$)";
 
@@ -615,8 +614,6 @@
   m_vecTokens.clear();
   CLangInfo::LoadTokens(pRootElement->FirstChild("sorttokens"),m_vecTokens);
 
-  XMLUtils::GetBoolean(pRootElement, "displayremotecodes", m_displayRemoteCodes);
-
   // TODO: Should cache path be given in terms of our predefined paths??
   //       Are we even going to have predefined paths??
   CSettings::GetPath(pRootElement, "cachepath", m_cachePath);

Modified: branches/Dharma/xbmc/AdvancedSettings.h
===================================================================
--- branches/Dharma/xbmc/AdvancedSettings.h	2010-10-24 17:39:55 UTC (rev 34991)
+++ branches/Dharma/xbmc/AdvancedSettings.h	2010-10-24 17:40:34 UTC (rev 34992)
@@ -145,7 +145,6 @@
     bool m_fullScreenOnMovieStart;
     bool m_noDVDROM;
     CStdString m_cachePath;
-    bool m_displayRemoteCodes;
     CStdString m_videoCleanDateTimeRegExp;
     CStdStringArray m_videoCleanStringRegExps;
     CStdStringArray m_videoExcludeFromListingRegExps;

Modified: branches/Dharma/xbmc/ButtonTranslator.cpp
===================================================================
--- branches/Dharma/xbmc/ButtonTranslator.cpp	2010-10-24 17:39:55 UTC (rev 34991)
+++ branches/Dharma/xbmc/ButtonTranslator.cpp	2010-10-24 17:40:34 UTC (rev 34992)
@@ -504,10 +504,6 @@
   if (it2 == (*it).second.end())
     return 0;
 
-  // Convert the button to code
-  if (strnicmp((*it2).second.c_str(), "obc", 3) == 0)
-    return TranslateUniversalRemoteString((*it2).second.c_str());
-
   return TranslateRemoteString((*it2).second.c_str());
 }
 #endif
@@ -809,8 +805,6 @@
             buttonCode = TranslateGamepadString(pButton->Value());
         else if (type == "remote")
             buttonCode = TranslateRemoteString(pButton->Value());
-        else if (type == "universalremote")
-            buttonCode = TranslateUniversalRemoteString(pButton->Value());
         else if (type == "keyboard")
             buttonCode = TranslateKeyboardButton(pButton);
 
@@ -1017,18 +1011,6 @@
   return buttonCode;
 }
 
-uint32_t CButtonTranslator::TranslateUniversalRemoteString(const char *szButton)
-{
-  if (!szButton || strlen(szButton) < 4 || strnicmp(szButton, "obc", 3)) 
-    return 0;
-  const char *szCode = szButton + 3;
-  // Button Code is 255 - OBC (Original Button Code) of the button
-  uint32_t buttonCode = 255 - atol(szCode);
-  if (buttonCode > 255) 
-    buttonCode = 0;
-  return buttonCode;
-}
-
 uint32_t CButtonTranslator::TranslateKeyboardString(const char *szButton)
 {
   uint32_t buttonCode = 0;

Modified: branches/Dharma/xbmc/ButtonTranslator.h
===================================================================
--- branches/Dharma/xbmc/ButtonTranslator.h	2010-10-24 17:39:55 UTC (rev 34991)
+++ branches/Dharma/xbmc/ButtonTranslator.h	2010-10-24 17:40:34 UTC (rev 34992)
@@ -101,8 +101,6 @@
 
   static uint32_t TranslateGamepadString(const char *szButton);
   static uint32_t TranslateRemoteString(const char *szButton);
-  static uint32_t TranslateUniversalRemoteString(const char *szButton);
-
   static uint32_t TranslateKeyboardString(const char *szButton);
   static uint32_t TranslateKeyboardButton(TiXmlElement *pButton);
 

Modified: branches/Dharma/xbmc/utils/EventClient.cpp
===================================================================
--- branches/Dharma/xbmc/utils/EventClient.cpp	2010-10-24 17:39:55 UTC (rev 34991)
+++ branches/Dharma/xbmc/utils/EventClient.cpp	2010-10-24 17:40:34 UTC (rev 34992)
@@ -82,10 +82,6 @@
       {
         m_iKeyCode = CButtonTranslator::TranslateRemoteString( m_buttonName.c_str() );
       }
-      else if  ( m_mapName.compare("R2") == 0 ) // xbox unviversal remote map
-      {
-        m_iKeyCode = CButtonTranslator::TranslateUniversalRemoteString( m_buttonName.c_str() );
-      }
       else if ( (m_mapName.length() > 3) &&
                 (m_mapName.compare(0, 3, "LI:") == 0) ) // starts with LI: ?
       {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 35007
          http://xbmc.svn.sourceforge.net/xbmc/?rev=35007&view=rev
Author:   vdrfan
Date:     2010-10-25 17:13:42 +0000 (Mon, 25 Oct 2010)

Log Message:
-----------
added: original title to video info dialog in confluence

(cherry picked from commit 8fd0613376e9f3a10a936ee6d5c43a03a36ddd33)

Modified Paths:
--------------
    branches/Dharma/addons/skin.confluence/720p/DialogVideoInfo.xml
    branches/Dharma/language/English/strings.xml
    branches/Dharma/language/French/strings.xml
    branches/Dharma/language/German/strings.xml

Modified: branches/Dharma/addons/skin.confluence/720p/DialogVideoInfo.xml
===================================================================
--- branches/Dharma/addons/skin.confluence/720p/DialogVideoInfo.xml	2010-10-25 14:43:36 UTC (rev 35006)
+++ branches/Dharma/addons/skin.confluence/720p/DialogVideoInfo.xml	2010-10-25 17:13:42 UTC (rev 35007)
@@ -246,6 +246,12 @@
 						</focusedlayout>
 						<content>
 							<item>
+								<label>$LOCALIZE[20376]:</label>
+								<label2>$INFO[ListItem.OriginalTitle]</label2>
+								<onclick>-</onclick>
+								<visible>!IsEmpty(ListItem.OriginalTitle) + !stringcompare(ListItem.OriginalTitle,Listitem.Title)</visible>
+							</item>
+							<item>
 								<label>$LOCALIZE[20339]:</label>
 								<label2>$INFO[ListItem.Director]</label2>
 								<onclick>-</onclick>

Modified: branches/Dharma/language/English/strings.xml
===================================================================
--- branches/Dharma/language/English/strings.xml	2010-10-25 14:43:36 UTC (rev 35006)
+++ branches/Dharma/language/English/strings.xml	2010-10-25 17:13:42 UTC (rev 35007)
@@ -1849,7 +1849,7 @@
   <string id="20373">Season</string>
   <string id="20374">Downloading movie information</string>
   <string id="20375">Unassign content</string>
-
+  <string id="20376">Original title</string>
   <string id="20377">Refresh TV show information</string>
   <string id="20378">Refresh info for all episodes?</string>
   <string id="20379">Selected folder contains a single TV show</string>

Modified: branches/Dharma/language/French/strings.xml
===================================================================
--- branches/Dharma/language/French/strings.xml	2010-10-25 14:43:36 UTC (rev 35006)
+++ branches/Dharma/language/French/strings.xml	2010-10-25 17:13:42 UTC (rev 35007)
@@ -1856,7 +1856,7 @@
   <string id="20373">Saison</string>
   <string id="20374">Téléchargement des infos vidéo</string>
   <string id="20375">Catégorie non assignée</string>
-  
+  <string id="20376">Titre original</string>
   <string id="20377">Rafraîchir info séries TV</string>
   <string id="20378">Rafraichir les infos de tous les épisodes ?</string>
   <string id="20379">Dossier sélectionné contient une seule Série TV</string>

Modified: branches/Dharma/language/German/strings.xml
===================================================================
--- branches/Dharma/language/German/strings.xml	2010-10-25 14:43:36 UTC (rev 35006)
+++ branches/Dharma/language/German/strings.xml	2010-10-25 17:13:42 UTC (rev 35007)
@@ -1837,7 +1837,7 @@
   <string id="20373">Staffel</string>
   <string id="20374">Film-Informationen werden geladen...</string>
   <string id="20375">Inhalt zurücksetzen</string>
-
+  <string id="20376">Originaltitel</string>
   <string id="20377">TV-Serien-Informationen aktualisieren</string>
   <string id="20378">Die Informationen für alle Episoden aktualisieren?</string>
   <string id="20379">Ordner beinhaltet eine einzige TV-Serie</string>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 35008
          http://xbmc.svn.sourceforge.net/xbmc/?rev=35008&view=rev
Author:   vdrfan
Date:     2010-10-25 17:19:11 +0000 (Mon, 25 Oct 2010)

Log Message:
-----------
Revert "removed: obsolete xbox universalremote (obc) code"

This reverts commit ad525b9a6d78a03ebefd6f71ff10721ba98be71f.

Modified Paths:
--------------
    branches/Dharma/system/keymaps/gamepad.xml
    branches/Dharma/system/keymaps/joystick.Alienware.Dual.Compatible.Controller.xml
    branches/Dharma/system/keymaps/joystick.AppleRemote.xml
    branches/Dharma/system/keymaps/joystick.Harmony.xml
    branches/Dharma/system/keymaps/joystick.Interact.AxisPad.xml
    branches/Dharma/system/keymaps/joystick.Microsoft.Xbox.360.Controller.xml
    branches/Dharma/system/keymaps/joystick.Microsoft.Xbox.Controller.S.xml
    branches/Dharma/system/keymaps/joystick.PS3.Remote.Keyboard.xml
    branches/Dharma/system/keymaps/joystick.Sony.PLAYSTATION(R)3.Controller.xml
    branches/Dharma/system/keymaps/joystick.WiiRemote.xml
    branches/Dharma/system/keymaps/keyboard.xml
    branches/Dharma/system/keymaps/remote.xml
    branches/Dharma/xbmc/AdvancedSettings.cpp
    branches/Dharma/xbmc/AdvancedSettings.h
    branches/Dharma/xbmc/ButtonTranslator.cpp
    branches/Dharma/xbmc/ButtonTranslator.h
    branches/Dharma/xbmc/utils/EventClient.cpp

Modified: branches/Dharma/system/keymaps/gamepad.xml
===================================================================
--- branches/Dharma/system/keymaps/gamepad.xml	2010-10-25 17:13:42 UTC (rev 35007)
+++ branches/Dharma/system/keymaps/gamepad.xml	2010-10-25 17:19:11 UTC (rev 35008)
@@ -10,6 +10,14 @@
 <!--      <button>action</button>        -->
 <!--    </device>                        -->
 
+<!-- To map keys from other remotes using the RCA protocol, you may add <universalremote> blocks -->
+<!-- In this case, the tags used are <obc#> where # is the original button code (OBC) of the key -->
+<!-- You set it up by adding a <universalremote> block to the window or <global> section:       -->
+<!--    <universalremote>             -->
+<!--       <obc45>Stop</obc45>         -->
+<!--    </universalremote>            -->
+<!-- To find out the OBC's of your remote, try enabling the <displayremotecodes> tag in AdvancedSettings.xml -->
+
 <!-- Note that the action can be a built-in function.                 -->
 <!--  eg <B>XBMC.ActivateWindow(MyMusic)</B>                         -->
 <!-- would automatically go to My Music on the press of the B button. -->

Modified: branches/Dharma/system/keymaps/joystick.Alienware.Dual.Compatible.Controller.xml
===================================================================
--- branches/Dharma/system/keymaps/joystick.Alienware.Dual.Compatible.Controller.xml	2010-10-25 17:13:42 UTC (rev 35007)
+++ branches/Dharma/system/keymaps/joystick.Alienware.Dual.Compatible.Controller.xml	2010-10-25 17:19:11 UTC (rev 35008)
@@ -10,6 +10,14 @@
 <!--      <button>action</button>        -->
 <!--    </device>                        -->
 
+<!-- To map keys from other remotes using the RCA protocol, you may add <universalremote> blocks -->
+<!-- In this case, the tags used are <obc#> where # is the original button code (OBC) of the key -->
+<!-- You set it up by adding a <universalremote> block to the window or <global> section:       -->
+<!--    <universalremote>             -->
+<!--       <obc45>Stop</obc45>         -->
+<!--    </universalremote>            -->
+<!-- To find out the OBC's of your remote, try enabling the <displayremotecodes> tag in AdvancedSettings.xml -->
+
 <!-- Note that the action can be a built-in function.                 -->
 <!--  eg <B>XBMC.ActivateWindow(MyMusic)</B>                         -->
 <!-- would automatically go to My Music on the press of the B button. -->

Modified: branches/Dharma/system/keymaps/joystick.AppleRemote.xml
===================================================================
--- branches/Dharma/system/keymaps/joystick.AppleRemote.xml	2010-10-25 17:13:42 UTC (rev 35007)
+++ branches/Dharma/system/keymaps/joystick.AppleRemote.xml	2010-10-25 17:19:11 UTC (rev 35008)
@@ -10,6 +10,14 @@
 <!--      <button>action</button>        -->
 <!--    </device>                        -->
 
+<!-- To map keys from other remotes using the RCA protocol, you may add <universalremote> blocks -->
+<!-- In this case, the tags used are <obc#> where # is the original button code (OBC) of the key -->
+<!-- You set it up by adding a <universalremote> block to the window or <global> section:       -->
+<!--    <universalremote>             -->
+<!--       <obc45>Stop</obc45>         -->
+<!--    </universalremote>            -->
+<!-- To find out the OBC's of your remote, try enabling the <displayremotecodes> tag in AdvancedSettings.xml -->
+
 <!-- Note that the action can be a built-in function.                 -->
 <!--  eg <B>XBMC.ActivateWindow(MyMusic)</B>                         -->
 <!-- would automatically go to My Music on the press of the B button. -->

Modified: branches/Dharma/system/keymaps/joystick.Harmony.xml
===================================================================
--- branches/Dharma/system/keymaps/joystick.Harmony.xml	2010-10-25 17:13:42 UTC (rev 35007)
+++ branches/Dharma/system/keymaps/joystick.Harmony.xml	2010-10-25 17:19:11 UTC (rev 35008)
@@ -10,6 +10,14 @@
 <!--      <button>action</button>        -->
 <!--    </device>                        -->
 
+<!-- To map keys from other remotes using the RCA protocol, you may add <universalremote> blocks -->
+<!-- In this case, the tags used are <obc#> where # is the original button code (OBC) of the key -->
+<!-- You set it up by adding a <universalremote> block to the window or <global> section:       -->
+<!--    <universalremote>             -->
+<!--       <obc45>Stop</obc45>         -->
+<!--    </universalremote>            -->
+<!-- To find out the OBC's of your remote, try enabling the <displayremotecodes> tag in AdvancedSettings.xml -->
+
 <!-- Note that the action can be a built-in function.                 -->
 <!--  eg <B>XBMC.ActivateWindow(MyMusic)</B>                         -->
 <!-- would automatically go to My Music on the press of the B button. -->

Modified: branches/Dharma/system/keymaps/joystick.Interact.AxisPad.xml
===================================================================
--- branches/Dharma/system/keymaps/joystick.Interact.AxisPad.xml	2010-10-25 17:13:42 UTC (rev 35007)
+++ branches/Dharma/system/keymaps/joystick.Interact.AxisPad.xml	2010-10-25 17:19:11 UTC (rev 35008)
@@ -10,6 +10,14 @@
 <!--      <button>action</button>        -->
 <!--    </device>                        -->
 
+<!-- To map keys from other remotes using the RCA protocol, you may add <universalremote> blocks -->
+<!-- In this case, the tags used are <obc#> where # is the original button code (OBC) of the key -->
+<!-- You set it up by adding a <universalremote> block to the window or <global> section:       -->
+<!--    <universalremote>             -->
+<!--       <obc45>Stop</obc45>         -->
+<!--    </universalremote>            -->
+<!-- To find out the OBC's of your remote, try enabling the <displayremotecodes> tag in AdvancedSettings.xml -->
+
 <!-- Note that the action can be a built-in function.                 -->
 <!--  eg <B>XBMC.ActivateWindow(MyMusic)</B>                         -->
 <!-- would automatically go to My Music on the press of the B button. -->

Modified: branches/Dharma/system/keymaps/joystick.Microsoft.Xbox.360.Controller.xml
===================================================================
--- branches/Dharma/system/keymaps/joystick.Microsoft.Xbox.360.Controller.xml	2010-10-25 17:13:42 UTC (rev 35007)
+++ branches/Dharma/system/keymaps/joystick.Microsoft.Xbox.360.Controller.xml	2010-10-25 17:19:11 UTC (rev 35008)
@@ -10,6 +10,14 @@
 <!--      <button>action</button>        -->
 <!--    </device>                        -->
 
+<!-- To map keys from other remotes using the RCA protocol, you may add <universalremote> blocks -->
+<!-- In this case, the tags used are <obc#> where # is the original button code (OBC) of the key -->
+<!-- You set it up by adding a <universalremote> block to the window or <global> section:       -->
+<!--    <universalremote>             -->
+<!--       <obc45>Stop</obc45>         -->
+<!--    </universalremote>            -->
+<!-- To find out the OBC's of your remote, try enabling the <displayremotecodes> tag in AdvancedSettings.xml -->
+
 <!-- Note that the action can be a built-in function.                 -->
 <!--  eg <B>XBMC.ActivateWindow(MyMusic)</B>                         -->
 <!-- would automatically go to My Music on the press of the B button. -->

Modified: branches/Dharma/system/keymaps/joystick.Microsoft.Xbox.Controller.S.xml
===================================================================
--- branches/Dharma/system/keymaps/joystick.Microsoft.Xbox.Controller.S.xml	2010-10-25 17:13:42 UTC (rev 35007)
+++ branches/Dharma/system/keymaps/joystick.Microsoft.Xbox.Controller.S.xml	2010-10-25 17:19:11 UTC (rev 35008)
@@ -10,6 +10,14 @@
 <!--      <button>action</button>        -->
 <!--    </device>                        -->
 
+<!-- To map keys from other remotes using the RCA protocol, you may add <universalremote> blocks -->
+<!-- In this case, the tags used are <obc#> where # is the original button code (OBC) of the key -->
+<!-- You set it up by adding a <universalremote> block to the window or <global> section:       -->
+<!--    <universalremote>             -->
+<!--       <obc45>Stop</obc45>         -->
+<!--    </universalremote>            -->
+<!-- To find out the OBC's of your remote, try enabling the <displayremotecodes> tag in AdvancedSettings.xml -->
+
 <!-- Note that the action can be a built-in function.                 -->
 <!--  eg <B>XBMC.ActivateWindow(MyMusic)</B>                         -->
 <!-- would automatically go to My Music on the press of the B button. -->

Modified: branches/Dharma/system/keymaps/joystick.PS3.Remote.Keyboard.xml
===================================================================
--- branches/Dharma/system/keymaps/joystick.PS3.Remote.Keyboard.xml	2010-10-25 17:13:42 UTC (rev 35007)
+++ branches/Dharma/system/keymaps/joystick.PS3.Remote.Keyboard.xml	2010-10-25 17:19:11 UTC (rev 35008)
@@ -10,6 +10,14 @@
 <!--      <button>action</button>        -->
 <!--    </device>                        -->
 
+<!-- To map keys from other remotes using the RCA protocol, you may add <universalremote> blocks -->
+<!-- In this case, the tags used are <obc#> where # is the original button code (OBC) of the key -->
+<!-- You set it up by adding a <universalremote> block to the window or <global> section:       -->
+<!--    <universalremote>             -->
+<!--       <obc45>Stop</obc45>         -->
+<!--    </universalremote>            -->
+<!-- To find out the OBC's of your remote, try enabling the <displayremotecodes> tag in AdvancedSettings.xml -->
+
 <!-- Note that the action can be a built-in function.                 -->
 <!--  eg <B>XBMC.ActivateWindow(MyMusic)</B>                         -->
 <!-- would automatically go to My Music on the press of the B button. -->

Modified: branches/Dharma/system/keymaps/joystick.Sony.PLAYSTATION(R)3.Controller.xml
===================================================================
--- branches/Dharma/system/keymaps/joystick.Sony.PLAYSTATION(R)3.Controller.xml	2010-10-25 17:13:42 UTC (rev 35007)
+++ branches/Dharma/system/keymaps/joystick.Sony.PLAYSTATION(R)3.Controller.xml	2010-10-25 17:19:11 UTC (rev 35008)
@@ -10,6 +10,14 @@
 <!--      <button>action</button>        -->
 <!--    </device>                        -->
 
+<!-- To map keys from other remotes using the RCA protocol, you may add <universalremote> blocks -->
+<!-- In this case, the tags used are <obc#> where # is the original button code (OBC) of the key -->
+<!-- You set it up by adding a <universalremote> block to the window or <global> section:       -->
+<!--    <universalremote>             -->
+<!--       <obc45>Stop</obc45>         -->
+<!--    </universalremote>            -->
+<!-- To find out the OBC's of your remote, try enabling the <displayremotecodes> tag in AdvancedSettings.xml -->
+
 <!-- Note that the action can be a built-in function.                 -->
 <!--  eg <B>XBMC.ActivateWindow(MyMusic)</B>                         -->
 <!-- would automatically go to My Music on the press of the B button. -->

Modified: branches/Dharma/system/keymaps/joystick.WiiRemote.xml
===================================================================
--- branches/Dharma/system/keymaps/joystick.WiiRemote.xml	2010-10-25 17:13:42 UTC (rev 35007)
+++ branches/Dharma/system/keymaps/joystick.WiiRemote.xml	2010-10-25 17:19:11 UTC (rev 35008)
@@ -10,6 +10,14 @@
 <!--      <button>action</button>        -->
 <!--    </device>                        -->
 
+<!-- To map keys from other remotes using the RCA protocol, you may add <universalremote> blocks -->
+<!-- In this case, the tags used are <obc#> where # is the original button code (OBC) of the key -->
+<!-- You set it up by adding a <universalremote> block to the window or <global> section:       -->
+<!--    <universalremote>             -->
+<!--       <obc45>Stop</obc45>         -->
+<!--    </universalremote>            -->
+<!-- To find out the OBC's of your remote, try enabling the <displayremotecodes> tag in AdvancedSettings.xml -->
+
 <!-- Note that the action can be a built-in function.                 -->
 <!--  eg <B>XBMC.ActivateWindow(MyMusic)</B>                         -->
 <!-- would automatically go to My Music on the press of the B button. -->

Modified: branches/Dharma/system/keymaps/keyboard.xml
===================================================================
--- branches/Dharma/system/keymaps/keyboard.xml	2010-10-25 17:13:42 UTC (rev 35007)
+++ branches/Dharma/system/keymaps/keyboard.xml	2010-10-25 17:19:11 UTC (rev 35008)
@@ -10,6 +10,14 @@
 <!--      <button>action</button>        -->
 <!--    </device>                        -->
 
+<!-- To map keys from other remotes using the RCA protocol, you may add <universalremote> blocks -->
+<!-- In this case, the tags used are <obc#> where # is the original button code (OBC) of the key -->
+<!-- You set it up by adding a <universalremote> block to the window or <global> section:       -->
+<!--    <universalremote>             -->
+<!--       <obc45>Stop</obc45>         -->
+<!--    </universalremote>            -->
+<!-- To find out the OBC's of your remote, try enabling the <displayremotecodes> tag in AdvancedSettings.xml -->
+
 <!-- Note that the action can be a built-in function.                 -->
 <!--  eg <B>XBMC.ActivateWindow(MyMusic)</B>                         -->
 <!-- would automatically go to My Music on the press of the B button. -->

Modified: branches/Dharma/system/keymaps/remote.xml
===================================================================
--- branches/Dharma/system/keymaps/remote.xml	2010-10-25 17:13:42 UTC (rev 35007)
+++ branches/Dharma/system/keymaps/remote.xml	2010-10-25 17:19:11 UTC (rev 35008)
@@ -10,6 +10,14 @@
 <!--      <button>action</button>        -->
 <!--    </device>                        -->
 
+<!-- To map keys from other remotes using the RCA protocol, you may add <universalremote> blocks -->
+<!-- In this case, the tags used are <obc#> where # is the original button code (OBC) of the key -->
+<!-- You set it up by adding a <universalremote> block to the window or <global> section:       -->
+<!--    <universalremote>             -->
+<!--       <obc45>Stop</obc45>         -->
+<!--    </universalremote>            -->
+<!-- To find out the OBC's of your remote, try enabling the <displayremotecodes> tag in AdvancedSettings.xml -->
+
 <!-- Note that the action can be a built-in function.                 -->
 <!--  eg <B>XBMC.ActivateWindow(MyMusic)</B>                         -->
 <!-- would automatically go to My Music on the press of the B button. -->

Modified: branches/Dharma/xbmc/AdvancedSettings.cpp
===================================================================
--- branches/Dharma/xbmc/AdvancedSettings.cpp	2010-10-25 17:13:42 UTC (rev 35007)
+++ branches/Dharma/xbmc/AdvancedSettings.cpp	2010-10-25 17:19:11 UTC (rev 35008)
@@ -134,6 +134,7 @@
   m_fullScreenOnMovieStart = true;
   m_noDVDROM = false;
   m_cachePath = "special://temp/";
+  m_displayRemoteCodes = false;
 
   m_videoCleanDateTimeRegExp = "(.*[^ _\\,\\.\\(\\)\\[\\]\\-])[ _\\.\\(\\)\\[\\]\\-]+(19[0-9][0-9]|20[0-1][0-9])([ _\\,\\.\\(\\)\\[\\]\\-]|[^0-9]$)";
 
@@ -614,6 +615,8 @@
   m_vecTokens.clear();
   CLangInfo::LoadTokens(pRootElement->FirstChild("sorttokens"),m_vecTokens);
 
+  XMLUtils::GetBoolean(pRootElement, "displayremotecodes", m_displayRemoteCodes);
+
   // TODO: Should cache path be given in terms of our predefined paths??
   //       Are we even going to have predefined paths??
   CSettings::GetPath(pRootElement, "cachepath", m_cachePath);

Modified: branches/Dharma/xbmc/AdvancedSettings.h
===================================================================
--- branches/Dharma/xbmc/AdvancedSettings.h	2010-10-25 17:13:42 UTC (rev 35007)
+++ branches/Dharma/xbmc/AdvancedSettings.h	2010-10-25 17:19:11 UTC (rev 35008)
@@ -145,6 +145,7 @@
     bool m_fullScreenOnMovieStart;
     bool m_noDVDROM;
     CStdString m_cachePath;
+    bool m_displayRemoteCodes;
     CStdString m_videoCleanDateTimeRegExp;
     CStdStringArray m_videoCleanStringRegExps;
     CStdStringArray m_videoExcludeFromListingRegExps;

Modified: branches/Dharma/xbmc/ButtonTranslator.cpp
===================================================================
--- branches/Dharma/xbmc/ButtonTranslator.cpp	2010-10-25 17:13:42 UTC (rev 35007)
+++ branches/Dharma/xbmc/ButtonTranslator.cpp	2010-10-25 17:19:11 UTC (rev 35008)
@@ -504,6 +504,10 @@
   if (it2 == (*it).second.end())
     return 0;
 
+  // Convert the button to code
+  if (strnicmp((*it2).second.c_str(), "obc", 3) == 0)
+    return TranslateUniversalRemoteString((*it2).second.c_str());
+
   return TranslateRemoteString((*it2).second.c_str());
 }
 #endif
@@ -805,6 +809,8 @@
             buttonCode = TranslateGamepadString(pButton->Value());
         else if (type == "remote")
             buttonCode = TranslateRemoteString(pButton->Value());
+        else if (type == "universalremote")
+            buttonCode = TranslateUniversalRemoteString(pButton->Value());
         else if (type == "keyboard")
             buttonCode = TranslateKeyboardButton(pButton);
 
@@ -1011,6 +1017,18 @@
   return buttonCode;
 }
 
+uint32_t CButtonTranslator::TranslateUniversalRemoteString(const char *szButton)
+{
+  if (!szButton || strlen(szButton) < 4 || strnicmp(szButton, "obc", 3)) 
+    return 0;
+  const char *szCode = szButton + 3;
+  // Button Code is 255 - OBC (Original Button Code) of the button
+  uint32_t buttonCode = 255 - atol(szCode);
+  if (buttonCode > 255) 
+    buttonCode = 0;
+  return buttonCode;
+}
+
 uint32_t CButtonTranslator::TranslateKeyboardString(const char *szButton)
 {
   uint32_t buttonCode = 0;

Modified: branches/Dharma/xbmc/ButtonTranslator.h
===================================================================
--- branches/Dharma/xbmc/ButtonTranslator.h	2010-10-25 17:13:42 UTC (rev 35007)
+++ branches/Dharma/xbmc/ButtonTranslator.h	2010-10-25 17:19:11 UTC (rev 35008)
@@ -101,6 +101,8 @@
 
   static uint32_t TranslateGamepadString(const char *szButton);
   static uint32_t TranslateRemoteString(const char *szButton);
+  static uint32_t TranslateUniversalRemoteString(const char *szButton);
+
   static uint32_t TranslateKeyboardString(const char *szButton);
   static uint32_t TranslateKeyboardButton(TiXmlElement *pButton);
 

Modified: branches/Dharma/xbmc/utils/EventClient.cpp
===================================================================
--- branches/Dharma/xbmc/utils/EventClient.cpp	2010-10-25 17:13:42 UTC (rev 35007)
+++ branches/Dharma/xbmc/utils/EventClient.cpp	2010-10-25 17:19:11 UTC (rev 35008)
@@ -82,6 +82,10 @@
       {
         m_iKeyCode = CButtonTranslator::TranslateRemoteString( m_buttonName.c_str() );
       }
+      else if  ( m_mapName.compare("R2") == 0 ) // xbox unviversal remote map
+      {
+        m_iKeyCode = CButtonTranslator::TranslateUniversalRemoteString( m_buttonName.c_str() );
+      }
       else if ( (m_mapName.length() > 3) &&
                 (m_mapName.compare(0, 3, "LI:") == 0) ) // starts with LI: ?
       {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 35015
          http://xbmc.svn.sourceforge.net/xbmc/?rev=35015&view=rev
Author:   vdrfan
Date:     2010-10-25 17:26:12 +0000 (Mon, 25 Oct 2010)

Log Message:
-----------
removed: xbox leftover displayremotecodes code and references

(cherry picked from commit 1a5fe497af1fd84e292856a874c8227f5bfd78fc)

Modified Paths:
--------------
    branches/Dharma/system/keymaps/gamepad.xml
    branches/Dharma/system/keymaps/joystick.Alienware.Dual.Compatible.Controller.xml
    branches/Dharma/system/keymaps/joystick.AppleRemote.xml
    branches/Dharma/system/keymaps/joystick.Harmony.xml
    branches/Dharma/system/keymaps/joystick.Interact.AxisPad.xml
    branches/Dharma/system/keymaps/joystick.Microsoft.Xbox.360.Controller.xml
    branches/Dharma/system/keymaps/joystick.Microsoft.Xbox.Controller.S.xml
    branches/Dharma/system/keymaps/joystick.PS3.Remote.Keyboard.xml
    branches/Dharma/system/keymaps/joystick.Sony.PLAYSTATION(R)3.Controller.xml
    branches/Dharma/system/keymaps/joystick.WiiRemote.xml
    branches/Dharma/system/keymaps/keyboard.xml
    branches/Dharma/system/keymaps/remote.xml
    branches/Dharma/xbmc/AdvancedSettings.cpp
    branches/Dharma/xbmc/AdvancedSettings.h

Modified: branches/Dharma/system/keymaps/gamepad.xml
===================================================================
--- branches/Dharma/system/keymaps/gamepad.xml	2010-10-25 17:25:08 UTC (rev 35014)
+++ branches/Dharma/system/keymaps/gamepad.xml	2010-10-25 17:26:12 UTC (rev 35015)
@@ -16,7 +16,6 @@
 <!--    <universalremote>             -->
 <!--       <obc45>Stop</obc45>         -->
 <!--    </universalremote>            -->
-<!-- To find out the OBC's of your remote, try enabling the <displayremotecodes> tag in AdvancedSettings.xml -->
 
 <!-- Note that the action can be a built-in function.                 -->
 <!--  eg <B>XBMC.ActivateWindow(MyMusic)</B>                         -->

Modified: branches/Dharma/system/keymaps/joystick.Alienware.Dual.Compatible.Controller.xml
===================================================================
--- branches/Dharma/system/keymaps/joystick.Alienware.Dual.Compatible.Controller.xml	2010-10-25 17:25:08 UTC (rev 35014)
+++ branches/Dharma/system/keymaps/joystick.Alienware.Dual.Compatible.Controller.xml	2010-10-25 17:26:12 UTC (rev 35015)
@@ -16,7 +16,6 @@
 <!--    <universalremote>             -->
 <!--       <obc45>Stop</obc45>         -->
 <!--    </universalremote>            -->
-<!-- To find out the OBC's of your remote, try enabling the <displayremotecodes> tag in AdvancedSettings.xml -->
 
 <!-- Note that the action can be a built-in function.                 -->
 <!--  eg <B>XBMC.ActivateWindow(MyMusic)</B>                         -->

Modified: branches/Dharma/system/keymaps/joystick.AppleRemote.xml
===================================================================
--- branches/Dharma/system/keymaps/joystick.AppleRemote.xml	2010-10-25 17:25:08 UTC (rev 35014)
+++ branches/Dharma/system/keymaps/joystick.AppleRemote.xml	2010-10-25 17:26:12 UTC (rev 35015)
@@ -16,7 +16,6 @@
 <!--    <universalremote>             -->
 <!--       <obc45>Stop</obc45>         -->
 <!--    </universalremote>            -->
-<!-- To find out the OBC's of your remote, try enabling the <displayremotecodes> tag in AdvancedSettings.xml -->
 
 <!-- Note that the action can be a built-in function.                 -->
 <!--  eg <B>XBMC.ActivateWindow(MyMusic)</B>                         -->

Modified: branches/Dharma/system/keymaps/joystick.Harmony.xml
===================================================================
--- branches/Dharma/system/keymaps/joystick.Harmony.xml	2010-10-25 17:25:08 UTC (rev 35014)
+++ branches/Dharma/system/keymaps/joystick.Harmony.xml	2010-10-25 17:26:12 UTC (rev 35015)
@@ -16,7 +16,6 @@
 <!--    <universalremote>             -->
 <!--       <obc45>Stop</obc45>         -->
 <!--    </universalremote>            -->
-<!-- To find out the OBC's of your remote, try enabling the <displayremotecodes> tag in AdvancedSettings.xml -->
 
 <!-- Note that the action can be a built-in function.                 -->
 <!--  eg <B>XBMC.ActivateWindow(MyMusic)</B>                         -->

Modified: branches/Dharma/system/keymaps/joystick.Interact.AxisPad.xml
===================================================================
--- branches/Dharma/system/keymaps/joystick.Interact.AxisPad.xml	2010-10-25 17:25:08 UTC (rev 35014)
+++ branches/Dharma/system/keymaps/joystick.Interact.AxisPad.xml	2010-10-25 17:26:12 UTC (rev 35015)
@@ -16,7 +16,6 @@
 <!--    <universalremote>             -->
 <!--       <obc45>Stop</obc45>         -->
 <!--    </universalremote>            -->
-<!-- To find out the OBC's of your remote, try enabling the <displayremotecodes> tag in AdvancedSettings.xml -->
 
 <!-- Note that the action can be a built-in function.                 -->
 <!--  eg <B>XBMC.ActivateWindow(MyMusic)</B>                         -->

Modified: branches/Dharma/system/keymaps/joystick.Microsoft.Xbox.360.Controller.xml
===================================================================
--- branches/Dharma/system/keymaps/joystick.Microsoft.Xbox.360.Controller.xml	2010-10-25 17:25:08 UTC (rev 35014)
+++ branches/Dharma/system/keymaps/joystick.Microsoft.Xbox.360.Controller.xml	2010-10-25 17:26:12 UTC (rev 35015)
@@ -16,7 +16,6 @@
 <!--    <universalremote>             -->
 <!--       <obc45>Stop</obc45>         -->
 <!--    </universalremote>            -->
-<!-- To find out the OBC's of your remote, try enabling the <displayremotecodes> tag in AdvancedSettings.xml -->
 
 <!-- Note that the action can be a built-in function.                 -->
 <!--  eg <B>XBMC.ActivateWindow(MyMusic)</B>                         -->

Modified: branches/Dharma/system/keymaps/joystick.Microsoft.Xbox.Controller.S.xml
===================================================================
--- branches/Dharma/system/keymaps/joystick.Microsoft.Xbox.Controller.S.xml	2010-10-25 17:25:08 UTC (rev 35014)
+++ branches/Dharma/system/keymaps/joystick.Microsoft.Xbox.Controller.S.xml	2010-10-25 17:26:12 UTC (rev 35015)
@@ -16,7 +16,6 @@
 <!--    <universalremote>             -->
 <!--       <obc45>Stop</obc45>         -->
 <!--    </universalremote>            -->
-<!-- To find out the OBC's of your remote, try enabling the <displayremotecodes> tag in AdvancedSettings.xml -->
 
 <!-- Note that the action can be a built-in function.                 -->
 <!--  eg <B>XBMC.ActivateWindow(MyMusic)</B>                         -->

Modified: branches/Dharma/system/keymaps/joystick.PS3.Remote.Keyboard.xml
===================================================================
--- branches/Dharma/system/keymaps/joystick.PS3.Remote.Keyboard.xml	2010-10-25 17:25:08 UTC (rev 35014)
+++ branches/Dharma/system/keymaps/joystick.PS3.Remote.Keyboard.xml	2010-10-25 17:26:12 UTC (rev 35015)
@@ -16,7 +16,6 @@
 <!--    <universalremote>             -->
 <!--       <obc45>Stop</obc45>         -->
 <!--    </universalremote>            -->
-<!-- To find out the OBC's of your remote, try enabling the <displayremotecodes> tag in AdvancedSettings.xml -->
 
 <!-- Note that the action can be a built-in function.                 -->
 <!--  eg <B>XBMC.ActivateWindow(MyMusic)</B>                         -->

Modified: branches/Dharma/system/keymaps/joystick.Sony.PLAYSTATION(R)3.Controller.xml
===================================================================
--- branches/Dharma/system/keymaps/joystick.Sony.PLAYSTATION(R)3.Controller.xml	2010-10-25 17:25:08 UTC (rev 35014)
+++ branches/Dharma/system/keymaps/joystick.Sony.PLAYSTATION(R)3.Controller.xml	2010-10-25 17:26:12 UTC (rev 35015)
@@ -16,7 +16,6 @@
 <!--    <universalremote>             -->
 <!--       <obc45>Stop</obc45>         -->
 <!--    </universalremote>            -->
-<!-- To find out the OBC's of your remote, try enabling the <displayremotecodes> tag in AdvancedSettings.xml -->
 
 <!-- Note that the action can be a built-in function.                 -->
 <!--  eg <B>XBMC.ActivateWindow(MyMusic)</B>                         -->

Modified: branches/Dharma/system/keymaps/joystick.WiiRemote.xml
===================================================================
--- branches/Dharma/system/keymaps/joystick.WiiRemote.xml	2010-10-25 17:25:08 UTC (rev 35014)
+++ branches/Dharma/system/keymaps/joystick.WiiRemote.xml	2010-10-25 17:26:12 UTC (rev 35015)
@@ -16,7 +16,6 @@
 <!--    <universalremote>             -->
 <!--       <obc45>Stop</obc45>         -->
 <!--    </universalremote>            -->
-<!-- To find out the OBC's of your remote, try enabling the <displayremotecodes> tag in AdvancedSettings.xml -->
 
 <!-- Note that the action can be a built-in function.                 -->
 <!--  eg <B>XBMC.ActivateWindow(MyMusic)</B>                         -->

Modified: branches/Dharma/system/keymaps/keyboard.xml
===================================================================
--- branches/Dharma/system/keymaps/keyboard.xml	2010-10-25 17:25:08 UTC (rev 35014)
+++ branches/Dharma/system/keymaps/keyboard.xml	2010-10-25 17:26:12 UTC (rev 35015)
@@ -16,7 +16,6 @@
 <!--    <universalremote>             -->
 <!--       <obc45>Stop</obc45>         -->
 <!--    </universalremote>            -->
-<!-- To find out the OBC's of your remote, try enabling the <displayremotecodes> tag in AdvancedSettings.xml -->
 
 <!-- Note that the action can be a built-in function.                 -->
 <!--  eg <B>XBMC.ActivateWindow(MyMusic)</B>                         -->

Modified: branches/Dharma/system/keymaps/remote.xml
===================================================================
--- branches/Dharma/system/keymaps/remote.xml	2010-10-25 17:25:08 UTC (rev 35014)
+++ branches/Dharma/system/keymaps/remote.xml	2010-10-25 17:26:12 UTC (rev 35015)
@@ -16,7 +16,6 @@
 <!--    <universalremote>             -->
 <!--       <obc45>Stop</obc45>         -->
 <!--    </universalremote>            -->
-<!-- To find out the OBC's of your remote, try enabling the <displayremotecodes> tag in AdvancedSettings.xml -->
 
 <!-- Note that the action can be a built-in function.                 -->
 <!--  eg <B>XBMC.ActivateWindow(MyMusic)</B>                         -->

Modified: branches/Dharma/xbmc/AdvancedSettings.cpp
===================================================================
--- branches/Dharma/xbmc/AdvancedSettings.cpp	2010-10-25 17:25:08 UTC (rev 35014)
+++ branches/Dharma/xbmc/AdvancedSettings.cpp	2010-10-25 17:26:12 UTC (rev 35015)
@@ -134,7 +134,6 @@
   m_fullScreenOnMovieStart = true;
   m_noDVDROM = false;
   m_cachePath = "special://temp/";
-  m_displayRemoteCodes = false;
 
   m_videoCleanDateTimeRegExp = "(.*[^ _\\,\\.\\(\\)\\[\\]\\-])[ _\\.\\(\\)\\[\\]\\-]+(19[0-9][0-9]|20[0-1][0-9])([ _\\,\\.\\(\\)\\[\\]\\-]|[^0-9]$)";
 
@@ -615,8 +614,6 @@
   m_vecTokens.clear();
   CLangInfo::LoadTokens(pRootElement->FirstChild("sorttokens"),m_vecTokens);
 
-  XMLUtils::GetBoolean(pRootElement, "displayremotecodes", m_displayRemoteCodes);
-
   // TODO: Should cache path be given in terms of our predefined paths??
   //       Are we even going to have predefined paths??
   CSettings::GetPath(pRootElement, "cachepath", m_cachePath);

Modified: branches/Dharma/xbmc/AdvancedSettings.h
===================================================================
--- branches/Dharma/xbmc/AdvancedSettings.h	2010-10-25 17:25:08 UTC (rev 35014)
+++ branches/Dharma/xbmc/AdvancedSettings.h	2010-10-25 17:26:12 UTC (rev 35015)
@@ -145,7 +145,6 @@
     bool m_fullScreenOnMovieStart;
     bool m_noDVDROM;
     CStdString m_cachePath;
-    bool m_displayRemoteCodes;
     CStdString m_videoCleanDateTimeRegExp;
     CStdStringArray m_videoCleanStringRegExps;
     CStdStringArray m_videoExcludeFromListingRegExps;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 35035
          http://xbmc.svn.sourceforge.net/xbmc/?rev=35035&view=rev
Author:   anssih
Date:     2010-10-27 17:04:21 +0000 (Wed, 27 Oct 2010)

Log Message:
-----------
fixed: do not try to start pulse if --disable-pulse was used

(cherry picked from commit 169661b977191f84c01f8a060e6499dd2cbb303e)

Modified Paths:
--------------
    branches/Dharma/Makefile.in
    branches/Dharma/configure.in

Added Paths:
-----------
    branches/Dharma/tools/Linux/xbmc-standalone.sh.in
    branches/Dharma/tools/Linux/xbmc-standalone.sh.pulse

Removed Paths:
-------------
    branches/Dharma/tools/Linux/xbmc-standalone.sh

Modified: branches/Dharma/Makefile.in
===================================================================
--- branches/Dharma/Makefile.in	2010-10-27 17:02:14 UTC (rev 35034)
+++ branches/Dharma/Makefile.in	2010-10-27 17:04:21 UTC (rev 35035)
@@ -140,7 +140,7 @@
 CLEAN_FILES=xbmc.bin xbmc-xrandr
 
 DISTCLEAN_FILES=config.h config.log config.status tools/Linux/xbmc.sh \
-        autom4te.cache config.h.in~ \
+        tools/Linux/xbmc-standalone.sh autom4te.cache config.h.in~ \
         xbmc/lib/libPython/Python/Include/pyconfig.h \
         xbmc/lib/libPython/Python/configure.lineno \
         xbmc/lib/libPython/Python/libpython2.4.so.1.0 \

Modified: branches/Dharma/configure.in
===================================================================
--- branches/Dharma/configure.in	2010-10-27 17:02:14 UTC (rev 35034)
+++ branches/Dharma/configure.in	2010-10-27 17:04:21 UTC (rev 35035)
@@ -1225,8 +1225,10 @@
 fi
 
 if test "x$use_pulse" != "xno"; then
+  XBMC_STANDALONE_SH_PULSE=tools/Linux/xbmc-standalone.sh.pulse
   final_message="$final_message\n  PulseAudio:\tYes"
 else
+  XBMC_STANDALONE_SH_PULSE=/dev/null
   final_message="$final_message\n  PulseAudio:\tNo"
 fi
 
@@ -1428,6 +1430,7 @@
     xbmc/visualizations/iTunes/Makefile \
     xbmc/FileSystem/Makefile \
     tools/Linux/xbmc.sh \
+    tools/Linux/xbmc-standalone.sh \
     tools/TexturePacker/Makefile \
     tools/EventClients/Clients/OSXRemote/Makefile"
 
@@ -1484,6 +1487,7 @@
 AC_SUBST(LIBOGG_BASENAME)
 AC_SUBST(LIBVORBISENC_BASENAME)
 AC_SUBST(LIBVORBIS_BASENAME)
+AC_SUBST_FILE(XBMC_STANDALONE_SH_PULSE)
 
 # pushd and popd are not available in other shells besides bash, so implement
 # our own pushd/popd functions

Deleted: branches/Dharma/tools/Linux/xbmc-standalone.sh
===================================================================
--- branches/Dharma/tools/Linux/xbmc-standalone.sh	2010-10-27 17:02:14 UTC (rev 35034)
+++ branches/Dharma/tools/Linux/xbmc-standalone.sh	2010-10-27 17:04:21 UTC (rev 35035)
@@ -1,57 +0,0 @@
-#!/bin/sh
-
-#      Copyright (C) 2009-2010 Team XBMC
-#      http://www.xbmc.org
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with XBMC; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-
-XBMC="xbmc --standalone \"$@\""
-
-PULSE_START="$(which start-pulseaudio-x11)"
-if [ -n "$PULSE_START" ]; then
-  $PULSE_START
-else
-  PULSE_SESSION="$(which pulse-session)"
-  if [ -n "$PULSE_SESSION" ]; then
-    XBMC="$PULSE_SESSION $XBMC"
-  fi
-fi
-
-LOOP=1
-CRASHCOUNT=0
-LASTSUCCESSFULSTART=$(date +%s)
-
-while [ $(( $LOOP )) = "1" ]
-do
-  $XBMC
-  RET=$?
-  NOW=$(date +%s)
-  if [ $(( ($RET >= 64 && $RET <=66) || $RET == 0 )) = "1" ]; then # clean exit
-    LOOP=0
-  else # crash
-    DIFF=$((NOW-LASTSUCCESSFULSTART))
-    if [ $(($DIFF > 60 )) = "1" ]; then # Not on startup, ignore
-      LASTSUCESSFULSTART=$NOW
-      CRASHCOUNT=0
-    else # at startup, look sharp
-      CRASHCOUNT=$((CRASHCOUNT+1))
-      if [ $(($CRASHCOUNT >= 3)) = "1" ]; then # Too many, bail out
-        LOOP=0
-        echo "XBMC has exited uncleanly 3 times in the ${DIFF}s. Something is probably wrong"
-      fi
-    fi
-  fi
-done

Copied: branches/Dharma/tools/Linux/xbmc-standalone.sh.in (from rev 35030, branches/Dharma/tools/Linux/xbmc-standalone.sh)
===================================================================
--- branches/Dharma/tools/Linux/xbmc-standalone.sh.in	                        (rev 0)
+++ branches/Dharma/tools/Linux/xbmc-standalone.sh.in	2010-10-27 17:04:21 UTC (rev 35035)
@@ -0,0 +1,49 @@
+#!/bin/sh
+
+#      Copyright (C) 2009-2010 Team XBMC
+#      http://www.xbmc.org
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with XBMC; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+
+XBMC="xbmc --standalone \"$@\""
+
+@XBMC_STANDALONE_SH_PULSE@
+
+LOOP=1
+CRASHCOUNT=0
+LASTSUCCESSFULSTART=$(date +%s)
+
+while [ $(( $LOOP )) = "1" ]
+do
+  $XBMC
+  RET=$?
+  NOW=$(date +%s)
+  if [ $(( ($RET >= 64 && $RET <=66) || $RET == 0 )) = "1" ]; then # clean exit
+    LOOP=0
+  else # crash
+    DIFF=$((NOW-LASTSUCCESSFULSTART))
+    if [ $(($DIFF > 60 )) = "1" ]; then # Not on startup, ignore
+      LASTSUCESSFULSTART=$NOW
+      CRASHCOUNT=0
+    else # at startup, look sharp
+      CRASHCOUNT=$((CRASHCOUNT+1))
+      if [ $(($CRASHCOUNT >= 3)) = "1" ]; then # Too many, bail out
+        LOOP=0
+        echo "XBMC has exited uncleanly 3 times in the ${DIFF}s. Something is probably wrong"
+      fi
+    fi
+  fi
+done

Added: branches/Dharma/tools/Linux/xbmc-standalone.sh.pulse
===================================================================
--- branches/Dharma/tools/Linux/xbmc-standalone.sh.pulse	                        (rev 0)
+++ branches/Dharma/tools/Linux/xbmc-standalone.sh.pulse	2010-10-27 17:04:21 UTC (rev 35035)
@@ -0,0 +1,9 @@
+PULSE_START="$(which start-pulseaudio-x11)"
+if [ -n "$PULSE_START" ]; then
+  $PULSE_START
+else
+  PULSE_SESSION="$(which pulse-session)"
+  if [ -n "$PULSE_SESSION" ]; then
+    XBMC="$PULSE_SESSION $XBMC"
+  fi
+fi


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 35105
          http://xbmc.svn.sourceforge.net/xbmc/?rev=35105&view=rev
Author:   spiff_
Date:     2010-10-30 19:32:30 +0000 (Sat, 30 Oct 2010)

Log Message:
-----------
updated: ticket #10599 - dutch translation. thanks to adje
updated: ticket #10601 - greek translation. thanks to ydatografida

(cherry picked from commit 15741f688faa764ae5f2a733c1639d4cad114e31)

Modified Paths:
--------------
    branches/Dharma/addons/skin.confluence/language/Dutch/strings.xml
    branches/Dharma/language/Dutch/strings.xml
    branches/Dharma/language/Greek/strings.xml

Modified: branches/Dharma/addons/skin.confluence/language/Dutch/strings.xml
===================================================================
--- branches/Dharma/addons/skin.confluence/language/Dutch/strings.xml	2010-10-30 19:29:33 UTC (rev 35104)
+++ branches/Dharma/addons/skin.confluence/language/Dutch/strings.xml	2010-10-30 19:32:30 UTC (rev 35105)
@@ -82,6 +82,7 @@
   <string id="31128">XBMC-songteksten</string>
   <string id="31129">Downloaden ondertitels in video-OSD inschakelen</string>
   <string id="31130">Pad naar ondertitelscript</string>
+  <string id="31131">Horizontaal home menu gebruiken</string>
 
   <string id="31140">Muziek-OSD</string>
   <string id="31141">Video-OSD</string>

Modified: branches/Dharma/language/Dutch/strings.xml
===================================================================
--- branches/Dharma/language/Dutch/strings.xml	2010-10-30 19:29:33 UTC (rev 35104)
+++ branches/Dharma/language/Dutch/strings.xml	2010-10-30 19:32:30 UTC (rev 35105)
@@ -564,7 +564,9 @@
   <string id="609">CDDA-doelmap is niet ingegeven.</string>
   <string id="610">Muzieknummer rippen</string>
   <string id="611">Voer nummer in</string>
-
+  <string id="612">Bits/Sample</string> 
+  <string id="613">Sample frequentie</string>
+  
   <string id="620">CD's kopiëren</string>
   <string id="621">Encoder</string>
   <string id="622">Kwaliteit</string>
@@ -994,11 +996,11 @@
   <string id="12385">Dag/Maand</string>
   <string id="12386">Maand/Dag</string>
 
-  <string id="12390">Systeem draaitijd</string>
+  <string id="12390">Systeem actief</string>
   <string id="12391">minuten</string>
   <string id="12392">uur</string>
   <string id="12393">dagen</string>
-  <string id="12394">Totale draaitijd</string>
+  <string id="12394">Totale activiteit</string>
 
   <string id="12600">Het weer</string>
 
@@ -1023,6 +1025,7 @@
   <string id="13015">Actie voor aan/uitknop</string>
   <string id="13016">Systeem uitschakelen</string> 
 
+
   <string id="13020">Er is een andere sessie actief, wellicht SSH?</string>
   <string id="13021">Verwisselbare harde schijf aankoppelen?</string>
   <string id="13022">Apparaat onveilig verwijderd</string>
@@ -1776,6 +1779,7 @@
   <string id="20255">Eerste login, profiel bijwerken</string>
   <string id="20256">HTS tvheadend client</string>
   <string id="20257">VDR streamdev client</string>
+  <string id="20258">MythTV client</string>
 
   <string id="20300">Webservermap (HTTP)</string>
   <string id="20301">Webservermap (HTTPS)</string>
@@ -2255,6 +2259,8 @@
   <string id="24096">Add-on is gemarkeerd als niet werkend in het repository.</string>
   <string id="24097">Wilt u de add-on uitschakelen?</string> <!--'op het systeem' is hier overbodig-->
   <string id="24098">Defect</string>
+  <string id="24099">Wilt u deze skin gebruiken?</string>
+  <string id="25000">Meldingen</string>  
   
  <!-- strings 29800 thru 29998 reserved strings used only in the default Project Mayhem III skin and not c++ code -->
   <string id="29800">Bibliotheekmodus</string>

Modified: branches/Dharma/language/Greek/strings.xml
===================================================================
--- branches/Dharma/language/Greek/strings.xml	2010-10-30 19:29:33 UTC (rev 35104)
+++ branches/Dharma/language/Greek/strings.xml	2010-10-30 19:32:30 UTC (rev 35105)
@@ -2,9 +2,9 @@
 <!--Language file translated with Team XBMC Translator-->
 <!--Translator: Ydatografida-->
 <!--Email: ydatografida@...>
-<!--Date of translation: 10/14/2010-->
+<!--Date of translation: 10/30/2010-->
 <!--$Revision$-->
-<!--Based on english strings version 34753-->
+<!--Based on english strings version 35007-->
 <strings>
   <string id="0">Εφαρμογές</string>
   <string id="1">Φωτογραφίες</string>
@@ -936,7 +936,6 @@
   <string id="13013">Επανεκκίνηση</string>
   <string id="13014">Ελαχιστοποίηση</string>
   <string id="13015">Ενέργεια πλήκτρου λειτουργίας</string>
-  <string id="13016">Απενεργοποίηση</string>
   <string id="13020">Είναι ενεργή άλλη συνεδρία (ίσως μέσω ssh);</string>
   <string id="13021">Προσάρτηση αναιρούμενου δίσκου</string>
   <string id="13022">Επισφαλής αφαίρεση συσκευής</string>
@@ -1148,10 +1147,6 @@
   <string id="13508">Υψηλή</string>
   <string id="13509">Πραγματικά υψηλή (αργή!)</string>
   <string id="13510">Συγχρονισμός αναπαραγωγής ήχου κατά τη προβολή</string>
-  <string id="13550">Παύση κατά τη διάρκεια ανανέωσης</string>
-  <string id="13551">Ανενεργή</string>
-  <string id="13552">%.1f δευτερόλεπτο</string>
-  <string id="13553">%.1f δευτερόλεπτα</string>
   <string id="13600">Apple Remote</string>
   <string id="13602">Έγκριση έναρξης του XBMC μέσου απομακρυσμένου ελέγχου</string>
   <string id="13603">Ακολουθία χρόνου καθυστέρησης</string>
@@ -1406,6 +1401,9 @@
   <string id="16318">Χρονική/Χωρική (κατά το ήμισυ)</string>
   <string id="16319">DXVA</string>
   <string id="16400">Μετα-επεξεργασία βίντεο</string>
+  <string id="16401">Ανενεργή</string>
+  <string id="16402">Ενεργή για περιεχόμενο SD</string>
+  <string id="16403">Πάντα ενεργή</string>
   <string id="17500">Προβολή λήξης χρόνου αναστόλης</string>
   <string id="19000">Αλλαγή καναλιού</string>
   <string id="20000">Φάκελος αποθήκευσης μουσικής</string>
@@ -1597,7 +1595,6 @@
   <string id="20255">Πρώτη σύνδεση, επεξεργαστείτε το προφίλ σας</string>
   <string id="20256">HTS Tvheadend client</string>
   <string id="20257">VDR Streamdev client</string>
-  <string id="20258">MythTV client</string>
   <string id="20300">Κατάλογος διακομιστή ιστού (HTTP)</string>
   <string id="20301">Κατάλογος διακομιστή ιστού (HTTPS)</string>
   <string id="20302">Αδυναμία εγγραφής στο φάκελλο:</string>
@@ -2028,6 +2025,8 @@
   <string id="24096">Το πρόσθετο έχει επισημανθεί ως κατεστραμμένο στο αποθετήριο.</string>
   <string id="24097">Επιθυμητέ να απενεργοποιηθεί από το σύστημά σας;</string>
   <string id="24098">Κατεστραμμένο</string>
+  <string id="24099">Επιθυμητέ να εφαρμοστεί αυτό το κέλυφος;</string>
+  <string id="25000">Ειδοποιήσεις</string>
   <string id="29800">Λειτουργία συλλογής</string>
   <string id="29801">Διάταξη πληκτρολογίου QWERTY</string>
   <string id="29802">Σε λειτουργία η διέλευση ήχου</string>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 35113
          http://xbmc.svn.sourceforge.net/xbmc/?rev=35113&view=rev
Author:   vdrfan
Date:     2010-10-31 18:06:30 +0000 (Sun, 31 Oct 2010)

Log Message:
-----------
updated: Portuguese (Brazil) language for XBMC and Confluence (thanks fabianosan)

(cherry picked from commit ee87c584e40d236ef550548c0c4330e60fbdb22b)

Modified Paths:
--------------
    branches/Dharma/addons/skin.confluence/language/Portuguese (Brazil)/strings.xml
    branches/Dharma/language/Portuguese (Brazil)/strings.xml

Modified: branches/Dharma/addons/skin.confluence/language/Portuguese (Brazil)/strings.xml
===================================================================
--- branches/Dharma/addons/skin.confluence/language/Portuguese (Brazil)/strings.xml	2010-10-31 13:58:11 UTC (rev 35112)
+++ branches/Dharma/addons/skin.confluence/language/Portuguese (Brazil)/strings.xml	2010-10-31 18:06:30 UTC (rev 35113)
@@ -88,8 +88,9 @@
   <string id="31126">Habilitar Letras no OSD de M\xFAsica</string>
   <string id="31127">CAMINHO PARA SCRIPT DE LETRAS</string>
   <string id="31128">Letras XBMC</string>
-  <string id="31129">Ativar download de legendas no OSD de video</string>
+  <string id="31129">Ativar Download de Legendas no OSD de Video</string>
   <string id="31130">CAMINHO PARA SCRIPT DE LEGENDA</string>
+  <string id="31131">Usar Menu Horizontal na Tela Inicial</string>
 
   <string id="31140">OSD de M\xFAsica</string>
   <string id="31141">OSD de Video</string>

Modified: branches/Dharma/language/Portuguese (Brazil)/strings.xml
===================================================================
--- branches/Dharma/language/Portuguese (Brazil)/strings.xml	2010-10-31 13:58:11 UTC (rev 35112)
+++ branches/Dharma/language/Portuguese (Brazil)/strings.xml	2010-10-31 18:06:30 UTC (rev 35113)
@@ -570,6 +570,8 @@
   <string id="609">CDDARipPath não foi definido.</string>
   <string id="610">Extrair faixa de áudio</string>
   <string id="611">Digite número</string>
+  <string id="612">Bits/Amostra</string>
+  <string id="613">Frequencia de amostra</string>
 
   <string id="620">CDs de áudio</string>
   <string id="621">Codificador</string>
@@ -1544,7 +1546,7 @@
 
   <string id="16300">Método para escalamento de vídeo</string>
   <string id="16301">Vizinho mais próximo</string>
-  <string id="16302">Bilienar</string>
+  <string id="16302">Bilinear</string>
   <string id="16303">Bicúbico</string>
   <string id="16304">Lanczos2</string>
   <string id="16305">Lanczos3</string>
@@ -1775,6 +1777,7 @@
   <string id="20255">Primeiro logon, editar seu perfil</string>
   <string id="20256">Cliente HTS Tvheadend</string>
   <string id="20257">Cliente VDR Streamdev</string>
+  <string id="20258">Cliente MythTV</string>
 
   <string id="20300">Diretório do servidor Web (HTTP)</string>
   <string id="20301">Diretório do servidor Web (HTTPS)</string>
@@ -2216,7 +2219,7 @@
   <string id="24036">Log de mudança</string>
   <string id="24037">Desinstalar</string>
   <string id="24038">Instalar</string>
-  <string id="24039">Desativar Add-ons</string>
+  <string id="24039">Add-ons Desativados</string>
   <string id="24040">(Limpar configuração atual)</string>
   <string id="24041">Instalar a partir de um arquivo ZIP</string>
   <string id="24042">Baixando %i%%</string>
@@ -2230,7 +2233,7 @@
   <string id="24059">Deseja ativar este Add-on?</string>
   <string id="24060">Deseja desativar este Add-on?</string>
   <string id="24061">Atualização do Add-on Disponível!</string>
-  <string id="24062">Ativar Add-ons</string>
+  <string id="24062">Add-ons Ativados</string>
   <string id="24063">Atualização Automática</string>
   <string id="24064">Add-on ativado</string>
   <string id="24065">Add-on atualizado</string>
@@ -2258,8 +2261,9 @@
   <string id="24096">O Add-on foi marcado como indisponível no repositório.</string>
   <string id="24097">Você deseja desabilitar em seu sistema?</string>
   <string id="24098">Indisponível</string>
+  <string id="24099">Gostaria de trocar para esta skin?</string>
+  <string id="25000">Notificações</string>
 
-
   <string id="29800">Modo de coleção</string>
   <string id="29801">Teclado QWERTY</string>
   <string id="29802">Utilizando áudio em passthrough</string>
@@ -2344,4 +2348,4 @@
   <string id="33083">Habilitar botão de script personalizado</string>
 
   <string id="34100">Configurar alto-falantes</string>
-</strings>
\ No newline at end of file
+</strings>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 35155
          http://xbmc.svn.sourceforge.net/xbmc/?rev=35155&view=rev
Author:   spiff_
Date:     2010-11-03 18:48:52 +0000 (Wed, 03 Nov 2010)

Log Message:
-----------
updated: ticket #10636 - romanian translation. thanks to Danny3

Modified Paths:
--------------
    branches/Dharma/addons/metadata.albums.allmusic.com/addon.xml
    branches/Dharma/addons/metadata.artists.allmusic.com/addon.xml
    branches/Dharma/addons/metadata.common.allmusic.com/addon.xml
    branches/Dharma/addons/metadata.common.themoviedb.org/addon.xml
    branches/Dharma/addons/metadata.mtv.com/addon.xml
    branches/Dharma/addons/metadata.themoviedb.org/addon.xml
    branches/Dharma/addons/metadata.themoviedb.org/resources/language/Romanian/strings.xml
    branches/Dharma/addons/metadata.tvdb.com/addon.xml
    branches/Dharma/addons/skin.confluence/language/Romanian/strings.xml
    branches/Dharma/language/Romanian/strings.xml

Added Paths:
-----------
    branches/Dharma/addons/metadata.albums.allmusic.com/resources/language/Romanian/
    branches/Dharma/addons/metadata.albums.allmusic.com/resources/language/Romanian/strings.xml
    branches/Dharma/addons/metadata.artists.allmusic.com/resources/language/Romanian/
    branches/Dharma/addons/metadata.artists.allmusic.com/resources/language/Romanian/strings.xml
    branches/Dharma/addons/metadata.tvdb.com/resources/language/Romanian/
    branches/Dharma/addons/metadata.tvdb.com/resources/language/Romanian/strings.xml

Modified: branches/Dharma/addons/metadata.albums.allmusic.com/addon.xml
===================================================================
--- branches/Dharma/addons/metadata.albums.allmusic.com/addon.xml	2010-11-03 18:42:21 UTC (rev 35154)
+++ branches/Dharma/addons/metadata.albums.allmusic.com/addon.xml	2010-11-03 18:48:52 UTC (rev 35155)
@@ -21,6 +21,7 @@
     <summary lang="nl">AllMusic-albuminfo</summary>
     <summary lang="pl">Informacje o albumach z AllMusic</summary>
     <summary lang="pt">Scraper de músicas AllMusic</summary>
+    <summary lang="ro">Catalog AllMusic pentru informații albume</summary>
     <summary lang="ru">Информация об альбоме из AllMusic</summary>
     <summary lang="zh">AllMusic音乐专辑信息</summary>
     <description lang="en">Use AllMusic.com to fill your library metadata information.
@@ -50,6 +51,9 @@
     <description lang="pt">Use o AllMusic.com para obter a informação da sua Biblioteca de música. O site allmusic foi criado em 1995 para alimentar a paixão dos fans de música.
 O pessoal da redacção da AMG, em conjunto com centenas de especialistas (todos fanáticos por música à sua maneira), tornaram o allmusic o mais completo site de referência musical do planeta. Continuam dedicados a criar e manter o conhecimento, espírito e conteúdos que fans de música e profissionais da indústria se habituaram a obter da AMG.
 Todos os géneros e estilos de música podem ser encontrados aqui, desde o mais comercial e popular até à música mais rara. Nós revemos e criticamos álbuns e artistas dentro do contexto do seu género - the ópera a rock de garagem, de pop a música country. Isto assegura que fans de qualquer género podem depender de nós para os manter actualizados sobre os seus artistas favoritos bem como de novos sons.</description>
+     <description lang="ro">Folosiți AllMusic.com ca sursă pentru mediateca dumneavoastră.
+Site-ul allmusic a fost creat în 1995 ca un loc unde iubitorii de muzică să se răsfețe. Echipa editorială AMG, împreună cu sute de contribuitori experți (niște fanatici după muzică în felul lor), au făcut allmusic cea mai cuprinzătoare sursă de referințe muzicale de pe planetă. Toți sunt dedicați să creeze și să întrețină conținutul pe care iubitorii de muzică și profesioniștii din industrie îl așteaptă de la AMG.
+Toate genurile și stilurile de muzică sunt incluse aici, începând de la cele mai populare către cele mai obscure. Noi criticăm albumele și artiștii în contextul genurilor proprii. Toți fanii oricărui stil de muzică pot conta pe noi să îi ținem la curent cu artiștii lor favoriți, dar și să le prezentăm noi cântece.</description>
     <description lang="ru">Используйте AllMusic.com для добавления мета-данных в вашу библиотеку.
 Сайт allmusic был создан в 1995 как место для фанатов музыки, где они могли бы удовлетворять свою страсть.
 Редакторский состав AMG, вместе с сотнями участников-экспертов (каждый по-своему фанат музыки), сделали allmusic самым полным источником информации о музыке на планете. Все они посвятили себя созданию и поддержке полезного, и познавательного, контента который любители музыки, и профессионалы индустрии, ожидают от AMG.

Added: branches/Dharma/addons/metadata.albums.allmusic.com/resources/language/Romanian/strings.xml
===================================================================
--- branches/Dharma/addons/metadata.albums.allmusic.com/resources/language/Romanian/strings.xml	                        (rev 0)
+++ branches/Dharma/addons/metadata.albums.allmusic.com/resources/language/Romanian/strings.xml	2010-11-03 18:48:52 UTC (rev 35155)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<strings>
+    <string id="30000">Descarcă imagini album de la Allmusic.com</string>
+    <string id="30001">Descarcă imagini album de la Last.fm</string>
+</strings>

Modified: branches/Dharma/addons/metadata.artists.allmusic.com/addon.xml
===================================================================
--- branches/Dharma/addons/metadata.artists.allmusic.com/addon.xml	2010-11-03 18:42:21 UTC (rev 35154)
+++ branches/Dharma/addons/metadata.artists.allmusic.com/addon.xml	2010-11-03 18:48:52 UTC (rev 35155)
@@ -21,6 +21,7 @@
     <summary lang="nl">AllMusic-artiestinfo</summary>
     <summary lang="pl">Informacje o artystach AllMusic</summary>
     <summary lang="pt">Scraper de músicas AllMusic</summary>
+    <summary lang="ro">Catalog AllMusic pentru informații artiști</summary>
     <summary lang="ru">Информация об исполнителе из AllMusic</summary>
     <summary lang="zh">AllMusic艺术家信息</summary>
     <description lang="en">Use AllMusic.com to fill your libray metadata information.
@@ -50,6 +51,10 @@
     <description lang="pt">Use o AllMusic.com para obter a informação da sua Biblioteca de música. O site allmusic foi criado em 1995 para alimentar a paixão dos fans de música.
 O pessoal da redacção da AMG, em conjunto com centenas de especialistas (todos fanáticos por música à sua maneira), tornaram o allmusic o mais completo site de referência musical do planeta. Continuam dedicados a criar e manter o conhecimento, espírito e conteúdos que fans de música e profissionais da indústria se habituaram a obter da AMG.
 Todos os géneros e estilos de música podem ser encontrados aqui, desde o mais comercial e popular até à música mais rara. Nós revemos e criticamos álbuns e artistas dentro do contexto do seu género - the ópera a rock de garagem, de pop a música country. Isto assegura que fans de qualquer género podem depender de nós para os manter actualizados sobre os seus artistas favoritos bem como de novos sons.</description>
+    <description lang="ro">Folosiți AllMusic.com ca sursă pentru mediateca dumneavoastră.
+Site-ul allmusic a fost creat în 1995 ca un loc unde iubitorii de muzică să se răsfețe. Toate genurile și stilurile de muzică sunt incluse aici, începând de la cele mai populare către cele mai obscure. Noi criticăm albumele și artiștii în contextul genurilor proprii.
+
+Home Theater Backdrops (HTBackdrops.com) este o bază de date de imagini realizată de comunitate pentru imagini de înaltă calitate ale artiștiilor, cum ar fi miniaturi și imagini realizate de fani (fanarts). Toate imaginile au fost create sau au ca sursă membrii ei. Vă rugăm să luați în considerare că puteți încărca propriile imagini cu muzicianul preferat.</description>
     <description lang="ru">Используйте AllMusic.com для добавления мета-данных в вашу библиотеку.
 Сайт allmusic был создан в 1995 как место для фанатов музыки, где они могли бы удовлетворять свою страсть.
 Редакторский состав AMG, вместе с сотнями участников-экспертов (каждый по-своему фанат музыки), сделали allmusic самым полным источником информации о музыке на планете. Все они посвятили себя созданию и поддержке полезного, и познавательного, контента который любители музыки, и профессионалы индустрии, ожидают от AMG.

Added: branches/Dharma/addons/metadata.artists.allmusic.com/resources/language/Romanian/strings.xml
===================================================================
--- branches/Dharma/addons/metadata.artists.allmusic.com/resources/language/Romanian/strings.xml	                        (rev 0)
+++ branches/Dharma/addons/metadata.artists.allmusic.com/resources/language/Romanian/strings.xml	2010-11-03 18:48:52 UTC (rev 35155)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<strings>
+    <string id="30000">Descarcă imagini fundal (fanarts) de la HTBackdrops.com</string>
+    <string id="30001">Descarcă imagini artist de la Allmusic.com</string>
+    <string id="30002">Descarcă imagini artist de la Last.fm</string>
+    <string id="30003">Descarcă imagini artist de la HTBackdrops.com</string>
+</strings>

Modified: branches/Dharma/addons/metadata.common.allmusic.com/addon.xml
===================================================================
--- branches/Dharma/addons/metadata.common.allmusic.com/addon.xml	2010-11-03 18:42:21 UTC (rev 35154)
+++ branches/Dharma/addons/metadata.common.allmusic.com/addon.xml	2010-11-03 18:48:52 UTC (rev 35155)
@@ -19,6 +19,7 @@
     <summary lang="nl">AllMusic-scraperfuncties</summary>
     <summary lang="pl">Scraper muzyki AllMusic</summary>
     <summary lang="pt">Scraper de música AllMusic</summary>
+    <summary lang="ro">Bibliotecă catalog de muzică AllMusic</summary>
     <summary lang="ru">Музыкальная Информация AllMusic</summary>
     <summary lang="zh">AllMusic音乐刮削器代码库</summary>
     <description lang="en">Download Music information from http://www.allmusic.com</description>
@@ -29,6 +30,7 @@
     <description lang="nl">Muziekinformatie ophalen van http://www.allmusic.com</description>
     <description lang="pl">Pobieraj informacje o muzyce z http://www.allmusic.com</description>
     <description lang="pt">Descarregar informação de música de http://www.allmusic.com</description>
+    <description lang="ro">Descărcați informații muzică de pe http://www.allmusic.com</description>
     <description lang="ru">Загружать информацию о Музыке с http://www.allmusic.com</description>
     <description lang="zh">从www.allmusic.com下载音乐信息</description>
   </extension>

Modified: branches/Dharma/addons/metadata.common.themoviedb.org/addon.xml
===================================================================
--- branches/Dharma/addons/metadata.common.themoviedb.org/addon.xml	2010-11-03 18:42:21 UTC (rev 35154)
+++ branches/Dharma/addons/metadata.common.themoviedb.org/addon.xml	2010-11-03 18:48:52 UTC (rev 35155)
@@ -18,7 +18,7 @@
     <summary lang="nl">TMDb-scraperfuncties</summary> 			<!--Dit gaat over de functies, niet over de mediabibliotheek!-->
     <summary lang="pl">Scraper biblioteki TMDb</summary>
     <summary lang="pt">Scraper de filmes TMDb</summary>
-    <summary lang="ro">Bibliotecă scraper TMDb</summary>
+    <summary lang="ro">Bibliotecă catalog TMDb</summary>
     <summary lang="ru">Обработчик для TMDb</summary>
     <summary lang="zh">TMDb刮削器代码库</summary>
     <description lang="en">Download thumbs and fanarts from http://www.themoviedb.org</description>
@@ -28,7 +28,7 @@
     <description lang="nl">Miniaturen en fanart ophalen van http://www.themoviedb.org</description>
     <description lang="pl">Pobieraj ikony i fanarty z http://www.themoviedb.org</description>
     <description lang="pt">Descarregar informação de filmes de http://www.themoviedb.org</description>
-    <description lang="ro">Descarcă miniaturi și fanart-uri de pe http://www.themoviedb.org</description>
+    <description lang="ro">Descărcați miniaturi și imagini realizate de fani de pe http://www.themoviedb.org</description>
     <description lang="ru">Загружать миниатюры и фанарт с http://www.themoviedb.org</description>
     <description lang="zh">从www.themoviedb.org下载海报和同人画</description>
   </extension>

Modified: branches/Dharma/addons/metadata.mtv.com/addon.xml
===================================================================
--- branches/Dharma/addons/metadata.mtv.com/addon.xml	2010-11-03 18:42:21 UTC (rev 35154)
+++ branches/Dharma/addons/metadata.mtv.com/addon.xml	2010-11-03 18:48:52 UTC (rev 35155)
@@ -19,7 +19,7 @@
     <summary lang="nl">MTV-muziekvideoscraper</summary>
     <summary lang="pl">Scraper teledysków MTV</summary>
     <summary lang="pt">Scraper de videoclips MTV</summary>
-    <summary lang="ro">Scraper MTV pentru videoclipuri</summary>
+    <summary lang="ro">Catalog MTV pentru videoclipuri</summary>
     <summary lang="ru">Обработчик музыкальных видео для MTV</summary>
     <summary lang="se">MTV Musikvideoskrapa</summary>
     <summary lang="zh">MTV音乐电视刮削器</summary>

Modified: branches/Dharma/addons/metadata.themoviedb.org/addon.xml
===================================================================
--- branches/Dharma/addons/metadata.themoviedb.org/addon.xml	2010-11-03 18:42:21 UTC (rev 35154)
+++ branches/Dharma/addons/metadata.themoviedb.org/addon.xml	2010-11-03 18:48:52 UTC (rev 35155)
@@ -13,7 +13,7 @@
              language="en"
              library="tmdb.xml"/>
   <extension point="xbmc.addon.metadata">
-    <summary lang="en">TMDB Movie Scraper</summary>
+    <summary lang="en">TMDb Movie Scraper</summary>
     <summary lang="de">Film-Scraper für TheMovieDB</summary>
     <summary lang="es">Scraper de películas de TheMovieDB</summary>
     <summary lang="hu">TMDB filmadat leolvasó</summary>
@@ -21,6 +21,7 @@
     <summary lang="pl">Scraper filmowy TMDB</summary>
     <summary lang="pt">Scraper de filmes TMDb</summary>
     <summary lang="ro">Scraper de filme TMDb</summary>
+    <summary lang="ro">Catalog de filme TMDb</summary>
     <summary lang="ru">Обработчик Фильмов для TMDB</summary>
     <summary lang="zh">TMDB电影刮削器</summary>
     <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>
@@ -30,7 +31,7 @@
     <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="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="pt">O themoviedb.org é uma base de dados de filmes livre e aberta. É completamente actualizado 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 de muitos softwares média center, como o popular XBMC, para obter informação, posters e fanart que enriquecem a experiência do utilizador.</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>
+    <description lang="ro">themoviedb.org este o bază de date de filme deschisă și gratuită. Este actualizată de oameni ca dumneavoastră. TMDb este curent folosită de milioane de oameni în fiecare lună și datorită API-ului puternic, este de asemenea folosită de multe centre media populare ca XBMC pentru a obține informații despre filme, afișe și imagini realizate de fani (Fanart) care îmbogățesc experiența utilizatorului.</description>
     <description lang="ru">themoviedb.org это бесплатная и открытая база данных фильмов. Она полностью поддерживается такими же людьми как и ты. В данный момент TMDb используется миллионами людей каждый месяц, и, с его мощным API, используется различными популярными медиа-центрами, такими как XBMC, для получения к Фильмам мета-данных, постеров и фанарта в целях улучшения пользовательского опыта.</description>
     <description lang="zh">themoviedb.org是一个开放和自由的电影数据库。它完全由象你一样的用户来掌控。TMDb每月为上百万用户提供服务，并通过强大的API界面为许多流行的媒体中心系统如XBMC提供电影资料、封面海报和同人画以丰富用户的体验。</description>
     <platform>all</platform>

Modified: branches/Dharma/addons/metadata.themoviedb.org/resources/language/Romanian/strings.xml
===================================================================
--- branches/Dharma/addons/metadata.themoviedb.org/resources/language/Romanian/strings.xml	2010-11-03 18:42:21 UTC (rev 35154)
+++ branches/Dharma/addons/metadata.themoviedb.org/resources/language/Romanian/strings.xml	2010-11-03 18:48:52 UTC (rev 35155)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <strings>
-    <string id="30000">Activează Fanart</string>
+    <string id="30000">Activează imagini de fundal realizate de fani (Fanart)</string>
     <string id="30001">Activează trailere de la HD-Trailers.net</string>
     <string id="30002">Limbă preferată</string>
+    <string id="30003">Ia nota de pe IMDb</string>
 </strings>

Modified: branches/Dharma/addons/metadata.tvdb.com/addon.xml
===================================================================
--- branches/Dharma/addons/metadata.tvdb.com/addon.xml	2010-11-03 18:42:21 UTC (rev 35154)
+++ branches/Dharma/addons/metadata.tvdb.com/addon.xml	2010-11-03 18:48:52 UTC (rev 35155)
@@ -19,7 +19,7 @@
     <summary lang="nl">Seriemetadata ophalen van TheTVDB.com</summary>
     <summary lang="pl">Pobieraj dane o serialach TV z TheTVDB.com</summary>
     <summary lang="pt">Scraper de séries de TV TVDB.com</summary>
-    <summary lang="ro">Descărcați informații seriale de pe TheTVDB.com</summary>
+    <summary lang="ro">Catalog de seriale TheTVDB.com</summary>
     <summary lang="ru">Загрузка информации о ТВ-шоу с TheTVDB.com</summary>
     <summary lang="zh">从TheTVDB.com获取电视剧集信息</summary>
     <description lang="en">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>
@@ -30,7 +30,7 @@
     <description lang="nl">TheTVDB.com is een seriescraper. De site is een gigantische open databank die iedereen kan aanpassen en uitbreiden, en biedt metadata aan voor TV-series in verschillende talen. Alle inhoud en afbeeldingen zijn afkomstig van gebruikers en moeten een grondige kwaliteitscontrole doorstaan. Het databankschema en de websitecode zijn vrijgegeven onder de open source GPL-licentie.</description>
     <description lang="pl">TheTVDB.com jest scraperem TV. Ten serwis jest ogromną, wielojęzykową i otwartą bazą danych o serialach, którą może edytować każdy. Zawartość tego serwisu została dostarczona przez użytkowników, dla użytkowników. Dostępne materiały mają wysoki standard lub jakość.</description>
     <description lang="pt"> O TheTVDB.com é um motor de busca para séries de TV. O site é uma gigantesca base de dados aberta que pode ser alterada por qualquer pessoa e contém informação em várias línguas. Todos os conteúdos do site foram enviados por utilizadores com um elevado padrão de qualidade. A base de dados e site funcionam sob uma licença GPL de software livre.</description>
-    <description lang="ro">TheTVDB.com este un scraper TV. Site-ul este o bază de date deschisă masivă care poate fi modificată de oricine și conține informații complete în diferite limbi pentru multe seriale. Tot conținutul și imaginile de pe site au fost adăugate de utilizatori și au un standard înalt de calitate. Schema bazei de date și site-ul web are sursă deschisă și licență GPL.</description>
+    <description lang="ro">TheTVDB.com este un catalog de filme seriale. Site-ul este o bază de date publică, masivă care poate fi modificată de oricine și conține informații complete în limbi diferite pentru multe seriale. Tot conținutul și imaginile de pe site au fost adăugate de utilizatori și au un standard înalt de calitate. Schema bazei de date și site-ul web au sursă deschisă și licență GPL.</description>
     <description lang="ru">TheTVDB.com это обработчик для ТВ-шоу. Сайт представляет собой массивную открытую базу данных, которая может быть изменене кем угодно и содержит полные мета-данные для многих шоу и сериалов на различных языках. Все содержанимое и изображения на сайте были выложены его пользователями для пользователей, и имеют высокий уровень или качество. Схемы базы данных и веб-сайт выполнены под открытым исходным кодом и доступны по лицензии GPL.</description>
     <description lang="zh">TheTVDB.com是一个电视刮削器。该网站是一个巨大的开放式数据库，任何人都可以修改，包含多语言的许多电视剧集资料。网站设定了高品质标准，所有图片和内容都由用户提供。数据库结构和网站均在GPL许可下开源。</description>
     <platform>all</platform>

Added: branches/Dharma/addons/metadata.tvdb.com/resources/language/Romanian/strings.xml
===================================================================
--- branches/Dharma/addons/metadata.tvdb.com/resources/language/Romanian/strings.xml	                        (rev 0)
+++ branches/Dharma/addons/metadata.tvdb.com/resources/language/Romanian/strings.xml	2010-11-03 18:48:52 UTC (rev 35155)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<strings>
+    <string id="30000">Folosește ordonare DVD</string>
+    <string id="30001">Folosește ordonare absolută (un singur sezon)</string>
+    <string id="30002">Activează Fanart</string>
+    <string id="30003">Preferă afișe</string>
+    <string id="30004">Limbă</string>
+</strings>

Modified: branches/Dharma/addons/skin.confluence/language/Romanian/strings.xml
===================================================================
--- branches/Dharma/addons/skin.confluence/language/Romanian/strings.xml	2010-11-03 18:42:21 UTC (rev 35154)
+++ branches/Dharma/addons/skin.confluence/language/Romanian/strings.xml	2010-11-03 18:48:52 UTC (rev 35155)
@@ -68,7 +68,7 @@
   <string id="31114">Mai multe imagini</string>
   <string id="31115">Personalizator</string>
   <string id="31116"></string>
-  <string id="31117">Arată filme adăugate recent</string>
+  <string id="31117">Arată filme și episoade adăugate recent</string>
   <string id="31118">Submeniu programe pagină inițială</string>
   <string id="31119">Activează buton supliment personalizat</string>
   <string id="31120">ETICHETĂ BUTON</string>
@@ -77,7 +77,7 @@
   <string id="31123">Folosește „Afișe” în loc de „Bannere” pentru seriale</string>
   <string id="31124">Arată video „În redare” pe fundal</string>
   <string id="31125">Arată vizualizare „În redare” pe fundal</string>
-  <string id="31126">Activează versuri în meniul audio</string>
+  <string id="31126">Activează descărcare versuri în meniul audio</string>
   <string id="31127">CALE CĂTRE SUPLIMENT VERSURI</string>
   <string id="31128">Versuri</string>
   <string id="31129">Activează descărcare subtitrări în meniul video</string>
@@ -108,8 +108,8 @@
   <string id="31309">Utilizare memorie:</string>
   <string id="31310">Număr pistă</string>
   <string id="31311">Imagine Fanart indisponibilă[CR][CR]Clic pe buton pentru setare</string>
-  <string id="31312">Scraper curent</string>
-  <string id="31313">Alegeți un scraper</string>
+  <string id="31312">Catalog curent</string>
+  <string id="31313">Alegeți un catalog (scraper)</string>
   <string id="31314">Opțiuni de scanare conținut</string>
   <string id="31315">De bază</string>
   <string id="31316"></string>
@@ -143,8 +143,8 @@
   <string id="31392">Cu Arial la bază</string>
 
   <!-- Description Labels  -->
-  <string id="31400">[B]CONFIGURAȚI SETĂRI ASPECT[/B][CR][CR]Schimbați costumul · Alegeți limbă și regiune · Modificați opțiuni de listare fișiere[CR]Alegeți un ecran de veghe</string>
-  <string id="31401">[B]CONFIGURAȚI SETĂRI VIDEO[/B][CR][CR]Administrați videoteca · Setați opțiuni redare video · Modificați opțiuni de listare filme[CR]Alegeți font subtitrare</string>
+  <string id="31400">[B]CONFIGURAȚI SETĂRI ASPECT[/B][CR][CR]Schimbați costumul · Alegeți limbă și regiune · Modificați opțiuni de listare fișiere[CR]Alegeți protector ecran</string>
+  <string id="31401">[B]CONFIGURAȚI SETĂRI VIDEO[/B][CR][CR]Administrați videoteca · Setați opțiuni redare video · Modificați opțiuni de listare video[CR]Alegeți font subtitrare</string>
   <string id="31402">[B]CONFIGURAȚI SETĂRI MUZICĂ[/B][CR][CR]Administrați fonoteca · Setați opțiuni redare muzică · Modificați opțiuni de listare muzică[CR]Pregătiți trimitere cântec · Setați opțiuni karaoke</string>
   <string id="31403">[B]CONFIGURAȚI SETĂRI IMAGINE[/B][CR][CR]Modificați opțiuni de listare imagini · Configurați prezentare diapozitive</string>
   <string id="31404">[B]CONFIGURAȚI SETĂRI VREME[/B][CR][CR]Alegeți trei orașe pentru care se obțin informații meteo</string>

Modified: branches/Dharma/language/Romanian/strings.xml
===================================================================
--- branches/Dharma/language/Romanian/strings.xml	2010-11-03 18:42:21 UTC (rev 35154)
+++ branches/Dharma/language/Romanian/strings.xml	2010-11-03 18:48:52 UTC (rev 35155)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!-- Translated by Daniel Alămiță, based on english revision 34640 -->
+<!-- Translated by Daniel Alămiță, based on english revision 34887 -->
 <strings>
   <string id="0">Programe</string>
   <string id="1">Imagini</string>
@@ -144,7 +144,7 @@
   <string id="167"></string>
   <string id="168"></string>
   <string id="169">Rezoluție</string>
-  <string id="170">Ajustare rată reîmprospătare ecran pentru potrivire cu video</string>
+  <string id="170">Ajustează rată reîmprospătare ecran pentru potrivire cu video</string>
   <string id="171"></string>
 
   <string id="172">Dată de lansare</string>
@@ -464,7 +464,7 @@
   <string id="502">Deschide</string>
   <string id="503">se verifică</string>
   <string id="504">Gol</string>
-  <string id="505">Încărcare informații media din fișiere...</string>
+  <string id="505">Extragere informații media din fișiere...</string>
   <string id="507">Sortează după: Utilizare</string>
   <string id="510">Activează vizualizări</string>
   <string id="511">Activează schimbare mod video</string>
@@ -1021,7 +1021,7 @@
   <string id="13011">Repaus</string>
   <string id="13012">Ieșire</string>
   <string id="13013">Repornire</string>
-  <string id="13014">Minimizează</string>
+  <string id="13014">Minimizare</string>
   <string id="13015">Acțiune buton de pornire (power)</string>
   <string id="13016">Închidere sistem</string>
 
@@ -1040,7 +1040,7 @@
   <string id="13106">Dezactivat</string>
   <string id="13107">Activată în timpul redării video</string>
   <string id="13108">Activat întotdeauna</string>
-  <string id="13109">Testare &amp; aplicare rezoluție</string>
+  <string id="13109">Testare și aplicare rezoluție</string>
   <string id="13110">Salvați rezoluția?</string>
   <string id="13111">Doriți să păstrați această rezoluție?</string>
 
@@ -1166,7 +1166,7 @@
   <string id="13316">Miniaturi recursive</string>
   <string id="13317">Prezentare diapozitive</string>
   <string id="13318">Prezentare diapozitive recursivă</string>
-  <string id="13319">Amestecare</string>
+  <string id="13319">Amestecă</string>
   <string id="13320">Stereo</string>
   <string id="13321">Doar în stânga</string>
   <string id="13322">Doar în dreapta</string>
@@ -1206,7 +1206,7 @@
   <string id="13357">Pixel shader de calitate înaltă</string>
   <string id="13358">Redă element</string>
   <string id="13359">Setează poză artist</string>
-  <string id="13360">Generiază miniaturi automat</string>
+  <string id="13360">Generează miniaturi automat</string>
   <string id="13361">Activează voce</string>
   <string id="13375">Activează dispozitiv</string>
   <string id="13376">Volum</string>
@@ -1234,7 +1234,7 @@
   <string id="13398">Scurtături</string>
   <string id="13399">Ignoră articolele la sortare (ex: „the”)</string>
   <string id="13400">Suprapune cântece din același album</string>
-  <string id="13401">Răsfoire după %s</string>
+  <string id="13401">Alegere %s</string>
   <string id="13402">Arată poziția pistei</string>
   <string id="13403">Elimină implicit</string>
   <string id="13404">Reia</string>
@@ -1276,7 +1276,7 @@
   <string id="13507">Mediu</string>
   <string id="13508">Înalt</string>
   <string id="13509">Foarte înalt(încet!)</string>
-  <string id="13510">Sincronizare redare cu reîmprospătare ecran</string>
+  <string id="13510">Sincronizează redarea cu reîmprospătarea ecranului</string>
   
   <string id="13550">Pauză în timp ce se schimbă rata de reîmprospătare</string>
   <string id="13551">Oprit</string>
@@ -1319,7 +1319,7 @@
   <string id="14021">Schimbare cod regiune 3</string>
   <string id="14022">Mediatecă</string>
   <string id="14023">Fără TV</string>
-  <string id="14024">Introduceți cel mai apropiat oraș mare</string>
+  <string id="14024">Introduceți cel mai mare oraș apropiat</string>
   <string id="14025">Preîncărcare Video/Audio/DVD - Disc dur</string>
   <string id="14026">Preîncărcare video - DVD-ROM</string>
   <string id="14027">- Rețea locală</string>
@@ -1482,10 +1482,10 @@
   <string id="15297">Doriți să eliminați această piesă din piesele îndrăgite?</string>
   <string id="15298">Doriți să deblocați această piesă?</string>
 
-  <string id="15300">Calea nu a putut fi găsită sau nu este validă</string>
-  <string id="15301">Nu s-a putut conecta la serverul de rețea</string>
-  <string id="15302">Niciun server găsit</string>
-  <string id="15303">Grupul de lucru nu a fost gasit</string>
+  <string id="15300">Calea nu a putut fi găsită sau nu este validă.</string>
+  <string id="15301">Nu se poate realiza conexiunea cu serverul de rețea.</string>
+  <string id="15302">Niciun server găsit.</string>
+  <string id="15303">Grupul de lucru nu a fost gasit.</string>
 
   <string id="15310">Se deschide sursă multi-căi</string>
   <string id="15311">Cale:</string>
@@ -1566,10 +1566,10 @@
   <string id="16318">Temporal/Spațial (jumătate)</string>
   <string id="16319">DXVA</string>
 
-  <string id="16400">Post-procesare</string>
-  <string id="16401"></string>
-  <string id="16402"></string>
-  <string id="16403"></string>
+  <string id="16400">Post-procesare video</string>
+  <string id="16401">Dezactivată</string>
+  <string id="16402">Activată pentru conținut SD</string>
+  <string id="16403">Activată întotdeauna</string>
 
   <string id="17500">Timp de așteptare repaus ecran</string>
 
@@ -1607,7 +1607,7 @@
 
   <string id="20037">Rezumat</string>
   <string id="20038">Blochează fereastra de muzică</string>
-  <string id="20039">Blochează fereastra de filme</string>
+  <string id="20039">Blochează fereastra de video</string>
   <string id="20040">Blochează fereastra de imagini</string>
   <string id="20041">Blochează ferestrele programe și scripturi</string>
   <string id="20042">Blochează gestionarul de fișiere</string>
@@ -1615,7 +1615,7 @@
   <string id="20044">Pornește nou</string>
   <string id="20045">Intrare în modul principal</string>
   <string id="20046">Părăsire mod principal</string>
-  <string id="20047">Creeați profilul '%s'?</string>
+  <string id="20047">Creați profilul '%s'?</string>
   <string id="20048">Porniți cu setări noi</string>
   <string id="20049">Cel mai bun disponibil</string>
   <string id="20050">Schimbă automat între 16:9 și 4:3</string>
@@ -1640,7 +1640,7 @@
   <string id="20069">Dosarul nu poate fi creat</string>
   <string id="20070">Director profil</string>
   <string id="20071">Porniți cu surse media noi</string>
-  <string id="20072">Verifică dacă în dosarul selectat se poate scrie</string>
+  <string id="20072">Verificați dacă în dosarul selectat se poate scrie.</string>
   <string id="20073">și dacă noul nume al dosarului este valid</string>
   <string id="20074">Clasă MPAA</string>
   <string id="20075">Introduceți codul de blocare principal</string>
@@ -1968,7 +1968,7 @@
   <string id="21379">Activează 720p</string>
   <string id="21380">Activează 1080i</string>
   <string id="21381">Introduceți nume pentru listă de redare nouă</string>
-  <string id="21382">Arată buton "Adaugă sursă" în listele de fișiere</string>
+  <string id="21382">Arată buton „Adaugă sursă” în listele de fișiere</string>
   <string id="21383">Activează bări de derulare</string>
   <string id="21384">Afișare filtrare privite ca un comutator în mediateca video</string>
   <string id="21385">Deschide</string>
@@ -1998,11 +1998,11 @@
   <string id="21409">înainte</string>
   <string id="21410">în ultimul</string>
   <string id="21411">nu în ultimul</string>
-  <string id="21412">Scrapers</string>
-  <string id="21413">Scraper implicit pentru filme</string>
-  <string id="21414">Scraper implicit pentru seriale tv</string>
-  <string id="21415">Scraper implicit pentru videoclipuri muzicale</string>
-  <string id="21416">Activează revenire bazată pe limbă scraper</string>
+  <string id="21412">Cataloage</string>
+  <string id="21413">Catalog (scraper) implicit pentru filme</string>
+  <string id="21414">Catalog (scraper) implicit pentru seriale tv</string>
+  <string id="21415">Catalog (scraper) implicit pentru videoclipuri</string>
+  <string id="21416">Activează revenire bazată pe limbă catalog</string>
   <string id="21417">- Setări</string>
   <string id="21418">Multilingual</string>
   <string id="21419">Niciun scraper prezent</string>
@@ -2036,7 +2036,7 @@
   <string id="21447">Limbă audio</string>
   <string id="21448">Limbă subtitrare</string>
   <string id="21449">Telecomanda trimite apăsări de taste</string>
-  <string id="21450">- Editare</string>
+  <string id="21450">- Modificare</string>
   <string id="21451">Este necesară o conexiune la Internet.</string>
   <string id="21452">Obține mai multe...</string>
   <string id="21453">Sistem de fișiere rădăcină</string>
@@ -2258,6 +2258,8 @@
   <string id="24096">Suplimentul a fost marcat ca defect în depozit.</string>
   <string id="24097">Doriți să îl dezactivați pe sistemul dumneavoastră?</string>
   <string id="24098">Defect</string>
+  <string id="24099">Doriți să folosiți acest costum?</string>
+  <string id="25000">Notificări</string>
 
   <!-- strings 29800 thru 29998 reserved strings used only in the default Project Mayhem III skin and not c++ code -->
   <string id="29800">Mod mediatecă</string>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 35228
          http://xbmc.svn.sourceforge.net/xbmc/?rev=35228&view=rev
Author:   spiff_
Date:     2010-11-09 19:04:58 +0000 (Tue, 09 Nov 2010)

Log Message:
-----------
fixed: asap codec didn't build properly on x86-64

(cherry picked from commit 0876ffc710118b289ac04c8dc54fffdbb2b0beec)

Modified Paths:
--------------
    branches/Dharma/configure.in

Added Paths:
-----------
    branches/Dharma/xbmc/cores/paplayer/asap/Makefile.in

Removed Paths:
-------------
    branches/Dharma/xbmc/cores/paplayer/asap/Makefile

Modified: branches/Dharma/configure.in
===================================================================
--- branches/Dharma/configure.in	2010-11-09 19:03:40 UTC (rev 35227)
+++ branches/Dharma/configure.in	2010-11-09 19:04:58 UTC (rev 35228)
@@ -1395,6 +1395,7 @@
     xbmc/cores/paplayer/timidity/Makefile \
     xbmc/cores/paplayer/AC3Codec/Makefile \
     xbmc/cores/paplayer/ADPCMCodec/Makefile \
+    xbmc/cores/paplayer/asap/Makefile \
     xbmc/cores/paplayer/NSFCodec/Makefile \
     xbmc/cores/paplayer/SIDCodec/Makefile \
     xbmc/cores/paplayer/vgmstream/Makefile \

Deleted: branches/Dharma/xbmc/cores/paplayer/asap/Makefile
===================================================================
--- branches/Dharma/xbmc/cores/paplayer/asap/Makefile	2010-11-09 19:03:40 UTC (rev 35227)
+++ branches/Dharma/xbmc/cores/paplayer/asap/Makefile	2010-11-09 19:04:58 UTC (rev 35228)
@@ -1,158 +0,0 @@
-PREFIX = /usr/local
-
-CC = gcc -s -O2 -Wall
-AR = ar rc
-PERL = perl
-XASM = xasm/xasm -q
-MADS = mads/mads -s
-RM = rm -f
-MKDIRS = mkdir -p
-INSTALL = install
-INSTALL_PROGRAM = $(INSTALL)
-INSTALL_DATA = $(INSTALL) -m 644
-ASCIIDOC = asciidoc -a localtime -a doctime
-ASCIIDOC_POSTPROCESS = $(PERL) -pi -e 's/527bbd;/c02020;/'
-
-XMMS_CFLAGS = `xmms-config --cflags`
-XMMS_LIBS = `xmms-config --libs`
-XMMS_INPUT_PLUGIN_DIR = `xmms-config --input-plugin-dir`
-XMMS_USER_PLUGIN_DIR = $(HOME)/.xmms/Plugins
-MOC_INCLUDE = ../moc-2.4.4
-MOC_PLUGIN_DIR = /usr/local/lib/moc/decoder_plugins
-XBMC_DLL_LOADER_EXPORTS = ../../DllLoader/exports
-
-COMMON_C = asap.c acpu.c apokeysnd.c
-COMMON_H = asap.h asap_internal.h anylang.h players.h
-COMMON_O = asap.o acpu.o apokeysnd.o
-PLAYERS_OBX = players/cmc.obx players/cm3.obx players/cms.obx players/dlt.obx players/mpt.obx players/rmt4.obx players/rmt8.obx players/tmc.obx players/tm2.obx
-
-.PHONY: force
-
-all: asap2wav libasap.a
-
-asap2wav: asap2wav.c $(COMMON_C) $(COMMON_H)
-	$(CC) -o $@ -I. asap2wav.c $(COMMON_C)
-
-lib: libasap.a
-
-libasap.a: $(COMMON_C) $(COMMON_H)
-	$(CC) -c -I. $(COMMON_C)
-	$(AR) $@ asap.o acpu.o apokeysnd.o
-
-asap-xmms: libasap-xmms.so
-
-libasap.xmms.so: xmms/libasap-xmms.c $(COMMON_C) $(COMMON_H)
-	$(CC) $(XMMS_CFLAGS) -shared -fPIC -Wl,--version-script=xmms/libasap-xmms.map -o $@ -I. xmms/libasap-xmms.c $(COMMON_C) $(XMMS_LIBS)
-
-asap-moc: libasap_decoder.so
-
-libasap_decoder.so: moc/libasap_decoder.c $(COMMON_C) $(COMMON_H)
-	$(CC) -shared -fPIC -o $@ -I. -I$(MOC_INCLUDE) moc/libasap_decoder.c $(COMMON_C)
-
-asap-xbmc: mads/mads xasm/xasm ../../../../system/players/paplayer/xbmc_asap-i486-linux.so
-
-xbmc/xbmc_asap.o: xbmc/xbmc_asap.c
-	$(CC) -I. -O2 -o $@ -c xbmc/xbmc_asap.c
-
-asap.o: asap.c $(COMMON_H)
-	$(CC) -I. -O2 -o $@ -c asap.c
-
-acpu.o: acpu.c $(COMMON_H)
-	$(CC) -I. -O2 -o $@ -c acpu.c
-
-apokeysnd.o: apokeysnd.c
-	$(CC) -I. -O2 -o $@ -c apokeysnd.c
-
-../../../../system/players/paplayer/xbmc_asap-i486-linux.so: xbmc/xbmc_asap.o $(COMMON_O) $(COMMON_H)
-	$(CC) -shared -fPIC -o $@ -I. xbmc/xbmc_asap.o `cat $(XBMC_DLL_LOADER_EXPORTS)/wrapper.def` $(XBMC_DLL_LOADER_EXPORTS)/wrapper.o $(COMMON_O)
-
-players.h: files2anylang.pl $(PLAYERS_OBX)
-	$(PERL) files2anylang.pl $(PLAYERS_OBX) >$@
-
-mads/mads: force
-	make -C mads
-
-xasm/xasm: force
-	make -C xasm
-
-players/cmc.obx: players/cmc.asx xasm/xasm
-	$(XASM) -d CM3=0 -o $@ players/cmc.asx
-
-players/cm3.obx: players/cmc.asx xasm/xasm
-	$(XASM) -d CM3=1 -o $@ players/cmc.asx
-
-players/cms.obx: players/cms.asx xasm/xasm
-	$(XASM) -o $@ players/cms.asx
-
-players/dlt.obx: players/dlt.as8 mads/mads
-	$(MADS) -o:$@ -c players/dlt.as8
-
-players/mpt.obx: players/mpt.asx xasm/xasm
-	$(XASM) -o $@ players/mpt.asx
-
-players/rmt4.obx: players/rmt.asx xasm/xasm
-	$(XASM) -d STEREOMODE=0 -o $@ players/rmt.asx
-
-players/rmt8.obx: players/rmt.asx xasm/xasm
-	$(XASM) -d STEREOMODE=1 -o $@ players/rmt.asx
-
-players/tmc.obx: players/tmc.asx xasm/xasm
-	$(XASM) -o $@ players/tmc.asx
-
-players/tm2.obx: players/tm2.asx xasm/xasm
-	$(XASM) -o $@ players/tm2.asx
-
-install: install-asap2wav install-lib
-
-install-asap2wav: asap2wav
-	$(MKDIRS) $(PREFIX)/bin
-	$(INSTALL_PROGRAM) asap2wav $(PREFIX)/bin/asap2wav
-
-uninstall-asap2wav:
-	$(RM) $(PREFIX)/bin/asap2wav
-
-install-lib: libasap.a
-	$(MKDIRS) $(PREFIX)/include
-	$(INSTALL_DATA) asap.h $(PREFIX)/include/asap.h
-	$(MKDIRS) $(PREFIX)/lib
-	$(INSTALL_DATA) libasap.a $(PREFIX)/lib/libasap.a
-
-uninstall-lib:
-	$(RM) $(PREFIX)/include/asap.h $(PREFIX)/lib/libasap.a
-
-install-xmms: libasap-xmms.so
-	$(MKDIRS) $(XMMS_INPUT_PLUGIN_DIR)
-	$(INSTALL_PROGRAM) libasap-xmms.so $(XMMS_INPUT_PLUGIN_DIR)/libasap-xmms.so
-
-uninstall-xmms:
-	$(RM) $(XMMS_INPUT_PLUGIN_DIR)/libasap-xmms.so
-
-install-xmms-user: libasap-xmms.so
-	$(MKDIRS) $(XMMS_USER_PLUGIN_DIR)
-	$(INSTALL_PROGRAM) libasap-xmms.so $(XMMS_USER_PLUGIN_DIR)/libasap-xmms.so
-
-uninstall-xmms-user:
-	$(RM) $(XMMS_USER_PLUGIN_DIR)/libasap-xmms.so
-
-install-moc: libasap_decoder.so
-	$(MKDIRS) $(MOC_PLUGIN_DIR)
-	$(INSTALL_PROGRAM) libasap_decoder.so $(MOC_PLUGIN_DIR)/libasap_decoder.so
-
-uninstall-moc:
-	$(RM) $(MOC_PLUGIN_DIR)/libasap_decoder.so
-
-players-clean:
-	make -C players clean
-	make -C mads clean
-	make -C xasm clean
-
-distclean: clean
-
-clean: players-clean
-	$(RM) asap2wav libasap.a asap.o acpu.o apokeysnd.o libasap-xmms.so libasap_decoder.so ../../../../system/players/paplayer/xbmc_asap-i486-linux.so players.h xbmc/xbmc_asap.o
-
-README.html: README INSTALL NEWS CREDITS
-	$(ASCIIDOC) -o $@ -a asapsrc -a asapports README
-	$(ASCIIDOC_POSTPROCESS) $@
-
-.DELETE_ON_ERROR:

Copied: branches/Dharma/xbmc/cores/paplayer/asap/Makefile.in (from rev 35227, branches/Dharma/xbmc/cores/paplayer/asap/Makefile)
===================================================================
--- branches/Dharma/xbmc/cores/paplayer/asap/Makefile.in	                        (rev 0)
+++ branches/Dharma/xbmc/cores/paplayer/asap/Makefile.in	2010-11-09 19:04:58 UTC (rev 35228)
@@ -0,0 +1,158 @@
+PREFIX = /usr/local
+
+CC = gcc -s -O2 -Wall -fPIC
+AR = ar rc
+PERL = perl
+XASM = xasm/xasm -q
+MADS = mads/mads -s
+RM = rm -f
+MKDIRS = mkdir -p
+INSTALL = install
+INSTALL_PROGRAM = $(INSTALL)
+INSTALL_DATA = $(INSTALL) -m 644
+ASCIIDOC = asciidoc -a localtime -a doctime
+ASCIIDOC_POSTPROCESS = $(PERL) -pi -e 's/527bbd;/c02020;/'
+
+XMMS_CFLAGS = `xmms-config --cflags`
+XMMS_LIBS = `xmms-config --libs`
+XMMS_INPUT_PLUGIN_DIR = `xmms-config --input-plugin-dir`
+XMMS_USER_PLUGIN_DIR = $(HOME)/.xmms/Plugins
+MOC_INCLUDE = ../moc-2.4.4
+MOC_PLUGIN_DIR = /usr/local/lib/moc/decoder_plugins
+XBMC_DLL_LOADER_EXPORTS = ../../DllLoader/exports
+
+COMMON_C = asap.c acpu.c apokeysnd.c
+COMMON_H = asap.h asap_internal.h anylang.h players.h
+COMMON_O = asap.o acpu.o apokeysnd.o
+PLAYERS_OBX = players/cmc.obx players/cm3.obx players/cms.obx players/dlt.obx players/mpt.obx players/rmt4.obx players/rmt8.obx players/tmc.obx players/tm2.obx
+
+.PHONY: force
+
+all: asap2wav libasap.a
+
+asap2wav: asap2wav.c $(COMMON_C) $(COMMON_H)
+	$(CC) -o $@ -I. asap2wav.c $(COMMON_C)
+
+lib: libasap.a
+
+libasap.a: $(COMMON_C) $(COMMON_H)
+	$(CC) -c -I. $(COMMON_C)
+	$(AR) $@ asap.o acpu.o apokeysnd.o
+
+asap-xmms: libasap-xmms.so
+
+libasap.xmms.so: xmms/libasap-xmms.c $(COMMON_C) $(COMMON_H)
+	$(CC) $(XMMS_CFLAGS) -shared -fPIC -Wl,--version-script=xmms/libasap-xmms.map -o $@ -I. xmms/libasap-xmms.c $(COMMON_C) $(XMMS_LIBS)
+
+asap-moc: libasap_decoder.so
+
+libasap_decoder.so: moc/libasap_decoder.c $(COMMON_C) $(COMMON_H)
+	$(CC) -shared -fPIC -o $@ -I. -I$(MOC_INCLUDE) moc/libasap_decoder.c $(COMMON_C)
+
+asap-xbmc: mads/mads xasm/xasm ../../../../system/players/paplayer/xbmc_asap-@...
+
+xbmc/xbmc_asap.o: xbmc/xbmc_asap.c
+	$(CC) -I. -O2 -o $@ -c xbmc/xbmc_asap.c
+
+asap.o: asap.c $(COMMON_H)
+	$(CC) -I. -O2 -o $@ -c asap.c
+
+acpu.o: acpu.c $(COMMON_H)
+	$(CC) -I. -O2 -o $@ -c acpu.c
+
+apokeysnd.o: apokeysnd.c
+	$(CC) -I. -O2 -o $@ -c apokeysnd.c
+
+../../../../system/players/paplayer/xbmc_asap-@...: xbmc/xbmc_asap.o $(COMMON_O) $(COMMON_H)
+	$(CC) -shared -fPIC -o $@ -I. xbmc/xbmc_asap.o `cat $(XBMC_DLL_LOADER_EXPORTS)/wrapper.def` $(XBMC_DLL_LOADER_EXPORTS)/wrapper.o $(COMMON_O)
+
+players.h: files2anylang.pl $(PLAYERS_OBX)
+	$(PERL) files2anylang.pl $(PLAYERS_OBX) >$@
+
+mads/mads: force
+	make -C mads
+
+xasm/xasm: force
+	make -C xasm
+
+players/cmc.obx: players/cmc.asx xasm/xasm
+	$(XASM) -d CM3=0 -o $@ players/cmc.asx
+
+players/cm3.obx: players/cmc.asx xasm/xasm
+	$(XASM) -d CM3=1 -o $@ players/cmc.asx
+
+players/cms.obx: players/cms.asx xasm/xasm
+	$(XASM) -o $@ players/cms.asx
+
+players/dlt.obx: players/dlt.as8 mads/mads
+	$(MADS) -o:$@ -c players/dlt.as8
+
+players/mpt.obx: players/mpt.asx xasm/xasm
+	$(XASM) -o $@ players/mpt.asx
+
+players/rmt4.obx: players/rmt.asx xasm/xasm
+	$(XASM) -d STEREOMODE=0 -o $@ players/rmt.asx
+
+players/rmt8.obx: players/rmt.asx xasm/xasm
+	$(XASM) -d STEREOMODE=1 -o $@ players/rmt.asx
+
+players/tmc.obx: players/tmc.asx xasm/xasm
+	$(XASM) -o $@ players/tmc.asx
+
+players/tm2.obx: players/tm2.asx xasm/xasm
+	$(XASM) -o $@ players/tm2.asx
+
+install: install-asap2wav install-lib
+
+install-asap2wav: asap2wav
+	$(MKDIRS) $(PREFIX)/bin
+	$(INSTALL_PROGRAM) asap2wav $(PREFIX)/bin/asap2wav
+
+uninstall-asap2wav:
+	$(RM) $(PREFIX)/bin/asap2wav
+
+install-lib: libasap.a
+	$(MKDIRS) $(PREFIX)/include
+	$(INSTALL_DATA) asap.h $(PREFIX)/include/asap.h
+	$(MKDIRS) $(PREFIX)/lib
+	$(INSTALL_DATA) libasap.a $(PREFIX)/lib/libasap.a
+
+uninstall-lib:
+	$(RM) $(PREFIX)/include/asap.h $(PREFIX)/lib/libasap.a
+
+install-xmms: libasap-xmms.so
+	$(MKDIRS) $(XMMS_INPUT_PLUGIN_DIR)
+	$(INSTALL_PROGRAM) libasap-xmms.so $(XMMS_INPUT_PLUGIN_DIR)/libasap-xmms.so
+
+uninstall-xmms:
+	$(RM) $(XMMS_INPUT_PLUGIN_DIR)/libasap-xmms.so
+
+install-xmms-user: libasap-xmms.so
+	$(MKDIRS) $(XMMS_USER_PLUGIN_DIR)
+	$(INSTALL_PROGRAM) libasap-xmms.so $(XMMS_USER_PLUGIN_DIR)/libasap-xmms.so
+
+uninstall-xmms-user:
+	$(RM) $(XMMS_USER_PLUGIN_DIR)/libasap-xmms.so
+
+install-moc: libasap_decoder.so
+	$(MKDIRS) $(MOC_PLUGIN_DIR)
+	$(INSTALL_PROGRAM) libasap_decoder.so $(MOC_PLUGIN_DIR)/libasap_decoder.so
+
+uninstall-moc:
+	$(RM) $(MOC_PLUGIN_DIR)/libasap_decoder.so
+
+players-clean:
+	make -C players clean
+	make -C mads clean
+	make -C xasm clean
+
+distclean: clean
+
+clean: players-clean
+	$(RM) asap2wav libasap.a asap.o acpu.o apokeysnd.o libasap-xmms.so libasap_decoder.so ../../../../system/players/paplayer/xbmc_asap-@... players.h xbmc/xbmc_asap.o
+
+README.html: README INSTALL NEWS CREDITS
+	$(ASCIIDOC) -o $@ -a asapsrc -a asapports README
+	$(ASCIIDOC_POSTPROCESS) $@
+
+.DELETE_ON_ERROR:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 35298
          http://xbmc.svn.sourceforge.net/xbmc/?rev=35298&view=rev
Author:   vdrfan
Date:     2010-11-16 22:49:09 +0000 (Tue, 16 Nov 2010)

Log Message:
-----------
updated: #10697 - Russian translation. thanks taraban

(cherry picked from commit 4ac46fe574aa3668e20f988d7c93c3d3fdfd6dcf)

Modified Paths:
--------------
    branches/Dharma/addons/skin.confluence/language/Russian/strings.xml
    branches/Dharma/language/Russian/strings.xml

Modified: branches/Dharma/addons/skin.confluence/language/Russian/strings.xml
===================================================================
--- branches/Dharma/addons/skin.confluence/language/Russian/strings.xml	2010-11-16 22:48:46 UTC (rev 35297)
+++ branches/Dharma/addons/skin.confluence/language/Russian/strings.xml	2010-11-16 22:49:09 UTC (rev 35298)
@@ -25,6 +25,7 @@
   <string id="31030">Полный список</string>
   <string id="31031">Миниатюры</string>
   <string id="31032">Карусель Изображений</string>
+  <string id="31033">Информация</string>
 
   <!-- Дополнительные обозначения -->
   <string id="31040">Воспроизводится</string>
@@ -46,7 +47,6 @@
   <string id="31058">Системные аудио файлы</string>
   <string id="31059">Текущий плейлист</string>
   <string id="31060">Этот файл сгруппирован, выберите часть которую вы хотите воспроизвести.</string>
-  <string id="31061">Выбранные</string>
   <string id="31061">Текущее Выделение</string>
   
   <!-- обозначения настроек оболочки -->
@@ -54,10 +54,10 @@
   <string id="31101">Настройки главного экрана</string>
   <string id="31102">Фон</string>
   <string id="31103">Показывать "Пауза" в режиме слайдшоу</string>
-  <string id="31104"></string>
+  <string id="31104">Воспроизводить трейлеры в окне [COLOR=grey3](Только Для Диалога Информации о Видео)[/COLOR]</string>
   <string id="31105">Показывать наименования во время фонового сканирования</string>
   <string id="31106">Различные опции</string>
-  <string id="31107"></string>
+  <string id="31107">Скрыть флаги читаемые из имени видео файла [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]</string>
   <string id="31108">Спрятать Кнопки Главного Меню</string>
   <string id="31109">Фон главного экрана</string>
   <string id="31110">Изменить фон для главного экрана</string>
@@ -69,20 +69,24 @@
   <string id="31116">Доп. скрипты</string>
   <string id="31117">Показывать недавно добавленное Видео</string>
   <string id="31118">Подменю Главного Экрана</string>
-  <string id="31119">Включить свои кнопки скриптов</string>
+  <string id="31119"></string>  <!-- blanked 2010-11-12 -->
   <string id="31120">НАЗВАНИЕ КНОПКИ</string>
-  <string id="31121">ПУТЬ ДО СКРИПТА</string>
+  <string id="31121"></string>  <!-- blanked 2010-11-12 -->
   <string id="31122">Страница Погоды</string>
   <string id="31123">Ипользовать "Постеры" вместо "Баннеров" для TV шоу</string>
   <string id="31124">Показывать фоновое "Воспроизводящееся" Видео</string>
   <string id="31125">Показывать фоновую "Воспроизводящуюся" Визуализацию</string>
 
-  <string id="31126">Показывать Тексты Песен на OSD Музыки</string>
-  <string id="31127">ПУТЬ ДО СКРИПТА ТЕКСТА ПЕСЕН</string>
-  <string id="31128">XBMC Lyrics</string>
-  <string id="31129">Включить загрузку субтитров на OSD Видео</string>
-  <string id="31130">ПУТЬ ДО СКРИПТА СУБТИТРОВ</string>
+  <string id="31126"></string>  <!-- blanked 2010-11-12 -->
+  <string id="31127"></string>  <!-- blanked 2010-11-12 -->
+  <string id="31128">Тексты Песен</string>
+  <string id="31129"></string>  <!-- blanked 2010-11-12 -->
+  <string id="31130"></string>  <!-- blanked 2010-11-12 -->
 
+  <string id="31131">Использовать Горизонтальное Главное Меню</string>
+  <string id="31132">Дополнение Текстов Песен</string>
+  <string id="31133">Дополнение Субтитров</string>
+
   <string id="31140">OSD Музыки</string>
   <string id="31141">OSD Видео</string>
 
@@ -98,37 +102,6 @@
   <string id="31300">Текущая Температура</string>
   <string id="31301">Последнее Обновление</string>
   <string id="31302">Меню</string>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
   <string id="31303"></string>
   <string id="31304">Изображение</string>
   <string id="31305">Не Вставлен Диск</string>
@@ -167,6 +140,11 @@
   <string id="31356">Скачать Субтитры</string>
   <string id="31357"></string>
 
+  <!-- Наборы шрифтов обложки -->
+  <string id="31390">По-умолчанию для обложки</string>
+  <string id="31391">По-умолчанию для обложки без Капса</string>
+  <string id="31392">На базе Arial</string>
+
   <!-- Описание в экране настроек  -->
   <string id="31400">[B]НАСТРОИКА ПАРАМЕТРОВ ВНЕШНЕГО ВИДА[/B][CR][CR]Изменить обложку · Установить язык и регион · Изменить настройки списка файлов[CR]Установить хранитель экрана</string>
   <string id="31401">[B]НАСТРОЙКА ПАРАМЕТРОВ ВИДЕО[/B][CR][CR]Управлять видео библиотекой · Установить опции воспроизведения видео[CR]Настроить список видео · Установить шрифт субтитров</string>

Modified: branches/Dharma/language/Russian/strings.xml
===================================================================
--- branches/Dharma/language/Russian/strings.xml	2010-11-16 22:48:46 UTC (rev 35297)
+++ branches/Dharma/language/Russian/strings.xml	2010-11-16 22:49:09 UTC (rev 35298)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!--Translator: Anton Tarabrin aka TaN-->
-<!--Email: tarabanton@...>
+<!--Language file translated with Team XBMC Translator-->
+<!--Date of translation: 11/15/2010-->
 <!--$Revision$-->
 <strings>
   <string id="0">Программы</string>
@@ -82,6 +82,8 @@
   <string id="110">Создавать эскизы</string>
   <string id="111">Ярлыки</string>
   <string id="112">На паузе</string>
+  <string id="113">Не удалось обновить</string>
+  <string id="114">Не удалось установить</string>
   <string id="115">Копировать</string>
   <string id="116">Переместить</string>
   <string id="117">Удалить</string>
@@ -354,8 +356,10 @@
   <string id="404">Ветер</string>
   <string id="405">Точка росы</string>
   <string id="406">Влажность</string>
-  <string id="407"></string>
-  <string id="408"></string>
+  <string id="407">
+  </string>
+  <string id="408">
+  </string>
   <string id="409">По умолчанию</string>
   <string id="410">Подключение к Гидрометеоцентру</string>
   <string id="411">Получение прогноза для:</string>
@@ -379,7 +383,7 @@
   <string id="431">Не кэшировать</string>
   <string id="432">Удалить фильм из медиатеки</string>
   <string id="433">Действительно удалить '%s'?</string>
-  <string id="434">С %s на %i %s</string> <!--From <wind dir.> at <speed> <unit>-->
+  <string id="434">С %s на %i %s</string>
   <string id="437">Съемный диск</string>
   <string id="438">Открытие файла</string>
   <string id="439">Буферизация</string>
@@ -533,6 +537,8 @@
   <string id="609">Значение CDDARipPath не задано</string>
   <string id="610">Оцифровать аудиотрек</string>
   <string id="611">Введите номер</string>
+  <string id="612">Бит/Сэмпл</string>
+  <string id="613">Частота Сэмплирования</string>
   <string id="620">Оцифровка CD</string>
   <string id="621">Кодировщик</string>
   <string id="622">Качество</string>
@@ -916,6 +922,7 @@
   <string id="13013">Перезагрузка</string>
   <string id="13014">Свернуть</string>
   <string id="13015">Реакция на кнопку питания</string>
+  <string id="13016">Выключить Систему</string>
   <string id="13020">Активна другая сессия, возможно через SSH?</string>
   <string id="13021">Подключен переносной жесткий диск</string>
   <string id="13022">Небезопасное отключение устройства</string>
@@ -938,6 +945,8 @@
   <string id="13115">Всегда включено</string>
   <string id="13116">Метод масштабирования</string>
   <string id="13117">Бикубический</string>
+  <string id="13121">Высококачественное масштабирование VDPAU</string>
+  <string id="13122">Преобразование цветов в VDPAU</string>
   <string id="13130">Гашение экрана</string>
   <string id="13131">Отключено</string>
   <string id="13132">Погасить экраны</string>
@@ -967,8 +976,8 @@
   <string id="13210">Запущен, сработает в %im</string>
   <string id="13211">НАПОМИНАНИЕ!</string>
   <string id="13212">Отменено за %im%is до срабатывания</string>
-  <string id="13213">%2.0fм</string> <!--minutes (left from countdown)--> 
-  <string id="13214">%2.0fс</string> <!--seconds (left from countdown)--> 
+  <string id="13213">%2.0fм</string>
+  <string id="13214">%2.0fс</string>
   <string id="13249">Искать субтитры в rar-архивах</string>
   <string id="13250">Укажите субтитры...</string>
   <string id="13251">Переместить объект</string>
@@ -1121,6 +1130,10 @@
   <string id="13508">Высокое</string>
   <string id="13509">Действительно высокое</string>
   <string id="13510">Синхронизировать с частотой экрана</string>
+  <string id="13550">Приостанавливать при изменении частоты обновления</string>
+  <string id="13551">Выкл.</string>
+  <string id="13552">%.1f Секунда</string>
+  <string id="13553">%.1f Секунд</string>
   <string id="13600">Пульт Apple</string>
   <string id="13602">Всегда работает</string>
   <string id="13603">Время задержки последовательности</string>
@@ -1548,6 +1561,9 @@
   <string id="20253">WebDAV сервер (HTTP)</string>
   <string id="20254">WebDAV сервер (HTTPS)</string>
   <string id="20255">Первый вход, отредактируйте свой профиль</string>
+  <string id="20256">Клиент HTS Tvheadend</string>
+  <string id="20257">Клиент VDR Streamdev</string>
+  <string id="20258">Клиент MythTV</string>
   <string id="20300">Папка Web-сервера (HTTP)</string>
   <string id="20301">Папка Web-сервера (HTTPS)</string>
   <string id="20302">Невозможно записать в папку:</string>
@@ -1688,6 +1704,8 @@
   <string id="20451">Страны</string>
   <string id="20452">эпизод</string>
   <string id="20453">эпизоды</string>
+  <string id="20454">Слушатель</string>
+  <string id="20455">Слушателей</string>
   <string id="21330">Показывать скрытые файлы и папки</string>
   <string id="21331">Клиент TuxBox</string>
   <string id="21332">ВНИМАНИЕ: Целевое устройство TuxBox находится в режиме записи!</string>
@@ -1977,10 +1995,11 @@
   <string id="24096">Аддон помечен в репозитории как испорченый.</string>
   <string id="24097">Вы желаете отключить его в вашей системе?</string>
   <string id="24098">Испорчен</string>
+  <string id="24099">Вы желаете переключиться на эту обложку?</string>
+  <string id="25000">Уведомления</string>
   <string id="29800">Режим медиатеки</string>
   <string id="29801">Клавиатура QWERTY</string>
   <string id="29802">Включен режим Passthrough Audio</string>
-  <string id="30011">Длительность поиска</string>
   <string id="33001">Качество трейлера</string>
   <string id="33002">Поток</string>
   <string id="33003">Скачать</string>
@@ -1991,6 +2010,7 @@
   <string id="33008">Сохраняем</string>
   <string id="33009">Копируем</string>
   <string id="33010">Установка пути для скачивания</string>
+  <string id="33011">Длительность поиска</string>
   <string id="33012">Короткая</string>
   <string id="33013">Длинная</string>
   <string id="33014">Использовать DVD player вместо обычного</string>
@@ -2053,4 +2073,4 @@
   <string id="33082">Путь к скрипту</string>
   <string id="33083">Включить свою кнопку скрипта</string>
   <string id="34100">Конфигурация динамиков</string>
-</strings>
+</strings>
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 35300
          http://xbmc.svn.sourceforge.net/xbmc/?rev=35300&view=rev
Author:   vdrfan
Date:     2010-11-16 22:49:49 +0000 (Tue, 16 Nov 2010)

Log Message:
-----------
updated: #10698/#10699/#10700 - Portuguese (Brazil) translations. thanks bugre

(cherry picked from commit c47d1f26ee2c668c33076619029467d3fa0c73ea)

Modified Paths:
--------------
    branches/Dharma/addons/skin.confluence/language/Portuguese (Brazil)/strings.xml
    branches/Dharma/addons/weather.xbmc.builtin/addon.xml
    branches/Dharma/language/Portuguese (Brazil)/strings.xml

Modified: branches/Dharma/addons/skin.confluence/language/Portuguese (Brazil)/strings.xml
===================================================================
--- branches/Dharma/addons/skin.confluence/language/Portuguese (Brazil)/strings.xml	2010-11-16 22:49:25 UTC (rev 35299)
+++ branches/Dharma/addons/skin.confluence/language/Portuguese (Brazil)/strings.xml	2010-11-16 22:49:49 UTC (rev 35300)
@@ -1,171 +1,134 @@
-<?xml version="1.0" encoding="ISO-8859-1" standalone="yes"?>
-<!--Language file for skin\Confluence -->
-<!--Translated: manually -->
-<!--Translator: bugre (werner), Fabiano Santiago (fabianosan) -->
-<!--Email: wxxx333@..., fabianosan@... -->
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!--Language file translated with Team XBMC Translator[wm]-->
+<!--File for addons/skin.confluence/language/Portuguese (Brazil)/ -->
+<!--Translator: bugre (wm), Fabiano Santiago (fabianosan) -->
+<!--Email: wxxx333-nospam-at-gmail.com, fabianosan@... -->
 <!--Date of translation: 11/23/2009-->
+<!--Updated on 15/11/2010 bugre -->
 <!--$Revision$-->
-<!--Based on english strings version 24877 -->
-
+<!--Based on english strings version 35254 -->
 <strings>
-  <!-- Misc labels -->
   <string id="31000">Alterar seu</string>
   <string id="31001">Amor</string>
-  <string id="31002">\xD3dio</string>
-  <string id="31003">Op\xE7\xF5es de energia</string>
+  <string id="31002">Ódio</string>
+  <string id="31003">Opções de energia</string>
   <string id="31004">Executando...</string>
   <string id="31005">Esconder INFO</string>
-
   <string id="31007">Plugins</string>
-
   <string id="31020">Adicionado recentemente</string>
   <string id="31021">Video - Arquivos</string>
-  <string id="31022">M\xFAsica - Arquivos</string>
+  <string id="31022">Música - Arquivos</string>
   <string id="31023">Executando</string>
-  <string id="31024">P\xE1gina</string>
+  <string id="31024">Página</string>
   <string id="31025">Itens</string>
-  <string id="31026">Op\xE7\xF5es diversas</string>
-  <string id="31027">Localiza\xE7\xE3o</string>
- 
-  <!-- View Type labels -->
+  <string id="31026">Opções diversas</string>
+  <string id="31027">Localização</string>
   <string id="31028">Vitrine</string>
   <string id="31029">Fanart</string>
   <string id="31030">Lista Completa</string>
-  <string id="31031">\xCDcones de imagens</string>
+  <string id="31031">Ícones de imagens</string>
   <string id="31032">Vitrine de Imagens</string>
   <string id="31033">Info</string>
-
-  <!-- Extra labels -->
   <string id="31040">Tocando agora</string>
-
   <string id="31042">TOCANDO</string>
   <string id="31043">PAUSADO</string>
-  <string id="31044">AVAN\xC7O R\xC1PIDO</string>
+  <string id="31044">AVANÇO RÁPIDO</string>
   <string id="31045">RETROCEDER</string>
-  <string id="31046">Propriedades de \xE1udio</string>
-  <string id="31047">Preconfigura\xE7\xE3o atual</string>
-  <string id="31048">Visualizar preconfigura\xE7\xF5es</string>
-  <string id="31049">Tempo de t\xE9rmino</string>
-
-
-  <!-- Playlist Editor labels -->
+  <string id="31046">Propriedades de áudio</string>
+  <string id="31047">Preconfiguração atual</string>
+  <string id="31048">Visualizar pre-configurações</string>
+  <string id="31049">Tempo de término</string>
   <string id="31055">Abrir playlist</string>
   <string id="31056">Salvar playlist</string>
   <string id="31057">Fechar playlist</string>
-  <string id="31058">Arquivos de m\xFAsica do sistema</string>
+  <string id="31058">Arquivos de música do sistema</string>
   <string id="31059">Playlist atual</string>
-  <string id="31060">Este arquivo est\xE1 empilhado, selecione a parte de onde executar.</string>
+  <string id="31060">Este arquivo está empilhado, selecione a parte de onde executar.</string>
   <string id="31061">Selecionado</string>
-
-  <!-- Skin Settings labels -->
   <string id="31100"></string>
-  <string id="31101">Op\xE7\xF5es da tela principal (home)</string>
+  <string id="31101">Opções da tela principal (home)</string>
   <string id="31102">Fundo</string>
-  <string id="31103">Exibir "Pausado" em exibi\xE7\xE3o de imagens (slideshow)</string>
-  <string id="31104"></string>
-  <string id="31105">Exibir t\xEDtulos de m\xEDdia em busca secud\xE1ria</string>
-  <string id="31106">Op\xE7\xF5es diversas</string>
-  <string id="31107"></string>
-  <string id="31108">Ocultar bot\xF5es do Menu Principal</string>
+  <string id="31103">Exibir "Pausado" em exibição de imagens (slideshow)</string>
+  <string id="31104">Tocar trailers em uma janela [COLOR=grey3](Só Diálogo de Informações do Vídeo)[/COLOR]</string>
+  <string id="31105">Exibir títulos de mídia em busca secudária</string>
+  <string id="31106">Opções diversas</string>
+  <string id="31107">Ocultar marcadores lidos do arquivo de vídeo [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]</string>
+  <string id="31108">Ocultar botões do Menu Principal</string>
   <string id="31109">Fundos da tela principal (home)</string>
-  <string id="31110">Editar fundo para bot\xE3o principal (home)</string>
+  <string id="31110">Editar fundo para botão principal (home)</string>
   <string id="31111">Ocultar</string>
-  <string id="31112">Op\xE7\xF5es</string>
-  <string id="31113">Imagem \xFAnica</string>
-  <string id="31114">Image m\xFAltipla</string>
+  <string id="31112">Opções</string>
+  <string id="31113">Imagem única</string>
+  <string id="31114">Multi imagens</string>
   <string id="31115">Personalizador</string>
-  <string id="31116">Scripts</string>
-  <string id="31117">Exibir v\xEDdeos adicionados recentemente</string>
-  <string id="31118">Submenu da P\xE1gina Principal</string>
-  <string id="31119">Habilitar bot\xE3o de Script Personalizado</string>
-  <string id="31120">R\xD3TULO DE BOT\xC3O</string>
-  <string id="31121">CAMINHO PARA O SCRIPT</string>
-  <string id="31122">P\xE1gina do Tempo</string>
-  <string id="31123">Usar "P\xF4sters" ao inv\xE9s de "Faixas" para Seriados</string>
-  <string id="31124">Exibir fundo V\xEDdeo "Tocando Agora"</string>
-  <string id="31125">Exibir fundo Visualiza\xE7\xE3o "Tocando Agora"</string>
-
-  <string id="31126">Habilitar Letras no OSD de M\xFAsica</string>
-  <string id="31127">CAMINHO PARA SCRIPT DE LETRAS</string>
-  <string id="31128">Letras XBMC</string>
-  <string id="31129">Ativar Download de Legendas no OSD de Video</string>
-  <string id="31130">CAMINHO PARA SCRIPT DE LEGENDA</string>
+  <string id="31117">Exibir vídeos adicionados recentemente</string>
+  <string id="31118">Submenu Programas da Página Principal</string>
+  <string id="31120">RÓTULO DE BOTÃO</string>
+  <string id="31122">Página do Tempo</string>
+  <string id="31123">Usar "Pôsters" ao invés de "Faixas" para Seriados</string>
+  <string id="31124">Exibir fundo Vídeo "Tocando Agora"</string>
+  <string id="31125">Exibir fundo Visualização "Tocando Agora"</string>
+  <string id="31128">Letras</string>
   <string id="31131">Usar Menu Horizontal na Tela Inicial</string>
-
-  <string id="31140">OSD de M\xFAsica</string>
+  <string id="31132">Add-on de Letras</string>
+  <string id="31133">Add-on de legendas</string>
+  <string id="31140">OSD de Música</string>
   <string id="31141">OSD de Video</string>
-
-  <!-- Script labels -->
   <string id="31200">Atalhos</string>
   <string id="31201">Categorias</string>
   <string id="31202">Elenco do Seriado</string>
-  <string id="31203">Escolha sua m\xFAsica</string>
-  <string id="31204">Se\xE7\xE3o de Links</string>
+  <string id="31203">Escolha sua música</string>
+  <string id="31204">Seção de Links</string>
   <string id="31205">Origem das Letras</string>
-
-  <!-- The Weather Channel Script labels -->
-  <string id="31250">Radar &amp; Previs\xE3o</string>
-  <string id="31251">Previs\xE3o</string>
-  <string id="31252">Script TWC (The Weather Channel)</string>
-
-  <!-- Extra labels -->
   <string id="31300">Temp. Atual</string>
-  <string id="31301">\xDAltima atualiza\xE7\xE3o</string>
+  <string id="31301">Última atualização</string>
   <string id="31302">Menu</string>
   <string id="31303"></string>
   <string id="31304">Imagem</string>
-  <string id="31305">Nenhum disco de m\xEDdia detectado</string>
+  <string id="31305">Nenhum disco de mídia detectado</string>
   <string id="31306">Ejetar</string>
   <string id="31307">Ocultar Fanart</string>
-  <string id="31308">Detalhes do v\xEDdeo</string>
-  <string id="31309">Mem\xF3ria usada:</string>
-  <string id="31310">N\xFAmero da faixa</string>
-  <string id="31311">IMAGEM DE FANART[CR][CR]INDISPON\xCDVEL[CR][CR] CLIQUE O BOT\xC3O PARA DEFINIR</string>
+  <string id="31308">Detalhes do vídeo</string>
+  <string id="31309">Memória usada:</string>
+  <string id="31310">Número da faixa</string>
+  <string id="31311">Imagem de Fanart[CR][CR]Indisponível[CR][CR] Clique no botão para definir</string>
   <string id="31312">Scraper Atual</string>
   <string id="31313">Escolha um Scraper</string>
-  <string id="31314">Op\xE7\xF5es de busca de conte\xFAdo</string>
-  <string id="31315">B\xE1sico</string>
+  <string id="31314">Opções de busca de conteúdo</string>
+  <string id="31315">Básico</string>
   <string id="31316"></string>
   <string id="31317">Definir caminho do Fanart</string>
   <string id="31318">Fanart Pequeno</string>
   <string id="31319">Perfil selecionado</string>
-  <string id="31320">\xDAltima conex\xE3o</string>
-  <string id="31321">Selecionador de M\xFAsica Karaoke</string>
+  <string id="31320">Última conexão</string>
+  <string id="31321">Selecionador de Música Karaoke</string>
   <string id="31322">Transmitido</string>
-  <string id="31323">\xDAltimos Filmes</string>
-  <string id="31324">\xDAltimos Epis\xF3dios</string>
-  <string id="31325">Op\xE7\xF5es do Playlist</string>
+  <string id="31323">Últimos Filmes</string>
+  <string id="31324">Últimos Episódios</string>
+  <string id="31325">Opções do Playlist</string>
   <string id="31326">Criado</string>
-  <string id="31327">Resolu\xE7\xE3o</string>
+  <string id="31327">Resolução</string>
   <string id="31328">Adicionado Recentemente</string>
-  <string id="31329">[B]DEFINIR TIMER![/B] [COLOR=grey2] - SISTEMA SE AUTO-DESLIGAR\xC1 EM[/COLOR]</string>
-  <string id="31330">Clique no bot\xE3o para tocar o[CR][CR]trailer</string>
-
-  <!-- Video and Music OSD Labels  -->
+  <string id="31329">[B]Timer definido![/B] [COLOR=grey2] - Sistema se desligará em[/COLOR]</string>
+  <string id="31330">Clique no botão para tocar o[CR][CR]trailer</string>
   <string id="31351">Pausar</string>
   <string id="31352">Parar</string>
-  <string id="31353">Avan\xE7ar</string>
+  <string id="31353">Avançar</string>
   <string id="31354">Voltar</string>
   <string id="31355">Menu do Filme</string>
   <string id="31356">Download de Legendas</string>
   <string id="31357"></string>
-  
-  <!-- Skin Fontsets -->
-  <string id="31390">Padr\xE3o da skin</string>
-  <string id="31391">Padr\xE3o da skin sem capslock</string>
+  <string id="31390">Padrão da skin</string>
+  <string id="31391">Padrão da skin sem capslock</string>
   <string id="31392">Baseado em Arial</string>
-
-  <!-- Description Labels  -->
-  <string id="31400">[B]CONFIGURAR AJUSTES DE APAR\xCANCIA[/B][CR][CR]Mudar o skin \xB7 Definir idioma e regi\xE3o \xB7 Definir op\xE7\xF5es de listagem de arquivos \xB7 Definir um descanso de tela</string>
-  <string id="31401">[B]CONFIGURAR AJUSTES DE V\xCDDEO[/B][CR][CR]Gerenciar sua cole\xE7\xE3o de v\xEDdeos \xB7 Definir op\xE7\xF5es de execu\xE7\xE3o de v\xEDdeo \xB7 Alterar op\xE7\xF5es de listagem de v\xEDdeo \xB7 Definir fonte para legendas</string>
-  <string id="31402">[B]CONFIGURAR AJUSTES DE M\xDASICAS[/B][CR][CR]Gerenciar sua cole\xE7\xE3o de m\xFAsicas \xB7 Definir op\xE7\xF5es de execu\xE7\xE3o de m\xFAsica \xB7 Alterar op\xE7\xF5es de listagem de m\xFAsica \xB7 Configurar submiss\xE3o de m\xFAsica \xB7 Definir op\xE7\xF5es de karaoke</string>
-  <string id="31403">[B]CONFIGURAR AJUSTES DE IMAGENS[/B][CR][CR]Definir op\xE7\xF5es de listagem de imagens \xB7 Configurar exibi\xE7\xE3o de imagens(slideshow)</string>
-  <string id="31404">[B]CONFIGURAR AJUSTES DE TEMPO[/B][CR][CR]Definir tr\xEAs cidades para buscar informa\xE7\xF5es sobre o tempo</string>
-  <string id="31405">[B]CONFIGURAR AJUSTES DE REDE[/B][CR][CR]Configurar controle do XBMC atrav\xE9s de UPnP e HTTP \xB7 Configurar compartilhamento de arquivo \xB7 Definir op\xE7\xF5es de acesso de internet</string>
-  <string id="31406">[B]CONFIGURAR AJUSTES DE SISTEMA[/B][CR][CR]Configurar e calibrar telas \xB7 Configurar sa\xEDda de \xE1udio \xB7 Configurar controles remotos \xB7 Definir op\xE7\xF5es para economia de energia \xB7 Habilitar depura\xE7\xE3o \xB7 Configurar bloqueio mestre</string>
-  <string id="31407">[B]CONFIGURAR AJUSTES DE SKIN[/B][CR][CR]Configurar o skin Confluence \xB7 Adicionar e remover itens no menu principal(home) \xB7 Alterar fundos do skin</string>
-  <string id="31408">[B]CONFIGURAR AJUSTES DE ADD-ONS[/B][CR][CR]Configurar Add-ons existentes \xB7 Procurar e instalar novos Add-ons de xbmc.org[CR]Alterar configura\xE7\xF5es do Add-on</string>
-
-  <string id="31420">[B][COLOR=white]XBMC n\xE3o detectou um disco.[/COLOR][/B][CR][CR]Insira um disco no drive e tente novamente ou Cancele</string>
-  <string id="31421">Selecione seu Perfil de usu\xE1rio XBMC[CR]para conectar e continue</string>
+  <string id="31400">[B]CONFIGURAR AJUSTES DE APARÊNCIA[/B][CR][CR]Mudar o skin · Definir idioma e região · Definir opções de listagem de arquivos · Definir um descanso de tela</string>
+  <string id="31401">[B]CONFIGURAR AJUSTES DE VÍDEO[/B][CR][CR]Gerenciar sua coleção de vídeos · Definir opções de execução de vídeo · Alterar opções de listagem de vídeo · Definir fonte para legendas</string>
+  <string id="31402">[B]CONFIGURAR AJUSTES DE MÚSICAS[/B][CR][CR]Gerenciar sua coleção de músicas · Definir opções de execução de música · Alterar opções de listagem de música · Configurar submissão de música · Definir opções de karaoke</string>
+  <string id="31403">[B]CONFIGURAR AJUSTES DE IMAGENS[/B][CR][CR]Definir opções de listagem de imagens · Configurar exibição de imagens(slideshow)</string>
+  <string id="31404">[B]CONFIGURAR AJUSTES DE TEMPO[/B][CR][CR]Definir três cidades para buscar informações sobre o tempo</string>
+  <string id="31405">[B]CONFIGURAR AJUSTES DE REDE[/B][CR][CR]Configurar controle do XBMC através de UPnP e HTTP · Configurar compartilhamento de arquivo · Definir opções de acesso de internet</string>
+  <string id="31406">[B]CONFIGURAR AJUSTES DE SISTEMA[/B][CR][CR]Configurar e calibrar telas · Configurar saída de áudio · Configurar controles remotos · Definir opções para economia de energia · Habilitar depuração · Configurar bloqueio mestre</string>
+  <string id="31407">[B]CONFIGURAR AJUSTES DE SKIN[/B][CR][CR]Configurar o skin Confluence · Adicionar e remover itens no menu principal(home) · Alterar fundos do skin</string>
+  <string id="31408">[B]CONFIGURAR AJUSTES DE ADD-ONS[/B][CR][CR]Configurar Add-ons existentes · Procurar e instalar novos Add-ons de xbmc.org[CR]Alterar configurações do Add-on</string>
+  <string id="31421">Selecione seu Perfil de usuário XBMC[CR]para conectar e continue</string>
 </strings>
\ No newline at end of file

Modified: branches/Dharma/addons/weather.xbmc.builtin/addon.xml
===================================================================
--- branches/Dharma/addons/weather.xbmc.builtin/addon.xml	2010-11-16 22:49:25 UTC (rev 35299)
+++ branches/Dharma/addons/weather.xbmc.builtin/addon.xml	2010-11-16 22:49:49 UTC (rev 35300)
@@ -5,6 +5,7 @@
        provider-name="Team XBMC">
   <extension point="xbmc.python.weather" library=""/>
   <extension point="xbmc.addon.metadata">
+    <summary lang="br">Condições meteorológicas atuais.</summary>
     <summary lang="en">Current weather conditions.</summary>
     <summary lang="de">Aktuelle Wetterbedingungen</summary>
     <summary lang="fr">Conditions météorologiques en cours.</summary>
@@ -16,6 +17,7 @@
     <summary lang="ro">Condiții meteo curente.</summary>
     <summary lang="ru">Текущие погодные условия.</summary>
     <summary lang="zh">当前天气状况</summary>
+    <description lang="br">Esta é a origem padrão de informação meteorológicas.[CR][CR]Ela provê as condições atuais e previsão para quatro dias.</description>
     <description lang="en">This is the default weather source.[CR][CR]It provides current weather conditions and a four day outlook.</description>
     <description lang="de">Standardquelle für Wetterinformationen[CR][CR]Das aktuelle Wetter sowie eine 4 tägige Vorausschau werden angezeigt</description>
     <description lang="fr">C'est la source météo par défaut.[CR][CR]Fournit les conditions climatiques en cours et les prévisions sur 4 jours.</description>

Modified: branches/Dharma/language/Portuguese (Brazil)/strings.xml
===================================================================
--- branches/Dharma/language/Portuguese (Brazil)/strings.xml	2010-11-16 22:49:25 UTC (rev 35299)
+++ branches/Dharma/language/Portuguese (Brazil)/strings.xml	2010-11-16 22:49:49 UTC (rev 35300)
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!--Language file translated with Team XBMC Translator[wm]-->
-<!--Translator: bugre (werner), Fabiano Santiago (fabianosan) -->
-<!--Email: wxxx333@..., fabianosan@...>
-<!--Date of translation: 12/21/2009, last revision: 29/07/2010-->
+<!--Language file translated with Team XBMC Translator[wm] -->
+<!--Translator: bugre (wm), Fabiano Santiago (fabianosan) -->
+<!--Email: wxxx333-nospam-at-gmail.com, fabianosan@... -->
+<!--Date of translation: 12/21/2009 -->
+<!--Updated on 29/07/2010 by fabianosan -->
+<!--Updated on 15/11/2010 by bugre -->
 <!--$Revision$-->
-<!--Based on english strings version 32026-->
+<!--Based on english strings version 35193-->
 <strings>
   <string id="0">Programas</string>
   <string id="1">Imagens</string>
@@ -16,7 +18,6 @@
   <string id="7">Arquivos</string>
   <string id="8">Tempo</string>
   <string id="9">xbmc media center</string>
-
   <string id="11">Segunda</string>
   <string id="12">Terça</string>
   <string id="13">Quarta</string>
@@ -24,7 +25,6 @@
   <string id="15">Sexta</string>
   <string id="16">Sábado</string>
   <string id="17">Domingo</string>
-
   <string id="21">Janeiro</string>
   <string id="22">Fevereiro</string>
   <string id="23">Março</string>
@@ -37,7 +37,6 @@
   <string id="30">Outubro</string>
   <string id="31">Novembro</string>
   <string id="32">Dezembro</string>
-
   <string id="41">Seg</string>
   <string id="42">Ter</string>
   <string id="43">Qua</string>
@@ -45,7 +44,6 @@
   <string id="45">Sex</string>
   <string id="46">Sab</string>
   <string id="47">Dom</string>
-
   <string id="51">Jan</string>
   <string id="52">Fev</string>
   <string id="53">Mar</string>
@@ -58,7 +56,6 @@
   <string id="60">Out</string>
   <string id="61">Nov</string>
   <string id="62">Dez</string>
-  
   <string id="71">N</string>
   <string id="72">NNE</string>
   <string id="73">NO</string>
@@ -76,7 +73,6 @@
   <string id="85">NL</string>
   <string id="86">NNL</string>
   <string id="87">VAR</string>
-
   <string id="98">Ver: Auto</string>
   <string id="99">Ver: Auto grande</string>
   <string id="100">Ver: Icones</string>
@@ -92,8 +88,8 @@
   <string id="110">Criar ícones</string>
   <string id="111">Atalhos</string>
   <string id="112">Pausado</string>
-  <string id="113">Falha na atualização</string>
-  <string id="114">Falha na instalação</string>
+  <string id="113">Atualização falhou</string>
+  <string id="114">Instalação falhou</string>
   <string id="115">Copiar</string>
   <string id="116">Mover</string>
   <string id="117">Excluir</string>
@@ -146,18 +142,13 @@
   <string id="164">Sem disco</string>
   <string id="165">Disco presente</string>
   <string id="166">Skin</string>
-  <string id="167">Ativar servidor FTP</string>
-  <string id="168">Ativar sincronização do horário pela internet</string>
   <string id="169">Resolução</string>
   <string id="170">Ajustar taxa de atualização para mesma da tela</string>
   <string id="171"></string>
-
   <string id="172">Data de lançamento:</string>
   <string id="173">Exibir videos 4:3 como</string>
-
   <string id="175">Modos</string>
   <string id="176">Estilos</string>
-
   <string id="179">Música</string>
   <string id="180">Duração</string>
   <string id="181">Selecionar álbum</string>
@@ -179,10 +170,8 @@
   <string id="197">Procurando informação de %s</string>
   <string id="198">Carregando detalhes do filme</string>
   <string id="199">Interface web</string>
-
   <string id="202">Título:</string>
   <string id="203">Sinopse:</string>
-
   <string id="205">Votos:</string>
   <string id="206">Elenco</string>
   <string id="207">Enredo</string>
@@ -200,7 +189,6 @@
   <string id="221">Rede não está conectada</string>
   <string id="222">Cancelar</string>
   <string id="224">Velocidade</string>
-
   <string id="226">Padrões de teste....</string>
   <string id="227">Procurar CDs de áudio na Internet</string>
   <string id="228">Misturar lista de reprodução ao carregar</string>
@@ -220,9 +208,7 @@
   <string id="242">Janela</string>
   <string id="243">Taxa de Atualização</string>
   <string id="244">Tela Cheia</string>
-  <string id="245">Dimensionando: (%i,%i)->(%i,%i) (Zoom x%2.2f) AR:%2.2f:1 (Pixels: %2.2f:1)</string>
-
-
+  <string id="245">Dimensionando: (%i,%i)-&gt;(%i,%i) (Zoom x%2.2f) AR:%2.2f:1 (Pixels: %2.2f:1)</string>
   <string id="247">Scripts</string>
   <string id="248">Idioma</string>
   <string id="249">Música</string>
@@ -261,7 +247,6 @@
   <string id="282">Encontrado(s) %i item(s)</string>
   <string id="283">Resultado(s) da busca</string>
   <string id="284">Nenhum resultado encontrado</string>
-  <string id="286">Filtro de pós-processamento</string>
   <string id="287">Legendas</string>
   <string id="288">Fonte</string>
   <string id="289">- Tamanho</string>
@@ -281,11 +266,6 @@
   <string id="304">Idioma</string>
   <string id="305">Ativado</string>
   <string id="306">Não-intercalado</string>
-  <string id="307">- Pós-processamento automático</string>
-  <string id="308">- Filtro anti-quadros vertical</string>
-  <string id="309">- Filtro anti-quadros horizontal</string>
-  <string id="310">- Brilho/contraste automático</string>
-  <string id="311">- Filtro anti-círculos</string>
   <string id="312">(0=auto)</string>
   <string id="313">Excluindo banco de dados</string>
   <string id="314">Preparando...</string>
@@ -378,8 +358,6 @@
   <string id="404">Vento</string>
   <string id="405">Pt. de orvalho</string>
   <string id="406">Umidade</string>
-  <string id="407">De</string>
-  <string id="408">até</string>
   <string id="409">Padrões</string>
   <string id="410">Acessando o serviço de meteorologia</string>
   <string id="411">Obtendo informações de tempo para:</string>
@@ -392,7 +370,6 @@
   <string id="418">Baixo</string>
   <string id="419">Alto</string>
   <string id="420">HDMI</string>
-
   <string id="422">Excluir informações do álbum</string>
   <string id="423">Excluir informações do CD</string>
   <string id="424">Selecionar</string>
@@ -405,8 +382,7 @@
   <string id="431">Sem cache</string>
   <string id="432">Excluir filme da coleção</string>
   <string id="433">Deseja excluir '%s'?</string>
-  <string id="434">De %s até %i %s</string> <!--From <wind dir.> at <speed> <unit>-->
-
+  <string id="434">De %s até %i %s</string>
   <string id="437">Disco removível</string>
   <string id="438">Abrindo arquivo</string>
   <string id="439">Cache</string>
@@ -450,7 +426,6 @@
   <string id="480">Aparência</string>
   <string id="481">Opções de Áudio</string>
   <string id="482">Sobre o XBMC</string>
-
   <string id="485">Excluir álbum</string>
   <string id="486">Repetir</string>
   <string id="487">Repetir uma</string>
@@ -478,11 +453,9 @@
   <string id="513">Janela principal</string>
   <string id="514">Configurações manuais</string>
   <string id="515">Gênero</string>
-
   <string id="517">Álbuns reproduzidos recentemente</string>
   <string id="518">Iniciar</string>
   <string id="519">Iniciar em..</string>
-  <string id="520">Editar título XBE</string>
   <string id="521">Compilações</string>
   <string id="522">Remover origem</string>
   <string id="523">Trocar mídia</string>
@@ -511,7 +484,6 @@
   <string id="546">Dispositivo de saída de passagem</string>
   <string id="547">Sem biografia para este artista</string>
   <string id="548">Converter áudio multicanal para estéreo</string>
-
   <string id="550">Ordenar por: %s</string>
   <string id="551">Nome</string>
   <string id="552">Data</string>
@@ -538,7 +510,6 @@
   <string id="573">Caminho</string>
   <string id="574">País</string>
   <string id="575">Em progresso</string>
-
   <string id="580">Direção de ordenação</string>
   <string id="581">Método de ordenação</string>
   <string id="582">Modo de exibição</string>
@@ -557,14 +528,12 @@
   <string id="595">Repetir: desl.</string>
   <string id="596">Repetir: uma</string>
   <string id="597">Repetir: todos</string>
-
   <string id="600">Extrair CD de áudio</string>
   <string id="601">Média</string>
   <string id="602">Padrão</string>
   <string id="603">Extrema</string>
   <string id="604">Taxa de bits constante</string>
   <string id="605">Extraindo...</string>
-
   <string id="607">Para:</string>
   <string id="608">Não foi possível extrair o CD ou faixa</string>
   <string id="609">CDDARipPath não foi definido.</string>
@@ -572,7 +541,6 @@
   <string id="611">Digite número</string>
   <string id="612">Bits/Amostra</string>
   <string id="613">Frequencia de amostra</string>
-
   <string id="620">CDs de áudio</string>
   <string id="621">Codificador</string>
   <string id="622">Qualidade</string>
@@ -583,7 +551,7 @@
   <string id="630">Normal</string>
   <string id="631">Zoom</string>
   <string id="632">Mudar para 4:3</string>
-  <string id="633">Mudar para 14:9</string>
+  <string id="633">Wide Zoom</string>
   <string id="634">Mudar para 16:9</string>
   <string id="635">Tamanho original</string>
   <string id="636">Personalizado</string>
@@ -609,31 +577,25 @@
   <string id="656">Busca lista de reprodução</string>
   <string id="657">Busca pasta</string>
   <string id="658">Informação da música</string>
-  <string id="659">Extensão Não-linear</string>
-
+  <string id="659">Expansão não-linear</string>
   <string id="660">Amplificação de volume</string>
   <string id="661">Pasta de exportação</string>
   <string id="662">Este arquivo não está mais disponível.</string>
   <string id="663">Gostaria de remover da coleção?</string>
   <string id="664">Busca Script</string>
   <string id="665">Nível de Compressão</string>
-
   <string id="700">Limpando a coleção</string>
   <string id="701">Removendo músicas antigas da coleção</string>
   <string id="702">Este caminho já foi examinado anteriormente</string>
   <string id="705">Rede</string>
   <string id="706">- Servidor</string>
-
   <string id="708">Ativar proxy HTTP</string>
-
   <string id="711">Internet Protocol (IP)</string>
   <string id="712">Porta inválida. O valor deve ser entre 1 e 65535.</string>
   <string id="713">Proxy HTTP</string>
-
   <string id="715">- Atribuição</string>
   <string id="716">Automático (DHCP)</string>
   <string id="717">Manual (estático)</string>
-  <string id="718">Padrão (dashboard)</string>
   <string id="719">- Endereço IP:</string>
   <string id="720">- Máscara de sub-rede:</string>
   <string id="721">- Gateway padrão:</string>
@@ -644,9 +606,7 @@
   <string id="726">As mudanças não foram salvas. Deseja continuar mesmo assim?</string>
   <string id="727">Servidor Web</string>
   <string id="728">Servidor FTP</string>
-  <string id="729">Horário da internet</string>
   <string id="730">- Porta</string>
-  <string id="731">Servidor de horário</string>
   <string id="732">Salvar &amp; aplicar</string>
   <string id="733">- Senha</string>
   <string id="734">Sem senha</string>
@@ -667,12 +627,10 @@
   <string id="749">Espelhar imagem</string>
   <string id="750">Tem certeza?</string>
   <string id="751">Removendo origem</string>
-
   <string id="754">Adicionar link de programa</string>
   <string id="755">Editar caminho do programa</string>
   <string id="756">Editar nome do programa</string>
   <string id="757">Editar a profundidade do caminho</string>
-
   <string id="759">Ver: lista grande</string>
   <string id="760">Amarelo</string>
   <string id="761">Branco</string>
@@ -682,10 +640,7 @@
   <string id="765">Ciano</string>
   <string id="766">Cinza claro</string>
   <string id="767">Cinza</string>
-
-
   <string id="770">Erro %i: compartilhamento não disponível</string>
-  <string id="771">- Limitador automático para FATX</string>
   <string id="772">Saída de áudio</string>
   <string id="773">Procurando</string>
   <string id="774">Pasta de apresentação (slideshow)</string>
@@ -704,7 +659,6 @@
   <string id="787">Interface de rede desabilitada</string>
   <string id="788">Interface de rede desabilitada com sucesso.</string>
   <string id="789">Nome da rede sem fio (ESSID)</string>
-
   <string id="791">Permitir programas locais controlar o XBMC</string>
   <string id="792">Porta</string>
   <string id="793">Intervalo de portas</string>
@@ -713,17 +667,14 @@
   <string id="796">Atraso de repetição contínuo (ms)</string>
   <string id="797">Número máximo de clientes</string>
   <string id="798">Acesso internet</string>
-
   <string id="850">Número de porta inválido</string>
   <string id="851">Intervalor de portas válido 1-65535</string>
   <string id="852">Intervalor de portas válido 1024-65535</string>
-
-  <string id="1000">Visualizar proteção de tela</string>
+  <string id="1000">- Previsualização</string>
   <string id="1001">Incapaz de conectar</string>
   <string id="1002">O XBMC foi incapaz de conectar ao local de rede</string>
   <string id="1003">Isto pode ser devido a rede não estar conectada.</string>
   <string id="1004">Gostaria de adicionar assim mesmo?</string>
-
   <string id="1006">Endereço IP</string>
   <string id="1007">Adicionar Local de rede</string>
   <string id="1008">Protocolo</string>
@@ -755,13 +706,13 @@
   <string id="1034">Sub-menu</string>
   <string id="1035">Habilitar botões de sub-menu</string>
   <string id="1036">Favoritos</string>
-  <string id="1037">Plugins de vídeo</string>
-  <string id="1038">Plugins de música</string>
-  <string id="1039">Plugins de imagens</string>
+  <string id="1037">Add-ons de vídeo</string>
+  <string id="1038">Add-ons de música</string>
+  <string id="1039">Add-ons de imagens</string>
   <string id="1040">Carregando diretório</string>
   <string id="1041">Recuperados %i items</string>
   <string id="1042">Recuperados %i de %i items</string>
-  <string id="1043">Plugins de programas</string>
+  <string id="1043">Add-ons de programas</string>
   <string id="1044">Selecionar ícone de plugin</string>
   <string id="1045">Opções do addon</string>
   <string id="1046">Pontos de acesso (sem fio)</string>
@@ -770,15 +721,12 @@
   <string id="1049">Opções do Script</string>
   <string id="1050">Singles</string>
   <string id="1051">Digite a URL</string>
-
   <string id="1200">Cliente SMB</string>
   <string id="1202">Grupo de trabalho</string>
   <string id="1203">Usuário padrão</string>
   <string id="1204">Senha padrão</string>
-
   <string id="1207">Servidor WINS</string>
   <string id="1208">Montar compartilhamento SMB</string>
-
   <string id="1210">Remover</string>
   <string id="1211">Música</string>
   <string id="1212">Vídeo</string>
@@ -803,25 +751,16 @@
   <string id="1233">Programas &amp; vídeo &amp; música</string>
   <string id="1234">Programas &amp; imagens &amp; música</string>
   <string id="1235">Programas &amp; imagens &amp; vídeo</string>
-
-  <string id="1245">Usuário de FTP</string>
-  <string id="1246">Senha de FTP</string>
-  <string id="1247">Senha de FTP configurada com sucesso</string>
-
   <string id="1250">Auto detecção</string>
   <string id="1251">Auto detectar sistemas</string>
   <string id="1252">Apelido</string>
-
   <string id="1254">Perguntar para conectar</string>
   <string id="1255">Enviar usuário e senha de FTP</string>
   <string id="1256">Intervalo de ping</string>
   <string id="1257">Gostaria de conectar ao sistema auto detectado?</string>
-
   <string id="1260">Anunciar estes serviços para outros sistemas via Zeroconf</string>
-
   <string id="1300">Dispositivo de áudio personalizado</string>
   <string id="1301">Dispositivo de passagem personalizado</string>
-
   <string id="1396">Correntes de ar</string>
   <string id="1397">e</string>
   <string id="1398">Congelando</string>
@@ -850,19 +789,11 @@
   <string id="1421">Muito Alto</string>
   <string id="1422">Ventoso</string>
   <string id="1423">Névoa</string>
-
   <string id="1450">Colocar tela em descanso quando inativo</string>
-
-
   <string id="2050">Executável</string>
-
   <string id="2100">Falha no Script! : %s</string>
-  <string id="2101">Necessário uma versão mais recente - Veja o log</string>
-  <string id="2102">Placas de Video</string>
-  <string id="2103">Requisitos não encontrados - Veja o log</string>
-
+  <string id="2101">Necessário versão mais nova - Veja o log</string>
   <string id="4501">Habilitar LCD/VFD</string>
-
   <string id="10000">Home</string>
   <string id="10001">Programas</string>
   <string id="10002">Imagens</string>
@@ -885,19 +816,15 @@
   <string id="10019">Configurações - Aparência</string>
   <string id="10020">Scripts</string>
   <string id="10021">Navegador Web</string>
-
   <string id="10028">Vídeos/lista de reprodução</string>
   <string id="10034">Configurações - Perfil</string>
-
   <string id="10100">Janela sim/não</string>
   <string id="10101">Janela de progresso</string>
-
   <string id="10210">Procurando legendas...</string>
   <string id="10211">Procurando ou armazenando legendas</string>
   <string id="10212">terminando</string>
   <string id="10213">carregando</string>
   <string id="10214">Abrindo sinal</string>
-
   <string id="10500">Música/lista de reprodução</string>
   <string id="10501">Música/arquivos</string>
   <string id="10502">Música/coleção</string>
@@ -910,14 +837,11 @@
   <string id="10509">Jogos em rede</string>
   <string id="10510">Extensões</string>
   <string id="10511">Informações do sistema</string>
-
   <string id="10516">Músicas - Coleção</string>
   <string id="10517">Tocando agora - Músicas</string>
-
   <string id="10522">Tocando agora - Vídeos</string>
   <string id="10523">Informação do álbum</string>
   <string id="10524">Informação do filme</string>
-
   <string id="12000">Selec. janela</string>
   <string id="12001">Música/informação</string>
   <string id="12002">Janela OK</string>
@@ -925,24 +849,12 @@
   <string id="12004">Scripts/informação</string>
   <string id="12005">Vídeo em tela-cheia</string>
   <string id="12006">Visualização de áudio</string>
-
   <string id="12008">Janela agrupamento de arquivos</string>
   <string id="12009">Reconstruindo índice...</string>
   <string id="12010">Voltar para janela de músicas</string>
   <string id="12011">Voltar para janela de vídeos</string>
-  <string id="12012">Atualizar lista de trainer</string>
-  <string id="12013">Trainer</string>
-  <string id="12014">Trainers não encontrado</string>
-  <string id="12015">Configurações de trainer</string>
-  <string id="12016">Todos os trainers registrados estão perdidos. Atualize sua lista</string>
-  <string id="12017">Iniciar automaticamente na última posição</string>
-  <string id="12018">Não</string>
-  <string id="12019">Sim</string>
-  <string id="12020">Perguntar</string>
   <string id="12021">Iniciar/Reiniciar</string>
   <string id="12022">Retomar da posição %s</string>
-  <string id="12023">Validando trainers existentes...</string>
-
   <string id="12310">0</string>
   <string id="12311">1</string>
   <string id="12312">2</string>
@@ -962,7 +874,7 @@
   <string id="12328">Entre com o código de desbloqueio</string>
   <string id="12329">ou pressione C para cancelar</string>
   <string id="12330">Selecione a combinação de botões e </string>
-  <string id="12331">pressione Start ou Back para cancelar</string>
+  <string id="12331">pressione OK ou Back para cancelar</string>
   <string id="12332">Configurar bloqueio</string>
   <string id="12333">Desbloquear</string>
   <string id="12334">Zerar bloqueio</string>
@@ -992,33 +904,24 @@
   <string id="12377">Isto irá zerar qualquer valor previamente salvo</string>
   <string id="12378">Exibir cada imagem por</string>
   <string id="12379">Usar efeitos de pan e zoom</string>
-  <string id="12380">Tocar vídeos NTSC em taxas PAL</string>
-  <string id="12381">Tocar vídeos PAL em taxas NTSC</string>
-  <string id="12382">Tocar vídeos NTSC em PAL60</string>
   <string id="12383">relógio 12 horas</string>
   <string id="12384">relógio 24 horas</string>
   <string id="12385">Dia/Mês</string>
   <string id="12386">Mês/Dia</string>
-
   <string id="12390">Uptime do sistema</string>
   <string id="12391">Minutos</string>
   <string id="12392">Horas</string>
   <string id="12393">Dias</string>
   <string id="12394">Uptime total</string>
-
   <string id="12600">Tempo</string>
-
   <string id="12900">Proteção de tela</string>
   <string id="12901">OSD em tela-cheia</string>
-
   <string id="13000">Sistema</string>
   <string id="13001">Diminuir rotação do HD</string>
   <string id="13002">Somente vídeos</string>
   <string id="13003">- Atraso</string>
   <string id="13004">- Tempo mínimo de duração</string>
   <string id="13005">Desligar</string>
-  <string id="13006">Dashboard</string>
-  <string id="13007">Usar caminho personalizado para a dashboard</string>
   <string id="13008">Modo de desligamento</string>
   <string id="13009">Terminar</string>
   <string id="13010">Hibernar</string>
@@ -1027,16 +930,14 @@
   <string id="13013">Reinicializar</string>
   <string id="13014">Minimizar</string>
   <string id="13015">Ação do botão de Liga/Desliga</string>
-
+  <string id="13016">Desligar o sistema</string>
   <string id="13020">Tem outra sessão ativa, talvez por ssh?</string>
   <string id="13021">Disco rígido removível montado</string>
   <string id="13022">Remoção insegura de dispositivo</string>
   <string id="13023">Dispositivo removido com sucesso</string>
   <string id="13024">Joystick conectado</string>
   <string id="13025">Joystick desconectado</string>
-
   <string id="13050">Bateria fraca</string>
-
   <string id="13100">Filtro de anti-oscilação</string>
   <string id="13101">Deixe driver escolher (necessita reinicializar)</string>
   <string id="13105">Sincronização vertical</string>
@@ -1046,7 +947,6 @@
   <string id="13109">Testar e aplicar resolução</string>
   <string id="13110">Salvar resolução?</string>
   <string id="13111">Manter esta resolução?</string>
-
   <string id="13112">Aumento de resolução em alta qualidade</string>
   <string id="13113">Desabilitado</string>
   <string id="13114">Habilitado para conteúdo SD</string>
@@ -1058,46 +958,25 @@
   <string id="13120">VDPAU</string>
   <string id="13121">Nível VDPAU HQ Upscaling</string>
   <string id="13122">Nível de conversão de cores VDPAU Studio</string>
-
   <string id="13130">Escurecer outras telas</string>
   <string id="13131">Desabilitado</string>
   <string id="13132">Limpar telas</string>
-
   <string id="13140">Detectadas coneções ativas!</string>
   <string id="13141">Se continuar, poderá perder o controle do XBMC</string>
   <string id="13142">Tem certeza que quer parar o servidor de Eventos?</string>
-
   <string id="13144">Trocar o modo "Apple Remote"?</string>
   <string id="13145">Se está utilizando o "Apple Remote" agora para controlar</string>
   <string id="13146">XBMC, trocar esta configuração pode afetar sua habilidade</string>
   <string id="13147">de continuar controlando ele. Você deseja prosseguir?</string>
-
-  <string id="13150">Chave do HDD:</string>
-  <string id="13151">Temperatura do HDD:</string>
-  <string id="13152">Modelo do DVD:</string>
-  <string id="13153">Firmware do DVD:</string>
-  <string id="13154">Modelo do HDD:</string>
-  <string id="13155">Serial do HDD:</string>
-  <string id="13156">Firmware do HDD:</string>
-  <string id="13157">Senha do HDD:</string>
-  <string id="13158">Estado de travamento do HDD:</string>
   <string id="13159">Máscara de sub-rede</string>
   <string id="13160">Gateway</string>
   <string id="13161">DNS primário</string>
   <string id="13162">Falha na inicialização</string>
-  <string id="13163">Gamepad</string>
-  <string id="13164">Teclado</string>
-  <string id="13165">Mouse</string>
-  <string id="13166">Head/microfone</string>
-  <string id="13167">Unidade de memória</string>
-  <string id="13168">IR-Remoto</string>
-  <string id="13169">Porta de controller</string>
   <string id="13170">Nunca</string>
   <string id="13171">Imediatamente</string>
   <string id="13172">Depois de %i segs</string>
   <string id="13173">Data de instalação do HDD:</string>
   <string id="13174">Re-ligamentos do HDD:</string>
-
   <string id="13200">Perfis</string>
   <string id="13201">Excluir perfil '%s'?</string>
   <string id="13204">Último perfil utilizado:</string>
@@ -1108,18 +987,15 @@
   <string id="13210">Iniciado, alarmar em %im</string>
   <string id="13211">Alarme!</string>
   <string id="13212">Cancelado restando %im%is</string>
-  <string id="13213">%2.0fm</string> <!--minutes (left from countdown)-->
-  <string id="13214">%2.0fs</string> <!--seconds (left from countdown)-->
-
+  <string id="13213">%2.0fm</string>
+  <string id="13214">%2.0fs</string>
   <string id="13249">Procurar por legendas em RARs</string>
   <string id="13250">Buscar por legendas...</string>
   <string id="13251">Mover item</string>
   <string id="13252">Mover item aqui</string>
   <string id="13253">Cancelar mover</string>
-
   <string id="13270">Hardware: </string>
   <string id="13271">Uso da CPU:</string>
-
   <string id="13274">Conectado, mas nenhum DNS disponível.</string>
   <string id="13275">Disco rígido</string>
   <string id="13276">DVD-ROM</string>
@@ -1128,23 +1004,15 @@
   <string id="13279">Rede</string>
   <string id="13280">Vídeo</string>
   <string id="13281">Hardware</string>
-  <string id="13282">_</string>
   <string id="13283">Sistema Operacional:</string>
   <string id="13284">Velocidade da CPU:</string>
-  <string id="13285">BIOS detectada:</string>
   <string id="13286">Encoder de vídeo:</string>
   <string id="13287">Resolução de tela:</string>
-  <string id="13288">Versão do XBOX:</string>
-  <string id="13289">Número de série do XBOX:</string>
-  <string id="13290">Fabricante do XBOX:</string>
-  <string id="13291">ModChip:</string>
   <string id="13292">Cabo A/V:</string>
-  <string id="13293">Região do vídeo &amp; XBE:</string>
   <string id="13294">Região do DVD:</string>
   <string id="13295">Internet:</string>
   <string id="13296">Conectado</string>
   <string id="13297">Desconectado. Verifique as opções de rede.</string>
-  <string id="13298">Chave Xbox Live:</string>
   <string id="13299">Temperatura desejada:</string>
   <string id="13300">Velocidade do ventilador</string>
   <string id="13301">Controle automático de temperatura</string>
@@ -1183,8 +1051,6 @@
   <string id="13334">Editar etiqueta</string>
   <string id="13335">Tornar padrão</string>
   <string id="13336">Remover botão</string>
-  <string id="13338">LED frontal</string>
-  <string id="13339">LED frontal colorido</string>
   <string id="13340">Deixar como está</string>
   <string id="13341">Verde</string>
   <string id="13342">Laranja</string>
@@ -1244,7 +1110,6 @@
   <string id="13409">Top 250</string>
   <string id="13410">Sintonizar com Last.fm</string>
   <string id="13411">Velocidade mínima do ventilador</string>
-
   <string id="13413">Baixando</string>
   <string id="13414">Incluir artistas que só aparecem em compilações</string>
   <string id="13415">Método de renderização</string>
@@ -1264,7 +1129,6 @@
   <string id="13429">Permitir aceleração por hardware (VDADecoder)</string>
   <string id="13430">Permitir aceleração por hardware (OpenMax)</string>
   <string id="13431">Pixel Shaders</string>
-
   <string id="13500">Método de syncronização de A/V</string>
   <string id="13501">Relógio de áudio</string>
   <string id="13502">Relógio de vídeo (cortar/ignorar áudio)</string>
@@ -1275,26 +1139,20 @@
   <string id="13507">Médio</string>
   <string id="13508">Alto</string>
   <string id="13509">Realmente alto(lento!)</string>
-  <string id="13510">Sincronizar reprodução com a exibição</string>  
-
+  <string id="13510">Sincronizar reprodução com a exibição</string>
   <string id="13550">Pausa durante alteração na taxa de atualização</string>
   <string id="13551">Desligado</string>
   <string id="13552">%.1f Segundo</string>
   <string id="13553">%.1f Segundos</string>
-
   <string id="13600">Controle Remoto Apple</string>
-
   <string id="13602">Permite iniciar o XBMC através do Controle Remoto</string>
   <string id="13603">Tempo de espera para sequenciamento</string>
-
   <string id="13610">Desabilitado</string>
   <string id="13611">Padrão</string>
   <string id="13612">Controle Remoto Universal</string>
   <string id="13613">Controle Remoto universal (Harmony)</string>
-
   <string id="13620">Erro Controle Remoto Apple</string>
   <string id="13621">Suporte ao Controle Remoto Apple pode ser habilitado.</string>
-
   <string id="14000">Agrupar</string>
   <string id="14001">Desagrupar</string>
   <string id="14003">Baixando lista de execução...</string>
@@ -1302,7 +1160,6 @@
   <string id="14005">Interpretando lista de canais...</string>
   <string id="14006">Recebimento da lista de canais falhou</string>
   <string id="14007">Recebimento de lista de execução falhou</string>
-
   <string id="14009">Diretório de jogos</string>
   <string id="14010">Troca automática para ícones baseado em</string>
   <string id="14011">Ativar troca automática para ícones</string>
@@ -1329,12 +1186,9 @@
   <string id="14034">Cache do DVD - DVD-ROM</string>
   <string id="14035">- Rede local</string>
   <string id="14036">Serviços</string>
-
   <string id="14038">Configurações de rede modificadas</string>
   <string id="14039">O XBMC precisa reiniciar para aplicar as suas</string>
   <string id="14040">configurações de rede.  Deseja reiniciar agora?</string>
-  <string id="14041">Pós-processamento</string>
-
   <string id="14043">- Desligar durante a execução</string>
   <string id="14044">%i mins</string>
   <string id="14045">%i segs</string>
@@ -1346,7 +1200,6 @@
   <string id="14051">Formato da hora</string>
   <string id="14052">Formato da data</string>
   <string id="14053">Filtros de interface</string>
-
   <string id="14055">Usar busca em segundo plano</string>
   <string id="14056">Parar busca</string>
   <string id="14057">Impossível enquanto estiver buscando informações da mídia</string>
@@ -1364,7 +1217,6 @@
   <string id="14069">Aplicar as configurações agora?</string>
   <string id="14070">Aplicar mudanças agora</string>
   <string id="14071">Permitir renomear e excluir arquivos</string>
-
   <string id="14074">Selecionar fuso horário</string>
   <string id="14075">Ajustar para horário de verão</string>
   <string id="14076">Adicionar a favoritos</string>
@@ -1387,27 +1239,21 @@
   <string id="14093">Segurança</string>
   <string id="14094">Disp. de Entrada</string>
   <string id="14095">Econ. de energia</string>
-
   <string id="15015">Remove</string>
   <string id="15016">Jogos</string>
-
   <string id="15019">Adicionar</string>
-
   <string id="15052">Senha</string>
-
   <string id="15100">Coleção</string>
   <string id="15101">Banco de dados</string>
   <string id="15102">* Todos álbuns</string>
   <string id="15103">* Todos artistas</string>
   <string id="15104">* Todas as músicas</string>
   <string id="15105">* Todos gêneros</string>
-
   <string id="15107">Carregando...</string>
   <string id="15108">Sons de navegação</string>
   <string id="15109">Skin padrão</string>
   <string id="15111">- Tema</string>
   <string id="15112">Tema padrão</string>
-
   <string id="15200">Last.fm</string>
   <string id="15201">Enviar músicas para o Last.fm</string>
   <string id="15202">Nome de usuário Last.fm</string>
@@ -1430,7 +1276,6 @@
   <string id="15219">Senha do Libre.fm</string>
   <string id="15220">Libre.fm</string>
   <string id="15221">Scrobbler</string>
-
   <string id="15250">Enviar a rádio para o Last.fm</string>
   <string id="15251">Conectando ao Last.fm...</string>
   <string id="15252">Selecionando estação...</string>
@@ -1480,21 +1325,16 @@
   <string id="15296">Desbanir</string>
   <string id="15297">Você quer remover esta faixa de suas faixas prediletas?</string>
   <string id="15298">Você quer desbanir esta faixa?</string>
-
   <string id="15300">Caminho não encontrado ou inválido</string>
   <string id="15301">Não foi possível conectar ao servidor da rede</string>
   <string id="15302">Não encontrou servidores</string>
   <string id="15303">Grupo de trabalho não encontrado</string>
-
   <string id="15310">Abrindo múltiplos caminhos para os marcadores</string>
   <string id="15311">Caminho:</string>
-
   <string id="16000">Geral</string>
-
   <string id="16002">Busca na internet</string>
   <string id="16003">Reprodutor</string>
   <string id="16004">Reproduzir mídia do disco</string>
-
   <string id="16008">Digite um novo título</string>
   <string id="16009">Nome do filme</string>
   <string id="16010">Nome do perfil</string>
@@ -1523,19 +1363,12 @@
   <string id="16033">Não pôde abrir banco de dados.</string>
   <string id="16034">Não pôde obter músicas do banco de dados.</string>
   <string id="16035">Lista de execução em modo-festa</string>
-
   <string id="16100">Todos os vídeos</string>
   <string id="16101">Não-vistos </string>
   <string id="16102">Vistos</string>
   <string id="16103">Marcar como visto</string>
   <string id="16104">Marcar como não-visto</string>
   <string id="16105">Editar título</string>
-  <string id="16106">Usar NTSC-M &amp; NTSC-J</string>
-  <string id="16107">Use apenas NTSC-M</string>
-  <string id="16108">Use apenas NTSC-J</string>
-  <string id="16109">Use apenas PAL-60</string>
-  <string id="16110">Para jogos com 60hz</string>
-
   <string id="16200">Operação foi cancelada</string>
   <string id="16201">Cópia falhou</string>
   <string id="16202">Falha ao copiar pelo menos um arquivo</string>
@@ -1543,7 +1376,6 @@
   <string id="16204">Falha ao mover pelo menos um arquivo</string>
   <string id="16205">Remover falhou</string>
   <string id="16206">Falha ao remover pelo menos um arquivo</string>
-
   <string id="16300">Método para escalamento de vídeo</string>
   <string id="16301">Vizinho mais próximo</string>
   <string id="16302">Bilinear</string>
@@ -1554,8 +1386,8 @@
   <string id="16307">Bicubic (software)</string>
   <string id="16308">Lanczos (software)</string>
   <string id="16309">Sinc (software)</string>
-  <string id="16310">(VDPAU)Temporal</string>
-  <string id="16311">(VDPAU)Temporal/Spatial</string>
+  <string id="16310">Temporal</string>
+  <string id="16311">Temporal/Espacial</string>
   <string id="16312">(VDPAU)Noise Reduction</string>
   <string id="16313">(VDPAU)Sharpness</string>
   <string id="16314">Inverse Telecine</string>
@@ -1564,27 +1396,21 @@
   <string id="16317">Temporal (Half)</string>
   <string id="16318">Temporal/Spatial (Half)</string>
   <string id="16319">DXVA</string>
-
   <string id="16400">Pós-processamento de video</string>
   <string id="16401">Desabilitado</string>
   <string id="16402">Ativar para Conteúdo SD</string>
   <string id="16403">Sempre Ligado</string>
-
   <string id="17500">Exibir intervalo para descanso</string>
-
   <string id="19000">Trocar para canal</string>
-
   <string id="20000">Pasta de músicas salvas</string>
   <string id="20001">Usar DVD-player externo</string>
   <string id="20002">DVD-player externo</string>
   <string id="20003">Pasta de trainers</string>
   <string id="20004">Pasta para captura de tela</string>
-
   <string id="20006">Pasta lista de reprodução</string>
   <string id="20007">Gravações</string>
   <string id="20008">Screenshots</string>
   <string id="20009">Usar XBMC</string>
-
   <string id="20011">Lista de reprodução de músicas</string>
   <string id="20012">Lista de reprodução de vídeos</string>
   <string id="20013">Você gostaria de iniciar o jogo?</string>
@@ -1594,21 +1420,16 @@
   <string id="20017">Ícone local</string>
   <string id="20018">Nenhum ícone</string>
   <string id="20019">Selecionar ícone</string>
-
-
   <string id="20022"></string>
   <string id="20023">Conflito</string>
   <string id="20024">Examinar novo</string>
   <string id="20025">Examinar todos</string>
   <string id="20026">Região</string>
-
-
-
   <string id="20037">Resumo</string>
   <string id="20038">Bloquear seção de música</string>
   <string id="20039">Bloquear seção de vídeo</string>
   <string id="20040">Bloquear seção de imagens</string>
-  <string id="20041">Bloquear seção de programas &amp; scripts</string>
+  <string id="20041">Bloquear janela de programas &amp; scripts</string>
   <string id="20042">Bloquear gerenciador de arquivos</string>
   <string id="20043">Bloquear configurações</string>
   <string id="20044">Iniciar de novo</string>
@@ -1623,7 +1444,6 @@
   <string id="20053">Sair do modo-mestre</string>
   <string id="20054">Entrou no modo-mestre</string>
   <string id="20055">Ícone Allmusic.com</string>
-
   <string id="20057">Remover ícone</string>
   <string id="20058">Adicionar perfil...</string>
   <string id="20059">Obter informação para todos os álbuns</string>
@@ -1753,8 +1573,6 @@
   <string id="20184">Rotacionar imagens usando informação do EXIF</string>
   <string id="20185">Usar estilo de visualização poster para seriados</string>
   <string id="20186">Por favor aguarde</string>
-  <string id="20187">Guardando valores da EEPROM</string>
-  <string id="20188">Guardando valores da BIOS</string>
   <string id="20189">Habilitar auto rolagem para enredo &amp; crítica</string>
   <string id="20190">Personalizado</string>
   <string id="20191">Habilitar registro de depuração</string>
@@ -1766,9 +1584,6 @@
   <string id="20197">Importar coleção de música</string>
   <string id="20198">Artista não encontrado!</string>
   <string id="20199">Erro ao baixar informação de artista</string>
-
-
-
   <string id="20250">Ativo! (vídeos)</string>
   <string id="20251">Misturando bebidas (vídeos)</string>
   <string id="20252">Enchendo os copos (vídeos)</string>
@@ -1778,37 +1593,24 @@
   <string id="20256">Cliente HTS Tvheadend</string>
   <string id="20257">Cliente VDR Streamdev</string>
   <string id="20258">Cliente MythTV</string>
-
   <string id="20300">Diretório do servidor Web (HTTP)</string>
   <string id="20301">Diretório do servidor Web (HTTPS)</string>
   <string id="20302">Impossível gravar na pasta:</string>
   <string id="20303">Quer cancelar e prosseguir?</string>
   <string id="20304">Feed RSS</string>
-
-  <string id="20306">Desconhecido. Adicione MD5 do xbmc.log ao BiosIDs.ini.</string>
   <string id="20307">DNS secundário</string>
   <string id="20308">Servidor DHCP:</string>
   <string id="20309">Criar nova pasta</string>
   <string id="20310">Escurecer LCD na reprodução</string>
   <string id="20311">Desconhecido ou onboard (protegido)</string>
   <string id="20312">Escurecer LCD na pausa</string>
-  <string id="20313">Ligar o LED durante a pausa</string>
   <string id="20314">Vídeos - Coleção</string>
-  <string id="20315">Saves de jogos</string>
   <string id="20316">Ordenar por: ID</string>
-  <string id="20317">Baixar saves de jogos</string>
-  <string id="20318">Save de jogo instalado no disco</string>
-  <string id="20319">Falha ao baixar save de jogo</string>
-  <string id="20320">Selecione save de jogo para baixar e instalar</string>
-  <string id="20321">Save não encontrado para jogo especificado</string>
-  <string id="20322">Ir para saves de jogos</string>
-  <string id="20323">Saves de jogos</string>
   <string id="20324">Reproduzir parte...</string>
   <string id="20325">Restaurar valores da calibração</string>
   <string id="20326">Isto irá restaurar os valores da calibração para %s</string>
   <string id="20327">para os valores padrões.</string>
   <string id="20328">Procurar destino</string>
-
   <string id="20330">Usar nomes de pastas para busca</string>
   <string id="20331">Arquivo</string>
   <string id="20332">Usar pasta ou nomes de arquivos em buscas?</string>
@@ -1883,7 +1685,6 @@
   <string id="20401">Reproduzir vídeo musical</string>
   <string id="20402">Baixar ícones de atores ao criar a coleção</string>
   <string id="20403">Selecionar ícone de ator</string>
-
   <string id="20405">Remover marcador do episódio</string>
   <string id="20406">Definir marcador do episódio</string>
   <string id="20407">Opções de scraper</string>
@@ -1898,7 +1699,6 @@
   <string id="20416">Primeira exibição</string>
   <string id="20417">Escritor</string>
   <string id="20418">Limpar nomes de arquivos e pastas</string>
-
   <string id="20420">Nunca</string>
   <string id="20421">Se só uma temporada</string>
   <string id="20422">Sempre</string>
@@ -1928,13 +1728,13 @@
   <string id="20446">Foram encontradas informações armazenadas localmente.</string>
   <string id="20447">Ignorar e atualizar da Internet?</string>
   <string id="20448">Não é possível baixar as informações</string>
-  <string id="20449">Provavelmente o servidor está indisponível.</string>
+  <string id="20449">Incapaz de conectar ao servidor remoto</string>
   <string id="20450">Deseja continuar a procura?</string>
   <string id="20451">Paises</string>
   <string id="20452">episódio</string>
   <string id="20453">episódios</string>
-
-
+  <string id="20454">Ouvinte</string>
+  <string id="20455">Ouvintes</string>
   <string id="21330">Exibir arquivos e diretórios ocultos</string>
   <string id="21331">Cliente TuxBox</string>
   <string id="21332">AVISO: dispositivo TuxBox está em modo de gravação!</string>
@@ -1943,16 +1743,12 @@
   <string id="21335">Tem certeza que deseja iniciar o canal?</string>
   <string id="21336">Conectando a: %s</string>
   <string id="21337">Dispositivo TuxBox</string>
-
-
   <string id="21359">Adicionar compartilhamento de mídia...</string>
   <string id="21360">Compartilhar coleções de vídeo e música através do UPnP</string>
-
   <string id="21364">Editar compartilhamento de mídia</string>
   <string id="21365">Remover compartilhamento de mídia</string>
   <string id="21366">Pasta de legendas</string>
   <string id="21367">Filme &amp; diretório de legenda alternativo</string>
-
   <string id="21369">Ativar mouse</string>
   <string id="21370">Permitir sons de navegação durante reprodução</string>
   <string id="21371">Ícone</string>
@@ -2038,7 +1834,6 @@
   <string id="21451">Necessário conexão com a Internet.</string>
   <string id="21452">Obter Mais</string>
   <string id="21453">Raiz</string>
-
   <string id="21800">Nome do arquivo</string>
   <string id="21801">Caminho do arquivo</string>
   <string id="21802">Tamanho do arquivo</string>
@@ -2048,7 +1843,6 @@
   <string id="21806">Comentário</string>
   <string id="21807">Colorido/B&amp;W</string>
   <string id="21808">Processamento JPEG</string>
-
   <string id="21820">Data/Hora</string>
   <string id="21821">Descrição</string>
   <string id="21822">Fabricante da câmera</string>
@@ -2073,7 +1867,6 @@
   <string id="21841">Longitude do GPS</string>
   <string id="21842">Altitude do GPS</string>
   <string id="21843">Orientação</string>
-
   <string id="21860">Categorias suplementares</string>
   <string id="21861">Palavras-chave</string>
   <string id="21862">Sub-título</string>
@@ -2115,13 +1908,9 @@
   <string id="21898">Anos de atividade</string>
   <string id="21899">Gravadora/marca</string>
   <string id="21900">Nascido/formado</string>
-
-
-
   <string id="22000">Atualizar coleção ao iniciar</string>
   <string id="22001">Ocultar progresso de atualizações de coleção</string>
   <string id="22002">- Sufixo de DNS</string>
-
   <string id="22003">%2.3fs</string>
   <string id="22004">Atrasado em: %2.3fs</string>
   <string id="22005">Adiantado em: %2.3fs</string>
@@ -2144,8 +1933,6 @@
   <string id="22022">Incluir arquivos de vídeo nas listagens</string>
   <string id="22023">Fabricante DirectX:</string>
   <string id="22024">Versão Direct3D:</string>
-
-
   <string id="22030">Fonte</string>
   <string id="22031">- Tamanho</string>
   <string id="22032">- Cores</string>
@@ -2160,37 +1947,24 @@
   <string id="22041">branco/vermelho</string>
   <string id="22042">branco/azul</string>
   <string id="22043">preto/branco</string>
-
   <string id="22079">Selecionar ação padrão</string>
   <string id="22080">Escolher</string>
   <string id="22081">Mostrar Informação</string>
   <string id="22082">Mais...</string>
   <string id="22083">Tocar Tudo</string>
-
   <string id="23049">Teletext indisponível</string>
   <string id="23050">Ativar Teletext</string>
   <string id="23051">Parte %i</string>
   <string id="23052">Acumulando %i bytes</string>
   <string id="23053">Parando</string>
   <string id="23054">Executando</string>
-
-
-  <string id="23000">Plugin do Tempo</string>
-  <string id="23001">- Configurações do plugin</string>
-  <string id="23050">Teletext ativado</string>
-  <string id="23051">Parte %i</string>
-
   <string id="23100">Player externo ativo</string>
   <string id="23101">Clique OK para sair do player</string>
-
   <string id="23104">Clique OK quando execução tiver terminado</string>
-
-
   <string id="24000">Add-on</string>
   <string id="24001">Add-ons</string>
   <string id="24002">Opções Add-on</string>
   <string id="24003">Informação do Add-on</string>
-
   <string id="24005">Locais de Midia</string>
   <string id="24007">Informação do Filme</string>
   <string id="24008">Proteção de Tela</string>
@@ -2203,7 +1977,6 @@
   <string id="24015">Informação de Video Musical (clipe)</string>
   <string id="24016">Informação de Album</string>
   <string id="24017">Informação de Artista</string>
-
   <string id="24020">Configurar</string>
   <string id="24021">Desativar</string>
   <string id="24022">Ativar</string>
@@ -2224,7 +1997,6 @@
   <string id="24041">Instalar a partir de um arquivo ZIP</string>
   <string id="24042">Baixando %i%%</string>
   <string id="24043">Atualizações Disponíveis</string>
-
   <string id="24050">Add-ons Disponíveis</string>
   <string id="24051">Versão:</string>
   <string id="24052">Declaração</string>
@@ -2241,7 +2013,6 @@
   <string id="24067">Baixando Add-ons</string>
   <string id="24068">Atualização Disponível</string>
   <string id="24069">Atualizar</string>
-
   <string id="24070">Add-on não utilizado</string>
   <string id="24071">Ocorreu um erro desconhecido</string>
   <string id="24072">Necessário configurações</string>
@@ -2251,29 +2022,19 @@
   <string id="24080">Reconectar?</string>
   <string id="24089">Add-on reiniciado</string>
   <string id="24090">Bloquear Gerenciador de Add-on</string>
-
   <string id="24091"></string>
   <string id="24092"></string>
   <string id="24093"></string>
   <string id="24094"></string>
   <string id="24095"></string>
-
   <string id="24096">O Add-on foi marcado como indisponível no repositório.</string>
   <string id="24097">Você deseja desabilitar em seu sistema?</string>
   <string id="24098">Indisponível</string>
   <string id="24099">Gostaria de trocar para esta skin?</string>
   <string id="25000">Notificações</string>
-
   <string id="29800">Modo de coleção</string>
   <string id="29801">Teclado QWERTY</string>
   <string id="29802">Utilizando áudio em passthrough</string>
-
-  <string id="29999">Aplicar filtro de cintilação (flick) para jogos</string>
-
-
-
-
-
   <string id="33001">Qualidade do trailer</string>
   <string id="33002">Canal/sinal</string>
   <string id="33003">Baixar</string>
@@ -2346,6 +2107,5 @@
   <string id="33081">Este arquivo está empilhado, selecione a parte que quer tocar.</string>
   <string id="33082">Caminho para o script</string>
   <string id="33083">Habilitar botão de script personalizado</string>
-
   <string id="34100">Configurar alto-falantes</string>
-</strings>
+</strings>
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 35324
          http://xbmc.svn.sourceforge.net/xbmc/?rev=35324&view=rev
Author:   theuni
Date:     2010-11-18 02:39:29 +0000 (Thu, 18 Nov 2010)

Log Message:
-----------
bump version strings for rc1. Also set PPA to build as release. All other platforms are handled at build time.

Modified Paths:
--------------
    branches/Dharma/tools/Linux/packaging/debian/rules
    branches/Dharma/xbmc/osx/Info.plist
    branches/Dharma/xbmc/utils/GUIInfoManager.h
    branches/Dharma/xbmc/win32/XBMC_PC.rc

Modified: branches/Dharma/tools/Linux/packaging/debian/rules
===================================================================
--- branches/Dharma/tools/Linux/packaging/debian/rules	2010-11-18 01:50:43 UTC (rev 35323)
+++ branches/Dharma/tools/Linux/packaging/debian/rules	2010-11-18 02:39:29 UTC (rev 35324)
@@ -10,7 +10,7 @@
 
 # Set this variable to yes for release builds to disable debugging and enable
 # optimizations.
-XBMC_RELEASE ?= no
+XBMC_RELEASE ?= yes
 
 # If not set already, try to set from debian/svnrevision
 ifeq (,$(SVNVERSION))
@@ -19,7 +19,7 @@
 
 # Whether we're building for release or not
 ifeq (yes,$(XBMC_RELEASE))
-  DEBUG_OPTIONS = --disable-debug --enable-optimizations
+  DEBUG_OPTIONS = --disable-debug
 else
   DEBUG_OPTIONS = --enable-debug
 endif

Modified: branches/Dharma/xbmc/osx/Info.plist
===================================================================
--- branches/Dharma/xbmc/osx/Info.plist	2010-11-18 01:50:43 UTC (rev 35323)
+++ branches/Dharma/xbmc/osx/Info.plist	2010-11-18 02:39:29 UTC (rev 35324)
@@ -9,7 +9,7 @@
 	<key>CFBundleExecutable</key>
 	<string>XBMC</string>
 	<key>CFBundleGetInfoString</key>
-	<string>10.0-beta4</string>
+	<string>10.0-rc1</string>
 	<key>CFBundleIconFile</key>
 	<string>xbmc.icns</string>
 	<key>CFBundleIdentifier</key>
@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>10.0-beta4</string>
+	<string>10.0-rc1</string>
 	<key>CFBundleVersion</key>
 	<string>r####</string>
 	<key>CFBundleSignature</key>

Modified: branches/Dharma/xbmc/utils/GUIInfoManager.h
===================================================================
--- branches/Dharma/xbmc/utils/GUIInfoManager.h	2010-11-18 01:50:43 UTC (rev 35323)
+++ branches/Dharma/xbmc/utils/GUIInfoManager.h	2010-11-18 02:39:29 UTC (rev 35324)
@@ -433,7 +433,7 @@
 
 // Version string MUST NOT contain spaces.  It is used
 // in the HTTP request user agent.
-#define VERSION_STRING "10.0-beta4"
+#define VERSION_STRING "10.0-rc1"
 
 #define LISTITEM_START              35000
 #define LISTITEM_THUMB              (LISTITEM_START)

Modified: branches/Dharma/xbmc/win32/XBMC_PC.rc
===================================================================
--- branches/Dharma/xbmc/win32/XBMC_PC.rc	2010-11-18 01:50:43 UTC (rev 35323)
+++ branches/Dharma/xbmc/win32/XBMC_PC.rc	2010-11-18 02:39:29 UTC (rev 35324)
@@ -71,12 +71,12 @@
         BEGIN
             VALUE "CompanyName", "Team XBMC"
             VALUE "FileDescription", "XBMC"
-            VALUE "FileVersion", "10.0-beta4"
+            VALUE "FileVersion", "10.0-rc1"
             VALUE "InternalName", "XBMC.exe"
             VALUE "LegalCopyright", "Copyright (c) Team XBMC.  All rights reserved."
             VALUE "OriginalFilename", "XBMC.exe"
             VALUE "ProductName", "XBMC for Windows"
-            VALUE "ProductVersion", "10.0-beta4"
+            VALUE "ProductVersion", "10.0-rc1"
         END
     END
     BLOCK "VarFileInfo"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 35332
          http://xbmc.svn.sourceforge.net/xbmc/?rev=35332&view=rev
Author:   vdrfan
Date:     2010-11-19 07:32:18 +0000 (Fri, 19 Nov 2010)

Log Message:
-----------
updated: #10712/#10713 - Icelandic translations. thanks kristjan

(cherry picked from commit 4c824ed1f658545821fb030807265f486255d767)

Modified Paths:
--------------
    branches/Dharma/addons/skin.confluence/language/Icelandic/strings.xml
    branches/Dharma/language/Icelandic/strings.xml

Modified: branches/Dharma/addons/skin.confluence/language/Icelandic/strings.xml
===================================================================
--- branches/Dharma/addons/skin.confluence/language/Icelandic/strings.xml	2010-11-19 07:30:15 UTC (rev 35331)
+++ branches/Dharma/addons/skin.confluence/language/Icelandic/strings.xml	2010-11-19 07:32:18 UTC (rev 35332)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Translator: Kristján Bjarni Guðmundsson-->
 <!--Email: kristjanbjarni@...>
-<!--Date of translation: 2010-05-20-->
+<!--Date of translation: 2010-11-18-->
 <!--$Revision$-->
-<!--Based on english strings version 29568-->
+<!--Based on english strings version 35254-->
 <strings>
   <!-- Misc labels -->
   <string id="31000">Breyta -</string>
@@ -62,7 +62,7 @@
   <string id="31104">Spila kvikmyndasýnishorn í glugga [COLOR=grey3](Aðeins myndbandaupplýsingarglugga)[/COLOR]</string>
   <string id="31105">Sýna myndatitla í bakgrunnsleit</string>
   <string id="31106">Ýmsir valkostir</string>
-  <string id="31107"/>
+  <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>
   <string id="31109">Bakgrunnar heimasvæðis</string>
   <string id="31110">Breyta bakgrunni fyrir heimahnapp</string>
@@ -71,23 +71,27 @@
   <string id="31113">Einföld mynd</string>
   <string id="31114">Margföld mynd</string>
   <string id="31115">Sérsníðari</string>
-  <string id="31116">Viðbótarskriftur</string>
+  <string id="31116"/>
   <string id="31117">Sýna myndbönd sem var nýlega bætt við</string>
   <string id="31118">Undirvalmynd heimasíðu</string>
-  <string id="31119">Virkja hnapp fyrir sérsniðna skriftu</string>
+  <string id="31119"/>  <!-- blanked 2010-11-12 -->
   <string id="31120">HNAPPAHEITI</string>
-  <string id="31121">SLÓÐ Á SKRIFTU</string>
+  <string id="31121"/>  <!-- blanked 2010-11-12 -->
   <string id="31122">Veðursíða</string>
   <string id="31123">Nota "Veggspjöld" í staðinn fyrir "Borða" fyrir sjónvarpsþætti</string>
   <string id="31124">Sýna "Í spilun" myndband í bakgrunni</string>
   <string id="31125">Sýna "Í spilun" myndskreytingu í bakgrunni</string>
 
-  <string id="31126">Virkja lagatexta á tónlistarskjá</string>
-  <string id="31127">SLÓÐ Á LAGATEXTASKRIFTU</string>
-  <string id="31128">XBMC lagatextar</string>
-  <string id="31129">Virkja niðurhal á þýðingartexta í myndbandaskjá</string>
-  <string id="31130">SLÓÐ Á ÞÝÐINGARTEXTA SKRIFTU</string>
+  <string id="31126"/>  <!-- blanked 2010-11-12 -->
+  <string id="31127"/>  <!-- blanked 2010-11-12 -->
+  <string id="31128">Lagatextar</string>
+  <string id="31129"/>  <!-- blanked 2010-11-12 -->
+  <string id="31130"/>  <!-- blanked 2010-11-12 -->
 
+  <string id="31131">Nota lárétta heimavalmynd</string>
+  <string id="31132">Viðbót fyrir lagatexta</string>
+  <string id="31133">Viðbót fyrir þýðingartexta</string>
+
   <string id="31140">Tónlistarskjár</string>
   <string id="31141">Myndbandaskjár</string>
 
@@ -99,11 +103,6 @@
   <string id="31204">Tenglar svæðis</string>
   <string id="31205">Frumkóði lagatexta</string>
 
-  <!-- The Weather Channel Script labels -->
-  <string id="31250">Ratsjá og Veðurspá</string>
-  <string id="31251">Veðurspá</string>
-  <string id="31252">TWC skrifta</string>
-
   <!-- Extra labels -->
   <string id="31300">Núverandi hiti</string>
   <string id="31301">Síðast uppfært</string>
@@ -146,15 +145,19 @@
   <string id="31356">Niðurhala þýðingartextum</string>
   <string id="31357"/>
 
+  <!-- Skin Fontsets -->
+  <string id="31390">Sjálfgildi útlits</string>
+  <string id="31391">Sjálfgildi útlits með engum hástöfum</string>
+  <string id="31392">Byggt á Arial</string>
+
   <!-- Description Labels  -->
   <string id="31400">[B]BREYTA VIÐMÓTSSTILLINGUM[/B][CR][CR]Breyta útlitinu · Breyta tungumáli og svæði · Breyta stillingum skráarlista[CR]Breyta skjáhvílu</string>
-  <string id="31401">[B]BREYTA SKJÁSTILLINGUM[/B][CR][CR]Sýsla með myndabandasafn · Breyta myndbandaspilun · Breyta stillingum myndbandalista[CR]Breyta leturgerðum skjátexta</string>
+  <string id="31401">[B]BREYTA SKJÁSTILLINGUM[/B][CR][CR]Sýsla með myndabandasafn · Breyta myndbandaspilun · Breyta stillingum myndbandalista[CR]Breyta leturgerðum þýðingartexta</string>
   <string id="31402">[B]BREYTA TÓNLISTARSTILLINGUM[/B][CR][CR]Sýsla með tónlistarsafn · Breyta stillingum tónlistarspilara · Breyta stillingum tónlistarlista[CR]Skilgreina laga upphal · Breyta karaoke stillingum</string>
   <string id="31403">[B]BREYTA LJÓSMYNDASTILLINGUM[/B][CR][CR]Breyta stillingum ljósmyndalista · Stilla myndasýningar</string>
   <string id="31404">[B]BREYTA VEÐURSTILLINGUM[/B][CR][CR]Skilgreindu þrjár borgir til að ná í veðurupplýsingar fyrir</string>
   <string id="31405">[B]BREYTA NETSTILLINGUM[/B][CR][CR]Breyta hvernig XBMC er stjórnað með UPnP eða HTTP · Breyta skráardeilingu[CR]Breyta Internet stillingum</string>
-  <string id="31406">[B]BREYTA KERFISSTILLINGUM[/B][CR][CR]Breyta og stilla skjái · Breyta hljóðúttaki · 
-Skilgreina fjarstýringar[CR]Breyta orkukostum · Virkja aflúsun · Skilgreina aðallykilorð</string>
+  <string id="31406">[B]BREYTA KERFISSTILLINGUM[/B][CR][CR]Breyta og stilla skjái · Breyta hljóðúttaki · Skilgreina fjarstýringar[CR]Breyta orkukostum · Virkja aflúsun · Skilgreina aðallykilorð</string>
   <string id="31407">[B]BREYTA ÚTLITSSTILLINGUM[/B][CR][CR]Breyta útliti Confluence · Bæta við og fjarlægja hluti úr aðalvamynd[CR]Breyta bakgrunni</string>
   <string id="31408">[B]BREYTA VIÐBÓTUM[/B][CR][CR]Breyttu uppsettum viðbótum · Leitaðu að og settu upp viðbætur frá xbmc.org[CR]Breyta stillingum viðbóta</string>
 

Modified: branches/Dharma/language/Icelandic/strings.xml
===================================================================
--- branches/Dharma/language/Icelandic/strings.xml	2010-11-19 07:30:15 UTC (rev 35331)
+++ branches/Dharma/language/Icelandic/strings.xml	2010-11-19 07:32:18 UTC (rev 35332)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Translator: Kristján Bjarni Guðmundsson-->
 <!--Email: kristjanbjarni@...>
-<!--Date of translation: 2010-05-20-->
+<!--Date of translation: 2010-11-18-->
 <!--$Revision$-->
-<!--Based on english strings version 30281-->
+<!--Based on english strings version 35193-->
 <strings>
   <string id="0">Forrit</string>
   <string id="1">Ljósmyndir</string>
@@ -58,6 +58,24 @@
   <string id="61">nóv</string>
   <string id="62">des</string>
 
+  <string id="71">N</string>
+  <string id="72">NNA</string>
+  <string id="73">NA</string>
+  <string id="74">ANA</string>
+  <string id="75">A</string>
+  <string id="76">ASA</string>
+  <string id="77">SA</string>
+  <string id="78">SSA</string>
+  <string id="79">S</string>
+  <string id="80">SSV</string>
+  <string id="81">SV</string>
+  <string id="82">VSV</string>
+  <string id="83">V</string>
+  <string id="84">VNV</string>
+  <string id="85">NV</string>
+  <string id="86">NNV</string>
+  <string id="87">VAR</string>
+
   <string id="98">Útlit: Sjálfvirkt</string>
   <string id="99">Útlit: Sjálfvirkt stórt</string>
   <string id="100">Sjá sem: Tákn</string>
@@ -73,7 +91,8 @@
   <string id="110">Gera smámyndir</string>
   <string id="111">Flýtival</string>
   <string id="112">Í bið</string>
-
+  <string id="113">Uppfærsla mistókst</string>
+  <string id="114">Uppsetning mistókst</string>
   <string id="115">Afrita</string>
   <string id="116">Færa</string>
   <string id="117">Eyða</string>
@@ -126,7 +145,7 @@
   <string id="164">Enginn diskur</string>
   <string id="165">Diskur í bakka</string>
   <string id="166">Útlit</string>
-  <string id="167">Virkja FTP þjón</string>
+  <string id="167"/>
   <string id="168"/>
   <string id="169">Upplausn</string>
   <string id="170">Stilla glæðningartíðni til að passa við myndefni</string>
@@ -158,6 +177,7 @@
   <string id="196">Veldu kvikmynd:</string>
   <string id="197">Sæki %s upplýsingar</string>
   <string id="198">Sæki upplýsingar um mynd</string>
+  <string id="199">Vefviðmót</string>
 
   <string id="202">Undirtitill</string>
   <string id="203">Söguþráður</string>
@@ -194,6 +214,12 @@
   <string id="237">Minnkun</string>
   <string id="238">Stækkun</string>
   <string id="239">Hreinsa spilunarlista við enda</string>
+  <string id="240">Skjáhamur</string>
+  <string id="241">Fylla skjá #%d</string>
+  <string id="242">Glugga</string>
+  <string id="243">Glæðingartíðni</string>
+  <string id="244">Fylla skjá</string>
+  <string id="245">Stærðir: (%i,%i)-&gt;(%i,%i) (Aðdráttur x%2.2f) AR:%2.2f:1 (Punktar: %2.2f:1)</string>
 
   <string id="247">Skriftur</string>
   <string id="248">Tungumál</string>
@@ -233,7 +259,7 @@
   <string id="282">Fann %i atriði</string>
   <string id="283">Leitarniðurstöður</string>
   <string id="284">Ekkert fannst</string>
-  <string id="286">Eftirvinnslusía</string>
+  <string id="286"/>
   <string id="287">Þýðingartextar</string>
   <string id="288">Leturgerð</string>
   <string id="289">- Stærð</string>
@@ -253,11 +279,11 @@
   <string id="304">Tungumál</string>
   <string id="305">Virkt</string>
   <string id="306">Ekki önnur hver lína</string>
-  <string id="307">- Sjálfvirk eftirvinnsla</string>
-  <string id="308">- Lóðrétt afblokkunar sía</string>
-  <string id="309">- Lárétt afblokkunar sía</string>
-  <string id="310">- Sjálfvirk birta/skerpa</string>
-  <string id="311">- Hringja sía</string>
+  <string id="307"/>
+  <string id="308"/>
+  <string id="309"/>
+  <string id="310"/>
+  <string id="311"/>
   <string id="312">(0=sjálfv.)</string>
   <string id="313">Hreinsa gagnagrunn</string>
   <string id="314">Undirbý...</string>
@@ -350,8 +376,8 @@
   <string id="404">Vindur</string>
   <string id="405">Daggarmark</string>
   <string id="406">Raki</string>
-  <string id="407">Frá</string>
-  <string id="408">á</string>
+  <string id="407"/>
+  <string id="408"/>
   <string id="409">Sjálfgildi</string>
   <string id="410">Tengist veðurþjónustu</string>
   <string id="411">Sæki veðurgögn fyrir:</string>
@@ -377,6 +403,7 @@
   <string id="431">Ekkert biðminni</string>
   <string id="432">Eyða kvikmynd úr safni</string>
   <string id="433">Viltu fjarlægja '%s'?</string>
+  <string id="434">Frá %s á %i %s</string> <!--From <wind dir.> at <speed> <unit>-->
 
   <string id="437">Færanlegur diskur</string>
   <string id="438">Opna skrá</string>
@@ -402,7 +429,7 @@
   <string id="459">Textar</string>
   <string id="460">Hljóðstraumur</string>
   <string id="461">[virkt]</string>
-  <string id="462">Þýðingarátexti</string>
+  <string id="462">Þýðingartexti</string>
   <string id="463">Baklýsing</string>
   <string id="464">Birta</string>
   <string id="465">Skerpa</string>
@@ -453,7 +480,7 @@
   <string id="517">Nýlega spilaðar hljómplötur</string>
   <string id="518">Keyra</string>
   <string id="519">Keyra í...</string>
-  <string id="520">Breyta XBE titli</string>
+  <string id="520"/>
   <string id="521">Safnplötur</string>
   <string id="522">Eyða uppsprettu</string>
   <string id="523">Skipta um miðil</string>
@@ -508,6 +535,7 @@
   <string id="572">Stúdíó</string>
   <string id="573">Slóð</string>
   <string id="574">Land</string>
+  <string id="575">Í vinnslu</string>
 
   <string id="580">Raða í átt</string>
   <string id="581">Röðunaraðferð</string>
@@ -540,6 +568,8 @@
   <string id="609">CDDARipPath er ekki skilgreint.</string>
   <string id="610">Afrita lag</string>
   <string id="611">Sláðu inn númer</string>
+  <string id="612">Bitar/úrtak</string>
+  <string id="613">Tíðni</string>
 
   <string id="620">Tónlistardiskar</string>
   <string id="621">Kótari</string>
@@ -601,7 +631,7 @@
   <string id="715">- Úthlutað</string>
   <string id="716">Sjálfvirkt (DHCP)</string>
   <string id="717">Handvirkt (Föst)</string>
-  <string id="718">Sjálfgefið (Mælaborð)</string>
+  <string id="718"/>
   <string id="719">- IP tala</string>
   <string id="720">- Undirnetssía</string>
   <string id="721">- Sjálfgefinn gátt</string>
@@ -653,7 +683,7 @@
   <!-- strings 768 and 769 reserved for more subtitle colors -->
 
   <string id="770">Villa %i: samnýting ekki aðgengileg</string>
-  <string id="771">- Sjálfvirkur FATX takmarkari</string>
+  <string id="771"/>
   <string id="772">Hljóðbúnaður</string>
   <string id="773">Leita</string>
   <string id="774">Mappa fyrir myndasýningar skjávara</string>
@@ -686,7 +716,7 @@
   <string id="851">Gild gátt er á bilinu 1-65535</string>
   <string id="852">Gild gátt er á bilinu 1024-65535</string>
 
-  <string id="1000">Forsýna skjávara</string>
+  <string id="1000">- Forsýna</string>
   <string id="1001">Get ekki tengst</string>
   <string id="1002">XBMC getur ekki tengst við netslóð.</string>
   <string id="1003">Þetta gæti verið vegna þess að netið er ekki tengt.</string>
@@ -772,9 +802,9 @@
   <string id="1234">Forrit &amp; myndir &amp; tónlist</string>
   <string id="1235">Forrit &amp; myndir &amp; myndefni</string>
 
-  <string id="1245">FTP notandanafn</string>
-  <string id="1246">FTP lykilorð</string>
-  <string id="1247">Tókst að setja lykilorð</string>
+  <string id="1245"/>
+  <string id="1246"/>
+  <string id="1247"/>
 
   <string id="1250">Sjálfvirk uppgötvun</string>
   <string id="1251">Sjálfvirk uppgötvun kerfa</string>
@@ -814,6 +844,10 @@
   <string id="1417">Haglél</string>
   <string id="1418">Þrumuveður</string>
   <string id="1419">Þrumuskúrir</string>
+  <string id="1420">Hóflegt</string>
+  <string id="1421">Mjög hátt</string>
+  <string id="1422">Vindasamt</string>
+  <string id="1423">Mistur</string>
 
   <!-- strings through to 1450 reserved for weather translation -->
 
@@ -823,6 +857,9 @@
   <string id="2050">Lengd</string>
 
   <string id="2100">Skrifta mistókst! : %s</string>
+  <string id="2101">Þarfnast nýrrar útgáfu - Skoðaðu atburðaskrá</string>
+  <string id="2102"/>
+  <string id="2103"/>
 
   <string id="4501">Virkja LCD/VFD</string>
 
@@ -893,18 +930,18 @@
   <string id="12009">Endurbygging á atriðaskrá...</string>
   <string id="12010">Til baka í tónlist</string>
   <string id="12011">Til baka í myndefni</string>
-  <string id="12012">Uppfæra svindl lista</string>
-  <string id="12013">Svindl</string>
-  <string id="12014">Engin svindl fundust</string>
-  <string id="12015">Stillingar svindls</string>
-  <string id="12016">Öll skráð svindl finnast ekki. Uppfærðu lista</string>
-  <string id="12017">Halda áfram frá seinasta stað</string>
-  <string id="12018">Nei</string>
-  <string id="12019">Já</string>
-  <string id="12020">Spyrja</string>
+  <string id="12012"/>
+  <string id="12013"/>
+  <string id="12014"/>
+  <string id="12015"/>
+  <string id="12016"/>
+  <string id="12017"/>
+  <string id="12018"/>
+  <string id="12019"/>
+  <string id="12020"/>
   <string id="12021">Byrja frá byrjun</string>
   <string id="12022">Áfram frá %s</string>
-  <string id="12023">Staðfesti núverandi svindl...</string>
+  <string id="12023"/>
 
   <string id="12310">0</string>
   <string id="12311">1</string>
@@ -955,9 +992,9 @@
   <string id="12377">Þetta mun endurstilla allar fyrri vistaðar stillingar</string>
   <string id="12378">Sýna hverja mynd í</string>
   <string id="12379">Nota skotrun og þysjun</string>
-  <string id="12380">Spila NTSC myndir á PAL hraða</string>
-  <string id="12381">Spila PAL myndir á NTSC hraða</string>
-  <string id="12382">Spila NTSC myndir í PAL60</string>
+  <string id="12380"/>
+  <string id="12381"/>
+  <string id="12382"/>
   <string id="12383">12 klst klukka</string>
   <string id="12384">24 klst klukka</string>
   <string id="12385">Dagur/Mánuður</string>
@@ -980,8 +1017,8 @@
   <string id="13003">- Bið</string>
   <string id="13004">- Lágmarks tímalengd</string>
   <string id="13005">Slökkva</string>
-  <string id="13006">Mælaborð</string>
-  <string id="13007">Nota slóða að eigin mælaborði</string>
+  <string id="13006"/>
+  <string id="13007"/>
   <string id="13008">Hætta aðgerð</string>
   <string id="13009">Hætta</string>
   <string id="13010">Dvali</string>
@@ -990,6 +1027,7 @@
   <string id="13013">Endurræsa</string>
   <string id="13014">Minnka</string>
   <string id="13015">Aðgerð straumrofa</string>
+  <string id="13016">Slökkva á kerfi</string>
 
   <string id="13020">Er önnur lota virk, kannski yfir ssh?</string>
   <string id="13021">Tengdur utanáliggjandi harður diskur</string>
@@ -1036,27 +1074,27 @@
   <string id="13146">XBMC, gæti breyting á þessu haft áhrif á getu þína</string>
   <string id="13147">til að halda áfram að stjórna því. Viltu halda áfram?</string>
 
-  <string id="13150">HDD lykill:</string>
-  <string id="13151">HDD hiti:</string>
-  <string id="13152">DVD tegund:</string>
-  <string id="13153">DVD fastbúnaður:</string>
-  <string id="13154">HDD tegund:</string>
-  <string id="13155">HDD raðnúmer:</string>
-  <string id="13156">HDD fastbúnaður:</string>
-  <string id="13157">HDD lykilorð:</string>
-  <string id="13158">HDD lás Staða:</string>
+  <string id="13150"/>
+  <string id="13151"/>
+  <string id="13152"/>
+  <string id="13153"/>
+  <string id="13154"/>
+  <string id="13155"/>
+  <string id="13156"/>
+  <string id="13157"/>
+  <string id="13158"/>
   <string id="13159">Undirnetssía</string>
   <string id="13160">Gátt</string>
   <string id="13161">Aðal DNS</string>
   <string id="13162">Frumstilling mistókst</string>
 
-  <string id="13163">Stýripinni</string>
-  <string id="13164">Lyklaborð</string>
-  <string id="13165">Mús</string>
-  <string id="13166">Höfuðhljóðnemi</string>
-  <string id="13167">Minniskubbur</string>
-  <string id="13168">Fjarstýring</string>
-  <string id="13169">Tengi fyrir stýringu</string>
+  <string id="13163"/>
+  <string id="13164"/>
+  <string id="13165"/>
+  <string id="13166"/>
+  <string id="13167"/>
+  <string id="13168"/>
+  <string id="13169"/>
 
 
   <string id="13170">Aldrei</string>
@@ -1075,6 +1113,8 @@
   <string id="13210">Í gangi, vakning eftir %im</string>
   <string id="13211">Vakna!</string>
   <string id="13212">Slökkt með %im%is eftir</string>
+  <string id="13213">%2.0fm</string> <!--minutes (left from countdown)-->
+  <string id="13214">%2.0fs</string> <!--seconds (left from countdown)-->
 
   <string id="13249">Leita að þýðingartextum í RAR skrám</string>
   <string id="13250">Leita eftir þýðingartexta...</string>
@@ -1096,20 +1136,20 @@
 
   <string id="13283">Stýrikerfi:</string>
   <string id="13284">CPU hraði:</string>
-  <string id="13285">Uppgötvaður BIOS:</string>
+  <string id="13285"/>
   <string id="13286">Skjáhraðall:</string>
   <string id="13287">Skjáupplausn:</string>
-  <string id="13288">Xbox útgáfa:</string>
-  <string id="13289">Xbox raðnúmer:</string>
-  <string id="13290">Xbox framleiðandi:</string>
-  <string id="13291">Mod kubbur:</string>
+  <string id="13288"/>
+  <string id="13289"/>
+  <string id="13290"/>
+  <string id="13291"/>
   <string id="13292">Hljóð/Mynd tengi:</string>
-  <string id="13293">Skjá og XBE svæði:</string>
+  <string id="13293"/>
   <string id="13294">DVD svæði:</string>
   <string id="13295">Internet:</string>
   <string id="13296">Tengdur</string>
   <string id="13297">Ekki tengdur. Athugaðu netstillingar.</string>
-  <string id="13298">Xbox Live lykill:</string>
+  <string id="13298"/>
   <string id="13299">Fastur hiti</string>
   <string id="13300">Viftuhraði</string>
   <string id="13301">Sjálfvikur hitastillir</string>
@@ -1148,8 +1188,8 @@
   <string id="13334">Breyta nafni</string>
   <string id="13335">Gera sjálfgefið</string>
   <string id="13336">Eyða takka</string>
-  <string id="13338">LED að framan</string>
-  <string id="13339">Litur á LED að framan</string>
+  <string id="13338"/>
+  <string id="13339"/>
   <string id="13340">Láta eiga sig</string>
   <string id="13341">Grænn</string>
   <string id="13342">Appelsínugulur</string>
@@ -1230,6 +1270,7 @@
   <string id="13428">Leyfa vélbúnaðarhröðun (CrystalHD)</string>
   <string id="13429">Leyfa vélbúnaðarhröðun (VDADecoder)</string>
   <string id="13430">Allow hardware acceleration (OpenMax)</string>
+  <string id="13431">Punktaskyggir</string>
 
   <string id="13500">A/V samstillingaraðferð</string>
   <string id="13501">Hljóðklukka</string>
@@ -1243,6 +1284,11 @@
   <string id="13509">Mjög hátt(hægvirkt!)</string>
   <string id="13510">Samstilla spilun við skjá</string>
 
+  <string id="13550">Setja í bið þegar glæðningartíðni er breytt</string>
+  <string id="13551">Af</string>
+  <string id="13552">%.1f Sekúnda</string>
+  <string id="13553">%.1f Sekúndur</string>
+
   <string id="13600">Apple fjarstýring</string>
 
   <string id="13602">Leyfa að ræsa XBMC með fjarstýringunni</string>
@@ -1294,7 +1340,7 @@
   <string id="14038">Netstillingum breytt</string>
   <string id="14039">XBMC þarf að endurræsa til að virkja</string>
   <string id="14040">netstillingar.  Viltu endurræsa núna?</string>
-  <string id="14041">Eftirvinnsla</string>
+  <string id="14041"/>
 
   <string id="14043">- Slökkva í miðri spilun</string>
   <string id="14044">%i mín</string>
@@ -1390,7 +1436,7 @@
   <string id="15218">Libre.fm notandanafn</string>
   <string id="15219">Libre.fm lykilorð</string>
   <string id="15220">Libre.fm</string>
-  <string id="15221">Senda lag</string>
+  <string id="15221">Senda lög</string>
 
   <string id="15250">Senda Last.fm útvarp til Last.fm</string>
   <string id="15251">Tengist við Last.fm...</string>
@@ -1491,11 +1537,11 @@
   <string id="16103">Merkja sem búið að horfa á</string>
   <string id="16104">Merkja sem ekki búið að horfa á</string>
   <string id="16105">Breyta titli</string>
-  <string id="16106">Nota NTSC-M og NTSC-J</string>
-  <string id="16107">Nota aðeins NTSC-M</string>
-  <string id="16108">Nota aðeins NTSC-J</string>
-  <string id="16109">Nota aðeins PAL-60</string>
-  <string id="16110">Fyrir 60hz Leiki</string>
+  <string id="16106"/>
+  <string id="16107"/>
+  <string id="16108"/>
+  <string id="16109"/>
+  <string id="16110"/>
 
   <string id="16200">Hætt var við aðgerð</string>
   <string id="16201">Afritun mistókst</string>
@@ -1524,7 +1570,13 @@
   <string id="16316">Sjálfvirkt</string>
   <string id="16317">Tími (Hálfur)</string>
   <string id="16318">Tími/Rými (Hálfur)</string>
+  <string id="16319">DXVA</string>
 
+  <string id="16400">Eftirvinnsla</string>
+  <string id="16401"/>
+  <string id="16402"/>
+  <string id="16403"/>
+
   <string id="17500">Sýna biðtíma</string>
 
   <string id="19000">Skipta yfir á rás</string>
@@ -1708,13 +1760,13 @@
   <string id="20184">Snúa mynd með upplýsingum frá EXIF</string>
   <string id="20185">Nota veggspjaldasnið fyrir sjónvarpsþætti</string>
   <string id="20186">Bíddu Aðeins</string>
-  <string id="20187">Afrita EEPROM</string>
-  <string id="20188">Afrita BIOS</string>
+  <string id="20187"/>
+  <string id="20188"/>
   <string id="20189">Virkja sjálfvirkt skrun fyrir söguþráð og gagnrýni</string>
   <string id="20190">Sérsniðið</string>
   <string id="20191">Virkja kembi úttak</string>
   <string id="20192">Ná í viðbótar upplýsingar við uppfærslu</string>
-
+  <string id="20193">Sjálfgefin þjónustua fyrir hljómplötu upplýsingar</string>
   <string id="20194">Sjálfgefin þjónusta fyrir tónlistarupplýsingar</string>
   <string id="20195">Breyta skrapara</string>
   <string id="20196">Flytja út tónlistarsafn</string>
@@ -1730,6 +1782,9 @@
   <string id="20253">WebDAV þjónn (HTTP)</string>
   <string id="20254">WebDAV þjónn (HTTPS)</string>
   <string id="20255">Fyrsta innskráning, breyttu notandastillingum</string>
+  <string id="20256">HTS Tvheadend biðlari</string>
+  <string id="20257">VDR Streamdev biðlari</string>
+  <string id="20258">MythTV biðlari</string>
 
   <string id="20300">Mappa vefþjóns (HTTP)</string>
   <string id="20301">Mappa vefþjóns (HTTPS)</string>
@@ -1737,24 +1792,24 @@
   <string id="20303">Viltu sleppa og halda áfram?</string>
   <string id="20304">RSS straumur</string>
 
-  <string id="20306">Óþekkt. Vinsamlegast bættu við MD5 frá xbmc.log í BiosIDs.ini.</string>
+  <string id="20306"/>
   <string id="20307">Auka DNS</string>
   <string id="20308">DHCP miðlari:</string>
   <string id="20309">Búa til nýja möppu</string>
   <string id="20310">Deyfa LCD við spilun</string>
   <string id="20311">Óþekktur eða á borði (varinn)</string>
   <string id="20312">Deyfa LCD við hlé</string>
-  <string id="20313">Setja LED aftur á við hlé</string>
+  <string id="20313"/>
   <string id="20314">Myndefni - Safn</string>
-  <string id="20315">Leikjavistanir</string>
+  <string id="20315"/>
   <string id="20316">Raða eftir: Auðkenni</string>
-  <string id="20317">Niðurhala Leikjavistunum</string>
-  <string id="20318">Leikjavistanir á hörðum Disk</string>
-  <string id="20319">Get ekki niðurhalað leikjavistunum</string>
-  <string id="20320">Veldu leikjavistun til að niðurhala og setja inn</string>
-  <string id="20321">Engin leikjavistun fannst fyrir viðkomandi leik</string>
-  <string id="20322">Fara í Leikjavistun</string>
-  <string id="20323">Leikjavistanir</string>
+  <string id="20317"/>
+  <string id="20318"/>
+  <string id="20319"/>
+  <string id="20320"/>
+  <string id="20321"/>
+  <string id="20322"/>
+  <string id="20323"/>
   <string id="20324">Spila hlut...</string>
   <string id="20325">Endurstilla tækjastillingu</string>
   <string id="20326">Þetta endurstillir tækjastillingu fyrir %s</string>
@@ -1807,7 +1862,7 @@
   <string id="20373">Sería</string>
   <string id="20374">Sæki upplýsingar um myndefni</string>
   <string id="20375">Taka af innihald</string>
-
+  <string id="20376">Upprunalegur titill</string>
   <string id="20377">Uppfæra upplýsingar um sjónvarpsþátt</string>
   <string id="20378">Uppfæra upplýsingar um alla þætti?</string>
   <string id="20379">Mappa inniheldur einn sjónvarpsþátt</string>
@@ -1880,9 +1935,13 @@
   <string id="20446">Fann staðbundnar upplýsingar.</string>
   <string id="20447">Hunsa og endurnýja frá Internetinu?</string>
   <string id="20448">Gat ekki niðurhalið upplýsingum</string>
-  <string id="20449">Netþjónn er líklega ekki uppi.</string>
+  <string id="20449">Get ekki tengst við netþjón</string>
   <string id="20450">Viltu halda áfram að leita?</string>
   <string id="20451">Lönd</string>
+  <string id="20452">þáttur</string>
+  <string id="20453">þættir</string>
+  <string id="20454">Hlustandi</string>
+  <string id="20455">Hlustendur</string>
   <!-- up to 21329 is reserved for the video db !! !-->
 
   <string id="21330">Sýna faldar skrár og möppur</string>
@@ -1955,7 +2014,6 @@
   <string id="21417">- Stillingar</string>
   <string id="21418">Fjöltungumál</string>
   <string id="21419">Engar sköfur skilgreindar</string>
-
   <string id="21420">Gildi til að para</string>
   <string id="21421">Snjöll spilunarlistaregla</string>
   <string id="21422">Para lög þar sem</string>
@@ -1987,6 +2045,9 @@
   <string id="21448">Tungumál þýðingartexta</string>
   <string id="21449">Fjarstýring sendir lyklaborðsáslætti</string>
   <string id="21450">- Breyta</string>
+  <string id="21451">Internet tenging er nauðsynleg.</string>
+  <string id="21452">Ná í meira...</string>
+  <string id="21453">Rótarskráarkerfið</string>
 
   <string id="21800">Skráarnafn</string>
   <string id="21801">Skáarslóð</string>
@@ -2071,6 +2132,7 @@
   <string id="22001">Uppfæra alltaf safn í bakgrunni</string>
   <string id="22002">- DNS viðskeyti</string>
 
+  <string id="22003">%2.3fs</string>
   <string id="22004">Seinkað: %2.3fs</string>
   <string id="22005">Á undan: %2.3fs</string>
   <string id="22006">Færsla þýðingartexta</string>
@@ -2109,6 +2171,12 @@
   <string id="22042">hvítt/blátt</string>
   <string id="22043">svart/hvítt</string>
 
+  <string id="22079">Sjálfgefin valaðgerð</string>
+  <string id="22080">Veldu</string>
+  <string id="22081">Sýna upplýsingar</string>
+  <string id="22082">Meira...</string>
+  <string id="22083">Spila allt</string>
+
   <string id="23049">Textavarp ekki tiltækt</string>
   <string id="23050">Virkja textavarp</string>
   <string id="23051">Partur %i</string>
@@ -2122,18 +2190,24 @@
 
   <string id="23104">Smelltu á Í lagi þegar spilun er lokið</string>
 
-  <!-- strings 24000 thru 24299 reserved for the addons framework -->
+  <!-- strings 24000 thru 24299 reserved for the Add-ons framework -->
   <string id="24000">Viðbót</string>
   <string id="24001">Viðbætur</string>
   <string id="24002">Viðbótarstillingar</string>
   <string id="24003">Viðbótarupplýsingar</string>
 
   <string id="24005">Tengiforrit</string>
-  <string id="24007">Skafa</string>
+  <string id="24007">Kvikmyndaupplýsingar</string>
   <string id="24008">Skjávari</string>
   <string id="24009">Skrifta</string>
   <string id="24010">Myndskreyting</string>
   <string id="24011">Viðbótarsafn</string>
+  <string id="24012">Þýðingartextar</string>
+  <string id="24013">Lagatextar</string>
+  <string id="24014">Sjónvarpsupplýsingar</string>
+  <string id="24015">Upplýsingar um tónlistarmyndband</string>
+  <string id="24016">Hljómplötuupplýsingar</string>
+  <string id="24017">Upplýsingar um flytjanda</string>
 
   <string id="24020">Stilla viðbætur</string>
   <string id="24021">Gera viðbót óvirka</string>
@@ -2148,11 +2222,19 @@
   <string id="24034">Leita að uppfærslum</string>
   <string id="24035">Þvinga endurnýjun</string>
   <string id="24036">Breytingaskrá</string>
+  <string id="24037">Taka út</string>
+  <string id="24038">Setja inn</string>
+  <string id="24039">Óvirkar viðbætur</string>
+  <string id="24040">(Hreinsa núverandi stillingu)</string>
+  <string id="24041">Setja inn frá zip skrá</string>
+  <string id="24042">Niðurhala %i%%</string>
+  <string id="24043">Fáanlegar uppfærslur</string>
 
   <string id="24050">Tiltækar viðbætur</string>
   <string id="24051">Útgáfa:</string>
   <string id="24052">Skilmálar</string>
   <string id="24053">Notkunarskilmálar:</string>
+  <string id="24054">Breytingaskrá</string>
   <string id="24059">Viltu setja inn þessa viðbót?</string>
   <string id="24060">Viltu gera þessa viðbót óvirka?</string>
   <string id="24061">Til er uppfærsla fyrir viðbót!</string>
@@ -2164,17 +2246,15 @@
   <string id="24067">Er að niðurhala viðbótum</string>
   <string id="24068">Fann uppfærslu</string>
   <string id="24069">Uppfærslur</string>
-  <string id="24070">Ekki er hægt að nota viðbót</string>
 
-  <string id="24070">Ekki er hægt að nota viðbót</string>
-  <string id="24071">Óþekkt villa kom upp</string>
+  <string id="24070">Ekki tókst að hlaða inn viðbót.</string>
+  <string id="24071">Óþekkt villa kom upp.</string>
   <string id="24072">Nauðsynlegt er að setja stillingar</string>
   <string id="24073">Gat ekki tengst</string>
   <string id="24074">Þarfnast endurræsingar</string>
   <string id="24075">Gera óvirkt</string>
   <string id="24080">Reyna að tengjast aftur?</string>
   <string id="24089">Endurræsingar viðbóta</string>
-
   <string id="24090">Læsa viðbótarstjóra</string>
 
   <string id="24091"/>
@@ -2183,12 +2263,18 @@
   <string id="24094"/>
   <string id="24095"/>
 
+  <string id="24096">Viðbót hefur verið merkt sem biluð í safni.</string>
+  <string id="24097">Viltu slökkva á henni á þínu kerfi?</string>
+  <string id="24098">Biluð</string>
+  <string id="24099">Viltu skipta yfir á þetta skinn?</string>
+  <string id="25000">Tilkynningar</string>
+
   <!-- strings 29800 thru 29998 reserved strings used only in the default Project Mayhem III skin and not c++ code -->
   <string id="29800">Safnhamur</string>
   <string id="29801">QWERTY Lyklaborð</string>
   <string id="29802">Gegnumúttakshljóð í notkun</string>
 
-  <string id="29999">Sjálfvirk flöktsía á leiki</string>
+  <string id="29999"/>
 
   <!-- strings 30000 thru 30999 reserved for plugins and plugin settings -->
   <!-- strings 31000 thru 31999 reserved for skins -->
@@ -2204,7 +2290,7 @@
   <string id="33008">Vista</string>
   <string id="33009">Afritun</string>
   <string id="33010">Velja niðurhalsmöppu</string>
-  <string id="30011">Leitarlengd</string>
+  <string id="33011">Leitarlengd</string>
   <string id="33012">Stutt</string>
   <string id="33013">Langt</string>
   <string id="33014">Nota DVD spilara í staðinn fyrir venjulegan spilara</string>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 35434
          http://xbmc.svn.sourceforge.net/xbmc/?rev=35434&view=rev
Author:   spiff_
Date:     2010-11-23 22:24:40 +0000 (Tue, 23 Nov 2010)

Log Message:
-----------
updated: Swedish translations

(cherry picked from commit 4980a0cac0e8fb35933650e050634d0ebf8603ed)

Modified Paths:
--------------
    branches/Dharma/addons/metadata.themoviedb.org/resources/language/Swedish/strings.xml
    branches/Dharma/addons/skin.confluence/language/Swedish/strings.xml
    branches/Dharma/language/Swedish/strings.xml

Modified: branches/Dharma/addons/metadata.themoviedb.org/resources/language/Swedish/strings.xml
===================================================================
--- branches/Dharma/addons/metadata.themoviedb.org/resources/language/Swedish/strings.xml	2010-11-23 22:13:59 UTC (rev 35433)
+++ branches/Dharma/addons/metadata.themoviedb.org/resources/language/Swedish/strings.xml	2010-11-23 22:24:40 UTC (rev 35434)
@@ -1,11 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!--Language file translated with Team XBMC Translator-->
-<!--Translator: blittan-->
-<!--Email: blittan@...>
-<!--Date of translation: 09/11/2010-->
-<!--$Revision$-->
-<strings>
-  <string id="30000">Aktivera fanart</string>
-  <string id="30001">Aktivera trailers från HD-Trailers.net</string>
-  <string id="30002">Föredraget språk</string>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!--Language file translated with Team XBMC Translator-->
+<!--Translator: blittan-->
+<!--Email: blittan@...>
+<!--Date of translation: 11/19/2010-->
+<!--$Revision$-->
+<strings>
+  <string id="30000">Aktivera fanart</string>
+  <string id="30001">Aktivera trailers från HD-Trailers.net</string>
+  <string id="30002">Föredraget språk</string>
+  <string id="30003">Hämta betyg från IMDb</string>
 </strings>
\ No newline at end of file

Modified: branches/Dharma/addons/skin.confluence/language/Swedish/strings.xml
===================================================================
--- branches/Dharma/addons/skin.confluence/language/Swedish/strings.xml	2010-11-23 22:13:59 UTC (rev 35433)
+++ branches/Dharma/addons/skin.confluence/language/Swedish/strings.xml	2010-11-23 22:24:40 UTC (rev 35434)
@@ -2,7 +2,7 @@
 <!--Language file translated with Team XBMC Translator-->
 <!--Translator: blittan-->
 <!--Email: blittan@...>
-<!--Date of translation: 09/11/2010-->
+<!--Date of translation: 11/19/2010-->
 <!--$Revision$-->
 <strings>
   <string id="31000">Ändra din</string>
@@ -59,18 +59,15 @@
   <string id="31115">Anpassare</string>
   <string id="31117">Visa nyligen tillagda filmer</string>
   <string id="31118">Hemsidans undermeny</string>
-  <string id="31119">Aktivera egen skriptknapp</string>
   <string id="31120">KNAPPETIKETT</string>
-  <string id="31121">SÖKVÄG TILL SKRIPT</string>
   <string id="31122">Vädersida</string>
   <string id="31123">Använd omslag istället för banner för TV-serier</string>
   <string id="31124">Visa bakgrund "Nu spelas" filmer</string>
   <string id="31125">Visa bakgrund "Nu spelas" visualisering</string>
-  <string id="31126">Aktivera sångtexter i musik-OSD</string>
-  <string id="31127">SÖKVÄG TILL SÅNGTEXTSKRIPT</string>
   <string id="31128">Sångtexter</string>
-  <string id="31129">Aktivera undertextsnedladdning i video-OSD</string>
-  <string id="31130">SÖKVÄG TILL UNDERTEXT-TILLÄGG</string>
+  <string id="31131">Använd horisontell hemmeny</string>
+  <string id="31132">Sångtextstillägg</string>
+  <string id="31133">Undertextstillägg</string>
   <string id="31140">Musik-OSD</string>
   <string id="31141">Video-OSD</string>
   <string id="31200">Genvägar</string>
@@ -114,6 +111,9 @@
   <string id="31354">Spola bakåt</string>
   <string id="31355">Filmmeny</string>
   <string id="31356">Ladda ner undertexter</string>
+  <string id="31390">Skalstandard</string>
+  <string id="31391">Skalstandard utan VERSAL</string>
+  <string id="31392">Arialbaserad</string>
   <string id="31400">[B]KONFIGURERA UTSEENDEINSTÄLLNINGAR[/B][CR][CR]Ändra skalet · Ange språk och region · Ange fillistningsalternativ[CR]Ange en skärmsläckare</string>
   <string id="31401">[B]KONFIGURERA GRAFIKINSTÄLLNINGAR[/B][CR][CR]Hantera ditt filmbibliotek · Ange filmuppspelningsalternativ · Ändra videoförteckningsalternativ[CR]Konfigurera undertextfonter</string>
   <string id="31402">[B]KONFIGURERA MUSIKINSTÄLLNINGAR[/B][CR][CR]Hantera ditt musikbibliotek · Ange musikuppspelningsalternativ · Ändra musiklistningsalternativ[CR]Ange låtinskickning · Ange karaokealternativ</string>

Modified: branches/Dharma/language/Swedish/strings.xml
===================================================================
--- branches/Dharma/language/Swedish/strings.xml	2010-11-23 22:13:59 UTC (rev 35433)
+++ branches/Dharma/language/Swedish/strings.xml	2010-11-23 22:24:40 UTC (rev 35434)
@@ -2,9 +2,9 @@
 <!--Language file translated with Team XBMC Translator-->
 <!--Translator: blittan-->
 <!--Email: blittan@...>
-<!--Date of translation: 09/11/2010-->
+<!--Date of translation: 11/19/2010-->
 <!--$Revision$-->
-<!--Based on english strings version 33648-->
+<!--Based on english strings version 35193-->
 <strings>
   <string id="0">Program</string>
   <string id="1">Bilder</string>
@@ -84,6 +84,8 @@
   <string id="110">Skapa miniatyrbilder</string>
   <string id="111">Genvägar</string>
   <string id="112">Pausad</string>
+  <string id="113">Uppdatering misslyckades</string>
+  <string id="114">Installation misslyckades</string>
   <string id="115">Kopiera</string>
   <string id="116">Flytta</string>
   <string id="117">Radera</string>
@@ -533,6 +535,8 @@
   <string id="609">CDDA-sökväg inte angiven.</string>
   <string id="610">Rippa ljudspår</string>
   <string id="611">Ange nummer</string>
+  <string id="612">Bitar/Sampling</string>
+  <string id="613">Samplingsfrekvens</string>
   <string id="620">Ljud-CD</string>
   <string id="621">Omkodare</string>
   <string id="622">Kvalitet</string>
@@ -922,6 +926,7 @@
   <string id="13013">Starta om</string>
   <string id="13014">Minimera</string>
   <string id="13015">Funktion för avstängningsknapp</string>
+  <string id="13016">Stäng av systemet</string>
   <string id="13020">Är en annan session aktiv, kanske över ssh?</string>
   <string id="13021">Monterade flyttbar hårddisk</string>
   <string id="13022">Osäker borttagning av enhet</string>
@@ -1133,6 +1138,10 @@
   <string id="13508">Hög</string>
   <string id="13509">Riktigt hög (långsam!)</string>
   <string id="13510">Synkronisera uppspelning till display</string>
+  <string id="13550">Pausa under uppdateringsfrekvensändring</string>
+  <string id="13551">Av</string>
+  <string id="13552">%.1f sekund</string>
+  <string id="13553">%.1f sekunder</string>
   <string id="13600">Apple-fjärrkontroll</string>
   <string id="13602">Tillåt start av XBMC med fjärrkontroll</string>
   <string id="13603">Sekvensfördröjningstid</string>
@@ -1577,6 +1586,7 @@
   <string id="20255">Första inloggningen, ändra din profil</string>
   <string id="20256">HTS Tvheadend-klient</string>
   <string id="20257">VDR Streamdev-klient</string>
+  <string id="20258">MythTV-klient</string>
   <string id="20300">Webserver katalog (HTTP)</string>
   <string id="20301">Webserver katalog (HTTPS)</string>
   <string id="20302">Kunde inte skriva till mapp:</string>
@@ -1717,6 +1727,8 @@
   <string id="20451">Länder</string>
   <string id="20452">avsnitt</string>
   <string id="20453">avsnitt</string>
+  <string id="20454">Lyssnare</string>
+  <string id="20455">Lyssnare</string>
   <string id="21330">Visa dolda filer och mappar</string>
   <string id="21331">TuxBox-klient</string>
   <string id="21332">VARNING: Vald TuxBox-enhet är i inspelningsläge!</string>
@@ -2007,10 +2019,11 @@
   <string id="24096">Tillägget har markerats som trasigt i förrådet.</string>
   <string id="24097">Vill du inaktivera det på ditt system?</string>
   <string id="24098">Trasigt</string>
+  <string id="24099">Vill du byta till detta skal?</string>
+  <string id="25000">Notifieringar</string>
   <string id="29800">Biblioteksläge</string>
   <string id="29801">QWERTY-tangentbord</string>
   <string id="29802">Ljudgenomströmning används</string>
-  <string id="30011">Söklängd</string>
   <string id="33001">Trailerkvalitet</string>
   <string id="33002">Strömma</string>
   <string id="33003">Ladda ned</string>
@@ -2021,6 +2034,7 @@
   <string id="33008">Sparar</string>
   <string id="33009">Kopierar</string>
   <string id="33010">Ange nedladdningsmapp</string>
+  <string id="33011">Söklängd</string>
   <string id="33012">Kort</string>
   <string id="33013">Lång</string>
   <string id="33014">Använd DVD-spelare istället för den vanliga spelaren</string>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 35435
          http://xbmc.svn.sourceforge.net/xbmc/?rev=35435&view=rev
Author:   spiff_
Date:     2010-11-23 22:30:26 +0000 (Tue, 23 Nov 2010)

Log Message:
-----------
updated: More Swedish translations

Modified Paths:
--------------
    branches/Dharma/addons/metadata.common.allmusic.com/addon.xml
    branches/Dharma/addons/metadata.common.hdtrailers.net/addon.xml
    branches/Dharma/addons/metadata.common.htbackdrops.com/addon.xml
    branches/Dharma/addons/metadata.common.last.fm/addon.xml
    branches/Dharma/addons/metadata.common.themoviedb.org/addon.xml
    branches/Dharma/addons/metadata.mtv.com/addon.xml
    branches/Dharma/addons/metadata.themoviedb.org/addon.xml
    branches/Dharma/addons/metadata.tvdb.com/addon.xml
    branches/Dharma/addons/repository.xbmc.org/addon.xml
    branches/Dharma/addons/screensaver.rsxs.euphoria/addon.xml
    branches/Dharma/addons/screensaver.rsxs.plasma/addon.xml
    branches/Dharma/addons/screensaver.rsxs.solarwinds/addon.xml
    branches/Dharma/addons/screensaver.xbmc.builtin.black/addon.xml
    branches/Dharma/addons/screensaver.xbmc.builtin.dim/addon.xml
    branches/Dharma/addons/screensaver.xbmc.builtin.slideshow/addon.xml
    branches/Dharma/addons/skin.confluence/addon.xml
    branches/Dharma/addons/visualization.itunes/addon.xml
    branches/Dharma/addons/visualization.milkdrop/addon.xml
    branches/Dharma/addons/visualization.waveform/addon.xml
    branches/Dharma/addons/weather.xbmc.builtin/addon.xml
    branches/Dharma/addons/webinterface.default/addon.xml
    branches/Dharma/language/Swedish/strings.xml

Modified: branches/Dharma/addons/metadata.common.allmusic.com/addon.xml
===================================================================
--- branches/Dharma/addons/metadata.common.allmusic.com/addon.xml	2010-11-23 22:24:40 UTC (rev 35434)
+++ branches/Dharma/addons/metadata.common.allmusic.com/addon.xml	2010-11-23 22:30:26 UTC (rev 35435)
@@ -21,6 +21,7 @@
     <summary lang="pt">Scraper de música AllMusic</summary>
     <summary lang="ro">Bibliotecă catalog de muzică AllMusic</summary>
     <summary lang="ru">Музыкальная Информация AllMusic</summary>
+    <summary lang="se">Skrapa för AllMusic.com</summary>
     <summary lang="zh">AllMusic音乐刮削器代码库</summary>
     <description lang="en">Download Music information from http://www.allmusic.com</description>
     <description lang="de">Downloade Musik Informationen von http://www.allmusic.com</description>
@@ -32,6 +33,7 @@
     <description lang="pt">Descarregar informação de música de http://www.allmusic.com</description>
     <description lang="ro">Descărcați informații muzică de pe http://www.allmusic.com</description>
     <description lang="ru">Загружать информацию о Музыке с http://www.allmusic.com</description>
+    <description lang="se">Ladda ner musikinformation från http://www.allmusic.com</description>
     <description lang="zh">从www.allmusic.com下载音乐信息</description>
   </extension>
 </addon>

Modified: branches/Dharma/addons/metadata.common.hdtrailers.net/addon.xml
===================================================================
--- branches/Dharma/addons/metadata.common.hdtrailers.net/addon.xml	2010-11-23 22:24:40 UTC (rev 35434)
+++ branches/Dharma/addons/metadata.common.hdtrailers.net/addon.xml	2010-11-23 22:30:26 UTC (rev 35435)
@@ -18,6 +18,7 @@
     <summary lang="pl">Scraper biblioteki HD-Trailers.net</summary>
     <summary lang="pt">Scraper de trailers de HD-Trailers.net</summary>
     <summary lang="ru">Обработчик для трейлеров с HD-Trailers.net</summary>
+    <summary lang="se">Skrapa för trailers från HD-Trailers.net</summary>
     <summary lang="zh">HD-Trailers.net刮削器代码库</summary>
     <description lang="en">Download Movie Trailers from http://www.hd-trailers.net</description>
     <description lang="de">Downloade Trailer von http://www.hd-trailers.net</description>
@@ -28,6 +29,7 @@
     <description lang="pl">Pobieraj zwiastuny filmowe z http://www.hd-trailers.net</description>
     <description lang="pt">Descarregar trailers de http://www.hd-trailers.net</description>
     <description lang="ru">Загружать трейлеры с http://www.hd-trailers.net</description>
+    <description lang="se">Ladda ner trailers från http://www.hd-trailers.net</description>
     <description lang="zh">从www.hd-trailers.net下载电影预告片</description>
     <minversion>20000</minversion>
     <platform>all</platform>

Modified: branches/Dharma/addons/metadata.common.htbackdrops.com/addon.xml
===================================================================
--- branches/Dharma/addons/metadata.common.htbackdrops.com/addon.xml	2010-11-23 22:24:40 UTC (rev 35434)
+++ branches/Dharma/addons/metadata.common.htbackdrops.com/addon.xml	2010-11-23 22:30:26 UTC (rev 35435)
@@ -20,6 +20,7 @@
     <summary lang="pl">Scraper biblioteki HTBackdrops</summary>
     <summary lang="pt">Biblioteca de fundos HTBackdrops</summary>
     <summary lang="ru">Обработчик Фоновых изображений с HTBackdrops</summary>
+    <summary lang="se">Skrapa för bakgrunder från HTBackdrops</summary>
     <summary lang="zh">HTBackdrops刮削器代码库</summary>
     <description lang="en">Download backdrops from http://www.htbackdrops.com</description>
     <description lang="de">Downloade Hintergründe von http://www.htbackdrops.com</description>
@@ -30,6 +31,7 @@
     <description lang="pl">Pobieraj tła z http://www.htbackdrops.com</description>
     <description lang="pt">Descarregar fundos de http://www.htbackdrops.com</description>
     <description lang="ru">Загружать фоновые изображения с http://www.htbackdrops.com</description>
+    <description lang="se">Ladda ner bakgrunder från http://www.htbackdrops.com</description>
     <description lang="zh">从www.htbackdrops.com下载背景图</description>
   </extension>
 </addon>

Modified: branches/Dharma/addons/metadata.common.last.fm/addon.xml
===================================================================
--- branches/Dharma/addons/metadata.common.last.fm/addon.xml	2010-11-23 22:24:40 UTC (rev 35434)
+++ branches/Dharma/addons/metadata.common.last.fm/addon.xml	2010-11-23 22:30:26 UTC (rev 35435)
@@ -20,6 +20,7 @@
     <summary lang="pl">Scraper biblioteki LastFM</summary>
     <summary lang="pt">Scraper de música LastFM</summary>
     <summary lang="ru">Обработчик для LastFM</summary>
+    <summary lang="se">Skrapebibliotek för LastFM</summary>
     <summary lang="zh">LastFM刮削器代码库</summary>
     <description lang="en">Download Music information from http://www.last.fm</description>
     <description lang="de">Downloade Musik informationen von http://www.last.fm</description>
@@ -30,6 +31,7 @@
     <description lang="pl">Pobieraj informacje o muzyce z http://www.last.fm</description>
     <description lang="pt">Descarregar informação de música de http://www.last.fm</description>
     <description lang="ru">Загружать информацию о Музыке с http://www.last.fm</description>
+    <description lang="se">Ladda ner musikinformation från http://www.last.fm</description>
     <description lang="zh">从www.last.fm下载音乐信息</description>
   </extension>
 </addon>

Modified: branches/Dharma/addons/metadata.common.themoviedb.org/addon.xml
===================================================================
--- branches/Dharma/addons/metadata.common.themoviedb.org/addon.xml	2010-11-23 22:24:40 UTC (rev 35434)
+++ branches/Dharma/addons/metadata.common.themoviedb.org/addon.xml	2010-11-23 22:30:26 UTC (rev 35435)
@@ -20,6 +20,7 @@
     <summary lang="pt">Scraper de filmes TMDb</summary>
     <summary lang="ro">Bibliotecă catalog TMDb</summary>
     <summary lang="ru">Обработчик для TMDb</summary>
+    <summary lang="se">Skrapebibliotek för TMDb</summary>
     <summary lang="zh">TMDb刮削器代码库</summary>
     <description lang="en">Download thumbs and fanarts from http://www.themoviedb.org</description>
     <description lang="es">Descarga información, posters y fanart de http://www.themoviedb.org</description>
@@ -30,6 +31,7 @@
     <description lang="pt">Descarregar informação de filmes de http://www.themoviedb.org</description>
     <description lang="ro">Descărcați miniaturi și imagini realizate de fani de pe http://www.themoviedb.org</description>
     <description lang="ru">Загружать миниатюры и фанарт с http://www.themoviedb.org</description>
+    <description lang="se">Ladda ner miniatyrer och fanart från http://www.themoviedb.org</description>
     <description lang="zh">从www.themoviedb.org下载海报和同人画</description>
   </extension>
 </addon>

Modified: branches/Dharma/addons/metadata.mtv.com/addon.xml
===================================================================
--- branches/Dharma/addons/metadata.mtv.com/addon.xml	2010-11-23 22:24:40 UTC (rev 35434)
+++ branches/Dharma/addons/metadata.mtv.com/addon.xml	2010-11-23 22:30:26 UTC (rev 35435)
@@ -34,7 +34,7 @@
     <description lang="pt">Descarregar informação de videoclips de http://www.mtv.com</description>
     <description lang="ro">Descărcați informații videoclipuri.</description>
     <description lang="ru">Загружать информацию о музыкальных видео с http://www.mtv.com</description>
-    <description lang="se">Ladda ner musikvideo information från MTV.</description>
+    <description lang="se">Ladda ner musikvideoinformation från MTV.</description>
     <description lang="zh">下载音乐电视资料</description>
     <platform>all</platform>
   </extension>

Modified: branches/Dharma/addons/metadata.themoviedb.org/addon.xml
===================================================================
--- branches/Dharma/addons/metadata.themoviedb.org/addon.xml	2010-11-23 22:24:40 UTC (rev 35434)
+++ branches/Dharma/addons/metadata.themoviedb.org/addon.xml	2010-11-23 22:30:26 UTC (rev 35435)
@@ -23,6 +23,7 @@
     <summary lang="ro">Scraper de filme TMDb</summary>
     <summary lang="ro">Catalog de filme TMDb</summary>
     <summary lang="ru">Обработчик Фильмов для TMDB</summary>
+    <summary lang="se">Filmskrapa för TMDB</summary>
     <summary lang="zh">TMDB电影刮削器</summary>
     <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="de">TheMovieDB.org ist eine freie und offene Film-Datenbank. Sie wird nur User wie dir betrieben. TheMovieDB wird zur Zeit monatlich von Millionen genutzt. Mit der mächtigen API wird sie auch von vielen Media-Center, wie z.B. XBMC, genutzt um Filme-Meta-Daten, Poster und Fanrts zu beziehen, damit der User sein Media-Center verschönern kann</description>

Modified: branches/Dharma/addons/metadata.tvdb.com/addon.xml
===================================================================
--- branches/Dharma/addons/metadata.tvdb.com/addon.xml	2010-11-23 22:24:40 UTC (rev 35434)
+++ branches/Dharma/addons/metadata.tvdb.com/addon.xml	2010-11-23 22:30:26 UTC (rev 35435)
@@ -21,6 +21,7 @@
     <summary lang="pt">Scraper de séries de TV TVDB.com</summary>
     <summary lang="ro">Catalog de seriale TheTVDB.com</summary>
     <summary lang="ru">Загрузка информации о ТВ-шоу с TheTVDB.com</summary>
+    <summary lang="ru">Hämta TV-serieinformation från TheTVDB.com</summary>
     <summary lang="zh">从TheTVDB.com获取电视剧集信息</summary>
     <description lang="en">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="de">TheTVDB.com ist ein Scraper für TV-Serien. Die Seite hat eine riesige offene Datenbank, welche von jedem geändert werden kann. Sie enthält weitreichende Meta-Daten für viele TV-Serien in verschiedenen Sprachen. Alle Inhalte und Bilder dieser Seite stammen von User für User und haben eine hohe Qualität. Das Datenbankschema und die Webseite sind OpenSource unter dem GPL-Recht</description>

Modified: branches/Dharma/addons/repository.xbmc.org/addon.xml
===================================================================
--- branches/Dharma/addons/repository.xbmc.org/addon.xml	2010-11-23 22:24:40 UTC (rev 35434)
+++ branches/Dharma/addons/repository.xbmc.org/addon.xml	2010-11-23 22:30:26 UTC (rev 35435)
@@ -22,6 +22,7 @@
 		<summary lang="pt">Install Add-ons from XBMC.org</summary>
 		<summary lang="ro">Instalați suplimente de la XBMC.org</summary>
 		<summary lang="ru">Установить Дополнения с XBMC.org</summary>
+		<summary lang="se">Installera tillägg från XBMC.org</summary>
 		<summary lang="zh">从XBMC.org安装扩展功能</summary>
 		<description lang="en">Download and install add-ons from the Official XBMC.org addon repository.[CR]  By using the official Repository you will be able to take advantage of our extensive file mirror service to help get you faster downloads from a region close to you.[CR]  All addons on this repository have under gone basic testing, if you find a broken or not working addon please report it to Team XBMC so we can take any action needed.</description>
 		<description lang="de">Download und installiere Add-Ons aus dem offiziellen XBMC.org Add-On Repository.[CR]  Durch die Nutzung des offiziellen Repository hat man Zugriff auf das große Datei Mirror System welches schnelle Downloads aus der Nähe bereit stellt.[CR]  Alle Add-Ons im Repository wurden getestet, sollte dennoch ein Add-On Fehler haben oder gar nicht funktionieren, sollte dieser Fehler an das Team XBMC gemeldet werden, damit die nötigen Schritte getroffen werden können</description>

Modified: branches/Dharma/addons/screensaver.rsxs.euphoria/addon.xml
===================================================================
--- branches/Dharma/addons/screensaver.rsxs.euphoria/addon.xml	2010-11-23 22:24:40 UTC (rev 35434)
+++ branches/Dharma/addons/screensaver.rsxs.euphoria/addon.xml	2010-11-23 22:30:26 UTC (rev 35435)
@@ -21,6 +21,7 @@
     <summary lang="pl">Tak psychodeliczny jak tylko się da</summary>
     <summary lang="pt">A mais psicadélica protecção de ecrã.</summary>
     <summary lang="ru">Настолько психаделично, насколько такой может быть заставка</summary>
+    <summary lang="se">Ungefär så psykedelisk som en skärmsläckare kan bli</summary>
     <summary lang="zh">最具迷幻效果的屏幕保护程序</summary>
     <description lang="en">This is about as psychedelic as screensavers get. mogumbo thought his Plasma saver was at the top of the scale, but this one is even more nauseating. You'd better find one of those air sickness bags before you stare at this one for too long.</description>
     <description lang="fi">Tämä on mahdollisesti niin psykedeelinen kuin vain näytönsäästäjä voi olla. mogumbo luuli, että hänen Plasma-näytönäästäjänsä oli asteikon huipulla, mutta tämä ohittaa senkin. Oksennuspussin hakeminen on suositeltavaa ennen pitkäaikaista tuijottamista.</description>

Modified: branches/Dharma/addons/screensaver.rsxs.plasma/addon.xml
===================================================================
--- branches/Dharma/addons/screensaver.rsxs.plasma/addon.xml	2010-11-23 22:24:40 UTC (rev 35434)
+++ branches/Dharma/addons/screensaver.rsxs.plasma/addon.xml	2010-11-23 22:30:26 UTC (rev 35435)
@@ -20,6 +20,7 @@
     <summary lang="nl">Waarschijnlijk de op één na meest psychedelische schermbeveiliging ooit</summary>
     <summary lang="pl">Prawdopodobnie drugi, najbardziej psychodeliczny wygaszacz na świecie</summary>
     <summary lang="pt">Provavelmente a segunda mais psicadélica protecção de ecrã</summary>
+    <summary lang="se">Förmodligen den näst psykedeliska skärmsläckaren</summary>
     <summary lang="zh">也许是排名第二的迷幻效果屏幕保护程序</summary>
     <description lang="en">Probably the second most psychedelic screensaver in existence. Just try to picture all those colors moving around.</description>
     <description lang="fi">Todennäköisesti toiseksi psykedeelisin olemassa oleva näytönsäästäjä. Kuvittelepa vain kaikki nuo värit lentelemässä ympäriinsä.</description>
@@ -29,6 +30,7 @@
     <description lang="nl">Waarschlijnlijk de op één na meest psychedelische schermbeveliging ooit. Probeer u het voor te stellen: al die kleuren die door mekaar lopen.</description>
     <description lang="pl">Prawdopodobnie drugi, najbardziej psychodeliczny wygaszacz na świecie. Spróbuj i zobacz ferię poruszających się barw.</description>
     <description lang="pt">Provavelmente a segunda mais psicadélica protecção de ecrã de sempre. Experimente-a para ver todas as cores moverem-se livremente.</description>
+    <description lang="se">Förmodligen den näst psykedeliska skärmsläckaren som finns. Försök bara att uppfatta alla färger som rör sig runt och runt.</description>
     <description lang="zh">也许是排名第二的迷幻效果屏幕保护程序。你将看到所有颜色满处乱飞。</description>
     <platform>linux osx</platform>
   </extension>

Modified: branches/Dharma/addons/screensaver.rsxs.solarwinds/addon.xml
===================================================================
--- branches/Dharma/addons/screensaver.rsxs.solarwinds/addon.xml	2010-11-23 22:24:40 UTC (rev 35434)
+++ branches/Dharma/addons/screensaver.rsxs.solarwinds/addon.xml	2010-11-23 22:30:26 UTC (rev 35435)
@@ -21,6 +21,7 @@
     <summary lang="pl">Wygaszacz hipnotyzujący efektami cząsteczek</summary>
     <summary lang="pt">Protecção de ecrã com um efeito de partículas</summary>
     <summary lang="ru">Завораживающий скринсейвер с эффектами частиц</summary>
+    <summary lang="se">En fascinerande skärmsläckare av partikeleffekter</summary>
     <summary lang="zh">一个迷人的粒子效果屏幕保护程序</summary>
     <description lang="en">This is a very mesmerizing particle effects screensaver. You'll find that you can achieve an amazing number of different patterns.</description>
     <description lang="fi">Erittäin lumoava partikkelitehostenäytönsäästäjä. Tulet huomaamaan uskomattoman määrän erilaisia kuvioita.</description>
@@ -31,6 +32,7 @@
     <description lang="pl">Bardzo hipnotyzujący wygaszacz. Przekonaj się, ile niespotykanch wzorów da się osiągnąć.</description>
     <description lang="pt">Protecção de ecrã fantástica com um efeito de partículas. Vai reparar que consegue um número quase infinito de padrões.</description>
     <description lang="ru">Это - очень завораживающий хранитель экрана. Доступно огромное количество вариаций эффектов.</description>
+    <description lang="se">Detta är en mycket fascinerande partikeleffektsskärmsläckare. Du kommer att upptäcka att du kan uppnå ett otroligt antal olika mönster.</description>
     <description lang="zh">这是一个非常迷人的粒子效果屏幕保护程序。你会发现你能看到惊人数量的不同图案。</description>
     <platform>linux osx</platform>
   </extension>

Modified: branches/Dharma/addons/screensaver.xbmc.builtin.black/addon.xml
===================================================================
--- branches/Dharma/addons/screensaver.xbmc.builtin.black/addon.xml	2010-11-23 22:24:40 UTC (rev 35434)
+++ branches/Dharma/addons/screensaver.xbmc.builtin.black/addon.xml	2010-11-23 22:30:26 UTC (rev 35435)
@@ -16,6 +16,7 @@
     <summary lang="pt">Protecção que torna o seu ecrã preto.</summary>
     <summary lang="ro">Protector ecran care afișează negru</summary>
     <summary lang="ru">Хранитель экрана который делает ваш экран чёрным</summary>
+    <summary lang="se">Skärmsläckare som gör din skärm svart</summary>
     <summary lang="zh">黑屏屏幕保护程序</summary>
     <description lang="en">Black is a simple screensaver that will turn your screen black.</description>
     <description lang="de">Black ist ein einfacher Bildschirmschoner, welcher den Bildschirm schwarz abdunkelt</description>
@@ -28,6 +29,7 @@
     <description lang="pt">Uma protecção que escurece o seu ecrã.</description>
     <description lang="ro">Black este un protector de ecran simplu care afișează negru pe ecran.</description>
     <description lang="ru">Black это простой хранитель экрана, который делает его чёрным.</description>
+    <description lang="se">Mörka är en enkel skärmsläckare som gör din skärm svart.</description>
     <description lang="zh">黑屏屏保是一个简单的屏幕保护程序，它使你的显示器进入黑屏状态。</description>
     <platform>all</platform>
   </extension>

Modified: branches/Dharma/addons/screensaver.xbmc.builtin.dim/addon.xml
===================================================================
--- branches/Dharma/addons/screensaver.xbmc.builtin.dim/addon.xml	2010-11-23 22:24:40 UTC (rev 35434)
+++ branches/Dharma/addons/screensaver.xbmc.builtin.dim/addon.xml	2010-11-23 22:30:26 UTC (rev 35435)
@@ -16,6 +16,7 @@
     <summary lang="pt">Protecção que esvaece o seu ecrã</summary>
     <summary lang="ro">Protector ecran care întunecă ecranul</summary>
     <summary lang="ru">Хранитель экрана затемняющий изображение</summary>
+    <summary lang="se">Skärmsläckare som dimmar din skärm</summary>
     <summary lang="zh">淡出屏幕保护程序</summary>
     <description lang="en">The Dim screensaver is a simple screensaver that will dim (fade out) your screen to a setable value between 20 and 100% .</description>
     <description lang="de">Der Dimmer-Bildschirmschoner ist ein einfacher Bildschirmschoner, welcher den Bildschirm auf einen benutzerdefinierten Wert zwischen 20 und 100% abdunkelt.</description>
@@ -29,6 +30,7 @@
     <description lang="pt">A protecção de ecrã esvanecente permite-lhe diminuir a intensidade luminosa do seu ecrã. Pode ser configurada para valores entre 20 e 100%.</description>
     <description lang="ro">Dim este un protector de ecran simplu care va întuneca (reduce intensitatea luminii) ecranului dumneavoastră la o valoare configurabilă cuprinsă între 20 și 100% .</description>
     <description lang="ru">Хранитель экрана Dim затемняет изображение на экране до заданного значения, от 20% до 100%.</description>
+    <description lang="ru">Dimma är en enkel skärmsläckare som dimmrar din skärm till ett inställbart värde mellan 20% och 100%.</description>
     <platform>all</platform>
   </extension>
 </addon>

Modified: branches/Dharma/addons/screensaver.xbmc.builtin.slideshow/addon.xml
===================================================================
--- branches/Dharma/addons/screensaver.xbmc.builtin.slideshow/addon.xml	2010-11-23 22:24:40 UTC (rev 35434)
+++ branches/Dharma/addons/screensaver.xbmc.builtin.slideshow/addon.xml	2010-11-23 22:30:26 UTC (rev 35435)
@@ -16,6 +16,7 @@
     <summary lang="pt">Protecção de ecrã que mostra uma apresentação de fotografias</summary>
     <summary lang="ro">Protector ecran care afișează o prezentare de diapozitive</summary>
     <summary lang="ru">Хранитель экрана показывающий слайдшоу из изображений</summary>
+    <summary lang="se">Skärmsläckare som visar ett bildspel</summary>
     <summary lang="zh">幻灯片屏幕保护程序</summary>
     <description lang="en">The Slideshow screensaver will show you a slide show of images using various transition effects. It can be configured to show your libraries music or video fanart, or a custom folder of images</description>
     <description lang="de">Der Slideshow-Bildschirmschoner zeigt eine Bilder-Slideshow mit verschiedenen Übergangseffekten. Er kann so konfiguriert werden, dass Musik oder Video Fanarts aus der Bibliothek, oder Bilder eines bestimmten Ordners angezeigt werden.  </description>
@@ -28,6 +29,7 @@
     <description lang="pt">Protecção de ecrã que lhe mostra fotografias usando vários efeitos de transição. Pode ser configurado para visualizar fanart das bibliotecas de música e vídeo ou uma pasta com as suas imagens.</description>
     <description lang="ro">Protectorul de ecran Slideshow va afișa imagini folosind diferite efecte de tranziție. Poate fi configurat să afișeze imagini fanart din mediateca audio sau video sau dintr-un dosar personalizat.</description>
     <description lang="ru">Хранитель экрана Slideshow покажет вам слайдшоу из изображений используя различные эффекты переходов. Он может быть настроен для показа фанарта музыки и видео из вашей библиотеки мультимедиа, или папки с изображениям.</description>
+    <description lang="se">Bildspelsskärmsläckaren visar ett bildspel med en variation av övergångseffekter. Den kan konfigureras att visa ditt biblioteks musik eller videofanart, eller en egen mapp med bilder</description>
     <description lang="zh">幻灯片屏保将使用各种过渡效果以幻灯片形式显示您的图片。你可以设置它显示音乐或视频资料库同人画，或某个文件夹中的图片。</description>
     <platform>all</platform>
   </extension>

Modified: branches/Dharma/addons/skin.confluence/addon.xml
===================================================================
--- branches/Dharma/addons/skin.confluence/addon.xml	2010-11-23 22:24:40 UTC (rev 35434)
+++ branches/Dharma/addons/skin.confluence/addon.xml	2010-11-23 22:30:26 UTC (rev 35435)
@@ -24,6 +24,7 @@
     <summary lang="pl">Confluence autorstwa Jezz_X</summary>
     <summary lang="pt">Tema Confluence desenvolvido por Jezz_X. (Tema padrão do XBMC)</summary>
     <summary lang="ro">Costum Confluence de Jezz_X. (costum implicit)</summary>
+    <summary lang="se">Confluence-skalet av Jezz_X. (XBMC standardskal)s</summary>
     <summary lang="zh">Jezz_X开发的Confluence皮肤</summary>
     <description lang="en">Confluence is the default skin for XBMC 9.11 and above. It is a combination of concepts from many popular skins, and attempts to embrace and integrate their good ideas into a skin that should be easy for first time XBMC users to understand and use.</description>
     <description lang="fr">Confluence est le skin par défaut de XBMC 9.11 ou supérieur. C'est un condensé d'idées de plusieurs skins populaires. Il tente d'englober et intégrer toutes les bonnes idées que n'importe quel débutant sur XBMC pourrait utiliser avec facilité.</description>
@@ -42,6 +43,7 @@
     <disclaimer lang="pl">Confluence jest domyślną skórą XBMC. Jej usunięcie może powodować problemy.</disclaimer>
     <disclaimer lang="pt">O tema Confluence é o tema padrão do XBMC. Removê-lo pode causar problemas. A sério! Deixe-o instalado, mesmo que não o use.</disclaimer>
     <disclaimer lang="ro">Confluence este costumul implicit pentru XBMC, dacă îl eliminați pot apărea probleme!</disclaimer>
+    <disclaimer lang="se">Confluence är standardskalet för XBMC 9.11 och över. Det är en kombination av koncept från många populära skal och försöker fånga och integrera alla goda ideer i ett skal som ska vara enkelt att förstå och använda för förstagångsanvändaren av XBMC.</disclaimer>
     <disclaimer lang="zh">Confluence是XMBC的默认皮肤，删除它可能导致故障。</disclaimer>
     <platform>all</platform>
   </extension>

Modified: branches/Dharma/addons/visualization.itunes/addon.xml
===================================================================
--- branches/Dharma/addons/visualization.itunes/addon.xml	2010-11-23 22:24:40 UTC (rev 35434)
+++ branches/Dharma/addons/visualization.itunes/addon.xml	2010-11-23 22:30:26 UTC (rev 35435)
@@ -17,6 +17,7 @@
     <summary lang="nl">iTunes-visualisaties</summary>
     <summary lang="pl">Wrapper wizualizacji iTunes</summary>
     <summary lang="pt">Visualização iTunes</summary>
+    <summary lang="zh">iTunes visualiseringsomslag</summary>
     <summary lang="zh">iTunes可视化效果包</summary>
     <description lang="en">iTunes Visualization Wrapper allows you to use visualizations from your OSX iTunes install in XBMC</description>
     <description lang="de">iTunes Visualisierung ermöglicht es von der OSX iTunes Installation die Visualisierung in XBMC nutzen zu können</description>
@@ -27,6 +28,7 @@
     <description lang="nl">Dankzij iTunes-visualisaties kan XBMC gebruik maken van de visualisaties van uw iTunesinstallatie in OS X</description>
     <description lang="pl">Wrapper pozwala XBMC na użycie wizualizacji z iTunes (tylko system OSX)</description>
     <description lang="pt">O iTunes Visualization Wrapper permite usar visualizações do seu OSX iTunes no XBMC</description>
+    <description lang="se">iTunes visualiseringsomslag tillåter dig att använda visualiseringar från din OSX iTunes installation i XBMC</description>
     <description lang="zh">iTunes可视化效果包允许你使用安装到XBMC的来自于OSX iTunes的可视化效果</description>
     <platform>osx</platform>
   </extension>

Modified: branches/Dharma/addons/visualization.milkdrop/addon.xml
===================================================================
--- branches/Dharma/addons/visualization.milkdrop/addon.xml	2010-11-23 22:24:40 UTC (rev 35434)
+++ branches/Dharma/addons/visualization.milkdrop/addon.xml	2010-11-23 22:30:26 UTC (rev 35435)
@@ -17,6 +17,7 @@
     <summary lang="pl">MilkDrop zabiera Cię w niesamowity lot w chmurach aktualnie słuchanych dźwięków</summary>
     <summary lang="pt">O MilkDrop leva-o a voar nas ondas sonoras que está a ouvir</summary>
     <summary lang="ro">MilkDrop vă face să zburați printre undele audio pe care le auziți</summary>
+    <summary lang="se">MilkDrop tar med dig på en flygtur genom ljudvågorna du hör</summary>
     <summary lang="zh">MilkDrop带你与声波一起飞翔</summary>
     <description lang="en">MilkDrop was originally a music visualizer "plug-in" to the Winamp music player. As you listen to your music, MilkDrop takes you flying through the actual soundwaves you're hearing, and uses beat detection to trigger myriad psychedelic effects, creating a rich visual journey through sound.</description>
     <description lang="fi">MilkDrop oli alunperin Winampin visualisaattorilisäosa. Kuunnellessasi musiikkia MilkDrop lennättää sinut kuulemiesi ääniaaltojen läpi ja käyttää tahdintunnistusta lukemattomien psykedeelisten tehosteiden toistamiseen, luoden visuaalisen matkan musiikin läpi.</description>
@@ -27,6 +28,7 @@
     <description lang="pl">MilkDrop jest wizualizacją pochodzącą z odtwarzacza Winamp. W czasie słuchania muzyki, MilkDrop zabiera użytkownika w niesamowity lot pomiędzy aktualnie odtwarzanymi falami dźwiękowymi, używając detekcji beatu, która synchronizuje efekty wizualne z muzyką.</description>
     <description lang="pt">O MilkDrop era originalmente uma visualização do reprodutor de música Winamp. Ao ouvir a sua música, o MilkDrop leva-o a voar nas ondas sonoras que está a ouvir, usando detecção de batida para desencadear uma miriade de efeitos psicadélicos. Cria, assim, uma viagem inesquecível pelo som.</description>
     <description lang="ro">MilkDrop a fost original un "modul" de vizualizare pentru lectorul de muzică Winamp. În timp ce ascultați muzica, MilkDrop vă face să zburați printre undele audio actuale pe care le auziți și folosește detecția bătăii pentru a activa miriada de efecte psihedelice, creând o călătorie vizuală bogată printre sunete.</description>
+    <description lang="se">MilkDrop vor från början en musikvisualition till Winamp-spelaren. När du lyssnar till din musik tar Milkdrop dig med på en flygtur genom ljudvågorna du hör och använde taktavkänning för att skapa en myriad av psykedeliska effekter som skapar en rik visuell resa genom ljudet.</description>
     <description lang="zh">MilkDrop是来自于Winamp音乐播放器的可视化插件。在你听音乐时，MilkDrop通过节拍检测触发的无数迷幻的效果，带你与声波一起飞翔，给你带来丰富的音乐和视觉旅程。</description>
     <platform>windx</platform>
   </extension>

Modified: branches/Dharma/addons/visualization.waveform/addon.xml
===================================================================
--- branches/Dharma/addons/visualization.waveform/addon.xml	2010-11-23 22:24:40 UTC (rev 35434)
+++ branches/Dharma/addons/visualization.waveform/addon.xml	2010-11-23 22:30:26 UTC (rev 35435)
@@ -20,6 +20,7 @@
     <summary lang="pl">Wizualizacja pokazująca dwie fale dźwięku</summary>
     <summary lang="pt">Visualização que mostra 2 gráficos ondulantes</summary>
     <summary lang="ro">Vizualizare care arată 2 grafice Waveform pe ecran</summary>
+    <summary lang="se">Visualisering som visar 2 vågformsgrafer på skärmen</summary>
     <summary lang="zh">在屏幕上显示两个波形图的可视化效果</summary>
     <description lang="en">Waveform is a simple Visualization showing 2 Waveform Graphs on the screen, One each for Left and Right channels that move to the beat of the music</description>
     <description lang="de">Waveform  ist eine einfache Visualisierung, welche 2 wellenförmige Grafiken zeigt. Je eine Grafik für den linken und rechten Kanal, welche sich im Takt der Musik bewegen</description>
@@ -31,6 +32,7 @@
     <description lang="pl">Waveform jest prostą wizualizacją pokazującą dwie fale dźwiękowe na ekranie. Każda na jeden kanał dźwięku.</description>
     <description lang="pt">O Waveform é um visualizador simples que mostra 2 gráficos ondulantes no ecrã, um para cada canal estéreo.</description>
     <description lang="ro">Waveform este o vizualizare simplă care arată 2 grafice Waveform pe ecran, câte unul pentru fiecare canal stâng și drept și care se mișcă după bătăile muzicii</description>
+    <description lang="se">Waveform är en enkel visualisering som visar 2 vågformsgrafer på skärmen, en för vänster och en för höger kanal som rör sig i takt med musiken</description>
     <description lang="zh">Waveform是一个简单的可视化效果，它在屏幕上显示两个波形图，分别与音乐左右声道的节拍相呼应。</description>
     <platform>all</platform>
   </extension>

Modified: branches/Dharma/addons/weather.xbmc.builtin/addon.xml
===================================================================
--- branches/Dharma/addons/weather.xbmc.builtin/addon.xml	2010-11-23 22:24:40 UTC (rev 35434)
+++ branches/Dharma/addons/weather.xbmc.builtin/addon.xml	2010-11-23 22:30:26 UTC (rev 35435)
@@ -16,6 +16,7 @@
     <summary lang="pt">Condições meteorológicas actuais.</summary>
     <summary lang="ro">Condiții meteo curente.</summary>
     <summary lang="ru">Текущие погодные условия.</summary>
+    <summary lang="se">Aktuella väderförhållanden.</summary>
     <summary lang="zh">当前天气状况</summary>
     <description lang="br">Esta é a origem padrão de informação meteorológicas.[CR][CR]Ela provê as condições atuais e previsão para quatro dias.</description>
     <description lang="en">This is the default weather source.[CR][CR]It provides current weather conditions and a four day outlook.</description>
@@ -28,6 +29,7 @@
     <description lang="pt">Fonte padrão das condições meteorológicas.[CR][CR]Providencia as condições meteorológicas actuais e previsão para quatro dias.</description>
     <description lang="ro">Sursă implicită pentru informații meteorologice.[CR][CR]Furnizează condiții meteo curente plus prognoza pe 4 zile.</description>
     <description lang="ru">Это источник информации о погоде.[CR][CR]Он предоставляет текущие погодные условия и прогноза на четыре дня.</description>
+    <description lang="se">Detta är standardkällan för väder.[CR][CR]Det tillhandahåller nuvarande väderförhållanden och en fyra dagars prognos.</description>
     <description lang="zh">这是默认的天气预报信息来源。[CR][CR]它提供了当前的天气状况和未来4天的天气预报。</description>
     <platform>all</platform>
   </extension>

Modified: branches/Dharma/addons/webinterface.default/addon.xml
===================================================================
--- branches/Dharma/addons/webinterface.default/addon.xml	2010-11-23 22:24:40 UTC (rev 35434)
+++ branches/Dharma/addons/webinterface.default/addon.xml	2010-11-23 22:30:26 UTC (rev 35435)
@@ -16,6 +16,7 @@
     <summary lang="pl">Standardowy interfejs WWW XBMC.</summary>
     <summary lang="pt">Interface Web da Team XBMC. (Interface Web padrão do XBMC)</summary>
     <summary lang="ro">Interfață web XBMC. (Interfață web implicită pentru XBMC)</summary>
+    <summary lang="se">Team XBMC webbgränssnitt. (XBMC's standardwebbgränssnitt)</summary>
     <summary lang="zh">Team XBMC Web 界面。（XBMC 的默认 web 界面）</summary>
     <description lang="de">Standard XBMC Webinterface; Für alle Geräte und Auflösungen geeignet</description>
     <description lang="en">Default web interface for XBMC; Designed for devices of all resolutions</description>
@@ -23,6 +24,7 @@
     <description lang="pl">Domyślny interfejs WWW dla XBMC; Zaprojektowany dla urządzeń z dowolną rozdzielczością</description>
     <description lang="pt">Interface Web padrão do XBMC. Desenhada para dispositivos com qualquer resolução</description>
     <description lang="ro">Interfață web implicită pentru XBMC, realizată de echipa XBMC pentru dispozitive cu orice rezoluție</description>
+    <description lang="zh">XBMC's standardwebbgränsnitt; Designat för alla upplösningar</description>
     <description lang="zh">XBMC 的默认 web 界面；适应所有分辨率模式</description>
     <platform>all</platform>
   </extension>

Modified: branches/Dharma/language/Swedish/strings.xml
===================================================================
--- branches/Dharma/language/Swedish/strings.xml	2010-11-23 22:24:40 UTC (rev 35434)
+++ branches/Dharma/language/Swedish/strings.xml	2010-11-23 22:30:26 UTC (rev 35435)
@@ -165,7 +165,7 @@
   <string id="196">Välj film:</string>
   <string id="197">Hämtar info för %s</string>
   <string id="198">Laddar filmdetaljer</string>
-  <string id="199">Webgränssnitt</string>
+  <string id="199">Webbgränssnitt</string>
   <string id="202">Slogan</string>
   <string id="203">Handling</string>
   <string id="205">Röster:</string>
@@ -1587,8 +1587,8 @@
   <string id="20256">HTS Tvheadend-klient</string>
   <string id="20257">VDR Streamdev-klient</string>
   <string id="20258">MythTV-klient</string>
-  <string id="20300">Webserver katalog (HTTP)</string>
-  <string id="20301">Webserver katalog (HTTPS)</string>
+  <string id="20300">Webbserver katalog (HTTP)</string>
+  <string id="20301">Webbserver katalog (HTTPS)</string>
   <string id="20302">Kunde inte skriva till mapp:</string>
   <string id="20303">Vill du hoppa över och fortsätta?</string>
   <string id="20304">RSS-flöde</string>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 35437
          http://xbmc.svn.sourceforge.net/xbmc/?rev=35437&view=rev
Author:   spiff_
Date:     2010-11-23 22:35:48 +0000 (Tue, 23 Nov 2010)

Log Message:
-----------
updated: More stuff translated to Swedish

(cherry picked from commit db82c49ec38ac36bfeb3200476d79c80815cad65)

Modified Paths:
--------------
    branches/Dharma/addons/metadata.albums.allmusic.com/addon.xml
    branches/Dharma/addons/metadata.artists.allmusic.com/addon.xml
    branches/Dharma/addons/metadata.themoviedb.org/addon.xml
    branches/Dharma/addons/metadata.tvdb.com/addon.xml
    branches/Dharma/addons/repository.xbmc.org/addon.xml
    branches/Dharma/addons/screensaver.rsxs.euphoria/addon.xml
    branches/Dharma/addons/visualization.dxspectrum/addon.xml
    branches/Dharma/addons/visualization.glspectrum/addon.xml
    branches/Dharma/addons/visualization.itunes/addon.xml
    branches/Dharma/addons/visualization.projectm/addon.xml
    branches/Dharma/language/Swedish/strings.xml

Modified: branches/Dharma/addons/metadata.albums.allmusic.com/addon.xml
===================================================================
--- branches/Dharma/addons/metadata.albums.allmusic.com/addon.xml	2010-11-23 22:31:45 UTC (rev 35436)
+++ branches/Dharma/addons/metadata.albums.allmusic.com/addon.xml	2010-11-23 22:35:48 UTC (rev 35437)
@@ -23,6 +23,7 @@
     <summary lang="pt">Scraper de músicas AllMusic</summary>
     <summary lang="ro">Catalog AllMusic pentru informații albume</summary>
     <summary lang="ru">Информация об альбоме из AllMusic</summary>
+    <summary lang="se">AllMusic albuminformation</summary>
     <summary lang="zh">AllMusic音乐专辑信息</summary>
     <description lang="en">Use AllMusic.com to fill your library metadata information.
 The allmusic website was created in 1995 as a place for music fans to indulge their passion.
@@ -58,6 +59,10 @@
 Сайт allmusic был создан в 1995 как место для фанатов музыки, где они могли бы удовлетворять свою страсть.
 Редакторский состав AMG, вместе с сотнями участников-экспертов (каждый по-своему фанат музыки), сделали allmusic самым полным источником информации о музыке на планете. Все они посвятили себя созданию и поддержке полезного, и познавательного, контента который любители музыки, и профессионалы индустрии, ожидают от AMG.
 Здесь представлены все стили и жанры музыки, от самых коммерчески популярных до наиболее неизвестных. Мы критикуем альбомы и исполнителей в контексте их собственного жанра - от оперы и гаражного рока до традиционного кантри. Это обеспечивает то, что фанат любого стиля музыки может полагаться на нас в поддержке актуальности своих познаний о любимом исполнителе и также расширять свои знания.</description>
+    <description lang="se">Låt AllMusic.com fylla dina mappar med metadatainformation.
+AllMusic's webbplats skapades 1995 som en plats för musikälskare där de kunde njuta av sin passion.
+AMG's redaktion har tillsammans med hundratals experter och bidragsgivare, alla musikfanatiker på sina egna sätt, gjort AllMusic till den mest omfattande källan inom musikreferens på den här planeten. De är alla kunniga och engagerade med att skapa och upprätthålla ett innehåll på webbplatsen, som musikälskare och branschfolk förväntar sig av AMG.
+Alla genrer och stilar av musik behandlas här, allt från det mest kommersiellt populära till det mest suspekta. De kritiserar album och artister inom ramen för sina egna genrer, allt från opera, garagerock till traditionell countrymusik. Detta säkerställer att alla fans oavsett musikstil kan lita på dem och hålla sig uppdaterade med sina favoritartister och bli introducerade till nya ljud.</description>
     <description lang="zh">从AllMusic.com网站获取音乐资料。
 allmusic网站创建于1995年，它是音乐爱好者的乐园。
 AMG的编辑和许多专业撰稿人（都是音乐狂热分子）共同把allmusic建成世界上最全面的音乐资料库。他们致力于创造和维护音乐爱好者和业内专业人士期望从AMG得到的知识和精神产品。

Modified: branches/Dharma/addons/metadata.artists.allmusic.com/addon.xml
===================================================================
--- branches/Dharma/addons/metadata.artists.allmusic.com/addon.xml	2010-11-23 22:31:45 UTC (rev 35436)
+++ branches/Dharma/addons/metadata.artists.allmusic.com/addon.xml	2010-11-23 22:35:48 UTC (rev 35437)
@@ -23,6 +23,7 @@
     <summary lang="pt">Scraper de músicas AllMusic</summary>
     <summary lang="ro">Catalog AllMusic pentru informații artiști</summary>
     <summary lang="ru">Информация об исполнителе из AllMusic</summary>
+    <summary lang="se">AllMusic artistinformation + HTBackdrops artistbilder</summary>
     <summary lang="zh">AllMusic艺术家信息</summary>
     <description lang="en">Use AllMusic.com to fill your libray metadata information.
 The allmusic website was created in 1995 as a place for music fans to indulge their passion. All genres and styles of music are covered here, ranging from the most commercially popular to the most obscure. We critique albums and artists within the context of their own genres - from opera to garage rock to traditional country.
@@ -59,6 +60,11 @@
 Сайт allmusic был создан в 1995 как место для фанатов музыки, где они могли бы удовлетворять свою страсть.
 Редакторский состав AMG, вместе с сотнями участников-экспертов (каждый по-своему фанат музыки), сделали allmusic самым полным источником информации о музыке на планете. Все они посвятили себя созданию и поддержке полезного, и познавательного, контента который любители музыки, и профессионалы индустрии, ожидают от AMG.
 Здесь представлены все стили и жанры музыки, от самых коммерчески популярных до наиболее неизвестных. Мы критикуем альбомы и исполнителей в контексте их собственного жанра - от оперы и гаражного рока до традиционного кантри. Это обеспечивает то, что фанат любого стиля музыки может полагаться на нас в поддержке актуальности своих познаний о любимом исполнителе и также расширять свои знания.</description>
+    <description lang="se">Låt AllMusic.com fylla dina mappar med metadatainformation.
+AllMusic's webbplats skapades 1995 som en plats för musikälskare där de kunde njuta av sin passion. Alla genrer och stilar av musik behandlas här, allt från det mest kommersiellt populära till det mest suspekta. De kritiserar album och artister inom ramen för sina egna genrer, allt från opera, garagerock till traditionell countrymusik.
+
+Home Theater Backdrops (HTBackdrops.com) är en gemenskapsdriven bilddatabas för högkvalitativa miniatyrer och fanart på artister. Alla bilder har skapats eller bidragits från medlemmarna. Överväg att ladda upp dina egna bilder av dina favoritartister.</description>
+</description>
     <description lang="zh">从AllMusic.com网站获取音乐资料。
 allmusic网站创建于1995年，它是音乐爱好者的乐园。
 AMG的编辑和许多专业撰稿人（都是音乐狂热分子）共同把allmusic建成世界上最全面的音乐资料库。他们致力于创造和维护音乐爱好者和业内专业人士期望从AMG得到的知识和精神产品。

Modified: branches/Dharma/addons/metadata.themoviedb.org/addon.xml
===================================================================
--- branches/Dharma/addons/metadata.themoviedb.org/addon.xml	2010-11-23 22:31:45 UTC (rev 35436)
+++ branches/Dharma/addons/metadata.themoviedb.org/addon.xml	2010-11-23 22:35:48 UTC (rev 35437)
@@ -34,6 +34,7 @@
     <description lang="pt">O themoviedb.org é uma base de dados de filmes livre e aberta. É completamente actualizado 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 de muitos softwares média center, como o popular XBMC, para obter informação, posters e fanart que enriquecem a experiência do utilizador.</description>
     <description lang="ro">themoviedb.org este o bază de date de filme deschisă și gratuită. Este actualizată de oameni ca dumneavoastră. TMDb este curent folosită de milioane de oameni în fiecare lună și datorită API-ului puternic, este de asemenea folosită de multe centre media populare ca XBMC pentru a obține informații despre filme, afișe și imagini realizate de fani (Fanart) care îmbogățesc experiența utilizatorului.</description>
     <description lang="ru">themoviedb.org это бесплатная и открытая база данных фильмов. Она полностью поддерживается такими же людьми как и ты. В данный момент TMDb используется миллионами людей каждый месяц, и, с его мощным API, используется различными популярными медиа-центрами, такими как XBMC, для получения к Фильмам мета-данных, постеров и фанарта в целях улучшения пользовательского опыта.</description>
+    <description lang="se">themoviedb.org är en fri och öppen filmdatabas. Den drivs helt av personer som dig. TMDb används av miljoner människor varje månad och med hjälp av deras kraftfulla API, är det också använt av många populära mediacenter som XBMC för att hämta film-metadata, omslag och fanart för att berika användarens upplevelse.</description>
     <description lang="zh">themoviedb.org是一个开放和自由的电影数据库。它完全由象你一样的用户来掌控。TMDb每月为上百万用户提供服务，并通过强大的API界面为许多流行的媒体中心系统如XBMC提供电影资料、封面海报和同人画以丰富用户的体验。</description>
     <platform>all</platform>
   </extension>

Modified: branches/Dharma/addons/metadata.tvdb.com/addon.xml
===================================================================
--- branches/Dharma/addons/metadata.tvdb.com/addon.xml	2010-11-23 22:31:45 UTC (rev 35436)
+++ branches/Dharma/addons/metadata.tvdb.com/addon.xml	2010-11-23 22:35:48 UTC (rev 35437)
@@ -33,6 +33,7 @@
     <description lang="pt"> O TheTVDB.com é um motor de busca para séries de TV. O site é uma gigantesca base de dados aberta que pode ser alterada por qualquer pessoa e contém informação em várias línguas. Todos os conteúdos do site foram enviados por utilizadores com um elevado padrão de qualidade. A base de dados e site funcionam sob uma licença GPL de software livre.</description>
     <description lang="ro">TheTVDB.com este un catalog de filme seriale. Site-ul este o bază de date publică, masivă care poate fi modificată de oricine și conține informații complete în limbi diferite pentru multe seriale. Tot conținutul și imaginile de pe site au fost adăugate de utilizatori și au un standard înalt de calitate. Schema bazei de date și site-ul web au sursă deschisă și licență GPL.</description>
     <description lang="ru">TheTVDB.com это обработчик для ТВ-шоу. Сайт представляет собой массивную открытую базу данных, которая может быть изменене кем угодно и содержит полные мета-данные для многих шоу и сериалов на различных языках. Все содержанимое и изображения на сайте были выложены его пользователями для пользователей, и имеют высокий уровень или качество. Схемы базы данных и веб-сайт выполнены под открытым исходным кодом и доступны по лицензии GPL.</description>
+    <description lang="se">TheTVDB.com är en TV-skrapa. Sajten är en massiv öppen databas som kan modifieras av vem som helst och innehåller all metadata för många serier på olika språk. Allt innehåll och bildmaterial har bidragits från användarna till användare och har en hög standard och kvalitet. Databasschemat och webbsidan är öppet under GPL-licens.</description>
     <description lang="zh">TheTVDB.com是一个电视刮削器。该网站是一个巨大的开放式数据库，任何人都可以修改，包含多语言的许多电视剧集资料。网站设定了高品质标准，所有图片和内容都由用户提供。数据库结构和网站均在GPL许可下开源。</description>
     <platform>all</platform>
   </extension>

Modified: branches/Dharma/addons/repository.xbmc.org/addon.xml
===================================================================
--- branches/Dharma/addons/repository.xbmc.org/addon.xml	2010-11-23 22:31:45 UTC (rev 35436)
+++ branches/Dharma/addons/repository.xbmc.org/addon.xml	2010-11-23 22:35:48 UTC (rev 35437)
@@ -35,6 +35,7 @@
 		<description lang="pt">Descarregue e instale add-ons do repositório oficial XBMC.org.[CR]  Ao usar o repositório oficial, poderá tirar partido do extenso serviço de imagens espalhado pelo mundo, que garante sempre downloads mais rápidos de uma localização próxima da sua.[CR]  Todos os add-ons deste repositório foram alvo de exaustivos testes. Na improvável hipótese de encontrar um add-on que não funcione, por favor reporte à equipa do XBMC, para que se possa proceder à resolução da situação.</description>
 		<description lang="ro">Descărcați și instalați suplimente din depozitul de suplimente XBMC.org oficial.[CR]  Folosind depozitul (repository) oficial puteți beneficia de serviciul nostru de găzduire distribuită pentru a vă ajuta să descărcați mai repede dintr-o regiune mai apropiată de dumneavoastră.[CR]  Toate suplimentele din acest depozit au trecut testele de bază, în caz că găsiți un supliment defect vă rugăm să îl raportați echipei XBMC pentru a lua măsurile necesare.</description>
 		<description lang="ru">Загружайте и устанавливайте обновления с официального репозитория XBMC.org[CR]  Используя официальный репозиторый вы сможете использовать преимущества распределенного хранилища для быстройй загрузки файлов из ближайшего к вам региона.[CR] Все дополнения в данном репозитории прошли тестирование. Если вы обнаружили не рабочее дополнение, пожалуйста сообщите об этом Команде XBMC.</description>
+		<description lang="en">Ladda ner och installera tillägg från det officiella XBMC.org tilläggsförrådet.[CR]  Genom att använda det officiella förrådet kan du utnyttja fördelarna med vår utökade filspeglinstjänst för att få snabbare nedladdningar från en region nära dig.[CR]  Alla tillägg på detta förråd har genomgått en enkel testprocedur, om du hittar ett trasigt eller icke fungerande tillägg uppskattar vi om du är vänlig och rapporterar det till Team XBMC så vi kan vidta nödvändiga åtgärder.</description>
 		<description lang="zh">从官方XBMC.org扩展功能库下载和安装扩展功能。[CR]　通过官方程序库你将能利用我们广泛的镜像服务优势，使你能够就近下载资源。[CR]　官方库中的所有扩展功能模块都经过了基本的测试，如果你发现有损坏或不能正常工作的插件请向XBMC开发团队报告，以便及时处理。</description>
 		<disclaimer lang="en">Team XBMC did not make all the add-ons on this repository and are not responsible for their content</disclaimer>
 		<disclaimer lang="de">Team XBMC hat nicht alle Add-Ons aus dem Repository erstellt und ist für deren Inhalt nicht verantwortlich</disclaimer>
@@ -47,6 +48,7 @@
 		<disclaimer lang="pt">A equipa XBMC não desenvolveu todos os add-ons neste repositório e não é responsável pelo seu conteúdo.</disclaimer>
 		<disclaimer lang="ro">Echipa XBMC nu a creat toate aceste suplimente din acest depozit și nu este responsabilă pentru conținutul lor.</disclaimer>
 		<disclaimer lang="ru">Команда XBMC не является автором всех дополнений в данном репозитории и не ответственна за их содержимое.</disclaimer>
+		<disclaimer lang="se">Team XBMC har inte skapat alla tillägg på detta förråd och är inte ansvariga för deras innehåll</disclaimer>
 		<disclaimer lang="zh">本库中扩展功能模块并非完全由XBMC开发团队开发，因此不对相关内容承担责任</disclaimer>
 		<platform>all</platform>
 	</extension>

Modified: branches/Dharma/addons/screensaver.rsxs.euphoria/addon.xml
===================================================================
--- branches/Dharma/addons/screensaver.rsxs.euphoria/addon.xml	2010-11-23 22:31:45 UTC (rev 35436)
+++ branches/Dharma/addons/screensaver.rsxs.euphoria/addon.xml	2010-11-23 22:35:48 UTC (rev 35437)
@@ -32,6 +32,7 @@
     <description lang="pl">Tak psychodeliczny wygaszacz jak tylko się da. Lepiej zaopatrz się w worki na chorobę lokomocyjną.</description>
     <description lang="pt">Esta é provavelmente a protecção de ecrã mais psicadélica de sempre. O mogumbo (autor) pensou que a sua protecção de ecrã 'Plasma' estava no topo da escala de protecções nauseantes mas esta parece ainda pior. Procure um saco de enjoo e sente-se, se vai ficar muito tempo a olhar para o ecrã.</description>
     <description lang="ru">Это настолько психаделично, насколько такой может быть заставка. mogumbo думал, что его хранитель экрана Plasma был недосягаем, но этот ещё более тошнотворный. Лучше найдите себе гигиенический пакет, перед тем как вы будете слишком долго смотреть на этот хранитель экрана.</description>
+    <description lang="se">Det här är ungefär så psykedelisk skärmsläckare kan bli. mogumbo trodde hans plasma-skärmsläckare var toppen på skalan, men denna är till och med ännu mer kväljande. Du gör bäst i att leta upp en åksjukepåse innan du stirrar på denna för länge.</description>
     <description lang="zh">这大概是最具迷幻效果的屏幕保护程序了。mogumbo以为他的Plasma屏保已经是数一数二了，但这个更令人作犯晕。如果你要长时间盯视它最好先准备一个晕机袋。</description>
     <platform>linux osx</platform>
   </extension>

Modified: branches/Dharma/addons/visualization.dxspectrum/addon.xml
===================================================================
--- branches/Dharma/addons/visualization.dxspectrum/addon.xml	2010-11-23 22:31:45 UTC (rev 35436)
+++ branches/Dharma/addons/visualization.dxspectrum/addon.xml	2010-11-23 22:35:48 UTC (rev 35437)
@@ -17,6 +17,7 @@
     <summary lang="pl">Wizualizacja pokazująca obracający się analizator widma w 3D (DirectX)</summary>
     <summary lang="pt">Visualização que mostra um analisador espectral rotativo em 3D (DirectX)</summary>
     <summary lang="ro">Vizualizare care afișează un analizator de spectre 3D rotativ</summary>
+    <summary lang="se">Visualisering som visar en roterande 3D-spektrumanalysator</summary>
     <summary lang="zh">显示旋转三维频谱分析图像的可视化效果</summary>
     <description lang="en">DirectX Spectrum is a Visualisation showing a rotating 3D Spectrum Analyzer rendered in DirectX that moves to the beat of the music creating a wave effect across the spectrum grid.
 It also has settings to adjust the spectrum bar height, Its speed, and how the bars are rendered (solid, points, wire frame) and is a nice light weight, low cpu useage visualisation that looks great</description>
@@ -34,6 +35,8 @@
 Pode-se definir a altura das barras, a sua velocidade e como são renderizadas (sólido, pontos ou contorno). É uma visualização que utiliza pouco o CPU e com um visual fantástico.</description>
     <description lang="ro">Spectrul DirectX este o vizualizare care afișează un analizator de spectre 3D rotativ randat în DirectX care se mișcă după bătăile muzicii creând un val dea-lungul grilei spectrale.
 De asemenea, are setări pentru ajustarea înălțimii bărilor spectrale, a vitezei, și a modului în care bările sunt randate (umplere, puncte, wire frame). Este o vizualizare cu consum redus al procesorului care arată fantastic de bine</description>
+    <description lang="se">DirectX Spectrum är en visualisering som visar en roterande 3D-spektrumanalysator renderad i DirectX som rör sig i takt med musiken och skapar vågor av effekter över spektrumområdet.
+Det har också inställningar för att justera spektrumhöjden, hastigheten och hur staplarna är renderade (solida, punkter, ramverk) och det är lätt, liten cpuanvändning samt ser bra ut</description>
     <description lang="zh">DirectX Spectrum可视化效果是DirectX渲染的一个旋转的三维频谱分析图像，频谱矩阵随着音乐节拍而象波浪起伏。
 你还可以设置频谱棒的高度、变换速度、以及呈现效果（固体、点、框架）。这是一个不错的轻量级，低CPU使用率的可视化效果。</description>
     <platform>windx</platform>

Modified: branches/Dharma/addons/visualization.glspectrum/addon.xml
===================================================================
--- branches/Dharma/addons/visualization.glspectrum/addon.xml	2010-11-23 22:31:45 UTC (rev 35436)
+++ branches/Dharma/addons/visualization.glspectrum/addon.xml	2010-11-23 22:35:48 UTC (rev 35437)
@@ -17,6 +17,7 @@
     <summary lang="nl">OpenGL-visualisatie</summary>
     <summary lang="pl">Wizualizacja pokazująca obracający się analizator widma w 3D (OpenGL)</summary>
     <summary lang="pt">Visualização que mostra um analisador espectral rotativo em 3D (OpenGL)</summary>
+    <summary lang="se">Visualisering som visar en roterande 3D-spektrumanalysator</summary>
     <summary lang="zh">显示旋转三维频谱分析图像的可视化效果</summary>
     <description lang="en">Opengl Spectrum is a Visualisation showing a rotating 3D Spectrum Analyzer rendered in Opengl that moves to the beat of the music creating a wave effect across the spectrum grid.
 It also has settings to adjust the spectrum bar height, Its speed, and how the bars are rendered (solid, points, wire frame) and is a nice light weight, low cpu useage visualisation that looks great</description>
@@ -33,6 +34,8 @@
     <description lang="pl">Wizualizacja pokazuje obracający się, trójwymiarowy analizator widma, renderowany przy użyciu OpenGL. Możesz ustawić wysokość słupków, ich prędkość i wygląd.</description>
     <description lang="pt">O OpenGL Spectrum é uma visualização que mostra um analisador espectral rotativavo, renderizado em OpenGL, que se sincroniza com a batida, criando assin um efeito de ondas na grelha espectral.
 Pode-se definir a altura das barras, a sua velocidade e como são renderizadas (sólido, pontos ou contorno). É uma visualização que utiliza pouco o CPU e com um visual fantástico.</description>
+    <description lang="se">OpenGL Spectrum är en visualisering som visar en roterande 3D-spektrumanalysator renderad i OpenGL som rör sig i takt med musiken och skapar vågor av effekter över spektrumområdet.
+Det har också inställningar för att justera spektrumhöjden, hastigheten och hur staplarna är renderade (solida, punkter, ramverk) och det är lätt, liten cpuanvändning samt ser bra ut</description>
     <description lang="zh">Opengl Spectrum可视化效果是Opengl渲染的一个旋转的三维频谱分析图像，频谱矩阵随着音乐节拍而象波浪起伏。
 你还可以设置频谱棒的高度、变换速度、以及呈现效果（固体、点、框架）。这是一个不错的轻量级，低CPU使用率的可视化效果。</description>
     <disclaimer></disclaimer>

Modified: branches/Dharma/addons/visualization.itunes/addon.xml
===================================================================
--- branches/Dharma/addons/visualization.itunes/addon.xml	2010-11-23 22:31:45 UTC (rev 35436)
+++ branches/Dharma/addons/visualization.itunes/addon.xml	2010-11-23 22:35:48 UTC (rev 35437)
@@ -17,7 +17,7 @@
     <summary lang="nl">iTunes-visualisaties</summary>
     <summary lang="pl">Wrapper wizualizacji iTunes</summary>
     <summary lang="pt">Visualização iTunes</summary>
-    <summary lang="zh">iTunes visualiseringsomslag</summary>
+    <summary lang="se">iTunes visualiseringsomslag</summary>
     <summary lang="zh">iTunes可视化效果包</summary>
     <description lang="en">iTunes Visualization Wrapper allows you to use visualizations from your OSX iTunes install in XBMC</description>
     <description lang="de">iTunes Visualisierung ermöglicht es von der OSX iTunes Installation die Visualisierung in XBMC nutzen zu können</description>

Modified: branches/Dharma/addons/visualization.projectm/addon.xml
===================================================================
--- branches/Dharma/addons/visualization.projectm/addon.xml	2010-11-23 22:31:45 UTC (rev 35436)
+++ branches/Dharma/addons/visualization.projectm/addon.xml	2010-11-23 22:35:48 UTC (rev 35437)
@@ -24,6 +24,7 @@
     <summary lang="ko">projectM 은 사운드웨이브 속으로 날아가는듯한 효과를 보여줍니다.</summary>
     <summary lang="pl">projectM zabiera Cię w niesamowity lot w chmurach aktualnie słuchanych dźwięków</summary>
     <summary lang="pt">O projectM leva-o a voar nas ondas sonoras que está a ouvir</summary>
+    <summary lang="se">projectM tar dig flygande genom ljudvågorna du hör</summary>
     <summary lang="zh">projectM带你与声波一起飞翔</summary>
     <description lang="en">projectM is an awesome music visualizer. There is nothing better in the world of Unix. projectM's greatness comes from the hard work of the community. Users like you can create presets that connect music with incredible visuals. Try it!
 projectM Visualization is an LGPL'ed reimplementation of Milkdrop under OpenGL
@@ -45,6 +46,9 @@
 Wszystko czego wymaga projectM, to karta graficzna wspierająca akcelerację 3D oraz zasoby Twojej muzyki.</description>
     <description lang="pt">O projectM é um fantástico visualizador de música. Não existe nenhum melhor no mundo Unix. A grandeza do projectM advém do trabalho árduo da comunidade. Utilizadores como você podem criar pré-definições que ligam a música a visualizações incríveis. Experimente!
 O visualizador projectM é uma reimplementação do Milkdrop OpenGL sob uma licença LGPL. Tudo o que o projectM necessita é de uma placa gráfica com aceleração 3D e a sua música favorita.</description>
+    <description lang="se">projectM är en fantastisk musikvisualisering. Det finns inget bättre i Unixvärlden. projectM's storhet kommer från hårt arbete i gemenskapen. Användare som dig kan skapa förval som anluter musiken med dom otroliga visualiseringarna. Prova det!
+projectM visualiseringen är en LGPL återskapning av Milkdrop från OpenGL
+Alla projectM kräver ett grafikkort med 3D-acceleration och din favoritmusik.</description>
     <description lang="zh">projectM是一个音乐可视化效果。它是Unix世界中最好的。它的伟大来自于社区的辛苦工作。使用者可以创建预设参数把音乐和难以置信的可视化效果连接起来。试试吧！
 projectM可视化效果是用OpenGL按照LGPL协议对Milkdrop的重新实现
 projectM所要求的仅是一块有3D加速功能的显卡和你喜爱的音乐。</description>

Modified: branches/Dharma/language/Swedish/strings.xml
===================================================================
--- branches/Dharma/language/Swedish/strings.xml	2010-11-23 22:31:45 UTC (rev 35436)
+++ branches/Dharma/language/Swedish/strings.xml	2010-11-23 22:35:48 UTC (rev 35437)
@@ -1419,7 +1419,7 @@
   <string id="20024">Skanna nya</string>
   <string id="20025">Skanna alla</string>
   <string id="20026">Region</string>
-  <string id="20037">Sammanfattning</string>
+  <string id="20037">Översikt</string>
   <string id="20038">Lås musikfönster</string>
   <string id="20039">Lås filmfönster</string>
   <string id="20040">Lås bildfönster</string>
@@ -1677,7 +1677,7 @@
   <string id="20399">Gå till musikvideor från album</string>
   <string id="20400">Gå till musikvideor av artist</string>
   <string id="20401">Spela musikvideo</string>
-  <string id="20402">Hämta automatiskt skådespelarminiatyrer under tilläggning till biblioteket</string>
+  <string id="20402">Hämta skådespelarminiatyrer vid tilläggning till biblioteket</string>
   <string id="20403">Ange skådespelarminiatyr</string>
   <string id="20405">Ta bort avsnittsbokmärke</string>
   <string id="20406">Lägg till avsnittsbokmärke</string>
@@ -1826,7 +1826,7 @@
   <string id="21449">Fjärrkontroll sänder tangentbordstryckningar</string>
   <string id="21450">- Redigera</string>
   <string id="21451">Internetuppkoppling krävs.</string>
-  <string id="21452">Få mer...</string>
+  <string id="21452">Hämta fler...</string>
   <string id="21453">Rotfilsystem</string>
   <string id="21800">Filnamn</string>
   <string id="21801">Filsökväg</string>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 35439
          http://xbmc.svn.sourceforge.net/xbmc/?rev=35439&view=rev
Author:   spiff_
Date:     2010-11-23 22:40:19 +0000 (Tue, 23 Nov 2010)

Log Message:
-----------
updated: ticket #10720 - romanian translation. thanks to danny3
updated: ticket #10718 - polish translation. thanks to kolabor
updated: ticket #10637 - dutch translation. thanks to adje
updated: ticket #10515 - ukranian translation. thanks to issh
updated: ticket #10746 - norwegian translation. thanks to ventech

Modified Paths:
--------------
    branches/Dharma/addons/skin.confluence/language/Romanian/strings.xml
    branches/Dharma/addons/visualization.dxspectrum/addon.xml
    branches/Dharma/addons/visualization.dxspectrum/resources/language/Romanian/strings.xml
    branches/Dharma/addons/visualization.glspectrum/addon.xml
    branches/Dharma/addons/visualization.milkdrop/addon.xml
    branches/Dharma/language/Dutch/strings.xml
    branches/Dharma/language/Norwegian/strings.xml
    branches/Dharma/language/Polish/strings.xml
    branches/Dharma/language/Romanian/strings.xml
    branches/Dharma/language/Ukrainian/langinfo.xml
    branches/Dharma/language/Ukrainian/strings.xml

Modified: branches/Dharma/addons/skin.confluence/language/Romanian/strings.xml
===================================================================
--- branches/Dharma/addons/skin.confluence/language/Romanian/strings.xml	2010-11-23 22:36:43 UTC (rev 35438)
+++ branches/Dharma/addons/skin.confluence/language/Romanian/strings.xml	2010-11-23 22:40:19 UTC (rev 35439)
@@ -74,8 +74,8 @@
   <string id="31120">ETICHETĂ BUTON</string>
   <string id="31121">CALE CĂTRE SUPLIMENT</string>
   <string id="31122">Pagină meteo</string>
-  <string id="31123">Folosește „Afișe” în loc de „Bannere” pentru seriale</string>
-  <string id="31124">Arată video „În redare” pe fundal</string>
+  <string id="31124">Arată video „Acum în redare” pe fundal</string>
+  <string id="31125">Arată vizualizare „Acum în redare” pe fundal</string>
   <string id="31125">Arată vizualizare „În redare” pe fundal</string>
   <string id="31126">Activează descărcare versuri în meniul audio</string>
   <string id="31127">CALE CĂTRE SUPLIMENT VERSURI</string>
@@ -134,7 +134,7 @@
   <string id="31353">Derulează înainte</string>
   <string id="31354">Derulează înapoi</string>
   <string id="31355">Meniu film</string>
-  <string id="31356">Descarcă subtitrări</string>
+  <string id="31356">Descărcare subtitrare</string>
   <string id="31357"></string>
   
   <!-- Skin Fontsets -->

Modified: branches/Dharma/addons/visualization.dxspectrum/addon.xml
===================================================================
--- branches/Dharma/addons/visualization.dxspectrum/addon.xml	2010-11-23 22:36:43 UTC (rev 35438)
+++ branches/Dharma/addons/visualization.dxspectrum/addon.xml	2010-11-23 22:40:19 UTC (rev 35439)
@@ -34,7 +34,7 @@
     <description lang="pt">O DirectX Spectrum é uma visualização que mostra um analisador espectral rotativavo, renderizado em DirectX, que se sincroniza com a batida, criando assin um efeito de ondas na grelha espectral.
 Pode-se definir a altura das barras, a sua velocidade e como são renderizadas (sólido, pontos ou contorno). É uma visualização que utiliza pouco o CPU e com um visual fantástico.</description>
     <description lang="ro">Spectrul DirectX este o vizualizare care afișează un analizator de spectre 3D rotativ randat în DirectX care se mișcă după bătăile muzicii creând un val dea-lungul grilei spectrale.
-De asemenea, are setări pentru ajustarea înălțimii bărilor spectrale, a vitezei, și a modului în care bările sunt randate (umplere, puncte, wire frame). Este o vizualizare cu consum redus al procesorului care arată fantastic de bine</description>
+De asemenea, are setări pentru ajustarea înălțimii bărilor spectrale, a vitezei, și a modului în care bările sunt randate (umplere, puncte, contur). Este o vizualizare cu consum redus al procesorului care arată fantastic de bine.</description>
     <description lang="se">DirectX Spectrum är en visualisering som visar en roterande 3D-spektrumanalysator renderad i DirectX som rör sig i takt med musiken och skapar vågor av effekter över spektrumområdet.
 Det har också inställningar för att justera spektrumhöjden, hastigheten och hur staplarna är renderade (solida, punkter, ramverk) och det är lätt, liten cpuanvändning samt ser bra ut</description>
     <description lang="zh">DirectX Spectrum可视化效果是DirectX渲染的一个旋转的三维频谱分析图像，频谱矩阵随着音乐节拍而象波浪起伏。

Modified: branches/Dharma/addons/visualization.dxspectrum/resources/language/Romanian/strings.xml
===================================================================
--- branches/Dharma/addons/visualization.dxspectrum/resources/language/Romanian/strings.xml	2010-11-23 22:36:43 UTC (rev 35438)
+++ branches/Dharma/addons/visualization.dxspectrum/resources/language/Romanian/strings.xml	2010-11-23 22:40:19 UTC (rev 35439)
@@ -3,17 +3,17 @@
     <!-- settings labels -->
     <string id="30000">Mod</string>
     <string id="30001">umplere</string>
-    <string id="30002">wireframe</string>
+    <string id="30002">contur</string>
     <string id="30003">puncte</string>
     <string id="30004">Înălțime bară</string>
     <string id="30005">mică</string>
-    <string id="30006">implicit</string>
+    <string id="30006">standard</string>
     <string id="30007">mare</string>
     <string id="30008">foarte mare</string>
     <string id="30009">Viteză</string>
     <string id="30010">foarte încet</string>
     <string id="30011">încet</string>
-    <string id="30012">implicit</string>
+    <string id="30012">standard</string>
     <string id="30013">repede</string>
     <string id="30014">foarte repede</string>
 </strings>

Modified: branches/Dharma/addons/visualization.glspectrum/addon.xml
===================================================================
--- branches/Dharma/addons/visualization.glspectrum/addon.xml	2010-11-23 22:36:43 UTC (rev 35438)
+++ branches/Dharma/addons/visualization.glspectrum/addon.xml	2010-11-23 22:40:19 UTC (rev 35439)
@@ -17,6 +17,7 @@
     <summary lang="nl">OpenGL-visualisatie</summary>
     <summary lang="pl">Wizualizacja pokazująca obracający się analizator widma w 3D (OpenGL)</summary>
     <summary lang="pt">Visualização que mostra um analisador espectral rotativo em 3D (OpenGL)</summary>
+    <summary lang="ro">Vizualizare care afișează un analizator de spectre 3D rotativ</summary>
     <summary lang="se">Visualisering som visar en roterande 3D-spektrumanalysator</summary>
     <summary lang="zh">显示旋转三维频谱分析图像的可视化效果</summary>
     <description lang="en">Opengl Spectrum is a Visualisation showing a rotating 3D Spectrum Analyzer rendered in Opengl that moves to the beat of the music creating a wave effect across the spectrum grid.
@@ -34,6 +35,8 @@
     <description lang="pl">Wizualizacja pokazuje obracający się, trójwymiarowy analizator widma, renderowany przy użyciu OpenGL. Możesz ustawić wysokość słupków, ich prędkość i wygląd.</description>
     <description lang="pt">O OpenGL Spectrum é uma visualização que mostra um analisador espectral rotativavo, renderizado em OpenGL, que se sincroniza com a batida, criando assin um efeito de ondas na grelha espectral.
 Pode-se definir a altura das barras, a sua velocidade e como são renderizadas (sólido, pontos ou contorno). É uma visualização que utiliza pouco o CPU e com um visual fantástico.</description>
+    <description lang="ro">Spectrul OpenGL este o vizualizare care afișează un analizator de spectre 3D rotativ randat în OpenGL care se mișcă după bătăile muzicii creând un val dea-lungul grilei spectrale.
+De asemenea, are setări pentru ajustarea înălțimii bărilor spectrale, a vitezei, și a modului în care bările sunt randate (umplere, puncte, contur). Este o vizualizare cu consum redus al procesorului care arată fantastic de bine.</description>
     <description lang="se">OpenGL Spectrum är en visualisering som visar en roterande 3D-spektrumanalysator renderad i OpenGL som rör sig i takt med musiken och skapar vågor av effekter över spektrumområdet.
 Det har också inställningar för att justera spektrumhöjden, hastigheten och hur staplarna är renderade (solida, punkter, ramverk) och det är lätt, liten cpuanvändning samt ser bra ut</description>
     <description lang="zh">Opengl Spectrum可视化效果是Opengl渲染的一个旋转的三维频谱分析图像，频谱矩阵随着音乐节拍而象波浪起伏。

Modified: branches/Dharma/addons/visualization.milkdrop/addon.xml
===================================================================
--- branches/Dharma/addons/visualization.milkdrop/addon.xml	2010-11-23 22:36:43 UTC (rev 35438)
+++ branches/Dharma/addons/visualization.milkdrop/addon.xml	2010-11-23 22:40:19 UTC (rev 35439)
@@ -27,7 +27,7 @@
     <description lang="nl">Milkdrop was oorspronkelijk een muziekvisualisatieplug-in voor de Winamp-muziekspeler. Terwijl u uw muziek beluistert vliegt Milkdrop u door de soundwaves die u op dat moment hoort. Op basis van de beat produceert het een veelvoud aan psychedelische effecten.</description>
     <description lang="pl">MilkDrop jest wizualizacją pochodzącą z odtwarzacza Winamp. W czasie słuchania muzyki, MilkDrop zabiera użytkownika w niesamowity lot pomiędzy aktualnie odtwarzanymi falami dźwiękowymi, używając detekcji beatu, która synchronizuje efekty wizualne z muzyką.</description>
     <description lang="pt">O MilkDrop era originalmente uma visualização do reprodutor de música Winamp. Ao ouvir a sua música, o MilkDrop leva-o a voar nas ondas sonoras que está a ouvir, usando detecção de batida para desencadear uma miriade de efeitos psicadélicos. Cria, assim, uma viagem inesquecível pelo som.</description>
-    <description lang="ro">MilkDrop a fost original un "modul" de vizualizare pentru lectorul de muzică Winamp. În timp ce ascultați muzica, MilkDrop vă face să zburați printre undele audio actuale pe care le auziți și folosește detecția bătăii pentru a activa miriada de efecte psihedelice, creând o călătorie vizuală bogată printre sunete.</description>
+    <description lang="ro">MilkDrop a fost original un „modul” de vizualizare pentru lectorul de muzică Winamp. În timp ce ascultați muzica, MilkDrop vă face să zburați printre undele audio actuale pe care le auziți și folosește detecția bătăii pentru a activa miriada de efecte psihedelice, creând o călătorie vizuală bogată printre sunete.</description>
     <description lang="se">MilkDrop vor från början en musikvisualition till Winamp-spelaren. När du lyssnar till din musik tar Milkdrop dig med på en flygtur genom ljudvågorna du hör och använde taktavkänning för att skapa en myriad av psykedeliska effekter som skapar en rik visuell resa genom ljudet.</description>
     <description lang="zh">MilkDrop是来自于Winamp音乐播放器的可视化插件。在你听音乐时，MilkDrop通过节拍检测触发的无数迷幻的效果，带你与声波一起飞翔，给你带来丰富的音乐和视觉旅程。</description>
     <platform>windx</platform>

Modified: branches/Dharma/language/Dutch/strings.xml
===================================================================
--- branches/Dharma/language/Dutch/strings.xml	2010-11-23 22:36:43 UTC (rev 35438)
+++ branches/Dharma/language/Dutch/strings.xml	2010-11-23 22:40:19 UTC (rev 35439)
@@ -1935,6 +1935,8 @@
   <string id="20451">Landen</string>
   <string id="20452">Aflevering</string>
   <string id="20453">Afleveringen</string>
+  <string id="20454">Luisteraar</string> 
+  <string id="20455">Luisteraars</string>
   <!-- up to 21329 is reserved for the video db !! !-->
 
   <string id="21330">Verborgen bestanden en mappen weergeven</string>

Modified: branches/Dharma/language/Norwegian/strings.xml
===================================================================
--- branches/Dharma/language/Norwegian/strings.xml	2010-11-23 22:36:43 UTC (rev 35438)
+++ branches/Dharma/language/Norwegian/strings.xml	2010-11-23 22:40:19 UTC (rev 35439)
@@ -42,8 +42,8 @@
   <string id="45">Fre</string>
   <string id="46">Lør</string>
   <string id="47">Søn</string>
+  
   <string id="51">Jan</string>
-  
   <string id="52">Feb</string>
   <string id="53">Mar</string>
   <string id="54">Apr</string>
@@ -176,6 +176,7 @@
   <string id="197">Spør etter %s informasjon</string>
   <string id="198">Laster filmdetaljer</string>
   <string id="199">Webgrensesnitt</string>
+  
   <string id="202">Slagord</string>
   <string id="203">Handling</string>
   
@@ -565,6 +566,8 @@
   <string id="609">CDDA-sti for ripping er ikke satt</string>
   <string id="610">Ripp musikkspor</string>
   <string id="611">Skriv inn nummer</string>
+  <string id="612">Bits/Sample</string>
+  <string id="613">Samplingsfrekvens</string>
   
   <string id="620">CD-ripping</string>
   <string id="621">Koder</string>
@@ -856,9 +859,6 @@
   <string id="2102"></string>
   <string id="2103"></string>
   
-  <string id="2102"></string>
-  <string id="2103"></string>
-  
   <string id="4501">Aktiver LCD/VFD</string>
   
   <string id="10000">Forside</string>
@@ -885,13 +885,11 @@
   <string id="10021">Nettleser</string>
   
   <string id="10028">Videoer/Spilleliste</string>
-
   <string id="10034">Innstillinger - Profiler</string>
   
   <string id="10100">Ja/Nei dialog</string>
   <string id="10101">Forløpsdialgboks</string>
   
-  
   <string id="10210">Leter etter undertekster...</string>
   <string id="10211">Leter etter eller henter undertekster...</string>
   <string id="10212">avslutter</string>
@@ -1094,6 +1092,8 @@
   <string id="13167"></string>
   <string id="13168"></string>
   <string id="13169"></string>
+  
+  
   <string id="13170">Aldri</string>
   <string id="13171">Umiddelbart</string>
   <string id="13172">Etter %i sek</string>
@@ -1267,7 +1267,6 @@
   <string id="13430">Tillat maskinvareakselerasjon (OpenMax)</string>
   <string id="13431">Piksel shader</string> <!-- improve here -->
   
-  
   <string id="13500">A/V synkmetode</string>
   <string id="13501">Lydklokking</string>
   <string id="13502">Videoklokking (dropp/dupliser lyd)</string>
@@ -1281,6 +1280,7 @@
   <string id="13510">Synkroniser avspilling til skjerm</string>
   
   <string id="13600">Apple fjernkontroll</string>
+  
   <string id="13602">Tillat oppstart av XBMC fra fjernkontrollen</string>
   <string id="13603">Sekvensforsinkelse</string>
   
@@ -2177,6 +2177,7 @@
   
   <string id="23104">Trykk OK når avspilling er ferdig</string>
   
+  
   <string id="24000">Tillegg</string>
   <string id="24001">Tillegg</string>
   <string id="24002">Alternativer for tillegg</string>
@@ -2218,7 +2219,7 @@
   
   <string id="24050">Tilgjengelige tillegg</string>
   <string id="24051">Versjon:</string>
-  <string id="24052">Dementi:</string>
+  <string id="24052">Fraskrivelse:</string>
   <string id="24053">Lisens:</string>
   <string id="24054">Endringslogg</string>
   <string id="24059">Vil du aktivere dette tillegget?</string>
@@ -2239,7 +2240,6 @@
   <string id="24073">Kunne ikke koble til</string>
   <string id="24074">Må startes på nytt</string>
   <string id="24075">Deaktivere</string>
-
   <string id="24080">Forsøk ny oppkobling?</string>
   <string id="24089">Tillegg starter på nytt</string>
   <string id="24090">Lås tilleggsbehandler</string>
@@ -2253,6 +2253,8 @@
   <string id="24096">Tillegget er markert som ødelagt i pakkebrønnen.</string>
   <string id="24097">Vil du deaktivere tillegget?</string>
   <string id="24098">Ødelagt</string>
+  <string id="24099">Ønsker du å bytte til dette skinnet nå?</string>
+  <string id="25000">Varslinger</string>
   
   
   <string id="29800">Biblioteksmodus</string>

Modified: branches/Dharma/language/Polish/strings.xml
===================================================================
--- branches/Dharma/language/Polish/strings.xml	2010-11-23 22:36:43 UTC (rev 35438)
+++ branches/Dharma/language/Polish/strings.xml	2010-11-23 22:40:19 UTC (rev 35439)
@@ -2,9 +2,9 @@
 <!--Language file translated with Team XBMC Translator-->
 <!--Translator: Rafał Wójcik-->
 <!--Email: rafal.wojcik@...>
-<!--Date of translation: 10/23/2010-->
+<!--Date of translation: 11/19/2010-->
 <!--$Revision$-->
-<!--Based on english strings version 34887-->
+<!--Based on english strings version 35193-->
 <strings>
   <string id="0">Programy</string>
   <string id="1">Zdjęcia</string>
@@ -1723,6 +1723,8 @@
   <string id="20451">Kraje</string>
   <string id="20452">odcinek</string>
   <string id="20453">odcinki</string>
+  <string id="20454">Słuchacz</string>
+  <string id="20455">Słuchaczy</string>
   <string id="21330">Pokazuj ukryte pliki i foldery</string>
   <string id="21331">Klient TuxBox</string>
   <string id="21332">UWAGA: Urządzenie TuxBox jest w trybie nagrywania!</string>
@@ -2100,4 +2102,4 @@
   <string id="34108">5.1</string>
   <string id="34109">7.0</string>
   <string id="34110">7.1</string>
-</strings>
\ No newline at end of file
+</strings>

Modified: branches/Dharma/language/Romanian/strings.xml
===================================================================
--- branches/Dharma/language/Romanian/strings.xml	2010-11-23 22:36:43 UTC (rev 35438)
+++ branches/Dharma/language/Romanian/strings.xml	2010-11-23 22:40:19 UTC (rev 35439)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!-- Translated by Daniel Alămiță, based on english revision 34887 -->
+<!-- Translated by Daniel Alămiță, based on english revision 35193 -->
 <strings>
   <string id="0">Programe</string>
   <string id="1">Imagini</string>
@@ -99,7 +99,7 @@
   <string id="122">Confirmare ștergere fișier</string>
   <string id="123">Copiați aceste fișiere?</string>
   <string id="124">Mutați aceste fișiere?</string>
-  <string id="125">Ștergeți aceste fișiere?&#10;ATENȚIE: Ștergerea fișierelor nu poate fi anulată!</string>
+  <string id="125">Sigur doriți să ștergeți acest fișier?&#10;ATENȚIE: Ștergerea fișierelor nu poate fi anulată!</string>
   <string id="126">Stare</string>
   <string id="127">Obiecte</string>
   <string id="128">Generale</string>
@@ -109,7 +109,7 @@
   <string id="132">Albume</string>
   <string id="133">Artiști</string>
   <string id="134">Cântece</string>
-  <string id="135">Genuri</string>
+  <string id="135">Gen</string>
   <string id="136">Liste de redare</string>
   <string id="137">Caută</string>
   <string id="138">Informații sistem</string>
@@ -172,7 +172,7 @@
   <string id="195">Nu s-au găsit informații!</string>
   <string id="196">Selectați filmul:</string>
   <string id="197">Se cer informații pe %s</string>
-  <string id="198">Se descarcă informații film</string>
+  <string id="198">Încărcare informații film</string>
   <string id="199">Interfață web</string>
 
   <string id="202">Citat</string>
@@ -236,11 +236,11 @@
   <string id="263">Permite controlul XBMC prin HTTP</string>
   <string id="264">Înregistrează</string>
   <string id="265">Oprește înreg.</string>
-  <string id="266">Sortează după: Pistă</string>
-  <string id="267">Sortează după: Timp</string>
-  <string id="268">Sortează după: Titlu</string>
-  <string id="269">Sortează după: Artist</string>
-  <string id="270">Sortează după: Album</string>
+  <string id="266">Sort. după: Pistă</string>
+  <string id="267">Sort. după: Timp</string>
+  <string id="268">Sort. după: Titlu</string>
+  <string id="269">Sort. după: Artist</string>
+  <string id="270">Sort. după: Album</string>
   <string id="271">Top 100</string>
   <string id="272">Compensare suprascanare stânga-sus</string>
   <string id="273">Compensare suprascanare dreapta-jos</string>
@@ -254,7 +254,7 @@
   <string id="281">Verificați fișierele XML</string>
   <string id="282">S-au găsit %i elemente</string>
   <string id="283">Rezultate căutare</string>
-  <string id="284">Nu s-au găsit rezultate</string>
+  <string id="284">Nu s-au găsit rezultate.</string>
   <string id="286"></string>
   <string id="287">Subtitrări</string>
   <string id="288">Font</string>
@@ -262,7 +262,7 @@
   <string id="290">Comprimare interval dinamic</string>
   <string id="291">Video</string>
   <string id="292">Audio</string>
-  <string id="293">Răsfoire după subtitrări</string>
+  <string id="293">Alegere subtitrare</string>
   <string id="294">Creează semn de carte</string>
   <string id="296">Elimină semne de carte</string>
   <string id="297">Decalaj audio</string>
@@ -334,13 +334,13 @@
   <string id="366">Sortează după: An</string>
   <string id="367">Sortează după: Notă</string>
   <string id="368">IMDb</string>
-  <string id="369">Titlu</string>
+  <string id="369">Nume</string>
   <string id="370">furtuni(cu trăznete)</string>
   <string id="371">parțial</string>
   <string id="372">în general</string>
   <string id="373">însorit</string>
   <string id="374">înnorat</string>
-  <string id="375">zăpadă</string>
+  <string id="375">ninsoare</string>
   <string id="376">ploaie</string>
   <string id="377">slab</string>
   <string id="378">AM</string>
@@ -377,9 +377,9 @@
   <string id="409">Implicit</string>
   <string id="410">Se accesează serviciul de prognoză</string>
   <string id="411">Se obține prognoza pentru:</string>
-  <string id="412">Nu se pot obține date despre vreme</string>
+  <string id="412">Nu se pot obține date despre vreme.</string>
   <string id="413">Manual</string>
-  <string id="414">Nicio prezentare pentru acest album</string>
+  <string id="414">Nicio prezentare pentru acest album.</string>
   <string id="415">Se descarcă miniatura...</string>
   <string id="416">Indisponibil</string>
   <string id="417">Afișare: Pictograme mari</string>
@@ -503,7 +503,7 @@
   <string id="544">Info media</string>
   <string id="545">Dispozitiv de ieșire audio</string>
   <string id="546">Dispozitiv prin care trece audio</string>
-  <string id="547">Nu există biografie pentru acest artist</string>
+  <string id="547">Nu există biografie pentru acest artist.</string>
   <string id="548">Micșorează audio multi-canal către stereo</string>
 
   <string id="550">Sort. după: %s</string>
@@ -536,12 +536,12 @@
   <string id="580">Direcție de sortare</string>
   <string id="581">Metodă de sortare</string>
   <string id="582">Mod de vizualizare</string>
-  <string id="583">Ține minte vizualizările pentru dosare diferite</string>
+  <string id="583">Memorează vizualizările pentru dosare diferite</string>
   <string id="584">Ascendent</string>
   <string id="585">Descendent</string>
   <string id="586">Modifică lista de redare</string>
   <string id="587">Filtrează</string>
-  <string id="588">Anulează mod petrecere</string>
+  <string id="588">Renunță la mod petrecere</string>
   <string id="589">Mod petrecere</string>
   <string id="590">Aleator</string>
   <string id="591">Oprit</string>
@@ -588,7 +588,7 @@
   <string id="641">Nivel PreAmp - Fișiere normalizate audio</string>
   <string id="642">Nivel PreAmp - Fișiere ne-normalizate audio</string>
   <string id="643">Evită distorsiunile în fișierele normalizate audio</string>
-  <string id="644">Decupare benzi negre</string>
+  <string id="644">Elimină benzile negre</string>
   <string id="645">Un fișier mare trebuie dezarhivat. Continuați?</string>
   <string id="646">Elimină din mediatecă</string>
   <string id="647">Exportă mediateca video</string>
@@ -596,7 +596,7 @@
   <string id="649">Se importă</string>
   <string id="650">Se exportă</string>
   <string id="651">Alegere mediatecă</string>
-  <string id="652">Ani</string>
+  <string id="652">An</string>
   <string id="653">Actualizează mediateca</string>
   <string id="654">Arată informații de depanare</string>
   <string id="655">Alegere executabil</string>
@@ -735,7 +735,7 @@
   <string id="1020">Adăugare sursă %s</string>
   <string id="1021">Introduceți căi sau alegeți locații media.</string>
   <string id="1022">Introduceți un nume pentru această sursă media.</string>
-  <string id="1023">Răsfoire după partajare nouă</string>
+  <string id="1023">Alegere partajare nouă</string>
   <string id="1024">Alege</string>
   <string id="1025">Nu se pot obține informații dosar.</string>
   <string id="1026">Adaugă sursă</string>
@@ -756,8 +756,8 @@
   <string id="1041">S-au obținut %i elemente</string>
   <string id="1042">S-au obținut %i din %i elemente</string>
   <string id="1043">Suplimente programe</string>
-  <string id="1044">Setează miniatură supliment</string>
-  <string id="1045">Setări supliment</string>
+  <string id="1044">Alege miniatură supliment</string>
+  <string id="1045">Configurare supliment</string>
   <string id="1046">Puncte de acces</string>
   <string id="1047">Altele...</string>
   <string id="1048">- Utilizator</string>
@@ -908,10 +908,10 @@
   <string id="10511">Informații sistem</string>
 
   <string id="10516">Mediatecă audio</string>
-  <string id="10517">Muzică - În redare</string>
+  <string id="10517">Muzică acum în redare</string>
 
-  <string id="10522">Filme - În redare</string>
-  <string id="10523">Informații album</string>
+  <string id="10522">Video acum în redare</string>
+  <string id="10523">Info album</string>
   <string id="10524">Informații film</string>
 
   <string id="12000">Selectează dialog</string>
@@ -1113,9 +1113,9 @@
   <string id="13214">%2.0f s</string> <!--seconds (left from countdown)-->
 
   <string id="13249">Caută subtitrări în arhive RAR</string>
-  <string id="13250">Caută subtitrare...</string>
-  <string id="13251">Mută element</string>
-  <string id="13252">Mută element aici</string>
+  <string id="13250">Alegere subtitrare...</string>
+  <string id="13251">Mută elementul</string>
+  <string id="13252">Mută elementul aici</string>
   <string id="13253">Renunță la mutare</string>
 
   <string id="13270">Hardware:</string>
@@ -1196,7 +1196,7 @@
   <string id="13347">Adaugă la coadă</string>
   <string id="13348">Caută pe IMDb...</string>
   <string id="13349">Scanează pentru conținut nou</string>
-  <string id="13350">În redare...</string>
+  <string id="13350">Acum în redare...</string>
   <string id="13351">Informații album</string>
   <string id="13352">Scanează în mediatecă</string>
   <string id="13353">Oprește scanarea</string>
@@ -1222,7 +1222,7 @@
   <string id="13386">Folosește saltul bazat pe timp</string>
   <string id="13387">Model de numire pistă - dreapta</string>
   <string id="13388">Predefinit</string>
-  <string id="13389">Nu există predefiniri disponibile&#10;pentru această vizualizare</string>
+  <string id="13389">Nu există vizualizări predefinite disponibile</string>
   <string id="13390">Nu există setări disponibile&#10;pentru această vizualizare</string>
   <string id="13391">Scoate/Încarcă</string>
   <string id="13392">Folosește vizualizarea dacă se redă audio</string>
@@ -1256,7 +1256,7 @@
   <string id="13420">Elimină în siguranță</string>
   <string id="13421">VDPAU</string>
   <string id="13422">Pornește diapozitive de aici</string>
-  <string id="13423">Ține minte pentru această cale</string>
+  <string id="13423">Memorează pentru această cale</string>
   <string id="13424">Folosește obiecte de preîncărcare pixel</string>
   <string id="13425">Permite accelerare hardware (VDPAU)</string>
   <string id="13426">Permite accelerare hardware (VAAPI)</string>
@@ -1590,11 +1590,11 @@
   <string id="20012">Liste de redare video</string>
   <string id="20013">Doriți să lansați acest joc?</string>
   <string id="20014">Sortează după: Listă de redare</string>
-  <string id="20015">Afiș la distanță</string>
-  <string id="20016">Afiș curent</string>
-  <string id="20017">Afiș local</string>
-  <string id="20018">Niciun afiș</string>
-  <string id="20019">Alegere afiș</string>
+  <string id="20015">Imagine la distanță</string>
+  <string id="20016">Imagine curentă</string>
+  <string id="20017">Imagine locală</string>
+  <string id="20018">Nicio imagine</string>
+  <string id="20019">Alegere imagine</string>
 
   <!-- string id 20022 will always be set to an empty string (LocalizeStrings.cpp)-->
   <string id="20022"></string>
@@ -1627,7 +1627,7 @@
 
   <string id="20057">Elimină miniatură</string>
   <string id="20058">Adaugă profil...</string>
-  <string id="20059">Cere info pt. toate albumele</string>
+  <string id="20059">Obține info pt. toate albumele</string>
   <string id="20060">Informații media</string>
   <string id="20061">Separă</string>
   <string id="20062">Partajări implicite</string>
@@ -1762,7 +1762,7 @@
   <string id="20192">Descarcă informații adiționale în timpul actualizărilor</string>
   <string id="20193">Serviciu implicit pentru informații albume</string>
   <string id="20194">Serviciu implicit pentru informații artiști</string>
-  <string id="20195">Schimbă scraper</string>
+  <string id="20195">Schimbă catalogul</string>
   <string id="20196">Exportă mediateca audio</string>
   <string id="20197">Importă mediatecă</string>
   <string id="20198">Niciun artist găsit!</string>
@@ -1833,7 +1833,7 @@
   <string id="20350">voturi</string>
   <string id="20351">Informații serial</string>
   <string id="20352">Informații episod</string>
-  <string id="20353">Se descarcă informații serial</string>
+  <string id="20353">Încărcare informații serial</string>
   <string id="20354">Se obține ghid episoade</string>
   <string id="20355">Se descarcă informații pentru episoadele din director</string>
   <string id="20356">Selectați serial:</string>
@@ -1854,11 +1854,11 @@
   <string id="20371">Alegere afiș sezon</string>
   <string id="20372">Imagine sezon</string>
   <string id="20373">Sezon</string>
-  <string id="20374">Se descarcă informații film</string>
+  <string id="20374">Descărcare informații filme</string>
   <string id="20375">Eliminare atribuire conținut</string>
   <string id="20376">Titlu original</string>
-  <string id="20377">Reîmprospătează informații serial</string>
-  <string id="20378">Reîmprospătare informații pentru toate episoadele?</string>
+  <string id="20377">Actualizare informații serial</string>
+  <string id="20378">Actualizați informațiile pentru toate episoadele?</string>
   <string id="20379">Dosarul selectat conține un singur serial</string>
   <string id="20380">Exclude dosarul selectat la scanări</string>
   <string id="20381">Speciale</string>
@@ -1874,7 +1874,7 @@
   <string id="20391">Videoclip</string>
   <string id="20392">Eliminare videoclip din mediatecă</string>
   <string id="20393">Informații videoclip</string>
-  <string id="20394">Se descarcă informații videoclip</string>
+  <string id="20394">Încărcare informații videoclip</string>
   <string id="20395">Amestecat</string>
   <string id="20396">Du-te la albume după artist</string>
   <string id="20397">Du-te la album</string>
@@ -1883,13 +1883,13 @@
   <string id="20400">Du-te la videoclipuri după artist</string>
   <string id="20401">Redă videoclip</string>
   <string id="20402">Descarcă miniaturi actori la adăugare în mediatecă</string>
-  <string id="20403">Setează miniatură actor</string>
+  <string id="20403">Alege fotografie actor</string>
 
   <string id="20405">Elimină semn de carte episod</string>
   <string id="20406">Setează semn de carte episod</string>
   <string id="20407">Setări scraper</string>
-  <string id="20408">Se descarcă informații videoclip</string>
-  <string id="20409">Se descarcă informații serial</string>
+  <string id="20408">Descărcare informații videoclipuri</string>
+  <string id="20409">Descărcare informații serial</string>
   <string id="20410">Trailer</string>
   <string id="20411">Netezește</string>
   <string id="20412">Netezire seriale</string>
@@ -1915,7 +1915,7 @@
   <string id="20432">Exclude calea din actualizăriile mediatecii</string>
   <string id="20433">Extrage miniaturi și informații video</string>
   <string id="20434">Seturi</string>
-  <string id="20435">Setează miniatură set de filme</string>
+  <string id="20435">Alege miniatură set de filme</string>
   <string id="20436">Exportare miniaturi actor?</string>
   <string id="20437">Alegere Fanart</string>
   <string id="20438">Fanart local</string>
@@ -1934,6 +1934,8 @@
   <string id="20451">Țări</string>
   <string id="20452">episod</string>
   <string id="20453">episoade</string>
+  <string id="20454">Ascultător</string>
+  <string id="20455">Ascultători</string>
   <!-- up to 21329 is reserved for the video db !! !-->
 
   <string id="21330">Arată fișierele și directoarele ascunse</string>
@@ -2063,12 +2065,12 @@
   <string id="21829">Expunere</string>
   <string id="21830">Durată expunere</string>
   <string id="21831">Favorizare expunere</string>
-  <string id="21832">Mod expunere</string>
+  <string id="21832">Mod de expunere</string>
   <string id="21833">Bliț folosit</string>
-  <string id="21834">Balanță alb</string>
+  <string id="21834">Balanță de alb</string>
   <string id="21835">Sursă de lumină</string>
   <string id="21836">Mod măsurare</string>
-  <string id="21837">ISO</string>
+  <string id="21837">Viteză ISO</string>
   <string id="21838">Zoom digital</string>
   <string id="21839">Lățime CCD</string>
   <string id="21840">Latitudine GPS</string>
@@ -2083,26 +2085,26 @@
   <string id="21864">Titlu de ziar</string>
   <string id="21865">Instrucțiuni speciale</string>
   <string id="21866">Categorie</string>
-  <string id="21867">Byline</string>
-  <string id="21868">Titlu Byline</string>
-  <string id="21869">Credit</string>
+  <string id="21867">Autor</string>
+  <string id="21868">Titlu autor</string>
+  <string id="21869">Mulțumiri</string>
   <string id="21870">Sursă</string>
-  <string id="21871">Înștiițare drept de autor</string>
+  <string id="21871">Drept de autor</string>
   <string id="21872">Nume obiect</string>
   <string id="21873">Oraș</string>
   <string id="21874">Stat</string>
   <string id="21875">Țară</string>
   <string id="21876">Referință Tx originală</string>
-  <string id="21877">Data creării</string>
-  <string id="21878">Semnalizare cod de autor</string>
+  <string id="21877">Dată creare</string>
+  <string id="21878">Indicator drept de autor</string>
   <string id="21879">Cod țară</string>
   <string id="21880">Serviciu referință</string>
   <string id="21881">Permite controlul XBMC prin UPnP</string>
   <string id="21882">Încearcă să sari peste introducere înainte de meniul DVD</string>
   <string id="21883">Muzică salvată</string>
-  <string id="21884">Cere info pt. toți artiștii</string>
-  <string id="21885">Se descarcă informații album</string>
-  <string id="21886">Se descarcă informații artist</string>
+  <string id="21884">Obține info pt. toți artiștii</string>
+  <string id="21885">Descărcare informații albume</string>
+  <string id="21886">Descărcare informații artiști</string>
   <string id="21887">Biografie</string>
   <string id="21888">Discografie</string>
   <string id="21889">Se caută artist</string>
@@ -2125,8 +2127,8 @@
   <string id="22002">- Sufix DNS</string>
 
   <string id="22003">%2.3fs</string>
-  <string id="22004">În urmă cu: %2.3fs</string>
-  <string id="22005">În avans cu: %2.3fs</string>
+  <string id="22004">în urmă cu: %2.3fs</string>
+  <string id="22005">în avans cu: %2.3fs</string>
   <string id="22006">Decalaj subtitrare</string>
   <string id="22007">Furnizor OpenGL:</string>
   <string id="22008">Randor OpenGL:</string>
@@ -2185,7 +2187,7 @@
   <!-- strings 24000 thru 24299 reserved for the Add-ons framework -->
   <string id="24000">Supliment</string>
   <string id="24001">Suplimente</string>
-  <string id="24002">Opțiuni supliment</string>
+  <string id="24002">Opțiuni suplimente</string>
   <string id="24003">Informații supliment</string>
 
   <string id="24005">Surse media</string>
@@ -2207,7 +2209,7 @@
   <string id="24023">Supliment dezactivat</string>
   <string id="24027">Meteo</string>
   <string id="24028">Weather.com (standard)</string>
-  <string id="24030">Acest supliment nu poate fi configurat</string>
+  <string id="24030">Acest supliment nu poate fi configurat.</string>
   <string id="24031">Eroare la încărcarea setăriilor</string>
   <string id="24032">Toate suplimentele</string>
   <string id="24033">Obținere suplimente</string>
@@ -2231,11 +2233,11 @@
   <string id="24060">Doriți să dezactivați acest supliment?</string>
   <string id="24061">Actualizare supliment disponibilă!</string>
   <string id="24062">Suplimente activate</string>
-  <string id="24063">Actualiz. automată</string>
+  <string id="24063">Auto-actualizare</string>
   <string id="24064">Supliment activat</string>
   <string id="24065">Supliment actualizat</string>
   <string id="24066">Renunțați la descărcarea suplimentului?</string>
-  <string id="24067">Suplimente care se descarcă</string>
+  <string id="24067">Suplimente în descărcare</string>
   <string id="24068">Actualizare disponibilă</string>
   <string id="24069">Actualizează</string>
 

Modified: branches/Dharma/language/Ukrainian/langinfo.xml
===================================================================
--- branches/Dharma/language/Ukrainian/langinfo.xml	2010-11-23 22:36:43 UTC (rev 35438)
+++ branches/Dharma/language/Ukrainian/langinfo.xml	2010-11-23 22:40:19 UTC (rev 35439)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <language>
   <charsets>
-    <gui unicodefont="true">CP1251</gui>
-    <subtitle>CP1251</subtitle>
+    <gui unicodefont="false">CP1252</gui>
+    <subtitle>CP1252</subtitle>
   </charsets>
   <dvd>
     <menu>uk</menu>
@@ -10,12 +10,12 @@
     <subtitle>uk</subtitle>
   </dvd>
   <regions>
-    <region>
-      <dateshort>DD.MM.YYYY</dateshort>
-      <datelong>DDDD, D MMMM YYYY 'р.'</datelong>
+    <region name="Ukraine" locale="UA">
+      <dateshort>DD/MM/YYYY</dateshort>
+      <datelong>DDDD, D MMMM YYYY</datelong>
       <time symbolAM="" symbolPM="">H:mm:ss</time>
       <tempunit>C</tempunit>
-      <speedunit>mps</speedunit>
+      <speedunit>kmh</speedunit>
     </region>
   </regions>
 </language>

Modified: branches/Dharma/language/Ukrainian/strings.xml
===================================================================
--- branches/Dharma/language/Ukrainian/strings.xml	2010-11-23 22:36:43 UTC (rev 35438)
+++ branches/Dharma/language/Ukrainian/strings.xml	2010-11-23 22:40:19 UTC (rev 35439)
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!--Language file translated with Team XBMC Translator-->
-<!--Translator: TigerHeart [ua]-->
-<!--Email: admin@...>
-<!--Date of translation: 06/24/2009-->
+<!--Translator: Igor Shavrin-->
+<!--Email: i.shavrin@...>
+<!--Date of translation: 10/16/2010-->
 <!--$Revision$-->
-<!--Based on english strings version 21081-->
+<!--Based on english strings version 34640-->
 <strings>
   <string id="0">Програми</string>
   <string id="1">Фотографії</string>
@@ -34,6 +34,41 @@
   <string id="30">жовтня</string>
   <string id="31">листопада</string>
   <string id="32">грудня</string>
+  <string id="41">Пн</string>
+  <string id="42">Вт</string>
+  <string id="43">Ср</string>
+  <string id="44">Чт</string>
+  <string id="45">Пт</string>
+  <string id="46">Сб</string>
+  <string id="47">Нд</string>
+  <string id="51">Січ</string>
+  <string id="52">Лют</string>
+  <string id="53">Бер</string>
+  <string id="54">Квт</string>
+  <string id="55">Тра</string>
+  <string id="56">Чер</string>
+  <string id="57">Лип</string>
+  <string id="58">Срп</string>
+  <string id="59">Вер</string>
+  <string id="60">Жов</string>
+  <string id="61">Лст</string>
+  <string id="62">Гру</string>
+  <string id="71">Пн</string>
+  <string id="72">ПнПнСх</string>
+  <string id="73">ПнСх</string>
+  <string id="74">СхПнСх</string>
+  <string id="75">Сх</string>
+  <string id="76">СхПдСх</string>
+  <string id="77">ПдСх</string>
+  <string id="78">ПдПдСх</string>
+  <string id="79">Пд</string>
+  <string id="80">ПдПдЗах</string>
+  <string id="81">ПдЗах</string>
+  <string id="82">ЗахПдЗах</string>
+  <string id="83">Зах</string>
+  <string id="84">ЗахПнЗах</string>
+  <string id="85">ПнЗах</string>
+  <string id="86">ПнПнЗах</string>
   <string id="98">Вигляд: Авто.</string>
   <string id="99">Вигляд: Авто. Велик</string>
   <string id="100">Вигляд: Значки</string>
@@ -49,6 +84,8 @@
   <string id="110">Створити ескізи</string>
   <string id="111">Ярлики</string>
   <string id="112">ПАУЗА</string>
+  <string id="113">Помилка поновлення</string>
+  <string id="114">Помилка встановлення</string>
   <string id="115">Копіювати</string>
   <string id="116">Перемістити</string>
   <string id="117">Видалити</string>
@@ -86,6 +123,8 @@
   <string id="149">MAC-адреса</string>
   <string id="150">IP-адреса</string>
   <string id="151">З'єднання:</string>
+  <string id="152">Напівдуплекс</string>
+  <string id="153">Повний дуплекс</string>
   <string id="154">Диски</string>
   <string id="155">лоток DVD приводу</string>
   <string id="156">Вільно</string>
@@ -101,9 +140,10 @@
   <string id="166">Оформлення</string>
   <string id="167">Задіяти FTP сервер</string>
   <string id="168">Задіяти синхронізацію часу через Інтернет</string>
-  <string id="169">Дозвіл екрана</string>
+  <string id="169">Роздільна здатність екрану</string>
   <string id="170">Налаштувати частоту екрану</string>
   <string id="172">Дата випуску</string>
+  <string id="173">Показувати 4:3 відео як</string>
   <string id="175">Настрій</string>
   <string id="176">Стилі</string>
   <string id="179">Пісня</string>
@@ -113,6 +153,7 @@
   <string id="183">Огляд</string>
   <string id="184">Оновити</string>
   <string id="185">Пошук альбому</string>
+  <string id="186">Так</string>
   <string id="187">Альбомів не знайдено!</string>
   <string id="188">Вибрати все</string>
   <string id="189">Сканування інформації</string>
@@ -125,6 +166,7 @@
   <string id="196">Виберіть фільм:</string>
   <string id="197">Запит інформації з %s</string>
   <string id="198">Завантаження інформації про фільм</string>
+  <string id="199">Web інтерфейс</string>
   <string id="202">Девіз</string>
   <string id="203">Сюжет</string>
   <string id="205">Голосів:</string>
@@ -144,9 +186,8 @@
   <string id="221">Немає підключення до мережі</string>
   <string id="222">Відмінити</string>
   <string id="224">Тривалість показу слайда</string>
-  <string id="225">Тривалість ефекту зміни слайдів</string>
   <string id="226">Тестові шаблони...</string>
-  <string id="227">Шукати інформацію про аудио CD в Internet</string>
+  <string id="227">Шукати інформацію про аудіо CD в Internet</string>
   <string id="228">Перемішати плейлист при завантаженні</string>
   <string id="229">Зупиняти HDD через (хв)</string>
   <string id="230">Відео-фільтри</string>
@@ -160,12 +201,11 @@
   <string id="238">Збільшення</string>
   <string id="239">Очистити плейлист після програвання</string>
   <string id="240">Автопрогравання DVD-Video диска</string>
-  <string id="241">Автопрогравання VCD/SVCD диска</string>
-  <string id="242">Автопрогравання Audio-CD диска</string>
-  <string id="243">Автозапуск Xbox-гри</string>
-  <string id="244">Автопрогравання відеофайлів</string>
-  <string id="245">Автопрогравання аудіофайлів</string>
-  <string id="246">Автопоказ зображень</string>
+  <string id="241">На весь екран #%d</string>
+  <string id="242">У вікні</string>
+  <string id="243">Частота поновлення екрану</string>
+  <string id="244">На весь екран</string>
+  <string id="245">Масштабування: (%i,%i)-&gt;(%i,%i) (Збільш. x%2.2f) Співвідн.:%2.2f:1 (Пікс.: %2.2f:1)</string>
   <string id="247">Скрипти</string>
   <string id="248">Мова</string>
   <string id="249">Музика</string>
@@ -180,7 +220,7 @@
   <string id="259">Відкриття</string>
   <string id="261">Очікування старту...</string>
   <string id="262">Лог роботи скриптів</string>
-  <string id="263">Задіяти Web сервер</string>
+  <string id="263">Дозволити керування XBMC через HTTP</string>
   <string id="264">Запис</string>
   <string id="265">Зупинити запис</string>
   <string id="266">Сорт.по: Треку</string>
@@ -188,6 +228,7 @@
   <string id="268">Сорт.по: Назві</string>
   <string id="269">Сорт.по: Виконавцю</string>
   <string id="270">Сорт.по: Альбму</string>
+  <string id="271">Топ 100</string>
   <string id="272">Налаштування розмірів екрана (лівий верхній кут)</string>
   <string id="273">Налаштування розмірів екрана (правий нижній кут)</string>
   <string id="274">Позиція субтитрів</string>
@@ -205,7 +246,7 @@
   <string id="287">Субтитри</string>
   <string id="288">Шрифт</string>
   <string id="289">- розмір</string>
-  <string id="290">Стиснення динамічного диапазону</string>
+  <string id="290">Стиснення динамічного діапазону</string>
   <string id="291">Відео</string>
   <string id="292">Звук</string>
   <string id="293">Вкажіть субтитри</string>
@@ -213,10 +254,14 @@
   <string id="296">Очистити закладки</string>
   <string id="297">Затримка звуку</string>
   <string id="298">Закладки</string>
+  <string id="299">- виводити звук в форматі AAC </string>
+  <string id="300">- виводити звук в форматі MP1</string>
+  <string id="301">- виводити звук в форматі MP2</string>
+  <string id="302">- виводити звук в форматі MP3</string>
   <string id="303">Затримка субтитрів</string>
   <string id="304">Мова</string>
   <string id="305">Включено</string>
-  <string id="307">- автоматичний пост-процессінг</string>
+  <string id="307">- автоматична післяобробка</string>
   <string id="308">- вертикальний Deblocking-фільтр</string>
   <string id="309">- горизонтальний Deblocking-фільтр</string>
   <string id="310">- Авто яскравість/контрастність</string>
@@ -243,7 +288,7 @@
   <string id="331">Стиснення бази даних...</string>
   <string id="332">Помилка стискування бази даних</string>
   <string id="333">Ви хочете очистити Бібліотеку?</string>
-  <string id="334">Очищення Бібліотеки...</string>
+  <string id="334">Очистити Бібліотеку...</string>
   <string id="335">Старт</string>
   <string id="336">Перетворення частоти кадрів</string>
   <string id="337">Аудіо вихід</string>
@@ -256,7 +301,7 @@
   <string id="344">Актори</string>
   <string id="345">Рік</string>
   <string id="350">Програми</string>
-  <string id="351">відключено</string>
+  <string id="351">Вимкнено</string>
   <string id="352">Затемнення</string>
   <string id="353">Чорний екран</string>
   <string id="354">Сліди "Матриці"</string>
@@ -275,8 +320,8 @@
   <string id="367">Сорт.по: Рейтингу</string>
   <string id="369">Назва</string>
   <string id="370">грози</string>
-  <string id="371">місцями</string>
-  <string id="372">переважно</string>
+  <string id="371">Місцями</string>
+  <string id="372">Переважно</string>
   <string id="373">сонячно</string>
   <string id="374">хмарно</string>
   <string id="375">сніг</string>
@@ -295,9 +340,9 @@
   <string id="388">рано</string>
   <string id="389">рясний</string>
   <string id="390">шквали</string>
-  <string id="391">min</string>
-  <string id="392">med</string>
-  <string id="393">max</string>
+  <string id="391">низький</string>
+  <string id="392">помірний</string>
+  <string id="393">всиокий</string>
   <string id="394">туман</string>
   <string id="395">серпанок</string>
   <string id="396">Місцевість</string>
@@ -322,7 +367,9 @@
   <string id="415">Завантаження ескізів...</string>
   <string id="416">Не доступно</string>
   <string id="417">Вигляд: Великі значки</string>
-  <string id="418">Задіяти Бібліотеку</string>
+  <string id="418">Мін.</string>
+  <string id="419">Макс.</string>
+  <string id="420">Порт HDMI</string>
   <string id="422">Видалити дані про альбом</string>
   <string id="423">Видалити дані про CD</string>
   <string id="424">Вибір</string>
@@ -335,17 +382,19 @@
   <string id="431">Не кешувати</string>
   <string id="432">Видалити фільм із Бібліотеки</string>
   <string id="433">Дійсно видалити '%s'?</string>
+  <string id="434">%s Швидк. %i %s</string>
   <string id="437">З'ємний диск</string>
   <string id="438">Відкриття файла</string>
-  <string id="439">Кєш</string>
+  <string id="439">Кеш</string>
   <string id="440">Жорсткий диск</string>
   <string id="442">Локальна мережа</string>
+  <string id="443">Інтернет</string>
   <string id="444">Відео</string>
   <string id="445">Аудіо</string>
   <string id="447">Автопрогравання</string>
-  <string id="448">РК екран</string>
+  <string id="448">РК екран (LCD)</string>
   <string id="449">Включено</string>
-  <string id="450">Кількість знакомість в рядку</string>
+  <string id="450">Кількість знаків у рядку</string>
   <string id="451">Адреса 1-го рядка</string>
   <string id="452">Адреса 2-го рядка</string>
   <string id="453">Адреса 3-го рядка</string>
@@ -357,7 +406,7 @@
   <string id="460">Аудіо потік</string>
   <string id="461">[працює]</string>
   <string id="462">Субтитри</string>
-  <string id="463">Яскравість підсвічування</string>
+  <string id="463">Підсвічування</string>
   <string id="464">Яскравість</string>
   <string id="465">Контрастність</string>
   <string id="466">Гама</string>
@@ -384,9 +433,9 @@
   <string id="492">Масштабувати субтитри</string>
   <string id="493">Розширені опції (Тільки для експертів!)</string>
   <string id="494">Загальний рівень шуму в кімнаті (dB)</string>
-  <string id="495">Перераховувати відео до дозволу GUI</string>
+  <string id="495">Перераховувати відео до розд. зд. GUI</string>
   <string id="496">Калібрування</string>
-  <string id="497">Сховати тип в назвах файлів</string>
+  <string id="497">Показати розширення файлів</string>
   <string id="498">Сорт.по: Типу</string>
   <string id="499">Неможливо з'єднатися з пошуковим сервісом</string>
   <string id="500">Невдалося завантажити дані про альбом</string>
@@ -402,7 +451,6 @@
   <string id="513">Головне меню</string>
   <string id="514">Налаштування</string>
   <string id="515">Жанр</string>
-  <string id="516">Відображати архіви з одним файлом прозорими</string>
   <string id="517">Недавно прослухані альбоми</string>
   <string id="518">Запустити</string>
   <string id="519">Запустити в режимі…</string>
@@ -457,13 +505,15 @@
   <string id="571">За змовчуванням</string>
   <string id="572">Кіностудія</string>
   <string id="573">Шлях</string>
+  <string id="574">Країна</string>
+  <string id="575">В процесі</string>
   <string id="580">Напрямок сортування</string>
   <string id="581">Метод сортування</string>
   <string id="582">Режим перегляду</string>
   <string id="583">Пам'ятати параметри відображення кожної папки</string>
   <string id="584">За зростанням</string>
   <string id="585">За убуванням</string>
-  <string id="586">Виправити плейлист</string>
+  <string id="586">Редагувати плейлист</string>
   <string id="587">Фільтр</string>
   <string id="588">Відключити режим 'Вечірка'</string>
   <string id="589">Режим 'Вечірка'</string>
@@ -475,18 +525,20 @@
   <string id="595">Повтор: Вимкнено</string>
   <string id="596">Повтор: Один трек</string>
   <string id="597">Повтор: Усі треки</string>
-  <string id="600">Оцифрувати Audio CD</string>
+  <string id="600">Зберегти з Audio CD</string>
   <string id="601">Середня</string>
   <string id="602">Стандартна</string>
   <string id="603">Екстремальна</string>
-  <string id="604">Постійний BitRate</string>
-  <string id="605">Оцифровка...</string>
+  <string id="604">Постійний бітрейт</string>
+  <string id="605">Збереження...</string>
   <string id="607">У:</string>
-  <string id="608">Оцифровка CD чи треку неможлива</string>
+  <string id="608">Збереження CD чи треку неможлива</string>
   <string id="609">Не зазначено значення CDDARipPath</string>
-  <string id="610">Оцифрувати аудіо трек</string>
+  <string id="610">Зберегти аудіо трек</string>
   <string id="611">Впишіть номер</string>
-  <string id="620">Оцифровка CD</string>
+  <string id="612">Біт/відлік</string>
+  <string id="613">Частота відліків</string>
+  <string id="620">Аудіо CD</string>
   <string id="621">Кодувальник</string>
   <string id="622">Якість</string>
   <string id="623">Бітрейт</string>
@@ -522,20 +574,22 @@
   <string id="656">Вкажіть плейлист</string>
   <string id="657">Вкажіть папку</string>
   <string id="658">Інформація про пісню</string>
-  <string id="660">Посилювання звуку</string>
+  <string id="659">Нелінійний розтяг</string>
+  <string id="660">Підсилення звуку</string>
   <string id="661">Виберіть папку для експорту</string>
   <string id="662">Цей файл більше недоступний.</string>
   <string id="663">Хочете видалити його з Бібліотеки?</string>
+  <string id="664">Вказати скрипт</string>
+  <string id="665">Рівень стиску</string>
   <string id="700">Очищення Бібліотеки</string>
   <string id="701">Видалення старих пісень з Бібліотеки</string>
   <string id="702">Ця папка вже була просканована раніше</string>
   <string id="705">Мережа</string>
-  <string id="706">Адреса HTTP proxy сервера</string>
-  <string id="707">Порт HTTP proxy сервера</string>
+  <string id="706">Адреса HTTP проксі сервера</string>
   <string id="708">Використовувати HTTP proxy сервер</string>
-  <string id="709">Ім'я користувача для HTTP proxy сервера</string>
-  <string id="710">Пароль користувача для HTTP proxy сервера</string>
+  <string id="711">Інтернет протокол (IP)</string>
   <string id="712">Неправильний порт. Повинно бути від 1 до 65535.</string>
+  <string id="713">HTTP проксі</string>
   <string id="715">- Призначення</string>
   <string id="716">автоматично (DHCP)</string>
   <string id="717">вручну (Static)</string>
@@ -551,10 +605,10 @@
   <string id="727">Web сервер</string>
   <string id="728">FTP сервер</string>
   <string id="729">Час за Інтернетом</string>
-  <string id="730">Порт для Web сервера</string>
+  <string id="730">- Порт</string>
   <string id="731">Адреса серверу часу</string>
   <string id="732">Зберегти і застосувати</string>
-  <string id="733">Пароль для Web сервера</string>
+  <string id="733">- Пароль</string>
   <string id="734">без пароля</string>
   <string id="735">- набір символів</string>
   <string id="736">- стиль</string>
@@ -584,10 +638,8 @@
   <string id="763">світло-зелений</string>
   <string id="764">жовто-зелений</string>
   <string id="765">блакитний</string>
-  <string id="766">зарезервовано</string>
-  <string id="767">зарезервовано</string>
-  <string id="768">зарезервовано</string>
-  <string id="769">зарезервовано</string>
+  <string id="766">Світло-сірий</string>
+  <string id="767">Сірий</string>
   <string id="770">Помилка %і: ресурс не доступний</string>
   <string id="771">- дотримуватися обмежень файлової системи FATx</string>
   <string id="772">Аудіо обладнання</string>
@@ -602,17 +654,20 @@
   <string id="784">Застосування налаштувань мережевого інтерфейсу. Зачекайте.</string>
   <string id="785">Мережевий інтерфейс перезапущено</string>
   <string id="786">Мережевий інтерфейс не запустився</string>
-  <string id="787">Інтерфейс відключено</string>
+  <string id="787">Інтерфейс вимкнено</string>
   <string id="788">Мережевий інтерфейс відключено</string>
   <string id="789">Ім'я бездротової мережі (ESSID)</string>
-  <string id="790">Сервер подій</string>
-  <string id="791">Задіяти Сервер подій</string>
+  <string id="791">Дозволити програмам на цьому комп’ютері керувати XBMC</string>
   <string id="792">Порт</string>
   <string id="793">Діапазон портів</string>
-  <string id="794">Дозволити іншим комп'ютерам підключатися</string>
+  <string id="794">Дозволити програмам на інших комп'ютерах керувати XBMC</string>
   <string id="795">Затримка начального повтору (мс)</string>
   <string id="796">Затримка послідуючих повторів (мс)</string>
   <string id="797">Максимальна кількість клієнтів</string>
+  <string id="798">Доступ в інтернет</string>
+  <string id="850">Введено неправильний номер проту</string>
+  <string id="851">Номер порту має бути в діапазоні 1-65535</string>
+  <string id="852">Номер порту має бути в діапазоні 1024-65536</string>
   <string id="1000">Подивитися заставку</string>
   <string id="1001">Неможливо підключитися</string>
   <string id="1002">XBMC неспроможний підключитися до мережі.</string>
@@ -627,7 +682,7 @@
   <string id="1012">Доступна папка</string>
   <string id="1013">Порт</string>
   <string id="1014">Ім'я користувача</string>
-  <string id="1015">Вкажіть мережовий сервер</string>
+  <string id="1015">Вкажіть мережевий сервер</string>
   <string id="1016">Впишіть мережеву адресу сервера</string>
   <string id="1017">Впишіть шлях на сервері</string>
   <string id="1018">Впишіть номер порту</string>
@@ -650,18 +705,19 @@
   <string id="1035">Дозволити пункти в підменю</string>
   <string id="1036">Вибране</string>
   <string id="1037">Відео додатки</string>
-  <string id="1038">Музикальні додатки</string>
+  <string id="1038">Музичні додатки</string>
   <string id="1039">Фото додатки</string>
   <string id="1040">Завантаження папки</string>
-  <string id="1041">Відновлено %i об'ект(ів)</string>
-  <string id="1042">Відновлено %i з %i об'ект(ів)</string>
+  <string id="1041">Отримано %i об'ект(ів)</string>
+  <string id="1042">Отримано %i з %i об'ект(ів)</string>
   <string id="1043">Програмні додатки</string>
   <string id="1044">Встановити ескіз для додатка</string>
   <string id="1045">Налаштування додатка</string>
   <string id="1046">Крапки доступу</string>
   <string id="1047">Різне...</string>
-  <string id="1048">Ім'я користувача для WEB серверу</string>
+  <string id="1048">- Ім'я користувача</string>
   <string id="1049">Налаштування скриптів</string>
+  <string id="1051">Введіть web адресу</string>
   <string id="1200">SMB клієнт</string>
   <string id="1202">Робоча група</string>
   <string id="1203">Ім'я користувача за змовчуванням</string>
@@ -702,6 +758,7 @@
   <string id="1255">Відправляти логін і пароль для FTP</string>
   <string id="1256">Інтервал для команди 'ping'</string>
   <string id="1257">Ви хочете під'єднатися до знайденої системи?</string>
+  <string id="1260">Повідомляти іншим комп’ютерам про ці сервіси через Zeroconf</string>
   <string id="1396">ожеледь</string>
   <string id="1397">і</string>
   <string id="1398">замерзання</string>
@@ -728,7 +785,9 @@
   <string id="1419">Грозові зливи</string>
   <string id="1450">Дозволити енергозбереження під час бездії</string>
   <string id="2050">Тривалість</string>
-  <string id="4501">Тип РК екрану</string>
+  <string id="2100">Помилка скрипта! : %s</string>
+  <string id="2101">Потрібна новіша версія- Див log</string>
+  <string id="4501">Задіяти LCD/VFD</string>
   <string id="10000">Основний</string>
   <string id="10001">Програми</string>
   <string id="10002">Фотографії</string>
@@ -799,7 +858,6 @@
   <string id="12021">Починати з початку</string>
   <string id="12022">Продовжувати з %s</string>
   <string id="12023">Перевірка існуючих трейнерів...</string>
-  <string id="12024">Автоматично створювати ескізи для відео без обкладинки</string>
   <string id="12325">Заблоковано! Впишіть код...</string>
   <string id="12326">Впишіть пароль</string>
   <string id="12327">Введіть код захисту</string>
@@ -859,21 +917,26 @@
   <string id="13005">Вимикання</string>
   <string id="13006">Завантажити Dashboard</string>
   <string id="13007">Особливий шлях до dashboard</string>
-  <string id="13008">Режим завершення роботи</string>
+  <string id="13008">Завершити роботу і вимкнути</string>
   <string id="13009">Вихід</string>
+  <string id="13010">Зберегти сеанс на диск і вимкнути</string>
+  <string id="13011">Призупинити</string>
   <string id="13012">Вихід із</string>
   <string id="13013">Перезавантаження</string>
   <string id="13014">Згорнути</string>
+  <string id="13015">Дія кнопки живлення</string>
+  <string id="13016">Вимкнути комп’ютер</string>
   <string id="13020">Активна інша сессія, можливо через SSH?</string>
   <string id="13021">Під'єднано переносний жорсткий диск</string>
   <string id="13022">Небезпечне видалення пристрою</string>
   <string id="13023">Пристрій від'єднано успішно</string>
   <string id="13024">Джойстик підключено</string>
   <string id="13025">Джойстик відключено</string>
+  <string id="13050">Низький заряд батареї</string>
   <string id="13100">Рівень зменшення мерехтіння</string>
-  <string id="13101">За вибором драйверу (перезавантажити)</string>
-  <string id="13105">Вертикальна синхронізація</string>
-  <string id="13106">Відключено</string>
+  <string id="13101">За виб. драйверу (перезав.)</string>
+  <string id="13105">Вертик. синхронізація</string>
+  <string id="13106">Вимкнено</string>
   <string id="13107">Тільки при програванні відео</string>
   <string id="13108">Включено завжди</string>
   <string id="13109">Перевірка відеорежиму</string>
@@ -885,7 +948,8 @@
   <string id="13115">Включено завжди</string>
   <string id="13116">Метод масштабування</string>
   <string id="13120">Strict Pixmap-Texture Binding (перезавантажити)</string>
-  <string id="13130">Гасіння екрану</string>
+  <string id="13122">Перетворення кольорів VDPAU Studio</string>
+  <string id="13130">Погасити інші екрани</string>
   <string id="13131">Відключено</string>
   <string id="13132">Погасити екрани</string>
   <string id="13140">Знайдено активне з'єднання!</string>
@@ -936,16 +1000,15 @@
   <string id="13252">Перемістити об'єкт сюди</string>
   <string id="13253">Відмінити переміщення</string>
   <string id="13270">Обладнання:</string>
-  <string id="13271">Загруженість CPU:</string>
+  <string id="13271">Завантаженість CPU:</string>
   <string id="13274">Підключено, але DNS сервер недоступний.</string>
   <string id="13275">Жорсткий диск</string>
   <string id="13276">Привід DVD</string>
   <string id="13277">Накопичувачі</string>
-  <string id="13278">Загальне</string>
+  <string id="13278">Стандартне</string>
   <string id="13279">Мережа</string>
   <string id="13280">Відео</string>
   <string id="13281">Обладнання</string>
-  <string id="13282">_</string>
   <string id="13283">Операційна система:</string>
   <string id="13284">Частота CPU:</string>
   <string id="13285">Знайдено BIOS:</string>
@@ -953,7 +1016,7 @@
   <string id="13287">Відеорежим:</string>
   <string id="13288">Версія Xbox:</string>
   <string id="13289">Серійний № Xbox:</string>
-  <string id="13290">Виготівник Xbox:</string>
+  <string id="13290">Виробник Xbox:</string>
   <string id="13291">MOD-чіп:</string>
   <string id="13292">Кабель A/V:</string>
   <string id="13293">Регіон для відео та XBE:</string>
@@ -1007,7 +1070,7 @@
   <string id="13342">помаранчевий</string>
   <string id="13343">червоний</string>
   <string id="13344">усі кольори по черзі</string>
-  <string id="13345">Вимикати при програванні</string>
+  <string id="13345">Вимикати LED при програванні</string>
   <string id="13346">Інформація про фільм</string>
   <string id="13347">Додати в плейлист</string>
   <string id="13348">Знайти в IMDb...</string>
@@ -1058,33 +1121,44 @@
   <string id="13406">Дані про фотографію</string>
   <string id="13407">%s перед-налаштування</string>
   <string id="13408">(Рейтинг користувачів IMDb)</string>
+  <string id="13409">Топ 250</string>
   <string id="13410">Налаштуватися на Last.fm</string>
   <string id="13411">Мінімальна швидкість вентиляторів</string>
-  <string id="13412">- RSS-новини містять текст зправа-наліво</string>
-  <string id="13413">Загрузка</string>
-  <string id="13414">Ховати виконавців, які з'являються тільки у збірках</string>
+  <string id="13413">Завантаження</string>
+  <string id="13414">Ховати виконавців, які з'являються лише у збірках</string>
   <string id="13415">Метод обробки</string>
   <string id="13416">Авто-визначення</string>
   <string id="13417">Основні шейдери (ARB)</string>
-  <string id="13418">Додаткові шейдери (GLSL)</string>
+  <string id="13418">Розширені шейдери (GLSL)</string>
   <string id="13419">Програмний</string>
   <string id="13420">Видалити безпечно</string>
+  <string id="13422">Почати показ слайдів звідси</string>
+  <string id="13423">Запам’ятати для цього шляху</string>
+  <string id="13424">Використовувати об’єкти піксельних буферів</string>
+  <string id="13425">Дозволити апаратне прискорення (VDPAU)</string>
+  <string id="13426">Дозволити апаратне прискорення (VAAPI)</string>
+  <string id="13427">Дозволити апаратне прискорення (DXVA2)</string>
+  <string id="13428">Дозволити апаратне прискорення (CrystalHD)</string>
+  <string id="13429">Дозволити апаратне прискорення (VDADecoder)</string>
+  <string id="13430">Дозволити апаратне прискорення (OpenMax)</string>
+  <string id="13431">Піксельні шейдери</string>
   <string id="13500">Метод синхронізації A/V</string>
   <string id="13501">по частоті звуку</string>
   <string id="13502">по частоті відео (пропускати / дублювати звук)</string>
-  <string id="13503">по частоті відео (перетворювати звук)</string>
+  <string id="13503">по частоті відео (перетв. звук)</string>
   <string id="13504">Максимальна величина перетворення (%)</string>
   <string id="13505">Якість перетворення</string>
-  <string id="13506">Низька</string>
+  <string id="13506">Низька (швидко)</string>
   <string id="13507">Середня</string>
   <string id="13508">Висока</string>
-  <string id="13509">Дійсно висока</string>
+  <string id="13509">Дійсно висока (повільно!)</string>
   <string id="13510">Синхронізувати з частотою екрану</string>
+  <string id="13550">Призупиняти при зміні частоти оновлення</string>
+  <string id="13551">Вимкн.</string>
   <string id="13600">Пульт Apple</string>
-  <string id="13601">Режим</string>
   <string id="13602">Працює завжди</string>
   <string id="13603">Час затримки послідовності</string>
-  <string id="13610">Відключено</string>
+  <string id="13610">Вимкнено</string>
   <string id="13611">Стандартний</string>
   <string id="13612">Універсальний пульт</string>
   <string id="13613">Мульти-пульт (Harmony)</string>
@@ -1123,15 +1197,14 @@
   <string id="14034">Кеш для файлів DVD-Video: - з DVD диска</string>
   <string id="14035">- з локальної мережі</string>
   <string id="14036">Сервери</string>
-  <string id="14037">Зовнішній вигляд</string>
   <string id="14038">Налаштування локальної мережі змінені</string>
-  <string id="14039">Для вступу змін з силу, потрібно</string>
+  <string id="14039">Для застосування змін мережевих параметрів, потрібне</string>
   <string id="14040">перезавантаження XBMC. Перезавантажити зараз?</string>
   <string id="14041">Пост-процессінг</string>
   <string id="14043">- Вимикати під час програвання</string>
-  <string id="14044">%i хвилин</string>
-  <string id="14045">%i секунд</string>
-  <string id="14046">%i мілісекунд</string>
+  <string id="14044">%i хв.</string>
+  <string id="14045">%i сек.</string>
+  <string id="14046">%i мсек.</string>
   <string id="14047">%i %%</string>
   <string id="14048">%i кб/сек</string>
   <string id="14049">%i кб</string>
@@ -1139,7 +1212,6 @@
   <string id="14051">Формат часу</string>
   <string id="14052">Формат дати</string>
   <string id="14053">Фільтри інтерфейсу</string>
-  <string id="14054">Задіяти пошук в Інтернеті</string>
   <string id="14055">Сканувати у фоновому режимі</string>
   <string id="14056">Зупинити сканування</string>
   <string id="14057">Неможливо, поки скануються файли</string>
@@ -1162,8 +1234,22 @@
   <string id="14076">Додати до Вибраного</string>
   <string id="14077">Видалити з Вибраного</string>
   <string id="14078">- Колір</string>
-  <string id="14079">Країна у часовому поясі</string>
+  <string id="14079">Країна</string>
   <string id="14080">Часовий пояс</string>
+  <string id="14081">Списки файлів</string>
+  <string id="14082">Показати EXIF інформацію зображення</string>
+  <string id="14083">Використовувати повноекранне вікно замість справжнього повноекранного режиму</string>
+  <string id="14084">Додавати треки у чергу при виборі</string>
+  <string id="14085">Автоматично програвати аудіо CD диски</string>
+  <string id="14086">Програвання</string>
+  <string id="14088">Автоматично програвати DVD диски</string>
+  <string id="14089">Шрифт для текстових субтитрів</string>
+  <string id="14090">Мова та регіон</string>
+  <string id="14091">Кодування символів</string>
+  <string id="14092">Відлагодження</string>
+  <string id="14093">Безпека</string>
+  <string id="14094">Пристрої вводу</string>
+  <string id="14095">Енергозбереження</string>
   <string id="15015">Прибрати</string>
   <string id="15016">Ігри</string>
   <string id="15019">Додати</string>
@@ -1174,7 +1260,6 @@
   <string id="15103">* Усі артисти</string>
   <string id="15104">* Усі пісні</string>
   <string id="15105">* Усі жанри</string>
-  <string id="15106">Запам'ятати обраний файл при навігації</string>
   <string id="15107">Буфериуеться...</string>
   <string id="15108">Звуки інтерфейсу</string>
   <string id="15109">Стандартне оформлення</string>
@@ -1256,7 +1341,6 @@
   <string id="15310">Відкриття кілька-шляхового джерела</string>
   <string id="15311">Шлях:</string>
   <string id="16000">Основний</string>
-  <string id="16001">Налаштування звукового обладнання...</string>
   <string id="16002">Пошук в Інтернеті</string>
   <string id="16003">Програвач</string>
   <string id="16004">Програти файл з диска</string>
@@ -1278,6 +1362,7 @@
   <string id="16026">Програвання плейлиста перервано</string>
   <string id="16027">Занадто багато послідовних помилок</string>
   <string id="16028">Впишіть значення</string>
+  <string id="16029">Деталі можна продовитися у файлі журналу</string>
   <string id="16030">Режим 'Вечірки' перервано.</string>
   <string id="16031">Немає відповідних пісень в Бібліотеці.</string>
   <string id="16032">Не можу ініцюювати Базу Даних.</string>
@@ -1314,13 +1399,15 @@
   <string id="16312">(VDPAU) Зменшення шумів</string>
   <string id="16313">(VDPAU) Чіткість</string>
   <string id="16314">Зворотній Telecine</string>
+  <string id="16316">Авто</string>
+  <string id="16400">Післяобробка</string>
   <string id="17500">Переключення екрану в сплячий режим через</string>
-  <string id="20000">Папка для оцифровки AudioCD</string>
+  <string id="19000">Перемикнути на канал</string>
+  <string id="20000">Папка для збереження з аудіо CD</string>
   <string id="20001">Використовувати зовнішній DVD-програвач</string>
   <string id="20002">Зовнішній DVD-програвач</string>
   <string id="20003">Папка для трейнерів</string>
   <string id="20004">Папка для скріншотів</string>
-  <string id="20005">Папка для записів</string>
   <string id="20006">Папка для плейлистів</string>
   <string id="20007">Записи</string>
   <string id="20008">Скріншоти</string>
@@ -1340,6 +1427,7 @@
   <string id="20024">Сканувати нове</string>
   <string id="20025">Сканувати все</string>
   <string id="20026">Регіон</string>
+  <string id="20037">Підсумок</string>
   <string id="20038">Заблокувати розділ Музика</string>
   <string id="20039">Заблокувати розділ Відео</string>
   <string id="20040">Заблокувати розділ Фотографії</string>
@@ -1498,10 +1586,17 @@
   <string id="20250">Вечірка почалася! (Відео)</string>
   <string id="20251">Змішування напоїв (Відео)</string>
   <string id="20252">Наповнювання келихів (Відео)</string>
+  <string id="20253">WebDAV сервер (HTTP)</string>
+  <string id="20254">WebDAV сервер (HTTPS)</string>
+  <string id="20255">Це перший вхід, відредагуйте свій профіль</string>
+  <string id="20256">HTS Tvheadend клієнт</string>
+  <string id="20257">VDR Streamdev клієнт</string>
+  <string id="20258">MythTV клієнт</string>
   <string id="20300">Папка Web сервера (HTTP)</string>
   <string id="20301">Папка Web-сервера (HTTPS)</string>
   <string id="20302">Неможливо записати у папку:</string>
   <string id="20303">Хочете пропустити і продовжити далі?</string>
+  <string id="20304">RSS канал</string>
   <string id="20306">Невідомо. Додайте сигнатуру MD5 з xbmc.log в BiosIDs.ini</string>
   <string id="20307">Вторинний DNS</string>
   <string id="20308">Сервер DHCP:</string>
@@ -1612,9 +1707,8 @@
   <string id="20416">Перший переданий</string>
   <string id="20417">Автор сценарію</string>
   <string id="20418">Очищати імена файлів і папок</string>
-  <string id="20419">Групувати однакові серіали</string>
   <string id="20420">Ніколи</string>
-  <string id="20421">Тільки якщо один сезон</string>
+  <string id="20421">Лише якщо один сезон</string>
   <string id="20422">Завжди</string>
   <string id="20423">Є трейлер</string>
   <string id="20424">Брехня</string>
@@ -1627,6 +1721,16 @@
   <string id="20431">Перезаписати старі файли?</string>
   <string id="20432">Виключити шлях з оновлень Бібліотеки</string>
   <string id="20433">Видобути мета-данні з медіафайлу</string>
+  <string id="20443">Ви хочете оновити інформацію для всіх</string>
+  <string id="20444">об’єктів у цьому шляху?</string>
+  <string id="20446">Знайдено локально збережену інформацію.</string>
+  <string id="20447">Ігнорувати і оновити з інтернету?</string>
+  <string id="20448">Не вдалося завантажити інформацію</string>
+  <string id="20449">Не можливо приєднатися до віддаленого серверу</string>
+  <string id="20450">Ви бажаєте продовжити сканування?</string>
+  <string id="20451">Країни</string>
+  <string id="20452">епізод</string>
+  <string id="20453">епізоди</string>
   <string id="21330">Показувати приховані файли і папки</string>
   <string id="21331">Кліент TuXbox</string>
   <string id="21332">УВАГА: Цільовий пристрій TuXbox знаходиться в режимі запису!</string>
@@ -1635,14 +1739,8 @@
   <string id="21335">Ви впевнені що хочете включити потік?</string>
   <string id="21336">Підключення до: %s</string>
   <string id="21337">Пристрій TuXbox</string>
-  <string id="21356">UPnP Музика</string>
-  <string id="21357">UPnP Відео</string>
-  <string id="21358">UPnP Фотографії</string>
   <string id="21359">Додати медіа ресурс...</string>
-  <string id="21360">Задіяти сервер UPnP</string>
-  <string id="21361">Керування UPnP музичними ресурсами</string>
-  <string id="21362">Керування UPnP відео ресурсами</string>
-  <string id="21363">Керування UPnP фото ресурсами</string>
+  <string id="21360">Поширювати бібліотеки музики і фільмів через UPnP</string>
   <string id="21364">Змінити медіа ресурс</string>
   <string id="21365">Видалити медіа ресурс</string>
   <string id="21366">Особлива папка для субтитрів</string>
@@ -1695,6 +1793,8 @@
   <string id="21414">Стандартний інфо-ресурс для серіалів</string>
   <string id="21415">Стандартний інфо-ресурс для музичного відео</string>
   <string id="21416">Дозволити виправлення, залежно від мови інфо-ресурсу</string>
+  <string id="21417">- Налаштування</string>
+  <string id="21418">Багатомовний</string>
   <string id="21420">Значення занадто велике</string>
   <string id="21421">Правило "розумного" плейлиста</string>
   <string id="21422">Вибрати об'єкти, в яких</string>
@@ -1718,6 +1818,17 @@
   <string id="21440">Домашня папка</string>
   <string id="21441">Кількість переглядів</string>
   <string id="21442">Назва епізоду</string>
+  <string id="21443">Роздільна здатність відео</string>
+  <string id="21444">Аудіо канали</string>
+  <string id="21445">Відео кодек</string>
+  <string id="21446">Аудіо кодек</string>
+  <string id="21447">Мова звукової доріжки</string>
+  <string id="21448">Мова субтитрів</string>
+  <string id="21449">Пульт дист. керування симулює натискання клавіш клавіатури</string>
+  <string id="21450">- редагувати</string>
+  <string id="21451">Необхідне підключення до інтернету</string>
+  <string id="21452">Отримати більше...</string>
+  <string id="21453">Коренева файлова система</string>
   <string id="21800">Назва файлу</string>
   <string id="21801">Шлях до файлу</string>
   <string id="21802">Розмір файлу</string>
@@ -1729,7 +1840,7 @@
   <string id="21808">Алгоритм JPEG</string>
   <string id="21820">Дата і час зйомки</string>
   <string id="21821">Опис</string>
-  <string id="21822">Виготівник фотоап-ту</string>
+  <string id="21822">Виробник фотоап-ту</string>
   <string id="21823">Модель фотоапарату</string>
   <string id="21824">EXIF нотатка</string>
   <string id="21825">Прошивка</string>
@@ -1770,9 +1881,9 @@
   <string id="21878">Признак авторського права</string>
   <string id="21879">Код країни</string>
   <string id="21880">Довідковий сервіс</string>
-  <string id="21881">Задіяти UPnP обробник</string>
+  <string id="21881">Дозволити керування XBMC через UPnP</string>
   <string id="21882">Намагатися пропускати вступ перед меню DVD диска</string>
-  <string id="21883">Оцифровані аудіо CD диски</string>
+  <string id="21883">Зкопійовані аудіо CD диски</string>
   <string id="21884">Дані про всіх виконавців</string>
   <string id="21885">Загрузка інформації про альбом</string>
   <string id="21886">Загрузка інформації про виконавця</string>
@@ -1797,7 +1908,7 @@
   <string id="22004">Затримано на: %2.3fs</string>
   <string id="22005">Випереджає на: %2.3fs</string>
   <string id="22006">Зміщення субтитрів</string>
-  <string id="22007">Виготівник OpenGL:</string>
+  <string id="22007">Виробник OpenGL:</string>
   <string id="22008">Обробник OpenGL:</string>
   <string id="22009">Версія OpenGL:</string>
   <string id="22010">Температура GPU:</string>
@@ -1811,23 +1922,150 @@
   <string id="22018">Канали прямої трансляції</string>
   <string id="22019">Записи по назві</string>
   <string id="22020">Керівництво</string>
+  <string id="22021">Дозволена похибка у співвідношенні сторін для зменшення чорних смуг</string>
+  <string id="22022">Показувати відеофайли у списках</string>
+  <string id="22023">Постачальник DirectX:</string>
+  <string id="22024">Версія Direct3D:</string>
   <string id="22030">Шрифт</string>
   <string id="22031">- Розмір</string>
   <string id="22032">- Кольори</string>
   <string id="22033">- Набір символів</string>
-  <string id="22034">Експортувати лист пісень в форматі HTML</string>
-  <string id="22035">Експортувати лист пісень в форматі CSV</string>
-  <string id="22036">Імпортувати лист пісень...</string>
+  <string id="22034">Експортувати список караоке в форматі HTML</string>
+  <string id="22035">Експортувати список караоке в форматі CSV</string>
+  <string id="22036">Імпортувати список караоке...</string>
   <string id="22037">Автоматично спливаючий вибір пісень</string>
-  <string id="22038">Експортувати лист пісень...</string>
+  <string id="22038">Експортувати список караоке...</string>
   <string id="22039">Введіть номер пісні</string>
   <string id="22040">білий/зелений</string>
   <string id="22041">білий/червоний</string>
   <string id="22042">білий/синій</string>
   <string id="22043">чорний/білий</string>
-  <string id="23000">Додаток погоди</string>
-  <string id="23001">- Налаштування додатка</string>
+  <string id="22079">Дія за замовчуванням при виборі</string>
+  <string id="22080">Вибрати</string>
+  <string id="22081">Показати інформацію</string>
+  <string id="22082">Більше...</string>
+  <string id="22083">Програти все</string>
+  <string id="23049">Телетекст недоступний</string>
+  <string id="23050">Ввімкнути телетекст</string>
+  <string id="23051">Частина %i</string>
+  <string id="23052">Буферизація... %i байт</string>
+  <string id="23053">Припинення...</string>
+  <string id="23054">Виконання...</string>
+  <string id="23100">Зовнішній програвач активний</string>
+  <string id="23101">Натисніть OK для закриття програвача</string>
+  <string id="23104">Натисніть ОК коли програвання завершиться</string>
+  <string id="24000">Додаток</string>
+  <string id="24001">Додатки</string>
+  <string id="24002">Параметри додатків</string>
+  <string id="24003">Інформація про додаток</string>
+  <string id="24005">Джерела медіа</string>
+  <string id="24007">Інформація про фільм</string>
+  <string id="24008">Зберігач екрану</string>
+  <string id="24009">Скрипт</string>
+  <string id="24011">Репозиторій додатків</string>
+  <string id="24012">Субтитри</string>
+  <string id="24013">Тексти пісень</string>
+  <string id="24016">Інформація про альбом</string>
+  <string id="24017">Інформація про виконавця</string>
+  <string id="24020">Налаштувати</string>
+  <string id="24021">Вимкнути</string>
+  <string id="24022">Увімкнути</string>
+  <string id="24023">Додаток вимкнений</string>
+  <string id="24027">Погода</string>
+  <string id="24028">Weather.com (за замовчуванням)</string>
+  <string id="24030">Цей додаток не можна налаштувати</string>
+  <string id="24031">Помилка завантаження налаштувань</string>
+  <string id="24032">Всі додатки</string>
+  <string id="24033">Отримати додатки</string>
+  <string id="24034">Перевірити наявність оновлень</string>
+  <string id="24035">Примусове оновлення</string>
+  <string id="24036">Журнал змін</string>
+  <string id="24037">Видалити</string>
+  <string id="24038">Встановити</string>
+  <string id="24039">Вимкнені додатки</string>
+  <string id="24040">(Очистити поточні налаштування)</string>
+  <string id="24041">Встановити із zip файлу</string>
+  <string id="24042">Завантаження....  %i%%</string>
+  <string id="24043">Доступні оновлення</string>
+  <string id="24050">Доступні додатки</string>
+  <string id="24051">Версія:</string>
+  <string id="24053">Ліцензія:</string>
+  <string id="24054">Журнал змін</string>
+  <string id="24059">Увімкнути цей додаток?</string>
+  <string id="24060">Вимкнути цей додаток?</string>
+  <string id="24061">Доступне оновлення додатку!</string>
+  <string id="24062">Ввімкнені додатки</string>
+  <string id="24063">Автооновлення</string>
+  <string id="24064">Додаток активований</string>
+  <string id="24065">Додаток оновлений</string>
+  <string id="24066">Відмінити завантаження додатку?</string>
+  <string id="24067">Додатки які зараз завантажуються</string>
+  <string id="24068">Доступне оновлення</string>
+  <string id="24069">Оновлення</string>
+  <string id="24070">Неможливо завантажити додаток</string>
+  <string id="24071">Виникла невідома помилка</string>
+  <string id="24072">Потрібно налаштувати</string>
+  <string id="24073">Неможливо під’єднатися</string>
+  <string id="24074">Потрбно перезавантажити</string>
+  <string id="24075">Вимкнути</string>
+  <string id="24080">Спробувати під’єднатися знову?</string>
+  <string id="24090">Заблокувати менеджер додатків</string>
+  <string id="24096">Додаток був позначений у репозиторії як зламаний.</string>
+  <string id="24097">Вимкнути його у вашій системі?</string>
+  <string id="24098">Зламаний</string>
   <string id="29800">Режим Бібліотеки</string>
   <string id="29801">Клавіатура QWERTY</string>
   <string id="29999">Задіяти фільтр для усунення мерехтіння в іграх</string>
-</strings>
\ No newline at end of file
+  <string id="33001">Якість трейлеру</string>
+  <string id="33002">Потік</string>
+  <string id="33003">Завантаження</string>
+  <string id="33004">Завантажити і програти</string>
+  <string id="33005">Завантажити і зберегти</string>
+  <string id="33006">Сьогодні</string>
+  <string id="33007">Завтра</string>
+  <string id="33008">Збереження</string>
+  <string id="33009">Копіювання</string>
+  <string id="33010">Вкажіть папку завантаження</string>
+  <string id="33011">Період пошуку</string>
+  <string id="33012">Короткий</string>
+  <string id="33013">Довгий</string>
+  <string id="33015">Запитати про завантаження перед програванням відео</string>
+  <string id="33016">Кліпи</string>
+  <string id="33017">Перезавантажити додаток для активації</string>
+  <string id="33018">Вночі</string>
+  <string id="33019">Сьогодні вночі</string>
+  <string id="33020">Умови</string>
+  <string id="33027">Схід сонця</string>
+  <string id="33028">Захід сонця</string>
+  <string id="33029">Подробиці</string>
+  <string id="33032">Перекласти текст</string>
+  <string id="33035">Мапи</string>
+  <string id="33036">Щогодини</string>
+  <string id="33037">Щотижня</string>
+  <string id="33038">%s днів</string>
+  <string id="33049">Сигнал</string>
+  <string id="33050">Сигнали</string>
+  <string id="33053">Налаштувати</string>
+  <string id="33054">Сезони</string>
+  <string id="33059">Налаштувати</string>
+  <string id="33061">Меню</string>
+  <string id="33062">Програти</string>
+  <string id="33063">Параметри</string>
+  <string id="33065">Редактор</string>
+  <string id="33068">Фон</string>
+  <string id="33069">Фони</string>
+  <string id="33070">Власний фон</string>
+  <string id="33071">Власні фони</string>
+  <string id="33072">Переглянути Readme</string>
+  <string id="33073">Переглянути журнал змін</string>
+  <string id="33074">Для запуску ця версія %s вимагає</string>
+  <string id="33075">XBMC  випуску %s або новіший.</string>
+  <string id="33076">Будь-ласка, оновіть XBMC.</string>
+  <string id="33077">Інформацію не знайдено!</string>
+  <string id="33078">Наступна сторінка</string>
+  <string id="33079">Подобається</string>
+  <string id="33080">Неподобається</string>
+  <string id="33082">Шлях до скрипту</string>
+  <string id="33083">Ввімкнути кнопку власного скрипта</string>
+  <string id="34100">Конфігурація гучномовців</string>
+</strings>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 35487
          http://xbmc.svn.sourceforge.net/xbmc/?rev=35487&view=rev
Author:   theuni
Date:     2010-11-27 17:46:55 +0000 (Sat, 27 Nov 2010)

Log Message:
-----------
changed: ditch libshout and replace with curl-based code

Fixed up Backport of r35468.

Modified Paths:
--------------
    branches/Dharma/Makefile.in
    branches/Dharma/XBMC.xcodeproj/project.pbxproj
    branches/Dharma/configure.in
    branches/Dharma/project/VS2008Express/XBMC for Windows.sln
    branches/Dharma/project/VS2008Express/XBMC.vcproj
    branches/Dharma/project/VS2010Express/XBMC for Windows.sln
    branches/Dharma/project/VS2010Express/XBMC.vcxproj
    branches/Dharma/project/VS2010Express/XBMC.vcxproj.filters
    branches/Dharma/xbmc/FileSystem/FileCurl.cpp
    branches/Dharma/xbmc/FileSystem/FileCurl.h
    branches/Dharma/xbmc/FileSystem/FileShoutcast.cpp
    branches/Dharma/xbmc/FileSystem/FileShoutcast.h
    branches/Dharma/xbmc/FileSystem/Makefile.in
    branches/Dharma/xbmc/cores/paplayer/PAPlayer.cpp
    branches/Dharma/xbmc/cores/paplayer/PAPlayer.h

Removed Paths:
-------------
    branches/Dharma/xbmc/FileSystem/ShoutcastRipFile.cpp
    branches/Dharma/xbmc/FileSystem/ShoutcastRipFile.h

Modified: branches/Dharma/Makefile.in
===================================================================
--- branches/Dharma/Makefile.in	2010-11-27 17:46:35 UTC (rev 35486)
+++ branches/Dharma/Makefile.in	2010-11-27 17:46:55 UTC (rev 35487)
@@ -37,7 +37,6 @@
 	xbmc/lib/libPython/xbmcmodule \
 	xbmc/lib/libRTV \
 	xbmc/lib/libscrobbler \
-	xbmc/lib/libshout \
 	xbmc/lib/libUPnP \
 	xbmc/lib/libXBMS \
 	xbmc/lib/libXDAAP \
@@ -242,8 +241,6 @@
 	$(MAKE) -C xbmc/lib/libscrobbler
 xbmc/lib/libRTV/librtv-@...: force
 	$(MAKE) -C xbmc/lib/libRTV
-xbmc/lib/libshout/libshout-@...: force
-	$(MAKE) -C xbmc/lib/libshout
 xbmc/lib/libUPnP/libupnp-@...: force
 	$(MAKE) -C xbmc/lib/libUPnP
 xbmc/lib/libXBMS/libxbms-@...: force
@@ -389,7 +386,6 @@
 	xbmc/lib/libXBMS/libxbms-@... \
 	xbmc/lib/libRTV/librtv-@... \
 	xbmc/lib/libXDAAP/libxdaap-@... \
-	xbmc/lib/libshout/libshout-@... \
 	xbmc/lib/libjsonrpc/libjsonrpc.a \
 	xbmc/lib/libhttpapi/libhttpapi.a \
 	lib/jsoncpp/jsoncpp/src/lib_json/libjsoncpp.a \
@@ -427,7 +423,6 @@
 	xbmc/lib/libPython/xbmcmodule/xbmcmodule.a \
 	xbmc/lib/libscrobbler/scrobbler.a \
 	xbmc/lib/libRTV/librtv-@... \
-	xbmc/lib/libshout/libshout-@... \
 	xbmc/lib/libUPnP/libupnp-@... \
 	xbmc/lib/libXDAAP/libxdaap-@... \
 	xbmc/lib/libjsonrpc/libjsonrpc.a \

Modified: branches/Dharma/XBMC.xcodeproj/project.pbxproj
===================================================================
--- branches/Dharma/XBMC.xcodeproj/project.pbxproj	2010-11-27 17:46:35 UTC (rev 35486)
+++ branches/Dharma/XBMC.xcodeproj/project.pbxproj	2010-11-27 17:46:55 UTC (rev 35487)
@@ -269,7 +269,6 @@
 		810C9F630D67BD2F0095F5DD /* PltMediaConnect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 810C9F600D67BD2F0095F5DD /* PltMediaConnect.cpp */; };
 		810C9FA90D67D1FB0095F5DD /* MythDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 810C9FA50D67D1FB0095F5DD /* MythDirectory.cpp */; };
 		810C9FAA0D67D1FB0095F5DD /* MythFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 810C9FA70D67D1FB0095F5DD /* MythFile.cpp */; };
-		810CA01C0D68A6E20095F5DD /* libshout-x86-osx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E30B3E8E0D5D59290030A311 /* libshout-x86-osx.a */; };
 		815EE6350E17F1DC009FBE3C /* DVDInputStreamRTMP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 815EE6330E17F1DC009FBE3C /* DVDInputStreamRTMP.cpp */; };
 		83A72B910FBC8DB000171871 /* CoreAudioRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 83A72B8E0FBC8DB000171871 /* CoreAudioRenderer.cpp */; };
 		83A72B940FBC8DFF00171871 /* CoreAudio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 83A72B920FBC8DFF00171871 /* CoreAudio.cpp */; };
@@ -563,7 +562,6 @@
 		E38E20520D25F9FD00618676 /* RarDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17460D25F9FA00618676 /* RarDirectory.cpp */; };
 		E38E20530D25F9FD00618676 /* RarManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17480D25F9FA00618676 /* RarManager.cpp */; };
 		E38E20540D25F9FD00618676 /* RTVDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E174B0D25F9FA00618676 /* RTVDirectory.cpp */; };
-		E38E20560D25F9FD00618676 /* ShoutcastRipFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E174F0D25F9FA00618676 /* ShoutcastRipFile.cpp */; };
 		E38E20570D25F9FD00618676 /* SIDFileDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17510D25F9FA00618676 /* SIDFileDirectory.cpp */; };
 		E38E20580D25F9FD00618676 /* SmartPlaylistDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17530D25F9FA00618676 /* SmartPlaylistDirectory.cpp */; };
 		E38E205B0D25F9FD00618676 /* StackDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17590D25F9FA00618676 /* StackDirectory.cpp */; };
@@ -1274,7 +1272,6 @@
 		F5A1C9840F6B06CF00A96ABD /* RarDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17460D25F9FA00618676 /* RarDirectory.cpp */; };
 		F5A1C9850F6B06CF00A96ABD /* RarManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17480D25F9FA00618676 /* RarManager.cpp */; };
 		F5A1C9860F6B06CF00A96ABD /* RTVDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E174B0D25F9FA00618676 /* RTVDirectory.cpp */; };
-		F5A1C9880F6B06CF00A96ABD /* ShoutcastRipFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E174F0D25F9FA00618676 /* ShoutcastRipFile.cpp */; };
 		F5A1C9890F6B06CF00A96ABD /* SIDFileDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17510D25F9FA00618676 /* SIDFileDirectory.cpp */; };
 		F5A1C98A0F6B06CF00A96ABD /* SmartPlaylistDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17530D25F9FA00618676 /* SmartPlaylistDirectory.cpp */; };
 		F5A1C98B0F6B06CF00A96ABD /* StackDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17590D25F9FA00618676 /* StackDirectory.cpp */; };
@@ -2208,7 +2205,6 @@
 		C85EB761117461830008E5A5 /* GUIViewStateAddonBrowser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIViewStateAddonBrowser.h; sourceTree = "<group>"; };
 		E306D12C0DDF7B590052C2AD /* XBMCHelper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XBMCHelper.cpp; sourceTree = "<group>"; };
 		E306D12D0DDF7B590052C2AD /* XBMCHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XBMCHelper.h; sourceTree = "<group>"; };
-		E30B3E8E0D5D59290030A311 /* libshout-x86-osx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libshout-x86-osx.a"; path = "xbmc/lib/libshout/libshout-x86-osx.a"; sourceTree = "<group>"; };
 		E33206370D5070AA00435CE3 /* DVDDemuxVobsub.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DVDDemuxVobsub.cpp; sourceTree = "<group>"; };
 		E33466A50D2E5103005A65EC /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = "<absolute>"; };
 		E33979940D62FD47004ECDDA /* DVDInputStreamTV.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DVDInputStreamTV.cpp; sourceTree = "<group>"; };
@@ -2795,8 +2791,6 @@
 		E38E17490D25F9FA00618676 /* RarManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RarManager.h; sourceTree = "<group>"; };
 		E38E174B0D25F9FA00618676 /* RTVDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RTVDirectory.cpp; sourceTree = "<group>"; };
 		E38E174C0D25F9FA00618676 /* RTVDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTVDirectory.h; sourceTree = "<group>"; };
-		E38E174F0D25F9FA00618676 /* ShoutcastRipFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ShoutcastRipFile.cpp; sourceTree = "<group>"; };
-		E38E17500D25F9FA00618676 /* ShoutcastRipFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShoutcastRipFile.h; sourceTree = "<group>"; };
 		E38E17510D25F9FA00618676 /* SIDFileDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SIDFileDirectory.cpp; sourceTree = "<group>"; };
 		E38E17520D25F9FA00618676 /* SIDFileDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SIDFileDirectory.h; sourceTree = "<group>"; };
 		E38E17530D25F9FA00618676 /* SmartPlaylistDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SmartPlaylistDirectory.cpp; sourceTree = "<group>"; };
@@ -3071,8 +3065,6 @@
 		E38E1A220D25F9FB00618676 /* errors.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = errors.h; sourceTree = "<group>"; };
 		E38E1A250D25F9FB00618676 /* scrobbler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scrobbler.cpp; sourceTree = "<group>"; };
 		E38E1A260D25F9FB00618676 /* scrobbler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scrobbler.h; sourceTree = "<group>"; };
-		E38E1A280D25F9FB00618676 /* filelib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = filelib.h; sourceTree = "<group>"; };
-		E38E1A2D0D25F9FB00618676 /* rip_manager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rip_manager.h; sourceTree = "<group>"; };
 		E38E1AB80D25F9FB00618676 /* SConstruct */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = SConstruct; sourceTree = "<group>"; };
 		E38E1ABD0D25F9FB00618676 /* MediaCrawler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaCrawler.cpp; sourceTree = "<group>"; };
 		E38E1ABE0D25F9FB00618676 /* MediaCrawler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaCrawler.h; sourceTree = "<group>"; };
@@ -3860,7 +3852,6 @@
 				E35EF2550D380C3D00DB5CD5 /* QuickTime.framework in Frameworks */,
 				E35EF3240D380E1E00DB5CD5 /* Carbon.framework in Frameworks */,
 				E3EB8F080D5D5C0300FFF489 /* libvorbis.dylib in Frameworks */,
-				810CA01C0D68A6E20095F5DD /* libshout-x86-osx.a in Frameworks */,
 				E3BBB7A20D7EA8B200CAAFD3 /* libpcre.dylib in Frameworks */,
 				88ECB6590DE013C4003396A7 /* DiskArbitration.framework in Frameworks */,
 				88ECB6E70DE07BA6003396A7 /* libfontconfig.1.dylib in Frameworks */,
@@ -5587,8 +5578,6 @@
 				E4DC97520FFE5BA8008E0C07 /* SAPFile.cpp */,
 				F5A7B37C113AFB900059D6AA /* SFTPDirectory.cpp */,
 				F5A7B37D113AFB900059D6AA /* SFTPDirectory.h */,
-				E38E174F0D25F9FA00618676 /* ShoutcastRipFile.cpp */,
-				E38E17500D25F9FA00618676 /* ShoutcastRipFile.h */,
 				E38E17510D25F9FA00618676 /* SIDFileDirectory.cpp */,
 				E38E17520D25F9FA00618676 /* SIDFileDirectory.h */,
 				E38E17530D25F9FA00618676 /* SmartPlaylistDirectory.cpp */,
@@ -5740,7 +5729,6 @@
 				E38E19820D25F9FB00618676 /* libPython */,
 				E38E1A130D25F9FB00618676 /* libRTV */,
 				E38E1A210D25F9FB00618676 /* libscrobbler */,
-				E38E1A270D25F9FB00618676 /* libshout */,
 				F5E55E601076B34F006E788A /* libsquish */,
 				E38E1A550D25F9FB00618676 /* libUPnP */,
 				E38E1C780D25F9FC00618676 /* libXBMS */,
@@ -5907,15 +5895,6 @@
 			path = libscrobbler;
 			sourceTree = "<group>";
 		};
-		E38E1A270D25F9FB00618676 /* libshout */ = {
-			isa = PBXGroup;
-			children = (
-				E38E1A280D25F9FB00618676 /* filelib.h */,
-				E38E1A2D0D25F9FB00618676 /* rip_manager.h */,
-			);
-			path = libshout;
-			sourceTree = "<group>";
-		};
 		E38E1A550D25F9FB00618676 /* libUPnP */ = {
 			isa = PBXGroup;
 			children = (
@@ -6937,7 +6916,6 @@
 				E38E256C0D263A1C00618676 /* librtv-x86-osx.a */,
 				F5DC8816110A4B8900EE1B15 /* libxbms-x86-osx.a */,
 				E38E25680D2639F100618676 /* libxdaap-x86-osx.a */,
-				E30B3E8E0D5D59290030A311 /* libshout-x86-osx.a */,
 				810CA0050D683DEF0095F5DD /* libSDL-x86-osx.a */,
 				810CA0080D683DEF0095F5DD /* libSDL_mixer-x86-osx.a */,
 			);
@@ -7467,7 +7445,6 @@
 				E38E20520D25F9FD00618676 /* RarDirectory.cpp in Sources */,
 				E38E20530D25F9FD00618676 /* RarManager.cpp in Sources */,
 				E38E20540D25F9FD00618676 /* RTVDirectory.cpp in Sources */,
-				E38E20560D25F9FD00618676 /* ShoutcastRipFile.cpp in Sources */,
 				E38E20570D25F9FD00618676 /* SIDFileDirectory.cpp in Sources */,
 				E38E20580D25F9FD00618676 /* SmartPlaylistDirectory.cpp in Sources */,
 				E38E205B0D25F9FD00618676 /* StackDirectory.cpp in Sources */,
@@ -8335,7 +8312,6 @@
 				F5A1C9840F6B06CF00A96ABD /* RarDirectory.cpp in Sources */,
 				F5A1C9850F6B06CF00A96ABD /* RarManager.cpp in Sources */,
 				F5A1C9860F6B06CF00A96ABD /* RTVDirectory.cpp in Sources */,
-				F5A1C9880F6B06CF00A96ABD /* ShoutcastRipFile.cpp in Sources */,
 				F5A1C9890F6B06CF00A96ABD /* SIDFileDirectory.cpp in Sources */,
 				F5A1C98A0F6B06CF00A96ABD /* SmartPlaylistDirectory.cpp in Sources */,
 				F5A1C98B0F6B06CF00A96ABD /* StackDirectory.cpp in Sources */,

Modified: branches/Dharma/configure.in
===================================================================
--- branches/Dharma/configure.in	2010-11-27 17:46:35 UTC (rev 35486)
+++ branches/Dharma/configure.in	2010-11-27 17:46:55 UTC (rev 35487)
@@ -1414,7 +1414,6 @@
     xbmc/lib/libhttpapi/Makefile \
     lib/jsoncpp/jsoncpp/src/lib_json/Makefile \
     xbmc/lib/libjsonrpc/Makefile \
-    xbmc/lib/libshout/Makefile \
     xbmc/lib/libsquish/Makefile \
     xbmc/lib/libid3tag/Makefile \
     xbmc/lib/cximage-6.0/Makefile \

Modified: branches/Dharma/project/VS2008Express/XBMC for Windows.sln
===================================================================
--- branches/Dharma/project/VS2008Express/XBMC for Windows.sln	2010-11-27 17:46:35 UTC (rev 35486)
+++ branches/Dharma/project/VS2008Express/XBMC for Windows.sln	2010-11-27 17:46:55 UTC (rev 35487)
@@ -9,7 +9,6 @@
 		{7A74ED4B-2BF5-47D7-B43E-C80F714417FB} = {7A74ED4B-2BF5-47D7-B43E-C80F714417FB}
 		{E465056A-C6F3-45EE-B791-CAF8E0CE629D} = {E465056A-C6F3-45EE-B791-CAF8E0CE629D}
 		{B2975495-FBE4-4F94-AAC5-B21A9842BF50} = {B2975495-FBE4-4F94-AAC5-B21A9842BF50}
-		{76850A99-4EC7-4196-B3EA-E4120A00E8A6} = {76850A99-4EC7-4196-B3EA-E4120A00E8A6}
 		{BDD2CB99-93C5-4A70-ACBF-396FFB961AD3} = {BDD2CB99-93C5-4A70-ACBF-396FFB961AD3}
 		{5013769A-0784-4CE8-9D9D-09AC7F731B4F} = {5013769A-0784-4CE8-9D9D-09AC7F731B4F}
 		{510441AC-B9E1-4B31-9C0C-EB3AD39D90C4} = {510441AC-B9E1-4B31-9C0C-EB3AD39D90C4}
@@ -50,8 +49,6 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcmyth_dll", "..\..\xbmc\lib\cmyth\Win32\libcmyth.vcproj", "{F9E6874D-60A8-49BA-9393-A2105E63ABCF}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libshout", "..\..\xbmc\lib\libshout\libshout\libshout.vcproj", "{76850A99-4EC7-4196-B3EA-E4120A00E8A6}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsamplerate", "..\..\xbmc\lib\libsamplerate\libsamplerate_win32\libsamplerate_win32.vcproj", "{5013769A-0784-4CE8-9D9D-09AC7F731B4F}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsqlite", "..\..\xbmc\lib\sqLite\sqlite\libsqlite_win32\libsqlite_win32.vcproj", "{9E74DF3B-9343-4689-B0EC-4451617F9489}"
@@ -290,14 +287,6 @@
 		{F9E6874D-60A8-49BA-9393-A2105E63ABCF}.Release (DirectX)|Win32.Build.0 = Release|Win32
 		{F9E6874D-60A8-49BA-9393-A2105E63ABCF}.Release (OpenGL)|Win32.ActiveCfg = Release|Win32
 		{F9E6874D-60A8-49BA-9393-A2105E63ABCF}.Release (OpenGL)|Win32.Build.0 = Release|Win32
-		{76850A99-4EC7-4196-B3EA-E4120A00E8A6}.Debug (DirectX)|Win32.ActiveCfg = Debug|Win32
-		{76850A99-4EC7-4196-B3EA-E4120A00E8A6}.Debug (DirectX)|Win32.Build.0 = Debug|Win32
-		{76850A99-4EC7-4196-B3EA-E4120A00E8A6}.Debug (OpenGL)|Win32.ActiveCfg = Debug|Win32
-		{76850A99-4EC7-4196-B3EA-E4120A00E8A6}.Debug (OpenGL)|Win32.Build.0 = Debug|Win32
-		{76850A99-4EC7-4196-B3EA-E4120A00E8A6}.Release (DirectX)|Win32.ActiveCfg = Release|Win32
-		{76850A99-4EC7-4196-B3EA-E4120A00E8A6}.Release (DirectX)|Win32.Build.0 = Release|Win32
-		{76850A99-4EC7-4196-B3EA-E4120A00E8A6}.Release (OpenGL)|Win32.ActiveCfg = Release|Win32
-		{76850A99-4EC7-4196-B3EA-E4120A00E8A6}.Release (OpenGL)|Win32.Build.0 = Release|Win32
 		{5013769A-0784-4CE8-9D9D-09AC7F731B4F}.Debug (DirectX)|Win32.ActiveCfg = Debug|Win32
 		{5013769A-0784-4CE8-9D9D-09AC7F731B4F}.Debug (DirectX)|Win32.Build.0 = Debug|Win32
 		{5013769A-0784-4CE8-9D9D-09AC7F731B4F}.Debug (OpenGL)|Win32.ActiveCfg = Debug|Win32

Modified: branches/Dharma/project/VS2008Express/XBMC.vcproj
===================================================================
--- branches/Dharma/project/VS2008Express/XBMC.vcproj	2010-11-27 17:46:35 UTC (rev 35486)
+++ branches/Dharma/project/VS2008Express/XBMC.vcproj	2010-11-27 17:46:55 UTC (rev 35487)
@@ -4268,10 +4268,6 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\xbmc\FileSystem\ShoutcastRipFile.cpp"
-					>
-				</File>
-				<File
 					RelativePath="..\..\xbmc\FileSystem\SIDFileDirectory.cpp"
 					>
 				</File>
@@ -5909,10 +5905,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\xbmc\FileSystem\ShoutcastRipFile.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\xbmc\utils\SingleLock.h"
 				>
 			</File>

Modified: branches/Dharma/project/VS2010Express/XBMC for Windows.sln
===================================================================
--- branches/Dharma/project/VS2010Express/XBMC for Windows.sln	2010-11-27 17:46:35 UTC (rev 35486)
+++ branches/Dharma/project/VS2010Express/XBMC for Windows.sln	2010-11-27 17:46:55 UTC (rev 35487)
@@ -31,8 +31,6 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcmyth_dll", "..\..\xbmc\lib\cmyth\Win32\libcmyth.vcxproj", "{F9E6874D-60A8-49BA-9393-A2105E63ABCF}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libshout", "..\..\xbmc\lib\libshout\libshout\libshout.vcxproj", "{76850A99-4EC7-4196-B3EA-E4120A00E8A6}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsamplerate", "..\..\xbmc\lib\libsamplerate\libsamplerate_win32\libsamplerate_win32.vcxproj", "{5013769A-0784-4CE8-9D9D-09AC7F731B4F}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsqlite", "..\..\xbmc\lib\sqLite\sqlite\libsqlite_win32\libsqlite_win32.vcxproj", "{9E74DF3B-9343-4689-B0EC-4451617F9489}"
@@ -227,14 +225,6 @@
 		{F9E6874D-60A8-49BA-9393-A2105E63ABCF}.Release (DirectX)|Win32.Build.0 = Release|Win32
 		{F9E6874D-60A8-49BA-9393-A2105E63ABCF}.Release (OpenGL)|Win32.ActiveCfg = Release|Win32
 		{F9E6874D-60A8-49BA-9393-A2105E63ABCF}.Release (OpenGL)|Win32.Build.0 = Release|Win32
-		{76850A99-4EC7-4196-B3EA-E4120A00E8A6}.Debug (DirectX)|Win32.ActiveCfg = Debug|Win32
-		{76850A99-4EC7-4196-B3EA-E4120A00E8A6}.Debug (DirectX)|Win32.Build.0 = Debug|Win32
-		{76850A99-4EC7-4196-B3EA-E4120A00E8A6}.Debug (OpenGL)|Win32.ActiveCfg = Debug|Win32
-		{76850A99-4EC7-4196-B3EA-E4120A00E8A6}.Debug (OpenGL)|Win32.Build.0 = Debug|Win32
-		{76850A99-4EC7-4196-B3EA-E4120A00E8A6}.Release (DirectX)|Win32.ActiveCfg = Release|Win32
-		{76850A99-4EC7-4196-B3EA-E4120A00E8A6}.Release (DirectX)|Win32.Build.0 = Release|Win32
-		{76850A99-4EC7-4196-B3EA-E4120A00E8A6}.Release (OpenGL)|Win32.ActiveCfg = Release|Win32
-		{76850A99-4EC7-4196-B3EA-E4120A00E8A6}.Release (OpenGL)|Win32.Build.0 = Release|Win32
 		{5013769A-0784-4CE8-9D9D-09AC7F731B4F}.Debug (DirectX)|Win32.ActiveCfg = Debug|Win32
 		{5013769A-0784-4CE8-9D9D-09AC7F731B4F}.Debug (DirectX)|Win32.Build.0 = Debug|Win32
 		{5013769A-0784-4CE8-9D9D-09AC7F731B4F}.Debug (OpenGL)|Win32.ActiveCfg = Debug|Win32

Modified: branches/Dharma/project/VS2010Express/XBMC.vcxproj
===================================================================
--- branches/Dharma/project/VS2010Express/XBMC.vcxproj	2010-11-27 17:46:35 UTC (rev 35486)
+++ branches/Dharma/project/VS2010Express/XBMC.vcxproj	2010-11-27 17:46:55 UTC (rev 35487)
@@ -793,7 +793,6 @@
     <ClCompile Include="..\..\xbmc\FileSystem\SAPDirectory.cpp" />
     <ClCompile Include="..\..\xbmc\FileSystem\SAPFile.cpp" />
     <ClCompile Include="..\..\xbmc\FileSystem\SFTPDirectory.cpp" />
-    <ClCompile Include="..\..\xbmc\FileSystem\ShoutcastRipFile.cpp" />
     <ClCompile Include="..\..\xbmc\FileSystem\SIDFileDirectory.cpp" />
     <ClCompile Include="..\..\xbmc\FileSystem\SmartPlaylistDirectory.cpp" />
     <ClCompile Include="..\..\xbmc\FileSystem\SpecialProtocol.cpp" />
@@ -1612,7 +1611,6 @@
     <ClInclude Include="..\..\xbmc\SettingsControls.h" />
     <ClInclude Include="..\..\xbmc\utils\SharedSection.h" />
     <ClInclude Include="..\..\xbmc\Shortcut.h" />
-    <ClInclude Include="..\..\xbmc\FileSystem\ShoutcastRipFile.h" />
     <ClInclude Include="..\..\xbmc\utils\SingleLock.h" />
     <ClInclude Include="..\..\xbmc\Song.h" />
     <ClInclude Include="..\..\xbmc\SortFileItem.h" />
@@ -1819,10 +1817,6 @@
       <Project>{5013769a-0784-4ce8-9d9d-09ac7f731b4f}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="..\..\xbmc\lib\libshout\libshout\libshout.vcxproj">
-      <Project>{76850a99-4ec7-4196-b3ea-e4120a00e8a6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
     <ProjectReference Include="..\..\xbmc\lib\libsquish\vs7\squish\squish_2010.vcxproj">
       <Project>{6a8518c3-d81a-4428-bd7f-c37933088ac1}</Project>
       <Private>true</Private>

Modified: branches/Dharma/project/VS2010Express/XBMC.vcxproj.filters
===================================================================
--- branches/Dharma/project/VS2010Express/XBMC.vcxproj.filters	2010-11-27 17:46:35 UTC (rev 35486)
+++ branches/Dharma/project/VS2010Express/XBMC.vcxproj.filters	2010-11-27 17:46:55 UTC (rev 35487)
@@ -1572,9 +1572,6 @@
     <ClCompile Include="..\..\xbmc\FileSystem\SFTPDirectory.cpp">
       <Filter>Source Files\Filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\FileSystem\ShoutcastRipFile.cpp">
-      <Filter>Source Files\Filesystem</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\xbmc\FileSystem\SIDFileDirectory.cpp">
       <Filter>Source Files\Filesystem</Filter>
     </ClCompile>
@@ -3942,9 +3939,6 @@
     <ClInclude Include="..\..\xbmc\Shortcut.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\FileSystem\ShoutcastRipFile.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\xbmc\utils\SingleLock.h">
       <Filter>Header Files</Filter>
     </ClInclude>

Modified: branches/Dharma/xbmc/FileSystem/FileCurl.cpp
===================================================================
--- branches/Dharma/xbmc/FileSystem/FileCurl.cpp	2010-11-27 17:46:35 UTC (rev 35486)
+++ branches/Dharma/xbmc/FileSystem/FileCurl.cpp	2010-11-27 17:46:55 UTC (rev 35487)
@@ -326,6 +326,7 @@
   m_password = "";
   m_httpauth = "";
   m_state = new CReadState();
+  m_skipshout = false;
 }
 
 //Has to be called before Open()
@@ -713,6 +714,8 @@
           SetCookie(value);
         else if (name.Equals("Encoding"))
           SetContentEncoding(value);
+        else if (name.Equals("noshout") && value.Equals("true"))
+          m_skipshout = true;
         else
           SetRequestHeader(name, value);
       }
@@ -851,9 +854,9 @@
 
   // check if this stream is a shoutcast stream. sometimes checking the protocol line is not enough so examine other headers as well.
   // shoutcast streams should be handled by FileShoutcast.
-  if (m_state->m_httpheader.GetProtoLine().Left(3) == "ICY" || !m_state->m_httpheader.GetValue("icy-notice1").IsEmpty()
+  if ((m_state->m_httpheader.GetProtoLine().Left(3) == "ICY" || !m_state->m_httpheader.GetValue("icy-notice1").IsEmpty()
      || !m_state->m_httpheader.GetValue("icy-name").IsEmpty()
-     || !m_state->m_httpheader.GetValue("icy-br").IsEmpty() )
+     || !m_state->m_httpheader.GetValue("icy-br").IsEmpty()) && !m_skipshout)
   {
     CLog::Log(LOGDEBUG,"FileCurl - file <%s> is a shoutcast stream. re-opening", m_url.c_str());
     throw new CRedirectException(new CFileShoutcast);

Modified: branches/Dharma/xbmc/FileSystem/FileCurl.h
===================================================================
--- branches/Dharma/xbmc/FileSystem/FileCurl.h	2010-11-27 17:46:35 UTC (rev 35486)
+++ branches/Dharma/xbmc/FileSystem/FileCurl.h	2010-11-27 17:46:55 UTC (rev 35487)
@@ -152,6 +152,7 @@
       bool            m_useOldHttpVersion;
       bool            m_seekable;
       bool            m_multisession;
+      bool            m_skipshout;
 
       CRingBuffer     m_buffer;           // our ringhold buffer
       char *          m_overflowBuffer;   // in the rare case we would overflow the above buffer

Modified: branches/Dharma/xbmc/FileSystem/FileShoutcast.cpp
===================================================================
--- branches/Dharma/xbmc/FileSystem/FileShoutcast.cpp	2010-11-27 17:46:35 UTC (rev 35486)
+++ branches/Dharma/xbmc/FileSystem/FileShoutcast.cpp	2010-11-27 17:46:55 UTC (rev 35487)
@@ -33,178 +33,33 @@
 #include "GUIWindowManager.h"
 #include "URL.h"
 #include "utils/TimeUtils.h"
-#include "LocalizeStrings.h"
 
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
 //////////////////////////////////////////////////////////////////////
 
-// prevent inclusion of config.h from libshout
-#define __SRCONFIG_H__
-#include "lib/libshout/rip_manager.h"
-#include "lib/libshout/filelib.h"
-#undef __SRCONFIG_H__
-
-#include "RingBuffer.h"
-#include "ShoutcastRipFile.h"
 #include "utils/GUIInfoManager.h"
 #include "utils/log.h"
 
-//using namespace std; On VS2010 error_code conflicts with std::error_code
 using namespace XFILE;
 using namespace MUSIC_INFO;
 
-#ifndef HAS_SHOUTCAST
-extern "C"
-{
-  error_code rip_manager_start(void (*status_callback)(int message, void *data), RIP_MANAGER_OPTIONS *options) { return 0; }
-  void       rip_manager_stop() { }
-  void       set_rip_manager_options_defaults(RIP_MANAGER_OPTIONS*) {}
-  int        rip_manager_get_content_type() { return 0; }
-}
-#endif
-
-const int SHOUTCASTTIMEOUT = 60;
-static CRingBuffer m_ringbuf;
-
-static FileState m_fileState;
-static CShoutcastRipFile m_ripFile;
-
-
-static RIP_MANAGER_INFO m_ripInfo;
-static ERROR_INFO m_errorInfo;
-
-
-
-void rip_callback(int message, void *data)
-{
-  switch (message)
-  {
-    RIP_MANAGER_INFO *info;
-  case RM_UPDATE:
-    info = (RIP_MANAGER_INFO*)data;
-    memcpy(&m_ripInfo, info, sizeof(m_ripInfo));
-    if (info->status == RM_STATUS_BUFFERING)
-    {
-      m_fileState.bBuffering = true;
-    }
-    else if ( info->status == RM_STATUS_RIPPING)
-    {
-      m_ripFile.SetRipManagerInfo( &m_ripInfo );
-      m_fileState.bBuffering = false;
-    }
-    else if (info->status == RM_STATUS_RECONNECTING)
-  { }
-    break;
-  case RM_ERROR:
-    ERROR_INFO *errInfo;
-    errInfo = (ERROR_INFO*)data;
-    memcpy(&m_errorInfo, errInfo, sizeof(m_errorInfo));
-    m_fileState.bRipError = true;
-    OutputDebugString("error\n");
-    break;
-  case RM_DONE:
-    OutputDebugString("done\n");
-    m_fileState.bRipDone = true;
-    break;
-  case RM_NEW_TRACK:
-    char *trackName;
-    trackName = (char*) data;
-    m_ripFile.SetTrackname( trackName );
-    break;
-  case RM_STARTED:
-    m_fileState.bRipStarted = true;
-    OutputDebugString("Started\n");
-    break;
-  }
-
-}
-
-extern "C" {
-error_code filelib_write_show(char *buf, u_long size)
-{
-  if ((unsigned int)size > m_ringbuf.getSize())
-  {
-    CLog::Log(LOGERROR, "Shoutcast chunk too big: %lu", size);
-    return SR_ERROR_BUFFER_FULL;
-  }
-  while (m_ringbuf.getMaxWriteSize() < (unsigned int)size) Sleep(10);
-  m_ringbuf.WriteData(buf, size);
-  m_ripFile.Write( buf, size ); //will only write, if it has to
-  if (m_fileState.bBuffering)
-  {
-    if (rip_manager_get_content_type() == CONTENT_TYPE_OGG)
-    {
-      if (m_ringbuf.getMaxReadSize() > (m_ringbuf.getSize() / 8) )
-      {
-        // hack because ogg streams are very broke, force it to go.
-        m_fileState.bBuffering = false;
-      }
-    }
-  }
-
-  return SR_SUCCESS;
-}
-}
-
-CFileShoutcast* m_pShoutCastRipper = NULL;
-
 CFileShoutcast::CFileShoutcast()
 {
-  // FIXME: without this check
-  // the playback stops when CFile::Stat()
-  // or CFile::Exists() is called
-
-  // Do we already have another file
-  // using the ripper?
-  if (!m_pShoutCastRipper)
-  {
-    m_fileState.bBuffering = true;
-    m_fileState.bRipDone = false;
-    m_fileState.bRipStarted = false;
-    m_fileState.bRipError = false;
-    m_ringbuf.Create(1024*1024); // must be big enough. some stations use 192kbps.
-    m_pShoutCastRipper = this;
-  }
+  m_lastTime = CTimeUtils::GetTimeMS();
+  m_discarded = 0;
+  m_currint = 0;
+  m_buffer = NULL;
 }
 
 CFileShoutcast::~CFileShoutcast()
 {
-  // FIXME: without this check
-  // the playback stops when CFile::Stat()
-  // or CFile::Exists() is called
-
-  // Has this object initialized the ripper?
-  if (m_pShoutCastRipper==this)
-  {
-    rip_manager_stop();
-    m_pShoutCastRipper = NULL;
-    m_ripFile.Reset();
-    m_ringbuf.Destroy();
-  }
+  Close();
 }
 
-bool CFileShoutcast::CanRecord()
-{
-  if ( !m_fileState.bRipStarted )
-    return false;
-  return m_ripFile.CanRecord();
-}
-
-bool CFileShoutcast::Record()
-{
-  return m_ripFile.Record();
-}
-
-void CFileShoutcast::StopRecording()
-{
-  m_ripFile.StopRecording();
-}
-
-
 int64_t CFileShoutcast::GetPosition()
 {
-  return 0;
+  return m_file.GetPosition()-m_discarded;
 }
 
 int64_t CFileShoutcast::GetLength()
@@ -212,202 +67,50 @@
   return 0;
 }
 
-
 bool CFileShoutcast::Open(const CURL& url)
 {
-  m_lastTime = CTimeUtils::GetTimeMS();
-  int ret;
+  CURL url2(url);
+  url2.SetProtocolOptions("noshout=true&Icy-MetaData=1");
 
-  CGUIDialogProgress* dlgProgress = NULL;
-
-  // dvdplayer can deadlock with progress dialog so check first
-  if (g_application.GetCurrentPlayer() == EPC_PAPLAYER)
+  bool result=false;
+  if ((result=m_file.Open(url2.Get())))
   {
-    dlgProgress = (CGUIDialogProgress*)g_windowManager.GetWindow(WINDOW_DIALOG_PROGRESS);
+    m_tag.SetTitle(m_file.GetHttpHeader().GetValue("icy-name"));
+    if (m_tag.GetTitle().IsEmpty())
+      m_tag.SetTitle(m_file.GetHttpHeader().GetValue("ice-name")); // icecast
+    m_tag.SetGenre(m_file.GetHttpHeader().GetValue("icy-genre"));
+    if (m_tag.GetGenre().IsEmpty())
+      m_tag.SetGenre(m_file.GetHttpHeader().GetValue("ice-genre")); // icecast
+    m_tag.SetLoaded(true);
+    g_infoManager.SetCurrentSongTag(m_tag);
   }
+  m_metaint = atoi(m_file.GetHttpHeader().GetValue("icy-metaint").c_str());
+  m_buffer = new char[16*255];
 
-  set_rip_manager_options_defaults(&m_opt);
-
-  strcpy(m_opt.output_directory, "./");
-  m_opt.proxyurl[0] = '\0';
-
-  // Use a proxy, if the GUI was configured as such
-  bool bProxyEnabled = g_guiSettings.GetBool("network.usehttpproxy");
-  if (bProxyEnabled)
-  {
-    const CStdString &strProxyServer = g_guiSettings.GetString("network.httpproxyserver");
-    const CStdString &strProxyPort = g_guiSettings.GetString("network.httpproxyport");
-    // Should we check for valid strings here
-#ifndef _LINUX
-    _snprintf( m_opt.proxyurl, MAX_URL_LEN, "http://%s:%s", strProxyServer.c_str(), strProxyPort.c_str() );
-#else
-    snprintf( m_opt.proxyurl, MAX_URL_LEN, "http://%s:%s", strProxyServer.c_str(), strProxyPort.c_str() );
-#endif
-  }
-
-  CStdString strUrl = url.Get();
-  strUrl.Replace("shout://", "http://");
-  strncpy(m_opt.url, strUrl.c_str(), MAX_URL_LEN);
-  sprintf(m_opt.useragent, "x%s", url.GetFileName().c_str());
-  if (dlgProgress)
-  {
-    dlgProgress->SetHeading(260);
-    dlgProgress->SetLine(0, 259);
-    dlgProgress->SetLine(1, strUrl);
-    dlgProgress->SetLine(2, "");
-    if (!dlgProgress->IsDialogRunning())
-      dlgProgress->StartModal();
-    dlgProgress->Progress();
-  }
-
-  if ((ret = rip_manager_start(rip_callback, &m_opt)) != SR_SUCCESS)
-  {
-    if (dlgProgress) dlgProgress->Close();
-    return false;
-  }
-  int iShoutcastTimeout = 10 * SHOUTCASTTIMEOUT; //i.e: 10 * 10 = 100 * 100ms = 10s
-  int iCount = 0;
-  while (!m_fileState.bRipDone && !m_fileState.bRipStarted && !m_fileState.bRipError && (!dlgProgress || !dlgProgress->IsCanceled()))
-  {
-    if (iCount <= iShoutcastTimeout) //Normally, this isn't the problem,
-      //because if RIP_MANAGER fails, this would be here
-      //with m_fileState.bRipError
-    {
-      Sleep(100);
-    }
-    else
-    {
-      if (dlgProgress)
-      {
-        dlgProgress->SetLine(1, 257);
-        dlgProgress->SetLine(2, "Connection timed out...");
-        Sleep(1500);
-        dlgProgress->Close();
-      }
-      return false;
-    }
-    iCount++;
-  }
-
-  if (dlgProgress && dlgProgress->IsCanceled())
-  {
-     Close();
-     dlgProgress->Close();
-     return false;
-  }
-
-  /* store content type of stream */
-  m_mimetype = rip_manager_get_content_type();
-
-  //CHANGED CODE: Don't reset timer anymore.
-
-  while (!m_fileState.bRipDone && !m_fileState.bRipError && m_fileState.bBuffering && (!dlgProgress || !dlgProgress->IsCanceled()))
-  {
-    if (iCount <= iShoutcastTimeout) //Here is the real problem: Sometimes the buffer fills just to
-      //slowly, thus the quality of the stream will be bad, and should be
-      //aborted...
-    {
-      Sleep(100);
-      char szTmp[1024];
-      //g_dialog.SetCaption(0, "Shoutcast" );
-      sprintf(szTmp, g_localizeStrings.Get(23052).c_str(), m_ringbuf.getMaxReadSize());
-      if (dlgProgress)
-      {
-        dlgProgress->SetLine(2, szTmp );
-        dlgProgress->Progress();
-      }
-
-      sprintf(szTmp, "%s", m_ripInfo.filename);
-      for (int i = 0; i < (int)strlen(szTmp); i++)
-        szTmp[i] = tolower((unsigned char)szTmp[i]);
-      szTmp[50] = 0;
-      if (dlgProgress)
-      {
-        dlgProgress->SetLine(1, szTmp );
-        dlgProgress->Progress();
-      }
-    }
-    else //it's not really a connection timeout, but it's here,
-      //where things get boring, if connection is slow.
-      //trust me, i did a lot of testing... Doesn't happen often,
-      //but if it does it sucks to wait here forever.
-      //CHANGED: Other message here
-    {
-      if (dlgProgress)
-      {
-        dlgProgress->SetLine(1, 257);
-        dlgProgress->SetLine(2, "Connection to server too slow...");
-        dlgProgress->Close();
-      }
-      return false;
-    }
-    iCount++;
-  }
-  if (dlgProgress && dlgProgress->IsCanceled())
-  {
-     Close();
-     dlgProgress->Close();
-     return false;
-  }
-  if ( m_fileState.bRipError )
-  {
-    if (dlgProgress)
-    {
-      dlgProgress->SetLine(1, 257);
-      dlgProgress->SetLine(2, 16029);
-      CLog::Log(LOGERROR, "%s: error - %s", __FUNCTION__, m_errorInfo.error_str);
-      dlgProgress->Progress();
-
-      Sleep(1500);
-      dlgProgress->Close();
-    }
-    return false;
-  }
-  if (dlgProgress)
-  {
-    dlgProgress->SetLine(2, 261);
-    dlgProgress->Progress();
-    dlgProgress->Close();
-  }
-  return true;
+  return result;
 }
 
 unsigned int CFileShoutcast::Read(void* lpBuf, int64_t uiBufSize)
 {
-  if (m_fileState.bRipDone)
+  if (m_currint >= m_metaint && m_metaint > 0)
   {
-    OutputDebugString("Read done\n");
-    return 0;
+    unsigned char header;
+    m_file.Read(&header,1);
+    ReadTruncated(m_buffer, header*16);
+    ExtractTagInfo(m_buffer);
+    m_discarded += header*16+1;
+    m_currint = 0;
   }
-
-  int slept=0;
-  while (m_ringbuf.getMaxReadSize() <= 0)
-  {
-    Sleep(10);
-    if (slept += 10 > SHOUTCASTTIMEOUT*1000)
-      return -1;
-  }
-
-  int iRead = m_ringbuf.getMaxReadSize();
-  if (iRead > uiBufSize) iRead = (int)uiBufSize;
-  m_ringbuf.ReadData((char*)lpBuf, iRead);
-
   if (CTimeUtils::GetTimeMS() - m_lastTime > 500)
   {
     m_lastTime = CTimeUtils::GetTimeMS();
-    CMusicInfoTag tag;
-    GetMusicInfoTag(tag);
-    g_infoManager.SetCurrentSongTag(tag);
+    g_infoManager.SetCurrentSongTag(m_tag);
   }
-  return iRead;
-}
 
-void CFileShoutcast::outputTimeoutMessage(const char* message)
-{
-  //g_dialog.SetCaption(0, "Shoutcast"  );
-  //g_dialog.SetMessage(0,  message );
-  //g_dialog.Render();
-  Sleep(1500);
+  unsigned int toRead = std::min((unsigned int)uiBufSize,(unsigned int)m_metaint-m_currint);
+  toRead = m_file.Read(lpBuf,toRead);
+  m_currint += toRead;
+  return toRead;
 }
 
 int64_t CFileShoutcast::Seek(int64_t iFilePosition, int iWhence)
@@ -417,37 +120,25 @@
 
 void CFileShoutcast::Close()
 {
-  OutputDebugString("Shoutcast Stopping\n");
-  if ( m_ripFile.IsRecording() )
-    m_ripFile.StopRecording();
-  m_ringbuf.Clear();
-  rip_manager_stop();
-  m_ripFile.Reset();
-  OutputDebugString("Shoutcast Stopped\n");
+  delete[] m_buffer;
+  m_file.Close();
 }
 
-bool CFileShoutcast::IsRecording()
+void CFileShoutcast::ExtractTagInfo(const char* buf)
 {
-  return m_ripFile.IsRecording();
+  char temp[1024];
+  if (sscanf(buf,"StreamTitle='%[^']",temp) > 0)
+    m_tag.SetTitle(temp);
 }
 
-bool CFileShoutcast::GetMusicInfoTag(CMusicInfoTag& tag)
+void CFileShoutcast::ReadTruncated(char* buf2, int size)
 {
-  m_ripFile.GetMusicInfoTag(tag);
-  return true;
-}
-
-CStdString CFileShoutcast::GetContent()
-{
-  switch (m_mimetype)
+  char* buf = buf2;
+  while (size > 0)
   {
-    case CONTENT_TYPE_MP3:
-      return "audio/mpeg";
-    case CONTENT_TYPE_OGG:
-      return "audio/ogg";
-    case CONTENT_TYPE_AAC:
-      return "audio/aac";
-    default:
-      return "application/octet-stream";
+    int read = m_file.Read(buf,size);
+    size -= read;
+    buf += read;
   }
 }
+

Modified: branches/Dharma/xbmc/FileSystem/FileShoutcast.h
===================================================================
--- branches/Dharma/xbmc/FileSystem/FileShoutcast.h	2010-11-27 17:46:35 UTC (rev 35486)
+++ branches/Dharma/xbmc/FileSystem/FileShoutcast.h	2010-11-27 17:46:55 UTC (rev 35487)
@@ -23,37 +23,15 @@
 //
 //////////////////////////////////////////////////////////////////////
 
-#if !defined(AFX_FILESHOUTCAST_H__6B6082E6_547E_44C4_8801_9890781659C0__INCLUDED_)
-#define AFX_FILESHOUTCAST_H__6B6082E6_547E_44C4_8801_9890781659C0__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
 
 #include "IFile.h"
+#include "FileCurl.h"
 #include "StdString.h"
+#include "MusicInfoTag.h"
 
-// prevent inclusion of config.h from libshout
-#define __SRCONFIG_H__
-#include "lib/libshout/rip_manager.h"
-#undef __SRCONFIG_H__
-
-namespace MUSIC_INFO
-{
-  class CMusicInfoTag;
-}
-
 namespace XFILE
 {
-typedef struct FileStateSt
-{
-  bool bBuffering;
-  bool bRipDone;
-  bool bRipStarted;
-  bool bRipError;
-}
-FileState;
-
 class CFileShoutcast : public IFile
 {
 public:
@@ -67,17 +45,17 @@
   virtual unsigned int Read(void* lpBuf, int64_t uiBufSize);
   virtual int64_t Seek(int64_t iFilePosition, int iWhence = SEEK_SET);
   virtual void Close();
-  virtual bool CanRecord();
-  virtual bool Record();
-  virtual void StopRecording();
-  virtual bool IsRecording();
-  virtual bool GetMusicInfoTag(MUSIC_INFO::CMusicInfoTag& tag);
-  virtual CStdString GetContent();
 protected:
-  void outputTimeoutMessage(const char* message);
+  void ExtractTagInfo(const char* buf);
+  void ReadTruncated(char* buf2, int size);
+
   unsigned int m_lastTime;
-  int m_mimetype;
-  RIP_MANAGER_OPTIONS m_opt;
+  CFileCurl m_file;
+  int m_metaint;
+  int m_discarded; // data used for tags
+  int m_currint;
+  char* m_buffer; // buffer used for tags
+  MUSIC_INFO::CMusicInfoTag m_tag;
 };
 }
-#endif // !defined(AFX_FILESHOUTCAST_H__6B6082E6_547E_44C4_8801_9890781659C0__INCLUDED_)
+

Modified: branches/Dharma/xbmc/FileSystem/Makefile.in
===================================================================
--- branches/Dharma/xbmc/FileSystem/Makefile.in	2010-11-27 17:46:35 UTC (rev 35486)
+++ branches/Dharma/xbmc/FileSystem/Makefile.in	2010-11-27 17:46:55 UTC (rev 35487)
@@ -72,7 +72,6 @@
      RTVDirectory.cpp \
      SAPDirectory.cpp \
      SAPFile.cpp \
-     ShoutcastRipFile.cpp \
      SIDFileDirectory.cpp \
      SmartPlaylistDirectory.cpp \
      SMBDirectory.cpp \

Deleted: branches/Dharma/xbmc/FileSystem/ShoutcastRipFile.cpp
===================================================================
--- branches/Dharma/xbmc/FileSystem/ShoutcastRipFile.cpp	2010-11-27 17:46:35 UTC (rev 35486)
+++ branches/Dharma/xbmc/FileSystem/ShoutcastRipFile.cpp	2010-11-27 17:46:55 UTC (rev 35487)
@@ -1,499 +0,0 @@
-/*
- *      Copyright (C) 2005-2008 Team XBMC
- *      http://www.xbmc.org
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *  http://www.gnu.org/copyleft/gpl.html
- *
- */
-
-#include "ShoutcastRipFile.h"
-#include "Id3Tag.h"
-#include "FileSystem/Directory.h"
-#include "FileItem.h"
-#include "GUISettings.h"
-#include "Util.h"
-
-// prevent inclusion of config.h from libshout
-#define __SRCONFIG_H__
-#include "lib/libshout/rip_manager.h"
-#undef __SRCONFIG_H__
-
-using namespace MUSIC_INFO;
-
-#define MAX_RECORDED_TRACKS 999
-
-#ifndef _LINUX
-#if !defined(WIN32)
-#define WIN32 1
-#endif
-#endif
-
-#ifdef _WIN32
-extern "C" FILE *fopen_utf8(const char *_Filename, const char *_Mode);
-#else
-#define fopen_utf8 fopen
-#endif
-
-namespace SHOUTCAST
-{
-// prevent inclusion of config.h from libshout
-#define __SRCONFIG_H__
-#include "lib/libshout/rip_manager.h"
-#undef __SRCONFIG_H__
-}
-
-CShoutcastRipFile::CShoutcastRipFile()
-{
-  m_recState.bRecording = false;
-  m_recState.bCanRecord = false;
-  m_recState.bTrackChanged = false;
-  m_recState.bFilenameSet = false;
-  m_recState.bStreamSet = false;
-  m_iTrackCount = 1;
-  m_szFileName[0] = '\0';
-  m_szFilteredFileName[0] = '\0';
-  m_szStreamName[0] = '\0';
-  m_ripFile = NULL;
-  m_logFile = NULL;
-}
-
-CShoutcastRipFile::~CShoutcastRipFile()
-{
-  m_recState.bRecording = false;
-  m_recState.bCanRecord = false;
-  m_recState.bTrackChanged = false;
-  m_recState.bFilenameSet = false;
-  m_recState.bStreamSet = false;
-  m_iTrackCount = 1;
-  m_szFileName[0] = '\0';
-  m_szFilteredFileName[0] = '\0';
-  m_szStreamName[0] = '\0';
-  if ( m_ripFile != NULL )
-  {
-    fclose( m_ripFile );
-    m_ripFile = NULL;
-  }
-  if ( m_logFile != NULL )
-  {
-    fclose( m_logFile );
-    m_logFile = NULL;
-  }
-}
-
-void CShoutcastRipFile::Reset()
-{
-  m_recState.bRecording = false;
-  m_recState.bCanRecord = false;
-  m_recState.bTrackChanged = false;
-  m_recState.bFilenameSet = false;
-  m_recState.bStreamSet = false;
-  m_iTrackCount = 1;
-  m_szFileName[0] = '\0';
-  m_szFilteredFileName[0] = '\0';
-  m_szStreamName[0] = '\0';
-  if ( m_ripFile != NULL )
-  {
-    fclose( m_ripFile );
-    m_ripFile = NULL;
-  }
-  if ( m_logFile != NULL )
-  {
-    fclose( m_logFile );
-    m_logFile = NULL;
-  }
-}
-
-//SetRipManagerInfo() will be called frequently, depending on meta size
-void CShoutcastRipFile::SetRipManagerInfo( const RIP_MANAGER_INFO* ripInfo )
-{
-  RIP_MANAGER_INFO info;
-  memcpy(&info, ripInfo, sizeof(info));
-  if ( m_recState.bFilenameSet && m_recState.bStreamSet ) //wait for RM to give all info needed
-  {
-    //we got everything we need
-    //look if we have some metainformation (change of trackname)
-    //RM returns Trackname like StreamName, if there is no Meta-Info
-    //(or maybe he is not capable sometimes?!?)
-    if ( strcmp( m_szFileName, m_szStreamName ) != 0 )
-      m_recState.bHasMetaData = true;
-    else
-      m_recState.bHasMetaData = false;
-    m_recState.bCanRecord = true;  //now we are ready for recording...
-  }
-  else
-  {
-    //put relevant data to members
-    if ( !m_recState.bFilenameSet )  //check for filename
-    {
-      strcpy( m_szFileName, info.filename );
-      if ( m_szFileName[0] != '\0' ) //recheck, just to be sure...
-      {
-        m_recState.bFilenameSet = true;
-      }
-    }
-    if ( !m_recState.bStreamSet ) //and for stream name
-    {
-      strcpy( m_szStreamName, info.streamname );
-      if ( m_szStreamName[0] != '\0' ) //recheck, just to be sure...
-      {
-        m_recState.bStreamSet = true;
-      }
-    }
-  }
-}
-
-bool CShoutcastRipFile::Record()
-{
-  //open file for logging now
-  if ( m_logFile == NULL ) //will be done only the first time or if path not set!
-  {
-    char logFilename[1024];
-    CStdString strHomePath = g_guiSettings.GetString("audiocds.recordingpath");
-#ifndef _LINUX
-    sprintf(logFilename, "%s\\recordings.log", strHomePath.c_str() );
-#else
-    sprintf(logFilename, "%s/recordings.log", strHomePath.c_str() );
-#endif
-    m_logFile = fopen_utf8( logFilename, "at+");
-  }
-
-  PrepareRecording();
-  m_ripFile = fopen_utf8( m_szFilteredFileName, "wb+" );
-
-  char logRecording[2048];
-  //we log this, for users that want to change id3 tags afterward...
-  sprintf(logRecording, "%s     ( StreamName: %s )     ( TrackName: %s )\n",
-          m_szFilteredFileName,
-          m_szStreamName,
-          m_szFileName );
-  if ( m_logFile != NULL )
-  {
-    fwrite(logRecording, strlen(logRecording), 1, m_logFile);
-    fflush( m_logFile );     //Flush, if file isn't proberly closed afterwards (when user turns off xbox)
-  }
-  //  XTRACE(logRecording);
-  if ( m_ripFile != NULL )
-  {
-    m_recState.bRecording = true;
-  }
-  else
-  {
-    m_recState.bRecording = false;
-  }
-
-  return m_recState.bRecording;
-}
-
-bool CShoutcastRipFile::CanRecord()
-{
-
-  return m_recState.bCanRecord;
-}
-
-void CShoutcastRipFile::StopRecording()
-{
-  m_recState.bRecording = false; //stop writing, so we can write ID3 info
-  if (m_ripFile)
-  {
-    fclose(m_ripFile);
-    m_ripFile = NULL;
-    // Write collected ID3 Data to file
-    CID3Tag id3tag;
-    id3tag.SetMusicInfoTag(m_Tag);
-    id3tag.Write(m_szFilteredFileName);
-  }
-}
-
-bool CShoutcastRipFile::IsRecording()
-{
-  return m_recState.bRecording;
-}
-
-void CShoutcastRipFile::Write( char *buf, unsigned long size )
-{
-  if ( m_recState.bRecording && m_ripFile != NULL )
-  {
-    fwrite(buf, size, 1, m_ripFile);
-  }
-}
-
-void CShoutcastRipFile::SetTrackname( const char *trackName )
-{
-  if ( m_recState.bRecording && m_recState.bHasMetaData)  //if we are already recording, swap the file
-  {
-    StopRecording();
-    memset( m_szFileName, '\0', sizeof(m_szFileName)); //clear buffer
-    strcpy( m_szFileName, trackName ); //swap
-    m_iTrackCount++;
-    Record();
-  }
-  else
-  {
-    memset( m_szFileName, '\0', sizeof(m_szFileName)); //clear buffer
-    strcpy( m_szFileName, trackName ); //swap only filenames
-    if ( strcmp( m_szFileName, m_szStreamName ) != 0 ) //sometimes it takes a moment for RM to get the real TrackName
-      m_recState.bHasMetaData = true;
-  }
-}
-
-void CShoutcastRipFile::PrepareRecording( )
-{
-  //"init"
-  m_Tag.Clear();
-  memset( m_szFilteredFileName, '\0', sizeof(m_szFilteredFileName)); //clear buffer
-
-
-  //Get the directory
-  //first copy the fileName to preserve info of the original RM message
-  strcpy(m_szFilteredFileName, m_szFileName );
-  char directoryName[1124];
-  GetDirectoryName(directoryName);
-  RemoveIllegalChars( directoryName );
-
-
-
-  //sometimes it happens, that .mp3 is already at the end, then strip it
-  int lastFour = strlen( m_szFilteredFileName ) - 4;
-  if ( strcmp( &m_szFilteredFileName[lastFour], ".mp3") == 0 )
-  {
-    m_szFilteredFileName[lastFour] = '\0';
-  }
-  RemoveLastSpace( m_szFilteredFileName );
-  RemoveIllegalChars( m_szFilteredFileName ); //first remove all unsupported chars
-  //now distinguish between
-  if ( m_recState.bHasMetaData )
-  {
-    //The filename of RM will be something like "Oasis - Champagne Supernova", thus
-    //So, we will make a file i.e "f:music\Record\Limbik Frequencies\Oasis - Champagne Supernova.mp3"
-
-    CStdString strHomePath = g_guiSettings.GetString("audiocds.recordingpath");
-    char szFilePath[1024];
-#ifndef _LINUX
-    sprintf( szFilePath, "%s\\%s", strHomePath.c_str(), directoryName );
-#else
-    sprintf( szFilePath, "%s/%s", strHomePath.c_str(), directoryName );
-#endif
-    SetFilename( szFilePath, m_szFilteredFileName );
-    //get the artist and trackname
-    char szArtist[1124];
-    char szTrackName[1124];
-    char szTokens[1024];
-    char* cursor;
-    bool tokenUsed = false;
-    bool foundArtist = false;
-    bool foundTrackName = false;
-    strcpy( szTokens, m_szFileName );
-    cursor = strtok(szTokens, "-");
-    while (cursor != NULL)
-    {
-      tokenUsed = false;
-      //we will look for two strings,
-      //sometimes there's a track number, wich we will throw away
-      if ( !foundArtist )
-      {
-        if ( atoi( cursor ) == 0 )
-        {
-          //its a string
-          strcpy(szArtist, cursor );
-          foundArtist = true;
-          tokenUsed = true;
-        }
-      }
-      if ( !foundTrackName && !tokenUsed )
-      {
-        if ( atoi( cursor ) == 0 )
-        {
-          //its a string
-          strcpy(szTrackName, cursor );
-          foundTrackName = true;
-          tokenUsed = true;
-        }
-      }
-      cursor = strtok (NULL, "-");
-    }
-    if ( foundTrackName )         //lets hope we found a track name, else it will be unknown
-      m_Tag.SetTitle(szTrackName);
-    if ( foundArtist )          //lets hope we found an artist, else it will be unknown
-      m_Tag.SetArtist(szArtist);
-    m_Tag.SetAlbum(directoryName);  //Jazzmusique (Album is like Directory)
-  }
-  else
-  {
-    //here we will make a file i.e "f:music\Record\Jazzmusique\Jazzmusique - 3.mp3"
-    CStdString strHomePath = g_guiSettings.GetString("audiocds.recordingpath");
-    char szFilePath[1024];
-    char szTitle[1124];             //i.e.
-
-    //Set the filename
-#ifndef _LINUX
-    sprintf( szFilePath, "%s\\%s", strHomePath.c_str(), directoryName );
-#else
-    sprintf( szFilePath, "%s/%s", strHomePath.c_str(), directoryName );
-#endif
-    SetFilename( szFilePath, directoryName ); //file name like Directory
-
-    //set the remaining tags
-    sprintf( szTitle, "%s %i", directoryName, m_iTrackCount );
-    m_Tag.SetTitle( szTitle );       //Jazzmusique 3
-    m_Tag.SetAlbum( directoryName );      //Jazzmusique (Album is like Directory)
-    m_Tag.SetArtist( "Shoutcast" );     //Shoutcast
-  }
-}
-
-void CShoutcastRipFile::SetFilename( const char* filePath, const char* fileName )
-{
-  //first look if we need to create the directory
-  XFILE::CDirectory::Create(filePath);
-  CFileItemList items;
-  XFILE::CDirectory::GetDirectory(filePath, items, ".mp3", false);
-  items.SetFastLookup(true);
-
-  CStdString file;
-  for (int i = m_iTrackCount; i <= MAX_RECORDED_TRACKS; i++ )
-  {
-    if ( m_recState.bHasMetaData )
-      file.Format("%i - %s.mp3", i, fileName); // will be "TRACKNUMBER - FILENAME.mp3"
-    else
-      file.Format("%s - %i.mp3", fileName, i); // will be "FILENAME - TRACKNUMBER.mp3"
-    file = CUtil::AddFileToFolder(filePath, CUtil::MakeLegalFileName(file));
-    if (!items.Get(file))
-    {
-      strcpy( m_szFilteredFileName, file.c_str() );
-      //set the appropriate trackNumber
-      m_Tag.SetTrackNumber(i);
-      if ( !m_recState.bHasMetaData )
-        m_iTrackCount = i;
-      return;
-    }
-  }
-  //if its the MAX_RECORDED_TRACKS. file, we overwrite it
-  strcpy( m_szFilteredFileName, file.c_str() );
-  return;
-}
-
-void CShoutcastRipFile::RemoveIllegalChars( char *szRemoveIllegal )
-{
-  static char legalChars[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890!#$%&'()-@[]^_`{}~ ";
-  char *cursor;
-  for (cursor = szRemoveIllegal; *(cursor += strspn(cursor, legalChars)); /**/ )
-    *cursor = '_';
-}
-
-
-//Sets the directory to a stripped stream name.
-//Here is where most problems occure: It is hard to implement something fast
-//which works for all streams and results in a meaningful name...
-void CShoutcastRipFile::GetDirectoryName( char* directoryName )
-{
-  char szStrippedStreamName[30]; //max 30 chars
-  memmove(szStrippedStreamName, m_szStreamName, 30);
-  // First start only at the place, where the first alphabetical character occures
-  //this is for example: "...::::Beatblender::::...."
-  char alphabet[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
-  int pos = strcspn (szStrippedStreamName, alphabet);;
-  memmove(directoryName, szStrippedStreamName + pos, 29 - pos );
-  directoryName[29] = '\0'; //the last one should be \0
-
-  //sometimes streams look like "Streamname - Shitty info",
-  //then remove that Shitty info
-  CutAfterLastChar(directoryName, '-' );
-
-  //or then theylook like "Streamname: Shitty info - other shitty info", :-(
-  //then remove that Shitty info
-  CutAfterLastChar(directoryName, ':' );
-
-  RemoveLastSpace(directoryName);        //also remove the last space, else if used as path -> crash
-}
-
-void CShoutcastRipFile::CutAfterLastChar( char* szToBeCutted, int where )
-{
-  char * cursor;
-  cursor = strchr( szToBeCutted, where );
-  if ( cursor != NULL )
-    szToBeCutted[cursor - szToBeCutted] = '\0';
-}
-
-void CShoutcastRipFile::RemoveLastSpace( char* szToBeRemoved )
-{
-  if ( szToBeRemoved[strlen(szToBeRemoved) - 1] == ' ' )
-    szToBeRemoved[strlen(szToBeRemoved) - 1] = '\0';
-}
-
-void CShoutcastRipFile::GetMusicInfoTag(CMusicInfoTag& tag)
-{
-  if ( m_recState.bFilenameSet && m_recState.bStreamSet )
-  {
-    tag.Clear();
-    //now distinguish between
-    if ( m_recState.bHasMetaData )
-    {
-      //The filename of RM will be something like "Oasis - Champagne Supernova", thus
-      //So, we will make a file i.e "f:music\Record\Limbik Frequencies\Oasis - Champagne Supernova.mp3"
-      //get the artist and trackname
-      char szArtist[1124];
-      char szTrackName[1124];
-      char szTokens[1024];
-      char* cursor;
-      bool tokenUsed = false;
-      bool foundArtist = false;
-      bool foundTrackName = false;
-      strcpy( szTokens, m_szFileName );
-      cursor = strtok(szTokens, "-");
-      if (!cursor) cursor = strtok(szTokens, ",");
-      while (cursor != NULL)
-      {
-        tokenUsed = false;
-        //we will look for two strings,
-        //sometimes there's a track number, wich we will throw away
-        if ( !foundArtist )
-        {
-          if ( atoi( cursor ) == 0 )
-          {
-            //its a string
-            strcpy(szArtist, cursor );
-            foundArtist = true;
-            tokenUsed = true;
-          }
-        }
-        if ( !foundTrackName && !tokenUsed )
-        {
-          if ( atoi( cursor ) == 0 )
-          {
-            //its a string
-            strcpy(szTrackName, cursor );
-            foundTrackName = true;
-            tokenUsed = true;
-          }
-        }
-        cursor = strtok (NULL, "-");
-        //if (!cursor) cursor=strtok(NULL,",");
-      }
-      if ( foundTrackName )         //lets hope we found a track name, else it will be unknown
-        tag.SetTitle(szTrackName);
-      else
-        tag.SetTitle(m_szStreamName);
-      if ( foundArtist )          //lets hope we found an artist, else it will be unknown
-        tag.SetArtist(szArtist);
-      tag.SetAlbum(m_szStreamName);  //Jazzmusique (Album is like Directory)
-    }
-    else
-    {
-      tag.Clear();
-      tag.SetTitle(m_szStreamName);
-    }
-
-  }
-}

Deleted: branches/Dharma/xbmc/FileSystem/ShoutcastRipFile.h
===================================================================
--- branches/Dharma/xbmc/FileSystem/ShoutcastRipFile.h	2010-11-27 17:46:35 UTC (rev 35486)
+++ branches/Dharma/xbmc/FileSystem/ShoutcastRipFile.h	2010-11-27 17:46:55 UTC (rev 35487)
@@ -1,87 +0,0 @@
-#ifndef CShoutcastRipFile_H
-#define CShoutcastRipFile_H
-/*
- *      Copyright (C) 2005-2008 Team XBMC
- *      http://www.xbmc.org
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *  http://www.gnu.org/copyleft/gpl.html
- *
- */
-
-
-#include "MusicInfoTag.h"
-
-typedef struct RecStateSt
-{
-  bool bRecording;
-  bool bCanRecord;
-  bool bTrackChanged;
-  bool bFilenameSet;
-  bool bStreamSet;
-  bool bHasMetaData;
-}
-RecState;
-
-/* prototype */
-typedef struct RIP_MANAGER_INFOst RIP_MANAGER_INFO;
-
-//if one would like to make other IFiles recordable, it would be
-//great, to define a superclass for this one with differend useful
-//functions for all, like FilterFileName(), Record(),...
-class CShoutcastRipFile
-{
-public:
-
-  CShoutcastRipFile();
-  virtual ~CShoutcastRipFile();
-
-
-  void SetRipManagerInfo( const RIP_MANAGER_INFO* ripInfo );
-  void SetTrackname( const char* trackname );
-
-
-  bool Record();
-  bool CanRecord();
-  void StopRecording();
-  bool IsRecording();
-  void Write( char *buf, unsigned long size );
-  void Reset();
-  void GetMusicInfoTag(MUSIC_INFO::CMusicInfoTag& tag);
-protected:
-
-
-private:
-
-  void PrepareRecording( );
-  void RemoveIllegalChars( char *szRemoveIllegal );
-  void GetDirectoryName( char* directoryName );
-  void SetFilename( const char* filePath, const char* fileName );
-  void CutAfterLastChar( char* szToBeCutted, int where );
-  void RemoveLastSpace( char* szToBeRemoved );
-
-
-  RecState m_recState;
-  int m_iTrackCount;
-  char m_szFileName[1024]; //FIXME: i think, that length could be optimized here
-  char m_szFilteredFileName[1024];
-  char m_szStreamName[1024];
-  FILE* m_ripFile;
-  FILE* m_logFile;
-  MUSIC_INFO::CMusicInfoTag m_Tag;
-};
-
-
-#endif

Modified: branches/Dharma/xbmc/cores/paplayer/PAPlayer.cpp
===================================================================
--- branches/Dharma/xbmc/cores/paplayer/PAPlayer.cpp	2010-11-27 17:46:35 UTC (rev 35486)
+++ branches/Dharma/xbmc/cores/paplayer/PAPlayer.cpp	2010-11-27 17:46:55 UTC (rev 35487)
@@ -47,8 +47,6 @@
 #define TIME_TO_CACHE_NEXT_FILE 5000L         // 5 seconds
 #define TIME_TO_CROSS_FADE      10000L        // 10 seconds
 
-extern XFILE::CFileShoutcast* m_pShoutCastRipper;
-
 // PAP: Psycho-acoustic Audio Player
 // Supporting all open  audio codec standards.
 // First one being nullsoft's nsv audio decoder format
@@ -1089,30 +1087,6 @@
   return false;
 }
 
-bool PAPlayer::CanRecord()
-{
-  if (!m_pShoutCastRipper) return false;
-  return m_pShoutCastRipper->CanRecord();
-}
-
-bool PAPlayer::IsRecording()
-{
-  if (!m_pShoutCastRipper) return false;
-  return m_pShoutCastRipper->IsRecording();
-}
-
-bool PAPlayer::Record(bool bOnOff)
-{
-  if (!m_pShoutCastRipper) return false;
-  if (bOnOff && IsRecording()) return true;
-  if (bOnOff == false && IsRecording() == false) return true;
-  if (bOnOff)
-    return m_pShoutCastRipper->Record();
-
-  m_pShoutCastRipper->StopRecording();
-  return true;
-}
-
 void PAPlayer::WaitForStream()
 {
   // should we wait for our other stream as well?

Modified: branches/Dharma/xbmc/cores/paplayer/PAPlayer.h
===================================================================
--- branches/Dharma/xbmc/cores/paplayer/PAPlayer.h	2010-11-27 17:46:35 UTC (rev 35486)
+++ branches/Dharma/xbmc/cores/paplayer/PAPlayer.h	2010-11-27 17:46:55 UTC (rev 35487)
@@ -89,9 +89,6 @@
   virtual void SeekTime(__int64 iTime = 0);
   // Skip to next track/item inside the current media (if supported).
   virtual bool SkipNext();
-  virtual bool CanRecord() ;
-  virtual bool IsRecording();
-  virtual bool Record(bool bOnOff) ;
 
   void StreamCallback( LPVOID pPacketContext );
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 35500
          http://xbmc.svn.sourceforge.net/xbmc/?rev=35500&view=rev
Author:   spiff_
Date:     2010-11-28 10:00:22 +0000 (Sun, 28 Nov 2010)

Log Message:
-----------
updated: ticket #10766 - hungarian translation. thanks to alanwww1
updated: ticket #10769, #10770 - turkish translation. thanks to queep
updated: ticket #10773 - dutch translation. thanks to adje
updated: ticket #10780 - japanese translation. thanks to kyouhei

(cherry picked from commit 8541b9e2a5c44fcff428b76295c60d981841db9e)

Modified Paths:
--------------
    branches/Dharma/addons/skin.confluence/language/Turkish/strings.xml
    branches/Dharma/language/Dutch/strings.xml
    branches/Dharma/language/Hungarian/strings.xml
    branches/Dharma/language/Japanese/strings.xml
    branches/Dharma/language/Turkish/strings.xml

Modified: branches/Dharma/addons/skin.confluence/language/Turkish/strings.xml
===================================================================
--- branches/Dharma/addons/skin.confluence/language/Turkish/strings.xml	2010-11-28 09:53:02 UTC (rev 35499)
+++ branches/Dharma/addons/skin.confluence/language/Turkish/strings.xml	2010-11-28 10:00:22 UTC (rev 35500)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <!--Translator: Özgür BASKIN (queeup)-->
 <!--Email: ozgur.baskin@...>
-<!--Date of translation: 18/10/2010-->
-<!--Turkish strings based on English strings revision 34584-->
+<!--Date of translation: 26/11/2010-->
+<!--Turkish strings based on English strings revision 35254-->
 <strings>
   <!-- Misc labels -->
   <string id="31000">Değiştir</string>
@@ -61,7 +61,7 @@
   <string id="31104">Fragmanları pencere içinde oynat [COLOR=grey3](Sadece Video Bilgisi İletişim Kutusu İçin)[/COLOR]</string>
   <string id="31105">Ortam başlıklarını arkaplan tarayıcısında göster</string>
   <string id="31106">Çeşitli seçenekler</string>
-  <string id="31107">Etiket okumayı video dosya adlarında gizle?? [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]</string>
+  <string id="31107">Video dosya adlarında etiket okumayı gizle [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]</string>
   <string id="31108">Ana Menü Tuşlarını Gizle</string>
   <string id="31109">Medya arka planları</string>
   <string id="31110">Medya Türü için Arka planı değiştir</string>
@@ -73,20 +73,23 @@
   <string id="31116"></string>
   <string id="31117">Son Eklenen Videoları Göster</string>
   <string id="31118">Ana Sayfa Programlar Altmenüsü</string>
-  <string id="31119">Özel Eklenti Tuşunu Etkinleştir</string>
+  <string id="31119"></string>  <!-- blanked 2010-11-12 -->
   <string id="31120">TUŞ ETİKETİ</string>
-  <string id="31121">EKLENTİ YOLU</string>
+  <string id="31121"></string>  <!-- blanked 2010-11-12 -->
   <string id="31122">Hava Durumu Sayfası</string>
   <string id="31123">TV Programları için "Afiş" yerine "Poster" kullan</string>
   <string id="31124">Arkaplanda Oynatılan Videoyu göster</string>
   <string id="31125">Arkaplanda Görsel Ögeyi göster</string>
 
-  <string id="31126">Müzik OSD'de Lyrics'i etkinleştir</string>
-  <string id="31127">LYRICS EKLENTİ YOLU</string>
+  <string id="31126"></string>  <!-- blanked 2010-11-12 -->
+  <string id="31127"></string>  <!-- blanked 2010-11-12 -->
   <string id="31128">Lyrics</string>
-  <string id="31129">Video OSD'de Altyazı İndirmesini etkinleştir</string>
-  <string id="31130">ALTYAZI EKLENTİ YOLU</string>
+  <string id="31129"></string>  <!-- blanked 2010-11-12 -->
+  <string id="31130"></string>  <!-- blanked 2010-11-12 -->
+  
   <string id="31131">Yatay Ana Menü</string>
+  <string id="31132">Lyrics Eklentisi</string>
+  <string id="31133">Altyazı Eklentisi</string>
 
   <string id="31140">Müzik OSD</string>
   <string id="31141">Video OSD</string>

Modified: branches/Dharma/language/Dutch/strings.xml
===================================================================
--- branches/Dharma/language/Dutch/strings.xml	2010-11-28 09:53:02 UTC (rev 35499)
+++ branches/Dharma/language/Dutch/strings.xml	2010-11-28 10:00:22 UTC (rev 35500)
@@ -681,7 +681,7 @@
   <string id="770">Fout %i: gedeelde map niet beschikbaar</string>
   <string id="771"></string>
   <string id="772">Geluidshardware</string>
-  <string id="773">Uitpakken</string>
+  <string id="773">Zoeken</string>
   <string id="774">Map schermbeveiliging door diavoorstelling</string>
   <string id="775">Netwerkverbinding</string>
   <string id="776">- Naam draadloos netwerk (ESSID)</string>

Modified: branches/Dharma/language/Hungarian/strings.xml
===================================================================
--- branches/Dharma/language/Hungarian/strings.xml	2010-11-28 09:53:02 UTC (rev 35499)
+++ branches/Dharma/language/Hungarian/strings.xml	2010-11-28 10:00:22 UTC (rev 35500)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!--Translator: Bence Nádas and Attila Jakosa-->
 <!--Email: attila.jakosa@...>
-<!--Date of translation: 19/09/2010-->
-<!--Based on English r33901-->
+<!--Date of translation: 25/11/2010-->
+<!--Based on English r35368-->
 <!--$Revision$-->
 <strings>
   <string id="0">Program</string>
@@ -1027,6 +1027,7 @@
   <string id="13013">Újraindítás</string>
   <string id="13014">Kicsinyítés</string>
   <string id="13015">Be(ki)kapcsoló gomb művelet</string>
+  <string id="13016">Gép kikapcsolása</string>
 
   <string id="13020">Lehet hogy egy másik bejelentkezés aktív (ssh)?</string>
   <string id="13021">Külső meghajtó csatlakozott</string>
@@ -1337,7 +1338,7 @@
   <string id="14038">A hálózati beállítások megváltoztatva</string>
   <string id="14039">Az XBMC-t újra kell indítani, a hálózati beállítások</string>
   <string id="14040">megváltoztatásához. Újraindítás most?</string>
-  <string id="14041"></string>
+  <string id="14041">Internetkapcsolat sávszélesség-korlátozás</string>
 
   <string id="14043">- Leállítás lejátszás közben</string>
   <string id="14044">%i perc</string>
@@ -1781,6 +1782,7 @@
   <string id="20255">Első bejelentkezés, profilod szerkesztése</string>
   <string id="20256">HTS Tvheadend TV kliens</string>
   <string id="20257">VDR Streamdev TV kliens</string>
+  <string id="20258">MythTV kliens</string>
 
   <string id="20300">Webkiszolgáló könyvtár (HTTP)</string>
   <string id="20301">Webkiszolgáló könyvtár (HTTPS)</string>
@@ -2042,6 +2044,8 @@
   <string id="21451">Internet kapcsolat szükséges.</string>
   <string id="21452">Több beszerzése...</string>
   <string id="21453">Fájlrendszer</string>
+  <string id="21454">Hallgató</string>
+  <string id="21455">Hallgató</string>
 
   <string id="21800">Fájlnév</string>
   <string id="21801">Fájl helye</string>
@@ -2201,6 +2205,7 @@
   <string id="24015">Zenei videóklip információ</string>
   <string id="24016">Album információ</string>
   <string id="24017">Előadó információ</string>
+  <string id="24018">Szolgáltatások</string>
 
   <string id="24020">Beállítás</string>
   <string id="24021">Kikapcsolás</string>
@@ -2259,6 +2264,8 @@
   <string id="24096">A kiegészítőt működésképtelennek jelölték a tárhelyen.</string>
   <string id="24097">Akarod letiltani a számítógépeden?</string>
   <string id="24098">Működésképtelen</string>
+  <string id="24099">Átváltasz erre az arculatra ?</string>
+  <string id="25000">Értesítések</string>
 
   <!-- 29800-tól 29998 a default PM3 arculat-hoz foglalva -->
   <string id="29800">Médiatár mód</string>
@@ -2281,7 +2288,7 @@
   <string id="33008">Mentés</string>
   <string id="33009">Másolás</string>
   <string id="33010">Letöltési mappa megadása</string>
-  <string id="30011">Keresési idő</string>
+  <string id="33011">Keresési idő</string>
   <string id="33012">Rövid</string>
   <string id="33013">Hosszú</string>
   <string id="33014">DVD lejátszó használata az általános lejátszó helyett</string>

Modified: branches/Dharma/language/Japanese/strings.xml
===================================================================
--- branches/Dharma/language/Japanese/strings.xml	2010-11-28 09:53:02 UTC (rev 35499)
+++ branches/Dharma/language/Japanese/strings.xml	2010-11-28 10:00:22 UTC (rev 35500)
@@ -2,8 +2,9 @@
 <!--Language file translated with Team XBMC Translator-->
 <!--Translator: kyouhei-->
 <!--Email: Twitter: @kyouhei-->
-<!--Date of translation: 09/19/2010-->
+<!--Date of translation: 11/28/2010-->
 <!--$Revision$-->
+<!--Based on english strings version 35208-->
 <strings>
   <string id="0">プログラム</string>
   <string id="1">ピクチャ</string>
@@ -207,7 +208,7 @@
   <string id="290">Dynamic Range Compression</string>
   <string id="291">ビデオ</string>
   <string id="292">オーディオ</string>
-  <string id="293">字幕をブラウズする</string>
+  <string id="293">字幕を参照する</string>
   <string id="294">ブックマークの作成</string>
   <string id="296">ブックマークの削除</string>
   <string id="297">音声オフセット</string>
@@ -517,18 +518,19 @@
   <string id="648">Import Video Library</string>
   <string id="649">Importing</string>
   <string id="650">Exporting</string>
-  <string id="651">ライブラリをブラウズする</string>
+  <string id="651">ライブラリを参照する</string>
   <string id="652">製作年</string>
   <string id="653">ライブラリを更新</string>
   <string id="654">Show Debug Info</string>
   <string id="655">Browse for Executable</string>
-  <string id="656">Browse for Playlist</string>
-  <string id="657">Browse for Folder</string>
+  <string id="656">プレイリストを参照する</string>
+  <string id="657">フォルダを参照する</string>
   <string id="658">楽曲情報</string>
   <string id="660">Volume Amplification</string>
   <string id="661">Choose Export Folder</string>
   <string id="662">このファイルは存在しません。</string>
   <string id="663">ライブラリから削除しますか？</string>
+  <string id="664">スクリプトを参照する</string>
   <string id="700">ライブラリの整理</string>
   <string id="701">ライブラリから古い曲を削除します</string>
   <string id="702">このパスは以前にスキャンしました</string>
@@ -616,25 +618,25 @@
   <string id="1012">Shared Folder</string>
   <string id="1013">Port</string>
   <string id="1014">Username</string>
-  <string id="1015">Browse for Network Server</string>
+  <string id="1015">ネットワークサーバを参照する</string>
   <string id="1016">Enter the network address of the server</string>
   <string id="1017">Enter the path on the server</string>
   <string id="1018">Enter the port number</string>
   <string id="1019">Enter the username</string>
   <string id="1020">Add %s Source</string>
-  <string id="1021">Enter the paths or browse for the media locations.</string>
-  <string id="1022">Enter a name for this Media Source.</string>
+  <string id="1021">メディアロケーションのパスを入力するか、参照してください。</string>
+  <string id="1022">メディアソースの名前を入力してください。</string>
   <string id="1023">Browse for new share</string>
-  <string id="1024">Browse</string>
+  <string id="1024">参照</string>
   <string id="1025">Could not retrieve directory information.</string>
   <string id="1026">ソースを追加</string>
   <string id="1027">ソースを編集</string>
   <string id="1028">Edit %s Source</string>
   <string id="1029">Enter the new label</string>
-  <string id="1030">Browse for Image</string>
-  <string id="1031">Browse for Image Folder</string>
+  <string id="1030">イメージを参照する</string>
+  <string id="1031">イメージフォルダを参照する</string>
   <string id="1032">Add Network Location...</string>
-  <string id="1033">Browse for file</string>
+  <string id="1033">ファイルを参照する</string>
   <string id="1034">Submenu</string>
   <string id="1035">Enable Submenu Buttons</string>
   <string id="1036">お気に入り</string>
@@ -911,7 +913,7 @@
   <string id="13211">アラーム!</string>
   <string id="13212">%im%is でキャンセル</string>
   <string id="13249">RARファイル内から字幕を探す</string>
-  <string id="13250">字幕をブラウズする...</string>
+  <string id="13250">字幕を参照する...</string>
   <string id="13251">Move Item</string>
   <string id="13252">Move Item Here</string>
   <string id="13253">Cancel Move</string>
@@ -1025,9 +1027,9 @@
   <string id="13398">ショートカット</string>
   <string id="13399">冠詞(theなど)をソート対象から外す</string>
   <string id="13400">アルバム内クロスフェード</string>
-  <string id="13401">Browse for %s</string>
+  <string id="13401">%sを参照する</string>
   <string id="13402">Show track position</string>
-  <string id="13403">Clear Default</string>
+  <string id="13403">デフォルトをクリア</string>
   <string id="13404">Resume</string>
   <string id="13405">サムネイルを取得</string>
   <string id="13406">画像情報</string>
@@ -1113,7 +1115,10 @@
   <string id="14076">お気に入りに追加</string>
   <string id="14077">お気に入りから削除</string>
   <string id="14078">スキンカラー</string>
+  <string id="14080">タイムゾーン</string>
+  <string id="14081">ファイルリスト</string>
   <string id="14082">EXIF情報を表示</string>
+  <string id="14089">字幕に使用するフォント</string>
   <string id="15015">Remove</string>
   <string id="15016">Games</string>
   <string id="15019">追加</string>
@@ -1386,7 +1391,7 @@
   <string id="20150">シャットダウンタイマを設定</string>
   <string id="20151">シャットダウンタイマをキャンセル</string>
   <string id="20152">Lock preferences for %s</string>
-  <string id="20153">Browse...</string>
+  <string id="20153">参照...</string>
   <string id="20155">Storage Information</string>
   <string id="20156">Hard Disk Information</string>
   <string id="20157">DVD-ROM Information</string>
@@ -1535,18 +1540,18 @@
   <string id="20407">Scraper Settings</string>
   <string id="20408">クリップ情報を取得中</string>
   <string id="20409">TV番組情報を取得中</string>
-  <string id="20410">Trailer</string>
-  <string id="20411">Flatten</string>
-  <string id="20412">Flatten TV Shows</string>
+  <string id="20410">予告</string>
+  <string id="20411">フラット化</string>
+  <string id="20412">TV番組のフラット化</string>
   <string id="20413">Fanartを取得</string>
   <string id="20414">ビデオ及び音楽ライブラリでFanartを表示する</string>
   <string id="20415">新しいコンテンツをスキャン中</string>
   <string id="20416">初回放映</string>
-  <string id="20417">Writer</string>
+  <string id="20417">脚本家</string>
   <string id="20418">Clean File and Folder Names</string>
   <string id="20420">Never</string>
-  <string id="20421">If Only One Season</string>
-  <string id="20422">Always</string>
+  <string id="20421">1シーズンのみの場合</string>
+  <string id="20422">常に</string>
   <string id="20423">Has Trailer</string>
   <string id="20424">False</string>
   <string id="20425">Fanart Slideshow</string>
@@ -1731,10 +1736,11 @@
   <string id="22018">Live Channels</string>
   <string id="22019">Recordings by title</string>
   <string id="22020">Guide</string>
+  <string id="22079">デフォルトの動作</string>
   <string id="22082">さらに...</string>
   <string id="24067">現在ダウンロード中のAdd-on</string>
   <string id="29800">Library Mode</string>
   <string id="29801">QWERTYキーボード</string>
   <string id="29802">パススルーオーディオ使用中</string>
   <string id="33061">メニュー</string>
-</strings>
\ No newline at end of file
+</strings>

Modified: branches/Dharma/language/Turkish/strings.xml
===================================================================
--- branches/Dharma/language/Turkish/strings.xml	2010-11-28 09:53:02 UTC (rev 35499)
+++ branches/Dharma/language/Turkish/strings.xml	2010-11-28 10:00:22 UTC (rev 35500)
@@ -4,8 +4,8 @@
 <!--Date of translation: 06/07/2006-->
 <!--Translator: Özgür BASKIN (queeup)-->
 <!--Email: ozgur.baskin@...>
-<!--Date of translation: 21/10/2010-->
-<!--Based on English strings revision 34887-->
+<!--Date of translation: 26/11/2010-->
+<!--Based on English strings revision 35368-->
 <strings>
   <string id="0">Programlar</string>
   <string id="1">Resimler</string>
@@ -1340,7 +1340,7 @@
   <string id="14038">Ağ ayarları değişti</string>
   <string id="14039">Ayarların etkili olabilmesi için yeniden başlatmak gerekli.</string>
   <string id="14040">XBMC'yi yeniden başlatmak istiyor musunuz?</string>
-  <string id="14041"></string>
+  <string id="14041">İnternet bağlantısı bant genişliği sınırlaması</string>
 
   <string id="14043">- Ortam oynatılıyor olsa bile kapat</string>
   <string id="14044">%i dk</string>
@@ -1940,6 +1940,8 @@
   <string id="20451">Ülkeler</string>
   <string id="20452">bölüm</string>
   <string id="20453">bölüm</string>
+  <string id="20454">Dinleyici</string>
+  <string id="20455">Dinleyiciler</string>
   <!-- up to 21329 is reserved for the video db !! !-->
 
   <string id="21330">Gizli dosya ve dizinleri göster</string>
@@ -2206,6 +2208,7 @@
   <string id="24015">Müzik videosu bilgisi</string>
   <string id="24016">Albüm bilgisi</string>
   <string id="24017">Sanatçı bilgisi</string>
+  <string id="24018">Hizmetler</string>
 
   <string id="24020">Yapılandır</string>
   <string id="24021">Devre dışı bırak</string>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 35528
          http://xbmc.svn.sourceforge.net/xbmc/?rev=35528&view=rev
Author:   theuni
Date:     2010-11-30 00:19:12 +0000 (Tue, 30 Nov 2010)

Log Message:
-----------
removed: last traces of libshout.

(cherry picked from commit c3611f1fd570d34800ecb1f848fd959e1811b7a4)

Modified Paths:
--------------
    branches/Dharma/.gitignore
    branches/Dharma/guilib/system.h
    branches/Dharma/tools/Linux/packaging/debian/copyright

Modified: branches/Dharma/.gitignore
===================================================================
--- branches/Dharma/.gitignore	2010-11-30 00:19:02 UTC (rev 35527)
+++ branches/Dharma/.gitignore	2010-11-30 00:19:12 UTC (rev 35528)
@@ -1126,11 +1126,6 @@
 /xbmc/lib/libsamplerate/libsamplerate_win32/Debug
 /xbmc/lib/libsamplerate/libsamplerate_win32/Release
 
-# /xbmc/lib/libshout/
-/xbmc/lib/libshout/Makefile
-/xbmc/lib/libshout/libshout/Debug
-/xbmc/lib/libshout/libshout/Release
-
 /xbmc/lib/libsquish/Makefile
 /xbmc/lib/libsquish/lib/squishd.lib
 /xbmc/lib/libsquish/lib/squish.lib

Modified: branches/Dharma/guilib/system.h
===================================================================
--- branches/Dharma/guilib/system.h	2010-11-30 00:19:02 UTC (rev 35527)
+++ branches/Dharma/guilib/system.h	2010-11-30 00:19:12 UTC (rev 35528)
@@ -39,7 +39,6 @@
 #define HAS_KARAOKE
 #define HAS_SCREENSAVER
 #define HAS_PYTHON
-#define HAS_SHOUTCAST
 #define HAS_SYSINFO
 #define HAS_UPNP
 #define HAS_VIDEO_PLAYBACK

Modified: branches/Dharma/tools/Linux/packaging/debian/copyright
===================================================================
--- branches/Dharma/tools/Linux/packaging/debian/copyright	2010-11-30 00:19:02 UTC (rev 35527)
+++ branches/Dharma/tools/Linux/packaging/debian/copyright	2010-11-30 00:19:12 UTC (rev 35528)
@@ -844,24 +844,6 @@
     http://www.python.org/psf/license/ and is repeated below under the section
     "License: PSF License for Python 2.4".
 
-libshout - Library which can be used to write a source client like ices
-<http://www.icecast.org/>
-
-    Copyright © 2004 the Icecast team <team@...>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
 libopendaap - library which enables applications to discover, and connect to,
 iTunes music shares.
 <http://craz.net/programs/itunes/libopendaap.html>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 35593
          http://xbmc.svn.sourceforge.net/xbmc/?rev=35593&view=rev
Author:   davilla
Date:     2010-12-08 01:12:37 +0000 (Wed, 08 Dec 2010)

Log Message:
-----------
merge -> fixed, trac #10830, OGG files can be played but don't get scanned, this has been broke a long time

Modified Paths:
--------------
    branches/Dharma/XBMC.xcodeproj/project.pbxproj
    branches/Dharma/xbmc/DllPaths_generated.h.in

Modified: branches/Dharma/XBMC.xcodeproj/project.pbxproj
===================================================================
--- branches/Dharma/XBMC.xcodeproj/project.pbxproj	2010-12-08 01:09:20 UTC (rev 35592)
+++ branches/Dharma/XBMC.xcodeproj/project.pbxproj	2010-12-08 01:12:37 UTC (rev 35593)
@@ -1025,6 +1025,8 @@
 		F599CD2C108E65370010EC2A /* IoSupport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F599CD29108E65370010EC2A /* IoSupport.cpp */; };
 		F599CD74108E6A7A0010EC2A /* DarwinStorageProvider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F599CD73108E6A7A0010EC2A /* DarwinStorageProvider.cpp */; };
 		F599CD75108E6A7A0010EC2A /* DarwinStorageProvider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F599CD73108E6A7A0010EC2A /* DarwinStorageProvider.cpp */; };
+		F59FC1A712AF11E70063D9F2 /* libvorbisfile.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F59FC1A612AF11E70063D9F2 /* libvorbisfile.dylib */; };
+		F59FC1A812AF11E70063D9F2 /* libvorbisfile.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F59FC1A612AF11E70063D9F2 /* libvorbisfile.dylib */; };
 		F5A00B080EFDDDFC00CD59F3 /* AudioRendererFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A00B070EFDDDFC00CD59F3 /* AudioRendererFactory.cpp */; };
 		F5A00B260EFDE44100CD59F3 /* NullDirectSound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A00B240EFDE44100CD59F3 /* NullDirectSound.cpp */; };
 		F5A1C8750F6B06CF00A96ABD /* AnimatedGif.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E138C0D25F9F900618676 /* AnimatedGif.cpp */; };
@@ -3685,6 +3687,7 @@
 		F599CD2A108E65370010EC2A /* IoSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IoSupport.h; sourceTree = "<group>"; };
 		F599CD72108E6A7A0010EC2A /* DarwinStorageProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DarwinStorageProvider.h; sourceTree = "<group>"; };
 		F599CD73108E6A7A0010EC2A /* DarwinStorageProvider.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DarwinStorageProvider.cpp; sourceTree = "<group>"; };
+		F59FC1A612AF11E70063D9F2 /* libvorbisfile.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libvorbisfile.dylib; path = /opt/local/lib/libvorbisfile.dylib; sourceTree = "<absolute>"; };
 		F5A00B070EFDDDFC00CD59F3 /* AudioRendererFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = AudioRendererFactory.cpp; path = xbmc/cores/AudioRenderers/AudioRendererFactory.cpp; sourceTree = SOURCE_ROOT; };
 		F5A00B090EFDDE5F00CD59F3 /* AudioRendererFactory.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AudioRendererFactory.h; path = xbmc/cores/AudioRenderers/AudioRendererFactory.h; sourceTree = SOURCE_ROOT; };
 		F5A00B240EFDE44100CD59F3 /* NullDirectSound.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = NullDirectSound.cpp; path = xbmc/cores/AudioRenderers/NullDirectSound.cpp; sourceTree = SOURCE_ROOT; };
@@ -3882,6 +3885,7 @@
 				F5A7A6F4112893440059D6AA /* libjsonrpc.a in Frameworks */,
 				F5A7A6F71128934C0059D6AA /* libhttpapi.a in Frameworks */,
 				F5A7A8131128F4DA0059D6AA /* libmicrohttpd.a in Frameworks */,
+				F59FC1A712AF11E70063D9F2 /* libvorbisfile.dylib in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3941,6 +3945,7 @@
 				F5A7A6F5112893440059D6AA /* libjsonrpc.a in Frameworks */,
 				F5A7A6F81128934D0059D6AA /* libhttpapi.a in Frameworks */,
 				F5A7A8141128F4DA0059D6AA /* libmicrohttpd.a in Frameworks */,
+				F59FC1A812AF11E70063D9F2 /* libvorbisfile.dylib in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -6866,6 +6871,7 @@
 				F5F241D7110BFCF4009126C6 /* libwavpack.dylib */,
 				F5D8F88B104CD47D004A11AB /* libmms.dylib */,
 				E3EB8F050D5D5C0300FFF489 /* libvorbis.dylib */,
+				F59FC1A612AF11E70063D9F2 /* libvorbisfile.dylib */,
 				E38E24240D26317D00618676 /* libfribidi.dylib */,
 				F57E213E0E3C3AB200700C9D /* libiconv.dylib */,
 				E38E24230D26317D00618676 /* libfreetype.dylib */,

Modified: branches/Dharma/xbmc/DllPaths_generated.h.in
===================================================================
--- branches/Dharma/xbmc/DllPaths_generated.h.in	2010-12-08 01:09:20 UTC (rev 35592)
+++ branches/Dharma/xbmc/DllPaths_generated.h.in	2010-12-08 01:12:37 UTC (rev 35593)
@@ -71,7 +71,7 @@
 #define DLL_PATH_MODPLUG_CODEC "@MODPLUG_SONAME@"
 #else
 #define DLL_PATH_FLAC_CODEC    "special://xbmcbin/system/players/paplayer/libFLAC-@...>"
-#define DLL_PATH_OGG_CODEC     "special://xbmcbin/system/players/paplayer/vorbisfile-@...>"
+#define DLL_PATH_OGG_CODEC     "libvorbisfile.3.2.0.dylib"
 #define DLL_PATH_MODPLUG_CODEC "special://xbmcbin/system/players/paplayer/libmodplug-@...>"
 #endif
 
@@ -104,9 +104,9 @@
 #define DLL_PATH_VORBIS        "@VORBIS_SONAME@"
 #else
 #define DLL_PATH_LAME_ENC      "special://xbmcbin/system/cdrip/lame_enc-@...>"
-#define DLL_PATH_OGG           "special://xbmcbin/system/cdrip/ogg-@...>"
-#define DLL_PATH_VORBIS_ENC    "special://xbmcbin/system/cdrip/vorbisenc-@...>"
-#define DLL_PATH_VORBIS        "special://xbmcbin/system/cdrip/vorbis-@...>"
+#define DLL_PATH_OGG           "libogg.0.5.3.dylib"
+#define DLL_PATH_VORBIS_ENC    "libvorbisenc.2.0.3.dylib"
+#define DLL_PATH_VORBIS        "libvorbis.0.4.0.dylib"
 #endif
 
 /* broadcom crystalhd */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 35604
          http://xbmc.svn.sourceforge.net/xbmc/?rev=35604&view=rev
Author:   wiso
Date:     2010-12-08 19:54:58 +0000 (Wed, 08 Dec 2010)

Log Message:
-----------
[WIN32] merged r35603 from trunk

Modified Paths:
--------------
    branches/Dharma/system/players/dvdplayer/avcodec-52.dll
    branches/Dharma/system/players/dvdplayer/avformat-52.dll
    branches/Dharma/system/players/dvdplayer/avutil-50.dll
    branches/Dharma/system/players/dvdplayer/postproc-51.dll
    branches/Dharma/system/players/dvdplayer/swscale-0.6.1.dll

Property Changed:
----------------
    branches/Dharma/
    branches/Dharma/addons/skin.confluence/720p/
    branches/Dharma/guilib/GUIControlFactory.cpp
    branches/Dharma/guilib/GUIControlFactory.h
    branches/Dharma/guilib/GUIImage.cpp
    branches/Dharma/guilib/GUIImage.h
    branches/Dharma/lib/libass/
    branches/Dharma/xbmc/MusicInfoTag.cpp
    branches/Dharma/xbmc/MusicInfoTagLoaderFactory.cpp
    branches/Dharma/xbmc/MusicInfoTagLoaderFactory.h
    branches/Dharma/xbmc/cores/AudioRenderers/IAudioCallback.h
    branches/Dharma/xbmc/cores/AudioRenderers/IAudioRenderer.h
    branches/Dharma/xbmc/cores/AudioRenderers/Win32DirectSound.cpp
    branches/Dharma/xbmc/cores/AudioRenderers/Win32DirectSound.h
    branches/Dharma/xbmc/cores/VideoRenderers/legacy/ComboRenderer.cpp
    branches/Dharma/xbmc/cores/VideoRenderers/legacy/ComboRenderer.h
    branches/Dharma/xbmc/cores/VideoRenderers/legacy/RGBRendererV2.cpp
    branches/Dharma/xbmc/cores/VideoRenderers/legacy/RGBRendererV2.h
    branches/Dharma/xbmc/cores/dvdplayer/Codecs/ffmpeg/
    branches/Dharma/xbmc/cores/dvdplayer/Codecs/ffmpeg/ffpresets/
    branches/Dharma/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/arm/
    branches/Dharma/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/asfenc.c
    branches/Dharma/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/arm/
    branches/Dharma/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/bfin/
    branches/Dharma/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/sh4/
    branches/Dharma/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/x86/
    branches/Dharma/xbmc/cores/paplayer/PAPlayer.cpp
    branches/Dharma/xbmc/cores/paplayer/PAPlayer.h
    branches/Dharma/xbmc/karaoke/Cdg.cpp
    branches/Dharma/xbmc/karaoke/Cdg.h
    branches/Dharma/xbmc/linux/HALPowerSyscall.cpp
    branches/Dharma/xbmc/linux/HALPowerSyscall.h
    branches/Dharma/xbmc/xbmc.cpp


Property changes on: branches/Dharma
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/karaoke:16819-17295
/branches/timidityupdate:16561-16749
/branches/xbmc-zeroconf/XBMC:18852-18854
/trunk:31904,31908,31982,32172,32349-32350,32406,32697,32774-32775,33359,33361,33811,33982,34045,34226,34235-34239,34270-34271,34295,34304-34305,34319
/trunk/XBMC:18902
   + /branches/karaoke:16819-17295
/branches/timidityupdate:16561-16749
/branches/xbmc-zeroconf/XBMC:18852-18854
/trunk:31904,31908,31982,32172,32349-32350,32406,32697,32774-32775,33359,33361,33811,33982,34045,34226,34235-34239,34270-34271,34295,34304-34305,34319,35603
/trunk/XBMC:18902


Property changes on: branches/Dharma/addons/skin.confluence/720p
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/addons/skin.confluence/720p:31904,31908,31982,32172,32349-32350,32406,32697,32774-32775,33359,33361,33811,33982,34045,34226,34235-34239,34270-34271,34295,34304-34305,34319
   + /trunk/addons/skin.confluence/720p:31904,31908,31982,32172,32349-32350,32406,32697,32774-32775,33359,33361,33811,33982,34045,34226,34235-34239,34270-34271,34295,34304-34305,34319,35603


Property changes on: branches/Dharma/guilib/GUIControlFactory.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/9.11_Camelot/guilib/GUIControlFactory.cpp:25753-25754,25905-25907,25910
/branches/karaoke/guilib/GUIControlFactory.cpp:16819-17295
/branches/xbmc-zeroconf/XBMC/guilib/GUIControlFactory.cpp:18852-18854
/trunk/guilib/GUIControlFactory.cpp:31904,31908,31982,32172,32349-32350,32406,32697,32774-32775,33359,33361,33811,33982,34045,34226,34235-34239,34270-34271,34295,34304-34305,34319
   + /branches/9.11_Camelot/guilib/GUIControlFactory.cpp:25753-25754,25905-25907,25910
/branches/karaoke/guilib/GUIControlFactory.cpp:16819-17295
/branches/xbmc-zeroconf/XBMC/guilib/GUIControlFactory.cpp:18852-18854
/trunk/guilib/GUIControlFactory.cpp:31904,31908,31982,32172,32349-32350,32406,32697,32774-32775,33359,33361,33811,33982,34045,34226,34235-34239,34270-34271,34295,34304-34305,34319,35603


Property changes on: branches/Dharma/guilib/GUIControlFactory.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/9.11_Camelot/guilib/GUIControlFactory.h:25753-25754,25905-25907,25910
/branches/karaoke/guilib/GUIControlFactory.h:16819-17295
/branches/xbmc-zeroconf/XBMC/guilib/GUIControlFactory.h:18852-18854
/trunk/guilib/GUIControlFactory.h:31904,31908,31982,32172,32349-32350,32406,32697,32774-32775,33359,33361,33811,33982,34045,34226,34235-34239,34270-34271,34295,34304-34305,34319
   + /branches/9.11_Camelot/guilib/GUIControlFactory.h:25753-25754,25905-25907,25910
/branches/karaoke/guilib/GUIControlFactory.h:16819-17295
/branches/xbmc-zeroconf/XBMC/guilib/GUIControlFactory.h:18852-18854
/trunk/guilib/GUIControlFactory.h:31904,31908,31982,32172,32349-32350,32406,32697,32774-32775,33359,33361,33811,33982,34045,34226,34235-34239,34270-34271,34295,34304-34305,34319,35603


Property changes on: branches/Dharma/guilib/GUIImage.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/9.11_Camelot/guilib/GUIImage.cpp:25753-25754,25905-25907,25910
/branches/karaoke/guilib/GUIImage.cpp:16819-17295
/branches/xbmc-zeroconf/XBMC/guilib/GUIImage.cpp:18852-18854
/trunk/guilib/GUIImage.cpp:31904,31908,31982,32172,32349-32350,32406,32697,32774-32775,33359,33361,33811,33982,34045,34226,34235-34239,34270-34271,34295,34304-34305,34319
   + /branches/9.11_Camelot/guilib/GUIImage.cpp:25753-25754,25905-25907,25910
/branches/karaoke/guilib/GUIImage.cpp:16819-17295
/branches/xbmc-zeroconf/XBMC/guilib/GUIImage.cpp:18852-18854
/trunk/guilib/GUIImage.cpp:31904,31908,31982,32172,32349-32350,32406,32697,32774-32775,33359,33361,33811,33982,34045,34226,34235-34239,34270-34271,34295,34304-34305,34319,35603


Property changes on: branches/Dharma/guilib/GUIImage.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/9.11_Camelot/guilib/GUIImage.h:25753-25754,25905-25907,25910
/branches/karaoke/guilib/GUIImage.h:16819-17295
/branches/xbmc-zeroconf/XBMC/guilib/GUIImage.h:18852-18854
/trunk/guilib/GUIImage.h:31904,31908,31982,32172,32349-32350,32406,32697,32774-32775,33359,33361,33811,33982,34045,34226,34235-34239,34270-34271,34295,34304-34305,34319
   + /branches/9.11_Camelot/guilib/GUIImage.h:25753-25754,25905-25907,25910
/branches/karaoke/guilib/GUIImage.h:16819-17295
/branches/xbmc-zeroconf/XBMC/guilib/GUIImage.h:18852-18854
/trunk/guilib/GUIImage.h:31904,31908,31982,32172,32349-32350,32406,32697,32774-32775,33359,33361,33811,33982,34045,34226,34235-34239,34270-34271,34295,34304-34305,34319,35603


Property changes on: branches/Dharma/lib/libass
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/karaoke/lib/libass:16819-17295
/branches/timidityupdate/lib/libass:16561-16749
/branches/xbmc-zeroconf/XBMC/lib/libass:18852-18854
/trunk/XBMC/lib/libass:18902
/trunk/lib/libass:31904,31908,31982,32172,32349-32350,32406,32697,32774-32775,32866-32867,33359,33361,33811,33982,34045,34226,34235-34239,34270-34271,34295,34304-34305,34319
/vendor/libass/current:30023-32865
   + /branches/karaoke/lib/libass:16819-17295
/branches/timidityupdate/lib/libass:16561-16749
/branches/xbmc-zeroconf/XBMC/lib/libass:18852-18854
/trunk/XBMC/lib/libass:18902
/trunk/lib/libass:31904,31908,31982,32172,32349-32350,32406,32697,32774-32775,32866-32867,33359,33361,33811,33982,34045,34226,34235-34239,34270-34271,34295,34304-34305,34319,35603
/vendor/libass/current:30023-32865

Modified: branches/Dharma/system/players/dvdplayer/avcodec-52.dll
===================================================================
(Binary files differ)

Modified: branches/Dharma/system/players/dvdplayer/avformat-52.dll
===================================================================
(Binary files differ)

Modified: branches/Dharma/system/players/dvdplayer/avutil-50.dll
===================================================================
(Binary files differ)

Modified: branches/Dharma/system/players/dvdplayer/postproc-51.dll
===================================================================
(Binary files differ)

Modified: branches/Dharma/system/players/dvdplayer/swscale-0.6.1.dll
===================================================================
(Binary files differ)


Property changes on: branches/Dharma/xbmc/MusicInfoTag.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/karaoke/xbmc/MusicInfoTag.cpp:16819-17295
/branches/xbmc-zeroconf/XBMC/xbmc/MusicInfoTag.cpp:18852-18854
/trunk/xbmc/MusicInfoTag.cpp:31904,31908,31982,32172,32349-32350,32406,32697,32774-32775,33359,33361,33811,33982,34045,34226,34235-34239,34270-34271,34295,34304-34305,34319
   + /branches/karaoke/xbmc/MusicInfoTag.cpp:16819-17295
/branches/xbmc-zeroconf/XBMC/xbmc/MusicInfoTag.cpp:18852-18854
/trunk/xbmc/MusicInfoTag.cpp:31904,31908,31982,32172,32349-32350,32406,32697,32774-32775,33359,33361,33811,33982,34045,34226,34235-34239,34270-34271,34295,34304-34305,34319,35603


Property changes on: branches/Dharma/xbmc/MusicInfoTagLoaderFactory.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/karaoke/xbmc/MusicInfoTagLoaderFactory.cpp:16819-17295
/branches/xbmc-zeroconf/XBMC/xbmc/MusicInfoTagLoaderFactory.cpp:18852-18854
/trunk/xbmc/MusicInfoTagLoaderFactory.cpp:31904,31908,31982,32172,32349-32350,32406,32697,32774-32775,33359,33361,33811,33982,34045,34226,34235-34239,34270-34271,34295,34304-34305,34319
   + /branches/karaoke/xbmc/MusicInfoTagLoaderFactory.cpp:16819-17295
/branches/xbmc-zeroconf/XBMC/xbmc/MusicInfoTagLoaderFactory.cpp:18852-18854
/trunk/xbmc/MusicInfoTagLoaderFactory.cpp:31904,31908,31982,32172,32349-32350,32406,32697,32774-32775,33359,33361,33811,33982,34045,34226,34235-34239,34270-34271,34295,34304-34305,34319,35603


Property changes on: branches/Dharma/xbmc/MusicInfoTagLoaderFactory.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/karaoke/xbmc/MusicInfoTagLoaderFactory.h:16819-17295
/branches/xbmc-zeroconf/XBMC/xbmc/MusicInfoTagLoaderFactory.h:18852-18854
/trunk/xbmc/MusicInfoTagLoaderFactory.h:31904,31908,31982,32172,32349-32350,32406,32697,32774-32775,33359,33361,33811,33982,34045,34226,34235-34239,34270-34271,34295,34304-34305,34319
   + /branches/karaoke/xbmc/MusicInfoTagLoaderFactory.h:16819-17295
/branches/xbmc-zeroconf/XBMC/xbmc/MusicInfoTagLoaderFactory.h:18852-18854
/trunk/xbmc/MusicInfoTagLoaderFactory.h:31904,31908,31982,32172,32349-32350,32406,32697,32774-32775,33359,33361,33811,33982,34045,34226,34235-34239,34270-34271,34295,34304-34305,34319,35603


Property changes on: branches/Dharma/xbmc/cores/AudioRenderers/IAudioCallback.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/karaoke/xbmc/cores/AudioRenderers/IAudioCallback.h:16819-17295
/branches/xbmc-zeroconf/XBMC/xbmc/cores/AudioRenderers/IAudioCallback.h:18852-18854
/trunk/xbmc/cores/AudioRenderers/IAudioCallback.h:31904,31908,31982,32172,32349-32350,32406,32697,32774-32775,33359,33361,33811,33982,34045,34226,34235-34239,34270-34271,34295,34304-34305,34319
   + /branches/karaoke/xbmc/cores/AudioRenderers/IAudioCallback.h:16819-17295
/branches/xbmc-zeroconf/XBMC/xbmc/cores/AudioRenderers/IAudioCallback.h:18852-18854
/trunk/xbmc/cores/AudioRenderers/IAudioCallback.h:31904,31908,31982,32172,32349-32350,32406,32697,32774-32775,33359,33361,33811,33982,34045,34226,34235-34239,34270-34271,34295,34304-34305,34319,35603


Property changes on: branches/Dharma/xbmc/cores/AudioRenderers/IAudioRenderer.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/karaoke/xbmc/cores/AudioRenderers/IDirectSoundRenderer.h:16819-17295
/branches/xbmc-zeroconf/XBMC/xbmc/cores/AudioRenderers/IAudioRenderer.h:18852-18854
/trunk/xbmc/cores/AudioRenderers/IAudioRenderer.h:31904,31908,31982,32172,32349-32350,32406,32697,32774-32775,33359,33361,33811,33982,34045,34226,34235-34239,34270-34271,34295,34304-34305,34319
   + /branches/karaoke/xbmc/cores/AudioRenderers/IDirectSoundRenderer.h:16819-17295
/branches/xbmc-zeroconf/XBMC/xbmc/cores/AudioRenderers/IAudioRenderer.h:18852-18854
/trunk/xbmc/cores/AudioRenderers/IAudioRenderer.h:31904,31908,31982,32172,32349-32350,32406,32697,32774-32775,33359,33361,33811,33982,34045,34226,34235-34239,34270-34271,34295,34304-34305,34319,35603


Property changes on: branches/Dharma/xbmc/cores/AudioRenderers/Win32DirectSound.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/karaoke/xbmc/cores/AudioRenderers/Win32DirectSound.cpp:16819-17295
/branches/xbmc-zeroconf/XBMC/xbmc/cores/AudioRenderers/Win32DirectSound.cpp:18852-18854
/trunk/xbmc/cores/AudioRenderers/Win32DirectSound.cpp:31904,31908,31982,32172,32349-32350,32406,32697,32774-32775,33359,33361,33811,33982,34045,34226,34235-34239,34270-34271,34295,34304-34305,34319
   + /branches/karaoke/xbmc/cores/AudioRenderers/Win32DirectSound.cpp:16819-17295
/branches/xbmc-zeroconf/XBMC/xbmc/cores/AudioRenderers/Win32DirectSound.cpp:18852-18854
/trunk/xbmc/cores/AudioRenderers/Win32DirectSound.cpp:31904,31908,31982,32172,32349-32350,32406,32697,32774-32775,33359,33361,33811,33982,34045,34226,34235-34239,34270-34271,34295,34304-34305,34319,35603


Property changes on: branches/Dharma/xbmc/cores/AudioRenderers/Win32DirectSound.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/karaoke/xbmc/cores/AudioRenderers/Win32DirectSound.h:16819-17295
/branches/xbmc-zeroconf/XBMC/xbmc/cores/AudioRenderers/Win32DirectSound.h:18852-18854
/trunk/xbmc/cores/AudioRenderers/Win32DirectSound.h:31904,31908,31982,32172,32349-32350,32406,32697,32774-32775,33359,33361,33811,33982,34045,34226,34235-34239,34270-34271,34295,34304-34305,34319
   + /branches/karaoke/xbmc/cores/AudioRenderers/Win32DirectSound.h:16819-17295
/branches/xbmc-zeroconf/XBMC/xbmc/cores/AudioRenderers/Win32DirectSound.h:18852-18854
/trunk/xbmc/cores/AudioRenderers/Win32DirectSound.h:31904,31908,31982,32172,32349-32350,32406,32697,32774-32775,33359,33361,33811,33982,34045,34226,34235-34239,34270-34271,34295,34304-34305,34319,35603


Property changes on: branches/Dharma/xbmc/cores/VideoRenderers/legacy/ComboRenderer.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/xbmc/cores/VideoRenderers/legacy/ComboRenderer.cpp:31904,31908,31982,32172,32349-32350,32406,32697,32774-32775,33359,33361,33811,33982,34045,34226,34235-34239,34270-34271,34295,34304-34305,34319
   + /trunk/xbmc/cores/VideoRenderers/legacy/ComboRenderer.cpp:31904,31908,31982,32172,32349-32350,32406,32697,32774-32775,33359,33361,33811,33982,34045,34226,34235-34239,34270-34271,34295,34304-34305,34319,35603


Property changes on: branches/Dharma/xbmc/cores/VideoRenderers/legacy/ComboRenderer.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/xbmc/cores/VideoRenderers/legacy/ComboRenderer.h:31904,31908,31982,32172,32349-32350,32406,32697,32774-32775,33359,33361,33811,33982,34045,34226,34235-34239,34270-34271,34295,34304-34305,34319
   + /trunk/xbmc/cores/VideoRenderers/legacy/ComboRenderer.h:31904,31908,31982,32172,32349-32350,32406,32697,32774-32775,33359,33361,33811,33982,34045,34226,34235-34239,34270-34271,34295,34304-34305,34319,35603


Property changes on: branches/Dharma/xbmc/cores/VideoRenderers/legacy/RGBRendererV2.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/xbmc/cores/VideoRenderers/legacy/RGBRendererV2.cpp:31904,31908,31982,32172,32349-32350,32406,32697,32774-32775,33359,33361,33811,33982,34045,34226,34235-34239,34270-34271,34295,34304-34305,34319
   + /trunk/xbmc/cores/VideoRenderers/legacy/RGBRendererV2.cpp:31904,31908,31982,32172,32349-32350,32406,32697,32774-32775,33359,33361,33811,33982,34045,34226,34235-34239,34270-34271,34295,34304-34305,34319,35603


Property changes on: branches/Dharma/xbmc/cores/VideoRenderers/legacy/RGBRendererV2.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/xbmc/cores/VideoRenderers/legacy/RGBRendererV2.h:31904,31908,31982,32172,32349-32350,32406,32697,32774-32775,33359,33361,33811,33982,34045,34226,34235-34239,34270-34271,34295,34304-34305,34319
   + /trunk/xbmc/cores/VideoRenderers/legacy/RGBRendererV2.h:31904,31908,31982,32172,32349-32350,32406,32697,32774-32775,33359,33361,33811,33982,34045,34226,34235-34239,34270-34271,34295,34304-34305,34319,35603


Property changes on: branches/Dharma/xbmc/cores/dvdplayer/Codecs/ffmpeg
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/karaoke/xbmc/cores/dvdplayer/Codecs/ffmpeg:16819-17295
/branches/xbmc-zeroconf/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg:18852-18854
/trunk/xbmc/cores/dvdplayer/Codecs/ffmpeg:31904,31908,31982,32172,32349-32350,32406,32697,32774-32775,33359,33361,33811,33982,34045,34226,34235-34239,34270-34271,34295,34304-34305,34319
/vendor/ffmpeg/current:13445-30928
   + /branches/karaoke/xbmc/cores/dvdplayer/Codecs/ffmpeg:16819-17295
/branches/xbmc-zeroconf/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg:18852-18854
/trunk/xbmc/cores/dvdplayer/Codecs/ffmpeg:31904,31908,31982,32172,32349-32350,32406,32697,32774-32775,33359,33361,33811,33982,34045,34226,34235-34239,34270-34271,34295,34304-34305,34319,35603
/vendor/ffmpeg/current:13445-30928


Property changes on: branches/Dharma/xbmc/cores/dvdplayer/Codecs/ffmpeg/ffpresets
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/karaoke/xbmc/cores/dvdplayer/Codecs/ffmpeg/ffpresets:16819-17295
/branches/xbmc-zeroconf/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/ffpresets:18852-18854
/trunk/xbmc/cores/dvdplayer/Codecs/ffmpeg/ffpresets:31904,31908,31982,32172,32349-32350,32406,32697,32774-32775,33359,33361,33811,33982,34045,34226,34235-34239,34270-34271,34295,34304-34305,34319
/vendor/ffmpeg/current/ffpresets:16668-30928
   + /branches/karaoke/xbmc/cores/dvdplayer/Codecs/ffmpeg/ffpresets:16819-17295
/branches/xbmc-zeroconf/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/ffpresets:18852-18854
/trunk/xbmc/cores/dvdplayer/Codecs/ffmpeg/ffpresets:31904,31908,31982,32172,32349-32350,32406,32697,32774-32775,33359,33361,33811,33982,34045,34226,34235-34239,34270-34271,34295,34304-34305,34319,35603
/vendor/ffmpeg/current/ffpresets:16668-30928


Property changes on: branches/Dharma/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/arm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/karaoke/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/arm:16819-17295
/branches/xbmc-zeroconf/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/arm:18852-18854
/trunk/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/arm:31904,31908,31982,32172,32349-32350,32406,32697,32774-32775,33359,33361,33811,33982,34045,34226,34235-34239,34270-34271,34295,34304-34305,34319
/vendor/ffmpeg/current/libavcodec/arm:16668-30928
   + /branches/karaoke/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/arm:16819-17295
/branches/xbmc-zeroconf/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/arm:18852-18854
/trunk/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/arm:31904,31908,31982,32172,32349-32350,32406,32697,32774-32775,33359,33361,33811,33982,34045,34226,34235-34239,34270-34271,34295,34304-34305,34319,35603
/vendor/ffmpeg/current/libavcodec/arm:16668-30928


Property changes on: branches/Dharma/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/asfenc.c
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/xbmc-zeroconf/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/asfenc.c:18852-18854
/trunk/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/asfenc.c:31904,31908,31982,32172,32349-32350,32406,32697,32774-32775,33359,33361,33811,33982,34045,34226,34235-34239,34270-34271,34295,34304-34305,34319
/vendor/ffmpeg/current/libavformat/asfenc.c:16668-30928
   + /branches/xbmc-zeroconf/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/asfenc.c:18852-18854
/trunk/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/asfenc.c:31904,31908,31982,32172,32349-32350,32406,32697,32774-32775,33359,33361,33811,33982,34045,34226,34235-34239,34270-34271,34295,34304-34305,34319,35603
/vendor/ffmpeg/current/libavformat/asfenc.c:16668-30928


Property changes on: branches/Dharma/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/arm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/karaoke/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/arm:16819-17295
/branches/xbmc-zeroconf/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/arm:18852-18854
/trunk/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/arm:31904,31908,31982,32172,32349-32350,32406,32697,32774-32775,33359,33361,33811,33982,34045,34226,34235-34239,34270-34271,34295,34304-34305,34319
/vendor/ffmpeg/current/libavutil/arm:16668-30928
   + /branches/karaoke/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/arm:16819-17295
/branches/xbmc-zeroconf/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/arm:18852-18854
/trunk/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/arm:31904,31908,31982,32172,32349-32350,32406,32697,32774-32775,33359,33361,33811,33982,34045,34226,34235-34239,34270-34271,34295,34304-34305,34319,35603
/vendor/ffmpeg/current/libavutil/arm:16668-30928


Property changes on: branches/Dharma/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/bfin
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/karaoke/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/bfin:16819-17295
/branches/xbmc-zeroconf/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/bfin:18852-18854
/trunk/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/bfin:31904,31908,31982,32172,32349-32350,32406,32697,32774-32775,33359,33361,33811,33982,34045,34226,34235-34239,34270-34271,34295,34304-34305,34319
/vendor/ffmpeg/current/libavutil/bfin:16668-30928
   + /branches/karaoke/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/bfin:16819-17295
/branches/xbmc-zeroconf/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/bfin:18852-18854
/trunk/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/bfin:31904,31908,31982,32172,32349-32350,32406,32697,32774-32775,33359,33361,33811,33982,34045,34226,34235-34239,34270-34271,34295,34304-34305,34319,35603
/vendor/ffmpeg/current/libavutil/bfin:16668-30928


Property changes on: branches/Dharma/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/sh4
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/karaoke/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/sh4:16819-17295
/branches/xbmc-zeroconf/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/sh4:18852-18854
/trunk/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/sh4:31904,31908,31982,32172,32349-32350,32406,32697,32774-32775,33359,33361,33811,33982,34045,34226,34235-34239,34270-34271,34295,34304-34305,34319
/vendor/ffmpeg/current/libavutil/sh4:16668-30928
   + /branches/karaoke/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/sh4:16819-17295
/branches/xbmc-zeroconf/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/sh4:18852-18854
/trunk/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/sh4:31904,31908,31982,32172,32349-32350,32406,32697,32774-32775,33359,33361,33811,33982,34045,34226,34235-34239,34270-34271,34295,34304-34305,34319,35603
/vendor/ffmpeg/current/libavutil/sh4:16668-30928


Property changes on: branches/Dharma/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/x86
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/karaoke/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/x86:16819-17295
/branches/xbmc-zeroconf/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/x86:18852-18854
/trunk/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/x86:31904,31908,31982,32172,32349-32350,32406,32697,32774-32775,33359,33361,33811,33982,34045,34226,34235-34239,34270-34271,34295,34304-34305,34319
/vendor/ffmpeg/current/libavutil/x86:16668-30928
   + /branches/karaoke/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/x86:16819-17295
/branches/xbmc-zeroconf/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/x86:18852-18854
/trunk/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/x86:31904,31908,31982,32172,32349-32350,32406,32697,32774-32775,33359,33361,33811,33982,34045,34226,34235-34239,34270-34271,34295,34304-34305,34319,35603
/vendor/ffmpeg/current/libavutil/x86:16668-30928


Property changes on: branches/Dharma/xbmc/cores/paplayer/PAPlayer.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/xbmc/cores/paplayer/PAPlayer.cpp:31904,31908,31982,32172,32349-32350,32406,32697,32774-32775,33359,33361,33811,33982,34045,34226,34235-34239,34270-34271,34295,34304-34305,34319
   + /trunk/xbmc/cores/paplayer/PAPlayer.cpp:31904,31908,31982,32172,32349-32350,32406,32697,32774-32775,33359,33361,33811,33982,34045,34226,34235-34239,34270-34271,34295,34304-34305,34319,35603


Property changes on: branches/Dharma/xbmc/cores/paplayer/PAPlayer.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/xbmc/cores/paplayer/PAPlayer.h:31904,31908,31982,32172,32349-32350,32406,32697,32774-32775,33359,33361,33811,33982,34045,34226,34235-34239,34270-34271,34295,34304-34305,34319
   + /trunk/xbmc/cores/paplayer/PAPlayer.h:31904,31908,31982,32172,32349-32350,32406,32697,32774-32775,33359,33361,33811,33982,34045,34226,34235-34239,34270-34271,34295,34304-34305,34319,35603


Property changes on: branches/Dharma/xbmc/karaoke/Cdg.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/timidityupdate/xbmc/Cdg.cpp:16561-16749
/branches/xbmc-zeroconf/XBMC/xbmc/karaoke/Cdg.cpp:18852-18854
/trunk/xbmc/karaoke/Cdg.cpp:31904,31908,31982,32172,32349-32350,32406,32697,32774-32775,33359,33361,33811,33982,34045,34226,34235-34239,34270-34271,34295,34304-34305,34319
   + /branches/timidityupdate/xbmc/Cdg.cpp:16561-16749
/branches/xbmc-zeroconf/XBMC/xbmc/karaoke/Cdg.cpp:18852-18854
/trunk/xbmc/karaoke/Cdg.cpp:31904,31908,31982,32172,32349-32350,32406,32697,32774-32775,33359,33361,33811,33982,34045,34226,34235-34239,34270-34271,34295,34304-34305,34319,35603


Property changes on: branches/Dharma/xbmc/karaoke/Cdg.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/timidityupdate/xbmc/Cdg.h:16561-16749
/branches/xbmc-zeroconf/XBMC/xbmc/karaoke/Cdg.h:18852-18854
/trunk/xbmc/karaoke/Cdg.h:31904,31908,31982,32172,32349-32350,32406,32697,32774-32775,33359,33361,33811,33982,34045,34226,34235-34239,34270-34271,34295,34304-34305,34319
   + /branches/timidityupdate/xbmc/Cdg.h:16561-16749
/branches/xbmc-zeroconf/XBMC/xbmc/karaoke/Cdg.h:18852-18854
/trunk/xbmc/karaoke/Cdg.h:31904,31908,31982,32172,32349-32350,32406,32697,32774-32775,33359,33361,33811,33982,34045,34226,34235-34239,34270-34271,34295,34304-34305,34319,35603


Property changes on: branches/Dharma/xbmc/linux/HALPowerSyscall.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/karaoke/xbmc/linux/DBusPowerSyscall.cpp:16819-17295
/branches/timidityupdate/xbmc/linux/DBusPowerSyscall.cpp:16561-16749
/branches/xbmc-zeroconf/XBMC/xbmc/linux/DBusPowerSyscall.cpp:18852-18854
/trunk/XBMC/xbmc/linux/DBusPowerSyscall.cpp:18902
/trunk/xbmc/linux/HALPowerSyscall.cpp:31904,31908,31982,32172,32349-32350,32406,32697,32774-32775,33359,33361,33811,33982,34045,34226,34235-34239,34270-34271,34295,34304-34305,34319
   + /branches/karaoke/xbmc/linux/DBusPowerSyscall.cpp:16819-17295
/branches/timidityupdate/xbmc/linux/DBusPowerSyscall.cpp:16561-16749
/branches/xbmc-zeroconf/XBMC/xbmc/linux/DBusPowerSyscall.cpp:18852-18854
/trunk/XBMC/xbmc/linux/DBusPowerSyscall.cpp:18902
/trunk/xbmc/linux/HALPowerSyscall.cpp:31904,31908,31982,32172,32349-32350,32406,32697,32774-32775,33359,33361,33811,33982,34045,34226,34235-34239,34270-34271,34295,34304-34305,34319,35603


Property changes on: branches/Dharma/xbmc/linux/HALPowerSyscall.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/karaoke/xbmc/linux/DBusPowerSyscall.h:16819-17295
/branches/timidityupdate/xbmc/linux/DBusPowerSyscall.h:16561-16749
/branches/xbmc-zeroconf/XBMC/xbmc/linux/DBusPowerSyscall.h:18852-18854
/trunk/XBMC/xbmc/linux/DBusPowerSyscall.h:18902
/trunk/xbmc/linux/HALPowerSyscall.h:31904,31908,31982,32172,32349-32350,32406,32697,32774-32775,33359,33361,33811,33982,34045,34226,34235-34239,34270-34271,34295,34304-34305,34319
   + /branches/karaoke/xbmc/linux/DBusPowerSyscall.h:16819-17295
/branches/timidityupdate/xbmc/linux/DBusPowerSyscall.h:16561-16749
/branches/xbmc-zeroconf/XBMC/xbmc/linux/DBusPowerSyscall.h:18852-18854
/trunk/XBMC/xbmc/linux/DBusPowerSyscall.h:18902
/trunk/xbmc/linux/HALPowerSyscall.h:31904,31908,31982,32172,32349-32350,32406,32697,32774-32775,33359,33361,33811,33982,34045,34226,34235-34239,34270-34271,34295,34304-34305,34319,35603


Property changes on: branches/Dharma/xbmc/xbmc.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/karaoke/xbmc/XboxMediaCenter.cpp:16819-17295
/branches/timidityupdate/xbmc/XboxMediaCenter.cpp:16561-16749
/branches/xbmc-zeroconf/XBMC/xbmc/xbmc.cpp:18852-18854
/trunk/xbmc/xbmc.cpp:31904,31908,31982,32172,32349-32350,32406,32697,32774-32775,33359,33361,33811,33982,34045,34226,34235-34239,34270-34271,34295,34304-34305,34319
   + /branches/karaoke/xbmc/XboxMediaCenter.cpp:16819-17295
/branches/timidityupdate/xbmc/XboxMediaCenter.cpp:16561-16749
/branches/xbmc-zeroconf/XBMC/xbmc/xbmc.cpp:18852-18854
/trunk/xbmc/xbmc.cpp:31904,31908,31982,32172,32349-32350,32406,32697,32774-32775,33359,33361,33811,33982,34045,34226,34235-34239,34270-34271,34295,34304-34305,34319,35603


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 35606
          http://xbmc.svn.sourceforge.net/xbmc/?rev=35606&view=rev
Author:   spiff_
Date:     2010-12-08 21:28:34 +0000 (Wed, 08 Dec 2010)

Log Message:
-----------
updated: ticket #10790, #10791 - korean translation. thanks to airplanez
updated: ticket #10795 - turkish translation. thanks to queep
updated: ticket #10804 - polish translation. thanks to kolabor
updated: ticket #10818 - dutch translation. thanks to idioteque
updated: ticket #10842 - romanian translation. thanks to danny3
updated: ticket #10848 - spanish translation. thanks to poxitron

(cherry picked from commit 668d5a86f488bc33153569485a05d895a7877750)

Modified Paths:
--------------
    branches/Dharma/addons/skin.confluence/language/Korean/strings.xml
    branches/Dharma/addons/skin.confluence/language/Romanian/strings.xml
    branches/Dharma/addons/skin.confluence/language/Turkish/strings.xml
    branches/Dharma/language/Dutch/strings.xml
    branches/Dharma/language/Korean/strings.xml
    branches/Dharma/language/Polish/strings.xml
    branches/Dharma/language/Romanian/strings.xml
    branches/Dharma/language/Spanish/strings.xml

Modified: branches/Dharma/addons/skin.confluence/language/Korean/strings.xml
===================================================================
--- branches/Dharma/addons/skin.confluence/language/Korean/strings.xml	2010-12-08 21:25:34 UTC (rev 35605)
+++ branches/Dharma/addons/skin.confluence/language/Korean/strings.xml	2010-12-08 21:28:34 UTC (rev 35606)
@@ -2,7 +2,7 @@
 <!--Language file translated with Team XBMC Translator-->
 <!--Translator: airplanez-->
 <!--Email: airplanez@...>
-<!--Date of translation: 10/11/2010-->
+<!--Date of translation: 12/07/2010-->
 <!--$Revision$-->
 <strings>
   <string id="31000">변경</string>
@@ -61,19 +61,18 @@
   <string id="31115">사용자 지정</string>
   <string id="31117">최근 추가된 비디오 보이기</string>
   <string id="31118">홈 페이지 프로그램 하위메뉴</string>
-  <string id="31119">사용자 지정 추가기능 버튼 사용</string>
   <string id="31120">버튼 라벨</string>
-  <string id="31121">추가기능 경로</string>
   <string id="31122">날씨 페이지</string>
   <string id="31123">TV 쇼에 "배너" 대신 "포스터" 사용</string>
   <string id="31124">비디오 배경에 "지금 재생중" 보이기</string>
   <string id="31125">시각화 배경에 "지금 재생중" 보이기</string>
-  <string id="31126">음악 OSD 에 가사 사용</string>
-  <string id="31127">가사 추가기능 경로</string>
   <string id="31128">가사</string>
-  <string id="31129">비디오 OSD 에 자막 다운로드 사용</string>
-  <string id="31130">자막 추가기능 경로</string>
   <string id="31131">수평 홈 메뉴 사용</string>
+  <string id="31132">가사 추가기능</string>
+  <string id="31133">자막 추가기능</string>
+  <string id="31134">홈 페이지 비디오 하위메뉴</string>
+  <string id="31135">홈 페이지 음악 하위메뉴</string>
+  <string id="31136">홈 페이지 사진 하위메뉴</string>
   <string id="31140">음악 OSD</string>
   <string id="31141">비디오 OSD</string>
   <string id="31200">바로가기</string>

Modified: branches/Dharma/addons/skin.confluence/language/Romanian/strings.xml
===================================================================
--- branches/Dharma/addons/skin.confluence/language/Romanian/strings.xml	2010-12-08 21:25:34 UTC (rev 35605)
+++ branches/Dharma/addons/skin.confluence/language/Romanian/strings.xml	2010-12-08 21:28:34 UTC (rev 35606)
@@ -24,8 +24,8 @@
   <string id="31028">Afișe</string>
   <string id="31029">Fanart</string>
   <string id="31030">Listă completă</string>
-  <string id="31031">Miniaturi stânga</string>
-  <string id="31032">Imagini</string>
+  <string id="31031">Detalii</string>
+  <string id="31032">Ciclu imagini</string>
   <string id="31033">Informații</string>
 
   <!-- Extra labels -->
@@ -36,7 +36,7 @@
   <string id="31044">DERULARE ÎNAINTE</string>
   <string id="31045">DERULARE ÎNAPOI</string>
   <string id="31046">Proprietăți audio</string>
-  <string id="31047">Predefinire curentă</string>
+  <string id="31047">Viz. predefinită curentă</string>
   <string id="31048">Vizualizări predefinite</string>
   <string id="31049">Se termină la</string>
 
@@ -74,9 +74,9 @@
   <string id="31120">ETICHETĂ BUTON</string>
   <string id="31121">CALE CĂTRE SUPLIMENT</string>
   <string id="31122">Pagină meteo</string>
+  <string id="31123">Folosește „Afișe” în loc de „Bannere” pentru seriale</string>
   <string id="31124">Arată video „Acum în redare” pe fundal</string>
   <string id="31125">Arată vizualizare „Acum în redare” pe fundal</string>
-  <string id="31125">Arată vizualizare „În redare” pe fundal</string>
   <string id="31126">Activează descărcare versuri în meniul audio</string>
   <string id="31127">CALE CĂTRE SUPLIMENT VERSURI</string>
   <string id="31128">Versuri</string>

Modified: branches/Dharma/addons/skin.confluence/language/Turkish/strings.xml
===================================================================
--- branches/Dharma/addons/skin.confluence/language/Turkish/strings.xml	2010-12-08 21:25:34 UTC (rev 35605)
+++ branches/Dharma/addons/skin.confluence/language/Turkish/strings.xml	2010-12-08 21:28:34 UTC (rev 35606)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <!--Translator: Özgür BASKIN (queeup)-->
 <!--Email: ozgur.baskin@...>
-<!--Date of translation: 26/11/2010-->
-<!--Turkish strings based on English strings revision 35254-->
+<!--Date of translation: 29/11/2010-->
+<!--Turkish strings based on English strings revision 35510-->
 <strings>
   <!-- Misc labels -->
   <string id="31000">Değiştir</string>
@@ -72,7 +72,7 @@
   <string id="31115">Özelleştir</string>
   <string id="31116"></string>
   <string id="31117">Son Eklenen Videoları Göster</string>
-  <string id="31118">Ana Sayfa Programlar Altmenüsü</string>
+  <string id="31118">Ana Sayfa Programlar Alt Menüsü</string>
   <string id="31119"></string>  <!-- blanked 2010-11-12 -->
   <string id="31120">TUŞ ETİKETİ</string>
   <string id="31121"></string>  <!-- blanked 2010-11-12 -->
@@ -90,6 +90,9 @@
   <string id="31131">Yatay Ana Menü</string>
   <string id="31132">Lyrics Eklentisi</string>
   <string id="31133">Altyazı Eklentisi</string>
+  <string id="31134">Ana Sayfa Videolar Alt Menüsü</string>
+  <string id="31135">Ana Sayfa Müzik Alt Menüsü</string>
+  <string id="31136">Ana Sayfa Resimler Alt Menüsü</string>
 
   <string id="31140">Müzik OSD</string>
   <string id="31141">Video OSD</string>

Modified: branches/Dharma/language/Dutch/strings.xml
===================================================================
--- branches/Dharma/language/Dutch/strings.xml	2010-12-08 21:25:34 UTC (rev 35605)
+++ branches/Dharma/language/Dutch/strings.xml	2010-12-08 21:28:34 UTC (rev 35606)
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!--Language file translated with Team XBMC Translator-->
+<!--Translator: idioteque-->
+<!--Email: ronaldloggen@...>
+<!--Date of translation: 12/01/2010-->
 <!--$Revision$-->
+<!--Based on english strings version 35208-->
 <strings>
   <string id="0">Programma's</string>
   <string id="1">Afbeeldingen</string>
@@ -11,15 +16,13 @@
   <string id="7">Bestandsbeheer</string>
   <string id="8">Weer</string>
   <string id="9">XBMC Media Center</string>
-
-  <string id="11">Maandag</string> <!--Originele Engelse versies heeft ook hoofdletters, zonder hoofdletters ziet het er vreemd uit in het weerscherm-->
+  <string id="11">Maandag</string>
   <string id="12">Dinsdag</string>
   <string id="13">Woensdag</string>
   <string id="14">Donderdag</string>
   <string id="15">Vrijdag</string>
   <string id="16">Zaterdag</string>
   <string id="17">Zondag</string>
-
   <string id="21">januari</string>
   <string id="22">februari</string>
   <string id="23">maart</string>
@@ -32,7 +35,6 @@
   <string id="30">oktober</string>
   <string id="31">november</string>
   <string id="32">december</string>
-
   <string id="41">Ma</string>
   <string id="42">Di</string>
   <string id="43">Wo</string>
@@ -40,7 +42,6 @@
   <string id="45">Vr</string>
   <string id="46">Za</string>
   <string id="47">Zo</string>
-
   <string id="51">jan</string>
   <string id="52">feb</string>
   <string id="53">mrt</string>
@@ -53,7 +54,6 @@
   <string id="60">okt</string>
   <string id="61">nov</string>
   <string id="62">dec</string>
-  
   <string id="71">N</string>
   <string id="72">NNO</string>
   <string id="73">NO</string>
@@ -71,7 +71,6 @@
   <string id="85">NW</string>
   <string id="86">NNW</string>
   <string id="87">VAR</string>
-
   <string id="98">Layout: Automatisch</string>
   <string id="99">Layout: Autom. groot</string>
   <string id="100">Layout: Klein</string>
@@ -87,8 +86,8 @@
   <string id="110">Miniaturen aanmaken</string>
   <string id="111">Snelkoppelingen</string>
   <string id="112">Pauze</string>
-  <string id="113">Update mislukt</string> 
-  <string id="114">Installatie mislukt</string> 
+  <string id="113">Update mislukt</string>
+  <string id="114">Installatie mislukt</string>
   <string id="115">Kopieer</string>
   <string id="116">Verplaats</string>
   <string id="117">Verwijder</string>
@@ -141,18 +140,18 @@
   <string id="164">Geen schijf</string>
   <string id="165">Schijf aanwezig</string>
   <string id="166">Skin</string>
-  <string id="167"></string>
-  <string id="168"></string>
+  <string id="167">
+  </string>
+  <string id="168">
+  </string>
   <string id="169">Resolutie</string>
   <string id="170">Verversingsfrequentie scherm aanpassen aan video</string>
-  <string id="171"></string>
-
+  <string id="171">
+  </string>
   <string id="172">Releasedatum:</string>
   <string id="173">Geef 4:3 video's weer als</string>
-
   <string id="175">Stemmingen</string>
   <string id="176">Stijlen</string>
-
   <string id="179">Tracklist</string>
   <string id="180">Tijdsduur</string>
   <string id="181">Selecteer album</string>
@@ -171,13 +170,11 @@
   <string id="194">Zoeken...</string>
   <string id="195">Geen informatie gevonden</string>
   <string id="196">Kies film:</string>
-  <string id="197">%s raadplegen voor informatie</string> <!--%s wordt vervangen door de naam van een scraper-->
+  <string id="197">%s raadplegen voor informatie</string>
   <string id="198">Filmgegevens ophalen</string>
-  <string id="199">Webinterface</string> 
-
+  <string id="199">Webinterface</string>
   <string id="202">Slagzin</string>
   <string id="203">Plot</string>
-
   <string id="205">Stemmen:</string>
   <string id="206">Acteurs</string>
   <string id="207">Plot</string>
@@ -195,7 +192,6 @@
   <string id="221">Netwerk is niet verbonden</string>
   <string id="222">Annuleren</string>
   <string id="224">Wisseltijd</string>
-
   <string id="226">Test patronen</string>
   <string id="227">CD-informatie opzoeken op internet</string>
   <string id="228">Afspeellijst willekeurig afspelen</string>
@@ -215,8 +211,7 @@
   <string id="242">Venster</string>
   <string id="243">Verversingsfrequentie</string>
   <string id="244">Volledig scherm</string>
-  <string id="245">Formaat: (%i,%i)->(%i,%i) (Zoom x%2.2f) AR:%2.2f:1 (Pixels: %2.2f:1)</string>
-  
+  <string id="245">Formaat: (%i,%i)-&gt;(%i,%i) (Zoom x%2.2f) AR:%2.2f:1 (Pixels: %2.2f:1)</string>
   <string id="247">Scripts</string>
   <string id="248">Taal</string>
   <string id="249">Muziek</string>
@@ -255,7 +250,8 @@
   <string id="282">%i items gevonden</string>
   <string id="283">Zoekresultaten</string>
   <string id="284">Niets gevonden</string>
-  <string id="286"></string>
+  <string id="286">
+  </string>
   <string id="287">Ondertitels</string>
   <string id="288">Lettertype</string>
   <string id="289">- Formaat</string>
@@ -275,11 +271,16 @@
   <string id="304">Taal</string>
   <string id="305">Ingeschakeld</string>
   <string id="306">Non-Interleaved</string>
-  <string id="307"></string>
-  <string id="308"></string>
-  <string id="309"></string>
-  <string id="310"></string>
-  <string id="311"></string>
+  <string id="307">
+  </string>
+  <string id="308">
+  </string>
+  <string id="309">
+  </string>
+  <string id="310">
+  </string>
+  <string id="311">
+  </string>
   <string id="312">(0=auto)</string>
   <string id="313">Bibliotheek opschonen</string>
   <string id="314">Voorbereiden...</string>
@@ -310,7 +311,7 @@
   <string id="339">Digitaal</string>
   <string id="340">Diverse artiesten</string>
   <string id="341">DVD afspelen</string>
-  <string id="342">Films</string>
+  <string id="342">Speelfilms</string>
   <string id="343">Framerate aanpassen</string>
   <string id="344">Acteurs</string>
   <string id="345">Jaar</string>
@@ -342,12 +343,12 @@
   <string id="374">Bewolkt</string>
   <string id="375">Sneeuw</string>
   <string id="376">Regen</string>
-  <string id="377">Lichtelijk</string>
+  <string id="377">Lichte</string>
   <string id="378">AM</string>
   <string id="379">PM</string>
   <string id="380">Buien</string>
   <string id="381">Lichte</string>
-  <string id="382">Verspreid</string>
+  <string id="382">Verstrooide</string>
   <string id="383">Wind</string>
   <string id="384">Sterk</string>
   <string id="385">Mooi</string>
@@ -356,11 +357,11 @@
   <string id="388">Vroeg</string>
   <string id="389">Buien</string>
   <string id="390">Sneeuwbuien</string>
-  <string id="391">min.</string>
-  <string id="392">gem.</string>
-  <string id="393">max</string>
-  <string id="394">Nevel</string>
-  <string id="395">Mist</string>
+  <string id="391">Min</string>
+  <string id="392">Gem.</string>
+  <string id="393">Max.</string>
+  <string id="394">Mist</string>
+  <string id="395">Heiig</string>
   <string id="396">Locatie selecteren</string>
   <string id="397">Vernieuwingstijd</string>
   <string id="398">Eenheid temperatuur</string>
@@ -372,8 +373,10 @@
   <string id="404">Wind</string>
   <string id="405">Dauwpunt</string>
   <string id="406">Vochtigheid</string>
-  <string id="407"></string>
-  <string id="408"></string>
+  <string id="407">
+  </string>
+  <string id="408">
+  </string>
   <string id="409">Standaard</string>
   <string id="410">Weather.com openen</string>
   <string id="411">Weergegevens ophalen voor</string>
@@ -386,7 +389,6 @@
   <string id="418">Min</string>
   <string id="419">Max</string>
   <string id="420">HDMI</string>
-
   <string id="422">Albuminformatie wissen</string>
   <string id="423">CDDB-informatie wissen</string>
   <string id="424">Selecteer</string>
@@ -399,8 +401,7 @@
   <string id="431">Data niet bufferen</string>
   <string id="432">Video uit database verwijderen</string>
   <string id="433">'%s' zeker verwijderen?</string>
-  <string id="434">Uit %s met %i %s</string> <!--From <wind dir.> at <speed> <unit>-->
-
+  <string id="434">Uit %s met %i %s</string>
   <string id="437">Verwisselbare schijf</string>
   <string id="438">Bestand openen</string>
   <string id="439">Buffer</string>
@@ -444,7 +445,6 @@
   <string id="480">Uiterlijk</string>
   <string id="481">Geluidsinstellingen</string>
   <string id="482">Over XBMC</string>
-
   <string id="485">Album verwijderen</string>
   <string id="486">Herhalen</string>
   <string id="487">Nummer herhalen</string>
@@ -472,11 +472,11 @@
   <string id="513">Beginscherm</string>
   <string id="514">Handmatige instellingen</string>
   <string id="515">Genre</string>
-
   <string id="517">Laatst afgespeelde albums</string>
   <string id="518">Starten</string>
   <string id="519">Starten in..</string>
-  <string id="520"></string>
+  <string id="520">
+  </string>
   <string id="521">Compilaties</string>
   <string id="522">Snelkoppeling verwijderen</string>
   <string id="523">Media veranderen</string>
@@ -505,7 +505,6 @@
   <string id="546">Doorgifte Geluidsuitvoerapparaat</string>
   <string id="547">Geen biografie beschikbaar voor artiest</string>
   <string id="548">Downmix multikanaals audio naar stereo</string>
-
   <string id="550">Sorteer: %s</string>
   <string id="551">Naam</string>
   <string id="552">Datum</string>
@@ -532,7 +531,6 @@
   <string id="573">Pad</string>
   <string id="574">Land</string>
   <string id="575">Bezig</string>
-
   <string id="580">Sorteerrichting</string>
   <string id="581">Sorteren op</string>
   <string id="582">Layout</string>
@@ -551,23 +549,20 @@
   <string id="595">Herhalen: Uit</string>
   <string id="596">Herhalen: 1</string>
   <string id="597">Herhalen: Alles</string>
-
   <string id="600">Cd kopiëren</string>
   <string id="601">Middelmatig</string>
   <string id="602">Standaard</string>
   <string id="603">Extreem</string>
   <string id="604">Constante bitsnelheid</string>
   <string id="605">Kopiëren...</string>
-
   <string id="607">Naar:</string>
   <string id="608">Kopiëren van CD of nummer mislukt</string>
   <string id="609">CDDA-doelmap is niet ingegeven.</string>
   <string id="610">Muzieknummer rippen</string>
   <string id="611">Voer nummer in</string>
-  <string id="612">Bits/Sample</string> 
+  <string id="612">Bits/Sample</string>
   <string id="613">Sample frequentie</string>
-  
-  <string id="620">CD's kopiëren</string>
+  <string id="620">CD's importeren</string>
   <string id="621">Encoder</string>
   <string id="622">Kwaliteit</string>
   <string id="623">Bitsnelheid</string>
@@ -604,30 +599,26 @@
   <string id="657">Map openen</string>
   <string id="658">Muziekinformatie</string>
   <string id="659">Niet-lineair uitrekken</string>
-
   <string id="660">Volumeversterking</string>
   <string id="661">Exporteerlocatie kiezen</string>
   <string id="662">Dit bestand is niet langer beschikbaar.</string>
   <string id="663">Wilt u het verwijderen uit de bibliotheek?</string>
   <string id="664">Naar script zoeken</string>
   <string id="665">Compressieniveau</string>
-
   <string id="700">Bibliotheek opschonen</string>
   <string id="701">Oude nummers uit bibliotheek verwijderen</string>
   <string id="702">Deze locatie is al eerder gescand</string>
   <string id="705">Netwerk</string>
   <string id="706">- Host</string>
-
   <string id="708">HTTP-proxy gebruiken</string>
-
   <string id="711">Internet Protocol (IP)</string>
   <string id="712">Ongeldig poortnummer. Waarde moet tussen 1 en 65535 liggen.</string>
   <string id="713">HTTP proxy</string>
-
   <string id="715">Toewijzing</string>
   <string id="716">Automatisch (DHCP)</string>
   <string id="717">Handmatig (Statisch)</string>
-  <string id="718"></string>
+  <string id="718">
+  </string>
   <string id="719">- IP-adres</string>
   <string id="720">- Netmask</string>
   <string id="721">- Standaard Gateway</string>
@@ -638,7 +629,8 @@
   <string id="726">Veranderingen niet opgeslagen. Doorgaan zonder op te slaan?</string>
   <string id="727">Webserver</string>
   <string id="728">FTP-server</string>
-  <string id="729"></string>
+  <string id="729">
+  </string>
   <string id="730">- Poort</string>
   <string id="731">- Host</string>
   <string id="732">Opslaan en toepassen</string>
@@ -661,12 +653,10 @@
   <string id="749">Spiegel afbeelding</string>
   <string id="750">Weet u het zeker?</string>
   <string id="751">Snelkoppeling verwijderen</string>
-
   <string id="754">Programmalink toevoegen</string>
   <string id="755">Programmalink wijzigen</string>
   <string id="756">Programmanaam wijzigen</string>
   <string id="757">Zoekdiepte instellen</string>
-
   <string id="759">Layout: Groot</string>
   <string id="760">Geel</string>
   <string id="761">Wit</string>
@@ -676,10 +666,9 @@
   <string id="765">Cyaan</string>
   <string id="766">Reserved</string>
   <string id="767">Reserved</string>
-  <!-- strings 768 and 769 reserved for more subtitle colors -->
-
   <string id="770">Fout %i: gedeelde map niet beschikbaar</string>
-  <string id="771"></string>
+  <string id="771">
+  </string>
   <string id="772">Geluidshardware</string>
   <string id="773">Zoeken</string>
   <string id="774">Map schermbeveiliging door diavoorstelling</string>
@@ -698,7 +687,6 @@
   <string id="787">Verbinding uitgeschakeld</string>
   <string id="788">Verbinding succesvol uitgeschakeld.</string>
   <string id="789">Naam draadloos netwerk (ESSID)</string>
-
   <string id="791">Gebeurtenissen op afstand activeren</string>
   <string id="792">Poort voor gebeurtenissen op afstand</string>
   <string id="793">Poortbereik voor gebeurtenissen op afstand</string>
@@ -707,17 +695,14 @@
   <string id="796">Doorgaande herhalingsvertraging (ms)</string>
   <string id="797">Maximaal aantal gebruikers</string>
   <string id="798">Internettoegang</string>
-
   <string id="850">Ongeldig poortnummer ingevoerd</string>
   <string id="851">Geldig poortbereik is 1-65535</string>
   <string id="852">Geldig poortbereik is 1024-65535</string>
-
   <string id="1000">- Voorbeeld</string>
   <string id="1001">Verbinding mislukt</string>
   <string id="1002">XBMC kon niet verbinden met de netwerklocatie.</string>
   <string id="1003">Dit kan veroorzaakt worden doordat het netwerk niet verbonden is.</string>
   <string id="1004">Wilt u het toch toevoegen?</string>
-
   <string id="1006">IP-adres</string>
   <string id="1007">Netwerklocatie toevoegen</string>
   <string id="1008">Protocol</string>
@@ -764,15 +749,12 @@
   <string id="1049">Script instellingen</string>
   <string id="1050">Singles</string>
   <string id="1051">Voer URL in</string>
-
   <string id="1200">SMB-client</string>
   <string id="1202">Werkgroep</string>
   <string id="1203">Standaardgebruikersnaam</string>
   <string id="1204">Standaardwachtwoord</string>
-
   <string id="1207">WINS-server</string>
   <string id="1208">Laad SMB gedeeld netwerk</string>
-
   <string id="1210">Verwijder</string>
   <string id="1211">Muziek</string>
   <string id="1212">Video</string>
@@ -782,7 +764,7 @@
   <string id="1216">Muziek en afbeeldingen</string>
   <string id="1217">Muziek en bestanden</string>
   <string id="1218">Video en afbeeldingen</string>
-  <string id="1219">Video - Bestanden</string> <!--Blijkbaar een label voor de lijstweergave-->
+  <string id="1219">Video - Bestanden</string>
   <string id="1220">Afbeeldingen en bestanden</string>
   <string id="1221">Muziek, video's en afbeeldingen</string>
   <string id="1222">Muziek, video's, afbeeldingen en bestanden</string>
@@ -797,25 +779,22 @@
   <string id="1233">Programma's, video en muziek</string>
   <string id="1234">Programma's, afbeeldingen en muziek</string>
   <string id="1235">Programma's, afbeeldingen en video's</string>
-
-  <string id="1245"></string>
-  <string id="1246"></string>
-  <string id="1247"></string>
-
+  <string id="1245">
+  </string>
+  <string id="1246">
+  </string>
+  <string id="1247">
+  </string>
   <string id="1250">Systeem detecteren</string>
   <string id="1251">Aangesloten systemen automatisch detecteren</string>
   <string id="1252">Nickname</string>
-
   <string id="1254">Vragen om verbinding te maken</string>
   <string id="1255">FTP-gebruikersnaam en -wachtwoord verzenden</string>
   <string id="1256">Pinginterval in sec.</string>
   <string id="1257">Verbinding maken met de gevonden systeem?</string>
-
   <string id="1260">Zeroconf publishing</string>
-
   <string id="1300">Aangepaste geluidskaart</string>
   <string id="1301">Aangepast Passthrough apparaat</string>
-
   <string id="1396">Driftsneeuw</string>
   <string id="1397">en</string>
   <string id="1398">Vrieskou</string>
@@ -844,21 +823,15 @@
   <string id="1421">Very High</string>
   <string id="1422">Winderig</string>
   <string id="1423">Mist</string>
-
-  <!-- strings through to 1450 reserved for weather translation -->
-
   <string id="1450">Energiebezuiniging inschakelen bij inactiviteit</string>
-  <!-- strings through to 1470 reserved for power-saving -->
-
   <string id="2050">Speelduur</string>
-
   <string id="2100">Fout in script! : %s</string>
   <string id="2101">Nieuwere versie vereist - Zie log</string>
-  <string id="2102"></string>
-  <string id="2103"></string>
-
+  <string id="2102">
+  </string>
+  <string id="2103">
+  </string>
   <string id="4501">Gebruik LCD/VFD</string>
-
   <string id="10000">Beginscherm</string>
   <string id="10001">Programma's</string>
   <string id="10002">Afbeeldingen</string>
@@ -876,24 +849,20 @@
   <string id="10014">Instellingen - Weer</string>
   <string id="10015">Instellingen - Muziek</string>
   <string id="10016">Instellingen - Systeem</string>
-  <string id="10017">Instellingen - Films</string>
+  <string id="10017">Instellingen - Video's</string>
   <string id="10018">Instellingen - Netwerk</string>
   <string id="10019">Instellingen - Uiterlijk</string>
   <string id="10020">Scripts</string>
   <string id="10021">Webbrowser</string>
-
   <string id="10028">Video/Afspeellijst</string>
   <string id="10034">Instellingen - Profielen</string>
-
   <string id="10100">Ja/Nee</string>
   <string id="10101">Voortgang</string>
-
   <string id="10210">Zoeken naar ondertitels...</string>
   <string id="10211">Ondertitels cachen...</string>
   <string id="10212">Bezig met afsluiten</string>
   <string id="10213">Bufferen</string>
   <string id="10214">Bezig met het openen van stream</string>
-
   <string id="10500">Muziek/Afspeellijst</string>
   <string id="10501">Muziek/Bestanden</string>
   <string id="10502">Muziek/Bibliotheek</string>
@@ -906,14 +875,11 @@
   <string id="10509">Netwerk gaming</string>
   <string id="10510">Extensies</string>
   <string id="10511">Systeeminformatie</string>
-
   <string id="10516">Muziek - Bibliotheek</string>
   <string id="10517">Muziek - Afspeellijst</string>
-
   <string id="10522">Video's - Afspeellijst</string>
   <string id="10523">Albuminformatie</string>
   <string id="10524">Filminformatie</string>
-
   <string id="12000">Selecteren</string>
   <string id="12001">Muziek/Informatie</string>
   <string id="12002">Bevestiging</string>
@@ -921,24 +887,32 @@
   <string id="12004">Scripts/Informatie</string>
   <string id="12005">Volledig scherm</string>
   <string id="12006">Geluidsvisualisatie</string>
-
   <string id="12008">Bestanden groeperen</string>
   <string id="12009">Herindexeren</string>
   <string id="12010">Terug naar Muziek</string>
   <string id="12011">Terug naar Video's</string>
-  <string id="12012"></string>
-  <string id="12013"></string>
-  <string id="12014"></string>
-  <string id="12015"></string>
-  <string id="12016"></string>
-  <string id="12017"></string>
-  <string id="12018"></string>
-  <string id="12019"></string>
-  <string id="12020"></string>
+  <string id="12012">
+  </string>
+  <string id="12013">
+  </string>
+  <string id="12014">
+  </string>
+  <string id="12015">
+  </string>
+  <string id="12016">
+  </string>
+  <string id="12017">
+  </string>
+  <string id="12018">
+  </string>
+  <string id="12019">
+  </string>
+  <string id="12020">
+  </string>
   <string id="12021">Starten vanaf begin</string>
   <string id="12022">Hervatten vanaf %s</string>
-  <string id="12023"></string>
-
+  <string id="12023">
+  </string>
   <string id="12310">0</string>
   <string id="12311">1</string>
   <string id="12312">2</string>
@@ -988,33 +962,34 @@
   <string id="12377">Dit zal alle voorgaande opgeslagen waarden resetten</string>
   <string id="12378">Afbeeldingen weergeven gedurende</string>
   <string id="12379">Pan- en zoomeffecten gebruiken</string>
-  <string id="12380"></string>
-  <string id="12381"></string>
-  <string id="12382"></string>
+  <string id="12380">
+  </string>
+  <string id="12381">
+  </string>
+  <string id="12382">
+  </string>
   <string id="12383">12-uursformaat</string>
   <string id="12384">24-uursformaat</string>
   <string id="12385">Dag/Maand</string>
   <string id="12386">Maand/Dag</string>
-
   <string id="12390">Systeem actief</string>
   <string id="12391">minuten</string>
   <string id="12392">uur</string>
   <string id="12393">dagen</string>
   <string id="12394">Totale activiteit</string>
-
   <string id="12600">Het weer</string>
-
   <string id="12900">Schermbeveiliging</string>
   <string id="12901">Volledig scherm On Screen Display</string>
-
   <string id="13000">Systeem</string>
   <string id="13001">Harde schijf onmiddellijk uitschakelen</string>
   <string id="13002">Alleen beeld</string>
   <string id="13003">- Vertraging</string>
   <string id="13004">- Minimale bestandsduur</string>
   <string id="13005">Uitschakelen</string>
-  <string id="13006"></string>
-  <string id="13007"></string>
+  <string id="13006">
+  </string>
+  <string id="13007">
+  </string>
   <string id="13008">Standaard afsluitmodus</string>
   <string id="13009">Afsluiten</string>
   <string id="13010">Slaapstand</string>
@@ -1023,18 +998,13 @@
   <string id="13013">Opnieuw opstarten</string>
   <string id="13014">Minimaliseren</string>
   <string id="13015">Actie voor aan/uitknop</string>
-  <string id="13016">Systeem uitschakelen</string> 
-
-
   <string id="13020">Er is een andere sessie actief, wellicht SSH?</string>
   <string id="13021">Verwisselbare harde schijf aankoppelen?</string>
   <string id="13022">Apparaat onveilig verwijderd</string>
   <string id="13023">Apparaat succesvol verwijderd</string>
   <string id="13024">Joystick aangesloten</string>
   <string id="13025">Geen joystick aangesloten</string>
-
   <string id="13050">Lage accuspanning</string>
-
   <string id="13100">Flikkerfilter</string>
   <string id="13101">Laat keuze aan driver (herstart vereist)</string>
   <string id="13105">Vertical blank sync</string>
@@ -1044,12 +1014,10 @@
   <string id="13109">Test resolutie</string>
   <string id="13110">Resolutie behouden?</string>
   <string id="13111">Wilt u deze resolutie behouden?</string>
-
   <string id="13112">Softwarematige Hoge Kwaliteit Beeldverbetering</string>
   <string id="13113">Uitgeschakeld</string>
   <string id="13114">Inschakelen voor SD-beelden</string>
   <string id="13115">Altijd inschakelen</string>
-
   <string id="13116">Beeldverbeteringsmethode</string>
   <string id="13117">Bicubic</string>
   <string id="13118">Lanczos</string>
@@ -1057,49 +1025,57 @@
   <string id="13120">Strikte Pixmap-Texture Binding (vereist herstart)</string>
   <string id="13121">VDPAU HQ Upscaling level</string>
   <string id="13122">VDPAU Studio level color conversion</string>
-
   <string id="13130">Beeldscherm blanking</string>
   <string id="13131">Uitgeschakeld</string>
   <string id="13132">Blank beeldscherm</string>
-
   <string id="13140">Actieve verbindingen gedetecteerd!</string>
   <string id="13141">Als u doorgaat, kunt u XBMC mogelijk niet meer</string>
   <string id="13142">besturen. Weet u zeker dat u de Event Server wilt stoppen?</string>
-
   <string id="13144">Verander Apple afstandsbediengsmodus?</string>
   <string id="13145">Als u op dit moment de Apple afstandsbediening gebruikt</string>
   <string id="13146">om XBMC te besturen, kan het veranderen van deze instelling</string>
   <string id="13147">de mogelijkheid om het te blijven besturen beïnvloeden. Doorgaan?</string>
-
-  <string id="13150"></string>
-  <string id="13151"></string>
-  <string id="13152"></string>
-  <string id="13153"></string>
-  <string id="13154"></string>
-  <string id="13155"></string>
-  <string id="13156"></string>
-  <string id="13157"></string>
-  <string id="13158"></string>
+  <string id="13150">
+  </string>
+  <string id="13151">
+  </string>
+  <string id="13152">
+  </string>
+  <string id="13153">
+  </string>
+  <string id="13154">
+  </string>
+  <string id="13155">
+  </string>
+  <string id="13156">
+  </string>
+  <string id="13157">
+  </string>
+  <string id="13158">
+  </string>
   <string id="13159">Subnetmasker</string>
   <string id="13160">Gateway</string>
   <string id="13161">DNS-server</string>
   <string id="13162">Initialiseren mislukt</string>
-
-  <string id="13163"></string>
-  <string id="13164"></string>
-  <string id="13165"></string>
-  <string id="13166"></string>
-  <string id="13167"></string>
-  <string id="13168"></string>
-  <string id="13169"></string>
-
-
+  <string id="13163">
+  </string>
+  <string id="13164">
+  </string>
+  <string id="13165">
+  </string>
+  <string id="13166">
+  </string>
+  <string id="13167">
+  </string>
+  <string id="13168">
+  </string>
+  <string id="13169">
+  </string>
   <string id="13170">Nooit</string>
   <string id="13171">Direct</string>
   <string id="13172">Na %i sec.</string>
   <string id="13173">HDD installatiedatum:</string>
   <string id="13174">HDD Power Cycle teller:</string>
-
   <string id="13200">Profielen</string>
   <string id="13201">Profiel '%s' verwijderen?</string>
   <string id="13204">Laatst gebruikt profiel:</string>
@@ -1110,18 +1086,15 @@
   <string id="13210">Gestart, alarm over %im</string>
   <string id="13211">Alarm!</string>
   <string id="13212">Gestopt met nog %im%is te gaan</string>
-  <string id="13213">%2.0fm</string> <!--minutes (left from countdown)-->
-  <string id="13214">%2.0fs</string> <!--seconds (left from countdown)-->
-
+  <string id="13213">%2.0fm</string>
+  <string id="13214">%2.0fs</string>
   <string id="13249">Naar ondertitels zoeken in RAR-archieven</string>
   <string id="13250">Ondertitels zoeken</string>
   <string id="13251">Item verplaatsen</string>
   <string id="13252">Item hierheen verplaatsen</string>
   <string id="13253">Verplaatsen annuleren</string>
-
   <string id="13270">Hardware:</string>
   <string id="13271">Belasting:</string>
-
   <string id="13274">XBMC is verbonden, maar geen DNS beschikbaar.</string>
   <string id="13275">Harde schijf</string>
   <string id="13276">DVD-ROM</string>
@@ -1130,23 +1103,29 @@
   <string id="13279">Netwerk</string>
   <string id="13280">Video</string>
   <string id="13281">Hardware</string>
-
   <string id="13283">Kernelversie:</string>
   <string id="13284">Kloksnelheid:</string>
-  <string id="13285"></string>
+  <string id="13285">
+  </string>
   <string id="13286">Video-encoder:</string>
   <string id="13287">Schermresolutie:</string>
-  <string id="13288"></string>
-  <string id="13289"></string>
-  <string id="13290"></string>
-  <string id="13291"></string>
+  <string id="13288">
+  </string>
+  <string id="13289">
+  </string>
+  <string id="13290">
+  </string>
+  <string id="13291">
+  </string>
   <string id="13292">A/V-kabel:</string>
-  <string id="13293"></string>
+  <string id="13293">
+  </string>
   <string id="13294">DVD-regio:</string>
   <string id="13295">Internet:</string>
   <string id="13296">XBMC is verbonden</string>
   <string id="13297">XBMC is niet verbonden. Controleer uw netwerkinstellingen.</string>
-  <string id="13298"></string>
+  <string id="13298">
+  </string>
   <string id="13299">- Doeltemperatuur</string>
   <string id="13300">- Ventilatorsnelheid</string>
   <string id="13301">Automatische ventilatorsnelheid</string>
@@ -1185,8 +1164,10 @@
   <string id="13334">Label aanpassen</string>
   <string id="13335">Maak standaard</string>
   <string id="13336">Verwijder Knop</string>
-  <string id="13338"></string>
-  <string id="13339"></string>
+  <string id="13338">
+  </string>
+  <string id="13339">
+  </string>
   <string id="13340">Onveranderd laten</string>
   <string id="13341">Groen</string>
   <string id="13342">Oranje</string>
@@ -1221,7 +1202,7 @@
   <string id="13384">Stem - Poort 2</string>
   <string id="13385">Stem - Poort 3</string>
   <string id="13386">Op tijd gebaseerd zoeken</string>
-  <string id="13387">Track weergeven als (rechts)</string>
+  <string id="13387">In rechter kolom van lijst weergeven:</string>
   <string id="13388">Preset</string>
   <string id="13389">Er zijn geen presets beschikbaar voor deze visualisatie</string>
   <string id="13390">Er zijn geen instellingen beschikbaar voor deze visualisatie</string>
@@ -1246,9 +1227,8 @@
   <string id="13409">Top 250</string>
   <string id="13410">Op Last.FM beluisteren</string>
   <string id="13411">Minimale ventilatorsnelheid</string>
-
   <string id="13413">Download</string>
-  <string id="13414">Artiest weergeven die alleen op verzamel-CD's voorkomt</string>
+  <string id="13414">Artiesten weergeven die alleen op verzamel CD's voorkomen</string>
   <string id="13415">Rendermethode</string>
   <string id="13416">Automatisch detecteren</string>
   <string id="13417">Eenvoudige shaders (ARB)</string>
@@ -1266,7 +1246,6 @@
   <string id="13429">Hardwareversnelling inschakelen (VDADecoder)</string>
   <string id="13430">Hardwareversnelling inschakelen (OpenMax)</string>
   <string id="13431">Pixelshaders</string>
-
   <string id="13500">A/V-synchronisatiemethode</string>
   <string id="13501">Audioklok</string>
   <string id="13502">Videoklok (Drop/Dupe audio)</string>
@@ -1278,25 +1257,15 @@
   <string id="13508">Hoog</string>
   <string id="13509">Echt hoog</string>
   <string id="13510">Afspelen video naar beeldscherm synchroniseren</string>
-   
-  <string id="13550">Tijdens wijzigen verversingsfrequentie pauzeren</string> 
-  <string id="13551">Uit</string> 
-  <string id="13552">%.1f Seconde</string> 
-  <string id="13553">%.1f Seconden</string> 
-
   <string id="13600">Apple afstandsbediening</string>
-
   <string id="13602">Altijd actief</string>
   <string id="13603">Ondertitel eerder/later starten</string>
-
   <string id="13610">Uitgeschakeld</string>
   <string id="13611">Standaard</string>
   <string id="13612">Universele afstandsbediening</string>
   <string id="13613">Multi Remote (Harmony)</string>
-
   <string id="13620">Apple afstandsbedieningsfout</string>
   <string id="13621">Apple afstandsbedieningsondersteuning kan niet worden geactiveerd.</string>
-
   <string id="14000">Groeperen</string>
   <string id="14001">Groeperen: Uit</string>
   <string id="14003">Afspeellijst downloaden...</string>
@@ -1304,7 +1273,6 @@
   <string id="14005">Streamlijst verwerken...</string>
   <string id="14006">Streamlijst downloaden mislukt</string>
   <string id="14007">Afspeellijst downloaden mislukt</string>
-
   <string id="14009">Spellocatie</string>
   <string id="14010">Automatisch overschakelen naar miniaturen als</string>
   <string id="14011">Automatisch overschakelen naar miniaturen</string>
@@ -1331,12 +1299,11 @@
   <string id="14034">DVD-buffer</string>
   <string id="14035">- Lokaal netwerk</string>
   <string id="14036">Servers</string>
-
   <string id="14038">Netwerkinstellingen gewijzigd</string>
   <string id="14039">XBMC moet herstarten om de netwerkinstellingen</string>
   <string id="14040">te wijzigen. Wilt u nu herstarten?</string>
-  <string id="14041"></string>
-
+  <string id="14041">
+  </string>
   <string id="14043">- Uitschakelen tijdens gebruik</string>
   <string id="14044">%i minuten</string>
   <string id="14045">%i sec.</string>
@@ -1348,7 +1315,6 @@
   <string id="14051">Tijdnotatie</string>
   <string id="14052">Datumnotatie</string>
   <string id="14053">GUI-filters</string>
-
   <string id="14055">Scannen op de achtergrond inschakelen</string>
   <string id="14056">Scan annuleren</string>
   <string id="14057">Niet mogelijk tijdens scannen naar media-info</string>
@@ -1365,8 +1331,7 @@
   <string id="14068">Geef het IP-adres</string>
   <string id="14069">Instellingen nu toepassen?</string>
   <string id="14070">Instellingen toepassen</string>
-  <string id="14071">Bestanden hernoemen en verwijderen toestaan</string>
-
+  <string id="14071">Hernoemen en verwijderen van bestanden toestaan</string>
   <string id="14074">Tijdzone</string>
   <string id="14075">Automatische zomer-/wintertijd</string>
   <string id="14076">Aan favorieten toevoegen</string>
@@ -1375,7 +1340,7 @@
   <string id="14079">Tijdzone land</string>
   <string id="14080">Tijdzone</string>
   <string id="14081">Bestandlijsten</string>
-  <string id="14082">EXIF-informatie gebruiken</string> <!--Uit context is duidelijk dat EXIF-informatie bij afbeeldingen hoort-->
+  <string id="14082">EXIF-informatie gebruiken</string>
   <string id="14083">Gemaximaliseerd venster in plaats van volledig scherm</string>
   <string id="14084">Nummers in wachtrij zetten na selectie</string>
   <string id="14085">Audio-CD's automatisch afspelen</string>
@@ -1389,35 +1354,29 @@
   <string id="14093">Beveiliging</string>
   <string id="14094">Invoerapparaten</string>
   <string id="14095">Energiebeheer</string>
-
   <string id="15015">Verwijder</string>
   <string id="15016">Spellen</string>
-
   <string id="15019">Voeg toe</string>
-
   <string id="15052">Wachtwoord</string>
-
   <string id="15100">Bibliotheek</string>
   <string id="15101">Database</string>
   <string id="15102">* Alle albums</string>
   <string id="15103">* Alle artiesten</string>
   <string id="15104">* Alle nummers</string>
   <string id="15105">* Alle genres</string>
-
   <string id="15107">Bufferen...</string>
   <string id="15108">Navigatiegeluiden</string>
   <string id="15109">Standaarduiterijk</string>
   <string id="15111">Thema</string>
   <string id="15112">Standaard thema</string>
-
   <string id="15200">Last.FM</string>
-  <string id="15201">Afgespeelde tracks op Last.FM bijhouden</string>
+  <string id="15201">Afgespeelde nummers op Last.FM bijhouden</string>
   <string id="15202">Last.FM-gebruikersnaam</string>
   <string id="15203">Last.FM-wachtwoord</string>
   <string id="15204">Verbinding mislukt</string>
   <string id="15205">Werk XBMC bij aub</string>
   <string id="15206">Authentificatie mislukt: controleer gebruikersnaam en wachtwoord</string>
-  <string id="15207">Actief</string> <!--Wordt voorafgegaan door 'Verbinding:' dus 'Verbonden' is een beetje een belachelijke vertaling-->
+  <string id="15207">Actief</string>
   <string id="15208">Niet verbonden</string>
   <string id="15209">Verzendinterval %i</string>
   <string id="15210">%i nummers gebufferd</string>
@@ -1427,12 +1386,11 @@
   <string id="15214">Geleidelijke A/V-synchronisatie gebruiken</string>
   <string id="15215">Bestandsnamen in miniatuurweergave verbergen</string>
   <string id="15216">Afspelen in feestmix</string>
-  <string id="15217">Nummers indienen bij Libre.fm</string>
+  <string id="15217">Afgespeelde nummers op Libre.fm bijhouden</string>
   <string id="15218">Libre.fm-gebruikersnaam</string>
   <string id="15219">Libre.fm-wachtwoord</string>
   <string id="15220">Libre.fm</string>
   <string id="15221">Nummer indienen</string>
-
   <string id="15250">Last.FM-radio aan Last.FM toevoegen</string>
   <string id="15251">Verbinding maken met Last.FM...</string>
   <string id="15252">Station selecteren...</string>
@@ -1482,21 +1440,16 @@
   <string id="15296">Ban opheffen</string>
   <string id="15297">Wilt u dit nummer verwijderen uit uw favoriete nummers?</string>
   <string id="15298">Wilt u de ban op dit nummer opheffen?</string>
-
   <string id="15300">Pad niet gevonden of ongeldig</string>
   <string id="15301">Kan niet verbinden met netwerkserver</string>
   <string id="15302">Geen servers gevonden</string>
   <string id="15303">Werkgroep niet gevonden</string>
-
   <string id="15310">Openen multi-pad favoriet</string>
   <string id="15311">Pad:</string>
-
   <string id="16000">Algemeen</string>
-
   <string id="16002">Zoeken op CDDB</string>
   <string id="16003">Speler</string>
   <string id="16004">Media van disk afspelen</string>
-
   <string id="16008">Geef een nieuwe titel</string>
   <string id="16009">Geef naam van de film</string>
   <string id="16010">Geef profielnaam</string>
@@ -1525,19 +1478,22 @@
   <string id="16033">Kan database niet openen.</string>
   <string id="16034">Kan geen nummers uit database verkrijgen.</string>
   <string id="16035">Feestmix afspeellijst</string>
-
   <string id="16100">Alle video's</string>
-  <string id="16101">Niet bekeken</string> <!--Uit context is duidelijk dat het om video's (afleveringen) gaat-->
-  <string id="16102">Bekeken</string> <!--Idem-->
+  <string id="16101">Niet bekeken</string>
+  <string id="16102">Bekeken</string>
   <string id="16103">Als bekeken markeren</string>
   <string id="16104">Als niet-bekeken markeren</string>
   <string id="16105">Titel aanpassen</string>
-  <string id="16106"></string>
-  <string id="16107"></string>
-  <string id="16108"></string>
-  <string id="16109"></string>
-  <string id="16110"></string>
-
+  <string id="16106">
+  </string>
+  <string id="16107">
+  </string>
+  <string id="16108">
+  </string>
+  <string id="16109">
+  </string>
+  <string id="16110">
+  </string>
   <string id="16200">Actie is afgebroken</string>
   <string id="16201">Kopiëren mislukt</string>
   <string id="16202">Tenminste 1 bestand is niet gekopieerd</string>
@@ -1545,7 +1501,6 @@
   <string id="16204">Tenminste 1 bestand is niet verplaatst</string>
   <string id="16205">Verwijderen mislukt</string>
   <string id="16206">Tenminste 1 bestand is niet verwijderd</string>
-
   <string id="16300">Videoschalingsmethode</string>
   <string id="16301">Nearest neighbour</string>
   <string id="16302">Bilinear</string>
@@ -1566,27 +1521,21 @@
   <string id="16317">Temporal (Half)</string>
   <string id="16318">Temporal/Spatial (Half)</string>
   <string id="16319">DXVA</string>
-
   <string id="16400">Video post-processing</string>
-  <string id="16401"></string>
-  <string id="16402"></string>
-  <string id="16403"></string>
-
+  <string id="16401">Uitgeschakeld</string>
+  <string id="16402">Ingeschakeld voor SD beelden</string>
+  <string id="16403">Altijd ingeschakeld</string>
   <string id="17500">Uitschakeltijd beeldscherm</string>
-
   <string id="19000">Kanaal wijzigen</string>
-
-  <string id="20000">CD-ripmap</string>
+  <string id="20000">Geimporteerde muziek map</string>
   <string id="20001">Andere DVD-speler gebruiken</string>
   <string id="20002">- Locatie van de DVD-speler</string>
   <string id="20003">Trainersmap</string>
   <string id="20004">Screenshotmap</string>
-
   <string id="20006">Playlistmap</string>
   <string id="20007">Opnames</string>
   <string id="20008">Screenshots</string>
   <string id="20009">XBMC gebruiken</string>
-
   <string id="20011">Muziekafspeellijsten</string>
   <string id="20012">Videoafspeellijsten</string>
   <string id="20013">Wilt u het spel starten?</string>
@@ -1596,16 +1545,12 @@
   <string id="20017">Lokale afbeelding</string>
   <string id="20018">Geen afbeelding</string>
   <string id="20019">Miniatuur kiezen</string>
-
-  <!-- string id 20022 will always be set to an empty string (LocalizeStrings.cpp)-->
-  <string id="20022"></string>
+  <string id="20022">
+  </string>
   <string id="20023">Conflict</string>
   <string id="20024">Scan nieuwe</string>
   <string id="20025">Scan alles</string>
   <string id="20026">Land</string>
-
-  <!-- string id's 20027 thru 20034 are reserved for temperature strings (LocalizeStrings.cpp)-->
-
   <string id="20037">Samenvatting</string>
   <string id="20038">Muzieksectie vergrendelen</string>
   <string id="20039">Videosectie vergrendelen</string>
@@ -1625,7 +1570,6 @@
   <string id="20053">Ontgrendelde modus verlaten</string>
   <string id="20054">Ontgrendelde modus inschakelen</string>
   <string id="20055">Allmusic.com-miniatuur</string>
-
   <string id="20057">Miniatuur verwijderen</string>
   <string id="20058">Profiel toevoegen...</string>
   <string id="20059">Info opvragen voor alle albums</string>
@@ -1753,10 +1697,12 @@
   <string id="20182">Spatie</string>
   <string id="20183">Skin herladen</string>
   <string id="20184">Draaien op basis van EXIF-informatie</string>
-  <string id="20185">Posterstijl voor series gebruiken</string>
+  <string id="20185">Posterstijl voor tv-series gebruiken</string>
   <string id="20186">Even geduld...</string>
-  <string id="20187"></string>
-  <string id="20188"></string>
+  <string id="20187">
+  </string>
+  <string id="20188">
+  </string>
   <string id="20189">Plot en bespreking automatisch scrollen</string>
   <string id="20190">Handmatig</string>
   <string id="20191">Foutregistratie inschakelen</string>
@@ -1768,9 +1714,6 @@
   <string id="20197">Muziekbibliotheek importeren</string>
   <string id="20198">Geen artiest gevonden!</string>
   <string id="20199">Downloaden van artiestinformatie mislukt</string>
-
-  <!-- string id's 20200 thru 20211 are reserved for speedstrings (LocalizeStrings.cpp)-->
-
   <string id="20250">Feesten maar! (video's)</string>
   <string id="20251">Drankjes mixen (video's)</string>
   <string id="20252">Glazen vullen (video's)</string>
@@ -1779,38 +1722,44 @@
   <string id="20255">Eerste login, profiel bijwerken</string>
   <string id="20256">HTS tvheadend client</string>
   <string id="20257">VDR streamdev client</string>
-  <string id="20258">MythTV client</string>
-
   <string id="20300">Webservermap (HTTP)</string>
   <string id="20301">Webservermap (HTTPS)</string>
   <string id="20302">Kan niet schrijven naar map:</string>
   <string id="20303">Overslaan en verdergaan?</string>
   <string id="20304">RSS-feed</string>
-
-  <string id="20306"></string>
+  <string id="20306">
+  </string>
   <string id="20307">Secundaire DNS</string>
   <string id="20308">DHCP-server:</string>
   <string id="20309">Nieuwe map</string>
   <string id="20310">LCD dimmen tijdens afspelen</string>
   <string id="20311">Onbekend of onboard (beveiligd)</string>
   <string id="20312">LCD dimmen tijdens pauze</string>
-  <string id="20313"></string>
+  <string id="20313">
+  </string>
   <string id="20314">Video - Bibliotheek</string>
-  <string id="20315"></string>
+  <string id="20315">
+  </string>
   <string id="20316">Sorteer: ID</string>
-  <string id="20317"></string>
-  <string id="20318"></string>
-  <string id="20319"></string>
-  <string id="20320"></string>
-  <string id="20321"></string>
-  <string id="20322"></string>
-  <string id="20323"></string>
+  <string id="20317">
+  </string>
+  <string id="20318">
+  </string>
+  <string id="20319">
+  </string>
+  <string id="20320">
+  </string>
+  <string id="20321">
+  </string>
+  <string id="20322">
+  </string>
+  <string id="20323">
+  </string>
   <string id="20324">Afspelen deel...</string>
   <string id="20325">Kalibratie opnieuw instellen</string>
   <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="20330">Gebruik mapnamen bij zoeken</string>
   <string id="20331">Bestand</string>
   <string id="20332">Ook in bestands- of mapnamen zoeken?</string>
@@ -1823,8 +1772,8 @@
   <string id="20339">Regisseur</string>
   <string id="20340">Wilt u alle items in deze map</string>
   <string id="20341">verwijderen uit de bibliotheek?</string>
-  <string id="20342">Films</string>
-  <string id="20343">Series</string>
+  <string id="20342">Speelfilms</string>
+  <string id="20343">TV-Series</string>
   <string id="20344">Deze map bevat</string>
   <string id="20345">Automatisch scannen</string>
   <string id="20346">Ook onderliggende mappen scannen</string>
@@ -1840,8 +1789,8 @@
   <string id="20356">Selecteer serie:</string>
   <string id="20357">Geef de naam van de serie</string>
   <string id="20358">Seizoen %i</string>
-  <string id="20359">Afl.</string> <!--Overlapt met andere delen van de UI in bepaalde schermen-->
-  <string id="20360">Afl.</string> <!--Zelfde opmerking als bij vorige string-->
+  <string id="20359">Afl.</string>
+  <string id="20360">Afl.</string>
   <string id="20361">Afleveringsdetails laden</string>
   <string id="20362">Aflevering uit bibliotheek verwijderen</string>
   <string id="20363">Serie uit bibliotheek verwijderen</string>
@@ -1857,7 +1806,7 @@
   <string id="20373">Seizoen</string>
   <string id="20374">Video-informatie ophalen</string>
   <string id="20375">Inhoud ontkoppelen</string>
-  <string id="20376">Originele titel</string> 
+  <string id="20376">Originele titel</string>
   <string id="20377">Serie-informatie vernieuwen</string>
   <string id="20378">Alle afleveringen vernieuwen?</string>
   <string id="20379">Geselecteerde map bevat één enkele serie</string>
@@ -1867,8 +1816,8 @@
   <string id="20383">Geselecteerde map bevat 1 video</string>
   <string id="20384">Aan serie koppelen</string>
   <string id="20385">Van serie loskoppelen</string>
-  <string id="20386">Onlangs toegevoegde films</string>
-  <string id="20387">Onlangs toegevoegde afleveringen series</string>
+  <string id="20386">Onlangs toegevoegde speelfilms</string>
+  <string id="20387">Onlangs toegevoegde afleveringen tv-series</string>
   <string id="20388">Filmstudio's</string>
   <string id="20389">Muziekvideo's</string>
   <string id="20390">Onlangs toegevoegde muziekvideo's</string>
@@ -1885,7 +1834,6 @@
   <string id="20401">Muziekvideo afspelen</string>
   <string id="20402">Afbeeldingen van acteurs automatisch laden</string>
   <string id="20403">Acteursafbeelding instellen</string>
-
   <string id="20405">Afl. uit favorieten verwijderen</string>
   <string id="20406">Afl. aan favorieten toevoegen</string>
   <string id="20407">Scraperinstellingen</string>
@@ -1894,13 +1842,12 @@
   <string id="20410">Trailer</string>
   <string id="20411">Eenvoudige weergave</string>
   <string id="20412">Seizoenen verbergen indien één seizoen</string>
-  <string id="20413">Fanart downl.</string> <!-- Past niet in knop indien voluit geschreven-->
+  <string id="20413">Fanart downl.</string>
   <string id="20414">Fanart in video- en muziekbibliotheek tonen</string>
   <string id="20415">Bezig met scannen naar nieuwe inhoud</string>
-  <string id="20416">Eerst uitgez.</string> <!-- "Eerste keer uitgezonden" neemt teveel ruimte in beslag in overzicht-->
+  <string id="20416">Eerst uitgez.</string>
   <string id="20417">Schrijver</string>
   <string id="20418">Bestands- en mapnamen opschonen</string>
-
   <string id="20420">Nooit</string>
   <string id="20421">Alleen indien één seizoen</string>
   <string id="20422">Altijd</string>
@@ -1914,7 +1861,7 @@
   <string id="20430">Miniaturen en fanart exporteren?</string>
   <string id="20431">Oude bestanden overschrijven?</string>
   <string id="20432">Pad uitsluiten van bibliotheekupdates</string>
-  <string id="20433">Miniaturen en vlaggen extraheren</string>
+  <string id="20433">Miniaturen en codec informatie uitlezen</string>
   <string id="20434">Sets</string>
   <string id="20435">Filmsetthumb kiezen</string>
   <string id="20436">Acteurminiaturen exporteren</string>
@@ -1935,12 +1882,7 @@
   <string id="20451">Landen</string>
   <string id="20452">Aflevering</string>
   <string id="20453">Afleveringen</string>
-  <string id="20454">Luisteraar</string> 
-  <string id="20455">Luisteraars</string>
-  <!-- up to 21329 is reserved for the video db !! !-->
-
   <string id="21330">Verborgen bestanden en mappen weergeven</string>
-
   <string id="21331">TuxBox-client</string>
   <string id="21332">WAARSCHUWING: TuxBox is aan het opnemen.</string>
   <string id="21333">De stream wordt gestopt!</string>
@@ -1948,16 +1890,12 @@
   <string id="21335">Weet u zeker dat u de stream wil starten?</string>
   <string id="21336">Verbinden met: %s</string>
   <string id="21337">TuxBox-apparaat</string>
-  <!-- up to 21355 is reserved for the TuxBox Client!! !-->
-
   <string id="21359">Gedeelde media toevoegen...</string>
   <string id="21360">UPnP-server inschakelen</string>
-
   <string id="21364">Gedeelde media wijzigen</string>
   <string id="21365">Gedeelde media verwijderen</string>
-  <string id="21366">Ondertitelmap</string>
+  <string id="21366">Map voor ondertitels...</string>
   <string id="21367">Video - alternatieve ondertitelmap</string>
-
   <string id="21369">Muis inschakelen</string>
   <string id="21370">Navigatiegeluiden afspelen tijdens afspelen van media</string>
   <string id="21371">Miniatuur</string>
@@ -2002,10 +1940,10 @@
   <string id="21410">in laatste</string>
   <string id="21411">niet in laatste</string>
   <string id="21412">Scrapers</string>
-  <string id="21413">Standaard filmscraper</string>
-  <string id="21414">Standaard seriescraper</string>
-  <string id="21415">Standaard muziekvideoscraper</string>
-  <string id="21416">Fallback gebaseerd op scrapertaal</string>
+  <string id="21413">Standaard speelfilm scraper</string>
+  <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 </string>
   <string id="21418">Meertalig</string>
   <string id="21419">Geen scrapers beschikbaar</string>
@@ -2043,7 +1981,6 @@
   <string id="21451">Internetverbinding vereist.</string>
   <string id="21452">Add-ons installeren</string>
   <string id="21453">Rootbestandsysteem</string>
-
   <string id="21800">Bestandsnaam</string>
   <string id="21801">Pad</string>
   <string id="21802">Bestandsgrootte</string>
@@ -2053,7 +1990,6 @@
   <string id="21806">Opmerking</string>
   <string id="21807">Kleur/zwart-wit</string>
   <string id="21808">JPEG-proces</string>
-
   <string id="21820">Datum/tijd</string>
   <string id="21821">Omschrijving</string>
   <string id="21822">Cameramerk</string>
@@ -2078,7 +2014,6 @@
   <string id="21841">GPS-breedtegraad</string>
   <string id="21842">GPS-hoogte</string>
   <string id="21843">Oriëntatie</string>
-
   <string id="21860">Overige categorieën</string>
   <string id="21861">Sleutelwoorden</string>
   <string id="21862">Titel</string>
@@ -2120,13 +2055,9 @@
   <string id="21898">Jaren actief:</string>
   <string id="21899">Platenlabel</string>
   <string id="21900">Geboren/Opgericht</string>
-
-  <!-- strings 21900 thru 21999 reserved for slideshow info -->
-
   <string id="22000">Bibliotheek bijwerken bij het opstarten</string>
   <string id="22001">Bibliotheek altijd op de achtergrond bijwerken</string>
   <string id="22002">- DNS-suffix</string>
-  
   <string id="22003">%2.3fs</string>
   <string id="22004">Eerder %2.3fs</string>
   <string id="22005">Later %2.3fs</string>
@@ -2138,7 +2069,7 @@
   <string id="22011">Temperatuur:</string>
   <string id="22012">Aanwezig geheugen</string>
   <string id="22013">Profieldata</string>
-  <string id="22014">Scherm dimmen bij gepauzeerde videoweergave</string> <!--Oorspronkelijke vertaling had aanhalingstekens maar dimmen is (ondertussen?) een geaccepteerd Nederlands woord-->
+  <string id="22014">Scherm dimmen bij gepauzeerde videoweergave</string>
   <string id="22015">Alle opnames</string>
   <string id="22016">Op titel</string>
   <string id="22017">Op groep</string>
@@ -2149,8 +2080,6 @@
   <string id="22022">Toon videobestanden in lijst</string>
   <string id="22023">DirectX-leverancier:</string>
   <string id="22024">Direct3D-versie</string>
-
-  <!-- strings 22030 thru 22060 reserved for karaoke -->
   <string id="22030">Lettertype</string>
   <string id="22031">- Grootte</string>
   <string id="22032">- Kleuren</string>
@@ -2165,32 +2094,24 @@
   <string id="22041">wit/rood</string>
   <string id="22042">wit/blauw</string>
   <string id="22043">zwart/wit</string>
-
   <string id="22079">Standaardactie bij selecteren</string>
   <string id="22080">Kiezen</string>
   <string id="22081">Informatie tonen</string>
   <string id="22082">Meer...</string>
   <string id="22083">Alles afspelen</string>
-
   <string id="23049">Teletekst niet beschikbaar</string>
   <string id="23050">Teletekst activeren</string>
   <string id="23051">Stuk %i</string>
   <string id="23052">%i bytes bufferen</string>
   <string id="23053">Instellingen ontbreken</string>
   <string id="23054">Instellingen verkeerd</string>
-
-  <!-- strings 23100 thru 23150 reserved for external player -->
   <string id="23100">Externe speler actief</string>
   <string id="23101">Klik op OK om de speler te beëindigen</string>
-
   <string id="23104">Klik op OK als afspelen beëindigd is</string>
-
-  <!-- strings 24000 thru 24299 reserved for the add-ons framework -->
   <string id="24000">Add-on</string>
   <string id="24001">Add-ons</string>
   <string id="24002">Add-onopties</string>
   <string id="24003">Add-oninformatie</string>
-
   <string id="24005">Mediabronnen</string>
   <string id="24007">Filminformatie</string>
   <string id="24008">Schermbeveiliging</string>
@@ -2203,7 +2124,6 @@
   <string id="24015">Muziekvideoinformatie</string>
   <string id="24016">Albuminformatie</string>
   <string id="24017">Artiestinformatie</string>
-
   <string id="24020">Configureren</string>
   <string id="24021">Uitschakelen</string>
   <string id="24022">Inschakelen</string>
@@ -2224,7 +2144,6 @@
   <string id="24041">Installeren via zipbestand</string>
   <string id="24042">Downloaden van %i%%</string>
   <string id="24043">Beschikbare updates</string>
-
   <string id="24050">Beschikbare add-ons</string>
   <string id="24051">Versie:</string>
   <string id="24052">Disclaimer</string>
@@ -2241,7 +2160,6 @@
   <string id="24067">Bezig met het ophalen van de volgende add-ons</string>
   <string id="24068">Update beschikbaar</string>
   <string id="24069">Update</string>
-
   <string id="24070">Add-on kan niet worden geladen</string>
   <string id="24071">Er is een onbekende fout opgetreden</string>
   <string id="24072">Instellingen vereist</string>
@@ -2251,30 +2169,25 @@
   <string id="24080">Nogmaals proberen te verbinden?</string>
   <string id="24089">Add-on aan het herstarten</string>
   <string id="24090">Add-onmanager vastzetten</string>
-
-  <string id="24091"></string>
-  <string id="24092"></string>
-  <string id="24093"></string>
-  <string id="24094"></string>
+  <string id="24091">
+  </string>
+  <string id="24092">
+  </string>
+  <string id="24093">
+  </string>
+  <string id="24094">
+  </string>
   <string id="24095">Uitgeschakelde systeem add-on</string>
-
   <string id="24096">Add-on is gemarkeerd als niet werkend in het repository.</string>
-  <string id="24097">Wilt u de add-on uitschakelen?</string> <!--'op het systeem' is hier overbodig-->
+  <string id="24097">Wilt u de add-on uitschakelen?</string>
   <string id="24098">Defect</string>
   <string id="24099">Wilt u deze skin gebruiken?</string>
-  <string id="25000">Meldingen</string>  
-  
- <!-- strings 29800 thru 29998 reserved strings used only in the default Project Mayhem III skin and not c++ code -->
+  <string id="25000">Meldingen</string>
   <string id="29800">Bibliotheekmodus</string>
   <string id="29801">QWERTY-indeling toetsenbord</string>
   <string id="29802">Passthrough audio in gebruik</string>
-
-  <string id="29999"></string>
-
-  <!-- strings 30000 thru 30999 reserved for plugins and plugin settings -->
-  <!-- strings 31000 thru 31999 reserved for skins -->
-  <!-- strings 32000 thru 32999 reserved for scripts -->
-  <!-- strings 33000 thru 33999 reserved for common strings used in Add-ons -->
+  <string id="29999">
+  </string>
   <string id="33001">Trailerkwaliteit</string>
   <string id="33002">Stream</string>
   <string id="33003">Downloaden</string>
@@ -2344,19 +2257,15 @@
   <string id="33078">Volgende pagina</string>
   <string id="33079">Liefde</string>
   <string id="33080">Haat</string>
-  
   <string id="33081">Dit bestand bestaat uit meerdere delen, selecteer het deel dat u wilt afspelen.</string>
   <string id="33082">Pad naar script</string>
   <string id="33083">Stel aangepaste scriptknop in</string>
-
-  <!-- translators: no need to add these to your language files -->
   <string id="34000">Lame</string>
   <string id="34001">Vorbis</string>
   <string id="34002">Wav</string>
   <string id="34003">DXVA2</string>
   <string id="34004">VAAPI</string>
   <string id="34005">FLAC</string>
-
   <string id="34100">Luidsprekerkanalen</string>
   <string id="34101">2.0</string>
   <string id="34102">2.1</string>
@@ -2368,6 +2277,4 @@
   <string id="34108">5.1</string>
   <string id="34109">7.0</string>
   <string id="34110">7.1</string>
-  <!-- 34112-34200 reserved for future use -->
-
 </strings>

Modified: branches/Dharma/language/Korean/strings.xml
===================================================================
--- branches/Dharma/language/Korean/strings.xml	2010-12-08 21:25:34 UTC (rev 35605)
+++ branches/Dharma/language/Korean/strings.xml	2010-12-08 21:28:34 UTC (rev 35606)
@@ -2,7 +2,7 @@
 <!--Language file translated with Team XBMC Translator-->
 <!--Translator: airplanez-->
 <!--Email: airplanez@...>
-<!--Date of translation: 10/25/2010-->
+<!--Date of translation: 11/29/2010-->
 <!--$Revision$-->
 <strings>
   <string id="0">프로그램</string>
@@ -1186,6 +1186,7 @@
   <string id="14038">네트워크 설정이 변경되었습니다</string>
   <string id="14039">네트워크 설정을 변경하려면 XBMC</string>
   <string id="14040">재시작이 필요합니다. 지금 재시작 하시겠습니까?</string>
+  <string id="14041">인터넷 연결 대역폭 제한</string>
   <string id="14043">- 재생중에도 종료</string>
   <string id="14044">%i 분</string>
   <string id="14045">%i 초</string>
@@ -1726,6 +1727,8 @@
   <string id="20451">국가</string>
   <string id="20452">에피소드</string>
   <string id="20453">에피소드</string>
+  <string id="20454">청취자</string>
+  <string id="20455">청취자</string>
   <string id="21330">숨김 파일 및 디렉토리 보이기</string>
   <string id="21331">TuxBox 클라이언트</string>
   <string id="21332">경고: 대상 TuxBox 장치가 녹음-모드 입니다!</string>
@@ -1968,6 +1971,7 @@
   <string id="24015">뮤직비디오 정보</string>
   <string id="24016">앨범 정보</string>
   <string id="24017">아티스트 정보</string>
+  <string id="24018">서비스</string>
   <string id="24020">설정</string>
   <string id="24021">사용안함</string>
   <string id="24022">사용함</string>

Modified: branches/Dharma/language/Polish/strings.xml
===================================================================
--- branches/Dharma/language/Polish/strings.xml	2010-12-08 21:25:34 UTC (rev 35605)
+++ branches/Dharma/language/Polish/strings.xml	2010-12-08 21:28:34 UTC (rev 35606)
@@ -1183,6 +1183,7 @@
   <string id="14038">Zmieniono ustawienia sieci</string>
   <string id="14039">Wprowadzone zmiany wymagają ponownego uruchomienia.</string>
   <string id="14040">Chcesz teraz ponownie uruchomić XBMC?</string>
+  <string id="14041">Ograniczenie pasma połączenia Internetowego</string>
   <string id="14043">- Wyłącz w trakcie odtwarzania</string>
   <string id="14044">%i min</string>
   <string id="14045">%i s</string>
@@ -2102,4 +2103,4 @@
   <string id="34108">5.1</string>
   <string id="34109">7.0</string>
   <string id="34110">7.1</string>
-</strings>
+</strings>
\ No newline at end of file

Modified: branches/Dharma/language/Romanian/strings.xml
===================================================================
--- branches/Dharma/language/Romanian/strings.xml	2010-12-08 21:25:34 UTC (rev 35605)
+++ branches/Dharma/language/Romanian/strings.xml	2010-12-08 21:28:34 UTC (rev 35606)
@@ -247,7 +247,7 @@
   <string id="274">Poziționare subtitrare</string>
   <string id="275">Ajustare raport pixel</string>
   <string id="276">Ajustați săgeata pentru a modifica gradul de suprascanare</string>
-  <string id="277">Ajustați bara pentru a modifica poziția afișării subtitrărilor</string>
+  <string id="277">Ajustați bara pe verticală pentru a modifica poziția afișării subtitrărilor</string>
   <string id="278">Ajustați dreptunghiul până ce devine un pătrat perfect</string>
   <string id="279">Nu s-au putut încărca setăriile</string>
   <string id="280">Se folosesc setările implicite</string>
@@ -321,7 +321,7 @@
   <string id="353">Negru</string>
   <string id="354">Matrix</string>
   <string id="355">Așteptare pentru activare protector ecran</string>
-  <string id="356">Mod protector ecran</string>
+  <string id="356">Protector ecran</string>
   <string id="357">Timp de așteptare pentru închidere</string>
   <string id="358">Toate albumele</string>
   <string id="359">Albume adăugate recent</string>
@@ -456,7 +456,7 @@
   <string id="494">Headroom audio per total</string>
   <string id="495">Mărește fișierele videos pâna la rezoluția GUI</string>
   <string id="496">Calibrare</string>
-  <string id="497">Arată extensii fișiere</string>
+  <string id="497">Arată extensiile fișierelor</string>
   <string id="498">Sortează după: Tip</string>
   <string id="499">Imposibil de conectat la serviciul de căutare online</string>
   <string id="500">Descărcarea informațiilor album a eșuat</string>
@@ -715,7 +715,7 @@
   <string id="1000">- Previzualizare</string>
   <string id="1001">Imposibil de conectat</string>
   <string id="1002">XBMC nu s-a putut conecta la locația rețelei.</string>
-  <string id="1003">Acest lucru poate fi din cauză că rețeaua nu este conectată.</string>
+  <string id="1003">Este posibil ca rețeaua să nu fie conectată.</string>
   <string id="1004">Doriți să îl adăugați oricum?</string>
 
   <string id="1006">Adresă IP</string>
@@ -985,7 +985,7 @@
   <string id="12368">Introduceți un cod principal valid</string>
   <string id="12373">Setări și gestionar de fișiere</string>
   <string id="12376">Setează ca implicit pentru toate filmele</string>
-  <string id="12377">Vor fi resetate toate valorile salvate anterior</string>
+  <string id="12377">Vor fi resetate toate valorile salvate anterior.</string>
   <string id="12378">Durată de afișare pentru fiecare imagine</string>
   <string id="12379">Folosește efecte de mișcare și mărire</string>
   <string id="12380"></string>
@@ -1041,7 +1041,7 @@
   <string id="13107">Activată în timpul redării video</string>
   <string id="13108">Activat întotdeauna</string>
   <string id="13109">Testare și aplicare rezoluție</string>
-  <string id="13110">Salvați rezoluția?</string>
+  <string id="13110">Salvare rezoluție</string>
   <string id="13111">Doriți să păstrați această rezoluție?</string>
 
   <string id="13112">Mărire cu calitate înaltă</string>
@@ -1153,7 +1153,7 @@
   <string id="13303">- Fonturi</string>
   <string id="13304">Activează inversare pentru textele bi-direcționale</string>
   <string id="13305">Afișează fluxuri de știri RSS</string>
-  <string id="13306">Arată elemente dosar părinte</string>
+  <string id="13306">Arată elementele dosarului părinte</string>
   <string id="13307">Model de numire piste</string>
   <string id="13308">Doriți să reporniți sistemul</string>
   <string id="13309">în loc de XBMC?</string>
@@ -1374,10 +1374,10 @@
   <string id="14079">Țară fus orar</string>
   <string id="14080">Fus orar</string>
   <string id="14081">Liste de fișiere</string>
-  <string id="14082">Afișează informații EXIF pentru imagini</string>
+  <string id="14082">Arată informațiile EXIF ale imaginilor</string>
   <string id="14083">Folosește o fereastră pe tot ecranul în loc de ecran complet adevărat</string>
   <string id="14084">La selectare pune cântecele la coadă</string>
-  <string id="14085">Redă CD-urile audio automat</string>
+  <string id="14085">Redă automat CD-urile audio</string>
   <string id="14086">Redare</string>
   <string id="14087">DVD-uri</string>
   <string id="14088">Redă DVD-urile automat</string>
@@ -1387,7 +1387,7 @@
   <string id="14092">Depanare</string>
   <string id="14093">Securitate</string>
   <string id="14094">Dispozitive intrare</string>
-  <string id="14095">Economie energie</string>
+  <string id="14095">Reducere consum</string>
 
   <string id="15015">Elimină</string>
   <string id="15016">Jocuri</string>
@@ -1530,7 +1530,7 @@
   <string id="16102">privite</string>
   <string id="16103">Marchează ca privit</string>
   <string id="16104">Marchează ca neprivit</string>
-  <string id="16105">Modifică titlu</string>
+  <string id="16105">Modifică titlul</string>
   <string id="16106"></string>
   <string id="16107"></string>
   <string id="16108"></string>
@@ -1545,7 +1545,7 @@
   <string id="16205">Ștergerea a eșuat</string>
   <string id="16206">Cel puțin un fișier nu a putut fi șters</string>
 
-  <string id="16300">Metodă scalare video</string>
+  <string id="16300">Metodă de scalare video</string>
   <string id="16301">Nearest neighbour</string>
   <string id="16302">Bilinear</string>
   <string id="16303">Bicubic</string>
@@ -1627,7 +1627,7 @@
 
   <string id="20057">Elimină miniatură</string>
   <string id="20058">Adaugă profil...</string>
-  <string id="20059">Obține info pt. toate albumele</string>
+  <string id="20059">Cere info pt. toate albumele</string>
   <string id="20060">Informații media</string>
   <string id="20061">Separă</string>
   <string id="20062">Partajări implicite</string>
@@ -1892,7 +1892,7 @@
   <string id="20409">Descărcare informații serial</string>
   <string id="20410">Trailer</string>
   <string id="20411">Netezește</string>
-  <string id="20412">Netezire seriale</string>
+  <string id="20412">Netezește seriale</string>
   <string id="20413">Obține Fanart</string>
   <string id="20414">Arată Fanart în mediateciile de filme și muzică</string>
   <string id="20415">Se scanează pentru conținut nou</string>
@@ -1923,7 +1923,7 @@
   <string id="20440">Fanart curent</string>
   <string id="20441">Fanart la distanță</string>
   <string id="20442">Schimbare conținut</string>
-  <string id="20443">Doriți să reîmprospătații informațiile pentru toate</string>
+  <string id="20443">Doriți să reîmprospătați informațiile pentru toate</string>
   <string id="20444">elementele din această cale?</string>
   <string id="20445">Fanart</string>
   <string id="20446">Au fost găsite informații stocate local.</string>
@@ -1938,7 +1938,7 @@
   <string id="20455">Ascultători</string>
   <!-- up to 21329 is reserved for the video db !! !-->
 
-  <string id="21330">Arată fișierele și directoarele ascunse</string>
+  <string id="21330">Arată dosarele și fișierele ascunse</string>
 
   <string id="21331">Client TuxBox</string>
   <string id="21332">AVERTISMENT: Dispozitivul țintă TuxBox este în modul înregistrare!</string>
@@ -1950,7 +1950,7 @@
   <!-- up to 21355 is reserved for the TuxBox Client!! !-->
 
   <string id="21359">Adaugă partajare media...</string>
-  <string id="21360">Partajează mediateciile de filme și muzică prin UPnP</string>
+  <string id="21360">Partajează mediateca video și audio prin UPnP</string>
 
   <string id="21364">Modifică partajare media</string>
   <string id="21365">Elimină partajare media</string>
@@ -2102,7 +2102,7 @@
   <string id="21881">Permite controlul XBMC prin UPnP</string>
   <string id="21882">Încearcă să sari peste introducere înainte de meniul DVD</string>
   <string id="21883">Muzică salvată</string>
-  <string id="21884">Obține info pt. toți artiștii</string>
+  <string id="21884">Cere info pt. toți artiștii</string>
   <string id="21885">Descărcare informații albume</string>
   <string id="21886">Descărcare informații artiști</string>
   <string id="21887">Biografie</string>
@@ -2123,7 +2123,7 @@
   <!-- strings 21900 thru 21999 reserved for slideshow info -->
 
   <string id="22000">Actualizează mediateca la pornire</string>
-  <string id="22001">Ascunde progres pentru actualizări mediatecă</string>
+  <string id="22001">Ascunde progresul când se actualizează mediateca</string>
   <string id="22002">- Sufix DNS</string>
 
   <string id="22003">%2.3fs</string>
@@ -2171,7 +2171,7 @@
   <string id="22082">Mai multe...</string>
   <string id="22083">Redă toate</string>
 
-  <string id="23049">Teletextul nu este disponibil</string>
+  <string id="23049">Teletextul nu este disponibil!</string>
   <string id="23050">Activează Teletext</string>
   <string id="23051">Parte %i</string>
   <string id="23052">Preîncărcare %i octeți</string>

Modified: branches/Dharma/language/Spanish/strings.xml
===================================================================
--- branches/Dharma/language/Spanish/strings.xml	2010-12-08 21:25:34 UTC (rev 35605)
+++ branches/Dharma/language/Spanish/strings.xml	2010-12-08 21:28:34 UTC (rev 35606)
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!--Language file translated with Team XBMC Translator-->
-<!--Translator: xbmcero-->
-<!--Date of translation: 08/12/2010-->
-<!--Based on english strings version 32026-->
+<!--$Revision$-->
 <strings>
   <string id="0">Programas</string>
   <string id="1">Imágenes</string>
@@ -11,9 +8,10 @@
   <string id="4">Guía de TV</string>
   <string id="5">Ajustes</string>
   <string id="6">XBMC SVN</string>
-  <string id="7">Ficheros</string>
+  <string id="7">Archivos</string>
   <string id="8">El Tiempo</string>
   <string id="9">xbmc media center</string>
+
   <string id="11">Lunes</string>
   <string id="12">Martes</string>
   <string id="13">Miércoles</string>
@@ -21,6 +19,7 @@
   <string id="15">Viernes</string>
   <string id="16">Sábado</string>
   <string id="17">Domingo</string>
+
   <string id="21">Enero</string>
   <string id="22">Febrero</string>
   <string id="23">Marzo</string>
@@ -33,6 +32,7 @@
   <string id="30">Octubre</string>
   <string id="31">Noviembre</string>
   <string id="32">Diciembre</string>
+
   <string id="41">Lun</string>
   <string id="42">Mar</string>
   <string id="43">Mie</string>
@@ -40,6 +40,7 @@
   <string id="45">Vie</string>
   <string id="46">Sab</string>
   <string id="47">Dom</string>
+
   <string id="51">Ene</string>
   <string id="52">Feb</string>
   <string id="53">Mar</string>
@@ -48,10 +49,29 @@
   <string id="56">Jun</string>
   <string id="57">Jul</string>
   <string id="58">Ago</string>
-  <string id="59">Set</string>
+  <string id="59">Sep</string>
   <string id="60">Oct</string>
   <string id="61">Nov</string>
   <string id="62">Dic</string>
+
+  <string id="71">N</string>
+  <string id="72">NNE</string>
+  <string id="73">NE</string>
+  <string id="74">ENE</string>
+  <string id="75">E</string>
+  <string id="76">ESE</string>
+  <string id="77">SE</string>
+  <string id="78">SSE</string>
+  <string id="79">S</string>
+  <string id="80">SSO</string>
+  <string id="81">SO</string>
+  <string id="82">OSO</string>
+  <string id="83">O</string>
+  <string id="84">ONO</string>
+  <string id="85">NO</string>
+  <string id="86">NNO</string>
+  <string id="87">VAR</string>
+
   <string id="98">Ver: Auto</string>
   <string id="99">Ver: Auto grande</string>
   <string id="100">Ver: Iconos</string>
@@ -67,17 +87,19 @@
   <string id="110">Crear miniaturas</string>
   <string id="111">Accesos directos</string>
   <string id="112">Pausado</string>
+  <string id="113">Ha fallado la actualización</string>
+  <string id="114">Ha fallado la instalación</string>
   <string id="115">Copiar</string>
   <string id="116">Mover</string>
   <string id="117">Eliminar</string>
   <string id="118">Renombrar</string>
-  <string id="119">Nuevo directorio</string>
+  <string id="119">Nueva carpeta</string>
   <string id="120">Confirmar copiar</string>
   <string id="121">Confirmar mover</string>
   <string id="122">Confirmar eliminar</string>
-  <string id="123">¿Copiar estos ficheros?</string>
-  <string id="124">¿Mover estos ficheros?</string>
-  <string id="125">¿Eliminar estos ficheros? ¡Ojo, no podrá deshacerse!</string>
+  <string id="123">¿Copiar estos archivos?</string>
+  <string id="124">¿Mover estos archivos?</string>
+  <string id="125">¿Eliminar estos archivos? ¡Ojo, no podrá deshacerse!</string>
   <string id="126">Estado</string>
   <string id="127">Objetos</string>
   <string id="128">General</string>
@@ -120,12 +142,17 @@
   <string id="165">Disco presente</string>
   <string id="166">Skin</string>
   <string id="167"></string>
+  <string id="168"></string>
   <string id="169">Resolución</string>
-  <string id="170">Ajustar frecuencia refresco pantalla para emparejar el vídeo</string>
+  <string id="170">Ajustar la frecuencia de refresco de la pantalla para ajustarse al vídeo</string>
+  <string id="171"></string>
+
   <string id="172">Fecha de publicación</string>
   <string id="173">Mostrar vídeos 4:3 como</string>
+
   <string id="175">Estados de ánimo</string>
   <string id="176">Estilos</string>
+
   <string id="179">Canción</string>
   <string id="180">Duración</string>
   <string id="181">Seleccionar álbum</string>
@@ -146,8 +173,11 @@
   <string id="196">Seleccione película:</string>
   <string id="197">Consultando %s</string>
   <string id="198">Cargando detalles de la película</string>
+  <string id="199">Interfaz Web</string>
+
   <string id="202">Eslogan</string>
   <string id="203">Resumen</string>
+
   <string id="205">Votos:</string>
   <string id="206">Reparto</string>
   <string id="207">Argumento</string>
@@ -155,7 +185,7 @@
   <string id="209">Siguiente</string>
   <string id="210">Anterior</string>
   <string id="213">Calibrar interfaz de usuario...</string>
-  <string id="214">Calibrar vídeo...</string>
+  <string id="214">Calibración de vídeo...</string>
   <string id="215">Suavizar</string>
   <string id="216">Cantidad de zoom</string>
   <string id="217">Relación de aspecto</string>
@@ -165,6 +195,7 @@
   <string id="221">La red no está conectada</string>
   <string id="222">Cancelar</string>
   <string id="224">Velocidad</string>
+
   <string id="226">Probar patrones...</string>
   <string id="227">Consultar CDs de audio en Internet</string>
   <string id="228">Lista de reproducción aleatoria al cargar</string>
@@ -183,6 +214,9 @@
   <string id="241">Pantalla completa #%d</string>
   <string id="242">Ventana</string>
   <string id="243">Frecuencia de actualización</string>
+  <string id="244">Pantalla completa</string>
+  <string id="245">Ajustando tamaño: (%i,%i)->(%i,%i) (Zoom x%2.2f) AR:%2.2f:1 (Píxeles: %2.2f:1)</string>
+
   <string id="247">Scripts</string>
   <string id="248">Idioma</string>
   <string id="249">Música</string>
@@ -199,51 +233,57 @@
   <string id="260">Shoutcast</string>
   <string id="261">Esperando para empezar...</string>
   <string id="262">Salida de Scripts</string>
-  <string id="263">Permitir control del XBMC vía HTTP</string>
+  <string id="263">Permitir el control de XBMC por HTTP</string>
   <string id="264">Grabar</string>
   <string id="265">Detener grabación</string>
-  <string id="266">Por: Pista</string>
-  <string id="267">Por: Duración</string>
-  <string id="268">Por: Título</string>
-  <string id="269">Por: Intérprete</string>
-  <string id="270">Por: Álbum</string>
+  <string id="266">Ordenar por: Pista</string>
+  <string id="267">Ordenar por: Duración</string>
+  <string id="268">Ordenar por: Título</string>
+  <string id="269">Ordenar por: Intérprete</string>
+  <string id="270">Ordenar por: Álbum</string>
   <string id="271">Top 100</string>
-  <string id="272">Compensación esquina superior izquierda</string>
-  <string id="273">Compensación esquina inferior derecha</string>
+  <string id="272">Compensación de overscan en esquina superior izquierda</string>
+  <string id="273">Compensación de overscan en esquina inferior derecha</string>
   <string id="274">Posición de los subtítulos</string>
-  <string id="275">Ajuste de la tasa de pixel</string>
+  <string id="275">Ajuste de la proporción del pixel</string>
   <string id="276">Mueva la flecha para variar la cantidad de imagen perdida por los lados</string>
-  <string id="277">Mueva la flecha para variar la posición de los subtítulos</string>
+  <string id="277">Modifique la barra para variar la posición de los subtítulos</string>
   <string id="278">Modifique el rectángulo hasta que sea un cuadrado perfecto</string>
   <string id="279">No se puede cargar la configuración</string>
-  <string id="280">Usando valores alternativos por defecto</string>
-  <string id="281">Por favor, compruebe los ficheros .xml</string>
+  <string id="280">Usando la configuración por defecto</string>
+  <string id="281">Por favor, compruebe los archivos .xml</string>
   <string id="282">Encontrados %i elementos</string>
   <string id="283">Resultados de la búsqueda</string>
   <string id="284">No se encontraron resultados</string>
+  <string id="286"></string>
   <string id="287">Subtítulos</string>
   <string id="288">Fuente</string>
   <string id="289">- Tamaño</string>
   <string id="290">Compresión de rango dinámico</string>
   <string id="291">Vídeo</string>
   <string id="292">Sonido</string>
-  <string id="293">Subtítulos</string>
+  <string id="293">Buscar subtítulos</string>
   <string id="294">Crear marcador</string>
   <string id="296">Borrar marcadores</string>
   <string id="297">Retardo de sonido</string>
   <string id="298">Marcadores</string>
-  <string id="299">Decodificador compatible AAC</string>
-  <string id="300">Decodificador compatible MP1</string>
-  <string id="301">Decodificador compatible MP2</string>
-  <string id="302">Decodificador compatible MP3</string>
+  <string id="299">- Decodificador compatible AAC</string>
+  <string id="300">- Decodificador compatible MP1</string>
+  <string id="301">- Decodificador compatible MP2</string>
+  <string id="302">- Decodificador compatible MP3</string>
   <string id="303">Retardo</string>
   <string id="304">Idioma</string>
   <string id="305">Activado</string>
   <string id="306">No-Interpolado</string>
+  <string id="307"></string>
+  <string id="308"></string>
+  <string id="309"></string>
+  <string id="310"></string>
+  <string id="311"></string>
   <string id="312">(0=auto)</string>
-  <string id="313">Limpieza de base de datos</string>
+  <string id="313">Limpieza de la base de datos</string>
   <string id="314">Preparando...</string>
-  <string id="315">Error en base de datos</string>
+  <string id="315">Error en la base de datos</string>
   <string id="316">Buscando canciones...</string>
   <string id="317">Limpieza completada con éxito</string>
   <string id="318">Limpiando canciones...</string>
@@ -259,40 +299,40 @@
   <string id="328">Escribiendo cambios...</string>
   <string id="329">Error escribiendo cambios</string>
   <string id="330">Esto puede llevar algún tiempo...</string>
-  <string id="331">Comprimiendo base de datos...</string>
-  <string id="332">Error comprimiendo base de datos</string>
+  <string id="331">Comprimiendo la base de datos...</string>
+  <string id="332">Error comprimiendo la base de datos</string>
   <string id="333">¿Quieres limpiar la bibloteca?</string>
-  <string id="334">Limpiar biblioteca...</string>
+  <string id="334">Limpiar la biblioteca...</string>
   <string id="335">Inicio</string>
   <string id="336">Conversión de imágenes por segundo</string>
-  <string id="337">Salida de sonido</string>
+  <string id="337">Salida de audio</string>
   <string id="338">Analógica</string>
-  <string id="339">Digital</string>
+  <string id="339">Óptica/Coaxial</string>
   <string id="340">Varios intérpretes</string>
   <string id="341">Reproducir disco</string>
   <string id="342">Películas</string>
   <string id="343">Ajustar imágenes/seg</string>
   <string id="344">Actores</string>
   <string id="345">Año</string>
-  <string id="346">Incrementar volumen al hacer downmix</string>
+  <string id="346">Aumentar el volumen al hacer un downmix</string>
   <string id="350">Programas</string>
   <string id="351">Apagado</string>
   <string id="352">Atenuar</string>
   <string id="353">Negro</string>
-  <string id="354">Tipo Matrix</string>
+  <string id="354">Tipo Matrix</string> <!--comprobar-->
   <string id="355">Activar salvapantallas tras</string>
   <string id="356">Modo del salvapantallas</string>
-  <string id="357">Apagar equipo tras</string>
+  <string id="357">Apagar el equipo tras</string>
   <string id="358">Todos los álbumes</string>
   <string id="359">Álbumes recientes</string>
   <string id="360">Salvapantallas</string>
   <string id="361">Presentación R.</string>
   <string id="362">Nivel de atenuación</string>
-  <string id="363">Por: Archivo</string>
-  <string id="364">Decodificador compatible AC3</string>
-  <string id="365">Por: Nombre</string>
-  <string id="366">Por: Año</string>
-  <string id="367">Por: Calificación</string>
+  <string id="363">Ordenar por: Archivo</string>
+  <string id="364">- Decodificador compatible AC3</string>
+  <string id="365">Ordenar por: Nombre</string>
+  <string id="366">Ordenar por: Año</string>
+  <string id="367">Ordenar por: Calificación</string>
   <string id="368">IMDb</string>
   <string id="369">Título</string>
   <string id="370">Tormenta</string>
@@ -321,20 +361,20 @@
   <string id="393">Alto</string>
   <string id="394">Niebla</string>
   <string id="395">Bruma</string>
-  <string id="396">Seleccione lugar</string>
+  <string id="396">Seleccione un lugar</string>
   <string id="397">Actualizar cada</string>
   <string id="398">Temperatura en</string>
   <string id="399">Velocidad en</string>
   <string id="400">El Tiempo</string>
   <string id="401">Temperatura</string>
-  <string id="402">Sensación térmica</string>
+  <string id="402">Sen. térmica</string>
   <string id="403">Índice UV</string>
   <string id="404">Viento</string>
-  <string id="405">Punto rocío</string>
+  <string id="405">Punto de rocío</string>
   <string id="406">Humedad</string>
-  <string id="407">De</string>
-  <string id="408">a</string>
-  <string id="409">Predef.</string>
+  <string id="407"></string>
+  <string id="408"></string>
+  <string id="409">Por defecto</string>
   <string id="410">Accediendo a El Tiempo</string>
   <string id="411">Obteniendo el tiempo para:</string>
   <string id="412">No se pueden obtener datos meteorológicos</string>
@@ -346,6 +386,7 @@
   <string id="418">Bajo</string>
   <string id="419">Alto</string>
   <string id="420">HDMI</string>
+
   <string id="422">Eliminar información del álbum</string>
   <string id="423">Eliminar información CDDB</string>
   <string id="424">Seleccionar</string>
@@ -358,8 +399,10 @@
   <string id="431">Sin caché</string>
   <string id="432">Eliminar película de la base de datos</string>
   <string id="433">¿Eliminar realmente '%s'?</string>
+  <string id="434">De %s a %i %s</string> <!--From <wind dir.> at <speed> <unit>-->
+
   <string id="437">Disco extraíble</string>
-  <string id="438">Abriendo fichero</string>
+  <string id="438">Abriendo archivo</string>
   <string id="439">Caché</string>
   <string id="440">Disco duro</string>
   <string id="441">UDF</string>
@@ -401,33 +444,35 @@
   <string id="480">Apariencia</string>
   <string id="481">Opciones de sonido</string>
   <string id="482">Acerca de XBMC</string>
+
   <string id="485">Eliminar álbum</string>
   <string id="486">Repetir</string>
   <string id="487">Repetir uno</string>
   <string id="488">Repetir directorio</string>
-  <string id="489">Reproducir automáticamente siguiente canción</string>
+  <string id="489">Reproducir automáticamente la siguiente canción</string>
   <string id="491">- Usar iconos grandes</string>
   <string id="492">Redimensionar subtítulos VOB</string>
   <string id="493">Opciones avanzadas (¡Sólo expertos!)</string>
   <string id="494">Margen total de sonido (dB)</string>
   <string id="495">Sobremuestrear vídeos a resolución XBMC</string>
   <string id="496">Calibración</string>
-  <string id="497">Mostrar extensiones de archivo</string>
-  <string id="498">Por: Tipo</string>
+  <string id="497">Mostrar las extensiones de archivo</string>
+  <string id="498">Ordenar por: Tipo</string>
   <string id="499">No se puede conectar al servicio de búsqueda online</string>
-  <string id="500">Error al obtener información de álbum</string>
+  <string id="500">Error al obtener la información del álbum</string>
   <string id="501">Buscando nombres de los álbumes...</string>
   <string id="502">Abierto</string>
   <string id="503">Ocupado</string>
   <string id="504">Vacío</string>
-  <string id="505">Cargando información de ficheros...</string>
-  <string id="507">Por: Uso</string>
+  <string id="505">Cargando información de archivos...</string>
+  <string id="507">Odenar por: Uso</string>
   <string id="510">Habilitar visualizaciones</string>
   <string id="511">Habilitar cambio de modo de vídeo</string>
   <string id="512">Pantalla de inicio</string>
   <string id="513">Pantalla principal</string>
   <string id="514">Ajustes manuales</string>
   <string id="515">Género</string>
+
   <string id="517">Álbumes reproducidos recientemente</string>
   <string id="518">Lanzar</string>
   <string id="519">Lanzar en..</string>
@@ -455,12 +500,13 @@
   <string id="541">Iconos de álbum</string>
   <string id="542">Iconos de DVD</string>
   <string id="543">DVD</string>
-  <string id="544">Info de medio</string>
-  <string id="545">Dispositivo de salida de sonido</string>
+  <string id="544">Info del medio</string>
+  <string id="545">Dispositivo de salida de audio</string>
   <string id="546">Dispositivo de salida passthrough</string>
   <string id="547">No hay biografía para este artista</string>
   <string id="548">Mezcla de audio multicanal a estéreo</string>
-  <string id="550">%s</string>
+
+  <string id="550">Ordenar por: %s</string>
   <string id="551">Nombre</string>
   <string id="552">Fecha</string>
   <string id="553">Tamaño</string>
@@ -471,7 +517,7 @@
   <string id="558">Álbum</string>
   <string id="559">Lista de reproducción</string>
   <string id="560">ID</string>
-  <string id="561">Fichero</string>
+  <string id="561">Archivo</string>
   <string id="562">Año</string>
   <string id="563">Valoración</string>
   <string id="564">Tipo</string>
@@ -486,6 +532,7 @@
   <string id="573">Ruta</string>
   <string id="574">País</string>
   <string id="575">En progreso</string>
+
   <string id="580">Dirección de ordenación</string>
   <string id="581">Método de ordenación</string>
   <string id="582">Modo de vista</string>
@@ -504,70 +551,80 @@
   <string id="595">Repetir: Off</string>
   <string id="596">Repetir: Uno</string>
   <string id="597">Repetir: Todos</string>
+
   <string id="600">Ripear CD de audio</string>
   <string id="601">Media</string>
   <string id="602">Estándar</string>
   <string id="603">Extrema</string>
-  <string id="604">Velocidad de bits constante (CBR)</string>
+  <string id="604">Bitrate constante (CBR)</string>
   <string id="605">Ripeando...</string>
+
   <string id="607">A:</string>
-  <string id="608">No se puede copiar CD o Pista</string>
+  <string id="608">No se puede ripear CD o Pista</string>
   <string id="609">CDDARipPath no está definido.</string>
-  <string id="610">Copiar pista de audio</string>
+  <string id="610">Ripear pista de audio</string>
   <string id="611">Introducir número</string>
-  <string id="620">Ripear CD</string>
+  <string id="612">Bits/Muestreo</string>
+  <string id="613">Frecuencia de muestreo</string>
+
+  <string id="620">CDs de audio</string>
   <string id="621">Codificador</string>
   <string id="622">Calidad</string>
-  <string id="623">Velocidad de bits</string>
+  <string id="623">Bitrate</string>
   <string id="624">Incluir número de pista</string>
   <string id="625">Todas las canciones de</string>
   <string id="629">Modo de vista</string>
   <string id="630">Normal</string>
   <string id="631">Zoom</string>
   <string id="632">Adaptar a 4:3</string>
-  <string id="633">Adaptar a 14:9</string>
+  <string id="633">Zoom amplio</string>
   <string id="634">Adaptar a 16:9</string>
   <string id="635">Tamaño original</string>
   <string id="636">Personalizado</string>
-  <string id="637">ReplayGain</string>
-  <string id="638">Ajustes de volumen ReplayGain</string>
+  <string id="637">Replay Gain</string>
+  <string id="638">Ajustes de volumen Replay Gain</string>
   <string id="639">Usar volumen de la pista</string>
   <string id="640">Usar volumen del álbum</string>
-  <string id="641">Nivel PreAmp - Ficheros con ReplayGain</string>
-  <string id="642">Nivel PreAmp - Ficheros sin ReplayGain</string>
-  <string id="643">Evitar distorsión digital en ficheros con ReplayGain</string>
+  <string id="641">Nivel PreAmp - Archivos con Replay Gain</string>
+  <string id="642">Nivel PreAmp - Archivos sin Replay Gain</string>
+  <string id="643">Evitar distorsión digital en archivos con Replay Gain</string>
   <string id="644">Eliminar bordes negros</string>
-  <string id="645">Es necesario descomprimir un fichero grande. ¿Continuar?</string>
+  <string id="645">Es necesario descomprimir un archivos grande. ¿Continuar?</string>
   <string id="646">Eliminar de la base de datos</string>
-  <string id="647">Exportar biblioteca de vídeo</string>
-  <string id="648">Importar biblioteca de vídeo</string>
+  <string id="647">Exportar la biblioteca de vídeo</string>
+  <string id="648">Importar la biblioteca de vídeo</string>
   <string id="649">Importando</string>
   <string id="650">Exportando</string>
-  <string id="651">Explorar biblioteca</string>
+  <string id="651">Explorar la biblioteca</string>
   <string id="652">Años</string>
-  <string id="653">Actualizar biblioteca</string>
+  <string id="653">Actualizar la biblioteca</string>
   <string id="654">Ver información de depuración</string>
   <string id="655">Buscar ejecutable</string>
   <string id="656">Buscar lista de reproducción</string>
   <string id="657">Buscar directorio</string>
   <string id="658">Info de la canción</string>
   <string id="659">Estirado no-lineal</string>
+
   <string id="660">Amplificación de volumen</string>
   <string id="661">Escoja el directorio de exportación</string>
   <string id="662">Éste archivo ya no está disponible</string>
   <string id="663">¿Le gustaría eliminarlo de la biblioteca?</string>
   <string id="664">Búsqueda de script</string>
   <string id="665">Nivel de compresión</string>
+
   <string id="700">Limpiar la biblioteca</string>
   <string id="701">Eliminando canciones antiguas de la biblioteca</string>
   <string id="702">Esta ruta ya ha sido explorada anteriormente</string>
   <string id="705">Red</string>
   <string id="706">- Servidor</string>
-  <string id="708">Activar proxy HTTP para acceder a internet</string>
-  <string id="711">Protocólo Internet (IP)</string>
+
+  <string id="708">Usar un proxy HTTP para acceder a internet</string>
+
+  <string id="711">Protocólo de Internet (IP)</string>
   <string id="712">Puerto especificado no válido. El valor debe estar entre 1 y 65535.</string>
   <string id="713">Proxy HTTP</string>
-  <string id="715">Asignación</string>
+
+  <string id="715">- Asignación</string>
   <string id="716">Automática (DHCP)</string>
   <string id="717">Manual (Estática)</string>
   <string id="718"></string>
@@ -581,7 +638,9 @@
   <string id="726">Cambios no guardados. ¿Seguir sin guardar?</string>
   <string id="727">Servidor Web</string>
   <string id="728">Servidor FTP</string>
+  <string id="729"></string>
   <string id="730">- Puerto</string>
+  <string id="731"></string>
   <string id="732">Guardar y aplicar</string>
   <string id="733">- Contraseña</string>
   <string id="734">Sin contraseña</string>
@@ -594,18 +653,20 @@
   <string id="741">Negrita cursiva</string>
   <string id="742">Blanco</string>
   <string id="743">Amarillo</string>
-  <string id="744">Ficheros</string>
+  <string id="744">Archivos</string>
   <string id="745">No se ha explorado información para esta vista</string>
-  <string id="746">Cambiar a vista de ficheros</string>
+  <string id="746">Por favor desactive el modo bibloteca</string>
   <string id="747">Error cargando imagen</string>
   <string id="748">Editar ruta</string>
   <string id="749">Añadir rec. compartido</string>
   <string id="750">¿Está seguro?</string>
   <string id="751">Eliminando rec. compartido</string>
+
   <string id="754">Añadir enlace a programa</string>
   <string id="755">Editar ruta programa</string>
   <string id="756">Editar nombre programa</string>
   <string id="757">Editar profundidad ruta</string>
+
   <string id="759">Ver: Lista grande</string>
   <string id="760">Amarillo</string>
   <string id="761">Blanco</string>
@@ -615,13 +676,16 @@
   <string id="765">Verde azulado</string>
   <string id="766">Gris Claro</string>
   <string id="767">Gris</string>
+  <!-- strings 768 and 769 reserved for more subtitle colors -->
+
   <string id="770">Error %i: recurso no disponible</string>
-  <string id="772">Hardware sonido</string>
+  <string id="771"></string>
+  <string id="772">Salida de audio</string>
   <string id="773">Buscando</string>
   <string id="774">Directorio de diapositivas</string>
   <string id="775">Interfaz de red</string>
   <string id="776">- Nombre de la red inalámbrica (ESSID)</string>
-  <string id="777">- Password de la red inalámbrica</string>
+  <string id="777">- Contraseña de la red inalámbrica</string>
   <string id="778">- Seguridad de la red inalámbrica</string>
   <string id="779">Guardar y aplicar la configuración de interfaz de red</string>
   <string id="780">Sin cifrado</string>
@@ -634,22 +698,26 @@
   <string id="787">Interfaz deshabilitada</string>
   <string id="788">La interfaz de red se deshabilitó con éxito.</string>
   <string id="789">Nombre de la red inalámbrica (ESSID)</string>
-  <string id="791">Activar eventos remotos</string>
+
+  <string id="791">Permitir que los programas de este equipo controlen el XBMC</string>
   <string id="792">Puerto</string>
-  <string id="793">Rango de puertos de eventos remotos</string>
-  <string id="794">Recibir eventos de otros ordenadores</string>
+  <string id="793">Rango de puertos</string>
+  <string id="794">Permitir que los programas de otro equipo controlen el XBMC</string>
   <string id="795">Retraso inicial de repetición (ms)</string>
   <string id="796">Retraso continuo de repetición (ms)</string>
   <string id="797">Número máximo de clientes</string>
   <string id="798">Acceso a internet</string>
+
   <string id="850">Numero de puerto introducido inválido</string>
   <string id="851">El rango válido de puertos es 1-65535</string>
-  <string id="852">El rango válido de puertos es1024-65535</string>
-  <string id="1000">Vista previa del salvapantallas</string>
+  <string id="852">El rango válido de puertos es 1024-65535</string>
+
+  <string id="1000">- Vista previa</string>
   <string id="1001">Imposible conectar</string>
   <string id="1002">XBMC ha sido incapaz de conectar a la dirección de red.</string>
   <string id="1003">Podría ser debido a que la red no esté conectada.</string>
   <string id="1004">¿Desea añadirla de todos modos?</string>
+
   <string id="1006">Dirección IP</string>
   <string id="1007">Añadir dirección de red</string>
   <string id="1008">Protocolo</string>
@@ -681,32 +749,35 @@
   <string id="1034">Submenú</string>
   <string id="1035">Habilitar botones de submenú</string>
   <string id="1036">Favoritos</string>
-  <string id="1037">Addons de vídeo</string>
-  <string id="1038">Addons de música</string>
-  <string id="1039">Addons de imágenes</string>
+  <string id="1037">Add-ons de vídeo</string>
+  <string id="1038">Add-ons de música</string>
+  <string id="1039">Add-ons de imágenes</string>
   <string id="1040">Cargando directorio</string>
   <string id="1041">%i elementos obtenidos</string>
   <string id="1042">%i de %i elementos obtenidos</string>
-  <string id="1043">Addons de aplicaciones</string>
+  <string id="1043">Add-ons de aplicaciones</string>
   <string id="1044">Establecer miniatura de plugin</string>
-  <string id="1045">Configuración del plugin</string>
+  <string id="1045">Configuración del Add-on</string>
   <string id="1046">Puntos de acceso</string>
   <string id="1047">Otro...</string>
   <string id="1048">- Nombre usuario</string>
   <string id="1049">Configuración de script</string>
   <string id="1050">Individual</string>
   <string id="1051">Introduzca la dirección web</string>
+
   <string id="1200">Cliente SMB</string>
   <string id="1202">Grupo de trabajo</string>
   <string id="1203">Usuario por defecto</string>
   <string id="1204">Contraseña por defecto</string>
+
   <string id="1207">Servidor WINS</string>
   <string id="1208">Montar recursos compartidos por SMB</string>
+
   <string id="1210">Eliminar</string>
   <string id="1211">Música</string>
   <string id="1212">Vídeo</string>
   <string id="1213">Imágenes</string>
-  <string id="1214">Ficheros</string>
+  <string id="1214">Archivos</string>
   <string id="1215">Música y vídeo </string>
   <string id="1216">Música e imágenes</string>
   <string id="1217">Música y archivos</string>
@@ -726,19 +797,25 @@

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 35610
          http://xbmc.svn.sourceforge.net/xbmc/?rev=35610&view=rev
Author:   davilla
Date:     2010-12-09 23:15:37 +0000 (Thu, 09 Dec 2010)

Log Message:
-----------
merge r35608, [osx] fixed, figure out correct dylib names to match what linker uses

Modified Paths:
--------------
    branches/Dharma/configure.in
    branches/Dharma/xbmc/DllPaths_generated.h.in

Modified: branches/Dharma/configure.in
===================================================================
--- branches/Dharma/configure.in	2010-12-09 19:46:54 UTC (rev 35609)
+++ branches/Dharma/configure.in	2010-12-09 23:15:37 UTC (rev 35610)
@@ -17,11 +17,29 @@
 # check for library basenames
 AC_DEFUN([XB_FIND_SONAME],
 [
-  AC_MSG_CHECKING([for lib$2 soname])
-  $1_SONAME=$( $CC -print-file-name=lib$2.so | \
-    while read output; do objdump -p $output | \
-      grep "SONAME" | \
-      sed -e 's/ \+SONAME \+//'; done 2> /dev/null )
+  if [[ "$host_vendor" != "apple" ]]; then
+    AC_MSG_CHECKING([for lib$2 soname])
+    $1_SONAME=$( $CC -print-file-name=lib$2.so | \
+      while read output; do objdump -p $output | \
+        grep "SONAME" | \
+        sed -e 's/ \+SONAME \+//'; done 2> /dev/null )
+  else
+    AC_MSG_CHECKING([for lib$2 dylib])
+    gcc_lib_path=[`$CC -print-search-dirs 2>/dev/null | fgrep libraries: | sed 's/[^=]*=\(.*\)/\1/' | sed 's/:/ /g'`]
+    env_lib_path=[`echo $LDFLAGS | sed 's/-L[ ]*//g'`]
+    if test "$cross_compiling" = yes; then
+      host_lib_path=""
+    else
+      host_lib_path="/usr/lib /usr/local/lib"
+    fi
+    for path in $gcc_lib_path $env_lib_path $host_lib_path; do
+      lib=[`ls -- $path/lib$2.dylib 2>/dev/null`]
+      if test x$lib != x; then
+        # we want the path/name that is embedded in the dylib 
+        $1_SONAME=[`otool -L $lib | grep -v lib$2.dylib | grep lib$2 | awk '{V=1; print $V}'`]
+      fi
+    done
+  fi
   if [[ -z "$$1_SONAME" ]]; then
     AC_MSG_RESULT([no])
     if test -z "$3" || test "x${$3}" = "xyes"; then
@@ -673,14 +691,14 @@
 if test "$host_vendor" != "apple"; then
   XB_FIND_SONAME([CURL],        [curl])
   XB_FIND_SONAME([FLAC],        [FLAC])
-  XB_FIND_SONAME([VORBISFILE],  [vorbisfile])
   XB_FIND_SONAME([MODPLUG],     [modplug])
   XB_FIND_SONAME([FAAD],        [faad])
   XB_FIND_SONAME([MAD],         [mad])
-  XB_FIND_SONAME([OGG],         [ogg])
-  XB_FIND_SONAME([VORBISENC],   [vorbisenc])
-  XB_FIND_SONAME([VORBIS],      [vorbis])
 fi
+XB_FIND_SONAME([OGG],         [ogg])
+XB_FIND_SONAME([VORBIS],      [vorbis])
+XB_FIND_SONAME([VORBISENC],   [vorbisenc])
+XB_FIND_SONAME([VORBISFILE],  [vorbisfile])
 
 # WebServer
 if test "$host_vendor" != "apple" ; then

Modified: branches/Dharma/xbmc/DllPaths_generated.h.in
===================================================================
--- branches/Dharma/xbmc/DllPaths_generated.h.in	2010-12-09 19:46:54 UTC (rev 35609)
+++ branches/Dharma/xbmc/DllPaths_generated.h.in	2010-12-09 23:15:37 UTC (rev 35610)
@@ -67,13 +67,12 @@
 #define DLL_PATH_SHN_CODEC     "special://xbmcbin/system/players/paplayer/libshnplay-@...>"
 #if defined(_LINUX) && !defined(__APPLE__)
 #define DLL_PATH_FLAC_CODEC    "@FLAC_SONAME@"
-#define DLL_PATH_OGG_CODEC     "@VORBISFILE_SONAME@"
 #define DLL_PATH_MODPLUG_CODEC "@MODPLUG_SONAME@"
 #else
 #define DLL_PATH_FLAC_CODEC    "special://xbmcbin/system/players/paplayer/libFLAC-@...>"
-#define DLL_PATH_OGG_CODEC     "libvorbisfile.3.3.2.dylib"
 #define DLL_PATH_MODPLUG_CODEC "special://xbmcbin/system/players/paplayer/libmodplug-@...>"
 #endif
+#define DLL_PATH_OGG_CODEC     "@VORBISFILE_SONAME@"
 
 /* dvdplayer */
 #define DLL_PATH_LIBASS        "special://xbmcbin/system/players/dvdplayer/libass-@...>"
@@ -99,15 +98,12 @@
 /* cdrip */
 #if defined(_LINUX) && !defined(__APPLE__)
 #define DLL_PATH_LAME_ENC      "libmp3lame.so.0"
-#define DLL_PATH_OGG           "@OGG_SONAME@"
-#define DLL_PATH_VORBIS_ENC    "@VORBISENC_SONAME@"
-#define DLL_PATH_VORBIS        "@VORBIS_SONAME@"
 #else
 #define DLL_PATH_LAME_ENC      "special://xbmcbin/system/cdrip/lame_enc-@...>"
-#define DLL_PATH_OGG           "libogg.0.6.0.dylib"
-#define DLL_PATH_VORBIS_ENC    "libvorbisenc.2.0.6.dylib"
-#define DLL_PATH_VORBIS        "libvorbis.0.4.3.dylib"
 #endif
+#define DLL_PATH_OGG           "@OGG_SONAME@"
+#define DLL_PATH_VORBIS_ENC    "@VORBISENC_SONAME@"
+#define DLL_PATH_VORBIS        "@VORBIS_SONAME@"
 
 /* broadcom crystalhd */
 #if defined(_LINUX) && !defined(__APPLE__)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.