diff --git a/app/src/foss/res/values-de/values.xml b/app/src/foss/res/values-de/strings.xml
similarity index 51%
rename from app/src/foss/res/values-de/values.xml
rename to app/src/foss/res/values-de/strings.xml
index ee26b93e..689029c6 100644
--- a/app/src/foss/res/values-de/values.xml
+++ b/app/src/foss/res/values-de/strings.xml
@@ -1,14 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string-array name="pref_map_provider_names">
-        <item>OpenStreetMap (Mapbox)</item>
-    </string-array>
-    <string-array name="pref_search_provider_names">
-        <item>OpenStreetMap (Mapbox)</item>
-    </string-array>
-    <string-array name="pref_search_provider_values" tranlatable="false">
-        <item>mapbox</item>
-    </string-array>
     <string name="donations_info" formatted="false">Findest du EVMap nützlich? Unterstütze die Weiterentwicklung der App mit einer Spende an den Entwickler.</string>
     <string name="donate_paypal">Mit PayPal spenden</string>
     <string name="data_sources_hint">Die Kartendaten für die App stammen von OpenStreetMap (Mapbox).</string>
diff --git a/app/src/foss/res/values/arrays.xml b/app/src/foss/res/values/arrays.xml
new file mode 100644
index 00000000..caa9ea9e
--- /dev/null
+++ b/app/src/foss/res/values/arrays.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="pref_map_provider_names">
+        <item>@string/pref_map_provider_osm_mapbox</item>
+    </string-array>
+    <string-array name="pref_map_provider_values" translatable="false">
+        <item>mapbox</item>
+    </string-array>
+    <string-array name="pref_search_provider_names">
+        <item>@string/pref_search_provider_osm_mapbox</item>
+    </string-array>
+    <string-array name="pref_search_provider_values" translatable="false">
+        <item>mapbox</item>
+    </string-array>
+</resources>
\ No newline at end of file
diff --git a/app/src/foss/res/values/donottranslate.xml b/app/src/foss/res/values/donottranslate.xml
new file mode 100644
index 00000000..1283d53f
--- /dev/null
+++ b/app/src/foss/res/values/donottranslate.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="pref_search_provider_default" translatable="false">mapbox</string>
+    <string name="pref_map_provider_default" translatable="false">mapbox</string>
+    <string name="paypal_link" translatable="false">https://paypal.me/johan98</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/foss/res/values/strings.xml b/app/src/foss/res/values/strings.xml
new file mode 100644
index 00000000..a1a9f5c6
--- /dev/null
+++ b/app/src/foss/res/values/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="donations_info" formatted="false">Do you find EVMap useful? Support its development by sending a donation to the developer.</string>
+    <string name="donate_paypal">Donate with PayPal</string>
+    <string name="data_sources_hint">Map data in the app is provided by OpenStreetMap (Mapbox).</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/foss/res/values/values.xml b/app/src/foss/res/values/values.xml
deleted file mode 100644
index db4f4609..00000000
--- a/app/src/foss/res/values/values.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string-array name="pref_map_provider_names">
-        <item>OpenStreetMap (Mapbox)</item>
-    </string-array>
-    <string-array name="pref_map_provider_values" tranlatable="false">
-        <item>mapbox</item>
-    </string-array>
-    <string-array name="pref_search_provider_names">
-        <item>OpenStreetMap (Mapbox)</item>
-    </string-array>
-    <string-array name="pref_search_provider_values" tranlatable="false">
-        <item>mapbox</item>
-    </string-array>
-    <string name="pref_search_provider_default" translatable="false">mapbox</string>
-    <string name="pref_map_provider_default" translatable="false">mapbox</string>
-    <string name="donations_info" formatted="false">Do you find EVMap useful? Support its development by sending a donation to the developer.</string>
-    <string name="donate_paypal">Donate with PayPal</string>
-    <string name="paypal_link" translatable="false">https://paypal.me/johan98</string>
-    <string name="data_sources_hint">Map data in the app is provided by OpenStreetMap (Mapbox).</string>
-</resources>
\ No newline at end of file
diff --git a/app/src/google/res/values-de/values.xml b/app/src/google/res/values-de/strings.xml
similarity index 90%
rename from app/src/google/res/values-de/values.xml
rename to app/src/google/res/values-de/strings.xml
index d003c1cd..5c8595c3 100644
--- a/app/src/google/res/values-de/values.xml
+++ b/app/src/google/res/values-de/strings.xml
@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string-array name="pref_map_provider_names">
-        <item>Google Maps</item>
-        <item>OpenStreetMap (Mapbox)</item>
-    </string-array>
-    <string-array name="pref_search_provider_names">
-        <item>Google Maps</item>
-        <item>OpenStreetMap (Mapbox)</item>
-    </string-array>
     <string name="donations_info" formatted="false">Findest du EVMap nützlich? Unterstütze die Weiterentwicklung der App mit einer Spende an den Entwickler.\n\nGoogle zieht von der Spende 15% Gebühren ab.</string>
     <string name="auto_location_service">EVMap läuft unter Android Auto und nutzt dafür deinen Standort.</string>
     <string name="auto_no_chargers_found">Keine Ladestationen in der Nähe gefunden</string>
