aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortheuni <theuni-nospam-@xbmc.org>2012-02-07 02:09:22 -0500
committertheuni <theuni-nospam-@xbmc.org>2012-02-07 02:09:22 -0500
commita1029820bd32cffbf8f311075f81de4feb8cef34 (patch)
tree7dac292157322c75eab72a8284279ca393cd6af7
parentf119e6aa5ff44d8bf8e670d5d7c21e2fc4832a7c (diff)
parent72529146da82905c4a36e86ed65ac1a47e6deb1b (diff)
Merge remote-tracking branch 'origin/master' into Eden
-rw-r--r--README.linux2
-rw-r--r--README.osx12
-rw-r--r--README.ubuntu2
-rw-r--r--addons/metadata.artists.allmusic.com/addon.xml2
-rw-r--r--addons/metadata.artists.allmusic.com/allmusic.xml2
-rw-r--r--addons/metadata.common.imdb.com/addon.xml2
-rw-r--r--addons/metadata.common.imdb.com/changelog.txt12
-rw-r--r--addons/metadata.common.imdb.com/imdb.xml2
-rw-r--r--addons/metadata.common.themoviedb.org/addon.xml2
-rw-r--r--addons/metadata.common.themoviedb.org/tmdb.xml6
-rw-r--r--addons/metadata.themoviedb.org/addon.xml8
-rw-r--r--addons/metadata.themoviedb.org/changelog.txt27
-rw-r--r--addons/metadata.themoviedb.org/tmdb.xml34
-rw-r--r--addons/skin.confluence/720p/DialogButtonMenu.xml2
-rw-r--r--addons/skin.confluence/720p/IncludesHomeMenuItems.xml2
-rw-r--r--addons/skin.confluence/language/Arabic/strings.xml183
-rw-r--r--addons/skin.confluence/language/Icelandic/strings.xml44
-rw-r--r--addons/skin.confluence/language/Italian/strings.xml70
m---------addons/skin.touched0
-rw-r--r--addons/weather.wunderground/addon.xml7
-rw-r--r--addons/weather.wunderground/changelog.txt8
-rw-r--r--addons/weather.wunderground/default.py26
-rw-r--r--addons/weather.wunderground/resources/language/Chinese (Simple)/strings.xml7
-rw-r--r--language/Arabic/langinfo.xml22
-rw-r--r--language/Arabic/strings.xml2071
-rw-r--r--language/Bulgarian/langinfo.xml3
-rw-r--r--language/English/strings.xml19
-rw-r--r--language/French/strings.xml2
-rw-r--r--language/German/strings.xml12
-rw-r--r--language/Hebrew/strings.xml35
-rw-r--r--language/Hungarian/strings.xml17
-rw-r--r--language/Icelandic/strings.xml199
-rw-r--r--language/Italian/strings.xml526
-rw-r--r--language/Lithuanian/strings.xml540
-rw-r--r--language/Spanish (Mexico)/strings.xml15
-rw-r--r--language/Turkish/strings.xml30
-rw-r--r--lib/addons/script.module.pil/Makefile.in1
-rw-r--r--lib/ffmpeg/build_xbmc_win32.sh2
-rw-r--r--project/VS2010Express/XBMC.vcxproj2
-rw-r--r--project/VS2010Express/XBMC.vcxproj.filters6
-rw-r--r--system/Lircmap.xml45
-rw-r--r--system/keymaps/joystick.AppleRemote.xml8
-rw-r--r--xbmc/Application.cpp28
-rw-r--r--xbmc/ApplicationMessenger.cpp43
-rw-r--r--xbmc/ApplicationMessenger.h6
-rw-r--r--xbmc/FileItem.cpp113
-rw-r--r--xbmc/FileItem.h9
-rw-r--r--xbmc/GUIInfoManager.cpp7
-rw-r--r--xbmc/GUIInfoManager.h1
-rw-r--r--xbmc/NfoFile.h4
-rw-r--r--xbmc/ThumbnailCache.cpp6
-rw-r--r--xbmc/addons/AddonInstaller.cpp15
-rw-r--r--xbmc/addons/Repository.cpp4
-rw-r--r--xbmc/cores/AudioRenderers/CoreAudioRenderer.cpp5
-rw-r--r--xbmc/cores/AudioRenderers/NullDirectSound.cpp3
-rw-r--r--xbmc/cores/DllLoader/LibraryLoader.h5
-rw-r--r--xbmc/cores/VideoRenderers/LinuxRendererGL.cpp10
-rw-r--r--xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp10
-rw-r--r--xbmc/cores/VideoRenderers/WinRenderer.cpp2
-rw-r--r--xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp2
-rw-r--r--xbmc/cores/dvdplayer/DVDPlayer.cpp2
-rw-r--r--xbmc/cores/dvdplayer/DVDPlayerVideo.cpp2
-rw-r--r--xbmc/cores/paplayer/MP3codec.cpp12
-rw-r--r--xbmc/dialogs/GUIDialogContextMenu.cpp15
-rw-r--r--xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp4
-rw-r--r--xbmc/filesystem/DllLibCurl.cpp25
-rw-r--r--xbmc/filesystem/FTPParse.cpp12
-rw-r--r--xbmc/filesystem/FileCDDA.cpp6
-rw-r--r--xbmc/filesystem/FileNFS.cpp34
-rw-r--r--xbmc/filesystem/FileNFS.h9
-rw-r--r--xbmc/filesystem/FileShoutcast.cpp2
-rw-r--r--xbmc/filesystem/IDirectory.cpp10
-rw-r--r--xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeEpisodes.cpp7
-rw-r--r--xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeSeasons.cpp11
-rw-r--r--xbmc/guilib/GUISettingsSliderControl.cpp16
-rw-r--r--xbmc/guilib/GUISpinControlEx.cpp17
-rw-r--r--xbmc/guilib/GUIToggleButtonControl.cpp2
-rw-r--r--xbmc/guilib/JpegIO.cpp2
-rw-r--r--xbmc/input/ButtonTranslator.cpp9
-rw-r--r--xbmc/input/ButtonTranslator.h2
-rw-r--r--xbmc/interfaces/json-rpc/AudioLibrary.cpp16
-rw-r--r--xbmc/interfaces/json-rpc/FileItemHandler.cpp14
-rw-r--r--xbmc/interfaces/json-rpc/FileOperations.cpp20
-rw-r--r--xbmc/interfaces/json-rpc/JSONServiceDescription.cpp4
-rw-r--r--xbmc/interfaces/json-rpc/ServiceDescription.h4
-rw-r--r--xbmc/interfaces/json-rpc/types.json4
-rw-r--r--xbmc/interfaces/python/xbmcmodule/action.cpp6
-rw-r--r--xbmc/interfaces/python/xbmcmodule/xbmcmodule.cpp14
-rw-r--r--xbmc/linux/XLCDproc.cpp12
-rw-r--r--xbmc/linux/XLCDproc.h6
-rw-r--r--xbmc/linux/XThreadUtils.h2
-rw-r--r--xbmc/music/Album.cpp20
-rw-r--r--xbmc/music/Album.h9
-rw-r--r--xbmc/music/Artist.cpp20
-rw-r--r--xbmc/music/Artist.h9
-rw-r--r--xbmc/music/MusicDatabase.cpp1
-rw-r--r--xbmc/music/tags/MusicInfoTagLoaderWMA.cpp2
-rw-r--r--xbmc/network/AirPlayServer.cpp12
-rw-r--r--xbmc/network/EventClient.cpp5
-rw-r--r--xbmc/network/Zeroconf.cpp26
-rw-r--r--xbmc/network/Zeroconf.h13
-rw-r--r--xbmc/network/windows/ZeroconfWIN.cpp10
-rw-r--r--xbmc/osx/atv2/XBMCController.mm7
-rw-r--r--xbmc/playlists/SmartPlayList.cpp18
-rw-r--r--xbmc/settings/AdvancedSettings.cpp12
-rw-r--r--xbmc/settings/AdvancedSettings.h6
-rw-r--r--xbmc/settings/GUIDialogContentSettings.cpp2
-rw-r--r--xbmc/settings/GUISettings.cpp8
-rw-r--r--xbmc/settings/GUIWindowSettingsCategory.cpp40
-rw-r--r--xbmc/settings/Settings.cpp2
-rw-r--r--xbmc/storage/DetectDVDType.cpp23
-rw-r--r--xbmc/storage/DetectDVDType.h12
-rw-r--r--xbmc/utils/LCD.cpp8
-rw-r--r--xbmc/utils/LCD.h2
-rw-r--r--xbmc/utils/XMLUtils.cpp5
-rw-r--r--xbmc/utils/XMLUtils.h16
-rw-r--r--xbmc/video/VideoDatabase.cpp65
-rw-r--r--xbmc/video/VideoDatabase.h9
-rw-r--r--xbmc/video/VideoInfoTag.cpp47
-rw-r--r--xbmc/video/VideoInfoTag.h26
-rw-r--r--xbmc/video/VideoReferenceClock.cpp151
-rw-r--r--xbmc/video/VideoReferenceClock.h3
-rw-r--r--xbmc/video/windows/GUIWindowVideoBase.cpp15
-rw-r--r--xbmc/video/windows/GUIWindowVideoBase.h2
-rw-r--r--xbmc/video/windows/GUIWindowVideoNav.cpp47
-rw-r--r--xbmc/visualizations/XBMCProjectM/libprojectM/CMakeLists.txt6
-rw-r--r--xbmc/win32/WIN32Util.cpp5
-rw-r--r--xbmc/windowing/X11/WinSystemX11.cpp12
-rw-r--r--xbmc/windowing/X11/WinSystemX11.h1
-rw-r--r--xbmc/windowing/osx/WinEventsIOS.mm2
-rw-r--r--xbmc/windowing/windows/WinEventsWin32.cpp11
-rw-r--r--xbmc/windows/GUIMediaWindow.cpp12
-rw-r--r--xbmc/windows/GUIWindowLoginScreen.cpp4
133 files changed, 4253 insertions, 1044 deletions
diff --git a/README.linux b/README.linux
index a0244e0746..fe7b67979a 100644
--- a/README.linux
+++ b/README.linux
@@ -55,7 +55,7 @@ Build-Depends: debhelper (>= 7.0.50~), python-support, cmake,
libbluetooth-dev, zlib1g-dev, libsmbclient-dev, libboost-thread-dev
libiso9660-dev, libssl-dev, lsb-release, libvdpau-dev, libmicrohttpd-dev,
libmodplug-dev, librtmp-dev, libcrystalhd-dev, curl, python-dev, libyajl-dev,
- libplist-dev, libusb-dev, libudev-dev
+ libplist-dev, libusb-dev, libudev-dev, libltdl-dev
*** For developers and anyone else who compiles frequently it is recommended to
use ccache
diff --git a/README.osx b/README.osx
index b4f9990129..51703f405e 100644
--- a/README.osx
+++ b/README.osx
@@ -14,9 +14,9 @@ TOC
-----------------------------------------------------------------------------
This is a platform port of XBMC for the Apple OSX operating system. Both 10.5
-and 10.6 Intel development platforms are supported. The current build system
-is Xcode 3.1.2 There are two ways to build XBMC for Mac, from command-line or
-from Xcode.
+and 10.6 Intel development platforms are supported. Xcode 4.x is not supported.
+The current build system is Xcode 3.2.5 There are two ways to build XBMC for Mac,
+from command-line or from Xcode.
Generally, Xcode is the easiest as it presents the build system in a GUI environment.
The command-line build is still under development.
@@ -41,8 +41,10 @@ character itself should NOT be typed as part of the command.
-----------------------------------------------------------------------------
Install latest Xcode. You can download it from Apple's site after registration at
(http://developer.apple.com/tools/download). You also need to install the 10.4
-sdk. If using Xcode 3.x, you MUST use Xcode 3.1.2 so update your existing version
-if you are running a previous Xcode 3.x version. Xcode 3.x only runs on 10.5.
+sdk. If using Xcode 3.x, you MUST use Xcode 3.1.2 or a newer version, so update
+your existing version. if you are running a previous Xcode 3.x version.
+Xcode 3.x only runs on 10.5 and above. If you are running 10.7, DO NOT USE Xcode 4.x,
+it will fail. Use Xcode 3.x under 10.7.
-----------------------------------------------------------------------------
3.1 Install XBMC build depends
diff --git a/README.ubuntu b/README.ubuntu
index 3c92fc9dd5..4a73574bb4 100644
--- a/README.ubuntu
+++ b/README.ubuntu
@@ -47,7 +47,7 @@ For Ubuntu (all versions >= 7.04):
# sudo apt-get install git-core make g++ gcc gawk pmount libtool nasm yasm automake cmake gperf zip unzip bison libsdl-dev libsdl-image1.2-dev libsdl-gfx1.2-dev libsdl-mixer1.2-dev libfribidi-dev liblzo2-dev libfreetype6-dev libsqlite3-dev libogg-dev libasound2-dev python-sqlite libglew-dev libcurl3 libcurl4-gnutls-dev libxrandr-dev libxrender-dev libmad0-dev libogg-dev libvorbisenc2 libsmbclient-dev libmysqlclient-dev libpcre3-dev libdbus-1-dev libhal-dev libhal-storage-dev libjasper-dev libfontconfig-dev libbz2-dev libboost-dev libenca-dev libxt-dev libxmu-dev libpng-dev libjpeg-dev libpulse-dev mesa-utils libcdio-dev libsamplerate-dev libmpeg3-dev libflac-dev libiso9660-dev libass-dev libssl-dev fp-compiler gdc libmpeg2-4-dev libmicrohttpd-dev libmodplug-dev libssh-dev gettext cvs python-dev libyajl-dev libboost-thread-dev libplist-dev libusb-dev libudev-dev
For >= 10.10:
- # sudo apt-get install autopoint
+ # sudo apt-get install autopoint libltdl-dev
On 8.10 and older versions, libcurl is outdated and thus XBMC will not compile properly.
In this case you will have to manually compile the latest version.
diff --git a/addons/metadata.artists.allmusic.com/addon.xml b/addons/metadata.artists.allmusic.com/addon.xml
index 77d3526416..41e7af204b 100644
--- a/addons/metadata.artists.allmusic.com/addon.xml
+++ b/addons/metadata.artists.allmusic.com/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.artists.allmusic.com"
name="AllMusic"
- version="2.0.6"
+ version="2.0.7"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
diff --git a/addons/metadata.artists.allmusic.com/allmusic.xml b/addons/metadata.artists.allmusic.com/allmusic.xml
index 3d99ff1bfc..7ea01cc611 100644
--- a/addons/metadata.artists.allmusic.com/allmusic.xml
+++ b/addons/metadata.artists.allmusic.com/allmusic.xml
@@ -42,7 +42,7 @@
<expression noclean="1">&lt;meta name=&quot;title&quot; content=&quot;([^&quot;]*)</expression>
</RegExp>
<RegExp input="$$1" output="\1" dest="8">
- <expression>http://www.allmusic.com/artist/([^&amp;&quot;/]*)</expression>
+ <expression>http://www.allmusic.com/artist/([^&amp;&quot;/]*)/</expression>
</RegExp>
<RegExp input="$$7" conditional="htbthumbs" output="&lt;chain function=&quot;GetHTBThumbs&quot;&gt;\1&lt;/chain&gt;" dest="5">
<expression/>
diff --git a/addons/metadata.common.imdb.com/addon.xml b/addons/metadata.common.imdb.com/addon.xml
index 66fe1e3346..59a43028d4 100644
--- a/addons/metadata.common.imdb.com/addon.xml
+++ b/addons/metadata.common.imdb.com/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.common.imdb.com"
name="IMDB common scraper functions"
- version="2.1.5"
+ version="2.1.9"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
diff --git a/addons/metadata.common.imdb.com/changelog.txt b/addons/metadata.common.imdb.com/changelog.txt
index 437fc1844d..a19b89efe5 100644
--- a/addons/metadata.common.imdb.com/changelog.txt
+++ b/addons/metadata.common.imdb.com/changelog.txt
@@ -1,3 +1,15 @@
+[B]2.1.9[/B]
+- fixed: plot when contains html links (once again)
+
+[B]2.1.8[/B]
+- revert: two latest changes - cause crash some times
+
+[B]2.1.7[/B]
+- fixed: typo in fixing previous plot issue
+
+[B]2.1.6[/B]
+- fixed: plot when contains html links
+
[B]2.1.5[/B]
- fixed: Cleanup and factored out Genres to common
diff --git a/addons/metadata.common.imdb.com/imdb.xml b/addons/metadata.common.imdb.com/imdb.xml
index 78e4318077..5633908756 100644
--- a/addons/metadata.common.imdb.com/imdb.xml
+++ b/addons/metadata.common.imdb.com/imdb.xml
@@ -35,7 +35,7 @@
<ParseIMDBPlot dest="5">
<RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" dest="5">
<RegExp input="$$1" output="&lt;plot&gt;\1&lt;/plot&gt;" dest="2">
- <expression trim="1">&lt;h2&gt;Storyline&lt;/h2&gt;\n+&lt;p&gt;([^&lt;]+)</expression>
+ <expression trim="1">&lt;h2&gt;Storyline&lt;/h2&gt;\n+&lt;p&gt;(.*?)&lt;[^a/]</expression>
</RegExp>
<expression noclean="1" />
</RegExp>
diff --git a/addons/metadata.common.themoviedb.org/addon.xml b/addons/metadata.common.themoviedb.org/addon.xml
index 7cd3d85820..252d868303 100644
--- a/addons/metadata.common.themoviedb.org/addon.xml
+++ b/addons/metadata.common.themoviedb.org/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.common.themoviedb.org"
name="The MovieDB common scraper functions"
- version="2.1.0"
+ version="2.1.2"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
diff --git a/addons/metadata.common.themoviedb.org/tmdb.xml b/addons/metadata.common.themoviedb.org/tmdb.xml
index ee000716d6..8390acfcaa 100644
--- a/addons/metadata.common.themoviedb.org/tmdb.xml
+++ b/addons/metadata.common.themoviedb.org/tmdb.xml
@@ -39,9 +39,6 @@
<RegExp input="$$9" output="&lt;plot&gt;\1&lt;/plot&gt;" dest="2">
<expression>(.+)</expression>
</RegExp>
- <RegExp input="$$1" output="&lt;outline&gt;\1&lt;/outline&gt;" dest="2+">
- <expression fixchars="1">&quot;overview&quot;:&quot;(.{180,}?)[.?!]</expression>
- </RegExp>
<expression noclean="1" />
</RegExp>
</ParseTMDBPlot>
@@ -50,9 +47,6 @@
<RegExp input="$$1" output="&lt;plot&gt;\1&lt;/plot&gt;" dest="2">
<expression clear="yes" fixchars="1">&quot;overview&quot;:&quot;(.*?)&quot;,</expression>
</RegExp>
- <RegExp input="$$1" output="&lt;outline&gt;\1&lt;/outline&gt;" dest="2+">
- <expression fixchars="1">&quot;overview&quot;:&quot;(.{180,}?)[.?!]</expression>
- </RegExp>
<expression noclean="1" />
</RegExp>
</ParseFallbackTMDBPlot>
diff --git a/addons/metadata.themoviedb.org/addon.xml b/addons/metadata.themoviedb.org/addon.xml
index 575cce8334..3b2d65ca76 100644
--- a/addons/metadata.themoviedb.org/addon.xml
+++ b/addons/metadata.themoviedb.org/addon.xml
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.themoviedb.org"
name="The MovieDB"
- version="3.0.0"
+ version="3.0.9"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
- <import addon="metadata.common.themoviedb.org" version="2.1.0"/>
+ <import addon="metadata.common.themoviedb.org" version="2.1.2"/>
<import addon="metadata.common.hdtrailers.net" version="1.0.7"/>
- <import addon="metadata.common.imdb.com" version="2.1.5"/>
- <import addon="plugin.video.youtube" version="2.1.0" optional="true"/>
+ <import addon="metadata.common.imdb.com" version="2.1.9"/>
+ <import addon="plugin.video.youtube" version="2.1.4" optional="true"/>
</requires>
<extension point="xbmc.metadata.scraper.movies"
language="en"
diff --git a/addons/metadata.themoviedb.org/changelog.txt b/addons/metadata.themoviedb.org/changelog.txt
index e7e0109492..1386211adc 100644
--- a/addons/metadata.themoviedb.org/changelog.txt
+++ b/addons/metadata.themoviedb.org/changelog.txt
@@ -1,3 +1,30 @@
+[B]3.0.9[/B]
+- fixed: missing language parameter name in NfoUrl
+
+[B]3.0.8[/B]
+- fixed: movies without release date won't find
+
+[B]3.0.7[/B]
+- fixed: keep originaltitle; IMDb ID; remove TMDb title fallback, because it became obsolate
+
+[B]3.0.6[/B]
+- updated chinese translation
+
+[B]3.0.5[/B]
+- reverted latest change
+
+[B]3.0.4[/B]
+- added: option to not scrape sets
+
+[B]3.0.3[/B]
+- fixed: plot outline includes trash on some movies
+
+[B]3.0.2[/B]
+- fixed: imdb IDs not properly handled
+
+[B]3.0.1[/B]
+- changed: also fallback to original_title to make sure a valid title gets scraped
+
[B]3.0.0[/B]
- major rewrite: utilize TMDb API v3, scraping set information, prioritize posters on the selected language
diff --git a/addons/metadata.themoviedb.org/tmdb.xml b/addons/metadata.themoviedb.org/tmdb.xml
index 8efd0894a5..a60cf39580 100644
--- a/addons/metadata.themoviedb.org/tmdb.xml
+++ b/addons/metadata.themoviedb.org/tmdb.xml
@@ -9,21 +9,16 @@
</RegExp>
</CreateSearchUrl>
<NfoUrl dest="3">
- <RegExp input="$$1" output="&lt;details&gt;&lt;url&gt;http://api.themoviedb.org/3/movie/\2?api_key=57983e31fb435df4df77afb854740ea9&amp;$INFO[language]&lt;/url&gt;&lt;id&gt;\2&lt;/id&gt;&lt;/details&gt;" dest="3">
+ <RegExp input="$$1" output="&lt;details&gt;&lt;url&gt;http://api.themoviedb.org/3/movie/\2?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]&lt;/url&gt;&lt;id&gt;\2&lt;/id&gt;&lt;/details&gt;" dest="3">
<expression clear="yes" noclean="1">(themoviedb.org/movie/)([0-9]*)</expression>
</RegExp>
- <RegExp input="$$1" output="&lt;details&gt;&lt;url&gt;http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;$INFO[language]&lt;/url&gt;&lt;id&gt;\1&lt;/id&gt;&lt;/details&gt;" dest="3">
+ <RegExp input="$$1" output="&lt;details&gt;&lt;url&gt;http://api.themoviedb.org/3/movie/tt\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]&lt;/url&gt;&lt;id&gt;tt\1&lt;/id&gt;&lt;/details&gt;" dest="3">
<expression>imdb....?/title/tt([0-9]*)</expression>
</RegExp>
- <RegExp input="$$1" output="&lt;details&gt;&lt;url&gt;http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;$INFO[language]&lt;/url&gt;&lt;id&gt;\1&lt;/id&gt;&lt;/details&gt;" dest="3">
+ <RegExp input="$$1" output="&lt;details&gt;&lt;url&gt;http://api.themoviedb.org/3/movie/tt\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]&lt;/url&gt;&lt;id&gt;tt\1&lt;/id&gt;&lt;/details&gt;" dest="3">
<expression>imdb....?/Title\?([0-9]*)</expression>
</RegExp>
</NfoUrl>
- <GetTMDBId dest="3">
- <RegExp input="$$1" output="&lt;details&gt;&lt;url cache=&quot;tmdb-$INFO[language]-\1.json&quot;&gt;http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]&lt;/url&gt;&lt;id&gt;\1&lt;/id&gt;&lt;/details&gt;" dest="3+">
- <expression>&quot;movie&quot;,&quot;id&quot;:([0-9]*),</expression>
- </RegExp>
- </GetTMDBId>
<GetSearchResults dest="8">
<RegExp input="$$3" output="&lt;results&gt;\1&lt;/results&gt;" dest="8">
<RegExp input="$$1" output="&lt;entity&gt;&lt;title&gt;\4&lt;/title&gt;&lt;id&gt;\1&lt;/id&gt;&lt;year&gt;\3&lt;/year&gt;&lt;url cache=&quot;tmdb-$INFO[language]-\1.json&quot;&gt;http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]&lt;/url&gt;&lt;/entity&gt;" dest="3">
@@ -32,6 +27,9 @@
<RegExp input="$$1" output="&lt;entity&gt;&lt;title&gt;\2&lt;/title&gt;&lt;id&gt;\1&lt;/id&gt;&lt;year&gt;\3&lt;/year&gt;&lt;url cache=&quot;tmdb-$INFO[language]-\1.json&quot;&gt;http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]&lt;/url&gt;&lt;/entity&gt;" dest="3+">
<expression repeat="yes">&quot;id&quot;:([0-9]*),&quot;original_title&quot;:&quot;([^&quot;]*)&quot;,&quot;release_date&quot;:&quot;([0-9]+)-</expression>
</RegExp>
+ <RegExp input="$$1" output="&lt;entity&gt;&lt;title&gt;\2&lt;/title&gt;&lt;id&gt;\1&lt;/id&gt;&lt;url cache=&quot;tmdb-$INFO[language]-\1.json&quot;&gt;http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]&lt;/url&gt;&lt;/entity&gt;" dest="3+">
+ <expression repeat="yes">&quot;id&quot;:([0-9]*),&quot;original_title&quot;:&quot;([^&quot;]*)&quot;,&quot;release_date&quot;:null</expression>
+ </RegExp>
<expression noclean="1" />
</RegExp>
</GetSearchResults>
@@ -46,18 +44,12 @@
<RegExp input="$$1" output="\1" dest="9">
<expression fixchars="1">&quot;original_title&quot;:&quot;([^&quot;]*)</expression>
</RegExp>
- <RegExp input="$$1" output="\1" dest="10">
- <expression fixchars="1">&quot;title&quot;:&quot;([^&quot;]*)</expression>
- </RegExp>
- <RegExp input="$$10" output="&lt;url function=&quot;ParseFallbackTMDBTitle&quot; cache=&quot;tmdb-en-$$2.json&quot;&gt;http://api.themoviedb.org/3/movie/$$2?api_key=57983e31fb435df4df77afb854740ea9&amp;language=en&lt;/url&gt;" dest="5+">
- <expression>^$</expression>
- </RegExp>
- <RegExp input="$$10" output="&lt;title&gt;\1&lt;/title&gt;" dest="5+">
- <expression>(.+)</expression>
- </RegExp>
<RegExp conditional="keeporiginaltitle" input="$$9" output="&lt;title&gt;\1&lt;/title&gt;" dest="5+">
<expression/>
</RegExp>
+ <RegExp input="$$1" output="&lt;title&gt;\1&lt;/title&gt;" dest="5+">
+ <expression fixchars="1">&quot;title&quot;:&quot;([^&quot;]*)</expression>
+ </RegExp>
<RegExp input="$$9" output="&lt;originaltitle&gt;\1&lt;/originaltitle&gt;" dest="5+">
<expression/>
</RegExp>
@@ -154,14 +146,6 @@
<expression noclean="1" />
</RegExp>
</GetDetails>
- <ParseFallbackTMDBTitle dest="5">
- <RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" dest="5">
- <RegExp input="$$1" output="&lt;title&gt;\1&lt;/title&gt;" dest="2">
- <expression fixchars="1">&quot;title&quot;:&quot;([^&quot;]*)</expression>
- </RegExp>
- <expression noclean="1" />
- </RegExp>
- </ParseFallbackTMDBTitle>
<ParseFallbackTMDBRuntime dest="5">
<RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" dest="5">
<RegExp input="$$1" output="&lt;runtime&gt;\1&lt;/runtime&gt;" dest="2">
diff --git a/addons/skin.confluence/720p/DialogButtonMenu.xml b/addons/skin.confluence/720p/DialogButtonMenu.xml
index 49fe371e4d..08848834fc 100644
--- a/addons/skin.confluence/720p/DialogButtonMenu.xml
+++ b/addons/skin.confluence/720p/DialogButtonMenu.xml
@@ -246,7 +246,7 @@
<label>$LOCALIZE[31329] [B]$INFO[System.Alarmpos][/B]</label>
</control>
</control>
- <control type="image" id="10">
+ <control type="image" id="12">
<description>background bottom image</description>
<posx>0</posx>
<width>340</width>
diff --git a/addons/skin.confluence/720p/IncludesHomeMenuItems.xml b/addons/skin.confluence/720p/IncludesHomeMenuItems.xml
index 1f663a3063..101236712b 100644
--- a/addons/skin.confluence/720p/IncludesHomeMenuItems.xml
+++ b/addons/skin.confluence/720p/IncludesHomeMenuItems.xml
@@ -32,7 +32,7 @@
<include>ButtonHomeSubCommonValues</include>
<label>14022</label>
<onclick>ActivateWindow(Videos,Root)</onclick>
- <visible>Library.HasContent(Videos)</visible>
+ <visible>Library.HasContent(Video)</visible>
</control>
<control type="button" id="90107">
<include>ButtonHomeSubCommonValues</include>
diff --git a/addons/skin.confluence/language/Arabic/strings.xml b/addons/skin.confluence/language/Arabic/strings.xml
new file mode 100644
index 0000000000..a78e15ac1c
--- /dev/null
+++ b/addons/skin.confluence/language/Arabic/strings.xml
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!--Translator: Medo Alyami-->
+<!--Email: alyami1@live.com-->
+<!--Based on English 72696c450cb789e240194a0595bed6e291e3a158 (14.11.2011)-->
+<strings>
+ <!-- Misc labels -->
+ <string id="31000">تغيير</string>
+ <string id="31001">حب</string>
+ <string id="31002">كراهية</string>
+ <string id="31003">خيارات الطاقة</string>
+ <string id="31004">...جاري التشغيل</string>
+ <string id="31005">إخÙاء المعلومات</string>
+ <string id="31006">خيارات العرض</string>
+ <string id="31007">الملحقات</string>
+ <string id="31008">شاشة كاملة</string>
+
+ <string id="31020">أضيÙت مؤخرا</string>
+ <string id="31021">الÙيديو - ملÙات</string>
+ <string id="31022">الموسيقى - ملÙات</string>
+ <string id="31023">يشتغل الان</string>
+ <string id="31024">عناصر</string>
+ <string id="31025">صÙحة</string>
+ <string id="31026">خيارات متنوعه</string>
+ <string id="31027">الموقع</string>
+
+ <!-- View Type labels -->
+ <string id="31028">ملصق التÙاÙ</string>
+ <string id="31029">Fanart</string>
+ <string id="31030">قائمة كاملة</string>
+ <string id="31031">مصغرات الصورة</string>
+ <string id="31032">صورة التÙاÙ</string>
+ <string id="31033">معلومات</string>
+
+ <!-- Extra labels -->
+ <string id="31040">يشتغل الان</string>
+
+ <string id="31042">يشتغل الان</string>
+ <string id="31043">متوقÙ</string>
+ <string id="31044">تقديم سريع</string>
+ <string id="31045">إرجاع</string>
+ <string id="31046">خصائص الصوت</string>
+ <string id="31047">القيمة الحالية</string>
+ <string id="31048">التصور المسبقة</string>
+ <string id="31049">وقت الانتهاء</string>
+ <string id="31050">الÙرز:تصاعدي</string>
+ <string id="31051">الÙرز:تنازلي</string>
+
+
+ <!-- Playlist Editor labels -->
+ <string id="31055">Ùتح قائمة التشغيل</string>
+ <string id="31056">Ø­Ùظ قائمة التشغيل</string>
+ <string id="31057">إغلاق قائمة التشغيل</string>
+ <string id="31058">ملÙات موسيقى النظام</string>
+ <string id="31059">قائمة التشغيل الحالية</string>
+ <string id="31060">.هذا المل٠مكدس، حدد الجزء الذي تريد تشغيله</string>
+ <string id="31061">مختارة حاليا</string>
+
+ <!-- Skin Settings labels -->
+ <string id="31100"></string>
+ <string id="31101">خيارات الصÙحة الرئيسية</string>
+ <string id="31102">الخلÙية</string>
+ <string id="31103">إظهار "إيقا٠مؤقت" ÙÙŠ عرض شرائح الصور</string>
+ <string id="31104">[COLOR=grey3] (صندوق حوار معلومات الÙيديو Ùقط)[/COLOR]تشغيل مقطع الÙيديو ÙÙŠ ناÙذة</string>
+ <string id="31105">"الÙيديو" الزر يذهب دائما الى "ملÙات الÙيديو"</string>
+ <string id="31106">خيارات متنوعة</string>
+ <string id="31107">[COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]إخÙاء وضع علامة القراءة من أسماء الÙيديو</string>
+ <string id="31108">إخÙاء أزرار القائمة الرئيسية</string>
+ <string id="31109">خلÙيات الوسائط</string>
+ <string id="31110">تعديل خلÙية نوع الوسائط</string>
+ <string id="31111">إخÙاء</string>
+ <string id="31112">خيارات</string>
+ <string id="31113">صورة واحدة</string>
+ <string id="31114">عدة صورة</string>
+ <string id="31115">مخصص</string>
+ <string id="31116"></string>
+ <string id="31117">إظهار الÙيديوات المضاÙØ© مؤخراً</string>
+ <string id="31118">القائمة الÙرعية لقائمة البرامج الرئيسية</string>
+ <string id="31119">Fanart إخÙاء خلÙية</string>
+ <string id="31120">علامة الزر</string>
+ <string id="31121"></string> <!-- blanked 2010-11-12 -->
+ <string id="31122">صÙحة الطقس</string>
+ <string id="31123">استخدام "ملصقات" بدلا من "لاÙتات" للمسلسلات التلÙزيونية</string>
+ <string id="31124">إظهار خلÙية "التشغيل الآن" للÙيديو</string>
+ <string id="31125">إظهار خلÙية "التشغيل الآن" للتصور</string>
+
+ <string id="31126">(TvTunes ملحق) تشغيل أغاني سمة التلÙزيون ÙÙŠ مكتبة الÙيديو</string>
+ <string id="31127">TvTunes</string>
+ <string id="31128">كلمات الأغاني</string>
+ <string id="31129"></string> <!-- blanked 2010-11-12 -->
+ <string id="31130"></string> <!-- blanked 2010-11-12 -->
+
+ <string id="31131"></string> <!-- blanked 2010-12-23 -->
+ <string id="31132">ملحق كلمات الأغاني</string>
+ <string id="31133">ملحق الترجمات</string>
+ <string id="31134">القائمة الÙرعية لقائمة الÙيديو الرئيسية</string>
+ <string id="31135">القائمة الÙرعية لقائمة الموسيقى الرئيسية</string>
+ <string id="31136">القائمة الÙرعية لقائمة الصور الرئيسية</string>
+
+ <string id="31140">عرض الموسيقى على الشاشة</string>
+ <string id="31141">عرض الÙيديو على الشاشة</string>
+
+ <!-- Script labels -->
+ <string id="31200">اختصارات</string>
+ <string id="31201">الÙئات</string>
+ <string id="31202">إظهار الرواية</string>
+ <string id="31203">اختر أغنيتك</string>
+ <string id="31204">روابط ذات صلة</string>
+ <string id="31205">مصدر كلمات الأغنية</string>
+
+ <!-- Extra labels -->
+ <string id="31300">درجة الحرارة الحالية</string>
+ <string id="31301">اخر تحديث</string>
+ <string id="31302">القائمة</string>
+ <string id="31303">: مزود البيانات</string>
+ <string id="31304">الصور</string>
+ <string id="31305">لم يتم الكش٠عن قرص وسائط</string>
+ <string id="31306">إخراج</string>
+ <string id="31307">Fanart إخÙاء</string>
+ <string id="31308">تÙاصيل الÙلم</string>
+ <string id="31309">الذاكرة المستخدمة:</string>
+ <string id="31310">رقم المسار</string>
+ <string id="31311">انقر الزر للتعيين[CR][CR]غير متوÙرة[CR][CR]Fanart صورة</string>
+ <string id="31312">Current Scraper</string>
+ <string id="31313">Choose a Scraper</string>
+ <string id="31314">خيارات Ùحص المحتوى </string>
+ <string id="31315">أساسي</string>
+ <string id="31316"></string>
+ <string id="31317">Fanart تعيين مسار</string>
+ <string id="31318">Fanart صغيرة</string>
+ <string id="31319">المل٠الشخصي المحدد</string>
+ <string id="31320">آخر تسجيل دخول ÙÙŠ</string>
+ <string id="31321">محدد أغاني الكاريوكي</string>
+ <string id="31322">المبث</string>
+ <string id="31323">أحدث الأÙلام</string>
+ <string id="31324">أحدث الحلقات</string>
+ <string id="31325">خيارات قائمة التشغيل</string>
+ <string id="31326">أنشئ</string>
+ <string id="31327">الدقة</string>
+ <string id="31328">أضي٠مؤخراً</string>
+ <string id="31329">[COLOR=grey2] إغلاق النظام تلقائيا ÙÙŠ - [/COLOR][B]!تعيين مؤقت[B]</string>
+ <string id="31330">مقطع الÙلم [CR][CR] انقر على الزر لتشغيل</string>
+ <string id="31331">تÙاصبل الألبوم</string>
+
+ <!-- Video and Music OSD Labels -->
+ <string id="31351">توقي٠مؤقت</string>
+ <string id="31352">توق٠كامل</string>
+ <string id="31353">تقديم سريع</string>
+ <string id="31354">ترجيع</string>
+ <string id="31355">قائمة الÙلم</string>
+ <string id="31356">تحميل الترجمات</string>
+ <string id="31357"></string>
+
+ <!-- Skin Fontsets -->
+ <string id="31390">الخلÙية الاإÙتراضية</string>
+ <string id="31391">Skin default with no Caps</string>
+ <string id="31392">Arial based</string>
+
+ <!-- Description Labels -->
+ <string id="31400">[B]تكوين إعدادات المظهر[/B][CR][CR]تغيير الخلÙية · تعيين اللغة والمنطقة · تغيير خيارات قائمة الملÙ[CR]ضبط شاشة التوقÙ</string>
+ <string id="31401">[B]تكوين إعدادات الÙيديو[/B][CR][CR]إدارة مكتبة الÙيديو · تعيين خيارات تشغيل الÙيديو · تغيير خيارات قائمة الÙيديو[CR]تعيين خطوط الترجمة</string>
+ <string id="31402">[B]تكوين إعدادات الموسيقى[/B][CR][CR]إدارة مكتبة الموسيقي · تعيين خيارات تشغيل الموسيقى · تغيير خيارات قائمة الموسيقى · تعيين خيارات الكارويوكي</string>
+ <string id="31403">[B]تكوين إعدادات الصور[/B][CR][CR]ضبط عرض الشرائح · تغيير خيارات قائمة الصور</string>
+ <string id="31404">[B]تكوين إعدادات الطقس[/B][CR][CR]تعيين ثلاث مدن لجمع معلومات عن الطقس</string>
+ <string id="31405">[B]تكوين إعدادات شبكة الاتصال[/B][CR][CR] HTTP و UPnP عبرXBMC ضبط تحكم · تكوين مل٠تقاسم[CR]تعيين خيارات الوصول إلى الإنترنت</string>
+ <string id="31406">[B]تكوين إعدادات النظام[/B][CR][CR]ضبط المعايرة والعرض· تكوين مخرج الصوت · ضبط التحكم عن بعد[CR]تعيين خيارات توÙير الطاقة · تمكين التصحيح · ضبط القÙÙ„ الرئيسي </string>
+ <string id="31407">[B]تكوين إعدادات الخلÙيات [/B][CR][CR]Setup the Confluence skin · أض٠وإزالة عناصر القائمة الرئيسية[CR]تغيير الخلÙيات</string>
+ <string id="31408">[B]تكوين الملحقات [/B][CR][CR]xbmc.org إدارة الملحقات المثبتة · تصÙØ­ وتثبيت الملحقات من[CR] تعديل إعدادت الملحق</string>
+
+ <string id="31421">للدخول والإستمرارا [CR]XBMC حدد ملÙÙƒ الشخصي الخاص بـ</string>
+
+ <!-- Weather plugin -->
+ <string id="31900">خرائط الطقس</string>
+ <string id="31901">36 hour توقعات طقس</string>
+ <string id="31902">توقعات الطقس لكل ساعة</string>
+ <string id="31903">توقعات طقس نهاية الأسبوع</string>
+ <string id="31904">10 Days توقعات طقس</string>
+ <string id="31905">توقعات الطقس</string>
+ <string id="31906">الخرائط والÙيديو</string>
+ <string id="31907">[COLOR=grey2](Fullscreen Playback)[/COLOR]توقعات الطقس Ùيديو</string>
+ <string id="31908">Ùرصة هطول الأمطار</string>
+ <string id="31909">...جلب معلومات توقعات الطقس</string>
+
+ </strings>
diff --git a/addons/skin.confluence/language/Icelandic/strings.xml b/addons/skin.confluence/language/Icelandic/strings.xml
index 6901b6ddd3..df761b5006 100644
--- a/addons/skin.confluence/language/Icelandic/strings.xml
+++ b/addons/skin.confluence/language/Icelandic/strings.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--Translator: Kristján Bjarni Guðmundsson-->
<!--Email: kristjanbjarni@gmail.com-->
-<!--Date of translation: 2011-06-08-->
-<!--$Revision$-->
-<!--Based on english strings version 35672-->
+<!--Date of translation: 2012-01-22-->
+<!--Based on English 72696c450cb789e240194a0595bed6e291e3a158 (14.11.2011)-->
<strings>
<!-- Misc labels -->
<string id="31000">Breyta -</string>
@@ -11,9 +10,10 @@
<string id="31002">Hatri</string>
<string id="31003">Orkukostir</string>
<string id="31004">Vinnsla...</string>
- <string id="31005">Fela UPPLÃSINGAR</string>
-
+ <string id="31005">Fela upplýsingar</string>
+ <string id="31006">Stillingar sjónarhorns</string>
<string id="31007">Tengiforrit</string>
+ <string id="31008">Allur skjárinn</string>
<string id="31020">Nýlega bætt við</string>
<string id="31021">Myndefni - Skrár</string>
@@ -23,7 +23,7 @@
<string id="31025">Hlutir</string>
<string id="31026">Ãmsir valkostir</string>
<string id="31027">Staðsetning</string>
-
+
<!-- View Type labels -->
<string id="31028">Veggspjaldafletting</string>
<string id="31029">Aðdáendamyndir</string>
@@ -43,7 +43,8 @@
<string id="31047">Gildandi forstilling</string>
<string id="31048">Forstillingar myndskreytinga</string>
<string id="31049">Lokatími</string>
-
+ <string id="31050">Raða: Hækkandi</string>
+ <string id="31051">Raða: Lækkandi</string>
<!-- Playlist Editor labels -->
<string id="31055">Opna lagalista</string>
@@ -53,14 +54,14 @@
<string id="31059">Núgildandi lagalisti</string>
<string id="31060">Þessi skrá er stöfluð, veldu þann part sem þú vilt byrja að spila frá.</string>
<string id="31061">Núverandi val</string>
-
+
<!-- Skin Settings labels -->
<string id="31100"/>
<string id="31101">Stillingar heimaskjás</string>
<string id="31102">Bakgrunnur</string>
<string id="31103">Sýna "à bið" í myndasýningu</string>
<string id="31104">Spila kvikmyndasýnishorn í glugga [COLOR=grey3](Aðeins myndbandaupplýsingarglugga)[/COLOR]</string>
- <string id="31105"></string>
+ <string id="31105">Myndbandahnappur fer alltaf í myndbandaskrár</string>
<string id="31106">Ãmsir valkostir</string>
<string id="31107">Fela flagg lesið frá skráarnöfnum [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]</string>
<string id="31108">Fela hnapp í aðalvalmynd</string>
@@ -74,7 +75,7 @@
<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"/> <!-- blanked 2010-11-12 -->
+ <string id="31119">Fela aðdáendamyndir í bakgrunni</string>
<string id="31120">HNAPPAHEITI</string>
<string id="31121"/> <!-- blanked 2010-11-12 -->
<string id="31122">Veðursíða</string>
@@ -82,12 +83,12 @@
<string id="31124">Sýna "à spilun" myndband í bakgrunni</string>
<string id="31125">Sýna "à spilun" myndskreytingu í bakgrunni</string>
- <string id="31126"/> <!-- blanked 2010-11-12 -->
- <string id="31127"/> <!-- blanked 2010-11-12 -->
+ <string id="31126">Spila þema lög í myndbandasafni (TvTunes viðbót)</string>
+ <string id="31127">TvTunes</string>
<string id="31128">Lagatextar</string>
<string id="31129"/> <!-- blanked 2010-11-12 -->
<string id="31130"/> <!-- blanked 2010-11-12 -->
-
+
<string id="31131"/> <!-- blanked 2010-12-23 -->
<string id="31132">Viðbót fyrir lagatexta</string>
<string id="31133">Viðbót fyrir þýðingartexta</string>
@@ -110,7 +111,7 @@
<string id="31300">Núverandi hiti</string>
<string id="31301">Síðast uppfært</string>
<string id="31302">Valmynd</string>
- <string id="31303"/>
+ <string id="31303">Gagnaveita</string>
<string id="31304">Mynd</string>
<string id="31305">Enginn diskur með myndefni fannst</string>
<string id="31306">Ãta út</string>
@@ -138,6 +139,7 @@
<string id="31328">Nýlega bætt við</string>
<string id="31329">[B]Tímamælir virkur![/B] [COLOR=grey2] - Sjálfvirkt Slökkt eftir[/COLOR]</string>
<string id="31330">Smelltu á takka til að spila[CR][CR]Kvikmyndasýnishorn</string>
+ <string id="31331">Hljómplötuupplýsingar</string>
<!-- Video and Music OSD Labels -->
<string id="31351">Bið</string>
@@ -165,4 +167,16 @@
<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>
<string id="31421">Veldu XBMC notanda[CR]til að skrá þig inn og halda áfram</string>
+
+ <!-- Weather plugin -->
+ <string id="31900">Veðurkort</string>
+ <string id="31901">36 klst veðurspá</string>
+ <string id="31902">Klukkustunda veðurspá</string>
+ <string id="31903">Veðurspá helgarinnar</string>
+ <string id="31904">10 daga veðurspá</string>
+ <string id="31905">Veðurspá</string>
+ <string id="31906">Kort og Myndbönd</string>
+ <string id="31907">Myndbandaveðurspá [COLOR=grey2](Spila á öllum skjánum)[/COLOR]</string>
+ <string id="31908">Líkur á úrkomu</string>
+ <string id="31909">Næ í veðurspá...</string>
</strings>
diff --git a/addons/skin.confluence/language/Italian/strings.xml b/addons/skin.confluence/language/Italian/strings.xml
index 7890bb143d..b3323105b7 100644
--- a/addons/skin.confluence/language/Italian/strings.xml
+++ b/addons/skin.confluence/language/Italian/strings.xml
@@ -1,4 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1" standalone="yes"?>
+<!--Translator: Gulp-->
+<!--Email: http://forum.xbmc.org/member.php?u=42290-->
+<!--Based on English 72696c450cb789e240194a0595bed6e291e3a158 (14.11.2011)-->
<strings>
<!-- Misc labels -->
<string id="31000">Cambia il tuo</string>
@@ -6,9 +9,10 @@
<string id="31002">Odio</string>
<string id="31003">Impostazioni Avanzate</string>
<string id="31004">Sto lavorando...</string>
- <string id="31005">Nascondi INFO</string>
-
+ <string id="31005">Nascondi informazioni</string>
+ <string id="31006">Vedi Opzioni</string>
<string id="31007">Plugins</string>
+ <string id="31008">Schermo Intero</string>
<string id="31020">Aggiunti di recente</string>
<string id="31021">Files - Video</string>
@@ -18,7 +22,7 @@
<string id="31025">Oggetti</string>
<string id="31026">Opzioni Varie</string>
<string id="31027">Località</string>
-
+
<!-- View Type labels -->
<string id="31028">Poster</string>
<string id="31029">Fanart</string>
@@ -38,6 +42,8 @@
<string id="31047">Preset Corrente</string>
<string id="31048">Preset Visualizzazione</string>
<string id="31049">Orario fine riproduzione</string>
+ <string id="31050">Ordina: Crescente</string>
+ <string id="31051">Ordina: Decrescente</string>
<!-- Playlist Editor labels -->
@@ -48,16 +54,16 @@
<string id="31059">Playlist Corrente </string>
<string id="31060">Questo file è stato accorpato, scegli la parte da cui vuoi iniziare.</string>
<string id="31061">Correntemente Selezionato</string>
-
+
<!-- Skin Settings labels -->
<string id="31100"></string>
<string id="31101">Opzioni pagina principale</string>
<string id="31102">Sfondo</string>
<string id="31103">Mostra "In pausa" durante la visualizzazione delle immagini</string>
<string id="31104">Riproduci i trailer in finestra [COLOR=grey3](Solo nel pannello informazioni video)[/COLOR]</string>
- <string id="31105"></string>
+ <string id="31105">Il pulsante "Video" porta sempre ai "files" video</string>
<string id="31106">Opzioni Varie</string>
- <string id="31107"></string>
+ <string id="31107">Nascondi la spunta letto dai nomi dei file video [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]</string>
<string id="31108">Nascondi i bottoni del menù principale</string>
<string id="31109">Sfondi per le sezioni principali</string>
<string id="31110">Modifica lo Sfondo per la Sezione</string>
@@ -68,20 +74,27 @@
<string id="31115">Personalizzazione</string>
<string id="31116"></string>
<string id="31117">Mostra i Video Aggiunti di Recente</string>
- <string id="31118">Sottomenu Pagina Principale</string>
- <string id="31119"></string>
+ <string id="31118">Sottomenù Pagina Principale</string>
+ <string id="31119">Nascondi i Fanart sullo sfondo</string>
<string id="31120">ETICHETTA BOTTONE</string>
- <string id="31121"></string>
+ <string id="31121"></string> <!-- blanked 2010-11-12 -->
<string id="31122">Pagina Meteo</string>
<string id="31123">Usa i "Posters" invece dei "Banners" per le Serie Tv</string>
<string id="31124">Mostra nello Sfondo il nome del Video "In Riproduzione" </string>
<string id="31125">Mostra nello Sfondo Visualizzazioni il nome del file "In Riproduzione"</string>
- <string id="31126"></string>
- <string id="31127"></string>
+ <string id="31126">Riproduci le sigle TV (sonore) nell'archivio video (add-on TvTunes)</string>
+ <string id="31127">TvTunes</string>
<string id="31128">XBMC Testi Canzoni</string>
- <string id="31129"></string>
- <string id="31130"></string>
+ <string id="31129"></string> <!-- blanked 2010-11-12 -->
+ <string id="31130"></string> <!-- blanked 2010-11-12 -->
+
+<string id="31131"></string> <!-- blanked 2010-12-23 -->
+ <string id="31132">Add-on Testi</string>
+ <string id="31133">Add-on Sottotitoli</string>
+ <string id="31134">Sottomenù Home Page Video</string>
+ <string id="31135">Sottomenù Home Page Musica</string>
+ <string id="31136">Sottomenù Home Page Immagini</string>
<string id="31140">OSD Musica</string>
<string id="31141">OSD Video</string>
@@ -94,16 +107,11 @@
<string id="31204">Sezione Links</string>
<string id="31205">Sorgente Testi</string>
- <!-- The Weather Channel Script labels -->
- <string id="31250">Radar &amp; Pevisioni</string>
- <string id="31251">Previsioni</string>
- <string id="31252">TWC Script</string>
-
<!-- Extra labels -->
<string id="31300">Temperatura Corrente</string>
<string id="31301">Ultimo Aggiornamento</string>
- <string id="31302">Menu</string>
- <string id="31303"></string>
+ <string id="31302">Menù</string>
+ <string id="31303">Fornitore dei dati</string>
<string id="31304">Immagini</string>
<string id="31305">Nessun Disco Rilevato</string>
<string id="31306">Espelli</string>
@@ -131,16 +139,22 @@
<string id="31328">Aggiunti di Recente</string>
<string id="31329">[B]Timer Impostato![/B] [COLOR=grey2] - Il Sistema Verrà Spento in[/COLOR]</string>
<string id="31330">Premi il bottone per riprodurre [CR][CR]il trailer del Film</string>
+ <string id="31331">Dettagli Album</string>
<!-- Video and Music OSD Labels -->
<string id="31351">Pausa</string>
<string id="31352">Stop</string>
<string id="31353">Avanti Veloce</string>
<string id="31354">Indietro</string>
- <string id="31355">Menu Filmato</string>
+ <string id="31355">Menù Filmato</string>
<string id="31356">Scarica Sottotitoli</string>
<string id="31357"></string>
+ <!-- Skin Fontsets -->
+ <string id="31390">Predefinito della Skin</string>
+ <string id="31391">Predefinito della Skin senza maiuscole</string>
+ <string id="31392">Basato su Arial</string>
+
<!-- Description Labels -->
<string id="31400">[B]CONFIGURA LE IMPOSTAZIONI PER L'ASPETTO[/B][CR][CR]Cambia la skin · Imposta Lingua e Regione · Cambia le impostazioni di elenco dei file[CR]Imposta uno screensaver</string>
<string id="31401">[B]CONFIGURA IMPOSTAZIONI VIDEO[/B][CR][CR]Gestisci la tua Libreria Video · Imposta le impostazioni di riproduzione dei video · Cambia impostazioni per le liste video[CR]Imposta il fonts dei sottotitoli</string>
@@ -150,6 +164,20 @@
<string id="31405">[B]CONFIGURA IMPOSTAZIONI DI RETE[/B][CR][CR]Imposta il controllo di XBMC via UPnP e HTTP · Configura le opzioni di condivisione[CR]Imposta le opzioni di accesso ad Internet</string>
<string id="31406">[B]CONFIGURA IMPOSTAZIONI DI SISTEMA[/B][CR][CR]Imposta e calibra il video · Configura l'uscita Audio · Imposta i controlli remoti[CR]Imposta le ozioni di risparmio energetico · Abilita il Debug · Imposta il master lock</string>
<string id="31407">[B]CONFIGURA IMPOSTAZIONI SKIN[/B][CR][CR]Configura la skin Confluence · Aggiungi o rimuovi oggetti dalla pagina principale[CR]Cambia gli sfondi</string> <string id="31408">[B]CONFIGURA GLI ADD-ONS[/B][CR][CR]Gestisci i tuoi Add-ons installati · Cerca ed installa gli Add-ons da xbmc.org[CR]Modifica le impostazioni degli Add-ons</string>
+ <string id="31408">[B]CONFIGURA GLI ADD-ONS[/B][CR][CR]Gestisci gli Add-ons installati · Esplora e installa gli Add-ons da xbmc.org[CR]Modifica le impostazioni degli Add-ons</string>
<string id="31421">Scegli il tuo profilo utente di XBMC[CR]per fare il login e continuare</string>
+
+ <!-- Weather plugin -->
+ <string id="31900">Mappa Meteo</string>
+ <string id="31901">Previsioni a 36 Ore</string>
+ <string id="31902">Previsioni Orarie</string>
+ <string id="31903">Previsioni per il Weekend</string>
+ <string id="31904">Previsioni a 10 giorni</string>
+ <string id="31905">Previsioni</string>
+ <string id="31906">Mappe &amp; Video</string>
+ <string id="31907">Previsioni Video [COLOR=grey2](Riproduzione a schermo intero)[/COLOR]</string>
+ <string id="31908">Percentuale di precipitazioni</string>
+ <string id="31909">Recuper informazioni previsioni...</string>
+
</strings>
diff --git a/addons/skin.touched b/addons/skin.touched
-Subproject 1d03746646111f97e28b807a290bd762c7db547
+Subproject 9b6fcdbb095bc84cdf84c1fd01ff719e972cbaa
diff --git a/addons/weather.wunderground/addon.xml b/addons/weather.wunderground/addon.xml
index d52f581866..ee79a9f304 100644
--- a/addons/weather.wunderground/addon.xml
+++ b/addons/weather.wunderground/addon.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="weather.wunderground" name="Weather Underground" version="0.0.2" provider-name="Team XBMC">
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<addon id="weather.wunderground" name="Weather Underground" version="0.0.4" provider-name="Team XBMC">
<requires>
<import addon="xbmc.python" version="2.0"/>
<import addon="script.module.simplejson" version="2.0.10"/>
@@ -9,11 +9,14 @@
<summary lang="bg">Синоптична прогноза от wunderground.com</summary>
<summary lang="en">Weather forecast from wunderground.com</summary>
<summary lang="se">Väderprognos från wunderground.com</summary>
+ <summary lang="zh">æ¥è‡ªwunderground.com的天气预报</summary>
<description lang="bg">Прогноза за времето оÑигурена от Weather Underground (http://www.wunderground.com/)</description>
<description lang="en">Weather forecast provided by Weather Underground (http://www.wunderground.com/)</description>
<description lang="se">Väderprognos tillhandahållen av Weather Underground (http://www.wunderground.com/)</description>
+ <description lang="zh">ç”±Weather Underground(http://www.wunderground.com/)æ供的天气预报</description>
<disclaimer lang="en">Use of this add-on implies that you have agreed to the Terms of Service located at http://www.wunderground.com/weather/api/d/terms.html</disclaimer>
<disclaimer lang="se">Användning av detta tillägg innebär att du har godkänt Terms of Service från http://www.wunderground.com/weather/api/d/terms.html</disclaimer>
+ <disclaimer lang="zh">使用此扩展功能æ„味ç€ä½ åŒæ„此连接下的æœåŠ¡æ¡æ¬¾ï¼šhttp://www.wunderground.com/weather/api/d/terms.html</disclaimer>
<platform>all</platform>
</extension>
</addon>
diff --git a/addons/weather.wunderground/changelog.txt b/addons/weather.wunderground/changelog.txt
index 3d8d737eca..d4ce40b10f 100644
--- a/addons/weather.wunderground/changelog.txt
+++ b/addons/weather.wunderground/changelog.txt
@@ -1,3 +1,11 @@
+v0.0.4
+- don't fetch weather when no locations are set up
+- fix incrementing values on each weather refresh when no locations are set up
+- workaround: stop xbmc from running the script in a loop when no locations are set up
+
+v0.0.3
+- added Simplified Chinese translation
+
v0.0.2
- show dialog instead of empty list when no locations are found
- added german translation
diff --git a/addons/weather.wunderground/default.py b/addons/weather.wunderground/default.py
index 632224ae85..c00e6d3ac6 100644
--- a/addons/weather.wunderground/default.py
+++ b/addons/weather.wunderground/default.py
@@ -129,7 +129,29 @@ if sys.argv[1].startswith('Location'):
else:
location = __addon__.getSetting('Location%sid' % sys.argv[1])
aik = base64.b64decode(A_I_K)
- forecast(location)
+ if not location == '':
+ forecast(location)
+ refresh_locations()
+ else:
+ # workaround to fix incrementing values on each weather refresh when no locations are set up:
+ set_property('Current.Condition' , 'N/A')
+ set_property('Current.Temperature' , '0')
+ set_property('Current.Wind' , '0')
+ set_property('Current.WindDirection' , 'N/A')
+ set_property('Current.Humidity' , '0')
+ set_property('Current.FeelsLike' , '0')
+ set_property('Current.UVIndex' , '0')
+ set_property('Current.DewPoint' , '0')
+ set_property('Current.OutlookIcon' , 'na.png')
+ set_property('Current.FanartCode' , 'na')
+ for count in range (0, 3):
+ set_property('Day%i.Title' % count, 'N/A')
+ set_property('Day%i.HighTemp' % count, '0')
+ set_property('Day%i.LowTemp' % count, '0')
+ set_property('Day%i.Outlook' % count, 'N/A')
+ set_property('Day%i.OutlookIcon' % count, 'na.png')
+ set_property('Day%i.FanartCode' % count, 'na')
+ # workaround to stop xbmc from running the script in a loop when no locations are set up:
+ set_property('Locations', '1')
-refresh_locations()
set_property('WeatherProvider', 'Weather Underground')
diff --git a/addons/weather.wunderground/resources/language/Chinese (Simple)/strings.xml b/addons/weather.wunderground/resources/language/Chinese (Simple)/strings.xml
new file mode 100644
index 0000000000..ab8b025eb2
--- /dev/null
+++ b/addons/weather.wunderground/resources/language/Chinese (Simple)/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<strings>
+ <string id="30101">所在地设置</string>
+ <string id="30111">更改地点1</string>
+ <string id="30112">更改地点2</string>
+ <string id="30113">更改地点3</string>
+</strings>
diff --git a/language/Arabic/langinfo.xml b/language/Arabic/langinfo.xml
new file mode 100644
index 0000000000..ae496f2439
--- /dev/null
+++ b/language/Arabic/langinfo.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<language locale="ar">
+ <charsets>
+ <gui unicodefont="true">CP1256</gui>
+ <subtitle>CP1256</subtitle>
+ </charsets>
+ <dvd>
+ <menu>ar</menu>
+ <audio>ar</audio>
+ <subtitle>ar</subtitle>
+ </dvd>
+ <regions>
+ <region name="Middle East" locale="ME">
+ <dateshort>DD/MM/YYYY</dateshort>
+ <datelong>DDDD DD MMMM YYYY</datelong>
+ <time symbolAM="" symbolPM="">HH:mm:ss</time>
+ <tempunit>C</tempunit>
+ <speedunit>kmh</speedunit>
+ </region>
+ </regions>
+</language>
+
diff --git a/language/Arabic/strings.xml b/language/Arabic/strings.xml
new file mode 100644
index 0000000000..33337583d4
--- /dev/null
+++ b/language/Arabic/strings.xml
@@ -0,0 +1,2071 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!--Translator: Medo Alyami-->
+<!--Email: alyami1@live.com-->
+<!--Based on English 4c45436d4c19274fca2d478373326688c5682e55 (11.12.2011)-->
+<strings>
+ <string id="0">البرامج</string>
+ <string id="1">الصور</string>
+ <string id="2">الموسيقى</string>
+ <string id="3">الÙيديو</string>
+ <string id="4">دليل التلÙزيون</string>
+ <string id="5">الإعدادات</string>
+ <string id="7">إدارة الملÙات</string>
+ <string id="8">الطقس</string>
+ <string id="9">xbmc مركز وسائط</string>
+ <string id="11">الاثنين</string>
+ <string id="12">الثلاثاء</string>
+ <string id="13">الاربعاء</string>
+ <string id="14">الخميس</string>
+ <string id="15">الجمعة</string>
+ <string id="16">السبت</string>
+ <string id="17">الاحد</string>
+ <string id="21">يناير</string>
+ <string id="22">Ùبراير</string>
+ <string id="23">مارس</string>
+ <string id="24">أبريل</string>
+ <string id="25">مايو</string>
+ <string id="26">يونيو</string>
+ <string id="27">يوليو</string>
+ <string id="28">أغسطس</string>
+ <string id="29">سبتمبر</string>
+ <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">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">SSW</string>
+ <string id="81">SW</string>
+ <string id="82">WSW</string>
+ <string id="83">W</string>
+ <string id="84">WNW</string>
+ <string id="85">NW</string>
+ <string id="86">NNW</string>
+ <string id="87">VAR</string>
+ <string id="98">عرض: تلقائية</string>
+ <string id="99">عرض: تلقائية كبيرة</string>
+ <string id="100">عرض: رموز</string>
+ <string id="101">عرض: قائمة</string>
+ <string id="102">Ùحص</string>
+ <string id="103">ترتيب حسب: الإسم</string>
+ <string id="104">ترتيب حسب: التاريخ</string>
+ <string id="105">ترتيب حسب: الحجم</string>
+ <string id="106">لا</string>
+ <string id="107">نعم</string>
+ <string id="108">عرض الشرائح</string>
+ <string id="109">إنشاء مصغرات</string>
+ <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>
+ <string id="118">إعادة تسمية</string>
+ <string id="119">مجلد جديد</string>
+ <string id="120">تأكيد نسخ ملÙ</string>
+ <string id="121">تأكيد نقل ملÙ</string>
+ <string id="122">تأكيد حذ٠ملÙØŸ</string>
+ <string id="123">نسخ هذه الملÙات؟</string>
+ <string id="124">تحريك هذه الملÙات؟</string>
+ <string id="125">حذ٠هذه الملÙات؟ - لايمكن التراجع بعد حذ٠هذه الملÙات!</string>
+ <string id="126">الحالة</string>
+ <string id="127">كائنات</string>
+ <string id="128">عام</string>
+ <string id="129">عرض الشرائح</string>
+ <string id="130">معلومات النظام</string>
+ <string id="131">عرض</string>
+ <string id="132">البومات</string>
+ <string id="133">الÙنانين</string>
+ <string id="134">الأغاني</string>
+ <string id="135">الأنواع</string>
+ <string id="136">قوائم التشغيل</string>
+ <string id="137">بحث</string>
+ <string id="138">معلومات النظام</string>
+ <string id="139">درجات الحرارة:</string>
+ <string id="140">وحدة المعالجة:</string>
+ <string id="141">معالج الرسومات:</string>
+ <string id="142">الوقت:</string>
+ <string id="143">الحالي:</string>
+ <string id="144">النسخة:</string>
+ <string id="145">الشبكة:</string>
+ <string id="146">النوع:</string>
+ <string id="147">ثابت</string>
+ <string id="148">DHCP</string>
+ <string id="149">عنوان التحكم بالوصول إلى الوسائط MAC</string>
+ <string id="150">عنوان الآي بي IP</string>
+ <string id="151">الربط:</string>
+ <string id="152">Half duplex</string>
+ <string id="153">Full duplex</string>
+ <string id="154">سعة التخزين</string>
+ <string id="155">السواقة</string>
+ <string id="156">الخالية</string>
+ <string id="157">الÙيديو</string>
+ <string id="158">الذاكرة</string>
+ <string id="159">لايوجد رابط</string>
+ <string id="160">الخالية</string>
+ <string id="161">تعطيل</string>
+ <string id="162">Ùتح علبة</string>
+ <string id="163">قراءة</string>
+ <string id="164">لايوجد قرص</string>
+ <string id="165">القرص الحالي</string>
+ <string id="166">الخلÙيات</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>
+ <string id="180">المدة</string>
+ <string id="181">اختر الألبوم</string>
+ <string id="182">المسارات</string>
+ <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>
+ <string id="190">Ø­Ùظ</string>
+ <string id="191">خلط</string>
+ <string id="192">مسح</string>
+ <string id="193">Ùحص</string>
+ <string id="194">بحث...</string>
+ <string id="195">لا توجد معلومات</string>
+ <string id="196">اختر الÙلم:</string>
+ <string id="197">%s معلومات الإستعلام</string>
+ <string id="198">تحميل تÙاصيل الÙيلم</string>
+ <string id="199">واجهة ويب</string>
+ <string id="202">إشعار</string>
+ <string id="203">موجز الرواية</string>
+ <string id="205">اصوات</string>
+ <string id="206">طرح</string>
+ <string id="207">الرواية</string>
+ <string id="208">تشغيل</string>
+ <string id="209">التالي</string>
+ <string id="210">السابق</string>
+ <string id="213">معايرة واجهة المستخدم...</string>
+ <string id="214">معايرة الÙيديو...</string>
+ <string id="215">تنعيم</string>
+ <string id="216">مقدار التكبير</string>
+ <string id="217">نسبة عنصر الصورة</string>
+ <string id="218">DVD محرك أقراص </string>
+ <string id="219">الرجاء إدراج القرص</string>
+ <string id="220">مشاركة عن بعد</string>
+ <string id="221">لم يتم توصيل الشبكة</string>
+ <string id="222">إلغاء</string>
+ <string id="224">سرعة</string>
+ <string id="225">تحول عمودي</string>
+ <string id="226">اختبار النماذج...</string>
+ <string id="227">بحث أسماء مسارات الاسطوانة الصوتية من freedb.org</string>
+ <string id="228">خلط قائمة التشغيل على التحميل</string>
+ <string id="229">HDD وقت نسج</string>
+ <string id="230">تصÙية الÙيديو</string>
+ <string id="231">بلا</string>
+ <string id="232">نقطة</string>
+ <string id="233">طولي</string>
+ <string id="234">تباين</string>
+ <string id="235">تخميس</string>
+ <string id="236">غاوسي مكعب</string>
+ <string id="237">تقليل</string>
+ <string id="238">تكبير</string>
+ <string id="239">مسح التشغيل على الانتهاء</string>
+ <string id="240">طريقة العرض</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) AR:%2.2f:1 (%بكسل: 2.2f:1) (VShift: %2.2f)</string>
+ <string id="247">النصية</string>
+ <string id="248">اللغة</string>
+ <string id="249">موسيقى</string>
+ <string id="250">التصور</string>
+ <string id="251">حدد دليل الوجهة</string>
+ <string id="252">إخراج النظام الصوتي لجميع المكبرات</string>
+ <string id="253">عدد القنوات</string>
+ <string id="254">- DTS قدرة استقبال</string>
+ <string id="255">CDDB</string>
+ <string id="256">إحضار المعلومات الإسطوانة</string>
+ <string id="257">خطأ</string>
+ <string id="258">تمكين علامة القراءة</string>
+ <string id="259">جاري الÙتح</string>
+ <string id="260">شوتكاست</string>
+ <string id="261">انتظار للبدء...</string>
+ <string id="262">مخرجات النصية</string>
+ <string id="263">سماح تحكم XBMC عبر HTTP</string>
+ <string id="264">تسجيل</string>
+ <string id="265">إيقا٠التسجيل</string>
+ <string id="266">ترتيب حسب: المسار</string>
+ <string id="267">ترتيب حسب: الوقت</string>
+ <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>
+ <string id="275">تكيي٠نسبة البكسل</string>
+ <string id="276">ضبط السهم لتغيير مقدار زيادة الÙحص</string>
+ <string id="277">ضبط الشريط لتغيير موضع الترجمات</string>
+ <string id="278">ضبط المستطيل بحيث يكون مربع تماما</string>
+ <string id="279">غير قادر على تحميل الإعدادات</string>
+ <string id="280">استخدام الإعدادات الاÙتراضية</string>
+ <string id="281">يرجى التحقق من ملÙات XML</string>
+ <string id="282">العثور %i عل بنود</string>
+ <string id="283">نتائج البحث</string>
+ <string id="284">لا توجد نتائج</string>
+ <string id="287">الترجمات</string>
+ <string id="288">الخط</string>
+ <string id="289">- الحجم</string>
+ <string id="290">ضغط النطاق الديناميكي</string>
+ <string id="291">Ùيديو</string>
+ <string id="292">صوت</string>
+ <string id="293">تصÙØ­ للبحث عن الترجمة</string>
+ <string id="294">إنشاء علامة</string>
+ <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="306">غير معشق</string>
+ <string id="312">(0=auto)</string>
+ <string id="313">تنظي٠قاعدة بيانات</string>
+ <string id="314">إعداد...</string>
+ <string id="315">خطأ ÙÙŠ قاعدة بيانات</string>
+ <string id="316">بحث الأغاني...</string>
+ <string id="317">قاعدة البيانات منظÙØ© بنجاح</string>
+ <string id="318">تنظي٠الأغاني...</string>
+ <string id="319">خطأ تنظي٠الأغاني</string>
+ <string id="320">تنظي٠الÙنانين...</string>
+ <string id="321">خطأ تنظي٠الÙنانين</string>
+ <string id="322">تنظي٠الأنواع...</string>
+ <string id="323">خطأ تنظي٠الأنواع</string>
+ <string id="324">تنظي٠مسارات...</string>
+ <string id="325">خطأ تنظي٠المسارات</string>
+ <string id="326">تنظي٠ألبومات...</string>
+ <string id="327">خطأ تنظي٠ألبومات</string>
+ <string id="328">كتابة تغييرات...</string>
+ <string id="329">خطأ كتابة التغييرات</string>
+ <string id="330">هذا قد يستغرق بعض الوقت...</string>
+ <string id="331">ضغط قاعدة بيانات...</string>
+ <string id="332">خطأ ضغط قاعدة بيانات</string>
+ <string id="333">هل تريد تنظي٠المكتبة؟</string>
+ <string id="334">تنطي٠المكتبة...</string>
+ <string id="335">ابدأ</string>
+ <string id="336">تحويل Ùراميرات</string>
+ <string id="337">مخرج الصوت</string>
+ <string id="338">النظير</string>
+ <string id="339">بصري/محوري</string>
+ <string id="340">Ùنانين مختلÙين</string>
+ <string id="341">تشغيل القرص</string>
+ <string id="342">Ø£Ùلام</string>
+ <string id="343">ضبط Ùراميرات</string>
+ <string id="344">الممثلين</string>
+ <string id="345">السنة</string>
+ <string id="346">دÙع مستوى الصوت على downmix</string>
+ <string id="350">برامج</string>
+ <string id="351">معطلة</string>
+ <string id="352">خاÙت</string>
+ <string id="353">أسود</string>
+ <string id="354">مسارات ماتركيس</string>
+ <string id="355">وقت شاشة التوقÙ</string>
+ <string id="356">وضع شاشة التوقÙ</string>
+ <string id="357">مؤقت عملية الإغلاق</string>
+ <string id="358">جميع الألبومات</string>
+ <string id="359">ألبومات مضاÙØ© مؤخرا</string>
+ <string id="360">شاشة التوقÙ</string>
+ <string id="361">R. عرض شرائح</string>
+ <string id="362">مستوى Ø®Ùت شاشة التوقÙ</string>
+ <string id="363">ترتيب حسب: ملÙ</string>
+ <string id="364">-Dolby Digital (AC3) قدرة استقبال</string>
+ <string id="365">ترتيب حسب : الإسم</string>
+ <string id="366">ترتيب حسب : السنة</string>
+ <string id="367">ترتيب حسب: التصنيÙ</string>
+ <string id="368">IMDb</string>
+ <string id="369">العنوان </string>
+ <string id="370">:عواص٠رعدية</string>
+ <string id="371">:جزئيا</string>
+ <string id="372">:غالبيا</string>
+ <string id="373">:مشمس</string>
+ <string id="374">:غائم</string>
+ <string id="375">:ثلج</string>
+ <string id="376">:ممطر</string>
+ <string id="377">:Ø®ÙÙŠÙØ©</string>
+ <string id="378">صباحا</string>
+ <string id="379">مساءاً</string>
+ <string id="380">:زخات مطر</string>
+ <string id="381">:قليل</string>
+ <string id="382">:غيوم</string>
+ <string id="383">:رياح</string>
+ <string id="384">:قوي</string>
+ <string id="385">:عادل</string>
+ <string id="386">:صاÙÙŠ</string>
+ <string id="387">:غائم</string>
+ <string id="388">مبكر</string>
+ <string id="389">:ممطر</string>
+ <string id="390">:موجات</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>
+ <string id="397">تحديث الوقت</string>
+ <string id="398">وحدات درجة الحرارة</string>
+ <string id="399">وحدات السرعة</string>
+ <string id="400">الطقس</string>
+ <string id="401">درجة الحرارة</string>
+ <string id="402">:Feels like</string>
+ <string id="403">:UV index</string>
+ <string id="404">:رياح</string>
+ <string id="405">:نقطة ندى</string>
+ <string id="406">:رطوبة</string>
+ <string id="409">الاÙتراضية</string>
+ <string id="410">خدمة الوصول الى الطقس</string>
+ <string id="411">الحصول على طقس:</string>
+ <string id="412">تعذر الحصول على بيانات الطقس</string>
+ <string id="413">يدوي</string>
+ <string id="414">لاتوجد استعراضات لهذا الألبوم</string>
+ <string id="415">...تحميل المصغرة</string>
+ <string id="416">غير متاح</string>
+ <string id="417">عرض: رموز كبيرة</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>
+ <string id="425">لا توجد معلومات الألبوم</string>
+ <string id="426">CD لا توجد معلومات</string>
+ <string id="427">القرص</string>
+ <string id="428">الصحيح CD/DVD إدراج</string>
+ <string id="429">:الرجاء إدراج القرص التالي</string>
+ <string id="430">DVD# :ترتيب بواسطة</string>
+ <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="440">القرص الصلب</string>
+ <string id="441">UDF</string>
+ <string id="442">الشبكة المحلية</string>
+ <string id="443">الإنترنت</string>
+ <string id="444">Ùيديو</string>
+ <string id="445">صوت</string>
+ <string id="446">DVD</string>
+ <string id="447">وسائط تشغيل تلقائية</string>
+ <string id="448">LCD</string>
+ <string id="449">ممكن</string>
+ <string id="450">أعمدة </string>
+ <string id="451">عنوان الص٠1</string>
+ <string id="452">عنوان الص٠2</string>
+ <string id="453">عنوان الص٠3</string>
+ <string id="454">عنوان الص٠4</string>
+ <string id="455">الصÙÙˆÙ</string>
+ <string id="456">الوضع</string>
+ <string id="457">تبديل االعرض</string>
+ <string id="459">الترجمات</string>
+ <string id="460">تدÙÙ‚ الصوت</string>
+ <string id="461">[نشط]</string>
+ <string id="462">الترجمة</string>
+ <string id="463">الاضاءة الخلÙية</string>
+ <string id="464">السطوع</string>
+ <string id="465">التباين</string>
+ <string id="466">غاما</string>
+ <string id="467">النوع</string>
+ <string id="468">تحريك الشريط لتغيير وضعية OSD</string>
+ <string id="469">وضعية OSD</string>
+ <string id="470">الاعتمادات</string>
+ <string id="471">Modchip</string>
+ <string id="474">معطلة</string>
+ <string id="475">موسيقى Ùقط</string>
+ <string id="476">الموسيقى والÙيديو</string>
+ <string id="477">غير قادر على تحميل قائمة التشغيل</string>
+ <string id="478">OSD</string>
+ <string id="479">الخلÙية واللغة</string>
+ <string id="480">المظهر</string>
+ <string id="481">خيارات الصوت</string>
+ <string id="482">XBMC حول</string>
+ <string id="485">حذ٠الألبوم </string>
+ <string id="486">إعادة</string>
+ <string id="487">إعادة مرة واحدة</string>
+ <string id="488">إعادة المجلد</string>
+ <string id="489">تشغيل الأغنية القادمة تلقائيا </string>
+ <string id="491">-- استخدام الرموز الكبيرة</string>
+ <string id="492">إعادة تحجيم VobSubs</string>
+ <string id="493">(!خيارات متقدمة - (للخبراء Ùقط</string>
+ <string id="494">Overall Audio Headroom (dB)</string>
+ <string id="495">إعادة تشكيل دقة عرض الÙيديو</string>
+ <string id="496">المعايرة</string>
+ <string id="497">عرض ملحقات الملÙ</string>
+ <string id="498">ترتيب حسب: النوع</string>
+ <string id="499">غير قادر على اتصال خدمة البحث على الانترنت</string>
+ <string id="500">Ùشل تحميل معلومات الألبوم </string>
+ <string id="501">يبحث عن أسم الألبوم...</string>
+ <string id="502">Ùتح</string>
+ <string id="503">مشغول</string>
+ <string id="504">خالي</string>
+ <string id="505">تحميل معلومات الوسائط من الملÙات...</string>
+ <string id="507">ترتيب حسب: الإستخدام</string>
+ <string id="510">تمكين التصور</string>
+ <string id="511">تمكين تغيير وضع الÙيديو</string>
+ <string id="512">ناÙذة بدء التشغيل</string>
+ <string id="513">الناÙذة الرئيسية</string>
+ <string id="514">الإعدادات اليدوية</string>
+ <string id="515">النوع</string>
+ <string id="517">ألبومات أجريت مؤخرا</string>
+ <string id="518">تشغيل</string>
+ <string id="519">تشغيل ÙÙŠ..</string>
+ <string id="521">التجميعات</string>
+ <string id="522">إزالة مصدر</string>
+ <string id="523">تغيير الوسائط</string>
+ <string id="524">اختر قائمة التشغيل</string>
+ <string id="525">قائمة تشغيل جديدة...</string>
+ <string id="526">أض٠الى قائمة التشغيل</string>
+ <string id="527">يدويا أض٠إلى المكتبة </string>
+ <string id="528">أدخل عنوان</string>
+ <string id="529">خطأ: عنوان مكرر</string>
+ <string id="530">اختر النوع</string>
+ <string id="531">نوع جديد</string>
+ <string id="532">إضاÙØ© يدويا</string>
+ <string id="533">أدخل النوع</string>
+ <string id="534">عرض: %s</string>
+ <string id="535">قائمة</string>
+ <string id="536">رموز</string>
+ <string id="537">قائمة كبير</string>
+ <string id="538">رموز كبيرة</string>
+ <string id="539">واسع</string>
+ <string id="540">واسع كبيرة </string>
+ <string id="541">رموز الألبوم</string>
+ <string id="542">DVD رموز</string>
+ <string id="543">DVD</string>
+ <string id="544">معلومات الوسائط</string>
+ <string id="545">جهاز إخراج الصوت</string>
+ <string id="546">جهاز عبور الصوت</string>
+ <string id="547">لا سيرة ذاتية لهذا الÙنان</string>
+ <string id="548">مزج صوت القنوات المتعددة الى ستيريو</string>
+ <string id="550">ترتيب حسب: %s</string>
+ <string id="551">الإسم</string>
+ <string id="552">التاريخ</string>
+ <string id="553">الحجم</string>
+ <string id="554">المسار</string>
+ <string id="555">الوقت</string>
+ <string id="556">العنوان</string>
+ <string id="557">الÙنان</string>
+ <string id="558">الألبوم</string>
+ <string id="559">قائمة التشغيل</string>
+ <string id="560">المعرÙ</string>
+ <string id="561">ملÙ</string>
+ <string id="562">السنة</string>
+ <string id="563">التقييم</string>
+ <string id="564">النوع</string>
+ <string id="565">الاستخدام</string>
+ <string id="566">البوم الÙنان</string>
+ <string id="567">عدد المرات التي أجريت</string>
+ <string id="568">أجريت مؤخراً</string>
+ <string id="569">تعليق</string>
+ <string id="570">تاريخ الإضاÙØ©</string>
+ <string id="571">الاÙتراضي</string>
+ <string id="572">ستوديو</string>
+ <string id="573">مسار</string>
+ <string id="574">البلد</string>
+ <string id="575">ÙÙŠ المعالجة</string>
+ <string id="576">مرات أجريت</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="587">تصÙية</string>
+ <string id="588">إلغاء وضع الطر٠</string>
+ <string id="589">وضع الطرÙ</string>
+ <string id="590">عشوائي</string>
+ <string id="591">معطلة</string>
+ <string id="592">واحدة</string>
+ <string id="593">الكل</string>
+ <string id="594">معطلة</string>
+ <string id="595">الإعادة: معطلة</string>
+ <string id="596">إعادة: واحدة</string>
+ <string id="597">إعادة: الكل</string>
+ <string id="600">نسخ اسطوانة صوت</string>
+ <string id="601">متوسطة</string>
+ <string id="602">قياسي</string>
+ <string id="603">أقصى</string>
+ <string id="604">ثبات معدل البت </string>
+ <string id="605">ينسخ...</string>
+ <string id="607">إلى:</string>
+ <string id="608">لايمكن نسخ القرص أو المسار</string>
+ <string id="609">CDDARipPath لم يتم تعري٠</string>
+ <string id="610">نسخ مسار الصوت</string>
+ <string id="611">إدخال رقم</string>
+ <string id="612">عينه/Ùئات</string>
+ <string id="613">عينة التردد</string>
+ <string id="620">قرص الصوت</string>
+ <string id="621">التشÙير</string>
+ <string id="622">الجودة</string>
+ <string id="623">معدل بت</string>
+ <string id="624">تضمين رقم المسار</string>
+ <string id="625">كل الأغاني من</string>
+ <string id="629">وضع العرض</string>
+ <string id="630">عادي</string>
+ <string id="631">تكبير</string>
+ <string id="632">4:3 امتداد</string>
+ <string id="633">14:09 امتداد</string>
+ <string id="634">امتداد 16:09</string>
+ <string id="635">الحجم الأصلي</string>
+ <string id="636">Ùريد</string>
+ <string id="637">إعادة العائدات</string>
+ <string id="638">إعادة العائدات للكمية المتناسبة</string>
+ <string id="639">استخدام مستويات المسار</string>
+ <string id="640">استخدام مستويات الألبوم</string>
+ <string id="641">مستوى ما قبل مكبر للصوت -- زيادة عائدات ملÙات اللحن</string>
+ <string id="642">مستوى ما قبل مكبر للصوت -- لا إعادة لملÙات العائدات</string>
+ <string id="643">منع سرعة زيادة عوائد ملÙات اللحن</string>
+ <string id="644">قص الأشرطة السوداء</string>
+ <string id="645">يحتاج إلى Ùتح مل٠كبير. مواصلة؟</string>
+ <string id="646">إزالة من المكتبة</string>
+ <string id="647">تصدير مكتبة الÙيديو...</string>
+ <string id="648">استيراد مكتبة الÙيديو...</string>
+ <string id="649">استيراد</string>
+ <string id="650">تصدير</string>
+ <string id="651">تصÙØ­ للمكتبة</string>
+ <string id="652">سنوات</string>
+ <string id="653">تحديث المكتبة</string>
+ <string id="654">تصحيح عرض معلومات</string>
+ <string id="655">تصÙØ­ لمل٠تنÙيذي</string>
+ <string id="656">تصÙØ­ لقائمة التشغيل</string>
+ <string id="657">تصÙØ­ للملÙات</string>
+ <string id="658">معلومات الأغنية</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">- الخادم</string>
+ <string id="708">استخدام وكيل HTTP للوصول الإنترنت</string>
+ <string id="711">Internet Protocol (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">يدوي (ثابت)</string>
+ <string id="719">عنوان IP</string>
+ <string id="720">قناع الشبكة</string>
+ <string id="721">البوابة الإÙتراضية</string>
+ <string id="722">خادم DNS</string>
+ <string id="723">Ø­Ùظ وإعادة</string>
+ <string id="724">عنوان خاطئ. يجب أن يكون ÙÙŠ AAA.BBB.CCC.DDD</string>
+ <string id="725">مع الأرقام من 0 إلى 255.</string>
+ <string id="726">لم يتم Ø­Ùظ التغييرات. مواصلة بدون Ø­Ùظ؟</string>
+ <string id="727">خادم ويب</string>
+ <string id="728">FTP خادم</string>
+ <string id="730">- المنÙØ°</string>
+ <string id="732">Ø­Ùظ وتطبيق</string>
+ <string id="733">- كلمة المرور</string>
+ <string id="734">لا مرور</string>
+ <string id="735">-وضع الأحرÙ</string>
+ <string id="736">- النمط</string>
+ <string id="737">- اللون</string>
+ <string id="738">عادي</string>
+ <string id="739">عريض</string>
+ <string id="740">مائلة</string>
+ <string id="741">عريض مائلة</string>
+ <string id="742">أبيض</string>
+ <string id="743">أصÙر</string>
+ <string id="744">ملÙات</string>
+ <string id="745">لاتوجد معلومات Ù…Ùحوصة لهذا العرض</string>
+ <string id="746">الرجاء إيقا٠وضع المكتبة</string>
+ <string id="747">خطأ ÙÙŠ تحميل الصورة</string>
+ <string id="748">تعديل مسار</string>
+ <string id="749">صورة مرآتية</string>
+ <string id="750">هل أنت متأكد؟</string>
+ <string id="751">إزالة مصدر</string>
+ <string id="754">إضاÙØ© رابط برنامج</string>
+ <string id="755">تحرير مسار برنامج</string>
+ <string id="756">تحرير اسم برنامج </string>
+ <string id="757">تحرير عمق مسار</string>
+ <string id="759">عرض: قائمة كبيرة</string>
+ <string id="760">أصÙر</string>
+ <string id="761">أبيض</string>
+ <string id="762">أزرق</string>
+ <string id="763">أخضر ساطع</string>
+ <string id="764">أصÙر أخضر</string>
+ <string id="765">أزرق</string>
+ <string id="766">رمادي Ùاتح</string>
+ <string id="767">رمادي</string>
+ <string id="770">خطأ %i: لاتوجد مشاركة</string>
+ <string id="772">مخرج الصوت</string>
+ <string id="773">يبحث</string>
+ <string id="774">مجلد عرض الشرائح</string>
+ <string id="775">واجهة شبكة الاتصال</string>
+ <string id="776">- اسم الشبكة اللاسلكية (ESSID)</string>
+ <string id="777">- كلمة مرور الشبكة اللاسلكية</string>
+ <string id="778">- حماية الشبكة اللاسلكية</string>
+ <string id="779">Ø­Ùظ إعدادات واجهة الشبكة</string>
+ <string id="780">لاتشÙير</string>
+ <string id="784">تطبيق إعدادات واجهة الشبكة. يرجى الانتظار.</string>
+ <string id="785">إعادة تشغيل واجهة الشبكة بنجاح</string>
+ <string id="786">لم يتم تشغيل واجهة الشبكة بنجاح</string>
+ <string id="787">الواجهة معطلة</string>
+ <string id="788">واجهة الشبكة معطلة بنجاح</string>
+ <string id="789">اسم الشبكة اللاسلكية (ESSID)</string>
+ <string id="791">سماح البرامج على هذا النظام للتحكم على XBMC</string>
+ <string id="792">المنÙØ°</string>
+ <string id="793">نطاق المنÙØ°</string>
+ <string id="794">سماح برامج على أنظمة أخرى للتحكم على XBMC</string>
+ <string id="797">الحد الأقصى لعدد من العملاء</string>
+ <string id="798">الوصول إلى الإنترنت</string>
+ <string id="850">رقم المنÙØ° المدخل غير صالح</string>
+ <string id="851">نطاق المنÙØ° الصالح هو 1-65535</string>
+ <string id="852">نطاق المنÙØ° السليم هو 1024-65535</string>
+ <string id="998">إضاÙØ© موسيقى...</string>
+ <string id="999">إضاÙØ© Ùيديو...</string>
+ <string id="1000">معاينة</string>
+ <string id="1001">غير قادر على الاتصال</string>
+ <string id="1002">XBMC Ùشل ÙÙŠ الاتصال إلى موقع الشبكة.</string>
+ <string id="1003">قد يكون هذا بسبب عدم توصيل الشبكة.</string>
+ <string id="1004">هل تريد إضاÙته على أي حال؟</string>
+ <string id="1006">IP عنوان</string>
+ <string id="1007">إضاÙØ© موقع شبكة</string>
+ <string id="1008">بروتوكول</string>
+ <string id="1009">عنوان الخدمة</string>
+ <string id="1010">اسم الخدمة</string>
+ <string id="1011">مسار بعيد</string>
+ <string id="1012">مجلد مشترك</string>
+ <string id="1013">المنÙØ°</string>
+ <string id="1014">اسم المستخدم</string>
+ <string id="1015">تصÙØ­ لخادم الشبكة</string>
+ <string id="1016">أدخل عنوان الشبكة من الخادم</string>
+ <string id="1017">أدخل المسار على الخادم</string>
+ <string id="1018">أدخل رقم المنÙØ°</string>
+ <string id="1019">أدخل اسم المستخدم</string>
+ <string id="1020">%s إضاÙØ© مصدر</string>
+ <string id="1021">أدخل المسار أو تصÙØ­ موقع الوسائط.</string>
+ <string id="1022">أدخل اسم لمصدر الوسائط.</string>
+ <string id="1023">تصÙØ­ لمشاركة جديد</string>
+ <string id="1024">تصÙØ­</string>
+ <string id="1025">لايتمكن من استرجاع معلومات الدليل</string>
+ <string id="1026">إضاÙØ© مصدر...</string>
+ <string id="1027">تحرير مصدر</string>
+ <string id="1028">%s تحرير مصدر</string>
+ <string id="1029">أدخل علامة جديد</string>
+ <string id="1030">تصÙØ­ للصور</string>
+ <string id="1031">تصÙØ­ لمجلد الصور</string>
+ <string id="1032">إضاÙØ© موقع شبكة...</string>
+ <string id="1033">تصÙØ­ لملÙ</string>
+ <string id="1034">قائمة ثانوية</string>
+ <string id="1035">تمكين أزرار القائمة الثانوية</string>
+ <string id="1036">المÙضلات</string>
+ <string id="1037">ملحقات الÙيديو</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="1043">ملحقات البرامج</string>
+ <string id="1044">تعيين صورة مصغرة للملحق</string>
+ <string id="1045">إعدادت الملحق</string>
+ <string id="1046">نقاط الوصول</string>
+ <string id="1047">أخرى...</string>
+ <string id="1048">- اسم المستخدم</string>
+ <string id="1049">إعدادت النصية</string>
+ <string id="1050">الأÙراد</string>
+ <string id="1051">أدخل عنوان ويب</string>
+ <string id="1200">SMB عميل</string>
+ <string id="1202">SMB Ùريق العمل</string>
+ <string id="1203">SMB اسم المستخدم</string>
+ <string id="1204">SMB كلمة السر</string>
+ <string id="1207">SMB WINS خادم</string>
+ <string id="1208">SMB مشاركة</string>
+ <string id="1210">إزالة</string>
+ <string id="1211">موسيقى</string>
+ <string id="1212">Ùيديو</string>
+ <string id="1213">صور</string>
+ <string id="1214">ملÙات</string>
+ <string id="1215">الموسيقى والÙيديو</string>
+ <string id="1216">الموسيقى والصور</string>
+ <string id="1217">الموسيقى والملÙات</string>
+ <string id="1218">Ùيديو وصور</string>
+ <string id="1219">ملÙات الÙيديو</string>
+ <string id="1220">الصور والملÙات</string>
+ <string id="1221">الموسيقى والÙيديو والصور</string>
+ <string id="1222">الموسيقى والÙيديو والصور والملÙات</string>
+ <string id="1223">معطلة</string>
+ <string id="1226">الملÙات والموسيقى والÙيديو</string>
+ <string id="1227">الملÙات والصور والموسيقى</string>
+ <string id="1228">الملÙات والصور والÙيديو</string>
+ <string id="1229">الموسيقى والبرامج</string>
+ <string id="1230">الÙيديو والبرامج</string>
+ <string id="1231">الصور والبرامج</string>
+ <string id="1232">الموسيقى والÙيديو والصور والبرامج</string>
+ <string id="1233">البرامج والÙيديو والموسيقى</string>
+ <string id="1234">البرامج والصور والموسيقى</string>
+ <string id="1235">البرامج والصور والÙيديو</string>
+ <string id="1250">تحديد الهوية تلقائي</string>
+ <string id="1251">الكش٠التلقائي عن نظام</string>
+ <string id="1252">كنية</string>
+ <string id="1254">طلب للاتصال</string>
+ <string id="1255">FTP إرسال اسم المستخدم وكلمة السر الخاصة للـ</string>
+ <string id="1256">Ping تأخير</string>
+ <string id="1257">هل ترغب ÙÙŠ الاتصال إلى نظام الكش٠التلقائي؟</string>
+ <string id="1260">أعلن هذه الخدمات لأنظمة أخرى عبر Zeroconf</string>
+ <string id="1271">اسم الجهاز</string>
+ <string id="1272">-- استخدام حماية كلمة المرور</string>
+ <string id="1300">جهاز صوت مخصص</string>
+ <string id="1301">جهاز عبور مخصص</string>
+ <string id="1396">ينجرÙ</string>
+ <string id="1397">Ùˆ</string>
+ <string id="1398">يتجمد</string>
+ <string id="1399">متأخر</string>
+ <string id="1400">معزولة</string>
+ <string id="1401">رعد ومطر</string>
+ <string id="1402">رعد</string>
+ <string id="1403">شمس</string>
+ <string id="1404">كثيÙØ©</string>
+ <string id="1405">ÙÙŠ</string>
+ <string id="1406">ÙÙŠ</string>
+ <string id="1407">كثب</string>
+ <string id="1408">جليد</string>
+ <string id="1409">بلورات</string>
+ <string id="1410">هدوء</string>
+ <string id="1411">مع</string>
+ <string id="1412">عاصÙØ©</string>
+ <string id="1413">رذاذ</string>
+ <string id="1414">عواص٠رعدية</string>
+ <string id="1415">رذاذ</string>
+ <string id="1416">ضباب</string>
+ <string id="1421">عالية جدا</string>
+ <string id="1422">عاصÙØ©</string>
+ <string id="1423">ضباب</string>
+ <string id="1450">مراقبة دخول ÙÙŠ وضع السكون عند الخمول</string>
+ <string id="2050">وقت التشغيل:</string>
+ <string id="2100">Ùشل النصية! %s</string>
+ <string id="2101">بحاجة إلى نسخة جديدة - انظر السجل</string>
+ <string id="4501">تشغيل LCD / VFD</string>
+ <string id="10000">الرئيسية</string>
+ <string id="10001">برامج</string>
+ <string id="10002">صور</string>
+ <string id="10003">إدارة الملÙات</string>
+ <string id="10004">الإعدادات</string>
+ <string id="10005">موسيقى</string>
+ <string id="10006">Ùيديو</string>
+ <string id="10007">معلومات النظام</string>
+ <string id="10008">العامة - الإعدادات</string>
+ <string id="10009">الشاشة - إعدادات</string>
+ <string id="10010">معايرة واجهة المستخدم الرسومية - المظهر - إعدادات </string>
+ <string id="10011">معايرة الشاشة - الÙيديو - إعدادات </string>
+ <string id="10012">الصور - إعدادات</string>
+ <string id="10013">البرامج - إعدادات</string>
+ <string id="10014">الطقس - إعدادات</string>
+ <string id="10015">الموسيقى - إعدادات</string>
+ <string id="10016">النظام - إعدادات</string>
+ <string id="10017">الÙيديو - إعدادات</string>
+ <string id="10018">الشبكة - إعدادات</string>
+ <string id="10019">المظهر - إعدادات</string>
+ <string id="10020">النصية</string>
+ <string id="10021">متصÙØ­ ويب</string>
+ <string id="10028">Ùيديو / قائمة التشغيل</string>
+ <string id="10034">إعدادات مل٠المستخدم -</string>
+ <string id="10100">حوار نعم/لا</string>
+ <string id="10101">تقدم الحوار</string>
+ <string id="10210">يبحث عن الترجمات...</string>
+ <string id="10211">يبحث عن أو تخزين مؤقت للترجمة...</string>
+ <string id="10212">يلغي</string>
+ <string id="10213">تخزين المعلومات</string>
+ <string id="10214">ÙŠÙتح البث </string>
+ <string id="10500">موسيقى / قائمة التشغيل</string>
+ <string id="10501">الموسيقى / ملÙات</string>
+ <string id="10502">الموسيقى / الدليل</string>
+ <string id="10503">محرر قائمة التشغيل</string>
+ <string id="10504">Ø£Ùضل 100 أغنية</string>
+ <string id="10505">Ø£Ùضل 100 البوم</string>
+ <string id="10506">برامج</string>
+ <string id="10507">إعدادات</string>
+ <string id="10508">حالة الطقس</string>
+ <string id="10509">ألعاب الشبكة</string>
+ <string id="10510">ملحقات</string>
+ <string id="10511">معلومات النظام</string>
+ <string id="10516">موسيقى -- مكتبة</string>
+ <string id="10517">التشغيل الآن -- موسيقى</string>
+ <string id="10522">التشغيل الآن -- Ùيديو</string>
+ <string id="10523">معلومات الألبوم </string>
+ <string id="10524">معلومات الÙيلم</string>
+ <string id="12000">تحديد الحوار</string>
+ <string id="12001">الموسيقى/معلومات</string>
+ <string id="12002">حوار مواÙÙ‚</string>
+ <string id="12003">الÙيديو/معلومات</string>
+ <string id="12004">النصية / معلومات</string>
+ <string id="12005"> وضع الÙيديو ÙÙŠ ملء الشاشة</string>
+ <string id="12006">تصور الصوت</string>
+ <string id="12008">كومة من الملÙات</string>
+ <string id="12009">إعادة مؤشر...</string>
+ <string id="12010">عودة إلى الموسيقى</string>
+ <string id="12011">عودة إلى الÙيديو</string>
+ <string id="12021">ابدأ من البداية</string>
+ <string id="12022">استئنا٠من %s</string>
+ <string id="12310">0</string>
+ <string id="12311">1</string>
+ <string id="12312">2</string>
+ <string id="12313">3</string>
+ <string id="12314">4</string>
+ <string id="12315">5</string>
+ <string id="12316">6</string>
+ <string id="12317">7</string>
+ <string id="12318">8</string>
+ <string id="12319">9</string>
+ <string id="12320">c</string>
+ <string id="12321">مواÙÙ‚</string>
+ <string id="12322">*</string>
+ <string id="12325">مقÙÙ„! أدخل كلمة الكود...</string>
+ <string id="12326">أدخل كلمة المرور</string>
+ <string id="12327">أدخل الكود الرئيسي</string>
+ <string id="12328">أدخل رمز القÙÙ„</string>
+ <string id="12329">أو اضغط C للإلغاء</string>
+ <string id="12330">أدخل أزرار السرد وانقر</string>
+ <string id="12331">اضغط مواÙÙ‚, أو الخل٠للإلغاء</string>
+ <string id="12332">ضع Ù‚ÙÙ„</string>
+ <string id="12333">القÙÙ„</string>
+ <string id="12334">إعادة تعيين القÙÙ„</string>
+ <string id="12335">إزالة القÙÙ„</string>
+ <string id="12337">كلمة سر رقمية</string>
+ <string id="12338">تحكم تركيبة الزر</string>
+ <string id="12339">كلمة السر كاملة نصيا</string>
+ <string id="12340">إدخال كلمة السر الجديدة</string>
+ <string id="12341">إدخال كلمة المرور مرة أخرى</string>
+ <string id="12342">كلمة مرور خاطئة ،</string>
+ <string id="12343">غادر المحاولة</string>
+ <string id="12344">كلمة المرور غير متطابقة.</string>
+ <string id="12345">الدخول محظور</string>
+ <string id="12346">Ùشل العديد من محاولات تسجيل الدخول.</string>
+ <string id="12347">النظام سو٠يغلق الان.</string>
+ <string id="12348">العنصر مقÙÙ„</string>
+ <string id="12353">تنشيط Ù‚ÙÙ„</string>
+ <string id="12356">تغيير Ù‚ÙÙ„</string>
+ <string id="12357">Ù‚ÙÙ„ مصدر</string>
+ <string id="12358">حقل كلمة المرور Ùارغة. الرجاء المحاولة مرة أخرى.</string>
+ <string id="12360">الإغلاق الرئيسي</string>
+ <string id="12362">إيقا٠تشغيل النظام إذا تجاوز القÙÙ„ الرئيسي المحاولات</string>
+ <string id="12367">الرمز الرئيسي غير متطابق</string>
+ <string id="12368">الرجاء إدخال رمز رئيسي صحيح</string>
+ <string id="12373">إعدادت إدارة الملÙ</string>
+ <string id="12376">تعيين اÙتراضيا على جميع الأÙلام</string>
+ <string id="12377">هذا سو٠تعيين أية قيم تم Ø­Ùظها سابقا</string>
+ <string id="12378">مقدار الوقت لعرض كل صورة</string>
+ <string id="12379">استخدام بان وتأثيرات التكبير</string>
+ <string id="12383">12 ساعة</string>
+ <string id="12384">24 ساعة على مدار الساعة</string>
+ <string id="12385">اليوم / الشهر</string>
+ <string id="12386">شهر / يوم</string>
+ <string id="12390">وقت النظام النشط</string>
+ <string id="12391">دقائق</string>
+ <string id="12392">ساعات</string>
+ <string id="12393">أيام</string>
+ <string id="12394">النشاط الكلي</string>
+ <string id="12395">مستوى البطارية</string>
+ <string id="12600">الطقس </string>
+ <string id="12900">شاشة</string>
+ <string id="12901">شاشة كاملة OSD</string>
+ <string id="13000">النظام</string>
+ <string id="13001">Hardisk مزج على الÙور</string>
+ <string id="13002">Ùيديو Ùقط</string>
+ <string id="13003">- تأخير </string>
+ <string id="13004">- مدة الحد الأدنى للملÙ</string>
+ <string id="13005">إغلاق</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">تصÙية Flicker</string>
+ <string id="13101">اسمح للسواقه الاختيار (يتطلب إعادة تشغيل )</string>
+ <string id="13106">تزامن رأسي Ùارغ</string>
+ <string id="13107">ممكن خلال تشغيل الÙيديو</string>
+ <string id="13108">ممكن دائما</string>
+ <string id="13109">اختبار وتطبيق الدقة</string>
+ <string id="13110">Ø­Ùظ الدقة؟</string>
+ <string id="13111">هل ترغب ÙÙŠ الحÙاظ على هذه الدقة؟</string>
+ <string id="13113">معطلة</string>
+ <string id="13114">SD ممكن لمحتوى</string>
+ <string id="13115">دائما ممكن</string>
+ <string id="13116">طريقة التوسيع</string>
+ <string id="13130">Ø£Ùرغ العروض الاخرى</string>
+ <string id="13131">معطلة </string>
+ <string id="13140">الكش٠عن اتصالات نشطة!</string>
+ <string id="13141">إذا استمر ØŒ قد تكون غير قادر على التحكم ÙÙŠ XBMC المزيد</string>
+ <string id="13142">ØŸEventServer هل أنت متأكد تريد إيقاÙ</string>
+ <string id="13144">تغير نمط أبل البعيد؟</string>
+ <string id="13159">قناع الشبكة</string>
+ <string id="13160">DNS</string>
+ <string id="13161">Primary DNS</string>
+ <string id="13162">Ùشلت التهيئة</string>
+ <string id="13170">أبداً</string>
+ <string id="13171">Ùوراٌ</string>
+ <string id="13172">بعد %i ثواني</string>
+ <string id="13173">تاريخ تثبيت القرص القلب:</string>
+ <string id="13200">الملÙات الشخصية</string>
+ <string id="13201">حذ٠مل٠شخصي '%s'?</string>
+ <string id="13204">آخر مل٠شخصي تم تحميله:</string>
+ <string id="13205">غير معروÙ</string>
+ <string id="13206">الكتابة Ùوق</string>
+ <string id="13208">المنبه</string>
+ <string id="13209">Ùاصل المنبه الزمني (بالدقائق)</string>
+ <string id="13210">بدأ, المنبه ÙÙŠ %im</string>
+ <string id="13211">المنبه!</string>
+ <string id="13212">ألغي مع %im&is متبقيه</string>
+ <string id="13213">%2.0fm</string>
+ <string id="13214">%2.0fs</string>
+ <string id="13249">بحث الترجمات ÙÙŠ RARs</string>
+ <string id="13250">تصÙØ­ الترجمات...</string>
+ <string id="13251">تحريك عنصر</string>
+ <string id="13252">تحريك عنصر هنا</string>
+ <string id="13253">التراجع عن نقل</string>
+ <string id="13270">الأجهزة:</string>
+ <string id="13271">سرعة وحدة المعالجة المركزية:</string>
+ <string id="13274">متصلة بالشبكة بدون إعدادات DNS</string>
+ <string id="13275">القرص الثابت</string>
+ <string id="13276">DVD - ROM</string>
+ <string id="13277">التخزين</string>
+ <string id="13278">الاÙتراضية</string>
+ <string id="13279">الشبكة</string>
+ <string id="13280">الÙيديو</string>
+ <string id="13281">الأجهزة</string>
+ <string id="13283">نظام التشغيل: </string>
+ <string id="13284">:سرعة وحدة المعالجة المركزية</string>
+ <string id="13286">:ترميز الÙيديو</string>
+ <string id="13287"> دقة الشاشة:</string>
+ <string id="13292">A/V كيبل</string>
+ <string id="13294">DVD منطقة:</string>
+ <string id="13295">الانترنت:</string>
+ <string id="13296">متصل </string>
+ <string id="13297">غير متصل. تحقق من إعدادات الشبكة. </string>
+ <string id="13299">درجة الحرارة المستهدÙØ©</string>
+ <string id="13300">:سرعة المروحة</string>
+ <string id="13301">التحكم ÙÙŠ درجة الحرارة تلقائيا</string>
+ <string id="13302">السيطرة على سرعة المروحة</string>
+ <string id="13303">الخطوط</string>
+ <string id="13304">مكن جعل الأحرÙ</string>
+ <string id="13305">RSS إظهار أخبار</string>
+ <string id="13306">عرض عناصر المجلد الأصلي</string>
+ <string id="13307">إخÙاء أرقام المسار </string>
+ <string id="13308">هل تريد إعادة تشغيل النظام الخاص بك</string>
+ <string id="13309">بدلا من مجرد XBMC?</string>
+ <string id="13310">تأثير التكبير</string>
+ <string id="13311">الأثر المتوقع</string>
+ <string id="13312">تخÙيض الخطوط سوداء</string>
+ <string id="13313">إعادة تشغيل</string>
+ <string id="13314">التداخل ÙÙŠ الانتقال بين الأغاني</string>
+ <string id="13315">تجديد المصغرات</string>
+ <string id="13316">تكرير المصغرات</string>
+ <string id="13317">مشاهدة صور العرض</string>
+ <string id="13318">تكرير المصغرات</string>
+ <string id="13319">عشوائي</string>
+ <string id="13320">ستيريو</string>
+ <string id="13321">اليسار Ùقط</string>
+ <string id="13322">اليمين Ùقط</string>
+ <string id="13323">تمكين دعم الكاريوكي</string>
+ <string id="13324">Ø´ÙاÙية الخلÙية</string>
+ <string id="13325">Ø´ÙاÙية المقدمة</string>
+ <string id="13326">تأخير A/V</string>
+ <string id="13327">كاريوكي</string>
+ <string id="13328">%s لم يتم العثور على.</string>
+ <string id="13329">خطأ ÙÙŠ Ùتح %s</string>
+ <string id="13330"> غير قادر على تحميل %s</string>
+ <string id="13331">خطأ : الذاكرة ممتلئة</string>
+ <string id="13332">تحريك لأعلى</string>
+ <string id="13333">تحريك لأسÙÙ„</string>
+ <string id="13334">تحرير العلامة</string>
+ <string id="13335">تعيين كاÙتراضي</string>
+ <string id="13336">إزالة زر</string>
+ <string id="13340">دون تغيير</string>
+ <string id="13341">الخضراء</string>
+ <string id="13342">البرتقالي</string>
+ <string id="13343">الحمراء</string>
+ <string id="13344">متغير</string>
+ <string id="13345">تبديل ضوء الصمام على القراءة</string>
+ <string id="13346">معلومات الÙيلم</string>
+ <string id="13347">انتظار عنصر</string>
+ <string id="13348">تصÙØ­ نوع الÙيلم...</string>
+ <string id="13349">تÙحص محتوى جديد</string>
+ <string id="13350">يعرض الان...</string>
+ <string id="13351">معلومات الألبوم</string>
+ <string id="13352">Ùحص العناصر الى المكتبة</string>
+ <string id="13353">إيقا٠التÙحص</string>
+ <string id="13354">طريقة التقديم</string>
+ <string id="13355">مضلل بكسل ذات جودة منخÙضه </string>
+ <string id="13356">تراكيب الأجهزة</string>
+ <string id="13357">مضلل بكسل ذات جودة عالية</string>
+ <string id="13358">تشغيل عنصر</string>
+ <string id="13359">تعيين مصغرات للÙنان</string>
+ <string id="13360">إنشاء مصغرات الصور تلقائياً</string>
+ <string id="13361">تمكين صوت</string>
+ <string id="13375">تمكين جهاز</string>
+ <string id="13376">مقدار الصوت</string>
+ <string id="13377">وضع العرض الاÙتراضي</string>
+ <string id="13378">السطوع الاÙتراضي</string>
+ <string id="13379">التباين الاÙتراضي</string>
+ <string id="13380">غاما الاÙتراضي</string>
+ <string id="13381">استئنا٠الÙيديو</string>
+ <string id="13382">قناع الصوت - منÙØ° 1</string>
+ <string id="13383">قناع الصوت - منÙØ° 2</string>
+ <string id="13384">قناع الصوت - منÙØ° 3</string>
+ <string id="13385">قناع الصوت - منÙØ° 4</string>
+ <string id="13386">استخدام الوقت على أساس البحث</string>
+ <string id="13387">تنسيق أسماء المسار - يمين</string>
+ <string id="13388">مسبق</string>
+ <string id="13389">لا توجد قيم مسبقة متاحة لهذا التصور</string>
+ <string id="13390">لا توجد إعدادات متاحة لهذا التصور</string>
+ <string id="13391">إخراج/تحميل</string>
+ <string id="13392">استخدام التصور ÙÙŠ حالة تشغيل الصوت</string>
+ <string id="13393">حساب الحجم</string>
+ <string id="13394">حساب حجم المجلد</string>
+ <string id="13395">إعدادات الÙيديو</string>
+ <string id="13396">إعدادات الصوت والترجمة</string>
+ <string id="13397">تمكين الترجمات</string>
+ <string id="13398">الاختصارات</string>
+ <string id="13399">تجاهل المقالات عند الÙرز ("The")</string>
+ <string id="13400"> التداخل بين الأغاني ÙÙŠ الألبوم Ù†Ùسه</string>
+ <string id="13401">%s تصÙØ­ لـ</string>
+ <string id="13402">إظهار موضع المسار</string>
+ <string id="13403">إزالة الاÙتراضيات</string>
+ <string id="13404">استئناÙ</string>
+ <string id="13405">احصل عل مصغرة</string>
+ <string id="13406">معلومات الصورة</string>
+ <string id="13408">(IMDB تصني٠المستخدم)</string>
+ <string id="13409">Ø£Ùضل 250</string>
+ <string id="13410">السماع إلى LAST.FM</string>
+ <string id="13411">سرعة المروحة الدنيا</string>
+ <string id="13412">شغل من هنا</string>
+ <string id="13413">تحميل</string>
+ <string id="13414">يشمل مجموعات الÙنانين Ùقط</string>
+ <string id="13415">طريقة التقديم</string>
+ <string id="13416">كش٠تلقائيا</string>
+ <string id="13419">برنامج</string>
+ <string id="13420">إزالة بأمان</string>
+ <string id="13422">ابدأ عرض شرائح من هنا</string>
+ <string id="13423">تذكر هذا المسار</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="13432">تمكين تسارع (VideoToolbox)</string>
+ <string id="13500">تزامن أسلوب تشغيل الشاشة</string>
+ <string id="13501">ساعة الصوت</string>
+ <string id="13506">منخÙض (سريع)</string>
+ <string id="13507">متوسط</string>
+ <string id="13508">مرتÙع</string>
+ <string id="13509">مرتÙع جداً (slow!)</string>
+ <string id="13510"> مزامنة التشغيل إلى الشاشة </string>
+ <string id="13550">وق٠عند تغيير معدل التحديث</string>
+ <string id="13551">معطلة</string>
+ <string id="13552">%.if ثانية</string>
+ <string id="13553">%.if ثواني</string>
+ <string id="13600">Apple ريموت</string>
+ <string id="13602">تمكين تشغيل XBMC بواسطة الريموت</string>
+ <string id="13610">معطلة</string>
+ <string id="13611">قياسي</string>
+ <string id="13612">ريموت شامل</string>
+ <string id="13613">ريموت متعدد (متواÙÙ‚)</string>
+ <string id="13620">خطأ ريموت أبل</string>
+ <string id="14000">مكدس</string>
+ <string id="14001">غير مكدس</string>
+ <string id="14003">تحميل مل٠قائمة التشغيل...</string>
+ <string id="14004">تحميل قائمة البث...</string>
+ <string id="14005">تحليل قائمة البث...</string>
+ <string id="14006">Ùشل تحميل قائمة البث</string>
+ <string id="14007">Ùشل تحميل مل٠قائمة التشغيل</string>
+ <string id="14009">دليل الألعاب</string>
+ <string id="14010">تنقل آلي للمصغرات استنادا على</string>
+ <string id="14011">تمكين التنقل الى عرض المصغرات تلقائيا </string>
+ <string id="14012">- استخدام رموز كبيرة</string>
+ <string id="14013">- تغيير استنادا على</string>
+ <string id="14014">- ÙÙŠ المئة</string>
+ <string id="14015">لا توجد ملÙات وعلى الأقل صورة مصغرة واحدة</string>
+ <string id="14016">​​على الأقل مل٠واحد وصورة مصغرة</string>
+ <string id="14017">نسبة المصغرات</string>
+ <string id="14018">عرض الخيارات</string>
+ <string id="14019">تغيير منطقة الرمز 1</string>
+ <string id="14020">تغيير منطقة الرمز 2</string>
+ <string id="14021">تتغيير منطقة الرمز 3</string>
+ <string id="14022">المكتبة</string>
+ <string id="14023">لا يوجد تلÙزيون</string>
+ <string id="14024">أدخل أقرب مدينة كبيرة </string>
+ <string id="14025">التخزين المؤقت للÙيديو/الصوت/دي ÙÙŠ دي - القرص الصلب</string>
+ <string id="14026">التخزين المؤقت للÙيديو - DVD-ROM</string>
+ <string id="14027">- الشبكة المحلية</string>
+ <string id="14028">- الإنترنت</string>
+ <string id="14030">التخزين المؤقت للصوت - DVD-ROM </string>
+ <string id="14031">- الشبكة المحلية</string>
+ <string id="14032">- الإنترنت</string>
+ <string id="14034">DVD التخزين المؤقت لـ - DVD-ROM</string>
+ <string id="14035">- الشبكة المحلية</string>
+ <string id="14036">الخدمات</string>
+ <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>
+ <string id="14046">%i ms</string>
+ <string id="14047">%i %%</string>
+ <string id="14048">%i kbps</string>
+ <string id="14049">%i kb</string>
+ <string id="14050">%i.0 dB</string>
+ <string id="14051">تهيئة الوقت</string>
+ <string id="14052">تهيئة التاريخ</string>
+ <string id="14053">Ùلاتر واجهة المستخدم الرسومية</string>
+ <string id="14055">استخدام Ùحص الخلÙية</string>
+ <string id="14056">إيقا٠الÙحص</string>
+ <string id="14057">غير ممكن أثناء الÙحص على معلومات الوسائط</string>
+ <string id="14058">تأثير طبعة الÙلم</string>
+ <string id="14059">البحث عن المصغرات ÙÙŠ المشاركات البعيدة</string>
+ <string id="14060">التخزين المؤقت لأنواع غير معروÙØ© - الانترنت</string>
+ <string id="14061">التلقائية</string>
+ <string id="14062">أدخل اسم المستخدم لـ</string>
+ <string id="14063">التاريخ والوقت</string>
+ <string id="14064">تعيين التاريخ</string>
+ <string id="14065">تعيين الوقت</string>
+ <string id="14066">HH : MM تنسيق دخول الوقت 24 ساعة</string>
+ <string id="14067">DD / MM / YYYY تنسيق دخول التاريخ</string>
+ <string id="14068">IP أدخل عنوان</string>
+ <string id="14069">تغيير الإعدادات الآن؟</string>
+ <string id="14070">إجراء التغييرات الآن</string>
+ <string id="14071">سماح تسمية وحذ٠الملÙ</string>
+ <string id="14074">تعيين التوقيت</string>
+ <string id="14075">استخدام التوقيت الصيÙÙŠ</string>
+ <string id="14076">أض٠إلى المÙضلة</string>
+ <string id="14077">إزالة من المÙضلة</string>
+ <string id="14078">الألوان</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">تشغيل القرص الصوتي تلقائياً</string>
+ <string id="14086">توليÙ</string>
+ <string id="14088">تشغيل الدي ÙÙŠ دي تلقائياً</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>
+ <string id="15052">كلمة المرور</string>
+ <string id="15100">المكتبة</string>
+ <string id="15101">قاعدة البيانات</string>
+ <string id="15102">* جميع الألبومات</string>
+ <string id="15103">* جميع الÙنانين</string>
+ <string id="15104">* جميع الأغاني</string>
+ <string id="15105">* جميع الأنواع</string>
+ <string id="15107">تخزين ...</string>
+ <string id="15108">أصوات التنقل</string>
+ <string id="15109">الخلÙية الاÙتراضي</string>
+ <string id="15111">السمات</string>
+ <string id="15112">السمة الاÙتراضية</string>
+ <string id="15200">Last.fm</string>
+ <string id="15201">Last.fm إرسال الأغاني إلى</string>
+ <string id="15202">Last.fm اسم مستخدم</string>
+ <string id="15203">Last.fm كلمة مرور</string>
+ <string id="15204">يستعد :غير قادر للتبادل...</string>
+ <string id="15205">XBMC يرجى تحديث</string>
+ <string id="15206">ترخيص سيئ: تحقق من اسم المستخدم وكلمة السر</string>
+ <string id="15207">متصل</string>
+ <string id="15208">غير متصل</string>
+ <string id="15209">%i إرسال التأخير</string>
+ <string id="15210">الأغاني %i المخزنة مؤقتا</string>
+ <string id="15211">إرسال...</string>
+ <string id="15212">ثواني %i إرسال ÙÙŠ</string>
+ <string id="15213">التشغيل باستخدام...</string>
+ <string id="15214">ممهدة A/V استخدام مزامنة</string>
+ <string id="15215">إخÙاء أسماء المل٠ÙÙŠ عرض المصغرات</string>
+ <string id="15216">تشغيل ÙÙŠ وضع الطرÙ</string>
+ <string id="15217">Libre.fm إرسال الأغاني إلى</string>
+ <string id="15218">Libre.fm اسم مستخدم</string>
+ <string id="15219">Libre.fm كلمة مرور</string>
+ <string id="15221">إرسال الأغاني...</string>
+ <string id="15250">...Last.fm إلى إذاعة Last.fm إرسال</string>
+ <string id="15251">Last.fm يتصل...</string>
+ <string id="15252">اختيار المحطة...</string>
+ <string id="15253">البحث عن Ùنانين مماثلين...</string>
+ <string id="15254">البحث عن شعارات مماثلة...</string>
+ <string id="15255">(%name%) ملÙÙƒ الشخصي</string>
+ <string id="15256">المراكز الأولى</string>
+ <string id="15257">%name% علامة Ø£Ùضل المغنين</string>
+ <string id="15258">%name% علامة Ø£Ùضل الألبومات</string>
+ <string id="15259">%name% علامة Ø£Ùضل المسارات</string>
+ <string id="15260">Last.fm ÙÙŠ اذاعة %name% استمع الى علامة</string>
+ <string id="15261">%name% Ùنانين ممثالين مثل</string>
+ <string id="15262">البومات %name% Ø£Ùضل</string>
+ <string id="15263">مسارات %name% Ø£Ùضل</string>
+ <string id="15264">شعارات %name% Ø£Ùضل</string>
+ <string id="15265">%name% أكبر المعجبين من</string>
+ <string id="15266">Last.fm المعجبين ÙÙŠ اذاعة %name% استمع الى</string>
+ <string id="15267">Last.fm Ùنانين مماثلين ÙÙŠ اذاعة %name% استمع الى</string>
+ <string id="15268">%name% Ø£Ùضل الÙنانين للمستخدم</string>
+ <string id="15269">%name% Ø£Ùضل الألبومات</string>
+ <string id="15270">%name% Ø£Ùضل المسارات للمستخدم</string>
+ <string id="15271">%name% أصدقاء للمستخدم</string>
+ <string id="15272">%name% جيران للمستخدم</string>
+ <string id="15273">%name% خريطة الÙنان الاسبوعية</string>
+ <string id="15274">%name% خريطة الألبوم الاسبوعية</string>
+ <string id="15275">%name% خريطة المسار الاسبوعية</string>
+ <string id="15276">Last.fm الجيران ÙÙŠ اذاعة %name%'s استمع الى</string>
+ <string id="15277">Last.fm الشخصية ÙÙŠ اذاعة %name%'s استمع الى</string>
+ <string id="15278">Last.fm ميكس ÙÙŠ اذاعة %name%'s استمع الى</string>
+ <string id="15279">Last.fm حصول القائمة من...</string>
+ <string id="15280">Last.fm لا يمكن حصول القائمة من...</string>
+ <string id="15281">إدخال اسم Ùنان للعثورعلى اÙنانين مماثلين</string>
+ <string id="15282">إدخال علامة للعثور على أغاني مشابهة</string>
+ <string id="15283">%name% اخر المسارات استمعت بواسطة</string>
+ <string id="15284">Last.fm التوصيات ÙÙŠ اذاعة %name%'s استمع الى</string>
+ <string id="15287">هل تريد إضاÙØ© القائمة الحالية للمسارات المÙضلة؟</string>
+ <string id="15288">هل تريد مقاطعة الأغنية الحالية؟</string>
+ <string id="15289">.'%s' أضيÙت الى الأغاني المÙضلة</string>
+ <string id="15290">.لمساراتك المÙضلة '%s' لا يمكن إضاÙØ©</string>
+ <string id="15291">'%s' :حظر</string>
+ <string id="15292">.'%s' لا يمكن حظر</string>
+ <string id="15293">%name% اخر المسارات Ù…Ùضلة بواسطة</string>
+ <string id="15294">%name% اخر المسارات حظرت بواسطة</string>
+ <string id="15295">ازالة مة المسارات المÙضلة</string>
+ <string id="15296">الغاء الحظر</string>
+ <string id="15297">هل تريد إزالة المسار من الأغاني المÙضلة لديك؟</string>
+ <string id="15298">هل تريد إلغاء حظر الأغنية؟</string>
+ <string id="15300">لم يتم العثور على المسار أو غير صالح</string>
+ <string id="15301">لم يتم العثور على خادم</string>
+ <string id="15302">لم يتم العثور على الملقم</string>
+ <string id="15303">لم يتم العثورعلى مجموعة العمل </string>
+ <string id="15310">جاري Ùتح مصدر متعدد المسارات</string>
+ <string id="15311">:المسار</string>
+ <string id="16000">عام</string>
+ <string id="16002">بحث الويب</string>
+ <string id="16003">المشغل</string>
+ <string id="16004">تشغيل الوسائط من القرص</string>
+ <string id="16008">إدخال عنوان جديد</string>
+ <string id="16009">أدخل اسم الÙلم</string>
+ <string id="16010">أدخل لسم ملÙÙƒ الشخصي</string>
+ <string id="16011">أدخل اسم الألبوم</string>
+ <string id="16012">أدخل اسم قائمة التشغيل</string>
+ <string id="16013">أدخل اسم المل٠الجديد</string>
+ <string id="16014">أدخل اسم المجلد</string>
+ <string id="16015">أدخل الدليل</string>
+ <string id="16016">%A, %T, %N, %B, %D, %G, %Y, %F, %S الخيارات المتاحة:</string>
+ <string id="16017">أدخل نص البحث</string>
+ <string id="16018">بلا</string>
+ <string id="16019">اختيار تلقائي</string>
+ <string id="16020">تشابك</string>
+ <string id="16021">بوب</string>
+ <string id="16022">بوب مزدوج</string>
+ <string id="16023"></string>
+ <string id="16024">يلغي...</string>
+ <string id="16025">أدخل اسم الÙنان</string>
+ <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>
+ <string id="16033">.لم يتمكن من Ùتح قاعدة بيانات</string>
+ <string id="16034">لم يتمكن الحصول على الأغاني من قاعدة البيانات</string>
+ <string id="16035">قائمة تشغيل وضع الطر٠</string>
+ <string id="16039">معطلة</string>
+ <string id="16040">التلقائية</string>
+ <string id="16041">النشطة</string>
+ <string id="16100">كل الÙيديو</string>
+ <string id="16101">غير مشاهدة</string>
+ <string id="16102">شوهدت</string>
+ <string id="16103">أشر إليها على أنها شوهدت</string>
+ <string id="16104">أشر إليها على أنها لم تشاهد</string>
+ <string id="16105">تحرير عنوان</string>
+ <string id="16200">تم إحباط التشغيل</string>
+ <string id="16201">Ùشل النسخ</string>
+ <string id="16202">Ùشل ÙÙŠ نسخ مل٠واحد على الأقل</string>
+ <string id="16203">Ùشل النقل</string>
+ <string id="16204">Ùشل ÙÙŠ نقل مل٠واحد على الأقل</string>
+ <string id="16205">Ùشل الحذÙ</string>
+ <string id="16206">Ùشل ÙÙŠ حذ٠مل٠واحد على الأقل</string>
+ <string id="19000">تبديل الى القناة</string>
+ <string id="20000">مجلد موسيقى محÙوظ</string>
+ <string id="20001">استخدم مشغل دي ÙÙŠ دي خارجي</string>
+ <string id="20002">الخارجية لاعب دي ÙÙŠ دي</string>
+ <string id="20003">مجلد المربين</string>
+ <string id="20004">مجلد لقطات الشاشة</string>
+ <string id="20006">مجلد قوائم التشغيل</string>
+ <string id="20007">التسجيلات</string>
+ <string id="20008">اللقطات</string>
+ <string id="20009">XBMC استخدام</string>
+ <string id="20011">قوائم تشغيل الموسيقى</string>
+ <string id="20012">قوائم تشغيل الÙيديو</string>
+ <string id="20013">هل تريد تشغيل اللعبة؟</string>
+ <string id="20014">ترتيب حسب: قائمة التشغيل</string>
+ <string id="20015">ريموت المصغرة</string>
+ <string id="20016">​​المصغرة الحالية</string>
+ <string id="20017">المحلية المصغرة</string>
+ <string id="20018">المصغرة الحرة</string>
+ <string id="20019">حدد صورة مصغرة</string>
+ <string id="20023">التناقض</string>
+ <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>
+ <string id="20041">Ù‚ÙÙ„ ناÙذة البرامج والبرامج النصية</string>
+ <string id="20042"> Ù‚ÙÙ„ إدارة الملÙ</string>
+ <string id="20043">إعدادات القÙÙ„</string>
+ <string id="20044">البدء من جديد</string>
+ <string id="20045">إدخال إلى الوضع الرئيسي</string>
+ <string id="20046">إنهاء الوضع الرئيسي</string>
+ <string id="20047">؟ '% s' إنشاء مل٠</string>
+ <string id="20048">ابدأ مع الإعدادات الجديدة</string>
+ <string id="20049">Ø£Ùضل المتوÙر</string>
+ <string id="20050">4x3 and 16x3 التبديل تلقائيا بين</string>
+ <string id="20051">تعامل مع الملÙات المكدسة كمل٠واحد</string>
+ <string id="20052">حذر</string>
+ <string id="20053">غادر الوضع الرئيسي</string>
+ <string id="20054">ÙÙŠ الوضع الرئيسي</string>
+ <string id="20055">Allmusic.com مصغرة</string>
+ <string id="20057">إزالة الصورة المصغرة</string>
+ <string id="20058">أض٠مل٠شخصي...</string>
+ <string id="20059">استعلام معلومات جميع الألبومات</string>
+ <string id="20060">معلومات الوسائط</string>
+ <string id="20061">Ùصل</string>
+ <string id="20062">مساهمة اÙتراضية</string>
+ <string id="20063">مساهمة اÙتراضية (للقراءة Ùقط)</string>
+ <string id="20064">نسخ الاÙتراضية</string>
+ <string id="20065">الصورة الشخصية</string>
+ <string id="20066">Ù‚ÙÙ„ التÙضيلات</string>
+ <string id="20067">تحرير المل٠الشخصي</string>
+ <string id="20068">Ù‚ÙÙ„ المل٠الشخصي</string>
+ <string id="20069">لا يتمكن من إنشاء المجلد</string>
+ <string id="20070">دليل المل٠المل٠الشخصي</string>
+ <string id="20071">ابدأ مع مصادر الوسائط الجديدة</string>
+ <string id="20072">تأكد من أن المجلد المحدد قابل للكتابة</string>
+ <string id="20073">وأن اسم المجلد الجديد صالحا</string>
+ <string id="20074">:MPAA تصنيÙ</string>
+ <string id="20075">إدخال رمز القÙÙ„ الرئيسي عند بداية التشغيل</string>
+ <string id="20076">اطلب رمز القÙÙ„ الرئيسي عند بداية التشغيل </string>
+ <string id="20077">إعدادات الخلÙية</string>
+ <string id="20078">- لم يتم تعيين الارتباط -</string>
+ <string id="20079">تمكين الصور المتحركة</string>
+ <string id="20080">أثناء الموسيقى RSS إيقا٠الموسيقى</string>
+ <string id="20081">تمكين اختصارات الأزرار</string>
+ <string id="20082">عرض البرامج ÙÙŠ القائمة الرئيسية</string>
+ <string id="20083">عرض معلومات الموسيقى</string>
+ <string id="20084">عرض معلومات الطقس</string>
+ <string id="20085">عرض نظام عرض المعلومات</string>
+ <string id="20086">C : E : F : عرض المساحة الحرة على الأقراص </string>
+ <string id="20087">E : F : G : عرض المساحة الحرة على الأقراص </string>
+ <string id="20088">معلومات الطقس</string>
+ <string id="20089">مساحة القرص الحرة</string>
+ <string id="20090">أدخل اسم لمشاركة موجودة</string>
+ <string id="20091">رمز القÙÙ„</string>
+ <string id="20092">تحميل المل٠الشخصي</string>
+ <string id="20093">اسم المل٠الشخصي</string>
+ <string id="20094">مصادر الوسائط</string>
+ <string id="20095">إدخال رمز Ù‚ÙÙ„ المل٠الشخصي</string>
+ <string id="20096">شاشة الدخول</string>
+ <string id="20097">الحصول على معلومات الألبوم</string>
+ <string id="20098">الحصول على معلومات عن الألبوم</string>
+ <string id="20099">لا يمكن نسخ القرص أو المسار أثناء القراءة من القرص</string>
+ <string id="20100">رمز القÙÙ„ الرئيسي والإعدادت</string>
+ <string id="20101">إدخال رمز القÙÙ„ الرئيسي يسمح الوضع الرئيسي دائما</string>
+ <string id="20102">أو نسخ اÙتراضيا؟</string>
+ <string id="20103">Ø­Ùظ التغييرات إلى مل٠الشخصي؟</string>
+ <string id="20104">.الإعدادات القديمة وجدت</string>
+ <string id="20105">هل تريد استخدامها؟</string>
+ <string id="20106"> مصادر وسائط قديمة وجدت</string>
+ <string id="20107">Ùصل (مقÙلة)</string>
+ <string id="20108">الجذر</string>
+ <string id="20109">التكبير</string>
+ <string id="20110">UPnP إعدادات</string>
+ <string id="20111">تلقائي UPnP تشغيل عميل</string>
+ <string id="20112">%s :آخر تسجيل دخول</string>
+ <string id="20113">لم يتم تسجيل دخول</string>
+ <string id="20114">%i / %i المل٠الشخصي</string>
+ <string id="20115">تسجيل دخول مستخدم / اختيار مل٠شخصي</string>
+ <string id="20116">استخدام القÙÙ„ على شاشة تسجيل الدخول</string>
+ <string id="20117">رمز القÙÙ„ غير صحيح</string>
+ <string id="20118">هذا يتطلب رمز القÙÙ„ الرئيسي لتمكين التعيين</string>
+ <string id="20119">هل تريد تعيينها الآن؟</string>
+ <string id="20120">تحميل معلومات البرنامج</string>
+ <string id="20121">! الطرÙ</string>
+ <string id="20122">صحيح</string>
+ <string id="20123">خلط المشروبات</string>
+ <string id="20124">ملء الأكواب</string>
+ <string id="20125">تسجيل الدخو بإسم</string>
+ <string id="20126">تسجيل الخروج</string>
+ <string id="20128">اذهب الى الجذر</string>
+ <string id="20129">نسج</string>
+ <string id="20130">نسج (مقلوب)</string>
+ <string id="20131">توليÙ</string>
+ <string id="20132">إعادة تشغيل الÙيديو</string>
+ <string id="20133">تحرير موقع الشبكة</string>
+ <string id="20134">إزالة موقع الشبكة</string>
+ <string id="20135">هل تريد أن تÙحص المجلد؟</string>
+ <string id="20136">وحدة ذاكرة</string>
+ <string id="20137">وحدة الذاكرة جاهزة للاستخدام</string>
+ <string id="20138">غير قادر على تحميل وحدة الذاكرة</string>
+ <string id="20139">%i الÙتحة ,%i ÙÙŠ المنÙØ°</string>
+ <string id="20140">Ù‚ÙÙ„ الشاشة المؤقتة</string>
+ <string id="20141">تعيين</string>
+ <string id="20142">اسم المستخدم</string>
+ <string id="20143">أدخل كلمة المرور لـ</string>
+ <string id="20144">مؤقت الإغلاق</string>
+ <string id="20145">إغلاق (ÙÙŠ دقائق)</string>
+ <string id="20146">%im بدأت, أغلقت ÙÙŠ</string>
+ <string id="20147">إيقا٠ÙÙŠ 30 دقيقة</string>
+ <string id="20148">إيقا٠ÙÙŠ 60 دقيقة</string>
+ <string id="20149">إيقا٠ÙÙŠ 120 دقيقة</string>
+ <string id="20150">مؤقت إغلاق مخصص</string>
+ <string id="20151">إلغاء مؤقت الإغلاق</string>
+ <string id="20152">%s Ù‚ÙÙ„ التÙضيلات لـ</string>
+ <string id="20153">استعراض...</string>
+ <string id="20154">معلومات الملخص</string>
+ <string id="20155">معلومات التخزين</string>
+ <string id="20156">معلومات القرص الصلب</string>
+ <string id="20157">DVD-ROM معلومات محرك الأقراص</string>
+ <string id="20158">معلومات الشبكة</string>
+ <string id="20159">معلومات الÙيديو</string>
+ <string id="20160">معلومات الجهاز</string>
+ <string id="20161">المجموع</string>
+ <string id="20162">المستخدمة</string>
+ <string id="20163">من</string>
+ <string id="20164">القÙÙ„ غير معتمد</string>
+ <string id="20165">غير مقÙÙ„</string>
+ <string id="20166">مقÙÙ„</string>
+ <string id="20167">مجمدة</string>
+ <string id="20168">يتطلب إعادة</string>
+ <string id="20169">الاسبوع</string>
+ <string id="20170">الصÙ</string>
+ <string id="20171">(SMB) شبكة النواÙØ°</string>
+ <string id="20172">XBMSP خادم</string>
+ <string id="20173">FTP خادم</string>
+ <string id="20174">(DAAP) مشاركة موسيقى الايتونز</string>
+ <string id="20175">خادم UPnP</string>
+ <string id="20176">عرض معلومات الÙيديو</string>
+ <string id="20177">إنهاء</string>
+ <string id="20178">تغير</string>
+ <string id="20179">أحر٠كبيرة</string>
+ <string id="20180">الرموز</string>
+ <string id="20181">مساÙØ© للخلÙ</string>
+ <string id="20182">مساÙØ©</string>
+ <string id="20183">إعادة تحميل الخلÙية</string>
+ <string id="20184">EXIF استدارة الصور باستخدام معلومات ​​</string>
+ <string id="20185">استخدام أنماط عرض الملصقات للبرامج التلÙزيونية</string>
+ <string id="20186">الرجاء الانتظار</string>
+ <string id="20189">تمكين التمرير التلقائي للحوار والمراجعة</string>
+ <string id="20190">مخصص</string>
+ <string id="20191">تمكين تسجيل التصحيح</string>
+ <string id="20192">تنزيل معلومات إضاÙية اثناء التحديثات</string>
+ <string id="20193">الخدمة الاÙتراضية لمعلومات الألبوم</string>
+ <string id="20194">الخدمة الاÙتراضية لمعلومات الÙنان</string>
+ <string id="20195">تغير المكشطه</string>
+ <string id="20196">تصدير مكتبة الموسيقى...</string>
+ <string id="20197">استيراد مكتبة الموسيقى...</string>
+ <string id="20198">!لم يتم العثور على الÙنان</string>
+ <string id="20199">Ùشل تحميل معلومات الÙنان</string>
+ <string id="20250">هناك طرÙا! (Ùيديو)</string>
+ <string id="20251"> خلط المشروبات (Ùيديو)</string>
+ <string id="20252">ملء أكواب (Ùيديو)</string>
+ <string id="20300">(HTTP) دليل خادم الويب</string>
+ <string id="20301">(HTTPS) دليل خادم الويب</string>
+ <string id="20302">:لايمكن الكتابة إلى المجلد</string>
+ <string id="20303">هل تريد أن تتخطى وتذهب؟</string>
+ <string id="20307">Secondary DNS</string>
+ <string id="20308">:DHCP خادم</string>
+ <string id="20309">انشأ مجلد جديد</string>
+ <string id="20310">عند التشغيل LCD تبهيت</string>
+ <string id="20311">غير معرو٠أو على لوحة (محمية)</string>
+ <string id="20312">عند التوق٠LCD تبهيت</string>
+ <string id="20314">الÙيديو - المكتبة</string>
+ <string id="20316">ترتيب بواسطة: اسم المستخدم</string>
+ <string id="20324">تشغيل جزء...</string>
+ <string id="20325">إعادة المعايرة</string>
+ <string id="20326">%s هذا سو٠يعين معايرة القيم لـ </string>
+ <string id="20327">القيم الاÙتراضية الخاصة به</string>
+ <string id="20328">استعراض للموقع</string>
+ <string id="20330">استخدام أسماء المجلد للبحث</string>
+ <string id="20331">المجلد</string>
+ <string id="20332">استخدام أسماء مل٠أو مجلد؟</string>
+ <string id="20333">تعيين المحتوى</string>
+ <string id="20334">مجلد</string>
+ <string id="20335">بحث المحتوى المتكرر؟</string>
+ <string id="20336">Ùتح مصادر</string>
+ <string id="20337">الممثل</string>
+ <string id="20338">الÙيلم</string>
+ <string id="20339">المخرج</string>
+ <string id="20340">هل تريد إزالة كاÙØ© المعلومات الموجودة ÙÙŠ</string>
+ <string id="20341">؟XBMC هذا المسار من مكتبة </string>
+ <string id="20342">الأÙلام</string>
+ <string id="20343">البرامج التلÙزيونية</string>
+ <string id="20344">هذا الدليل يحتوي</string>
+ <string id="20345">تشغيل الÙحص الآلي</string>
+ <string id="20346">Ùحص متكرر</string>
+ <string id="20347">مثل</string>
+ <string id="20348">المخرجين</string>
+ <string id="20349">!لاتوجد ملÙات Ùيديو ÙÙŠ هذا المسار</string>
+ <string id="20350">الأصوات</string>
+ <string id="20351">معلومات البرامج التلÙزيونية</string>
+ <string id="20352">معلومات الحلقة</string>
+ <string id="20353">تحميل تÙاصيل البرنامج التلÙزيوني</string>
+ <string id="20354">استيراد دليل الحلقة</string>
+ <string id="20355">تحميل معلومات الحلقة ÙÙŠ الدليل</string>
+ <string id="20356">:اختر البرنامج التلÙزيوني</string>
+ <string id="20357">إدراج اسم البرنامج التلÙزيوني</string>
+ <string id="20358">%i الÙصل</string>
+ <string id="20359">الحلقة</string>
+ <string id="20360">الحلقات</string>
+ <string id="20361">تحميل تÙاصيل الحلقة</string>
+ <string id="20362">إزالة الحلقة من المكتبة</string>
+ <string id="20363">إزالة البرنامج التلÙزيوني من المكتبة</string>
+ <string id="20364">البرنامج التلÙزيوني</string>
+ <string id="20365">محور الحلقة</string>
+ <string id="20366">* جميع الÙصول</string>
+ <string id="20367">إخÙاء المشاهدات</string>
+ <string id="20368">رمز الانتاج</string>
+ <string id="20369">اظهار حوار العناصر الغير مشاهدة</string>
+ <string id="20370">*مخÙية لمنع المتطÙلين*</string>
+ <string id="20371">تعيين مصغرة للÙصل</string>
+ <string id="20372">صورة الÙصل</string>
+ <string id="20373">الÙصل</string>
+ <string id="20374">تحميل معلومات الÙيلم</string>
+ <string id="20375">محتوى غير مخصص</string>
+ <string id="20376">العنوان الأصلي</string>
+ <string id="20377">تحديث معلومات البرنامج تلÙزيوني </string>
+ <string id="20378">تحديث المعلومات لجميع الحلقات؟</string>
+ <string id="20379">المجلد المحدد يحتوي على برنامج تلÙزيوني واحد</string>
+ <string id="20380">استبعاد المجلد المحدد من الÙحص</string>
+ <string id="20381">العروض الخاصة</string>
+ <string id="20382">تحميل مصغرات الÙصل تلقائي</string>
+ <string id="20383">المجلد المحدد يحتوي على Ùيديو واحد</string>
+ <string id="20384">ربط إلى البرنامج التلÙزيوني</string>
+ <string id="20385">إزالة الربط من البرنامج التلÙزيوني</string>
+ <string id="20386">Ø£Ùلام أضيÙت مؤخراً</string>
+ <string id="20387">حلقات أضيÙت مؤخراً</string>
+ <string id="20388">استوديوهات</string>
+ <string id="20389">االÙيديو كليب</string>
+ <string id="20390">اغاني Ùيديو كليب أضيÙت مؤخراً</string>
+ <string id="20391">الÙيديو كليب</string>
+ <string id="20392">إزالة اغاني الÙيديو من المكتبة</string>
+ <string id="20393">معلومات الÙيديو كليب</string>
+ <string id="20394">تحميل معلومات الÙيديو كليب</string>
+ <string id="20395">مختلطة</string>
+ <string id="20396">اذهب لألبومات الÙنانين</string>
+ <string id="20397">للألبومات</string>
+ <string id="20398">تشغيل الأغنية</string>
+ <string id="20399">اذهب لألبومات الÙيديو الكليب</string>
+ <string id="20400">اذهب إلى الÙيديو كليب حسب الÙنان</string>
+ <string id="20401">تشغيل الÙيديو كليب</string>
+ <string id="20402">تحميل صور مصغرة للممثل عند الإضاÙØ© إلى المكتبة</string>
+ <string id="20403">تعيين صورة مصغرة للمثل</string>
+ <string id="20405">إزالة علامة الحلقه</string>
+ <string id="20406">تعيين علامة الحلقه</string>
+ <string id="20407">إعدادات المكشطة </string>
+ <string id="20408"> تحميل معلومات الÙيديو كليب</string>
+ <string id="20409">تنزيل معلومات البرنامج التلÙزيوني</string>
+ <string id="20410">Ùيلم قصير</string>
+ <string id="20411">Ùلاتن</string>
+ <string id="20412">برامج تلÙزيونية Ùلاتن</string>
+ <string id="20413">احصل Fanart</string>
+ <string id="20414">ÙÙŠ مكتبات الÙيديو والموسيقى Fanart إظهار </string>
+ <string id="20415">Ùحص عن محتوى جديد</string>
+ <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="20422">دائما</string>
+ <string id="20423">Ùلم قصير</string>
+ <string id="20424">خطأ</string>
+ <string id="20425">Fanart عرض شرائح</string>
+ <string id="20426">تصدير إلى مل٠واحد أو معزول</string>
+ <string id="20427">مدخل الملÙات؟</string>
+ <string id="20428">مل٠واحد</string>
+ <string id="20429">Ù…Ùصول</string>
+ <string id="20430">تصدير المصغرات و Fanart?</string>
+ <string id="20431">الكتابة Ùوق الملÙات القديمة؟</string>
+ <string id="20432">استبعاد المسار من تحديثات المكتبة</string>
+ <string id="20433">استخراج معلومات المصغرات والÙيديو</string>
+ <string id="20434">تعيينات</string>
+ <string id="20435">تعيين مصغرات الÙيديو</string>
+ <string id="20436">تصدير مصغرات الÙنانين؟</string>
+ <string id="20437">اختر الخلÙية</string>
+ <string id="20438">الخلÙية المحلية</string>
+ <string id="20439">لاتوجد خلÙية</string>
+ <string id="20440">الخلÙية الحالية</string>
+ <string id="20441">الخلÙية البعيدة</string>
+ <string id="20442">تغيير المحتوى</string>
+ <string id="20443">هل تريد تحديث كاÙØ© البيانات؟</string>
+ <string id="20444">العناصر ÙÙŠ هذا المسار؟</string>
+ <string id="20445">Fanart</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="20454">المستمع</string>
+ <string id="20455">المستمعين</string>
+ <string id="20456">تعيين خلÙية الÙلم Fanart</string>
+ <string id="20457">تعيين الÙلم</string>
+ <string id="21330">إظهار الملÙات المخÙية والدلائل</string>
+ <string id="21331">TuxBox عميل</string>
+ <string id="21332">ليس ÙÙŠ وضع التسجيل TuxBox تحذير: جهاز</string>
+ <string id="21333">!سيتم إيقا٠البث</string>
+ <string id="21334">!Ùشل %s :الانتقال الى القناة</string>
+ <string id="21335">هل أنت متأكد لبدأ البث؟</string>
+ <string id="21336">%s :يتصل الى</string>
+ <string id="21337">TuxBox جهاز</string>
+ <string id="21359">إضاÙØ© مشاركة الوسائط...</string>
+ <string id="21360">UPnP مشاركة الÙيديو والموسيقى عبر</string>
+ <string id="21364">تحرير مشاركة الوسائط</string>
+ <string id="21365">إزالة مشاركة الوسائط</string>
+ <string id="21366">مجلد الترجمة</string>
+ <string id="21367">دليل ترجمة الÙيديو البديل</string>
+ <string id="21368">ASS / SSA تجاوز خطوط الترجمات</string>
+ <string id="21369">تمكين دعم الÙأره وشاشة اللمس</string>
+ <string id="21370">تشغيل أصوات التنقل أثناء تشغيل الوسائط</string>
+ <string id="21371">المصغرة</string>
+ <string id="21372">تحديد منطقة مشغل الدي ÙÙŠ دي</string>
+ <string id="21373">مخرج الÙيديو</string>
+ <string id="21374">حجم الÙيديو</string>
+ <string id="21375">عادي</string>
+ <string id="21376">الرسائل</string>
+ <string id="21377">شاشة عريضة</string>
+ <string id="21378">480P تمكين</string>
+ <string id="21379">7200P تمكين</string>
+ <string id="21380">1080i تمكين</string>
+ <string id="21381">أدخل اسم قائمة تشغيل الجديدة</string>
+ <string id="21382">إظهار أزرار"إضاÙØ© مصدر" ÙÙŠ قوائم الملÙات</string>
+ <string id="21383">تكمين أشرطة التمرير</string>
+ <string id="21384">Make watched filtering a toggle in video library</string>
+ <string id="21385">Ùتح</string>
+ <string id="21386">مستوى الإدارة الصوتية</string>
+ <string id="21387">سريع</string>
+ <string id="21388">هادئة</string>
+ <string id="21389">تمكين خلÙية مخصصة</string>
+ <string id="21390">إدارة مستوى الطاقة</string>
+ <string id="21391">طاقة عالية</string>
+ <string id="21392">طاقة منخÙضة</string>
+ <string id="21393">احتياطية عالية</string>
+ <string id="21394">احتياطية منخÙضة</string>
+ <string id="21395">لا يمكن تخزين مؤقت لملÙات أكبر من 4 غيغابايت </string>
+ <string id="21396">الÙصل</string>
+ <string id="21398">مضلل بكسل عالي الجودة</string>
+ <string id="21399">استخدام الرسوم المتحركة</string>
+ <string id="21400">يحتوي على</string>
+ <string id="21401">لا يحتوي على</string>
+ <string id="21402">انه</string>
+ <string id="21403">ليس</string>
+ <string id="21404">يبدأ</string>
+ <string id="21405">ينتهي</string>
+ <string id="21406">أكبر من </string>
+ <string id="21407">أقل من </string>
+ <string id="21408">بعد </string>
+ <string id="21409">قبل</string>
+ <string id="21410">الاخير</string>
+ <string id="21411">لم يدم</string>
+ <string id="21412">الكاشطات</string>
+ <string id="21413">كاشط الÙيلم الاÙتراضي</string>
+ <string id="21414">كاشط البرنامج التلÙزيوني الاÙتراضي</string>
+ <string id="21415">كاشط الموسيقى الاÙتراضي</string>
+ <string id="21416">تمكين الاحتياطية على أساس اللغة المكشطة</string>
+ <string id="21417">الإعدادت</string>
+ <string id="21418">متعددة اللغات</string>
+ <string id="21419">لاتوجد مكشطة حالية</string>
+ <string id="21420">تعديل قيمة</string>
+ <string id="21421">قاعدة الأغاني الذكية</string>
+ <string id="21422">ضبط العناصر ÙÙŠ</string>
+ <string id="21423">قانون جديد...</string>
+ <string id="21424">يجب مطابقة العناصر</string>
+ <string id="21425">جميع القوانين</string>
+ <string id="21426">قانون واحد أو أكثر</string>
+ <string id="21427">محدود</string>
+ <string id="21428">لايوجد حدود</string>
+ <string id="21429">ترتيب</string>
+ <string id="21430">تصاعدي</string>
+ <string id="21431">تنازلي</string>
+ <string id="21432">تحرير قائمة التشغيل الذكية</string>
+ <string id="21433">اسم قائمة التشغيل</string>
+ <string id="21434">البحث عن العناصر ÙÙŠ</string>
+ <string id="21435">- تعديل</string>
+ <string id="21436">%i عناصر</string>
+ <string id="21437">قائمة ذكية للأغاني الجديد...</string>
+ <string id="21438">%c محرك</string>
+ <string id="21439">تحرير قوانين وضع الطرÙ</string>
+ <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="21460">موقع الترجمة </string>
+ <string id="21461">صالح</string>
+ <string id="21462">أسÙÙ„ الÙيديو</string>
+ <string id="21463">تحت الÙيديو</string>
+ <string id="21464">أعلى الÙيديو</string>
+ <string id="21465">أعلا الÙيديو</string>
+ <string id="21800">اسم الملÙ</string>
+ <string id="21801">مسار الملÙ</string>
+ <string id="21802">حجم الملÙ</string>
+ <string id="21803">تاريخ/وقت الملÙ</string>
+ <string id="21805">الدقة</string>
+ <string id="21806">التعليقات</string>
+ <string id="21807">أسود/أبيض اللون</string>
+ <string id="21820">الوقت/التاريخ</string>
+ <string id="21821">الوصÙ</string>
+ <string id="21822">الشركة المصنعة للكاميرا</string>
+ <string id="21823">طراز الكاميرا</string>
+ <string id="21824">EXIF ​​تعليق</string>
+ <string id="21825">الثابتة</string>
+ <string id="21826">الÙتحة</string>
+ <string id="21827">البؤري</string>
+ <string id="21828">مساÙØ© التركيز</string>
+ <string id="21829">التعرض</string>
+ <string id="21830">وقت التعرض</string>
+ <string id="21832">نمط التعرض</string>
+ <string id="21833">الÙلاش المستخدمة</string>
+ <string id="21834">موازنة البياض</string>
+ <string id="21835">مصدر الضوء</string>
+ <string id="21836">وضع القياس</string>
+ <string id="21837">ISO</string>
+ <string id="21838">التقريب الرقمي</string>
+ <string id="21839">CCD عرض</string>
+ <string id="21840">GPS خطوط عرض</string>
+ <string id="21841">GPS خطوط طول</string>
+ <string id="21842">GPS ارتÙاع</string>
+ <string id="21843">التوجه</string>
+ <string id="21860">أكثر الÙئات</string>
+ <string id="21861">كلمات دالة</string>
+ <string id="21862">تÙسير الكلمات</string>
+ <string id="21863">الكاتب</string>
+ <string id="21864">العنوان</string>
+ <string id="21865">تعليمات خاصة</string>
+ <string id="21866">الÙئات</string>
+ <string id="21867">الخط الثانوي</string>
+ <string id="21868">عنوان الخط الثانوي</string>
+ <string id="21869">الائتمان</string>
+ <string id="21870">المصدر</string>
+ <string id="21871">حقوق التأليÙ</string>
+ <string id="21872">اسم الكائن</string>
+ <string id="21873">المدينة</string>
+ <string id="21874">البلد</string>
+ <string id="21875">البلد</string>
+ <string id="21877">تاريخ الإنشاء</string>
+ <string id="21878">علم حقوق المؤلÙ</string>
+ <string id="21879">رمز البلد</string>
+ <string id="21881">UPnP عبر XBMC سماح تحكم</string>
+ <string id="21882">DVD محاولة لتخطي الادوار التمهيدية قبل قائمة</string>
+ <string id="21883">الموسيقى المحÙوظة</string>
+ <string id="21884">تحقق لجميع الÙنانين</string>
+ <string id="21885">تحميل معلومات الألبوم</string>
+ <string id="21886">تحميل معلومات الÙنان</string>
+ <string id="21887">السيرة الذاتية</string>
+ <string id="21888">Discography</string>
+ <string id="21889">يبحث عن Ùنان</string>
+ <string id="21890">اختر الÙنان</string>
+ <string id="21891">معلومات الÙنان</string>
+ <string id="21892">آلات</string>
+ <string id="21893">ولد</string>
+ <string id="21894">أنشأ</string>
+ <string id="21895">مواضيع</string>
+ <string id="21896">صر٠النظر</string>
+ <string id="21897">توÙÙŠ</string>
+ <string id="21898">سنوات النشاط</string>
+ <string id="21899">شركة الإنتاج</string>
+ <string id="21900">ولد / أنشأ</string>
+ <string id="22000">تحديث المكتبة عند بدء تشغيل</string>
+ <string id="22001">إخÙاء تحديث المكتبة ÙÙŠ الخلÙية</string>
+ <string id="22006">موازنة الترجمة</string>
+ <string id="22007">مزود OpenGL:</string>
+ <string id="22009">نسخة OpenGL:</string>
+ <string id="22010">درجة حرارة CPU: </string>
+ <string id="22011">درجة حرارة GPU:</string>
+ <string id="22012">إجمالي الذاكرة</string>
+ <string id="22013">البيانات الشخصية</string>
+ <string id="22014">استخدام التعتيم عند التوق٠أثناء تشغيل الÙيديو</string>
+ <string id="22015">جميع التسجيلات</string>
+ <string id="22016">​​حسب العنوان</string>
+ <string id="22017">حسب المجموعة</string>
+ <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="22037">إظهار مؤشر الأغنية تلقائياً</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="22079">اختيار الإجراء الاÙتراضي</string>
+ <string id="22080">اختر</string>
+ <string id="22081">عرض المعلومات</string>
+ <string id="22082">المزيد...</string>
+ <string id="22083">تشغيل الكل</string>
+ <string id="23050">تنشيط النص</string>
+ <string id="23053">توقÙ</string>
+ <string id="23054">%i جزء</string>
+ <string id="23100">تنشيط المشغل الخارجي</string>
+ <string id="23101">انقر مواÙÙ‚ لتعطيل المشغل</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="24010">التصور</string>
+ <string id="24011">مخزن الملحقات</string>
+ <string id="24012">الترجمات</string>
+ <string id="24013">كلمات الأغاني</string>
+ <string id="24014">معلومات التلÙزيون</string>
+ <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>
+ <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">تثبيت من مل٠مضغوط</string>
+ <string id="24042">%i%% تحميل</string>
+ <string id="24043">التحديثات متوÙرة</string>
+ <string id="24044">عدم تواÙÙ‚ التطابقات</string>
+ <string id="24045">تركيبة الملحق غير صحيحة</string>
+ <string id="24046">%s مستخدم من قبل الملحق المثبت</string>
+ <string id="24047">لايمكن إزالة هذا الملحق</string>
+ <string id="24048">العودة</string>
+ <string id="24050">الملحقات المتوÙرة</string>
+ <string id="24051">الإصدار:</string>
+ <string id="24052">تنويه</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="24076">يتطلب ملحق</string>
+ <string id="24080">محاولة إعادة الاتصال؟</string>
+ <string id="24089">إعادة تشغيل الملحق</string>
+ <string id="24090">Ù‚ÙÙ„ إدارة الملحق</string>
+ <string id="24094">(الحالي)</string>
+ <string id="24095">(القائمة السوداء)</string>
+ <string id="24096">ملحوظة المكونات غير صالحة ÙÙŠ المخزن</string>
+ <string id="24097">تريد تعطيله من النظام؟</string>
+ <string id="24098">غير صالحة</string>
+ <string id="24099">سكين تريد استبداله؟</string>
+ <string id="24100">هل تريد التبديل الى هذه الخلÙية؟</string>
+ <string id="24101">هل تريد تحميل هذا الملحق؟</string>
+ <string id="25000">الإشعارات</string>
+ <string id="29800">وضع المكتبة</string>
+ <string id="29801">QWERTY لوحة Ù…Ùاتيح</string>
+ <string id="29802">عبور الصوت مستخدم</string>
+ <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="33014">استخدام مشغل دي ÙÙŠ دي بدلا من المشغل العادي</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="33021">هطول</string>
+ <string id="33022">هطول</string>
+ <string id="33023">رطب</string>
+ <string id="33024">Feels</string>
+ <string id="33025">ملاحظ</string>
+ <string id="33026">خارج عن المعتاد</string>
+ <string id="33027">شروق الشمس</string>
+ <string id="33028">غروب الشمس</string>
+ <string id="33029">التÙاصيل</string>
+ <string id="33030">التوقعات</string>
+ <string id="33031">Coverflow</string>
+ <string id="33032">ترجمة النص</string>
+ <string id="33033">قائمة الخريطة %s Ùئة </string>
+ <string id="33034">36 ساعة</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="33051">اختر</string>
+ <string id="33052">تحقق</string>
+ <string id="33053">تعيين</string>
+ <string id="33054">مواسم</string>
+ <string id="33055">استخدم</string>
+ <string id="33056">شاهد</string>
+ <string id="33057">الاستماع إلى</string>
+ <string id="33058">عرض</string>
+ <string id="33059">تكوين</string>
+ <string id="33060">الطاقة</string>
+ <string id="33061">القائمة</string>
+ <string id="33062">تشغيل</string>
+ <string id="33063">الخيارات</string>
+ <string id="33065">المحرر</string>
+ <string id="33066">حول</string>
+ <string id="33067">ابدأ التقييم</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">أو أكثر للتشغيل %s XBMC revision يتطلب</string>
+ <string id="33076">XBMC يرجى تحديث</string>
+ <string id="33077">!لم يتم العثور على البيانات</string>
+ <string id="33078">الصÙحة التالية</string>
+ <string id="33079">الحب</string>
+ <string id="33080">الكراهية</string>
+ <string id="33081">هذا المل٠ينتمي إلى كشط. حدد نقطة التشغيل</string>
+ <string id="33100">Ùشل البدء</string>
+ <string id="33101">خادم الويب</string>
+ <string id="33102">خادم الحدث</string>
+ <string id="33103">خادم الدخول عن بعد</string>
+ <string id="34100">إعداد المكبر</string>
+ <string id="34201">لا يمكن العثور على العنصر التالي للتشغيل</string>
+ <string id="34202">لا يمكن العثور على العنصر السابق للتشغيل</string>
+ <string id="35000">الأجهزة الطرÙية</string>
+ <string id="35001">العام HID جهاز</string>
+ <string id="35002">محول الشبكة العام</string>
+ <string id="35003">القرص العام</string>
+ <string id="35004">.أي إعدادات لهذا الجهاز</string>
+ <string id="35005">تم تعيين جهاز جديد</string>
+ <string id="35006">تم إزالة الجهاز</string>
+ <string id="35500">الموقع</string>
+ <string id="35501">التصنيÙ</string>
+ <string id="35502">الاسم</string>
+ <string id="35503">المزود</string>
+ <string id="35504">معر٠المنتج</string>
+ <string id="36006">لم يتمكن من Ùتح المحول</string>
+ <string id="36007">XBMC تشغيل التلÙزيون عند بدء</string>
+ <string id="36008">XBMC إيقا٠التلÙزيون عند إيقا٠</string>
+ <string id="36009">وضع الأجهزة ÙÙŠ وضع الاستعداد عند تنشيط شاشة التوقÙ</string>
+ <string id="36015">HDMI رقم منÙØ°</string>
+ <string id="36016">متصل</string>
+ <string id="36017">غير متوÙر libcec تم العثور على الارتباط, ولكن</string>
+ <string id="36018">استخدام إعدادات لغة للتلÙزيون</string>
+</strings> \ No newline at end of file
diff --git a/language/Bulgarian/langinfo.xml b/language/Bulgarian/langinfo.xml
index 582fc1a8e8..47bd455536 100644
--- a/language/Bulgarian/langinfo.xml
+++ b/language/Bulgarian/langinfo.xml
@@ -64,7 +64,8 @@
<datelong>DDDD, D MMMM YYYY 'г.'</datelong>
<time symbolAM="" symbolPM="">H:mm:ss</time>
<tempunit>C</tempunit>
- <speedunit>kph</speedunit>
+ <speedunit>kmh</speedunit>
+ <timezone>EET</timezone>
</region>
</regions>
</language>
diff --git a/language/English/strings.xml b/language/English/strings.xml
index ece866ac14..323b45aa61 100644
--- a/language/English/strings.xml
+++ b/language/English/strings.xml
@@ -1772,7 +1772,7 @@
<string id="20326">This will reset the calibration values for %s</string>
<string id="20327">to it's default values.</string>
<string id="20328">Browse for destination</string>
-
+ <string id="20329">Movies are in separate folders that match the movie title</string>
<string id="20330">Use folder names for lookups</string>
<string id="20331">File</string>
<string id="20332">Use file or folder names in lookups?</string>
@@ -1862,7 +1862,7 @@
<string id="20416">First aired</string>
<string id="20417">Writer</string>
<string id="20418"></string>
- <string id="20419">Show metadata in files view</string>
+ <string id="20419">Replace file names with library titles</string>
<string id="20420">Never</string>
<string id="20421">If only one season</string>
@@ -1902,6 +1902,7 @@
<string id="20455">Listeners</string>
<string id="20456">Set movieset fanart</string>
<string id="20457">Movie set</string>
+ <string id="20458">Group movies in sets</string>
<!-- up to 21329 is reserved for the video db !! !-->
<string id="21330">Show hidden files and directories</string>
@@ -2009,7 +2010,9 @@
<string id="21451">Internet connection required.</string>
<string id="21452">Get More...</string>
<string id="21453">Root filesystem</string>
-
+ <string id="21454">Cache full</string>
+ <string id="21455">Cache filled before reaching required amount for continous playback</string>
+
<string id="21460">Subtitle location</string>
<string id="21461">Fixed</string>
<string id="21462">Bottom of video</string>
@@ -2328,6 +2331,8 @@
<string id="33101">Webserver</string>
<string id="33102">Event Server</string>
<string id="33103">Remote communication server</string>
+
+ <string id="33200">Detected New Connection</string>
<!-- translators: no need to add these to your language files -->
<string id="34000">Lame</string>
@@ -2352,6 +2357,14 @@
<string id="34201">Can't find a next item to play</string>
<string id="34202">Can't find a previous item to play</string>
+
+ <string id="34300">Failed to start zeroconf</string>
+ <string id="34301">Is Apple's Bonjour Service installed? See log for more info.</string>
+
+ <string id="34400">Video Rendering</string>
+ <string id="34401">Failed to init video filters/scalers, falling back to bilinear scaling</string>
+ <string id="34402">Failed to initialize audio device</string>
+ <string id="34403">Check your audiosettings</string>
<string id="35000">Peripherals</string>
diff --git a/language/French/strings.xml b/language/French/strings.xml
index 76553e8e89..20a403c1ee 100644
--- a/language/French/strings.xml
+++ b/language/French/strings.xml
@@ -393,7 +393,7 @@
<string id="431">Pas de cache</string>
<string id="432">Retirer le film de la médiathèque</string>
<string id="433">Êtes-vous sûr(e) de retirer '%s' ?</string>
- <string id="434">Direction : %s, Vitesse : %i %s</string> <!--From <wind dir.> at <speed> <unit>-->
+ <string id="434">%s à %i %s</string> <!--From <wind dir.> at <speed> <unit>-->
<string id="437">Disque amovible</string>
<string id="438">Ouverture du fichier</string>
diff --git a/language/German/strings.xml b/language/German/strings.xml
index a2727c0c26..36aa789569 100644
--- a/language/German/strings.xml
+++ b/language/German/strings.xml
@@ -2035,6 +2035,8 @@
<string id="21451">Internetverbindung benötigt.</string>
<string id="21452">Mehr...</string>
<string id="21453">Root Dateisystem</string>
+ <string id="21454">Cache voll</string>
+ <string id="21455">Cache gefüllt bevor ausreichende Datenmenge für ruckelfreie Wiedergabe erreicht wurde</string>
<string id="21460">Position der Untertitel</string>
<string id="21461">Fixiert</string>
@@ -2345,12 +2347,18 @@
<string id="33081">Diese Datei ist gestapelt, wähle den Teil der abgespielt werden soll.</string>
<string id="33082">Skriptpfad</string>
<string id="33083">Benutzerdefinierten Skript Button aktivieren</string>
-
+ <string id="33200">Neue Verbindung erkannt</string>
<string id="34100">Lautsprecherkonfiguration</string>
<string id="34201">Nächstes Element konnte nicht gefunden werden</string>
<string id="34202">Vorheriges Element konnte nich gefunden werden</string>
-
+ <string id="34300">zeroconf konnte nicht gestartet werden</string>
+ <string id="34301">Ist der Bonjour Service von Apple installiert? Log-File einsehen für mehr Info</string>
+
+ <string id="34400">Video Rendering</string>
+ <string id="34401">Videofilter/-scaler konnte nicht initialisiert werden! Verwende Bilineares Scaling</string>
+ <string id="34402">Audiogerät konnte nicht initialisiert werden</string>
+ <string id="34403">Audio-Einstellungen überprüfen</string>
<string id="35000">Geräte</string>
<string id="35001">HID-Gerät</string>
diff --git a/language/Hebrew/strings.xml b/language/Hebrew/strings.xml
index 2507066731..ed47e1846d 100644
--- a/language/Hebrew/strings.xml
+++ b/language/Hebrew/strings.xml
@@ -2,8 +2,8 @@
<!--Language file translated with Team XBMC Translator-->
<!--Translator: Idan Bushari-->
<!--Email: bushari2003@hotmail.com-->
-<!--Date of translation: 12/24/2011-->
-<!--$Revision$-->
+<!--Date of translation: 01/25/2012-->
+<!--Based on English 3978ce61ee897fab5daf83c345f3a8183aae0b22 (26.01.2012)-->
<strings>
<string id="0">תוכנות</string>
<string id="1">תמונות</string>
@@ -253,6 +253,10 @@
<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>
@@ -360,6 +364,7 @@
<string id="417">תצוגה : צלמיות גדולות</string>
<string id="418">נמוך</string>
<string id="419">גבוה</string>
+ <string id="420">HDMI</string>
<string id="422">מחק פרטי ×לבו×</string>
<string id="423">מחק פרטי CDDB</string>
<string id="424">בחר</string>
@@ -943,6 +948,7 @@
<string id="13115">×פשר תמיד</string>
<string id="13130">החשך ×¦×’×™× ×חרי×</string>
<string id="13131">מנוטרל</string>
+ <string id="13132">×¦×’×™× ×¨×™×§×™×</string>
<string id="13140">×—×™×‘×•×¨×™× ×¤×¢×™×œ×™× ×–×•×”×•!</string>
<string id="13141">×× ×ª×ž×©×™×š, ייתכן ×©×œ× ×ª×•×›×œ לשלוט ב-XBMC יותר</string>
<string id="13142">×תה בטוח שברצונך להפסיק ×ת EventServer?</string>
@@ -950,11 +956,14 @@
<string id="13145">×× ×תה משתמש כרגע בשלט Apple כדי לשלוט</string>
<string id="13146">ב- XBMC. שינוי הגדרות ×לה כנר××” ישפיעו על היכולות שלך</string>
<string id="13147">כדי להמשיך לשלוט בזה. ×”×× ×‘×¨×¦×•× ×š להמשיך?</string>
+ <string id="13160">שער</string>
+ <string id="13161">DNS ר×שי</string>
<string id="13162">×תחול נכשל</string>
<string id="13170">××£ פע×</string>
<string id="13171">מיידי</string>
<string id="13172">ל×חר %i שניות</string>
<string id="13173">ת×ריך התקנת כונן קשיח:</string>
+ <string id="13174">HDD ספירת מחזור ×”×נרגיה:</string>
<string id="13200">פרופילי×</string>
<string id="13201">למחוק פרופיל '%s'?</string>
<string id="13204">פרופיל ×חרון בשימוש:</string>
@@ -1541,6 +1550,8 @@
<string id="20302">×œ× ×™×›×•×œ ×œ×¨×©×•× ×œ×ª×™×§×™×™×”:</string>
<string id="20303">×”×× ×ª×¨×¦×” לדלג ולהמשיך?</string>
<string id="20304">הזנת RSS</string>
+ <string id="20307">DNS משני</string>
+ <string id="20308">DHCP שרת:</string>
<string id="20309">צור תיקיה חדשה</string>
<string id="20310">×¢×ž×¢× LCD בזמן ניגון</string>
<string id="20311">×œ× ×™×“×•×¢ ×ו על הלוח (מוגן)</string>
@@ -1639,7 +1650,7 @@
<string id="20415">סורק עבור תוכן חדש</string>
<string id="20416">שודר לר×שונה</string>
<string id="20417">כותב</string>
- <string id="20419">הצג מטה ד×טה בתצוגת קבצי×</string>
+ <string id="20419">החלף שמות ×§×‘×¦×™× ×¢× ×›×•×ª×¨×•×ª ספריה</string>
<string id="20420">××£ פע×</string>
<string id="20421">×× ×¨×§ עונה ×חת</string>
<string id="20422">תמיד</string>
@@ -1678,6 +1689,7 @@
<string id="20455">מ××–×™× ×™×</string>
<string id="20456">הגדר פ×× ×רט למ×רז סרטי×</string>
<string id="20457">מ×רז סרטי×</string>
+ <string id="20458">קבוצות ×¡×¨×˜×™× ×‘×ž×רזי×</string>
<string id="21330">הצג ×§×‘×¦×™× ×•×¡×¤×¨×™×•×ª מוחב××™×</string>
<string id="21331">קליינט TuxBox</string>
<string id="21332">×זהרה: הצב ×ת מכשיר ×” TuxBox במצב הקלטה</string>
@@ -1776,6 +1788,9 @@
<string id="21450">- עריכה</string>
<string id="21451">נחוץ חיבור ל×ינטרנט.</string>
<string id="21452">קבל עוד...</string>
+ <string id="21453">שורש מערכת הקבצי×</string>
+ <string id="21454">מטמון מל×</string>
+ <string id="21455">המטמון ×”×ª×ž×œ× ×œ×¤× ×™ שהגיע לכמות הנחוצה לניגון רציף</string>
<string id="21460">×ž×™×§×•× ×”×›×ª×•×‘×™×ª</string>
<string id="21461">מקובע</string>
<string id="21462">תחתית הויד×ו</string>
@@ -1786,6 +1801,7 @@
<string id="21801">נתיב קובץ</string>
<string id="21802">גודל קובץ</string>
<string id="21803">ת×ריך/שעה קובץ</string>
+ <string id="21804">שקופית ×ינדקס</string>
<string id="21805">רזולוציה</string>
<string id="21806">הערות</string>
<string id="21807">צבעוני/שחור-לבן</string>
@@ -1855,6 +1871,7 @@
<string id="21900">נולד / הוק×</string>
<string id="22000">עדכן ×ת הספריה בהפעלה</string>
<string id="22001">תמיד עדכן ספרייה ברקע</string>
+ <string id="22002">- DNS סיומת</string>
<string id="22004">%2.3f שניות עוכבו</string>
<string id="22005">%2.3f שניות הוקדמו</string>
<string id="22006">השהיית כתוביות</string>
@@ -1925,6 +1942,7 @@
<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>
@@ -1955,7 +1973,7 @@
<string id="24062">הרחבות מופעלות</string>
<string id="24063">עדכון ×וטומטי</string>
<string id="24064">הרחבה מופעלת</string>
- <string id="24065">החרבה מעודכנת</string>
+ <string id="24065">הרחבה עודכנה</string>
<string id="24066">בטל הורדת הרחבה?</string>
<string id="24067">בתהליך הורדת הרחבות</string>
<string id="24068">×§×™×™× ×¢×“×›×•×Ÿ</string>
@@ -2058,9 +2076,15 @@
<string id="33101">שרת</string>
<string id="33102">Event Server</string>
<string id="33103">שרת התחברות מרחוק</string>
+ <string id="33200">זוהה חיבור חדש</string>
<string id="34100">תצורת רמקול</string>
<string id="34201">×œ× × ×ž×¦× ×¤×¨×™×˜ ×”×‘× ×œ× ×™×’×•×Ÿ</string>
<string id="34202">×œ× × ×ž×¦× ×”×¤×¨×™×˜ ×”×§×•×“× ×œ× ×™×’×•×Ÿ</string>
+ <string id="34300">נכשל בהפעלת zeroconf</string>
+ <string id="34301">×”×× ×©×™×¨×•×ª Apple's Bonjour מותקן? ר××” לוג למידע נוסף</string>
+ <string id="34400">עיבוד ויד×ו</string>
+ <string id="34402">נכשל בהפעלת התקן ×”×ודיו</string>
+ <string id="34403">בדוק הגדרות ×ודיו</string>
<string id="35000">ציוד היקפי</string>
<string id="35001">התקן HID כללי</string>
<string id="35002">מת×× ×¨×©×ª כללי</string>
@@ -2079,9 +2103,10 @@
<string id="36009">הכנס ×ת ×”×”×ª×§× ×™× ×œ×ž×¦×‘ שינה ×›×שר ×ž×¤×¢×™×œ×™× ×©×•×ž×¨ מסך</string>
<string id="36011">×ין ×פשרות לזהות פורט CEC. הגדר ×–×ת ידנית.</string>
<string id="36012">×ין ×פשרות לזהות מת×× CEC.</string>
+ <string id="36013">ממשק libcec ×œ× × ×ª×ž×š. %d גדול יותר מ×שר ×”×’×¨×¡× ×©- XBMC תומך (%d)</string>
<string id="36014">הכנס ×ת המחשב למצב המתנה ×›×שר הטלוויזיה נכבית</string>
<string id="36015">מספר פורט HDMI</string>
<string id="36016">מחובר</string>
<string id="36017">מת×× × ×ž×¦×. ×בל libcec ×œ× ×–×ž×™×Ÿ</string>
<string id="36018">השתמש בהגדרות שפה של הטלוויזיה</string>
-</strings> \ No newline at end of file
+</strings>
diff --git a/language/Hungarian/strings.xml b/language/Hungarian/strings.xml
index e81242d1b9..4702678ede 100644
--- a/language/Hungarian/strings.xml
+++ b/language/Hungarian/strings.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<!--Translator: Bence Nádas and Attila Jakosa with a help of Zsolt Malecz-->
<!--Email: attila.jakosa@gmail.com-->
-<!--Based on English 4c45436d4c19274fca2d478373326688c5682e55 (11.12.2011)-->
+<!--Based on English 98d103ae66a1e81e379e65dd131341cd119cfcf2 (21.01.2012)-->
<strings>
<string id="0">Programok</string>
<string id="1">Képek</string>
@@ -2033,8 +2033,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="21454">Gyorsítótár megtelt</string>
+ <string id="21455">A gyorsítótár még azelőtt megtelt, hogy elegendő lett volna a folyamatos lejátszáshoz</string>
<string id="21460">Felirat helye</string>
<string id="21461">Rögzített</string>
@@ -2354,13 +2354,22 @@
<string id="33102">Eseménykiszolgáló</string>
<string id="33103">Távoli kommunikációs kiszolgáló</string>
+ <string id="33200">Új kapcsolatot észleltem</string>
+
<string id="34100">Hangfalkiépítés</string>
<string id="34201">Nincs következő lejátszandó elem</string>
<string id="34202">Nincs előző lejátszandó elem</string>
- <string id="35000">Perifériák</string>
+ <string id="34300">A zeroconf elindítása nem sikerült</string>
+ <string id="34301">Biztos, hogy az Apple Bonjour Service telepítve van? (Részletes információ a naplóban)</string>
+ <string id="34400">Video leképező rendszer hiba</string>
+ <string id="34401">Az átméretező (scaler) nem használható, visszaállva a bilinear eljárásra</string>
+ <string id="34402">A beállított hangeszköz nem használható</string>
+ <string id="34403">Ellenőrizd a hangbeállításokat</string>
+
+ <string id="35000">Perifériák</string>
<string id="35001">Szabványos HID eszköz</string>
<string id="35002">Szabványos hálózati adapter</string>
<string id="35003">Szabványos lemez</string>
diff --git a/language/Icelandic/strings.xml b/language/Icelandic/strings.xml
index 013d85d271..b2bcb61b5c 100644
--- a/language/Icelandic/strings.xml
+++ b/language/Icelandic/strings.xml
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<!--Translator: Kristján Bjarni Guðmundsson-->
<!--Email: kristjanbjarni@gmail.com-->
-<!--Date of translation: 2011-06-08-->
+<!--Date of translation: 2012-02-01-->
<!--$Revision$-->
-<!--Based on english strings version 35715-->
<strings>
<string id="0">Forrit</string>
<string id="1">Ljósmyndir</string>
@@ -197,7 +196,7 @@
<string id="221">Netkerfi ótengt</string>
<string id="222">Hætta við</string>
<string id="224">Hraði</string>
-
+ <string id="225">Lóðrétt hliðrun</string>
<string id="226">Prufumynstur...</string>
<string id="227">Sækja upplýsingar um tónlistardiska frá freedb.org</string>
<string id="228">Endurraða spilunarlista í byrjun</string>
@@ -217,7 +216,7 @@
<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="245">Stærðir: (%i,%i)-&gt;(%i,%i) (Aðdráttur x%2.2f) AR:%2.2f:1 (Punktar: %2.2f:1) (Lóð.hliðrun: %2.2f)</string>
<string id="247">Skriftur</string>
<string id="248">Tungumál</string>
@@ -391,7 +390,7 @@
<string id="426">Engar upplýsingar fundust um geisladisk</string>
<string id="427">Diskur</string>
<string id="428">Settu inn réttan CD/DVD</string>
- <string id="429">Settu inn eftirfarandi CD/DVD</string>
+ <string id="429">Settu inn eftirfarandi disk:</string>
<string id="430">Raða eftir: DVD#</string>
<string id="431">Ekkert biðminni</string>
<string id="432">Eyða kvikmynd úr safni</string>
@@ -466,7 +465,7 @@
<string id="510">Virkja myndskreytingu</string>
<string id="511">Skipta sjálfvirkt um skjáham eftir svæði leiks</string>
<string id="512">Ræsi gluggi</string>
- <string id="513">Heima gluggi</string>
+ <string id="513">Forsíða</string>
<string id="514">Handvirkar stillingar</string>
<string id="515">Flokkur</string>
@@ -529,6 +528,7 @@
<string id="573">Slóð</string>
<string id="574">Land</string>
<string id="575">Ã vinnslu</string>
+ <string id="576">Sinnum spilað</string>
<string id="580">Raða í átt</string>
<string id="581">Röðunaraðferð</string>
@@ -709,6 +709,8 @@
<string id="851">Gild gátt er á bilinu 1-65535</string>
<string id="852">Gild gátt er á bilinu 1024-65535</string>
+ <string id="998">Bæta við tónlist...</string>
+ <string id="999">Bæta við myndefni...</string>
<string id="1000">- Forsýna</string>
<string id="1001">Get ekki tengst</string>
<string id="1002">XBMC getur ekki tengst við netslóð.</string>
@@ -805,6 +807,9 @@
<string id="1257">Viltu tengjast uppgötvuðu kerfi?</string>
<string id="1260">Tilkynna þjónustur til annarra kerfa með Zeroconf</string>
+ <string id="1270">Leyfa XBMC að taka á móti AirPlay efni</string>
+ <string id="1271">Nafn tækis</string>
+ <string id="1272">- Nota lykilorð</string>
<string id="1300">Sérsniðið hljóðtæki</string>
<string id="1301">Sérsniðið gegnumstreymitæki</string>
@@ -981,6 +986,7 @@
<string id="12392">Klukkustundir</string>
<string id="12393">Dagar</string>
<string id="12394">Heildar uppitími</string>
+ <string id="12395">Rafhlaða</string>
<string id="12600">Veður</string>
@@ -1015,6 +1021,7 @@
<string id="13100">Flökt sía</string>
<string id="13101">Láta rekil ráða (þarfnast endurræsingar)</string>
+
<string id="13105">Lóðrétt auð samstilling</string>
<string id="13106">Óvirkt</string>
<string id="13107">Virkt við afspilun</string>
@@ -1062,9 +1069,11 @@
<string id="13200">Notendur</string>
<string id="13201">Eyða notanda '%s'?</string>
+
<string id="13204">Seinasti notandi:</string>
<string id="13205">Óþekkt</string>
<string id="13206">Yfirskrifa</string>
+
<string id="13208">Vekjaraklukka</string>
<string id="13209">Vekjaraklukku tími (í mínútum)</string>
<string id="13210">Ã gangi, vakning eftir %im</string>
@@ -1165,6 +1174,7 @@
<string id="13359">Setja smámynd á listamann</string>
<string id="13360">Búa til smámyndir</string>
<string id="13361">Virkja rödd</string>
+
<string id="13375">Virkja Tæki</string>
<string id="13376">Hljóðstyrkur</string>
<string id="13377">Sjálfgefinn sjónarhornsháttur</string>
@@ -1204,7 +1214,7 @@ fyrir þessa myndskreytingu</string>
<string id="13409">Topp 250</string>
<string id="13410">Stilla inn á Last.fm</string>
<string id="13411">Lágmarks viftuhraði</string>
-
+ <string id="13412">Spila hér</string>
<string id="13413">Niðurhala</string>
<string id="13414">Fela tónlistarmenn sem birtast aðeins á safndiskum</string>
<string id="13415">Teikni hamur</string>
@@ -1222,8 +1232,9 @@ fyrir þessa myndskreytingu</string>
<string id="13427">Leyfa vélbúnaðarhröðun (DXVA2)</string>
<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="13430">Leyfa vélbúnaðarhröðun (OpenMax)</string>
<string id="13431">Punktaskyggir</string>
+ <string id="13432">Leyfa vélbúnaðarhröðun (VideoToolbox)</string>
<string id="13500">A/V samstillingaraðferð</string>
<string id="13501">Hljóðklukka</string>
@@ -1325,7 +1336,7 @@ fyrir þessa myndskreytingu</string>
<string id="14070">Virkja stillingar núna</string>
<string id="14071">Leyfa að eyða skrám</string>
- <string id="14074">Setja tímabelti</string>
+ <string id="14074">Velja tímabelti</string>
<string id="14075">Nota sumartíma</string>
<string id="14076">Bæta við í uppáhalds</string>
<string id="14077">Fjarlægja úr uppáhalds</string>
@@ -1470,7 +1481,7 @@ fyrir þessa myndskreytingu</string>
<string id="16020">De-interlace</string>
<string id="16021">Bob</string>
<string id="16022">Bob (Umsnúinn)</string>
- <string id="16023">Interlaced meðhöndlun</string>
+ <string id="16023"/>
<string id="16024">Hætti við...</string>
<string id="16025">Sláðu inn nafn listamanns</string>
<string id="16026">Hætt við spilun spilunarlista</string>
@@ -1483,7 +1494,13 @@ fyrir þessa myndskreytingu</string>
<string id="16033">Gat ekki opnað gagnagrunn.</string>
<string id="16034">Gat ekki náð í lög frá gagnagrunni.</string>
<string id="16035">Partí spilunarlisti</string>
-
+ <string id="16036">De-interlace (Hálft)</string>
+ <string id="16037">Deinterlace mynd</string>
+ <string id="16038">Deinterlace aðferð</string>
+ <string id="16039">Af</string>
+ <string id="16040">Sjálfvirkt</string>
+ <string id="16041">Ã</string>
+
<string id="16100">Allar Myndir</string>
<string id="16101">Ekki búið að horfa á</string>
<string id="16102">Búið að horfa</string>
@@ -1500,8 +1517,8 @@ fyrir þessa myndskreytingu</string>
<string id="16206">Mistókst að eyða amk einni skrá</string>
<string id="16300">Skjástækkunaraðferð</string>
- <string id="16301">Næsti nágranni</string>
- <string id="16302">Tvílínulegt</string>
+ <string id="16301">Nearest neighbour</string>
+ <string id="16302">Bilinear</string>
<string id="16303">Bicubic</string>
<string id="16304">Lanczos2</string>
<string id="16305">Lanczos3</string>
@@ -1509,24 +1526,29 @@ fyrir þessa myndskreytingu</string>
<string id="16307">Bicubic (hugbúnaður)</string>
<string id="16308">Lanczos (hugbúnaður)</string>
<string id="16309">Sinc (hugbúnaður)</string>
- <string id="16310">Tími</string>
- <string id="16311">Tími/Rými</string>
+ <string id="16310">Temporal</string>
+ <string id="16311">Temporal/Spatial</string>
<string id="16312">(VDPAU)Suðhreinsun</string>
<string id="16313">(VDPAU)Skerpa</string>
- <string id="16314">Andhverf samfletting</string>
- <string id="16315">Lanczos3 fínstillt</string>
+ <string id="16314">Inverse Telecine</string>
+ <string id="16315">Lanczos3 optimized</string>
<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="16317">Temporal (Half)</string>
+ <string id="16318">Temporal/Spatial (Half)</string>
<string id="16319">DXVA</string>
-
+ <string id="16320">DXVA Bob</string>
+ <string id="16321">DXVA Best</string>
+ <string id="16322">Spline36</string>
+ <string id="16323">Spline36 optimized</string>
+ <string id="16324">Software Blend</string>
+
<string id="16400">Eftirvinnsla</string>
<string id="17500">Sýna biðtíma</string>
<string id="19000">Skipta yfir á rás</string>
- <string id="20000">CDDA afritunar mappa</string>
+ <string id="20000">Tónlistarmappa fyrir vistun</string>
<string id="20001">Nota ytri DVD spilara</string>
<string id="20002">Ytri DVD spilari</string>
<string id="20003">Svindl mappa</string>
@@ -1710,7 +1732,7 @@ fyrir þessa myndskreytingu</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="20193">Sjálfgefin þjónusta fyrir hljómplötuupplý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>
@@ -1729,6 +1751,9 @@ fyrir þessa myndskreytingu</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="20259">Network Filesystem (NFS)</string>
+ <string id="20260">Secure Shell (SSH/SFTP)</string>
+ <string id="20261">Apple Filing Protocol (AFP)</string>
<string id="20300">Mappa vefþjóns (HTTP)</string>
<string id="20301">Mappa vefþjóns (HTTPS)</string>
@@ -1781,22 +1806,23 @@ fyrir þessa myndskreytingu</string>
<string id="20355">Sæki upplýsingar um þætti í möppu</string>
<string id="20356">Veldu sjónvarpsþáttaröð:</string>
<string id="20357">Sláðu inn nafn á sjónvarpsþáttaröðinni</string>
- <string id="20358">Sería %i</string>
+ <string id="20358">Þáttaröð %i</string>
<string id="20359">Þáttur</string>
<string id="20360">Þættir</string>
<string id="20361">Sæki upplýsingar um þátt</string>
<string id="20362">Fjarlægja þátt úr safni</string>
<string id="20363">Fjarlægja sjónvarpsþátt úr safni</string>
- <string id="20364">Sjónvarpsþáttaröð</string>
+ <string id="20364">Sjónvarpsþáttur</string>
<string id="20365">Söguþráður þáttar</string>
- <string id="20366">* Allar seríur</string>
+ <string id="20366">* Allar þáttaraðir</string>
<string id="20367">Fela búið</string>
<string id="20368">Framleiðslu kóði</string>
<string id="20369">Fela söguþráð á því sem ekki er búið að horfa á</string>
<string id="20370">* Falið til að spilla ekki söguþræði *</string>
- <string id="20371">Velja smámynd fyrir seríu</string>
- <string id="20372">Mynd seríu</string>
- <string id="20373">Sería</string>
+ <string id="20371">Velja smámynd fyrir þáttaröð
+</string>
+ <string id="20372">Mynd þáttaraðar</string>
+ <string id="20373">Þáttaröð</string>
<string id="20374">Sæki upplýsingar um myndefni</string>
<string id="20375">Taka af innihald</string>
<string id="20376">Upprunalegur titill</string>
@@ -1805,7 +1831,7 @@ fyrir þessa myndskreytingu</string>
<string id="20379">Mappa inniheldur einn sjónvarpsþátt</string>
<string id="20380">Undanskilja möppu frá leit</string>
<string id="20381">Sérþættir</string>
- <string id="20382">Ná sjálfkrafa í seríusmámyndir</string>
+ <string id="20382">Ná sjálfkrafa í þáttaraðarsmámynd</string>
<string id="20383">Mappa inniheldur eina myndskrá</string>
<string id="20384">Tengja við sjónvarpsþáttaröð</string>
<string id="20385">Fjarlægja tengingu við sjónvarpsþáttaröð</string>
@@ -1836,15 +1862,16 @@ fyrir þessa myndskreytingu</string>
<string id="20410">Sýnishorn</string>
<string id="20411">Fletja</string>
<string id="20412">Fletja út sjónvarpsþætti</string>
- <string id="20413">Ná í aðdáenda grafík</string>
- <string id="20414">Sýna aðdáenda grafík í tónlistar- og myndabandasafni</string>
+ <string id="20413">Ná í aðdáendamyndir</string>
+ <string id="20414">Sýna aðdáendamyndir í tónlistar- og myndbandasafni</string>
<string id="20415">Leita að nýju efni</string>
<string id="20416">Sýnt fyrst</string>
<string id="20417">Handritshöfundur</string>
- <string id="20418">Hreinsa skráar- og möppunöfn</string>
+ <string id="20418"/>
+ <string id="20419">Sýna lýsigögn í skráarsýn</string>
<string id="20420">Aldrei</string>
- <string id="20421">Bara ef ein sería</string>
+ <string id="20421">Bara ef ein þáttaröð</string>
<string id="20422">Alltaf</string>
<string id="20423">Er með sýnishorn</string>
<string id="20424">Ósatt</string>
@@ -1857,8 +1884,8 @@ fyrir þessa myndskreytingu</string>
<string id="20431">Skrifa yfir eldri skrár?</string>
<string id="20432">Undanskilja slóð frá uppfærslu á safni</string>
<string id="20433">Ná í smámyndir og myndbandaupplýsingar</string>
- <string id="20434">Hópar</string>
- <string id="20435">Setja táknmynd myndasafns</string>
+ <string id="20434">Sett</string>
+ <string id="20435">Velja smámynd fyrir kvikmyndasett</string>
<string id="20436">Flytja út leikaramyndir?</string>
<string id="20437">Velja aðdáendamyndir</string>
<string id="20438">Staðbundnar aðdáendamyndir</string>
@@ -1879,6 +1906,9 @@ fyrir þessa myndskreytingu</string>
<string id="20453">þættir</string>
<string id="20454">Hlustandi</string>
<string id="20455">Hlustendur</string>
+ <string id="20456">Velja aðdáendamynd fyrir kvikmyndasett</string>
+ <string id="20457">Kvikmyndasett</string>
+ <string id="20458">Hópa saman kvikmyndir í sett</string>
<!-- up to 21329 is reserved for the video db !! !-->
<string id="21330">Sýna faldar skrár og möppur</string>
@@ -1899,8 +1929,9 @@ fyrir þessa myndskreytingu</string>
<string id="21365">Fjarlægja samnýtingu</string>
<string id="21366">Sérsniðin mappa fyrir þýðingartexta</string>
<string id="21367">Kvikmynda og auka mappa fyrir þýðingartexta</string>
-
- <string id="21369">Virkja mús</string>
+ <string id="21368">Hunsa ASS/SSA skjátexta leturgerð</string>
+
+ <string id="21369">Virkja stuðning við mús og snertiskjá</string>
<string id="21370">Leyfa leiðsagnarhljóð á meðan efni er spilað</string>
<string id="21371">Smámynd</string>
<string id="21372">Fastsetja svæði DVD spilara</string>
@@ -1985,6 +2016,15 @@ fyrir þessa myndskreytingu</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="21454">Skyndiminni fullt</string>
+ <string id="21455">Skyndiminni fylltist áður en tókst að ná í nauðsynlegt magn fyrir áframhaldandi spilun</string>
+
+ <string id="21460">Staðsetning þýðingartexta</string>
+ <string id="21461">Fastur</string>
+ <string id="21462">Neðst á mynd</string>
+ <string id="21463">Fyrir neðan mynd</string>
+ <string id="21464">Efst á mynd</string>
+ <string id="21465">Fyrir ofan mynd</string>
<string id="21800">Skráarnafn</string>
<string id="21801">Skáarslóð</string>
@@ -2000,7 +2040,7 @@ fyrir þessa myndskreytingu</string>
<string id="21821">Lýsing</string>
<string id="21822">Nafn myndavélar</string>
<string id="21823">Tegund myndavélar</string>
- <string id="21824">EXIF athugasemd</string>
+ <string id="21824">EXIF upplýsingar</string>
<string id="21825">Fastbúnaður</string>
<string id="21826">Ljósop</string>
<string id="21827">Linsustærð</string>
@@ -2151,12 +2191,12 @@ fyrir þessa myndskreytingu</string>
<string id="24021">Gera viðbót óvirka</string>
<string id="24022">Virkja viðbót</string>
<string id="24023">Viðbót óvirk</string>
- <string id="24027">Veðurþjónsusta</string>
+ <string id="24027">Veðurþjónusta</string>
<string id="24028">Weather.com (sjálfgefið)</string>
- <string id="24030">Ekki ert hægt að stilla þessa viðbót</string>
+ <string id="24030">Ekki er hægt að stilla þessa viðbót</string>
<string id="24031">Villa við að hlaða inn stillingum</string>
- <string id="24032">Öll söfn</string>
- <string id="24033">Söfn</string>
+ <string id="24032">Allar viðbætur</string>
+ <string id="24033">Sækja viðbætur</string>
<string id="24034">Leita að uppfærslum</string>
<string id="24035">Þvinga endurnýjun</string>
<string id="24036">Breytingaskrá</string>
@@ -2165,8 +2205,13 @@ fyrir þessa myndskreytingu</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="24042">Niðurhaa %i%%</string>
<string id="24043">Fáanlegar uppfærslur</string>
+ <string id="24044">Kröfur voru ekki uppfylltar</string>
+ <string id="24045">Viðbót er ekki rétt uppsett</string>
+ <string id="24046">%s er notað af eftirfarandi viðbótum</string>
+ <string id="24047">Ekki er hægt að taka þessa viðbót út</string>
+ <string id="24048">Niðurfæra útgáfu</string>
<string id="24050">Tiltækar viðbætur</string>
<string id="24051">Útgáfa:</string>
@@ -2183,7 +2228,7 @@ fyrir þessa myndskreytingu</string>
<string id="24066">Hætta við að niðurhala viðbót?</string>
<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="24069">Uppfæra</string>
<string id="24070">Ekki tókst að hlaða inn viðbót.</string>
<string id="24071">Óþekkt villa kom upp.</string>
@@ -2191,14 +2236,19 @@ fyrir þessa myndskreytingu</string>
<string id="24073">Gat ekki tengst</string>
<string id="24074">Þarfnast endurræsingar</string>
<string id="24075">Gera óvirkt</string>
+ <string id="24076">Þarfnast viðbótar</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="24094">(núna)</string>
+ <string id="24095">(á bannlista)</string>
<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="24099">Viltu skipta yfir á þetta útlit?</string>
+ <string id="24100">Til að nota þetta þarftu að hala niður viðbót:</string>
+ <string id="24101">Viltu hala niður þessari viðbót?</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 -->
@@ -2227,12 +2277,12 @@ fyrir þessa myndskreytingu</string>
<string id="33015">Spyrja um niðurhal áður en myndband er spilað</string>
<string id="33016">Úrklippur</string>
<string id="33017">Endurræstu viðbót til að gera virkt</string>
- <string id="33018">Úrklippur</string>
+ <string id="33018">à kvöld</string>
<string id="33019">Aðra nótt</string>
<string id="33020">Staða</string>
<string id="33021">Úrkoma</string>
<string id="33022">Úrkoma</string>
- <string id="33023">Rakur</string>
+ <string id="33023">Raki</string>
<string id="33024">Skynjast sem</string>
<string id="33025">Sést sem</string>
<string id="33026">Frávík frá venjulegu</string>
@@ -2283,6 +2333,13 @@ fyrir þessa myndskreytingu</string>
<string id="33082">Slóð á skriftu</string>
<string id="33083">Virkja takka fyrir sérsniðna skriftu</string>
+ <string id="33100">Tókst ekki að ræsa</string>
+ <string id="33101">Vefþjónn</string>
+ <string id="33102">Atburðaþjónn</string>
+ <string id="33103">Fjartengdur samskiptaþjónn</string>
+
+ <string id="33200">Uppgötvaði nýja tengingu</string>
+
<!-- translators: no need to add these to your language files -->
<string id="34000">Lame</string>
<string id="34001">Vorbis</string>
@@ -2304,4 +2361,52 @@ fyrir þessa myndskreytingu</string>
<string id="34110">7.1</string>
<!-- 34112-34200 reserved for future use -->
+ <string id="34201">Finn ekki næsta hlut til að spila</string>
+ <string id="34202">Finn ekki fyrri hlut til að spila</string>
+
+ <string id="34300">Gat ekki ræst zeroconf</string>
+ <string id="34301">Er Apple Bonjour þjónusta uppsett? Athugaðu atburðaskrá fyrir meiri upplýsingar.</string>
+
+ <string id="34400">Skjábirting</string>
+ <string id="34401">Gat ekki frumstillt skjá síur/kvarða, fer til baka í tvílínulega kvörðun</string>
+ <string id="34402">Gat ekki frumstillt hljóðkerfi</string>
+ <string id="34403">Athugaðu hljóðstillingar</string>
+
+ <string id="35000">Tæki</string>
+
+ <string id="35001">Almennt HID tæki</string>
+ <string id="35002">Almennt netkort</string>
+ <string id="35003">Almennur diskur</string>
+ <string id="35004">Engar stillingar eru tiltækar
+fyrir þetta tæki.</string>
+ <string id="35005">Nýtt tæki skilgreint</string>
+ <string id="35006">Tæki fjarlægt</string>
+ <string id="35007">Lyklavörpun sem á að nota fyrir þetta tæki</string>
+ <string id="35008">Lyklavörpun virk</string>
+
+ <string id="35500">Staðsetning</string>
+ <string id="35501">Klasi</string>
+ <string id="35502">Nafn</string>
+ <string id="35503">Söluaðili</string>
+ <string id="35504">Auðkenni vöru</string>
+
+ <string id="36000">Pulse-Eight CEC tengispjald</string>
+ <string id="36001">Pulse-Eight Nyxboard</string>
+ <string id="36002">Skipta yfir í hliðar lyklaborð</string>
+ <string id="36003">Skipta yfir í hliðar fjarstýringu</string>
+ <string id="36004">Ãttu á "user" hnapp</string>
+ <string id="36005">Virkja að skipta á milli hliðarskipana</string>
+ <string id="36006">Gat ekki opnað tengispjald</string>
+ <string id="36007">Kveikja á sjónvarpinu þegar XBMC er ræst</string>
+ <string id="36008">Slökkva á tækjum þegar slökkt er á XBMC</string>
+ <string id="36009">Setja tæki í biðstöðu þegar skjávari er virkur</string>
+ <string id="36010"/>
+ <string id="36011">Fann ekki CEC gátt. Settu það upp handvirkt.</string>
+ <string id="36012">Fann ekki CEC tengispjald.</string>
+ <string id="36013">Þessi útgáfa af libcec er ekki studd. %d er hærri en útgáfan sem XBMC styður (%d)</string>
+ <string id="36014">Setja tölvuna í biðstöðu þegar slökkt er á sjónvarpinu</string>
+ <string id="36015">HDMI gátt</string>
+ <string id="36016">Tengdur</string> <!-- max. 13 characters -->
+ <string id="36017">Fann tengispjald, en libcec er ekki tiltækt</string>
+ <string id="36018">Nota tungumál sjónvarps</string>
</strings>
diff --git a/language/Italian/strings.xml b/language/Italian/strings.xml
index d11c54fc4c..abcc3c7cc1 100644
--- a/language/Italian/strings.xml
+++ b/language/Italian/strings.xml
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!--Language file translated with Team XBMC Translator-->
-<!--Translator: succo-->
-<!--Email: succo69@libero.it-->
-<!--Date of translation: 11/07/2010-->
-<!--$Revision$-->
-<!--Based on english strings version 35193-->
+<!--Translator: Succo, updated by Gulp-->
+<!--Email: succo69@libero.it, http://forum.xbmc.org/member.php?u=42290-->
+<!--Based on English 98d103ae66a1e81e379e65dd131341cd119cfcf2 (21.01.2012)-->
<strings>
<string id="0">Programmi</string>
<string id="1">Immagini</string>
@@ -16,6 +13,7 @@
<string id="7">File</string>
<string id="8">Meteo</string>
<string id="9">xbmc media center</string>
+
<string id="11">Lunedì</string>
<string id="12">Martedì</string>
<string id="13">Mercoledì</string>
@@ -23,6 +21,7 @@
<string id="15">Venerdì</string>
<string id="16">Sabato</string>
<string id="17">Domenica</string>
+
<string id="21">Gennaio</string>
<string id="22">Febbraio</string>
<string id="23">Marzo</string>
@@ -35,6 +34,7 @@
<string id="30">Ottobre</string>
<string id="31">Novembre</string>
<string id="32">Dicembre</string>
+
<string id="41">Lun</string>
<string id="42">Mar</string>
<string id="43">Mer</string>
@@ -42,6 +42,7 @@
<string id="45">Ven</string>
<string id="46">Sab</string>
<string id="47">Dom</string>
+
<string id="51">Gen</string>
<string id="52">Feb</string>
<string id="53">Mar</string>
@@ -54,6 +55,16 @@
<string id="60">Ott</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>
@@ -61,6 +72,8 @@
<string id="84">ONO</string>
<string id="85">NO</string>
<string id="86">NNO</string>
+ <string id="87">VAR</string>
+
<string id="98">Vedi: Auto</string>
<string id="99">Vedi: Auto grande</string>
<string id="100">Vedi: Icone</string>
@@ -71,7 +84,7 @@
<string id="105">Ordina per Dim.</string>
<string id="106">No</string>
<string id="107">Si</string>
- <string id="108">Slideshow</string>
+ <string id="108">Presentazione</string>
<string id="109">Crea le icone</string>
<string id="110">Crea le icone</string>
<string id="111">Collegamenti</string>
@@ -113,7 +126,7 @@
<string id="147">Statico</string>
<string id="148">DHCP</string>
<string id="149">MAC address</string>
- <string id="150">IP</string>
+ <string id="150">Indirizzo IP</string>
<string id="151">Connessione:</string>
<string id="152">Half duplex</string>
<string id="153">Full duplex</string>
@@ -130,16 +143,16 @@
<string id="164">Senza disco</string>
<string id="165">Disco presente</string>
<string id="166">Skin</string>
- <string id="167">
- </string>
+
<string id="169">Risoluzione</string>
- <string id="170">Regola la frequenza di aggiornamento </string>
- <string id="171">
- </string>
+ <string id="170">Regola la frequenza di aggiornamento</string>
+
<string id="172">Data di uscita:</string>
<string id="173">Mostra video 4:3 come</string>
- <string id="175">Atteggiamenti </string>
+
+ <string id="175">Atteggiamenti</string>
<string id="176">Stili</string>
+
<string id="179">Canzone</string>
<string id="180">Durata</string>
<string id="181">Seleziona l'album</string>
@@ -161,8 +174,10 @@
<string id="197">Richiesta %s informazioni</string>
<string id="198">Caricamento dettagli del film</string>
<string id="199">Interfaccia web</string>
+
<string id="202">Tema</string>
<string id="203">Sintesi</string>
+
<string id="205">Voti</string>
<string id="206">Attori</string>
<string id="207">Trama</string>
@@ -180,6 +195,7 @@
<string id="221">Rete non connessa</string>
<string id="222">Annulla</string>
<string id="224">Velocità</string>
+ <string id="225">Spostamento Verticale</string>
<string id="226">Immagine di prova</string>
<string id="227">Cerca i nomi delle tracce audio su freedb.org</string>
<string id="228">Mescola playlist all'avvio</string>
@@ -200,6 +216,7 @@
<string id="243">Frequenza di Refresh</string>
<string id="244">Schermo intero</string>
<string id="245">Dimensione: (%i,%i)-&gt;(%i,%i) (Zoom x%2.2f) AR:%2.2f:1 (Pixel: %2.2f:1)</string>
+
<string id="247">Scripts</string>
<string id="248">Lingua</string>
<string id="249">Musica</string>
@@ -237,19 +254,18 @@
<string id="281">Ricontrolla i file .xml</string>
<string id="282">Trovato/i %i elemento/i</string>
<string id="283">Risultati della ricerca</string>
- <string id="284">Ricerca fallita</string>
- <string id="286">
- </string>
+ <string id="284">Nessun risultato</string>
+
<string id="287">Sottotitoli</string>
<string id="288">Carattere</string>
<string id="289">- Dimensione</string>
- <string id="290">Dynamic range compression</string>
+ <string id="290">Ampiezza compressione dinamica</string>
<string id="291">Video</string>
<string id="292">Audio</string>
<string id="293">Esplora sottotitoli</string>
<string id="294">Crea segnalibro</string>
<string id="296">Cancella segnalibri</string>
- <string id="297">Offset audio</string>
+ <string id="297">Sfasamento audio</string>
<string id="298">Segnalibri</string>
<string id="299">- ricevitore compatibile AAC</string>
<string id="300">- ricevitore compatibile MP1</string>
@@ -259,16 +275,7 @@
<string id="304">Lingua</string>
<string id="305">Attivo</string>
<string id="306">Non-interlacciato</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">Riorganizza archivio</string>
<string id="314">Preparazione...</string>
@@ -361,6 +368,7 @@
<string id="404">Vento</string>
<string id="405">P. di rugiada</string>
<string id="406">Umidità</string>
+
<string id="409">Predefinitio</string>
<string id="410">Accesso a servizio meteo</string>
<string id="411">Aggiorno le previsioni meteo per:</string>
@@ -373,6 +381,7 @@
<string id="418">Basso</string>
<string id="419">Alto</string>
<string id="420">HDMI</string>
+
<string id="422">Elimina le info sull'album</string>
<string id="423">Elimina info CD</string>
<string id="424">Seleziona</string>
@@ -386,6 +395,7 @@
<string id="432">Eliminare il film dal archivio</string>
<string id="433">Sicuro di voler cancellare '%s'?</string>
<string id="434">Da %s a %i %s</string>
+
<string id="437">Disco rimuovibile</string>
<string id="438">Apertura file</string>
<string id="439">Cache</string>
@@ -429,6 +439,7 @@
<string id="480">Aspetto</string>
<string id="481">Opzioni audio</string>
<string id="482">Informazioni su XBMC</string>
+
<string id="485">Elimina album</string>
<string id="486">Ripeti</string>
<string id="487">Ripeti una volta</string>
@@ -456,11 +467,11 @@
<string id="513">Schermata Home</string>
<string id="514">Impostazioni manuali</string>
<string id="515">Genere</string>
+
<string id="517">Album riprodotti di recente</string>
<string id="518">Avvia</string>
<string id="519">Avvia in...</string>
- <string id="520">
- </string>
+
<string id="521">Compilations</string>
<string id="522">Rimuovi sorgente</string>
<string id="523">Cambia media</string>
@@ -489,6 +500,7 @@
<string id="546">Dispositivo d'uscita passtrough</string>
<string id="547">Nessuna biografia per questo artista</string>
<string id="548">Converti l'audio multicanale in stereo</string>
+
<string id="550">Ordina per: %s</string>
<string id="551">Nome</string>
<string id="552">Data</string>
@@ -515,6 +527,8 @@
<string id="573">Percorso</string>
<string id="574">Nazione</string>
<string id="575">In corso</string>
+ <string id="576">Numero di riproduzioni</string>
+
<string id="580">Direzione ordinamento</string>
<string id="581">Metodo di ordinamento</string>
<string id="582">Modalità di visualizzazione</string>
@@ -533,12 +547,14 @@
<string id="595">Ripeti: Inattivo</string>
<string id="596">Ripeti: Uno</string>
<string id="597">Ripeti: Tutto</string>
+
<string id="600">Rip CD audio</string>
<string id="601">Medio</string>
<string id="602">Standard</string>
<string id="603">Estremo</string>
<string id="604">Bit rate costante</string>
<string id="605">Rip in corso...</string>
+
<string id="607">A:</string>
<string id="608">Impossibile rip del CD o della traccia</string>
<string id="609">Il percorso CDDARip non è impostato</string>
@@ -546,6 +562,7 @@
<string id="611">Inserire numero</string>
<string id="612">Bit/Campionamento</string>
<string id="613">Frequenza Campionamento</string>
+
<string id="620">CD Audio</string>
<string id="621">Codificatore</string>
<string id="622">Qualità</string>
@@ -583,26 +600,30 @@
<string id="657">Cerca cartella</string>
<string id="658">Informazioni canzone</string>
<string id="659">Adattamento non lineare</string>
+
<string id="660">Amplificazione volume</string>
<string id="661">Selez. cartella esportazione</string>
<string id="662">Questo file non è più disponibile.</string>
<string id="663">Vuoi rimuoverlo dall'archivio?</string>
<string id="664">Cerca Script</string>
<string id="665">Livello Compressione</string>
+
<string id="700">Pulisci l'archivio</string>
<string id="701">Eliminazione vecchie canzoni dall'archivio</string>
<string id="702">Questo percorso è già stato esaminato in precedenza.</string>
<string id="705">Rete</string>
<string id="706">- Server</string>
+
<string id="708">Usa un server proxy HTTP per accedere a internet</string>
+
<string id="711">Internet Protocol (IP)</string>
<string id="712">Porta specificata non valida. Inserire un valore compreso tra 1 and 65535.</string>
<string id="713">HTTP proxy</string>
+
<string id="715">- Assegnazione</string>
<string id="716">Automatico (DHCP)</string>
<string id="717">Manuale (Static)</string>
- <string id="718">
- </string>
+
<string id="719">- Indirizzo IP</string>
<string id="720">- Netmask</string>
<string id="721">- Default gateway</string>
@@ -613,7 +634,9 @@
<string id="726">Modifiche non salvate. Continuare senza salvare?</string>
<string id="727">Web server</string>
<string id="728">FTP server</string>
+
<string id="730">- Porta</string>
+
<string id="732">Salva e applica</string>
<string id="733">- Password</string>
<string id="734">Nessuna password</string>
@@ -634,10 +657,12 @@
<string id="749">Rifletti immagine</string>
<string id="750">Sei sicuro?</string>
<string id="751">Rimuovo sorgente</string>
+
<string id="754">Aggiungi collegamento</string>
<string id="755">Modifica percorso</string>
<string id="756">Modifica nome programma</string>
<string id="757">Modifica profondità percorso</string>
+
<string id="759">Visualizza: Lista grande</string>
<string id="760">Giallo</string>
<string id="761">Bianco</string>
@@ -647,9 +672,10 @@
<string id="765">Azzurro</string>
<string id="766">Grigio chiaro</string>
<string id="767">Grigio</string>
+ <!-- strings 768 and 769 reserved for more subtitle colors -->
+
<string id="770">Errore %i: condivisione non disponibile</string>
- <string id="771">
- </string>
+
<string id="772">Uscita audio</string>
<string id="773">Cercando</string>
<string id="774">Cartella per salvaschermo fotografico</string>
@@ -668,6 +694,7 @@
<string id="787">Interfaccia disabilitata</string>
<string id="788">Disabilitazione dell'interfaccia di rete effettuata con successo.</string>
<string id="789">Nome della rete wireless (ESSID)</string>
+
<string id="791">Permetti ai programmi installati di controllare XBMC</string>
<string id="792">Porta</string>
<string id="793">Range porte</string>
@@ -676,14 +703,19 @@
<string id="796">Ritardo ripetizione continuo (ms)</string>
<string id="797">Numero massimo di clients</string>
<string id="798">Accesso a Internet</string>
+
<string id="850">Inserito un numero di porta non valido</string>
<string id="851">Il numero di porta deve essere compreso tra 1-65535</string>
<string id="852">Il numero di porta deve essere compreso tra 1024-65535</string>
+
+ <string id="998">Aggiungi Musica...</string>
+ <string id="999">Aggiungi Video...</string>
<string id="1000">- Anteprima</string>
<string id="1001">Impossibile connettersi</string>
<string id="1002">XBMC non è riuscito a connettersi all'indirizzo di rete.</string>
<string id="1003">La possibile causa potrebbe essere la rete scollegata.</string>
<string id="1004">Vuoi aggiungerlo comunque?</string>
+
<string id="1006">Indirizzo IP</string>
<string id="1007">Aggiungi indirizzo di rete</string>
<string id="1008">Protocollo</string>
@@ -712,8 +744,8 @@
<string id="1031">Cerca cartella immagini</string>
<string id="1032">Aggiungi locazione di rete...</string>
<string id="1033">Cerca file</string>
- <string id="1034">Sottomenu</string>
- <string id="1035">Attiva pulsanti sottomenu</string>
+ <string id="1034">Sottomenù</string>
+ <string id="1035">Attiva pulsanti sottomenù</string>
<string id="1036">Preferiti</string>
<string id="1037">Addon Video</string>
<string id="1038">Addon Musica</string>
@@ -730,18 +762,21 @@
<string id="1049">Impostazioni script</string>
<string id="1050">Singoli</string>
<string id="1051">Inserisci l'indirizzo web</string>
- <string id="1200">SMB client</string>
- <string id="1202">Workgroup</string>
- <string id="1203">Default username</string>
- <string id="1204">Default password</string>
- <string id="1207">WINS server</string>
+
+ <string id="1200">client SMB</string>
+ <string id="1202">Gruppo di lavoro</string>
+ <string id="1203">Nome utente di default</string>
+ <string id="1204">Password di default</string>
+
+ <string id="1207">server WINS</string>
<string id="1208">Monta condivisioni SMB</string>
+
<string id="1210">Rimuovi</string>
<string id="1211">Musica</string>
<string id="1212">Video</string>
<string id="1213">Immagini</string>
- <string id="1214">File</string>
- <string id="1215">Musica e video </string>
+ <string id="1214">Files</string>
+ <string id="1215">Musica e video</string>
<string id="1216">Musica e immagini</string>
<string id="1217">Musica e file</string>
<string id="1218">Video e immagini</string>
@@ -760,22 +795,24 @@
<string id="1233">Programmi, video e musica</string>
<string id="1234">Programmi, immagini e musica</string>
<string id="1235">Programmi, immagini e video</string>
- <string id="1245">
- </string>
- <string id="1246">
- </string>
- <string id="1247">
- </string>
+
<string id="1250">Autorilevamento</string>
<string id="1251">Autorilevamento sistema</string>
<string id="1252">Nick name</string>
+
<string id="1254">Richiedi di connetersi</string>
<string id="1255">Invia user e password FTP</string>
<string id="1256">Intervallo ping</string>
<string id="1257">Vuoi connetterti al sistema rilevato?</string>
+
<string id="1260">Annuncia questi servizi ad altri sistemi via Zeroconf</string>
+ <string id="1270">Permetti ad XBMC di ricevere contenuti da AirPlay</string>
+ <string id="1271">Nome periferica</string>
+ <string id="1272">- Proteggi con password</string>
+
<string id="1300">Dispositipo audio personalizzato</string>
<string id="1301">Dispositivo passthrough personalizzato</string>
+
<string id="1396">Mutevole</string>
<string id="1397">e</string>
<string id="1398">Gelata</string>
@@ -793,7 +830,7 @@
<string id="1410">Calmo</string>
<string id="1411">con</string>
<string id="1412">ventilato</string>
- <string id="1413">pioggerella</string>
+ <string id="1413">pioggia leggera</string>
<string id="1414">Temporale</string>
<string id="1415">Acquerugiola</string>
<string id="1416">Nebbie</string>
@@ -804,15 +841,19 @@
<string id="1421">Molto Alto</string>
<string id="1422">Ventoso</string>
<string id="1423">Nebbia</string>
+
+ <!-- strings through to 1450 reserved for weather translation -->
+
<string id="1450">Metti lo schermo in risparmio energetico quando inattivo</string>
+ <!-- strings through to 1470 reserved for power-saving -->
+
<string id="2050">Durata:</string>
+
<string id="2100">Esecuzione script non riuscita! : %s</string>
<string id="2101">Necessaria una versione più recente - Controlla il log</string>
- <string id="2102">
- </string>
- <string id="2103">
- </string>
+
<string id="4501">Abilita LCD/VFD</string>
+
<string id="10000">Home</string>
<string id="10001">Programmi</string>
<string id="10002">Immagini</string>
@@ -835,15 +876,19 @@
<string id="10019">Impostazioni - Aspetto</string>
<string id="10020">Script</string>
<string id="10021">Browser Web</string>
+
<string id="10028">Video/Playlist</string>
<string id="10034">Impostazioni - Profili</string>
+
<string id="10100">Casella di dialogo si/no</string>
- <string id="10101">Progressione</string>
+ <string id="10101">Casella di Progresso</string>
+
<string id="10210">Cerco i sottotitoli...</string>
<string id="10211">Ricerca o memorizzazione sottotitoli...</string>
<string id="10212">terminando</string>
<string id="10213">buffering</string>
<string id="10214">Apertura stream</string>
+
<string id="10500">Musica/Playlist</string>
<string id="10501">Musica/File</string>
<string id="10502">Musica/Archivio</string>
@@ -856,11 +901,14 @@
<string id="10509">Gioco online</string>
<string id="10510">Estensioni</string>
<string id="10511">Info sistema</string>
+
<string id="10516">Musica - Archivio</string>
<string id="10517">Musica - In Riproduzione</string>
+
<string id="10522">Video - In Riproduzione</string>
<string id="10523">Info album</string>
<string id="10524">Info film</string>
+
<string id="12000">Casella di selezione</string>
<string id="12001">Musica/Info</string>
<string id="12002">Dialog OK</string>
@@ -868,32 +916,15 @@
<string id="12004">Script/Info</string>
<string id="12005">Video a schermo intero</string>
<string id="12006">Effetti grafici</string>
+
<string id="12008">Casella di unisci</string>
<string id="12009">Ricostruzione indice...</string>
<string id="12010">Ritorna in musica</string>
<string id="12011">Ritorna in video</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">Parti dall'inizio</string>
<string id="12022">Riprendi da %s</string>
- <string id="12023">
- </string>
+
<string id="12310">0</string>
<string id="12311">1</string>
<string id="12312">2</string>
@@ -943,34 +974,31 @@
<string id="12377">Questo resetterà i valori salvati in precendeza</string>
<string id="12378">Tempo di visualizzazione di ogni immagine</string>
<string id="12379">Usa gli effetti pan e zoom</string>
- <string id="12380">
- </string>
- <string id="12381">
- </string>
- <string id="12382">
- </string>
+
<string id="12383">Orario in 12 ore</string>
<string id="12384">Orario in 24 ore</string>
<string id="12385">Giorno/Mese</string>
<string id="12386">Mese/Giorno</string>
+
<string id="12390">Tempo di vita del sistema</string>
<string id="12391">Minuti</string>
<string id="12392">Ore</string>
<string id="12393">Giorni</string>
<string id="12394">Tempo totale d'accensione</string>
+ <string id="12395">Livello Batteria</string>
+
<string id="12600">Meteo</string>
+
<string id="12900">Salvaschermo</string>
<string id="12901">OSD a schermo intero</string>
+
<string id="13000">Sistema</string>
<string id="13001">Autospegnimento hard disk immediato</string>
<string id="13002">Solo video</string>
<string id="13003">- Ritardo</string>
<string id="13004">- Durata minima del file</string>
<string id="13005">Spegni</string>
- <string id="13006">
- </string>
- <string id="13007">
- </string>
+
<string id="13008">Funzionalità spegnimento</string>
<string id="13009">Chiudi</string>
<string id="13010">Iberna</string>
@@ -980,15 +1008,19 @@
<string id="13014">Riduci ad icona</string>
<string id="13015">Comportamento tasto power</string>
<string id="13016">Spegni Sistema</string>
+
<string id="13020">C'è un'altra sessione attiva, forse via SSH?</string>
<string id="13021">Hard disk rimuovibile montato</string>
<string id="13022">Rimozione insicura</string>
<string id="13023">Rimozione periferica effettuata</string>
<string id="13024">Joystick inserito</string>
<string id="13025">Joystick disinserito</string>
+
<string id="13050">Batteria scarica</string>
+
<string id="13100">Filtro sfarfallio</string>
<string id="13101">Fai scegliere al driver (riavvio necessario)</string>
+
<string id="13105">Vertical blank sync</string>
<string id="13106">Disattivato</string>
<string id="13107">Attivo durante la riproduzione video</string>
@@ -996,10 +1028,12 @@
<string id="13109">Prova e applica risoluzione</string>
<string id="13110">Salva risoluzione?</string>
<string id="13111">Vuoi mantenere questa risoluzione?</string>
+
<string id="13112">Ridimensionamento ad alta qualità</string>
<string id="13113">Disabilitato</string>
<string id="13114">Attivo per Contenuto SD</string>
<string id="13115">Sempre attivo</string>
+
<string id="13116">Modalità di ridimensionamento</string>
<string id="13117">Bicubico</string>
<string id="13118">Lanczos</string>
@@ -1007,74 +1041,55 @@
<string id="13120">VDPAU</string>
<string id="13121">Livello VDPAU HQ Upscaling</string>
<string id="13122">Livello di conversione colore VDPAU Studio</string>
+
<string id="13130">Svuota gli altri schermi</string>
<string id="13131">Disabilitato</string>
<string id="13132">Schermi vuoti</string>
+
<string id="13140">Rilevata connessione attiva!</string>
<string id="13141">Se continui, potresti non essere in grado di controllare XBMC.</string>
<string id="13142">Sei sicuro di voler fermare l'Event server?</string>
+
<string id="13144">Modifica modalità Apple Remote?</string>
<string id="13145">Se stai usando un Apple Remote per controllare</string>
<string id="13146">XBMC, cambiare quest'impostazione potrebbe impedirti</string>
<string id="13147">di continuare a controllarlo. Vuoi continuare?</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">Maschera subnet:</string>
<string id="13160">Gateway:</string>
<string id="13161">DNS Primario</string>
<string id="13162">Inizializzazione fallita</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">Mai</string>
<string id="13171">Immediatamente</string>
<string id="13172">Dopo %i secondi</string>
<string id="13173">Data installazione hard disk:</string>
<string id="13174">Conteggio spegnimenti HDD:</string>
+
<string id="13200">Profili</string>
<string id="13201">Cancella profilo '%i'?</string>
+
<string id="13204">Ultimo profilo caricato:</string>
<string id="13205">Sconosciuto</string>
<string id="13206">Sovrascrivi</string>
+
<string id="13208">Allarme sveglia</string>
<string id="13209">Intervallo allarme sveglia (in minutes)</string>
<string id="13210">Partito, allarme tra %im</string>
<string id="13211">Allarme!</string>
<string id="13212">Annullato con ancora %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="13249">Cerca sottotili nei file RAR</string>
<string id="13250">Mostra sottotili...</string>
<string id="13251">Sposta l'elemento</string>
<string id="13252">Sposta l'elemento qui</string>
<string id="13253">Annulla spostamento</string>
+
<string id="13270">Hardware:</string>
<string id="13271">Utilizzo CPU:</string>
+
<string id="13274">Connesso, ma non c'è nessun DNS disponibile.</string>
<string id="13275">Hard Disk</string>
<string id="13276">DVD-ROM</string>
@@ -1083,20 +1098,25 @@
<string id="13279">Rete</string>
<string id="13280">Video</string>
<string id="13281">Hardware</string>
+
<string id="13283">Sistema operativo:</string>
<string id="13284">Velocità CPU:</string>
+
<string id="13286">Codificatore video:</string>
<string id="13287">Risoluzione schermo:</string>
+
<string id="13292">Cavo A/V:</string>
+
<string id="13294">Regione DVD:</string>
<string id="13295">Internet:</string>
<string id="13296">Connessa</string>
<string id="13297">Non connessa. Controlla configurazione rete!</string>
+
<string id="13299">Temperatura da raggiungere</string>
<string id="13300">Velocità ventola</string>
<string id="13301">Controllo automatico temperatura</string>
<string id="13302">Controllo velocità ventola</string>
- <string id="13303">- Font</string>
+ <string id="13303">- Carattere</string>
<string id="13304">Abilita inversione in stringhe bidirezionali</string>
<string id="13305">Mostra i feed RSS</string>
<string id="13306">Mostra gli elementi delle cartelle superiori</string>
@@ -1110,8 +1130,8 @@
<string id="13314">Dissolvenza tra le tracce</string>
<string id="13315">Ricrea le icone</string>
<string id="13316">Icone ricorsive</string>
- <string id="13317">Vedi lo slideshow</string>
- <string id="13318">Slideshow ricorsivo</string>
+ <string id="13317">Vedi la Presentazione</string>
+ <string id="13318">Presentazione ricorsiva</string>
<string id="13319">Ordine sparso</string>
<string id="13320">Stereo</string>
<string id="13321">Solo sinistra</string>
@@ -1130,6 +1150,7 @@
<string id="13334">Edit label</string>
<string id="13335">Imposta predefinito</string>
<string id="13336">Rimuovi pulsante</string>
+
<string id="13340">Lascia com'è</string>
<string id="13341">Verde</string>
<string id="13342">Arancione</string>
@@ -1152,6 +1173,7 @@
<string id="13359">Setta icona artista</string>
<string id="13360">Crea le icone automaticamente</string>
<string id="13361">Attiva voce</string>
+
<string id="13375">Attiva dispositivo</string>
<string id="13376">Volume</string>
<string id="13377">Modalità di visione predefinita</string>
@@ -1176,7 +1198,7 @@
<string id="13396">Impostazioni audio e sottotitoli</string>
<string id="13397">Attiva sottotitoli</string>
<string id="13398">Scorciatoie</string>
- <string id="13399">Ignora l'articolo ("il","lo", etc.) davanti al nome nell'ordinamento </string>
+ <string id="13399">Ignora l'articolo ("il","lo", etc.) davanti al nome nell'ordinamento</string>
<string id="13400">Dissolvenza tra le tracce dello steso album</string>
<string id="13401">Mostra per %s</string>
<string id="13402">Mostra posizione traccia</string>
@@ -1189,6 +1211,7 @@
<string id="13409">Top 250</string>
<string id="13410">Sintonizzati su Last.FM</string>
<string id="13411">Minima vel. ventola</string>
+ <string id="13412">Riproduci da qui</string>
<string id="13413">Download in corso</string>
<string id="13414">Includi gli artisti presenti solo nelle compilation</string>
<string id="13415">Metodo di render</string>
@@ -1198,7 +1221,7 @@
<string id="13419">Software</string>
<string id="13420">Rimozione sicura</string>
<string id="13421">VDPAU</string>
- <string id="13422">Avvia lo slideshow da qui</string>
+ <string id="13422">Avvia la presentazione da qui</string>
<string id="13423">Ricorda per questo percorso</string>
<string id="13424">Usa oggetti pixel buffer</string>
<string id="13425">Abilita accelerazione hardware (VDPAU)</string>
@@ -1208,6 +1231,8 @@
<string id="13429">Abilita accelerazione hardware (VDADecoder)</string>
<string id="13430">Abilita accelerazione hardware (OpenMax)</string>
<string id="13431">Pixel Shaders</string>
+ <string id="13432">Abilita accelerazione hardware (VideoToolbox)</string>
+
<string id="13500">Metodo di sincronizzazione A/V</string>
<string id="13501">Clock audio</string>
<string id="13502">Clock video (Lascia/Aggiungi audio)</string>
@@ -1219,19 +1244,25 @@
<string id="13508">Alta</string>
<string id="13509">Molto alta</string>
<string id="13510">Sincronizza il suono all'immagine</string>
+
<string id="13550">Pausa durante il cambio di frequenza</string>
<string id="13551">Spento</string>
<string id="13552">%.1f Secondo</string>
<string id="13553">%.1f Secondi</string>
+
<string id="13600">Telecomando Apple</string>
+
<string id="13602">Permetti avvio di XBMC da telecomando</string>
<string id="13603">Ritardo nella sequenza</string>
+
<string id="13610">Disabilitato</string>
<string id="13611">Standard</string>
<string id="13612">Telecomando Universale</string>
<string id="13613">Telecomando Multi (Harmony)</string>
+
<string id="13620">Errore Apple Remote</string>
<string id="13621">Il supporto per Apple Remote non è stato attivato.</string>
+
<string id="14000">Unisci volumi</string>
<string id="14001">Dividi volumi</string>
<string id="14003">Scaricamento file playlist...</string>
@@ -1239,6 +1270,7 @@
<string id="14005">Esamino lista streams...</string>
<string id="14006">Scaricamento lista streams fallito</string>
<string id="14007">Scaricamento file playlist fallito</string>
+
<string id="14009">Cartella giochi</string>
<string id="14010">Attivazione vista ad icone per</string>
<string id="14011">Auto-attivazione vista ad icone</string>
@@ -1265,11 +1297,12 @@
<string id="14034">cache DVD - DVD-ROM</string>
<string id="14035">- Rete Locale</string>
<string id="14036">Servizi</string>
+
<string id="14038">Impostazioni di rete cambiate</string>
<string id="14039">XBMC deve essere riavviato per cambiare le</string>
<string id="14040">tue impostazioni di rete. Vuoi riavviare adesso?</string>
- <string id="14041">
- </string>
+ <string id="14041">Limite di banda connessione Internet</string>
+
<string id="14043">- Spegnimento durante l'esecuzione</string>
<string id="14044">%i min</string>
<string id="14045">%i sec</string>
@@ -1281,6 +1314,7 @@
<string id="14051">Formato orario</string>
<string id="14052">Formato data</string>
<string id="14053">Filtri interfaccia</string>
+
<string id="14055">Usa scansione in background</string>
<string id="14056">Ferma scansione</string>
<string id="14057">Non si può durante la scansione informazioni media</string>
@@ -1298,6 +1332,7 @@
<string id="14069">Vuoi salvare queste impostazioni adesso?</string>
<string id="14070">Salva impostazioni</string>
<string id="14071">Consenti la rinominazione e la cancellazione dei file</string>
+
<string id="14074">Imposta il fuso orario</string>
<string id="14075">Passa all'ora legale</string>
<string id="14076">Aggiungi ai preferiti</string>
@@ -1320,21 +1355,27 @@
<string id="14093">Sicurezza</string>
<string id="14094">Dispositivi di input</string>
<string id="14095">Risparmio energetico</string>
+
<string id="15015">Rimuovi</string>
<string id="15016">Giochi</string>
+
<string id="15019">Aggiungi</string>
+
<string id="15052">Password</string>
+
<string id="15100">Archivio</string>
<string id="15101">Banca dati</string>
<string id="15102">* Tutti gli album</string>
<string id="15103">* Tutti gli artisti</string>
<string id="15104">* Tutte le canzoni</string>
<string id="15105">* Tutti i generi</string>
+
<string id="15107">Caricando...</string>
<string id="15108">Suoni di navigazione</string>
<string id="15109">Default della skin</string>
<string id="15111">- Tema</string>
<string id="15112">Tema di default</string>
+
<string id="15200">Last.fm</string>
<string id="15201">Invia le canzoni a Last.fm</string>
<string id="15202">Nome utente Last.fm</string>
@@ -1357,6 +1398,7 @@
<string id="15219">Password di Libre.fm</string>
<string id="15220">Libre.fm</string>
<string id="15221">Invio canzone</string>
+
<string id="15250">Invia la radio Last.fm a Last.fm</string>
<string id="15251">Connessione a Last.fm...</string>
<string id="15252">Selezione stazione...</string>
@@ -1393,7 +1435,7 @@
<string id="15283">Traccce recentemente ascoltate da %name%</string>
<string id="15284">Ascolta le %name%'s raccomandazioni Last.fm radio</string>
<string id="15285">Etichette preferite per l'utente %name%</string>
- <string id="15286">Ascolta la playlist Last.fm radio di %name%</string>
+
<string id="15287">Vuoi aggiungere la traccia corrente alle tue preferite?</string>
<string id="15288">Vuoi vietare la traccia corrente?</string>
<string id="15289">Aggiunta alle tue traccie preferite: '%s'.</string>
@@ -1406,16 +1448,21 @@
<string id="15296">Riammetti</string>
<string id="15297">Vuoi rimuovere questa traccia dalle tracce preferite?</string>
<string id="15298">Vuoi togliere il divieto a questa traccia?</string>
+
<string id="15300">Percorso non trovato o invalido</string>
<string id="15301">Non è stato possibile connettersi al server</string>
<string id="15302">Nessun server trovato</string>
<string id="15303">Nessun workgroup trovato</string>
+
<string id="15310">Apertura sorgente multipercorso</string>
<string id="15311">Percorso:</string>
+
<string id="16000">Generale</string>
+
<string id="16002">Ricerca Internet</string>
<string id="16003">Lettore</string>
<string id="16004">Riproduci i media dal disco</string>
+
<string id="16008">Inserire nuovo titolo</string>
<string id="16009">Inserire nome del film</string>
<string id="16010">Inserire nome del profilo</string>
@@ -1431,7 +1478,7 @@
<string id="16020">DeInterlaccia</string>
<string id="16021">Bob</string>
<string id="16022">Bob (invertito)</string>
- <string id="16023">Modifiche interlacciate</string>
+ <string id="16023"></string>
<string id="16024">Annullando...</string>
<string id="16025">Inserire nome artista</string>
<string id="16026">Riproduzione fallita</string>
@@ -1443,13 +1490,21 @@
<string id="16032">Impossibile inizializzare il database.</string>
<string id="16033">Impossibile aprire il database.</string>
<string id="16034">Impossibile ricavare canzoni dal database.</string>
- <string id="16035">Party mode playlist</string>
+ <string id="16035">Playlist modalità party</string>
+ <string id="16036">Deinterlaccia (metà)</string>
+ <string id="16037">Deinterlaccia il video</string>
+ <string id="16038">Metodo di deinterlacciamento</string>
+ <string id="16039">Off</string>
+ <string id="16040">Auto</string>
+ <string id="16041">On</string>
+
<string id="16100">Tutti i video</string>
<string id="16101">Non visti</string>
<string id="16102">Già visti</string>
<string id="16103">Segna come già visto</string>
<string id="16104">Segna come non visto</string>
<string id="16105">Modifica titolo</string>
+
<string id="16200">L'operazione è stata annullata</string>
<string id="16201">Copia non riuscita</string>
<string id="16202">Almeno un file non è stato copiato</string>
@@ -1457,6 +1512,7 @@
<string id="16204">Almeno un file non è stato spostato</string>
<string id="16205">Cancellazione non riuscita</string>
<string id="16206">Almeno un file non è stato cancellato</string>
+
<string id="16300">Metodo di ridimensionamento</string>
<string id="16301">Più vicino</string>
<string id="16302">Bilineare</string>
@@ -1477,21 +1533,29 @@
<string id="16317">Temporale (mezzo)</string>
<string id="16318">Temporale/Spaziale (mezzo)</string>
<string id="16319">DXVA</string>
+ <string id="16320">DXVA Bob</string>
+ <string id="16321">DXVA Best</string>
+ <string id="16322">Spline36</string>
+ <string id="16323">Spline36 ottimizzato</string>
+ <string id="16324">Software Blend</string>
+
<string id="16400">Video post-processing</string>
- <string id="16401">Disattivato</string>
- <string id="16402">Attivato per contenuto SD</string>
- <string id="16403">Sempre Attivato</string>
+
<string id="17500">Tempo di spegnimento display</string>
+
<string id="19000">Cambia al canale</string>
+
<string id="20000">Cartella per il salvataggio della musica</string>
<string id="20001">Usa un player DVD esterno</string>
<string id="20002">Player DVD esterno</string>
<string id="20003">Cartella dei trainer</string>
<string id="20004">Cartella per gli screenshot</string>
+
<string id="20006">Cartella playlists</string>
<string id="20007">Registrazioni</string>
<string id="20008">Screenshots</string>
<string id="20009">Usa XBMC</string>
+
<string id="20011">Playlists musica</string>
<string id="20012">Playlists video</string>
<string id="20013">Vuoi lanciare il gioco?</string>
@@ -1501,12 +1565,16 @@
<string id="20017">Icona locale</string>
<string id="20018">Nessuna icona</string>
<string id="20019">Seleziona icona</string>
- <string id="20022">
- </string>
+
+ <!-- string id 20022 will always be set to an empty string (LocalizeStrings.cpp)-->
+ <string id="20022"></string>
<string id="20023">Conflitto</string>
<string id="20024">Scansiona nuovo</string>
<string id="20025">Scansiona tutto</string>
<string id="20026">Regione</string>
+
+ <!-- string id's 20027 thru 20034 are reserved for temperature strings (LocalizeStrings.cpp)-->
+
<string id="20037">Sommario</string>
<string id="20038">Blocca sezione musica</string>
<string id="20039">Blocca sezione video</string>
@@ -1526,6 +1594,7 @@
<string id="20053">Uscito da master mode</string>
<string id="20054">Entrato in master mode</string>
<string id="20055">Icona Allmusic.com</string>
+
<string id="20057">Rimuovi icona</string>
<string id="20058">Aggiungi profilo...</string>
<string id="20059">Cerca info per tutti gli album</string>
@@ -1580,7 +1649,7 @@
<string id="20108">Root</string>
<string id="20109">- Zoom</string>
<string id="20110">UPnP client</string>
- <string id="20111">Autostart client UPnP </string>
+ <string id="20111">Autostart client UPnP</string>
<string id="20112">Ultimo login: %s</string>
<string id="20113">Mai loggato</string>
<string id="20114">Profilo %i / %i</string>
@@ -1655,6 +1724,7 @@
<string id="20184">Ruota le immagini usando le informazioni EXIF</string>
<string id="20185">Usa la vista a poster per le serie TV</string>
<string id="20186">Attendere Prego</string>
+
<string id="20189">Attiva lo scorrimento automatico per la trama e la recensione</string>
<string id="20190">Custom</string>
<string id="20191">Attiva il debug logging</string>
@@ -1666,6 +1736,9 @@
<string id="20197">Importa archivio musicale</string>
<string id="20198">Nessun artista trovato!</string>
<string id="20199">Scaricamento info artista fallito</string>
+
+ <!-- string id's 20200 thru 20211 are reserved for speedstrings (LocalizeStrings.cpp)-->
+
<string id="20250">Party attivo! (videos)</string>
<string id="20251">Mixando bevande (videos)</string>
<string id="20252">Riempiendo bicchieri (videos)</string>
@@ -1675,36 +1748,33 @@
<string id="20256">HTS Tvheadend client</string>
<string id="20257">VDR Streamdev client</string>
<string id="20258">Client Myth TV</string>
+ <string id="20259">Network Filesystem (NFS)</string>
+ <string id="20260">Shell sicura(SSH/SFTP)</string>
+ <string id="20261">Apple Filing Protocol (AFP)</string>
+
<string id="20300">Web server directory (HTTP)</string>
<string id="20301">Web server directory (HTTPS)</string>
<string id="20302">Impossibile scrivere nella cartella:</string>
<string id="20303">Vuoi ignorare e procedere?</string>
<string id="20304">RSS Feed</string>
- <string id="20306">
- </string>
+
<string id="20307">DNS secondario</string>
- <string id="20308">DHCP server:</string>
+ <string id="20308">server DHCP:</string>
<string id="20309">Crea nuova cartella</string>
<string id="20310">Oscura LCD se in riproduzione</string>
<string id="20311">Sconosciuto o installato (protetto)</string>
<string id="20312">Oscura LCD se in pausa</string>
- <string id="20313">
- </string>
+
<string id="20314">Video - Archivio</string>
+
<string id="20316">Ordina per: ID</string>
- <string id="20320">
- </string>
- <string id="20321">
- </string>
- <string id="20322">
- </string>
- <string id="20323">
- </string>
+
<string id="20324">Play part...</string>
<string id="20325">Reset calibrazione</string>
<string id="20326">Questo resetterà il valore di calibrazione per %s</string>
<string id="20327">al suo valore originale.</string>
<string id="20328">Cerca la destinazione</string>
+
<string id="20330">Usa i nomi delle cartelle per le ricerche</string>
<string id="20331">File</string>
<string id="20332">Uso i nomi dei files o delle cartelle per le ricerche?</string>
@@ -1779,11 +1849,12 @@
<string id="20401">Riproduci video musicale</string>
<string id="20402">Scarica le icone degli attori all'aggiunta in archivio</string>
<string id="20403">Imposta icona attore</string>
+
<string id="20405">Rimuovi segnalibro episodio</string>
<string id="20406">Imposta segnalibro episodio</string>
<string id="20407">Impostazioni scraper</string>
<string id="20408">Scaricamento informazioni video musicale</string>
- <string id="20409">Scaricamento informazioni serie TV </string>
+ <string id="20409">Scaricamento informazioni serie TV</string>
<string id="20410">Trailer</string>
<string id="20411">Spiana</string>
<string id="20412">Spiana serie TV</string>
@@ -1793,6 +1864,8 @@
<string id="20416">Prima visione</string>
<string id="20417">Scrittore</string>
<string id="20418">Pulisci i nomi dei files e delle cartelle</string>
+ <string id="20419">Mostra i metadati nella vista files</string>
+
<string id="20420">Mai</string>
<string id="20421">Se solo una stagione</string>
<string id="20422">Sempre</string>
@@ -1829,7 +1902,12 @@
<string id="20453">episodi</string>
<string id="20454">In Ascolto</string>
<string id="20455">In Ascolto</string>
+ <string id="20456">Imposta l'immagine fanart per un set di filmati</string>
+ <string id="20457">imposta filmato</string>
+ <!-- up to 21329 is reserved for the video db !! !-->
+
<string id="21330">Mostra i files e le cartelle nascoste</string>
+
<string id="21331">TuxBox client</string>
<string id="21332">ATTENZIONE: il dispositivo TuxBox è in modalità registrazione!</string>
<string id="21333">Lo stream verrà fermato!</string>
@@ -1837,12 +1915,17 @@
<string id="21335">Sicuro di fare partire lo stream ?</string>
<string id="21336">Connessione a: %s</string>
<string id="21337">Dispositivo TuxBox</string>
+ <!-- up to 21355 is reserved for the TuxBox Client!! !-->
+
<string id="21359">Aggiungi condivisione media...</string>
<string id="21360">Condividi gli archivi musicali e video attraverso UPnP</string>
+
<string id="21364">Modifica condivisioni media</string>
<string id="21365">Rimuovi condivisioni media</string>
<string id="21366">Cartella sottotitoli</string>
<string id="21367">Film &amp; cartella sottotitoli alternativa</string>
+ <string id="21368">Override ASS/SSA subtitles fonts</string>
+
<string id="21369">Abilita il mouse</string>
<string id="21370">Suoni di navigazione attivi durante la riproduzione</string>
<string id="21371">Icone</string>
@@ -1928,6 +2011,16 @@
<string id="21451">Richiesta connessione Internet.</string>
<string id="21452">Altro...</string>
<string id="21453">Root filesystem</string>
+ <string id="21454">Cache piena</string>
+ <string id="21455">Cache saturata prima di raggiungere il livello richiesto per una riproduzione fluida</string>
+
+ <string id="21460">Cartella dei sottotitoli</string>
+ <string id="21461">Fissa</string>
+ <string id="21462">Bordo inferiore del video</string>
+ <string id="21463">Sotto il video</string>
+ <string id="21464">Bordo superiore del video</string>
+ <string id="21465">Sopra il video</string>
+
<string id="21800">Nome file</string>
<string id="21801">Percorso file</string>
<string id="21802">Dimensione file</string>
@@ -1937,6 +2030,7 @@
<string id="21806">Commento</string>
<string id="21807">Colori/bn</string>
<string id="21808">Processo JPEG</string>
+
<string id="21820">Data/Ora</string>
<string id="21821">Descrizione</string>
<string id="21822">Marca fotocamera</string>
@@ -1961,6 +2055,7 @@
<string id="21841">Longitudine GPS</string>
<string id="21842">Altitudine GPS</string>
<string id="21843">Orientamento</string>
+
<string id="21860">Categorie supplementari</string>
<string id="21861">Parole chiave</string>
<string id="21862">Titolo</string>
@@ -2002,9 +2097,14 @@
<string id="21898">Anni attività</string>
<string id="21899">Etichetta</string>
<string id="21900">Nato/Formato</string>
+
+ <!-- strings 21900 thru 21999 reserved for slideshow info -->
+
<string id="22000">Aggiorna l'archivio all'avvio</string>
<string id="22001">Nascondi avanzamento aggiornamento archivio</string>
<string id="22002">- Suffisso DNS</string>
+
+ <string id="22003">%2.3fs</string>
<string id="22004">In ritardo di: %2.3fs</string>
<string id="22005">In anticipo di: %2.3fs</string>
<string id="22006">Offset sottotitoli</string>
@@ -2024,8 +2124,10 @@
<string id="22020">Guida</string>
<string id="22021">Errore proporzioni permesso per ridurre le barre nere</string>
<string id="22022">Mostra i file video nelle liste</string>
- <string id="22023">DirectX Vendor:</string>
+ <string id="22023">Fornitore DirectX:</string>
<string id="22024">Versione Direct3D:</string>
+
+ <!-- strings 22030 thru 22060 reserved for karaoke -->
<string id="22030">Carattere</string>
<string id="22031">- Dimensione</string>
<string id="22032">- Colore</string>
@@ -2040,25 +2142,33 @@
<string id="22041">bianco/rosso</string>
<string id="22042">bianco/blu</string>
<string id="22043">nero/bianco</string>
+
<string id="22079">Azione predefinita di selezione</string>
<string id="22080">Scegli</string>
<string id="22081">Mostra Informazioni</string>
<string id="22082">Altro...</string>
<string id="22083">Riproduci tutto</string>
+
<string id="23049">Teletext non disponibile</string>
<string id="23050">Attiva il Teletext</string>
<string id="23051">Parte %i</string>
<string id="23052">Buffering %i bytes</string>
<string id="23053">In arresto</string>
<string id="23054">In esecuzione</string>
+
+ <!-- strings 23100 thru 23150 reserved for external player -->
<string id="23100">Player Esterno Attivato</string>
<string id="23101">Premi OK per chiudere il player</string>
+
<string id="23104">Premi OK al termine della riproduzione</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">Opzioni Add-on</string>
<string id="24003">Informazioni Add-on</string>
- <string id="24005">Plugin</string>
+
+ <string id="24005">Sorgenti files multimediali</string>
<string id="24007">Scraper Film</string>
<string id="24008">Salvaschermo</string>
<string id="24009">Script</string>
@@ -2067,9 +2177,11 @@
<string id="24012">Servizio Sottotitoli</string>
<string id="24013">Servizio Testi</string>
<string id="24014">Scraper Serie TV</string>
- <string id="24015">Scraper Videoclip </string>
+ <string id="24015">Scraper Videoclip</string>
<string id="24016">Scraper Album</string>
<string id="24017">Scraper Artista</string>
+ <string id="24018">Servizi</string>
+
<string id="24020">Configura</string>
<string id="24021">Disabilita</string>
<string id="24022">Abilita</string>
@@ -2090,6 +2202,12 @@
<string id="24041">Installa da un file zip</string>
<string id="24042">Scaricando %i%%</string>
<string id="24043">Aggiornamenti Disponibili</string>
+ <string id="24044">Dipendenze non soddisfatte</string>
+ <string id="24045">L'Add-on non ha una struttura corretta</string>
+ <string id="24046">%s è usato al momento dai seguenti add-on(s)</string>
+ <string id="24047">Questo add-on non può essere rimosso</string>
+ <string id="24048">Regredire versione</string>
+
<string id="24050">Add-ons disponibili</string>
<string id="24051">Versione:</string>
<string id="24052">Informazioni</string>
@@ -2106,35 +2224,37 @@
<string id="24067">Download dell'Add-ons in corso</string>
<string id="24068">Aggiornamento disponibile</string>
<string id="24069">Aggiorna</string>
- <string id="24070">L' Add-on non può essere caricato</string>
+
+ <string id="24070">L'Add-on non può essere caricato</string>
<string id="24071">Si è verificato un errore sconosciuto.</string>
<string id="24072">Impostazioni richieste</string>
<string id="24073">Impossibile connettersi</string>
<string id="24074">Riavvio richiesto</string>
<string id="24075">Disabilita</string>
+ <string id="24076">Add-on Richiesto</string>
<string id="24080">Provo a riconnettere?</string>
<string id="24089">Riavvio dell'Add-on</string>
<string id="24090">Blocca il manager degli 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="24094">(currente)</string>
+ <string id="24095">(blacklisted)</string>
<string id="24096">Questo Add-on è segnalato non funzionante nel repository.</string>
<string id="24097">Vuoi disabilitarlo nel tuo sistema?</string>
<string id="24098">Non funzionante</string>
<string id="24099">Vuoi passare a questa skin?</string>
+ <string id="24100">Per usare questa funzione occorre scaricare un Add-on:</string>
+ <string id="24101">Vuoi scaricare questo Add-on?</string>
<string id="25000">Notifiche</string>
+
+ <!-- strings 29800 thru 29998 reserved strings used only in the default Project Mayhem III skin and not c++ code -->
<string id="29800">Modo Archivio</string>
<string id="29801">Tastiera QWERTY</string>
<string id="29802">Periferica Audio passthrough utilizzata</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 addons -->
<string id="33001">Qualità trailer</string>
<string id="33002">Stream</string>
<string id="33003">Scarica</string>
@@ -2167,7 +2287,7 @@
<string id="33030">Vista</string>
<string id="33031">Coverflow</string>
<string id="33032">Traduci testo</string>
- <string id="33033">Lsta mappa %s categoria</string>
+ <string id="33033">Lista mappa %s categoria</string>
<string id="33034">36 Ore</string>
<string id="33035">Mappe</string>
<string id="33036">Orario</string>
@@ -2207,5 +2327,79 @@
<string id="33081">Questo file è multiplo, seleziona la parte da cui iniziare la riproduzione.</string>
<string id="33082">Percorso per lo script</string>
<string id="33083">Abilita il pulsante per lo script personalizzato</string>
- <string id="34100">Configurazione casse</string>
+
+ <string id="33100">Avvio fallito</string>
+ <string id="33101">Webserver</string>
+ <string id="33102">Server Eventi</string>
+ <string id="33103">Server comunicazione remota</string>
+
+ <string id="33200">Rilevata una nuova connessione</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">Configurazione altoparlanti</string>
+ <string id="34101">2.0</string>
+ <string id="34102">2.1</string>
+ <string id="34103">3.0</string>
+ <string id="34104">3.1</string>
+ <string id="34105">4.0</string>
+ <string id="34106">4.1</string>
+ <string id="34107">5.0</string>
+ <string id="34108">5.1</string>
+ <string id="34109">7.0</string>
+ <string id="34110">7.1</string>
+ <!-- 34112-34200 reserved for future use -->
+
+ <string id="34201">Non trovo il successivo elemento da riprodurre</string>
+ <string id="34202">Non trovo il precedente elemento da riprodurre</string>
+
+ <string id="34300">Avvio di zeroconf fallito</string>
+ <string id="34301">Il servizio Apple Bonjour è installato? Controllare i log per maggiori informazioni.</string>
+
+ <string id="34400">Rendering Video</string>
+ <string id="34401">Fallita l'inizializzazione dei filtri/scalers video, ritorno al bilinear scaling</string>
+ <string id="34402">Fallita l'inizializzazione dei dispositivi audio</string>
+ <string id="34403">Controlla le impostazioni audio</string>
+
+ <string id="35000">Periferiche</string>
+ <string id="35001">Periferica HID generica</string>
+ <string id="35002">Adattatore di rete generico</string>
+ <string id="35003">Disco generico</string>
+ <string id="35004">Non ci sono impostazioni disponibili&#10;per questa periferica.</string>
+ <string id="35005">Nuova periferica configurata</string>
+ <string id="35006">Periferica rimossa</string>
+ <string id="35007">Mappa dei caratteri da usare per questa periferica</string>
+ <string id="35008">Mappa dei caratteri abilitata</string>
+
+ <string id="35500">Posizione</string>
+ <string id="35501">Classe</string>
+ <string id="35502">Nome</string>
+ <string id="35503">Fornitore</string>
+ <string id="35504">ID prodotto</string>
+
+ <string id="36000">Adattatore CEC Pulse-Eight</string>
+ <string id="36001">Pulse-Eight Nyxboard</string>
+ <string id="36002">Passa ai comandi da tastiera</string>
+ <string id="36003">Passa ai controlli al telecomando</string>
+ <string id="36004">Premi il bottone "user"</string>
+ <string id="36005">Enable switch side commands</string>
+ <string id="36006">Non riesco ad accedere all'adattatore</string>
+ <string id="36007">Accendi la TV all'avvio di XBMC</string>
+ <string id="36008">Spegni la TV all'uscita da XBMC</string>
+ <string id="36009">Imposta il dispositivo in stanby all'attivazione dello screensaver</string>
+ <string id="36010"></string>
+ <string id="36011">Impossibile trovare la porta CEC. Impostala manualmente.</string>
+ <string id="36012">Impossibile connettersi all'adattatore CEC.</string>
+ <string id="36013">Versione interfaccia libcec non supportata. %d è maggiore della versione supportata da XBMC (%d)</string>
+ <string id="36014">Metti il pc in standby quando la TV viene spenta</string>
+ <string id="36015">Numero porta HDMI</string>
+ <string id="36016">Connesso</string> <!-- max. 13 characters -->
+ <string id="36017">Adattatore trovato, ma libcec non è disponibile</string>
+ <string id="36018">Usa il linguaggio impostato sulla TV</string>
</strings>
diff --git a/language/Lithuanian/strings.xml b/language/Lithuanian/strings.xml
index 3bd4730ede..ab1a878a13 100644
--- a/language/Lithuanian/strings.xml
+++ b/language/Lithuanian/strings.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--Translator: Artūras Griškonis (ArtX38)-->
<!--Email: info@xbmc.lt-->
-<!--Date of translation: 11/11/2011-->
-<!--Based on english strings version 34a9a95a2ce4d3eb4079e241747fd0d6d51dc1ea-->
+<!--Date of translation: 21/01/2012-->
+<!--Based on english strings version 98d103ae66a1e81e379e65dd131341cd119cfcf2-->
<strings>
<string id="0">Programos</string>
<string id="1">Foto</string>
@@ -103,7 +103,7 @@
<string id="123">Kopijuoti failus?</string>
<string id="124">Perkelti failus?</string>
<string id="125">Ištrynti failus? - Atkūrimas neįmanomas</string>
- <string id="126">Statusas</string>
+ <string id="126">PadÄ—tis</string>
<string id="127">Objektas(-ai)</string>
<string id="128">Pagrindiniai</string>
<string id="129">Prezentacija</string>
@@ -129,8 +129,8 @@
<string id="149">MAC-adresas</string>
<string id="150">IP-adresas</string>
<string id="151">Sujungimas:</string>
- <string id="152">Pusiau abipusis</string>
- <string id="153">Abipusis</string>
+ <string id="152">Pusiau dvipusis</string>
+ <string id="153">Pilnai dvipusis</string>
<string id="154">Laikmenos</string>
<string id="155">DVD grotuvo dÄ—tuvÄ—</string>
<string id="156">Laisva</string>
@@ -148,7 +148,7 @@
<string id="168">Įjungti laiko sinhronizavimą internetu</string>
<string id="169">Ekrano rezoliucija</string>
<string id="170">Nustatyti ekrano atnaujinimo dažnį</string>
- <string id="171">Nustatyti nuo 4:3 iki 16:9</string>
+ <string id="171">IÅ¡didinti nuo 4:3 iki 16:9</string>
<string id="172">IÅ¡leidimo data</string>
<string id="173">Rodyti formatÄ… 4:3 kaip</string>
@@ -166,7 +166,7 @@
<string id="186">Gerai</string>
<string id="187">Albumų nerasta!</string>
<string id="188">Rinktis viskÄ…</string>
- <string id="189">Skaitmeninių duomenų skenavimas</string>
+ <string id="189">Media duomenų skenavimas</string>
<string id="190">IÅ¡saugoti</string>
<string id="191">Sumaišyti</string>
<string id="192">IÅ¡valyti</string>
@@ -197,7 +197,7 @@
<string id="220">Nuotoliniai resursai</string>
<string id="221">NeprisijungÄ™ prie tinklo</string>
<string id="222">Atšaukti</string>
- <string id="224">Prezentacijos rodimo laikas</string>
+ <string id="224">Prezentacijos rodymo laikas</string>
<string id="225">Vertikalus perÄ—jimas</string>
<string id="226">Testiniai Å¡ablonai...</string>
<string id="227">Ieškoti info apie audio CD internete</string>
@@ -253,7 +253,7 @@
<string id="277">Keiskite juostelę subtitrų rodymo koregavimui</string>
<string id="278">Keiskite staÄiakampį taip, kad pasiekti tikslų kvadratÄ…</string>
<string id="279">Nepavyko įkelti nustatymų</string>
- <string id="280">Naudoti numatytus nustatimus</string>
+ <string id="280">Naudoti numatytus nustatymus</string>
<string id="281">Prašome patikrinti XML failus</string>
<string id="282">Rasta %i objektas(-ų)</string>
<string id="283">Paieškos rezultatai</string>
@@ -267,7 +267,7 @@
<string id="291">Video</string>
<string id="292">Audio</string>
<string id="293">Pasirinkti subtitrus</string>
- <string id="294">Idėti užsklandą</string>
+ <string id="294">Įdėti užsklandą</string>
<string id="296">Nuimti užsklandą</string>
<string id="297">Garso perÄ—jimas</string>
<string id="298">Užsklanda</string>
@@ -308,7 +308,7 @@
<string id="333">Norite valyti bibliotekÄ…?</string>
<string id="334">Valyti bibliotekÄ…...</string>
<string id="335">PradÄ—ti</string>
- <string id="336">RÄ—melio normos konversija</string>
+ <string id="336">Kadrų dažnio konversija</string>
<string id="337">Garso formatas</string>
<string id="338">Analoginis</string>
<string id="339">Optinis/Koaxalinis</string>
@@ -360,9 +360,9 @@
<string id="388">Anksyvi</string>
<string id="389">Gausus</string>
<string id="390">Audrotas</string>
- <string id="391">Min.</string>
+ <string id="391">Žemas</string>
<string id="392">Vidutinis</string>
- <string id="393">Maks.</string>
+ <string id="393">Aukštas</string>
<string id="394">RÅ«kas</string>
<string id="395">Dunlksna</string>
<string id="396">Vietomis</string>
@@ -371,14 +371,14 @@
<string id="399">VÄ—jo geiÄio matavimo vienetas</string>
<string id="400">Oras</string>
<string id="401">Temperatūra</string>
- <string id="402">Laipsnių</string>
+ <string id="402">JauÄiasi kaip</string>
<string id="403">Uf lygis</string>
<string id="404">VÄ—jas</string>
- <string id="405">Laipsnių</string>
+ <string id="405">Rasos taškas</string>
<string id="406">DrÄ—gnumas</string>
<string id="409">Pagal nutilÄ—jimÄ…</string>
- <string id="410">Prijungimas prie hidrometeorologijos</string>
+ <string id="410">Prijungimas prie Hidrometeocentro</string>
<string id="411">Gauti orų prognozę:</string>
<string id="412">Neimanoma gauti orų prognozės</string>
<string id="413">Rankiniu būdu</string>
@@ -426,15 +426,15 @@
<string id="456">Režimas</string>
<string id="457">Pakeisti išvaizdą</string>
<string id="459">Subtitrai</string>
- <string id="460">Garso srautas</string>
+ <string id="460">Audio srautas</string>
<string id="461">[dirba]</string>
<string id="462">Subtitrai</string>
- <string id="463">Foninis apšvietimas</string>
- <string id="464">Apšvietimas</string>
+ <string id="463">Foninis ryškumas</string>
+ <string id="464">Ryškumas</string>
<string id="465">Kontrastas</string>
<string id="466">Gama</string>
<string id="467">Tipas</string>
- <string id="468">Judinkit juostelÄ™, kad pakeisti pozicijÄ… (OSD)</string>
+ <string id="468">Judinkit juostelÄ™ pozicijai pakeisti (OSD)</string>
<string id="469">Ekrano pozicija (OSD)</string>
<string id="470">KÅ«rÄ—jai</string>
<string id="471">ÐœOD-Äipas</string>
@@ -448,21 +448,21 @@
<string id="481">Audio nustatymai</string>
<string id="482">Apie XBMC</string>
- <string id="485">IÅ¡trynti albumÄ…</string>
+ <string id="485">IÅ¡trinti albumÄ…</string>
<string id="486">Kartoti</string>
<string id="487">Kartoti vienÄ… kartÄ…</string>
<string id="488">PapkÄ—s kartojimas</string>
<string id="489">Groti sekantį failą automatiškai</string>
- <string id="491">- naudoti didelius ženklus</string>
+ <string id="491">- naudoti didelius ženkliukus</string>
<string id="492">Subtitrų mastelis</string>
<string id="493">Papildomi duomenys (tik ekspertams!)</string>
- <string id="494">Bendras triukšmas kambaryje (dB)</string>
+ <string id="494">Bendras garso lygis patalpoje</string>
<string id="495">PerskaiÄiuoti vaizdo rezoliucijÄ… iki GUI</string>
<string id="496">Kalibravimas</string>
- <string id="497">SlÄ—pti failo pavadinimo tipus</string>
+ <string id="497">Rodyti failų plėtinius</string>
<string id="498">Rušiuoti pagal: Tipą</string>
<string id="499">Nepavyko prisijungti prie paieškos serverio</string>
- <string id="500">Nesėkminga atsisiųsti duomenis apie albumą</string>
+ <string id="500">Nesėkmingai atsiųsti duomenys apie albumą</string>
<string id="501">Albumų pavadinimų tikrinimas...</string>
<string id="502">Atidarytas</string>
<string id="503">Apdorojimas...</string>
@@ -472,7 +472,7 @@
<string id="510">Įjungti vaizdo efektus</string>
<string id="511">Auto perjungimas PAL/NTSC</string>
<string id="512">Paleidus pereiti į menių:</string>
- <string id="513">Pagrindinis meniu</string>
+ <string id="513">Pagrindinis menių</string>
<string id="514">Nustatymai</string>
<string id="515">Žanras</string>
@@ -485,14 +485,14 @@
<string id="522">Pašalinti šaltinį</string>
<string id="523">Pereiti į skirsnį...</string>
<string id="524">Pasirinkite grojaraštį</string>
- <string id="525">Sukurti nauja grojaraštį...</string>
- <string id="526">Idėti į grojaraštį</string>
- <string id="527">Idėti į biblioteką</string>
- <string id="528">Iršykite pavadinimą</string>
+ <string id="525">Sukurti naują grojaraštį...</string>
+ <string id="526">Įdėti į grojaraštį</string>
+ <string id="527">Įdėti į biblioteką</string>
+ <string id="528">Įrašykite pavadinimą</string>
<string id="529">Klaida: Vienodi pavadinimai</string>
<string id="530">Parinkite žanrą</string>
<string id="531">Naujas žanras</string>
- <string id="532">Rankinis idÄ—jimas</string>
+ <string id="532">Rankinis įdėjimas</string>
<string id="533">Įveskite žanrą</string>
<string id="534">Vaizdas: %s</string>
<string id="535">Sąrašas</string>
@@ -500,7 +500,7 @@
<string id="537">Pilnas sąrašas</string>
<string id="538">Dideli ženkliukai</string>
<string id="539">Platus</string>
- <string id="540">Platus stamb.</string>
+ <string id="540">Platus rieb.</string>
<string id="541">Albumų ženkliukai</string>
<string id="542">DVD ženkliukai</string>
<string id="543">DVD</string>
@@ -527,16 +527,16 @@
<string id="564">Tipas</string>
<string id="565">Dažnis</string>
<string id="566">Albumo atlikÄ—jas</string>
- <string id="567">Paleidimo kartų(us)</string>
+ <string id="567">Paleidimo kartus(ų)</string>
<string id="568">Paskutiniai groti(as)</string>
- <string id="569">Komentarus</string>
+ <string id="569">Koment.</string>
<string id="570">Įtraukimo data</string>
<string id="571">Kaip yra</string>
<string id="572">Kinostudija</string>
<string id="573">Kelias</string>
<string id="574">Å alis</string>
<string id="575">Procese</string>
- <string id="576">Grojo kartų(us)</string>
+ <string id="576">Grojo kartus(ų)</string>
<string id="580">RÅ«Å¡iavimo kryptis</string>
<string id="581">RÅ«Å¡iavimo metodas</string>
@@ -546,7 +546,7 @@
<string id="585">Pagal mažėjimą</string>
<string id="586">Taisyti grojaraštį</string>
<string id="587">Filtras</string>
- <string id="588">Atjungti režimą 'Party'</string>
+ <string id="588">Išjungti režimą 'Party'</string>
<string id="589">Režimas 'Party'</string>
<string id="590">Atsitiktinai</string>
<string id="591">IÅ¡jungta</string>
@@ -576,7 +576,7 @@
<string id="621">KoduotÄ—</string>
<string id="622">KokybÄ—</string>
<string id="623">Dumenų srautas</string>
- <string id="624">Dadėti takelio numerį</string>
+ <string id="624">Pridėti takelio numerį</string>
<string id="625">Visos dainos</string>
<string id="629">Peržiūros režimas</string>
<string id="630">Normalus</string>
@@ -596,8 +596,8 @@
<string id="644">Pašalinti juodas juostas</string>
<string id="645">Būtina išarchyvuoti didelį failą. Testi?</string>
<string id="646">Pašalinti iš bibliotekos</string>
- <string id="647">Eksportuoti video į biblioteką</string>
- <string id="648">Importuoti video iš bibliotekos</string>
+ <string id="647">Eksportuoti į video biblioteką</string>
+ <string id="648">Importuoti iš video bibliotekos</string>
<string id="649">Importas</string>
<string id="650">Eksportas</string>
<string id="651">Nurodykite bibliotekÄ…</string>
@@ -670,7 +670,7 @@
<string id="754">Pridėti nuorodą į programą</string>
<string id="755">Pakeisti programos keliÄ…</string>
<string id="756">Pakeisti programos pavadinimÄ…</string>
- <string id="757">Pakeisti kelio dydi</string>
+ <string id="757">Pakeisti kelio dydį</string>
<string id="759">Vaizdas: Didelis sąrašas</string>
<string id="760">Geltonas</string>
@@ -690,7 +690,7 @@
<string id="774">PapkÄ— prezentacijai</string>
<string id="775">Tinko sÄ…saja</string>
<string id="776">- Bevielio tinklo pavadinimas (ESSID)</string>
- <string id="777">- Bevielio tinklo slaptąžodis</string>
+ <string id="777">- Bevielio tinklo slaptažodis</string>
<string id="778">- Bevielio tinklo saugumas</string>
<string id="779">IÅ¡saugoti ir taikyti tinklo sÄ…sajÄ…</string>
<string id="780">Be Å¡ifravimo</string>
@@ -699,7 +699,7 @@
<string id="783">WPA2</string>
<string id="784">Tinklo sÄ…sajos parametrai taikomi, palaukite,...</string>
<string id="785">Tinklo sąsajos sėkmingai paleistos iš naujo</string>
- <string id="786">Tinklo sÄ…sajos paleistos nesÄ—kmyngai</string>
+ <string id="786">Tinklo sÄ…sajos paleistos nesÄ—kmingai</string>
<string id="787">Sąsaja yra išjungta</string>
<string id="788">Tinklo sÄ…sajos sÄ—kmingai atjungtos</string>
<string id="789">Bevielio tinklo pavadinimas (ESSID)</string>
@@ -720,10 +720,10 @@
<string id="998">PridÄ—ti Muzika...</string>
<string id="999">PridÄ—ti Video...</string>
<string id="1000">- Peržiūra</string>
- <string id="1001">Neimanoma prisijungti</string>
+ <string id="1001">Neįmanoma prisijungti</string>
<string id="1002">XBMC negali prisijungti prie tinklo.</string>
<string id="1003">Turbūt tinklas nepajungtas.</string>
- <string id="1004">Visvien pridÄ—ti?</string>
+ <string id="1004">Vistiek pridÄ—ti?</string>
<string id="1006">IP adresas</string>
<string id="1007">PridÄ—ti tinklo vietÄ…</string>
@@ -744,7 +744,7 @@
<string id="1022">Įveskite pavadinimą šiai bibliotekai</string>
<string id="1023">Nurodykite kitÄ… bibliotekÄ…</string>
<string id="1024">Peržiūra</string>
- <string id="1025">Neimanoma gauti informacijos apie papkÄ™</string>
+ <string id="1025">Neįmanoma gauti informacijos apie papkę</string>
<string id="1026">Pridėti šaltinį</string>
<string id="1027">Keisti šaltinį</string>
<string id="1028">Keisti šaltinį %s</string>
@@ -759,9 +759,9 @@
<string id="1037">Video priedai</string>
<string id="1038">Muzikos priedai</string>
<string id="1039">Foto priedai</string>
- <string id="1040">Parsisiųsti katalogą</string>
- <string id="1041">Atkurta %i objektas(-ų)</string>
- <string id="1042">Atkurta %i iš %i objektas(-ų)</string>
+ <string id="1040">Atsisiųsti katalogą</string>
+ <string id="1041">Atkurta %i objektų(-ai,as)</string>
+ <string id="1042">Atkurta %i iš %i objektų(-ai,as)</string>
<string id="1043">Programinės įrangos priedai</string>
<string id="1044">Sukurti eskizÄ… priedams</string>
<string id="1045">Priedų nustatymai</string>
@@ -774,28 +774,28 @@
<string id="1200">SMB vartotojas</string>
<string id="1202">Darbo grupÄ—</string>
- <string id="1203">Vartotojo vardas pagal nutilÄ—jimÄ…</string>
- <string id="1204">Vartotojo slaptažodis pagal nutilėjimą</string>
+ <string id="1203">Numatytas vartotojo vardas</string>
+ <string id="1204">Numatytas vartotojo slaptažodis</string>
<string id="1207">WINS serveris</string>
<string id="1208">Montuoti SMB resursus</string>
<string id="1210">Pašalinti</string>
<string id="1211">Muzika</string>
- <string id="1212">Vidio</string>
+ <string id="1212">Video</string>
<string id="1213">Foto</string>
- <string id="1214">Failus</string>
+ <string id="1214">Failai</string>
<string id="1215">Muzika &amp; video</string>
<string id="1216">Muzika &amp; foto</string>
- <string id="1217">Muzika &amp; failus</string>
+ <string id="1217">Muzika &amp; failai</string>
<string id="1218">Video &amp; foto</string>
- <string id="1219">Video &amp; failus</string>
- <string id="1220">Foto &amp; failus</string>
- <string id="1221">Muzika, video &amp; failus</string>
- <string id="1222">Muzika, video, foto &amp; failus</string>
+ <string id="1219">Video &amp; failai</string>
+ <string id="1220">Foto &amp; failai</string>
+ <string id="1221">Muzika, video &amp; failai</string>
+ <string id="1222">Muzika, video, foto &amp; failai</string>
<string id="1223">Atjungta</string>
<string id="1226">Failai, muzika &amp; video</string>
- <string id="1227">Failai, foto &amp; mzika</string>
+ <string id="1227">Failai, foto &amp; muzika</string>
<string id="1228">Failai, foto &amp; video</string>
<string id="1229">Muzika &amp; programos</string>
<string id="1230">Video &amp; programos</string>
@@ -824,7 +824,7 @@
<string id="1272">- Naudoti saugų slaptažodį</string>
<string id="1300">Kitas audio irenginys</string>
- <string id="1301">Kitas audio irenginys garsui</string>
+ <string id="1301">Kitas tiesioginio garso išvesties įrenginys</string>
<string id="1396">Plikledis</string>
<string id="1397">ir</string>
@@ -862,7 +862,7 @@
<string id="2050">TrukmÄ—</string>
- <string id="2100">Skriptas ikÄ—lÄ— klaidÄ…! : %s</string>
+ <string id="2100">Skriptas nesÄ—kmingas! : %s</string>
<string id="2101">Reikalinga naujesnė versija - Žiurėkite žurnalą</string>
<string id="4501">Įjungti LCD/VFD displėjų</string>
@@ -888,16 +888,16 @@
<string id="10018">Nustatymai - Tinklas</string>
<string id="10019">Nustatymai - IÅ¡vaizda</string>
<string id="10020">Skriptai</string>
- <string id="10021">Interneto naršyklė</string>
+ <string id="10021">Interneto Naršyklė</string>
<string id="10028">Video/Grojaraštis</string>
<string id="10034">Nustatymai - Profilis</string>
- <string id="10100">Taip/Ne dialogas</string>
- <string id="10101">Pažanga dialoge</string>
+ <string id="10100">Dialogas 'Taip/Ne'</string>
+ <string id="10101">Dialogas Vykdymas</string>
<string id="10210">Subtitrų paieška...</string>
- <string id="10211">Subtitrų paieška talpykloje...</string>
+ <string id="10211">Paieška arba subtitrų buferizacija...</string>
<string id="10212">užbaigimas</string>
<string id="10213">buferizacija</string>
<string id="10214">Srauto atidarymas</string>
@@ -937,7 +937,7 @@
<string id="12021">Pradėti nuo pradžios</string>
<string id="12022">Tęsti nuo %s</string>
- <string id="12023">Patikrinti esamÄ… instruktcija...</string>
+ <string id="12023">Patikrinti esamÄ… instruktcijÄ…...</string>
<string id="12310">0</string>
<string id="12311">1</string>
@@ -952,7 +952,7 @@
<string id="12320">c</string>
<string id="12321">Ok</string>
<string id="12322">*</string>
- <string id="12325">Užblokuota! Iveskite kodą...</string>
+ <string id="12325">Užblokuota! Įveskite kodą...</string>
<string id="12326">Įveskite slaptažodį</string>
<string id="12327">Įveskite apsaugos kodą</string>
<string id="12328">Įveskite atblokavimo kodą</string>
@@ -975,14 +975,14 @@
<string id="12346">Slaptažodžių bandymų skaiÄius iÅ¡naudotas.</string>
<string id="12347">Dabar sistema bus išjungta.</string>
<string id="12348">Užblokuota</string>
- <string id="12353">Perdiekite apsaugÄ…</string>
+ <string id="12353">Reaktyvuoti apsaugÄ…</string>
<string id="12356">Keisti apsaugÄ…</string>
<string id="12357">Apsaugos Å¡altinis</string>
<string id="12358">Slaptažodžio laukas tuÅ¡Äias. Pakartokite.</string>
- <string id="12360">Apsaugos</string>
- <string id="12362">IÅ¡junkite sistemÄ…,jei bandymų skaiÄius yra iÅ¡naudotas</string>
- <string id="12367">Apsaugos kodas neteisyngas!</string>
- <string id="12368">Įveskite teisyngą apsaugos kodą!</string>
+ <string id="12360">Bendra apsauga</string>
+ <string id="12362">IÅ¡jungite sistemÄ…,jei bandymų skaiÄius yra iÅ¡naudotas</string>
+ <string id="12367">Apsaugos kodas neteisingas!</string>
+ <string id="12368">Įveskite teisingą apsaugos kodą!</string>
<string id="12373">Parametrai ir failų tvarkyklė</string>
<string id="12376">Nustatyti visiems filmams</string>
<string id="12377">Tai pakeis anksÄiau nustatytus parametrus.</string>
@@ -1010,18 +1010,18 @@
<string id="13001">Greitas HDD sustabdymas</string>
<string id="13002">Tiktai video</string>
<string id="13003">- Užlaikymas</string>
- <string id="13004">- Minimalus failo ilgis</string>
+ <string id="13004">- Minimali failo trukmÄ—</string>
<string id="13005">IÅ¡jungimas</string>
<string id="13008">Išjungimo režimas</string>
<string id="13009">IÅ¡Ä—jimas</string>
<string id="13010">Miego rėžimas</string>
- <string id="13011">Miego rėžimas</string>
+ <string id="13011">Laukimo rėžimas</string>
<string id="13012">IÅ¡jungti XBMC</string>
<string id="13013">Perkrauti kompiuterį</string>
<string id="13014">Suglausti</string>
- <string id="13015">Reakcija į maitinimo mygtuką</string>
- <string id="13016">Išjungti kompiuterį</string>
+ <string id="13015">Jungties veiksmas</string>
+ <string id="13016">IÅ¡jungti sistemÄ…</string>
<string id="13020">Aktyvi kita sesija, gal per SSH?</string>
<string id="13021">Prijungtas nešiojamas HDD</string>
@@ -1046,7 +1046,7 @@
<string id="13112">Aukštos kokybės mastelis</string>
<string id="13113">Atjungta</string>
<string id="13114">Tiktai dÄ—l SD turinio</string>
- <string id="13115">Visada ijungta</string>
+ <string id="13115">Visada įjungta</string>
<string id="13116">Mastelio metodas</string>
<string id="13117">Bicubic</string>
@@ -1054,7 +1054,7 @@
<string id="13119">Sinc</string>
<string id="13120">VDPAU</string>
<string id="13121">VDPAU HQ kokybÄ—s mastelis</string>
- <string id="13122">VDPAU spalvų konvertavimas </string>
+ <string id="13122">VDPAU spalvų konvertavimas</string>
<string id="13130">Ekrano užsklanda</string>
<string id="13131">Atjungta</string>
@@ -1062,9 +1062,9 @@
<string id="13140">Rastos aktyvios jungtys!</string>
<string id="13141">Jei tęsite, Jūs prarasite sugebėjimą valdyti</string>
- <string id="13142">XBMC. Ar tikrai norite sustabdyti įvykio serverį?</string>
+ <string id="13142">XBMC. Ar tikrai norite sustabdyti serverio įvykius?</string>
- <string id="13144">Redaguoti pultelio Apple režimą?</string>
+ <string id="13144">Redaguoti Apple pultelio režimą?</string>
<string id="13145">Jeigu Jūs naudojate Apple pultelį</string>
<string id="13146">XBMC valdymui, šių nustatymų pakeitimas gali atjungti</string>
<string id="13147">galimybe jais naudotis. Jūs norite tęsti?</string>
@@ -1077,14 +1077,14 @@
<string id="13170">Niekada</string>
<string id="13171">Nedelsiant</string>
<string id="13172">Po %i sek.</string>
- <string id="13173">Kada idiegtas HDD:</string>
- <string id="13174">Ciklų kiekis ONN/OFF HDD:</string>
+ <string id="13173">HDD įjungimo laikas:</string>
+ <string id="13174">HDD įjungimo ciklų skaiÄius:</string>
<string id="13200">Profiliai</string>
<string id="13201">Pašalinti profilį '%s'?</string>
<string id="13204">Paskutinis įkeltas profilis:</string>
- <string id="13205">Neaišku</string>
+ <string id="13205">Nežinoma</string>
<string id="13206">Perrašyti</string>
<string id="13208">Priminimo laikmatis</string>
@@ -1095,7 +1095,7 @@
<string id="13213">%2.fm</string> <!--minutes (left from countdown)-->
<string id="13214">%2.fs</string> <!--seconds (left from countdown)-->
- <string id="13249">Ieškoti subtitrų RARarhyve</string>
+ <string id="13249">Ieškoti subtitrų RARe</string>
<string id="13250">Nurodykite subtitrus...</string>
<string id="13251">Perkelti objektÄ…</string>
<string id="13252">Perkelti objektÄ… Äia</string>
@@ -1107,8 +1107,8 @@
<string id="13274">Prijungta, bet DNS severis nepasiekiamas</string>
<string id="13275">HDD</string>
<string id="13276">DVD grotuvas</string>
- <string id="13277">Diskai</string>
- <string id="13278">Bendri</string>
+ <string id="13277">Saugykla</string>
+ <string id="13278">Numatytas</string>
<string id="13279">Tinklas</string>
<string id="13280">Video</string>
<string id="13281">Įranga</string>
@@ -1137,22 +1137,22 @@
<string id="13307">Takelio pavadinimo Å¡ablonas</string>
<string id="13308">JÅ«s norite perkrauti sistemÄ…</string>
<string id="13309">vietoj XBMC perkrovimo?</string>
- <string id="13310">Padidinimo efektas</string>
- <string id="13311">Slydimo efektas</string>
+ <string id="13310">Didinimo efektas</string>
+ <string id="13311">Flotacinis efektas</string>
<string id="13312">Juodų juostų sumažinimas</string>
<string id="13313">Perkrauti sistemÄ…</string>
<string id="13314">Takelių perėjimo laikas</string>
<string id="13315">Atnaujinti eskizus</string>
<string id="13316">Eskizų rekursavimas</string>
- <string id="13317">Prezentacijos peržiura</string>
+ <string id="13317">Prezentacijos peržiūra</string>
<string id="13318">Prezentacijos rekursavimas</string>
<string id="13319">Atsitiktiniai</string>
<string id="13320">Stereo</string>
<string id="13321">Kairys</string>
- <string id="13322">Dešnys</string>
+ <string id="13322">Dešinys</string>
<string id="13323">Leisti karaoke palaikymÄ… (CD+G)</string>
- <string id="13324">Skaidrumo fono lygis</string>
- <string id="13325">Skaidrumo teksto lygis</string>
+ <string id="13324">Fono skaidrumas</string>
+ <string id="13325">Teksto skaidrumas</string>
<string id="13326">Garso vėlinimas vaizdo atžvilgiu</string>
<string id="13327">Karaoke</string>
<string id="13328">%s nerastas</string>
@@ -1172,7 +1172,7 @@
<string id="13344">Ciklinis</string>
<string id="13345">Perjungti LED atkūrimo metu</string>
<string id="13346">Duomenys apie filmÄ…</string>
- <string id="13347">Idėti i grojaraštį</string>
+ <string id="13347">Elemento eilÄ—</string>
<string id="13348">Rasti IMDb...</string>
<string id="13349">Nuskaityti naują turinį</string>
<string id="13350">Aktualus grojaraštis...</string>
@@ -1181,7 +1181,7 @@
<string id="13353">Sustabdyti skaitymÄ…</string>
<string id="13354">Apdirbimo metodas</string>
<string id="13355">Žemos kokybės Pixel Shader</string>
- <string id="13356">Aparatūros danga</string>
+ <string id="13356">Aparatūros derinimas</string>
<string id="13357">Aukštos kokybės Pixel Shader</string>
<string id="13358">Atkurti objektÄ…</string>
<string id="13359">Įdiegti atlikėjo eskizą</string>
@@ -1190,15 +1190,15 @@
<string id="13375">Įjungti prietaisą</string>
<string id="13376">Garsas</string>
- <string id="13377">Pagrindinis peržiuros režimas</string>
+ <string id="13377">Pagrindinis peržiūros režimas</string>
<string id="13378">Standartinis ryškumas</string>
<string id="13379">Standartinis kontrastas</string>
<string id="13380">StandartinÄ— gama</string>
<string id="13381">Tęsti video</string>
- <string id="13382">Balso kaukÄ— 1</string>
- <string id="13383">Balso kaukÄ— 2</string>
- <string id="13384">Balso kaukÄ— 3</string>
- <string id="13385">Balso kaukÄ— 4</string>
+ <string id="13382">Balso keitimas - 1</string>
+ <string id="13383">Balso keitimas - 2</string>
+ <string id="13384">Balso keitimas - 3</string>
+ <string id="13385">Balso keitimas - 4</string>
<string id="13386">Pozicijonavimas laike</string>
<string id="13387">Dešnė kolonėlė sąraše</string>
<string id="13388">IÅ¡ankstinis diegimas</string>
@@ -1208,7 +1208,7 @@
<string id="13392">Paleisti vizualizacijÄ… kai groja muzika</string>
<string id="13393">ApskaiÄiuoti dydį</string>
<string id="13394">PapkÄ—s dydžio apskaiÄiavimas</string>
- <string id="13395">Vidio nustatymai</string>
+ <string id="13395">Video nustatymai</string>
<string id="13396">Subtitrų ir garso nustatymai</string>
<string id="13397">Įjungti subtitrus</string>
<string id="13398">EtiketÄ—s</string>
@@ -1216,7 +1216,7 @@
<string id="13400">Sklandus perÄ—jimas prie kito takelio</string>
<string id="13401">Paieška %s</string>
<string id="13402">Rodyti takelio pozicijÄ…</string>
- <string id="13403">Valyti pagal nutylÄ—jimÄ…</string>
+ <string id="13403">Skaidrus numatytas</string>
<string id="13404">Tęsti</string>
<string id="13405">Gauti eskizÄ…</string>
<string id="13406">Duomenys apie foto</string>
@@ -1238,12 +1238,12 @@
<string id="13422">PradÄ—ti prezentacijÄ… nuo Äia</string>
<string id="13423">Atsiminti keliÄ…</string>
<string id="13424">Naudoti pikselių buferio objektus</string>
- <string id="13425">Įjungti aparatūros spartinimą (VDPAU)</string>
- <string id="13426">Įjungti aparatūros spartinimą (VAAPI)</string>
- <string id="13427">Įjungti aparatūros spartinimą (DXVA2)</string>
- <string id="13428">Įjungti aparatūros spartinimą (CrystalHD)</string>
- <string id="13429">Įjungti aparatūros spartinimą (VDADecoder)</string>
- <string id="13430">Įjungti aparatūros spartinimą (OpenMax)</string>
+ <string id="13425">Leisti aparatūros spartinimą (VDPAU)</string>
+ <string id="13426">Leisti aparatūros spartinimą (VAAPI)</string>
+ <string id="13427">Leisti aparatūros spartinimą (DXVA2)</string>
+ <string id="13428">Leisti aparatūros spartinimą (CrystalHD)</string>
+ <string id="13429">Leisti aparatūros spartinimą (VDADecoder)</string>
+ <string id="13430">Leisti aparatūros spartinimą (OpenMax)</string>
<string id="13431">Pikseliniai šešėliai</string>
<string id="13432">Leisti aparatūros spartinimą (VideoToolbox)</string>
@@ -1275,7 +1275,7 @@
<string id="13613">Multi pultelis (Harmony)</string>
<string id="13620">Apple pultelio klaida</string>
- <string id="13621">Ijungti Apple pultelio palaikymÄ….</string>
+ <string id="13621">Įjungti Apple pultelio palaikymą.</string>
<string id="14000">Sugrupuoti</string>
<string id="14001">IÅ¡grupuoti</string>
@@ -1286,8 +1286,8 @@
<string id="14007">Klaida įkeliant bibliotekos failą</string>
<string id="14009">Papkė su žaidimais</string>
- <string id="14010">Vaizdo autoperjungimas į eskizus po</string>
- <string id="14011">Ijungti autoperjungimas į eskizus</string>
+ <string id="14010">Vaizdo auto perjungimas į eskizus po</string>
+ <string id="14011">Įjungti auto perjungimas į eskizus</string>
<string id="14012">- naudoti didelius ženkliukus</string>
<string id="14013">- Perjungi po</string>
<string id="14014">- procentinių santykių</string>
@@ -1295,12 +1295,12 @@
<string id="14016">nors vienas failas ir eskizas</string>
<string id="14017">procentinių santykių eskizų</string>
<string id="14018">Peržiūros nustatymai</string>
- <string id="14019">Pirmas miestas</string>
- <string id="14020">Antras miestas</string>
- <string id="14021">TreÄias miestas</string>
+ <string id="14019">1-as miestas</string>
+ <string id="14020">2-as miestas</string>
+ <string id="14021">3-as miestas</string>
<string id="14022">Biblioteka</string>
<string id="14023">Be TV</string>
- <string id="14024">Įveskite artimiausią didelį miestą</string>
+ <string id="14024">Įveskite artimiausią miestą</string>
<string id="14025">Audio/Video/DVD - iš HDD</string>
<string id="14026">Video - iš DVD disko</string>
<string id="14027">- iš vietinio tinklo</string>
@@ -1308,13 +1308,13 @@
<string id="14030">Audio - iš CD/DVD disko</string>
<string id="14031">- iš vietinio tinklo</string>
<string id="14032">- iš interneto</string>
- <string id="14034">DVD talpykla - iš DVD disko</string>
+ <string id="14034">DVD kešas - iš DVD disko</string>
<string id="14035">- iš vietinio tinklo</string>
<string id="14036">Servisas(paslaugos)</string>
- <string id="14038">XBMC pasikeitÄ— tinklo nustatymai.</string>
- <string id="14039">Norite perkrauti dabar?</string>
- <string id="14040">NorÄ—dami taikyti pakeitimus perkraukite</string>
+ <string id="14038">PasikeitÄ— tinklo nustatymai.</string>
+ <string id="14039">Reikia iš naujo pakeisti jūsų tinklo sąranką</string>
+ <string id="14040">Ar norite perkrauti XBMC dabar?</string>
<string id="14041">Interneto ryšio spartos apribojimas</string>
<string id="14043">- IÅ¡jungti grojant</string>
@@ -1334,8 +1334,8 @@
<string id="14057">Neimanoma, kol skaitomi failai</string>
<string id="14058">Filmo efektai</string>
<string id="14059">Ieškoti eskizų išoriniuose resursuose</string>
- <string id="14060">Nežinomo tipo talpyklos - iš interneto</string>
- <string id="14061">Automatiškai</string>
+ <string id="14060">Nežinomas talpyklos podėlis - Internetas</string>
+ <string id="14061">Auto</string>
<string id="14062">Įveskite vartotojo vardą</string>
<string id="14063">Data &amp; laikas</string>
<string id="14064">Nustatyti datÄ…</string>
@@ -1362,7 +1362,7 @@
<string id="14086">Atkūrimas</string>
<string id="14087">DVD</string>
<string id="14088">Atkūrti DVD automatiškai</string>
- <string id="14089">Šriftas subtitrų tekstui</string>
+ <string id="14089">Subtitrų tekstų šriftas</string>
<string id="14090">Kalbos</string>
<string id="14091">KoduotÄ—</string>
<string id="14092">Derinimo</string>
@@ -1392,23 +1392,23 @@
<string id="15200">Last.fm</string>
<string id="15201">Siųsti statistiką į Last.fm</string>
- <string id="15202">Vartotojo vardas Last.fm</string>
+ <string id="15202">Vartotojo slapyvardis Last.fm</string>
<string id="15203">Slaptažodis Last.fm</string>
<string id="15204">Nepavyksta prisijungti: užmiegu...</string>
<string id="15205">Prašome atnaujinti XBMC</string>
- <string id="15206">Neteisingas prisijungimas: Patikrinkite vartotojo vardą ir slaptažodį</string>
+ <string id="15206">Neteisingas prisijungimas: Patikrinkite vartotojo slapyvardį ir slaptažodį</string>
<string id="15207">Sujungtas</string>
<string id="15208">Nesujungtas</string>
<string id="15209">Sujungimo intervalas %i</string>
<string id="15210">Į talpyklą %i dainų</string>
<string id="15211">Sujungimas...</string>
<string id="15212">Sujungimas po %i sek.</string>
- <string id="15213">Naudokite grotuvÄ…...</string>
+ <string id="15213">Naudoti grotuvÄ…...</string>
<string id="15214">Naudoti A/V sinchronizavimÄ…</string>
<string id="15215">Slėpti failų pavadinimus eskizų režime</string>
- <string id="15216">Grojimo režimas 'party'</string>
+ <string id="15216">Grojimo režimas 'Party'</string>
<string id="15217">Siųsti statistiką į Libre.fm</string>
- <string id="15218">Vartotojo vardas Libre.fm</string>
+ <string id="15218">Vartotojo slapyvardis Libre.fm</string>
<string id="15219">Slaptažodis Libre.fm</string>
<string id="15220">Libre.fm</string>
<string id="15221">Dainų pateikimas</string>
@@ -1417,9 +1417,9 @@
<string id="15251">Prisijungti prie Last.fm...</string>
<string id="15252">Stoties pasirinkimas...</string>
<string id="15253">Rasti panašius atlikėjus...</string>
- <string id="15254">Rasti panašias žymes...</string>
+ <string id="15254">Rasti panašias žymas...</string>
<string id="15255">Jūsų profilis (%name%)</string>
- <string id="15256">Bendros top žymės</string>
+ <string id="15256">Bendros Top žymos</string>
<string id="15257">Top atlikėjų pagal žymę %name%</string>
<string id="15258">Top albumų pagal žymę %name%</string>
<string id="15259">Top kūriniai pagal žymę %name%</string>
@@ -1427,7 +1427,7 @@
<string id="15261">Panašius atlikėjus į %name%</string>
<string id="15262">Top %name% albumų</string>
<string id="15263">Top %name% kompozicijų</string>
- <string id="15264">Top %name% žymių</string>
+ <string id="15264">Top %name% žymų</string>
<string id="15265">Didžiausi gerbėjai %name%</string>
<string id="15266">Klausyti(is) gerbėjų pasirinkimą %name% Last.fm</string>
<string id="15267">Klausyti(is) panašių %name% atlikėjų Last.fm</string>
@@ -1439,7 +1439,7 @@
<string id="15273">Savaitės dainininkų diagrama %name%</string>
<string id="15274">Savaitės albumų diagrama %name%</string>
<string id="15275">Savaitės takelių diagrama %name%</string>
- <string id="15276">Klausyti(is) %name%'s žmonių Last.fm</string>
+ <string id="15276">Klausyti(is) %name%'s iš žmonių Last.fm</string>
<string id="15277">Klausyti(is) %name%'s savo Last.fm</string>
<string id="15278">Klausyti(is) %name%'s milymiausi Last.fm</string>
<string id="15279">Gaukite sąrašą iš Last.fm...</string>
@@ -1447,20 +1447,20 @@
<string id="15281">Įveskite atlikėjo vardą, ieškoti panašių</string>
<string id="15282">Įveskite pavadinime žymą, ieškoti panašių</string>
<string id="15283">Pastaruoju metu klausomos dainos %name%'</string>
- <string id="15284">Klausyti(is) rekomendacijų %name%' Last.fm</string>
+ <string id="15284">Klausyti(is) rekomenduojamų %name%' Last.fm</string>
<string id="15285">Top žymos %name%</string>
- <string id="15286">Klausyti(is) grojaraÅ¡Äio %name%' Last.fm</string>
- <string id="15287">Ar norite pridėti šį takelį į savo "Mėgstami kūriniai"?</string>
+ <string id="15286">Klausyti(is) iÅ¡ grojaraÅ¡Äio %name%' Last.fm</string>
+ <string id="15287">Ar norite pridėti šį takelį į savo mėgstami kūriniai?</string>
<string id="15288">Norite užrakinti šį takelį?</string>
- <string id="15289">Pridėta prie Jūsų "Mėgstami kūriniai": '%s'.</string>
- <string id="15290">Negalima pridėti '%s' prie Jūsų "Mėgstami kūriniai".</string>
+ <string id="15289">Pridėta prie Jūsų mėgstami kūriniai: '%s'.</string>
+ <string id="15290">Negalima pridėti '%s' prie Jūsų mėgstami kūriniai.</string>
<string id="15291">Užblokuota: '%s'.</string>
<string id="15292">Neimanoma užblokuoti: '%s'.</string>
- <string id="15293">Neseniai pamėgti kūriniai %name%'а</string>
- <string id="15294">Neseniai užblokuoti kūriniai %name%'а</string>
- <string id="15295">Šalinti iš "Mėgstami kūriniai"</string>
+ <string id="15293">Jums patikę kūriniai %name%'а</string>
+ <string id="15294">Jūsų užblokuoti kūriniai %name%'а</string>
+ <string id="15295">Šalinti iš mėgstami kūriniai</string>
<string id="15296">Atblokuoti</string>
- <string id="15297">Jūs norite pašalinti šį kūrinį iš "Mėgstami kūriniai"?</string>
+ <string id="15297">Jūs norite pašalinti šį kūrinį iš mėgstami kūriniai?</string>
<string id="15298">Norite atblokuoti šį takelį?</string>
<string id="15300">Blogas arba jų visai nėra</string>
@@ -1482,7 +1482,7 @@
<string id="16010">Įveskite profilio pavadinimą</string>
<string id="16011">Įveskite albumo pavadinimą</string>
<string id="16012">Ä®veskite grojaraÅ¡Äio pavadinimÄ…</string>
- <string id="16013">Įveskite naują failo vardą</string>
+ <string id="16013">Įveskite naują failo pavadinimą</string>
<string id="16014">Įveskite aplanko pavadinimą</string>
<string id="16015">Įveskite aplanką</string>
<string id="16016">Galimos parinktys: %A, %T, %N, %B, %D, %G, %Y, %F, %S</string>
@@ -1492,25 +1492,25 @@
<string id="16020">De-interlace</string>
<string id="16021">Bob</string>
<string id="16022">Bob (inverted)</string>
- <string id="16023">BesikeiÄiantis apdirbimas</string>
+ <string id="16023"></string>
<string id="16024">Atšaukiama...</string>
<string id="16025">Įveskite atlikėjo vardą</string>
<string id="16026">GrojaraÅ¡Äio veikimas nutraukiamas</string>
<string id="16027">Per daug klaidų iš eilės</string>
<string id="16028">Įveskite reikšmę</string>
<string id="16029">Patikrinkite žurnalo bylą išsamiai informacijai</string>
- <string id="16030">Režimas 'Vakarėlis' atjungtas</string>
- <string id="16031">Nėra atitinkamų dainų bibliotekoje</string>
- <string id="16032">Nepavyko inicijuoti duomenų bazės</string>
- <string id="16033">Nepavyko atidaryti duomenų bazės</string>
- <string id="16034">Nepavyko gauti dainų iš duomenų bazės</string>
- <string id="16035">GrojaraÅ¡Äio režimas 'VakarÄ—lis'</string>
+ <string id="16030">'Vakarėlis' atšauktas.</string>
+ <string id="16031">Nėra atitinkamų dainų bibliotekoje.</string>
+ <string id="16032">Nepavyko inicijuoti duomenų bazės.</string>
+ <string id="16033">Nepavyko atidaryti duomenų bazės.</string>
+ <string id="16034">Nepavyko gauti dainų iš duomenų bazės.</string>
+ <string id="16035">Grojaraštis 'Vakarėlis'</string>
<string id="16036">De-interlace (Half)</string>
<string id="16037">Deinterlace video</string>
<string id="16038">Deinterlace method</string>
- <string id="16039">Off</string>
+ <string id="16039">IÅ¡j.</string>
<string id="16040">Auto</string>
- <string id="16041">On</string>
+ <string id="16041">Įj.</string>
<string id="16100">Visi filmai</string>
<string id="16101">Neperžiūrėta</string>
@@ -1528,7 +1528,7 @@
<string id="16206">Nepavyko pašalinti jokio failo</string>
<string id="16300">Vaizdo mastelio metodas</string>
- <string id="16301">Artimiausias kaimyninis</string>
+ <string id="16301">Artimiausias kitas</string>
<string id="16302">Bilinear</string>
<string id="16303">Bicubic</string>
<string id="16304">Lanczos2</string>
@@ -1542,7 +1542,7 @@
<string id="16312">(VDPAU) Triukšmo sumažinimas</string>
<string id="16313">(VDPAU) Ryškumas</string>
<string id="16314">Atvirkštinis Telecine</string>
- <string id="16315">Lanczos3 optimizuoti</string>
+ <string id="16315">Lanczos3 optimizuotas(i)</string>
<string id="16316">Auto</string>
<string id="16317">Laikinas (Half)</string>
<string id="16318">Laikinas/Erdvinis (Half)</string>
@@ -1550,7 +1550,7 @@
<string id="16320">DXVA Bob</string>
<string id="16321">DXVA Best</string>
<string id="16322">Spline36</string>
- <string id="16323">Spline36 optimizuoti</string>
+ <string id="16323">Spline36 optimizuotas(i)</string>
<string id="16324">Programinė įranga Blend</string>
<string id="16400">Vaizdo pertvarkymas</string>
@@ -1560,12 +1560,12 @@
<string id="17500">Ekranas miego režime</string>
- <string id="19000">Persijungti į kanalą</string>
+ <string id="19000">Perjungti į kanalą</string>
<string id="20000">IÅ¡saugota muzikos kataloge</string>
<string id="20001">Naudokite išorinį DVD grotuvą</string>
<string id="20002">IÅ¡orinis DVD grotuvas</string>
- <string id="20003">Trainerių aplankas</string>
+ <string id="20003">Trainers aplankas</string>
<string id="20004">Ekrano vaizdo aplankas</string>
<string id="20006">GrojaraÅ¡Äių aplankas</string>
@@ -1596,17 +1596,17 @@
<string id="20038">Blokuoti 'Muzika'</string>
<string id="20039">Blokuoti 'Video'</string>
<string id="20040">Blokuoti 'Foto'</string>
- <string id="20041">Blokuoti 'Programos' ir 'Skriptai'</string>
+ <string id="20041">Blokuoti 'Programos' &amp; 'Skriptai'</string>
<string id="20042">Blokuoti 'Failų tvarkyklė'</string>
<string id="20043">Blokuoti 'Nustatymai'</string>
<string id="20044">Å vari paleistis</string>
- <string id="20045">Ijungti režimą 'Visiška prieiga'</string>
+ <string id="20045">Įjungti režimą 'Visiška prieiga'</string>
<string id="20046">Išjungti režimą 'Visiška prieiga'</string>
- <string id="20047">Sukurti profilį '%s' ?</string>
+ <string id="20047">Sukurti profilį '%s'?</string>
<string id="20048">Pradėti su 'Švarūs parametrai'</string>
<string id="20049">Geriausių prieinamų</string>
<string id="20050">Automatiškai perjungti 16:9 arba 4:3</string>
- <string id="20051">Žiurėti nuoseklius failus kaip vieną failą</string>
+ <string id="20051">Žiūrėti sudėtinius failus kaip vieną failą</string>
<string id="20052">DÄ—mesio</string>
<string id="20053">Palikti režimą 'Visiška prieiga'</string>
<string id="20054">Įjungtas režimas 'Visiška prieiga'</string>
@@ -1628,7 +1628,7 @@
<string id="20070">Profilio aplankas</string>
<string id="20071">Paleiskite su naujais ištekliais</string>
<string id="20072">Įsitikinkite, kad aplankas yra atidarytas</string>
- <string id="20073">ir jo pavadinimas tikras (galiojantis)</string>
+ <string id="20073">ir jo pavadinimas tikras</string>
<string id="20074">Reitingas MPAA</string>
<string id="20075">Įveskite saugos kodą</string>
<string id="20076">Klausti saugos kodo paleidžiant</string>
@@ -1653,15 +1653,15 @@
<string id="20095">Įveskite profilio saugos kodą</string>
<string id="20096">Prisijungimo ekranas</string>
<string id="20097">Informacijos užklausimas apie albumą</string>
- <string id="20098">Duomenų prašymas albumui</string>
+ <string id="20098">Duomenų užklausimas albumui</string>
<string id="20099">Neįmanoma perkelti į skaitmeninį formatą atkūrimo metu</string>
<string id="20100">Saugos kodas ir jo nustatymas</string>
<string id="20101">Įvestas kodas visada persijungia į režimą 'Visiška prieiga'</string>
- <string id="20102">ar kopijuoti iš standartinis?</string>
- <string id="20103">IÅ¡saugoti profilio pakeitimus ?</string>
- <string id="20104">Rasti seni nustatymai</string>
+ <string id="20102">ar kopijuoti iš standartinio?</string>
+ <string id="20103">IÅ¡saugoti profilio pakeitimus?</string>
+ <string id="20104">Rasti seni nustatymai.</string>
<string id="20105">JÅ«s norite juos panaudoti?</string>
- <string id="20106">Rasta senų išteklių</string>
+ <string id="20106">Rasta senų media išteklių.</string>
<string id="20107">Atskirai (uždaryta)</string>
<string id="20108">- Å aknis</string>
<string id="20109">- Mastelis</string>
@@ -1676,16 +1676,16 @@
<string id="20118">Šiam apsaugos kodui turi būti įdiegta.</string>
<string id="20119">Įdiegti jį dabar?</string>
<string id="20120">Duomenų įkėlimas apie programą</string>
- <string id="20121">VakarÄ—lis prasidÄ—jo!</string>
+ <string id="20121">'VakarÄ—lis' prasidÄ—jo!</string>
<string id="20122">Tiesa</string>
- <string id="20123">Gėrimų maišymas</string>
- <string id="20124">Bokalų pildymas</string>
+ <string id="20123">'Gėrimų' maišymas</string>
+ <string id="20124">'Bokalų' pildymas</string>
<string id="20125">Prisijungęs kaip</string>
- <string id="20126">IÅ¡Ä—jimas</string>
+ <string id="20126">Atjungimas</string>
<string id="20128">Eiti į viršų</string>
- <string id="20129">Weave</string>
- <string id="20130">Weave (inverted)</string>
- <string id="20131">Blend</string>
+ <string id="20129">Laviruoti</string>
+ <string id="20130">Laviruoti (atvirkÅ¡Äiai)</string>
+ <string id="20131">Mišinys</string>
<string id="20132">Perkrauti video</string>
<string id="20133">Keisti tinklo vietÄ…</string>
<string id="20134">Å alinti tinklo vietÄ…</string>
@@ -1693,12 +1693,12 @@
<string id="20136">Atminties kortelÄ—</string>
<string id="20137">Atminties kortelÄ— pajungta</string>
<string id="20138">Neįmanoma pajungti atminties kortelės</string>
- <string id="20139">į portą %i, anga %i</string>
+ <string id="20139">Ä® portÄ… %i, slotÄ… %i</string>
<string id="20140">Užrakinti ekrano užsklandą</string>
<string id="20141">Įdiegti</string>
- <string id="20142">Vartotojo vardas</string>
+ <string id="20142">Vartotojo slaptavardis</string>
<string id="20143">Įveskite slaptažodį dėl</string>
- <string id="20144">IÅ¡ijungimo laikmatis</string>
+ <string id="20144">IÅ¡jungimo laikmatis</string>
<string id="20145">IÅ¡jungimo intervalas (min.)</string>
<string id="20146">Veikia, išjungti po %im</string>
<string id="20147">IÅ¡jungti po 30 min.</string>
@@ -1721,33 +1721,33 @@
<string id="20164">Apsauga nepalaikoma</string>
<string id="20165">Neužblokuota</string>
<string id="20166">Užblokuota</string>
- <string id="20167">Frozen</string>
+ <string id="20167">Įšaldytas</string>
<string id="20168">Reikia atstatyti</string>
<string id="20169">SavaitÄ—</string>
<string id="20170">Linija</string>
<string id="20171">Windows tinklas (SMB)</string>
<string id="20172">XBMSP serveris</string>
<string id="20173">FTP serveris</string>
- <string id="20174">iTunes (DAAP)</string>
+ <string id="20174">iTunes dalytis muzika (DAAP)</string>
<string id="20175">UPnP serveris</string>
<string id="20176">Rodyti video informacijÄ…</string>
<string id="20177">Baigti</string>
<string id="20178">Perkelti</string>
- <string id="20179">DidelÄ—s</string>
+ <string id="20179">Didžiosios</string>
<string id="20180">Simboliai</string>
- <string id="20181">Backspace</string>
- <string id="20182">Space</string>
+ <string id="20181">Atgal</string>
+ <string id="20182">Tarpas</string>
<string id="20183">Atnaujinti išvaizdą</string>
<string id="20184">Keisti nuotraukas naudojant EXIF</string>
- <string id="20185">Naudoti plakato vaizdÄ… serialams</string>
+ <string id="20185">Naudoti afišos vaizdą serialams</string>
<string id="20186">Prašome palaukti</string>
<string id="20189">Įjungti automatinį slinktį, siužetams &amp; peržiūroms</string>
<string id="20190">Papildomai</string>
<string id="20191">Įjungti žurnalo derinimą</string>
<string id="20192">Ieškoti albumo info dedant į biblioteką</string>
- <string id="20193">Pagal nutylÄ—jimÄ… info albumams</string>
- <string id="20194">Pagal nutylÄ—jimÄ… info atlikÄ—jams</string>
+ <string id="20193">Numatyta paslauga info apie albumÄ…</string>
+ <string id="20194">Numatyta paslauga info apie atlikÄ—jÄ…</string>
<string id="20195">Pakeisti info šaltinį</string>
<string id="20196">Eksportuoti muzikinÄ™ bibliotekÄ…</string>
<string id="20197">Importuoti muzikinÄ™ bibliotekÄ…</string>
@@ -1756,9 +1756,9 @@
<!-- string id's 20200 thru 20211 are reserved for speedstrings (LocalizeStrings.cpp)-->
- <string id="20250">VakarÄ—lis prasidÄ—jo!(Video)</string>
- <string id="20251">Gėrimų maišymas (Video)</string>
- <string id="20252">Bokalų pildymas (Video)</string>
+ <string id="20250">'VakarÄ—lis' prasidÄ—jo!(Video)</string>
+ <string id="20251">'Gėrimų' maišymas (Video)</string>
+ <string id="20252">'Bokalų' pildymas (Video)</string>
<string id="20253">WebDAV serveris (HTTP)</string>
<string id="20254">WebDAV serveris (HTTPS)</string>
<string id="20255">Pirmas prisijungimas, redaguoti savo profilį</string>
@@ -1767,7 +1767,7 @@
<string id="20258">Klientas MythTV</string>
<string id="20259">Tinklo failų sistema (NFS)</string>
<string id="20260">Fono apsauga (SSH/SFTP)</string>
- <string id="20261">Apple Bylų protokolas (AFP)</string>
+ <string id="20261">Apple Filing Protocol (AFP)</string>
<string id="20300">Serverio katalogas (HTTP)</string>
<string id="20301">Serverio katalogas (HTTPS)</string>
@@ -1780,7 +1780,7 @@
<string id="20309">Sukurti naujÄ… aplankÄ…</string>
<string id="20310">Pritemdyti LCD ekranÄ… grojant</string>
<string id="20311">Nežinomas arba integruotas (apsaugotas)</string>
- <string id="20312">Pritemdyti LCD ekraną pristabdžius</string>
+ <string id="20312">Pritemdyti LCD ekranÄ… pauzÄ—je</string>
<string id="20314">Video - Biblioteka</string>
@@ -1802,7 +1802,7 @@
<string id="20337">Aktorius</string>
<string id="20338">Filmas</string>
<string id="20339">Režisierius</string>
- <string id="20340">Ar norite ištrinti</string>
+ <string id="20340">Ar norite panaikinti</string>
<string id="20341">visus objektus iš bibliotekos?</string>
<string id="20342">Filmai</string>
<string id="20343">Serialai</string>
@@ -1823,7 +1823,7 @@
<string id="20358">Sezonas %i</string>
<string id="20359">Epizodas</string>
<string id="20360">Epizodai</string>
- <string id="20361">Įkėlimas išsamios info apie epizodą</string>
+ <string id="20361">Atsiųsti informaciją apie epizodus</string>
<string id="20362">Pašalinti iš bibliotekos epizodą</string>
<string id="20363">Pašalinti iš bibliotekos serialą</string>
<string id="20364">Serialas</string>
@@ -1832,23 +1832,23 @@
<string id="20367">Be peržiurėtų</string>
<string id="20368">Produkto kodas</string>
<string id="20369">Rodyti siužetą neperžiurėtiems elementams</string>
- <string id="20370">* Paslėpta, kad būtų išvengta spoilerių *</string>
+ <string id="20370">* Paslėpta, kad išvengti spoilerių *</string>
<string id="20371">Nustatyti sezono eskizus</string>
<string id="20372">Sezono paveikslÄ—lis</string>
<string id="20373">Sezonas</string>
- <string id="20374">Atsisiųsti informaciją apie filmą</string>
+ <string id="20374">Atsiųsti informaciją apie filmą</string>
<string id="20375">Nenurodyti turinio</string>
<string id="20376">Originalus pavadinimas</string>
<string id="20377">Atnaujinti informacijÄ… apie serialÄ…</string>
<string id="20378">Atnaujinti informacijÄ… apie visus epizodus?</string>
<string id="20379">Nurodytas katalogas turi atskirÄ… serialÄ…</string>
- <string id="20380">Nenuskaityti pasirinktÄ… aplankÄ…</string>
+ <string id="20380">Neskaityti pasirinkto aplanko</string>
<string id="20381">Ypatingas</string>
<string id="20382">Automatiškai sukurti eskizus sezonui</string>
<string id="20383">Nurodytas katalogas turi atskirÄ… video</string>
<string id="20384">Susieti su serialu</string>
<string id="20385">Atsieti nuo serialo</string>
- <string id="20386">Naiji filmai</string>
+ <string id="20386">Nauji filmai</string>
<string id="20387">Nauji epizodai</string>
<string id="20388">Studijos</string>
<string id="20389">Vaizdo klipai</string>
@@ -1856,7 +1856,7 @@
<string id="20391">Vaizdo klipai</string>
<string id="20392">Pašalinti iš bibliotekos vaizdo klipus</string>
<string id="20393">Duomenys apie vaizdo klipus</string>
- <string id="20394">Duomenų ikėlimas apie vaizdo klipus</string>
+ <string id="20394">Duomenų įkėlimas apie vaizdo klipus</string>
<string id="20395">Sumaišyti</string>
<string id="20396">Pereiti prie albumo pagal atlikÄ—jÄ…</string>
<string id="20397">Pereiti prie albumo</string>
@@ -1870,16 +1870,16 @@
<string id="20405">Naikinti epizodo žymę</string>
<string id="20406">Nustatyti epizodo žymę</string>
<string id="20407">Info resurso nustatymas</string>
- <string id="20408">Atsisiųsti duomenis apie vaizdo klipą</string>
- <string id="20409">Atsisiųsti duomenis apie serialą</string>
+ <string id="20408">Atsiųsti duomenis apie vaizdo klipą</string>
+ <string id="20409">Atsiųsti duomenis apie serialą</string>
<string id="20410">Treileris</string>
<string id="20411">Sujungti</string>
- <string id="20412">Sujungti serialus</string>
+ <string id="20412">Sujungti TV Å¡ou</string>
<string id="20413">Gauti Fanart</string>
<string id="20414">Rodyti Fanart bibliotekoje</string>
- <string id="20415">Naujo turinio skenavimas</string>
- <string id="20416">Pirmas perduotas</string>
- <string id="20417">Scenarijaus autorius</string>
+ <string id="20415">Ieškoma naujo turinio</string>
+ <string id="20416">Pirma eteryje</string>
+ <string id="20417">Autorius(rašytojas)</string>
<string id="20418">Valyti failų ir aplankų vardus</string>
<string id="20419">Rodyti metaduomenis žiurimiems failams</string>
@@ -1887,7 +1887,7 @@
<string id="20421">Tik jeigu vienas sezonas</string>
<string id="20422">Visada</string>
<string id="20423">Yra treileris</string>
- <string id="20424">Melas</string>
+ <string id="20424">Klaidingas</string>
<string id="20425">Prezentacijos Fanart</string>
<string id="20426">Eksportuoti viename faile ar suskaidyti</string>
<string id="20427">į atskirus failus kiekvienam įrašui?</string>
@@ -1914,12 +1914,12 @@
<string id="20448">Nepavyko įkelti informacijos</string>
<string id="20449">Serveris nepasiekiamas.</string>
<string id="20450">Ar norite tęsti skenavimą?</string>
- <string id="20451">Å alies</string>
+ <string id="20451">Å alis</string>
<string id="20452">Epizodas</string>
<string id="20453">Epizodai</string>
<string id="20454">Klausytojas</string>
<string id="20455">Klausytojų</string>
- <string id="20456">Nustatyti rodomo filmo fanart</string>
+ <string id="20456">Nustatyti rodomo filmo Fanart</string>
<string id="20457">Filmų rinkinys</string>
<!-- up to 21329 is reserved for the video db !! !-->
@@ -1934,13 +1934,13 @@
<string id="21337">TuxBox prietaisas</string>
<!-- up to 21355 is reserved for the TuxBox Client!! !-->
- <string id="21359">DadÄ—ti 'media resursai'...</string>
- <string id="21360">Įjungti UPnP serverį</string>
+ <string id="21359">PridÄ—ti medijos resursai...</string>
+ <string id="21360">Prieiga prie medija resursai per UPnP</string>
- <string id="21364">Pakeisti 'media resursai'</string>
- <string id="21365">Pašalinti 'media resursai'</string>
+ <string id="21364">Pakeisti media resursai</string>
+ <string id="21365">Pašalinti media resursai</string>
<string id="21366">Ypatingas aplankas subtitrams</string>
- <string id="21367">Aplankas filmams ir alternatyviems subtitrams</string>
+ <string id="21367">Aplankas filmams &amp; alternatyviems subtitrams</string>
<string id="21368">Nepaisyti ASS/SSA subtitrų šriftų</string>
<string id="21369">Įjungti pelę ir Touch Screen palaikymą</string>
@@ -1956,9 +1956,9 @@
<string id="21379">Įjungti 720p</string>
<string id="21380">Įjungti 1080i</string>
<string id="21381">Ä®veskite naujÄ… grojaraÅ¡Äio pavadinimÄ…</string>
- <string id="21382">Rodyti '"Pridėtų failų" sąrašų šaltinis' mygtuką</string>
+ <string id="21382">Rodyti "Pridėti kodai" failų sąraše</string>
<string id="21383">Įjungti slinkties juostas</string>
- <string id="21384">Filtravimo perjungimo vaizdo įrašų biblioteka</string>
+ <string id="21384">Žymėti varnele peržiūrėtą vaizdo įrašą bibliotekoje</string>
<string id="21385">Atidaryti</string>
<string id="21386">Akustikos lygio reguliavimas</string>
<string id="21387">Greitas</string>
@@ -1969,10 +1969,10 @@
<string id="21392">Mažiau energijos</string>
<string id="21393">IÅ¡samus laukimas</string>
<string id="21394">Sumažintas laukimas</string>
- <string id="21395">Neįmanoma kopijuoti failus didesnius nei 4 GB</string>
+ <string id="21395">Neįmanoma įkelti failo didesnio kaip 4 GB</string>
<string id="21396">Skyrius</string>
<string id="21397">Aukštos kokybės Pixel Shader v2</string>
- <string id="21398">Groti grojaraštį paleidimo metu</string>
+ <string id="21398">Įgalinti grojaraštį paleidimo metu</string>
<string id="21399">Naudokite Tween animacijÄ…</string>
<string id="21400">sudÄ—tyje yra</string>
<string id="21401">sudÄ—tyje nÄ—ra</string>
@@ -1986,11 +1986,11 @@
<string id="21409">prieš</string>
<string id="21410">gale</string>
<string id="21411">pradžioj</string>
- <string id="21412">Info-resursai</string>
- <string id="21413">Standartinis info-resursas filmams</string>
- <string id="21414">Standartinis info-resursas serialams</string>
- <string id="21415">Standartinis info-resursas vaizdo klipams</string>
- <string id="21416">Leisti taisyti info-resurso kalbÄ…</string>
+ <string id="21412">'Scrapers'</string>
+ <string id="21413">Numatytasis filmų 'scraper'</string>
+ <string id="21414">Numatytasis serialų 'scraper'</string>
+ <string id="21415">Numatytasis vaizdo klipų 'scraper'</string>
+ <string id="21416">Leisti taisyti 'scraper' kalbÄ…</string>
<string id="21417">- Nustatymai</string>
<string id="21418">Daugiakalbis</string>
<string id="21419">Šaltinių informacija neegzistuoja</string>
@@ -2009,13 +2009,13 @@
<string id="21432">GrojaraÅ¡Äio redagavimas</string>
<string id="21433">GrojaraÅ¡Äio pavadinimas</string>
<string id="21434">Ieškoti objektų, katruose</string>
- <string id="21435">IÅ¡taisyti</string>
- <string id="21436">%i objektas(ų)</string>
- <string id="21437">Sukurti naują grojaraštį...</string>
- <string id="21438">%c Drive</string>
+ <string id="21435">Redaguoti</string>
+ <string id="21436">%i objektÄ…(-us,ai)</string>
+ <string id="21437">Naujas išmoningas grojaraštis...</string>
+ <string id="21438">%c Diskas</string>
<string id="21439">Keisti režimo taisykles 'Vakarėlis'</string>
<string id="21440">Namų papkė</string>
- <string id="21441">Peržiuros kiekis</string>
+ <string id="21441">Peržiūros kiekis</string>
<string id="21442">Epizodo pavadinimas</string>
<string id="21443">Video rezoliucija</string>
<string id="21444">Audio kanalai</string>
@@ -2028,13 +2028,15 @@
<string id="21451">Reikalingas interneto ryšys</string>
<string id="21452">Dar...</string>
<string id="21453">Å akninÄ— FS</string>
+ <string id="21454">Talpykla pilna</string>
+ <string id="21455">Pasiekti reikiamą lygį iki nepertraukiamo grojimo talpyklos užpildymo</string>
<string id="21460">Subtitrų vieta</string>
- <string id="21461">Nustatymas</string>
- <string id="21462">Žemiau video</string>
- <string id="21463">Žemiau vaizdo</string>
- <string id="21464">AukÅ¡Äiau video</string>
- <string id="21465">Aukštai vaizdo</string>
+ <string id="21461">Fiksuotas</string>
+ <string id="21462">ApaÄioje video</string>
+ <string id="21463">Žemiau video</string>
+ <string id="21464">Į viršų video</string>
+ <string id="21465">Aukštai video</string>
<string id="21800">Failo pavadinimas</string>
<string id="21801">Failo maršrutas</string>
@@ -2073,7 +2075,7 @@
<string id="21860">Daugiau kategorijų</string>
<string id="21861">Raktiniai žodžiai</string>
- <string id="21862">Antraštė</string>
+ <string id="21862">Titras</string>
<string id="21863">Autorius</string>
<string id="21864">Antraštė</string>
<string id="21865">Specialios instrukcijos</string>
@@ -2092,12 +2094,12 @@
<string id="21878">Autorinės teisės ženklas</string>
<string id="21879">Å alies kodas</string>
<string id="21880">Nuorodos tarnyba</string>
- <string id="21881">Įjungti UPnP apdorojimą</string>
+ <string id="21881">Vykdyti kontrolÄ™ XBMC per UPnP</string>
<string id="21882">Bandyti praleisti DVD įrašą</string>
<string id="21883">Nuskaityti Audio CD diskai</string>
- <string id="21884">Duomenys apie visus atlikÄ—jus</string>
- <string id="21885">Atsisiuntimo duomenys apie albumÄ…</string>
- <string id="21886">Atsisiuntimo duomenys apie atlikÄ—jÄ…</string>
+ <string id="21884">Užklausa apie visus atlikėjus</string>
+ <string id="21885">AtsisiunÄiama albumo informacija</string>
+ <string id="21886">AtsisiunÄiama atlikÄ—jo informacija</string>
<string id="21887">Biografija</string>
<string id="21888">Diskografija</string>
<string id="21889">Ieškoti atlikėjo</string>
@@ -2120,35 +2122,35 @@
<string id="22002">- DNS suffix</string>
<string id="22003">%2.3fÑ</string>
- <string id="22004">Užlaikyta: %2.3fÑ</string>
- <string id="22005">Lenkia: %2.3fÑ</string>
+ <string id="22004">Delsimas: %2.3fÑ</string>
+ <string id="22005">Ä® priekį: %2.3fÑ</string>
<string id="22006">Subtitrų poslinkis</string>
- <string id="22007">OpenGL gamintojas:</string>
- <string id="22008">OpenGL atvaizdas:</string>
+ <string id="22007">OpenGL vendor:</string>
+ <string id="22008">OpenGL renderer:</string>
<string id="22009">OpenGL versija:</string>
<string id="22010">GPU temperatūra:</string>
<string id="22011">CPU temperatūra:</string>
<string id="22012">Viso atminties</string>
- <string id="22013">Profilio duomenis</string>
- <string id="22014">Tamsinti, kai peržiuros metu pristabdoma</string>
+ <string id="22013">Profilio duomenys</string>
+ <string id="22014">Pritemdyti, kai peržiuros metu pristabdoma</string>
<string id="22015">Visi įrašai</string>
<string id="22016">Pagal vardÄ…</string>
<string id="22017">Pagal grupÄ™</string>
- <string id="22018">TiesioginÄ—s transliacijos kanalai</string>
- <string id="22019">Įrašai pagal vardą</string>
+ <string id="22018">Tiesioginiai kanalai</string>
+ <string id="22019">Įrašai pagal pavadinimą</string>
<string id="22020">Gidas</string>
- <string id="22021">Juodų juostų klaidos vaizdo formate</string>
- <string id="22022">Rodyti savo vaizdo failus sąraše</string>
- <string id="22023">DirectX versija:</string>
- <string id="22024">Direct3D versija:</string>
+ <string id="22021">Leidžiama proporcijos klaida juodų juostų mažinimui</string>
+ <string id="22022">Rodyti vaizdo failų sąrašus</string>
+ <string id="22023">DirectX vendor:</string>
+ <string id="22024">Direct3D version:</string>
<!-- strings 22030 thru 22060 reserved for karaoke -->
<string id="22030">- Å riftas</string>
<string id="22031">- Dydis</string>
<string id="22032">- Spalva</string>
<string id="22033">- KoduotÄ—</string>
- <string id="22034">Eksportuoti karaoke tekstÄ… formatu HTML</string>
- <string id="22035">Eksportuoti karaoke tekstÄ… formatu CSV</string>
+ <string id="22034">Eksportuoti karaoke tekstÄ… HTML formatu</string>
+ <string id="22035">Eksportuoti karaoke tekstÄ… CSV formatu</string>
<string id="22036">Importuoti karaoke tekstÄ…...</string>
<string id="22037">Automatinis dainų pasirinkimas</string>
<string id="22038">Eksportuoti karaoke tekstÄ…...</string>
@@ -2219,7 +2221,7 @@
<string id="24043">Prieinami atnaujinimai</string>
<string id="24044">Priklausomybės neįvykdytos</string>
<string id="24045">Priedai neatitinka teisingos struktūros</string>
- <string id="24046">%s įdiegti taip kaip yra naudojama priedus(ai)</string>
+ <string id="24046">%s įdiegti taip kaip yra naudojama priedai(us)</string>
<string id="24047">Šis priedas negali būti pašalintas</string>
<string id="24048">Gryžti</string>
@@ -2228,7 +2230,7 @@
<string id="24052">Atsisakymas</string>
<string id="24053">Licenzija:</string>
<string id="24054">Pakeitimų sąrašas</string>
- <string id="24059">JÅ«s norite ijungti priedus?</string>
+ <string id="24059">Jūs norite įjungti priedus?</string>
<string id="24060">Jūs norite išjungti priedus?</string>
<string id="24061">Galimi priedų atnaujinimai!</string>
<string id="24062">Įjungti priedus</string>
@@ -2272,9 +2274,9 @@
<!-- strings 33000 thru 33999 reserved for common strings used in addons -->
<string id="33001">Treilerio kokybÄ—</string>
<string id="33002">Srautas</string>
- <string id="33003">Parsisiųsti</string>
- <string id="33004">Parsisiųsti &amp; groti</string>
- <string id="33005">Parsisiųsti &amp; išsaugoti</string>
+ <string id="33003">Atsisiųsti</string>
+ <string id="33004">Atsisiųsti &amp; groti</string>
+ <string id="33005">Atsisiųsti &amp; išsaugoti</string>
<string id="33006">Å iandien</string>
<string id="33007">Rytoj</string>
<string id="33008">IÅ¡saugojimas</string>
@@ -2283,8 +2285,8 @@
<string id="33011">Paieškų trukmė</string>
<string id="33012">Trumpa</string>
<string id="33013">Ilga</string>
- <string id="33014">Naudokite DVD grotuvÄ… vietoj ...</string>
- <string id="33015">Parsisiųsti video prieš grojant</string>
+ <string id="33014">Naudokite DVD grotuvÄ… vietoj...</string>
+ <string id="33015">Atsisiųsti video prieš grojant</string>
<string id="33016">Vaizdo klipai</string>
<string id="33017">Norėdami įjungti modulį, turit iš naujo paleisti</string>
<string id="33018">Šį vakarą</string>
@@ -2321,15 +2323,15 @@
<string id="33059">Pritaikykite</string>
<string id="33060">Energija</string>
<string id="33061">Meniu</string>
- <string id="33062">Atkurkite</string>
+ <string id="33062">Atkurti</string>
<string id="33063">Nustatymai</string>
<string id="33065">Redaktorius</string>
<string id="33066">Apie Jūsų</string>
<string id="33067">Įvertinimas žvaigždutėmis</string>
<string id="33068">Fonas</string>
<string id="33069">Fono variantai</string>
- <string id="33070">Savas fonas</string>
- <string id="33071">Savi fonai</string>
+ <string id="33070">Jūsų fonas</string>
+ <string id="33071">Jūsų fonai</string>
<string id="33072">Peržiurėti Readme</string>
<string id="33073">Peržiurėti Changelog</string>
<string id="33074">Å i versija %s reikalauja</string>
@@ -2369,18 +2371,26 @@
<string id="34110">7.1</string>
<!-- 34112-34200 reserved for future use -->
+ <string id="33200">Aptiktas Naujas Pajungimas</string>
<string id="34201">Nerasta kito failo grojimui</string>
<string id="34202">Nerasta ankstesnio failo grojimui</string>
- <string id="35000">Periferija</string>
+ <string id="34300">NesÄ—kminga paleistis zeroconf</string>
+ <string id="34301">Ar įdiegta "Apple Bonjour" tarnyba? Prisijungti, gauti daugiau info.</string>
+
+ <string id="34400">Vaizdo Rendering</string>
+ <string id="34401">Bilinear mastelio paleidimo klaida, pirminio paleidimo vaizdo filters/scalers</string>
+ <string id="34402">Nepavyko inicijuoti garso prietaiso</string>
+ <string id="34403">Patikrinkite savo garso nustatymus</string>
+ <string id="35000">Periferija</string>
<string id="35001">Bendras HID prietaisas</string>
<string id="35002">Bendras tinklo adapteris</string>
<string id="35003">Bendras diskas</string>
- <string id="35004">Nėra jokių prieinamų nustatymų&#10;šiai periferijai(įrenginiui(iams)).</string>
+ <string id="35004">Nėra jokių prieinamų nustatymų&#10;šiai periferijai.</string>
<string id="35005">Naujas prietaiso konfigūravimas</string>
<string id="35006">Pašalinti prietaisą</string>
- <string id="35007">Nuoroda, kad naudoti šį prietaisą</string>
+ <string id="35007">Nuoroda, kaip naudoti šį prietaisą</string>
<string id="35008">Nuoroda atidaryta</string>
<string id="35500">PadÄ—tis</string>
@@ -2393,19 +2403,19 @@
<string id="36001">Pulse-Eight Nyxboard</string>
<string id="36002">Perjungti į klaviatūros komandas</string>
<string id="36003">Perjungti į pultelio komandas</string>
- <string id="36004">Paspauskite mygtukÄ… "Naudotojas"</string>
+ <string id="36004">Paspauskite mygtukÄ… "Vartotojas"</string>
<string id="36005">Perjungti šalutinį komandų jungtį</string>
<string id="36006">Nepavyko atidaryti adapterio</string>
- <string id="36007">Įjungti maitinimo įrenginiuose, paleidžiant XBMC</string>
- <string id="36008">Išjungti maitinimo įrenginiuose, sustabdant XBMC</string>
+ <string id="36007">Įjungti maitinimą įrenginiuose, paleidžiant XBMC</string>
+ <string id="36008">Išjungti maitinimą įrenginiuose, sustabdant XBMC</string>
<string id="36009">Patalpinkite prietaisus laukimo režime, kai aktyvi ekrano užsklanda</string>
<string id="36010">Nustatyti kaip neaktyvų šaltinį kai sustabdomas XBMC</string>
<string id="36011">Nepavyko aptikti CEC prievado. Nustatyti jį rankiniu būdu.</string>
<string id="36012">Nepavyko aptikti CEC adapterio.</string>
<string id="36013">Nepalaikomas 'libec' sÄ…sajos versija.%d atsisiuskite naujesnÄ™ XBMC versijÄ… (%d)</string>
- <string id="36014">Šį kompiuterį budėjimo režimu, kai televizorius yra išjungtas</string>
+ <string id="36014">Kompiuterį budėjimo režimu, kai televizorius yra išjungtas</string>
<string id="36015">HDMI prievado numeris</string>
<string id="36016">Sujungtas</string>
- <string id="36017">Adapteris nustatÄ—, bet Libcec nÄ—ra</string>
- <string id="36018">Naudoti TV's kalbos nustatymus</string>
-</strings> \ No newline at end of file
+ <string id="36017">Adapteris rastas, bet Libcec nÄ—ra</string>
+ <string id="36018">Naudokite TV kalbos nustatymus</string>
+</strings>
diff --git a/language/Spanish (Mexico)/strings.xml b/language/Spanish (Mexico)/strings.xml
index 0322951926..2881eb5e8a 100644
--- a/language/Spanish (Mexico)/strings.xml
+++ b/language/Spanish (Mexico)/strings.xml
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!--Language file translated with Team XBMC Translator-->
<!--Translator: Juanjo Armellino-->
-<!--Date of translation: 12/30/2011, fixed to EDEN beta1-->
-<!--$Revision$-->
+<!--Date of translation: 01/23/2012-->
+<!--Based on English 98d103ae66a1e81e379e65dd131341cd119cfcf2 (21.01.2012)-->
<strings>
<string id="0">Programas</string>
<string id="1">Imágenes</string>
@@ -184,6 +183,7 @@
<string id="221">La red no está conectada</string>
<string id="222">Cancelar</string>
<string id="224">Velocidad</string>
+ <string id="225">Desplazamiento vertical</string>
<string id="226">Patrones de prueba</string>
<string id="227">Consultar CDs de audio en freedb.org</string>
<string id="228">Mezclar lista de reproducción al cargar</string>
@@ -1851,6 +1851,8 @@
<string id="21451">Se requiere una conexión a internet.</string>
<string id="21452">Obtener más...</string>
<string id="21453">Sistema de archivos Root</string>
+ <string id="21454">Cache lleno</string>
+ <string id="21455">El cache se llenó antes de alcanzar la cantidad requerida para reproducción continua</string>
<string id="21460">Ubicación de subtitulos</string>
<string id="21461">Fijo</string>
<string id="21462">Sobre el final del video</string>
@@ -2140,6 +2142,7 @@
<string id="33101">Servidor Web</string>
<string id="33102">Servidor de eventos</string>
<string id="33103">Servidor de comunicacion remota</string>
+ <string id="33200">Detectada nueva conexión</string>
<string id="34100">Configuración de parlantes</string>
<string id="34101">2.0</string>
<string id="34102">2.1</string>
@@ -2153,6 +2156,12 @@
<string id="34110">7.1</string>
<string id="34201">No se encuentra el próximo item</string>
<string id="34202">No se encuentra el item anterior</string>
+ <string id="34300">Fallo al iniciar Zeroconf</string>
+ <string id="34301">Está instalado el servicio Bonjour de Apple? vea log para mas info.</string>
+ <string id="34400">Renderizado de video</string>
+ <string id="34401">Fallo al iniciar filtros/escaladores de video, utilizando escalado bilineal</string>
+ <string id="34402">Fallo al iniciar dispositivo de sonido</string>
+ <string id="34403">Verifique su configuracion de sonido</string>
<string id="35000">Periféricos</string>
<string id="35001">Dispositivo HID genérico</string>
<string id="35002">Adaptador de red genérico</string>
diff --git a/language/Turkish/strings.xml b/language/Turkish/strings.xml
index 3ae7806fb5..0753c5e4f9 100644
--- a/language/Turkish/strings.xml
+++ b/language/Turkish/strings.xml
@@ -7,8 +7,8 @@
<!--Date of translation: 22/04/2011-->
<!--Translator: Özgür BASKIN (queeup)-->
<!--Email: ozgur.baskin@gmail.com-->
-<!--Date of translation: 25/11/2011-->
-<!--Based on English strings commit f0e75fab88 -->
+<!--Date of translation: 21/01/2012-->
+<!--Based on English strings commit e9bcfd0779 -->
<strings>
<string id="0">Programlar</string>
<string id="1">Resimler</string>
@@ -682,7 +682,7 @@
<!-- strings 768 and 769 reserved for more subtitle colors -->
<string id="770">Hata %i: paylaşım bulunamıyor</string>
- <string id="771"></string>
+
<string id="772">Ses çıkışı</string>
<string id="773">Atla</string>
<string id="774">Slayt Gösterisi klasörü</string>
@@ -1932,8 +1932,8 @@
<string id="21366">Altyazı klasörü</string>
<string id="21367">Film ve alternatif altyazı klasörü</string>
<string id="21368">ASS/SSA altyazı yazı tiplerini geçersiz kıl</string>
-
- <string id="21369">Fareyi etkinleÅŸtir</string>
+
+ <string id="21369">Fareyi ve Dokunmatik Ekran desteÄŸini etkinleÅŸtir</string>
<string id="21370">Ortam oynatılırken kılavuz seslerini çal</string>
<string id="21371">Küçük resimler</string>
<string id="21372">DVD bölge kodunu zorla</string>
@@ -2018,7 +2018,9 @@
<string id="21451">Internet bağlantısı gereklidir.</string>
<string id="21452">Daha Fazla...</string>
<string id="21453">Kök dosya sistemi</string>
-
+ <string id="21454">Önbellek dolu</string>
+ <string id="21455">Önbellek sürekli oynatma için gerekli miktara ulaşamadan doldu</string>
+
<string id="21460">Altyazı konumu</string>
<string id="21461">Sabit</string>
<string id="21462">Videonun en altında</string>
@@ -2322,8 +2324,8 @@
<string id="33071">Özel arka planlar</string>
<string id="33072">Benioku'yu görüntüle</string>
<string id="33073">Değişiklikleri görüntüle</string>
- <string id="33074">This version of %s requires an</string>
- <string id="33075">XBMC revision of %s or greater to run.</string>
+ <string id="33074">%s sürümünün çalışması için</string>
+ <string id="33075">%s veya daha büyük bir XBMC sürümü gerekli.</string>
<string id="33076">Lütfen XBMC'yi güncelleyin.</string>
<string id="33077">Hiç veri bulunamadı!</string>
<string id="33078">Sonraki sayfa</string>
@@ -2332,11 +2334,13 @@
<string id="33081">Bu dosya yığınlandı, oynatmak istediğiniz bölümü seçin.</string>
<string id="33082">Betik yolu</string>
<string id="33083">Özel betik tuşunu etkinleştir</string>
-
+
<string id="33100">Başlatılamadı</string>
<string id="33101">Web Sunucusu</string>
<string id="33102">Olay Sunucusu</string>
<string id="33103">Uzak iletiÅŸim sunucusu</string>
+
+ <string id="33200">Yeni Bağlantı Algılandı</string>
<!-- translators: no need to add these to your language files -->
<string id="34000">Lame</string>
@@ -2361,6 +2365,14 @@
<string id="34201">Çalınacak sonraki öğeyi bulamıyor</string>
<string id="34202">Çalınacak önceki öğeyi bulamıyor</string>
+
+ <string id="34300">Zeroconf başlatılamadı</string>
+ <string id="34301">Apple'ın Bonjour Hizmeti yüklü mü? Daha fazla bilgi için hata ayıklama çıktısına bakın.</string>
+
+ <string id="34400">Video Ä°ÅŸleme</string>
+ <string id="34401">Video filtreleri/ölçekleyiciler başlatılamadı, bilinear ölçeklendirmeye dönülüyor</string>
+ <string id="34402">Ses aygıtı başlatılamadı</string>
+ <string id="34403">Ses ayarlarınızı denetleyin</string>
<string id="35000">Çevre birimleri</string>
diff --git a/lib/addons/script.module.pil/Makefile.in b/lib/addons/script.module.pil/Makefile.in
index a1f4d00e2e..0cc40f4dbc 100644
--- a/lib/addons/script.module.pil/Makefile.in
+++ b/lib/addons/script.module.pil/Makefile.in
@@ -43,6 +43,7 @@ $(SOURCE): $(ARCHIVE)
patch -p1 < ../Imaging-1.1.7-setuptools-0.1.patch; \
patch -p1 < ../Imaging-1.1.7-access.patch; \
sed -ie "s|"darwin"|"darwinNot"|g" "setup.py"; \
+ sed -ie "s|ZLIB_ROOT = None|ZLIB_ROOT = libinclude(\"${platform_sdk_path}/usr\")|" "setup.py"; \
fi
$(DESTDIR): $(SOURCE)
diff --git a/lib/ffmpeg/build_xbmc_win32.sh b/lib/ffmpeg/build_xbmc_win32.sh
index 2f637bdf80..bb93b67ffb 100644
--- a/lib/ffmpeg/build_xbmc_win32.sh
+++ b/lib/ffmpeg/build_xbmc_win32.sh
@@ -47,7 +47,7 @@ OPTIONS="
--enable-avfilter \
--disable-doc"
-./configure --extra-cflags="-fno-common -Iinclude-xbmc-win32/dxva2" --extra-ldflags="-L/xbmc/system/players/dvdplayer" ${OPTIONS} &&
+./configure --extra-cflags="-fno-common -Iinclude-xbmc-win32/dxva2 -DNDEBUG" --extra-ldflags="-L/xbmc/system/players/dvdplayer" ${OPTIONS} &&
make $MAKEFLAGS &&
cp lib*/*.dll .libs/ &&
diff --git a/project/VS2010Express/XBMC.vcxproj b/project/VS2010Express/XBMC.vcxproj
index 2609c25ea2..6c09174d3a 100644
--- a/project/VS2010Express/XBMC.vcxproj
+++ b/project/VS2010Express/XBMC.vcxproj
@@ -743,6 +743,7 @@
<ClCompile Include="..\..\xbmc\SortFileItem.cpp" />
<ClCompile Include="..\..\xbmc\storage\AutorunMediaJob.cpp" />
<ClCompile Include="..\..\xbmc\storage\cdioSupport.cpp" />
+ <ClCompile Include="..\..\xbmc\storage\DetectDVDType.cpp" />
<ClCompile Include="..\..\xbmc\storage\IoSupport.cpp" />
<ClCompile Include="..\..\xbmc\storage\MediaManager.cpp" />
<ClCompile Include="..\..\xbmc\storage\windows\Win32StorageProvider.cpp" />
@@ -756,6 +757,7 @@
<ClCompile Include="..\..\xbmc\threads\platform\Implementation.cpp" />
<ClInclude Include="..\..\xbmc\cores\AudioRenderers\IAudioRenderer.h" />
<ClInclude Include="..\..\xbmc\filesystem\FileUPnP.h" />
+ <ClInclude Include="..\..\xbmc\storage\DetectDVDType.h" />
<ClInclude Include="..\..\xbmc\threads\platform\win\Implementation.cpp" />
<ClCompile Include="..\..\xbmc\threads\SystemClock.cpp" />
<ClCompile Include="..\..\xbmc\threads\Thread.cpp" />
diff --git a/project/VS2010Express/XBMC.vcxproj.filters b/project/VS2010Express/XBMC.vcxproj.filters
index 3e68763199..f1bb61c85f 100644
--- a/project/VS2010Express/XBMC.vcxproj.filters
+++ b/project/VS2010Express/XBMC.vcxproj.filters
@@ -2565,6 +2565,9 @@
<ClCompile Include="..\..\xbmc\filesystem\FileUPnP.cpp">
<Filter>filesystem</Filter>
</ClCompile>
+ <ClCompile Include="..\..\xbmc\storage\DetectDVDType.cpp">
+ <Filter>storage</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\xbmc\win32\pch.h">
@@ -5151,6 +5154,9 @@
<Filter>filesystem</Filter>
</ClInclude>
<ClInclude Include="..\..\xbmc\cores\AudioRenderers\IAudioRenderer.h" />
+ <ClInclude Include="..\..\xbmc\storage\DetectDVDType.h">
+ <Filter>storage</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\..\xbmc\win32\XBMC_PC.rc">
diff --git a/system/Lircmap.xml b/system/Lircmap.xml
index 77fa8b3cd6..b009eab99d 100644
--- a/system/Lircmap.xml
+++ b/system/Lircmap.xml
@@ -425,7 +425,6 @@
<play>KEY_PLAY</play>
<play>KEY_PLAYPAUSE</play>
<pause>KEY_PAUSE</pause>
- <pause>KEY_PLAYPAUSE</pause>
<stop>KEY_STOP</stop>
<stop>KEY_STOPCD</stop>
<forward>KEY_FASTFORWARD</forward>
@@ -466,4 +465,48 @@
<display>KEY_ANGLE</display>
<teletext>KEY_TEXT</teletext>
</remote>
+ <remote device="mediacenter">
+ <pause>pause</pause>
+ <stop>stop</stop>
+ <forward>fwd</forward>
+ <reverse>rew</reverse>
+ <left>left</left>
+ <right>right</right>
+ <up>up</up>
+ <down>down</down>
+ <select>ok</select>
+ <pageplus>ch+</pageplus>
+ <pageminus>ch-</pageminus>
+ <back>back</back>
+ <menu>clear</menu>
+ <title>play</title>
+ <info>info</info>
+ <skipplus>next</skipplus>
+ <skipminus>prev</skipminus>
+ <display>teletext</display>
+ <start>ehome</start>
+ <record>rec</record>
+ <volumeplus>vol+</volumeplus>
+ <volumeminus>vol-</volumeminus>
+ <mute>mute</mute>
+ <power>power</power>
+ <myvideo>video</myvideo>
+ <mymusic>music</mymusic>
+ <mypictures>pictures</mypictures>
+ <mytv>tv</mytv>
+ <one>1</one>
+ <two>2</two>
+ <three>3</three>
+ <four>4</four>
+ <five>5</five>
+ <six>6</six>
+ <seven>7</seven>
+ <eight>8</eight>
+ <nine>9</nine>
+ <zero>0</zero>
+ <mytv>red</mytv>
+ <mymusic>green</mymusic>
+ <mypictures>yellow</mypictures>
+ <myvideo>blue</myvideo>
+ </remote>
</lircmap>
diff --git a/system/keymaps/joystick.AppleRemote.xml b/system/keymaps/joystick.AppleRemote.xml
index 3ce6d4d06d..f93769d1a6 100644
--- a/system/keymaps/joystick.AppleRemote.xml
+++ b/system/keymaps/joystick.AppleRemote.xml
@@ -39,14 +39,14 @@
<!-- hold center--> <button id="7">Fullscreen</button>
<!-- hold menu --> <button id="8">ContextMenu</button>
- <!-- old buttons for ATV <2.2, used on OSX -->
+ <!-- old buttons for ATV1 <2.2, used on OSX -->
<!-- hold left --> <button id="9">Left</button>
<!-- hold right --> <button id="10">Right</button>
<!-- new aluminium remote buttons -->
<!-- play/pause --> <button id="12">Play</button>
- <!-- Additional buttons via Harmony Apple TV remote profile -->
+ <!-- Additional buttons via Harmony Apple TV remote profile - these are also the learned buttons on Apple TV 2gen-->
<!-- pageup --> <button id="13">PageUp</button>
<!-- pagedown --> <button id="14">PageDown</button>
<!-- pause --> <button id="15">Pause</button><!-- work? -->
@@ -57,7 +57,7 @@
<!-- skip fwd --> <button id="20">SkipNext</button>
<!-- skip back --> <button id="21">SkipPrevious</button>
- <!-- Learned remote buttons (ATV >2.3) -->
+ <!-- Learned remote buttons (ATV1 >2.3) -->
<!-- Play --> <button id="70">Play</button>
<!-- Pause --> <button id="71">Pause</button>
<!-- Stop --> <button id="72">Stop</button>
@@ -68,7 +68,7 @@
<!-- Return --> <button id="77">OSD</button>
<!-- Enter --> <button id="78">ShowVideoMenu</button>
- <!-- few gestures from Apple's iPhone Remote (ATV > 2.3 ?) -->
+ <!-- few gestures from Apple's iPhone Remote (ATV1 > 2.3 ?) -->
<!-- SwipeLeft --> <button id="80">Left</button>
<!-- SwipeRight --> <button id="81">Right</button>
<!-- SwipeUp --> <button id="82">Up</button>
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
index a1c4d2dc37..cedda60aaf 100644
--- a/xbmc/Application.cpp
+++ b/xbmc/Application.cpp
@@ -266,9 +266,10 @@
#ifdef HAS_SDL_AUDIO
#include <SDL/SDL_mixer.h>
#endif
-#ifdef _WIN32
+#ifdef TARGET_WINDOWS
#include <shlobj.h>
#include "win32util.h"
+#include "storage/DetectDVDType.h"
#endif
#ifdef HAS_XRANDR
#include "windowing/X11/XRandR.h"
@@ -1032,7 +1033,7 @@ bool CApplication::InitDirectoriesWin32()
VECSOURCES::const_iterator it;
for(it=vShare.begin();it!=vShare.end();++it)
if(g_mediaManager.GetDriveStatus(it->strPath) == DRIVE_CLOSED_MEDIA_PRESENT)
- g_application.getApplicationMessenger().OpticalMount(it->strPath);
+ CJobManager::GetInstance().AddJob(new CDetectDisc(it->strPath, false), NULL);
// remove end
return true;
@@ -1072,6 +1073,18 @@ bool CApplication::Initialize()
CDirectory::Create("special://xbmc/sounds");
}
+ // Load curl so curl_global_init gets called before any service threads
+ // are started. Unloading will have no effect as curl is never fully unloaded.
+ // To quote man curl_global_init:
+ // "This function is not thread safe. You must not call it when any other
+ // thread in the program (i.e. a thread sharing the same memory) is running.
+ // This doesn't just mean no other thread that is using libcurl. Because
+ // curl_global_init() calls functions of other libraries that are similarly
+ // thread unsafe, it could conflict with any other thread that
+ // uses these other libraries."
+ g_curlInterface.Load();
+ g_curlInterface.Unload();
+
StartServices();
// Init DPMS, before creating the corresponding setting control.
@@ -3010,6 +3023,11 @@ bool CApplication::ProcessEventServer(float frameTime)
bool isAxis = false;
float fAmount = 0.0;
+ // es->ExecuteNextAction() invalidates the ref to the CEventServer instance
+ // when the action exits XBMC
+ es = CEventServer::GetInstance();
+ if (!es || !es->Running() || es->GetNumberOfClients()==0)
+ return false;
WORD wKeyID = es->GetButtonCode(joystickName, isAxis, fAmount);
if (wKeyID)
@@ -4373,6 +4391,12 @@ void CApplication::CheckScreenSaverAndDPMS()
maybeScreensaver = false;
}
+ if (m_bScreenSave && IsPlayingVideo() && !m_pPlayer->IsPaused())
+ {
+ WakeUpScreenSaverAndDPMS();
+ return;
+ }
+
if (!maybeScreensaver && !maybeDPMS) return; // Nothing to do.
// See if we need to reset timer.
diff --git a/xbmc/ApplicationMessenger.cpp b/xbmc/ApplicationMessenger.cpp
index 9ae6a09f44..2e314731a1 100644
--- a/xbmc/ApplicationMessenger.cpp
+++ b/xbmc/ApplicationMessenger.cpp
@@ -68,6 +68,9 @@
#include "playlists/PlayList.h"
#include "FileItem.h"
+#include "utils/JobManager.h"
+#include "storage/DetectDVDType.h"
+
using namespace std;
CDelayedMessage::CDelayedMessage(ThreadMessage& msg, unsigned int delay)
@@ -726,31 +729,6 @@ case TMSG_POWERDOWN:
break;
#ifdef HAS_DVD_DRIVE
- case TMSG_OPTICAL_MOUNT:
- {
- CMediaSource share;
- share.strPath = pMsg->strParam;
- share.strStatus = g_mediaManager.GetDiskLabel(share.strPath);
- share.strDiskUniqueId = g_mediaManager.GetDiskUniqueId(share.strPath);
- if(g_mediaManager.IsAudio(share.strPath))
- share.strStatus = "Audio-CD";
- else if(share.strStatus == "")
- share.strStatus = g_localizeStrings.Get(446);
- share.strName = share.strPath;
- share.m_ignore = true;
- share.m_iDriveType = CMediaSource::SOURCE_TYPE_DVD;
- g_mediaManager.AddAutoSource(share, pMsg->dwParam1 != 0);
- }
- break;
-
- case TMSG_OPTICAL_UNMOUNT:
- {
- CMediaSource share;
- share.strPath = pMsg->strParam;
- share.strName = share.strPath;
- g_mediaManager.RemoveAutoSource(share);
- }
- break;
case TMSG_CALLBACK:
{
ThreadMessageCallback *callback = (ThreadMessageCallback*)pMsg->lpVoid;
@@ -1180,21 +1158,6 @@ vector<bool> CApplicationMessenger::GetInfoBooleans(const vector<CStdString> &pr
return infoLabels;
}
-void CApplicationMessenger::OpticalMount(CStdString device, bool bautorun)
-{
- ThreadMessage tMsg = {TMSG_OPTICAL_MOUNT};
- tMsg.strParam = device;
- tMsg.dwParam1 = (DWORD)bautorun;
- SendMessage(tMsg, false);
-}
-
-void CApplicationMessenger::OpticalUnMount(CStdString device)
-{
- ThreadMessage tMsg = {TMSG_OPTICAL_UNMOUNT};
- tMsg.strParam = device;
- SendMessage(tMsg, false);
-}
-
void CApplicationMessenger::ShowVolumeBar(bool up)
{
ThreadMessage tMsg = {TMSG_VOLUME_SHOW};
diff --git a/xbmc/ApplicationMessenger.h b/xbmc/ApplicationMessenger.h
index fa2e62837a..9833e1b790 100644
--- a/xbmc/ApplicationMessenger.h
+++ b/xbmc/ApplicationMessenger.h
@@ -91,9 +91,6 @@ class CGUIWindow;
#define TMSG_GUI_INFOLABEL 608
#define TMSG_GUI_INFOBOOL 609
-#define TMSG_OPTICAL_MOUNT 700
-#define TMSG_OPTICAL_UNMOUNT 701
-
#define TMSG_CALLBACK 800
#define TMSG_VOLUME_SHOW 900
@@ -197,9 +194,6 @@ public:
std::vector<CStdString> GetInfoLabels(const std::vector<CStdString> &properties);
std::vector<bool> GetInfoBooleans(const std::vector<CStdString> &properties);
- void OpticalMount(CStdString device, bool bautorun=false);
- void OpticalUnMount(CStdString device);
-
void ShowVolumeBar(bool up);
void SetSplashMessage(const CStdString& message);
diff --git a/xbmc/FileItem.cpp b/xbmc/FileItem.cpp
index c21c0f4684..27a9adf74b 100644
--- a/xbmc/FileItem.cpp
+++ b/xbmc/FileItem.cpp
@@ -1158,7 +1158,7 @@ bool CFileItem::IsAlbum() const
return m_bIsAlbum;
}
-void CFileItem::UpdateInfo(const CFileItem &item)
+void CFileItem::UpdateInfo(const CFileItem &item, bool replaceLabels /*=true*/)
{
if (item.HasVideoInfoTag())
{ // copy info across (TODO: premiered info is normally stored in m_dateTime by the db)
@@ -1170,9 +1170,9 @@ void CFileItem::UpdateInfo(const CFileItem &item)
if (item.HasPictureInfoTag())
*GetPictureInfoTag() = *item.GetPictureInfoTag();
- if (!item.GetLabel().IsEmpty())
+ if (replaceLabels && !item.GetLabel().IsEmpty())
SetLabel(item.GetLabel());
- if (!item.GetLabel2().IsEmpty())
+ if (replaceLabels && !item.GetLabel2().IsEmpty())
SetLabel2(item.GetLabel2());
if (!item.GetThumbnailImage().IsEmpty())
SetThumbnailImage(item.GetThumbnailImage());
@@ -1994,7 +1994,7 @@ void CFileItemList::Stack(bool stackFiles /* = true */)
if (IsVirtualDirectoryRoot() || IsLiveTV() || IsSourcesPath())
return;
- SetProperty("isstacked", "1");
+ SetProperty("isstacked", true);
// items needs to be sorted for stuff below to work properly
Sort(SORT_METHOD_LABEL, SORT_ORDER_ASC);
@@ -2149,9 +2149,6 @@ void CFileItemList::StackFiles()
{
CFileItemPtr item1 = Get(i);
- // set property
- item1->SetProperty("isstacked", "1");
-
// skip folders, nfo files, playlists
if (item1->m_bIsFolder
|| item1->IsParentFolder()
@@ -2712,16 +2709,14 @@ CStdString CFileItem::GetBaseMoviePath(bool bUseFolderNames) const
if (IsMultiPath())
strMovieName = CMultiPathDirectory::GetFirstPath(m_strPath);
- int pos;
- if ((pos=strMovieName.Find("BDMV/")) != -1 ||
- (pos=strMovieName.Find("BDMV\\")) != -1)
- strMovieName = strMovieName.Mid(0,pos+5);
+ if (IsOpticalMediaFile())
+ return GetLocalMetadataPath();
- if ((!m_bIsFolder || IsOpticalMediaFile() || URIUtils::IsInArchive(m_strPath)) && bUseFolderNames)
+ if ((!m_bIsFolder || URIUtils::IsInArchive(m_strPath)) && bUseFolderNames)
{
CStdString name2(strMovieName);
URIUtils::GetParentPath(name2,strMovieName);
- if (URIUtils::IsInArchive(m_strPath) || strMovieName.Find( "VIDEO_TS" ) != -1)
+ if (URIUtils::IsInArchive(m_strPath))
{
CStdString strArchivePath;
URIUtils::GetParentPath(strMovieName, strArchivePath);
@@ -2735,61 +2730,41 @@ CStdString CFileItem::GetBaseMoviePath(bool bUseFolderNames) const
#ifdef UNIT_TESTING
bool CFileItem::testGetBaseMoviePath()
{
- CFileItem item;
- CStdString path;
- bool result = true;
-
- item.SetPath("c:\\dir\\filename.avi");
- path = item.GetBaseMoviePath(false);
- if (path != "c:\\dir\\filename.avi")
- result = false;
-
- item.SetPath("c:\\dir\\filename.avi");
- path = item.GetBaseMoviePath(true);
- if (path != "c:\\dir\\")
- result = false;
-
- item.SetPath("/dir/filename.avi");
- path = item.GetBaseMoviePath(false);
- if (path != "/dir/filename.avi")
- result = false;
-
- item.SetPath("/dir/filename.avi");
- path = item.GetBaseMoviePath(true);
- if (path != "/dir/")
- result = false;
-
- item.SetPath("smb://somepath/file.avi");
- path = item.GetBaseMoviePath(false);
- if (path != "smb://somepath/file.avi")
- result = false;
-
- item.SetPath("smb://somepath/file.avi");
- path = item.GetBaseMoviePath(true);
- if (path != "smb://somepath/")
- result = false;
-
- item.SetPath("stack:///path/to/movie_name/cd1/some_file1.avi , /path/to/movie_name/cd2/some_file2.avi");
- path = item.GetBaseMoviePath(false);
- if (path != "stack:///path/to/movie_name/cd1/some_file1.avi , /path/to/movie_name/cd2/some_file2.avi")
- result = false;
-
- item.SetPath("stack:///path/to/movie_name/cd1/some_file1.avi , /path/to/movie_name/cd2/some_file2.avi");
- path = item.GetBaseMoviePath(true);
- if (path != "/path/to/movie_name/")
- result = false;
-
- item.SetPath("/home/user/TV Shows/Dexter/S1/1x01.avi");
- path = item.GetBaseMoviePath(true);
- if (path != "/home/user/TV Shows/Dexter/S1/")
- result = false;
-
- item.SetPath("rar://g%3a%5cmultimedia%5cmovies%5cSphere%2erar/Sphere.avi");
- path = item.GetBaseMoviePath(true);
- if (path != "g:\\multimedia\\movies\\")
- result = false;
-
- return result;
+ typedef struct
+ {
+ const char *file;
+ bool use_folder;
+ const char *base;
+ } testfiles;
+
+ const testfiles test_files[] = {{ "c:\\dir\\filename.avi", false, "c:\\dir\\filename.avi" },
+ { "c:\\dir\\filename.avi", true, "c:\\dir\\" },
+ { "/dir/filename.avi", false, "/dir/filename.avi" },
+ { "/dir/filename.avi", true, "/dir/" },
+ { "smb://somepath/file.avi", false, "smb://somepath/file.avi" },
+ { "smb://somepath/file.avi", true, "smb://somepath/" },
+ { "stack:///path/to/movie_name/cd1/some_file1.avi , /path/to/movie_name/cd2/some_file2.avi", false, "stack:///path/to/movie_name/cd1/some_file1.avi , /path/to/movie_name/cd2/some_file2.avi" },
+ { "stack:///path/to/movie_name/cd1/some_file1.avi , /path/to/movie_name/cd2/some_file2.avi", true, "/path/to/movie_name/" },
+ { "/home/user/TV Shows/Dexter/S1/1x01.avi", false, "/home/user/TV Shows/Dexter/S1/1x01.avi" },
+ { "/home/user/TV Shows/Dexter/S1/1x01.avi", true, "/home/user/TV Shows/Dexter/S1/" },
+ { "rar://g%3a%5cmultimedia%5cmovies%5cSphere%2erar/Sphere.avi", true, "g:\\multimedia\\movies\\" },
+ { "/home/user/movies/movie_name/video_ts/VIDEO_TS.IFO", false, "/home/user/movies/movie_name/" },
+ { "/home/user/movies/movie_name/video_ts/VIDEO_TS.IFO", true, "/home/user/movies/movie_name/" },
+ { "/home/user/movies/movie_name/BDMV/index.bdmv", false, "/home/user/movies/movie_name/" },
+ { "/home/user/movies/movie_name/BDMV/index.bdmv", true, "/home/user/movies/movie_name/" }};
+
+ for (unsigned int i = 0; i < sizeof(test_files) / sizeof(testfiles); i++)
+ {
+ CFileItem item;
+ item.SetPath(test_files[i].file);
+ CStdString path = item.GetBaseMoviePath(test_files[i].use_folder);
+ if (path != test_files[i].base)
+ {
+ CLog::Log(LOGFATAL, "%s failed ('%s' -> '%s' != '%s')", __FUNCTION__, test_files[i].file, path.c_str(), test_files[i].base);
+ return false;
+ }
+ }
+ return true;
}
#endif
@@ -2922,7 +2897,7 @@ CStdString CFileItem::GetLocalMetadataPath() const
CStdString parentFolder(parent);
URIUtils::RemoveSlashAtEnd(parentFolder);
parentFolder = URIUtils::GetFileName(parentFolder);
- if (parentFolder == "VIDEO_TS" || parentFolder == "BDMV")
+ if (parentFolder.CompareNoCase("VIDEO_TS") == 0 || parentFolder.CompareNoCase("BDMV") == 0)
{ // go back up another one
parent = URIUtils::GetParentPath(parent);
}
diff --git a/xbmc/FileItem.h b/xbmc/FileItem.h
index c5a748b5e3..73faf0d25a 100644
--- a/xbmc/FileItem.h
+++ b/xbmc/FileItem.h
@@ -239,8 +239,10 @@ public:
// Gets the correct movie title
CStdString GetMovieName(bool bUseFolderNames = false) const;
- /*! \brief Find the base movie path (eg the folder if using "use foldernames for lookups")
- Takes care of VIDEO_TS, BDMV, and rar:// listings
+ /*! \brief Find the base movie path (i.e. the item the user expects us to use to lookup the movie)
+ For folder items, with "use foldernames for lookups" it returns the folder.
+ Regardless of settings, for VIDEO_TS/BDMV it returns the parent of the VIDEO_TS/BDMV folder (if present)
+
\param useFolderNames whether we're using foldernames for lookups
\return the base movie folder
*/
@@ -293,8 +295,9 @@ public:
Properties are appended, and labels, thumbnail and icon are updated if non-empty
in the given item.
\param item the item used to supplement information
+ \param replaceLabels whether to replace labels (defaults to true)
*/
- void UpdateInfo(const CFileItem &item);
+ void UpdateInfo(const CFileItem &item, bool replaceLabels = true);
bool IsSamePath(const CFileItem *item) const;
diff --git a/xbmc/GUIInfoManager.cpp b/xbmc/GUIInfoManager.cpp
index 0aae13905c..5241748285 100644
--- a/xbmc/GUIInfoManager.cpp
+++ b/xbmc/GUIInfoManager.cpp
@@ -218,6 +218,7 @@ const infomap system_labels[] = {{ "hasnetwork", SYSTEM_ETHERNET_LINK_ACT
{ "cansuspend", SYSTEM_CAN_SUSPEND },
{ "canhibernate", SYSTEM_CAN_HIBERNATE },
{ "canreboot", SYSTEM_CAN_REBOOT },
+ { "screensaveractive",SYSTEM_SCREENSAVER_ACTIVE },
{ "cputemperature", SYSTEM_CPU_TEMPERATURE }, // labels from here
{ "cpuusage", SYSTEM_CPU_USAGE },
{ "gputemperature", SYSTEM_GPU_TEMPERATURE },
@@ -1519,7 +1520,7 @@ CStdString CGUIInfoManager::GetLabel(int info, int contextWindow)
break;
#ifdef HAS_LCD
case LCD_PROGRESS_BAR:
- if (g_lcd) strLabel = g_lcd->GetProgressBar(g_application.GetTime(), g_application.GetTotalTime());
+ if (g_lcd && g_lcd->IsConnected()) strLabel = g_lcd->GetProgressBar(g_application.GetTime(), g_application.GetTotalTime());
break;
#endif
case NETWORK_IP_ADDRESS:
@@ -1904,6 +1905,8 @@ bool CGUIInfoManager::GetBool(int condition1, int contextWindow, const CGUIListI
bReturn = g_powerManager.CanHibernate();
else if (condition == SYSTEM_CAN_REBOOT)
bReturn = g_powerManager.CanReboot();
+ else if (condition == SYSTEM_SCREENSAVER_ACTIVE)
+ bReturn = g_application.IsInScreenSaver();
else if (condition == PLAYER_SHOWINFO)
bReturn = m_playerShowInfo;
@@ -1968,7 +1971,7 @@ bool CGUIInfoManager::GetBool(int condition1, int contextWindow, const CGUIListI
{
CGUIWindow *pWindow = GetWindowWithCondition(contextWindow, WINDOW_CONDITION_IS_MEDIA_WINDOW);
if (pWindow)
- bReturn = ((CGUIMediaWindow*)pWindow)->CurrentDirectory().GetProperty("isstacked")=="1";
+ bReturn = ((CGUIMediaWindow*)pWindow)->CurrentDirectory().GetProperty("isstacked").asBoolean();
}
else if (condition == CONTAINER_HAS_THUMB)
{
diff --git a/xbmc/GUIInfoManager.h b/xbmc/GUIInfoManager.h
index e0f9c5f735..c6590a4709 100644
--- a/xbmc/GUIInfoManager.h
+++ b/xbmc/GUIInfoManager.h
@@ -372,6 +372,7 @@ namespace INFO
#define SYSTEM_BATTERY_LEVEL 714
#define SYSTEM_IDLE_TIME 715
#define SYSTEM_FRIENDLY_NAME 716
+#define SYSTEM_SCREENSAVER_ACTIVE 717
#define LIBRARY_HAS_MUSIC 720
#define LIBRARY_HAS_VIDEO 721
diff --git a/xbmc/NfoFile.h b/xbmc/NfoFile.h
index 246e4e49c4..17f68aebdd 100644
--- a/xbmc/NfoFile.h
+++ b/xbmc/NfoFile.h
@@ -51,7 +51,7 @@ public:
NFOResult Create(const CStdString&, const ADDON::ScraperPtr&, int episode=-1,
const CStdString& strPath2="");
template<class T>
- bool GetDetails(T& details,const char* document=NULL, bool prefix=false)
+ bool GetDetails(T& details,const char* document=NULL, bool prioritise=false)
{
TiXmlDocument doc;
CStdString strDoc;
@@ -64,7 +64,7 @@ public:
g_charsetConverter.unknownToUTF8(strDoc);
doc.Parse(strDoc.c_str());
- return details.Load(doc.RootElement(),true,prefix);
+ return details.Load(doc.RootElement(), true, prioritise);
}
void Close();
diff --git a/xbmc/ThumbnailCache.cpp b/xbmc/ThumbnailCache.cpp
index a5553db897..5da6b9edc1 100644
--- a/xbmc/ThumbnailCache.cpp
+++ b/xbmc/ThumbnailCache.cpp
@@ -120,7 +120,7 @@ CStdString CThumbnailCache::GetAlbumThumb(const CMusicInfoTag *musicInfo)
if (!musicInfo)
return CStdString();
- return GetAlbumThumb(musicInfo->GetAlbum(), !musicInfo->GetArtist().empty() ? musicInfo->GetArtist() : musicInfo->GetAlbumArtist());
+ return GetAlbumThumb(musicInfo->GetAlbum(), !musicInfo->GetAlbumArtist().empty() ? musicInfo->GetAlbumArtist() : musicInfo->GetArtist());
}
CStdString CThumbnailCache::GetAlbumThumb(const CAlbum &album)
@@ -209,7 +209,7 @@ CStdString CThumbnailCache::GetVideoThumb(const CFileItem &item)
CStdString CThumbnailCache::GetFanart(const CFileItem &item)
{
// get the locally cached thumb
- if (item.IsVideoDb() || item.HasVideoInfoTag())
+ if (item.IsVideoDb() || (item.HasVideoInfoTag() && !item.GetVideoInfoTag()->IsEmpty()))
{
if (!item.HasVideoInfoTag())
return "";
@@ -232,7 +232,7 @@ CStdString CThumbnailCache::GetFanart(const CFileItem &item)
}
return GetThumb(showPath,g_settings.GetVideoFanartFolder());
}
- CStdString path = item.m_bIsFolder ? item.GetVideoInfoTag()->m_strPath : item.GetVideoInfoTag()->m_strFileNameAndPath;
+ CStdString path = item.GetVideoInfoTag()->GetPath();
if (path.empty())
return "";
return GetThumb(path,g_settings.GetVideoFanartFolder());
diff --git a/xbmc/addons/AddonInstaller.cpp b/xbmc/addons/AddonInstaller.cpp
index 44fd977b99..deb30a2a67 100644
--- a/xbmc/addons/AddonInstaller.cpp
+++ b/xbmc/addons/AddonInstaller.cpp
@@ -521,21 +521,26 @@ bool CAddonInstallJob::Install(const CStdString &installFrom)
{
if (it->first.Equals("xbmc.metadata"))
continue;
+
+ const CStdString &addonID = it->first;
+ const AddonVersion &version = it->second.first;
+ bool optional = it->second.second;
AddonPtr dependency;
- if (!CAddonMgr::Get().GetAddon(it->first,dependency) || dependency->Version() < it->second.first)
- {
+ bool haveAddon = CAddonMgr::Get().GetAddon(addonID, dependency);
+ if ((haveAddon && !dependency->MeetsVersion(version)) || (!haveAddon && !optional))
+ { // we have it but our version isn't good enough, or we don't have it and we need it
bool force=(dependency != NULL);
// dependency is already queued up for install - ::Install will fail
// instead we wait until the Job has finished. note that we
// recall install on purpose in case prior installation failed
- if (CAddonInstaller::Get().HasJob(it->first))
+ if (CAddonInstaller::Get().HasJob(addonID))
{
- while (CAddonInstaller::Get().HasJob(it->first))
+ while (CAddonInstaller::Get().HasJob(addonID))
Sleep(50);
force = false;
}
// don't have the addon or the addon isn't new enough - grab it (no new job for these)
- if (!CAddonInstaller::Get().Install(it->first, force, referer, false))
+ if (!CAddonInstaller::Get().Install(addonID, force, referer, false))
{
DeleteAddon(addonFolder);
return false;
diff --git a/xbmc/addons/Repository.cpp b/xbmc/addons/Repository.cpp
index 3cc4a93403..e64cb4e621 100644
--- a/xbmc/addons/Repository.cpp
+++ b/xbmc/addons/Repository.cpp
@@ -255,10 +255,8 @@ VECADDONS CRepositoryUpdateJob::GrabAddons(RepositoryPtr& repo)
CLog::Log(LOGERROR,"Repository %s returned no add-ons, listing may have failed",repo->Name().c_str());
}
else
- {
database.GetRepository(repo->ID(),addons);
- database.SetRepoTimestamp(repo->ID(),CDateTime::GetCurrentDateTime().GetAsDBDateTime());
- }
+ database.SetRepoTimestamp(repo->ID(),CDateTime::GetCurrentDateTime().GetAsDBDateTime());
return addons;
}
diff --git a/xbmc/cores/AudioRenderers/CoreAudioRenderer.cpp b/xbmc/cores/AudioRenderers/CoreAudioRenderer.cpp
index 34f17d47ad..1cd5d5d358 100644
--- a/xbmc/cores/AudioRenderers/CoreAudioRenderer.cpp
+++ b/xbmc/cores/AudioRenderers/CoreAudioRenderer.cpp
@@ -36,7 +36,6 @@
#include "utils/log.h"
#include "utils/TimeUtils.h"
-
const AudioChannelLabel g_LabelMap[] =
{
kAudioChannelLabel_Left, // PCM_FRONT_LEFT,
@@ -552,14 +551,14 @@ bool CCoreAudioRenderer::Initialize(IAudioCallback* pCallback, const CStdString&
"No suitable AC3 output format found. Attempting DD-Wav.");
configured = InitializePCMEncoded(m_init_state.uiSamplesPerSec);
// TODO: wait for audio device startup
- Sleep(100);
+ Sleep(250);
}
else
{
// Standard PCM data
configured = InitializePCM(m_init_state.iChannels, m_init_state.uiSamplesPerSec, m_init_state.uiBitsPerSample, m_init_state.channelMap);
// TODO: wait for audio device startup
- Sleep(100);
+ Sleep(250);
}
// No suitable output format was able to be configured
diff --git a/xbmc/cores/AudioRenderers/NullDirectSound.cpp b/xbmc/cores/AudioRenderers/NullDirectSound.cpp
index 52af7845a2..20e6125b6d 100644
--- a/xbmc/cores/AudioRenderers/NullDirectSound.cpp
+++ b/xbmc/cores/AudioRenderers/NullDirectSound.cpp
@@ -22,6 +22,7 @@
#include "threads/SystemClock.h"
#include "NullDirectSound.h"
#include "guilib/AudioContext.h"
+#include "guilib/LocalizeStrings.h"
#include "utils/log.h"
#include "utils/TimeUtils.h"
#include "dialogs/GUIDialogKaiToast.h"
@@ -52,7 +53,7 @@ bool CNullDirectSound::Initialize(IAudioCallback* pCallback, const CStdString& d
g_audioContext.SetupSpeakerConfig(iChannels, bAudioOnAllSpeakers, bIsMusic);
g_audioContext.SetActiveDevice(CAudioContext::DIRECTSOUND_DEVICE);
- CGUIDialogKaiToast::QueueNotification(CGUIDialogKaiToast::Error, "Failed to initialize audio device", "Check your audiosettings", TOAST_DISPLAY_TIME, false);
+ CGUIDialogKaiToast::QueueNotification(CGUIDialogKaiToast::Error, g_localizeStrings.Get(34402), g_localizeStrings.Get(34403), TOAST_DISPLAY_TIME, false);
m_timePerPacket = 1.0f / (float)(iChannels*(uiBitsPerSample/8) * uiSamplesPerSec);
m_packetsSent = 0;
m_paused = 0;
diff --git a/xbmc/cores/DllLoader/LibraryLoader.h b/xbmc/cores/DllLoader/LibraryLoader.h
index a3f6c5d042..7f5129f2b0 100644
--- a/xbmc/cores/DllLoader/LibraryLoader.h
+++ b/xbmc/cores/DllLoader/LibraryLoader.h
@@ -22,9 +22,8 @@
#ifndef LIBRARY_LOADER
#define LIBRARY_LOADER
-#ifndef _LINUX
-#include "system.h" // WIN32INCLUDES - needed for HMODULE
-#else
+#include "system.h"
+#ifdef _LINUX
#include "PlatformDefs.h"
#endif
diff --git a/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp b/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
index b4ecc84ad8..8172750462 100644
--- a/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
+++ b/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
@@ -37,6 +37,7 @@
#include "windowing/WindowingFactory.h"
#include "dialogs/GUIDialogKaiToast.h"
#include "guilib/Texture.h"
+#include "guilib/LocalizeStrings.h"
#include "threads/SingleLock.h"
#include "DllSwScale.h"
#include "utils/log.h"
@@ -871,7 +872,7 @@ void CLinuxRendererGL::UpdateVideoFilter()
break;
}
- CGUIDialogKaiToast::QueueNotification(CGUIDialogKaiToast::Error, "Video Renderering", "Failed to init video filters/scalers, falling back to bilinear scaling");
+ CGUIDialogKaiToast::QueueNotification(CGUIDialogKaiToast::Error, g_localizeStrings.Get(34400), g_localizeStrings.Get(34401));
CLog::Log(LOGERROR, "GL: Falling back to bilinear due to failure to init scaler");
if (m_pVideoFilterShader)
{
@@ -3026,6 +3027,13 @@ bool CLinuxRendererGL::Supports(EINTERLACEMETHOD method)
return false;
}
+#ifdef TARGET_DARWIN
+ // YADIF too slow for HD but we have no methods to fall back
+ // to something that works so just turn it off.
+ if(method == VS_INTERLACEMETHOD_DEINTERLACE)
+ return false;
+#endif
+
if(method == VS_INTERLACEMETHOD_DEINTERLACE
|| method == VS_INTERLACEMETHOD_DEINTERLACE_HALF
|| method == VS_INTERLACEMETHOD_SW_BLEND)
diff --git a/xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp b/xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp
index 578f6cca04..6af7ebfec8 100644
--- a/xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp
+++ b/xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp
@@ -51,6 +51,9 @@
#include "DVDCodecs/Video/DVDVideoCodecVideoToolBox.h"
#include <CoreVideo/CoreVideo.h>
#endif
+#ifdef TARGET_DARWIN_IOS
+#include "osx/DarwinUtils.h"
+#endif
using namespace Shaders;
@@ -582,6 +585,9 @@ void CLinuxRendererGLES::UpdateVideoFilter()
void CLinuxRendererGLES::LoadShaders(int field)
{
+#ifdef TARGET_DARWIN_IOS
+ float ios_version = GetIOSVersion();
+#endif
int requestedMethod = g_guiSettings.GetInt("videoplayer.rendermethod");
CLog::Log(LOGDEBUG, "GL: Requested render method: %d", requestedMethod);
@@ -614,8 +620,8 @@ void CLinuxRendererGLES::LoadShaders(int field)
m_renderMethod = RENDER_CVREF;
break;
}
- #if defined(__APPLE__) && defined(__arm__)
- else if (CONF_FLAGS_FORMAT_MASK(m_iFlags) == CONF_FLAGS_FORMAT_YV12)
+ #if defined(TARGET_DARWIN_IOS)
+ else if (ios_version < 5.0 && CONF_FLAGS_FORMAT_MASK(m_iFlags) == CONF_FLAGS_FORMAT_YV12)
{
CLog::Log(LOGNOTICE, "GL: Using software color conversion/RGBA render method");
m_renderMethod = RENDER_SW;
diff --git a/xbmc/cores/VideoRenderers/WinRenderer.cpp b/xbmc/cores/VideoRenderers/WinRenderer.cpp
index 2bca5e37b3..8ff4a1297f 100644
--- a/xbmc/cores/VideoRenderers/WinRenderer.cpp
+++ b/xbmc/cores/VideoRenderers/WinRenderer.cpp
@@ -558,7 +558,7 @@ void CWinRenderer::UpdatePSVideoFilter()
if (!m_scalerShader->Create(m_scalingMethod))
{
SAFE_DELETE(m_scalerShader);
- CGUIDialogKaiToast::QueueNotification(CGUIDialogKaiToast::Error, "Video Renderering", "Failed to init video scaler, falling back to bilinear scaling.");
+ CGUIDialogKaiToast::QueueNotification(CGUIDialogKaiToast::Error, g_localizeStrings.Get(34400), g_localizeStrings.Get(34401));
m_bUseHQScaler = false;
}
}
diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
index fbe68710c6..a27f052aa0 100644
--- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
+++ b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
@@ -772,7 +772,7 @@ DemuxPacket* CDVDDemuxFFmpeg::Read()
if(duration > stream->duration)
{
stream->duration = duration;
- duration = m_dllAvUtil.av_rescale_rnd(stream->duration, stream->time_base.num * AV_TIME_BASE, stream->time_base.den, AV_ROUND_NEAR_INF);
+ duration = m_dllAvUtil.av_rescale_rnd(stream->duration, (int64_t)stream->time_base.num * AV_TIME_BASE, stream->time_base.den, AV_ROUND_NEAR_INF);
if ((m_pFormatContext->duration == (int64_t)AV_NOPTS_VALUE && m_pFormatContext->file_size > 0)
|| (m_pFormatContext->duration != (int64_t)AV_NOPTS_VALUE && duration > m_pFormatContext->duration))
m_pFormatContext->duration = duration;
diff --git a/xbmc/cores/dvdplayer/DVDPlayer.cpp b/xbmc/cores/dvdplayer/DVDPlayer.cpp
index f00e5e5568..a2ca1807b0 100644
--- a/xbmc/cores/dvdplayer/DVDPlayer.cpp
+++ b/xbmc/cores/dvdplayer/DVDPlayer.cpp
@@ -1393,7 +1393,7 @@ void CDVDPlayer::HandlePlaySpeed()
{
if(level < 0.0)
{
- CGUIDialogKaiToast::QueueNotification("Cache full", "Cache filled before reaching required amount for continous playback");
+ CGUIDialogKaiToast::QueueNotification(g_localizeStrings.Get(21454), g_localizeStrings.Get(21455));
caching = CACHESTATE_INIT;
}
if(level >= 1.0)
diff --git a/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp b/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
index 9ee4d5b1ec..95d47b689e 100644
--- a/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
+++ b/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
@@ -1492,7 +1492,7 @@ void CDVDPlayerVideo::CalcFrameRate()
//and is able to calculate the correct frame duration from it
double frameduration = m_pullupCorrection.GetFrameDuration();
- if (frameduration == DVD_NOPTS_VALUE)
+ if (frameduration == DVD_NOPTS_VALUE || m_pullupCorrection.GetPatternLength() > 1)
{
//reset the stored framerates if no good framerate was detected
m_fStableFrameRate = 0.0;
diff --git a/xbmc/cores/paplayer/MP3codec.cpp b/xbmc/cores/paplayer/MP3codec.cpp
index c03ebb0707..4593d0daff 100644
--- a/xbmc/cores/paplayer/MP3codec.cpp
+++ b/xbmc/cores/paplayer/MP3codec.cpp
@@ -71,7 +71,9 @@ MP3Codec::MP3Codec()
m_HaveData = false;
flushcnt = 0;
- madx_init(&mxhouse);
+
+ if (m_dll.Load())
+ madx_init(&mxhouse);
}
MP3Codec::~MP3Codec()
@@ -84,7 +86,8 @@ MP3Codec::~MP3Codec()
delete[] m_OutputBuffer;
m_OutputBuffer = NULL;
- madx_deinit(&mxhouse);
+ if (m_dll.IsLoaded())
+ madx_deinit(&mxhouse);
}
//Eventhandler if filereader is clearedwe flush the decoder.
@@ -95,8 +98,9 @@ void MP3Codec::OnFileReaderClearEvent()
bool MP3Codec::Init(const CStdString &strFile, unsigned int filecache)
{
- if (!m_dll.IsLoaded())
- m_dll.Load();
+ if (!m_dll.Load())
+ return false;
+
// set defaults...
m_InputBufferPos = 0;
m_OutputBufferPos = 0;
diff --git a/xbmc/dialogs/GUIDialogContextMenu.cpp b/xbmc/dialogs/GUIDialogContextMenu.cpp
index d8d47fede6..1dc25a8a91 100644
--- a/xbmc/dialogs/GUIDialogContextMenu.cpp
+++ b/xbmc/dialogs/GUIDialogContextMenu.cpp
@@ -220,10 +220,17 @@ void CGUIDialogContextMenu::SetupButtons()
}
// update our default control
- if (m_defaultControl < BUTTON_START || m_defaultControl > BUTTON_END)
- m_defaultControl = BUTTON_START;
- while (m_defaultControl <= BUTTON_END && !(GetControl(m_defaultControl)->CanFocus()))
- m_defaultControl++;
+ if (pGroupList)
+ m_defaultControl = pGroupList->GetID();
+#if PRE_SKIN_VERSION_11_COMPATIBILITY
+ else
+ {
+ if (m_defaultControl < BUTTON_START || m_defaultControl > BUTTON_END)
+ m_defaultControl = BUTTON_START;
+ while (m_defaultControl <= BUTTON_END && !(GetControl(m_defaultControl)->CanFocus()))
+ m_defaultControl++;
+ }
+#endif
}
void CGUIDialogContextMenu::SetPosition(float posX, float posY)
diff --git a/xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp b/xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp
index 242b2eac9a..5999638e9d 100644
--- a/xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp
+++ b/xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp
@@ -164,12 +164,12 @@ void CGUIDialogSmartPlaylistEditor::OnOK()
// save our playlist
if (m_path.IsEmpty())
{
- CStdString filename(m_playlist.m_playlistName);
+ CStdString filename(CUtil::MakeLegalFileName(m_playlist.m_playlistName));
CStdString path;
if (CGUIDialogKeyboard::ShowAndGetInput(filename, g_localizeStrings.Get(16013), false))
{
path = URIUtils::AddFileToFolder(g_guiSettings.GetString("system.playlistspath"),m_playlist.GetSaveLocation());
- path = URIUtils::AddFileToFolder(path, filename);
+ path = URIUtils::AddFileToFolder(path, CUtil::MakeLegalFileName(filename));
}
else
return;
diff --git a/xbmc/filesystem/DllLibCurl.cpp b/xbmc/filesystem/DllLibCurl.cpp
index 167f848b67..fa6367b4c5 100644
--- a/xbmc/filesystem/DllLibCurl.cpp
+++ b/xbmc/filesystem/DllLibCurl.cpp
@@ -32,14 +32,16 @@ using namespace XCURL;
/* okey this is damn ugly. our dll loader doesn't allow for postload, preunload functions */
static long g_curlReferences = 0;
-//static unsigned int g_curlTimeout = 0;
+#if(0)
+static unsigned int g_curlTimeout = 0;
+#endif
bool DllLibCurlGlobal::Load()
{
CSingleLock lock(m_critSection);
if(g_curlReferences > 0)
{
- //g_curlReferences++;
+ g_curlReferences++;
return true;
}
@@ -56,16 +58,13 @@ bool DllLibCurlGlobal::Load()
}
/* check idle will clean up the last one */
- //g_curlReferences = 2;
- g_curlReferences = 1;
+ g_curlReferences = 2;
return true;
}
void DllLibCurlGlobal::Unload()
{
- return;
- /*
CSingleLock lock(m_critSection);
if (--g_curlReferences == 0)
{
@@ -78,22 +77,21 @@ void DllLibCurlGlobal::Unload()
DllDynamic::Unload();
}
- // CheckIdle will clear this one up
+ /* CheckIdle will clear this one up */
+#if(0)
if(g_curlReferences == 1)
g_curlTimeout = XbmcThreads::SystemClockMillis();
- */
+#endif
}
void DllLibCurlGlobal::CheckIdle()
{
/* avoid locking section here, to avoid stalling gfx thread on loads*/
- return;
- /*
if(g_curlReferences == 0)
return;
CSingleLock lock(m_critSection);
- // 20 seconds idle time before closing handle
+ /* 20 seconds idle time before closing handle */
const unsigned int idletime = 30000;
VEC_CURLSESSIONS::iterator it = m_sessions.begin();
@@ -118,10 +116,11 @@ void DllLibCurlGlobal::CheckIdle()
it++;
}
- // check if we should unload the dll
+ /* check if we should unload the dll */
+#if(0) // we never unload libcurl, since libssl can break when python unloads then
if(g_curlReferences == 1 && XbmcThreads::SystemClockMillis() - g_curlTimeout > idletime)
Unload();
- */
+#endif
}
void DllLibCurlGlobal::easy_aquire(const char *protocol, const char *hostname, CURL_HANDLE** easy_handle, CURLM** multi_handle)
diff --git a/xbmc/filesystem/FTPParse.cpp b/xbmc/filesystem/FTPParse.cpp
index b3b5251812..b9e2aa0489 100644
--- a/xbmc/filesystem/FTPParse.cpp
+++ b/xbmc/filesystem/FTPParse.cpp
@@ -415,7 +415,13 @@ int CFTPParse::FTPParse(string str)
if (pcrecpp::RE("-").FullMatch(type))
m_flagtryretr = 1;
if (pcrecpp::RE("l").FullMatch(type))
+ {
m_flagtrycwd = m_flagtryretr = 1;
+ // handle symlink
+ size_t found = m_name.find(" -> ");
+ if (found != std::string::npos)
+ m_name = m_name.substr(0, found);
+ }
setTime(date);
return 1;
@@ -441,7 +447,13 @@ int CFTPParse::FTPParse(string str)
if (pcrecpp::RE("-").FullMatch(type))
m_flagtryretr = 1;
if (pcrecpp::RE("l").FullMatch(type))
+ {
m_flagtrycwd = m_flagtryretr = 1;
+ // handle symlink
+ size_t found = m_name.find(" -> ");
+ if (found != std::string::npos)
+ m_name = m_name.substr(0, found);
+ }
setTime(date);
return 1;
diff --git a/xbmc/filesystem/FileCDDA.cpp b/xbmc/filesystem/FileCDDA.cpp
index aff43497ff..bae2d875ed 100644
--- a/xbmc/filesystem/FileCDDA.cpp
+++ b/xbmc/filesystem/FileCDDA.cpp
@@ -130,9 +130,11 @@ unsigned int CFileCDDA::Read(void* lpBuf, int64_t uiBufSize)
if (m_lsnCurrent + iSectorCount > m_lsnEnd)
iSectorCount = m_lsnEnd - m_lsnCurrent;
- if (m_cdio->cdio_read_audio_sectors(m_pCdIo, lpBuf, m_lsnCurrent, iSectorCount) != DRIVER_OP_SUCCESS)
+ int iret = m_cdio->cdio_read_audio_sectors(m_pCdIo, lpBuf, m_lsnCurrent, iSectorCount);
+
+ if ( iret != DRIVER_OP_SUCCESS)
{
- CLog::Log(LOGERROR, "file cdda: Reading %d sectors of audio data starting at lsn %d failed", iSectorCount, m_lsnCurrent);
+ CLog::Log(LOGERROR, "file cdda: Reading %d sectors of audio data starting at lsn %d failed with error code %i", iSectorCount, m_lsnCurrent, iret);
return 0;
}
diff --git a/xbmc/filesystem/FileNFS.cpp b/xbmc/filesystem/FileNFS.cpp
index 5a89a618af..271c36301e 100644
--- a/xbmc/filesystem/FileNFS.cpp
+++ b/xbmc/filesystem/FileNFS.cpp
@@ -31,6 +31,7 @@
#include "utils/log.h"
#include "utils/URIUtils.h"
#include "network/DNSNameCache.h"
+#include "threads/SystemClock.h"
#include <nfsc/libnfs-raw-mount.h>
@@ -45,6 +46,9 @@
//do the nfs keep alive for the open files
#define KEEP_ALIVE_TIMEOUT 480
+//4 mins cached context timeout
+#define CONTEXT_TIMEOUT 240000
+
//return codes for getContextForExport
#define CONTEXT_INVALID 0 //getcontext failed
#define CONTEXT_NEW 1 //new context created
@@ -128,19 +132,38 @@ void CNfsConnection::destroyOpenContexts()
{
for(tOpenContextMap::iterator it = m_openContextMap.begin();it!=m_openContextMap.end();it++)
{
- m_pLibNfs->nfs_destroy_context(it->second);
+ m_pLibNfs->nfs_destroy_context(it->second.pContext);
}
m_openContextMap.clear();
}
struct nfs_context *CNfsConnection::getContextFromMap(const CStdString &exportname)
{
+ struct nfs_context *pRet = NULL;
+
tOpenContextMap::iterator it = m_openContextMap.find(exportname.c_str());
if(it != m_openContextMap.end())
{
- return it->second;
+ //check if context has timed out already
+ uint64_t now = XbmcThreads::SystemClockMillis();
+ if((now - it->second.lastAccessedTime) < CONTEXT_TIMEOUT)
+ {
+ //its not timedout yet
+ //refresh access time of that
+ //context and return it
+ CLog::Log(LOGDEBUG, "NFS: Refreshing context for %s, old: %"PRId64", new: %"PRId64, exportname.c_str(), it->second.lastAccessedTime, now);
+ it->second.lastAccessedTime = now;
+ pRet = it->second.pContext;
+ }
+ else
+ {
+ //context is timed out
+ //destroy it and return NULL
+ CLog::Log(LOGDEBUG, "NFS: Old context timed out - destroying it");
+ m_pLibNfs->nfs_destroy_context(it->second.pContext);
+ }
}
- return NULL;
+ return pRet;
}
int CNfsConnection::getContextForExport(const CStdString &exportname)
@@ -164,7 +187,10 @@ int CNfsConnection::getContextForExport(const CStdString &exportname)
}
else
{
- m_openContextMap[exportname] = m_pNfsContext; //add context to list of all contexts
+ struct contextTimeout tmp;
+ tmp.pContext = m_pNfsContext;
+ tmp.lastAccessedTime = XbmcThreads::SystemClockMillis();
+ m_openContextMap[exportname] = tmp; //add context to list of all contexts
ret = CONTEXT_NEW;
}
}
diff --git a/xbmc/filesystem/FileNFS.h b/xbmc/filesystem/FileNFS.h
index ffeb34ac35..ca42686945 100644
--- a/xbmc/filesystem/FileNFS.h
+++ b/xbmc/filesystem/FileNFS.h
@@ -52,7 +52,14 @@ class CNfsConnection : public CCriticalSection
{
public:
typedef std::map<struct nfsfh *, unsigned int> tFileKeepAliveMap;
- typedef std::map<std::string, struct nfs_context *> tOpenContextMap;
+
+ struct contextTimeout
+ {
+ struct nfs_context *pContext;
+ uint64_t lastAccessedTime;
+ };
+
+ typedef std::map<std::string, struct contextTimeout> tOpenContextMap;
CNfsConnection();
~CNfsConnection();
diff --git a/xbmc/filesystem/FileShoutcast.cpp b/xbmc/filesystem/FileShoutcast.cpp
index 9a138eeeb8..79fa6ac25d 100644
--- a/xbmc/filesystem/FileShoutcast.cpp
+++ b/xbmc/filesystem/FileShoutcast.cpp
@@ -111,7 +111,7 @@ unsigned int CFileShoutcast::Read(void* lpBuf, int64_t uiBufSize)
if (m_metaint > 0)
toRead = std::min((unsigned int)uiBufSize,(unsigned int)m_metaint-m_currint);
else
- toRead = std::min(uiBufSize,int64_t(16*255));
+ toRead = std::min((unsigned int)uiBufSize,(unsigned int)16*255);
toRead = m_file.Read(lpBuf,toRead);
m_currint += toRead;
return toRead;
diff --git a/xbmc/filesystem/IDirectory.cpp b/xbmc/filesystem/IDirectory.cpp
index 874d163b6e..67f91d6c93 100644
--- a/xbmc/filesystem/IDirectory.cpp
+++ b/xbmc/filesystem/IDirectory.cpp
@@ -68,6 +68,16 @@ bool IDirectory::IsAllowed(const CStdString& strFile) const
if (fileName.length() == 12 && fileName.Left(4).Equals("vts_") && fileName.Right(6).Equals("_0.ifo")) return true;
return false;
}
+ if (strExtension.Equals(".dat|"))
+ {
+ CStdString fileName = URIUtils::GetFileName(strFile);
+ /* VCD filenames are of the form AVSEQ##(#).DAT, ITEM###(#).DAT, MUSIC##(#).DAT - i.e. all 11 or 12 characters long
+ starting with AVSEQ, MUSIC or ITEM */
+ if ((fileName.length() == 11 || fileName.length() == 12) &&
+ (fileName.Left(5).Equals("AVSEQ") || fileName.Left(5).Equals("MUSIC") || fileName.Left(4).Equals("ITEM")))
+ return true;
+ return false;
+ }
return true;
}
return false;
diff --git a/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeEpisodes.cpp b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeEpisodes.cpp
index 3c1f1ec826..3bfee107a1 100644
--- a/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeEpisodes.cpp
+++ b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeEpisodes.cpp
@@ -41,7 +41,12 @@ bool CDirectoryNodeEpisodes::GetContent(CFileItemList& items) const
CollectQueryParams(params);
CStdString strBaseDir=BuildPath();
- bool bSuccess=videodatabase.GetEpisodesNav(strBaseDir, items, params.GetGenreId(), params.GetYear(), params.GetActorId(), params.GetDirectorId(), params.GetTvShowId(), params.GetSeason());
+
+ int season = (int)params.GetSeason();
+ if (season == -2)
+ season = -1;
+
+ bool bSuccess=videodatabase.GetEpisodesNav(strBaseDir, items, params.GetGenreId(), params.GetYear(), params.GetActorId(), params.GetDirectorId(), params.GetTvShowId(), season);
videodatabase.Close();
diff --git a/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeSeasons.cpp b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeSeasons.cpp
index 36c071f535..79580f0bdf 100644
--- a/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeSeasons.cpp
+++ b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeSeasons.cpp
@@ -48,6 +48,13 @@ CStdString CDirectoryNodeSeasons::GetLocalizedName() const
return g_localizeStrings.Get(20381); // Specials
case -1:
return g_localizeStrings.Get(20366); // All Seasons
+ case -2:
+ {
+ CDirectoryNode *pParent = GetParent();
+ if (pParent)
+ return pParent->GetLocalizedName();
+ return "";
+ }
default:
CStdString season;
season.Format(g_localizeStrings.Get(20358), GetID()); // Season <season>
@@ -85,8 +92,8 @@ bool CDirectoryNodeSeasons::GetContent(CFileItemList& items) const
if (bFlatten)
{ // flatten if one season or flatten always
items.Clear();
- bSuccess=videodatabase.GetEpisodesNav(BuildPath()+"-1/",items,params.GetGenreId(),params.GetYear(),params.GetActorId(),params.GetDirectorId(),params.GetTvShowId());
- items.SetPath(BuildPath()+"-1/");
+ bSuccess=videodatabase.GetEpisodesNav(BuildPath()+"-2/",items,params.GetGenreId(),params.GetYear(),params.GetActorId(),params.GetDirectorId(),params.GetTvShowId());
+ items.SetPath(BuildPath()+"-2/");
}
videodatabase.Close();
diff --git a/xbmc/guilib/GUISettingsSliderControl.cpp b/xbmc/guilib/GUISettingsSliderControl.cpp
index 7a52d8581e..bd362f2c1b 100644
--- a/xbmc/guilib/GUISettingsSliderControl.cpp
+++ b/xbmc/guilib/GUISettingsSliderControl.cpp
@@ -36,10 +36,16 @@ CGUISettingsSliderControl::~CGUISettingsSliderControl(void)
void CGUISettingsSliderControl::Process(unsigned int currentTime, CDirtyRegionList &dirtyregions)
{
+ if (m_bInvalidated)
+ {
+ float sliderPosX = m_buttonControl.GetXPosition() + m_buttonControl.GetWidth() - m_width - m_buttonControl.GetLabelInfo().offsetX;
+ float sliderPosY = m_buttonControl.GetYPosition() + (m_buttonControl.GetHeight() - m_height) * 0.5f;
+ CGUISliderControl::SetPosition(sliderPosX, sliderPosY);
+ }
m_buttonControl.SetFocus(HasFocus());
m_buttonControl.SetPulseOnSelect(m_pulseOnSelect);
m_buttonControl.SetEnabled(m_enabled);
- m_buttonControl.Process(currentTime, dirtyregions);
+ m_buttonControl.DoProcess(currentTime, dirtyregions);
ProcessText();
CGUISliderControl::Process(currentTime, dirtyregions);
}
@@ -100,21 +106,19 @@ void CGUISettingsSliderControl::SetInvalid()
void CGUISettingsSliderControl::SetPosition(float posX, float posY)
{
m_buttonControl.SetPosition(posX, posY);
- float sliderPosX = posX + m_buttonControl.GetWidth() - m_width - m_buttonControl.GetLabelInfo().offsetX;
- float sliderPosY = posY + (m_buttonControl.GetHeight() - m_height) * 0.5f;
- CGUISliderControl::SetPosition(sliderPosX, sliderPosY);
+ CGUISliderControl::SetInvalid();
}
void CGUISettingsSliderControl::SetWidth(float width)
{
m_buttonControl.SetWidth(width);
- SetPosition(GetXPosition(), GetYPosition());
+ CGUISliderControl::SetInvalid();
}
void CGUISettingsSliderControl::SetHeight(float height)
{
m_buttonControl.SetHeight(height);
- SetPosition(GetXPosition(), GetYPosition());
+ CGUISliderControl::SetInvalid();
}
void CGUISettingsSliderControl::SetEnabled(bool bEnable)
diff --git a/xbmc/guilib/GUISpinControlEx.cpp b/xbmc/guilib/GUISpinControlEx.cpp
index c5405ac496..42d07f9190 100644
--- a/xbmc/guilib/GUISpinControlEx.cpp
+++ b/xbmc/guilib/GUISpinControlEx.cpp
@@ -69,9 +69,12 @@ void CGUISpinControlEx::Process(unsigned int currentTime, CDirtyRegionList &dirt
m_buttonControl.SetPulseOnSelect(m_pulseOnSelect);
m_buttonControl.SetEnabled(m_enabled);
if (m_bInvalidated)
- SetPosition(GetXPosition(), GetYPosition());
-
- m_buttonControl.Process(currentTime, dirtyregions);
+ {
+ float spinPosX = m_buttonControl.GetXPosition() + m_buttonControl.GetWidth() - GetSpinWidth() * 2 - (m_spinPosX ? m_spinPosX : m_buttonControl.GetLabelInfo().offsetX);
+ float spinPosY = m_buttonControl.GetYPosition() + (m_buttonControl.GetHeight() - GetSpinHeight()) * 0.5f;
+ CGUISpinControl::SetPosition(spinPosX, spinPosY);
+ }
+ m_buttonControl.DoProcess(currentTime, dirtyregions);
CGUISpinControl::Process(currentTime, dirtyregions);
}
@@ -84,21 +87,19 @@ void CGUISpinControlEx::Render()
void CGUISpinControlEx::SetPosition(float posX, float posY)
{
m_buttonControl.SetPosition(posX, posY);
- float spinPosX = posX + m_buttonControl.GetWidth() - GetSpinWidth() * 2 - (m_spinPosX ? m_spinPosX : m_buttonControl.GetLabelInfo().offsetX);
- float spinPosY = posY + (m_buttonControl.GetHeight() - GetSpinHeight()) * 0.5f;
- CGUISpinControl::SetPosition(spinPosX, spinPosY);
+ CGUISpinControl::SetInvalid();
}
void CGUISpinControlEx::SetWidth(float width)
{
m_buttonControl.SetWidth(width);
- SetPosition(m_buttonControl.GetXPosition(), m_buttonControl.GetYPosition());
+ CGUISpinControl::SetInvalid();
}
void CGUISpinControlEx::SetHeight(float height)
{
m_buttonControl.SetHeight(height);
- SetPosition(m_buttonControl.GetXPosition(), m_buttonControl.GetYPosition());
+ CGUISpinControl::SetInvalid();
}
bool CGUISpinControlEx::UpdateColors()
diff --git a/xbmc/guilib/GUIToggleButtonControl.cpp b/xbmc/guilib/GUIToggleButtonControl.cpp
index 370a931fad..6686b1d3d6 100644
--- a/xbmc/guilib/GUIToggleButtonControl.cpp
+++ b/xbmc/guilib/GUIToggleButtonControl.cpp
@@ -58,7 +58,7 @@ void CGUIToggleButtonControl::Process(unsigned int currentTime, CDirtyRegionList
m_selectButton.SetVisible(IsVisible());
m_selectButton.SetEnabled(!IsDisabled());
m_selectButton.SetPulseOnSelect(m_pulseOnSelect);
- m_selectButton.Process(currentTime, dirtyregions);
+ m_selectButton.DoProcess(currentTime, dirtyregions);
}
CGUIButtonControl::Process(currentTime, dirtyregions);
}
diff --git a/xbmc/guilib/JpegIO.cpp b/xbmc/guilib/JpegIO.cpp
index 79682a4dc1..15819bd4a4 100644
--- a/xbmc/guilib/JpegIO.cpp
+++ b/xbmc/guilib/JpegIO.cpp
@@ -159,7 +159,7 @@ bool CJpegIO::Open(const CStdString &texturePath, unsigned int minx, unsigned in
XFILE::CFile file;
if (file.Open(m_texturePath.c_str(), 0))
{
- m_imgsize = file.GetLength();
+ m_imgsize = (unsigned int)file.GetLength();
m_inputBuff = new unsigned char[m_imgsize];
m_inputBuffSize = file.Read(m_inputBuff, m_imgsize);
file.Close();
diff --git a/xbmc/input/ButtonTranslator.cpp b/xbmc/input/ButtonTranslator.cpp
index 88ea85d4ff..7c640db705 100644
--- a/xbmc/input/ButtonTranslator.cpp
+++ b/xbmc/input/ButtonTranslator.cpp
@@ -416,7 +416,7 @@ void CButtonTranslator::RemoveDevice(CStdString& strDevice)
Load();
}
-bool CButtonTranslator::Load(void)
+bool CButtonTranslator::Load(bool AlwaysLoad)
{
m_translatorMap.clear();
@@ -429,8 +429,11 @@ bool CButtonTranslator::Load(void)
};
bool success = false;
- // If we've already loaded the m_baseMap we don't need to load it again
- if (m_Loaded)
+ // If we've already loaded the m_baseMap we don't need to load it
+ // again - this speeds up reloads caused by plugging and unplugging
+ // HID devices. However if AlwaysLoad is true always load the keymaps
+ // from scratch.
+ if (m_Loaded && !AlwaysLoad)
{
m_translatorMap = m_baseMap;
}
diff --git a/xbmc/input/ButtonTranslator.h b/xbmc/input/ButtonTranslator.h
index c22104e6e2..802f16bfff 100644
--- a/xbmc/input/ButtonTranslator.h
+++ b/xbmc/input/ButtonTranslator.h
@@ -69,7 +69,7 @@ public:
void RemoveDevice(CStdString& strDevice);
/// loads Lircmap.xml/IRSSmap.xml (if enabled) and Keymap.xml
- bool Load(void);
+ bool Load(bool AlwaysLoad = false);
/// clears the maps
void Clear();
diff --git a/xbmc/interfaces/json-rpc/AudioLibrary.cpp b/xbmc/interfaces/json-rpc/AudioLibrary.cpp
index 0f92385ef0..ca7f7b5576 100644
--- a/xbmc/interfaces/json-rpc/AudioLibrary.cpp
+++ b/xbmc/interfaces/json-rpc/AudioLibrary.cpp
@@ -329,6 +329,22 @@ bool CAudioLibrary::FillFileItemList(const CVariant &parameterObject, CFileItemL
}
musicdatabase.Close();
+
+ if (success)
+ {
+ // If we retrieved the list of songs by "artistid"
+ // we sort by album (and implicitly by track number)
+ if (artistID != -1)
+ list.Sort(SORT_METHOD_ALBUM_IGNORE_THE, SORT_ORDER_ASC);
+ // If we retrieve the list of songs by "genreid"
+ // we sort by artist (and implicitly by album and track number)
+ else if (genreID != -1)
+ list.Sort(SORT_METHOD_ARTIST_IGNORE_THE, SORT_ORDER_ASC);
+ // otherwise we sort by track number
+ else
+ list.Sort(SORT_METHOD_TRACKNUM, SORT_ORDER_ASC);
+
+ }
}
return success;
diff --git a/xbmc/interfaces/json-rpc/FileItemHandler.cpp b/xbmc/interfaces/json-rpc/FileItemHandler.cpp
index 964e0adcaf..097ea31adb 100644
--- a/xbmc/interfaces/json-rpc/FileItemHandler.cpp
+++ b/xbmc/interfaces/json-rpc/FileItemHandler.cpp
@@ -144,13 +144,7 @@ void CFileItemHandler::HandleFileItem(const char *ID, bool allowFile, const char
if (ID)
{
- if (stricmp(ID, "genreid") == 0)
- {
- CStdString genre = item->GetPath();
- genre.TrimRight('/');
- object[ID] = atoi(genre.c_str());
- }
- else if (item->HasMusicInfoTag() && item->GetMusicInfoTag()->GetDatabaseId() > 0)
+ if (item->HasMusicInfoTag() && item->GetMusicInfoTag()->GetDatabaseId() > 0)
object[ID] = (int)item->GetMusicInfoTag()->GetDatabaseId();
else if (item->HasVideoInfoTag() && item->GetVideoInfoTag()->m_iDbId > 0)
object[ID] = item->GetVideoInfoTag()->m_iDbId;
@@ -180,6 +174,10 @@ void CFileItemHandler::HandleFileItem(const char *ID, bool allowFile, const char
object["type"] = "movie";
break;
+ case VIDEODB_CONTENT_TVSHOWS:
+ object["type"] = "tvshow";
+ break;
+
default:
break;
}
@@ -339,8 +337,6 @@ bool CFileItemHandler::ParseSortMethods(const CStdString &method, const bool &ig
sortmethod = SORT_METHOD_PLAYCOUNT;
else if (method.Equals("unsorted"))
sortmethod = SORT_METHOD_UNSORTED;
- else if (method.Equals("max"))
- sortmethod = SORT_METHOD_MAX;
else
return false;
diff --git a/xbmc/interfaces/json-rpc/FileOperations.cpp b/xbmc/interfaces/json-rpc/FileOperations.cpp
index 8dca2758bc..7902a0fe39 100644
--- a/xbmc/interfaces/json-rpc/FileOperations.cpp
+++ b/xbmc/interfaces/json-rpc/FileOperations.cpp
@@ -34,6 +34,9 @@
using namespace XFILE;
using namespace JSONRPC;
+static const unsigned int SourcesSize = 5;
+static CStdString SourceNames[] = { "programs", "files", "video", "music", "pictures" };
+
JSON_STATUS CFileOperations::GetRootDirectory(const CStdString &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result)
{
CStdString media = parameterObject["media"].asString();
@@ -44,7 +47,13 @@ JSON_STATUS CFileOperations::GetRootDirectory(const CStdString &method, ITranspo
{
CFileItemList items;
for (unsigned int i = 0; i < (unsigned int)sources->size(); i++)
+ {
+ // Do not show sources which are locked
+ if (sources->at(i).m_iHasLock == 2)
+ continue;
+
items.Add(CFileItemPtr(new CFileItem(sources->at(i))));
+ }
for (unsigned int i = 0; i < (unsigned int)items.Size(); i++)
{
@@ -74,6 +83,17 @@ JSON_STATUS CFileOperations::GetDirectory(const CStdString &method, ITransportLa
CFileItemList items;
CStdString strPath = parameterObject["directory"].asString();
+ // Check if this directory is part of a source and whether it's locked
+ VECSOURCES *sources;
+ bool isSource;
+ for (unsigned int index = 0; index < SourcesSize; index++)
+ {
+ sources = g_settings.GetSourcesFromType(SourceNames[index]);
+ int sourceIndex = CUtil::GetMatchingSource(strPath, *sources, isSource);
+ if (sourceIndex >= 0 && sourceIndex < (int)sources->size() && sources->at(sourceIndex).m_iHasLock == 2)
+ return InvalidParams;
+ }
+
CStdStringArray regexps;
CStdString extensions = "";
if (media.Equals("video"))
diff --git a/xbmc/interfaces/json-rpc/JSONServiceDescription.cpp b/xbmc/interfaces/json-rpc/JSONServiceDescription.cpp
index 337a92dec4..b38806f616 100644
--- a/xbmc/interfaces/json-rpc/JSONServiceDescription.cpp
+++ b/xbmc/interfaces/json-rpc/JSONServiceDescription.cpp
@@ -1236,7 +1236,7 @@ bool CJSONServiceDescription::parseTypeDefinition(const CVariant &value, JSONSch
if (value.isMember("default") && IsType(value["default"], type.type))
{
bool ok = false;
- if (type.enums.size() >= 0)
+ if (type.enums.size() <= 0)
ok = true;
// If the type has an enum definition we must make
// sure that the default value is a valid enum value
@@ -1499,7 +1499,7 @@ bool CJSONServiceDescription::parseTypeDefinition(const CVariant &value, JSONSch
bool ok = false;
if (value.isMember("default") && IsType(value["default"], type.type))
{
- if (type.enums.size() >= 0)
+ if (type.enums.size() <= 0)
ok = true;
// If the type has an enum definition we must make
// sure that the default value is a valid enum value
diff --git a/xbmc/interfaces/json-rpc/ServiceDescription.h b/xbmc/interfaces/json-rpc/ServiceDescription.h
index bf55b4b4f4..facaef1d5a 100644
--- a/xbmc/interfaces/json-rpc/ServiceDescription.h
+++ b/xbmc/interfaces/json-rpc/ServiceDescription.h
@@ -190,7 +190,7 @@ namespace JSONRPC
"\"canshuffle\": { \"type\": \"boolean\" },"
"\"canrepeat\": { \"type\": \"boolean\" },"
"\"currentaudiostream\": { \"$ref\": \"Player.Audio.Stream.Extended\" },"
- "\"audiostreams\": { \"type\": \"array\", \"items\": { \"$ref\": \"Player.Audio.Stream.Extended\" } },"
+ "\"audiostreams\": { \"type\": \"array\", \"items\": { \"$ref\": \"Player.Audio.Stream\" } },"
"\"subtitleenabled\": { \"type\": \"boolean\" },"
"\"currentsubtitle\": { \"$ref\": \"Player.Subtitle\" },"
"\"subtitles\": { \"type\": \"array\", \"items\": { \"$ref\": \"Player.Subtitle\" } }"
@@ -656,7 +656,7 @@ namespace JSONRPC
"\"enum\": [ \"none\", \"label\", \"date\", \"size\", \"file\", \"drivetype\", \"track\", \"duration\", \"title\", \"artist\","
"\"album\", \"genre\", \"year\", \"videorating\", \"programcount\", \"playlist\", \"episode\", \"videotitle\","
"\"sorttitle\", \"productioncode\", \"songrating\", \"mpaarating\", \"videoruntime\", \"studio\", \"fullpath\","
- "\"lastplayed\", \"unsorted\", \"max\" ]"
+ "\"lastplayed\", \"unsorted\" ]"
"},"
"\"order\": { \"type\": \"string\", \"default\": \"ascending\", \"enum\": [ \"ascending\", \"descending\" ] },"
"\"ignorearticle\": { \"type\": \"boolean\", \"default\": false }"
diff --git a/xbmc/interfaces/json-rpc/types.json b/xbmc/interfaces/json-rpc/types.json
index 318782dabc..24fd9f836c 100644
--- a/xbmc/interfaces/json-rpc/types.json
+++ b/xbmc/interfaces/json-rpc/types.json
@@ -162,7 +162,7 @@
"canshuffle": { "type": "boolean" },
"canrepeat": { "type": "boolean" },
"currentaudiostream": { "$ref": "Player.Audio.Stream.Extended" },
- "audiostreams": { "type": "array", "items": { "$ref": "Player.Audio.Stream.Extended" } },
+ "audiostreams": { "type": "array", "items": { "$ref": "Player.Audio.Stream" } },
"subtitleenabled": { "type": "boolean" },
"currentsubtitle": { "$ref": "Player.Subtitle" },
"subtitles": { "type": "array", "items": { "$ref": "Player.Subtitle" } }
@@ -628,7 +628,7 @@
"enum": [ "none", "label", "date", "size", "file", "drivetype", "track", "duration", "title", "artist",
"album", "genre", "year", "videorating", "programcount", "playlist", "episode", "videotitle",
"sorttitle", "productioncode", "songrating", "mpaarating", "videoruntime", "studio", "fullpath",
- "lastplayed", "unsorted", "max" ]
+ "lastplayed", "unsorted" ]
},
"order": { "type": "string", "default": "ascending", "enum": [ "ascending", "descending" ] },
"ignorearticle": { "type": "boolean", "default": false }
diff --git a/xbmc/interfaces/python/xbmcmodule/action.cpp b/xbmc/interfaces/python/xbmcmodule/action.cpp
index 74c49f26d0..ff03f3ff83 100644
--- a/xbmc/interfaces/python/xbmcmodule/action.cpp
+++ b/xbmc/interfaces/python/xbmcmodule/action.cpp
@@ -19,6 +19,12 @@
*
*/
+// Get rid of 'dereferencing type-punned pointer will break strict-aliasing rules'
+// warnings caused by Py_RETURN_TRUE/FALSE.
+#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
+#pragma GCC diagnostic ignored "-Wstrict-aliasing"
+#endif
+
#include "action.h"
#include "guilib/Key.h"
#include "pyutil.h"
diff --git a/xbmc/interfaces/python/xbmcmodule/xbmcmodule.cpp b/xbmc/interfaces/python/xbmcmodule/xbmcmodule.cpp
index fc6a57df61..0de5cca8d7 100644
--- a/xbmc/interfaces/python/xbmcmodule/xbmcmodule.cpp
+++ b/xbmc/interfaces/python/xbmcmodule/xbmcmodule.cpp
@@ -478,6 +478,8 @@ namespace PYXBMC
"getInfoLabel(infotag) -- Returns an InfoLabel as a string.\n"
"\n"
"infotag : string - infoTag for value you want returned.\n"
+ " Also multiple InfoLabels are possible e.x.:\n"
+ " label = xbmc.getInfoLabel('$INFO[Weather.Conditions] - thats the weather')\n"
"\n"
"List of InfoTags - http://wiki.xbmc.org/?title=InfoLabels \n"
"\n"
@@ -495,7 +497,17 @@ namespace PYXBMC
CPyThreadState gilRelease;
int ret = g_infoManager.TranslateString(cLine);
- cret = g_infoManager.GetLabel(ret);
+ //doesn't seem to be a single InfoTag?
+ //try full blown GuiInfoLabel then
+ if (ret == 0)
+ {
+ CGUIInfoLabel label(cLine);
+ cret = label.GetLabel(0);
+ }
+ else
+ {
+ cret = g_infoManager.GetLabel(ret);
+ }
}
return Py_BuildValue((char*)"s", cret.c_str());
}
diff --git a/xbmc/linux/XLCDproc.cpp b/xbmc/linux/XLCDproc.cpp
index 58d2a3d913..01f59ad421 100644
--- a/xbmc/linux/XLCDproc.cpp
+++ b/xbmc/linux/XLCDproc.cpp
@@ -40,6 +40,8 @@ XLCDproc::XLCDproc()
m_iActualpos = 0;
m_iBackLight = 32;
m_iLCDContrast = 50;
+ m_iColumns = 0;
+ m_iRows = 0;
m_bStop = true;
m_sockfd = -1;
m_lastInitAttempt = 0;
@@ -291,6 +293,16 @@ void XLCDproc::Resume()
}
}
+int XLCDproc::GetColumns()
+{
+ return m_iColumns;
+}
+
+int XLCDproc::GetRows()
+{
+ return m_iRows;
+}
+
void XLCDproc::SetLine(int iLine, const CStdString& strLine)
{
if (m_bStop || m_sockfd == -1)
diff --git a/xbmc/linux/XLCDproc.h b/xbmc/linux/XLCDproc.h
index f54b448111..96285ef1a2 100644
--- a/xbmc/linux/XLCDproc.h
+++ b/xbmc/linux/XLCDproc.h
@@ -40,6 +40,8 @@ public:
virtual void Resume();
virtual void SetBackLight(int iLight);
virtual void SetContrast(int iContrast);
+ virtual int GetColumns();
+ virtual int GetRows();
protected:
virtual void Process();
@@ -48,10 +50,6 @@ protected:
void CloseSocket();
unsigned int m_iColumns; // display columns for each line
unsigned int m_iRows; // total number of rows
- unsigned int m_iRow1adr;
- unsigned int m_iRow2adr;
- unsigned int m_iRow3adr;
- unsigned int m_iRow4adr;
unsigned int m_iActualpos; // actual cursor possition
int m_iBackLight;
int m_iLCDContrast;
diff --git a/xbmc/linux/XThreadUtils.h b/xbmc/linux/XThreadUtils.h
index 41b659e7af..fe8fafb905 100644
--- a/xbmc/linux/XThreadUtils.h
+++ b/xbmc/linux/XThreadUtils.h
@@ -89,7 +89,7 @@ public:
void *Get()
{
if (pthread_getspecific(m_key) == NULL)
-pthread_setspecific(m_key, malloc(8));
+ pthread_setspecific(m_key, calloc(8, 1));
return pthread_getspecific(m_key);
}
diff --git a/xbmc/music/Album.cpp b/xbmc/music/Album.cpp
index 46b3ab9cd1..4275d7882a 100644
--- a/xbmc/music/Album.cpp
+++ b/xbmc/music/Album.cpp
@@ -28,19 +28,19 @@
using namespace std;
using namespace MUSIC_INFO;
-bool CAlbum::Load(const TiXmlElement *album, bool chained, bool prefix)
+bool CAlbum::Load(const TiXmlElement *album, bool append, bool prioritise)
{
if (!album) return false;
- if (!chained)
+ if (!append)
Reset();
XMLUtils::GetString(album,"title",strAlbum);
- XMLUtils::GetAdditiveString(album,"artist",g_advancedSettings.m_musicItemSeparator,strArtist);
- XMLUtils::GetAdditiveString(album,"genre",g_advancedSettings.m_musicItemSeparator,strGenre);
- XMLUtils::GetAdditiveString(album,"style",g_advancedSettings.m_musicItemSeparator,strStyles);
- XMLUtils::GetAdditiveString(album,"mood",g_advancedSettings.m_musicItemSeparator,strMoods);
- XMLUtils::GetAdditiveString(album,"theme",g_advancedSettings.m_musicItemSeparator,strThemes);
+ XMLUtils::GetAdditiveString(album, "artist", g_advancedSettings.m_musicItemSeparator, strArtist, prioritise);
+ XMLUtils::GetAdditiveString(album, "genre", g_advancedSettings.m_musicItemSeparator, strGenre, prioritise);
+ XMLUtils::GetAdditiveString(album, "style", g_advancedSettings.m_musicItemSeparator, strStyles, prioritise);
+ XMLUtils::GetAdditiveString(album, "mood", g_advancedSettings.m_musicItemSeparator, strMoods, prioritise);
+ XMLUtils::GetAdditiveString(album, "theme", g_advancedSettings.m_musicItemSeparator, strThemes, prioritise);
XMLUtils::GetString(album,"review",strReview);
XMLUtils::GetString(album,"releasedate",m_strDateOfRelease);
@@ -65,7 +65,7 @@ bool CAlbum::Load(const TiXmlElement *album, bool chained, bool prefix)
while (thumb)
{
thumbURL.ParseElement(thumb);
- if (prefix)
+ if (prioritise)
{
CStdString temp;
temp << *thumb;
@@ -73,8 +73,8 @@ bool CAlbum::Load(const TiXmlElement *album, bool chained, bool prefix)
}
thumb = thumb->NextSiblingElement("thumb");
}
- // prefix thumbs from nfos
- if (prefix && iThumbCount && iThumbCount != thumbURL.m_url.size())
+ // prioritise thumbs from nfos
+ if (prioritise && iThumbCount && iThumbCount != thumbURL.m_url.size())
{
rotate(thumbURL.m_url.begin(),
thumbURL.m_url.begin()+iThumbCount,
diff --git a/xbmc/music/Album.h b/xbmc/music/Album.h
index ba237af32e..bc969f1443 100644
--- a/xbmc/music/Album.h
+++ b/xbmc/music/Album.h
@@ -62,7 +62,14 @@ public:
songs.clear();
}
- bool Load(const TiXmlElement *movie, bool chained=false, bool prefix=false);
+ /*! \brief Load album information from an XML file.
+ See CVideoInfoTag::Load for a description of the types of elements we load.
+ \param element the root XML element to parse.
+ \param append whether information should be added to the existing tag, or whether it should be reset first.
+ \param prioritise if appending, whether additive tags should be prioritised (i.e. replace or prepend) over existing values. Defaults to false.
+ \sa CVideoInfoTag::Load
+ */
+ bool Load(const TiXmlElement *element, bool append = false, bool prioritise = false);
bool Save(TiXmlNode *node, const CStdString &tag, const CStdString& strPath);
long idAlbum;
diff --git a/xbmc/music/Artist.cpp b/xbmc/music/Artist.cpp
index 5908b83f4b..736542a13c 100644
--- a/xbmc/music/Artist.cpp
+++ b/xbmc/music/Artist.cpp
@@ -25,18 +25,18 @@
using namespace std;
-bool CArtist::Load(const TiXmlElement *artist, bool chained, bool prefix)
+bool CArtist::Load(const TiXmlElement *artist, bool append, bool prioritise)
{
if (!artist) return false;
- if (!chained)
+ if (!append)
Reset();
XMLUtils::GetString(artist,"name",strArtist);
- XMLUtils::GetAdditiveString(artist,"genre",g_advancedSettings.m_musicItemSeparator,strGenre);
- XMLUtils::GetAdditiveString(artist,"style",g_advancedSettings.m_musicItemSeparator,strStyles);
- XMLUtils::GetAdditiveString(artist,"mood",g_advancedSettings.m_musicItemSeparator,strMoods);
- XMLUtils::GetAdditiveString(artist,"yearsactive",g_advancedSettings.m_musicItemSeparator,strYearsActive);
- XMLUtils::GetAdditiveString(artist,"instruments",g_advancedSettings.m_musicItemSeparator,strInstruments);
+ XMLUtils::GetAdditiveString(artist, "genre", g_advancedSettings.m_musicItemSeparator, strGenre, prioritise);
+ XMLUtils::GetAdditiveString(artist, "style", g_advancedSettings.m_musicItemSeparator, strStyles, prioritise);
+ XMLUtils::GetAdditiveString(artist, "mood", g_advancedSettings.m_musicItemSeparator, strMoods, prioritise);
+ XMLUtils::GetAdditiveString(artist, "yearsactive", g_advancedSettings.m_musicItemSeparator, strYearsActive, prioritise);
+ XMLUtils::GetAdditiveString(artist, "instruments", g_advancedSettings.m_musicItemSeparator, strInstruments, prioritise);
XMLUtils::GetString(artist,"born",strBorn);
XMLUtils::GetString(artist,"formed",strFormed);
@@ -51,7 +51,7 @@ bool CArtist::Load(const TiXmlElement *artist, bool chained, bool prefix)
while (thumb)
{
thumbURL.ParseElement(thumb);
- if (prefix)
+ if (prioritise)
{
CStdString temp;
temp << *thumb;
@@ -60,7 +60,7 @@ bool CArtist::Load(const TiXmlElement *artist, bool chained, bool prefix)
thumb = thumb->NextSiblingElement("thumb");
}
// prefix thumbs from nfos
- if (prefix && iThumbCount && iThumbCount != thumbURL.m_url.size())
+ if (prioritise && iThumbCount && iThumbCount != thumbURL.m_url.size())
{
rotate(thumbURL.m_url.begin(),
thumbURL.m_url.begin()+iThumbCount,
@@ -88,7 +88,7 @@ bool CArtist::Load(const TiXmlElement *artist, bool chained, bool prefix)
if (fanart2)
{
// we prefix to handle mixed-mode nfo's with fanart set
- if (prefix)
+ if (prioritise)
{
CStdString temp;
temp << *fanart2;
diff --git a/xbmc/music/Artist.h b/xbmc/music/Artist.h
index 31c387ea09..10618cca42 100644
--- a/xbmc/music/Artist.h
+++ b/xbmc/music/Artist.h
@@ -56,7 +56,14 @@ public:
idArtist = -1;
}
- bool Load(const TiXmlElement *movie, bool chained=false, bool prefix=false);
+ /*! \brief Load artist information from an XML file.
+ See CVideoInfoTag::Load for a description of the types of elements we load.
+ \param element the root XML element to parse.
+ \param append whether information should be added to the existing tag, or whether it should be reset first.
+ \param prioritise if appending, whether additive tags should be prioritised (i.e. replace or prepend) over existing values. Defaults to false.
+ \sa CVideoInfoTag::Load
+ */
+ bool Load(const TiXmlElement *element, bool append = false, bool prioritise = false);
bool Save(TiXmlNode *node, const CStdString &tag, const CStdString& strPath);
CStdString strArtist;
diff --git a/xbmc/music/MusicDatabase.cpp b/xbmc/music/MusicDatabase.cpp
index 54395475a3..7cf81562ca 100644
--- a/xbmc/music/MusicDatabase.cpp
+++ b/xbmc/music/MusicDatabase.cpp
@@ -2569,6 +2569,7 @@ bool CMusicDatabase::GetGenresNav(const CStdString& strBaseDir, CFileItemList& i
{
CFileItemPtr pItem(new CFileItem(m_pDS->fv("strGenre").get_asString()));
pItem->GetMusicInfoTag()->SetGenre(m_pDS->fv("strGenre").get_asString());
+ pItem->GetMusicInfoTag()->SetDatabaseId(m_pDS->fv("idGenre").get_asInt());
CStdString strDir;
strDir.Format("%ld/", m_pDS->fv("idGenre").get_asInt());
pItem->SetPath(strBaseDir + strDir);
diff --git a/xbmc/music/tags/MusicInfoTagLoaderWMA.cpp b/xbmc/music/tags/MusicInfoTagLoaderWMA.cpp
index ced5d2d7af..af46361e62 100644
--- a/xbmc/music/tags/MusicInfoTagLoaderWMA.cpp
+++ b/xbmc/music/tags/MusicInfoTagLoaderWMA.cpp
@@ -131,7 +131,7 @@ bool CMusicInfoTagLoaderWMA::Load(const CStdString& strFileName, CMusicInfoTag&
{
iOffset += 64;
pDataI = (unsigned int*)(pData.get() + iOffset);
- float F1 = (float)pDataI[1];
+ uint64_t F1 = pDataI[1];
F1 = F1 * 0x10000 * 0x10000 + pDataI[0];
tag.SetDuration((long)((F1 / 10000) / 1000)); // from milliseconds to seconds
}
diff --git a/xbmc/network/AirPlayServer.cpp b/xbmc/network/AirPlayServer.cpp
index 5a1477350d..bfbf1f1041 100644
--- a/xbmc/network/AirPlayServer.cpp
+++ b/xbmc/network/AirPlayServer.cpp
@@ -33,6 +33,7 @@
#include "Application.h"
#include "utils/md5.h"
#include "utils/Variant.h"
+#include "guilib/GUIWindowManager.h"
#ifdef TARGET_WINDOWS
#define close closesocket
@@ -823,8 +824,15 @@ int CAirPlayServer::CTCPClient::ProcessRequest( CStdString& responseHeader,
}
else
{
- g_application.getApplicationMessenger().MediaStop();
- CAirPlayServer::m_isPlaying--;
+ if (IsPlaying()) //only stop player if we started him
+ {
+ g_application.getApplicationMessenger().MediaStop();
+ CAirPlayServer::m_isPlaying--;
+ }
+ else //if we are not playing and get the stop request - we just wanna stop picture streaming
+ {
+ g_windowManager.PreviousWindow();
+ }
ComposeReverseEvent(reverseHeader, reverseBody, sessionId, EVENT_STOPPED);
}
}
diff --git a/xbmc/network/EventClient.cpp b/xbmc/network/EventClient.cpp
index 457bc9cd3e..fe7088fb09 100644
--- a/xbmc/network/EventClient.cpp
+++ b/xbmc/network/EventClient.cpp
@@ -35,6 +35,7 @@
#include "utils/TimeUtils.h"
#include "dialogs/GUIDialogKaiToast.h"
#include "guilib/GraphicContext.h"
+#include "guilib/LocalizeStrings.h"
using namespace EVENTCLIENT;
using namespace EVENTPACKET;
@@ -335,13 +336,13 @@ bool CEventClient::OnPacketHELO(CEventPacket *packet)
m_bGreeted = true;
if (m_eLogoType == LT_NONE)
{
- CGUIDialogKaiToast::QueueNotification("Detected New Connection",
+ CGUIDialogKaiToast::QueueNotification(g_localizeStrings.Get(33200),
m_deviceName.c_str());
}
else
{
CGUIDialogKaiToast::QueueNotification(iconfile.c_str(),
- "Detected New Connection",
+ g_localizeStrings.Get(33200),
m_deviceName.c_str());
}
return true;
diff --git a/xbmc/network/Zeroconf.cpp b/xbmc/network/Zeroconf.cpp
index a21f781a00..cecc785c30 100644
--- a/xbmc/network/Zeroconf.cpp
+++ b/xbmc/network/Zeroconf.cpp
@@ -37,6 +37,7 @@
#include "threads/CriticalSection.h"
#include "threads/SingleLock.h"
#include "threads/Atomics.h"
+#include "utils/JobManager.h"
#ifndef HAS_ZEROCONF
//dummy implementation used if no zeroconf is present
@@ -76,7 +77,8 @@ bool CZeroconf::PublishService(const std::string& fcr_identifier,
if(!ret.second) //identifier exists
return false;
if(m_started)
- return doPublishService(fcr_identifier, fcr_type, fcr_name, f_port, txt);
+ CJobManager::GetInstance().AddJob(new CPublish(fcr_identifier, info), NULL);
+
//not yet started, so its just queued
return true;
}
@@ -112,9 +114,8 @@ void CZeroconf::Start()
if(m_started)
return;
m_started = true;
- for(tServiceMap::const_iterator it = m_service_map.begin(); it != m_service_map.end(); ++it){
- doPublishService(it->first, it->second.type, it->second.name, it->second.port, it->second.txt);
- }
+
+ CJobManager::GetInstance().AddJob(new CPublish(m_service_map), NULL);
}
void CZeroconf::Stop()
@@ -154,3 +155,20 @@ void CZeroconf::ReleaseInstance()
smp_instance = 0;
}
+CZeroconf::CPublish::CPublish(const std::string& fcr_identifier, const PublishInfo& pubinfo)
+{
+ m_servmap.insert(std::make_pair(fcr_identifier, pubinfo));
+}
+
+CZeroconf::CPublish::CPublish(const tServiceMap& servmap)
+ : m_servmap(servmap)
+{
+}
+
+bool CZeroconf::CPublish::DoWork()
+{
+ for(tServiceMap::const_iterator it = m_servmap.begin(); it != m_servmap.end(); ++it)
+ CZeroconf::GetInstance()->doPublishService(it->first, it->second.type, it->second.name, it->second.port, it->second.txt);
+
+ return true;
+} \ No newline at end of file
diff --git a/xbmc/network/Zeroconf.h b/xbmc/network/Zeroconf.h
index bda22eb4a3..3a6122beea 100644
--- a/xbmc/network/Zeroconf.h
+++ b/xbmc/network/Zeroconf.h
@@ -23,6 +23,7 @@
#include <string>
#include <map>
+#include "utils/Job.h"
class CCriticalSection;
/// this class provides support for zeroconf
@@ -117,4 +118,16 @@ private:
//protects singleton creation/destruction
static long sm_singleton_guard;
static CZeroconf* smp_instance;
+
+ class CPublish : public CJob
+ {
+ public:
+ CPublish(const std::string& fcr_identifier, const PublishInfo& pubinfo);
+ CPublish(const tServiceMap& servmap);
+
+ bool DoWork();
+
+ private:
+ tServiceMap m_servmap;
+ };
};
diff --git a/xbmc/network/windows/ZeroconfWIN.cpp b/xbmc/network/windows/ZeroconfWIN.cpp
index 8be8bbfb3e..c973caec9f 100644
--- a/xbmc/network/windows/ZeroconfWIN.cpp
+++ b/xbmc/network/windows/ZeroconfWIN.cpp
@@ -26,6 +26,7 @@
#include <threads/SingleLock.h>
#include <utils/log.h>
#include "dialogs/GUIDialogKaiToast.h"
+#include "guilib/LocalizeStrings.h"
#pragma comment(lib, "dnssd.lib")
@@ -46,7 +47,7 @@ bool CZeroconfWIN::IsZCdaemonRunning()
if(err != kDNSServiceErr_NoError)
{
CLog::Log(LOGERROR, "ZeroconfWIN: Zeroconf can't be started probably because Apple's Bonjour Service isn't installed. You can get it by either installing Itunes or Apple's Bonjour Print Service for Windows (http://support.apple.com/kb/DL999)");
- CGUIDialogKaiToast::QueueNotification(CGUIDialogKaiToast::Error, "Failed to start zeroconf", "Is Apple's Bonjour Service installed? See log for more info.", 10000, true);
+ CGUIDialogKaiToast::QueueNotification(CGUIDialogKaiToast::Error, g_localizeStrings.Get(34300), g_localizeStrings.Get(34301), 10000, true);
return false;
}
CLog::Log(LOGDEBUG, "ZeroconfWIN:Bonjour version is %d.%d", version / 10000, version / 100 % 100);
@@ -64,7 +65,7 @@ bool CZeroconfWIN::doPublishService(const std::string& fcr_identifier,
TXTRecordRef txtRecord;
TXTRecordCreate(&txtRecord, 0, NULL);
- CLog::Log(LOGDEBUG, __FUNCTION__ " identifier: %s type: %s name:%s port:%i", fcr_identifier.c_str(), fcr_type.c_str(), fcr_name.c_str(), f_port);
+ CLog::Log(LOGDEBUG, "ZeroconfWIN: identifier: %s type: %s name:%s port:%i", fcr_identifier.c_str(), fcr_type.c_str(), fcr_name.c_str(), f_port);
//add txt records
if(!txt.empty())
@@ -85,14 +86,14 @@ bool CZeroconfWIN::doPublishService(const std::string& fcr_identifier,
if (netService)
DNSServiceRefDeallocate(netService);
- CLog::Log(LOGERROR, __FUNCTION__ " DNSServiceRegister returned (error = %ld)", (int) err);
+ CLog::Log(LOGERROR, "ZeroconfWIN: DNSServiceRegister returned (error = %ld)", (int) err);
}
else
{
err = DNSServiceProcessResult(netService);
if (err != kDNSServiceErr_NoError)
- CLog::Log(LOGERROR, __FUNCTION__ " DNSServiceProcessResult returned (error = %ld)", (int) err);
+ CLog::Log(LOGERROR, "ZeroconfWIN: DNSServiceProcessResult returned (error = %ld)", (int) err);
CSingleLock lock(m_data_guard);
m_services.insert(make_pair(fcr_identifier, netService));
@@ -120,6 +121,7 @@ bool CZeroconfWIN::doRemoveService(const std::string& fcr_ident)
void CZeroconfWIN::doStop()
{
CSingleLock lock(m_data_guard);
+ CLog::Log(LOGDEBUG, "ZeroconfWIN: Shutdown services");
for(tServiceMap::iterator it = m_services.begin(); it != m_services.end(); ++it)
DNSServiceRefDeallocate(it->second);
m_services.clear();
diff --git a/xbmc/osx/atv2/XBMCController.mm b/xbmc/osx/atv2/XBMCController.mm
index 9a91aab8bf..1c1447a063 100644
--- a/xbmc/osx/atv2/XBMCController.mm
+++ b/xbmc/osx/atv2/XBMCController.mm
@@ -24,6 +24,7 @@
#define BOOL XBMC_BOOL
#import "WinEventsIOS.h"
#import "XBMC_events.h"
+#include "utils/log.h"
#undef BOOL
#import <Foundation/Foundation.h>
@@ -120,8 +121,9 @@ typedef enum {
kBREventRemoteActionStop = 17,
kBREventRemoteActionFastFwd = 18,
kBREventRemoteActionRewind = 19,
- kBREventRemoteActionSkipBack = 20,
- kBREventRemoteActionSkipFwd = 21,
+ kBREventRemoteActionSkipFwd = 20,
+ kBREventRemoteActionSkipBack = 21,
+
kBREventRemoteActionPlayHold = 22,
kBREventRemoteActionCenterHold,
@@ -338,6 +340,7 @@ int m_systemsleepTimeout;
- (eATVClientEvent) ATVClientEventFromBREvent:(BREvent*) f_event
{
int remoteAction = [f_event remoteAction];
+ CLog::Log(LOGDEBUG,"XBMCPureController: Button press remoteAction = %i", remoteAction);
switch (remoteAction)
{
diff --git a/xbmc/playlists/SmartPlayList.cpp b/xbmc/playlists/SmartPlayList.cpp
index 82803cb5b8..37a6755112 100644
--- a/xbmc/playlists/SmartPlayList.cpp
+++ b/xbmc/playlists/SmartPlayList.cpp
@@ -264,12 +264,15 @@ vector<CSmartPlaylistRule::DATABASE_FIELD> CSmartPlaylistRule::GetFields(const C
fields.push_back(FIELD_AIRDATE);
fields.push_back(FIELD_PLAYCOUNT);
fields.push_back(FIELD_LASTPLAYED);
- fields.push_back(FIELD_INPROGRESS);
if (!sortOrders)
+ {
+ fields.push_back(FIELD_INPROGRESS);
fields.push_back(FIELD_GENRE);
+ }
fields.push_back(FIELD_YEAR); // premiered
fields.push_back(FIELD_DIRECTOR);
- fields.push_back(FIELD_ACTOR);
+ if (!sortOrders)
+ fields.push_back(FIELD_ACTOR);
fields.push_back(FIELD_EPISODE);
fields.push_back(FIELD_SEASON);
fields.push_back(FIELD_FILENAME);
@@ -291,7 +294,8 @@ vector<CSmartPlaylistRule::DATABASE_FIELD> CSmartPlaylistRule::GetFields(const C
fields.push_back(FIELD_WRITER);
fields.push_back(FIELD_PLAYCOUNT);
fields.push_back(FIELD_LASTPLAYED);
- fields.push_back(FIELD_INPROGRESS);
+ if (!sortOrders)
+ fields.push_back(FIELD_INPROGRESS);
fields.push_back(FIELD_GENRE);
fields.push_back(FIELD_COUNTRY);
fields.push_back(FIELD_YEAR); // premiered
@@ -304,7 +308,8 @@ vector<CSmartPlaylistRule::DATABASE_FIELD> CSmartPlaylistRule::GetFields(const C
fields.push_back(FIELD_HASTRAILER);
fields.push_back(FIELD_FILENAME);
fields.push_back(FIELD_PATH);
- fields.push_back(FIELD_SET);
+ if (!sortOrders)
+ fields.push_back(FIELD_SET);
isVideo = true;
// fields.push_back(FIELD_DATEADDED); // no date added yet in db
}
@@ -677,7 +682,7 @@ CStdString CSmartPlaylistRule::GetDatabaseField(DATABASE_FIELD field, const CStd
else if (field == FIELD_PATH) result = "strPath";
else if (field == FIELD_RANDOM) result = "RANDOM()"; // only used for order clauses
else if (field == FIELD_DATEADDED) result = "idMovie"; // only used for order clauses
- else if (field == FIELD_SET) result = "idSet"; // only used for order clauses
+ else if (field == FIELD_SET) result = "cant_order_by_set";
return result;
}
else if (type == "musicvideos")
@@ -711,6 +716,7 @@ CStdString CSmartPlaylistRule::GetDatabaseField(DATABASE_FIELD field, const CStd
else if (field == FIELD_YEAR) result.Format("c%02d", VIDEODB_ID_TV_PREMIERED);
else if (field == FIELD_GENRE) result.Format("c%02d", VIDEODB_ID_TV_GENRE);
else if (field == FIELD_MPAA) result.Format("c%02d", VIDEODB_ID_TV_MPAA);
+ else if (field == FIELD_STUDIO) result.Format("c%02d", VIDEODB_ID_TV_STUDIOS);
else if (field == FIELD_DIRECTOR) result = "cant_order_by_director"; // join required
else if (field == FIELD_ACTOR) result = "cant_order_by_actor"; // join required
else if (field == FIELD_NUMEPISODES) result = "totalcount";
@@ -718,7 +724,7 @@ CStdString CSmartPlaylistRule::GetDatabaseField(DATABASE_FIELD field, const CStd
else if (field == FIELD_PLAYCOUNT) result = "watched";
else if (field == FIELD_RANDOM) result = "RANDOM()"; // only used for order clauses
else if (field == FIELD_DATEADDED) result = "idShow"; // only used for order clauses
- else if (field == FIELD_PATH) return "strPath";
+ else if (field == FIELD_PATH) result = "strPath";
return result;
}
if (type == "episodes")
diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp
index a0e845d8c2..63b6a34eef 100644
--- a/xbmc/settings/AdvancedSettings.cpp
+++ b/xbmc/settings/AdvancedSettings.cpp
@@ -115,12 +115,6 @@ void CAdvancedSettings::Initialize()
m_slideshowZoomAmount = 5.0f;
m_slideshowBlackBarCompensation = 20.0f;
- m_lcdRows = 4;
- m_lcdColumns = 20;
- m_lcdAddress1 = 0;
- m_lcdAddress2 = 0x40;
- m_lcdAddress3 = 0x14;
- m_lcdAddress4 = 0x54;
m_lcdHeartbeat = false;
m_lcdDimOnScreenSave = false;
m_lcdScrolldelay = 1;
@@ -595,12 +589,6 @@ void CAdvancedSettings::ParseSettingsFile(const CStdString &file)
pElement = pRootElement->FirstChildElement("lcd");
if (pElement)
{
- XMLUtils::GetInt(pElement, "rows", m_lcdRows, 1, 4);
- XMLUtils::GetInt(pElement, "columns", m_lcdColumns, 1, 40);
- XMLUtils::GetInt(pElement, "address1", m_lcdAddress1, 0, 0x100);
- XMLUtils::GetInt(pElement, "address2", m_lcdAddress2, 0, 0x100);
- XMLUtils::GetInt(pElement, "address3", m_lcdAddress3, 0, 0x100);
- XMLUtils::GetInt(pElement, "address4", m_lcdAddress4, 0, 0x100);
XMLUtils::GetBoolean(pElement, "heartbeat", m_lcdHeartbeat);
XMLUtils::GetBoolean(pElement, "dimonscreensave", m_lcdDimOnScreenSave);
XMLUtils::GetInt(pElement, "scrolldelay", m_lcdScrolldelay, -8, 8);
diff --git a/xbmc/settings/AdvancedSettings.h b/xbmc/settings/AdvancedSettings.h
index 47e25fc96f..a232185409 100644
--- a/xbmc/settings/AdvancedSettings.h
+++ b/xbmc/settings/AdvancedSettings.h
@@ -139,12 +139,6 @@ class CAdvancedSettings
float m_slideshowZoomAmount;
float m_slideshowPanAmount;
- int m_lcdRows;
- int m_lcdColumns;
- int m_lcdAddress1;
- int m_lcdAddress2;
- int m_lcdAddress3;
- int m_lcdAddress4;
bool m_lcdHeartbeat;
bool m_lcdDimOnScreenSave;
int m_lcdScrolldelay;
diff --git a/xbmc/settings/GUIDialogContentSettings.cpp b/xbmc/settings/GUIDialogContentSettings.cpp
index efa3701aab..5f9d0496e0 100644
--- a/xbmc/settings/GUIDialogContentSettings.cpp
+++ b/xbmc/settings/GUIDialogContentSettings.cpp
@@ -170,7 +170,7 @@ void CGUIDialogContentSettings::CreateSettings()
case CONTENT_MOVIES:
{
AddBool(1,20345,&m_bRunScan, m_bShowScanSettings);
- AddBool(2,20330,&m_bUseDirNames, m_bShowScanSettings);
+ AddBool(2,20329,&m_bUseDirNames, m_bShowScanSettings);
AddBool(3,20346,&m_bScanRecursive, m_bShowScanSettings && ((m_bUseDirNames && !m_bSingleItem) || !m_bUseDirNames));
AddBool(4,20383,&m_bSingleItem, m_bShowScanSettings && (m_bUseDirNames && !m_bScanRecursive));
AddBool(5,20432,&m_bNoUpdate, m_bShowScanSettings);
diff --git a/xbmc/settings/GUISettings.cpp b/xbmc/settings/GUISettings.cpp
index 48c2389359..80ad97a67b 100644
--- a/xbmc/settings/GUISettings.cpp
+++ b/xbmc/settings/GUISettings.cpp
@@ -421,8 +421,8 @@ void CGUISettings::Initialize()
// Todo: Implement test pattern for DX
AddString(vs, "videoscreen.testpattern",226,"", BUTTON_CONTROL_STANDARD);
#endif
-#if defined(_LINUX) && !defined(__APPLE__)
- AddBool(NULL, "videoscreen.haslcd", 4501, false);
+#if defined(HAS_LCD)
+ AddBool(vs, "videoscreen.haslcd", 4501, false);
#endif
CSettingsCategory* ao = AddCategory(4, "audiooutput", 772);
@@ -554,7 +554,7 @@ void CGUISettings::Initialize()
flattenTVShowOptions.insert(make_pair(20422, 2));
AddInt(vdl, "videolibrary.flattentvshows", 20412, 1, flattenTVShowOptions, SPIN_CONTROL_TEXT);
- AddBool(NULL, "videolibrary.flattenmoviesets", 22002, false);
+ AddBool(vdl, "videolibrary.groupmoviesets", 20458, false);
AddBool(vdl, "videolibrary.updateonstartup", 22000, false);
AddBool(vdl, "videolibrary.backgroundupdate", 22001, false);
AddSeparator(vdl, "videolibrary.sep3");
@@ -670,7 +670,7 @@ void CGUISettings::Initialize()
AddInt(vid, "myvideos.selectaction", 22079, SELECT_ACTION_PLAY_OR_RESUME, myVideosSelectActions, SPIN_CONTROL_TEXT);
AddBool(NULL, "myvideos.treatstackasfile", 20051, true);
AddBool(vid, "myvideos.extractflags",20433, true);
- AddBool(vid, "myvideos.filemetadata", 20419, true);
+ AddBool(vid, "myvideos.replacelabels", 20419, true);
AddBool(NULL, "myvideos.extractthumb",20433, true);
CSettingsCategory* sub = AddCategory(5, "subtitles", 287);
diff --git a/xbmc/settings/GUIWindowSettingsCategory.cpp b/xbmc/settings/GUIWindowSettingsCategory.cpp
index e9f77b26fa..c6492f2f0f 100644
--- a/xbmc/settings/GUIWindowSettingsCategory.cpp
+++ b/xbmc/settings/GUIWindowSettingsCategory.cpp
@@ -2190,30 +2190,34 @@ void CGUIWindowSettingsCategory::FillInCharSets(CSetting *pSetting)
DisplayMode CGUIWindowSettingsCategory::FillInScreens(CStdString strSetting, RESOLUTION res)
{
- CBaseSettingControl *control = GetSetting(strSetting);
- control->SetDelayed();
- CGUISpinControlEx *pControl = (CGUISpinControlEx *)GetControl(control->GetID());
- pControl->Clear();
-
- CStdString strScreen;
- if (g_advancedSettings.m_canWindowed)
- pControl->AddLabel(g_localizeStrings.Get(242), -1);
-
- for (int idx = 0; idx < g_Windowing.GetNumScreens(); idx++)
- {
- strScreen.Format(g_localizeStrings.Get(241), g_settings.m_ResInfo[RES_DESKTOP + idx].iScreen + 1);
- pControl->AddLabel(strScreen, g_settings.m_ResInfo[RES_DESKTOP + idx].iScreen);
- }
-
DisplayMode mode;
-
if (res == RES_WINDOW)
mode = DM_WINDOWED;
else
mode = g_settings.m_ResInfo[res].iScreen;
- pControl->SetValue(mode);
- g_guiSettings.SetInt("videoscreen.screen", mode);
+ // we expect "videoscreen.screen" but it might be hidden on some platforms,
+ // so check that we actually have a visable control.
+ CBaseSettingControl *control = GetSetting(strSetting);
+ if (control)
+ {
+ control->SetDelayed();
+ CGUISpinControlEx *pControl = (CGUISpinControlEx *)GetControl(control->GetID());
+ pControl->Clear();
+
+ CStdString strScreen;
+ if (g_advancedSettings.m_canWindowed)
+ pControl->AddLabel(g_localizeStrings.Get(242), -1);
+
+ for (int idx = 0; idx < g_Windowing.GetNumScreens(); idx++)
+ {
+ strScreen.Format(g_localizeStrings.Get(241), g_settings.m_ResInfo[RES_DESKTOP + idx].iScreen + 1);
+ pControl->AddLabel(strScreen, g_settings.m_ResInfo[RES_DESKTOP + idx].iScreen);
+ }
+ pControl->SetValue(mode);
+ g_guiSettings.SetInt("videoscreen.screen", mode);
+ }
+
return mode;
}
diff --git a/xbmc/settings/Settings.cpp b/xbmc/settings/Settings.cpp
index 6d266934a3..eda98f45c9 100644
--- a/xbmc/settings/Settings.cpp
+++ b/xbmc/settings/Settings.cpp
@@ -951,7 +951,7 @@ bool CSettings::LoadProfile(unsigned int index)
CStdString strLanguagePath;
strLanguagePath.Format("special://xbmc/language/%s/strings.xml", strLanguage.c_str());
- CButtonTranslator::GetInstance().Load();
+ CButtonTranslator::GetInstance().Load(true);
g_localizeStrings.Load(strLanguagePath);
g_Mouse.SetEnabled(g_guiSettings.GetBool("input.enablemouse"));
diff --git a/xbmc/storage/DetectDVDType.cpp b/xbmc/storage/DetectDVDType.cpp
index 5e185c7f45..64ba1c54af 100644
--- a/xbmc/storage/DetectDVDType.cpp
+++ b/xbmc/storage/DetectDVDType.cpp
@@ -51,6 +51,7 @@
#include "Application.h"
#include "IoSupport.h"
#include "cdioSupport.h"
+#include "storage/MediaManager.h"
using namespace XFILE;
@@ -529,4 +530,26 @@ const CStdString &CDetectDVDMedia::GetDVDPath()
return m_diskPath;
}
+CDetectDisc::CDetectDisc(const CStdString &strPath, const bool bautorun)
+ : m_strPath(strPath), m_bautorun(bautorun)
+{
+}
+
+bool CDetectDisc::DoWork()
+{
+ CMediaSource share;
+ share.strPath = m_strPath;
+ share.strStatus = g_mediaManager.GetDiskLabel(share.strPath);
+ share.strDiskUniqueId = g_mediaManager.GetDiskUniqueId(share.strPath);
+ if(g_mediaManager.IsAudio(share.strPath))
+ share.strStatus = "Audio-CD";
+ else if(share.strStatus == "")
+ share.strStatus = g_localizeStrings.Get(446);
+ share.strName = share.strPath;
+ share.m_ignore = true;
+ share.m_iDriveType = CMediaSource::SOURCE_TYPE_DVD;
+ g_mediaManager.AddAutoSource(share, m_bautorun);
+ return true;
+}
+
#endif
diff --git a/xbmc/storage/DetectDVDType.h b/xbmc/storage/DetectDVDType.h
index 12cd00a1b2..c3b444b2d1 100644
--- a/xbmc/storage/DetectDVDType.h
+++ b/xbmc/storage/DetectDVDType.h
@@ -37,6 +37,7 @@
#include "threads/Thread.h"
#include "utils/StdString.h"
+#include "utils/Job.h"
namespace MEDIA_DETECT
{
@@ -93,4 +94,15 @@ private:
};
}
+class CDetectDisc : public CJob
+{
+public:
+ CDetectDisc(const CStdString &strPath, const bool bautorun);
+ bool DoWork();
+
+private:
+ CStdString m_strPath;
+ bool m_bautorun;
+};
+
#endif
diff --git a/xbmc/utils/LCD.cpp b/xbmc/utils/LCD.cpp
index 43681ff870..dff8422324 100644
--- a/xbmc/utils/LCD.cpp
+++ b/xbmc/utils/LCD.cpp
@@ -168,14 +168,14 @@ CStdString ILCD::GetProgressBar(double tCurrent, double tTotal)
unsigned char cLCDsmallBlocks = 0xb0; //this char (0xAC-0xAF) will be translated in LCD.cpp to the smallBlock
unsigned char cLCDbigBlock = 0xab; //this char will be translated in LCD.cpp to the right bigBlock
int iBigBlock = 5; // a big block is a combination of 5 small blocks
- int m_iColumns = g_advancedSettings.m_lcdColumns - 2;
+ int iColumns = GetColumns()-2;
- if (m_iColumns > 0)
+ if (iColumns > 0)
{
- double dBlockSize = tTotal * 0.99 / m_iColumns / iBigBlock; // mult with 0.99 to show the last bar
+ double dBlockSize = tTotal * 0.99 / iColumns / iBigBlock; // mult with 0.99 to show the last bar
CStdString strProgressBar = "[";
- for (int i = 1;i <= m_iColumns;i++)
+ for (int i = 1;i <= iColumns;i++)
{
//set full blocks
if (tCurrent >= i * iBigBlock * dBlockSize)
diff --git a/xbmc/utils/LCD.h b/xbmc/utils/LCD.h
index 7892d64085..b60bcf2c3f 100644
--- a/xbmc/utils/LCD.h
+++ b/xbmc/utils/LCD.h
@@ -58,6 +58,8 @@ public:
virtual void Resume() = 0;
virtual void SetBackLight(int iLight) = 0;
virtual void SetContrast(int iContrast) = 0;
+ virtual int GetColumns() = 0;
+ virtual int GetRows() = 0;
virtual void SetLine(int iLine, const CStdString& strLine) = 0;
virtual void DisableOnPlayback(bool playingVideo, bool playingMusic);
CStdString GetProgressBar(double tCurrent, double tTotal);
diff --git a/xbmc/utils/XMLUtils.cpp b/xbmc/utils/XMLUtils.cpp
index 6adc743e04..d55f402c2a 100644
--- a/xbmc/utils/XMLUtils.cpp
+++ b/xbmc/utils/XMLUtils.cpp
@@ -133,11 +133,14 @@ bool XMLUtils::GetString(const TiXmlNode* pRootNode, const char* strTag, CStdStr
}
bool XMLUtils::GetAdditiveString(const TiXmlNode* pRootNode, const char* strTag,
- const CStdString& strSeparator, CStdString& strStringValue)
+ const CStdString& strSeparator, CStdString& strStringValue,
+ bool clear)
{
CStdString strTemp;
const TiXmlElement* node = pRootNode->FirstChildElement(strTag);
bool bResult=false;
+ if (node && node->FirstChild() && clear)
+ strStringValue.clear();
while (node)
{
if (node->FirstChild())
diff --git a/xbmc/utils/XMLUtils.h b/xbmc/utils/XMLUtils.h
index 5ba8b1c509..8aa9266b76 100644
--- a/xbmc/utils/XMLUtils.h
+++ b/xbmc/utils/XMLUtils.h
@@ -38,7 +38,21 @@ public:
static bool GetInt(const TiXmlNode* pRootNode, const char* strTag, int& iIntValue);
static bool GetBoolean(const TiXmlNode* pRootNode, const char* strTag, bool& bBoolValue);
static bool GetString(const TiXmlNode* pRootNode, const char* strTag, CStdString& strStringValue);
- static bool GetAdditiveString(const TiXmlNode* pRootNode, const char* strTag, const CStdString& strSeparator, CStdString& strStringValue);
+ /*! \brief Get multiple tags, concatenating the values together.
+ Transforms
+ <tag>value1</tag>
+ <tag clear="true">value2</tag>
+ ...
+ <tag>valuen</tag>
+ into value2<sep>...<sep>valuen, appending it to the value string. Note that <value1> is overwritten by the clear="true" tag.
+
+ \param rootNode the parent containing the <tag>'s.
+ \param tag the <tag> in question.
+ \param separator the separator to use when concatenating values.
+ \param value [out] the resulting string. Remains untouched if no <tag> is available, else is appended (or cleared based on the clear parameter).
+ \param clear if true, clears the string prior to adding tags, if tags are available. Defaults to false.
+ */
+ static bool GetAdditiveString(const TiXmlNode* rootNode, const char* tag, const CStdString& separator, CStdString& value, bool clear = false);
static bool GetEncoding(const TiXmlDocument* pDoc, CStdString& strEncoding);
static bool GetPath(const TiXmlNode* pRootNode, const char* strTag, CStdString& strStringValue);
static bool GetFloat(const TiXmlNode* pRootNode, const char* strTag, float& value, const float min, const float max);
diff --git a/xbmc/video/VideoDatabase.cpp b/xbmc/video/VideoDatabase.cpp
index 777b030e20..06d6812c59 100644
--- a/xbmc/video/VideoDatabase.cpp
+++ b/xbmc/video/VideoDatabase.cpp
@@ -363,21 +363,8 @@ void CVideoDatabase::CreateViews()
CLog::Log(LOGINFO, "create movieview");
m_pDS->exec("DROP VIEW IF EXISTS movieview");
- CStdString movieview = PrepareSQL("CREATE VIEW movieview AS SELECT "
- "movie.*,"
- "files.strFileName AS strFileName,"
- "path.strPath AS strPath,"
- "files.playCount AS playCount,"
- "files.lastPlayed AS lastPlayed,"
- " NULLIF(setlinkmovie.idSet, 0) AS idSet "
- "FROM movie"
- " LEFT JOIN setlinkmovie ON"
- " setlinkmovie.idMovie=movie.idMovie"
- " LEFT JOIN files ON"
- " files.idFile=movie.idFile"
- " LEFT JOIN path ON"
- " path.idPath=files.idPath");
- m_pDS->exec(movieview.c_str());
+ m_pDS->exec("create view movieview as select movie.*,files.strFileName as strFileName,path.strPath as strPath,files.playCount as playCount,files.lastPlayed as lastPlayed "
+ "from movie join files on files.idFile=movie.idFile join path on path.idPath=files.idPath");
}
//********************************************************************************************************************************
@@ -3485,6 +3472,17 @@ bool CVideoDatabase::UpdateOldVersion(int iVersion)
m_pDS->exec("UPDATE settings SET DeinterlaceMode = 0, Deinterlace = 1 WHERE Deinterlace = 0"); // method none => mode off, method auto
}
+ if (iVersion < 59)
+ { // base paths for video_ts and bdmv files was wrong (and inconsistent depending on where and when they were scanned)
+ CStdString where = PrepareSQL(" WHERE files.strFileName LIKE 'VIDEO_TS.IFO' or files.strFileName LIKE 'index.BDMV'");
+ UpdateBasePath("movie", "idMovie", VIDEODB_ID_BASEPATH, false, where);
+ UpdateBasePath("musicvideo", "idMVideo", VIDEODB_ID_MUSICVIDEO_BASEPATH, false, where);
+ UpdateBasePath("episode", "idEpisode", VIDEODB_ID_EPISODE_BASEPATH, false, where);
+ UpdateBasePathID("movie", "idMovie", VIDEODB_ID_BASEPATH, VIDEODB_ID_PARENTPATHID);
+ UpdateBasePathID("musicvideo", "idMVideo", VIDEODB_ID_MUSICVIDEO_BASEPATH, VIDEODB_ID_MUSICVIDEO_PARENTPATHID);
+ UpdateBasePathID("episode", "idEpisode", VIDEODB_ID_EPISODE_BASEPATH, VIDEODB_ID_EPISODE_PARENTPATHID);
+ }
+
// always recreate the view after any table change
CreateViews();
}
@@ -3508,13 +3506,14 @@ bool CVideoDatabase::LookupByFolders(const CStdString &path, bool shows)
return settings.parent_name_root; // shows, movies, musicvids
}
-void CVideoDatabase::UpdateBasePath(const char *table, const char *id, int column, bool shows)
+void CVideoDatabase::UpdateBasePath(const char *table, const char *id, int column, bool shows, const CStdString &where)
{
CStdString query;
if (shows)
query = PrepareSQL("SELECT idShow,path.strPath from tvshowlinkpath join path on tvshowlinkpath.idPath=path.idPath");
else
query = PrepareSQL("SELECT %s.%s,path.strPath,files.strFileName from %s join files on %s.idFile=files.idFile join path on files.idPath=path.idPath", table, id, table, table);
+ query += where;
map<CStdString, bool> paths;
m_pDS2->query(query.c_str());
@@ -3884,6 +3883,7 @@ bool CVideoDatabase::GetNavCommon(const CStdString& strBaseDir, CFileItemList& i
for (it = mapItems.begin(); it != mapItems.end(); ++it)
{
CFileItemPtr pItem(new CFileItem(it->second.first));
+ pItem->GetVideoInfoTag()->m_iDbId = it->first;
CStdString strDir;
strDir.Format("%ld/", it->first);
pItem->SetPath(strBaseDir + strDir);
@@ -3902,6 +3902,7 @@ bool CVideoDatabase::GetNavCommon(const CStdString& strBaseDir, CFileItemList& i
while (!m_pDS->eof())
{
CFileItemPtr pItem(new CFileItem(m_pDS->fv(1).get_asString()));
+ pItem->GetVideoInfoTag()->m_iDbId = m_pDS->fv(0).get_asInt();
CStdString strDir;
strDir.Format("%ld/", m_pDS->fv(0).get_asInt());
pItem->SetPath(strBaseDir + strDir);
@@ -4123,7 +4124,7 @@ bool CVideoDatabase::GetMusicVideoAlbumsNav(const CStdString& strBaseDir, CFileI
pItem->SetLabelPreformated(true);
if (!items.Contains(pItem->GetPath()))
{
- pItem->GetVideoInfoTag()->m_strArtist = m_pDS->fv(2).get_asString();
+ pItem->GetVideoInfoTag()->m_strArtist = it->second.second;
CStdString strThumb = CThumbnailCache::GetAlbumThumb(*pItem);
if (CFile::Exists(strThumb))
pItem->SetThumbnailImage(strThumb);
@@ -4708,17 +4709,21 @@ bool CVideoDatabase::GetMoviesByWhere(const CStdString& strBaseDir, const CStdSt
if (NULL == m_pDS.get()) return false;
CStdString strSQL = "select * from movieview ";
-
- if (where.size())
- strSQL += where;
- else
- {
- if (fetchSets && !g_guiSettings.GetBool("videolibrary.flattenmoviesets"))
- {
- GetSetsNav("videodb://1/7/", items, VIDEODB_CONTENT_MOVIES, "");
- strSQL += PrepareSQL("WHERE movieview.idMovie NOT IN (SELECT idMovie FROM setlinkmovie s1 JOIN(SELECT idSet, COUNT(1) AS c FROM setlinkmovie GROUP BY idSet HAVING c>1) s2 ON s2.idSet=s1.idSet)");
- }
+ if (fetchSets && g_guiSettings.GetBool("videolibrary.groupmoviesets"))
+ {
+ // user wants sets (and we're not fetching a particular set node), so grab all sets that match this where clause first
+ CStdString setsWhere;
+ if (where.size())
+ setsWhere = " where movie.idMovie in (select movieview.idMovie from movieview " + where + ")";
+ GetSetsNav("videodb://1/7/", items, VIDEODB_CONTENT_MOVIES, setsWhere);
+ CStdString movieSetsWhere = "movieview.idMovie NOT IN (SELECT idMovie FROM setlinkmovie s1 JOIN(SELECT idSet, COUNT(1) AS c FROM setlinkmovie GROUP BY idSet HAVING c>1) s2 ON s2.idSet=s1.idSet)";
+ if (where.size())
+ strSQL += where + PrepareSQL(" and " + movieSetsWhere);
+ else
+ strSQL += PrepareSQL(" WHERE " + movieSetsWhere);
}
+ else
+ strSQL += where;
if (order.size())
strSQL += " " + order;
@@ -7333,7 +7338,7 @@ void CVideoDatabase::ExportToXML(const CStdString &path, bool singleFiles /* = f
if (images && !bSkip)
{
- CStdString cachedThumb(GetCachedThumb(item));
+ CStdString cachedThumb(GetCachedThumb(CFileItem(episode)));
CStdString savedThumb(saveItem.GetTBNFile());
if (!cachedThumb.IsEmpty() && (overwrite || !CFile::Exists(savedThumb, false)))
if (!CFile::Cache(cachedThumb, savedThumb))
@@ -7421,6 +7426,10 @@ void CVideoDatabase::ExportActorThumbs(const CStdString &strDir, const CVideoInf
CStdString CVideoDatabase::GetCachedThumb(const CFileItem& item) const
{
CStdString cachedThumb(item.GetCachedVideoThumb());
+ if (item.HasVideoInfoTag() && !item.m_bIsFolder &&
+ item.GetVideoInfoTag()->m_iEpisode > -1 &&
+ CFile::Exists(item.GetCachedEpisodeThumb()))
+ cachedThumb = item.GetCachedEpisodeThumb();
if (!CFile::Exists(cachedThumb) && g_advancedSettings.m_bVideoLibraryExportAutoThumbs)
{
CStdString strPath, strFileName;
diff --git a/xbmc/video/VideoDatabase.h b/xbmc/video/VideoDatabase.h
index b6775d214f..5b1ec90176 100644
--- a/xbmc/video/VideoDatabase.h
+++ b/xbmc/video/VideoDatabase.h
@@ -698,16 +698,17 @@ private:
int RunQuery(const CStdString &sql);
/*! \brief Update routine for base path of videos
- Only required for videodb version < 44
+ Only required for videodb version < 59
\param table the table to update
\param id the primary id in the given table
\param column the basepath column to update
\param shows whether we're fetching shows (defaults to false)
+ \param where restrict updating of items that match the where clause
*/
- void UpdateBasePath(const char *table, const char *id, int column, bool shows = false);
+ void UpdateBasePath(const char *table, const char *id, int column, bool shows = false, const CStdString &where = "");
/*! \brief Update routine for base path id of videos
- Only required for videodb version < 52
+ Only required for videodb version < 59
\param table the table to update
\param id the primary id in the given table
\param column the column of the basepath
@@ -721,7 +722,7 @@ private:
*/
bool LookupByFolders(const CStdString &path, bool shows = false);
- virtual int GetMinVersion() const { return 58; };
+ virtual int GetMinVersion() const { return 60; };
virtual int GetExportVersion() const { return 1; };
const char *GetBaseDBName() const { return "MyVideos"; };
diff --git a/xbmc/video/VideoInfoTag.cpp b/xbmc/video/VideoInfoTag.cpp
index ef19863809..216d4fbc77 100644
--- a/xbmc/video/VideoInfoTag.cpp
+++ b/xbmc/video/VideoInfoTag.cpp
@@ -250,16 +250,13 @@ bool CVideoInfoTag::Save(TiXmlNode *node, const CStdString &tag, bool savePathIn
return true;
}
-bool CVideoInfoTag::Load(const TiXmlElement *movie, bool chained /* = false */,
- bool prefix /* = false */)
+bool CVideoInfoTag::Load(const TiXmlElement *element, bool append, bool prioritise)
{
- if (!movie) return false;
-
- // reset our details if we aren't chained.
- if (!chained) Reset();
-
- ParseNative(movie,prefix);
-
+ if (!element)
+ return false;
+ if (!append)
+ Reset();
+ ParseNative(element, prioritise);
return true;
}
@@ -508,7 +505,7 @@ const CStdString CVideoInfoTag::GetCast(bool bIncludeRole /*= false*/) const
return strLabel.TrimRight("\n");
}
-void CVideoInfoTag::ParseNative(const TiXmlElement* movie, bool prefix)
+void CVideoInfoTag::ParseNative(const TiXmlElement* movie, bool prioritise)
{
XMLUtils::GetString(movie, "title", m_strTitle);
XMLUtils::GetString(movie, "originaltitle", m_strOriginalTitle);
@@ -563,7 +560,7 @@ void CVideoInfoTag::ParseNative(const TiXmlElement* movie, bool prefix)
while (thumb)
{
m_strPictureURL.ParseElement(thumb);
- if (prefix)
+ if (prioritise)
{
CStdString temp;
temp << *thumb;
@@ -572,8 +569,8 @@ void CVideoInfoTag::ParseNative(const TiXmlElement* movie, bool prefix)
thumb = thumb->NextSiblingElement("thumb");
}
- // prefix thumbs from nfos
- if (prefix && iThumbCount && iThumbCount != m_strPictureURL.m_url.size())
+ // prioritise thumbs from nfos
+ if (prioritise && iThumbCount && iThumbCount != m_strPictureURL.m_url.size())
{
rotate(m_strPictureURL.m_url.begin(),
m_strPictureURL.m_url.begin()+iThumbCount,
@@ -581,14 +578,16 @@ void CVideoInfoTag::ParseNative(const TiXmlElement* movie, bool prefix)
m_strPictureURL.m_xml = xmlAdd;
}
- XMLUtils::GetAdditiveString(movie,"genre",g_advancedSettings.m_videoItemSeparator,m_strGenre);
- XMLUtils::GetAdditiveString(movie,"country",g_advancedSettings.m_videoItemSeparator,m_strCountry);
- XMLUtils::GetAdditiveString(movie,"credits",g_advancedSettings.m_videoItemSeparator,m_strWritingCredits);
- XMLUtils::GetAdditiveString(movie,"director",g_advancedSettings.m_videoItemSeparator,m_strDirector);
- XMLUtils::GetAdditiveString(movie,"showlink",g_advancedSettings.m_videoItemSeparator,m_strShowLink);
+ XMLUtils::GetAdditiveString(movie, "genre", g_advancedSettings.m_videoItemSeparator, m_strGenre, prioritise);
+ XMLUtils::GetAdditiveString(movie, "country", g_advancedSettings.m_videoItemSeparator, m_strCountry, prioritise);
+ XMLUtils::GetAdditiveString(movie, "credits", g_advancedSettings.m_videoItemSeparator, m_strWritingCredits, prioritise);
+ XMLUtils::GetAdditiveString(movie, "director", g_advancedSettings.m_videoItemSeparator, m_strDirector, prioritise);
+ XMLUtils::GetAdditiveString(movie, "showlink", g_advancedSettings.m_videoItemSeparator, m_strShowLink, prioritise);
// cast
const TiXmlElement* node = movie->FirstChildElement("actor");
+ if (node && node->FirstChild() && prioritise)
+ m_cast.clear();
while (node)
{
const TiXmlNode *actor = node->FirstChild("name");
@@ -614,6 +613,8 @@ void CVideoInfoTag::ParseNative(const TiXmlElement* movie, bool prefix)
}
node = movie->FirstChildElement("set");
+ if (node && node->FirstChild() && prioritise)
+ m_set.clear();
while (node)
{
if (node->FirstChild())
@@ -622,9 +623,11 @@ void CVideoInfoTag::ParseNative(const TiXmlElement* movie, bool prefix)
node = node->NextSiblingElement("set");
}
- XMLUtils::GetAdditiveString(movie,"studio",g_advancedSettings.m_videoItemSeparator,m_strStudio);
+ XMLUtils::GetAdditiveString(movie, "studio", g_advancedSettings.m_videoItemSeparator, m_strStudio, prioritise);
// artists
node = movie->FirstChildElement("artist");
+ if (node && node->FirstChild() && prioritise)
+ m_strArtist.clear();
while (node)
{
const TiXmlNode* pNode = node->FirstChild("name");
@@ -637,7 +640,7 @@ void CVideoInfoTag::ParseNative(const TiXmlElement* movie, bool prefix)
{
const char* clear=node->Attribute("clear");
if (m_strArtist.IsEmpty() || (clear && stricmp(clear,"true")==0))
- m_strArtist += pValue;
+ m_strArtist = pValue;
else
m_strArtist += g_advancedSettings.m_videoItemSeparator + pValue;
}
@@ -704,8 +707,8 @@ void CVideoInfoTag::ParseNative(const TiXmlElement* movie, bool prefix)
const TiXmlElement *fanart = movie->FirstChildElement("fanart");
if (fanart)
{
- // we prefix to handle mixed-mode nfo's with fanart set
- if (prefix)
+ // we prioritise mixed-mode nfo's with fanart set
+ if (prioritise)
{
CStdString temp;
temp << *fanart;
diff --git a/xbmc/video/VideoInfoTag.h b/xbmc/video/VideoInfoTag.h
index 1e465b9155..3ee238be72 100644
--- a/xbmc/video/VideoInfoTag.h
+++ b/xbmc/video/VideoInfoTag.h
@@ -43,7 +43,22 @@ class CVideoInfoTag : public IArchivable, public ISerializable
public:
CVideoInfoTag() { Reset(); };
void Reset();
- bool Load(const TiXmlElement *movie, bool chained = false, bool prefix=false);
+ /* \brief Load information to a videoinfotag from an XML element
+ There are three types of tags supported:
+ 1. Single-value tags, such as <title>. These are set if available, else are left untouched.
+ 2. Additive tags, such as <set> or <genre>. These are appended to or replaced (if available) based on the value
+ of the prioritise parameter. In addition, a clear attribute is available in the XML to clear the current value prior
+ to appending.
+ 3. Image tags such as <thumb> and <fanart>. If the prioritise value is specified, any additional values are prepended
+ to the existing values.
+
+ \param element the root XML element to parse.
+ \param append whether information should be added to the existing tag, or whether it should be reset first.
+ \param prioritise if appending, whether additive tags should be prioritised (i.e. replace or prepend) over existing values. Defaults to false.
+
+ \sa ParseNative
+ */
+ bool Load(const TiXmlElement *element, bool append = false, bool prioritise = false);
bool Save(TiXmlNode *node, const CStdString &tag, bool savePathInfo = true);
virtual void Archive(CArchive& ar);
virtual void Serialize(CVariant& value);
@@ -114,7 +129,14 @@ public:
CBookmark m_resumePoint;
private:
- void ParseNative(const TiXmlElement* movie, bool prefix);
+ /* \brief Parse our native XML format for video info.
+ See Load for a description of the available tag types.
+
+ \param element the root XML element to parse.
+ \param prioritise whether additive tags should be replaced (or prepended) by the content of the tags, or appended to.
+ \sa Load
+ */
+ void ParseNative(const TiXmlElement* element, bool prioritise);
};
typedef std::vector<CVideoInfoTag> VECMOVIES;
diff --git a/xbmc/video/VideoReferenceClock.cpp b/xbmc/video/VideoReferenceClock.cpp
index 83fabfe2b5..ea72ee85d5 100644
--- a/xbmc/video/VideoReferenceClock.cpp
+++ b/xbmc/video/VideoReferenceClock.cpp
@@ -30,6 +30,7 @@
#if defined(HAS_GLX) && defined(HAS_XRANDR)
#include <sstream>
#include <X11/extensions/Xrandr.h>
+ #include "windowing/WindowingFactory.h"
#define NVSETTINGSCMD "nvidia-settings -nt -q RefreshRate3"
#elif defined(__APPLE__) && !defined(__arm__)
#include <QuartzCore/CVDisplayLink.h>
@@ -228,6 +229,8 @@ bool CVideoReferenceClock::SetupGLX()
m_vInfo = NULL;
m_Context = NULL;
m_Window = 0;
+ m_pixmap = None;
+ m_glPixmap = None;
CLog::Log(LOGDEBUG, "CVideoReferenceClock: Setting up GLX");
@@ -267,6 +270,14 @@ bool CVideoReferenceClock::SetupGLX()
return false;
}
+ CStdString Vendor = g_Windowing.GetRenderVendor();
+ Vendor.ToLower();
+ if (Vendor.compare(0, 3, "ati") == 0)
+ {
+ CLog::Log(LOGDEBUG, "CVideoReferenceClock: GL_VENDOR: %s, using ati workaround", Vendor.c_str());
+ m_bIsATI = true;
+ }
+
m_vInfo = glXChooseVisual(m_Dpy, DefaultScreen(m_Dpy), singleBufferAttributes);
if (!m_vInfo)
{
@@ -274,13 +285,26 @@ bool CVideoReferenceClock::SetupGLX()
return false;
}
- Swa.border_pixel = 0;
- Swa.event_mask = StructureNotifyMask;
- Swa.colormap = XCreateColormap(m_Dpy, RootWindow(m_Dpy, m_vInfo->screen), m_vInfo->visual, AllocNone );
- SwaMask = CWBorderPixel | CWColormap | CWEventMask;
+ if (!m_bIsATI)
+ {
+ Swa.border_pixel = 0;
+ Swa.event_mask = StructureNotifyMask;
+ Swa.colormap = XCreateColormap(m_Dpy, RootWindow(m_Dpy, m_vInfo->screen), m_vInfo->visual, AllocNone );
+ SwaMask = CWBorderPixel | CWColormap | CWEventMask;
- m_Window = XCreateWindow(m_Dpy, RootWindow(m_Dpy, m_vInfo->screen), 0, 0, 256, 256, 0,
+ m_Window = XCreateWindow(m_Dpy, RootWindow(m_Dpy, m_vInfo->screen), 0, 0, 256, 256, 0,
m_vInfo->depth, InputOutput, m_vInfo->visual, SwaMask, &Swa);
+ }
+ else
+ {
+ m_pixmap = XCreatePixmap(m_Dpy, DefaultRootWindow(m_Dpy), 256, 256, m_vInfo->depth);
+ if (!m_pixmap)
+ {
+ CLog::Log(LOGDEBUG, "CVideoReferenceClock: unable to create pixmap");
+ return false;
+ }
+ m_glPixmap = glXCreateGLXPixmap(m_Dpy, m_vInfo, m_pixmap);
+ }
m_Context = glXCreateContext(m_Dpy, m_vInfo, NULL, True);
if (!m_Context)
@@ -289,25 +313,32 @@ bool CVideoReferenceClock::SetupGLX()
return false;
}
- ReturnV = glXMakeCurrent(m_Dpy, m_Window, m_Context);
+ if (!m_bIsATI)
+ ReturnV = glXMakeCurrent(m_Dpy, m_Window, m_Context);
+ else
+ ReturnV = glXMakeCurrent(m_Dpy, m_glPixmap, m_Context);
+
if (ReturnV != True)
{
CLog::Log(LOGDEBUG, "CVideoReferenceClock: glXMakeCurrent returned %i", ReturnV);
return false;
}
- m_glXWaitVideoSyncSGI = (int (*)(int, int, unsigned int*))glXGetProcAddress((const GLubyte*)"glXWaitVideoSyncSGI");
- if (!m_glXWaitVideoSyncSGI)
+ if (!m_bIsATI)
{
- CLog::Log(LOGDEBUG, "CVideoReferenceClock: glXWaitVideoSyncSGI not found");
- return false;
- }
+ m_glXWaitVideoSyncSGI = (int (*)(int, int, unsigned int*))glXGetProcAddress((const GLubyte*)"glXWaitVideoSyncSGI");
+ if (!m_glXWaitVideoSyncSGI)
+ {
+ CLog::Log(LOGDEBUG, "CVideoReferenceClock: glXWaitVideoSyncSGI not found");
+ return false;
+ }
- ReturnV = m_glXWaitVideoSyncSGI(2, 0, &GlxTest);
- if (ReturnV)
- {
- CLog::Log(LOGDEBUG, "CVideoReferenceClock: glXWaitVideoSyncSGI returned %i", ReturnV);
- return false;
+ ReturnV = m_glXWaitVideoSyncSGI(2, 0, &GlxTest);
+ if (ReturnV)
+ {
+ CLog::Log(LOGDEBUG, "CVideoReferenceClock: glXWaitVideoSyncSGI returned %i", ReturnV);
+ return false;
+ }
}
m_glXGetVideoSyncSGI = (int (*)(unsigned int*))glXGetProcAddress((const GLubyte*)"glXGetVideoSyncSGI");
@@ -479,19 +510,6 @@ void CVideoReferenceClock::CleanupGLX()
{
CLog::Log(LOGDEBUG, "CVideoReferenceClock: Cleaning up GLX");
- bool AtiWorkaround = false;
- const char* VendorPtr = (const char*)glGetString(GL_VENDOR);
- if (VendorPtr)
- {
- CStdString Vendor = VendorPtr;
- Vendor.ToLower();
- if (Vendor.compare(0, 3, "ati") == 0)
- {
- CLog::Log(LOGDEBUG, "CVideoReferenceClock: GL_VENDOR: %s, using ati dpy workaround", VendorPtr);
- AtiWorkaround = true;
- }
- }
-
if (m_vInfo)
{
XFree(m_vInfo);
@@ -508,9 +526,19 @@ void CVideoReferenceClock::CleanupGLX()
XDestroyWindow(m_Dpy, m_Window);
m_Window = 0;
}
+ if (m_glPixmap)
+ {
+ glXDestroyPixmap(m_Dpy, m_glPixmap);
+ m_glPixmap = None;
+ }
+ if (m_pixmap)
+ {
+ XFreePixmap(m_Dpy, m_pixmap);
+ m_pixmap = None;
+ }
//ati saves the Display* in their libGL, if we close it here, we crash
- if (m_Dpy && !AtiWorkaround)
+ if (m_Dpy && !m_bIsATI)
{
XCloseDisplay(m_Dpy);
m_Dpy = NULL;
@@ -532,11 +560,59 @@ void CVideoReferenceClock::RunGLX()
m_glXGetVideoSyncSGI(&VblankCount);
PrevVblankCount = VblankCount;
+ uint64_t lastVblankTime = CurrentHostCounter();
+ int sleepTime, correction;
+ int integral = 0;
+
while(!m_bStop)
{
//wait for the next vblank
- ReturnV = m_glXWaitVideoSyncSGI(2, (VblankCount + 1) % 2, &VblankCount);
- m_glXGetVideoSyncSGI(&VblankCount); //the vblank count returned by glXWaitVideoSyncSGI is not always correct
+ if (!m_bIsATI)
+ {
+ ReturnV = m_glXWaitVideoSyncSGI(2, (VblankCount + 1) % 2, &VblankCount);
+ m_glXGetVideoSyncSGI(&VblankCount); //the vblank count returned by glXWaitVideoSyncSGI is not always correct
+ }
+ else
+ {
+ // calculate sleep time in micro secs
+ // we start with 50% of interval
+ sleepTime = 500000LL / m_RefreshRate;
+
+ // correct sleepTime by time used for processing since last vblank
+ correction = (CurrentHostCounter() - lastVblankTime) * 1000000LL / m_SystemFrequency;
+ sleepTime -= correction;
+
+ // correct sleep time by integral term
+ // consider 10 cycles as desired
+ sleepTime += integral;
+
+ // clamp sleepTime to a min value of 30% of interval
+ // integral is already clamped to a max value
+ sleepTime = std::max(int(300000LL/m_RefreshRate), sleepTime);
+
+ unsigned int iterations = 0;
+ while (VblankCount == PrevVblankCount && !m_bStop)
+ {
+ usleep(sleepTime);
+ m_glXGetVideoSyncSGI(&VblankCount);
+ sleepTime = sleepTime > 200 ? sleepTime/2 : 100;
+ iterations++;
+ }
+ if (iterations > 10)
+ integral += 100;
+ else if (iterations < 10)
+ integral -= 100;
+
+ // clamp integral to an absolute value of 20% of interval
+ if (integral > 200000LL/m_RefreshRate)
+ integral = 200000LL/m_RefreshRate;
+ else if (integral < -200000LL/m_RefreshRate)
+ integral = -200000LL/m_RefreshRate;
+
+ lastVblankTime = CurrentHostCounter();
+ ReturnV = 0;
+ }
+
Now = CurrentHostCounter(); //get the timestamp of this vblank
if(ReturnV)
@@ -554,13 +630,14 @@ void CVideoReferenceClock::RunGLX()
SingleLock.Leave();
SendVblankSignal();
UpdateRefreshrate();
-
IsReset = false;
}
- else
+ else if (!m_bStop)
{
CLog::Log(LOGDEBUG, "CVideoReferenceClock: Vblank counter has reset");
+ integral = 0;
+
//only try reattaching once
if (IsReset)
return;
@@ -575,7 +652,11 @@ void CVideoReferenceClock::RunGLX()
}
CLog::Log(LOGDEBUG, "CVideoReferenceClock: Attaching glX context");
- ReturnV = glXMakeCurrent(m_Dpy, m_Window, m_Context);
+ if (!m_bIsATI)
+ ReturnV = glXMakeCurrent(m_Dpy, m_Window, m_Context);
+ else
+ ReturnV = glXMakeCurrent(m_Dpy, m_glPixmap, m_Context);
+
if (ReturnV != True)
{
CLog::Log(LOGDEBUG, "CVideoReferenceClock: glXMakeCurrent returned %i", ReturnV);
diff --git a/xbmc/video/VideoReferenceClock.h b/xbmc/video/VideoReferenceClock.h
index 9699cd4df7..465d3136cb 100644
--- a/xbmc/video/VideoReferenceClock.h
+++ b/xbmc/video/VideoReferenceClock.h
@@ -119,9 +119,12 @@ class CVideoReferenceClock : public CThread
XVisualInfo *m_vInfo;
Window m_Window;
GLXContext m_Context;
+ Pixmap m_pixmap;
+ GLXPixmap m_glPixmap;
int m_RREventBase;
bool m_UseNvSettings;
+ bool m_bIsATI;
#elif defined(_WIN32) && defined(HAS_DX)
bool SetupD3D();
diff --git a/xbmc/video/windows/GUIWindowVideoBase.cpp b/xbmc/video/windows/GUIWindowVideoBase.cpp
index 5750952abc..c10f68e6fd 100644
--- a/xbmc/video/windows/GUIWindowVideoBase.cpp
+++ b/xbmc/video/windows/GUIWindowVideoBase.cpp
@@ -873,7 +873,8 @@ bool CGUIWindowVideoBase::OnSelect(int iItem)
CFileItemPtr item = m_vecItems->Get(iItem);
- if (!item->m_bIsFolder && item->GetPath() != "add" && item->GetPath() != "addons://more/video")
+ CStdString path = item->GetPath();
+ if (!item->m_bIsFolder && path != "add" && path != "addons://more/video" && path.Left(19) != "newsmartplaylist://" && path.Left(14) != "newplaylist://")
return OnFileAction(iItem, g_guiSettings.GetInt("myvideos.selectaction"));
return CGUIMediaWindow::OnSelect(iItem);
@@ -1349,6 +1350,7 @@ bool CGUIWindowVideoBase::OnPlayMedia(int iItem)
item.SetPath(pItem->GetVideoInfoTag()->m_strFileNameAndPath);
item.SetProperty("original_listitem_url", pItem->GetPath());
}
+ CLog::Log(LOGDEBUG, "%s %s", __FUNCTION__, item.GetPath().c_str());
PlayMovie(&item);
@@ -1695,9 +1697,7 @@ bool CGUIWindowVideoBase::GetDirectory(const CStdString &strDirectory, CFileItem
items.Add(newPlaylist);
}
- m_stackingAvailable = !(items.IsTuxBox() || items.IsPlugin() ||
- items.IsAddonsPath() || items.IsRSS() ||
- items.IsInternetStream() || items.IsVideoDb());
+ m_stackingAvailable = StackingAvailable(items);
// we may also be in a tvshow files listing
// (ideally this should be removed, and our stack regexps tidied up if necessary
// No "normal" episodes should stack, and multi-parts should be supported)
@@ -1711,6 +1711,13 @@ bool CGUIWindowVideoBase::GetDirectory(const CStdString &strDirectory, CFileItem
return bResult;
}
+bool CGUIWindowVideoBase::StackingAvailable(const CFileItemList &items) const
+{
+ return !(items.IsTuxBox() || items.IsPlugin() ||
+ items.IsAddonsPath() || items.IsRSS() ||
+ items.IsInternetStream() || items.IsVideoDb());
+}
+
void CGUIWindowVideoBase::OnPrepareFileItems(CFileItemList &items)
{
if (!items.GetPath().Equals("plugin://video/"))
diff --git a/xbmc/video/windows/GUIWindowVideoBase.h b/xbmc/video/windows/GUIWindowVideoBase.h
index 348d169e4e..d9168fd97d 100644
--- a/xbmc/video/windows/GUIWindowVideoBase.h
+++ b/xbmc/video/windows/GUIWindowVideoBase.h
@@ -117,6 +117,8 @@ protected:
static bool OnUnAssignContent(const CStdString &path, int label1, int label2, int label3);
+ bool StackingAvailable(const CFileItemList &items) const;
+
CGUIDialogProgress* m_dlgProgress;
CVideoDatabase m_database;
diff --git a/xbmc/video/windows/GUIWindowVideoNav.cpp b/xbmc/video/windows/GUIWindowVideoNav.cpp
index a81b688840..7c44ed3fbd 100644
--- a/xbmc/video/windows/GUIWindowVideoNav.cpp
+++ b/xbmc/video/windows/GUIWindowVideoNav.cpp
@@ -339,7 +339,7 @@ bool CGUIWindowVideoNav::GetDirectory(const CStdString &strDirectory, CFileItemL
// grab the season thumb as the folder thumb
CStdString strLabel;
CStdString strPath;
- if (params.GetSeason() == -1 && items.Size() > 0)
+ if (params.GetSeason() <= -1 && items.Size() > 0)
{
CQueryParams params2;
dir.GetQueryParams(items[0]->GetPath(),params2);
@@ -400,7 +400,7 @@ bool CGUIWindowVideoNav::GetDirectory(const CStdString &strDirectory, CFileItemL
else
items.SetContent("");
}
- else
+ else if (!items.IsVirtualDirectoryRoot())
{ // load info from the database
CStdString label;
if (items.GetLabel().IsEmpty() && m_rootDir.IsSource(items.GetPath(), g_settings.GetSourcesFromType("video"), &label))
@@ -421,9 +421,19 @@ void CGUIWindowVideoNav::LoadVideoInfo(CFileItemList &items)
CStdString content = m_database.GetContentForPath(items.GetPath());
items.SetContent(content.IsEmpty() ? "files" : content);
- bool fileMetaData = (g_guiSettings.GetBool("myvideos.filemetadata") &&
- !content.IsEmpty() &&
- m_stackingAvailable && g_settings.m_videoStacking);
+ /*
+ If we have a matching item in the library, so we can assign the metadata to it. In addition, we can choose
+ * whether the item is stacked down (eg in the case of folders representing a single item)
+ * whether or not we assign the library's labels to the item, or leave the item as is.
+
+ As certain users (read: certain developers) don't want either of these to occur, we compromise by stacking
+ items down only if stacking is available and enabled.
+
+ Similarly, we assign the "clean" library labels to the item only if the "Replace filenames with library titles"
+ setting is enabled.
+ */
+ bool stackItems = items.GetProperty("isstacked").asBoolean() || (StackingAvailable(items) && g_settings.m_videoStacking);
+ bool replaceLabels = g_guiSettings.GetBool("myvideos.replacelabels");
CFileItemList dbItems;
/* NOTE: In the future when GetItemsForPath returns all items regardless of whether they're "in the library"
@@ -439,15 +449,13 @@ void CGUIWindowVideoNav::LoadVideoInfo(CFileItemList &items)
{
CFileItemPtr pItem = items[i];
CFileItemPtr match;
- if (!content.IsEmpty())
- match = dbItems.Get(pItem->GetPath());
+ if (!content.IsEmpty()) /* optical media will be stacked down, so it's path won't match the base path */
+ match = dbItems.Get(pItem->IsOpticalMediaFile() ? pItem->GetLocalMetadataPath() : pItem->GetPath());
if (match)
{
- CStdString label (pItem->GetLabel ());
- CStdString label2(pItem->GetLabel2());
- pItem->UpdateInfo(*match);
-
- if (fileMetaData)
+ pItem->UpdateInfo(*match, replaceLabels);
+
+ if (stackItems)
{
if (match->m_bIsFolder)
pItem->SetPath(match->GetVideoInfoTag()->m_strPath);
@@ -461,14 +469,6 @@ void CGUIWindowVideoNav::LoadVideoInfo(CFileItemList &items)
pItem->m_bIsFolder = match->m_bIsFolder;
}
}
- else
- {
- if (CFile::Exists(match->GetCachedFanart()))
- pItem->SetProperty("fanart_image", match->GetCachedFanart());
-
- pItem->SetLabel (label);
- pItem->SetLabel2(label2);
- }
}
else
{
@@ -485,8 +485,8 @@ void CGUIWindowVideoNav::LoadVideoInfo(CFileItemList &items)
if (pItem->IsVideo())
pItem->SetOverlayImage(CGUIListItem::ICON_OVERLAY_UNWATCHED, pItem->HasVideoInfoTag() && pItem->GetVideoInfoTag()->m_playCount > 0);
- // Since the item is not in our db, as an alternative clean its name
- if (fileMetaData)
+ // Since the item is not in our db but the user wants a clean label we should clean it up (stacking may do some cleaning as well)
+ if (replaceLabels)
pItem->CleanString();
}
}
@@ -655,7 +655,7 @@ bool CGUIWindowVideoNav::CanDelete(const CStdString& strPath)
if (params.GetMovieId() != -1 ||
params.GetEpisodeId() != -1 ||
params.GetMVideoId() != -1 ||
- (params.GetTvShowId() != -1 && params.GetSeason() == -1
+ (params.GetTvShowId() != -1 && params.GetSeason() <= -1
&& !CVideoDatabaseDirectory::IsAllItem(strPath)))
return true;
@@ -1450,6 +1450,7 @@ bool CGUIWindowVideoNav::OnClick(int iItem)
CFileItemPtr item = m_vecItems->Get(iItem);
if (!item->m_bIsFolder && item->IsVideoDb() && !item->Exists())
{
+ CLog::Log(LOGDEBUG, "%s called on '%s' but file doesn't exist", __FUNCTION__, item->GetPath().c_str());
if (!DeleteItem(item.get(), true))
return true;
diff --git a/xbmc/visualizations/XBMCProjectM/libprojectM/CMakeLists.txt b/xbmc/visualizations/XBMCProjectM/libprojectM/CMakeLists.txt
index 7fc164b253..31077de86f 100644
--- a/xbmc/visualizations/XBMCProjectM/libprojectM/CMakeLists.txt
+++ b/xbmc/visualizations/XBMCProjectM/libprojectM/CMakeLists.txt
@@ -58,7 +58,7 @@ endif(BUILD_PROJECTM_STATIC)
SET_TARGET_PROPERTIES(projectM PROPERTIES VERSION 2.00 SOVERSION 2)
if (APPLE)
-ADD_DEFINITIONS(-DMACOS -DSTBI_NO_DDS -DUSE_THREADS)
+ADD_DEFINITIONS(-DMACOS -DSTBI_NO_DDS)
set(RESOURCE_PREFIX "Resources" )
FIND_LIBRARY(CORE_FOUNDATION_LIBRARY CoreFoundation )
MARK_AS_ADVANCED (CORE_FOUNDATION_LIBRARY)
@@ -68,10 +68,10 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.4 -L/opt/local/l
else (APPLE)
if (WIN32)
set (RESOURCE_PREFIX "Resources")
-ADD_DEFINITIONS(-DWIN32 -DSTBI_NO_DDS -DUSE_THREADS)
+ADD_DEFINITIONS(-DWIN32 -DSTBI_NO_DDS)
else(WIN32)
set (RESOURCE_PREFIX "share/projectM")
-ADD_DEFINITIONS(-DLINUX -DSTBI_NO_DDS -DUSE_THREADS)
+ADD_DEFINITIONS(-DLINUX -DSTBI_NO_DDS)
endif(WIN32)
endif(APPLE)
diff --git a/xbmc/win32/WIN32Util.cpp b/xbmc/win32/WIN32Util.cpp
index 9005ab1f44..a7bf0646c3 100644
--- a/xbmc/win32/WIN32Util.cpp
+++ b/xbmc/win32/WIN32Util.cpp
@@ -522,7 +522,10 @@ HRESULT CWIN32Util::ToggleTray(const char cDriveLetter)
if(dwReq == IOCTL_STORAGE_EJECT_MEDIA && bRet == 1)
{
strRootFormat.Format( _T("%c:"), cDL);
- g_application.getApplicationMessenger().OpticalUnMount(strRootFormat);
+ CMediaSource share;
+ share.strPath = strRootFormat;
+ share.strName = share.strPath;
+ g_mediaManager.RemoveAutoSource(share);
}
return bRet? S_OK : S_FALSE;
}
diff --git a/xbmc/windowing/X11/WinSystemX11.cpp b/xbmc/windowing/X11/WinSystemX11.cpp
index 62cf55492b..201b0ad45a 100644
--- a/xbmc/windowing/X11/WinSystemX11.cpp
+++ b/xbmc/windowing/X11/WinSystemX11.cpp
@@ -52,6 +52,8 @@ CWinSystemX11::CWinSystemX11() : CWinSystemBase()
m_wmWindow = 0;
m_bWasFullScreenBeforeMinimize = false;
m_dpyLostTime = 0;
+
+ XSetErrorHandler(XErrorHandler);
}
CWinSystemX11::~CWinSystemX11()
@@ -534,4 +536,14 @@ void CWinSystemX11::Unregister(IDispResource* resource)
m_resources.erase(i);
}
+int CWinSystemX11::XErrorHandler(Display* dpy, XErrorEvent* error)
+{
+ char buf[1024];
+ XGetErrorText(error->display, error->error_code, buf, sizeof(buf));
+ CLog::Log(LOGERROR, "CWinSystemX11::XErrorHandler: %s, type:%i, serial:%lu, error_code:%i, request_code:%i minor_code:%i",
+ buf, error->type, error->serial, (int)error->error_code, (int)error->request_code, (int)error->minor_code);
+
+ return 0;
+}
+
#endif
diff --git a/xbmc/windowing/X11/WinSystemX11.h b/xbmc/windowing/X11/WinSystemX11.h
index 5b941be01d..a77c4d53b9 100644
--- a/xbmc/windowing/X11/WinSystemX11.h
+++ b/xbmc/windowing/X11/WinSystemX11.h
@@ -79,6 +79,7 @@ protected:
private:
bool IsSuitableVisual(XVisualInfo *vInfo);
+ static int XErrorHandler(Display* dpy, XErrorEvent* error);
CStopWatch m_screensaverReset;
};
diff --git a/xbmc/windowing/osx/WinEventsIOS.mm b/xbmc/windowing/osx/WinEventsIOS.mm
index 9d5671993d..b016aa738f 100644
--- a/xbmc/windowing/osx/WinEventsIOS.mm
+++ b/xbmc/windowing/osx/WinEventsIOS.mm
@@ -26,6 +26,7 @@
#include "Application.h"
#include "WindowingFactory.h"
#include "threads/CriticalSection.h"
+#include "utils/log.h"
static CCriticalSection g_inputCond;
@@ -75,6 +76,7 @@ bool CWinEventsIOS::MessagePump()
float fAmount = 0.0;
unsigned short wKeyID = pumpEvent.user.code;
+ CLog::Log(LOGDEBUG,"CWinEventsIOS: Button press keyID = %i", wKeyID);
ret |= g_application.ProcessJoystickEvent(joystickName, wKeyID, isAxis, fAmount);
}
else
diff --git a/xbmc/windowing/windows/WinEventsWin32.cpp b/xbmc/windowing/windows/WinEventsWin32.cpp
index 935e53369b..ece372e878 100644
--- a/xbmc/windowing/windows/WinEventsWin32.cpp
+++ b/xbmc/windowing/windows/WinEventsWin32.cpp
@@ -39,6 +39,8 @@
#include "settings/Settings.h"
#include "settings/AdvancedSettings.h"
#include "peripherals/Peripherals.h"
+#include "storage/DetectDVDType.h"
+#include "utils/JobManager.h"
#ifdef _WIN32
@@ -640,7 +642,7 @@ LRESULT CALLBACK CWinEventsWin32::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, L
case SHCNE_MEDIAINSERTED:
CLog::Log(LOGDEBUG, __FUNCTION__": Drive %s Media has arrived.", drivePath);
if (GetDriveType(drivePath) == DRIVE_CDROM)
- g_application.getApplicationMessenger().OpticalMount(drivePath, true);
+ CJobManager::GetInstance().AddJob(new CDetectDisc(drivePath, true), NULL);
else
CWin32StorageProvider::SetEvent();
break;
@@ -649,7 +651,12 @@ LRESULT CALLBACK CWinEventsWin32::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, L
case SHCNE_MEDIAREMOVED:
CLog::Log(LOGDEBUG, __FUNCTION__": Drive %s Media was removed.", drivePath);
if (GetDriveType(drivePath) == DRIVE_CDROM)
- g_application.getApplicationMessenger().OpticalUnMount(drivePath);
+ {
+ CMediaSource share;
+ share.strPath = drivePath;
+ share.strName = share.strPath;
+ g_mediaManager.RemoveAutoSource(share);
+ }
else
CWin32StorageProvider::SetEvent();
break;
diff --git a/xbmc/windows/GUIMediaWindow.cpp b/xbmc/windows/GUIMediaWindow.cpp
index 5aa4615fcd..6a9c905613 100644
--- a/xbmc/windows/GUIMediaWindow.cpp
+++ b/xbmc/windows/GUIMediaWindow.cpp
@@ -967,16 +967,18 @@ bool CGUIMediaWindow::OnClick(int iItem)
g_guiSettings.GetBool("karaoke.autopopupselector") && pItem->IsKaraoke();
bool autoplay = m_guiState.get() && m_guiState->AutoPlayNextItem();
- if (pItem->IsPlugin())
+ if (m_vecItems->IsPlugin())
{
- CURL url(pItem->GetPath());
+ CURL url(m_vecItems->GetPath());
AddonPtr addon;
if (CAddonMgr::Get().GetAddon(url.GetHostName(),addon))
{
PluginPtr plugin = boost::dynamic_pointer_cast<CPluginSource>(addon);
- if (plugin && plugin->Provides(CPluginSource::AUDIO) && pItem->IsAudio())
+ if (plugin && plugin->Provides(CPluginSource::AUDIO))
{
- autoplay = g_guiSettings.GetBool("musicplayer.autoplaynextitem");
+ CFileItemList items;
+ auto_ptr<CGUIViewState> state(CGUIViewState::GetViewState(GetID(), items));
+ autoplay = state.get() && state->AutoPlayNextItem();
}
}
}
@@ -1190,6 +1192,8 @@ bool CGUIMediaWindow::OnPlayMedia(int iItem)
g_playlistPlayer.SetCurrentPlaylist(PLAYLIST_NONE);
CFileItemPtr pItem=m_vecItems->Get(iItem);
+ CLog::Log(LOGDEBUG, "%s %s", __FUNCTION__, pItem->GetPath().c_str());
+
bool bResult = false;
if (pItem->IsInternetStream() || pItem->IsPlayList())
bResult = g_application.PlayMedia(*pItem, m_guiState->GetPlaylist());
diff --git a/xbmc/windows/GUIWindowLoginScreen.cpp b/xbmc/windows/GUIWindowLoginScreen.cpp
index c07e88ce82..119d9c7d5c 100644
--- a/xbmc/windows/GUIWindowLoginScreen.cpp
+++ b/xbmc/windows/GUIWindowLoginScreen.cpp
@@ -265,6 +265,9 @@ CFileItemPtr CGUIWindowLoginScreen::GetCurrentListItem(int offset)
void CGUIWindowLoginScreen::LoadProfile(unsigned int profile)
{
+ // stop service addons and give it some time before we start it again
+ ADDON::CAddonMgr::Get().StopServices(true);
+
if (profile != 0 || !g_settings.IsMasterUser())
{
g_application.getNetwork().NetworkMessage(CNetwork::SERVICES_DOWN,1);
@@ -297,6 +300,7 @@ void CGUIWindowLoginScreen::LoadProfile(unsigned int profile)
JSONRPC::CJSONRPC::Initialize();
#endif
+ // start services which should run on login
ADDON::CAddonMgr::Get().StartServices(false);
g_windowManager.ChangeActiveWindow(g_SkinInfo->GetFirstWindow());