Merge branch 'master' into development
Bringing our development (beta) branch inline with all the more urgent fixes which went directly into the master (production) branch.
This commit is contained in:
commit
9e6d50b966
22 changed files with 1543 additions and 624 deletions
|
@ -7,7 +7,7 @@ function createTemplate(options, messages) {
|
|||
const openForums = options.openForums;
|
||||
|
||||
let template = [{
|
||||
label: 'File',
|
||||
label: messages.mainMenuFile.message,
|
||||
submenu: [
|
||||
{
|
||||
role: 'quit',
|
||||
|
@ -15,7 +15,7 @@ function createTemplate(options, messages) {
|
|||
]
|
||||
},
|
||||
{
|
||||
label: 'Edit',
|
||||
label: messages.mainMenuEdit.message,
|
||||
submenu: [
|
||||
{
|
||||
role: 'undo',
|
||||
|
@ -47,7 +47,7 @@ function createTemplate(options, messages) {
|
|||
]
|
||||
},
|
||||
{
|
||||
label: 'View',
|
||||
label: messages.mainMenuView.message,
|
||||
submenu: [
|
||||
{
|
||||
role: 'resetzoom',
|
||||
|
@ -80,6 +80,7 @@ function createTemplate(options, messages) {
|
|||
]
|
||||
},
|
||||
{
|
||||
label: messages.mainMenuWindow.message,
|
||||
role: 'window',
|
||||
submenu: [
|
||||
{
|
||||
|
@ -88,6 +89,7 @@ function createTemplate(options, messages) {
|
|||
]
|
||||
},
|
||||
{
|
||||
label: messages.mainMenuHelp.message,
|
||||
role: 'help',
|
||||
submenu: [
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue