From ea24117be96fac4cc20b61f455e5ebfb8d6e9d6a Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Sun, 27 Apr 2025 09:11:54 -0700 Subject: [PATCH] Remove so more translation keys --- Localizable.xcstrings | 476 ++++++++--------------- Meshtastic/Enums/ChannelRoles.swift | 6 +- Meshtastic/Views/ContentView.swift | 2 +- Meshtastic/Views/Settings/Settings.swift | 2 +- 4 files changed, 169 insertions(+), 317 deletions(-) diff --git a/Localizable.xcstrings b/Localizable.xcstrings index a29691fb..0e1c3b63 100644 --- a/Localizable.xcstrings +++ b/Localizable.xcstrings @@ -5210,198 +5210,6 @@ } } }, - "channel.role.disabled" : { - "localizations" : { - "de" : { - "stringUnit" : { - "state" : "translated", - "value" : "Deaktiviert" - } - }, - "en" : { - "stringUnit" : { - "state" : "translated", - "value" : "Disabled" - } - }, - "fr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Désactivé" - } - }, - "he" : { - "stringUnit" : { - "state" : "translated", - "value" : "כבוי" - } - }, - "it" : { - "stringUnit" : { - "state" : "translated", - "value" : "Disattivato" - } - }, - "pl" : { - "stringUnit" : { - "state" : "translated", - "value" : "Wyłączony" - } - }, - "se" : { - "stringUnit" : { - "state" : "translated", - "value" : "Inaktiverad" - } - }, - "sr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Онемогућено" - } - }, - "zh-Hans" : { - "stringUnit" : { - "state" : "translated", - "value" : "禁用" - } - }, - "zh-Hant-TW" : { - "stringUnit" : { - "state" : "translated", - "value" : "關閉" - } - } - } - }, - "channel.role.primary" : { - "localizations" : { - "de" : { - "stringUnit" : { - "state" : "translated", - "value" : "Primär" - } - }, - "en" : { - "stringUnit" : { - "state" : "translated", - "value" : "Primary" - } - }, - "fr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Principal" - } - }, - "he" : { - "stringUnit" : { - "state" : "translated", - "value" : "עיקרי" - } - }, - "it" : { - "stringUnit" : { - "state" : "translated", - "value" : "Primario" - } - }, - "pl" : { - "stringUnit" : { - "state" : "translated", - "value" : "Podstawowy" - } - }, - "se" : { - "stringUnit" : { - "state" : "translated", - "value" : "Primär" - } - }, - "sr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Примарни" - } - }, - "zh-Hans" : { - "stringUnit" : { - "state" : "translated", - "value" : "主要" - } - }, - "zh-Hant-TW" : { - "stringUnit" : { - "state" : "translated", - "value" : "主要" - } - } - } - }, - "channel.role.secondary" : { - "localizations" : { - "de" : { - "stringUnit" : { - "state" : "translated", - "value" : "Sekundär" - } - }, - "en" : { - "stringUnit" : { - "state" : "translated", - "value" : "Secondary" - } - }, - "fr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Secondaire" - } - }, - "he" : { - "stringUnit" : { - "state" : "translated", - "value" : "משני" - } - }, - "it" : { - "stringUnit" : { - "state" : "translated", - "value" : "Secondario" - } - }, - "pl" : { - "stringUnit" : { - "state" : "translated", - "value" : "Wtórny" - } - }, - "se" : { - "stringUnit" : { - "state" : "translated", - "value" : "Sekundär" - } - }, - "sr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Секундарни" - } - }, - "zh-Hans" : { - "stringUnit" : { - "state" : "translated", - "value" : "次要" - } - }, - "zh-Hant-TW" : { - "stringUnit" : { - "state" : "translated", - "value" : "次要" - } - } - } - }, "channel.utilization" : { "localizations" : { "de" : { @@ -10913,13 +10721,43 @@ "de" : { "stringUnit" : { "state" : "translated", - "value" : "Ausgeschaltet" + "value" : "Deaktiviert" + } + }, + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Disabled" + } + }, + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Désactivé" + } + }, + "he" : { + "stringUnit" : { + "state" : "translated", + "value" : "כבוי" } }, "it" : { "stringUnit" : { "state" : "translated", - "value" : "Disabili" + "value" : "Disattivato" + } + }, + "pl" : { + "stringUnit" : { + "state" : "translated", + "value" : "Wyłączony" + } + }, + "se" : { + "stringUnit" : { + "state" : "translated", + "value" : "Inaktiverad" } }, "sr" : { @@ -10937,7 +10775,7 @@ "zh-Hant-TW" : { "stringUnit" : { "state" : "translated", - "value" : "已停用" + "value" : "關閉" } } } @@ -18572,27 +18410,21 @@ }, "Japan" : { "localizations" : { - "en" : { - "stringUnit" : { - "state" : "translated", - "value" : "Japan" - } - }, "it" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Giappone" } }, "sr" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Јапан" } }, "zh-Hant-TW" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "日本" } } @@ -27424,21 +27256,57 @@ }, "Primary" : { "localizations" : { + "de" : { + "stringUnit" : { + "state" : "needs_review", + "value" : "Primär" + } + }, + "fr" : { + "stringUnit" : { + "state" : "needs_review", + "value" : "Principal" + } + }, + "he" : { + "stringUnit" : { + "state" : "needs_review", + "value" : "עיקרי" + } + }, "it" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Primario" } }, + "pl" : { + "stringUnit" : { + "state" : "needs_review", + "value" : "Podstawowy" + } + }, + "se" : { + "stringUnit" : { + "state" : "needs_review", + "value" : "Primär" + } + }, "sr" : { "stringUnit" : { - "state" : "translated", - "value" : "Основни" + "state" : "needs_review", + "value" : "Примарни" + } + }, + "zh-Hans" : { + "stringUnit" : { + "state" : "needs_review", + "value" : "主要" } }, "zh-Hant-TW" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "主要" } } @@ -28690,61 +28558,55 @@ "localizations" : { "de" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Antworten" } }, - "en" : { - "stringUnit" : { - "state" : "translated", - "value" : "Reply" - } - }, "fr" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Répondre" } }, "he" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "תגובה" } }, "it" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Risposta" } }, "pl" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Odpowiedz" } }, "se" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Svara" } }, "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" : "回覆" } } @@ -30706,27 +30568,21 @@ }, "Russia" : { "localizations" : { - "en" : { - "stringUnit" : { - "state" : "translated", - "value" : "Russia" - } - }, "it" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Russia" } }, "sr" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Русија" } }, "zh-Hant-TW" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "俄羅斯" } } @@ -31280,18 +31136,60 @@ }, "Secondary" : { "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Sekundär" + } + }, + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Secondary" + } + }, + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Secondaire" + } + }, + "he" : { + "stringUnit" : { + "state" : "translated", + "value" : "משני" + } + }, "it" : { "stringUnit" : { "state" : "translated", "value" : "Secondario" } }, + "pl" : { + "stringUnit" : { + "state" : "translated", + "value" : "Wtórny" + } + }, + "se" : { + "stringUnit" : { + "state" : "translated", + "value" : "Sekundär" + } + }, "sr" : { "stringUnit" : { "state" : "translated", "value" : "Секундарни" } }, + "zh-Hans" : { + "stringUnit" : { + "state" : "translated", + "value" : "次要" + } + }, "zh-Hant-TW" : { "stringUnit" : { "state" : "translated", @@ -32890,7 +32788,7 @@ } } }, - "settings" : { + "Settings" : { "localizations" : { "de" : { "stringUnit" : { @@ -32954,22 +32852,6 @@ } } }, - "Settings" : { - "localizations" : { - "it" : { - "stringUnit" : { - "state" : "translated", - "value" : "Impostazioni" - } - }, - "zh-Hant-TW" : { - "stringUnit" : { - "state" : "translated", - "value" : "設定" - } - } - } - }, "Share QR Code & Link" : { "localizations" : { "de" : { @@ -34336,27 +34218,21 @@ }, "Taiwan" : { "localizations" : { - "en" : { - "stringUnit" : { - "state" : "translated", - "value" : "Taiwan" - } - }, "it" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Taiwan" } }, "sr" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Тајван" } }, "zh-Hant-TW" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "臺灣 🇹🇼" } } @@ -34388,61 +34264,55 @@ "localizations" : { "de" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Tapback Antwort" } }, - "en" : { - "stringUnit" : { - "state" : "translated", - "value" : "Tapback Response" - } - }, "fr" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Réponse de Tapback" } }, "he" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "תגובה מהירה" } }, "it" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Risposta di Tapback" } }, "pl" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Odpowiedź na stuknięcie" } }, "se" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Svarsreaktion" } }, "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" : "表情回應" } } @@ -35410,27 +35280,21 @@ }, "Thailand" : { "localizations" : { - "en" : { - "stringUnit" : { - "state" : "translated", - "value" : "Thailand" - } - }, "it" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Thailandia" } }, "sr" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Тајланд" } }, "zh-Hant-TW" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "泰國" } } @@ -36336,61 +36200,55 @@ "localizations" : { "de" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Zeitlimit erreicht" } }, - "en" : { - "stringUnit" : { - "state" : "translated", - "value" : "Timeout" - } - }, "fr" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Délai d'expiration" } }, "he" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "זמן קצוב" } }, "it" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Timeout" } }, "pl" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Limit czasu" } }, "se" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Tidsgräns överskriden" } }, "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" : "逾時長度" } } @@ -36422,61 +36280,55 @@ "localizations" : { "de" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Zeitstempel" } }, - "en" : { - "stringUnit" : { - "state" : "translated", - "value" : "Timestamp" - } - }, "fr" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Horodatage" } }, "he" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "שעה/תאריך" } }, "it" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Timestamp" } }, "pl" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Znacznik czasu" } }, "se" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Tidsstämpel" } }, "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" : "時間戳記" } } diff --git a/Meshtastic/Enums/ChannelRoles.swift b/Meshtastic/Enums/ChannelRoles.swift index 186cff0b..ea1c0e8b 100644 --- a/Meshtastic/Enums/ChannelRoles.swift +++ b/Meshtastic/Enums/ChannelRoles.swift @@ -19,11 +19,11 @@ enum ChannelRoles: Int, CaseIterable, Identifiable { switch self { case .disabled: - return "channel.role.disabled".localized + return "Disabled".localized case .primary: - return "channel.role.primary".localized + return "Primary".localized case .secondary: - return "channel.role.secondary".localized + return "Secondary".localized } } func protoEnumValue() -> Channel.Role { diff --git a/Meshtastic/Views/ContentView.swift b/Meshtastic/Views/ContentView.swift index 50734893..692b1749 100644 --- a/Meshtastic/Views/ContentView.swift +++ b/Meshtastic/Views/ContentView.swift @@ -54,7 +54,7 @@ struct ContentView: View { router: appState.router ) .tabItem { - Label("settings", systemImage: "gear") + Label("Settings", systemImage: "gear") .font(.title) } .tag(NavigationState.Tab.settings) diff --git a/Meshtastic/Views/Settings/Settings.swift b/Meshtastic/Views/Settings/Settings.swift index 8ebcfd83..0ebac5a8 100644 --- a/Meshtastic/Views/Settings/Settings.swift +++ b/Meshtastic/Views/Settings/Settings.swift @@ -542,7 +542,7 @@ struct Settings: View { } } } - .navigationTitle("settings") + .navigationTitle("Settings") .navigationBarItems( leading: MeshtasticLogo().onLongPressGesture(minimumDuration: 1.0) { self.moduleOverride.toggle()