From 43c8ed37248bf8627b7aeabc2cc8ab1434a5838c Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Sun, 27 Apr 2025 09:32:59 -0700 Subject: [PATCH] Additionaltranslatin key cleanup --- Localizable.xcstrings | 490 ++++++------------ .../Enums/CannedMessagesConfigEnums.swift | 2 +- Meshtastic/Enums/PositionConfigEnums.swift | 4 +- Meshtastic/Views/Bluetooth/Connect.swift | 2 +- Meshtastic/Views/Helpers/PowerMetrics.swift | 4 +- Meshtastic/Views/Messages/ChannelList.swift | 2 +- Meshtastic/Views/Messages/Messages.swift | 2 +- .../Views/Nodes/Helpers/NodeDetail.swift | 2 +- Meshtastic/Views/Settings/Channels.swift | 2 +- Meshtastic/Views/Settings/RouteRecorder.swift | 2 +- Meshtastic/Views/Settings/Settings.swift | 2 +- 11 files changed, 161 insertions(+), 353 deletions(-) diff --git a/Localizable.xcstrings b/Localizable.xcstrings index 0e1c3b63..440ebedb 100644 --- a/Localizable.xcstrings +++ b/Localizable.xcstrings @@ -4332,70 +4332,6 @@ } } }, - "canned.messages.preset.cardkb" : { - "localizations" : { - "de" : { - "stringUnit" : { - "state" : "translated", - "value" : "M5 Stack Card KB / RAK Tastenfeld" - } - }, - "en" : { - "stringUnit" : { - "state" : "translated", - "value" : "M5 Stack Card KB / RAK Keypad" - } - }, - "fr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Clavier M5 Stack Card KB / RAK" - } - }, - "he" : { - "stringUnit" : { - "state" : "translated", - "value" : "M5 Stack Card KB / RAK Keypad" - } - }, - "it" : { - "stringUnit" : { - "state" : "translated", - "value" : "M5 Stack Card KB / Tastiera RAK" - } - }, - "pl" : { - "stringUnit" : { - "state" : "translated", - "value" : "M5 Stack Card KB / RAK Keypad" - } - }, - "se" : { - "stringUnit" : { - "state" : "translated", - "value" : "M5 Stack Card KB / RAK Keypad" - } - }, - "sr" : { - "stringUnit" : { - "state" : "translated", - "value" : "M5 стек картица KB / RAK тастатура" - } - }, - "zh-Hans" : { - "stringUnit" : { - "state" : "translated", - "value" : "M5 Stack 卡片键盘 / RAK 键盘" - } - }, - "zh-Hant-TW" : { - "stringUnit" : { - "state" : "translated", - "value" : "M5Stack 卡片鍵盤 / RAK 鍵盤" - } - } - } - }, "canned.messages.preset.manual" : { "localizations" : { "de" : { @@ -5274,65 +5210,59 @@ } } }, - "channels" : { + "Channels" : { "localizations" : { "de" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Kanäle" } }, - "en" : { - "stringUnit" : { - "state" : "translated", - "value" : "Channels" - } - }, "fr" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Canaux" } }, "he" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "ערוצים" } }, "it" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Canali" } }, "pl" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Kanały" } }, "se" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Kanaler" } }, "sr" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Канали" } }, "zh-Hans" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "频道" } }, "zh-Hant-TW" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "頻道" } } @@ -10720,61 +10650,55 @@ "localizations" : { "de" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Deaktiviert" } }, - "en" : { - "stringUnit" : { - "state" : "translated", - "value" : "Disabled" - } - }, "fr" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Désactivé" } }, "he" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "כבוי" } }, "it" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Disattivato" } }, "pl" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Wyłączony" } }, "se" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Inaktiverad" } }, "sr" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Онемогућено" } }, "zh-Hans" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "禁用" } }, "zh-Hant-TW" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "關閉" } } @@ -10784,61 +10708,55 @@ "localizations" : { "de" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Trennen" } }, - "en" : { - "stringUnit" : { - "state" : "translated", - "value" : "Disconnect" - } - }, "fr" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Déconnecter" } }, "he" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "התנתק" } }, "it" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Disconnessione" } }, "pl" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Rozłącz" } }, "se" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Koppla från" } }, "sr" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Прекините везу" } }, "zh-Hans" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "断开连接" } }, "zh-Hant-TW" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "斷開連接" } } @@ -10848,61 +10766,55 @@ "localizations" : { "de" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Tastatur ausblenden" } }, - "en" : { - "stringUnit" : { - "state" : "translated", - "value" : "Dismiss" - } - }, "fr" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Annuler" } }, "he" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "סגור מקלדת" } }, "it" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Sospendere" } }, "pl" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Zamknij" } }, "se" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Stäng" } }, "sr" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Отпусти" } }, "zh-Hans" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "收起键盘" } }, "zh-Hant-TW" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "隱藏鍵盤" } } @@ -10912,61 +10824,55 @@ "localizations" : { "de" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Display (Device Screen)" } }, - "en" : { - "stringUnit" : { - "state" : "translated", - "value" : "Display" - } - }, "fr" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Écran" } }, "he" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "צג מכשיר" } }, "it" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Display" } }, "pl" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Wyświetlacz (Ekran Urządzenia)" } }, "se" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Skärm" } }, "sr" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Приказ" } }, "zh-Hans" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "显示" } }, "zh-Hant-TW" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "螢幕" } } @@ -11630,61 +11536,55 @@ "localizations" : { "de" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Aktiviert" } }, - "en" : { - "stringUnit" : { - "state" : "translated", - "value" : "Enabled" - } - }, "fr" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Activé" } }, "he" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "מופעל" } }, "it" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Abilitato" } }, "pl" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Włączony" } }, "se" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Aktiverad" } }, "sr" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Омогућено" } }, "zh-Hans" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "启用" } }, "zh-Hant-TW" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "啟用" } } @@ -12928,65 +12828,59 @@ } } }, - "finish" : { + "Finish" : { "localizations" : { "de" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Beenden" } }, - "en" : { - "stringUnit" : { - "state" : "translated", - "value" : "Finish" - } - }, "fr" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Terminer" } }, "he" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "סיים" } }, "it" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Fine" } }, "pl" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Finish" } }, "se" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Avsluta" } }, "sr" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Заврши" } }, "zh-Hans" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Finish" } }, "zh-Hant-TW" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "完成" } } @@ -13088,65 +12982,59 @@ } } }, - "firmware.version" : { + "Firmware Version" : { "localizations" : { "de" : { "stringUnit" : { - "state" : "translated", - "value" : "Firmware Version" - } - }, - "en" : { - "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Firmware Version" } }, "fr" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Version du firmware" } }, "he" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "גרסת קושחה" } }, "it" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Versione del firmware" } }, "pl" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Wersja Oprogramowania" } }, "se" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Firmwareversion" } }, "sr" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Верзија фирмвера" } }, "zh-Hans" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "固件版本" } }, "zh-Hant-TW" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "韌體版本" } } @@ -13270,61 +13158,55 @@ "localizations" : { "de" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Feste PIN" } }, - "en" : { - "stringUnit" : { - "state" : "translated", - "value" : "Fixed PIN" - } - }, "fr" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Code PIN fixe" } }, "he" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "קוד קבוע" } }, "it" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "PIN fisso" } }, "pl" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Stały PIN" } }, "se" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Fast PIN" } }, "sr" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Фиксни ПИН" } }, "zh-Hans" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "固定 PIN 码" } }, "zh-Hant-TW" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "固定 PIN 碼" } } @@ -14462,122 +14344,6 @@ } } }, - "gpsmode.disabled" : { - "localizations" : { - "de" : { - "stringUnit" : { - "state" : "translated", - "value" : "Ausgeschaltet" - } - }, - "en" : { - "stringUnit" : { - "state" : "translated", - "value" : "Disabled" - } - }, - "fr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Désactivé" - } - }, - "he" : { - "stringUnit" : { - "state" : "translated", - "value" : "כבוי" - } - }, - "it" : { - "stringUnit" : { - "state" : "translated", - "value" : "Disabili" - } - }, - "se" : { - "stringUnit" : { - "state" : "translated", - "value" : "Inaktiverad" - } - }, - "sr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Онемогућен" - } - }, - "zh-Hans" : { - "stringUnit" : { - "state" : "translated", - "value" : "禁用" - } - }, - "zh-Hant-TW" : { - "stringUnit" : { - "state" : "translated", - "value" : "已停用" - } - } - } - }, - "gpsmode.enabled" : { - "localizations" : { - "de" : { - "stringUnit" : { - "state" : "translated", - "value" : "Eingeschaltet" - } - }, - "en" : { - "stringUnit" : { - "state" : "translated", - "value" : "Enabled" - } - }, - "fr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Activé" - } - }, - "he" : { - "stringUnit" : { - "state" : "translated", - "value" : "מופעל" - } - }, - "it" : { - "stringUnit" : { - "state" : "translated", - "value" : "Abilitato" - } - }, - "se" : { - "stringUnit" : { - "state" : "translated", - "value" : "Aktiverad" - } - }, - "sr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Омогућен" - } - }, - "zh-Hans" : { - "stringUnit" : { - "state" : "translated", - "value" : "启用" - } - }, - "zh-Hant-TW" : { - "stringUnit" : { - "state" : "translated", - "value" : "已啟用" - } - } - } - }, "gpsmode.notPresent" : { "localizations" : { "en" : { @@ -20000,6 +19766,70 @@ } } }, + "M5 Stack Card KB / RAK Keypad" : { + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "M5 Stack Card KB / RAK Tastenfeld" + } + }, + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "M5 Stack Card KB / RAK Keypad" + } + }, + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Clavier M5 Stack Card KB / RAK" + } + }, + "he" : { + "stringUnit" : { + "state" : "translated", + "value" : "M5 Stack Card KB / RAK Keypad" + } + }, + "it" : { + "stringUnit" : { + "state" : "translated", + "value" : "M5 Stack Card KB / Tastiera RAK" + } + }, + "pl" : { + "stringUnit" : { + "state" : "translated", + "value" : "M5 Stack Card KB / RAK Keypad" + } + }, + "se" : { + "stringUnit" : { + "state" : "translated", + "value" : "M5 Stack Card KB / RAK Keypad" + } + }, + "sr" : { + "stringUnit" : { + "state" : "translated", + "value" : "M5 стек картица KB / RAK тастатура" + } + }, + "zh-Hans" : { + "stringUnit" : { + "state" : "translated", + "value" : "M5 Stack 卡片键盘 / RAK 键盘" + } + }, + "zh-Hant-TW" : { + "stringUnit" : { + "state" : "translated", + "value" : "M5Stack 卡片鍵盤 / RAK 鍵盤" + } + } + } + }, "Malaysia 433mhz" : { "localizations" : { "en" : { @@ -38624,7 +38454,7 @@ } } }, - "voltage" : { + "Voltage" : { "localizations" : { "de" : { "stringUnit" : { @@ -38688,28 +38518,6 @@ } } }, - "Voltage" : { - "localizations" : { - "it" : { - "stringUnit" : { - "state" : "translated", - "value" : "Tensione" - } - }, - "sr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Напон" - } - }, - "zh-Hant-TW" : { - "stringUnit" : { - "state" : "translated", - "value" : "電壓" - } - } - } - }, "Volts %@" : { "localizations" : { "it" : { diff --git a/Meshtastic/Enums/CannedMessagesConfigEnums.swift b/Meshtastic/Enums/CannedMessagesConfigEnums.swift index f197eced..15edbe4c 100644 --- a/Meshtastic/Enums/CannedMessagesConfigEnums.swift +++ b/Meshtastic/Enums/CannedMessagesConfigEnums.swift @@ -23,7 +23,7 @@ enum ConfigPresets: Int, CaseIterable, Identifiable { case .rakRotaryEncoder: return "canned.messages.preset.rakrotary".localized case .cardKB: - return "canned.messages.preset.cardkb".localized + return "M5 Stack Card KB / RAK Keypad".localized } } } diff --git a/Meshtastic/Enums/PositionConfigEnums.swift b/Meshtastic/Enums/PositionConfigEnums.swift index 4853d050..7e587a08 100644 --- a/Meshtastic/Enums/PositionConfigEnums.swift +++ b/Meshtastic/Enums/PositionConfigEnums.swift @@ -110,9 +110,9 @@ enum GpsMode: Int, CaseIterable, Equatable { var description: String { switch self { case .disabled: - return "gpsmode.disabled".localized + return "Disabled".localized case .enabled: - return "gpsmode.enabled".localized + return "Eenabled".localized case .notPresent: return "gpsmode.notPresent".localized } diff --git a/Meshtastic/Views/Bluetooth/Connect.swift b/Meshtastic/Views/Bluetooth/Connect.swift index 880faf8d..6dacb044 100644 --- a/Meshtastic/Views/Bluetooth/Connect.swift +++ b/Meshtastic/Views/Bluetooth/Connect.swift @@ -67,7 +67,7 @@ struct Connect: View { Text("BLE Name").font(.callout)+Text(": \(bleManager.connectedPeripheral?.peripheral.name?.addingVariationSelectors ?? "unknown".localized)") .font(.callout).foregroundColor(Color.gray) if node != nil { - Text("firmware.version").font(.callout)+Text(": \(node?.metadata?.firmwareVersion ?? "unknown".localized)") + Text("Firmware Version").font(.callout)+Text(": \(node?.metadata?.firmwareVersion ?? "unknown".localized)") .font(.callout).foregroundColor(Color.gray) } if bleManager.isSubscribed { diff --git a/Meshtastic/Views/Helpers/PowerMetrics.swift b/Meshtastic/Views/Helpers/PowerMetrics.swift index 7f9fdcdd..e85c0f6a 100644 --- a/Meshtastic/Views/Helpers/PowerMetrics.swift +++ b/Meshtastic/Views/Helpers/PowerMetrics.swift @@ -69,8 +69,8 @@ struct PowerMetrics: View { } enum PowerMetricType: String { - case current = "current" - case voltage = "voltage" + case current = "Current" + case voltage = "Voltage" } struct PowerMetricCompactWidget: View { diff --git a/Meshtastic/Views/Messages/ChannelList.swift b/Meshtastic/Views/Messages/ChannelList.swift index 426cb0c7..f4194dc3 100644 --- a/Meshtastic/Views/Messages/ChannelList.swift +++ b/Meshtastic/Views/Messages/ChannelList.swift @@ -154,6 +154,6 @@ struct ChannelList: View { .listStyle(.plain) } } - .navigationTitle("channels") + .navigationTitle("Channels") } } diff --git a/Meshtastic/Views/Messages/Messages.swift b/Meshtastic/Views/Messages/Messages.swift index 1267d3e2..6142617b 100644 --- a/Meshtastic/Views/Messages/Messages.swift +++ b/Meshtastic/Views/Messages/Messages.swift @@ -35,7 +35,7 @@ struct Messages: View { List(selection: $router.navigationState.messages) { NavigationLink(value: MessagesNavigationState.channels()) { Label { - Text("channels") + Text("Channels") .badge(unreadChannelMessages) .font(.title2) .padding() diff --git a/Meshtastic/Views/Nodes/Helpers/NodeDetail.swift b/Meshtastic/Views/Nodes/Helpers/NodeDetail.swift index 10c0b569..7f834de9 100644 --- a/Meshtastic/Views/Nodes/Helpers/NodeDetail.swift +++ b/Meshtastic/Views/Nodes/Helpers/NodeDetail.swift @@ -120,7 +120,7 @@ struct NodeDetail: View { if let metadata = node.metadata { HStack { Label { - Text("firmware.version") + Text("Firmware Version") } icon: { Image(systemName: "memorychip") .symbolRenderingMode(.multicolor) diff --git a/Meshtastic/Views/Settings/Channels.swift b/Meshtastic/Views/Settings/Channels.swift index 551b9ab4..19c56a7b 100644 --- a/Meshtastic/Views/Settings/Channels.swift +++ b/Meshtastic/Views/Settings/Channels.swift @@ -279,7 +279,7 @@ struct Channels: View { .padding() } } - .navigationTitle("channels") + .navigationTitle("Channels") .navigationBarItems(trailing: ZStack { ConnectedDevice(bluetoothOn: bleManager.isSwitchedOn, deviceConnected: bleManager.connectedPeripheral != nil, name: (bleManager.connectedPeripheral != nil) ? bleManager.connectedPeripheral.shortName : "?") diff --git a/Meshtastic/Views/Settings/RouteRecorder.swift b/Meshtastic/Views/Settings/RouteRecorder.swift index 8cee2eeb..4a1f2b96 100644 --- a/Meshtastic/Views/Settings/RouteRecorder.swift +++ b/Meshtastic/Views/Settings/RouteRecorder.swift @@ -250,7 +250,7 @@ struct RouteRecorder: View { } isShowingDetails = false } label: { - Label("finish", systemImage: "flag.checkered") + Label("Finish", systemImage: "flag.checkered") } .buttonStyle(.bordered) .buttonBorderShape(.capsule) diff --git a/Meshtastic/Views/Settings/Settings.swift b/Meshtastic/Views/Settings/Settings.swift index 0ebac5a8..715b74e2 100644 --- a/Meshtastic/Views/Settings/Settings.swift +++ b/Meshtastic/Views/Settings/Settings.swift @@ -78,7 +78,7 @@ struct Settings: View { NavigationLink(value: SettingsNavigationState.channels) { Label { - Text("channels") + Text("Channels") } icon: { Image(systemName: "fibrechannel") }