New translations strings.json (French)

wlcrs · Jan 24, 2025 · 6dc459e · 6dc459e
1 parent ab6b39b
commit 6dc459e
Showing 1 changed file with 9 additions and 15 deletions.
diff --git a/translations/fr.json b/translations/fr.json
@@ -90,12 +90,6 @@
             },
             "emma_maximum_feed_grid_power_watt": {
                 "name": "Maximum feed grid power"
-<<<<<<< HEAD
-=======
-            },
-            "mppt_scanning_interval": {
-                "name": "MPPT scan interval"
->>>>>>> 18f7306 (Fix missing translations for power meter current sensors)
             }
         },
         "sensor": {
@@ -135,6 +129,15 @@
             "phase_c_current": {
                 "name": "Courant de la phase C"
             },
+            "active_grid_a_current": {
+                "name": "Phase A current"
+            },
+            "active_grid_b_current": {
+                "name": "Phase B current"
+            },
+            "active_grid_c_current": {
+                "name": "Phase C current"
+            },
             "day_active_power_peak": {
                 "name": "Pic de puissance active journalière"
             },
@@ -273,15 +276,6 @@
             "grid_c_current": {
                 "name": "Courant de la phase C"
             },
-            "active_grid_a_current": {
-                "name": "Courant de la phase A"
-            },
-            "active_grid_b_current": {
-                "name": "Courant de la phase B"
-            },
-            "active_grid_c_current": {
-                "name": "Courant de la phase C"
-            },
             "active_grid_a_b_voltage": {
                 "name": "Tension ligne A-B"
             },