Fixed #1726: Revamp menu items with correct accelerators. (#1728)

1 files changed, 101 insertions, 400 deletions

diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index 4764d7416..d8050906b 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -5939,952 +5939,653 @@
         }
       },
       {
-        "defaultMessage": "!!!Undo",
+        "defaultMessage": "!!!View",
         "end": {
           "column": 3,
           "line": 26
         },
         "file": "src/lib/Menu.js",
-        "id": "menu.edit.undo",
+        "id": "menu.view",
         "start": {
           "column": 8,
           "line": 23
         }
       },
       {
-        "defaultMessage": "!!!Redo",
-        "end": {
-          "column": 3,
-          "line": 30
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.edit.redo",
-        "start": {
-          "column": 8,
-          "line": 27
-        }
-      },
-      {
-        "defaultMessage": "!!!Cut",
-        "end": {
-          "column": 3,
-          "line": 34
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.edit.cut",
-        "start": {
-          "column": 7,
-          "line": 31
-        }
-      },
-      {
-        "defaultMessage": "!!!Copy",
-        "end": {
-          "column": 3,
-          "line": 38
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.edit.copy",
-        "start": {
-          "column": 8,
-          "line": 35
-        }
-      },
-      {
-        "defaultMessage": "!!!Paste",
-        "end": {
-          "column": 3,
-          "line": 42
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.edit.paste",
-        "start": {
-          "column": 9,
-          "line": 39
-        }
-      },
-      {
-        "defaultMessage": "!!!Paste And Match Style",
-        "end": {
-          "column": 3,
-          "line": 46
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.edit.pasteAndMatchStyle",
-        "start": {
-          "column": 22,
-          "line": 43
-        }
-      },
-      {
-        "defaultMessage": "!!!Delete",
-        "end": {
-          "column": 3,
-          "line": 50
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.edit.delete",
-        "start": {
-          "column": 10,
-          "line": 47
-        }
-      },
-      {
-        "defaultMessage": "!!!Select All",
-        "end": {
-          "column": 3,
-          "line": 54
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.edit.selectAll",
-        "start": {
-          "column": 13,
-          "line": 51
-        }
-      },
-      {
         "defaultMessage": "!!!Find in Page",
         "end": {
           "column": 3,
-          "line": 58
+          "line": 30
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.findInPage",
         "start": {
           "column": 14,
-          "line": 55
+          "line": 27
         }
       },
       {
         "defaultMessage": "!!!Speech",
         "end": {
           "column": 3,
-          "line": 62
+          "line": 34
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.speech",
         "start": {
           "column": 10,
-          "line": 59
+          "line": 31
         }
       },
       {
         "defaultMessage": "!!!Start Speaking",
         "end": {
           "column": 3,
-          "line": 66
+          "line": 38
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.startSpeaking",
         "start": {
           "column": 17,
-          "line": 63
+          "line": 35
         }
       },
       {
         "defaultMessage": "!!!Stop Speaking",
         "end": {
           "column": 3,
-          "line": 70
+          "line": 42
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.stopSpeaking",
         "start": {
           "column": 16,
-          "line": 67
+          "line": 39
         }
       },
       {
         "defaultMessage": "!!!Start Dictation",
         "end": {
           "column": 3,
-          "line": 74
+          "line": 46
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.startDictation",
         "start": {
           "column": 18,
-          "line": 71
+          "line": 43
         }
       },
       {
         "defaultMessage": "!!!Emoji & Symbols",
         "end": {
           "column": 3,
-          "line": 78
+          "line": 50
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.emojiSymbols",
         "start": {
           "column": 16,
-          "line": 75
+          "line": 47
         }
       },
       {
         "defaultMessage": "!!!Open Quick Switch",
         "end": {
           "column": 3,
-          "line": 82
+          "line": 54
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.openQuickSwitch",
         "start": {
           "column": 19,
-          "line": 79
+          "line": 51
         }
       },
       {
         "defaultMessage": "!!!Back",
         "end": {
           "column": 3,
-          "line": 86
+          "line": 58
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.back",
         "start": {
           "column": 8,
-          "line": 83
+          "line": 55
         }
       },
       {
         "defaultMessage": "!!!Forward",
         "end": {
           "column": 3,
-          "line": 90
+          "line": 62
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.forward",
         "start": {
           "column": 11,
-          "line": 87
-        }
-      },
-      {
-        "defaultMessage": "!!!Actual Size",
-        "end": {
-          "column": 3,
-          "line": 94
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.view.resetZoom",
-        "start": {
-          "column": 13,
-          "line": 91
-        }
-      },
-      {
-        "defaultMessage": "!!!Zoom In",
-        "end": {
-          "column": 3,
-          "line": 98
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.view.zoomIn",
-        "start": {
-          "column": 10,
-          "line": 95
-        }
-      },
-      {
-        "defaultMessage": "!!!Zoom Out",
-        "end": {
-          "column": 3,
-          "line": 102
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.view.zoomOut",
-        "start": {
-          "column": 11,
-          "line": 99
-        }
-      },
-      {
-        "defaultMessage": "!!!Enter Full Screen",
-        "end": {
-          "column": 3,
-          "line": 106
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.view.enterFullScreen",
-        "start": {
-          "column": 19,
-          "line": 103
-        }
-      },
-      {
-        "defaultMessage": "!!!Exit Full Screen",
-        "end": {
-          "column": 3,
-          "line": 110
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.view.exitFullScreen",
-        "start": {
-          "column": 18,
-          "line": 107
-        }
-      },
-      {
-        "defaultMessage": "!!!Toggle Full Screen",
-        "end": {
-          "column": 3,
-          "line": 114
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.view.toggleFullScreen",
-        "start": {
-          "column": 20,
-          "line": 111
+          "line": 59
         }
       },
       {
         "defaultMessage": "!!!Toggle Dark Mode",
         "end": {
           "column": 3,
-          "line": 118
+          "line": 66
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.toggleDarkMode",
         "start": {
           "column": 18,
-          "line": 115
+          "line": 63
         }
       },
       {
         "defaultMessage": "!!!Toggle Developer Tools",
         "end": {
           "column": 3,
-          "line": 122
+          "line": 70
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.toggleDevTools",
         "start": {
           "column": 18,
-          "line": 119
+          "line": 67
         }
       },
       {
         "defaultMessage": "!!!Toggle Todos Developer Tools",
         "end": {
           "column": 3,
-          "line": 126
+          "line": 74
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.toggleTodosDevTools",
         "start": {
           "column": 23,
-          "line": 123
+          "line": 71
         }
       },
       {
         "defaultMessage": "!!!Toggle Service Developer Tools",
         "end": {
           "column": 3,
-          "line": 130
+          "line": 78
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.toggleServiceDevTools",
         "start": {
           "column": 25,
-          "line": 127
+          "line": 75
         }
       },
       {
         "defaultMessage": "!!!Reload Service",
         "end": {
           "column": 3,
-          "line": 134
+          "line": 82
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.reloadService",
         "start": {
           "column": 17,
-          "line": 131
+          "line": 79
         }
       },
       {
         "defaultMessage": "!!!Reload Ferdi",
         "end": {
           "column": 3,
-          "line": 138
+          "line": 86
         },
         "file": "src/lib/Menu.js",
-        "id": "menu.view.reloadFranz",
+        "id": "menu.view.reloadFerdi",
         "start": {
           "column": 15,
-          "line": 135
+          "line": 83
         }
       },
       {
         "defaultMessage": "!!!Lock Ferdi",
         "end": {
           "column": 3,
-          "line": 142
+          "line": 90
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.lockFerdi",
         "start": {
           "column": 13,
-          "line": 139
+          "line": 87
         }
       },
       {
         "defaultMessage": "!!!Reload ToDos",
         "end": {
           "column": 3,
-          "line": 146
+          "line": 94
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.reloadTodos",
         "start": {
           "column": 15,
-          "line": 143
-        }
-      },
-      {
-        "defaultMessage": "!!!Minimize",
-        "end": {
-          "column": 3,
-          "line": 150
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.window.minimize",
-        "start": {
-          "column": 12,
-          "line": 147
-        }
-      },
-      {
-        "defaultMessage": "!!!Close",
-        "end": {
-          "column": 3,
-          "line": 154
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.window.close",
-        "start": {
-          "column": 9,
-          "line": 151
+          "line": 91
         }
       },
       {
         "defaultMessage": "!!!Learn More",
         "end": {
           "column": 3,
-          "line": 158
+          "line": 98
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.learnMore",
         "start": {
           "column": 13,
-          "line": 155
+          "line": 95
         }
       },
       {
         "defaultMessage": "!!!Changelog",
         "end": {
           "column": 3,
-          "line": 162
+          "line": 102
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.changelog",
         "start": {
           "column": 13,
-          "line": 159
+          "line": 99
         }
       },
       {
         "defaultMessage": "!!!Support",
         "end": {
           "column": 3,
-          "line": 166
+          "line": 106
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.support",
         "start": {
           "column": 11,
-          "line": 163
+          "line": 103
         }
       },
       {
         "defaultMessage": "!!!Copy Debug Information",
         "end": {
           "column": 3,
-          "line": 170
+          "line": 110
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.debugInfo",
         "start": {
           "column": 13,
-          "line": 167
+          "line": 107
         }
       },
       {
         "defaultMessage": "!!!Publish Debug Information",
         "end": {
           "column": 3,
-          "line": 174
+          "line": 114
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.publishDebugInfo",
         "start": {
           "column": 20,
-          "line": 171
+          "line": 111
         }
       },
       {
         "defaultMessage": "!!!Ferdi Debug Information",
         "end": {
           "column": 3,
-          "line": 178
+          "line": 118
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.debugInfoCopiedHeadline",
         "start": {
           "column": 27,
-          "line": 175
+          "line": 115
         }
       },
       {
         "defaultMessage": "!!!Your Debug Information has been copied to your clipboard.",
         "end": {
           "column": 3,
-          "line": 182
+          "line": 122
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.debugInfoCopiedBody",
         "start": {
           "column": 23,
-          "line": 179
+          "line": 119
         }
       },
       {
         "defaultMessage": "!!!Unlock with Touch ID",
         "end": {
           "column": 3,
-          "line": 186
+          "line": 126
         },
         "file": "src/lib/Menu.js",
         "id": "locked.touchId",
         "start": {
           "column": 11,
-          "line": 183
+          "line": 123
         }
       },
       {
         "defaultMessage": "!!!unlock via Touch ID",
         "end": {
           "column": 3,
-          "line": 190
+          "line": 130
         },
         "file": "src/lib/Menu.js",
         "id": "locked.touchIdPrompt",
         "start": {
           "column": 17,
-          "line": 187
+          "line": 127
         }
       },
       {
         "defaultMessage": "!!!Terms of Service",
         "end": {
           "column": 3,
-          "line": 194
+          "line": 134
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.tos",
         "start": {
           "column": 7,
-          "line": 191
+          "line": 131
         }
       },
       {
         "defaultMessage": "!!!Privacy Statement",
         "end": {
           "column": 3,
-          "line": 198
+          "line": 138
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.privacy",
         "start": {
           "column": 11,
-          "line": 195
+          "line": 135
         }
       },
       {
         "defaultMessage": "!!!File",
         "end": {
           "column": 3,
-          "line": 202
+          "line": 142
         },
         "file": "src/lib/Menu.js",
         "id": "menu.file",
         "start": {
           "column": 8,
-          "line": 199
-        }
-      },
-      {
-        "defaultMessage": "!!!View",
-        "end": {
-          "column": 3,
-          "line": 206
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.view",
-        "start": {
-          "column": 8,
-          "line": 203
+          "line": 139
         }
       },
       {
         "defaultMessage": "!!!Services",
         "end": {
           "column": 3,
-          "line": 210
+          "line": 146
         },
         "file": "src/lib/Menu.js",
         "id": "menu.services",
         "start": {
           "column": 12,
-          "line": 207
-        }
-      },
-      {
-        "defaultMessage": "!!!Window",
-        "end": {
-          "column": 3,
-          "line": 214
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.window",
-        "start": {
-          "column": 10,
-          "line": 211
-        }
-      },
-      {
-        "defaultMessage": "!!!Help",
-        "end": {
-          "column": 3,
-          "line": 218
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.help",
-        "start": {
-          "column": 8,
-          "line": 215
-        }
-      },
-      {
-        "defaultMessage": "!!!About Ferdi",
-        "end": {
-          "column": 3,
-          "line": 222
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.app.about",
-        "start": {
-          "column": 9,
-          "line": 219
+          "line": 143
         }
       },
       {
         "defaultMessage": "!!!What's new?",
         "end": {
           "column": 3,
-          "line": 226
+          "line": 150
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.announcement",
         "start": {
           "column": 16,
-          "line": 223
+          "line": 147
         }
       },
       {
         "defaultMessage": "!!!Settings",
         "end": {
           "column": 3,
-          "line": 230
+          "line": 154
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.settings",
         "start": {
           "column": 12,
-          "line": 227
+          "line": 151
         }
       },
       {
         "defaultMessage": "!!!Check for updates",
         "end": {
           "column": 3,
-          "line": 234
+          "line": 158
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.checkForUpdates",
         "start": {
           "column": 19,
-          "line": 231
-        }
-      },
-      {
-        "defaultMessage": "!!!Hide",
-        "end": {
-          "column": 3,
-          "line": 238
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.app.hide",
-        "start": {
-          "column": 8,
-          "line": 235
-        }
-      },
-      {
-        "defaultMessage": "!!!Hide Others",
-        "end": {
-          "column": 3,
-          "line": 242
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.app.hideOthers",
-        "start": {
-          "column": 14,
-          "line": 239
-        }
-      },
-      {
-        "defaultMessage": "!!!Unhide",
-        "end": {
-          "column": 3,
-          "line": 246
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.app.unhide",
-        "start": {
-          "column": 10,
-          "line": 243
+          "line": 155
         }
       },
       {
         "defaultMessage": "!!!Auto-hide menu bar",
         "end": {
           "column": 3,
-          "line": 250
+          "line": 162
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.autohideMenuBar",
         "start": {
           "column": 19,
-          "line": 247
-        }
-      },
-      {
-        "defaultMessage": "!!!Quit",
-        "end": {
-          "column": 3,
-          "line": 254
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.app.quit",
-        "start": {
-          "column": 8,
-          "line": 251
+          "line": 159
         }
       },
       {
         "defaultMessage": "!!!Add New Service...",
         "end": {
           "column": 3,
-          "line": 258
+          "line": 166
         },
         "file": "src/lib/Menu.js",
         "id": "menu.services.addNewService",
         "start": {
           "column": 17,
-          "line": 255
+          "line": 163
         }
       },
       {
         "defaultMessage": "!!!Add New Workspace...",
         "end": {
           "column": 3,
-          "line": 262
+          "line": 170
         },
         "file": "src/lib/Menu.js",
         "id": "menu.workspaces.addNewWorkspace",
         "start": {
           "column": 19,
-          "line": 259
+          "line": 167
         }
       },
       {
         "defaultMessage": "!!!Open workspace drawer",
         "end": {
           "column": 3,
-          "line": 266
+          "line": 174
         },
         "file": "src/lib/Menu.js",
         "id": "menu.workspaces.openWorkspaceDrawer",
         "start": {
           "column": 23,
-          "line": 263
+          "line": 171
         }
       },
       {
         "defaultMessage": "!!!Close workspace drawer",
         "end": {
           "column": 3,
-          "line": 270
+          "line": 178
         },
         "file": "src/lib/Menu.js",
         "id": "menu.workspaces.closeWorkspaceDrawer",
         "start": {
           "column": 24,
-          "line": 267
+          "line": 175
         }
       },
       {
         "defaultMessage": "!!!Activate next service...",
         "end": {
           "column": 3,
-          "line": 274
+          "line": 182
         },
         "file": "src/lib/Menu.js",
         "id": "menu.services.setNextServiceActive",
         "start": {
           "column": 23,
-          "line": 271
+          "line": 179
         }
       },
       {
         "defaultMessage": "!!!Activate previous service...",
         "end": {
           "column": 3,
-          "line": 278
+          "line": 186
         },
         "file": "src/lib/Menu.js",
         "id": "menu.services.activatePreviousService",
         "start": {
           "column": 27,
-          "line": 275
+          "line": 183
         }
       },
       {
         "defaultMessage": "!!!Disable notifications & audio",
         "end": {
           "column": 3,
-          "line": 282
+          "line": 190
         },
         "file": "src/lib/Menu.js",
         "id": "sidebar.muteApp",
         "start": {
           "column": 11,
-          "line": 279
+          "line": 187
         }
       },
       {
         "defaultMessage": "!!!Enable notifications & audio",
         "end": {
           "column": 3,
-          "line": 286
+          "line": 194
         },
         "file": "src/lib/Menu.js",
         "id": "sidebar.unmuteApp",
         "start": {
           "column": 13,
-          "line": 283
+          "line": 191
         }
       },
       {
         "defaultMessage": "!!!Workspaces",
         "end": {
           "column": 3,
-          "line": 290
+          "line": 198
         },
         "file": "src/lib/Menu.js",
         "id": "menu.workspaces",
         "start": {
           "column": 14,
-          "line": 287
+          "line": 195
         }
       },
       {
         "defaultMessage": "!!!Default",
         "end": {
           "column": 3,
-          "line": 294
+          "line": 202
         },
         "file": "src/lib/Menu.js",
         "id": "menu.workspaces.defaultWorkspace",
         "start": {
           "column": 20,
-          "line": 291
+          "line": 199
         }
       },
       {
         "defaultMessage": "!!!Todos",
         "end": {
           "column": 3,
-          "line": 298
+          "line": 206
         },
         "file": "src/lib/Menu.js",
         "id": "menu.todos",
         "start": {
           "column": 9,
-          "line": 295
+          "line": 203
         }
       },
       {
         "defaultMessage": "!!!Open Todos drawer",
         "end": {
           "column": 3,
-          "line": 302
+          "line": 210
         },
         "file": "src/lib/Menu.js",
         "id": "menu.Todoss.openTodosDrawer",
         "start": {
           "column": 19,
-          "line": 299
+          "line": 207
         }
       },
       {
         "defaultMessage": "!!!Close Todos drawer",
         "end": {
           "column": 3,
-          "line": 306
+          "line": 214
         },
         "file": "src/lib/Menu.js",
         "id": "menu.Todoss.closeTodosDrawer",
         "start": {
           "column": 20,
-          "line": 303
+          "line": 211
         }
       },
       {
         "defaultMessage": "!!!Enable Todos",
         "end": {
           "column": 3,
-          "line": 310
+          "line": 218
         },
         "file": "src/lib/Menu.js",
         "id": "menu.todos.enableTodos",
         "start": {
           "column": 15,
-          "line": 307
+          "line": 215
         }
       },
       {
         "defaultMessage": "!!!Home",
         "end": {
           "column": 3,
-          "line": 314
+          "line": 222
         },
         "file": "src/lib/Menu.js",
         "id": "menu.services.goHome",
         "start": {
           "column": 17,
-          "line": 311
+          "line": 219
         }
       }
     ],