increase version code

Android Auto: show loading errors
2025-12-26 16:47:47 -05:00 · 2022-09-14 08:37:34 +02:00 · 2022-09-14 08:36:51 +02:00 · 2022-09-12 23:06:40 +02:00 · 2022-09-12 23:06:08 +02:00 · 2022-09-12 22:43:42 +02:00
73 changed files with 1426 additions and 642 deletions
--- a/_img/map_marker_charging.svg
+++ b/_img/map_marker_charging.svg
@@ -1,31 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<?xml version="1.0" encoding="utf-8"?><!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
-    viewBox="0 0 233.8 368.4" style="enable-background:new 0 0 233.8 368.4;" xml:space="preserve">
+	viewBox="0 0 233.8 368.4" style="enable-background:new 0 0 233.8 368.4;" xml:space="preserve">
 <style type="text/css">
 	.st0{fill:#FFFFFF;}
-	.st1{display:none;}
-	.st2{display:inline;fill:#802C27;}
-	.st3{fill:#808080;}
-	.st4{display:none;fill:#802C27;}
+	.st1{fill:#808080;}
 </style>
-    <g>
 	<g>
-		<g>
-			<path class="st0" d="M109.8,0h13.6c33.9,1.9,67.1,18.5,87.7,45.8c13.5,17.2,21,38.6,22.7,60.3v8.1c-0.8,42.1-27.7,76.6-51,109.4
-				c-26.2,37-50.4,77.3-57.1,122.9c-1.8,7.7,0.4,18.5-8.9,22c-2.2-1.7-4.7-3.1-6.2-5.4c-2.7-25.5-9.1-50.7-20-73.9
-				c-12.3-27.1-29.5-51.6-47-75.6C33,199,23,184.2,14.7,168.3c-13-23.8-17.9-51.9-12.5-78.6c4.4-21.1,15.4-40.6,30.6-55.7
-				C53.3,14,81.1,1.8,109.8,0z" />
-		</g>
-	</g>
-        <g class="st1">
-		<path class="st2" d="M107.2,74.1c18.9-4.8,40.4,5.5,47.7,23.7c6.1,14.5,1.9,32.5-9.9,42.9c-12.6,11.5-32.4,14-47.5,6
-			c-13.9-6.8-23-22.6-21.3-38.1C77.6,92,91.1,77.7,107.2,74.1z" />
-	</g>
+	<path class="st0" d="M117,367.4c-0.4-0.3-0.8-0.6-1.2-0.9c-1.6-1.2-3.1-2.3-4.2-3.7c-2.9-26.9-9.6-51.7-20.1-74
+		c-12.4-27.3-30.1-52.4-47.1-75.8c-8.7-12-19.8-27.9-28.8-45.2C2.3,143.6-2.1,115.9,3.2,89.9c4.3-20.4,15-40,30.3-55.2
+		C53.6,15.1,81.5,2.8,109.9,1l13.5,0c34.4,1.9,66.9,18.9,86.9,45.4c12.8,16.3,20.8,37.5,22.5,59.8l0,8
+		c-0.7,38.8-23.7,70.9-45.9,101.9c-1.7,2.3-3.3,4.6-5,6.9c-24.4,34.5-50.3,76.1-57.3,123.3c-0.5,2-0.7,4.3-0.9,6.5
+		C123.3,359,122.8,364.9,117,367.4z" />
+		<path class="st1" d="M123.3,2c34.1,1.9,66.3,18.8,86.2,45c12.6,16.1,20.5,37.1,22.3,59.1l0,8c-0.7,38.5-23.6,70.5-45.7,101.3
+		c-1.7,2.3-3.3,4.6-5,6.9c-24.5,34.6-50.5,76.3-57.4,123.7c-0.5,2.1-0.7,4.4-0.9,6.7c-0.5,5.9-1,11-5.8,13.4
+		c-0.2-0.2-0.5-0.4-0.7-0.5c-1.5-1.1-2.9-2-3.8-3.3c-2.9-26.9-9.7-51.8-20.1-74C80,261,62.3,235.8,45.2,212.4
+		c-8.7-11.9-19.8-27.8-28.8-45.1C3.3,143.3-1,115.9,4.2,90.1c4.2-20.2,14.9-39.6,30-54.7C54.2,16,81.7,3.8,109.9,2H123.3 M123.4,0
+		h-13.6c-28.7,1.8-56.5,14-77,34C17.6,49.1,6.6,68.6,2.2,89.7c-5.4,26.7-0.5,54.8,12.5,78.6C23,184.2,33,199,43.6,213.6
+		c17.5,24,34.7,48.5,47,75.6c10.9,23.2,17.3,48.4,20,73.9c1.5,2.3,4,3.7,6.2,5.4c9.3-3.5,7.1-14.3,8.9-22
+		c6.7-45.6,30.9-85.9,57.1-122.9c23.3-32.8,50.2-67.3,51-109.4v-8.1c-1.7-21.7-9.2-43.1-22.7-60.3C190.5,18.5,157.3,1.9,123.4,0
+		L123.4,0z" />
 </g>
-    <path class="st3" d="M90.9,57.3v68.2h18.6v55.8l43.4-74.4h-24.8l24.8-49.6H90.9z" />
-    <path class="st4" d="M159,85.3L159,85.3l-20.8-20.9l-5.9,5.9l11.8,11.8c-5.3,2-9,7.1-9,13.1c0,7.7,6.3,14,14,14c2,0,3.9-0.4,5.6-1.2
-	v40.4c0,3.1-2.5,5.6-5.6,5.6s-5.6-2.5-5.6-5.6v-25.2c0-6.2-5-11.2-11.2-11.2h-5.6V72.8c0-6.2-5-11.2-11.2-11.2H81.8
-	c-6.2,0-11.2,5-11.2,11.2v89.7h56.1v-42.1h8.4v28c0,7.7,6.3,14,14,14s14-6.3,14-14V95.2C163.1,91.3,161.6,87.8,159,85.3
-	 M149.1,100.8c-3.1,0-5.6-2.5-5.6-5.6c0-3.1,2.5-5.6,5.6-5.6s5.6,2.5,5.6,5.6C154.7,98.3,152.2,100.8,149.1,100.8 M93.1,145.6v-25.2
-	H81.8l22.4-42.1v28h11.2L93.1,145.6z" />
+	<path class="st1"
+		d="M90.9,57.3v68.2h18.6v55.8l43.4-74.4h-24.8l24.8-49.6C152.9,57.3,90.9,57.3,90.9,57.3z" />
 </svg>
--- a/_img/map_marker_charging_multiple.svg
+++ b/_img/map_marker_charging_multiple.svg
@@ -1,27 +1,28 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<?xml version="1.0" encoding="utf-8"?><!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
 	viewBox="0 0 233.8 368.4" style="enable-background:new 0 0 233.8 368.4;" xml:space="preserve">
 <style type="text/css">
 	.st0{fill:#FFFFFF;}
-	.st1{fill:#B5B5B5;}
-	.st2{fill:#808080;}
+	.st1{fill:#808080;}
+	.st2{fill:#B5B5B5;}
 </style>
 	<g>
-	<g>
-		<g>
-			<path class="st0" d="M109.8,0h13.6c33.9,1.9,67.1,18.5,87.7,45.8c13.5,17.2,21,38.6,22.7,60.3v8.1c-0.8,42.1-27.7,76.6-51,109.4
-				c-26.2,37-50.4,77.3-57.1,122.9c-1.8,7.7,0.4,18.5-8.9,22c-2.2-1.7-4.7-3.1-6.2-5.4c-2.7-25.5-9.1-50.7-20-73.9
-				c-12.3-27.1-29.5-51.6-47-75.6C33,199,23,184.2,14.7,168.3c-13-23.8-17.9-51.9-12.5-78.6C6.6,68.6,17.6,49.1,32.8,34
-				C53.3,14,81.1,1.8,109.8,0z" />
-		</g>
-	</g>
-</g>
-	<g>
-	<polygon class="st1"
-		points="143.2,109.4 123.5,143.2 123.5,181.3 166.9,106.9 144.7,106.9 	" />
-		<path class="st1"
-			d="M122.2,101.9h16.7h5.7l22.3-44.6c0,0-10.2,0-22.4,0l-1.1,2.2L122.2,101.9z" />
-		<path class="st2" d="M138.9,57.3c-9.7,0-19.8,0-26.4,0c-2.5,0-5.1,0-7.6,0c-8.2,0-16.1,0-21.4,0c-4.1,0-6.6,0-6.6,0v68.2h18.6v55.8
-		l43.4-74.4h-24.8L138.9,57.3z" />
+	<path class="st0" d="M117,367.4c-0.4-0.3-0.8-0.6-1.2-0.9c-1.6-1.2-3.1-2.3-4.2-3.7c-2.9-26.9-9.6-51.7-20.1-74
+		c-12.4-27.3-30.1-52.4-47.1-75.8c-8.7-12-19.8-27.9-28.8-45.2C2.3,143.6-2.1,115.9,3.2,89.9c4.3-20.4,15-40,30.3-55.2
+		C53.6,15.1,81.5,2.8,109.9,1l13.5,0c34.4,1.9,66.9,18.9,86.9,45.4c12.8,16.3,20.8,37.5,22.5,59.8l0,8
+		c-0.7,38.8-23.7,70.9-45.9,101.9c-1.7,2.3-3.3,4.6-5,6.9c-24.4,34.5-50.3,76.1-57.3,123.3c-0.5,2-0.7,4.3-0.9,6.5
+		C123.3,359,122.8,364.9,117,367.4z" />
+		<path class="st1" d="M123.3,2c34.1,1.9,66.3,18.8,86.2,45c12.6,16.1,20.5,37.1,22.3,59.1l0,8c-0.7,38.5-23.6,70.5-45.7,101.3
+		c-1.7,2.3-3.3,4.6-5,6.9c-24.5,34.6-50.5,76.3-57.4,123.7c-0.5,2.1-0.7,4.4-0.9,6.7c-0.5,5.9-1,11-5.8,13.4
+		c-0.2-0.2-0.5-0.4-0.7-0.5c-1.5-1.1-2.9-2-3.8-3.3c-2.9-26.9-9.7-51.8-20.1-74C80,261,62.3,235.8,45.2,212.4
+		c-8.7-11.9-19.8-27.8-28.8-45.1C3.3,143.3-1,115.9,4.2,90.1c4.2-20.2,14.9-39.6,30-54.7C54.2,16,81.7,3.8,109.9,2H123.3 M123.4,0
+		h-13.6c-28.7,1.8-56.5,14-77,34C17.6,49.1,6.6,68.6,2.2,89.7c-5.4,26.7-0.5,54.8,12.5,78.6C23,184.2,33,199,43.6,213.6
+		c17.5,24,34.7,48.5,47,75.6c10.9,23.2,17.3,48.4,20,73.9c1.5,2.3,4,3.7,6.2,5.4c9.3-3.5,7.1-14.3,8.9-22
+		c6.7-45.6,30.9-85.9,57.1-122.9c23.3-32.8,50.2-67.3,51-109.4v-8.1c-1.7-21.7-9.2-43.1-22.7-60.3C190.5,18.5,157.3,1.9,123.4,0
+		L123.4,0z" />
 </g>
+	<polygon class="st2" points="143.2,109.4 123.5,143.2 123.5,181.3 166.9,106.9 144.7,106.9 " />
+	<path class="st2" d="M122.2,101.9h16.7h5.7l22.3-44.6c0,0-10.2,0-22.4,0l-1.1,2.2L122.2,101.9z" />
+	<path class="st1" d="M138.9,57.3c-9.7,0-19.8,0-26.4,0c-2.5,0-5.1,0-7.6,0c-8.2,0-16.1,0-21.4,0c-4.1,0-6.6,0-6.6,0v68.2h18.6v55.8
+	l43.4-74.4h-24.8L138.9,57.3z" />
 </svg>
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,10 @@ apply plugin: 'androidx.navigation.safeargs.kotlin'
 apply plugin: 'com.mikepenz.aboutlibraries.plugin'
 apply plugin: 'de.timfreiheit.resourceplaceholders'

+def supportedLocales = "en,de,fr,nb-rNO"
+
 android {
-    compileSdkVersion 32
+    compileSdkVersion 33
    buildToolsVersion "30.0.3"

    defaultConfig {
@@ -19,10 +21,12 @@ android {
        minSdkVersion 21
        targetSdkVersion 31
        // NOTE: always increase versionCode by 2 since automotive flavor uses versionCode + 1
-        versionCode 102
-        versionName "1.3.8"
+        versionCode 116
+        versionName "1.3.11"

        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        resConfigs supportedLocales.split(",")
+        buildConfigField("String", "supportedLocales", '"' + supportedLocales + '"')
    }

    signingConfigs {
@@ -93,6 +97,7 @@ android {
    }
    lint {
        disable 'NullSafeMutableLiveData'
+        warning 'MissingTranslation'
    }

    testOptions {
@@ -146,7 +151,7 @@ configurations {

 dependencies {
    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.4.2'
+    implementation 'androidx.appcompat:appcompat:1.6.0-beta01'
    implementation 'androidx.core:core-ktx:1.8.0'
    implementation 'androidx.core:core-splashscreen:1.0.0'
    implementation "androidx.activity:activity-ktx:1.5.1"
@@ -165,8 +170,10 @@ dependencies {
    implementation 'com.squareup.okhttp3:okhttp-urlconnection:4.9.0'
    implementation 'com.squareup.moshi:moshi-kotlin:1.13.0'
    implementation 'com.squareup.moshi:moshi-adapters:1.13.0'
-    implementation 'com.markomilos.jsonapi:jsonapi-adapters:1.0.1'
-    implementation 'com.markomilos.jsonapi:jsonapi-retrofit:1.0.1'
+    implementation 'com.github.johan12345:jsonapi:50d72e7e55'  // patched version for jsonapi-adapters
+    implementation('com.markomilos.jsonapi:jsonapi-retrofit:1.0.1') {
+        exclude group: 'com.markomilos.jsonapi', module: 'jsonapi-adapters'
+    }
    implementation 'io.coil-kt:coil:1.1.0'
    implementation 'com.github.johan12345:StfalconImageViewer:5082ebd392'
    implementation "com.mikepenz:aboutlibraries-core:$about_libs_version"
@@ -184,7 +191,7 @@ dependencies {
    googleAutomotiveImplementation "androidx.car.app:app-automotive:$carAppVersion"

    // AnyMaps
-    def anyMapsVersion = 'f36bb3c126'
+    def anyMapsVersion = 'a9b3dd7d99'
    implementation "com.github.johan12345.AnyMaps:anymaps-base:$anyMapsVersion"
    googleImplementation "com.github.johan12345.AnyMaps:anymaps-google:$anyMapsVersion"
    googleImplementation 'com.google.android.gms:play-services-maps:18.1.0'
--- a/app/src/foss/res/values-fr/strings.xml
+++ b/app/src/foss/res/values-fr/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="donations_info" formatted="false">Trouvez-vous EVMap utile \? Soutenez son développement en envoyant un don au développeur.</string>
+    <string name="data_sources_hint">Les données cartographiques de l\'application sont fournies par OpenStreetMap (Mapbox).</string>
+    <string name="donate_paypal">Faire un don avec PayPal</string>
+</resources>
--- a/app/src/foss/res/values-nb-rNO/strings.xml
+++ b/app/src/foss/res/values-nb-rNO/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="donate_paypal">Doner med PayPal</string>
+    <string name="data_sources_hint">Kartdata i programmet tilbys av OpenStreetMap (Mapbox).</string>
+    <string name="donations_info" formatted="false">Synes du EVMap er nyttig\? Støtt utviklingen ved å sende en slant til utvikleren.</string>
+</resources>
--- a/app/src/foss/res/values/arrays.xml
+++ b/app/src/foss/res/values/arrays.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <string-array name="pref_map_provider_names">
-        <item>@string/pref_map_provider_osm_mapbox</item>
+        <item>@string/pref_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>
+        <item>@string/pref_provider_osm_mapbox</item>
    </string-array>
    <string-array name="pref_search_provider_values" translatable="false">
        <item>mapbox</item>
--- a/app/src/google/java/net/vonforst/evmap/Inits.kt
+++ b/app/src/google/java/net/vonforst/evmap/Inits.kt
@@ -7,16 +7,10 @@ import com.google.android.gms.common.ConnectionResult
 import com.google.android.gms.common.GoogleApiAvailability
 import com.google.android.gms.maps.MapsInitializer
 import com.google.android.libraries.places.api.Places
-import net.vonforst.evmap.storage.PreferenceDataSource
-import net.vonforst.evmap.utils.LocaleContextWrapper

 fun init(context: Context) {
    Places.initialize(context, context.getString(R.string.google_maps_key))
-
-    val localeContext = LocaleContextWrapper.wrap(
-        context.applicationContext, PreferenceDataSource(context).language
-    )
-    MapsInitializer.initialize(localeContext, MapsInitializer.Renderer.LATEST, null)
+    MapsInitializer.initialize(context, MapsInitializer.Renderer.LATEST, null)
 }

 fun checkPlayServices(activity: Activity): Boolean {
--- a/app/src/google/java/net/vonforst/evmap/auto/ChargepriceScreen.kt
+++ b/app/src/google/java/net/vonforst/evmap/auto/ChargepriceScreen.kt
@@ -248,7 +248,7 @@ class ChargepriceScreen(ctx: CarContext, val charger: ChargeLocation) : Screen(c
                    .sortedBy { it.chargepointPrices.first().price }
                    .sortedByDescending {
                        prefs.chargepriceMyTariffsAll ||
-                                myTariffs != null && it.tariff?.id in myTariffs
+                                myTariffs != null && it.tariffId in myTariffs
                    }
                invalidate()
            } catch (e: IOException) {
--- a/app/src/google/java/net/vonforst/evmap/auto/ChargerDetailScreen.kt
+++ b/app/src/google/java/net/vonforst/evmap/auto/ChargerDetailScreen.kt
@@ -3,6 +3,8 @@ package net.vonforst.evmap.auto
 import android.content.Intent
 import android.graphics.Bitmap
 import android.graphics.Canvas
+import android.graphics.Matrix
+import android.graphics.RectF
 import android.graphics.drawable.BitmapDrawable
 import android.net.Uri
 import android.text.SpannableStringBuilder
@@ -32,17 +34,19 @@ import net.vonforst.evmap.api.stringProvider
 import net.vonforst.evmap.model.ChargeLocation
 import net.vonforst.evmap.model.Favorite
 import net.vonforst.evmap.storage.AppDatabase
+import net.vonforst.evmap.storage.ChargeLocationsRepository
 import net.vonforst.evmap.storage.PreferenceDataSource
 import net.vonforst.evmap.ui.ChargerIconGenerator
 import net.vonforst.evmap.ui.availabilityText
 import net.vonforst.evmap.ui.getMarkerTint
 import net.vonforst.evmap.viewmodel.Status
-import net.vonforst.evmap.viewmodel.getReferenceData
+import net.vonforst.evmap.viewmodel.awaitFinished
 import java.time.ZoneId
 import java.time.format.DateTimeFormatter
 import java.time.format.FormatStyle
 import kotlin.math.roundToInt

+
 class ChargerDetailScreen(ctx: CarContext, val chargerSparse: ChargeLocation) : Screen(ctx) {
    var charger: ChargeLocation? = null
    var photo: Bitmap? = null
@@ -50,10 +54,8 @@ class ChargerDetailScreen(ctx: CarContext, val chargerSparse: ChargeLocation) :

    val prefs = PreferenceDataSource(ctx)
    private val db = AppDatabase.getInstance(carContext)
-    private val api by lazy {
-        createApi(prefs.dataSource, ctx)
-    }
-    private val referenceData = api.getReferenceData(lifecycleScope, carContext)
+    private val repo =
+        ChargeLocationsRepository(createApi(prefs.dataSource, ctx), lifecycleScope, db, prefs)

    private val imageSize = 128  // images should be 128dp according to docs
    private val imageSizeLarge = 480  // images should be 480 x 480 dp according to docs
@@ -71,9 +73,7 @@ class ChargerDetailScreen(ctx: CarContext, val chargerSparse: ChargeLocation) :
    private var favoriteUpdateJob: Job? = null

    init {
-        referenceData.observe(this) {
-            loadCharger()
-        }
+        loadCharger()
    }

    override fun onGetTemplate(): Template {
@@ -356,24 +356,21 @@ class ChargerDetailScreen(ctx: CarContext, val chargerSparse: ChargeLocation) :
    }

    private fun loadCharger() {
-        val referenceData = referenceData.value ?: return
        lifecycleScope.launch {
            favorite = db.favoritesDao().findFavorite(chargerSparse.id, chargerSparse.dataSource)

-            val response = api.getChargepointDetail(referenceData, chargerSparse.id)
+            val response = repo.getChargepointDetail(chargerSparse.id).awaitFinished()
            if (response.status == Status.SUCCESS) {
                val charger = response.data!!

                val photo = charger.photos?.firstOrNull()
                photo?.let {
                    val density = carContext.resources.displayMetrics.density
-                    val url = if (largeImageSupported) {
-                        photo.getUrl(size = (imageSizeLarge * density).roundToInt())
-                    } else {
-                        photo.getUrl(size = (imageSize * density).roundToInt())
-                    }
+                    val size =
+                        (density * if (largeImageSupported) imageSizeLarge else imageSize).roundToInt()
+                    val url = photo.getUrl(size = size)
                    val request = ImageRequest.Builder(carContext).data(url).build()
-                    var img =
+                    val img =
                        (carContext.imageLoader.execute(request).drawable as BitmapDrawable).bitmap

                    // draw icon on top of image
@@ -383,19 +380,29 @@ class ChargerDetailScreen(ctx: CarContext, val chargerSparse: ChargeLocation) :
                        multi = charger.isMulti()
                    )

-                    img = img.copy(Bitmap.Config.ARGB_8888, true)
+                    val outImg = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888)
                    val iconSmall = icon.scale(
-                        (img.height * 0.4 / icon.height * icon.width).roundToInt(),
-                        (img.height * 0.4).roundToInt()
+                        (size * 0.4 / icon.height * icon.width).roundToInt(),
+                        (size * 0.4).roundToInt()
+                    )
+                    val canvas = Canvas(outImg)
+
+                    val m = Matrix()
+                    m.setRectToRect(
+                        RectF(0f, 0f, img.width.toFloat(), img.height.toFloat()),
+                        RectF(0f, 0f, size.toFloat(), size.toFloat()),
+                        Matrix.ScaleToFit.CENTER
+                    )
+                    canvas.drawBitmap(
+                        img.copy(Bitmap.Config.ARGB_8888, false), m, null
                    )
-                    val canvas = Canvas(img)
                    canvas.drawBitmap(
                        iconSmall,
                        0f,
-                        (img.height - iconSmall.height * 1.1).toFloat(),
+                        (size - iconSmall.height * 1.1).toFloat(),
                        null
                    )
-                    this@ChargerDetailScreen.photo = img
+                    this@ChargerDetailScreen.photo = outImg
                }
                this@ChargerDetailScreen.charger = charger

--- a/app/src/google/java/net/vonforst/evmap/auto/MapScreen.kt
+++ b/app/src/google/java/net/vonforst/evmap/auto/MapScreen.kt
@@ -13,7 +13,9 @@ import androidx.car.app.hardware.info.EnergyLevel
 import androidx.car.app.model.*
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.IconCompat
-import androidx.lifecycle.*
+import androidx.lifecycle.DefaultLifecycleObserver
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.lifecycleScope
 import com.car2go.maps.model.LatLng
 import kotlinx.coroutines.*
 import net.vonforst.evmap.BuildConfig
@@ -24,14 +26,17 @@ import net.vonforst.evmap.api.createApi
 import net.vonforst.evmap.api.stringProvider
 import net.vonforst.evmap.model.ChargeLocation
 import net.vonforst.evmap.model.FILTERS_FAVORITES
+import net.vonforst.evmap.model.FilterValue
+import net.vonforst.evmap.model.FilterWithValue
 import net.vonforst.evmap.storage.AppDatabase
+import net.vonforst.evmap.storage.ChargeLocationsRepository
 import net.vonforst.evmap.storage.PreferenceDataSource
 import net.vonforst.evmap.ui.availabilityText
 import net.vonforst.evmap.ui.getMarkerTint
 import net.vonforst.evmap.utils.distanceBetween
+import net.vonforst.evmap.viewmodel.Status
+import net.vonforst.evmap.viewmodel.awaitFinished
 import net.vonforst.evmap.viewmodel.filtersWithValue
-import net.vonforst.evmap.viewmodel.getFilterValues
-import net.vonforst.evmap.viewmodel.getReferenceData
 import java.io.IOException
 import java.time.Duration
 import java.time.Instant
@@ -62,26 +67,22 @@ class MapScreen(ctx: CarContext, val session: EVMapSession) :
    private var chargers: List<ChargeLocation>? = null
    private var prefs = PreferenceDataSource(ctx)
    private val db = AppDatabase.getInstance(carContext)
-    private val api by lazy {
-        createApi(prefs.dataSource, ctx)
-    }
+    private val repo =
+        ChargeLocationsRepository(createApi(prefs.dataSource, ctx), lifecycleScope, db, prefs)
    private val searchRadius = 5 // kilometers
    private val distanceUpdateThreshold = Duration.ofSeconds(15)
    private val availabilityUpdateThreshold = Duration.ofMinutes(1)
    private var availabilities: MutableMap<Long, Pair<ZonedDateTime, ChargeLocationStatus?>> =
        HashMap()
    private val maxRows = if (ctx.carAppApiLevel >= 2) {
-        ctx.constraintManager.getContentLimit(ConstraintManager.CONTENT_LIMIT_TYPE_PLACE_LIST)
+        min(
+            ctx.constraintManager.getContentLimit(ConstraintManager.CONTENT_LIMIT_TYPE_PLACE_LIST),
+            25
+        )
    } else 6

-    private val referenceData = api.getReferenceData(lifecycleScope, carContext)
-    private val filterStatus = MutableLiveData<Long>().apply {
-        value = prefs.filterStatus
-    }
-    private val filterValues = db.filterValueDao().getFilterValues(filterStatus, prefs.dataSource)
-    private val filters =
-        Transformations.map(referenceData) { api.getFilters(it, carContext.stringProvider()) }
-    private val filtersWithValue = filtersWithValue(filters, filterValues)
+    private var filterStatus = prefs.filterStatus
+    private var filtersWithValue: List<FilterWithValue<FilterValue>>? = null

    private val hardwareMan: CarHardwareManager by lazy {
        ctx.getCarService(CarContext.HARDWARE_SERVICE) as CarHardwareManager
@@ -115,7 +116,7 @@ class MapScreen(ctx: CarContext, val session: EVMapSession) :
                prefs.placeSearchResultAndroidAutoName?.let {
                    carContext.getString(R.string.auto_chargers_near_location, it)
                } ?: carContext.getString(
-                    if (filterStatus.value == FILTERS_FAVORITES) {
+                    if (filterStatus == FILTERS_FAVORITES) {
                        R.string.auto_favorites
                    } else {
                        R.string.auto_chargers_closeby
@@ -142,7 +143,7 @@ class MapScreen(ctx: CarContext, val session: EVMapSession) :
                }
                builder.setNoItemsMessage(
                    carContext.getString(
-                        if (filterStatus.value == FILTERS_FAVORITES) {
+                        if (filterStatus == FILTERS_FAVORITES) {
                            R.string.auto_no_favorites_found
                        } else {
                            R.string.auto_no_chargers_found
@@ -154,18 +155,19 @@ class MapScreen(ctx: CarContext, val session: EVMapSession) :
            } ?: setLoading(true)
            setCurrentLocationEnabled(true)
            setHeaderAction(Action.APP_ICON)
-            val filtersCount = if (filterStatus.value == FILTERS_FAVORITES) 1 else {
-                filtersWithValue.value?.count {
+            val filtersCount = if (filterStatus == FILTERS_FAVORITES) 1 else {
+                filtersWithValue?.count {
                    !it.value.hasSameValueAs(it.filter.defaultValue())
                }
            }

            setActionStrip(
                ActionStrip.Builder()
-                    .addAction(Action.Builder()
-                        .setIcon(
-                            CarIcon.Builder(
-                                IconCompat.createWithResource(
+                    .addAction(
+                        Action.Builder()
+                            .setIcon(
+                                CarIcon.Builder(
+                                    IconCompat.createWithResource(
                                    carContext,
                                    R.drawable.ic_settings
                                )
@@ -189,9 +191,7 @@ class MapScreen(ctx: CarContext, val session: EVMapSession) :
                                    .build()
                            )
                            .setOnClickListener {
-                                screenManager.pushForResult(FilterScreen(carContext, session)) {
-                                    filterStatus.value = prefs.filterStatus
-                                }
+                                screenManager.push(FilterScreen(carContext, session))
                                session.mapScreen = null
                            }
                            .build())
@@ -289,10 +289,10 @@ class MapScreen(ctx: CarContext, val session: EVMapSession) :
        ) {
            return
        }
+        val previousLocation = this.location
        this.location = location
-        if (updateCoroutine != null) {
-            // don't update while still loading last update
-            return
+        if (previousLocation == null) {
+            loadChargers()
        }

        val now = Instant.now()
@@ -307,8 +307,6 @@ class MapScreen(ctx: CarContext, val session: EVMapSession) :

    private fun loadChargers() {
        val location = location ?: return
-        val referenceData = referenceData.value ?: return
-        val filters = filtersWithValue.value ?: return

        val searchLocation =
            prefs.placeSearchResultAndroidAuto ?: LatLng.fromLocation(location)
@@ -316,8 +314,14 @@ class MapScreen(ctx: CarContext, val session: EVMapSession) :

        updateCoroutine = lifecycleScope.launch {
            try {
+                filterStatus = prefs.filterStatus
+                val filterValues =
+                    db.filterValueDao().getFilterValuesAsync(filterStatus, prefs.dataSource)
+                val filters = repo.getFiltersAsync(carContext.stringProvider())
+                filtersWithValue = filtersWithValue(filters, filterValues)
+
                // load chargers
-                if (filterStatus.value == FILTERS_FAVORITES) {
+                if (filterStatus == FILTERS_FAVORITES) {
                    chargers =
                        db.favoritesDao().getAllFavoritesAsync().map { it.charger }.sortedBy {
                            distanceBetween(
@@ -326,42 +330,51 @@ class MapScreen(ctx: CarContext, val session: EVMapSession) :
                            )
                        }
                } else {
-                    val response = api.getChargepointsRadius(
-                        referenceData,
+                    val response = repo.getChargepointsRadius(
                        searchLocation,
                        searchRadius,
                        zoom = 16f,
-                        filters
-                    )
-                    chargers = response.data?.filterIsInstance(ChargeLocation::class.java)
+                        filtersWithValue
+                    ).awaitFinished()
+                    if (response.status == Status.ERROR) {
+                        withContext(Dispatchers.Main) { showLoadingError() }
+                        return@launch
+                    }
+                    var chargers = response.data?.filterIsInstance(ChargeLocation::class.java)
                    chargers?.let {
                        if (it.size < maxRows) {
                            // try again with larger radius
-                            val response = api.getChargepointsRadius(
-                                referenceData,
+                            val response = repo.getChargepointsRadius(
                                searchLocation,
                                searchRadius * 10,
                                zoom = 16f,
-                                filters
-                            )
+                                filtersWithValue
+                            ).awaitFinished()
+                            if (response.status == Status.ERROR) {
+                                withContext(Dispatchers.Main) { showLoadingError() }
+                                return@launch
+                            }
                            chargers =
                                response.data?.filterIsInstance(ChargeLocation::class.java)
                        }
                    }
+                    this@MapScreen.chargers = chargers
                }

                updateCoroutine = null
                lastDistanceUpdateTime = Instant.now()
                invalidate()
            } catch (e: IOException) {
-                withContext(Dispatchers.Main) {
-                    CarToast.makeText(carContext, R.string.connection_error, CarToast.LENGTH_LONG)
-                        .show()
-                }
+                withContext(Dispatchers.Main) { showLoadingError() }
            }
        }
    }

+    private fun showLoadingError() {
+        CarToast.makeText(carContext, R.string.connection_error, CarToast.LENGTH_LONG)
+            .show()
+    }
+
    private fun onEnergyLevelUpdated(energyLevel: EnergyLevel) {
        val isUpdate = this.energyLevel == null
        this.energyLevel = energyLevel
@@ -373,12 +386,11 @@ class MapScreen(ctx: CarContext, val session: EVMapSession) :

        // Reloading chargers in onStart does not seem to count towards content limit.
        // So let's do this so the user gets fresh chargers when re-entering the app.
-        chargers = null
-        availabilities.clear()
-        invalidate()
-        filtersWithValue.observe(this) {
-            loadChargers()
+        if (prefs.dataSource != repo.api.value?.id) {
+            repo.api.value = createApi(prefs.dataSource, carContext)
        }
+        invalidate()
+        loadChargers()
    }

    private fun setupListeners() {
@@ -398,6 +410,12 @@ class MapScreen(ctx: CarContext, val session: EVMapSession) :
    }

    override fun onStop(owner: LifecycleOwner) {
+        // Reloading chargers in onStart does not seem to count towards content limit.
+        // So let's do this so the user gets fresh chargers when re-entering the app.
+        // Deleting the data already in onStop makes sure that we show a loading screen directly
+        // (i.e. onGetTemplate is not called while the old data is still there)
+        chargers = null
+        availabilities.clear()
        removeListeners()
    }

--- a/app/src/google/java/net/vonforst/evmap/auto/SettingsScreens.kt
+++ b/app/src/google/java/net/vonforst/evmap/auto/SettingsScreens.kt
@@ -1,5 +1,6 @@
 package net.vonforst.evmap.auto

+import androidx.annotation.StringRes
 import androidx.car.app.CarContext
 import androidx.car.app.CarToast
 import androidx.car.app.Screen
@@ -107,6 +108,7 @@ class DataSettingsScreen(ctx: CarContext) : Screen(ctx) {
                        screenManager.push(
                            ChooseDataSourceScreen(
                                carContext,
+                                R.string.pref_data_source,
                                dataSourceNames,
                                dataSourceValues,
                                prefs.dataSource,
@@ -127,6 +129,7 @@ class DataSettingsScreen(ctx: CarContext) : Screen(ctx) {
                        screenManager.push(
                            ChooseDataSourceScreen(
                                carContext,
+                                R.string.pref_search_provider,
                                searchProviderNames,
                                searchProviderValues,
                                prefs.searchProvider
@@ -155,6 +158,7 @@ class DataSettingsScreen(ctx: CarContext) : Screen(ctx) {

 class ChooseDataSourceScreen(
    ctx: CarContext,
+    @StringRes val title: Int,
    val names: Array<String>,
    val values: Array<String>,
    val currentValue: String,
@@ -165,7 +169,7 @@ class ChooseDataSourceScreen(

    override fun onGetTemplate(): Template {
        return ListTemplate.Builder().apply {
-            setTitle(carContext.getString(R.string.pref_data_source))
+            setTitle(carContext.getString(title))
            setHeaderAction(Action.BACK)
            setSingleList(ItemList.Builder().apply {
                for (i in names.indices) {
--- a/app/src/google/res/values-fr/strings.xml
+++ b/app/src/google/res/values-fr/strings.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="donations_info" formatted="false">Trouvez-vous EVMap utile \? Soutenez son développement en envoyant un don au développeur.
+\n
+\nGoogle prend 15% sur chaque don.</string>
+    <string name="auto_location_service">EVMap fonctionne sur Android Auto et utilise votre position.</string>
+    <string name="open_in_app">Ouvrir dans l\'application</string>
+    <string name="opened_on_phone">Ouvert sur le téléphone</string>
+    <string name="auto_location_permission_needed">Pour exécuter EVMap sur Android Auto, vous devez autoriser l\'accès à votre emplacement.</string>
+    <string name="grant_on_phone">Grant au téléphone</string>
+    <string name="auto_prices">Prix</string>
+    <string name="auto_vehicle_data">Données sur le véhicule</string>
+    <string name="auto_range">Autonomie</string>
+    <string name="auto_speed">Vitesse</string>
+    <string name="welcome_android_auto">Prise en charge d’Android Auto</string>
+    <string name="sounds_cool">ça a l\'air cool</string>
+    <string name="auto_chargeprice_vehicle_unknown">Aucun des véhicules sélectionnés dans l\'application ne correspond à ce véhicule (%1$s %2$s).</string>
+    <string name="auto_chargeprice_vehicle_ambiguous">Plusieurs véhicules sélectionnés dans l\'application correspondent à ce véhicule (%1$s %2$s).</string>
+    <string name="selecting_all">tous les éléments sélectionnés</string>
+    <string name="data_sources_hint">Dans les paramètres, vous pouvez également choisir entre Google Maps et OpenStreetMap (Mapbox) pour les données cartographiques.</string>
+    <string name="auto_chargeprice_vehicle_unavailable">EVMap n\'a pas pu déterminer le modèle de votre véhicule.</string>
+    <string name="auto_no_chargers_found">Aucun chargeur à proximité n\'a été trouvé</string>
+    <string name="auto_no_favorites_found">Pas de favoris trouvés</string>
+    <string name="auto_charging_level">Niveau de charge</string>
+    <string name="auto_chargers_closeby">Chargeurs à proximité</string>
+    <string name="auto_chargers_near_location">Près de %s</string>
+    <string name="auto_fault_report_date">⚠️ Rapport d\'anomalie (%s)</string>
+    <string name="auto_no_data">Indisponible</string>
+    <string name="auto_settings">Paramètres</string>
+    <string name="selecting_none">désélectionner tous les éléments</string>
+    <string name="auto_vehicle_data_permission_needed">Pour cette fonction, EVMap doit avoir accès aux données de votre véhicule.</string>
+    <string name="auto_heading">Direction</string>
+    <string name="auto_favorites">Favoris</string>
+    <string name="auto_no_refresh_possible">D\'autres mises à jour ne sont pas possibles. Veuillez revenir en arrière et redémarrer.</string>
+    <string name="settings_android_auto_chargeprice_range">Plage de charge pour la comparaison des prix</string>
+    <string name="welcome_android_auto_detail">Vous pouvez également utiliser EVMap à partir d\'Android Auto sur les voitures prises en charge. Il suffit de sélectionner l\'application EVMap dans le menu Android Auto.</string>
+</resources>
--- a/app/src/google/res/values-nb-rNO/strings.xml
+++ b/app/src/google/res/values-nb-rNO/strings.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="donations_info" formatted="false">Synes du EVMap er nyttig\? Støtt utviklingen ved å sende penger til utvikleren.
+\n
+\nGoogle tar 15% av alle donasjoner.</string>
+    <string name="auto_favorites">Favoritter</string>
+    <string name="auto_charging_level">Ladingsnivå</string>
+    <string name="auto_chargeprice_vehicle_unavailable">EVMap kunne ikke fastsette kjøretøymodellen.</string>
+    <string name="selecting_none">fravalgte alle elementer</string>
+    <string name="grant_on_phone">Innvilg på mobilenheten</string>
+    <string name="auto_chargers_closeby">Ladere i nærheten</string>
+    <string name="auto_prices">Pris</string>
+    <string name="auto_no_chargers_found">Ingen ladere i nærheten</string>
+    <string name="auto_no_favorites_found">Fant ikke noen favoritter</string>
+    <string name="open_in_app">Åpne i programmet</string>
+    <string name="auto_location_service">EVMap kjører på Android Auto og bruker posisjonen din.</string>
+    <string name="auto_heading">Fartsretning</string>
+    <string name="opened_on_phone">Åpnet på mobilenheten</string>
+    <string name="auto_location_permission_needed">Innvilg posisjonstilgang for å bruke EVMap på Android Auto.</string>
+    <string name="auto_chargers_near_location">Nær %s</string>
+    <string name="auto_fault_report_date">⚠️ Feilrapport (%s)</string>
+    <string name="auto_vehicle_data">Kjøretøydata</string>
+    <string name="auto_no_data">Utilgjengelig</string>
+    <string name="auto_speed">Hastighet</string>
+    <string name="auto_settings">Innstillinger</string>
+    <string name="auto_chargeprice_vehicle_unknown">Ingen av kjøretøyene valgt i programmet samsvarer med dette kjøretøyet (%1$s %2$s).</string>
+    <string name="welcome_android_auto">Android Auto-støtte</string>
+    <string name="auto_chargeprice_vehicle_ambiguous">Flere kjøretøy valgt i programmet samsvarer med dette kjøretøyet (%1$s %2$s).</string>
+    <string name="auto_vehicle_data_permission_needed">EvMap trenger tilgang til kjøretøydata for å bruke denne funksjonen.</string>
+    <string name="auto_no_refresh_possible">Videre oppdateringer er ikke mulig. Gå tilbake og start på ny.</string>
+    <string name="auto_range">Rekkevidde</string>
+    <string name="welcome_android_auto_detail">Du kan også bruke EVMap inne i Android Auto på bilder som støtter dette ved å velge det i Android Auto-menyen.</string>
+    <string name="settings_android_auto_chargeprice_range">Prissammenligning for laderekkevidde fordelt på pris</string>
+    <string name="data_sources_hint">I innstillingene kan du også bytte mellom Google Maps og OpenStreetMap (Mapbox) for kartdata.</string>
+    <string name="selecting_all">valgte alle elementene</string>
+    <string name="sounds_cool">den er grei</string>
+</resources>
--- a/app/src/google/res/values/arrays.xml
+++ b/app/src/google/res/values/arrays.xml
@@ -1,16 +1,16 @@
 <?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>
+        <item>@string/pref_provider_google_maps</item>
+        <item>@string/pref_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>
+        <item>@string/pref_provider_google_maps</item>
+        <item>@string/pref_provider_osm_mapbox</item>
    </string-array>
    <string-array name="pref_search_provider_values" translatable="false">
        <item>google</item>
--- a/app/src/google/res/values/colors.xml
+++ b/app/src/google/res/values/colors.xml
@@ -3,5 +3,5 @@
    <color name="gauge_active">#00e676</color>
    <color name="gauge_middle">#087f23</color>
    <color name="gauge_inactive">#9e9e9e</color>
-    <color name="charger_100kw_dark">#fdd835</color>
+    <color name="charger_100kw_dark">#FBC02D</color>
 </resources>
--- a/app/src/googleAutomotive/res/values-fr/strings.xml
+++ b/app/src/googleAutomotive/res/values-fr/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="grant_on_phone">Autoriser</string>
+    <string name="auto_location_permission_needed">Pour exécuter EVMap sur Android Auto, vous devez autoriser l\'accès à votre emplacement.</string>
+</resources>
--- a/app/src/googleAutomotive/res/values-nb-rNO/strings.xml
+++ b/app/src/googleAutomotive/res/values-nb-rNO/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="auto_location_permission_needed">Du må du innvilge posisjonstilgang for å kjøre EVMap i bilen din.</string>
+    <string name="grant_on_phone">Tillat</string>
+</resources>
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -24,7 +24,8 @@
        android:label="@string/app_name"
        android:roundIcon="@mipmap/ic_launcher_round"
        android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        android:localeConfig="@xml/locales_config">

        <meta-data
            android:name="com.mapbox.ACCESS_TOKEN"
@@ -261,6 +262,15 @@
                android:name="android.app.shortcuts"
                android:resource="@xml/shortcuts" />
        </activity>
+
+        <service
+            android:name="androidx.appcompat.app.AppLocalesMetadataHolderService"
+            android:enabled="false"
+            android:exported="false">
+            <meta-data
+                android:name="autoStoreLocales"
+                android:value="true" />
+        </service>
    </application>

 </manifest>
--- a/app/src/main/java/net/vonforst/evmap/EvMapApplication.kt
+++ b/app/src/main/java/net/vonforst/evmap/EvMapApplication.kt
@@ -3,6 +3,7 @@ package net.vonforst.evmap
 import android.app.Application
 import com.facebook.stetho.Stetho
 import net.vonforst.evmap.storage.PreferenceDataSource
+import net.vonforst.evmap.ui.updateAppLocale
 import net.vonforst.evmap.ui.updateNightMode
 import org.acra.config.dialog
 import org.acra.config.limiter
@@ -13,7 +14,16 @@ import org.acra.ktx.initAcra
 class EvMapApplication : Application() {
    override fun onCreate() {
        super.onCreate()
-        updateNightMode(PreferenceDataSource(this))
+        val prefs = PreferenceDataSource(this)
+        updateNightMode(prefs)
+
+        // Convert to new AppCompat storage for app language
+        val lang = prefs.language
+        if (lang != null && lang !in listOf("", "default")) {
+            updateAppLocale(lang)
+            prefs.language = null
+        }
+
        Stetho.initializeWithDefaults(this);
        init(applicationContext)

--- a/app/src/main/java/net/vonforst/evmap/MapsActivity.kt
+++ b/app/src/main/java/net/vonforst/evmap/MapsActivity.kt
@@ -2,7 +2,6 @@ package net.vonforst.evmap

 import android.app.PendingIntent
 import android.content.ActivityNotFoundException
-import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.os.Build
@@ -32,7 +31,6 @@ import net.vonforst.evmap.fragment.MapFragmentArgs
 import net.vonforst.evmap.model.ChargeLocation
 import net.vonforst.evmap.navigation.NavHostFragment
 import net.vonforst.evmap.storage.PreferenceDataSource
-import net.vonforst.evmap.utils.LocaleContextWrapper
 import net.vonforst.evmap.utils.getLocationFromIntent


@@ -53,14 +51,6 @@ class MapsActivity : AppCompatActivity(),
    var fragmentCallback: FragmentCallback? = null
    private lateinit var prefs: PreferenceDataSource

-    override fun attachBaseContext(newBase: Context) {
-        return super.attachBaseContext(
-            LocaleContextWrapper.wrap(
-                newBase, PreferenceDataSource(newBase).language
-            )
-        );
-    }
-
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
        val splashScreen = installSplashScreen()
--- a/app/src/main/java/net/vonforst/evmap/Utils.kt
+++ b/app/src/main/java/net/vonforst/evmap/Utils.kt
@@ -6,11 +6,6 @@ import android.graphics.Typeface
 import android.os.Bundle
 import android.text.*
 import android.text.style.StyleSpan
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.Observer
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.suspendCancellableCoroutine
-import kotlinx.coroutines.withContext
 import java.util.*

 fun Bundle.optDouble(name: String): Double? {
@@ -85,25 +80,6 @@ fun max(a: Int?, b: Int?): Int? {

 fun <T> List<T>.containsAny(vararg values: T) = values.any { this.contains(it) }

-public suspend fun <T> LiveData<T>.await(): T {
-    return withContext(Dispatchers.Main.immediate) {
-        suspendCancellableCoroutine { continuation ->
-            val observer = object : Observer<T> {
-                override fun onChanged(value: T) {
-                    removeObserver(this)
-                    continuation.resume(value, null)
-                }
-            }
-
-            observeForever(observer)
-
-            continuation.invokeOnCancellation {
-                removeObserver(observer)
-            }
-        }
-    }
-}
-
 fun Context.isDarkMode() =
    (resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES

--- a/app/src/main/java/net/vonforst/evmap/api/ChargepointApi.kt
+++ b/app/src/main/java/net/vonforst/evmap/api/ChargepointApi.kt
@@ -34,7 +34,8 @@ interface ChargepointApi<out T : ReferenceData> {

    fun getFilters(referenceData: ReferenceData, sp: StringProvider): List<Filter<FilterValue>>

-    fun getName(): String
+    val name: String
+    val id: String
 }

 interface StringProvider {
--- a/app/src/main/java/net/vonforst/evmap/api/chargeprice/ChargepriceModel.kt
+++ b/app/src/main/java/net/vonforst/evmap/api/chargeprice/ChargepriceModel.kt
@@ -109,9 +109,7 @@ data class ChargepriceCar(
    val brand: String,

    @Json(name = "dc_charge_ports")
-    val dcChargePorts: List<String>,
-    @ToOne("manufacturer")
-    val manufacturer: ChargepriceBrand?
+    val dcChargePorts: List<String>
 ) : Equatable, Parcelable {

    companion object {
@@ -181,7 +179,7 @@ data class ChargePrice(
    val branding: ChargepriceBranding? = null,

    @ToOne("tariff")
-    val tariff: ChargepriceTariff?
+    val tariffId: String?
 ) : Equatable, Cloneable, Parcelable {
    fun formatMonthlyFees(ctx: Context): String {
        return listOfNotNull(
--- a/app/src/main/java/net/vonforst/evmap/api/goingelectric/GoingElectricApi.kt
+++ b/app/src/main/java/net/vonforst/evmap/api/goingelectric/GoingElectricApi.kt
@@ -129,7 +129,8 @@ class GoingElectricApiWrapper(
    private val clusterThreshold = 11f
    val api = GoingElectricApi.create(apikey, baseurl, context)

-    override fun getName() = "GoingElectric.de"
+    override val name = "GoingElectric.de"
+    override val id = "going_electric"

    override suspend fun getChargepoints(
        referenceData: ReferenceData,
@@ -467,17 +468,17 @@ class GoingElectricApiWrapper(
                sp.getString(R.string.filter_networks), "networks",
                networkMap, manyChoices = true
            ),
-            MultipleChoiceFilter(
-                sp.getString(R.string.categories), "categories",
-                categoryMap,
-                manyChoices = true
-            ),
+            BooleanFilter(sp.getString(R.string.filter_exclude_faults), "exclude_faults"),
            BooleanFilter(sp.getString(R.string.filter_barrierfree), "barrierfree"),
            MultipleChoiceFilter(
                sp.getString(R.string.filter_chargecards), "chargecards",
                chargecardMap, manyChoices = true
            ),
-            BooleanFilter(sp.getString(R.string.filter_exclude_faults), "exclude_faults")
+            MultipleChoiceFilter(
+                sp.getString(R.string.categories), "categories",
+                categoryMap,
+                manyChoices = true
+            )
        )
    }
 }
--- a/app/src/main/java/net/vonforst/evmap/api/openchargemap/OpenChargeMapApi.kt
+++ b/app/src/main/java/net/vonforst/evmap/api/openchargemap/OpenChargeMapApi.kt
@@ -108,7 +108,8 @@ class OpenChargeMapApiWrapper(
    private val clusterThreshold = 11
    val api = OpenChargeMapApi.create(apikey, baseurl, context)

-    override fun getName() = "OpenChargeMap.org"
+    override val name = "OpenChargeMap.org"
+    override val id = "open_charge_map"

    private fun formatMultipleChoice(value: MultipleChoiceFilterValue?) =
        if (value == null || value.all) null else value.values.joinToString(",")
--- a/app/src/main/java/net/vonforst/evmap/fragment/DataSourceSelectDialog.kt
+++ b/app/src/main/java/net/vonforst/evmap/fragment/DataSourceSelectDialog.kt
@@ -27,7 +27,7 @@ class DataSourceSelectDialog : MaterialDialogFragment() {
        }
    }

-    override fun onCreateView(
+    override fun createView(
        inflater: LayoutInflater,
        container: ViewGroup?,
        savedInstanceState: Bundle?
--- a/app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt
+++ b/app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt
@@ -72,7 +72,6 @@ import net.vonforst.evmap.adapter.ConnectorAdapter
 import net.vonforst.evmap.adapter.DetailsAdapter
 import net.vonforst.evmap.adapter.GalleryAdapter
 import net.vonforst.evmap.adapter.PlaceAutocompleteAdapter
-import net.vonforst.evmap.api.goingelectric.GoingElectricApiWrapper
 import net.vonforst.evmap.autocomplete.ApiUnavailableException
 import net.vonforst.evmap.autocomplete.PlaceWithBounds
 import net.vonforst.evmap.bold
@@ -394,7 +393,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                    val charger = vm.charger.value?.data
                    if (charger?.editUrl != null) {
                        (activity as? MapsActivity)?.openUrl(charger.editUrl)
-                        if (vm.apiType == GoingElectricApiWrapper::class.java) {
+                        if (vm.apiId == "going_electric") {
                            // instructions specific to GoingElectric
                            Toast.makeText(
                                requireContext(),
@@ -970,7 +969,8 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
            lifecycleScope.launch {
                val address = withContext(Dispatchers.IO) {
                    try {
-                        Geocoder(requireContext()).getFromLocationName(locationName, 1).getOrNull(0)
+                        Geocoder(requireContext()).getFromLocationName(locationName, 1)
+                            ?.getOrNull(0)
                    } catch (e: IOException) {
                        null
                    }
--- a/app/src/main/java/net/vonforst/evmap/fragment/MultiSelectDialog.kt
+++ b/app/src/main/java/net/vonforst/evmap/fragment/MultiSelectDialog.kt
@@ -39,7 +39,7 @@ class MultiSelectDialog : MaterialDialogFragment() {
    private lateinit var items: List<MultiSelectItem>
    private lateinit var binding: DialogMultiSelectBinding

-    override fun onCreateView(
+    override fun createView(
        inflater: LayoutInflater,
        container: ViewGroup?,
        savedInstanceState: Bundle?
--- a/app/src/main/java/net/vonforst/evmap/fragment/preference/AboutFragment.kt
+++ b/app/src/main/java/net/vonforst/evmap/fragment/preference/AboutFragment.kt
@@ -8,6 +8,7 @@ import androidx.navigation.ui.setupWithNavController
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import com.google.android.material.color.MaterialColors
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.transition.MaterialFadeThrough
 import com.google.android.material.transition.MaterialSharedAxis
 import com.mikepenz.aboutlibraries.LibsBuilder
@@ -44,6 +45,14 @@ class AboutFragment : PreferenceFragmentCompat() {

    override fun onPreferenceTreeClick(preference: Preference): Boolean {
        return when (preference.key) {
+            "contributors" -> {
+                MaterialAlertDialogBuilder(requireContext())
+                    .setTitle(R.string.about_contributors)
+                    .setMessage(getString(R.string.about_contributors_text) + "\n\n" + getString(R.string.about_contributors_list))
+                    .setPositiveButton(R.string.ok) { _, _ -> }
+                    .show()
+                true
+            }
            "github_link" -> {
                (activity as? MapsActivity)?.openUrl(getString(R.string.github_link))
                true
--- a/app/src/main/java/net/vonforst/evmap/fragment/preference/UiSettingsFragment.kt
+++ b/app/src/main/java/net/vonforst/evmap/fragment/preference/UiSettingsFragment.kt
@@ -2,24 +2,33 @@ package net.vonforst.evmap.fragment.preference

 import android.content.SharedPreferences
 import android.os.Bundle
+import androidx.preference.ListPreference
 import net.vonforst.evmap.R
+import net.vonforst.evmap.ui.getAppLocale
+import net.vonforst.evmap.ui.updateAppLocale
 import net.vonforst.evmap.ui.updateNightMode

 class UiSettingsFragment : BaseSettingsFragment() {
    override val isTopLevel = false
+    lateinit var langPref: ListPreference

    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
        setPreferencesFromResource(R.xml.settings_ui, rootKey)
+
+        langPref = findPreference("language")!!
+        langPref.setOnPreferenceChangeListener { _, newValue ->
+            updateAppLocale(newValue as String)
+            true
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+        langPref.value = getAppLocale()
    }

    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) {
        when (key) {
-            "language" -> {
-                activity?.let {
-                    it.finish();
-                    it.startActivity(it.intent);
-                }
-            }
            "darkmode" -> {
                updateNightMode(prefs)
            }
--- a/app/src/main/java/net/vonforst/evmap/fragment/updatedialogs/OpensourceDonationsDialogFragment.kt
+++ b/app/src/main/java/net/vonforst/evmap/fragment/updatedialogs/OpensourceDonationsDialogFragment.kt
@@ -13,7 +13,7 @@ import net.vonforst.evmap.ui.MaterialDialogFragment
 class OpensourceDonationsDialogFragment : MaterialDialogFragment() {
    private lateinit var binding: DialogOpensourceDonationsBinding

-    override fun onCreateView(
+    override fun createView(
        inflater: LayoutInflater,
        container: ViewGroup?,
        savedInstanceState: Bundle?
--- a/app/src/main/java/net/vonforst/evmap/model/ChargersModel.kt
+++ b/app/src/main/java/net/vonforst/evmap/model/ChargersModel.kt
@@ -167,9 +167,9 @@ data class Cost(
    fun getStatusText(ctx: Context, emoji: Boolean = false): CharSequence {
        if (freecharging != null && freeparking != null) {
            val charging =
-                if (freecharging) ctx.getString(R.string.free) else ctx.getString(R.string.paid)
+                if (freecharging) ctx.getString(R.string.charging_free) else ctx.getString(R.string.charging_paid)
            val parking =
-                if (freeparking) ctx.getString(R.string.free) else ctx.getString(R.string.paid)
+                if (freeparking) ctx.getString(R.string.parking_free) else ctx.getString(R.string.parking_paid)
            return if (emoji) {
                "⚡ $charging · \uD83C\uDD7F️ $parking"
            } else {
@@ -177,7 +177,7 @@ data class Cost(
            }
        } else if (freecharging != null) {
            val charging =
-                if (freecharging) ctx.getString(R.string.free) else ctx.getString(R.string.paid)
+                if (freecharging) ctx.getString(R.string.charging_free) else ctx.getString(R.string.charging_paid)
            return if (emoji) {
                "⚡ $charging"
            } else {
@@ -185,7 +185,7 @@ data class Cost(
            }
        } else if (freeparking != null) {
            val parking =
-                if (freeparking) ctx.getString(R.string.free) else ctx.getString(R.string.paid)
+                if (freeparking) ctx.getString(R.string.parking_free) else ctx.getString(R.string.parking_paid)
            return if (emoji) {
                "\uD83C\uDD7F $parking"
            } else {
--- a/app/src/main/java/net/vonforst/evmap/storage/ChargeLocationsDao.kt
+++ b/app/src/main/java/net/vonforst/evmap/storage/ChargeLocationsDao.kt
@@ -1,34 +1,124 @@
 package net.vonforst.evmap.storage

-import androidx.lifecycle.LiveData
-import androidx.room.*
-import net.vonforst.evmap.model.ChargeLocation
+import androidx.lifecycle.*
+import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import com.car2go.maps.model.LatLng
+import com.car2go.maps.model.LatLngBounds
+import kotlinx.coroutines.CoroutineScope
+import net.vonforst.evmap.api.ChargepointApi
+import net.vonforst.evmap.api.StringProvider
+import net.vonforst.evmap.api.goingelectric.GEReferenceData
+import net.vonforst.evmap.api.goingelectric.GoingElectricApiWrapper
+import net.vonforst.evmap.api.openchargemap.OpenChargeMapApiWrapper
+import net.vonforst.evmap.model.*
+import net.vonforst.evmap.viewmodel.Resource
+import net.vonforst.evmap.viewmodel.await

@Dao
-interface ChargeLocationsDao {
+abstract class ChargeLocationsDao {
    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun insert(vararg locations: ChargeLocation)
-
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    fun insertBlocking(vararg locations: ChargeLocation)
+    abstract suspend fun insert(vararg locations: ChargeLocation)

    @Delete
-    suspend fun delete(vararg locations: ChargeLocation)
+    abstract suspend fun delete(vararg locations: ChargeLocation)
+}

-    @Query("SELECT * FROM chargelocation")
-    fun getAllChargeLocations(): LiveData<List<ChargeLocation>>
+/**
+ * The ChargeLocationsRepository wraps the ChargepointApi and the DB to provide caching
+ * functionality.
+ */
+class ChargeLocationsRepository(
+    api: ChargepointApi<ReferenceData>, private val scope: CoroutineScope,
+    private val db: AppDatabase, private val prefs: PreferenceDataSource
+) {
+    val api = MutableLiveData<ChargepointApi<ReferenceData>>().apply { value = api }

-    @Query("SELECT * FROM chargelocation")
-    suspend fun getAllChargeLocationsAsync(): List<ChargeLocation>
+    val referenceData = this.api.switchMap { api ->
+        when (api) {
+            is GoingElectricApiWrapper -> {
+                GEReferenceDataRepository(
+                    api,
+                    scope,
+                    db.geReferenceDataDao(),
+                    prefs
+                ).getReferenceData()
+            }
+            is OpenChargeMapApiWrapper -> {
+                OCMReferenceDataRepository(
+                    api,
+                    scope,
+                    db.ocmReferenceDataDao(),
+                    prefs
+                ).getReferenceData()
+            }
+            else -> {
+                throw RuntimeException("no reference data implemented")
+            }
+        }
+    }

-    @Query("SELECT * FROM chargelocation")
-    fun getAllChargeLocationsBlocking(): List<ChargeLocation>
+    private val chargeLocationsDao = db.chargeLocationsDao()

-    @Query("SELECT * FROM chargelocation WHERE lat >= :lat1 AND lat <= :lat2 AND lng >= :lng1 AND lng <= :lng2")
-    suspend fun getChargeLocationsInBoundsAsync(
-        lat1: Double,
-        lat2: Double,
-        lng1: Double,
-        lng2: Double
-    ): List<ChargeLocation>
+    fun getChargepoints(
+        bounds: LatLngBounds,
+        zoom: Float,
+        filters: FilterValues?
+    ): LiveData<Resource<List<ChargepointListItem>>> {
+        return liveData {
+            val refData = referenceData.await()
+            val result = api.value!!.getChargepoints(refData, bounds, zoom, filters)
+
+            emit(result)
+        }
+    }
+
+    fun getChargepointsRadius(
+        location: LatLng,
+        radius: Int,
+        zoom: Float,
+        filters: FilterValues?
+    ): LiveData<Resource<List<ChargepointListItem>>> {
+        return liveData {
+            val refData = referenceData.await()
+            val result = api.value!!.getChargepointsRadius(refData, location, radius, zoom, filters)
+
+            emit(result)
+        }
+    }
+
+    fun getChargepointDetail(
+        id: Long
+    ): LiveData<Resource<ChargeLocation>> {
+        return liveData {
+            val refData = referenceData.await()
+            val result = api.value!!.getChargepointDetail(refData, id)
+            emit(result)
+        }
+    }
+
+    fun getFilters(sp: StringProvider) = MediatorLiveData<List<Filter<FilterValue>>>().apply {
+        addSource(referenceData) { refData: ReferenceData? ->
+            refData?.let { value = api.value!!.getFilters(refData, sp) }
+        }
+    }
+
+    suspend fun getFiltersAsync(sp: StringProvider): List<Filter<FilterValue>> {
+        val refData = referenceData.await()
+        return api.value!!.getFilters(refData, sp)
+    }
+
+    val chargeCardMap by lazy {
+        referenceData.map { refData: ReferenceData? ->
+            if (refData is GEReferenceData) {
+                refData.chargecards.associate {
+                    it.id to it.convert()
+                }
+            } else {
+                null
+            }
+        }
+    }
 }
--- a/app/src/main/java/net/vonforst/evmap/storage/FilterValueDao.kt
+++ b/app/src/main/java/net/vonforst/evmap/storage/FilterValueDao.kt
@@ -1,31 +1,28 @@
 package net.vonforst.evmap.storage

-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MediatorLiveData
-import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.liveData
 import androidx.room.*
-import net.vonforst.evmap.await
 import net.vonforst.evmap.model.*

@Dao
 abstract class FilterValueDao {
    @Query("SELECT * FROM booleanfiltervalue WHERE profile = :profile AND dataSource = :dataSource")
-    protected abstract fun getBooleanFilterValues(
+    protected abstract suspend fun getBooleanFilterValues(
        profile: Long,
        dataSource: String
-    ): LiveData<List<BooleanFilterValue>>
+    ): List<BooleanFilterValue>

    @Query("SELECT * FROM multiplechoicefiltervalue WHERE profile = :profile AND dataSource = :dataSource")
-    protected abstract fun getMultipleChoiceFilterValues(
+    protected abstract suspend fun getMultipleChoiceFilterValues(
        profile: Long,
        dataSource: String
-    ): LiveData<List<MultipleChoiceFilterValue>>
+    ): List<MultipleChoiceFilterValue>

    @Query("SELECT * FROM sliderfiltervalue WHERE profile = :profile AND dataSource = :dataSource")
-    protected abstract fun getSliderFilterValues(
+    protected abstract suspend fun getSliderFilterValues(
        profile: Long,
        dataSource: String
-    ): LiveData<List<SliderFilterValue>>
+    ): List<SliderFilterValue>

    @Insert(onConflict = OnConflictStrategy.REPLACE)
    protected abstract suspend fun insert(vararg values: BooleanFilterValue)
@@ -54,27 +51,22 @@ abstract class FilterValueDao {
        dataSource: String
    )

-    open fun getFilterValues(filterStatus: Long, dataSource: String): LiveData<List<FilterValue>> =
+    open suspend fun getFilterValuesAsync(
+        filterStatus: Long,
+        dataSource: String
+    ): List<FilterValue> =
        if (filterStatus == FILTERS_DISABLED || filterStatus == FILTERS_FAVORITES) {
-            MutableLiveData(emptyList())
+            emptyList()
        } else {
-            MediatorLiveData<List<FilterValue>>().apply {
-                val sources = listOf(
-                    getBooleanFilterValues(filterStatus, dataSource),
-                    getMultipleChoiceFilterValues(filterStatus, dataSource),
+            getBooleanFilterValues(filterStatus, dataSource) +
+                    getMultipleChoiceFilterValues(filterStatus, dataSource) +
                    getSliderFilterValues(filterStatus, dataSource)
-                )
-                for (source in sources) {
-                    addSource(source) {
-                        val values = sources.map { it.value }
-                        if (values.all { it != null }) {
-                            value = values.filterNotNull().flatten()
-                        }
-                    }
-                }
-            }
        }

+    open fun getFilterValues(filterStatus: Long, dataSource: String) = liveData {
+        emit(getFilterValuesAsync(filterStatus, dataSource))
+    }
+
    @Transaction
    open suspend fun insert(vararg values: FilterValue) {
        values.forEach {
@@ -98,7 +90,7 @@ abstract class FilterValueDao {
        if (filterStatus == FILTERS_CUSTOM) return

        deleteFilterValuesForProfile(FILTERS_CUSTOM, dataSource)
-        val values = getFilterValues(filterStatus, dataSource).await().onEach {
+        val values = getFilterValuesAsync(filterStatus, dataSource).onEach {
            it.profile = FILTERS_CUSTOM
        }
        insert(*values.toTypedArray())
--- a/app/src/main/java/net/vonforst/evmap/storage/GEReferenceDataDao.kt
+++ b/app/src/main/java/net/vonforst/evmap/storage/GEReferenceDataDao.kt
@@ -87,6 +87,7 @@ class GEReferenceDataRepository(
        val networks = dao.getAllNetworks()
        val chargeCards = dao.getAllChargeCards()
        return MediatorLiveData<GEReferenceData>().apply {
+            value = null
            listOf(chargeCards, networks, plugs).map { source ->
                addSource(source) { _ ->
                    val p = plugs.value ?: return@addSource
--- a/app/src/main/java/net/vonforst/evmap/storage/OCMReferenceDataDao.kt
+++ b/app/src/main/java/net/vonforst/evmap/storage/OCMReferenceDataDao.kt
@@ -79,6 +79,7 @@ class OCMReferenceDataRepository(
        val countries = dao.getAllCountries()
        val operators = dao.getAllOperators()
        return MediatorLiveData<OCMReferenceData>().apply {
+            value = null
            listOf(countries, connectionTypes, operators).map { source ->
                addSource(source) { _ ->
                    val ct = connectionTypes.value
--- a/app/src/main/java/net/vonforst/evmap/storage/PreferenceDataSource.kt
+++ b/app/src/main/java/net/vonforst/evmap/storage/PreferenceDataSource.kt
@@ -75,8 +75,15 @@ class PreferenceDataSource(val context: Context) {
        }


-    val language: String
-        get() = sp.getString("language", "default")!!
+    /**
+     * Sets app language. Will be removed and set to null with the next update because storage is
+     * handled by AppCompat.
+     */
+    var language: String?
+        get() = sp.getString("language", null)
+        set(lang) {
+            sp.edit().putString("language", lang).apply()
+        }

    val darkmode: String
        get() = sp.getString("darkmode", "default")!!
--- a/app/src/main/java/net/vonforst/evmap/ui/AnimationUtils.kt
+++ b/app/src/main/java/net/vonforst/evmap/ui/AnimationUtils.kt
@@ -32,7 +32,7 @@ fun View.exitCircularReveal(block: () -> Unit) {
        duration = 350
        interpolator = DecelerateInterpolator(1f)
        addListener(object : AnimatorListenerAdapter() {
-            override fun onAnimationEnd(animation: Animator?) {
+            override fun onAnimationEnd(animation: Animator) {
                visibility = View.INVISIBLE
                block()
                super.onAnimationEnd(animation)
--- a/app/src/main/java/net/vonforst/evmap/ui/ConfigurationUtils.kt
+++ b/app/src/main/java/net/vonforst/evmap/ui/ConfigurationUtils.kt
@@ -0,0 +1,37 @@
+package net.vonforst.evmap.ui
+
+import androidx.appcompat.app.AppCompatDelegate
+import androidx.core.os.LocaleListCompat
+import net.vonforst.evmap.BuildConfig
+import net.vonforst.evmap.storage.PreferenceDataSource
+
+fun updateNightMode(prefs: PreferenceDataSource) {
+    AppCompatDelegate.setDefaultNightMode(
+        when (prefs.darkmode) {
+            "on" -> AppCompatDelegate.MODE_NIGHT_YES
+            "off" -> AppCompatDelegate.MODE_NIGHT_NO
+            else -> AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
+        }
+    )
+}
+
+fun updateAppLocale(language: String) {
+    AppCompatDelegate.setApplicationLocales(
+        if (language in listOf("", "default")) {
+            LocaleListCompat.getEmptyLocaleList()
+        } else {
+            LocaleListCompat.forLanguageTags(language)
+        }
+    )
+}
+
+fun getAppLocale(): String? {
+    val locales = AppCompatDelegate.getApplicationLocales()
+    return if (locales.isEmpty) {
+        "default"
+    } else {
+        val arr = Array(locales.size()) { locales.get(it)!!.toLanguageTag() }
+        LocaleListCompat.forLanguageTags(BuildConfig.supportedLocales).getFirstMatch(arr)
+            ?.toLanguageTag()
+    }
+}
--- a/app/src/main/java/net/vonforst/evmap/ui/Dialogs.kt
+++ b/app/src/main/java/net/vonforst/evmap/ui/Dialogs.kt
@@ -69,7 +69,7 @@ abstract class MaterialDialogFragment : AppCompatDialogFragment() {
    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
        val dialog = MaterialAlertDialogBuilder(requireContext(), theme).apply {
            dialogView =
-                onCreateView(LayoutInflater.from(requireContext()), null, savedInstanceState)!!
+                createView(LayoutInflater.from(requireContext()), null, savedInstanceState)

            setView(dialogView)
        }.create()
@@ -77,6 +77,12 @@ abstract class MaterialDialogFragment : AppCompatDialogFragment() {
        return dialog
    }

+    abstract fun createView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View
+
    abstract fun initView(view: View, savedInstanceState: Bundle?)

    override fun getView(): View {
--- a/app/src/main/java/net/vonforst/evmap/ui/NightModeUtils.kt
+++ b/app/src/main/java/net/vonforst/evmap/ui/NightModeUtils.kt
@@ -1,14 +0,0 @@
-package net.vonforst.evmap.ui
-
-import androidx.appcompat.app.AppCompatDelegate
-import net.vonforst.evmap.storage.PreferenceDataSource
-
-fun updateNightMode(prefs: PreferenceDataSource) {
-    AppCompatDelegate.setDefaultNightMode(
-        when (prefs.darkmode) {
-            "on" -> AppCompatDelegate.MODE_NIGHT_YES
-            "off" -> AppCompatDelegate.MODE_NIGHT_NO
-            else -> AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
-        }
-    )
-}
--- a/app/src/main/java/net/vonforst/evmap/utils/LocaleContextWrapper.kt
+++ b/app/src/main/java/net/vonforst/evmap/utils/LocaleContextWrapper.kt
@@ -1,41 +0,0 @@
-package net.vonforst.evmap.utils
-
-import android.content.Context
-import android.content.ContextWrapper
-import android.content.res.Configuration
-import android.os.Build
-import androidx.core.os.ConfigurationCompat
-import java.util.*
-
-
-class LocaleContextWrapper(base: Context?) : ContextWrapper(base) {
-    companion object {
-        fun wrap(context: Context, language: String): ContextWrapper {
-            val sysConfig: Configuration = context.applicationContext.resources.configuration
-            val appConfig: Configuration = context.resources.configuration
-
-            if (language == "" || language == "default") {
-                // set default locale
-                Locale.setDefault(ConfigurationCompat.getLocales(sysConfig)[0])
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-                    appConfig.setLocales(sysConfig.locales)
-                } else {
-                    @Suppress("DEPRECATION")
-                    appConfig.locale = sysConfig.locale
-                }
-            } else {
-                // set selected locale
-                val locale = Locale(language)
-                Locale.setDefault(locale)
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-                    appConfig.setLocale(locale)
-                } else {
-                    @Suppress("DEPRECATION")
-                    appConfig.locale = locale
-                }
-            }
-
-            return LocaleContextWrapper(context.createConfigurationContext(appConfig))
-        }
-    }
-}
--- a/app/src/main/java/net/vonforst/evmap/viewmodel/ChargepriceViewModel.kt
+++ b/app/src/main/java/net/vonforst/evmap/viewmodel/ChargepriceViewModel.kt
@@ -169,7 +169,7 @@ class ChargepriceViewModel(
                            .sortedBy { it.chargepointPrices.first().price }
                            .sortedByDescending {
                                prefs.chargepriceMyTariffsAll ||
-                                        myTariffs != null && it.tariff?.id in myTariffs
+                                        myTariffs != null && it.tariffId in myTariffs
                            }
                        )
                    }
--- a/app/src/main/java/net/vonforst/evmap/viewmodel/Common.kt
+++ b/app/src/main/java/net/vonforst/evmap/viewmodel/Common.kt
@@ -1,45 +1,15 @@
 package net.vonforst.evmap.viewmodel

-import android.content.Context
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MediatorLiveData
-import kotlinx.coroutines.CoroutineScope
-import net.vonforst.evmap.api.ChargepointApi
-import net.vonforst.evmap.api.goingelectric.GoingElectricApiWrapper
-import net.vonforst.evmap.api.openchargemap.OpenChargeMapApiWrapper
-import net.vonforst.evmap.model.*
-import net.vonforst.evmap.storage.*
+import androidx.lifecycle.switchMap
+import net.vonforst.evmap.model.Filter
+import net.vonforst.evmap.model.FilterValue
+import net.vonforst.evmap.model.FilterValues
+import net.vonforst.evmap.model.FilterWithValue
+import net.vonforst.evmap.storage.FilterValueDao
 import kotlin.reflect.full.cast

-fun ChargepointApi<ReferenceData>.getReferenceData(
-    scope: CoroutineScope,
-    ctx: Context
-): LiveData<out ReferenceData> {
-    val db = AppDatabase.getInstance(ctx)
-    val prefs = PreferenceDataSource(ctx)
-    return when (this) {
-        is GoingElectricApiWrapper -> {
-            GEReferenceDataRepository(
-                this,
-                scope,
-                db.geReferenceDataDao(),
-                prefs
-            ).getReferenceData()
-        }
-        is OpenChargeMapApiWrapper -> {
-            OCMReferenceDataRepository(
-                this,
-                scope,
-                db.ocmReferenceDataDao(),
-                prefs
-            ).getReferenceData()
-        }
-        else -> {
-            throw RuntimeException("no reference data implemented")
-        }
-    }
-}
-
 fun filtersWithValue(
    filters: LiveData<List<Filter<FilterValue>>>,
    filterValues: LiveData<List<FilterValue>>
@@ -49,23 +19,21 @@ fun filtersWithValue(
            addSource(it) {
                val f = filters.value ?: return@addSource
                val values = filterValues.value ?: return@addSource
-                value = f.map { filter ->
-                    val value =
-                        values.find { it.key == filter.key } ?: filter.defaultValue()
-                    FilterWithValue(filter, filter.valueClass.cast(value))
-                }
+                value = filtersWithValue(f, values)
            }
        }
    }

+fun filtersWithValue(
+    filters: List<Filter<FilterValue>>,
+    values: List<FilterValue>
+) = filters.map { filter ->
+    val value =
+        values.find { it.key == filter.key } ?: filter.defaultValue()
+    FilterWithValue(filter, filter.valueClass.cast(value))
+}
+
 fun FilterValueDao.getFilterValues(filterStatus: LiveData<Long>, dataSource: String) =
-    MediatorLiveData<List<FilterValue>>().apply {
-        var source: LiveData<List<FilterValue>>? = null
-        addSource(filterStatus) { status ->
-            source?.let { removeSource(it) }
-            source = getFilterValues(status, dataSource)
-            addSource(source!!) { result ->
-                value = result
-            }
-        }
+    filterStatus.switchMap {
+        getFilterValues(it, dataSource)
    }
--- a/app/src/main/java/net/vonforst/evmap/viewmodel/FilterViewModel.kt
+++ b/app/src/main/java/net/vonforst/evmap/viewmodel/FilterViewModel.kt
@@ -8,21 +8,17 @@ import net.vonforst.evmap.api.createApi
 import net.vonforst.evmap.api.stringProvider
 import net.vonforst.evmap.model.*
 import net.vonforst.evmap.storage.AppDatabase
+import net.vonforst.evmap.storage.ChargeLocationsRepository
 import net.vonforst.evmap.storage.FilterProfile
 import net.vonforst.evmap.storage.PreferenceDataSource


 class FilterViewModel(application: Application) : AndroidViewModel(application) {
-    private var db = AppDatabase.getInstance(application)
-    private var prefs = PreferenceDataSource(application)
-    private var api: ChargepointApi<ReferenceData> = createApi(prefs.dataSource, application)
-
-    private val referenceData = api.getReferenceData(viewModelScope, application)
-    private val filters = MediatorLiveData<List<Filter<FilterValue>>>().apply {
-        addSource(referenceData) { data ->
-            value = api.getFilters(data, application.stringProvider())
-        }
-    }
+    private val db = AppDatabase.getInstance(application)
+    private val prefs = PreferenceDataSource(application)
+    private val api: ChargepointApi<ReferenceData> = createApi(prefs.dataSource, application)
+    private val repo = ChargeLocationsRepository(api, viewModelScope, db, prefs)
+    private val filters = repo.getFilters(application.stringProvider())

    private val filterValues: LiveData<List<FilterValue>> by lazy {
        db.filterValueDao().getFilterValues(FILTERS_CUSTOM, prefs.dataSource)
--- a/app/src/main/java/net/vonforst/evmap/viewmodel/MapViewModel.kt
+++ b/app/src/main/java/net/vonforst/evmap/viewmodel/MapViewModel.kt
@@ -7,29 +7,24 @@ import com.car2go.maps.AnyMap
 import com.car2go.maps.model.LatLng
 import com.car2go.maps.model.LatLngBounds
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import kotlinx.parcelize.Parcelize
-import net.vonforst.evmap.api.ChargepointApi
 import net.vonforst.evmap.api.availability.ChargeLocationStatus
 import net.vonforst.evmap.api.availability.getAvailability
 import net.vonforst.evmap.api.createApi
 import net.vonforst.evmap.api.goingelectric.GEChargepoint
-import net.vonforst.evmap.api.goingelectric.GEReferenceData
-import net.vonforst.evmap.api.goingelectric.GoingElectricApiWrapper
 import net.vonforst.evmap.api.openchargemap.OCMConnection
 import net.vonforst.evmap.api.openchargemap.OCMReferenceData
-import net.vonforst.evmap.api.openchargemap.OpenChargeMapApiWrapper
 import net.vonforst.evmap.api.stringProvider
 import net.vonforst.evmap.autocomplete.PlaceWithBounds
 import net.vonforst.evmap.model.*
 import net.vonforst.evmap.storage.AppDatabase
+import net.vonforst.evmap.storage.ChargeLocationsRepository
 import net.vonforst.evmap.storage.FilterProfile
 import net.vonforst.evmap.storage.PreferenceDataSource
 import net.vonforst.evmap.ui.cluster
 import net.vonforst.evmap.utils.distanceBetween
-import java.io.IOException

@Parcelize
 data class MapPosition(val bounds: LatLngBounds, val zoom: Float) : Parcelable
@@ -44,16 +39,19 @@ internal fun getClusterDistance(zoom: Float): Int? {

 class MapViewModel(application: Application, private val state: SavedStateHandle) :
    AndroidViewModel(application) {
-    val apiType: Class<ChargepointApi<ReferenceData>>
-        get() = api.value!!.javaClass
+    val apiId: String
+        get() = repo.api.value!!.id
    val apiName: String
-        get() = api.value!!.getName()
+        get() = repo.api.value!!.name

-    private var db = AppDatabase.getInstance(application)
-    private var prefs = PreferenceDataSource(application)
-    private var api = MutableLiveData<ChargepointApi<ReferenceData>>().apply {
-        value = createApi(prefs.dataSource, application)
-    }
+    private val db = AppDatabase.getInstance(application)
+    private val prefs = PreferenceDataSource(application)
+    private val repo = ChargeLocationsRepository(
+        createApi(prefs.dataSource, application),
+        viewModelScope,
+        db,
+        prefs
+    )

    val bottomSheetState: MutableLiveData<Int> by lazy {
        state.getLiveData("bottomSheetState")
@@ -71,39 +69,20 @@ class MapViewModel(application: Application, private val state: SavedStateHandle
            }
        }
    }
-    private val filterValues: LiveData<List<FilterValue>> =
+    private val filterValues: LiveData<List<FilterValue>> = repo.api.switchMap {
        db.filterValueDao().getFilterValues(filterStatus, prefs.dataSource)
-    private val referenceData =
-        Transformations.switchMap(api) { it.getReferenceData(viewModelScope, application) }
-    private val filters = Transformations.map(referenceData) {
-        api.value!!.getFilters(
-            it,
-            application.stringProvider()
-        )
    }
+    private val filters = repo.getFilters(application.stringProvider())

    private val filtersWithValue: LiveData<FilterValues> by lazy {
        filtersWithValue(filters, filterValues)
    }

-    val filterProfiles: LiveData<List<FilterProfile>> by lazy {
+    val filterProfiles: LiveData<List<FilterProfile>> = repo.api.switchMap {
        db.filterProfileDao().getProfiles(prefs.dataSource)
    }

-    val chargeCardMap: LiveData<Map<Long, ChargeCard>> by lazy {
-        MediatorLiveData<Map<Long, ChargeCard>>().apply {
-            value = null
-            addSource(referenceData) { data ->
-                value = if (data is GEReferenceData) {
-                    data.chargecards.map {
-                        it.id to it.convert()
-                    }.toMap()
-                } else {
-                    null
-                }
-            }
-        }
-    }
+    val chargeCardMap = repo.chargeCardMap

    val filtersCount: LiveData<Int> by lazy {
        MediatorLiveData<Int>().apply {
@@ -121,7 +100,7 @@ class MapViewModel(application: Application, private val state: SavedStateHandle
                value = Resource.loading(emptyList())
                // this is not automatically updated with mapPosition, as we only want to update
                // when map is idle.
-                listOf(filtersWithValue, referenceData).forEach {
+                listOf(filtersWithValue, repo.api).forEach {
                    addSource(it) {
                        reloadChargepoints()
                    }
@@ -141,28 +120,17 @@ class MapViewModel(application: Application, private val state: SavedStateHandle
    val chargerSparse: MutableLiveData<ChargeLocation> by lazy {
        state.getLiveData("chargerSparse")
    }
-    val chargerDetails: MediatorLiveData<Resource<ChargeLocation>> by lazy {
-        MediatorLiveData<Resource<ChargeLocation>>().apply {
-            value = state["chargerDetails"]
-            listOf(chargerSparse, referenceData).forEach {
-                addSource(it) { _ ->
-                    val charger = chargerSparse.value
-                    val refData = referenceData.value
-                    if (charger != null && refData != null) {
-                        if (charger.id != value?.data?.id) {
-                            loadChargerDetails(charger, refData)
-                        }
-                    } else {
-                        value = null
-                    }
-                }
-            }
-            observeForever {
-                // persist data in case fragment gets recreated
-                state["chargerDetails"] = it
-            }
+    val chargerDetails: LiveData<Resource<ChargeLocation>> = chargerSparse.switchMap { charger ->
+        charger?.id?.let {
+            repo.getChargepointDetail(it)
+        }
+    }.apply {
+        observeForever { chargerDetail ->
+            // persist data in case fragment gets recreated
+            state["chargerDetails"] = chargerDetail
        }
    }
+
    val charger: MediatorLiveData<Resource<ChargeLocation>> by lazy {
        MediatorLiveData<Resource<ChargeLocation>>().apply {
            addSource(chargerDetails) {
@@ -267,7 +235,9 @@ class MapViewModel(application: Application, private val state: SavedStateHandle

    fun reloadPrefs() {
        filterStatus.value = prefs.filterStatus
-        api.value = createApi(prefs.dataSource, getApplication())
+        if (prefs.dataSource != apiId) {
+            repo.api.value = createApi(prefs.dataSource, getApplication())
+        }
    }

    fun toggleFilters() {
@@ -307,8 +277,7 @@ class MapViewModel(application: Application, private val state: SavedStateHandle
    fun reloadChargepoints() {
        val pos = mapPosition.value ?: return
        val filters = filtersWithValue.value ?: return
-        val referenceData = referenceData.value ?: return
-        chargepointLoader(Triple(pos, filters, referenceData))
+        chargepointLoader(pos to filters)
    }

    private val miniMarkerThreshold = 13f
@@ -335,17 +304,16 @@ class MapViewModel(application: Application, private val state: SavedStateHandle
        }
    }.distinctUntilChanged()

+    private var chargepointsInternal: LiveData<Resource<List<ChargepointListItem>>>? = null
    private var chargepointLoader =
        throttleLatest(
            500L,
            viewModelScope
-        ) { data: Triple<MapPosition, FilterValues, ReferenceData> ->
+        ) { data: Pair<MapPosition, FilterValues> ->
            chargepoints.value = Resource.loading(chargepoints.value?.data)

            val mapPosition = data.first
            val filters = data.second
-            val api = api.value!!
-            val refData = data.third

            if (filterStatus.value == FILTERS_FAVORITES) {
                // load favorites from local DB
@@ -368,41 +336,40 @@ class MapViewModel(application: Application, private val state: SavedStateHandle
                return@throttleLatest
            }

-            if (api is GoingElectricApiWrapper) {
-                val chargeCardsVal = filters.getMultipleChoiceValue("chargecards")!!
-                filteredChargeCards.value =
-                    if (chargeCardsVal.all) null else chargeCardsVal.values.map { it.toLong() }
-                        .toSet()
+            val result = repo.getChargepoints(mapPosition.bounds, mapPosition.zoom, filters)
+            chargepointsInternal?.let { chargepoints.removeSource(it) }
+            chargepointsInternal = result
+            chargepoints.addSource(result) {
+                chargepoints.value = it

-                val connectorsVal = filters.getMultipleChoiceValue("connectors")!!
-                filteredConnectors.value =
-                    if (connectorsVal.all) null else connectorsVal.values.map {
-                        GEChargepoint.convertTypeFromGE(it)
-                    }.toSet()
-                filteredMinPower.value = filters.getSliderValue("min_power")
-            } else if (api is OpenChargeMapApiWrapper) {
-                val connectorsVal = filters.getMultipleChoiceValue("connectors")!!
-                filteredConnectors.value =
-                    if (connectorsVal.all) null else connectorsVal.values.map {
-                        OCMConnection.convertConnectionTypeFromOCM(
-                            it.toLong(),
-                            refData as OCMReferenceData
-                        )
-                    }.toSet()
-                filteredMinPower.value = filters.getSliderValue("min_power")
-            } else {
-                filteredConnectors.value = null
-                filteredMinPower.value = null
-                filteredChargeCards.value = null
+                if (apiId == "going_electric") {
+                    val chargeCardsVal = filters.getMultipleChoiceValue("chargecards")!!
+                    filteredChargeCards.value =
+                        if (chargeCardsVal.all) null else chargeCardsVal.values.map { it.toLong() }
+                            .toSet()
+
+                    val connectorsVal = filters.getMultipleChoiceValue("connectors")!!
+                    filteredConnectors.value =
+                        if (connectorsVal.all) null else connectorsVal.values.map {
+                            GEChargepoint.convertTypeFromGE(it)
+                        }.toSet()
+                    filteredMinPower.value = filters.getSliderValue("min_power")
+                } else if (apiId == "open_charge_map") {
+                    val connectorsVal = filters.getMultipleChoiceValue("connectors")!!
+                    filteredConnectors.value =
+                        if (connectorsVal.all) null else connectorsVal.values.map {
+                            OCMConnection.convertConnectionTypeFromOCM(
+                                it.toLong(),
+                                repo.referenceData.value!! as OCMReferenceData
+                            )
+                        }.toSet()
+                    filteredMinPower.value = filters.getSliderValue("min_power")
+                } else {
+                    filteredConnectors.value = null
+                    filteredMinPower.value = null
+                    filteredChargeCards.value = null
+                }
            }
-
-            var result = api.getChargepoints(refData, mapPosition.bounds, mapPosition.zoom, filters)
-            if (result.status == Status.ERROR && result.data == null) {
-                // keep old results if new data could not be loaded
-                result = Resource.error(result.message, chargepoints.value?.data)
-            }
-
-            chargepoints.value = result
        }

    private suspend fun loadAvailability(charger: ChargeLocation) {
@@ -417,47 +384,12 @@ class MapViewModel(application: Application, private val state: SavedStateHandle
        }
    }

-    private var chargerLoadingTask: Job? = null
-
-    private fun loadChargerDetails(charger: ChargeLocation, referenceData: ReferenceData) {
-        chargerDetails.value = Resource.loading(null)
-        chargerLoadingTask?.cancel()
-        chargerLoadingTask = viewModelScope.launch {
-            try {
-                val chargerDetail = api.value!!.getChargepointDetail(referenceData, charger.id)
-                chargerDetails.value = chargerDetail
-                if (favorites.value?.any { it.charger.id == chargerDetail.data?.id } == true) {
-                    // update data of stored favorite
-                    db.chargeLocationsDao().insert(charger)
-                }
-            } catch (e: IOException) {
-                chargerDetails.value = Resource.error(e.message, null)
-                e.printStackTrace()
+    fun loadChargerById(chargerId: Long) {
+        chargerSparse.value = null
+        repo.getChargepointDetail(chargerId).observeForever { response ->
+            if (response.status == Status.SUCCESS) {
+                chargerSparse.value = response.data
            }
        }
    }
-
-    fun loadChargerById(chargerId: Long) {
-        chargerDetails.value = Resource.loading(null)
-        chargerSparse.value = null
-        referenceData.observeForever(object : Observer<ReferenceData> {
-            override fun onChanged(refData: ReferenceData) {
-                referenceData.removeObserver(this)
-                viewModelScope.launch {
-                    val response = api.value!!.getChargepointDetail(refData, chargerId)
-                    chargerDetails.value = response
-                    if (response.status == Status.SUCCESS) {
-                        chargerSparse.value = response.data
-
-                        if (response.data != null && favorites.value?.any { it.charger.id == response.data.id } == true) {
-                            // update data of stored favorite
-                            db.chargeLocationsDao().insert(response.data)
-                        }
-                    } else {
-                        chargerSparse.value = null
-                    }
-                }
-            }
-        })
-    }
 }
--- a/app/src/main/java/net/vonforst/evmap/viewmodel/Utils.kt
+++ b/app/src/main/java/net/vonforst/evmap/viewmodel/Utils.kt
@@ -4,10 +4,7 @@ import android.os.Parcelable
 import androidx.annotation.MainThread
 import androidx.annotation.Nullable
 import androidx.lifecycle.*
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
+import kotlinx.coroutines.*
 import kotlinx.parcelize.Parcelize
 import kotlinx.parcelize.RawValue
 import java.util.concurrent.atomic.AtomicBoolean
@@ -107,4 +104,41 @@ fun <T> throttleLatest(
            waitingParam = param
        }
    }
+}
+
+public suspend fun <T> LiveData<T>.await(): T {
+    return suspendCancellableCoroutine { continuation ->
+        val observer = object : Observer<T> {
+            override fun onChanged(value: T?) {
+                if (value == null) return
+                removeObserver(this)
+                continuation.resume(value, null)
+            }
+        }
+
+        observeForever(observer)
+
+        continuation.invokeOnCancellation {
+            removeObserver(observer)
+        }
+    }
+}
+
+public suspend fun <T> LiveData<Resource<T>>.awaitFinished(): Resource<T> {
+    return suspendCancellableCoroutine { continuation ->
+        val observer = object : Observer<Resource<T>> {
+            override fun onChanged(value: Resource<T>) {
+                if (value.status != Status.LOADING) {
+                    removeObserver(this)
+                    continuation.resume(value, null)
+                }
+            }
+        }
+
+        observeForever(observer)
+
+        continuation.invokeOnCancellation {
+            removeObserver(observer)
+        }
+    }
 }
--- a/app/src/main/res/drawable/ic_map_marker_charging.xml
+++ b/app/src/main/res/drawable/ic_map_marker_charging.xml
@@ -1,12 +1,15 @@
-<vector android:height="44.11976dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:viewportHeight="368.4"
    android:viewportWidth="233.8"
    android:width="28dp"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M109.8,0h13.6c33.9,1.9 67.1,18.5 87.7,45.8c13.5,17.2 21,38.6 22.7,60.3v8.1c-0.8,42.1 -27.7,76.6 -51,109.4c-26.2,37 -50.4,77.3 -57.1,122.9c-1.8,7.7 0.4,18.5 -8.9,22c-2.2,-1.7 -4.7,-3.1 -6.2,-5.4c-2.7,-25.5 -9.1,-50.7 -20,-73.9c-12.3,-27.1 -29.5,-51.6 -47,-75.6C33,199 23,184.2 14.7,168.3c-13,-23.8 -17.9,-51.9 -12.5,-78.6c4.4,-21.1 15.4,-40.6 30.6,-55.7C53.3,14 81.1,1.8 109.8,0z" />
-    <path
-        android:fillColor="#808080"
-        android:pathData="M90.9,57.3v68.2h18.6v55.8l43.4,-74.4h-24.8l24.8,-49.6H90.9z" />
+    android:height="44.11976dp">
+  <path
+      android:pathData="M117,367.4c-0.4,-0.3 -0.8,-0.6 -1.2,-0.9c-1.6,-1.2 -3.1,-2.3 -4.2,-3.7c-2.9,-26.9 -9.6,-51.7 -20.1,-74c-12.4,-27.3 -30.1,-52.4 -47.1,-75.8c-8.7,-12 -19.8,-27.9 -28.8,-45.2C2.3,143.6 -2.1,115.9 3.2,89.9c4.3,-20.4 15,-40 30.3,-55.2C53.6,15.1 81.5,2.8 109.9,1l13.5,0c34.4,1.9 66.9,18.9 86.9,45.4c12.8,16.3 20.8,37.5 22.5,59.8l0,8c-0.7,38.8 -23.7,70.9 -45.9,101.9c-1.7,2.3 -3.3,4.6 -5,6.9c-24.4,34.5 -50.3,76.1 -57.3,123.3c-0.5,2 -0.7,4.3 -0.9,6.5C123.3,359 122.8,364.9 117,367.4z"
+      android:fillColor="#FFFFFF" />
+  <path
+      android:pathData="M123.3,2c34.1,1.9 66.3,18.8 86.2,45c12.6,16.1 20.5,37.1 22.3,59.1l0,8c-0.7,38.5 -23.6,70.5 -45.7,101.3c-1.7,2.3 -3.3,4.6 -5,6.9c-24.5,34.6 -50.5,76.3 -57.4,123.7c-0.5,2.1 -0.7,4.4 -0.9,6.7c-0.5,5.9 -1,11 -5.8,13.4c-0.2,-0.2 -0.5,-0.4 -0.7,-0.5c-1.5,-1.1 -2.9,-2 -3.8,-3.3c-2.9,-26.9 -9.7,-51.8 -20.1,-74C80,261 62.3,235.8 45.2,212.4c-8.7,-11.9 -19.8,-27.8 -28.8,-45.1C3.3,143.3 -1,115.9 4.2,90.1c4.2,-20.2 14.9,-39.6 30,-54.7C54.2,16 81.7,3.8 109.9,2H123.3M123.4,0h-13.6c-28.7,1.8 -56.5,14 -77,34C17.6,49.1 6.6,68.6 2.2,89.7c-5.4,26.7 -0.5,54.8 12.5,78.6C23,184.2 33,199 43.6,213.6c17.5,24 34.7,48.5 47,75.6c10.9,23.2 17.3,48.4 20,73.9c1.5,2.3 4,3.7 6.2,5.4c9.3,-3.5 7.1,-14.3 8.9,-22c6.7,-45.6 30.9,-85.9 57.1,-122.9c23.3,-32.8 50.2,-67.3 51,-109.4v-8.1c-1.7,-21.7 -9.2,-43.1 -22.7,-60.3C190.5,18.5 157.3,1.9 123.4,0L123.4,0z"
+      android:fillColor="#808080" />
+  <path
+      android:pathData="M90.9,57.3v68.2h18.6v55.8l43.4,-74.4h-24.8l24.8,-49.6C152.9,57.3 90.9,57.3 90.9,57.3z"
+      android:fillColor="#808080" />
 </vector>
--- a/app/src/main/res/drawable/ic_map_marker_charging_mini.xml
+++ b/app/src/main/res/drawable/ic_map_marker_charging_mini.xml
@@ -4,8 +4,8 @@
    android:height="16dp"
    xmlns:android="http://schemas.android.com/apk/res/android">
    <path
-        android:fillColor="#dddddd"
-        android:pathData="M12,12m-8.5,0a8.5,8.5 0,1 1,17 0a8.5,8.5 0,1 1,-17 0" />
+        android:fillColor="#808080"
+        android:pathData="M12,12m-9,0a9,9 0,1 1,18 0a9,9 0,1 1,-18 0" />
    <path
        android:fillColor="@android:color/white"
        android:pathData="M12,12m-7.5,0a7.5,7.5 0,1 1,15 0a7.5,7.5 0,1 1,-15 0" />
--- a/app/src/main/res/drawable/ic_map_marker_charging_multiple.xml
+++ b/app/src/main/res/drawable/ic_map_marker_charging_multiple.xml
@@ -12,6 +12,9 @@
  <path
      android:fillColor="#B5B5B5"
      android:pathData="M122.2,101.9h16.7h5.7l22.3,-44.6c0,0 -10.2,0 -22.4,0l-1.1,2.2L122.2,101.9z" />
+  <path
+      android:pathData="M123.3,2c34.1,1.9 66.3,18.8 86.2,45c12.6,16.1 20.5,37.1 22.3,59.1l0,8c-0.7,38.5 -23.6,70.5 -45.7,101.3c-1.7,2.3 -3.3,4.6 -5,6.9c-24.5,34.6 -50.5,76.3 -57.4,123.7c-0.5,2.1 -0.7,4.4 -0.9,6.7c-0.5,5.9 -1,11 -5.8,13.4c-0.2,-0.2 -0.5,-0.4 -0.7,-0.5c-1.5,-1.1 -2.9,-2 -3.8,-3.3c-2.9,-26.9 -9.7,-51.8 -20.1,-74C80,261 62.3,235.8 45.2,212.4c-8.7,-11.9 -19.8,-27.8 -28.8,-45.1C3.3,143.3 -1,115.9 4.2,90.1c4.2,-20.2 14.9,-39.6 30,-54.7C54.2,16 81.7,3.8 109.9,2H123.3M123.4,0h-13.6c-28.7,1.8 -56.5,14 -77,34C17.6,49.1 6.6,68.6 2.2,89.7c-5.4,26.7 -0.5,54.8 12.5,78.6C23,184.2 33,199 43.6,213.6c17.5,24 34.7,48.5 47,75.6c10.9,23.2 17.3,48.4 20,73.9c1.5,2.3 4,3.7 6.2,5.4c9.3,-3.5 7.1,-14.3 8.9,-22c6.7,-45.6 30.9,-85.9 57.1,-122.9c23.3,-32.8 50.2,-67.3 51,-109.4v-8.1c-1.7,-21.7 -9.2,-43.1 -22.7,-60.3C190.5,18.5 157.3,1.9 123.4,0L123.4,0z"
+      android:fillColor="#808080" />
  <path
      android:fillColor="#808080"
      android:pathData="M138.9,57.3c-9.7,0 -19.8,0 -26.4,0c-2.5,0 -5.1,0 -7.6,0c-8.2,0 -16.1,0 -21.4,0c-4.1,0 -6.6,0 -6.6,0v68.2h18.6v55.8l43.4,-74.4h-24.8L138.9,57.3z" />
--- a/app/src/main/res/layout/item_chargeprice.xml
+++ b/app/src/main/res/layout/item_chargeprice.xml
@@ -37,7 +37,7 @@
        android:paddingTop="8dp"
        android:paddingRight="16dp"
        android:paddingBottom="8dp"
-        android:background="@{BindingAdaptersKt.tariffBackground(context,!myTariffsAll &amp;&amp; myTariffs.contains(item.tariff.getId()), item.branding.backgroundColor)}">
+        android:background="@{BindingAdaptersKt.tariffBackground(context,!myTariffsAll &amp;&amp; myTariffs.contains(item.tariffId), item.branding.backgroundColor)}">

        <TextView
            android:id="@+id/txtTariff"
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -3,8 +3,8 @@
    <string name="app_name">EVMap</string>
    <string name="title_activity_maps">EVMap</string>
    <string name="connectors">Anschlüsse</string>
-    <string name="no_maps_app_found">Keine Navigations-App gefunden</string>
-    <string name="no_browser_app_found">Kein Webbrowser gefunden</string>
+    <string name="no_maps_app_found">Bitte installiere eine Navigations-App</string>
+    <string name="no_browser_app_found">Bitte installiere einen Webbrowser</string>
    <string name="address">Adresse</string>
    <string name="operator">Betreiber</string>
    <string name="network">Verbund</string>
@@ -19,10 +19,12 @@
    <string name="cost_detail"><![CDATA[<b>Laden:</b> %1$s · <b>Parken:</b> %2$s]]></string>
    <string name="cost_detail_charging"><![CDATA[<b>%s laden</b>]]></string>
    <string name="cost_detail_parking"><![CDATA[<b>%s parken</b>]]></string>
-    <string name="free">Kostenlos</string>
-    <string name="paid">Kostenpflichtig</string>
-    <string name="amenities">Ladeweile</string>
-    <string name="general_info">Allgemeine Hinweise</string>
+    <string name="charging_free">Kostenlos</string>
+    <string name="charging_paid">Kostenpflichtig</string>
+    <string name="parking_free">Kostenlos</string>
+    <string name="parking_paid">Kostenpflichtig</string>
+    <string name="amenities">Ausstattung</string>
+    <string name="general_info">Allgemein</string>
    <string name="realtime_data_unavailable">Echtzeitstatus nicht verfügbar</string>
    <string name="realtime_data_loading">Prüfe Echtzeitstatus…</string>
    <string name="realtime_data_source">Quelle Echtzeitdaten (beta): %s</string>
@@ -35,7 +37,7 @@
    <string name="about">Über EVMap</string>
    <string name="version">Version</string>
    <string name="github_link_title">Quellcode</string>
-    <string name="oss_licenses">Open Source-Lizenzen</string>
+    <string name="oss_licenses">Lizenzen</string>
    <string name="settings">Einstellungen</string>
    <string name="settings_ui">Oberfläche</string>
    <string name="settings_map">Karte</string>
@@ -43,10 +45,10 @@
    <string name="copyright_summary">©2020–2022 Johan von Forstner</string>
    <string name="other">Sonstiges</string>
    <string name="privacy">Datenschutzerklärung</string>
-    <string name="fav_add">Zu Favoriten hinzufügen</string>
+    <string name="fav_add">Als Favorit speichern</string>
    <string name="fav_remove">Aus Favoriten entfernen</string>
-    <string name="pref_navigate_use_maps">Navigation sofort starten</string>
-    <string name="pref_navigate_use_maps_on">Navigationsbutton startet direkt Google Maps-Navigation</string>
+    <string name="pref_navigate_use_maps">Sofort navigieren</string>
+    <string name="pref_navigate_use_maps_on">Navigationsbutton startet Routenführung mit Google Maps</string>
    <string name="pref_navigate_use_maps_off">Navigationsbutton startet Karten-App mit Position der Ladesäule</string>
    <string name="coordinates">Koordinaten</string>
    <string name="share">Teilen</string>
@@ -57,7 +59,7 @@
    <string name="filter_connectors">Anschlüsse</string>
    <string name="plug_type_1">Typ 1</string>
    <string name="plug_type_2">Typ 2</string>
-    <string name="plug_type_3">Typ 3a</string>
+    <string name="plug_type_3">Typ 3A</string>
    <string name="plug_ccs">CCS</string>
    <string name="plug_schuko">Schuko</string>
    <string name="plug_chademo">CHAdeMO</string>
@@ -69,18 +71,17 @@
    <string name="none">keine</string>
    <string name="show_more">mehr…</string>
    <string name="show_less">weniger…</string>
-    <string name="favorites_empty_state">Wenn du Ladestationen als Favorit markierst, tauchen sie hier auf.</string>
+    <string name="favorites_empty_state">Als Favorit gespeicherte Ladestationen tauchen hier auf</string>
    <string name="donate">Spenden</string>
-    <string name="donation_successful">Vielen Dank! ❤️</string>
-    <string name="donation_failed">Etwas ist schiefgelaufen. 😕</string>
+    <string name="donation_successful">Vielen Dank ❤️</string>
+    <string name="donation_failed">Etwas ist schiefgelaufen 😕</string>
    <string name="map_type_normal">Standard</string>
    <string name="map_type_satellite">Satellit</string>
    <string name="map_type_terrain">Gelände</string>
    <string name="map_type">Kartentyp</string>
    <string name="map_details">Kartendetails</string>
    <string name="map_traffic">Verkehr</string>
-    <string name="faq">FAQ</string>
-    <string name="faq_desc">Häufig gestellte Fragen</string>
+    <string name="faq">Häufig gestellte Fragen</string>
    <string name="menu_filters_active">Filter aktiv</string>
    <string name="filters_activated">Filter aktiviert</string>
    <string name="filters_deactivated">Filter deaktiviert</string>
@@ -97,10 +98,8 @@
    <string name="edit">bearbeiten</string>
    <string name="cancel">Abbrechen</string>
    <string name="ok">OK</string>
-    <string name="pref_language">Sprache</string>
-    <string name="pref_language_summary">App-Sprache ändern</string>
+    <string name="pref_language">App-Sprache</string>
    <string name="pref_darkmode">Dunkles Design</string>
-    <string name="pref_darkmode_summary">Einstellen, wann der Nachtmodus genutzt wird</string>
    <string name="connection_error">Ladesäulen konnten nicht geladen werden</string>
    <string name="retry">Wiederholen</string>
    <string name="filter_open_247">24 Stunden geöffnet</string>
@@ -150,16 +149,16 @@
    <string name="delete">Löschen</string>
    <string name="save_as_profile">Als Profil speichern</string>
    <string name="save_profile_enter_name">Geben Sie den Namen des Filterprofils ein:</string>
-    <string name="filterprofiles_empty_state">Du hast noch keine Filterprofile gespeichert.</string>
+    <string name="filterprofiles_empty_state">Du hast keine Filterprofile gespeichert</string>
    <string name="welcome_to_evmap">Willkommen bei EVMap</string>
-    <string name="welcome_1">Finde Ladestationen für Elektroautos in deiner Nähe.</string>
+    <string name="welcome_1">Finde Ladestationen für Elektroautos in deiner Nähe</string>
    <string name="welcome_2_title">Auf die Leistung kommt es an</string>
-    <string name="welcome_2">Die Farbe einer Ladestation auf der Karte zeigt dir die maximale Ladeleistung.</string>
-    <string name="welcome_2_detail">Du kannst die Farben im Menü unter “Über EVMap → FAQ” erneut ansehen)</string>
+    <string name="welcome_2">Die Farbe einer Ladestation zeigt dir die maximale Ladeleistung</string>
+    <string name="welcome_2_detail">Die Farben kannst du unter “Über EVMap → Häufig gestellte Fragen” erneut ansehen</string>
    <string name="donation_dialog_title">Danke, dass du EVMap nutzt!</string>
-    <string name="donation_dialog_detail">EVMap ist kostenlos und Open Source, ich entwickle es in meiner Freizeit. Über GitHub kann jeder zur Weiterentwicklung der App beitragen. Durch die steigende Beliebtheit der App müssen allerdings auch laufende Kosten, z.B. für den Zugriff auf die Datenquellen, gedeckt werden. Daher freue ich mich auch über Spenden in der App oder über GitHub Sponsors.</string>
+    <string name="donation_dialog_detail">EVMap ist kostenlos und Open Source. Über GitHub kann jeder zur Weiterentwicklung der App beitragen. Um die laufenden Kosten für den für die Datenquellen zu decken, freue ich mich auch über Spenden in der App oder über GitHub Sponsors.</string>
    <string name="chargeprice_donation_dialog_title">Du bist ein richtiger Sparfuchs!</string>
-    <string name="chargeprice_donation_dialog_detail">Es sieht so aus, als wenn du den Preisvergleich sehr gern nutzt. Für den Zugang zu den Preisinformationen muss der Entwickler von EVMap eine monatliche Gebühr an die Datenquelle Chargeprice.app zahlen. Um diesen Dienst weiter anbieten zu können, würde ich mich sehr über Spenden freuen.</string>
+    <string name="chargeprice_donation_dialog_detail">Anscheinend nutzt du den Preisvergleich sehr gern. Mit einer Spende für EVMap kannst du helfen, die Kosten für den Datenzugriff zu decken.</string>
    <string name="deleted_filterprofile">„%s” gelöscht</string>
    <string name="undo">Rückgängig</string>
    <string name="rename">Umbenennen</string>
@@ -170,7 +169,7 @@
    </plurals>
    <string name="navigate">Navigieren</string>
    <string name="verified">Verifiziert</string>
-    <string name="verified_desc">Verifiziert von der %s Community – nicht zwangsläufig auch aktuell verfügbar.</string>
+    <string name="verified_desc">Ladestation wurde mindestens einmal von einem Mitglied der %s Community getestet</string>
    <string name="charge_price_format">%1$.2f %2$s</string>
    <string name="charge_price_average_format">⌀ %1$.2f %2$s/kWh</string>
    <string name="charge_price_kwh_format">%1$.2f %2$s/kWh</string>
@@ -180,27 +179,27 @@
    <string name="chargeprice_session_fee">Startgebühr</string>
    <string name="chargeprice_per_kwh">pro kWh</string>
    <string name="chargeprice_per_minute">pro min</string>
-    <string name="chargeprice_blocking_fee">Blockiergeb. >%s</string>
-    <string name="chargeprice_no_tariffs_found">Keine geeigneten Tarife für diese Ladestation bei Chargeprice.app gefunden.</string>
+    <string name="chargeprice_blocking_fee">Blockiergeb. &gt;%s</string>
+    <string name="chargeprice_no_tariffs_found">Keine Tarife für diese Ladestation bei Chargeprice.app gefunden</string>
    <string name="powered_by_chargeprice">powered by Chargeprice</string>
    <string name="chargeprice_base_fee">Fixkosten: %1$.2f %2$s/Monat</string>
    <string name="chargeprice_min_spend">Mindestumsatz: %1$.2f %2$s/Monat</string>
    <string name="settings_chargeprice">Preisvergleich</string>
    <string name="pref_my_vehicle">Meine Fahrzeuge</string>
-    <string name="pref_chargeprice_no_base_fee">Nur Tarife ohne monatliche Gebühren</string>
+    <string name="pref_chargeprice_no_base_fee">Tarife mit monatlichen Gebühren ausschließen</string>
    <string name="pref_chargeprice_show_provider_customer_tariffs">Exklusive Energiekunden-Tarife anzeigen</string>
-    <string name="pref_chargeprice_show_provider_customer_tariffs_summary">Einige Anbieter bieten für ihre Kunden (z.B. Haushaltsstrom, Gas) günstigere Tarife an</string>
-    <string name="chargeprice_select_car_first">Bitte wähle zuerst dein Auto in den Einstellungen aus.</string>
+    <string name="pref_chargeprice_show_provider_customer_tariffs_summary">Einige Energieversorger bieten für ihre Kunden spezielle Tarife an</string>
+    <string name="chargeprice_select_car_first">Bitte wähle zuerst dein Auto in den Einstellungen aus</string>
    <string name="chargeprice_battery_range">Laden von %1$.0f%% bis %2$.0f%%</string>
    <string name="chargeprice_battery_range_from">Laden von</string>
    <string name="chargeprice_battery_range_to">bis</string>
    <string name="chargeprice_stats">(%1$.0f kWh, ca. %2$s, ⌀ %3$.0f kW)</string>
    <string name="chargeprice_vehicle">Fahrzeug</string>
-    <string name="edit_on_goingelectric_info">Falls hier nur eine leere Seite erscheint, logge dich bitte zuerst bei GoingElectric.de ein.</string>
-    <string name="close">schließen</string>
+    <string name="edit_on_goingelectric_info">Logge dich zuerst bei GoingElectric.de ein, falls hier nur eine leere Seite erscheint</string>
+    <string name="close">Schließen</string>
    <string name="chargeprice_title">Preise</string>
    <string name="chargeprice_connection_error">Preise konnten nicht geladen werden</string>
-    <string name="chargeprice_no_compatible_connectors">Keiner der Anschlüsse dieser Ladestation ist mit deinem Fahrzeug kompatibel.</string>
+    <string name="chargeprice_no_compatible_connectors">Kein kompatibler Anschluss an dieser Ladestation</string>
    <string name="pref_chargeprice_currency">Währung</string>
    <string name="pref_my_tariffs">Meine Tarife</string>
    <string name="chargeprice_all_tariffs_selected">alle Tarife ausgewählt</string>
@@ -216,20 +215,20 @@
        <item quantity="other">%d Tarife ausgewählt</item>
    </plurals>
    <string name="unknown_operator">Unbekannter Betreiber</string>
-    <string name="data_sources_description">EVMap unterstützt verschiedene Datenquellen für Ladestationen. Bitte wähle aus, welche du nutzen möchtest. Du kannst sie später in den Einstellungen der App ändern.</string>
+    <string name="data_sources_description">Bitte wähle eine Datenquelle für Ladestationen aus. Du kannst sie später in den Einstellungen der App ändern.</string>
    <string name="data_source_goingelectric">GoingElectric.de</string>
    <string name="data_source_openchargemap">Open Charge Map</string>
-    <string name="data_source_goingelectric_desc">Sehr gute Abdeckung in Deutschland, Österreich, Schweiz und vielen angrenzenden Ländern. Beschreibungen in Deutsch. Von der Community gepflegt.</string>
-    <string name="data_source_openchargemap_desc"><![CDATA[Weltweite Abdeckung mit variierender Qualität. Beschreibungen in Englisch oder Landessprache. Von der Community gepflegt & offizielle Verzeichnisse einiger Länder (z.B. Nordamerika, UK, Frankreich, Norwegen).]]></string>
+    <string name="data_source_goingelectric_desc">Sehr gute Abdeckung in den deutschsprachigen Ländern. Beschreibungen in Deutsch. Von der Community gepflegt.</string>
+    <string name="data_source_openchargemap_desc"><![CDATA[Weltweite Abdeckung mit variierender Qualität. Beschreibungen in Englisch oder Landessprache. Von der Community gepflegt und offizielle Verzeichnisse einiger Länder (z.B. Nordamerika, UK, Frankreich, Norwegen).]]></string>
    <string name="next">weiter</string>
    <string name="get_started">Los geht\'s</string>
    <string name="got_it">Alles klar</string>
    <string name="lets_go">Und los</string>
-    <string name="crash_report_text">Sorry, anscheinend ist EVMap abgestürzt. Bitte schicke einen Fehlerbericht an den Entwickler.</string>
+    <string name="crash_report_text">EVMap ist abgestürzt. Bitte schicke einen Fehlerbericht an den Entwickler.</string>
    <string name="crash_report_comment_prompt">Du kannst unten noch einen Kommentar hinzufügen:</string>
    <string name="powered_by_mapbox">powered by Mapbox</string>
    <string name="pref_search_provider">Anbieter für Ortssuche</string>
-    <string name="pref_search_provider_info"><![CDATA[Die Daten für die Ortssuche, vor allem von Google Maps, sind relativ teuer. Wenn du diese Funktion häufig nutzt, würde ich mich über eine Spende unter \"Über EVMap -> Spenden\" sehr freuen.]]></string>
+    <string name="pref_search_provider_info">Die Daten für die Ortssuche, vor allem von Google Maps, sind relativ teuer. Über eine Spende unter \"Über EVMap -&gt; Spenden\" würde ich mich sehr freuen.</string>
    <string name="github_sponsors">GitHub Sponsors</string>
    <string name="donate_desc">Unterstütze die Weiterentwicklung von EVMap mit einer einmaligen Spende</string>
    <string name="github_sponsors_desc">Unterstütze EVMap über GitHub Sponsors</string>
@@ -245,15 +244,13 @@
    <string name="help">Hilfe</string>
    <string name="settings_android_auto">Android Auto</string>
    <string name="pref_chargeprice_allow_unbalanced_load">Schieflast erlauben</string>
-    <string name="pref_chargeprice_allow_unbalanced_load_summary"><![CDATA[Erlaubt das Laden mit >4.5 kW an AC-Stationen für Autos mit 1-phasigem Lader]]></string>
-    <string name="pref_map_rotate_gestures_enabled">Kartenrotation erlauben</string>
-    <string name="pref_map_rotate_gestures_on">Karte kann mit Zweifingergeste rotiert werden</string>
-    <string name="pref_map_rotate_gestures_off">Karte bleibt fest nach Norden ausgerichtet</string>
+    <string name="pref_chargeprice_allow_unbalanced_load_summary">Einphasiges laden mit mehr als 4.5 kW erlauben</string>
+    <string name="pref_map_rotate_gestures_enabled">Kartenrotation</string>
+    <string name="pref_map_rotate_gestures_on">Karte mit zwei Fingern rotieren</string>
+    <string name="pref_map_rotate_gestures_off">Karte immer nach Norden ausrichten</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>
@@ -269,8 +266,8 @@
    <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>
+    <string name="pref_provider_google_maps">Google Maps</string>
+    <string name="pref_provider_osm_mapbox">OpenStreetMap (Mapbox)</string>
+    <string name="about_contributors">Mitwirkende</string>
+    <string name="about_contributors_text">Dank an alle Mitwirkenden für ihre Beiträge von Code und Übersetzungen für EVMap:</string>
+</resources>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -0,0 +1,276 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="app_name">EVMap</string>
+    <string name="title_activity_maps">EVMap</string>
+    <string name="connectors">Connecteurs</string>
+    <string name="no_maps_app_found">Installez d\'abord une application de navigation</string>
+    <string name="no_browser_app_found">Installez d\'abord un navigateur web</string>
+    <string name="address">Adresse</string>
+    <string name="operator">Opérateur</string>
+    <string name="network">Réseau</string>
+    <string name="hours">Heures d\'ouverture</string>
+    <string name="open_247"><b>Ouvert 24h/24 et 7j/7</b></string>
+    <string name="open_closesat"><b>Ouvert</b> · Ferme à %s</string>
+    <string name="closed_unfmt">Fermé</string>
+    <string name="cost">Coût</string>
+    <string name="closed"><b>Fermé</b></string>
+    <string name="closed_opensat"><b>Fermé</b> · Ouvre à %s</string>
+    <string name="holiday">Jour férié</string>
+    <string name="cost_detail"><b>Recharge :</b> %1$s · <b>Stationnement :</b> %2$s</string>
+    <string name="realtime_data_unavailable">Statut en temps réel non disponible</string>
+    <string name="source">Source : %s</string>
+    <string name="menu_favs">Favoris</string>
+    <string name="menu_filter">Filtre</string>
+    <string name="not_implemented">pas encore mis en œuvre</string>
+    <string name="about">À propos</string>
+    <string name="github_link_title">Code source</string>
+    <string name="settings_ui">Interface</string>
+    <string name="privacy">Confidentialité</string>
+    <string name="fav_add">Enregistrer comme favori</string>
+    <string name="pref_navigate_use_maps">Naviguer maintenant</string>
+    <string name="coordinates">Coordonnées</string>
+    <string name="pref_navigate_use_maps_on">Le bouton de navigation démarre le guidage d\'itinéraire avec Google Maps</string>
+    <string name="share">Partager</string>
+    <string name="plug_chademo">CHAdeMO</string>
+    <string name="plug_supercharger">Superchargeur Tesla</string>
+    <string name="show_less">moins…</string>
+    <string name="favorites_empty_state">Les chargeurs sauvegardés apparaissent ici</string>
+    <string name="donate">Faire un don</string>
+    <string name="map_type_satellite">Satellite</string>
+    <string name="map_type_terrain">Terrain</string>
+    <string name="map_type">Type de carte</string>
+    <string name="map_details">Détails de la carte</string>
+    <string name="map_traffic">Trafic</string>
+    <string name="faq">Foire aux questions</string>
+    <string name="menu_filters_active">Filtres actifs</string>
+    <string name="filters_activated">Filtres activés</string>
+    <string name="filters_deactivated">Filtres désactivés</string>
+    <string name="menu_manage_filter_profiles">Gérer les profils de filtrage</string>
+    <string name="edit">modifier</string>
+    <string name="pref_language">Langue de l\'application</string>
+    <string name="connection_error">Impossible de charger les stations de recharge</string>
+    <string name="retry">Réessayer</string>
+    <string name="filter_open_247">Disponible 24h/24 et 7j/7</string>
+    <string name="filter_barrierfree">Utilisable sans enregistrement</string>
+    <string name="filter_exclude_faults">Exclure les chargeurs avec des défauts signalés</string>
+    <string name="charge_cards">Méthodes de paiement</string>
+    <string name="goingelectric_forum">Fil de discussion du forum sur GoingElectric.de</string>
+    <string name="edit_at_datasource">modifier à %s</string>
+    <string name="categories">Catégories</string>
+    <string name="category_car_dealership">Concessionnaire automobile</string>
+    <string name="category_public_authorities">Pouvoirs publics</string>
+    <string name="category_church">Église</string>
+    <string name="category_hospital">Hôpital</string>
+    <string name="category_museum">Musée</string>
+    <string name="category_parking_multi">Parking à étages</string>
+    <string name="category_parking">Parking</string>
+    <string name="category_private_charger">Chargeur privé</string>
+    <string name="category_rest_area">Aire de repos</string>
+    <string name="category_parking_underground">Parking souterrain</string>
+    <string name="category_zoo">Zoo</string>
+    <string name="menu_apply">Appliquer les filtres</string>
+    <string name="save_as_profile">Enregistrer en tant que profil</string>
+    <string name="welcome_1">Trouvez des chargeurs de véhicules électriques autour de vous</string>
+    <string name="welcome_2">La couleur d\'un chargeur sur la carte vous indique sa puissance de charge maximale</string>
+    <string name="welcome_2_detail">Cela peut également être vu dans \"À propos\" → \"Foire aux questions\"</string>
+    <string name="donation_dialog_title">Merci d\'utiliser EVMap</string>
+    <string name="chargeprice_donation_dialog_title">Vous êtes un vrai chasseur de bonnes affaires !</string>
+    <string name="deleted_filterprofile">\"%s\" supprimé</string>
+    <string name="undo">Annuler</string>
+    <string name="rename">Renommer</string>
+    <string name="verified">vérifié</string>
+    <plurals name="charge_cards_compatible_num">
+        <item quantity="one">%d mode de paiement compatible</item>
+        <item quantity="many">%d modes de paiement compatibles</item>
+        <item quantity="other">%d modes de paiement compatibles</item>
+    </plurals>
+    <string name="verified_desc">Le fonctionnement du chargeur a été confirmé au moins une fois par un membre de la communauté %s</string>
+    <string name="percent_format">%.0f%%</string>
+    <string name="chargeprice_session_fee">frais de session</string>
+    <string name="chargeprice_per_kwh">par kWh</string>
+    <string name="chargeprice_per_minute">par min</string>
+    <string name="chargeprice_blocking_fee">Frais de blocage &gt;%s</string>
+    <string name="chargeprice_no_tariffs_found">Aucun tarif de recharge pour ce chargeur sur Chargeprice.app</string>
+    <string name="pref_chargeprice_show_provider_customer_tariffs">Afficher les tarifs exclusifs aux clients</string>
+    <string name="chargeprice_battery_range">Charge de %1$.0f%% à %2$.0f%%</string>
+    <string name="chargeprice_battery_range_from">Charge de</string>
+    <string name="chargeprice_stats">(%1$.0f kWh, approx. %2$s, ⌀ %3$.0f kW)</string>
+    <string name="chargeprice_vehicle">Véhicule</string>
+    <string name="close">Fermer</string>
+    <string name="chargeprice_title">Prix</string>
+    <string name="pref_chargeprice_currency">Devise</string>
+    <string name="data_source_goingelectric">GoingElectric.de</string>
+    <string name="chargeprice_all_tariffs_selected">tous les tarifs sélectionnés</string>
+    <string name="pref_data_source">Source des données</string>
+    <plurals name="chargeprice_some_tariffs_selected">
+        <item quantity="one">%d tarif sélectionné</item>
+        <item quantity="many">%d tarifs sélectionnés</item>
+        <item quantity="other">%d tarifs sélectionnés</item>
+    </plurals>
+    <string name="data_source_openchargemap">Open Charge Map</string>
+    <string name="next">suivant</string>
+    <string name="get_started">Commencez</string>
+    <string name="crash_report_comment_prompt">Vous pouvez ajouter un commentaire ci-dessous :</string>
+    <string name="github_sponsors">GitHub Sponsors</string>
+    <string name="donate_desc">Soutenir le développement d\'EVMap par un don unique</string>
+    <string name="github_sponsors_desc">Soutenir EVMap sur GitHub Sponsors</string>
+    <string name="unnamed_filter_profile">Profil de filtrage sans nom</string>
+    <string name="privacy_link">https://evmap.vonforst.net/en/privacy.html</string>
+    <string name="required">requis</string>
+    <string name="edit_filter_profile">Modifier \"%s\"</string>
+    <string name="pref_search_delete_recent">Supprimer les résultats de recherche récents</string>
+    <string name="settings_android_auto">Android Auto</string>
+    <string name="pref_chargeprice_allow_unbalanced_load">Permettre une charge déséquilibrée</string>
+    <string name="pref_map_rotate_gestures_enabled">Rotation de la carte</string>
+    <string name="pref_map_rotate_gestures_off">Rotation désactivée (nord toujours en haut)</string>
+    <string name="refresh_live_data">rafraîchir le statut en temps réel</string>
+    <string name="pref_language_device_default">Utiliser la langue de l\'appareil</string>
+    <string name="pref_darkmode_device_default">Utiliser le réglage de l\'appareil</string>
+    <string name="pref_darkmode_always_on">toujours allumé</string>
+    <string name="pref_darkmode_always_off">toujours éteint</string>
+    <string name="pref_chargeprice_currency_czk">Couronne tchèque (CZK)</string>
+    <string name="pref_chargeprice_currency_dkk">Couronne danoise (DKK)</string>
+    <string name="pref_chargeprice_currency_eur">Euro (EUR)</string>
+    <string name="show_more">plus…</string>
+    <string name="fav_remove">Retirer des favoris</string>
+    <string name="amenities">Commodités</string>
+    <string name="search">Recherche</string>
+    <string name="menu_map">Carte</string>
+    <string name="settings">Paramètres</string>
+    <string name="copyright">Copyright</string>
+    <string name="general_info">Informations générales</string>
+    <string name="realtime_data_loading">Vérification du statut en temps réel…</string>
+    <string name="plug_ccs">CCS</string>
+    <string name="donation_successful">Merci ❤️</string>
+    <string name="donation_failed">Quelque chose s\'est mal passé 😕</string>
+    <string name="category_supermarket">Supermarché</string>
+    <string name="version">Version</string>
+    <string name="oss_licenses">Licences</string>
+    <string name="realtime_data_source">Source du statut en temps réel (bêta) : %s</string>
+    <string name="plug_type_2">Type 2</string>
+    <string name="plug_type_3">Type 3A</string>
+    <string name="plug_cee_rot">CEE Rouge</string>
+    <string name="all">tous</string>
+    <string name="fault_report_date">Rapport d\'anomalie (dernière mise à jour : %s)</string>
+    <string name="menu_report_new_charger">Nouveau chargeur</string>
+    <string name="filter_connectors">Connecteurs</string>
+    <string name="copyright_summary">©2020-2022 Johan von Forstner</string>
+    <string name="other">Autre</string>
+    <string name="pref_navigate_use_maps_off">Le bouton de navigation lance l’application de cartes à l’emplacement du chargeur</string>
+    <string name="settings_map">Carte</string>
+    <string name="fault_report">Rapport d\'anomalie</string>
+    <string name="filter_free">Uniquement des chargeurs gratuits</string>
+    <string name="filter_min_power">Puissance minimale</string>
+    <string name="filter_free_parking">Uniquement les chargeurs avec un parking gratuit</string>
+    <string name="filter_min_connectors">Nombre minimal de connecteurs</string>
+    <string name="plug_type_1">Type 1</string>
+    <string name="plug_schuko">Schuko</string>
+    <string name="plug_cee_blau">CEE Bleu</string>
+    <string name="plug_roadster_hpc">Tesla Roadster (2008) HPC</string>
+    <string name="none">aucun</string>
+    <string name="map_type_normal">Défaut</string>
+    <string name="filter_networks">Réseaux</string>
+    <string name="ok">OK</string>
+    <string name="pref_darkmode">Mode sombre</string>
+    <string name="menu_edit_filters">Modifier les filtres</string>
+    <string name="go_to_chargeprice">Comparer les prix</string>
+    <string name="filter_chargecards">Méthodes de paiement</string>
+    <string name="all_selected">Tous sélectionnés</string>
+    <string name="number_selected">%d sélectionné</string>
+    <string name="cancel">Annuler</string>
+    <string name="filter_operators">Opérateurs</string>
+    <string name="chargeprice_donation_dialog_detail">Vous faites bon usage de la fonction de comparaison des prix. Aidez-nous à couvrir les coûts de ces données en soutenant EVMap par un don.</string>
+    <string name="and_n_others">et %d autres</string>
+    <string name="contact">Contact</string>
+    <string name="pref_map_provider">Fournisseur de cartes</string>
+    <string name="twitter">Twitter</string>
+    <string name="category_petrol_station">Station-service</string>
+    <string name="edit_on_goingelectric_info">Veuillez vous connecter à GoingElectric.de si cette page est vide</string>
+    <string name="settings_chargeprice">Comparaison des prix</string>
+    <string name="category_service_on_motorway">Aire de service (sur autoroute)</string>
+    <string name="category_railway_station">Gare ferroviaire</string>
+    <string name="category_camping">Camping</string>
+    <string name="category_airport">Aéroport</string>
+    <string name="category_amusement_park">Parc d\'attractions</string>
+    <string name="category_hotel">Hôtel</string>
+    <string name="category_restaurant">Restaurant</string>
+    <string name="filter_favorites">Favoris</string>
+    <string name="reorder">réorganiser</string>
+    <string name="delete">Supprimer</string>
+    <string name="save_profile_enter_name">Saisissez le nom du profil de filtrage :</string>
+    <string name="donation_dialog_detail">EVMap est un logiciel libre et gratuit. Les contributions de codage sur GitHub sont très appréciées. Pour aider à couvrir les frais de fonctionnement de l\'accès aux sources de données, veuillez envisager de faire un don du montant de votre choix au développeur.</string>
+    <string name="charging_barrierfree">Utilisable sans enregistrement</string>
+    <string name="chargeprice_battery_range_to">à</string>
+    <string name="category_service_off_motorway">Aire de service (hors autoroute)</string>
+    <string name="category_shopping_mall">Centre commercial</string>
+    <string name="category_cinema">Cinéma</string>
+    <string name="category_swimming_pool">Piscine</string>
+    <string name="menu_save_profile">Enregistrer en tant que profil</string>
+    <string name="no_filters">Aucun filtre</string>
+    <string name="category_holiday_home">Maison de vacances</string>
+    <string name="category_caravan_site">Emplacement pour caravanes</string>
+    <string name="filter_custom">Filtre modifié</string>
+    <string name="filterprofiles_empty_state">Vous n\'avez aucun profil de filtrage enregistré</string>
+    <string name="welcome_to_evmap">Bienvenue sur EVMap</string>
+    <string name="chargeprice_provider_customer_tariff">Uniquement pour les clients du fournisseur</string>
+    <string name="powered_by_chargeprice">alimenté par Chargeprice</string>
+    <string name="pref_my_vehicle">Mes véhicules</string>
+    <string name="pref_my_tariffs">Mes tarifs de recharge</string>
+    <string name="license">Licence</string>
+    <string name="autocomplete_connection_error">Impossible de charger les suggestions</string>
+    <string name="chargeprice_select_connector">Choisir le connecteur</string>
+    <string name="chargeprice_select_car_first">Veuillez d\'abord sélectionner le modèle de votre voiture dans les paramètres</string>
+    <string name="pref_chargeprice_show_provider_customer_tariffs_summary">Certains fournisseurs d\'énergie offrent des tarifs moins chers exclusivement à leurs clients</string>
+    <string name="pref_chargeprice_no_base_fee">Exclure les tarifs avec frais mensuels</string>
+    <string name="chargeprice_no_compatible_connectors">Pas de connecteurs compatibles dans cette station de recharge</string>
+    <string name="chargeprice_connection_error">Impossible de charger les prix</string>
+    <string name="pref_search_provider">Fournisseur de recherche de lieux</string>
+    <plurals name="pref_my_tariffs_summary">
+        <item quantity="one" tools:ignore="ImpliedQuantity">(sera mis en évidence dans la comparaison des prix)</item>
+        <item quantity="many">(seront mis en évidence dans la comparaison des prix)</item>
+        <item quantity="other">(seront mis en évidence dans la comparaison des prix)</item>
+    </plurals>
+    <string name="deleted_recent_search_results">Les résultats de recherche récents ont été supprimés</string>
+    <string name="pref_chargeprice_currency_gbp">Livre sterling (GBP)</string>
+    <string name="pref_chargeprice_currency_isk">Couronne islandaise (ISK)</string>
+    <string name="pref_chargeprice_currency_nok">Couronne norvégienne (NOK)</string>
+    <string name="settings_charger_data">Stations de recharge</string>
+    <string name="got_it">J\'ai compris</string>
+    <string name="powered_by_mapbox">propulsé par Mapbox</string>
+    <string name="lets_go">Allons-y</string>
+    <string name="crash_report_text">EVMap a planté. Veuillez envoyer un rapport de plantage au développeur.</string>
+    <string name="unknown_operator">Opérateur inconnu</string>
+    <string name="data_source_goingelectric_desc">Idéal dans les pays germanophones. Descriptions en allemand. Maintenu par la communauté.</string>
+    <string name="data_source_openchargemap_desc">Couverture mondiale avec une qualité variable. Descriptions en anglais ou dans la langue locale. Données ouvertes maintenues par la communauté et provenant de sources gouvernementales dans certains pays (par exemple, Amérique du Nord, Royaume-Uni, France, Norvège).</string>
+    <string name="faq_link">https://evmap.vonforst.net/en/faq.html</string>
+    <string name="chargeprice_faq_link">https://evmap.vonforst.net/en/chargeprice_faq.html</string>
+    <string name="settings_data_sources">Sources de données</string>
+    <string name="data_sources_description">Veuillez choisir une source de données pour les stations de recharge. Vous pourrez la modifier ultérieurement dans les paramètres de l\'application.</string>
+    <string name="pref_search_provider_info">Les données pour la recherche de lieux, en particulier celles de Google Maps, sont relativement coûteuses à récupérer. Veuillez envisager de faire un don via \"À propos\" -&gt; \"Faire un don\".</string>
+    <string name="pref_chargeprice_currency_hrk">Kuna croate (HRK)</string>
+    <string name="help">Aide</string>
+    <string name="pref_chargeprice_allow_unbalanced_load_summary">Autoriser la charge en courant alternatif monophasé de plus de 4,5 kW</string>
+    <string name="pref_chargeprice_currency_huf">Forint hongrois (HUF)</string>
+    <string name="pref_chargeprice_currency_pln">Złoty polonais (PLN)</string>
+    <string name="pref_map_rotate_gestures_on">Utilisez deux doigts pour faire pivoter la carte</string>
+    <string name="pref_chargeprice_currency_chf">Franc suisse (CHF)</string>
+    <string name="pref_chargeprice_currency_usd">Dollar américain (USD)</string>
+    <string name="pref_chargeprice_currency_sek">Couronne suédoise (SEK)</string>
+    <string name="cost_detail_charging"><b>Recharge %s</b></string>
+    <string name="cost_detail_parking"><b>Stationnement %s</b></string>
+    <string name="navigate">Naviguer vers</string>
+    <string name="charge_price_format">%1$.2f %2$s</string>
+    <string name="charge_price_average_format">⌀ %1$.2f %2$s/kWh</string>
+    <string name="charge_price_kwh_format">%1$.2f %2$s/kWh</string>
+    <string name="chargeprice_base_fee">Frais fixes : %1$.2f %2$s/mois</string>
+    <string name="chargeprice_min_spend">Dépenses minimales : %1$.2f %2$s/mois</string>
+    <string name="welcome_2_title">Visualisez la puissance</string>
+    <string name="pref_provider_google_maps">Google Maps</string>
+    <string name="parking_free">gratuit</string>
+    <string name="parking_paid">payant</string>
+    <string name="pref_provider_osm_mapbox">OpenStreetMap (Mapbox)</string>
+    <string name="charging_paid">payante</string>
+    <string name="charging_free">gratuite</string>
+    <string name="about_contributors">Contributeurs</string>
+    <string name="about_contributors_text">Merci à tous les contributeurs pour leur contribution au codage et à la traduction d\'EVMap :</string>
+</resources>
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -0,0 +1,274 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">EVMap</string>
+    <string name="no_maps_app_found">Installer et navigeringsprogram først</string>
+    <string name="closed"><b>Stengt</b></string>
+    <string name="open_closesat"><b>Åpen</b> · Stenger %s</string>
+    <string name="holiday">Ferie</string>
+    <string name="cost">Kostnad</string>
+    <string name="general_info">Generell info</string>
+    <string name="menu_filter">Filter</string>
+    <string name="about">Om</string>
+    <string name="version">Versjon</string>
+    <string name="settings">Innstillinger</string>
+    <string name="settings_map">Kart</string>
+    <string name="fav_add">Lagre som favoritt</string>
+    <string name="fav_remove">Fjern fra favoritter</string>
+    <string name="share">Del</string>
+    <string name="filter_free">Kun gratisladere</string>
+    <string name="faq">Ofte stilte spørsmål</string>
+    <string name="menu_edit_filters">Rediger filtre</string>
+    <string name="edit">rediger</string>
+    <string name="cancel">Avbryt</string>
+    <string name="ok">OK</string>
+    <string name="pref_language">Programspråk</string>
+    <string name="and_n_others">og %d andre</string>
+    <string name="pref_map_provider">Karttilbyder</string>
+    <string name="twitter">Twitter</string>
+    <string name="contact">Kontakt</string>
+    <string name="categories">Kategorier</string>
+    <string name="category_airport">Flyplass</string>
+    <string name="category_hotel">Hotell</string>
+    <string name="category_church">Kirke</string>
+    <string name="filter_favorites">Favoritter</string>
+    <string name="delete">Slett</string>
+    <string name="save_as_profile">Lagre som profil</string>
+    <string name="donation_dialog_title">Takk for at du bruker EVMap</string>
+    <string name="license">Lisens</string>
+    <string name="pref_data_source">Datakilder</string>
+    <string name="required">påkrevd</string>
+    <string name="edit_filter_profile">Rediger «%s»</string>
+    <string name="help">Hjelp</string>
+    <string name="hours">Åpningstider</string>
+    <string name="open_247"><b>Døgnåpen</b></string>
+    <string name="settings_ui">Grensesnitt</string>
+    <string name="title_activity_maps">EVMap</string>
+    <string name="no_browser_app_found">Installer en nettleser først</string>
+    <string name="address">Adresse</string>
+    <string name="network">Nettverk</string>
+    <string name="closed_unfmt">Stengt</string>
+    <string name="cost_detail_charging"><b>%s-lading</b></string>
+    <string name="cost_detail_parking"><b>%s-parkering</b></string>
+    <string name="menu_map">Kart</string>
+    <string name="category_petrol_station">Bensinstasjon</string>
+    <string name="closed_opensat"><b>Stengt</b> · Åpner %s</string>
+    <string name="retry">Prøv igjen</string>
+    <string name="source">Kilde: %s</string>
+    <string name="menu_favs">Favoritter</string>
+    <string name="menu_manage_filter_profiles">Håndter filterprofiler</string>
+    <string name="search">Søk</string>
+    <string name="not_implemented">ikke implementert enda</string>
+    <string name="github_link_title">Kildekode</string>
+    <string name="oss_licenses">Lisenser</string>
+    <string name="copyright">Opphavsrett</string>
+    <string name="coordinates">Koordinater</string>
+    <string name="fault_report">Feilrapport</string>
+    <string name="privacy">Personvern</string>
+    <string name="pref_navigate_use_maps">Umiddelbar navigasjon</string>
+    <string name="charge_cards">Betalingsmetoder</string>
+    <string name="go_to_chargeprice">Sammenlign priser</string>
+    <string name="filter_networks">Nettverk</string>
+    <string name="filter_chargecards">Betalingsmetoder</string>
+    <string name="category_hospital">Sykehus</string>
+    <string name="menu_save_profile">Lagre som profil</string>
+    <string name="pref_chargeprice_currency">Valuta</string>
+    <string name="next">neste</string>
+    <string name="github_sponsors">GitHub-sponsorer</string>
+    <string name="menu_report_new_charger">Ny lader</string>
+    <string name="category_private_charger">Privat lader</string>
+    <string name="category_restaurant">Restaurant</string>
+    <string name="category_museum">Museum</string>
+    <string name="category_swimming_pool">Svømmebasseng</string>
+    <string name="unnamed_filter_profile">Filterprofil uten navn</string>
+    <string name="get_started">Begynn</string>
+    <string name="got_it">Skjønner</string>
+    <string name="settings_data_sources">Datakilder</string>
+    <string name="pref_search_delete_recent">Slett nylige søkeresultater</string>
+    <string name="pref_chargeprice_currency_eur">Euro (EUR)</string>
+    <string name="pref_chargeprice_currency_nok">Norske kroner (NOK)</string>
+    <string name="pref_chargeprice_currency_gbp">Britiske pund (GBP)</string>
+    <string name="pref_chargeprice_currency_sek">Svenske kroner (SEK)</string>
+    <string name="realtime_data_loading">Sjekker sanntidsstatus …</string>
+    <string name="realtime_data_source">Kilde for sanntidsstatus (beta): %s</string>
+    <string name="realtime_data_unavailable">Sanntidsstatus utilgjengelig</string>
+    <string name="other">Andre</string>
+    <string name="cost_detail"><b>Lading:</b> %1$s · <b>Parkering:</b> %2$s</string>
+    <string name="copyright_summary">©2020–2022 Johan von Forstner</string>
+    <string name="pref_navigate_use_maps_on">Navigasjonsnkappen starter ruteveiledning på Google Maps</string>
+    <string name="filter_free_parking">Kun ladere med gratis parkering</string>
+    <string name="filter_min_power">Min. effekt</string>
+    <string name="plug_type_1">Type 1</string>
+    <string name="plug_chademo">CHAdeMO</string>
+    <string name="plug_schuko">Schuko</string>
+    <string name="plug_supercharger">Tesla Supercharger</string>
+    <string name="plug_type_2">Type 2</string>
+    <string name="plug_type_3">Type 3A</string>
+    <string name="all">alle</string>
+    <string name="none">ingen</string>
+    <string name="show_less">færre …</string>
+    <string name="map_type_satellite">Satellitt</string>
+    <string name="map_type_terrain">Terreng</string>
+    <string name="map_type">Karttype</string>
+    <string name="map_details">Kartdetaljer</string>
+    <string name="map_traffic">Trafikk</string>
+    <string name="favorites_empty_state">Lagrede ladere vises her</string>
+    <string name="plug_cee_rot">CEE rød</string>
+    <string name="plug_roadster_hpc">Tesla Roadster (2008) HPC</string>
+    <string name="menu_filters_active">Aktive filtre</string>
+    <string name="fault_report_date">Feilrapport (siste oppdatering: %s)</string>
+    <string name="all_selected">Alle valgt</string>
+    <string name="number_selected">%d valgt</string>
+    <string name="pref_darkmode">Mørk drakt</string>
+    <string name="connection_error">Kunne ikke laste inn ladestasjoner</string>
+    <string name="filter_barrierfree">Kan brukes uten registrering</string>
+    <string name="goingelectric_forum">Forumtråd på GoingElectric.de</string>
+    <string name="category_car_dealership">Bilforhandlere</string>
+    <string name="category_railway_station">Togstasjon</string>
+    <string name="category_public_authorities">Offentlige myndigheter</string>
+    <string name="category_amusement_park">Fornøyelsespark</string>
+    <string name="category_cinema">Kino</string>
+    <string name="category_parking_multi">Parkeringshus</string>
+    <string name="edit_at_datasource">rediger på %s</string>
+    <string name="category_camping">Campingplass</string>
+    <string name="category_service_on_motorway">Rasteplass (på motorvei)</string>
+    <string name="category_shopping_mall">Kjøpesenter</string>
+    <string name="category_holiday_home">Feriehjem</string>
+    <string name="category_parking">Parkeringsplass</string>
+    <string name="category_rest_area">Rasteplass</string>
+    <string name="category_supermarket">Supermarked</string>
+    <string name="menu_apply">Bruk filtre</string>
+    <string name="no_filters">Ingen filtre</string>
+    <string name="category_zoo">Dyrehage</string>
+    <string name="category_caravan_site">Campingplass</string>
+    <string name="category_parking_underground">Parkeringsgarasje under bakken</string>
+    <string name="reorder">endre rekkefølge</string>
+    <string name="save_profile_enter_name">Skriv inn navnet på filterprofilen:</string>
+    <string name="filterprofiles_empty_state">Du har ikke noen lagrede filterprofiler</string>
+    <string name="chargeprice_donation_dialog_title">Du er en sann gjerrigknark.</string>
+    <string name="deleted_filterprofile">Slettet «%s»</string>
+    <string name="charging_barrierfree">Kan brukes uten registrering</string>
+    <string name="welcome_1">Finn kjøretøyladere der du er</string>
+    <string name="welcome_2">Hver laders farge samsvarer med dens høyeste ladeeffekt</string>
+    <string name="welcome_2_detail">Dette er også å finne i «Om» → «O-S-S» i menyen</string>
+    <string name="verified_desc">Lader bekreftet av et medlem av %s-gemenskapen. Dette betyr ikke at den virker nå.</string>
+    <string name="charge_price_format">%2$s%1$.2f</string>
+    <string name="charge_price_average_format">⌀ %2$s%1$.2f/kWt</string>
+    <string name="charge_price_kwh_format">%2$s%1$.2f/kWt</string>
+    <string name="chargeprice_per_kwh">per kWt</string>
+    <string name="percent_format">%.0f%%</string>
+    <string name="chargeprice_per_minute">per min</string>
+    <string name="chargeprice_min_spend">Minimumskostnad: %2$s%1$.2f/måned</string>
+    <string name="settings_chargeprice">Prissammenligning</string>
+    <string name="pref_my_vehicle">Mine kjøretøy</string>
+    <string name="chargeprice_battery_range_to">til</string>
+    <string name="chargeprice_stats">(%1$.0f kWt, omtrentlig. %2$s, ⌀ %3$.0f kW)</string>
+    <string name="chargeprice_select_car_first">Velg bilmodellen din i innstillingene først</string>
+    <string name="chargeprice_battery_range">Lad fra %1$.0f%% til %2$.0f%%</string>
+    <string name="chargeprice_battery_range_from">Lad fra</string>
+    <string name="chargeprice_vehicle">Kjøretøy</string>
+    <string name="close">Lukk</string>
+    <string name="chargeprice_title">Priser</string>
+    <string name="chargeprice_connection_error">Kunne ikke laste inn priser</string>
+    <plurals name="pref_my_tariffs_summary">
+        <item quantity="one">(vil bli framhevet i prissammenligningen)</item>
+        <item quantity="other">(vil bli framhevet i prissammenligningen)</item>
+    </plurals>
+    <string name="settings_charger_data">Ladestasjoner</string>
+    <string name="data_source_goingelectric">GoingElectric.de</string>
+    <string name="data_source_openchargemap">Open Charge Map</string>
+    <string name="crash_report_comment_prompt">Du kan legge til en kommentar nedenfor:</string>
+    <string name="github_sponsors_desc">Støtt EVMap med GitHub-sponsorer</string>
+    <string name="donate_desc">Støtt utviklingen av EVMap med en engangsdonasjon</string>
+    <string name="settings_android_auto">Android Auto</string>
+    <string name="pref_map_rotate_gestures_enabled">Kartrotasjon</string>
+    <string name="deleted_recent_search_results">Nylige søkeresultater slettet</string>
+    <string name="autocomplete_connection_error">Kunne ikke laste inn forslag</string>
+    <string name="pref_language_device_default">Enhetsforvalg</string>
+    <string name="pref_chargeprice_currency_chf">Sveitserfranc (CHF)</string>
+    <string name="pref_chargeprice_currency_czk">Tsjekkiske kroner (CZK)</string>
+    <string name="pref_chargeprice_currency_dkk">Danske kroner (DKK)</string>
+    <string name="pref_chargeprice_currency_hrk">Kroatiske kroner (HRK)</string>
+    <string name="pref_map_rotate_gestures_on">Bruk to fingre for å rotere kartet</string>
+    <string name="pref_map_rotate_gestures_off">Rotasjon avslått (nord er alltid oppover)</string>
+    <string name="refresh_live_data">oppdater sanntidsstatus</string>
+    <string name="pref_chargeprice_currency_isk">Islandske kroner (ISK)</string>
+    <string name="pref_chargeprice_currency_pln">Polske zloty (PLN)</string>
+    <string name="pref_chargeprice_currency_usd">Amerikanske dollar (USD)</string>
+    <string name="filters_deactivated">Filtre deaktivert</string>
+    <string name="pref_navigate_use_maps_off">Navigasjonsknapp åpner kartprogrammet med laderposisjon</string>
+    <string name="show_more">flere …</string>
+    <string name="filters_activated">Filtre aktivert</string>
+    <string name="donate">Doner</string>
+    <string name="donation_successful">Takk ❤️</string>
+    <string name="map_type_normal">Forvalg</string>
+    <string name="donation_failed">Noe gikk galt 😕</string>
+    <string name="filter_custom">Endret filter</string>
+    <string name="welcome_to_evmap">Velkommen til EVMap</string>
+    <string name="rename">Gi nytt navn</string>
+    <string name="undo">Angre</string>
+    <plurals name="charge_cards_compatible_num">
+        <item quantity="one">%d kompatibel betalingsmetode</item>
+        <item quantity="other">%d kompatible betalingsmetoder</item>
+    </plurals>
+    <string name="plug_ccs">CCS</string>
+    <string name="verified">bekreftet</string>
+    <string name="pref_darkmode_always_on">alltid på</string>
+    <string name="pref_darkmode_device_default">Enhetsforvalg</string>
+    <string name="pref_darkmode_always_off">alltid av</string>
+    <string name="filter_exclude_faults">Utelat ladere med rapporterte feil</string>
+    <string name="plug_cee_blau">CEE blå</string>
+    <string name="filter_open_247">Døgnåpent</string>
+    <string name="pref_chargeprice_currency_huf">Ungarske forint (HUF)</string>
+    <string name="donation_dialog_detail">EVMap er fri programvare. Kodebidrag mottas med takk. Overvei å gi din støtte gjennom GitHub-sponsorer for å dekke løpende utgifter.</string>
+    <string name="pref_chargeprice_allow_unbalanced_load_summary">Tillat enfaselading over 4.5 kW</string>
+    <string name="connectors">Tilkobling</string>
+    <string name="operator">Operatør</string>
+    <string name="amenities">Tilleggstjenester</string>
+    <string name="filter_min_connectors">Min. antall tilkoblinger</string>
+    <string name="filter_connectors">Tilkoblinger</string>
+    <string name="filter_operators">Operatører</string>
+    <string name="category_service_off_motorway">Rasteplass (ikke på motorvei)</string>
+    <string name="welcome_2_title">Effekten til veies tilgjengeliggjøres</string>
+    <string name="chargeprice_donation_dialog_detail">Du bruker prissammenligningen en del.
+\nOvervei å dekke kostnadene ved å støtte EVMap med en donasjon.</string>
+    <string name="navigate">Navigasjon</string>
+    <string name="chargeprice_session_fee">startgebyr</string>
+    <string name="powered_by_chargeprice">tilbudt av Chargeprice</string>
+    <string name="chargeprice_base_fee">Grunnkostnad: %2$s%1$.2f/måned</string>
+    <string name="chargeprice_no_tariffs_found">Ingen ladeabonnement for denne laderen på Chargeprice.app</string>
+    <string name="pref_chargeprice_no_base_fee">Utelat abonnementer med månedlige gebyr</string>
+    <string name="chargeprice_select_connector">Velg tilkobling</string>
+    <string name="chargeprice_provider_customer_tariff">Kun for kundekoblingssalg</string>
+    <string name="chargeprice_blocking_fee">Blokkeringsgebyr &gt;%s</string>
+    <string name="pref_chargeprice_show_provider_customer_tariffs">Inkluder kundekoblingssalg</string>
+    <string name="pref_chargeprice_show_provider_customer_tariffs_summary">Strømselskaper tilbyr noen ganger billigere abonnementer til sine kunder</string>
+    <string name="pref_my_tariffs">Mine ladeabonnementer</string>
+    <string name="chargeprice_no_compatible_connectors">Ingen kompatible ladere på denne ladestasjonen</string>
+    <string name="data_sources_description">Velg en datakilde for ladestasjoner. (Kan endres senere i programinnstillingene.)</string>
+    <string name="unknown_operator">Ukjent operatør</string>
+    <plurals name="chargeprice_some_tariffs_selected">
+        <item quantity="one">%d plan valgt</item>
+        <item quantity="other">%d planer valgt</item>
+    </plurals>
+    <string name="data_source_goingelectric_desc">Storartet i tyskspråklige land. Beskrivelser på tysk. Gemenskapsdrevet.</string>
+    <string name="powered_by_mapbox">tilbudt av Mapbox</string>
+    <string name="pref_search_provider_info">Data for søk er dyre å hente, spesielt fra Google Maps. Overvei å donere gjennom «Om» → «Doner».</string>
+    <string name="data_source_openchargemap_desc">Verdensomspennende, med varierende kvalitet. Beskrivelser på engelsk eller det lokale språket. Gemenskapsdrevet og åpen myndighetsdata i noen land (f.eks. Nord-Amerika, Storbritannia, Frankrike, og Norge.)</string>
+    <string name="lets_go">Begynn</string>
+    <string name="crash_report_text">EVMap krasjet. Send en rapport til utvikleren.</string>
+    <string name="chargeprice_all_tariffs_selected">alle planer valgt</string>
+    <string name="pref_search_provider">Søketilbyder</string>
+    <string name="pref_chargeprice_allow_unbalanced_load">Tillat skjev last</string>
+    <string name="edit_on_goingelectric_info">Logg inn på GoingElectric.de hvis denne siden er tom</string>
+    <string name="pref_provider_google_maps">Google Maps</string>
+    <string name="pref_provider_osm_mapbox">OpenStreetMap (Mapbox)</string>
+    <string name="charging_free">Gratis</string>
+    <string name="parking_free">Gratis</string>
+    <string name="charging_paid">Betalt</string>
+    <string name="parking_paid">Betalt</string>
+    <string name="privacy_link">https://evmap.vonforst.net/en/privacy.html</string>
+    <string name="faq_link">https://evmap.vonforst.net/en/faq.html</string>
+    <string name="chargeprice_faq_link">https://evmap.vonforst.net/en/chargeprice_faq.html</string>
+    <string name="about_contributors">Bidragsytere</string>
+    <string name="about_contributors_text">Takk til alle som har kodet og oversatt EVMap:</string>
+</resources>
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -4,11 +4,15 @@
        <item>@string/pref_language_device_default</item>
        <item>@string/pref_language_en</item>
        <item>@string/pref_language_de</item>
+        <item>@string/pref_language_fr</item>
+        <item>@string/pref_language_nb_rNO</item>
    </string-array>
    <string-array name="pref_language_values" translatable="false">
        <item>default</item>
        <item>en</item>
        <item>de</item>
+        <item>fr</item>
+        <item>nb-NO</item>
    </string-array>
    <string-array name="pref_darkmode_names">
        <item>@string/pref_darkmode_device_default</item>
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -8,7 +8,7 @@
    <color name="colorSecondaryDark">#00b249</color>
    <color name="colorSecondaryContainer">#b5f4c7</color>
    <color name="colorOnSecondaryContainer">#007c00</color>
-    <color name="charger_100kw">#ffeb3b</color>
+    <color name="charger_100kw">#FDD835</color>
    <color name="charger_43kw">#ff9800</color>
    <color name="charger_20kw">#03a9f4</color>
    <color name="charger_11kw">#9e9e9e</color>
--- a/app/src/main/res/values/donottranslate.xml
+++ b/app/src/main/res/values/donottranslate.xml
@@ -8,4 +8,9 @@
    <string name="goingelectric_forum_url"><![CDATA[https://www.goingelectric.de/forum/viewtopic.php?f=5&t=56342]]></string>
    <string name="github_sponsors_link">https://github.com/sponsors/johan12345/</string>
    <string name="chargeprice_api_url">https://api.chargeprice.app/v1/</string>
+    <string name="pref_language_en">English</string>
+    <string name="pref_language_de">Deutsch</string>
+    <string name="pref_language_fr">Français</string>
+    <string name="pref_language_nb_rNO">Norsk Bokmål</string>
+    <string name="about_contributors_list">Danilo Bargen\nAltonss\nAllan Nordhøy\nLicaon_Kter\npt2121\nnautilusx</string>
 </resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2,8 +2,8 @@
    <string name="app_name">EVMap</string>
    <string name="title_activity_maps">EVMap</string>
    <string name="connectors">Connectors</string>
-    <string name="no_maps_app_found">No navigation app found</string>
-    <string name="no_browser_app_found">No web browser found</string>
+    <string name="no_maps_app_found">Install a navigation app first</string>
+    <string name="no_browser_app_found">Install a web browser first</string>
    <string name="address">Address</string>
    <string name="operator">Operator</string>
    <string name="network">Network</string>
@@ -18,10 +18,12 @@
    <string name="cost_detail"><![CDATA[<b>Charging:</b> %1$s · <b>Parking:</b> %2$s]]></string>
    <string name="cost_detail_charging"><![CDATA[<b>%s charging</b>]]></string>
    <string name="cost_detail_parking"><![CDATA[<b>%s parking</b>]]></string>
-    <string name="free">Free</string>
-    <string name="paid">Paid</string>
+    <string name="charging_free">Free</string>
+    <string name="charging_paid">Paid</string>
+    <string name="parking_free">Free</string>
+    <string name="parking_paid">Paid</string>
    <string name="amenities">Amenities</string>
-    <string name="general_info">General information</string>
+    <string name="general_info">General info</string>
    <string name="realtime_data_unavailable">Real-time status unavailable</string>
    <string name="realtime_data_loading">Checking real-time status…</string>
    <string name="realtime_data_source">Real-time status source (beta): %s</string>
@@ -31,32 +33,32 @@
    <string name="menu_favs">Favorites</string>
    <string name="menu_filter">Filter</string>
    <string name="not_implemented">not implemented yet</string>
-    <string name="about">About EVMap</string>
+    <string name="about">About</string>
    <string name="version">Version</string>
    <string name="github_link_title">Source code</string>
-    <string name="oss_licenses">Open Source Licenses</string>
+    <string name="oss_licenses">Licenses</string>
    <string name="settings">Settings</string>
-    <string name="settings_ui">User Interface</string>
+    <string name="settings_ui">Interface</string>
    <string name="settings_map">Map</string>
    <string name="copyright">Copyright</string>
    <string name="copyright_summary">©2020–2022 Johan von Forstner</string>
    <string name="other">Other</string>
-    <string name="privacy">Privacy Notice</string>
-    <string name="fav_add">Add to favorites</string>
+    <string name="privacy">Privacy</string>
+    <string name="fav_add">Save as favorite</string>
    <string name="fav_remove">Remove from favorites</string>
-    <string name="pref_navigate_use_maps">Start navigation immediately</string>
-    <string name="pref_navigate_use_maps_on">Navigation button starts Google Maps navigation immediately</string>
-    <string name="pref_navigate_use_maps_off">Navigation button launches maps app with charger location</string>
+    <string name="pref_navigate_use_maps">Immediate navigation</string>
+    <string name="pref_navigate_use_maps_on">Navigation button starts route guidance with Google Maps</string>
+    <string name="pref_navigate_use_maps_off">Navigation button opens the maps app with charger location</string>
    <string name="coordinates">Coordinates</string>
    <string name="share">Share</string>
    <string name="filter_free">Only free chargers</string>
-    <string name="filter_min_power">Minimum power</string>
+    <string name="filter_min_power">Min power</string>
    <string name="filter_free_parking">Only chargers with free parking</string>
-    <string name="filter_min_connectors">Minimum number of connectors</string>
+    <string name="filter_min_connectors">Min number of connectors</string>
    <string name="filter_connectors">Connectors</string>
    <string name="plug_type_1">Type 1</string>
    <string name="plug_type_2">Type 2</string>
-    <string name="plug_type_3">Type 3a</string>
+    <string name="plug_type_3">Type 3A</string>
    <string name="plug_ccs">CCS</string>
    <string name="plug_schuko">Schuko</string>
    <string name="plug_chademo">CHAdeMO</string>
@@ -68,18 +70,17 @@
    <string name="none">none</string>
    <string name="show_more">more…</string>
    <string name="show_less">less…</string>
-    <string name="favorites_empty_state">If you add chargers as favorites, they will show up here.</string>
+    <string name="favorites_empty_state">Saved chargers show up here</string>
    <string name="donate">Donate</string>
-    <string name="donation_successful">Thank you! ❤️</string>
-    <string name="donation_failed">Something went wrong. 😕</string>
+    <string name="donation_successful">Thank you ❤️</string>
+    <string name="donation_failed">Something went wrong 😕</string>
    <string name="map_type_normal">Default</string>
    <string name="map_type_satellite">Satellite</string>
    <string name="map_type_terrain">Terrain</string>
    <string name="map_type">Map type</string>
    <string name="map_details">Map details</string>
    <string name="map_traffic">Traffic</string>
-    <string name="faq">FAQ</string>
-    <string name="faq_desc">Frequently asked questions</string>
+    <string name="faq">Frequently asked questions</string>
    <string name="menu_filters_active">Filters active</string>
    <string name="filters_activated">Filters activated</string>
    <string name="filters_deactivated">Filters deactivated</string>
@@ -96,10 +97,8 @@
    <string name="edit">edit</string>
    <string name="cancel">Cancel</string>
    <string name="ok">OK</string>
-    <string name="pref_language">Language</string>
-    <string name="pref_language_summary">Change the app language</string>
+    <string name="pref_language">App language</string>
    <string name="pref_darkmode">Dark mode</string>
-    <string name="pref_darkmode_summary">Set when dark mode is activated</string>
    <string name="connection_error">Could not load charging stations</string>
    <string name="retry">Retry</string>
    <string name="filter_open_247">Available 24/7</string>
@@ -111,7 +110,7 @@
    <string name="twitter">Twitter</string>
    <string name="goingelectric_forum">Forum thread at GoingElectric.de</string>
    <string name="contact">Contact</string>
-    <string name="menu_report_new_charger">Report new charger</string>
+    <string name="menu_report_new_charger">New charger</string>
    <string name="edit_at_datasource">edit at %s</string>
    <string name="categories">Categories</string>
    <string name="category_car_dealership">Car Dealership</string>
@@ -129,7 +128,7 @@
    <string name="category_church">Church</string>
    <string name="category_hospital">Hospital</string>
    <string name="category_museum">Museum</string>
-    <string name="category_parking_multi">Multi-storey car park</string>
+    <string name="category_parking_multi">Parking garage</string>
    <string name="category_parking">Car park</string>
    <string name="category_private_charger">Private charger</string>
    <string name="category_rest_area">Rest area</string>
@@ -149,16 +148,16 @@
    <string name="delete">Delete</string>
    <string name="save_as_profile">Save as profile</string>
    <string name="save_profile_enter_name">Enter the name of the filter profile:</string>
-    <string name="filterprofiles_empty_state">You have not yet saved any filter profiles.</string>
+    <string name="filterprofiles_empty_state">You have no filter profiles saved</string>
    <string name="welcome_to_evmap">Welcome to EVMap</string>
-    <string name="welcome_1">Find electric vehicle chargers around you.</string>
+    <string name="welcome_1">Find electric vehicle chargers around you</string>
    <string name="welcome_2_title">You\'ve got the power</string>
-    <string name="welcome_2">The color of a charger on the map shows you its maximum charging power.</string>
-    <string name="welcome_2_detail">(You can check the colors again under “About EVMap → FAQ” in the menu)</string>
-    <string name="donation_dialog_title">Thank you for using EVMap!</string>
-    <string name="donation_dialog_detail">EVMap is free and Open Source software that I develop in my spare time. Coding contributions on GitHub are very much appreciated. However, due to increasing popularity of the app, I also need to cover some running costs, e.g. for access to the data sources. Therefore, please consider supporting the app through a donation or via GitHub Sponsors.</string>
+    <string name="welcome_2">Each charger\'s color corresponds to its max charging power</string>
+    <string name="welcome_2_detail">This can also be seen in “About” → “Frequently Asked Questions”</string>
+    <string name="donation_dialog_title">Thank you for using EVMap</string>
+    <string name="donation_dialog_detail">EVMap is libre and free of charge. Code contributions on GitHub are much appreciated. To help cover the running costs for data access, please consider donating an amount of your choice to the developer.</string>
    <string name="chargeprice_donation_dialog_title">You\'re a real bargain hunter!</string>
-    <string name="chargeprice_donation_dialog_detail">It seems like you like the price comparison feature a lot. To access the pricing data, the developer of EVMap needs to pay a monthly fee to the data provider Chargeprice.app. Therefore, please consider supporting EVMap through a donation.</string>
+    <string name="chargeprice_donation_dialog_detail">You make great use of the price comparison feature. Please help cover the costs for this data by supporting EVMap with a donation.</string>
    <string name="deleted_filterprofile">Deleted “%s”</string>
    <string name="undo">Undo</string>
    <string name="rename">Rename</string>
@@ -169,42 +168,42 @@
    </plurals>
    <string name="navigate">Navigate</string>
    <string name="verified">verified</string>
-    <string name="verified_desc">Charger verified by a member at the %s community — not necessarily working right now.</string>
+    <string name="verified_desc">Charger has once been confirmed to work by a member of the %s community</string>
    <string name="charge_price_format">%2$s%1$.2f</string>
    <string name="charge_price_average_format">⌀ %2$s%1$.2f/kWh</string>
    <string name="charge_price_kwh_format">%2$s%1$.2f/kWh</string>
    <string name="chargeprice_select_connector">Choose connector</string>
-    <string name="chargeprice_provider_customer_tariff">Only for provider customers</string>
-    <string name="edit_on_goingelectric_info">If only an empty page is showing here, please first log in to GoingElectric.de.</string>
+    <string name="chargeprice_provider_customer_tariff">Only for tie-in customers</string>
+    <string name="edit_on_goingelectric_info">Please log in at GoingElectric.de if this page is empty</string>
    <string name="percent_format">%.0f%%</string>
    <string name="chargeprice_session_fee">session fee</string>
    <string name="chargeprice_per_kwh">per kWh</string>
    <string name="chargeprice_per_minute">per min</string>
    <string name="chargeprice_blocking_fee">Blocking fee >%s</string>
-    <string name="chargeprice_no_tariffs_found">Chargeprice.app found no charging plans compatible with this charger.</string>
+    <string name="chargeprice_no_tariffs_found">No charging plans for this charger on Chargeprice.app</string>
    <string name="powered_by_chargeprice">powered by Chargeprice</string>
    <string name="chargeprice_base_fee">Base fee: %2$s%1$.2f/month</string>
    <string name="chargeprice_min_spend">Minimum spend: %2$s%1$.2f/month</string>
    <string name="settings_chargeprice">Price comparison</string>
    <string name="pref_my_vehicle">My vehicles</string>
-    <string name="pref_chargeprice_no_base_fee">Only show plans with no monthly fees</string>
-    <string name="pref_chargeprice_show_provider_customer_tariffs">Show customer-exclusive plans</string>
-    <string name="chargeprice_select_car_first">Please first select your car model in the settings.</string>
+    <string name="pref_chargeprice_no_base_fee">Exclude plans with monthly fees</string>
+    <string name="pref_chargeprice_show_provider_customer_tariffs">Include tie-in plans</string>
+    <string name="chargeprice_select_car_first">Please select your car model in the settings first</string>
    <string name="chargeprice_battery_range">Charge from %1$.0f%% to %2$.0f%%</string>
    <string name="chargeprice_battery_range_from">Charge from</string>
    <string name="chargeprice_battery_range_to">to</string>
    <string name="chargeprice_stats">(%1$.0f kWh, approx. %2$s, ⌀ %3$.0f kW)</string>
    <string name="chargeprice_vehicle">Vehicle</string>
-    <string name="pref_chargeprice_show_provider_customer_tariffs_summary">Some providers offer cheaper plans exclusively to their customers (e.g., household electricity, gas)</string>
-    <string name="close">close</string>
+    <string name="pref_chargeprice_show_provider_customer_tariffs_summary">Utility companies sometimes offer special plans for their customers</string>
+    <string name="close">Close</string>
    <string name="chargeprice_title">Prices</string>
    <string name="chargeprice_connection_error">Could not load prices</string>
-    <string name="chargeprice_no_compatible_connectors">None of the connectors on this charging station is compatible with your vehicle.</string>
+    <string name="chargeprice_no_compatible_connectors">No compatible connectors at this charging station</string>
    <string name="pref_chargeprice_currency">Currency</string>
    <string name="pref_my_tariffs">My charging plans</string>
    <plurals name="pref_my_tariffs_summary">
-        <item quantity="one">(will be highlighted in price comparison)</item>
-        <item quantity="other">(will be highlighted in price comparison)</item>
+        <item quantity="one">(will be highlighted in the price comparison)</item>
+        <item quantity="other">(will be highlighted in the price comparison)</item>
    </plurals>
    <string name="chargeprice_all_tariffs_selected">all plans selected</string>
    <string name="license">License</string>
@@ -215,20 +214,20 @@
        <item quantity="other">%d plans selected</item>
    </plurals>
    <string name="unknown_operator">Unknown operator</string>
-    <string name="data_sources_description">EVMap supports multiple data sources for charging stations. Please select the one you would like to use. You can always change it later in the app\'s settings.</string>
+    <string name="data_sources_description">Please pick a data source for charging stations. It can later be changed in the app settings.</string>
    <string name="data_source_goingelectric">GoingElectric.de</string>
    <string name="data_source_openchargemap">Open Charge Map</string>
-    <string name="data_source_goingelectric_desc">Very good coverage in Germany, Austria and Switzerland and many neighboring countries. Descriptions in German. Community-maintained.</string>
-    <string name="data_source_openchargemap_desc"><![CDATA[Worldwide coverage with varying quality. Descriptions in English or local language. Community-maintained & government open data in some countries (e.g. North America, UK, France, Norway).]]></string>
+    <string name="data_source_goingelectric_desc">Great in the German-speaking countries. Descriptions in German. Community-maintained.</string>
+    <string name="data_source_openchargemap_desc"><![CDATA[Worldwide, with varying quality. Descriptions in English or the local language. Community-maintained and open government data in some countries (e.g. North America, UK, France, Norway).]]></string>
    <string name="next">next</string>
    <string name="get_started">Get started</string>
    <string name="got_it">Got it</string>
    <string name="lets_go">Let\'s go</string>
-    <string name="crash_report_text">Sorry, it seems that EVMap has crashed. Please send a crash report to the developer.</string>
+    <string name="crash_report_text">EVMap crashed. Please send a crash report to the developer.</string>
    <string name="crash_report_comment_prompt">You can add a comment below:</string>
    <string name="powered_by_mapbox">powered by Mapbox</string>
-    <string name="pref_search_provider">Place search provider</string>
-    <string name="pref_search_provider_info"><![CDATA[Data for place search, especially from Google Maps, is relatively expensive. If you use this feature often, please consider making a donation through \"About EVMap -> Donate\".]]></string>
+    <string name="pref_search_provider">Search provider</string>
+    <string name="pref_search_provider_info"><![CDATA[Data for searches is expensive to fetch, especially from Google Maps. Please consider donating through “About” → “Donate”.]]></string>
    <string name="github_sponsors">GitHub Sponsors</string>
    <string name="donate_desc">Support EVMap\'s development with a one-time donation</string>
    <string name="github_sponsors_desc">Support EVMap on GitHub Sponsors</string>
@@ -243,16 +242,14 @@
    <string name="settings_data_sources">Data sources</string>
    <string name="help">Help</string>
    <string name="settings_android_auto">Android Auto</string>
-    <string name="pref_chargeprice_allow_unbalanced_load">Enable unbalanced load</string>
-    <string name="pref_chargeprice_allow_unbalanced_load_summary"><![CDATA[Allow charging with >4.5 kW at AC stations for cars with single-phase charger]]></string>
-    <string name="pref_map_rotate_gestures_enabled">Enable map rotation</string>
-    <string name="pref_map_rotate_gestures_on">Map can be rotated with two-finger gesture</string>
-    <string name="pref_map_rotate_gestures_off">Map will be fixed to north-up</string>
+    <string name="pref_chargeprice_allow_unbalanced_load">Allow unbalanced load</string>
+    <string name="pref_chargeprice_allow_unbalanced_load_summary">Allow single-phase AC charging with more than 4.5 kW</string>
+    <string name="pref_map_rotate_gestures_enabled">Map rotation</string>
+    <string name="pref_map_rotate_gestures_on">Use two fingers to rotate the map</string>
+    <string name="pref_map_rotate_gestures_off">Rotation off (north always 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="autocomplete_connection_error">Could not load suggestions</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>
@@ -268,8 +265,8 @@
    <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>
+    <string name="pref_provider_google_maps">Google Maps</string>
+    <string name="pref_provider_osm_mapbox">OpenStreetMap (Mapbox)</string>
+    <string name="about_contributors">Contributors</string>
+    <string name="about_contributors_text">Thanks to all contributors for their coding and translation contributions to EVMap:</string>
 </resources>
--- a/app/src/main/res/xml/about.xml
+++ b/app/src/main/res/xml/about.xml
@@ -14,10 +14,13 @@
            android:title="@string/copyright"
            android:summary="@string/copyright_summary" />

+        <Preference
+            android:key="contributors"
+            android:title="@string/about_contributors" />
+
        <Preference
            android:key="faq"
-            android:title="@string/faq"
-            android:summary="@string/faq_desc" />
+            android:title="@string/faq" />

        <Preference
            android:key="donate"
--- a/app/src/main/res/xml/locales_config.xml
+++ b/app/src/main/res/xml/locales_config.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<locale-config xmlns:android="http://schemas.android.com/apk/res/android">
+    <locale android:name="en" />
+    <locale android:name="de" />
+    <locale android:name="fr" />
+    <locale android:name="nb-NO" />
+</locale-config>
--- a/app/src/main/res/xml/settings_ui.xml
+++ b/app/src/main/res/xml/settings_ui.xml
@@ -2,11 +2,12 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
    <ListPreference
        android:key="language"
+        android:persistent="false"
        android:title="@string/pref_language"
        android:entries="@array/pref_language_names"
        android:entryValues="@array/pref_language_values"
        android:defaultValue="default"
-        android:summary="@string/pref_language_summary" />
+        android:summary="%s" />

    <ListPreference
        android:key="darkmode"
@@ -14,7 +15,7 @@
        android:entries="@array/pref_darkmode_names"
        android:entryValues="@array/pref_darkmode_values"
        android:defaultValue="default"
-        android:summary="@string/pref_darkmode_summary" />
+        android:summary="%s" />
    <CheckBoxPreference
        android:key="map_rotate_gestures_enabled"
        android:title="@string/pref_map_rotate_gestures_enabled"
--- a/fastlane/metadata/android/de-DE/changelogs/104.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/104.txt
@@ -0,0 +1,9 @@
+Verbesserungen:
+- Übersetzung auf Norwegisch und Französisch (Danke an die Beitragenden!)
+- Kontrast der Marker auf der Karte (v.a. gelb) erhöht
+- Android Automotive OS: Filter "Störung ausschließen" verfügbar
+
+Fehler behoben:
+- "Meine Tarife" wurden nicht mehr oben angeordnet und hervorgehoben
+- Dark Mode: Weißes Aufblitzen bei Wechsel zur Karte teilweise reduziert
+- Android Auto: Abstürze behoben
--- a/fastlane/metadata/android/de-DE/changelogs/106.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/106.txt
@@ -0,0 +1,2 @@
+Fehler behoben:
+- Wechseln der Datenquelle nicht möglich
--- a/fastlane/metadata/android/de-DE/changelogs/116.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/116.txt
@@ -0,0 +1,8 @@
+Verbesserungen:
+- Einige Texte vereinfacht
+- Unterstützung für Sprachauswahl pro App von Android 13
+
+Fehler behoben:
+- Filtermenü ließ sich nicht öffnen
+- Abstürze / Inkonsistenzen nach Wechsel der Datenquelle
+- Abstürze unter Android Auto
--- a/fastlane/metadata/android/en-US/changelogs/104.txt
+++ b/fastlane/metadata/android/en-US/changelogs/104.txt
@@ -0,0 +1,9 @@
+Improvements:
+- Added Norwegian and French translations (thanks to the contributors!)
+- Improved contrast of markers on map (especially yellow)
+- Android Automotive OS: Filter "exclude chargers with reported faults" available
+
+Bugfixes:
+- "My charging plans" were not sorted and highlighted
+- Dark Mode: Partly fixed white flashing when switching back to map
+- Android Auto: fixed crashes
--- a/fastlane/metadata/android/en-US/changelogs/106.txt
+++ b/fastlane/metadata/android/en-US/changelogs/106.txt
@@ -0,0 +1,2 @@
+Bugfixes:
+- Data source selection was not possible
--- a/fastlane/metadata/android/en-US/changelogs/116.txt
+++ b/fastlane/metadata/android/en-US/changelogs/116.txt
@@ -0,0 +1,8 @@
+Improvements:
+- Simplified some texts
+- Support for Android 13's per-app language selector
+
+Bugfixes:
+- Filter menu could not be opened
+- Crashes / inconsistencies after switching data source
+- Crashes on Android Auto
--- a/fastlane/metadata/android/fr/full_description.txt
+++ b/fastlane/metadata/android/fr/full_description.txt
@@ -0,0 +1,18 @@
+Grâce à EVMap, vous pouvez trouver les chargeurs de véhicules électriques confortablement à l'aide de votre téléphone Android. Il fournit un accès mobile aux bases de données communautaires de GoingElectric.de et Open Charge Map, qui contiennent des informations sur les points de charge dans le monde entier. Pour de nombreux points de charge en Europe, vous pouvez voir des informations sur le statut en temps réel.
+
+Caractéristiques :
+- Conception matérielle ("Material Design")
+- Affiche toutes les stations de recharge des répertoires GoingElectric.de et Open Charge Map gérés par la communauté.
+- Informations sur la disponibilité en temps réel (uniquement en Europe)
+- Comparaison des prix intégrée grâce à Chargeprice.app (uniquement en Europe)
+- Données cartographiques provenant d'OpenStreetMap (Mapbox)
+- Recherche de lieux
+- Options de filtrage avancées, y compris les profils de filtrage enregistrés
+- Liste de favoris, avec également des informations sur la disponibilité
+- Pas de publicité, entièrement open source
+
+EVMap est un projet open source et peut être trouvé sur https://github.com/johan12345/EVMap.
+
+Cette application n'est pas un produit officiel de GoingElectric.de ou Open Charge Map, elle utilise uniquement leurs API publiques.
+
+Une liste des permissions nécessaires avec des explications est disponible ici : https://evmap.vonforst.net/en/permissions.html
--- a/fastlane/metadata/android/fr/short_description.txt
+++ b/fastlane/metadata/android/fr/short_description.txt
@@ -0,0 +1 @@
+Trouver des stations de recharge pour véhicules électriques
--- a/fastlane/metadata/android/fr/title.txt
+++ b/fastlane/metadata/android/fr/title.txt
@@ -0,0 +1 @@
+EVMap - Charger son VE
--- a/fastlane/metadata/android/nb-NO/full_description.txt
+++ b/fastlane/metadata/android/nb-NO/full_description.txt
@@ -0,0 +1,19 @@
+Finn steder å lade fra den gemenskapsdrevne databasen til GoingElectric.de og Open Charge Map med din Android-enhet.
+Du finner info om ladestasjoner i hele verden og sanntidsinfo for mange av dem som er å finne i Europa.
+
+- Fri programvare
+- Materiell design
+- Sanntidsinfo (kun i Europa)
+- Integrert sammenligningsinfo ved bruk av Chargeprice.app (kun i Europa)
+- Kartdata fra OpenStreetMap (Mapbox)
+- Søk etter steder
+- Avanserte filtreringsvalg, inkludert lagrede filterprofiler
+- Favorittliste, som også har tilgjengelighetsinfo
+- Ingen reklame
+
+Du finner kildekoden på https://github.com/johan12345/EVMap.
+
+Dette kartet er ikke et offisielt program fra hverken GoingElectric.de eller Open Charge Map.
+Kun de offentlige API-ene derfra benyttes.
+
+Nødvendige tilganger er forklart på https://evmap.vonforst.net/en/permissions.html
--- a/fastlane/metadata/android/nb-NO/short_description.txt
+++ b/fastlane/metadata/android/nb-NO/short_description.txt
@@ -0,0 +1 @@
+Finn ladestasjoner for elektriske kjøretøy
--- a/fastlane/metadata/android/nb-NO/title.txt
+++ b/fastlane/metadata/android/nb-NO/title.txt
@@ -0,0 +1 @@
+EVMap — Elbil-ladere
Author	SHA1	Message	Date
johan12345	31fcee97e1	increase version code	2022-09-14 08:37:34 +02:00
johan12345	de8fd364f4	Android Auto: show loading errors	2022-09-14 08:36:51 +02:00
johan12345	e3f271be5d	increase version code	2022-09-12 23:06:40 +02:00
johan12345	99a2540398	MapScreen: move away from LiveData to avoid more refresh bugs	2022-09-12 23:06:08 +02:00
johan12345	85173b438b	increase version code	2022-09-12 22:43:42 +02:00
johan12345	c288883572	Android Auto: fix switch between filter settings	2022-09-12 22:42:34 +02:00
johan12345	c8f949da01	increase version code	2022-09-12 08:20:37 +02:00
johan12345	fe33dca1bc	Android Auto: fix loading data on first start	2022-09-12 08:19:00 +02:00
johan12345	4fb5090e9b	Release 1.3.11	2022-09-11 20:19:21 +02:00
johan12345	d9b8bf382a	ChargerDetailScreen: make images square	2022-09-11 19:41:27 +02:00
johan12345	d69456dfd0	fix more issues switching the data source, esp. on Android Auto	2022-09-11 19:14:12 +02:00
johan12345	4da2a273c7	MapScreen: avoid updating chargers twice, which can lead to crashes due to template update limit	2022-09-11 18:49:28 +02:00
johan12345	8e622c881d	Android Auto: limit maxRows in MapScreen to at most 25	2022-09-11 18:38:04 +02:00
johan12345	89b2175d89	fix crashes due to race conditions when changing data source	2022-09-11 18:07:08 +02:00
johan12345	3c30481821	add ChargeLocationRepository encapsulates logic to load charging stations for future implementation of offline caching (#164, #97)	2022-09-10 19:46:14 +02:00
johan12345	385353689d	French: ignore ImpliedQuantity	2022-09-04 15:46:26 +02:00
johan12345	7f9c838b9d	remove ignore:MissingQuantity for French	2022-09-04 15:41:30 +02:00
Hosted Weblate	205814e6f6	Translated using Weblate (Norwegian Bokmål) Currently translated at 85.4% (223 of 261 strings) Co-authored-by: Johan von Forstner <johan.forstner@gmail.com> Translate-URL: https://hosted.weblate.org/projects/evmap/android/nb_NO/ Translation: EVMap/Android	2022-09-04 15:40:02 +02:00
Hosted Weblate	f30ae4a720	Translated using Weblate (French) Currently translated at 100.0% (261 of 261 strings) Co-authored-by: Altons <marsupilami450@gmail.com> Translate-URL: https://hosted.weblate.org/projects/evmap/android/fr/ Translation: EVMap/Android	2022-09-04 15:40:02 +02:00
johan12345	a6117d3484	string adjustments	2022-09-04 11:05:50 +02:00
Hosted Weblate	f650def803	Translated using Weblate (Norwegian Bokmål) Currently translated at 84.6% (221 of 261 strings) Co-authored-by: Allan Nordhøy <epost@anotheragency.no> Translate-URL: https://hosted.weblate.org/projects/evmap/android/nb_NO/ Translation: EVMap/Android	2022-09-04 11:04:33 +02:00
johan12345	09ec0d1635	fix size of marker icon (mainly in intro) (regression from `b82f6f68fb`)	2022-09-04 08:43:39 +02:00
Hosted Weblate	cfc98209a1	Translated using Weblate (German) Currently translated at 100.0% (261 of 261 strings) Co-authored-by: Hosted Weblate <hosted@weblate.org> Co-authored-by: Johan von Forstner <johan.forstner@gmail.com> Translate-URL: https://hosted.weblate.org/projects/evmap/android/de/ Translation: EVMap/Android	2022-09-03 20:24:44 +02:00
johan12345	17dbab4659	remove unnecessary period	2022-09-03 20:19:56 +02:00
johan12345	f4ed7f7397	remove French and Norwegian strings according to simplifications in English strings	2022-09-03 20:10:56 +02:00
johan12345	c26253fe44	adapt some German strings according to changes in English strings	2022-09-03 20:10:56 +02:00
johan12345	1c7cc32427	Further adjustments to @comradekingu's suggestions	2022-09-03 20:10:56 +02:00
Johan von Forstner	4ff944c4e4	Update app/src/main/res/values/strings.xml Co-authored-by: Allan Nordhøy <epost@anotheragency.no>	2022-09-03 20:10:56 +02:00
Allan Nordhøy	2ec437a14b	Suggestions, fixes, removals	2022-09-03 20:10:56 +02:00
Allan Nordhøy	ae05d44649	App strings reworked	2022-09-03 20:10:47 +02:00
johan12345	a0f90a8c94	restructure FilterValueDao.getFilterValues possible fix for #225	2022-09-03 18:14:44 +02:00
johan12345	e1b7463490	rework locale chooser to use Android 13 native app locales	2022-09-03 15:37:58 +02:00
johan12345	27cbb5e208	add nautilusx to contributors	2022-09-01 20:57:03 +02:00
Hosted Weblate	5526e5d97c	Translated using Weblate (Norwegian Bokmål) Currently translated at 79.5% (210 of 264 strings) Co-authored-by: Allan Nordhøy <epost@anotheragency.no> Co-authored-by: Hosted Weblate <hosted@weblate.org> Translate-URL: https://hosted.weblate.org/projects/evmap/android/nb_NO/ Translation: EVMap/Android	2022-09-01 20:55:53 +02:00
Hosted Weblate	fc92ee9cdc	Translated using Weblate (German) Currently translated at 100.0% (264 of 264 strings) Co-authored-by: Hosted Weblate <hosted@weblate.org> Co-authored-by: nautilusx <translate@disroot.org> Translate-URL: https://hosted.weblate.org/projects/evmap/android/de/ Translation: EVMap/Android	2022-09-01 20:55:52 +02:00
Hosted Weblate	f20fab965c	Translated using Weblate (French) Currently translated at 100.0% (264 of 264 strings) Co-authored-by: Altons <marsupilami450@gmail.com> Co-authored-by: Hosted Weblate <hosted@weblate.org> Translate-URL: https://hosted.weblate.org/projects/evmap/android/fr/ Translation: EVMap/Android	2022-09-01 20:55:52 +02:00
johan12345	9146e7dab8	Merge remote-tracking branch 'weblate/master'	2022-08-25 20:43:12 +02:00
johan12345	54936b6e1a	make MissingTranslation lint check a warning	2022-08-25 20:32:31 +02:00
Altons	f3245dc29b	Translated using Weblate (French) Currently translated at 100.0% (264 of 264 strings) Translation: EVMap/Android Translate-URL: https://hosted.weblate.org/projects/evmap/android/fr/	2022-08-25 20:27:25 +02:00
johan12345	90968029ad	Release 1.3.10	2022-08-25 20:26:44 +02:00
Hosted Weblate	97cab1d007	Translated using Weblate (French) Currently translated at 99.6% (263 of 264 strings) Co-authored-by: Altons <marsupilami450@gmail.com> Translate-URL: https://hosted.weblate.org/projects/evmap/android/fr/ Translation: EVMap/Android	2022-08-25 20:24:19 +02:00
johan12345	0d41fb2685	Release 1.3.10	2022-08-25 20:23:53 +02:00
johan12345	2c0a5085ab	Add contributors dialog in About fixes #223	2022-08-25 20:22:30 +02:00
johan12345	9e80270a78	fix DataSourceSelectDialog OK button not working	2022-08-25 19:56:04 +02:00
johan12345	1b374cda1c	Release 1.3.9	2022-08-24 22:29:10 +02:00
johan12345	b82f6f68fb	Enhance marker color contrast fix #220	2022-08-24 22:12:29 +02:00
johan12345	8e19399aaa	Make border of mini markers more prominent (#220 )	2022-08-24 21:41:35 +02:00
johan12345	e315da926e	Fix selection of Norwegian locale in language chooser	2022-08-24 21:21:57 +02:00
johan12345	9450230856	minor fixes to translations - make language names untranslatable - missing plurals and strings - add Norwegian to language selection	2022-08-24 21:14:28 +02:00
Johan von Forstner	81d62860e2	Merge pull request #211 from weblate/weblate-evmap-android Translations update from Hosted Weblate	2022-08-24 20:45:58 +02:00
johan12345	e825654b9c	suppress lint MissingQuantity for French temporary until Weblate 4.14 with new plural requirements data is released	2022-08-24 20:45:41 +02:00
Hosted Weblate	0a4878a129	Translated using Weblate (Norwegian Bokmål) Currently translated at 77.3% (205 of 265 strings) Translated using Weblate (Norwegian Bokmål) Currently translated at 75.7% (200 of 264 strings) Update translation files Updated by "Cleanup translation files" hook in Weblate. Translated using Weblate (Norwegian Bokmål) Currently translated at 77.6% (205 of 264 strings) Update translation files Updated by "Remove blank strings" hook in Weblate. Translated using Weblate (Norwegian Bokmål) Currently translated at 73.4% (194 of 264 strings) Translated using Weblate (Norwegian Bokmål) Currently translated at 81.2% (26 of 32 strings) Translated using Weblate (Norwegian Bokmål) Currently translated at 100.0% (39 of 39 strings) Translated using Weblate (Norwegian Bokmål) Currently translated at 34.4% (91 of 264 strings) Translated using Weblate (Norwegian Bokmål) Currently translated at 34.4% (91 of 264 strings) Translated using Weblate (Norwegian Bokmål) Currently translated at 71.8% (23 of 32 strings) Translated using Weblate (Norwegian Bokmål) Currently translated at 32.9% (87 of 264 strings) Translated using Weblate (Norwegian Bokmål) Currently translated at 100.0% (2 of 2 strings) Translated using Weblate (Norwegian Bokmål) Currently translated at 100.0% (3 of 3 strings) Added translation using Weblate (Norwegian Bokmål) Added translation using Weblate (Norwegian Bokmål) Added translation using Weblate (Norwegian Bokmål) Added translation using Weblate (Norwegian Bokmål) Co-authored-by: Allan Nordhøy <epost@anotheragency.no> Co-authored-by: Hosted Weblate <hosted@weblate.org> Co-authored-by: Johan von Forstner <johan.forstner@gmail.com> Co-authored-by: Weblate <noreply@weblate.org> Translate-URL: https://hosted.weblate.org/projects/evmap/android-automotive/nb_NO/ Translate-URL: https://hosted.weblate.org/projects/evmap/android-fdroid/nb_NO/ Translate-URL: https://hosted.weblate.org/projects/evmap/android-google/nb_NO/ Translate-URL: https://hosted.weblate.org/projects/evmap/android/ Translate-URL: https://hosted.weblate.org/projects/evmap/android/nb_NO/ Translate-URL: https://hosted.weblate.org/projects/evmap/app-store-metadata/nb_NO/ Translation: EVMap/Android Translation: EVMap/Android (strings specific to F-Droid variant) Translation: EVMap/Android (strings specific to Google Play variant) Translation: EVMap/Android (strings specific to the Android Automotive OS app) Translation: EVMap/App Store metadata	2022-08-24 20:41:14 +02:00
johan12345	af50a95abd	update AnyMaps might reduce "white flash" in dark mode (at least for Google Maps) #216	2022-08-24 20:40:50 +02:00
johan12345	fe58551de9	fix highlighting of my charging plans caused by problem with markomilos.jsonapi library (`155aca0041`) fixes #221	2022-08-24 09:27:19 +02:00
johan12345	abc85c136b	add French to manual language selection	2022-08-23 00:19:19 +02:00
Hosted Weblate	0ad4691d30	Update translation files Updated by "Cleanup translation files" hook in Weblate. Co-authored-by: Hosted Weblate <hosted@weblate.org> Translate-URL: https://hosted.weblate.org/projects/evmap/android/ Translation: EVMap/Android	2022-08-23 00:13:30 +02:00
Hosted Weblate	d85a64ec77	Translated using Weblate (French) Currently translated at 100.0% (264 of 264 strings) Update translation files Updated by "Cleanup translation files" hook in Weblate. Translated using Weblate (French) Currently translated at 100.0% (264 of 264 strings) Translated using Weblate (French) Currently translated at 99.6% (263 of 264 strings) Translated using Weblate (French) Currently translated at 100.0% (39 of 39 strings) Translated using Weblate (French) Currently translated at 100.0% (2 of 2 strings) Translated using Weblate (French) Currently translated at 100.0% (32 of 32 strings) Translated using Weblate (French) Currently translated at 96.5% (255 of 264 strings) Translated using Weblate (French) Currently translated at 100.0% (3 of 3 strings) Translated using Weblate (French) Currently translated at 5.6% (15 of 264 strings) Translated using Weblate (French) Currently translated at 0.3% (1 of 264 strings) Added translation using Weblate (French) Added translation using Weblate (French) Added translation using Weblate (French) Added translation using Weblate (French) Co-authored-by: Altons <marsupilami450@gmail.com> Co-authored-by: Hosted Weblate <hosted@weblate.org> Co-authored-by: Johan von Forstner <johan.forstner@gmail.com> Co-authored-by: Weblate <noreply@weblate.org> Translate-URL: https://hosted.weblate.org/projects/evmap/android-automotive/fr/ Translate-URL: https://hosted.weblate.org/projects/evmap/android-fdroid/fr/ Translate-URL: https://hosted.weblate.org/projects/evmap/android-google/fr/ Translate-URL: https://hosted.weblate.org/projects/evmap/android/ Translate-URL: https://hosted.weblate.org/projects/evmap/android/fr/ Translate-URL: https://hosted.weblate.org/projects/evmap/app-store-metadata/fr/ Translation: EVMap/Android Translation: EVMap/Android (strings specific to F-Droid variant) Translation: EVMap/Android (strings specific to Google Play variant) Translation: EVMap/Android (strings specific to the Android Automotive OS app) Translation: EVMap/App Store metadata	2022-08-23 00:11:58 +02:00
johan12345	52fefb564a	eliminate duplicate strings for Google Maps and Mapbox	2022-08-22 23:25:34 +02:00
johan12345	d18b2e26b8	Separate "free" and "paid" strings for charging and parking because... French :D	2022-08-22 23:22:16 +02:00
johan12345	d5f55366a9	Android Auto: Avoid possible extra template refresh due to race condition	2022-08-22 23:03:08 +02:00
johan12345	2f93e92b57	Android Auto: Use more appropriate title for place search data source selection screen	2022-08-22 22:47:49 +02:00
johan12345	24e5d072d6	GoingElectric: swap order of "categories" and "exclude faults" filters Categories is not very useful as many chargers have no category assigned. Also, Polestar/Volvo AAOS only shows maximum 8 list items.	2022-08-22 22:37:15 +02:00
				`@@ -0,0 +1 @@`
				`Trouver des stations de recharge pour véhicules électriques`
				`@@ -0,0 +1 @@`
				`Finn ladestasjoner for elektriske kjøretøy`