baalajimaestro/NewPipe
1
0
Fork 0
Code Issues Pull requests Projects Releases 7 Packages Wiki Activity

resolve merge conflicts

Browse source
This commit is contained in:
bopol 2020-02-15 14:53:05 +01:00
parent ea54520e0b
commit 5b541cc9fb
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -347,7 +347,7 @@
<item>ko</item> <item>ko</item>
</string-array> </string-array>
<string-array name="language_names" translatable="false"> <string-array name="language_names" translatable="false">
<item>@string/system_default</item> <item>@string/systems_language</item>
<item>Afrikaans</item> <item>Afrikaans</item>
<item>Azərbaycan</item> <item>Azərbaycan</item>
<item>Bahasa Indonesia</item> <item>Bahasa Indonesia</item>
@ -429,7 +429,7 @@
<string-array name="country_names" translatable="false"> <string-array name="country_names" translatable="false">
<item>@string/system_default</item> <item>@string/systems_language</item>
<item>Afghanistan</item> <item>Afghanistan</item>
<item>Aland Islands</item> <item>Aland Islands</item>
<item>Albania</item> <item>Albania</item>
@ -997,7 +997,7 @@
<item>zh-tw</item> <item>zh-tw</item>
</string-array> </string-array>
<string-array name="app_language_name" translatable="false"> <string-array name="app_language_name" translatable="false">
<item>@string/system_default</item> <item>@string/systems_language</item>
<item>العربية</item> <item>العربية</item>
<item>Azərbaycan dili</item> <item>Azərbaycan dili</item>
<item>Asturianu</item> <item>Asturianu</item>

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

@ -591,6 +591,6 @@
<string name="downloads_storage_use_saf_summary">The Storage Access Framework allows downloads to an external SD card.\nNote: some devices are not compatible</string> <string name="downloads_storage_use_saf_summary">The Storage Access Framework allows downloads to an external SD card.\nNote: some devices are not compatible</string>
<string name="choose_instance_prompt">Choose an instance</string> <string name="choose_instance_prompt">Choose an instance</string>
<string name="app_language_title">App language</string> <string name="app_language_title">App language</string>
<string name="system_default">System default</string> <string name="systems_language">System default</string>
<string name="dynamic_seek_duration_description">%s seconds</string> <string name="dynamic_seek_duration_description">%s seconds</string>
</resources> </resources>