From 9b1795d769ef990f2fad29ef5d8a6eb7f5527004 Mon Sep 17 00:00:00 2001 From: Istvan T <37590873+waydabber@users.noreply.github.com> Date: Sun, 24 Oct 2021 12:01:17 +0200 Subject: [PATCH] Various fixes and improvements for 4.0.0 (#736) - Small change of wording under Displays to reflect the fact that software dimming is not always gamma now - Fixed an unneeded box control title leaking into localization files. - Updated Italian Localization - thanks to @picov - Fix: virtual displays are now properly ignored in gamma interference detection. - Fix for too long display names looking bad in menu - Fix for log errors about unneeded missing outlet connection errors - Improved reset for virtual and Apple displays. - Fixed menu showing blank space for display with no controls. - Made brightness availability changeable for built-in and virtual displays. - Updated french localization - thanks to @the0neyouseek --- MonitorControl/Info.plist | 2 +- MonitorControl/InternetAccessPolicy.plist | 28 +++++++++++++++ MonitorControl/Model/Display.swift | 5 ++- MonitorControl/Support/AppDelegate.swift | 2 +- MonitorControl/Support/MenuHandler.swift | 19 +++++----- MonitorControl/UI/Base.lproj/Main.storyboard | 19 ++++------ .../UI/de.lproj/Localizable.strings | 4 +-- MonitorControl/UI/de.lproj/Main.strings | 10 ++---- .../UI/en.lproj/Localizable.strings | 4 +-- MonitorControl/UI/en.lproj/Main.strings | 10 ++---- .../UI/fr.lproj/Localizable.strings | 18 +++++----- MonitorControl/UI/fr.lproj/Main.strings | 34 ++++++++---------- .../UI/hu.lproj/Localizable.strings | 4 +-- MonitorControl/UI/hu.lproj/Main.strings | 10 ++---- .../UI/it.lproj/Localizable.strings | 16 ++++----- MonitorControl/UI/it.lproj/Main.strings | 36 ++++++++----------- .../UI/ko.lproj/Localizable.strings | 4 +-- MonitorControl/UI/ko.lproj/Main.strings | 10 ++---- .../UI/nl.lproj/Localizable.strings | 4 +-- MonitorControl/UI/nl.lproj/Main.strings | 10 ++---- .../UI/tr.lproj/Localizable.strings | 4 +-- MonitorControl/UI/tr.lproj/Main.strings | 10 ++---- .../UI/zh-Hans.lproj/Localizable.strings | 4 +-- MonitorControl/UI/zh-Hans.lproj/Main.strings | 10 ++---- .../UI/zh-Hant-TW.lproj/Localizable.strings | 4 +-- .../UI/zh-Hant-TW.lproj/Main.strings | 10 ++---- .../DisplaysPrefsCellView.swift | 20 +++++------ .../DisplaysPrefsViewController.swift | 5 +-- MonitorControlHelper/Info.plist | 2 +- 29 files changed, 139 insertions(+), 179 deletions(-) diff --git a/MonitorControl/Info.plist b/MonitorControl/Info.plist index ace4cda..05c4621 100644 --- a/MonitorControl/Info.plist +++ b/MonitorControl/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString $(MARKETING_VERSION) CFBundleVersion - 6795 + 6828 LSApplicationCategoryType public.app-category.utilities LSMinimumSystemVersion diff --git a/MonitorControl/InternetAccessPolicy.plist b/MonitorControl/InternetAccessPolicy.plist index efb7b82..5f9afa2 100644 --- a/MonitorControl/InternetAccessPolicy.plist +++ b/MonitorControl/InternetAccessPolicy.plist @@ -24,6 +24,34 @@ DenyConsequences SoftwareUpdateDenyConsequences + + IsIncoming + + Host + github.com + NetworkProtocol + TCP + Port + 443 + Purpose + SoftwareUpdatePurpose + DenyConsequences + SoftwareUpdateDenyConsequences + + + IsIncoming + + Host + githubusercontent.com + NetworkProtocol + TCP + Port + 443 + Purpose + SoftwareUpdatePurpose + DenyConsequences + SoftwareUpdateDenyConsequences + diff --git a/MonitorControl/Model/Display.swift b/MonitorControl/Model/Display.swift index f10ad56..a3b30f7 100644 --- a/MonitorControl/Model/Display.swift +++ b/MonitorControl/Model/Display.swift @@ -91,6 +91,9 @@ class Display: Equatable { } func stepBrightness(isUp: Bool, isSmallIncrement: Bool) { + guard !self.readPrefAsBool(key: .unavailableDDC, for: .brightness) else { + return + } let value = self.calcNewBrightness(isUp: isUp, isSmallIncrement: isSmallIncrement) if self.setBrightness(value) { OSDUtils.showOsd(displayID: self.identifier, command: .brightness, value: value * 64, maxValue: 64) @@ -271,7 +274,7 @@ class Display: Equatable { func checkGammaInterference() { let currentSwBrightness = self.getSwBrightness() - guard !DisplayManager.shared.gammaInterferenceWarningShown, !(prefs.bool(forKey: PrefKey.disableCombinedBrightness.rawValue)), !self.readPrefAsBool(key: .avoidGamma), !self.smoothBrightnessRunning, self.prefExists(key: .SwBrightness), abs(currentSwBrightness - self.readPrefAsFloat(key: .SwBrightness)) > 0.02 else { + guard !DisplayManager.shared.gammaInterferenceWarningShown, !(prefs.bool(forKey: PrefKey.disableCombinedBrightness.rawValue)), !self.readPrefAsBool(key: .avoidGamma), !self.isVirtual, !self.smoothBrightnessRunning, self.prefExists(key: .SwBrightness), abs(currentSwBrightness - self.readPrefAsFloat(key: .SwBrightness)) > 0.02 else { return } DisplayManager.shared.gammaInterferenceCounter += 1 diff --git a/MonitorControl/Support/AppDelegate.swift b/MonitorControl/Support/AppDelegate.swift index c296919..24c1383 100644 --- a/MonitorControl/Support/AppDelegate.swift +++ b/MonitorControl/Support/AppDelegate.swift @@ -210,7 +210,7 @@ class AppDelegate: NSObject, NSApplicationDelegate { let counter = dispatchedCounter == 0 ? 10 : dispatchedCounter self.startupActionWriteCounter = dispatchedCounter == 0 ? counter : self.startupActionWriteCounter guard prefs.integer(forKey: PrefKey.startupAction.rawValue) == StartupAction.write.rawValue, self.startupActionWriteCounter == counter else { - return + return } os_log("Sober write action repeat for DDC - %{public}@", type: .info, String(counter)) DisplayManager.shared.restoreOtherDisplays() diff --git a/MonitorControl/Support/MenuHandler.swift b/MonitorControl/Support/MenuHandler.swift index 1cacdf3..f05d80f 100644 --- a/MonitorControl/Support/MenuHandler.swift +++ b/MonitorControl/Support/MenuHandler.swift @@ -113,14 +113,15 @@ class MenuHandler: NSMenu, NSMenuDelegate { contentWidth = max(addedSliderHandler.view!.frame.width, contentWidth) contentHeight += addedSliderHandler.view!.frame.height } + let margin = CGFloat(13) var blockNameView: NSTextField? if blockName != "" { contentHeight += 21 let attrs: [NSAttributedString.Key: Any] = [.foregroundColor: NSColor.textColor, .font: NSFont.boldSystemFont(ofSize: 12)] blockNameView = NSTextField(labelWithAttributedString: NSAttributedString(string: blockName, attributes: attrs)) + blockNameView?.frame.size.width = contentWidth - margin * 2 blockNameView?.alphaValue = 0.5 } - let margin = CGFloat(13) let itemView = BlockView(frame: NSRect(x: 0, y: 0, width: contentWidth + margin * 2, height: contentHeight + margin * 2)) var sliderPosition = CGFloat(margin * -1 + 1) for addedSliderHandler in addedSliderHandlers { @@ -134,7 +135,9 @@ class MenuHandler: NSMenu, NSMenuDelegate { } let item = NSMenuItem() item.view = itemView - monitorSubMenu.insertItem(item, at: 0) + if addedSliderHandlers.count != 0 { + monitorSubMenu.insertItem(item, at: 0) + } } else { for addedSliderHandler in addedSliderHandlers { self.addSliderItem(monitorSubMenu: monitorSubMenu, sliderHandler: addedSliderHandler) @@ -220,8 +223,8 @@ class MenuHandler: NSMenu, NSMenuDelegate { preferencesIcon.bezelStyle = .regularSquare preferencesIcon.isBordered = false preferencesIcon.setButtonType(.momentaryChange) - preferencesIcon.image = NSImage(systemSymbolName: "gearshape", accessibilityDescription: NSLocalizedString("Preferences...", comment: "Shown in menu")) - preferencesIcon.alternateImage = NSImage(systemSymbolName: "gearshape.fill", accessibilityDescription: NSLocalizedString("Preferences...", comment: "Shown in menu")) + preferencesIcon.image = NSImage(systemSymbolName: "gearshape", accessibilityDescription: NSLocalizedString("Preferences…", comment: "Shown in menu")) + preferencesIcon.alternateImage = NSImage(systemSymbolName: "gearshape.fill", accessibilityDescription: NSLocalizedString("Preferences…", comment: "Shown in menu")) preferencesIcon.alphaValue = 0.3 preferencesIcon.frame = NSRect(x: menuItemView.frame.maxX - iconSize * 3 - 30 - 16 + compensateForBlock, y: menuItemView.frame.origin.y + 5, width: iconSize, height: iconSize) preferencesIcon.imageScaling = .scaleProportionallyUpOrDown @@ -232,8 +235,8 @@ class MenuHandler: NSMenu, NSMenuDelegate { updateIcon.isBordered = false updateIcon.setButtonType(.momentaryChange) var symbolName = prefs.bool(forKey: PrefKey.showTickMarks.rawValue) ? "arrow.left.arrow.right.square" : "arrow.triangle.2.circlepath.circle" - updateIcon.image = NSImage(systemSymbolName: symbolName, accessibilityDescription: NSLocalizedString("Check for updates...", comment: "Shown in menu")) - updateIcon.alternateImage = NSImage(systemSymbolName: symbolName + ".fill", accessibilityDescription: NSLocalizedString("Check for updates...", comment: "Shown in menu")) + updateIcon.image = NSImage(systemSymbolName: symbolName, accessibilityDescription: NSLocalizedString("Check for updates…", comment: "Shown in menu")) + updateIcon.alternateImage = NSImage(systemSymbolName: symbolName + ".fill", accessibilityDescription: NSLocalizedString("Check for updates…", comment: "Shown in menu")) updateIcon.alphaValue = 0.3 updateIcon.frame = NSRect(x: menuItemView.frame.maxX - iconSize * 2 - 10 - 16 + compensateForBlock, y: menuItemView.frame.origin.y + 5, width: iconSize, height: iconSize) @@ -263,8 +266,8 @@ class MenuHandler: NSMenu, NSMenuDelegate { if app.macOS10() { self.insertItem(NSMenuItem.separator(), at: self.items.count) } - self.insertItem(withTitle: NSLocalizedString("Preferences...", comment: "Shown in menu"), action: #selector(app.prefsClicked), keyEquivalent: "", at: self.items.count) - let updateItem = NSMenuItem(title: NSLocalizedString("Check for updates...", comment: "Shown in menu"), action: #selector(app.updaterController.checkForUpdates(_:)), keyEquivalent: "") + self.insertItem(withTitle: NSLocalizedString("Preferences…", comment: "Shown in menu"), action: #selector(app.prefsClicked), keyEquivalent: "", at: self.items.count) + let updateItem = NSMenuItem(title: NSLocalizedString("Check for updates…", comment: "Shown in menu"), action: #selector(app.updaterController.checkForUpdates(_:)), keyEquivalent: "") updateItem.target = app.updaterController self.insertItem(updateItem, at: self.items.count) self.insertItem(withTitle: NSLocalizedString("Quit", comment: "Shown in menu"), action: #selector(app.quitClicked), keyEquivalent: "q", at: self.items.count) diff --git a/MonitorControl/UI/Base.lproj/Main.storyboard b/MonitorControl/UI/Base.lproj/Main.storyboard index 9b9a5b5..6e21e43 100644 --- a/MonitorControl/UI/Base.lproj/Main.storyboard +++ b/MonitorControl/UI/Base.lproj/Main.storyboard @@ -684,16 +684,10 @@ - - - - - - @@ -1195,12 +1189,8 @@ - - - - @@ -1219,7 +1209,7 @@ - + @@ -1348,7 +1338,7 @@ - + @@ -1842,7 +1832,7 @@ - + @@ -2068,6 +2058,9 @@ + + + diff --git a/MonitorControl/UI/de.lproj/Localizable.strings b/MonitorControl/UI/de.lproj/Localizable.strings index 67e0dfd..bc8b5c0 100644 --- a/MonitorControl/UI/de.lproj/Localizable.strings +++ b/MonitorControl/UI/de.lproj/Localizable.strings @@ -23,7 +23,7 @@ "Built-in Display" = "Integrierter Monitor"; /* Shown in menu */ -"Check for updates..." = "Nach Updates suchen..."; +"Check for updates…" = "Nach Updates suchen…"; /* Shown in menu */ "Contrast" = "Kontrast"; @@ -86,7 +86,7 @@ "Preferences for an incompatible previous app version detected. Default preferences are reloaded." = "Einstellungen für eine inkompatible Vorgängerversion des Programms erkannt. Die Standardeinstellungen werden neu geladen."; /* Shown in menu */ -"Preferences..." = "Einstellungen..."; +"Preferences…" = "Einstellungen…"; /* Shown in menu */ "Quit" = "Beenden"; diff --git a/MonitorControl/UI/de.lproj/Main.strings b/MonitorControl/UI/de.lproj/Main.strings index ac73290..40f576a 100644 --- a/MonitorControl/UI/de.lproj/Main.strings +++ b/MonitorControl/UI/de.lproj/Main.strings @@ -13,18 +13,12 @@ /* Class = "NSTextFieldCell"; title = "DDC min"; ObjectID = "1zE-fg-xEm"; */ "1zE-fg-xEm.title" = "DDC min"; -/* Class = "NSBox"; title = "Box"; ObjectID = "3a3-In-jeQ"; */ -"3a3-In-jeQ.title" = "Box"; - /* Class = "NSMenuItem"; title = "Show separate controls for each display in menu"; ObjectID = "3eO-bN-ZRl"; */ "3eO-bN-ZRl.title" = "Separate Steuerung für jeden Monitor im Menü anzeigen"; /* Class = "NSMenuItem"; title = "Apply last saved values to the display"; ObjectID = "3Jr-bW-YYq"; */ "3Jr-bW-YYq.title" = "Zuletzt gespeicherte Werte auf den Monitor anwenden"; -/* Class = "NSButtonCell"; title = "https://monitorcontrol.app"; ObjectID = "42n-Zy-AqF"; */ -"42n-Zy-AqF.title" = "https://monitorcontrol.app"; - /* Class = "NSMenuItem"; title = "Custom keyboard shortcuts"; ObjectID = "4CG-0I-anB"; */ "4CG-0I-anB.title" = "Benutzerdefinierte Tastaturkürzel"; @@ -73,8 +67,8 @@ /* Class = "NSTextFieldCell"; title = "Brightness:"; ObjectID = "Bhb-6l-uPQ"; */ "Bhb-6l-uPQ.title" = "Helligkeit:"; -/* Class = "NSTextFieldCell"; title = "(Gamma->DDC)"; ObjectID = "Bid-UL-blc"; */ -"Bid-UL-blc.title" = "(Gamma->DDC)"; +/* Class = "NSTextFieldCell"; title = "(Software->DDC)"; ObjectID = "Bid-UL-blc"; */ +"Bid-UL-blc.title" = "(Software->DDC)"; /* Class = "NSTextFieldCell"; title = "For hardware (DDC) controlled displays only. Results may vary."; ObjectID = "bIe-6O-xEH"; */ "bIe-6O-xEH.title" = "Nur für hardwaregesteuerte (DDC) Monitore. Die Ergebnisse können variieren."; diff --git a/MonitorControl/UI/en.lproj/Localizable.strings b/MonitorControl/UI/en.lproj/Localizable.strings index e1b4db4..c3f87ad 100644 --- a/MonitorControl/UI/en.lproj/Localizable.strings +++ b/MonitorControl/UI/en.lproj/Localizable.strings @@ -23,7 +23,7 @@ "Built-in Display" = "Built-in Display"; /* Shown in menu */ -"Check for updates..." = "Check for updates..."; +"Check for updates…" = "Check for updates…"; /* Shown in menu */ "Contrast" = "Contrast"; @@ -86,7 +86,7 @@ "Preferences for an incompatible previous app version detected. Default preferences are reloaded." = "Preferences for an incompatible previous app version detected. Default preferences are reloaded."; /* Shown in menu */ -"Preferences..." = "Preferences..."; +"Preferences…" = "Preferences…"; /* Shown in menu */ "Quit" = "Quit"; diff --git a/MonitorControl/UI/en.lproj/Main.strings b/MonitorControl/UI/en.lproj/Main.strings index 7cb5e86..a05bb84 100644 --- a/MonitorControl/UI/en.lproj/Main.strings +++ b/MonitorControl/UI/en.lproj/Main.strings @@ -13,18 +13,12 @@ /* Class = "NSTextFieldCell"; title = "DDC min"; ObjectID = "1zE-fg-xEm"; */ "1zE-fg-xEm.title" = "DDC min"; -/* Class = "NSBox"; title = "Box"; ObjectID = "3a3-In-jeQ"; */ -"3a3-In-jeQ.title" = "Box"; - /* Class = "NSMenuItem"; title = "Show separate controls for each display in menu"; ObjectID = "3eO-bN-ZRl"; */ "3eO-bN-ZRl.title" = "Show separate controls for each display in menu"; /* Class = "NSMenuItem"; title = "Apply last saved values to the display"; ObjectID = "3Jr-bW-YYq"; */ "3Jr-bW-YYq.title" = "Apply last saved values to the display"; -/* Class = "NSButtonCell"; title = "https://monitorcontrol.app"; ObjectID = "42n-Zy-AqF"; */ -"42n-Zy-AqF.title" = "https://monitorcontrol.app"; - /* Class = "NSMenuItem"; title = "Custom keyboard shortcuts"; ObjectID = "4CG-0I-anB"; */ "4CG-0I-anB.title" = "Custom keyboard shortcuts"; @@ -73,8 +67,8 @@ /* Class = "NSTextFieldCell"; title = "Brightness:"; ObjectID = "Bhb-6l-uPQ"; */ "Bhb-6l-uPQ.title" = "Brightness:"; -/* Class = "NSTextFieldCell"; title = "(Gamma->DDC)"; ObjectID = "Bid-UL-blc"; */ -"Bid-UL-blc.title" = "(Gamma->DDC)"; +/* Class = "NSTextFieldCell"; title = "(Software->DDC)"; ObjectID = "Bid-UL-blc"; */ +"Bid-UL-blc.title" = "(Software->DDC)"; /* Class = "NSTextFieldCell"; title = "For hardware (DDC) controlled displays only. Results may vary."; ObjectID = "bIe-6O-xEH"; */ "bIe-6O-xEH.title" = "For hardware (DDC) controlled displays only. Results may vary."; diff --git a/MonitorControl/UI/fr.lproj/Localizable.strings b/MonitorControl/UI/fr.lproj/Localizable.strings index 3a5dd1d..0d8e458 100644 --- a/MonitorControl/UI/fr.lproj/Localizable.strings +++ b/MonitorControl/UI/fr.lproj/Localizable.strings @@ -23,7 +23,7 @@ "Built-in Display" = "Écran intégré"; /* Shown in menu */ -"Check for updates..." = "Vérifier les mises à jour…"; +"Check for updates…" = "Vérifier les mises à jour…"; /* Shown in menu */ "Contrast" = "Contraste"; @@ -35,7 +35,7 @@ "Decrease" = "Diminuer"; /* Shown in the alert dialog */ -"Disable gamma control for my displays" = "Disable gamma control for my displays"; +"Disable gamma control for my displays" = "Désactiver le contrôle gamma pour mes écrans"; /* Shown in the main prefs window */ "Displays" = "Écrans"; @@ -50,13 +50,13 @@ "General" = "Général"; /* Shown in the Display Preferences */ -"Hardware (Apple)" = "Hardware (Apple)"; +"Hardware (Apple)" = "Matériel (Apple)"; /* Shown in the Display Preferences */ "Hardware (DDC)" = "Matériel (DDC)"; /* Shown in the alert dialog */ -"I'll quit the other app" = "I'll quit the other app"; +"I'll quit the other app" = "Je vais quitter l'autre application"; /* Shown in the alert dialog */ "Incompatible previous version" = "Version précédente incompatible"; @@ -65,7 +65,7 @@ "Increase" = "Augmenter"; /* Shown in the alert dialog */ -"Is f.lux or similar running?" = "Is f.lux or similar running?"; +"Is f.lux or similar running?" = "Est-ce que f.lux ou similaire est lancé ?"; /* Shown in the main prefs window */ "Keyboard" = "Clavier"; @@ -77,7 +77,7 @@ "No" = "Non"; /* Shown in the Display Preferences */ -"No Control" = "Aucun control"; +"No Control" = "Aucun contrôle"; /* Shown in the Display Preferences */ "Other Display" = "Autre écran"; @@ -86,7 +86,7 @@ "Preferences for an incompatible previous app version detected. Default preferences are reloaded." = "Préférences pour une version précédente incompatible détéctés. Les préférences par défaut seront rechargées."; /* Shown in menu */ -"Preferences..." = "Préférences..."; +"Preferences…" = "Préférences…"; /* Shown in menu */ "Quit" = "Quitter"; @@ -104,7 +104,7 @@ "Shortcuts not available" = "Raccourcis non disponible"; /* Shown in the Display Preferences */ -"Software (gamma)" = "Logiciel (gamma)"; +"Software (gamma)" = "Logiciel (Gamma)"; /* Shown in the Display Preferences */ "Software (gamma, forced)" = "Logiciel (Gamma, Forcé)"; @@ -113,7 +113,7 @@ "Software (shade)" = "Logiciel (Voile)"; /* Shown in the Display Preferences */ -"Software (shade, forced)" = "Software (shade, forced)"; +"Software (shade, forced)" = "Logiciel (Voile, Forcé)"; /* Shown in the Display Preferences */ "This display allows for software brightness control via gamma table manipulation or shade as it does not support hardware control. Reasons for this might be using the HDMI port of a Mac mini (which blocks hardware DDC control) or having a blacklisted display." = "Cet écran permet un contrôle de la luminosité logiciel via une manipulation des tables gamma car il ne prend pas en charge le contrôle matériel. Cela peut être dû à l'utilisation du port HDMI d'un Mac mini (qui bloque le contrôle DDC matériel) ou à un écran sur liste noire."; diff --git a/MonitorControl/UI/fr.lproj/Main.strings b/MonitorControl/UI/fr.lproj/Main.strings index a3d96a9..96f511d 100644 --- a/MonitorControl/UI/fr.lproj/Main.strings +++ b/MonitorControl/UI/fr.lproj/Main.strings @@ -1,5 +1,5 @@ /* Class = "NSButtonCell"; title = "Sync brightness changes from Built-in and Apple displays"; ObjectID = "0ca-DG-AgB"; */ -"0ca-DG-AgB.title" = "Synchronisez les changements de luminosité à partir des écrans intégrés et Apple"; +"0ca-DG-AgB.title" = "Synchronisez la luminosité à partir des écrans intégrés et Apple"; /* Class = "NSMenuItem"; title = "Assume last saved settings are valid (recommended)"; ObjectID = "1in-79-6qm"; */ "1in-79-6qm.title" = "Supposer que les derniers paramètres enregistrés sont valides (recommandé)"; @@ -13,17 +13,11 @@ /* Class = "NSTextFieldCell"; title = "DDC min"; ObjectID = "1zE-fg-xEm"; */ "1zE-fg-xEm.title" = "min. DDC"; -/* Class = "NSBox"; title = "Box"; ObjectID = "3a3-In-jeQ"; */ -"3a3-In-jeQ.title" = "Box"; - /* Class = "NSMenuItem"; title = "Show separate controls for each display in menu"; ObjectID = "3eO-bN-ZRl"; */ "3eO-bN-ZRl.title" = "Afficher des commandes distinctes pour chaque écran dans le menu"; /* Class = "NSMenuItem"; title = "Apply last saved values to the display"; ObjectID = "3Jr-bW-YYq"; */ -"3Jr-bW-YYq.title" = "Appliquer les dernières valeurs enregistrées à l'écran'"; - -/* Class = "NSButtonCell"; title = "https://monitorcontrol.app"; ObjectID = "42n-Zy-AqF"; */ -"42n-Zy-AqF.title" = "https://monitorcontrol.app"; +"3Jr-bW-YYq.title" = "Appliquer les dernières valeurs enregistrées à l'écran"; /* Class = "NSMenuItem"; title = "Custom keyboard shortcuts"; ObjectID = "4CG-0I-anB"; */ "4CG-0I-anB.title" = "Raccourcis clavier personnalisés"; @@ -38,7 +32,7 @@ "6mo-7S-oOO.title" = "Toujours masquer"; /* Class = "NSTextFieldCell"; title = "Slider behavior:"; ObjectID = "75n-7M-1mS"; */ -"75n-7M-1mS.title" = "Comportement des curseurs:"; +"75n-7M-1mS.title" = "Comportement des curseurs :"; /* Class = "NSButtonCell"; title = "Show slider tick marks"; ObjectID = "7zf-m1-gJO"; */ "7zf-m1-gJO.title" = "Afficher des marques de graduation"; @@ -73,8 +67,8 @@ /* Class = "NSTextFieldCell"; title = "Brightness:"; ObjectID = "Bhb-6l-uPQ"; */ "Bhb-6l-uPQ.title" = "Luminosité:"; -/* Class = "NSTextFieldCell"; title = "(Gamma->DDC)"; ObjectID = "Bid-UL-blc"; */ -"Bid-UL-blc.title" = "(Gamma → DDC)"; +/* Class = "NSTextFieldCell"; title = "(Software->DDC)"; ObjectID = "Bid-UL-blc"; */ +"Bid-UL-blc.title" = "(Logiciel → DDC)"; /* Class = "NSTextFieldCell"; title = "For hardware (DDC) controlled displays only. Results may vary."; ObjectID = "bIe-6O-xEH"; */ "bIe-6O-xEH.title" = "Pour les écrans contrôlés par matériel (DDC) uniquement. Les résultats peuvent varier."; @@ -83,10 +77,10 @@ "bkM-Px-U3b.title" = "Désactiver l'OSD du volume macOS"; /* Class = "NSTextFieldCell"; title = "OSD scale:"; ObjectID = "bP4-GJ-vhJ"; */ -"bP4-GJ-vhJ.title" = "Échelle de l'OSD:"; +"bP4-GJ-vhJ.title" = "Échelle de l'OSD :"; /* Class = "NSTextFieldCell"; title = "OSD scale:"; ObjectID = "Bqc-s3-C0w"; */ -"Bqc-s3-C0w.title" = "Échelle de l'OSD:"; +"Bqc-s3-C0w.title" = "Échelle de l'OSD :"; /* Class = "NSButtonCell"; title = "Reset settings"; ObjectID = "BYS-7Y-bRz"; */ "BYS-7Y-bRz.title" = "Réinitialiser les options"; @@ -122,7 +116,7 @@ "Eq3-z9-yIo.title" = "Minimal"; /* Class = "NSTextFieldCell"; title = "Scale mapping curve"; ObjectID = "Eui-5S-JR6"; */ -"Eui-5S-JR6.title" = "Courbe de mappage d'échelle"; +"Eui-5S-JR6.title" = "Courbe d'échelle"; /* Class = "NSTextFieldCell"; title = "Mute:"; ObjectID = "EvN-FT-vdZ"; */ "EvN-FT-vdZ.title" = "Sourdine :"; @@ -143,7 +137,7 @@ "FER-Ri-4UO.title" = "Volume :"; /* Class = "NSButtonCell"; title = "Allow zero brightness via software or combined dimming"; ObjectID = "FjB-XL-fG5"; */ -"FjB-XL-fG5.title" = "Allow zero brightness via software or combined dimming"; +"FjB-XL-fG5.title" = "Autoriser une luminosité nulle via le contrôle logiciel ou combiné"; /* Class = "NSTextFieldCell"; title = "Apple and built-in displays already have a brightness slider in Control Center."; ObjectID = "fmZ-HI-Mdc"; */ "fmZ-HI-Mdc.title" = "Les écrans Apple et intégrés ont déjà un curseur de luminosité dans le Centre de Contrôle."; @@ -215,7 +209,7 @@ "lA0-tv-qRs.title" = "Utiliser un curseur combiné pour tous les écrans"; /* Class = "NSTextFieldCell"; title = "Brightness and contrast:"; ObjectID = "LO4-4k-gxY"; */ -"LO4-4k-gxY.title" = "Contrôle de la luminosité et du contraste :"; +"LO4-4k-gxY.title" = "Luminosité et contraste :"; /* Class = "NSTextFieldCell"; title = "Display type:"; ObjectID = "lSJ-6w-KJ2"; */ "lSJ-6w-KJ2.title" = "Type d'écran :"; @@ -239,7 +233,7 @@ "MWo-6I-s9L.title" = "Afficher le curseur de luminosité dans le menu"; /* Class = "NSButtonCell"; title = "Avoid gamma table manipulation"; ObjectID = "na6-mS-MPi"; */ -"na6-mS-MPi.title" = "Avoid gamma table manipulation"; +"na6-mS-MPi.title" = "Éviter de manipuler la table gamma"; /* Class = "NSButtonCell"; title = "Separate scales for combined hardware & software dimming"; ObjectID = "O8o-hI-8eR"; */ "O8o-hI-8eR.title" = "Séparer les échelles pour le contrôle matériel et logiciel combiné"; @@ -281,7 +275,7 @@ "qO0-dB-yUs.title" = "Afficher le curseur de contraste dans le menu"; /* Class = "NSTextFieldCell"; title = "Volume control (DDC only):"; ObjectID = "qoh-Gn-f11"; */ -"qoh-Gn-f11.title" = "Contrôle du volume (DDC uniquement) :"; +"qoh-Gn-f11.title" = "Contrôle du volume (DDC) :"; /* Class = "NSTextFieldCell"; title = "Show percentage next to slider for more precision."; ObjectID = "qXy-CL-Wf1"; */ "qXy-CL-Wf1.title" = "Afficher le pourcentage à côté du curseur pour plus de précision."; @@ -323,7 +317,7 @@ "vri-pv-tJ4.title" = "Plusieurs écrans :"; /* Class = "NSTextFieldCell"; title = "DDC read polling mode:"; ObjectID = "vwm-hY-on5"; */ -"vwm-hY-on5.title" = "Mode d'interrogation de lecture DDC:"; +"vwm-hY-on5.title" = "Mode d'interrogation de lecture DDC :"; /* Class = "NSTextFieldCell"; title = "General options:"; ObjectID = "W58-ch-j69"; */ "W58-ch-j69.title" = "Options générales :"; @@ -356,7 +350,7 @@ "YHZ-VL-QJ3.title" = "L'échelle de l'OSD complète sera disponible pour le contrôle de la luminosité matériel et après avoir atteint une luminosité de 0, un contrôle logiciel supplémentaire sera utilisée."; /* Class = "NSTextFieldCell"; title = "Warning! With this option enabled, you might find yourself in a position when you end up with a blank display. This, combined with disabled keyboard controls can be frustrating."; ObjectID = "yi3-e1-wsL"; */ -"yi3-e1-wsL.title" = "Warning! With this option enabled, you might find yourself in a position when you end up with a blank display. This, combined with disabled keyboard controls can be frustrating."; +"yi3-e1-wsL.title" = "Attention ! Avec cette option activée, vous pourriez vous retrouver dans une position où l'écran s'éteint. Ceci, combiné à des commandes de clavier désactivées, peut être frustrant."; /* Class = "NSTextFieldCell"; title = "Identifier:"; ObjectID = "YqZ-LS-YvR"; */ "YqZ-LS-YvR.title" = "Identifiant :"; diff --git a/MonitorControl/UI/hu.lproj/Localizable.strings b/MonitorControl/UI/hu.lproj/Localizable.strings index 2d9ced6..61c9caf 100644 --- a/MonitorControl/UI/hu.lproj/Localizable.strings +++ b/MonitorControl/UI/hu.lproj/Localizable.strings @@ -23,7 +23,7 @@ "Built-in Display" = "Beépített"; /* Shown in menu */ -"Check for updates..." = "Frissítések ellenőrzése..."; +"Check for updates…" = "Frissítések ellenőrzése…"; /* Shown in menu */ "Contrast" = "Kontraszt"; @@ -86,7 +86,7 @@ "Preferences for an incompatible previous app version detected. Default preferences are reloaded." = "Az előző alkalmazásverzió beállításai nem kompatibilisek ezzel a verzióval. Visszaállítottuk az alapértelmezett beállításokat."; /* Shown in menu */ -"Preferences..." = "Beállítások..."; +"Preferences…" = "Beállítások…"; /* Shown in menu */ "Quit" = "Kilépés"; diff --git a/MonitorControl/UI/hu.lproj/Main.strings b/MonitorControl/UI/hu.lproj/Main.strings index 54ebd00..c7fd1cb 100644 --- a/MonitorControl/UI/hu.lproj/Main.strings +++ b/MonitorControl/UI/hu.lproj/Main.strings @@ -13,18 +13,12 @@ /* Class = "NSTextFieldCell"; title = "DDC min"; ObjectID = "1zE-fg-xEm"; */ "1zE-fg-xEm.title" = "DDC min"; -/* Class = "NSBox"; title = "Box"; ObjectID = "3a3-In-jeQ"; */ -"3a3-In-jeQ.title" = "Box"; - /* Class = "NSMenuItem"; title = "Show separate controls for each display in menu"; ObjectID = "3eO-bN-ZRl"; */ "3eO-bN-ZRl.title" = "Külön vezérlő minden képernyő számára"; /* Class = "NSMenuItem"; title = "Apply last saved values to the display"; ObjectID = "3Jr-bW-YYq"; */ "3Jr-bW-YYq.title" = "Utolsó mentett értékek elküldése a kijelzőnek"; -/* Class = "NSButtonCell"; title = "https://monitorcontrol.app"; ObjectID = "42n-Zy-AqF"; */ -"42n-Zy-AqF.title" = "https://monitorcontrol.app"; - /* Class = "NSMenuItem"; title = "Custom keyboard shortcuts"; ObjectID = "4CG-0I-anB"; */ "4CG-0I-anB.title" = "Egyéni billentyűkombinációk"; @@ -73,8 +67,8 @@ /* Class = "NSTextFieldCell"; title = "Brightness:"; ObjectID = "Bhb-6l-uPQ"; */ "Bhb-6l-uPQ.title" = "Fényerő:"; -/* Class = "NSTextFieldCell"; title = "(Gamma->DDC)"; ObjectID = "Bid-UL-blc"; */ -"Bid-UL-blc.title" = "(Gamma->DDC)"; +/* Class = "NSTextFieldCell"; title = "(Software->DDC)"; ObjectID = "Bid-UL-blc"; */ +"Bid-UL-blc.title" = "(Szoftver->DDC)"; /* Class = "NSTextFieldCell"; title = "For hardware (DDC) controlled displays only. Results may vary."; ObjectID = "bIe-6O-xEH"; */ "bIe-6O-xEH.title" = "Hardveresen (DDC) vezérelt kijelzők esetén működhet."; diff --git a/MonitorControl/UI/it.lproj/Localizable.strings b/MonitorControl/UI/it.lproj/Localizable.strings index 15fb949..26fa759 100644 --- a/MonitorControl/UI/it.lproj/Localizable.strings +++ b/MonitorControl/UI/it.lproj/Localizable.strings @@ -23,7 +23,7 @@ "Built-in Display" = "Monitor Integrato"; /* Shown in menu */ -"Check for updates..." = "Controlla aggiornamneti..."; +"Check for updates…" = "Controlla aggiornamenti…"; /* Shown in menu */ "Contrast" = "Contrasto"; @@ -35,7 +35,7 @@ "Decrease" = "Diminiusci"; /* Shown in the alert dialog */ -"Disable gamma control for my displays" = "Disable gamma control for my displays"; +"Disable gamma control for my displays" = "Disabilita controllo gamma per i miei monitor"; /* Shown in the main prefs window */ "Displays" = "Monitor"; @@ -56,7 +56,7 @@ "Hardware (DDC)" = "Hardware (DDC)"; /* Shown in the alert dialog */ -"I'll quit the other app" = "I'll quit the other app"; +"I'll quit the other app" = "Chiuderò le altre applicazioni"; /* Shown in the alert dialog */ "Incompatible previous version" = "Versione precedente incompatibile"; @@ -65,7 +65,7 @@ "Increase" = "Aumenta"; /* Shown in the alert dialog */ -"Is f.lux or similar running?" = "Is f.lux or similar running?"; +"Is f.lux or similar running?" = "E' attivo f.lux or simile?"; /* Shown in the main prefs window */ "Keyboard" = "Tastiera"; @@ -86,7 +86,7 @@ "Preferences for an incompatible previous app version detected. Default preferences are reloaded." = "Le impostazioni di una versione precedente incompatibile sono state trovate. Verranno caricate le impostazioni di default."; /* Shown in menu */ -"Preferences..." = "Preferenze..."; +"Preferences…" = "Preferenze…"; /* Shown in menu */ "Quit" = "Esci"; @@ -107,13 +107,13 @@ "Software (gamma)" = "Software (gamma)"; /* Shown in the Display Preferences */ -"Software (gamma, forced)" = "Software (Gamma, Forzata)"; +"Software (gamma, forced)" = "Software (gamma, forzata)"; /* Shown in the Display Preferences */ -"Software (shade)" = "Software (Sfumatura)"; +"Software (shade)" = "Software (attenuazione)"; /* Shown in the Display Preferences */ -"Software (shade, forced)" = "Software (shade, forced)"; +"Software (shade, forced)" = "Software (attenuazione, forzata)"; /* Shown in the Display Preferences */ "This display allows for software brightness control via gamma table manipulation or shade as it does not support hardware control. Reasons for this might be using the HDMI port of a Mac mini (which blocks hardware DDC control) or having a blacklisted display." = "Questo monitor permette il controllo software della luminositò attraverso la manipolazione della gammatable e non supporta un controllo hardware. Un motivo potrebbe essere Reasons l'utilizzo della porta HDMI su un Mac Mini (che blocca il controllo hardware DCC) oppure avere un monitor non supportato."; diff --git a/MonitorControl/UI/it.lproj/Main.strings b/MonitorControl/UI/it.lproj/Main.strings index 5ae3e9a..88e44d5 100644 --- a/MonitorControl/UI/it.lproj/Main.strings +++ b/MonitorControl/UI/it.lproj/Main.strings @@ -13,20 +13,14 @@ /* Class = "NSTextFieldCell"; title = "DDC min"; ObjectID = "1zE-fg-xEm"; */ "1zE-fg-xEm.title" = "Min DDC"; -/* Class = "NSBox"; title = "Box"; ObjectID = "3a3-In-jeQ"; */ -"3a3-In-jeQ.title" = "Box"; - /* Class = "NSMenuItem"; title = "Show separate controls for each display in menu"; ObjectID = "3eO-bN-ZRl"; */ "3eO-bN-ZRl.title" = "Mostra slider separati per ciascun monitor nel menu"; /* Class = "NSMenuItem"; title = "Apply last saved values to the display"; ObjectID = "3Jr-bW-YYq"; */ "3Jr-bW-YYq.title" = "Applica al monitor gli ultimi valori salvati"; -/* Class = "NSButtonCell"; title = "https://monitorcontrol.app"; ObjectID = "42n-Zy-AqF"; */ -"42n-Zy-AqF.title" = "https://monitorcontrol.app"; - /* Class = "NSMenuItem"; title = "Custom keyboard shortcuts"; ObjectID = "4CG-0I-anB"; */ -"4CG-0I-anB.title" = "Abreviazioni da tastiera personalizzate"; +"4CG-0I-anB.title" = "Abbreviazioni da tastiera personalizzate"; /* Class = "NSTextFieldCell"; title = "Using window focus might not work properly with full screen apps."; ObjectID = "4dX-o1-xAc"; */ "4dX-o1-xAc.title" = "L'utilizzo del focus sulla finestra potrebbe non funzionare sulle applicazioni a pieno schermo."; @@ -44,7 +38,7 @@ "7zf-m1-gJO.title" = "Mostra i marcatori nello slider"; /* Class = "NSTextFieldCell"; title = "Slider knob will snap to 0%, 25%, 50%, 75% and 100% when in proximity making setting these values easier. Disable for finer control."; ObjectID = "8Gx-Ya-zhp"; */ -"8Gx-Ya-zhp.title" = "Lo slider scatta nele posizioni 0%, 25%, 50%, 75% e 100% quando si trova in prossimità di questi valori in modo da impostarli più semplicemente."; +"8Gx-Ya-zhp.title" = "Lo slider scatta nelle posizioni 0%, 25%, 50%, 75% e 100% quando si trova in prossimità di questi valori in modo da impostarli più semplicemente."; /* Class = "NSButtonCell"; title = "Use fine OSD scale for brightness and contrast"; ObjectID = "8Q8-57-xnT"; */ "8Q8-57-xnT.title" = "Utilizza la scala fine OSD"; @@ -53,13 +47,13 @@ "95V-M4-2l5.title" = "Ringraziamento speciale ai contributors!"; /* Class = "NSMenuItem"; title = "Custom keyboard shortcuts"; ObjectID = "9eC-PD-FHl"; */ -"9eC-PD-FHl.title" = "Abbreviazioni da tastiera personalizzare"; +"9eC-PD-FHl.title" = "Abbreviazioni da tastiera personalizzate"; /* Class = "NSMenuItem"; title = "Attempt to read display settings"; ObjectID = "9yL-no-aWa"; */ "9yL-no-aWa.title" = "Tenta di leggere le impostazioni del monitor"; /* Class = "NSTextFieldCell"; title = "Show tick marks at 0%, 25%, 50%, 75% and 100% for accuracy."; ObjectID = "A8P-vn-DEJ"; */ -"A8P-vn-DEJ.title" = "Mostra i marcatori a 0%, 25%, 50%, 75% and 100%."; +"A8P-vn-DEJ.title" = "Mostra i marcatori a 0%, 25%, 50%, 75% e 100%."; /* Class = "NSTextFieldCell"; title = "Use brightness, volume and other settings from last time or use defaults. Values will be applied to the display upon first change by the user."; ObjectID = "an7-Aj-3fZ"; */ "an7-Aj-3fZ.title" = "Utilizza la luminisità, il volume ed altre impostazioni dell'ultima volta o utilizza il default. I valori saranno applicati al monitor alla prima modifica dell'utente."; @@ -73,11 +67,11 @@ /* Class = "NSTextFieldCell"; title = "Brightness:"; ObjectID = "Bhb-6l-uPQ"; */ "Bhb-6l-uPQ.title" = "Luminosità:"; -/* Class = "NSTextFieldCell"; title = "(Gamma->DDC)"; ObjectID = "Bid-UL-blc"; */ -"Bid-UL-blc.title" = "(Gamma->DDC)"; +/* Class = "NSTextFieldCell"; title = "(Software->DDC)"; ObjectID = "Bid-UL-blc"; */ +"Bid-UL-blc.title" = "(Software->DDC)"; /* Class = "NSTextFieldCell"; title = "For hardware (DDC) controlled displays only. Results may vary."; ObjectID = "bIe-6O-xEH"; */ -"bIe-6O-xEH.title" = "Solo per i montor con controllo hardware (DDC). I risultati possono variare."; +"bIe-6O-xEH.title" = "Solo per i monitor con controllo hardware (DDC). I risultati possono variare."; /* Class = "NSButtonCell"; title = "Disable macOS volume OSD"; ObjectID = "bkM-Px-U3b"; */ "bkM-Px-U3b.title" = "Disabilita l'OSD del volumme del macOS"; @@ -86,7 +80,7 @@ "bP4-GJ-vhJ.title" = "Scala OSD:"; /* Class = "NSTextFieldCell"; title = "OSD scale:"; ObjectID = "Bqc-s3-C0w"; */ -"Bqc-s3-C0w.title" = "OScala OSD:"; +"Bqc-s3-C0w.title" = "Scala OSD:"; /* Class = "NSButtonCell"; title = "Reset settings"; ObjectID = "BYS-7Y-bRz"; */ "BYS-7Y-bRz.title" = "Reset impostazioni"; @@ -113,10 +107,10 @@ "D9t-vT-gNJ.title" = "Lista VCP"; /* Class = "NSTextFieldCell"; title = "You can override audio device name under Displays (advanced) if needed."; ObjectID = "Dha-Tm-cDM"; */ -"Dha-Tm-cDM.title" = "Puoi sovrascrivere il nome del dispositivo audio dentro Monitor se necessario."; +"Dha-Tm-cDM.title" = "Puoi sovrascrivere il nome del dispositivo audio nella sezione Monitor se necessario."; /* Class = "NSTextFieldCell"; title = "You can disable smooth transitions for a more direct, immediate control."; ObjectID = "ENt-mP-0yH"; */ -"ENt-mP-0yH.title" = "Puoi disabilitare le transizioni modbide per un controllo più diretto ed immediato."; +"ENt-mP-0yH.title" = "Puoi disabilitare le transizioni morbide per un controllo più diretto ed immediato."; /* Class = "NSMenuItem"; title = "Minimal"; ObjectID = "Eq3-z9-yIo"; */ "Eq3-z9-yIo.title" = "Minimalista"; @@ -143,7 +137,7 @@ "FER-Ri-4UO.title" = "Volume:"; /* Class = "NSButtonCell"; title = "Allow zero brightness via software or combined dimming"; ObjectID = "FjB-XL-fG5"; */ -"FjB-XL-fG5.title" = "Allow zero brightness via software or combined dimming"; +"FjB-XL-fG5.title" = "Permetti la luminosità zero cia software o attenuazione combinata"; /* Class = "NSTextFieldCell"; title = "Apple and built-in displays already have a brightness slider in Control Center."; ObjectID = "fmZ-HI-Mdc"; */ "fmZ-HI-Mdc.title" = "I Monitor Apple ed incorporati hanno già lo slider della luminosità nel Centro di Controllo."; @@ -197,7 +191,7 @@ "jSj-HB-T2t.title" = "Modifica per tutti i monitor"; /* Class = "NSButtonCell"; title = "Check for updates"; ObjectID = "jVH-oc-rUi"; */ -"jVH-oc-rUi.title" = "Controlla aggiornamneti"; +"jVH-oc-rUi.title" = "Controlla aggiornamenti"; /* Class = "NSTextFieldCell"; title = "Note: you can press Shift during startup for 'Safe mode' to restore defaults and avoid reading or setting anything."; ObjectID = "Jx2-gO-nq9"; */ "Jx2-gO-nq9.title" = "Nota: puoi premere Maiusc all'avvio per il 'Safe mode' in modo da impostare i valori di default."; @@ -236,10 +230,10 @@ "mue-fa-8z6.title" = "Volume:"; /* Class = "NSButtonCell"; title = "Show brightness slider in menu"; ObjectID = "MWo-6I-s9L"; */ -"MWo-6I-s9L.title" = "Mostra lo slider della luminositò nel menu"; +"MWo-6I-s9L.title" = "Mostra lo slider della luminosità nel menu"; /* Class = "NSButtonCell"; title = "Avoid gamma table manipulation"; ObjectID = "na6-mS-MPi"; */ -"na6-mS-MPi.title" = "Avoid gamma table manipulation"; +"na6-mS-MPi.title" = "Impedisci la manipolazione della tabella di gamma"; /* Class = "NSButtonCell"; title = "Separate scales for combined hardware & software dimming"; ObjectID = "O8o-hI-8eR"; */ "O8o-hI-8eR.title" = "Scale separate per controllo combinato della attenuazione hw/sw"; @@ -356,7 +350,7 @@ "YHZ-VL-QJ3.title" = "L'intera scala OSD sarà disponibile per il controllo hardware della luminosità e una volta raggiunto lo 0, l'attenuazione software verrà utilizata."; /* Class = "NSTextFieldCell"; title = "Warning! With this option enabled, you might find yourself in a position when you end up with a blank display. This, combined with disabled keyboard controls can be frustrating."; ObjectID = "yi3-e1-wsL"; */ -"yi3-e1-wsL.title" = "Warning! With this option enabled, you might find yourself in a position when you end up with a blank display. This, combined with disabled keyboard controls can be frustrating."; +"yi3-e1-wsL.title" = "Attenzione! Con questa opzione attiva, potresti trovarti in con un monitor completamente nero. Questo i combinazione con la disattivazione dei comandi da tastiera potrebbe essere frustrante."; /* Class = "NSTextFieldCell"; title = "Identifier:"; ObjectID = "YqZ-LS-YvR"; */ "YqZ-LS-YvR.title" = "Identificativo:"; diff --git a/MonitorControl/UI/ko.lproj/Localizable.strings b/MonitorControl/UI/ko.lproj/Localizable.strings index dd10768..4f1c1d4 100644 --- a/MonitorControl/UI/ko.lproj/Localizable.strings +++ b/MonitorControl/UI/ko.lproj/Localizable.strings @@ -23,7 +23,7 @@ "Built-in Display" = "내장 디스플레이"; /* Shown in menu */ -"Check for updates..." = "업데이트 확인..."; +"Check for updates…" = "업데이트 확인…"; /* Shown in menu */ "Contrast" = "대비"; @@ -86,7 +86,7 @@ "Preferences for an incompatible previous app version detected. Default preferences are reloaded." = "호환되지 않는 이전 앱 버전에 대한 기본 설정이 감지되었습니다. 기본 환경 설정을 다시 불러옵니다."; /* Shown in menu */ -"Preferences..." = "환경 설정..."; +"Preferences…" = "환경 설정…"; /* Shown in menu */ "Quit" = "종료"; diff --git a/MonitorControl/UI/ko.lproj/Main.strings b/MonitorControl/UI/ko.lproj/Main.strings index 3ab14e4..d523cbc 100644 --- a/MonitorControl/UI/ko.lproj/Main.strings +++ b/MonitorControl/UI/ko.lproj/Main.strings @@ -13,18 +13,12 @@ /* Class = "NSTextFieldCell"; title = "DDC min"; ObjectID = "1zE-fg-xEm"; */ "1zE-fg-xEm.title" = "DDC 최솟값"; -/* Class = "NSBox"; title = "Box"; ObjectID = "3a3-In-jeQ"; */ -"3a3-In-jeQ.title" = "Box"; - /* Class = "NSMenuItem"; title = "Show separate controls for each display in menu"; ObjectID = "3eO-bN-ZRl"; */ "3eO-bN-ZRl.title" = "메뉴에서 각 디스플레이에 대해 각각의 컨트롤 표시"; /* Class = "NSMenuItem"; title = "Apply last saved values to the display"; ObjectID = "3Jr-bW-YYq"; */ "3Jr-bW-YYq.title" = "마지막으로 저장된 값을 디스플레이에 적용"; -/* Class = "NSButtonCell"; title = "https://monitorcontrol.app"; ObjectID = "42n-Zy-AqF"; */ -"42n-Zy-AqF.title" = "https://monitorcontrol.app"; - /* Class = "NSMenuItem"; title = "Custom keyboard shortcuts"; ObjectID = "4CG-0I-anB"; */ "4CG-0I-anB.title" = "사용자 정의 키보드 단축키"; @@ -73,8 +67,8 @@ /* Class = "NSTextFieldCell"; title = "Brightness:"; ObjectID = "Bhb-6l-uPQ"; */ "Bhb-6l-uPQ.title" = "밝기:"; -/* Class = "NSTextFieldCell"; title = "(Gamma->DDC)"; ObjectID = "Bid-UL-blc"; */ -"Bid-UL-blc.title" = "(감마->DDC)"; +/* Class = "NSTextFieldCell"; title = "(Software->DDC)"; ObjectID = "Bid-UL-blc"; */ +"Bid-UL-blc.title" = "(소프트웨어->DDC)"; /* Class = "NSTextFieldCell"; title = "For hardware (DDC) controlled displays only. Results may vary."; ObjectID = "bIe-6O-xEH"; */ "bIe-6O-xEH.title" = "하드웨어 (DDC) 제어 디스플레이 전용. 결과는 다를 수 있습니다."; diff --git a/MonitorControl/UI/nl.lproj/Localizable.strings b/MonitorControl/UI/nl.lproj/Localizable.strings index dab1207..62cac7e 100644 --- a/MonitorControl/UI/nl.lproj/Localizable.strings +++ b/MonitorControl/UI/nl.lproj/Localizable.strings @@ -23,7 +23,7 @@ "Built-in Display" = "Ingebouwd Scherm"; /* Shown in menu */ -"Check for updates..." = "Controleren op updates..."; +"Check for updates…" = "Controleren op updates…"; /* Shown in menu */ "Contrast" = "Contrast"; @@ -86,7 +86,7 @@ "Preferences for an incompatible previous app version detected. Default preferences are reloaded." = "Voorkeuren voor een incompatibele vorige app-versie gedetecteerd. Standaardvoorkeuren worden opnieuw geladen."; /* Shown in menu */ -"Preferences..." = "Voorkeuren..."; +"Preferences…" = "Voorkeuren…"; /* Shown in menu */ "Quit" = "Afsluiten"; diff --git a/MonitorControl/UI/nl.lproj/Main.strings b/MonitorControl/UI/nl.lproj/Main.strings index 23143c2..f7afffd 100644 --- a/MonitorControl/UI/nl.lproj/Main.strings +++ b/MonitorControl/UI/nl.lproj/Main.strings @@ -13,18 +13,12 @@ /* Class = "NSTextFieldCell"; title = "DDC min"; ObjectID = "1zE-fg-xEm"; */ "1zE-fg-xEm.title" = "DDC min"; -/* Class = "NSBox"; title = "Box"; ObjectID = "3a3-In-jeQ"; */ -"3a3-In-jeQ.title" = "Box"; - /* Class = "NSMenuItem"; title = "Show separate controls for each display in menu"; ObjectID = "3eO-bN-ZRl"; */ "3eO-bN-ZRl.title" = "Toon afzonderlijke bedieningselementen voor elk scherm in het menu"; /* Class = "NSMenuItem"; title = "Apply last saved values to the display"; ObjectID = "3Jr-bW-YYq"; */ "3Jr-bW-YYq.title" = "Pas laatst opgeslagen waarden toe op het scherm"; -/* Class = "NSButtonCell"; title = "https://monitorcontrol.app"; ObjectID = "42n-Zy-AqF"; */ -"42n-Zy-AqF.title" = "https://monitorcontrol.app"; - /* Class = "NSMenuItem"; title = "Custom keyboard shortcuts"; ObjectID = "4CG-0I-anB"; */ "4CG-0I-anB.title" = "Aangepaste sneltoetsen"; @@ -73,8 +67,8 @@ /* Class = "NSTextFieldCell"; title = "Brightness:"; ObjectID = "Bhb-6l-uPQ"; */ "Bhb-6l-uPQ.title" = "Helderheid:"; -/* Class = "NSTextFieldCell"; title = "(Gamma->DDC)"; ObjectID = "Bid-UL-blc"; */ -"Bid-UL-blc.title" = "(Gamma->DDC)"; +/* Class = "NSTextFieldCell"; title = "(Software->DDC)"; ObjectID = "Bid-UL-blc"; */ +"Bid-UL-blc.title" = "(Software->DDC)"; /* Class = "NSTextFieldCell"; title = "For hardware (DDC) controlled displays only. Results may vary."; ObjectID = "bIe-6O-xEH"; */ "bIe-6O-xEH.title" = "Alleen voor hardware (DDC) gestuurde schermen. Resultaten kunnen verschillen."; diff --git a/MonitorControl/UI/tr.lproj/Localizable.strings b/MonitorControl/UI/tr.lproj/Localizable.strings index cea33ad..3186619 100644 --- a/MonitorControl/UI/tr.lproj/Localizable.strings +++ b/MonitorControl/UI/tr.lproj/Localizable.strings @@ -23,7 +23,7 @@ "Built-in Display" = "Dahili Ekran"; /* Shown in menu */ -"Check for updates..." = "Güncellemeleri denetle..."; +"Check for updates…" = "Güncellemeleri denetle…"; /* Shown in menu */ "Contrast" = "Kontrast"; @@ -86,7 +86,7 @@ "Preferences for an incompatible previous app version detected. Default preferences are reloaded." = "Uyumsuz bir önceki uygulama sürümü için tercihler algılandı. Varsayılan tercihler yeniden yüklenir."; /* Shown in menu */ -"Preferences..." = "Tercihler..."; +"Preferences…" = "Tercihler…"; /* Shown in menu */ "Quit" = "Çıkış"; diff --git a/MonitorControl/UI/tr.lproj/Main.strings b/MonitorControl/UI/tr.lproj/Main.strings index 500f6ac..ad5841c 100644 --- a/MonitorControl/UI/tr.lproj/Main.strings +++ b/MonitorControl/UI/tr.lproj/Main.strings @@ -13,18 +13,12 @@ /* Class = "NSTextFieldCell"; title = "DDC min"; ObjectID = "1zE-fg-xEm"; */ "1zE-fg-xEm.title" = "DDC min"; -/* Class = "NSBox"; title = "Box"; ObjectID = "3a3-In-jeQ"; */ -"3a3-In-jeQ.title" = "Box"; - /* Class = "NSMenuItem"; title = "Show separate controls for each display in menu"; ObjectID = "3eO-bN-ZRl"; */ "3eO-bN-ZRl.title" = "Menüdeki her ekran için ayrı kontroller göster"; /* Class = "NSMenuItem"; title = "Apply last saved values to the display"; ObjectID = "3Jr-bW-YYq"; */ "3Jr-bW-YYq.title" = "Ekrana son kaydedilen değerleri uygula"; -/* Class = "NSButtonCell"; title = "https://monitorcontrol.app"; ObjectID = "42n-Zy-AqF"; */ -"42n-Zy-AqF.title" = "https://monitorcontrol.app"; - /* Class = "NSMenuItem"; title = "Custom keyboard shortcuts"; ObjectID = "4CG-0I-anB"; */ "4CG-0I-anB.title" = "Özel klavye kısayolu"; @@ -73,8 +67,8 @@ /* Class = "NSTextFieldCell"; title = "Brightness:"; ObjectID = "Bhb-6l-uPQ"; */ "Bhb-6l-uPQ.title" = "Parlaklık:"; -/* Class = "NSTextFieldCell"; title = "(Gamma->DDC)"; ObjectID = "Bid-UL-blc"; */ -"Bid-UL-blc.title" = "(Gama->DDC)"; +/* Class = "NSTextFieldCell"; title = "(Software->DDC)"; ObjectID = "Bid-UL-blc"; */ +"Bid-UL-blc.title" = "(Yazılım->DDC)"; /* Class = "NSTextFieldCell"; title = "For hardware (DDC) controlled displays only. Results may vary."; ObjectID = "bIe-6O-xEH"; */ "bIe-6O-xEH.title" = "Yalnızca donanım (DDC) kontrollü ekranlar için. Sonuçlar değişebilir."; diff --git a/MonitorControl/UI/zh-Hans.lproj/Localizable.strings b/MonitorControl/UI/zh-Hans.lproj/Localizable.strings index 62ebfeb..1b159bc 100644 --- a/MonitorControl/UI/zh-Hans.lproj/Localizable.strings +++ b/MonitorControl/UI/zh-Hans.lproj/Localizable.strings @@ -23,7 +23,7 @@ "Built-in Display" = "内置显示器"; /* Shown in menu */ -"Check for updates..." = "检查更新..."; +"Check for updates…" = "检查更新…"; /* Shown in menu */ "Contrast" = "对比度"; @@ -86,7 +86,7 @@ "Preferences for an incompatible previous app version detected. Default preferences are reloaded." = "监测到不兼容的旧版本设置。已重新加载默认设置。"; /* Shown in menu */ -"Preferences..." = "设置..."; +"Preferences…" = "设置…"; /* Shown in menu */ "Quit" = "关闭"; diff --git a/MonitorControl/UI/zh-Hans.lproj/Main.strings b/MonitorControl/UI/zh-Hans.lproj/Main.strings index 565e871..58457e6 100644 --- a/MonitorControl/UI/zh-Hans.lproj/Main.strings +++ b/MonitorControl/UI/zh-Hans.lproj/Main.strings @@ -13,18 +13,12 @@ /* Class = "NSTextFieldCell"; title = "DDC min"; ObjectID = "1zE-fg-xEm"; */ "1zE-fg-xEm.title" = "DDC最小值"; -/* Class = "NSBox"; title = "Box"; ObjectID = "3a3-In-jeQ"; */ -"3a3-In-jeQ.title" = "Box"; - /* Class = "NSMenuItem"; title = "Show separate controls for each display in menu"; ObjectID = "3eO-bN-ZRl"; */ "3eO-bN-ZRl.title" = "显示各个显示器的控制滑杆"; /* Class = "NSMenuItem"; title = "Apply last saved values to the display"; ObjectID = "3Jr-bW-YYq"; */ "3Jr-bW-YYq.title" = "使用上次储存的设置值至显示器"; -/* Class = "NSButtonCell"; title = "https://monitorcontrol.app"; ObjectID = "42n-Zy-AqF"; */ -"42n-Zy-AqF.title" = "https://monitorcontrol.app"; - /* Class = "NSMenuItem"; title = "Custom keyboard shortcuts"; ObjectID = "4CG-0I-anB"; */ "4CG-0I-anB.title" = "自定义快捷键"; @@ -73,8 +67,8 @@ /* Class = "NSTextFieldCell"; title = "Brightness:"; ObjectID = "Bhb-6l-uPQ"; */ "Bhb-6l-uPQ.title" = "亮度："; -/* Class = "NSTextFieldCell"; title = "(Gamma->DDC)"; ObjectID = "Bid-UL-blc"; */ -"Bid-UL-blc.title" = "(伽马值->DDC)"; +/* Class = "NSTextFieldCell"; title = "(Software->DDC)"; ObjectID = "Bid-UL-blc"; */ +"Bid-UL-blc.title" = "(软件->DDC)"; /* Class = "NSTextFieldCell"; title = "For hardware (DDC) controlled displays only. Results may vary."; ObjectID = "bIe-6O-xEH"; */ "bIe-6O-xEH.title" = "仅适用于以硬件（DDC）控制的显示器。结果可能会有差异。"; diff --git a/MonitorControl/UI/zh-Hant-TW.lproj/Localizable.strings b/MonitorControl/UI/zh-Hant-TW.lproj/Localizable.strings index 9f5b4de..ce7ef5c 100644 --- a/MonitorControl/UI/zh-Hant-TW.lproj/Localizable.strings +++ b/MonitorControl/UI/zh-Hant-TW.lproj/Localizable.strings @@ -23,7 +23,7 @@ "Built-in Display" = "內建螢幕"; /* Shown in menu */ -"Check for updates..." = "檢查更新..."; +"Check for updates…" = "檢查更新…"; /* Shown in menu */ "Contrast" = "對比度"; @@ -86,7 +86,7 @@ "Preferences for an incompatible previous app version detected. Default preferences are reloaded." = "偵測到不相容的先前應用程式版本的設定。原始設定已套用。"; /* Shown in menu */ -"Preferences..." = "設定..."; +"Preferences…" = "設定…"; /* Shown in menu */ "Quit" = "離開"; diff --git a/MonitorControl/UI/zh-Hant-TW.lproj/Main.strings b/MonitorControl/UI/zh-Hant-TW.lproj/Main.strings index e43f690..1ab1487 100644 --- a/MonitorControl/UI/zh-Hant-TW.lproj/Main.strings +++ b/MonitorControl/UI/zh-Hant-TW.lproj/Main.strings @@ -13,18 +13,12 @@ /* Class = "NSTextFieldCell"; title = "DDC min"; ObjectID = "1zE-fg-xEm"; */ "1zE-fg-xEm.title" = "DDC最小值"; -/* Class = "NSBox"; title = "Box"; ObjectID = "3a3-In-jeQ"; */ -"3a3-In-jeQ.title" = "Box"; - /* Class = "NSMenuItem"; title = "Show separate controls for each display in menu"; ObjectID = "3eO-bN-ZRl"; */ "3eO-bN-ZRl.title" = "顯示各個螢幕的控制滑桿"; /* Class = "NSMenuItem"; title = "Apply last saved values to the display"; ObjectID = "3Jr-bW-YYq"; */ "3Jr-bW-YYq.title" = "套用上次儲存的設定值至螢幕"; -/* Class = "NSButtonCell"; title = "https://monitorcontrol.app"; ObjectID = "42n-Zy-AqF"; */ -"42n-Zy-AqF.title" = "https://monitorcontrol.app"; - /* Class = "NSMenuItem"; title = "Custom keyboard shortcuts"; ObjectID = "4CG-0I-anB"; */ "4CG-0I-anB.title" = "自定義快捷鍵"; @@ -73,8 +67,8 @@ /* Class = "NSTextFieldCell"; title = "Brightness:"; ObjectID = "Bhb-6l-uPQ"; */ "Bhb-6l-uPQ.title" = "亮度："; -/* Class = "NSTextFieldCell"; title = "(Gamma->DDC)"; ObjectID = "Bid-UL-blc"; */ -"Bid-UL-blc.title" = "(伽碼值->DDC)"; +/* Class = "NSTextFieldCell"; title = "(Software->DDC)"; ObjectID = "Bid-UL-blc"; */ +"Bid-UL-blc.title" = "(軟體->DDC)"; /* Class = "NSTextFieldCell"; title = "For hardware (DDC) controlled displays only. Results may vary."; ObjectID = "bIe-6O-xEH"; */ "bIe-6O-xEH.title" = "僅適用於以硬體（DDC）控制的螢幕。結果可能會有異。"; diff --git a/MonitorControl/View Controllers/DisplaysPrefsCellView.swift b/MonitorControl/View Controllers/DisplaysPrefsCellView.swift index 1658f0f..7bc4e8d 100644 --- a/MonitorControl/View Controllers/DisplaysPrefsCellView.swift +++ b/MonitorControl/View Controllers/DisplaysPrefsCellView.swift @@ -244,7 +244,7 @@ class DisplaysPrefsCellView: NSTableCellView { @IBAction func unavailableDDC(_ sender: NSButton) { let command = self.tagCommand(sender.tag) let prefKey = PrefKey.unavailableDDC - if let display = display as? OtherDisplay { + if let display = display { switch sender.state { case .on: display.savePref(false, key: prefKey, for: command) @@ -255,8 +255,8 @@ class DisplaysPrefsCellView: NSTableCellView { } _ = display.setDirectBrightness(1) _ = display.setSwBrightness(1) - app.configure() } + app.configure() } @IBAction func minDDCOverride(_ sender: NSTextField) { @@ -360,24 +360,17 @@ class DisplaysPrefsCellView: NSTableCellView { self.ddcButtonToggled(self.ddcButton) self.avoidGamma.state = .off self.ddcButtonToggled(self.avoidGamma) - self.enabledButton.state = .on - self.enabledButtonToggled(self.enabledButton) self.disableVolumeOSDButton.state = .off self.disableVolumeOSDButton(self.disableVolumeOSDButton) self.pollingModeMenu.selectItem(withTag: 2) self.pollingModeValueChanged(self.pollingModeMenu) self.longerDelayButton.state = .off self.longerDelayButtonToggled(self.longerDelayButton) - self.enableMuteButton.state = .off - self.enableMuteButtonToggled(self.enableMuteButton) - self.friendlyName.stringValue = disp.name - self.friendlyNameValueChanged(self.friendlyName) self.combinedBrightnessSwitchingPoint.intValue = 0 self.combinedBrightnessSwitchingPoint(self.combinedBrightnessSwitchingPoint) self.audioDeviceNameOverride.stringValue = "" self.audioDeviceNameOverride(self.audioDeviceNameOverride) - self.unavailableDDCBrightness.state = .on self.unavailableDDCVolume.state = .on self.unavailableDDCContrast.state = .on @@ -401,9 +394,6 @@ class DisplaysPrefsCellView: NSTableCellView { self.remapDDCVolume.stringValue = "" self.remapDDCContrast.stringValue = "" - self.unavailableDDC(self.unavailableDDCBrightness) - - self.unavailableDDC(self.unavailableDDCBrightness) self.unavailableDDC(self.unavailableDDCVolume) self.unavailableDDC(self.unavailableDDCContrast) @@ -427,6 +417,12 @@ class DisplaysPrefsCellView: NSTableCellView { self.remapDDC(self.remapDDCVolume) self.remapDDC(self.remapDDCContrast) } + self.unavailableDDCBrightness.state = .on + self.unavailableDDC(self.unavailableDDCBrightness) + self.friendlyName.stringValue = disp.name + self.friendlyNameValueChanged(self.friendlyName) + self.enabledButton.state = .on + self.enabledButtonToggled(self.enabledButton) } } } diff --git a/MonitorControl/View Controllers/DisplaysPrefsViewController.swift b/MonitorControl/View Controllers/DisplaysPrefsViewController.swift index 8a2e979..67909de 100644 --- a/MonitorControl/View Controllers/DisplaysPrefsViewController.swift +++ b/MonitorControl/View Controllers/DisplaysPrefsViewController.swift @@ -186,6 +186,7 @@ class DisplaysPrefsViewController: NSViewController, PreferencePane, NSTableView cell.disableVolumeOSDButton.isEnabled = false } // Advanced settings + cell.unavailableDDCBrightness.state = !display.readPrefAsBool(key: .unavailableDDC, for: .brightness) ? .on : .off if let otherDisplay = display as? OtherDisplay, !otherDisplay.isSwOnly() { cell.pollingModeMenu.isEnabled = true cell.pollingModeMenu.selectItem(withTag: otherDisplay.readPrefAsInt(key: .pollingMode)) @@ -207,10 +208,8 @@ class DisplaysPrefsViewController: NSViewController, PreferencePane, NSTableView cell.audioDeviceNameOverride.stringValue = otherDisplay.readPrefAsString(key: .audioDeviceNameOverride) cell.updateWithCurrentAudioName.isEnabled = true - cell.unavailableDDCBrightness.isEnabled = true cell.unavailableDDCVolume.isEnabled = true cell.unavailableDDCContrast.isEnabled = true - cell.unavailableDDCBrightness.state = !otherDisplay.readPrefAsBool(key: .unavailableDDC, for: .brightness) ? .on : .off cell.unavailableDDCVolume.state = !otherDisplay.readPrefAsBool(key: .unavailableDDC, for: .audioSpeakerVolume) ? .on : .off cell.unavailableDDCContrast.state = !otherDisplay.readPrefAsBool(key: .unavailableDDC, for: .contrast) ? .on : .off @@ -265,10 +264,8 @@ class DisplaysPrefsViewController: NSViewController, PreferencePane, NSTableView cell.audioDeviceNameOverride.stringValue = "" cell.updateWithCurrentAudioName.isEnabled = false - cell.unavailableDDCBrightness.state = .off cell.unavailableDDCVolume.state = .off cell.unavailableDDCContrast.state = .off - cell.unavailableDDCBrightness.isEnabled = false cell.unavailableDDCVolume.isEnabled = false cell.unavailableDDCContrast.isEnabled = false diff --git a/MonitorControlHelper/Info.plist b/MonitorControlHelper/Info.plist index b52b1b9..2b798d7 100644 --- a/MonitorControlHelper/Info.plist +++ b/MonitorControlHelper/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString $(MARKETING_VERSION) CFBundleVersion - 6795 + 6828 LSApplicationCategoryType public.app-category.utilities LSBackgroundOnly