Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Weblate 2017-09-07 15:01:08 +00:00
commit 83acdee013
1 changed files with 5 additions and 3 deletions

View File

@ -19,7 +19,7 @@ const {app, shell, Menu} = require('electron');
// Menu template from http://electron.atom.io/docs/api/menu/, edited // Menu template from http://electron.atom.io/docs/api/menu/, edited
const template = [ const template = [
{ {
label: 'Edit', label: '&Edit',
submenu: [ submenu: [
{ role: 'undo' }, { role: 'undo' },
{ role: 'redo' }, { role: 'redo' },
@ -33,7 +33,7 @@ const template = [
], ],
}, },
{ {
label: 'View', label: '&View',
submenu: [ submenu: [
{ type: 'separator' }, { type: 'separator' },
{ role: 'resetzoom' }, { role: 'resetzoom' },
@ -45,6 +45,7 @@ const template = [
], ],
}, },
{ {
label: '&Window',
role: 'window', role: 'window',
submenu: [ submenu: [
{ role: 'minimize' }, { role: 'minimize' },
@ -52,6 +53,7 @@ const template = [
], ],
}, },
{ {
label: '&Help',
role: 'help', role: 'help',
submenu: [ submenu: [
{ {
@ -122,7 +124,7 @@ if (process.platform === 'darwin') {
]; ];
} else { } else {
template.unshift({ template.unshift({
label: 'File', label: '&File',
submenu: [ submenu: [
// For some reason, 'about' does not seem to work on windows. // For some reason, 'about' does not seem to work on windows.
/*{ /*{