Skip to content

Commit 1c4f975

Browse files
authored
Merge branch 'zulip:main' into feature/dnd-duration-dropdown
2 parents dd34bbd + b42f9de commit 1c4f975

File tree

12 files changed

+238
-225
lines changed

12 files changed

+238
-225
lines changed

app/renderer/css/main.css

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,12 +114,20 @@ body {
114114
}
115115

116116
.action-button i {
117-
color: rgb(108 133 146 / 100%);
117+
color: hsl(200.53deg 14.96% 49.8%);
118118
font-size: 28px;
119119
}
120120

121121
.action-button:hover i {
122-
color: rgb(152 169 179 / 100%);
122+
color: hsl(202.22deg 15.08% 64.9%);
123+
}
124+
125+
.action-button > .dnd-on {
126+
color: hsl(200.53deg 14.96% 85%);
127+
}
128+
129+
.action-button:hover > .dnd-on {
130+
color: hsl(202.22deg 15.08% 95%);
123131
}
124132

125133
.action-button.active {

app/renderer/css/preference.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
background: rgb(239 239 239 / 100%);
1212
letter-spacing: -0.08px;
1313
line-height: 18px;
14-
color: rgb(139 142 143 / 100%);
14+
color: rgb(34 44 49 / 100%);
1515

1616
/* Copied from https://github.com/yairEO/tagify/blob/v4.17.7/src/tagify.scss#L4-L8 */
1717
--tagify-dd-color-primary: rgb(53 149 246);
@@ -101,7 +101,7 @@ td:nth-child(odd) {
101101

102102
.nav {
103103
padding: 7px 0;
104-
color: rgb(153 153 153 / 100%);
104+
color: rgb(70 78 90 / 100%);
105105
cursor: pointer;
106106
}
107107

app/renderer/js/main.ts

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -817,9 +817,14 @@ export class ServerManagerView {
817817
toggleDndButton(alert: boolean): void {
818818
this.$dndTooltip.textContent =
819819
(alert ? "Disable" : "Enable") + " Do Not Disturb";
820-
this.$dndButton.querySelector("i")!.textContent = alert
821-
? "notifications_off"
822-
: "notifications";
820+
const $dndIcon = this.$dndButton.querySelector("i")!;
821+
$dndIcon.textContent = alert ? "notifications_off" : "notifications";
822+
823+
if (alert) {
824+
$dndIcon.classList.add("dnd-on");
825+
} else {
826+
$dndIcon.classList.remove("dnd-on");
827+
}
823828
}
824829

825830
async isLoggedIn(tabIndex: number): Promise<boolean> {

public/translations/bg.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
"Add custom CSS": "Добавете персонализиран CSS",
1010
"Add to Dictionary": "Add to Dictionary",
1111
"Advanced": "напреднал",
12-
"All the connected organizations will appear here.": "All the connected organizations will appear here.",
12+
"All the connected organizations will appear here.": "Всички свързани организации ще се появят тук.",
1313
"Always start minimized": "Винаги започвайте да минимизирате",
1414
"App Updates": "Актуализации на приложения",
1515
"App language (requires restart)": "App language (requires restart)",
1616
"Appearance": "Външен вид",
1717
"Application Shortcuts": "Клавишни комбинации за приложения",
1818
"Are you sure you want to disconnect this organization?": "Наистина ли искате да прекъснете връзката с тази организация?",
19-
"Are you sure?": "Are you sure?",
19+
"Are you sure?": "Сигурни ли сте?",
2020
"Ask where to save files before downloading": "Ask where to save files before downloading",
2121
"Auto hide Menu bar": "Автоматично скриване на лентата с менюта",
2222
"Auto hide menu bar (Press Alt key to display)": "Автоматично скриване на лентата с менюта (натиснете клавиша Alt за показване)",

public/translations/ca.json

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"A new update {{{version}}} has been downloaded.": "A new update {{{version}}} has been downloaded.",
3-
"A new version {{{version}}} of Zulip Desktop is available.": "A new version {{{version}}} of Zulip Desktop is available.",
2+
"A new update {{{version}}} has been downloaded.": "S'ha descarregat una nova actualització {{{version}}}",
3+
"A new version {{{version}}} of Zulip Desktop is available.": "Hi ha disponible una nova versió de Zulip Escriptori {{{version}}}",
44
"About": "About",
55
"About Zulip": "Quant a Zulip",
66
"Actual Size": "Actual Size",
@@ -16,16 +16,16 @@
1616
"Appearance": "Appearance",
1717
"Application Shortcuts": "Application Shortcuts",
1818
"Are you sure you want to disconnect this organization?": "Are you sure you want to disconnect this organization?",
19-
"Are you sure?": "Are you sure?",
19+
"Are you sure?": "Esteu segur/a?",
2020
"Ask where to save files before downloading": "Ask where to save files before downloading",
2121
"Auto hide Menu bar": "Auto hide Menu bar",
2222
"Auto hide menu bar (Press Alt key to display)": "Auto hide menu bar (Press Alt key to display)",
2323
"Available under the {{{link}}}Apache 2.0 License{{{endLink}}}": "Available under the {{{link}}}Apache 2.0 License{{{endLink}}}",
2424
"Back": "Back",
2525
"Bounce dock on new private message": "Bounce dock on new private message",
26-
"CSS file": "CSS file",
26+
"CSS file": "Arxiu CSS",
2727
"Cancel": "Cancel·la",
28-
"Certificate error": "Certificate error",
28+
"Certificate error": "Error de certificat",
2929
"Change": "Change",
3030
"Change the language from System Preferences → Keyboard → Text → Spelling.": "Change the language from System Preferences → Keyboard → Text → Spelling.",
3131
"Check for Updates": "Check for Updates",
@@ -48,16 +48,16 @@
4848
"Desktop Settings": "Configuració d'escriptori",
4949
"Disconnect": "Disconnect",
5050
"Disconnect organization": "Disconnect organization",
51-
"Do Not Disturb": "Do Not Disturb",
51+
"Do Not Disturb": "No molesteu",
5252
"Download App Logs": "Download App Logs",
5353
"Edit": "Edita",
5454
"Edit Shortcuts": "Edit Shortcuts",
55-
"Emoji & Symbols": "Emoji & Symbols",
55+
"Emoji & Symbols": "Emojis i símbols",
5656
"Enable auto updates": "Enable auto updates",
5757
"Enable error reporting (requires restart)": "Enable error reporting (requires restart)",
5858
"Enable spellchecker (requires restart)": "Enable spellchecker (requires restart)",
59-
"Enter Full Screen": "Enter Full Screen",
60-
"Error saving new organization": "Error saving new organization",
59+
"Enter Full Screen": "Entreu a pantalla sencera",
60+
"Error saving new organization": "Error en guardar la nova organització",
6161
"Error saving update notifications": "Error saving update notifications",
6262
"Error: {{{error}}}\n\nThe latest version of Zulip Desktop is available at:\n{{{link}}}\nCurrent version: {{{version}}}": "Error: {{{error}}}\n\nThe latest version of Zulip Desktop is available at:\n{{{link}}}\nCurrent version: {{{version}}}",
6363
"Factory Reset": "Factory Reset",
@@ -148,19 +148,19 @@
148148
"Toggle Sidebar": "Toggle Sidebar",
149149
"Toggle Tray Icon": "Toggle Tray Icon",
150150
"Tools": "Tools",
151-
"Unable to check for updates.": "Unable to check for updates.",
152-
"Unable to download the update.": "Unable to download the update.",
151+
"Unable to check for updates.": "No ha estat possible comprovar les actualitzacions",
152+
"Unable to download the update.": "No ha estat possible descarregar l'actualització.",
153153
"Undo": "Undo",
154154
"Unhide": "Unhide",
155-
"Unknown error": "Unknown error",
155+
"Unknown error": "Error desconegut",
156156
"Upload": "Pujada",
157157
"Use system proxy settings (requires restart)": "Use system proxy settings (requires restart)",
158158
"View": "View",
159159
"View Shortcuts": "View Shortcuts",
160160
"We encountered an error while saving the update notifications.": "We encountered an error while saving the update notifications.",
161161
"Window": "Window",
162162
"Window Shortcuts": "Window Shortcuts",
163-
"Yes": "Yes",
163+
"Yes": "No",
164164
"You are running the latest version of Zulip Desktop.\nVersion: {{{version}}}": "You are running the latest version of Zulip Desktop.\nVersion: {{{version}}}",
165165
"You can select a maximum of 3 languages for spellchecking.": "You can select a maximum of 3 languages for spellchecking.",
166166
"Zoom In": "Zoom In",

public/translations/de.json

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"Advanced": "Erweitert",
1212
"All the connected organizations will appear here.": "Alle verbundenen Organisationen werden hier angezeigt.",
1313
"Always start minimized": "Immer minimiert öffnen",
14-
"App Updates": "App Updates",
14+
"App Updates": "App-Updates",
1515
"App language (requires restart)": "Sprache der App (benötigt Neustart)",
1616
"Appearance": "Erscheinungsbild",
1717
"Application Shortcuts": "App-Verknüpfungen",
@@ -20,15 +20,15 @@
2020
"Ask where to save files before downloading": "Fragen, wo heruntergeladene Dateien gespeichert werden sollen",
2121
"Auto hide Menu bar": "Menü automatisch verbergen",
2222
"Auto hide menu bar (Press Alt key to display)": "Menü automatisch verbergen (zum Anzeigen die Alt-Taste drücken)",
23-
"Available under the {{{link}}}Apache 2.0 License{{{endLink}}}": "Available under the {{{link}}}Apache 2.0 License{{{endLink}}}",
23+
"Available under the {{{link}}}Apache 2.0 License{{{endLink}}}": "Verfügbar unter der {{{link}}}Apache-2.0-Lizenz{{{endLink}}}",
2424
"Back": "Zurück",
2525
"Bounce dock on new private message": "Im Dock hüpfen, wenn neue private Nachrichten eingehen",
2626
"CSS file": "CSS-Datei",
2727
"Cancel": "Abbrechen",
2828
"Certificate error": "Zertifikatfehler",
2929
"Change": "Ändern",
3030
"Change the language from System Preferences → Keyboard → Text → Spelling.": "Ändere die Spracheinstellung über Systemeinstellungen → Tastatur → Text → Rechtschreibung.",
31-
"Check for Updates": "Auf Updates prüfen",
31+
"Check for Updates": "Auf-Updates prüfen",
3232
"Close": "Schließen",
3333
"Connect": "Verbinden",
3434
"Connect to another organization": "Mit einer anderen Organisation verbinden",
@@ -40,14 +40,14 @@
4040
"Copy Link": "Link kopieren",
4141
"Copy Zulip URL": "Zulip-URL kopieren",
4242
"Create a new organization": "Eine neue Organisation erstellen",
43-
"Custom CSS file deleted": "Custom CSS file deleted",
43+
"Custom CSS file deleted": "Eigene CSS-Datei gelöscht",
4444
"Cut": "Ausschneiden",
4545
"Default download location": "Voreingestelltes Ziel für Downloads",
4646
"Delete": "Löschen",
4747
"Desktop Notifications": "Desktopbenachrichtigungen",
4848
"Desktop Settings": "Desktop-Einstellungen",
4949
"Disconnect": "Verbindung trennen",
50-
"Disconnect organization": "Disconnect organization",
50+
"Disconnect organization": "Organisation trennen",
5151
"Do Not Disturb": "Bitte nicht stören",
5252
"Download App Logs": "Logdateien der App herunterladen",
5353
"Edit": "Bearbeiten",
@@ -57,9 +57,9 @@
5757
"Enable error reporting (requires restart)": "Fehlerberichte aktivieren (erfordert Neustart)",
5858
"Enable spellchecker (requires restart)": "Rechtschreibprüfung aktivieren (erfordert Neustart)",
5959
"Enter Full Screen": "Vollbildschirm aktivieren",
60-
"Error saving new organization": "Error saving new organization",
61-
"Error saving update notifications": "Error saving update notifications",
62-
"Error: {{{error}}}\n\nThe latest version of Zulip Desktop is available at:\n{{{link}}}\nCurrent version: {{{version}}}": "Error: {{{error}}}\n\nThe latest version of Zulip Desktop is available at:\n{{{link}}}\nCurrent version: {{{version}}}",
60+
"Error saving new organization": "Neue Organisation konnte nicht gespeichert werden",
61+
"Error saving update notifications": "Update-Benachrichtigungen konnten nicht gespeichert werden",
62+
"Error: {{{error}}}\n\nThe latest version of Zulip Desktop is available at:\n{{{link}}}\nCurrent version: {{{version}}}": "Fehler: {{{error}}}\n\nDie neueste Version von Zulip Desktop ist hier verfügbar:\n{{{link}}}\nAktuelle Version: {{{version}}}",
6363
"Factory Reset": "Alle Einstellungen auf Standardwerte zurücksetzen",
6464
"Factory Reset Data": "Auf Werkseinstellung zurücksetzen",
6565
"File": "Datei",
@@ -81,7 +81,7 @@
8181
"History Shortcuts": "Kurzbefehle für Verlauf",
8282
"Install Later": "Später installieren",
8383
"Install and Relaunch": "Installieren und neustarten",
84-
"It will be installed the next time you restart the application.": "It will be installed the next time you restart the application.",
84+
"It will be installed the next time you restart the application.": "Es wird beim nächsten Neustart der Anwendung aktualisiert.",
8585
"Keyboard Shortcuts": "Tastenkürzel",
8686
"Later": "Später",
8787
"Loading": "Laden",
@@ -130,15 +130,15 @@
130130
"Show app icon in system tray": "App-Icon in Systemleiste anzeigen",
131131
"Show desktop notifications": "Desktopbenachrichtigungen anzeigen",
132132
"Show sidebar": "Seitenleiste anzeigen",
133-
"Show unread count badge on app icon": "Show unread count badge on app icon",
133+
"Show unread count badge on app icon": "Anzahl ungelesener Nachrichten auf dem App-Symbol anzeigen",
134134
"Spellchecker Languages": "Sprachen für die Rechtschreibprüfung",
135135
"Start app at login": "App beim Login automatisch starten",
136136
"Switch to Next Organization": "Zur nächsten Organisation wechseln",
137137
"Switch to Previous Organization": "Zur vorhergehenden Organisation wechseln",
138-
"The custom CSS previously set is deleted.": "The custom CSS previously set is deleted.",
139-
"The server presented an invalid certificate for {{{origin}}}:\n\n{{{error}}}": "The server presented an invalid certificate for {{{origin}}}:\n\n{{{error}}}",
140-
"The update will be downloaded in the background. You will be notified when it is ready to be installed.": "The update will be downloaded in the background. You will be notified when it is ready to be installed.",
141-
"There was an error while saving the new organization. You may have to add your previous organizations again.": "There was an error while saving the new organization. You may have to add your previous organizations again.",
138+
"The custom CSS previously set is deleted.": "Das zuvor eingestellte eigene CSS ist gelöscht.",
139+
"The server presented an invalid certificate for {{{origin}}}:\n\n{{{error}}}": "Der Server hat ein ungültiges Zertifikat für {{{origin}}} vorgelegt:\n\n{{{error}}}",
140+
"The update will be downloaded in the background. You will be notified when it is ready to be installed.": "Das Update wird im Hintegrund heruntergeladen. Du wirst benachrichigt, wenn es zur Installation bereit ist.",
141+
"There was an error while saving the new organization. You may have to add your previous organizations again.": "Beim Speichern der neuen Organisation ist ein Fehler aufgetreten. Möglicherweise musst du deine vorherigen Organisationen erneut hinzufügen.",
142142
"These desktop app shortcuts extend the Zulip webapp's": "Dies sind zusätzliche Kurzbefehle in der Desktop-App gegenüber der Web-App",
143143
"Tip": "Tipp",
144144
"Toggle DevTools for Active Tab": "Entwickler-Tools für aktiven Tab umschalten",
@@ -148,20 +148,20 @@
148148
"Toggle Sidebar": "Seitenleiste umschalten",
149149
"Toggle Tray Icon": "Tray-Icon umschalten",
150150
"Tools": "Extras",
151-
"Unable to check for updates.": "Unable to check for updates.",
152-
"Unable to download the update.": "Unable to download the update.",
151+
"Unable to check for updates.": "Update-Verfügbarkeit konnte nicht geprüft werden.",
152+
"Unable to download the update.": "Update konnte nicht heruntergeladen werden.",
153153
"Undo": "Rückgängig",
154154
"Unhide": "Nicht mehr verbergen",
155-
"Unknown error": "Unknown error",
155+
"Unknown error": "Unbekannter Fehler",
156156
"Upload": "Hochladen",
157157
"Use system proxy settings (requires restart)": "Systemweite Proxy-Einstellungen verwenden (erfordert Neustart)",
158158
"View": "Ansicht",
159159
"View Shortcuts": "Tastenkürzel anzeigen",
160-
"We encountered an error while saving the update notifications.": "We encountered an error while saving the update notifications.",
160+
"We encountered an error while saving the update notifications.": "Beim Speichern der Update-Benachrichtigungen ist ein Fehler aufgetreten.",
161161
"Window": "Fenster",
162162
"Window Shortcuts": "Kurzbefehle für Fenster",
163163
"Yes": "Ja",
164-
"You are running the latest version of Zulip Desktop.\nVersion: {{{version}}}": "You are running the latest version of Zulip Desktop.\nVersion: {{{version}}}",
164+
"You are running the latest version of Zulip Desktop.\nVersion: {{{version}}}": "Du verwendest die neueste Version von Zulip Desktop.\nVersion: {{{version}}}",
165165
"You can select a maximum of 3 languages for spellchecking.": "Du kannst höchstens 3 Sprachen für die Rechtschreibprüfung auswählen.",
166166
"Zoom In": "Vergrößern",
167167
"Zoom Out": "Verkleinern",

0 commit comments

Comments
 (0)