diff --git a/app/src/google/res/values/arrays.xml b/app/src/google/res/values/arrays.xml
new file mode 100644
index 00000000..c0dfa14a
--- /dev/null
+++ b/app/src/google/res/values/arrays.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="pref_map_provider_names">
+        <item>@string/pref_map_provider_google_maps</item>
+        <item>@string/pref_map_provider_osm_mapbox</item>
+    </string-array>
+    <string-array name="pref_map_provider_values" translatable="false">
+        <item>google</item>
+        <item>mapbox</item>
+    </string-array>
+    <string-array name="pref_search_provider_names">
+        <item>@string/pref_search_provider_google_maps</item>
+        <item>@string/pref_search_provider_osm_mapbox</item>
+    </string-array>
+    <string-array name="pref_search_provider_values" translatable="false">
+        <item>google</item>
+        <item>mapbox</item>
+    </string-array>
+</resources>
\ No newline at end of file
diff --git a/app/src/google/res/values/donottranslate.xml b/app/src/google/res/values/donottranslate.xml
new file mode 100644
index 00000000..3558600b
--- /dev/null
+++ b/app/src/google/res/values/donottranslate.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="pref_map_provider_default" translatable="false">google</string>
+    <string name="pref_search_provider_default" translatable="false">mapbox</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/google/res/values/values.xml b/app/src/google/res/values/strings.xml
similarity index 78%
rename from app/src/google/res/values/values.xml
rename to app/src/google/res/values/strings.xml
index c8a2538e..c85e499a 100644
--- a/app/src/google/res/values/values.xml
+++ b/app/src/google/res/values/strings.xml
@@ -1,23 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string-array name="pref_map_provider_names">
-        <item>Google Maps</item>
-        <item>OpenStreetMap (Mapbox)</item>
-    </string-array>
-    <string-array name="pref_map_provider_values" tranlatable="false">
-        <item>google</item>
-        <item>mapbox</item>
-    </string-array>
-    <string-array name="pref_search_provider_names">
-        <item>Google Maps</item>
-        <item>OpenStreetMap (Mapbox)</item>
-    </string-array>
-    <string-array name="pref_search_provider_values" tranlatable="false">
-        <item>google</item>
-        <item>mapbox</item>
-    </string-array>
-    <string name="pref_map_provider_default" translatable="false">google</string>
-    <string name="pref_search_provider_default" translatable="false">mapbox</string>
     <string name="donations_info" formatted="false">Do you find EVMap useful? Support its development by sending a donation to the developer.\n\nGoogle takes 15% off every donation.</string>
     <string name="auto_location_service">EVMap is running on Android Auto and using your location.</string>
     <string name="auto_no_chargers_found">No nearby chargers found</string>
diff --git a/app/src/main/res/values-de/arrays.xml b/app/src/main/res/values-de/arrays.xml
deleted file mode 100644
index 62f430a6..00000000
--- a/app/src/main/res/values-de/arrays.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string-array name="pref_language_names">
-        <item>Gerätesprache verwenden</item>
-        <item>Englisch</item>
-        <item>Deutsch</item>
-    </string-array>
-    <string-array name="pref_darkmode_names">
-        <item>Geräteeinstellung verwenden</item>
-        <item>immer an</item>
-        <item>immer aus</item>
-    </string-array>
-    <string-array name="pref_data_source_names">
-        <item>GoingElectric.de</item>
-        <item>Open Charge Map</item>
-    </string-array>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 0e67a805..75c17f92 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -208,20 +208,6 @@
     <string name="license">Lizenz</string>
     <string name="settings_charger_data">Ladesäulen</string>
     <string name="pref_data_source">Datenquelle</string>
