aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartijn Kaijser <machine.sanctum@gmail.com>2014-02-02 02:35:04 -0800
committerMartijn Kaijser <machine.sanctum@gmail.com>2014-02-02 02:35:04 -0800
commitf790149d106b3ad852d21309838c04c984d39e7f (patch)
tree4ab5f76bbb60231977563aa0e68dd3c212bc0ae2
parent86830e76034dcbf0fc8fb367faf48982e9051ec6 (diff)
parent91e088a33fa8ab712b1ea7dc73e9e7a3e1954e7b (diff)
Merge pull request #4129 from MartijnKaijser/settings_subtitles
shuffle subtitle settings
-rwxr-xr-xlanguage/English/strings.po4
-rw-r--r--system/settings/settings.xml174
2 files changed, 90 insertions, 88 deletions
diff --git a/language/English/strings.po b/language/English/strings.po
index 37ac8d79ce..76dd3126ac 100755
--- a/language/English/strings.po
+++ b/language/English/strings.po
@@ -10589,7 +10589,7 @@ msgstr ""
#: system/settings/settings.xml
msgctxt "#21366"
-msgid "Subtitle folder"
+msgid "Custom subtitle folder"
msgstr ""
msgctxt "#21367"
@@ -11003,7 +11003,7 @@ msgstr ""
#: system/settings/settings.xml
msgctxt "#21460"
-msgid "Subtitle location"
+msgid "Subtitle location on screen"
msgstr ""
#: system/settings/settings.xml
diff --git a/system/settings/settings.xml b/system/settings/settings.xml
index 1af057af32..c7ef591c65 100644
--- a/system/settings/settings.xml
+++ b/system/settings/settings.xml
@@ -173,14 +173,6 @@
</constraints>
<control type="list" format="string" />
</setting>
- <setting id="locale.subtitlelanguage" type="string" label="286" help="36120">
- <level>1</level>
- <default>original</default>
- <constraints>
- <options>streamlanguages</options>
- </constraints>
- <control type="list" format="string" />
- </setting>
</group>
</category>
<category id="filelists" label="14081" help="36121">
@@ -693,6 +685,92 @@
</category>
<category id="subtitles" label="287" help="36184">
<group id="1">
+ <setting id="locale.subtitlelanguage" type="string" label="286" help="36120">
+ <level>1</level>
+ <default>original</default>
+ <constraints>
+ <options>streamlanguages</options>
+ </constraints>
+ <control type="list" format="string" />
+ </setting>
+ </group>
+ <group id="2">
+ <setting id="subtitles.preferexternal" type="boolean" label="21600" help="21601">
+ <level>1</level>
+ <default>true</default>
+ <control type="toggle" />
+ </setting>
+ <setting id="subtitles.custompath" type="path" label="21366" help="36191">
+ <level>1</level>
+ <default></default>
+ <constraints>
+ <allowempty>true</allowempty>
+ <writable>false</writable>
+ <sources>
+ <source>videos</source>
+ </sources>
+ </constraints>
+ <control type="button" format="path">
+ <heading>657</heading>
+ </control>
+ </setting>
+ <setting id="subtitles.languages" type="list[string]" label="24111" help="24112">
+ <level>1</level>
+ <default>English</default>
+ <constraints>
+ <options>languages</options>
+ <delimiter>,</delimiter>
+ <minimum>1</minimum>
+ <maximum>3</maximum>
+ </constraints>
+ <control type="list" format="string">
+ <multiselect>true</multiselect>
+ </control>
+ </setting>
+ <setting id="subtitles.tv" type="addon" label="24116" help="24117">
+ <level>1</level>
+ <default>-</default>
+ <constraints>
+ <addontype>xbmc.subtitle.module</addontype>
+ <allowempty>true</allowempty>
+ </constraints>
+ <control type="button" format="addon" />
+ </setting>
+ <setting id="subtitles.movie" type="addon" label="24118" help="24119">
+ <level>1</level>
+ <default>-</default>
+ <constraints>
+ <addontype>xbmc.subtitle.module</addontype>
+ <allowempty>true</allowempty>
+ </constraints>
+ <control type="button" format="addon" />
+ </setting>
+ <setting id="subtitles.pauseonsearch" type="boolean" label="24105" help="">
+ <level>1</level>
+ <default>true</default>
+ <control type="toggle" />
+ </setting>
+ <setting id="subtitles.savetomoviefolder" type="boolean" label="24115" help="24106">
+ <level>1</level>
+ <default>true</default>
+ <control type="toggle" />
+ </setting>
+ </group>
+ <group id="3">
+ <setting id="subtitles.align" type="integer" label="21460" help="36192">
+ <level>1</level>
+ <default>0</default> <!-- SUBTITLE_ALIGN_MANUAL -->
+ <constraints>
+ <options>
+ <option label="21461">0</option> <!-- SUBTITLE_ALIGN_MANUAL -->
+ <option label="21462">1</option> <!-- SUBTITLE_ALIGN_BOTTOM_INSIDE -->
+ <option label="21463">2</option> <!-- SUBTITLE_ALIGN_BOTTOM_OUTSIDE -->
+ <option label="21464">3</option> <!-- SUBTITLE_ALIGN_TOP_INSIDE -->
+ <option label="21465">4</option> <!-- SUBTITLE_ALIGN_TOP_OUTSIDE -->
+ </options>
+ </constraints>
+ <control type="spinner" format="string" />
+ </setting>
<setting id="subtitles.font" type="string" label="14089" help="36185">
<level>1</level>
<default>arial.ttf</default>
@@ -767,85 +845,9 @@
<control type="toggle" />
</setting>
</group>
- <group id="2">
- <setting id="subtitles.savetomoviefolder" type="boolean" label="24115" help="24106">
- <level>1</level>
- <default>true</default>
- <control type="toggle" />
- </setting>
- <setting id="subtitles.pauseonsearch" type="boolean" label="24105" help="">
- <level>1</level>
- <default>true</default>
- <control type="toggle" />
- </setting>
- <setting id="subtitles.languages" type="list[string]" label="24111" help="24112">
- <level>1</level>
- <default>English</default>
- <constraints>
- <options>languages</options>
- <delimiter>,</delimiter>
- <minimum>1</minimum>
- <maximum>3</maximum>
- </constraints>
- <control type="list" format="string">
- <multiselect>true</multiselect>
- </control>
- </setting>
- <setting id="subtitles.tv" type="addon" label="24116" help="24117">
- <level>1</level>
- <default>-</default>
- <constraints>
- <addontype>xbmc.subtitle.module</addontype>
- <allowempty>true</allowempty>
- </constraints>
- <control type="button" format="addon" />
- </setting>
- <setting id="subtitles.movie" type="addon" label="24118" help="24119">
- <level>1</level>
- <default>-</default>
- <constraints>
- <addontype>xbmc.subtitle.module</addontype>
- <allowempty>true</allowempty>
- </constraints>
- <control type="button" format="addon" />
- </setting>
- <setting id="subtitles.custompath" type="path" label="21366" help="36191">
- <level>1</level>
- <default></default>
- <constraints>
- <allowempty>true</allowempty>
- <writable>false</writable>
- <sources>
- <source>videos</source>
- </sources>
- </constraints>
- <control type="button" format="path">
- <heading>657</heading>
- </control>
- </setting>
- <setting id="subtitles.align" type="integer" label="21460" help="36192">
- <level>1</level>
- <default>0</default> <!-- SUBTITLE_ALIGN_MANUAL -->
- <constraints>
- <options>
- <option label="21461">0</option> <!-- SUBTITLE_ALIGN_MANUAL -->
- <option label="21462">1</option> <!-- SUBTITLE_ALIGN_BOTTOM_INSIDE -->
- <option label="21463">2</option> <!-- SUBTITLE_ALIGN_BOTTOM_OUTSIDE -->
- <option label="21464">3</option> <!-- SUBTITLE_ALIGN_TOP_INSIDE -->
- <option label="21465">4</option> <!-- SUBTITLE_ALIGN_TOP_OUTSIDE -->
- </options>
- </constraints>
- <control type="spinner" format="string" />
- </setting>
- <setting id="subtitles.preferexternal" type="boolean" label="21600" help="21601">
- <level>1</level>
- <default>true</default>
- <control type="toggle" />
- </setting>
- </group>
- <group id="3">
+ <group id="4">
<setting id="subtitles.stereoscopicdepth" type="integer" label="36545" help="36546">
- <level>0</level>
+ <level>1</level>
<default>0</default>
<constraints>
<minimum>0</minimum>