Merge branch 'main' into main

AuroraWright · Sep 28, 2024 · 7f299de · 7f299de
2 parents 2f5868d + 9e56f9c
commit 7f299de
Show file tree

Hide file tree

Showing 5 changed files with 64 additions and 5 deletions.
diff --git a/TomatoBar.xcodeproj/project.pbxproj b/TomatoBar.xcodeproj/project.pbxproj
@@ -41,6 +41,7 @@
 		D043345B2C9C5E4B0004984D /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/Localizable.strings; sourceTree = "<group>"; };
 		D05258222C76B6B7005093E3 /* DND.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DND.swift; sourceTree = "<group>"; };
 		D05258242C76C7D4005093E3 /* macos-focus-mode.shortcut */ = {isa = PBXFileReference; lastKnownFileType = file; path = "macos-focus-mode.shortcut"; sourceTree = "<group>"; };
+		D07E612C2CA774ED0022B476 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = "<group>"; };
 		D0BEE8052C9C17CA00714D40 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/Localizable.strings; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -153,6 +154,7 @@
 				"zh-Hans",
 				ja,
 				it,
+				de,
 			);
 			mainGroup = 8A21B77F27EE31A20009E5DB;
 			packageReferences = (
@@ -231,6 +233,7 @@
 				C4C8DE0E2930DBB4003B1110 /* zh-Hans */,
 				D0BEE8052C9C17CA00714D40 /* ja */,
 				D043345B2C9C5E4B0004984D /* it */,
+				D07E612C2CA774ED0022B476 /* de */,
 			);
 			name = Localizable.strings;
 			sourceTree = "<group>";

diff --git a/TomatoBar.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/TomatoBar.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEWorkspaceSharedSettings_AutocreateContextsIfNeeded</key>
+	<true/>
+</dict>
+</plist>
diff --git a/TomatoBar/de.lproj/Localizable.strings b/TomatoBar/de.lproj/Localizable.strings
@@ -0,0 +1,48 @@
+"IntervalsView.min" = "min";
+"IntervalsView.workIntervalLength.label" = "Arbeitsintervall:";
+"IntervalsView.shortRestIntervalLength.label" = "Kurze Pause:";
+"IntervalsView.longRestIntervalLength.label" = "Lange Pause:";
+"IntervalsView.longRestIntervalLength.help" = "Dauer einer längeren Pause nach Beendigung des eingestellten Arbeitsintervalls";
+"IntervalsView.workIntervalsInSet.label" = "Arbeitsintervalle in einem Set:";
+"IntervalsView.workIntervalsInSet.help" = "Anzahl der Arbeitsintervalle bevor eine längere Pause eingelegt wird";
+"IntervalsView.presets.label" = "Vorlagen:";
+"SettingsView.shortcut.label" = "Start/Stop";
+"SettingsView.pauseShortcut.label" = "Pause/Fortsetzen";
+"SettingsView.skipShortcut.label" = "Überspringen";
+"SettingsView.addMinuteShortcut.label" = "1 Min. hinzufügen";
+"SettingsView.startWith.label" = "Beginne mit";
+"SettingsView.stopAfter.label" = "Beende nach";
+"SettingsView.dropdownDisabled.label" = "Aus";
+"SettingsView.dropdownWork.label" = "Arbeit";
+"SettingsView.dropdownBreak.label" = "Pause";
+"SettingsView.dropdownSet.label" = "Set";
+"SettingsView.showTimerInMenuBar.label" = "Timer in der Menüleiste anzeigen";
+"SettingsView.showFullScreenMask.label" = "Vollbild-Maske verwenden";
+"SettingsView.showFullScreenMask.help" = "Während den Pausen Vollbild-Masken anstelle von Benachrichtigungen verwenden";
+"SettingsView.toggleDoNotDisturb.label" = "Nicht stören umschalten";
+"SettingsView.toggleDoNotDisturb.help" = "Führt einen Kurzbefehl aus, um Nicht stören bei Arbeits-/Pausenübergängen zu aktivieren/deaktivieren";
+"SettingsView.startTimerOnLaunch.label" = "Timer beim Starten starten";
+"SettingsView.launchAtLogin.label" = "Beim Login starten";
+"SoundsView.isWindupEnabled.label" = "Aufziehen";
+"SoundsView.isDingEnabled.label" = "Ding";
+"SoundsView.isTickingEnabled.label" = "Ticken";
+"SoundsView.openSoundFolder.label" = "Sound-Ordner öffnen";
+"TBPopoverView.width" = "280";
+"TBPopoverView.start.label" = "Start";
+"TBPopoverView.stop.label" = "Stop";
+"TBPopoverView.addMinute.help" = "1 Min. hinzufügen";
+"TBPopoverView.pause.help" = "Pause";
+"TBPopoverView.resume.help" = "Fortsetzen";
+"TBPopoverView.skip.help" = "Überspringen";
+"TBPopoverView.intervals.label" = "Intervalle";
+"TBPopoverView.settings.label" = "Einstellungen";
+"TBPopoverView.sounds.label" = "Sounds";
+"TBPopoverView.about.label" = "Über";
+"TBPopoverView.quit.label" = "Beenden";
+"TBTimer.onRestStart.title" = "Zeit abgelaufen";
+"TBTimer.onRestStart.short.body" = "Zeit für eine kurze Pause!";
+"TBTimer.onRestStart.long.body" = "Zeit für eine lange Pause!";
+"TBTimer.onRestStart.skip.title" = "Überspringen";
+"TBTimer.onRestFinish.title" = "Pause ist vorbei";
+"TBTimer.onRestFinish.body" = "Mach weiter so!";
+"TBMask.skip.label" = "Doppelklicken Sie auf eine beliebige Fläche, um zu überspringen";
diff --git a/TomatoBar/en.lproj/Localizable.strings b/TomatoBar/en.lproj/Localizable.strings
@@ -2,9 +2,9 @@
 "IntervalsView.workIntervalLength.label" = "Work interval:";
 "IntervalsView.shortRestIntervalLength.label" = "Short rest interval:";
 "IntervalsView.longRestIntervalLength.label" = "Long rest interval:";