-    <string-array name="pref_chargeprice_currency_names">
-        <item>Schweizer Franken (CHF)</item>
-        <item>Tschechische Krone (CZK)</item>
-        <item>Dänische Krone (DKK)</item>
-        <item>Euro (EUR)</item>
-        <item>Britisches Pfund (GBP)</item>
-        <item>Kroatische Kuna (HRK)</item>
-        <item>Ungarischer Forint (HUF)</item>
-        <item>Isländische Krone (ISK)</item>
-        <item>Norwegische Krone (NOK)</item>
-        <item>Polnischer Złoty (PLN)</item>
-        <item>Schwedische Krone (SEK)</item>
-        <item>US-Dollar (USD)</item>
-    </string-array>
     <plurals name="chargeprice_some_tariffs_selected">
         <item quantity="one">%d Tarif ausgewählt</item>
         <item quantity="other">%d Tarife ausgewählt</item>
@@ -262,4 +248,26 @@
     <string name="pref_map_rotate_gestures_off">Karte bleibt fest nach Norden ausgerichtet</string>
     <string name="refresh_live_data">Echtzeitstatus aktualisieren</string>
     <string name="autocomplete_connection_error">Vorschläge konnten nicht geladen werden</string>
+    <string name="pref_language_device_default">Gerätesprache verwenden</string>
+    <string name="pref_language_en">Englisch</string>
+    <string name="pref_language_de">Deutsch</string>
+    <string name="pref_darkmode_device_default">Geräteeinstellung verwenden</string>
+    <string name="pref_darkmode_always_on">immer an</string>
+    <string name="pref_darkmode_always_off">immer aus</string>
+    <string name="pref_chargeprice_currency_chf">Schweizer Franken (CHF)</string>
+    <string name="pref_chargeprice_currency_czk">Tschechische Krone (CZK)</string>
+    <string name="pref_chargeprice_currency_dkk">Dänische Krone (DKK)</string>
+    <string name="pref_chargeprice_currency_eur">Euro (EUR)</string>
+    <string name="pref_chargeprice_currency_gbp">Britisches Pfund (GBP)</string>
+    <string name="pref_chargeprice_currency_hrk">Kroatische Kuna (HRK)</string>
+    <string name="pref_chargeprice_currency_huf">Ungarischer Forint (HUF)</string>
+    <string name="pref_chargeprice_currency_isk">Isländische Krone (ISK)</string>
+    <string name="pref_chargeprice_currency_nok">Norwegische Krone (NOK)</string>
+    <string name="pref_chargeprice_currency_pln">Polnischer Złoty (PLN)</string>
+    <string name="pref_chargeprice_currency_sek">Schwedische Krone (SEK)</string>
+    <string name="pref_chargeprice_currency_usd">US-Dollar (USD)</string>
+    <string name="pref_map_provider_google_maps">Google Maps</string>
+    <string name="pref_map_provider_osm_mapbox">OpenStreetMap (Mapbox)</string>
+    <string name="pref_search_provider_google_maps">Google Maps</string>
+    <string name="pref_search_provider_osm_mapbox">OpenStreetMap (Mapbox)</string>
 </resources>
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 8f7bfad6..9e495759 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string-array name="pref_language_names">
-        <item>Device default</item>
-        <item>English</item>
-        <item>German</item>
+        <item>@string/pref_language_device_default</item>
+        <item>@string/pref_language_en</item>
+        <item>@string/pref_language_de</item>
     </string-array>
-    <string-array name="pref_language_values" tranlatable="false">
+    <string-array name="pref_language_values" translatable="false">
         <item>default</item>
         <item>en</item>
         <item>de</item>
     </string-array>
     <string-array name="pref_darkmode_names">
-        <item>Device default</item>
-        <item>always on</item>
-        <item>always off</item>
+        <item>@string/pref_darkmode_device_default</item>
+        <item>@string/pref_darkmode_always_on</item>
+        <item>@string/pref_darkmode_always_off</item>
     </string-array>
