From 5b541cc9fb4b784ffd7a99e583356d70c8966c9c Mon Sep 17 00:00:00 2001
From: bopol <bopol@e.email>
Date: Sat, 15 Feb 2020 14:53:05 +0100
Subject: [PATCH] resolve merge conflicts
---
app/src/main/res/values/settings_keys.xml | 6 +++---
app/src/main/res/values/strings.xml | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml
index e652f24ae..05a7416f0 100644
--- a/app/src/main/res/values/settings_keys.xml
+++ b/app/src/main/res/values/settings_keys.xml
@@ -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>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 622b43bfd..a5f1cb345 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -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="choose_instance_prompt">Choose an instance</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>
</resources>