v1.7.31

Upgrade to Electron 12.0.11

CHANGELOG.md

@@ -1,3 +1,38 @@
+Changes in [1.7.31](https://github.com/vector-im/element-desktop/releases/tag/v1.7.31) (2021-06-21)
+===================================================================================================
+[Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.31-rc.1...v1.7.31)
+
+ * No changes since rc.1
+
+Changes in [1.7.31-rc.1](https://github.com/vector-im/element-desktop/releases/tag/v1.7.31-rc.1) (2021-06-15)
+=============================================================================================================
+[Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.30...v1.7.31-rc.1)
+
+ * Upgrade to Electron 12.0.11
+   [\#211](https://github.com/vector-im/element-desktop/pull/211)
+ * Translations update from Weblate
+   [\#214](https://github.com/vector-im/element-desktop/pull/214)
+ * Upgrade to Node 14
+   [\#212](https://github.com/vector-im/element-desktop/pull/212)
+ * Bump npm-registry-fetch from 4.0.2 to 4.0.7
+   [\#210](https://github.com/vector-im/element-desktop/pull/210)
+ * Update electron-builder for Node 16 compatibility
+   [\#204](https://github.com/vector-im/element-desktop/pull/204)
+ * Bump hosted-git-info from 2.8.5 to 2.8.9
+   [\#209](https://github.com/vector-im/element-desktop/pull/209)
+ * Bump glob-parent from 5.1.1 to 5.1.2
+   [\#206](https://github.com/vector-im/element-desktop/pull/206)
+ * Bump dot-prop from 4.2.0 to 4.2.1
+   [\#208](https://github.com/vector-im/element-desktop/pull/208)
+ * Bump y18n from 3.2.1 to 3.2.2
+   [\#207](https://github.com/vector-im/element-desktop/pull/207)
+ * Bump normalize-url from 4.5.0 to 4.5.1
+   [\#205](https://github.com/vector-im/element-desktop/pull/205)
+ * Put Preferences menu item in correct location on macOS
+   [\#200](https://github.com/vector-im/element-desktop/pull/200)
+ * Switch zoomIn accelerator to default
+   [\#202](https://github.com/vector-im/element-desktop/pull/202)
+
 Changes in [1.7.30](https://github.com/vector-im/element-desktop/releases/tag/v1.7.30) (2021-06-07)
 ===================================================================================================
 [Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.30-rc.1...v1.7.30)

dockerbuild/Dockerfile

@@ -30,7 +30,7 @@ ENV LC_ALL C.UTF-8
 
 ENV DEBUG_COLORS true
 ENV FORCE_COLOR true
-ENV NODE_VERSION 12.16.1
+ENV NODE_VERSION 14.17.0
 
 # this package is used for snapcraft and we should not clear apt list - to avoid apt-get update during snap build
 RUN curl -L https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.gz | tar xz -C /usr/local --strip-components=1 && \

package.json

@@ -2,7 +2,7 @@
   "name": "element-desktop",
   "productName": "Element",
   "main": "src/electron-main.js",
-  "version": "1.7.30",
+  "version": "1.7.31",
   "description": "A feature-rich client for Matrix.org",
   "author": "Element",
   "repository": {
@@ -43,8 +43,8 @@
   },
   "devDependencies": {
     "asar": "^2.0.1",
-    "electron-builder": "22.10.5",
-    "electron-builder-squirrel-windows": "22.10.5",
+    "electron-builder": "22.11.4",
+    "electron-builder-squirrel-windows": "22.11.4",
     "electron-devtools-installer": "^3.1.1",
     "electron-notarize": "^1.0.0",
     "eslint": "7.18.0",
@@ -68,7 +68,7 @@
   },
   "build": {
     "appId": "im.riot.app",
-    "electronVersion": "12.0.9",
+    "electronVersion": "12.0.11",
     "files": [
       "package.json",
       {

src/i18n/strings/hr.json

@@ -0,0 +1,13 @@
+{
+    "Paste": "Zalijepiti",
+    "Copy": "Kopirati",
+    "Cut": "Izrezati",
+    "Redo": "Preurediti",
+    "Undo": "Poništi",
+    "Edit": "Uredi",
+    "Quit": "Prestati",
+    "Show/Hide": "Pokaži/sakrij",
+    "Are you sure you want to quit?": "Jesi li siguran da želiš odustati?",
+    "Close Element": "Zatvori Element",
+    "Cancel": "Otkazati"
+}

src/i18n/strings/pt_BR.json

@@ -26,8 +26,8 @@
     "Zoom Out": "Dar Zoom Out",
     "Zoom In": "Dar Zoom In",
     "Actual Size": "Tamanho de Verdade",
-    "View": "Ver",
-    "Select All": "Selecionar Tudo",
+    "View": "Visualizar",
+    "Select All": "Selecionar Todas",
     "Delete": "Deletar",
     "Paste and Match Style": "Colar e Adequar Estilo",
     "Paste": "Colar",
@@ -38,7 +38,9 @@
     "Edit": "Editar",
     "Quit": "Sair",
     "Show/Hide": "Mostrar/Esconder",
-    "Are you sure you want to quit?": "Você tem certeza que quer sair?",
+    "Are you sure you want to quit?": "Você tem certeza que você quer sair?",
     "Close Element": "Fechar Element",
-    "Cancel": "Cancelar"
+    "Cancel": "Cancelar",
+    "Bring All to Front": "Trazer Todas Para Frente",
+    "Hide Others": "Esconder Outras(os)"
 }

src/vectormenu.js

@@ -17,6 +17,8 @@ limitations under the License.
 const { app, shell, Menu } = require('electron');
 const { _t } = require('./language-helper');
 
+const isMac = process.platform === 'darwin';
+
 function buildMenuTemplate() {
     // Menu template from http://electron.atom.io/docs/api/menu/, edited
     const template = [
@@ -70,7 +72,6 @@ function buildMenuTemplate() {
                 },
                 {
                     role: 'zoomin',
-                    accelerator: 'CommandOrControl+=',
                     label: _t('Zoom In'),
                 },
                 {
@@ -78,11 +79,11 @@ function buildMenuTemplate() {
                     label: _t('Zoom Out'),
                 },
                 { type: 'separator' },
-                {
+                // in macOS the Preferences menu item goes in the first menu
+                ...(!isMac ? [{
                     label: _t('Preferences'),
-                    accelerator: 'Command+,', // Mac-only accelerator
                     click() { global.mainWindow.webContents.send('preferences'); },
-                },
+                }] : []),
                 {
                     role: 'togglefullscreen',
                     label: _t('Toggle Full Screen'),
@@ -122,7 +123,7 @@ function buildMenuTemplate() {
     ];
 
     // macOS has specific menu conventions...
-    if (process.platform === 'darwin') {
+    if (isMac) {
         template.unshift({
             // first macOS menu is the name of the app
             role: 'appMenu',
@@ -130,7 +131,13 @@ function buildMenuTemplate() {
             submenu: [
                 {
                     role: 'about',
-                    label: _t('About'),
+                    label: _t('About') + ' ' + app.name,
+                },
+                { type: 'separator' },
+                {
+                    label: _t('Preferences') + '…',
+                    accelerator: 'Command+,', // Mac-only accelerator
+                    click() { global.mainWindow.webContents.send('preferences'); },
                 },
                 { type: 'separator' },
                 {