diff --git a/.github/screenshot.png b/.github/screenshot.png index 700cefd..f7e7e89 100644 Binary files a/.github/screenshot.png and b/.github/screenshot.png differ diff --git a/MonitorControl/Info.plist b/MonitorControl/Info.plist index 7a84176..71dd76b 100644 --- a/MonitorControl/Info.plist +++ b/MonitorControl/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString $(MARKETING_VERSION) CFBundleVersion - 6581 + 6632 LSApplicationCategoryType public.app-category.utilities LSMinimumSystemVersion diff --git a/MonitorControl/Model/Display.swift b/MonitorControl/Model/Display.swift index e1d7659..7831e6f 100644 --- a/MonitorControl/Model/Display.swift +++ b/MonitorControl/Model/Display.swift @@ -13,6 +13,7 @@ class Display: Equatable { internal var smoothBrightnessTransient: Float = 1 internal var smoothBrightnessRunning: Bool = false internal var smoothBrightnessSlow: Bool = false + let swBrightnessSemaphore = DispatchSemaphore(value: 1) static func == (lhs: Display, rhs: Display) -> Bool { return lhs.identifier == rhs.identifier @@ -199,8 +200,8 @@ class Display: Equatable { } } - let swBrightnessSemaphore = DispatchSemaphore(value: 1) func setSwBrightness(_ value: Float, smooth: Bool = false) -> Bool { + self.swBrightnessSemaphore.wait() let brightnessValue = min(1, value) var currentValue = self.readPrefAsFloat(key: .SwBrightness) self.savePref(brightnessValue, key: .SwBrightness) @@ -209,9 +210,9 @@ class Display: Equatable { newValue = self.swBrightnessTransform(value: newValue) if smooth { DispatchQueue.global(qos: .userInteractive).async { - self.swBrightnessSemaphore.wait() for transientValue in stride(from: currentValue, to: newValue, by: 0.005 * (currentValue > newValue ? -1 : 1)) { guard app.reconfigureID == 0 else { + self.swBrightnessSemaphore.signal() return } if self.isVirtual || self.readPrefAsBool(key: .avoidGamma) { @@ -224,10 +225,10 @@ class Display: Equatable { } Thread.sleep(forTimeInterval: 0.001) // Let's make things quick if not performed in the background } - self.swBrightnessSemaphore.signal() } } else { if self.isVirtual || self.readPrefAsBool(key: .avoidGamma) { + self.swBrightnessSemaphore.signal() return DisplayManager.shared.setShadeAlpha(value: 1 - newValue, displayID: self.identifier) } else { let gammaTableRed = self.defaultGammaTableRed.map { $0 * newValue } @@ -238,28 +239,64 @@ class Display: Equatable { DisplayManager.shared.enforceGammaActivity() } } + self.swBrightnessSemaphore.signal() return true } func getSwBrightness() -> Float { + self.swBrightnessSemaphore.wait() if self.isVirtual || self.readPrefAsBool(key: .avoidGamma) { let rawBrightnessValue = 1 - (DisplayManager.shared.getShadeAlpha(displayID: self.identifier) ?? 1) + self.swBrightnessSemaphore.signal() return self.swBrightnessTransform(value: rawBrightnessValue, reverse: true) } var gammaTableRed = [CGGammaValue](repeating: 0, count: 256) var gammaTableGreen = [CGGammaValue](repeating: 0, count: 256) var gammaTableBlue = [CGGammaValue](repeating: 0, count: 256) var gammaTableSampleCount: UInt32 = 0 + var brightnessValue: Float = 1 if CGGetDisplayTransferByTable(self.identifier, 256, &gammaTableRed, &gammaTableGreen, &gammaTableBlue, &gammaTableSampleCount) == CGError.success { let redPeak = gammaTableRed.max() ?? 0 let greenPeak = gammaTableGreen.max() ?? 0 let bluePeak = gammaTableBlue.max() ?? 0 let gammaTablePeak = max(redPeak, greenPeak, bluePeak) let peakRatio = gammaTablePeak / self.defaultGammaTablePeak - let brightnessValue = round(self.swBrightnessTransform(value: peakRatio, reverse: true) * 256) / 256 - return brightnessValue + brightnessValue = round(self.swBrightnessTransform(value: peakRatio, reverse: true) * 256) / 256 + } + self.swBrightnessSemaphore.signal() + return brightnessValue + } + + func checkGammaInterference() { + let currentSwBrightness = self.getSwBrightness() + guard !DisplayManager.shared.gammaInterferenceWarningShown, !(prefs.bool(forKey: PrefKey.disableSoftwareFallback.rawValue) && 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 { + return + } + DisplayManager.shared.gammaInterferenceCounter += 1 + _ = self.setSwBrightness(1) + os_log("Gamma table interference detected, number of events: %{public}@", type: .debug, String(DisplayManager.shared.gammaInterferenceCounter)) + if DisplayManager.shared.gammaInterferenceCounter >= 3 { + DisplayManager.shared.gammaInterferenceWarningShown = true + let alert = NSAlert() + alert.messageText = NSLocalizedString("Is f.lux or similar running?", comment: "Shown in the alert dialog") + alert.informativeText = NSLocalizedString("An other app seems to change the brightness or colors which causes issues.\n\nTo solve this, you need to quit the other app or disable gamma control for your displays in MonitorControl!", comment: "Shown in the alert dialog") + alert.addButton(withTitle: NSLocalizedString("I'll quit the other app", comment: "Shown in the alert dialog")) + alert.addButton(withTitle: NSLocalizedString("Disable gamma control for my displays", comment: "Shown in the alert dialog")) + alert.alertStyle = NSAlert.Style.critical + if alert.runModal() != .alertFirstButtonReturn { + for otherDisplay in DisplayManager.shared.getOtherDisplays() { + _ = otherDisplay.setSwBrightness(1) + _ = otherDisplay.setDirectBrightness(1) + otherDisplay.savePref(true, key: .avoidGamma) + _ = otherDisplay.setSwBrightness(1) + DisplayManager.shared.gammaInterferenceWarningShown = false + DisplayManager.shared.gammaInterferenceCounter = 0 + displaysPrefsVc?.loadDisplayList() + } + } else { + os_log("We won't watch for gamma table interference anymore", type: .debug) + } } - return 1 } func resetSwBrightness() -> Bool { diff --git a/MonitorControl/Model/OtherDisplay.swift b/MonitorControl/Model/OtherDisplay.swift index 7aef81d..3f7b0b3 100644 --- a/MonitorControl/Model/OtherDisplay.swift +++ b/MonitorControl/Model/OtherDisplay.swift @@ -327,6 +327,11 @@ class OtherDisplay: Display { } } + override func setBrightness(_ to: Float = -1, slow: Bool = false) -> Bool { + self.checkGammaInterference() + return super.setBrightness(to, slow: slow) + } + override func setDirectBrightness(_ to: Float, transient: Bool = false) -> Bool { let value = max(min(to, 1), 0) if !self.isSw() { @@ -341,7 +346,9 @@ class OtherDisplay: Display { brightnessSwValue = (value / self.combinedBrightnessSwitchingValue()) } _ = self.writeDDCValues(command: .brightness, value: self.convValueToDDC(for: .brightness, from: brightnessValue)) - _ = self.setSwBrightness(brightnessSwValue) + if self.readPrefAsFloat(key: .SwBrightness) != brightnessSwValue { + _ = self.setSwBrightness(brightnessSwValue) + } } else { _ = self.writeDDCValues(command: .brightness, value: self.convValueToDDC(for: .brightness, from: value)) } diff --git a/MonitorControl/Support/AppDelegate.swift b/MonitorControl/Support/AppDelegate.swift index fcb8665..e007d6a 100644 --- a/MonitorControl/Support/AppDelegate.swift +++ b/MonitorControl/Support/AppDelegate.swift @@ -131,6 +131,7 @@ class AppDelegate: NSObject, NSApplicationDelegate { } os_log("Request for configuration with reconfigreID %{public}@", type: .info, String(dispatchedReconfigureID)) self.reconfigureID = 0 + DisplayManager.shared.gammaInterferenceCounter = 0 DisplayManager.shared.configureDisplays() DisplayManager.shared.addDisplayCounterSuffixes() DisplayManager.shared.updateArm64AVServices() diff --git a/MonitorControl/Support/DisplayManager.swift b/MonitorControl/Support/DisplayManager.swift index b1edfb6..1fd6a94 100644 --- a/MonitorControl/Support/DisplayManager.swift +++ b/MonitorControl/Support/DisplayManager.swift @@ -11,6 +11,8 @@ class DisplayManager { var audioControlTargetDisplays: [OtherDisplay] = [] let ddcQueue = DispatchQueue(label: "DDC queue") let gammaActivityEnforcer = NSWindow(contentRect: .init(origin: NSPoint(x: 0, y: 0), size: .init(width: DEBUG_GAMMA_ENFORCER ? 15 : 1, height: DEBUG_GAMMA_ENFORCER ? 15 : 1)), styleMask: [], backing: .buffered, defer: false) + var gammaInterferenceCounter = 0 + var gammaInterferenceWarningShown = false func createGammaActivityEnforcer() { self.gammaActivityEnforcer.title = "Monior Control Gamma Activity Enforcer" diff --git a/MonitorControl/UI/de.lproj/Localizable.strings b/MonitorControl/UI/de.lproj/Localizable.strings index 307e2f1..86438ab 100644 --- a/MonitorControl/UI/de.lproj/Localizable.strings +++ b/MonitorControl/UI/de.lproj/Localizable.strings @@ -1,6 +1,9 @@ /* Shown in the main prefs window */ "About" = "Über"; +/* Shown in the alert dialog */ +"An other app seems to change the brightness or colors which causes issues.\n\nTo solve this, you need to quit the other app or disable gamma control for your displays in MonitorControl!" = "An other app seems to change the brightness or colors which causes issues.\n\nTo solve this, you need to quit the other app or disable gamma control for your displays in MonitorControl!"; + /* Shown in the main prefs window */ "App menu" = "App Menü"; @@ -34,6 +37,9 @@ /* Shown in record shortcut box */ "Decrease" = "Verringern"; +/* Shown in the alert dialog */ +"Disable gamma control for my displays" = "Disable gamma control for my displays"; + /* Shown in the main prefs window */ "Displays" = "Monitore"; @@ -52,6 +58,9 @@ /* Shown in the Display Preferences */ "Hardware (DDC)" = "Hardware (DDC)"; +/* Shown in the alert dialog */ +"I'll quit the other app" = "I'll quit the other app"; + /* Shown in the alert dialog */ "Incompatible previous version" = "Inkompatible Vorgängerversion"; @@ -61,6 +70,9 @@ /* Intel designation (shown after the version number in Preferences) */ "Intel" = "Intel"; +/* Shown in the alert dialog */ +"Is f.lux or similar running?" = "Is f.lux or similar running?"; + /* Shown in the main prefs window */ "Keyboard" = "Tastatur"; diff --git a/MonitorControl/UI/en.lproj/Localizable.strings b/MonitorControl/UI/en.lproj/Localizable.strings index 737e322..9884bfd 100644 --- a/MonitorControl/UI/en.lproj/Localizable.strings +++ b/MonitorControl/UI/en.lproj/Localizable.strings @@ -1,6 +1,9 @@ /* Shown in the main prefs window */ "About" = "About"; +/* Shown in the alert dialog */ +"An other app seems to change the brightness or colors which causes issues.\n\nTo solve this, you need to quit the other app or disable gamma control for your displays in MonitorControl!" = "An other app seems to change the brightness or colors which causes issues.\n\nTo solve this, you need to quit the other app or disable gamma control for your displays in MonitorControl!"; + /* Shown in the main prefs window */ "App menu" = "App menu"; @@ -34,6 +37,9 @@ /* Shown in record shortcut box */ "Decrease" = "Decrease"; +/* Shown in the alert dialog */ +"Disable gamma control for my displays" = "Disable gamma control for my displays"; + /* Shown in the main prefs window */ "Displays" = "Displays"; @@ -52,6 +58,9 @@ /* Shown in the Display Preferences */ "Hardware (DDC)" = "Hardware (DDC)"; +/* Shown in the alert dialog */ +"I'll quit the other app" = "I'll quit the other app"; + /* Shown in the alert dialog */ "Incompatible previous version" = "Incompatible previous version"; @@ -61,6 +70,9 @@ /* Intel designation (shown after the version number in Preferences) */ "Intel" = "Intel"; +/* Shown in the alert dialog */ +"Is f.lux or similar running?" = "Is f.lux or similar running?"; + /* Shown in the main prefs window */ "Keyboard" = "Keyboard"; diff --git a/MonitorControl/UI/es-419.lproj/Localizable.strings b/MonitorControl/UI/es-419.lproj/Localizable.strings index c8356ec..5a9868f 100644 --- a/MonitorControl/UI/es-419.lproj/Localizable.strings +++ b/MonitorControl/UI/es-419.lproj/Localizable.strings @@ -1,6 +1,9 @@ /* Shown in the main prefs window */ "About" = "Acerca de"; +/* Shown in the alert dialog */ +"An other app seems to change the brightness or colors which causes issues.\n\nTo solve this, you need to quit the other app or disable gamma control for your displays in MonitorControl!" = "An other app seems to change the brightness or colors which causes issues.\n\nTo solve this, you need to quit the other app or disable gamma control for your displays in MonitorControl!"; + /* Shown in the main prefs window */ "App menu" = "App menu"; @@ -34,6 +37,9 @@ /* Shown in record shortcut box */ "Decrease" = "Decrease"; +/* Shown in the alert dialog */ +"Disable gamma control for my displays" = "Disable gamma control for my displays"; + /* Shown in the main prefs window */ "Displays" = "Pantallas"; @@ -52,6 +58,9 @@ /* Shown in the Display Preferences */ "Hardware (DDC)" = "Hardware (DDC)"; +/* Shown in the alert dialog */ +"I'll quit the other app" = "I'll quit the other app"; + /* Shown in the alert dialog */ "Incompatible previous version" = "Incompatible previous version"; @@ -61,6 +70,9 @@ /* Intel designation (shown after the version number in Preferences) */ "Intel" = "Intel"; +/* Shown in the alert dialog */ +"Is f.lux or similar running?" = "Is f.lux or similar running?"; + /* Shown in the main prefs window */ "Keyboard" = "Keyboard"; diff --git a/MonitorControl/UI/fr.lproj/Localizable.strings b/MonitorControl/UI/fr.lproj/Localizable.strings index 253c572..5d69dc0 100644 --- a/MonitorControl/UI/fr.lproj/Localizable.strings +++ b/MonitorControl/UI/fr.lproj/Localizable.strings @@ -1,6 +1,9 @@ /* Shown in the main prefs window */ "About" = "À Propos"; +/* Shown in the alert dialog */ +"An other app seems to change the brightness or colors which causes issues.\n\nTo solve this, you need to quit the other app or disable gamma control for your displays in MonitorControl!" = "An other app seems to change the brightness or colors which causes issues.\n\nTo solve this, you need to quit the other app or disable gamma control for your displays in MonitorControl!"; + /* Shown in the main prefs window */ "App menu" = "Menu de l'app"; @@ -34,6 +37,9 @@ /* Shown in record shortcut box */ "Decrease" = "Diminuer"; +/* Shown in the alert dialog */ +"Disable gamma control for my displays" = "Disable gamma control for my displays"; + /* Shown in the main prefs window */ "Displays" = "Écrans"; @@ -52,6 +58,9 @@ /* 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"; + /* Shown in the alert dialog */ "Incompatible previous version" = "Version précédente incompatible"; @@ -61,6 +70,9 @@ /* Intel designation (shown after the version number in Preferences) */ "Intel" = "Intel"; +/* Shown in the alert dialog */ +"Is f.lux or similar running?" = "Is f.lux or similar running?"; + /* Shown in the main prefs window */ "Keyboard" = "Clavier"; diff --git a/MonitorControl/UI/hu.lproj/Localizable.strings b/MonitorControl/UI/hu.lproj/Localizable.strings index db5cc28..28d8a21 100644 --- a/MonitorControl/UI/hu.lproj/Localizable.strings +++ b/MonitorControl/UI/hu.lproj/Localizable.strings @@ -1,6 +1,9 @@ /* Shown in the main prefs window */ "About" = "Névjegy"; +/* Shown in the alert dialog */ +"An other app seems to change the brightness or colors which causes issues.\n\nTo solve this, you need to quit the other app or disable gamma control for your displays in MonitorControl!" = "An other app seems to change the brightness or colors which causes issues.\n\nTo solve this, you need to quit the other app or disable gamma control for your displays in MonitorControl!"; + /* Shown in the main prefs window */ "App menu" = "Menü"; @@ -34,6 +37,9 @@ /* Shown in record shortcut box */ "Decrease" = "Csökkentés"; +/* Shown in the alert dialog */ +"Disable gamma control for my displays" = "Disable gamma control for my displays"; + /* Shown in the main prefs window */ "Displays" = "Kijelzők"; @@ -52,6 +58,9 @@ /* Shown in the Display Preferences */ "Hardware (DDC)" = "Hardver (DDC)"; +/* Shown in the alert dialog */ +"I'll quit the other app" = "I'll quit the other app"; + /* Shown in the alert dialog */ "Incompatible previous version" = "Inkompatibilis előző verzió"; @@ -61,6 +70,9 @@ /* Intel designation (shown after the version number in Preferences) */ "Intel" = "Intel"; +/* Shown in the alert dialog */ +"Is f.lux or similar running?" = "Is f.lux or similar running?"; + /* Shown in the main prefs window */ "Keyboard" = "Billentyűzet"; diff --git a/MonitorControl/UI/it.lproj/Localizable.strings b/MonitorControl/UI/it.lproj/Localizable.strings index 8cb3695..a50a3fb 100644 --- a/MonitorControl/UI/it.lproj/Localizable.strings +++ b/MonitorControl/UI/it.lproj/Localizable.strings @@ -1,6 +1,9 @@ /* Shown in the main prefs window */ "About" = "Informazioni"; +/* Shown in the alert dialog */ +"An other app seems to change the brightness or colors which causes issues.\n\nTo solve this, you need to quit the other app or disable gamma control for your displays in MonitorControl!" = "An other app seems to change the brightness or colors which causes issues.\n\nTo solve this, you need to quit the other app or disable gamma control for your displays in MonitorControl!"; + /* Shown in the main prefs window */ "App menu" = "App menu"; @@ -34,6 +37,9 @@ /* Shown in record shortcut box */ "Decrease" = "Diminiusci"; +/* Shown in the alert dialog */ +"Disable gamma control for my displays" = "Disable gamma control for my displays"; + /* Shown in the main prefs window */ "Displays" = "Monitor"; @@ -52,6 +58,9 @@ /* Shown in the Display Preferences */ "Hardware (DDC)" = "Hardware (DDC)"; +/* Shown in the alert dialog */ +"I'll quit the other app" = "I'll quit the other app"; + /* Shown in the alert dialog */ "Incompatible previous version" = "Versione precedente incompatibile"; @@ -61,6 +70,9 @@ /* Intel designation (shown after the version number in Preferences) */ "Intel" = "Intel"; +/* Shown in the alert dialog */ +"Is f.lux or similar running?" = "Is f.lux or similar running?"; + /* Shown in the main prefs window */ "Keyboard" = "Tastiera"; diff --git a/MonitorControl/UI/ja.lproj/Localizable.strings b/MonitorControl/UI/ja.lproj/Localizable.strings index 4c5a996..f63ab55 100644 --- a/MonitorControl/UI/ja.lproj/Localizable.strings +++ b/MonitorControl/UI/ja.lproj/Localizable.strings @@ -1,6 +1,9 @@ /* Shown in the main prefs window */ "About" = "About"; +/* Shown in the alert dialog */ +"An other app seems to change the brightness or colors which causes issues.\n\nTo solve this, you need to quit the other app or disable gamma control for your displays in MonitorControl!" = "An other app seems to change the brightness or colors which causes issues.\n\nTo solve this, you need to quit the other app or disable gamma control for your displays in MonitorControl!"; + /* Shown in the main prefs window */ "App menu" = "App menu"; @@ -34,6 +37,9 @@ /* Shown in record shortcut box */ "Decrease" = "Decrease"; +/* Shown in the alert dialog */ +"Disable gamma control for my displays" = "Disable gamma control for my displays"; + /* Shown in the main prefs window */ "Displays" = "画面"; @@ -52,6 +58,9 @@ /* Shown in the Display Preferences */ "Hardware (DDC)" = "Hardware (DDC)"; +/* Shown in the alert dialog */ +"I'll quit the other app" = "I'll quit the other app"; + /* Shown in the alert dialog */ "Incompatible previous version" = "Incompatible previous version"; @@ -61,6 +70,9 @@ /* Intel designation (shown after the version number in Preferences) */ "Intel" = "Intel"; +/* Shown in the alert dialog */ +"Is f.lux or similar running?" = "Is f.lux or similar running?"; + /* Shown in the main prefs window */ "Keyboard" = "Keyboard"; diff --git a/MonitorControl/UI/ko.lproj/Localizable.strings b/MonitorControl/UI/ko.lproj/Localizable.strings index b55a445..66009ba 100644 --- a/MonitorControl/UI/ko.lproj/Localizable.strings +++ b/MonitorControl/UI/ko.lproj/Localizable.strings @@ -1,6 +1,9 @@ /* Shown in the main prefs window */ "About" = "정보"; +/* Shown in the alert dialog */ +"An other app seems to change the brightness or colors which causes issues.\n\nTo solve this, you need to quit the other app or disable gamma control for your displays in MonitorControl!" = "An other app seems to change the brightness or colors which causes issues.\n\nTo solve this, you need to quit the other app or disable gamma control for your displays in MonitorControl!"; + /* Shown in the main prefs window */ "App menu" = "앱 메뉴"; @@ -34,6 +37,9 @@ /* Shown in record shortcut box */ "Decrease" = "감소"; +/* Shown in the alert dialog */ +"Disable gamma control for my displays" = "Disable gamma control for my displays"; + /* Shown in the main prefs window */ "Displays" = "디스플레이"; @@ -52,6 +58,9 @@ /* Shown in the Display Preferences */ "Hardware (DDC)" = "하드웨어 (DDC)"; +/* Shown in the alert dialog */ +"I'll quit the other app" = "I'll quit the other app"; + /* Shown in the alert dialog */ "Incompatible previous version" = "호환되지 않는 이전 버전"; @@ -61,6 +70,9 @@ /* Intel designation (shown after the version number in Preferences) */ "Intel" = "Intel"; +/* Shown in the alert dialog */ +"Is f.lux or similar running?" = "Is f.lux or similar running?"; + /* Shown in the main prefs window */ "Keyboard" = "키보드"; diff --git a/MonitorControl/UI/nl.lproj/Localizable.strings b/MonitorControl/UI/nl.lproj/Localizable.strings index 03a1a70..2e3b87e 100644 --- a/MonitorControl/UI/nl.lproj/Localizable.strings +++ b/MonitorControl/UI/nl.lproj/Localizable.strings @@ -1,6 +1,9 @@ /* Shown in the main prefs window */ "About" = "Over"; +/* Shown in the alert dialog */ +"An other app seems to change the brightness or colors which causes issues.\n\nTo solve this, you need to quit the other app or disable gamma control for your displays in MonitorControl!" = "An other app seems to change the brightness or colors which causes issues.\n\nTo solve this, you need to quit the other app or disable gamma control for your displays in MonitorControl!"; + /* Shown in the main prefs window */ "App menu" = "App menu"; @@ -34,6 +37,9 @@ /* Shown in record shortcut box */ "Decrease" = "Verminderen"; +/* Shown in the alert dialog */ +"Disable gamma control for my displays" = "Disable gamma control for my displays"; + /* Shown in the main prefs window */ "Displays" = "Schermen"; @@ -52,6 +58,9 @@ /* Shown in the Display Preferences */ "Hardware (DDC)" = "Hardware (DDC)"; +/* Shown in the alert dialog */ +"I'll quit the other app" = "I'll quit the other app"; + /* Shown in the alert dialog */ "Incompatible previous version" = "Incompatibele vorige versie"; @@ -61,6 +70,9 @@ /* Intel designation (shown after the version number in Preferences) */ "Intel" = "Intel"; +/* Shown in the alert dialog */ +"Is f.lux or similar running?" = "Is f.lux or similar running?"; + /* Shown in the main prefs window */ "Keyboard" = "Toetsenbord"; diff --git a/MonitorControl/UI/pl.lproj/Localizable.strings b/MonitorControl/UI/pl.lproj/Localizable.strings index 69cfca9..aad718f 100644 --- a/MonitorControl/UI/pl.lproj/Localizable.strings +++ b/MonitorControl/UI/pl.lproj/Localizable.strings @@ -1,6 +1,9 @@ /* Shown in the main prefs window */ "About" = "Informacje"; +/* Shown in the alert dialog */ +"An other app seems to change the brightness or colors which causes issues.\n\nTo solve this, you need to quit the other app or disable gamma control for your displays in MonitorControl!" = "An other app seems to change the brightness or colors which causes issues.\n\nTo solve this, you need to quit the other app or disable gamma control for your displays in MonitorControl!"; + /* Shown in the main prefs window */ "App menu" = "App menu"; @@ -34,6 +37,9 @@ /* Shown in record shortcut box */ "Decrease" = "Decrease"; +/* Shown in the alert dialog */ +"Disable gamma control for my displays" = "Disable gamma control for my displays"; + /* Shown in the main prefs window */ "Displays" = "Wyświetlacze"; @@ -52,6 +58,9 @@ /* Shown in the Display Preferences */ "Hardware (DDC)" = "Hardware (DDC)"; +/* Shown in the alert dialog */ +"I'll quit the other app" = "I'll quit the other app"; + /* Shown in the alert dialog */ "Incompatible previous version" = "Incompatible previous version"; @@ -61,6 +70,9 @@ /* Intel designation (shown after the version number in Preferences) */ "Intel" = "Intel"; +/* Shown in the alert dialog */ +"Is f.lux or similar running?" = "Is f.lux or similar running?"; + /* Shown in the main prefs window */ "Keyboard" = "Keyboard"; diff --git a/MonitorControl/UI/ru.lproj/Localizable.strings b/MonitorControl/UI/ru.lproj/Localizable.strings index c03a038..1e69aa5 100644 --- a/MonitorControl/UI/ru.lproj/Localizable.strings +++ b/MonitorControl/UI/ru.lproj/Localizable.strings @@ -1,6 +1,9 @@ /* Shown in the main prefs window */ "About" = "О приложении"; +/* Shown in the alert dialog */ +"An other app seems to change the brightness or colors which causes issues.\n\nTo solve this, you need to quit the other app or disable gamma control for your displays in MonitorControl!" = "An other app seems to change the brightness or colors which causes issues.\n\nTo solve this, you need to quit the other app or disable gamma control for your displays in MonitorControl!"; + /* Shown in the main prefs window */ "App menu" = "App menu"; @@ -34,6 +37,9 @@ /* Shown in record shortcut box */ "Decrease" = "Decrease"; +/* Shown in the alert dialog */ +"Disable gamma control for my displays" = "Disable gamma control for my displays"; + /* Shown in the main prefs window */ "Displays" = "Дисплеи"; @@ -52,6 +58,9 @@ /* Shown in the Display Preferences */ "Hardware (DDC)" = "Аппаратно (DDC)"; +/* Shown in the alert dialog */ +"I'll quit the other app" = "I'll quit the other app"; + /* Shown in the alert dialog */ "Incompatible previous version" = "Incompatible previous version"; @@ -61,6 +70,9 @@ /* Intel designation (shown after the version number in Preferences) */ "Intel" = "Intel"; +/* Shown in the alert dialog */ +"Is f.lux or similar running?" = "Is f.lux or similar running?"; + /* Shown in the main prefs window */ "Keyboard" = "Keyboard"; diff --git a/MonitorControl/UI/tr.lproj/Localizable.strings b/MonitorControl/UI/tr.lproj/Localizable.strings index 06e8e57..aa742b6 100644 --- a/MonitorControl/UI/tr.lproj/Localizable.strings +++ b/MonitorControl/UI/tr.lproj/Localizable.strings @@ -1,6 +1,9 @@ /* Shown in the main prefs window */ "About" = "Hakkında"; +/* Shown in the alert dialog */ +"An other app seems to change the brightness or colors which causes issues.\n\nTo solve this, you need to quit the other app or disable gamma control for your displays in MonitorControl!" = "An other app seems to change the brightness or colors which causes issues.\n\nTo solve this, you need to quit the other app or disable gamma control for your displays in MonitorControl!"; + /* Shown in the main prefs window */ "App menu" = "Uygulama Menüsü"; @@ -34,6 +37,9 @@ /* Shown in record shortcut box */ "Decrease" = "Azalt"; +/* Shown in the alert dialog */ +"Disable gamma control for my displays" = "Disable gamma control for my displays"; + /* Shown in the main prefs window */ "Displays" = "Ekranlar"; @@ -52,6 +58,9 @@ /* Shown in the Display Preferences */ "Hardware (DDC)" = "Donanım (DDC)"; +/* Shown in the alert dialog */ +"I'll quit the other app" = "I'll quit the other app"; + /* Shown in the alert dialog */ "Incompatible previous version" = "Uyumsuz önceki versiyon"; @@ -61,6 +70,9 @@ /* Intel designation (shown after the version number in Preferences) */ "Intel" = "Intel"; +/* Shown in the alert dialog */ +"Is f.lux or similar running?" = "Is f.lux or similar running?"; + /* Shown in the main prefs window */ "Keyboard" = "Klavye"; diff --git a/MonitorControl/UI/uk.lproj/Localizable.strings b/MonitorControl/UI/uk.lproj/Localizable.strings index 8927658..3962531 100644 --- a/MonitorControl/UI/uk.lproj/Localizable.strings +++ b/MonitorControl/UI/uk.lproj/Localizable.strings @@ -1,6 +1,9 @@ /* Shown in the main prefs window */ "About" = "About"; +/* Shown in the alert dialog */ +"An other app seems to change the brightness or colors which causes issues.\n\nTo solve this, you need to quit the other app or disable gamma control for your displays in MonitorControl!" = "An other app seems to change the brightness or colors which causes issues.\n\nTo solve this, you need to quit the other app or disable gamma control for your displays in MonitorControl!"; + /* Shown in the main prefs window */ "App menu" = "App menu"; @@ -34,6 +37,9 @@ /* Shown in record shortcut box */ "Decrease" = "Decrease"; +/* Shown in the alert dialog */ +"Disable gamma control for my displays" = "Disable gamma control for my displays"; + /* Shown in the main prefs window */ "Displays" = "Displays"; @@ -52,6 +58,9 @@ /* Shown in the Display Preferences */ "Hardware (DDC)" = "Hardware (DDC)"; +/* Shown in the alert dialog */ +"I'll quit the other app" = "I'll quit the other app"; + /* Shown in the alert dialog */ "Incompatible previous version" = "Incompatible previous version"; @@ -61,6 +70,9 @@ /* Intel designation (shown after the version number in Preferences) */ "Intel" = "Intel"; +/* Shown in the alert dialog */ +"Is f.lux or similar running?" = "Is f.lux or similar running?"; + /* Shown in the main prefs window */ "Keyboard" = "Keyboard"; diff --git a/MonitorControl/UI/zh-Hans.lproj/Localizable.strings b/MonitorControl/UI/zh-Hans.lproj/Localizable.strings index 4a55ce2..bb52571 100644 --- a/MonitorControl/UI/zh-Hans.lproj/Localizable.strings +++ b/MonitorControl/UI/zh-Hans.lproj/Localizable.strings @@ -1,6 +1,9 @@ /* Shown in the main prefs window */ "About" = "关于"; +/* Shown in the alert dialog */ +"An other app seems to change the brightness or colors which causes issues.\n\nTo solve this, you need to quit the other app or disable gamma control for your displays in MonitorControl!" = "An other app seems to change the brightness or colors which causes issues.\n\nTo solve this, you need to quit the other app or disable gamma control for your displays in MonitorControl!"; + /* Shown in the main prefs window */ "App menu" = "App选项"; @@ -34,6 +37,9 @@ /* Shown in record shortcut box */ "Decrease" = "降低"; +/* Shown in the alert dialog */ +"Disable gamma control for my displays" = "Disable gamma control for my displays"; + /* Shown in the main prefs window */ "Displays" = "显示器"; @@ -52,6 +58,9 @@ /* Shown in the Display Preferences */ "Hardware (DDC)" = "硬件(DDC)"; +/* Shown in the alert dialog */ +"I'll quit the other app" = "I'll quit the other app"; + /* Shown in the alert dialog */ "Incompatible previous version" = "不兼容旧版本"; @@ -61,6 +70,9 @@ /* Intel designation (shown after the version number in Preferences) */ "Intel" = "Intel"; +/* Shown in the alert dialog */ +"Is f.lux or similar running?" = "Is f.lux or similar running?"; + /* Shown in the main prefs window */ "Keyboard" = "键盘"; diff --git a/MonitorControl/UI/zh-Hant-TW.lproj/Localizable.strings b/MonitorControl/UI/zh-Hant-TW.lproj/Localizable.strings index 5844b01..5c2f39c 100644 --- a/MonitorControl/UI/zh-Hant-TW.lproj/Localizable.strings +++ b/MonitorControl/UI/zh-Hant-TW.lproj/Localizable.strings @@ -1,6 +1,9 @@ /* Shown in the main prefs window */ "About" = "關於"; +/* Shown in the alert dialog */ +"An other app seems to change the brightness or colors which causes issues.\n\nTo solve this, you need to quit the other app or disable gamma control for your displays in MonitorControl!" = "An other app seems to change the brightness or colors which causes issues.\n\nTo solve this, you need to quit the other app or disable gamma control for your displays in MonitorControl!"; + /* Shown in the main prefs window */ "App menu" = "App選單"; @@ -34,6 +37,9 @@ /* Shown in record shortcut box */ "Decrease" = "減少"; +/* Shown in the alert dialog */ +"Disable gamma control for my displays" = "Disable gamma control for my displays"; + /* Shown in the main prefs window */ "Displays" = "螢幕"; @@ -52,6 +58,9 @@ /* Shown in the Display Preferences */ "Hardware (DDC)" = "硬體(DDC)"; +/* Shown in the alert dialog */ +"I'll quit the other app" = "I'll quit the other app"; + /* Shown in the alert dialog */ "Incompatible previous version" = "與先前版本不相容"; @@ -61,6 +70,9 @@ /* Intel designation (shown after the version number in Preferences) */ "Intel" = "Intel"; +/* Shown in the alert dialog */ +"Is f.lux or similar running?" = "Is f.lux or similar running?"; + /* Shown in the main prefs window */ "Keyboard" = "鍵盤"; diff --git a/MonitorControlHelper/Info.plist b/MonitorControlHelper/Info.plist index b121bd5..0915699 100644 --- a/MonitorControlHelper/Info.plist +++ b/MonitorControlHelper/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString $(MARKETING_VERSION) CFBundleVersion - 6581 + 6632 LSApplicationCategoryType public.app-category.utilities LSBackgroundOnly