From 4a75e68a1a42db190efa10b75dc6972777a19507 Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Sat, 15 Feb 2025 10:46:35 -0800 Subject: [PATCH] More key deletion --- Localizable.xcstrings | 401 +++++------------- Meshtastic/Enums/DisplayEnums.swift | 2 +- Meshtastic/Enums/LoraConfigEnums.swift | 2 +- .../Helpers/LocalNotificationManager.swift | 2 +- Meshtastic/Views/Bluetooth/Connect.swift | 6 +- .../Messages/MessageContextMenuItems.swift | 8 +- Meshtastic/Views/Settings/AppSettings.swift | 2 +- 7 files changed, 115 insertions(+), 308 deletions(-) diff --git a/Localizable.xcstrings b/Localizable.xcstrings index e1f9c1e2..941d7b71 100644 --- a/Localizable.xcstrings +++ b/Localizable.xcstrings @@ -1235,7 +1235,7 @@ } } }, - "airtime" : { + "Airtime" : { "localizations" : { "de" : { "stringUnit" : { @@ -1299,22 +1299,6 @@ } } }, - "Airtime" : { - "localizations" : { - "sr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Време емитовања" - } - }, - "zh-Hans" : { - "stringUnit" : { - "state" : "translated", - "value" : "广播时间" - } - } - } - }, "Airtime %@%%" : { "localizations" : { "sr" : { @@ -1545,23 +1529,7 @@ } } }, - "Always point north" : { - "localizations" : { - "de" : { - "stringUnit" : { - "state" : "translated", - "value" : "Immer nach Norden zeigen" - } - }, - "sr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Увек усмеравајте на север" - } - } - } - }, - "always.on" : { + "Always On" : { "extractionState" : "migrated", "localizations" : { "de" : { @@ -1626,6 +1594,22 @@ } } }, + "Always point north" : { + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Immer nach Norden zeigen" + } + }, + "sr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Увек усмеравајте на север" + } + } + } + }, "ambient.lighting" : { "localizations" : { "de" : { @@ -1872,135 +1856,6 @@ } } }, - "appsettings" : { - "localizations" : { - "de" : { - "stringUnit" : { - "state" : "translated", - "value" : "App Einstellungen" - } - }, - "en" : { - "stringUnit" : { - "state" : "translated", - "value" : "App Settings" - } - }, - "fr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Réglages de l'application" - } - }, - "he" : { - "stringUnit" : { - "state" : "translated", - "value" : "הגדרות אפליקציה" - } - }, - "pl" : { - "stringUnit" : { - "state" : "translated", - "value" : "Ustawienia aplikacji" - } - }, - "pt-PT" : { - "stringUnit" : { - "state" : "translated", - "value" : "Definições do App" - } - }, - "se" : { - "stringUnit" : { - "state" : "translated", - "value" : "Appinställningar" - } - }, - "sr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Подешавања апликације" - } - }, - "zh-Hans" : { - "stringUnit" : { - "state" : "translated", - "value" : "App 设置" - } - }, - "zh-Hant-TW" : { - "stringUnit" : { - "state" : "translated", - "value" : "設定" - } - } - } - }, - "appsettings.newNodeNotifications" : { - "extractionState" : "manual", - "localizations" : { - "de" : { - "stringUnit" : { - "state" : "translated", - "value" : "Mitteilungen über neue Knoten" - } - }, - "en" : { - "stringUnit" : { - "state" : "translated", - "value" : "New Node Notifications" - } - }, - "fr" : { - "stringUnit" : { - "state" : "translated", - "value" : "New Node Notifications" - } - }, - "he" : { - "stringUnit" : { - "state" : "translated", - "value" : "New Node Notifications" - } - }, - "pl" : { - "stringUnit" : { - "state" : "translated", - "value" : "New Node Notifications" - } - }, - "pt-PT" : { - "stringUnit" : { - "state" : "translated", - "value" : "Notificações de Nó Novo" - } - }, - "se" : { - "stringUnit" : { - "state" : "translated", - "value" : "New Node Notifications" - } - }, - "sr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Обавештења о новим чворовима" - } - }, - "zh-Hans" : { - "stringUnit" : { - "state" : "translated", - "value" : "新节点通知" - } - }, - "zh-Hant-TW" : { - "stringUnit" : { - "state" : "translated", - "value" : "新節點通知" - } - } - } - }, "appsettings.provide.location" : { "extractionState" : "manual", "localizations" : { @@ -5136,69 +4991,8 @@ } } }, - "communicating" : { - "localizations" : { - "de" : { - "stringUnit" : { - "state" : "translated", - "value" : "Verbinde mit Gerät..." - } - }, - "en" : { - "stringUnit" : { - "state" : "translated", - "value" : "Communicating with device. ." - } - }, - "fr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Communication avec l'appareil en cours. ." - } - }, - "he" : { - "stringUnit" : { - "state" : "translated", - "value" : "מתקשר עם מכשיר. ." - } - }, - "pl" : { - "stringUnit" : { - "state" : "translated", - "value" : "Komunikowanie z urządzeniem. ." - } - }, - "pt-PT" : { - "stringUnit" : { - "state" : "translated", - "value" : "Comunicando com dispositivo. ." - } - }, - "se" : { - "stringUnit" : { - "state" : "translated", - "value" : "Kommunicerar med enheten..." - } - }, - "sr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Комуницирање са уређајем. ." - } - }, - "zh-Hans" : { - "stringUnit" : { - "state" : "translated", - "value" : "与设备进行通讯中..." - } - }, - "zh-Hant-TW" : { - "stringUnit" : { - "state" : "translated", - "value" : "與電台進行通訊中..." - } - } - } + "Communicating" : { + }, "Config" : { "localizations" : { @@ -7045,7 +6839,7 @@ } } }, - "copy" : { + "Copy" : { "localizations" : { "de" : { "stringUnit" : { @@ -7577,6 +7371,9 @@ } } } + }, + "Delete Power metrics?" : { + }, "Description" : { "localizations" : { @@ -9482,7 +9279,7 @@ } } }, - "disconnect" : { + "Disconnect" : { "localizations" : { "de" : { "stringUnit" : { @@ -15911,7 +15708,7 @@ } } }, - "japan" : { + "Japan" : { "extractionState" : "manual", "localizations" : { "en" : { @@ -21702,6 +21499,71 @@ } } }, + "New Node Notifications" : { + "extractionState" : "manual", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Mitteilungen über neue Knoten" + } + }, + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "New Node Notifications" + } + }, + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "New Node Notifications" + } + }, + "he" : { + "stringUnit" : { + "state" : "translated", + "value" : "New Node Notifications" + } + }, + "pl" : { + "stringUnit" : { + "state" : "translated", + "value" : "New Node Notifications" + } + }, + "pt-PT" : { + "stringUnit" : { + "state" : "translated", + "value" : "Notificações de Nó Novo" + } + }, + "se" : { + "stringUnit" : { + "state" : "translated", + "value" : "New Node Notifications" + } + }, + "sr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Обавештења о новим чворовима" + } + }, + "zh-Hans" : { + "stringUnit" : { + "state" : "translated", + "value" : "新节点通知" + } + }, + "zh-Hant-TW" : { + "stringUnit" : { + "state" : "translated", + "value" : "新節點通知" + } + } + } + }, "new.zealand.865mhz" : { "extractionState" : "manual", "localizations" : { @@ -23831,6 +23693,9 @@ }, "Power Metrics Log" : { + }, + "Power Metrics Log}" : { + }, "Power Off" : { "localizations" : { @@ -25024,7 +24889,7 @@ } } }, - "reply" : { + "Reply" : { "localizations" : { "de" : { "stringUnit" : { @@ -29399,67 +29264,13 @@ } } }, - "subscribed" : { + "Subscribed" : { "localizations" : { - "de" : { - "stringUnit" : { - "state" : "translated", - "value" : "Verbunden mit dem Mesh" - } - }, - "en" : { - "stringUnit" : { - "state" : "translated", - "value" : "Subscribed to mesh" - } - }, - "fr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Abonné au maillage" - } - }, "he" : { "stringUnit" : { "state" : "translated", "value" : "מחובר למש" } - }, - "pl" : { - "stringUnit" : { - "state" : "translated", - "value" : "Zapisano do siatki" - } - }, - "pt-PT" : { - "stringUnit" : { - "state" : "translated", - "value" : "Inscrito no mesh" - } - }, - "se" : { - "stringUnit" : { - "state" : "translated", - "value" : "Prenumererar på mesh" - } - }, - "sr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Повезано са меш мрежом" - } - }, - "zh-Hans" : { - "stringUnit" : { - "state" : "translated", - "value" : "连接到 Mesh 网络" - } - }, - "zh-Hant-TW" : { - "stringUnit" : { - "state" : "translated", - "value" : "連接到 Mesh 網路" - } } } }, @@ -29525,7 +29336,7 @@ "Takes a Meshtastic channel URL and saves the channel settings." : { }, - "tapback" : { + "Tapback" : { "localizations" : { "de" : { "stringUnit" : { @@ -30976,6 +30787,9 @@ } }, "timestamp" : { + + }, + "Timestamp" : { "localizations" : { "de" : { "stringUnit" : { @@ -31039,16 +30853,6 @@ } } }, - "Timestamp" : { - "localizations" : { - "sr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Временска ознака" - } - } - } - }, "Timing & Format" : { "localizations" : { "sr" : { @@ -32043,6 +31847,9 @@ } }, "unknown" : { + + }, + "Unknown" : { "localizations" : { "de" : { "stringUnit" : { @@ -32978,7 +32785,7 @@ } } }, - "waiting" : { + "Waiting" : { "localizations" : { "de" : { "stringUnit" : { diff --git a/Meshtastic/Enums/DisplayEnums.swift b/Meshtastic/Enums/DisplayEnums.swift index 2ab15134..25753f02 100644 --- a/Meshtastic/Enums/DisplayEnums.swift +++ b/Meshtastic/Enums/DisplayEnums.swift @@ -65,7 +65,7 @@ enum ScreenOnIntervals: Int, CaseIterable, Identifiable { case .oneHour: return "interval.one.hour".localized case .max: - return "always.on".localized + return "Always On".localized } } } diff --git a/Meshtastic/Enums/LoraConfigEnums.swift b/Meshtastic/Enums/LoraConfigEnums.swift index 691a8298..2873c86f 100644 --- a/Meshtastic/Enums/LoraConfigEnums.swift +++ b/Meshtastic/Enums/LoraConfigEnums.swift @@ -93,7 +93,7 @@ enum RegionCodes: Int, CaseIterable, Identifiable { case .cn: return "china".localized case .jp: - return "japan".localized + return "Japan".localized case .anz: return "australia.new.zealand".localized case .kr: diff --git a/Meshtastic/Helpers/LocalNotificationManager.swift b/Meshtastic/Helpers/LocalNotificationManager.swift index 817c90a4..d5f25749 100644 --- a/Meshtastic/Helpers/LocalNotificationManager.swift +++ b/Meshtastic/Helpers/LocalNotificationManager.swift @@ -7,7 +7,7 @@ class LocalNotificationManager { var notifications = [Notification]() let thumbsUpAction = UNNotificationAction(identifier: "messageNotification.thumbsUpAction", title: "👍 \(Tapbacks.thumbsUp.description)", options: []) let thumbsDownAction = UNNotificationAction(identifier: "messageNotification.thumbsDownAction", title: "👎 \(Tapbacks.thumbsDown.description)", options: []) - let replyInputAction = UNTextInputNotificationAction(identifier: "messageNotification.replyInputAction", title: "reply".localized, options: []) + let replyInputAction = UNTextInputNotificationAction(identifier: "messageNotification.replyInputAction", title: "Reply".localized, options: []) // Step 1 Request Permissions for notifications private func requestAuthorization() { diff --git a/Meshtastic/Views/Bluetooth/Connect.swift b/Meshtastic/Views/Bluetooth/Connect.swift index eebb81dd..cb60b7e6 100644 --- a/Meshtastic/Views/Bluetooth/Connect.swift +++ b/Meshtastic/Views/Bluetooth/Connect.swift @@ -172,7 +172,7 @@ struct Connect: View { Button(role: .destructive) { bleManager.cancelPeripheralConnection() } label: { - Label("disconnect", systemImage: "antenna.radiowaves.left.and.right.slash") + Label("Disconnect", systemImage: "antenna.radiowaves.left.and.right.slash") } } @@ -258,7 +258,7 @@ struct Connect: View { bleManager.disconnectPeripheral(reconnect: false) } }) { - Label("disconnect", systemImage: "antenna.radiowaves.left.and.right.slash") + Label("Disconnect", systemImage: "antenna.radiowaves.left.and.right.slash") } .buttonStyle(.bordered) .buttonBorderShape(.capsule) @@ -270,7 +270,7 @@ struct Connect: View { bleManager.cancelPeripheralConnection() }) { - Label("disconnect", systemImage: "antenna.radiowaves.left.and.right.slash") + Label("Disconnect", systemImage: "antenna.radiowaves.left.and.right.slash") } .buttonStyle(.bordered) .buttonBorderShape(.capsule) diff --git a/Meshtastic/Views/Messages/MessageContextMenuItems.swift b/Meshtastic/Views/Messages/MessageContextMenuItems.swift index 8d8c4567..1d8642a0 100644 --- a/Meshtastic/Views/Messages/MessageContextMenuItems.swift +++ b/Meshtastic/Views/Messages/MessageContextMenuItems.swift @@ -19,7 +19,7 @@ struct MessageContextMenuItems: View { Text("Channel") + Text(": \(message.channel)") } - Menu("tapback") { + Menu("Tapback") { ForEach(Tapbacks.allCases) { tb in Button { let sentMessage = bleManager.sendMessage( @@ -40,14 +40,14 @@ struct MessageContextMenuItems: View { } Button(action: onReply) { - Text("reply") + Text("Reply") Image(systemName: "arrowshape.turn.up.left") } Button { UIPasteboard.general.string = message.messagePayload } label: { - Text("copy") + Text("Copy") Image(systemName: "doc.on.doc") } @@ -74,7 +74,7 @@ struct MessageContextMenuItems: View { } } else if isCurrentUser && message.ackError == 0 { // Empty Error - Text("waiting") + Text("Waiting") } else if isCurrentUser && message.ackError > 0 { let ackErrorVal = RoutingError(rawValue: Int(message.ackError)) Text("\(ackErrorVal?.display ?? "Empty Ack Error")") diff --git a/Meshtastic/Views/Settings/AppSettings.swift b/Meshtastic/Views/Settings/AppSettings.swift index f641b77b..fd4b8d5a 100644 --- a/Meshtastic/Views/Settings/AppSettings.swift +++ b/Meshtastic/Views/Settings/AppSettings.swift @@ -111,7 +111,7 @@ struct AppSettings: View { totalDownloadedTileSize = tileManager.getAllDownloadedSize() }) } - .navigationTitle("appsettings") + .navigationTitle("App Settings") .navigationBarItems(trailing: ZStack { ConnectedDevice(bluetoothOn: bleManager.isSwitchedOn, deviceConnected: bleManager.connectedPeripheral != nil, name: (bleManager.connectedPeripheral != nil) ? bleManager.connectedPeripheral.shortName : "?")