Sulkta-OSS/straw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2016-02-22 19:16:57 +01:00
commit 8126fdcd15
9 changed files with 259 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/res/values/settings_keys.xml
View file

@ -3,6 +3,7 @@
<!-- Categories -->
<string name="settings_category_video_audio">settings_category_video_audio</string>
<string name="settings_category_appearance">settings_category_appearance</string>
<string name="settings_content_options">settings_content_options</string>
<string name="settings_category_other">settings_category_other</string>
<!-- Key values -->
<string name="download_path_key">download_path</string>
@ -207,5 +208,6 @@
<item>日本語</item>
<item>한국어</item>
</string-array>
<string name="show_age_restricted_content">show_age_restricted_content</string>
<string name="use_tor_key">use_tor</string>
</resources>

3
app/src/main/res/values/strings.xml
View file

@ -74,6 +74,9 @@
<string name="background_player_playing_toast">Playing in background</string>
<string name="c3s_url" translatable="false">https://www.c3s.cc/</string>
<string name="play_btn_text">Play</string>
<string name="content">Content</string>
<string name="show_age_restricted_content_title">Show age restricted content</string>
<string name="video_is_age_restricted">Video is Age restricted. Enable age restricted videos in the settings first.</string>
<!-- error strings -->
<string name="general_error">Error</string>

16
app/src/main/res/xml/settings.xml
View file

@ -63,8 +63,8 @@
</PreferenceCategory>
<PreferenceCategory
android:key="@string/settings_category_other"
android:title="@string/settings_category_other_title"
android:key="@string/settings_content_options"
android:title="@string/content"
android:textAllCaps="true">
<ListPreference
@ -75,6 +75,18 @@
android:entryValues="@array/language_codes"
android:defaultValue="@string/default_language_value" />
<CheckBoxPreference
android:key="@string/show_age_restricted_content"
android:title="@string/show_age_restricted_content_title"
android:defaultValue="false"/>
</PreferenceCategory>
<PreferenceCategory
android:key="@string/settings_category_other"
android:title="@string/settings_category_other_title"
android:textAllCaps="true">
<EditTextPreference
android:key="@string/download_path_key"
android:title="@string/download_path_title"