Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-11-09 08:16:47 +01:00
commit 586bad345c
5 changed files with 70 additions and 31 deletions

View file

@ -46,7 +46,7 @@
<item>Audio</item>
</string-array>
<string name="nextVideoTitle">Nächstes Video</string>
<string name="showNextVideoTitle">Zeige \"Nächstes Video\" Auswahl.</string>
<string name="showNextAndSimilarTitle">Zeige nächstes und änliche Videos.</string>
<string name="urlNotSupportedText">Url wird nicht unterstützt.</string>
<string name="showSimilarVideosButtonText">Ähnliche Videos</string>
</resources>

View file

@ -46,7 +46,7 @@
<item>Audio</item>
</string-array>
<string name="nextVideoTitle">Next Video</string>
<string name="showNextVideoTitle">Show \"Next video\" item.</string>
<string name="showNextAndSimilarTitle">Show next and similar Videos.</string>
<string name="urlNotSupportedText">Url not Supported.</string>
<string name="showSimilarVideosButtonText">Similar Videos</string>
<string name="contentCountryTitle">Video Content Country</string>

View file

@ -48,13 +48,15 @@
<CheckBoxPreference
android:key="@string/showNextVideo"
android:title="@string/showNextVideoTitle"
android:title="@string/showNextAndSimilarTitle"
android:defaultValue="true" />
<!-- This function is not yet available
<ListPreference
android:key="@string/contentCountry"
android:title="@string/contentCountryTitle"
android:entries="@array/countryNames"
android:entryValues="@array/countryCodes"
android:defaultValue="" /> <!-- default will include no country code in URL-->
android:defaultValue="" /> <!- default will include no country code in URL-->
-->
</PreferenceScreen>