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

merged upstream/dev, changes for peertube support

Browse source
This commit is contained in:
Ritvik Saraf 2019-03-10 01:02:25 +05:30
commit d90b1ca5be
187 changed files with 6831 additions and 3208 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -144,6 +144,7 @@
<string name="default_country_value">GB</string>
<string name="content_language_key" translatable="false">content_language</string>
<string name="peertube_instance_url_key" translatable="false">peertube_instance_url</string>
<string name="peertube_instance_url_help" translatable="true">Find the instance that best suits you on https://instances.joinpeertube.org</string>
<string name="peertube_instance_name_key" translatable="false">peertube_instance_name</string>
<string name="content_country_key" translatable="false">content_country</string>
<string name="show_age_restricted_content" translatable="false">show_age_restricted_content</string>
@ -225,6 +226,10 @@
<item>@string/always_ask_open_action_key</item>
</string-array>
<!-- Updates -->
<string name="update_app_key" translatable="false">update_app_key</string>
<string name="update_pref_screen_key" translatable="false">update_pref_screen_key</string>
<!-- alternatively, load these from some local android data store -->
<string-array name="language_codes" translatable="false">
<item>af</item>