From 80ef53683ea056e5acc3d247d003e33d3549bc76 Mon Sep 17 00:00:00 2001 From: Milo Ivir <43657314+milotype@users.noreply.github.com> Date: Tue, 2 Aug 2022 19:40:08 +0200 Subject: [PATCH 1/4] feat: croatian translation (#771) --- app/i18n/index.js | 1 + app/i18n/lang/hr.json | 33 +++++++++++++++++++++++++++++++++ package.json | 3 ++- 3 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 app/i18n/lang/hr.json diff --git a/app/i18n/index.js b/app/i18n/index.js index 3e5ab7907..b531ce511 100644 --- a/app/i18n/index.js +++ b/app/i18n/index.js @@ -8,6 +8,7 @@ const languages = { es: { translation: require('./lang/es.json') }, fr: { translation: require('./lang/fr.json') }, gl: { translation: require('./lang/gl.json') }, + hr: { translation: require('./lang/hr.json') }, hu: { translation: require('./lang/hu.json') }, it: { translation: require('./lang/it.json') }, nl: { translation: require('./lang/nl.json') }, diff --git a/app/i18n/lang/hr.json b/app/i18n/lang/hr.json new file mode 100644 index 000000000..23ace50b0 --- /dev/null +++ b/app/i18n/lang/hr.json @@ -0,0 +1,33 @@ +{ + "enterConferenceNameOrUrl": "Upiši ime sobe za tvoju konferenciju ili Jitsi URL", + "go": "KRENI", + "help": "Pomoć", + "termsLink": "Uvjeti", + "privacyLink": "Privatnost", + "recentListLabel": "ili se ponovo pridruži jednoj od tvojih nedavnih konferencijskih soba", + "sendFeedbackLink": "Pošalji povratnu informaciju", + "aboutLink": "Informacije o", + "sourceLink": "Izvroni kod", + "versionLabel": "Verzija: {{version}}", + "onboarding": { + "startTour": "Započni obilazak", + "skip": "Preskoči", + "welcome": "Pozdrav u {{appName}}", + "letUsShowYouAround": "Upoznaj se s radom aplikacije!", + "next": "Dalje", + "conferenceUrl": "Upiši ime (ili potpuni URL) sobe kojoj se želiš pridružiti. Izmisli si ime, ali obavijesti druge kako bi ga upisali.", + "settingsDrawerButton": "Pritisni ovdje za otvaranje postavki.", + "serverSetting": "Ovo će biti poslužitelj na kojem će se održavati tvoje konferencije. Možeš koristiti vlastiti poslužitelj, ali ne moraš!", + "serverTimeout": "Vremensko ograničenje za pridruživanje sastanku. Ako se sastanku nitko ne pridruži prije tog vremena, sastanak se otkazuje.", + "alwaysOnTop": "Ovdje se može uključiti postavljanje prozora „Uvijek ispred ostalih”, koji se prikazuje kada glavni prozor nije aktivan prozor. Ovo će se primijeniti na sve konferencije." + }, + "settings": { + "back": "Natrag", + "alwaysOnTopWindow": "Uvijek ispred ostalih", + "invalidServer": "Neispravna URL-adresa poslužitelja", + "invalidServerTimeout": "Neispravna vrijednost za vremensko ograničenje poslužitelja", + "serverUrl": "URL-adresa poslužitelja", + "serverTimeout": "Vremensko ograničenje poslužitelja (u sekundama)", + "disableAGC": "Isključi kontrolu za automasko pojačanje zvuka" + } +} diff --git a/package.json b/package.json index aeb1830bf..44edfbf60 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,8 @@ "category": "VideoConference;AudioVideo;Audio;Video;Network", "description": "Jitsi Meet Desktop App", "desktop": { - "Comment[hu]": "Asztali Jitsi Meet-alkalmazás" + "Comment[hu]": "Asztali Jitsi Meet-alkalmazás", + "Comment[hr]": "Jitsi Meet desktop aplikacija" }, "executableName": "jitsi-meet", "target": [ From eb95561b576d3420f98710e3fd315bb9858a24d0 Mon Sep 17 00:00:00 2001 From: Christoph Settgast Date: Mon, 8 Aug 2022 09:55:35 +0200 Subject: [PATCH 2/4] fix(win): fix build failures (#780) Includes downgraded node-gyp-build which should fix issues like https://github.com/jitsi/jitsi-meet-electron/runs/7639735746?check_suite_focus=true --- package-lock.json | 33 ++++++++++++++++++++++++--------- package.json | 2 +- 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8c5e640ab..4d0ccf4f6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "hasInstallScript": true, "license": "Apache-2.0", "dependencies": { - "@jitsi/electron-sdk": "^3.0.9", + "@jitsi/electron-sdk": "^3.0.15", "electron-debug": "^3.2.0", "electron-reload": "^1.5.0" }, @@ -3057,16 +3057,16 @@ "dev": true }, "node_modules/@jitsi/electron-sdk": { - "version": "3.0.9", - "resolved": "https://registry.npmjs.org/@jitsi/electron-sdk/-/electron-sdk-3.0.9.tgz", - "integrity": "sha512-y8n+1AiMaW3G4PphsD1gfZsGURpROxw1uTrvQ+3I19BXrtq0drxs6OYDo7Hww40YuLnUh5odVf5hwm+mhm2SCg==", + "version": "3.0.15", + "resolved": "https://registry.npmjs.org/@jitsi/electron-sdk/-/electron-sdk-3.0.15.tgz", + "integrity": "sha512-oElArTC7GD53jlq3+Y+2JSVez/e3QMWjrnqIKz7WH0oy6sfkff2zKqgEQRROz0bApJZGkOt5QKdZibc+ESCqkA==", "hasInstallScript": true, "dependencies": { "@jitsi/logger": "^2.0.0", "@jitsi/robotjs": "^0.6.9", "electron-store": "^8.0.1", "node-addon-api": "^5.0.0", - "node-gyp-build": "^4.5.0", + "node-gyp-build": "4.3.0", "postis": "^2.2.0" } }, @@ -3075,6 +3075,16 @@ "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-5.0.0.tgz", "integrity": "sha512-CvkDw2OEnme7ybCykJpVcKH+uAOLV2qLqiyla128dN9TkEWfrYmxG6C2boDe5KcNQqZF3orkqzGgOMvZ/JNekA==" }, + "node_modules/@jitsi/electron-sdk/node_modules/node-gyp-build": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.3.0.tgz", + "integrity": "sha512-iWjXZvmboq0ja1pUGULQBexmxq8CV4xBhX7VDOTbL7ZR4FOowwY/VOtRxBN/yKxmdGoIp4j5ysNT4u3S2pDQ3Q==", + "bin": { + "node-gyp-build": "bin.js", + "node-gyp-build-optional": "optional.js", + "node-gyp-build-test": "build-test.js" + } + }, "node_modules/@jitsi/js-utils": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/@jitsi/js-utils/-/js-utils-2.0.0.tgz", @@ -17199,15 +17209,15 @@ "dev": true }, "@jitsi/electron-sdk": { - "version": "3.0.9", - "resolved": "https://registry.npmjs.org/@jitsi/electron-sdk/-/electron-sdk-3.0.9.tgz", - "integrity": "sha512-y8n+1AiMaW3G4PphsD1gfZsGURpROxw1uTrvQ+3I19BXrtq0drxs6OYDo7Hww40YuLnUh5odVf5hwm+mhm2SCg==", + "version": "3.0.15", + "resolved": "https://registry.npmjs.org/@jitsi/electron-sdk/-/electron-sdk-3.0.15.tgz", + "integrity": "sha512-oElArTC7GD53jlq3+Y+2JSVez/e3QMWjrnqIKz7WH0oy6sfkff2zKqgEQRROz0bApJZGkOt5QKdZibc+ESCqkA==", "requires": { "@jitsi/logger": "^2.0.0", "@jitsi/robotjs": "^0.6.9", "electron-store": "^8.0.1", "node-addon-api": "^5.0.0", - "node-gyp-build": "^4.5.0", + "node-gyp-build": "4.3.0", "postis": "^2.2.0" }, "dependencies": { @@ -17215,6 +17225,11 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-5.0.0.tgz", "integrity": "sha512-CvkDw2OEnme7ybCykJpVcKH+uAOLV2qLqiyla128dN9TkEWfrYmxG6C2boDe5KcNQqZF3orkqzGgOMvZ/JNekA==" + }, + "node-gyp-build": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.3.0.tgz", + "integrity": "sha512-iWjXZvmboq0ja1pUGULQBexmxq8CV4xBhX7VDOTbL7ZR4FOowwY/VOtRxBN/yKxmdGoIp4j5ysNT4u3S2pDQ3Q==" } } }, diff --git a/package.json b/package.json index 44edfbf60..78761a819 100644 --- a/package.json +++ b/package.json @@ -130,7 +130,7 @@ "readmeFilename": "README.md", "license": "Apache-2.0", "dependencies": { - "@jitsi/electron-sdk": "^3.0.9", + "@jitsi/electron-sdk": "^3.0.15", "electron-debug": "^3.2.0", "electron-reload": "^1.5.0" }, From 27f663a98f1331d5b9622c566c9516f8cd0983c9 Mon Sep 17 00:00:00 2001 From: Christoph Settgast Date: Fri, 12 Aug 2022 07:46:41 +0200 Subject: [PATCH 3/4] feat(wayland): enable titlebar when running under wayland (#766) Use with --ozone-platform-hint=auto to enable Closes: #683 --- README.md | 8 ++++++++ main.js | 4 ++-- package-lock.json | 14 +++++++------- package.json | 2 +- 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index e6b6bafdd..fbede6783 100644 --- a/README.md +++ b/README.md @@ -174,6 +174,14 @@ To fix this, install libfuse2 as follows: sudo apt install libfuse2 ``` +Under wayland, experimental native wayland support can be enabled with the command-line switch `--ozone-platform-hint` set to `auto`: + +``` +./jitsi-meet-x86_64.AppImage --ozone-platform-hint=auto +``` + +Note that screensharing is currently not supported under wayland, eg. the permissions prompt may loop endlessly. + In case you experience a blank page after jitsi server upgrades, try removing the local cache files: ``` diff --git a/main.js b/main.js index c738a934f..ee3522107 100644 --- a/main.js +++ b/main.js @@ -40,9 +40,9 @@ app.commandLine.appendSwitch('disable-features', 'IOSurfaceCapturer'); // Enable Opus RED field trial. app.commandLine.appendSwitch('force-fieldtrials', 'WebRTC-Audio-Red-For-Opus/Enabled/'); -// Enable optional PipeWire support. +// Wayland: Enable optional PipeWire and window decorations support. if (!app.commandLine.hasSwitch('enable-features')) { - app.commandLine.appendSwitch('enable-features', 'WebRTCPipeWireCapturer'); + app.commandLine.appendSwitch('enable-features', 'WebRTCPipeWireCapturer,WaylandWindowDecorations'); } autoUpdater.logger = require('electron-log'); diff --git a/package-lock.json b/package-lock.json index 4d0ccf4f6..59edbe82c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -39,7 +39,7 @@ "babel-loader": "^8.2.3", "concurrently": "5.1.0", "css-loader": "^6.7.1", - "electron": "19.0.8", + "electron": "19.0.12", "electron-builder": "23.1.0", "electron-context-menu": "^2.5.0", "electron-is-dev": "^1.2.0", @@ -6380,9 +6380,9 @@ } }, "node_modules/electron": { - "version": "19.0.8", - "resolved": "https://registry.npmjs.org/electron/-/electron-19.0.8.tgz", - "integrity": "sha512-OWK3P/NbDFfBUv+wbYv1/OV4jehY5DQPT7n1maQJfN9hsnrWTMktXS/bmS05eSUAjNAzHmKPKfiKH2c1Yr7nGw==", + "version": "19.0.12", + "resolved": "https://registry.npmjs.org/electron/-/electron-19.0.12.tgz", + "integrity": "sha512-GOvG0t2NCeJYIfmC3g/dnEAQ71k3nQDbRVqQhpi2YbsYMury0asGJwqnVAv2uZQEwCwSx4XOwOQARTFEG/msWw==", "dev": true, "hasInstallScript": true, "dependencies": { @@ -19765,9 +19765,9 @@ } }, "electron": { - "version": "19.0.8", - "resolved": "https://registry.npmjs.org/electron/-/electron-19.0.8.tgz", - "integrity": "sha512-OWK3P/NbDFfBUv+wbYv1/OV4jehY5DQPT7n1maQJfN9hsnrWTMktXS/bmS05eSUAjNAzHmKPKfiKH2c1Yr7nGw==", + "version": "19.0.12", + "resolved": "https://registry.npmjs.org/electron/-/electron-19.0.12.tgz", + "integrity": "sha512-GOvG0t2NCeJYIfmC3g/dnEAQ71k3nQDbRVqQhpi2YbsYMury0asGJwqnVAv2uZQEwCwSx4XOwOQARTFEG/msWw==", "dev": true, "requires": { "@electron/get": "^1.14.1", diff --git a/package.json b/package.json index 78761a819..372feee1f 100644 --- a/package.json +++ b/package.json @@ -159,7 +159,7 @@ "babel-loader": "^8.2.3", "concurrently": "5.1.0", "css-loader": "^6.7.1", - "electron": "19.0.8", + "electron": "19.0.12", "electron-builder": "23.1.0", "electron-context-menu": "^2.5.0", "electron-is-dev": "^1.2.0", From 5b9119c62b011de090171134a56253ab748e8064 Mon Sep 17 00:00:00 2001 From: Christoph Settgast Date: Fri, 12 Aug 2022 07:47:43 +0200 Subject: [PATCH 4/4] 2022.8.1 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 59edbe82c..75088843b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "jitsi-meet-electron", - "version": "2022.7.1", + "version": "2022.8.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "jitsi-meet-electron", - "version": "2022.7.1", + "version": "2022.8.1", "hasInstallScript": true, "license": "Apache-2.0", "dependencies": { diff --git a/package.json b/package.json index 372feee1f..c5ef67728 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "jitsi-meet-electron", - "version": "2022.7.1", + "version": "2022.8.1", "description": "Electron application for Jitsi Meet", "main": "./build/main.js", "productName": "Jitsi Meet",