-"IntervalsView.longRestIntervalLength.help" = "Duration of the lengthy break, taken after finishing work interval set";
+"IntervalsView.longRestIntervalLength.help" = "Duration of the longer break, taken after finishing a set of work intervals";
 "IntervalsView.workIntervalsInSet.label" = "Work intervals in a set:";
-"IntervalsView.workIntervalsInSet.help" = "Number of working intervals in the set, after which a lengthy break taken";
+"IntervalsView.workIntervalsInSet.help" = "Number of work intervals before taking a longer break";
 "IntervalsView.presets.label" = "Presets:";
 "SettingsView.shortcut.label" = "Start/stop";
 "SettingsView.pauseShortcut.label" = "Pause/resume";

diff --git a/TomatoBar/it.lproj/Localizable.strings b/TomatoBar/it.lproj/Localizable.strings
@@ -1,7 +1,7 @@
 "IntervalsView.min" = "min";
 "IntervalsView.workIntervalLength.label" = "Intervallo di lavoro:";
-"IntervalsView.shortRestIntervalLength.label" = "Intervallo di riposo breve:";
-"IntervalsView.longRestIntervalLength.label" = "Intervallo di riposo lungo:";
+"IntervalsView.shortRestIntervalLength.label" = "Pausa breve:";
+"IntervalsView.longRestIntervalLength.label" = "Pausa lunga:";
 "IntervalsView.longRestIntervalLength.help" = "Durata della pausa lunga, dopo aver completato un set";
 "IntervalsView.workIntervalsInSet.label" = "Intervalli di lavoro per set:";
 "IntervalsView.workIntervalsInSet.help" = "Numero di intervalli di lavoro per set prima di una pausa lunga";
@@ -20,7 +20,7 @@
 "SettingsView.showFullScreenMask.label" = "Usa maschera a schermo intero";
 "SettingsView.showFullScreenMask.help" = "Durante le pause, usa una maschera che copre il display invece di una notifica";
 "SettingsView.toggleDoNotDisturb.label" = "Gestisci Non disturbare";
-"SettingsView.toggleDoNotDisturb.help" = "Esegue un comando rapido per abilitare/disabilitare Non disturbare tra le fasi di lavoro e riposo";
+"SettingsView.toggleDoNotDisturb.help" = "Esegue un comando rapido per abilitare/disabilitare Non disturbare tra le fasi di lavoro e pausa";
 "SettingsView.startTimerOnLaunch.label" = "Avvia il timer aprendo l'app";
 "SettingsView.launchAtLogin.label" = "Apri al login";
 "SoundsView.isWindupEnabled.label" = "Carica";