diff --git a/QuickDrop.xcodeproj/project.pbxproj b/QuickDrop.xcodeproj/project.pbxproj index 38ea153..dbd8274 100644 --- a/QuickDrop.xcodeproj/project.pbxproj +++ b/QuickDrop.xcodeproj/project.pbxproj @@ -1222,7 +1222,7 @@ ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; SHARED_BUILD = 69; - SHARED_VERSION = 2.2.1; + SHARED_VERSION = 2.3; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -1284,7 +1284,7 @@ MTL_FAST_MATH = YES; SDKROOT = macosx; SHARED_BUILD = 69; - SHARED_VERSION = 2.2.1; + SHARED_VERSION = 2.3; SWIFT_COMPILATION_MODE = wholemodule; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_OPTIMIZATION_LEVEL = "-O"; diff --git a/QuickDrop/AppDelegate.swift b/QuickDrop/AppDelegate.swift index a39d1a2..47ac4b8 100644 --- a/QuickDrop/AppDelegate.swift +++ b/QuickDrop/AppDelegate.swift @@ -38,14 +38,12 @@ class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCenterDele let menu = NSMenu() let visibleItem = NSMenuItem( - title: "VisibleToEveryone".localized(), + title: getDefaultVisibleLabel(), action: nil, keyEquivalent: "" ) self.visibleItem = visibleItem menu.addItem(visibleItem) - - menu.addItem(withTitle: String(format: "DeviceName".localized(), arguments: [Host.current().localizedName ?? "Mac"]), action: nil, keyEquivalent: "") menu.addItem(NSMenuItem.separator()) @@ -116,7 +114,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCenterDele NearbyConnectionManager.shared.connectionUpdateCallback = { isConnected in if isConnected { self.statusItem?.button?.image = NSImage(named: "MenuBarIcon") - self.visibleItem?.title = "VisibleToEveryone".localized() + self.visibleItem?.title = self.getDefaultVisibleLabel() } else { self.statusItem?.button?.image = NSImage(named: "MenuBarIconSlash") @@ -337,6 +335,12 @@ class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCenterDele } } } + + + private func getDefaultVisibleLabel() -> String { + let name = NearbyConnectionManager.shared.deviceInfo.name ?? "Unknown".localized() + return String(format: "VisibleAs".localized(), name) + } } struct TransferInfo { diff --git a/QuickDrop/Assets.xcassets/iDroid.imageset/Contents.json b/QuickDrop/Assets.xcassets/iDroid.imageset/Contents.json index f6d18fc..dec9c5b 100644 --- a/QuickDrop/Assets.xcassets/iDroid.imageset/Contents.json +++ b/QuickDrop/Assets.xcassets/iDroid.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "FileTransfer Kopie-1024.png", + "filename" : "FileTransfer Kopie-512.png", "idiom" : "universal", "scale" : "1x" }, diff --git a/QuickDrop/Assets.xcassets/iDroid.imageset/FileTransfer Kopie-1024.png b/QuickDrop/Assets.xcassets/iDroid.imageset/FileTransfer Kopie-1024.png deleted file mode 100644 index 3585b0b..0000000 Binary files a/QuickDrop/Assets.xcassets/iDroid.imageset/FileTransfer Kopie-1024.png and /dev/null differ diff --git a/QuickDrop/Assets.xcassets/iDroid.imageset/FileTransfer Kopie-512.png b/QuickDrop/Assets.xcassets/iDroid.imageset/FileTransfer Kopie-512.png new file mode 100644 index 0000000..939ccb5 Binary files /dev/null and b/QuickDrop/Assets.xcassets/iDroid.imageset/FileTransfer Kopie-512.png differ diff --git a/QuickDrop/Localizable.xcstrings b/QuickDrop/Localizable.xcstrings index 5ce4f85..9c874b6 100644 --- a/QuickDrop/Localizable.xcstrings +++ b/QuickDrop/Localizable.xcstrings @@ -6754,239 +6754,6 @@ } } }, - "DeviceName" : { - "extractionState" : "manual", - "localizations" : { - "ar" : { - "stringUnit" : { - "state" : "translated", - "value" : "اسم الجهاز: %@" - } - }, - "ca" : { - "stringUnit" : { - "state" : "translated", - "value" : "Nom del dispositiu: %@" - } - }, - "cs" : { - "stringUnit" : { - "state" : "translated", - "value" : "Název zařízení: %@" - } - }, - "da" : { - "stringUnit" : { - "state" : "translated", - "value" : "Enhedsnavn: %@" - } - }, - "de" : { - "stringUnit" : { - "state" : "translated", - "value" : "Gerätename: %@" - } - }, - "el" : { - "stringUnit" : { - "state" : "translated", - "value" : "Όνομα Συσκευής: %@" - } - }, - "en" : { - "stringUnit" : { - "state" : "translated", - "value" : "Device name: %@" - } - }, - "en-AU" : { - "stringUnit" : { - "state" : "translated", - "value" : "Device Name: %@" - } - }, - "en-CA" : { - "stringUnit" : { - "state" : "translated", - "value" : "Device name: %@" - } - }, - "en-GB" : { - "stringUnit" : { - "state" : "translated", - "value" : "Device name: %@" - } - }, - "es" : { - "stringUnit" : { - "state" : "translated", - "value" : "Nombre del dispositivo: %@" - } - }, - "es-419" : { - "stringUnit" : { - "state" : "translated", - "value" : "Nombre del dispositivo: %@" - } - }, - "fi" : { - "stringUnit" : { - "state" : "translated", - "value" : "Laitteen nimi: %@" - } - }, - "fr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Nom de l'appareil : %@" - } - }, - "fr-CA" : { - "stringUnit" : { - "state" : "translated", - "value" : "Nom de l'appareil : %@" - } - }, - "he" : { - "stringUnit" : { - "state" : "translated", - "value" : "שם מכשיר: %@" - } - }, - "hi" : { - "stringUnit" : { - "state" : "translated", - "value" : "डिवाइस का नाम: %@" - } - }, - "hr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Naziv uređaja: %@" - } - }, - "hu" : { - "stringUnit" : { - "state" : "translated", - "value" : "Készülék neve: %@" - } - }, - "id" : { - "stringUnit" : { - "state" : "translated", - "value" : "Nama perangkat: %@" - } - }, - "it" : { - "stringUnit" : { - "state" : "translated", - "value" : "Nome del dispositivo: %@" - } - }, - "ja" : { - "stringUnit" : { - "state" : "translated", - "value" : "機器名: %@" - } - }, - "ko" : { - "stringUnit" : { - "state" : "translated", - "value" : "기기 이름: %@" - } - }, - "ms" : { - "stringUnit" : { - "state" : "translated", - "value" : "Nama peranti: %@" - } - }, - "nb" : { - "stringUnit" : { - "state" : "translated", - "value" : "Enhetsnavn: %@" - } - }, - "nl" : { - "stringUnit" : { - "state" : "translated", - "value" : "Naam apparaat: %@" - } - }, - "pl" : { - "stringUnit" : { - "state" : "translated", - "value" : "Nazwa urządzenia: %@" - } - }, - "pt-BR" : { - "stringUnit" : { - "state" : "translated", - "value" : "Nome do dispositivo: %@" - } - }, - "pt-PT" : { - "stringUnit" : { - "state" : "translated", - "value" : "Nome do dispositivo: %@" - } - }, - "ro" : { - "stringUnit" : { - "state" : "translated", - "value" : "Nume dispozitiv : %@" - } - }, - "ru" : { - "stringUnit" : { - "state" : "translated", - "value" : "Имя устройства: %@" - } - }, - "sv" : { - "stringUnit" : { - "state" : "translated", - "value" : "Enhetsnamn: %@" - } - }, - "th" : { - "stringUnit" : { - "state" : "translated", - "value" : "ชื่ออุปกรณ์: %@" - } - }, - "tr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Cihaz adı: %@" - } - }, - "uk" : { - "stringUnit" : { - "state" : "translated", - "value" : "Імʼя пристрою: %@" - } - }, - "vi" : { - "stringUnit" : { - "state" : "translated", - "value" : "Tên thiết bị: %@" - } - }, - "zh-Hans" : { - "stringUnit" : { - "state" : "translated", - "value" : "设备名称: %@" - } - }, - "zh-Hant" : { - "stringUnit" : { - "state" : "translated", - "value" : "裝置名稱：%@" - } - } - } - }, "DeviceNotShown" : { "extractionState" : "manual", "localizations" : { @@ -26086,235 +25853,235 @@ } } }, - "VisibleToEveryone" : { + "VisibleAs" : { "extractionState" : "manual", "localizations" : { "ar" : { "stringUnit" : { "state" : "translated", - "value" : "مرئي للجميع" + "value" : "ظاهر كـ %@" } }, "ca" : { "stringUnit" : { "state" : "translated", - "value" : "Visible per a tothom" + "value" : "Visible com %@" } }, "cs" : { "stringUnit" : { "state" : "translated", - "value" : "Viditelný pro všechny" + "value" : "Viditelné jako %@" } }, "da" : { "stringUnit" : { "state" : "translated", - "value" : "Synlig for alle" + "value" : "Synlig som %@" } }, "de" : { "stringUnit" : { "state" : "translated", - "value" : "Für alle sichtbar" + "value" : "Sichtbar als %@" } }, "el" : { "stringUnit" : { "state" : "translated", - "value" : "Ορατό σε όλους" + "value" : "Ορατό ως %@" } }, "en" : { "stringUnit" : { "state" : "translated", - "value" : "Visible to everyone" + "value" : "Visible as %@" } }, "en-AU" : { "stringUnit" : { "state" : "translated", - "value" : "Visible to all" + "value" : "Visible as %@" } }, "en-CA" : { "stringUnit" : { "state" : "translated", - "value" : "Visible to everyone" + "value" : "Visible as %@" } }, "en-GB" : { "stringUnit" : { "state" : "translated", - "value" : "Visible to everyone" + "value" : "Visible as %@" } }, "es" : { "stringUnit" : { "state" : "translated", - "value" : "Visible para todos" + "value" : "Visible como %@" } }, "es-419" : { "stringUnit" : { "state" : "translated", - "value" : "Visible para todos" + "value" : "Visible como %@" } }, "fi" : { "stringUnit" : { "state" : "translated", - "value" : "Näkyvissä kaikille" + "value" : "Näkyvissä nimellä %@" } }, "fr" : { "stringUnit" : { "state" : "translated", - "value" : "Visible par tout le monde" + "value" : "Visible sous %@" } }, "fr-CA" : { "stringUnit" : { "state" : "translated", - "value" : "Visible par tout le monde" + "value" : "Visible sous %@" } }, "he" : { "stringUnit" : { "state" : "translated", - "value" : "גלוי לכולם" + "value" : "גלוי כ- %@" } }, "hi" : { "stringUnit" : { "state" : "translated", - "value" : "सबके लिए दृश्यमान" + "value" : "%@ के रूप में दिख रहा है" } }, "hr" : { "stringUnit" : { "state" : "translated", - "value" : "Vidljivo svima" + "value" : "Vidljivo kao %@" } }, "hu" : { "stringUnit" : { "state" : "translated", - "value" : "Mindenki számára felfedezhető" + "value" : "Látható mint %@" } }, "id" : { "stringUnit" : { "state" : "translated", - "value" : "Terlihat untuk semua orang" + "value" : "Terlihat sebagai %@" } }, "it" : { "stringUnit" : { "state" : "translated", - "value" : "Visibile a tutti" + "value" : "Visibile come %@" } }, "ja" : { "stringUnit" : { "state" : "translated", - "value" : "すべてのユーザーに公開" + "value" : "%@として表示" } }, "ko" : { "stringUnit" : { "state" : "translated", - "value" : "모든 사용자에게 공개" + "value" : "%@로 표시됨" } }, "ms" : { "stringUnit" : { "state" : "translated", - "value" : "Kelihatan untuk semua orang" + "value" : "Kelihatan sebagai %@" } }, "nb" : { "stringUnit" : { "state" : "translated", - "value" : "Synlig for alle" + "value" : "Synlig som %@" } }, "nl" : { "stringUnit" : { "state" : "translated", - "value" : "Zichtbaar voor iedereen" + "value" : "Zichtbaar als %@" } }, "pl" : { "stringUnit" : { "state" : "translated", - "value" : "Widoczne dla wszystkich" + "value" : "Widoczny jako %@" } }, "pt-BR" : { "stringUnit" : { "state" : "translated", - "value" : "Visível para todos" + "value" : "Visível como %@" } }, "pt-PT" : { "stringUnit" : { "state" : "translated", - "value" : "Visível para todos" + "value" : "Visível como %@" } }, "ro" : { "stringUnit" : { "state" : "translated", - "value" : "Vizibil pentru toată lumea" + "value" : "Vizibil ca %@" } }, "ru" : { "stringUnit" : { "state" : "translated", - "value" : "Видимость: все" + "value" : "Видимо как %@" } }, "sv" : { "stringUnit" : { "state" : "translated", - "value" : "Synlig för alla" + "value" : "Synlig som %@" } }, "th" : { "stringUnit" : { "state" : "translated", - "value" : "เปิดเผยต่อทุกคน" + "value" : "มองเห็นได้เป็น %@" } }, "tr" : { "stringUnit" : { "state" : "translated", - "value" : "Herkes için görünür" + "value" : "%@ olarak görünüyor" } }, "uk" : { "stringUnit" : { "state" : "translated", - "value" : "Видимість: для всіх" + "value" : "Видимий як %@" } }, "vi" : { "stringUnit" : { "state" : "translated", - "value" : "Hiển thị cho mọi người" + "value" : "Hiển thị dưới dạng %@" } }, "zh-Hans" : { "stringUnit" : { "state" : "translated", - "value" : "对所有人可见" + "value" : "显示为%@" } }, "zh-Hant" : { "stringUnit" : { "state" : "translated", - "value" : "對所有人可見" + "value" : "顯示為%@" } } }