diff options
| author | blittan <blittan@svn> | 2010-01-21 11:44:41 +0000 |
|---|---|---|
| committer | blittan <blittan@svn> | 2010-01-21 11:44:41 +0000 |
| commit | 1bc845f732f39ed78f100ff3db2a3231fa43bd60 (patch) | |
| tree | 6c1005ece60b71a5ef70dfbb8b1ef2a2377cbb11 | |
| parent | ac755069b0fe853f87925e9c729001916319231e (diff) | |
fixed: r27041 using reserved string ids in English
updated: Swedish translation
fixed: typo in documentation for isPlaying
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@27047 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
| -rw-r--r-- | language/English/strings.xml | 5 | ||||
| -rw-r--r-- | language/Swedish/strings.xml | 6 | ||||
| -rw-r--r-- | xbmc/GUIDialogVideoSettings.cpp | 4 | ||||
| -rw-r--r-- | xbmc/lib/libPython/xbmcmodule/player.cpp | 2 |
4 files changed, 9 insertions, 8 deletions
diff --git a/language/English/strings.xml b/language/English/strings.xml index 99e5df1ef6..2f8af0c735 100644 --- a/language/English/strings.xml +++ b/language/English/strings.xml @@ -1495,6 +1495,8 @@ <string id="16314">Inverse Telecine</string> <string id="16315">Lanczos3 optimized</string> <string id="16316">Auto</string> + <string id="16317">Temporal (Half)</string> + <string id="16318">Temporal/Spatial (Half)</string> <string id="17500">Display sleep timeout</string> @@ -2171,7 +2173,4 @@ <string id="33081">This file is stacked, select the part you want to play from.</string> <string id="33082">Path to script</string> <string id="33083">Enable custom script button</string> - <string id="33084">Temporal (Half)</string> - <string id="33085">Temporal/Spatial (Half)</string> - </strings> diff --git a/language/Swedish/strings.xml b/language/Swedish/strings.xml index 60d5e69597..2d2562363d 100644 --- a/language/Swedish/strings.xml +++ b/language/Swedish/strings.xml @@ -1381,13 +1381,15 @@ <string id="16307">Bicubic (mjukvara)</string> <string id="16308">Lanczos (mjukvara)</string> <string id="16309">Sinc (mjukvara)</string> - <string id="16310">(VDPAU)Temporal</string> - <string id="16311">(VDPAU)Temporal/Spatial</string> + <string id="16310">Temporal</string> + <string id="16311">Temporal/Spatial</string> <string id="16312">(VDPAU)Noise Reduction</string> <string id="16313">(VDPAU)Sharpness</string> <string id="16314">Inverse Telecine</string> <string id="16315">Lanczos3 optimerad</string> <string id="16316">Auto</string> + <string id="16317">Temporal (Halv)</string> + <string id="16318">Temporal/Spatial (Halv)</string> <string id="17500">Visa insommningstimeout</string> <string id="19000">Byt till kanal</string> <string id="20000">Mapp för sparad musik</string> diff --git a/xbmc/GUIDialogVideoSettings.cpp b/xbmc/GUIDialogVideoSettings.cpp index e4d7674ef9..9cf73d4e5c 100644 --- a/xbmc/GUIDialogVideoSettings.cpp +++ b/xbmc/GUIDialogVideoSettings.cpp @@ -87,8 +87,8 @@ void CGUIDialogVideoSettings::CreateSettings() entries.push_back(make_pair(VS_INTERLACEMETHOD_VDPAU_TEMPORAL_SPATIAL , 16311)); entries.push_back(make_pair(VS_INTERLACEMETHOD_VDPAU_TEMPORAL , 16310)); entries.push_back(make_pair(VS_INTERLACEMETHOD_VDPAU_BOB , 16021)); - entries.push_back(make_pair(VS_INTERLACEMETHOD_VDPAU_TEMPORAL_SPATIAL_HALF, 33085)); - entries.push_back(make_pair(VS_INTERLACEMETHOD_VDPAU_TEMPORAL_HALF , 33084)); + entries.push_back(make_pair(VS_INTERLACEMETHOD_VDPAU_TEMPORAL_SPATIAL_HALF, 16318)); + entries.push_back(make_pair(VS_INTERLACEMETHOD_VDPAU_TEMPORAL_HALF , 16317)); entries.push_back(make_pair(VS_INTERLACEMETHOD_VDPAU_INVERSE_TELECINE , 16314)); /* remove unsupported methods */ diff --git a/xbmc/lib/libPython/xbmcmodule/player.cpp b/xbmc/lib/libPython/xbmcmodule/player.cpp index 8317304738..092b022c94 100644 --- a/xbmc/lib/libPython/xbmcmodule/player.cpp +++ b/xbmc/lib/libPython/xbmcmodule/player.cpp @@ -304,7 +304,7 @@ namespace PYXBMC // Player_IsPlaying PyDoc_STRVAR(isPlaying__doc__, - "isPlayingAudio() -- returns True is xbmc is playing a file."); + "isPlaying() -- returns True is xbmc is playing a file."); PyObject* Player_IsPlaying(PyObject *self, PyObject *args) { |