Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2017-04-08 21:47:50 +02:00
commit 83f4db59e2
6 changed files with 46 additions and 4 deletions

View file

@ -22,6 +22,14 @@
<item>144p</item>
</string-array>
<string name="preferred_video_format_key" translatable="false">preferrfed_video_format</string>
<string name="preferred_video_format_default" translatable="false">WebM</string>
<string-array name="video_format_list">
<item>WebM</item>
<item>MPEG-4</item>
<item>3GPP</item>
</string-array>
<string name="show_play_with_kodi_key" translatable="false">show_play_with_kodi</string>
<string name="theme_key" translatable="false">theme</string>

View file

@ -45,6 +45,7 @@
<string name="show_play_with_kodi_summary">Display an option to play a video via Kodi media center.</string>
<string name="play_audio">Audio</string>
<string name="default_audio_format_title">Default audio format</string>
<string name="preferred_video_format_title">Preferred video format</string>
<string name="webm_description">WebM — free format</string>
<string name="m4a_description">m4a — better quality</string>
<string name="theme_title">Theme</string>

View file

@ -25,6 +25,13 @@
android:entryValues="@array/resolution_list"
android:defaultValue="@string/default_resolution_value"/>
<ListPreference
android:key="@string/preferred_video_format_key"
android:title="@string/preferred_video_format_title"
android:entries="@array/video_format_list"
android:entryValues="@array/video_format_list"
android:defaultValue="@string/preferred_video_format_default"/>
<ListPreference
android:key="@string/default_audio_format_key"
android:title="@string/default_audio_format_title"