Merge remote-tracking branch 'GitHub/master' into develop
# Conflicts: # app/src/main/res/values/strings.xml # app/src/main/res/xml/pref_general.xml
This commit is contained in:
commit
341b62fa57
@ -60,10 +60,11 @@
|
||||
<string name="pref_title_peertube_server">PeerTube Server</string>
|
||||
<string name="pref_title_background_play">Background Playback</string>
|
||||
<string name="pref_description_background_play">If enabled, continues to play video in background.</string>
|
||||
<string name="pref_language_app">Application Language</string>
|
||||
<string name="pref_description_language_app">Select language for application interface. Restart app for change to take effect.</string>
|
||||
<string name="pref_title_back_pause">Pause on back button</string>
|
||||
<string name="pref_description_back_pause">Pause background play when pressing back during video playback.</string>
|
||||
|
||||
<string name="pref_language_app">Application Language</string>
|
||||
<string name="pref_description_language_app">Select language for application interface. Restart app for change to take effect.</string>
|
||||
<!-- languages -->
|
||||
<string name="ab">Abkhazian</string>
|
||||
<string name="aa">Afar</string>
|
||||
|
@ -30,6 +30,12 @@
|
||||
android:summary="@string/pref_description_back_pause"
|
||||
android:title="@string/pref_title_back_pause" />
|
||||
|
||||
<SwitchPreference
|
||||
android:defaultValue="true"
|
||||
android:key="pref_back_pause"
|
||||
android:summary="@string/pref_description_back_pause"
|
||||
android:title="@string/pref_title_back_pause" />
|
||||
|
||||
<ListPreference
|
||||
android:defaultValue="@array/empty_array"
|
||||
android:entries="@array/supportedLanguagesArray"
|
||||
|
Loading…
Reference in New Issue
Block a user