New translations strings.json (Portuguese)

wlcrs · Jan 24, 2025 · 77d0cb4 · 77d0cb4
1 parent 1dfa092
commit 77d0cb4
Showing 1 changed file with 9 additions and 39 deletions.
diff --git a/translations/pt.json b/translations/pt.json
@@ -129,6 +129,15 @@
             "phase_c_current": {
                 "name": "Phase C current"
             },
+            "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": "Day active power peak"
             },
@@ -267,15 +276,6 @@
             "grid_c_current": {
                 "name": "Phase C current"
             },
-            "active_grid_a_current": {
-                "name": "Phase A current"
-            },
-            "active_grid_b_current": {
-                "name": "Phase B current"
-            },
-            "active_grid_c_current": {
-                "name": "Phase C current"
-            },
             "active_grid_a_b_voltage": {
                 "name": "A-B line voltage"
             },
@@ -704,36 +704,6 @@
             },
             "backup_power_state_of_charge": {
                 "name": "Backup power state of charge"
-<<<<<<< HEAD
-=======
-            },
-            "pack_1_max_temperature": {
-                "name": "Pack 1 max temperature"
-            },
-            "pack_1_min_temperature": {
-                "name": "Pack 1 min temperature"
-            },
-            "pack_2_max_temperature": {
-                "name": "Pack 2 max temperature"
-            },
-            "pack_2_min_temperature": {
-                "name": "Pack 2 min temperature"
-            },
-            "pack_3_max_temperature": {
-                "name": "Pack 3 max temperature"
-            },
-            "pack_3_min_temperature": {
-                "name": "Pack 3 min temperature"
-            },
-            "pack_1_working_status": {
-                "name": "Pack 1 working status"
-            },
-            "pack_1_firmware_version": {
-                "name": "Pack 1 firmware version"
-            },
-            "bms_temperature": {
-                "name": "BMS temperature"
->>>>>>> 18f7306 (Fix missing translations for power meter current sensors)
             }
         },
         "select": {