Release 1.3.9

Enhance marker color contrast
fix #220
2025-12-25 08:07:46 -05:00 · 2022-08-24 22:29:10 +02:00 · 2022-08-24 22:12:29 +02:00 · 2022-08-24 21:41:35 +02:00 · 2022-08-24 21:21:57 +02:00 · 2022-08-24 21:14:28 +02:00
39 changed files with 828 additions and 106 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
@@ -19,8 +19,8 @@ android {
        minSdkVersion 21
        targetSdkVersion 31
        // NOTE: always increase versionCode by 2 since automotive flavor uses versionCode + 1
-        versionCode 102
-        versionName "1.3.8"
+        versionCode 104
+        versionName "1.3.9"

        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
    }
@@ -165,8 +165,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 +186,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/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/MapScreen.kt
+++ b/app/src/google/java/net/vonforst/evmap/auto/MapScreen.kt
@@ -373,10 +373,8 @@ 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) {
+        filtersWithValue.observe(this@MapScreen) {
            loadChargers()
        }
    }
@@ -398,6 +396,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/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
@@ -467,17 +467,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/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/utils/LocaleContextWrapper.kt
+++ b/app/src/main/java/net/vonforst/evmap/utils/LocaleContextWrapper.kt
@@ -25,7 +25,12 @@ class LocaleContextWrapper(base: Context?) : ContextWrapper(base) {
                }
            } else {
                // set selected locale
-                val locale = Locale(language)
+                val locale = if (language.contains("-")) {
+                    val split = language.split("-")
+                    Locale(split[0], split[1])
+                } else {
+                    Locale(language)
+                }
                Locale.setDefault(locale)
                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
                    appConfig.setLocale(locale)
--- 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/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"
-    android:viewportHeight="368.4"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="233.8dp"
+    android:height="368.4dp"
    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:viewportHeight="368.4">
+  <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
@@ -19,8 +19,10 @@
    <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="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">Ladeweile</string>
    <string name="general_info">Allgemeine Hinweise</string>
    <string name="realtime_data_unavailable">Echtzeitstatus nicht verfügbar</string>
@@ -252,8 +254,6 @@
    <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 +269,6 @@
    <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>
+    <string name="pref_provider_google_maps">Google Maps</string>
+    <string name="pref_provider_osm_mapbox">OpenStreetMap (Mapbox)</string>
 </resources>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -0,0 +1,274 @@
+<?xml version="1.0" encoding="utf-8"?><!-- tools:ignore="MissingQuantity" is temporary until Weblate 4.14 is released -->
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingQuantity">
+    <string name="app_name">EVMap</string>
+    <string name="title_activity_maps">EVMap</string>
+    <string name="connectors">Connecteurs</string>
+    <string name="no_maps_app_found">Aucune application de navigation trouvée</string>
+    <string name="no_browser_app_found">Aucun navigateur web trouvé</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 d\'EVMap</string>
+    <string name="github_link_title">Code source</string>
+    <string name="settings_ui">Interface utilisateur</string>
+    <string name="privacy">Politique de confidentialité</string>
+    <string name="fav_add">Ajouter aux favoris</string>
+    <string name="pref_navigate_use_maps">Démarrer la navigation immédiatement</string>
+    <string name="coordinates">Coordonnées</string>
+    <string name="pref_navigate_use_maps_on">Le bouton de navigation lance immédiatement la navigation 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">Si vous ajoutez des chargeurs à vos favoris, ils apparaîtront 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">FAQ</string>
+    <string name="faq_desc">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</string>
+    <string name="pref_language_summary">Changer la 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">(Vous pouvez vérifier à nouveau les couleurs sous \"À propos d\'EVMap → FAQ\" dans le menu)</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="other">%d modes de paiement compatibles</item>
+    </plurals>
+    <string name="verified_desc">Chargeur vérifié par un membre de la communauté %s - ne fonctionne pas forcément en ce moment.</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">Chargeprice.app n\'a trouvé aucun tarif de recharge compatible avec ce chargeur.</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="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">Activer la rotation de la carte</string>
+    <string name="pref_map_rotate_gestures_off">La carte reste orientée vers le nord</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 Open Source</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">Signaler un 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 avec 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">Il semble que vous appréciez beaucoup la fonction de comparaison des prix. Pour accéder aux données de tarification, le développeur d\'EVMap doit payer une redevance mensuelle au fournisseur de données Chargeprice.app. Par conséquent, veuillez envisager de soutenir EVMap par un don.</string>
+    <string name="pref_darkmode_summary">Définir lorsque le mode sombre est activé</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">Si seule une page vide s\'affiche ici, veuillez d\'abord vous connecter à GoingElectric.de.</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 open source que je développe pendant mon temps libre. Les contributions de codage sur GitHub sont très appréciées. Cependant, en raison de la popularité croissante de l\'application, je dois également couvrir certains coûts de fonctionnement, par exemple pour l\'accès aux sources de données. Par conséquent, veuillez envisager de soutenir l\'application par un don ou via les sponsors GitHub.</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 pas encore enregistré de profils de filtrage.</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">Les suggestions n\'ont pas pu être chargées</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 offrent des tarifs moins chers exclusivement à leurs clients (par exemple, électricité domestique, gaz)</string>
+    <string name="pref_chargeprice_no_base_fee">Afficher uniquement les tarifs sans frais mensuels</string>
+    <string name="chargeprice_no_compatible_connectors">Aucun des connecteurs de cette station de charge n\'est compatible avec votre véhicule.</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="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">Désolé, il semble que EVMap ait 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">Très bonne couverture en Allemagne, en Autriche et en Suisse et dans de nombreux pays voisins. 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">EVMap supporte plusieurs sources de données pour les stations de recharge. Veuillez sélectionner celle que vous souhaitez utiliser. Vous pourrez toujours 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. Si vous utilisez souvent cette fonctionnalité, veuillez envisager de faire un don via \"À propos d’EVMap -&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 avec &gt;4,5 kW aux stations AC pour les voitures avec chargeur monophasé</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">La carte peut être pivotée avec un geste à deux doigts</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>
+</resources>
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -0,0 +1,275 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">EVMap</string>
+    <string name="no_maps_app_found">Fant ingen navigeringsprogrammer</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 EVMap</string>
+    <string name="version">Versjon</string>
+    <string name="settings">Innstillinger</string>
+    <string name="settings_map">Kart</string>
+    <string name="fav_add">Legg til 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">O-S-S</string>
+    <string name="faq_desc">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">Språk</string>
+    <string name="pref_language_summary">Endre programspråket</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">Brukergrensesnitt</string>
+    <string name="title_activity_maps">EVMap</string>
+    <string name="no_browser_app_found">Fant ingen nettlesere</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">Frie lisenser</string>
+    <string name="copyright">Opphavsrett</string>
+    <string name="coordinates">Koordinater</string>
+    <string name="fault_report">Feilrapport</string>
+    <string name="privacy">Personvernsmerknad</string>
+    <string name="pref_navigate_use_maps">Start navigasjon umiddelbart</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">Rapporter 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 Google Maps-navigasjon umiddelbart</string>
+    <string name="filter_free_parking">Kun ladere med gratis parkering</string>
+    <string name="filter_min_power">Minimumseffekt</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">Ladere lagret som favoritter 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 lagret noen 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">Maksimal ladeeffekt er angitt ved forskjellige farger på respektive ladere i kartet.</string>
+    <string name="welcome_2_detail">(Du kan sjekke fargene igjen i «Om EVMap → 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 bilen 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">Skru på 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">Kartet kan roteres med to fingre</string>
+    <string name="pref_map_rotate_gestures_off">Kartet vil orienteres mot nord</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 starter kartprogram 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">Fri programvare utviklet på fritiden. Kodebidrag mottas med takk. Siden programmet er mer og mer populært må driftskostnader dekkes. Overvei å gi din støtte gjennom GitHub-sponsorer.</string>
+    <string name="pref_chargeprice_allow_unbalanced_load_summary">Tillat lading over 4.5 kW på vekselstrømsstasjoner med enfaselader</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="pref_darkmode_summary">Når mørk drakt er iført</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. Dette bekostes av utvikleren som månedlig avgift til Chargeprice.app-datatilbyderen.
+\nOvervei å 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">Chargeprice.app fant ikke noen ladeabonnementer kompatible med denne laderen.</string>
+    <string name="pref_chargeprice_no_base_fee">Kun vis abonnementer uten månedlige gebyr</string>
+    <string name="chargeprice_select_connector">Velg tilkobling</string>
+    <string name="chargeprice_provider_customer_tariff">Kun for tilbyderkunder</string>
+    <string name="chargeprice_blocking_fee">Blokkeringsgebyr &gt;%s</string>
+    <string name="pref_chargeprice_show_provider_customer_tariffs">Vis abonnementer fra kundekoblingssalg</string>
+    <string name="pref_chargeprice_show_provider_customer_tariffs_summary">Noen tilbydere gir billigere abonnementer til sine kunder (f.eks. husstandselektrisitet, gass, osv)</string>
+    <string name="pref_my_tariffs">Mine ladeabonnementer</string>
+    <string name="chargeprice_no_compatible_connectors">Ingen av tilkoblingene på denne ladestasjonen er kompatible med ditt kjøretøy.</string>
+    <string name="data_sources_description">Flere datakilder støttes for innhenting av stasjoner. Velg den du ønsker å bruke og gjør endringer senere i innstillingene hvis nødvendig.</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">Veldig god dekning i Tyskland, Østerrike, Sveits, og mange land i nærheten. Beskrivelser på tysk. Gemenskapsdrevet.</string>
+    <string name="powered_by_mapbox">tilbudt av Mapbox</string>
+    <string name="pref_search_provider_info">Data for stedssøk. Spesielt for Google Maps er dette relativt kostbart. Hvis du bruker dette ofte bes du om å donere gjennom «Om EVMap → Doner».</string>
+    <string name="data_source_openchargemap_desc">Verdensomspennende dekning med varierende kvalitet. Beskrivelser på engelsk eller lokalt språk. Gemenskapsdrevet og åpen data fra myndigheter i noen land (f.eks. Nord-Amerika, Storbritannia, Frankrike, Norge.)</string>
+    <string name="lets_go">Begynn</string>
+    <string name="crash_report_text">EVMap har krasjet. Send en rapport til utvikleren.</string>
+    <string name="chargeprice_all_tariffs_selected">alle planer valgt</string>
+    <string name="pref_search_provider">Stedssøkstilbyder</string>
+    <string name="pref_chargeprice_allow_unbalanced_load">Tillat skjev-belastning</string>
+    <string name="edit_on_goingelectric_info">Hvis en tom side vises her må du logge inn på GoingElectric.de først.</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>
+</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,8 @@
    <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>
 </resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -18,8 +18,10 @@
    <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="realtime_data_unavailable">Real-time status unavailable</string>
@@ -251,8 +253,6 @@
    <string name="refresh_live_data">refresh real-time status</string>
    <string name="autocomplete_connection_error">Suggestions could not be loaded</string>
    <string name="pref_language_device_default">Device default</string>
-    <string name="pref_language_en">English</string>
-    <string name="pref_language_de">German</string>
    <string name="pref_darkmode_device_default">Device default</string>
    <string name="pref_darkmode_always_on">always on</string>
    <string name="pref_darkmode_always_off">always off</string>
@@ -268,8 +268,6 @@
    <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>
 </resources>
--- 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/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/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	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`