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

resolve merge conflicts

Browse source
This commit is contained in:
bopol 2020-02-15 14:53:05 +01:00
parent c2524bb98c
commit 55fbeb7e28
2 changed files with 4 additions and 4 deletions
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>
</string-array>
<string-array name="language_names" translatable="false">
<item>@string/system_default</item>
<item>@string/systems_language</item>
<item>Afrikaans</item>
<item>Azərbaycan</item>
<item>Bahasa Indonesia</item>
@ -429,7 +429,7 @@
<string-array name="country_names" translatable="false">
<item>@string/system_default</item>
<item>@string/systems_language</item>
<item>Afghanistan</item>
<item>Aland Islands</item>
<item>Albania</item>
@ -997,7 +997,7 @@
<item>zh-tw</item>
</string-array>
<string-array name="app_language_name" translatable="false">
<item>@string/system_default</item>
<item>@string/systems_language</item>
<item>العربية</item>
<item>Azərbaycan dili</item>
<item>Asturianu</item>