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

Merge branch 'dev' into unhook-save-restore

Browse source
This commit is contained in:
Tobias Groza 2020-02-23 00:19:44 +01:00 • committed by GitHub
commit a30928c8d6
68 changed files with 1170 additions and 1332 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -31,6 +31,8 @@
<string name="seek_duration_key" translatable="false">seek_duration</string>
<string name="seek_duration_default_value" translatable="false">10000</string>
<string-array name="seek_duration_description" translatable="false">
<!-- They are overridden in VideoAudioSettingsFragment.java if the translation
(dynamic_seek_duration_description) exist. Otherwise this array is picked-->
<item>5 seconds</item>
<item>10 seconds</item>
<item>15 seconds</item>
@ -161,8 +163,6 @@
<string name="show_comments_key" translatable="false">show_comments</string>
<string name="stream_info_selected_tab_key" translatable="false">stream_info_selected_tab</string>
<string name="show_hold_to_append_key" translatable="false">show_hold_to_append</string>
<string name="default_language_value">en</string>
<string name="default_country_value">GB</string>
<string name="content_language_key" translatable="false">content_language</string>
<string name="peertube_instance_setup_key" translatable="false">peertube_instance_setup</string>
<string name="peertube_selected_instance_key" translatable="false">peertube_selected_instance</string>
@ -266,8 +266,11 @@
<string name="update_app_key" translatable="false">update_app_key</string>
<string name="update_pref_screen_key" translatable="false">update_pref_screen_key</string>
<!-- Localizations -->
<string name="default_localization_key" translatable="false">system</string>
<!-- alternatively, load these from some local android data store -->
<string-array name="language_codes" translatable="false">
<item>@string/default_localization_key</item>
<item>af</item>
<item>az</item>
<item>id</item>
@ -347,6 +350,7 @@
<item>ko</item>
</string-array>
<string-array name="language_names" translatable="false">
<item>@string/systems_language</item>
<item>Afrikaans</item>
<item>Azərbaycan</item>
<item>Bahasa Indonesia</item>
@ -428,6 +432,7 @@
<string-array name="country_names" translatable="false">
<item>@string/systems_language</item>
<item>Afghanistan</item>
<item>Aland Islands</item>
<item>Albania</item>
@ -678,6 +683,7 @@
</string-array>
<string-array name="country_codes" translatable="false">
<item>@string/default_localization_key</item>
<item>AF</item>
<item>AX</item>
<item>AL</item>
@ -929,7 +935,7 @@
<!--The next two arrays are set to change the app language-->
<string-array name="app_language_code" translatable="false">
<item>system</item>
<item>@string/default_localization_key</item>
<item>ar</item>
<item>az</item>
<item>ast</item>
@ -989,8 +995,8 @@
<item>uk</item>
<item>ur</item>
<item>vi</item>
<item>zh</item>
<item>zh-hans</item>
<item>zh-cn</item>
<item>zh-hk</item>
<item>zh-tw</item>
</string-array>
<string-array name="app_language_name" translatable="false">
@ -1054,9 +1060,9 @@
<item>українська мова</item>
<item>اردو</item>
<item>Tiếng Việt</item>
<item>官话</item>
<item>简化字</item>
<item>臺灣華語</item>
<item>简体中文</item>
<item>繁體中文（廣東話）</item>
<item>正體中文</item>
</string-array>
<!-- Limit mobile data usage -->