-    <string-array name="pref_darkmode_values" tranlatable="false">
+    <string-array name="pref_darkmode_values" translatable="false">
         <item>default</item>
         <item>on</item>
         <item>off</item>
     </string-array>
     <string-array name="pref_chargeprice_currency_names">
-        <item>Swiss franc (CHF)</item>
-        <item>Czech koruna (CZK)</item>
-        <item>Danish krone (DKK)</item>
-        <item>Euro (EUR)</item>
-        <item>Pound sterling (GBP)</item>
-        <item>Croatian kuna (HRK)</item>
-        <item>Hungarian forint (HUF)</item>
-        <item>Icelandic króna (ISK)</item>
-        <item>Norwegian krone (NOK)</item>
-        <item>Polish złoty (PLN)</item>
-        <item>Swedish krona (SEK)</item>
-        <item>US dollar (USD)</item>
+        <item>@string/pref_chargeprice_currency_chf</item>
+        <item>@string/pref_chargeprice_currency_czk</item>
+        <item>@string/pref_chargeprice_currency_dkk</item>
+        <item>@string/pref_chargeprice_currency_eur</item>
+        <item>@string/pref_chargeprice_currency_gbp</item>
+        <item>@string/pref_chargeprice_currency_hrk</item>
+        <item>@string/pref_chargeprice_currency_huf</item>
+        <item>@string/pref_chargeprice_currency_isk</item>
+        <item>@string/pref_chargeprice_currency_nok</item>
+        <item>@string/pref_chargeprice_currency_pln</item>
+        <item>@string/pref_chargeprice_currency_sek</item>
+        <item>@string/pref_chargeprice_currency_usd</item>
     </string-array>
-    <string-array name="pref_chargeprice_currency_values" donottranslate="true">
+    <string-array name="pref_chargeprice_currency_values" translatable="false">
         <item>CHF</item>
         <item>CZK</item>
         <item>DKK</item>
@@ -49,8 +49,8 @@
         <item>USD</item>
     </string-array>
     <string-array name="pref_data_source_names">
-        <item>GoingElectric.de</item>
-        <item>Open Charge Map</item>
+        <item>@string/data_source_goingelectric</item>
+        <item>@string/data_source_openchargemap</item>
     </string-array>
     <string-array name="pref_data_source_values" tranlatable="false">
         <item>goingelectric</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fe726142..bce117c8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -247,4 +247,26 @@
     <string name="pref_map_rotate_gestures_off">Map will be fixed to north-up</string>
     <string name="refresh_live_data">refresh real-time status</string>
     <string name="autocomplete_connection_error">Suggestions could not be loaded</string>
+    <string name="pref_language_device_default">Device default</string>
+    <string name="pref_language_en">English</string>
+    <string name="pref_language_de">German</string>
+    <string name="pref_darkmode_device_default">Device default</string>
+    <string name="pref_darkmode_always_on">always on</string>
+    <string name="pref_darkmode_always_off">always off</string>
+    <string name="pref_chargeprice_currency_chf">Swiss franc (CHF)</string>
+    <string name="pref_chargeprice_currency_czk">Czech koruna (CZK)</string>
+    <string name="pref_chargeprice_currency_dkk">Danish krone (DKK)</string>
+    <string name="pref_chargeprice_currency_eur">Euro (EUR)</string>
+    <string name="pref_chargeprice_currency_gbp">Pound sterling (GBP)</string>
+    <string name="pref_chargeprice_currency_hrk">Croatian kuna (HRK)</string>
+    <string name="pref_chargeprice_currency_huf">Hungarian forint (HUF)</string>
+    <string name="pref_chargeprice_currency_isk">Icelandic króna (ISK)</string>
+    <string name="pref_chargeprice_currency_nok">Norwegian krone (NOK)</string>
+    <string name="pref_chargeprice_currency_pln">Polish złoty (PLN)</string>
+    <string name="pref_chargeprice_currency_sek">Swedish krona (SEK)</string>
+    <string name="pref_chargeprice_currency_usd">US dollar (USD)</string>
+    <string name="pref_map_provider_google_maps">Google Maps</string>
+    <string name="pref_map_provider_osm_mapbox">OpenStreetMap (Mapbox)</string>
+    <string name="pref_search_provider_google_maps">Google Maps</string>
+    <string name="pref_search_provider_osm_mapbox">OpenStreetMap (Mapbox)</string>
 </resources>