Merge branch 'nightly' into release

11 files changed, 481 insertions, 412 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e25f0b2ab..eff4681b0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,91 @@
+# [v5.6.2-beta.1](https://github.com/getferdi/ferdi/compare/v5.6.1...v5.6.2-beta.1) (2021-09-13)
+
+### Services
+
+- We now have native support for 212 recipes! 💖 @vraravam
+  - 'clockwise' (#692)
+  - 'coinbase' (#697)
+  - 'devRant' (#706)
+  - 'dialpad' (#695)
+  - 'dingtalk' (fixes #416) (#686)
+  - 'drive' (#698)
+  - 'flock' (#688)
+  - 'freshdesk' (#700)
+  - 'hey' (#701)
+  - 'mewe' (fixes #484) (#684)
+  - 'misskey' (#693)
+  - 'plek' (#699)
+  - 'producthunt' (#687)
+  - 'ritetag' (#702)
+  - 'scrumpy' (#689)
+  - 'slowly' (fixes #297) (#690)
+  - 'sococo' (#704)
+  - 'stackoverflow' (#707)
+  - 'teamweek' (#694)
+  - 'tixio' (#691)
+  - 'udemy' (fixes #464) (#696)
+  - 'weekplan' (#705)
+  - 'whereby' (#683)
+  - 'yandex-mail' (fixes #421) (#685)
+- Add indirect count for 'teamleader' recipe. (#703) 💖 @vraravam
+- Merged 'github_enterprise' recipe into 'github' with the extra bits. 💖 @vraravam
+
+### Bug Fixes
+
+- Better implementation of prompting before quitting Ferdi (#1919) 💖 @vraravam
+- Fix broken menu due to referencing old intl value 💖 @mhatvan
+- Fix broken system tray menu (app wasn't quitting) by reverting previous fix 💖 @vraravam
+- Fix unread count in Office365 not working for non-English locales (getferdi/recipes#679) 💖 @vraravam
+- Fix unread count in WhatsApp for non-English locales (getferdi/recipes#680) 💖 @bpwned
+
+### Under the hood
+
+- Reuse method from the core electron framework for the 'About' Dialog 💖 @vraravam
+
+# [v5.6.2-nightly.2](https://github.com/getferdi/ferdi/compare/v5.6.2-nightly.1...v5.6.2-nightly.2) (2021-09-13)
+
+### Services
+
+- We now have native support for 212 recipes! 💖 @vraravam
+  - 'clockwise' (#692)
+  - 'coinbase' (#697)
+  - 'devRant' (#706)
+  - 'dialpad' (#695)
+  - 'dingtalk' (fixes #416) (#686)
+  - 'drive' (#698)
+  - 'flock' (#688)
+  - 'freshdesk' (#700)
+  - 'hey' (#701)
+  - 'mewe' (fixes #484) (#684)
+  - 'misskey' (#693)
+  - 'plek' (#699)
+  - 'producthunt' (#687)
+  - 'ritetag' (#702)
+  - 'scrumpy' (#689)
+  - 'slowly' (fixes #297) (#690)
+  - 'sococo' (#704)
+  - 'stackoverflow' (#707)
+  - 'teamweek' (#694)
+  - 'tixio' (#691)
+  - 'udemy' (fixes #464) (#696)
+  - 'weekplan' (#705)
+  - 'whereby' (#683)
+  - 'yandex-mail' (fixes #421) (#685)
+- Add indirect count for 'teamleader' recipe. (#703) 💖 @vraravam
+- Merged 'github_enterprise' recipe into 'github' with the extra bits. 💖 @vraravam
+
+### Bug fixes
+
+- fix broken menu due to referencing old intl value 💖 @mhatvan
+- fix broken system tray menu (app wasn't quitting) by reverting previous fix 💖 @vraravam
+
+# [v5.6.2-nightly.1](https://github.com/getferdi/ferdi/compare/v5.6.1...v5.6.2-nightly.1) (2021-09-12)
+
+### Bug fixes
+
+- Fix unread count in Office365 not working for non-English locales (getferdi/recipes#679) 💖 @vraravam
+- Fix unread count in WhatsApp for non-English locales (getferdi/recipes#680) 💖 @bpwned
+
 # [v5.6.1](https://github.com/getferdi/ferdi/compare/v5.6.0...v5.6.1) (2021-09-11)
 
 ### Features
diff --git a/package-lock.json b/package-lock.json
index 3d2edf0d3..c70ae5634 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "ferdi",
-  "version": "5.6.1",
+  "version": "5.6.2-nightly.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index accf7f412..1d38d0039 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "productName": "Ferdi",
   "desktopName": "ferdi.desktop",
   "appId": "com.kytwb.ferdi",
-  "version": "5.6.1",
+  "version": "5.6.2-nightly.2",
   "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.",
   "copyright": "kytwb",
   "main": "index.js",
diff --git a/recipes b/recipes
-Subproject 62599c06f4b2039219e282b34a51a4ff4fbe5e6
+Subproject 9db43e100a672b6d6932ac68c0fbe503c129138
diff --git a/src/environment.js b/src/environment.js
index caeada94b..9d7ffaf78 100644
--- a/src/environment.js
+++ b/src/environment.js
@@ -5,7 +5,6 @@ import { is, api as electronApi } from 'electron-util';
 
 import { DEFAULT_ACCENT_COLOR } from '@meetfranz/theme';
 
-import osName from 'os-name';
 import {
   LIVE_FERDI_API,
   DEV_FRANZ_API,
@@ -24,7 +23,6 @@ import {
 } from './config';
 
 import { asarPath } from './helpers/asar-helpers';
-import * as buildInfo from './buildInfo.json'; // eslint-disable-line import/no-unresolved
 
 export const { app } = electronApi;
 export const ferdiVersion = app.getVersion();
@@ -171,18 +169,5 @@ export const DEFAULT_APP_SETTINGS = {
   searchEngine: SEARCH_ENGINE_DDG,
   useVerticalStyle: false,
   alwaysShowWorkspaces: false,
+  liftSingleInstanceLock: false,
 };
-
-export function aboutAppDetails() {
-  return [
-    `Version: ${ferdiVersion}`,
-    `Electron: ${electronVersion}`,
-    `Chrome: ${chromeVersion}`,
-    `Node.js: ${nodeVersion}`,
-    `Platform: ${osName()}`,
-    `Arch: ${process.arch}`,
-    `Build date: ${new Date(Number(buildInfo.timestamp))}`,
-    `Git SHA: ${buildInfo.gitHashShort}`,
-    `Git branch: ${buildInfo.gitBranch}`,
-  ].join('\n');
-}
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index 7624168ba..3a41c66f6 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -5950,910 +5950,910 @@
         "defaultMessage": "!!!Edit",
         "end": {
           "column": 3,
-          "line": 36
+          "line": 35
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit",
         "start": {
           "column": 8,
-          "line": 33
+          "line": 32
         }
       },
       {
         "defaultMessage": "!!!Undo",
         "end": {
           "column": 3,
-          "line": 40
+          "line": 39
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.undo",
         "start": {
           "column": 8,
-          "line": 37
+          "line": 36
         }
       },
       {
         "defaultMessage": "!!!Redo",
         "end": {
           "column": 3,
-          "line": 44
+          "line": 43
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.redo",
         "start": {
           "column": 8,
-          "line": 41
+          "line": 40
         }
       },
       {
         "defaultMessage": "!!!Cut",
         "end": {
           "column": 3,
-          "line": 48
+          "line": 47
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.cut",
         "start": {
           "column": 7,
-          "line": 45
+          "line": 44
         }
       },
       {
         "defaultMessage": "!!!Copy",
         "end": {
           "column": 3,
-          "line": 52
+          "line": 51
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.copy",
         "start": {
           "column": 8,
-          "line": 49
+          "line": 48
         }
       },
       {
         "defaultMessage": "!!!Paste",
         "end": {
           "column": 3,
-          "line": 56
+          "line": 55
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.paste",
         "start": {
           "column": 9,
-          "line": 53
+          "line": 52
         }
       },
       {
         "defaultMessage": "!!!Paste And Match Style",
         "end": {
           "column": 3,
-          "line": 60
+          "line": 59
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.pasteAndMatchStyle",
         "start": {
           "column": 22,
-          "line": 57
+          "line": 56
         }
       },
       {
         "defaultMessage": "!!!Delete",
         "end": {
           "column": 3,
-          "line": 64
+          "line": 63
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.delete",
         "start": {
           "column": 10,
-          "line": 61
+          "line": 60
         }
       },
       {
         "defaultMessage": "!!!Select All",
         "end": {
           "column": 3,
-          "line": 68
+          "line": 67
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.selectAll",
         "start": {
           "column": 13,
-          "line": 65
+          "line": 64
         }
       },
       {
         "defaultMessage": "!!!Find in Page",
         "end": {
           "column": 3,
-          "line": 72
+          "line": 71
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.findInPage",
         "start": {
           "column": 14,
-          "line": 69
+          "line": 68
         }
       },
       {
         "defaultMessage": "!!!Speech",
         "end": {
           "column": 3,
-          "line": 76
+          "line": 75
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.speech",
         "start": {
           "column": 10,
-          "line": 73
+          "line": 72
         }
       },
       {
         "defaultMessage": "!!!Start Speaking",
         "end": {
           "column": 3,
-          "line": 80
+          "line": 79
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.startSpeaking",
         "start": {
           "column": 17,
-          "line": 77
+          "line": 76
         }
       },
       {
         "defaultMessage": "!!!Stop Speaking",
         "end": {
           "column": 3,
-          "line": 84
+          "line": 83
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.stopSpeaking",
         "start": {
           "column": 16,
-          "line": 81
+          "line": 80
         }
       },
       {
         "defaultMessage": "!!!Start Dictation",
         "end": {
           "column": 3,
-          "line": 88
+          "line": 87
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.startDictation",
         "start": {
           "column": 18,
-          "line": 85
+          "line": 84
         }
       },
       {
         "defaultMessage": "!!!Emoji & Symbols",
         "end": {
           "column": 3,
-          "line": 92
+          "line": 91
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.emojiSymbols",
         "start": {
           "column": 16,
-          "line": 89
+          "line": 88
         }
       },
       {
         "defaultMessage": "!!!Open Quick Switch",
         "end": {
           "column": 3,
-          "line": 96
+          "line": 95
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.openQuickSwitch",
         "start": {
           "column": 19,
-          "line": 93
+          "line": 92
         }
       },
       {
         "defaultMessage": "!!!Back",
         "end": {
           "column": 3,
-          "line": 100
+          "line": 99
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.back",
         "start": {
           "column": 8,
-          "line": 97
+          "line": 96
         }
       },
       {
         "defaultMessage": "!!!Forward",
         "end": {
           "column": 3,
-          "line": 104
+          "line": 103
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.forward",
         "start": {
           "column": 11,
-          "line": 101
+          "line": 100
         }
       },
       {
         "defaultMessage": "!!!Actual Size",
         "end": {
           "column": 3,
-          "line": 108
+          "line": 107
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.resetZoom",
         "start": {
           "column": 13,
-          "line": 105
+          "line": 104
         }
       },
       {
         "defaultMessage": "!!!Zoom In",
         "end": {
           "column": 3,
-          "line": 112
+          "line": 111
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.zoomIn",
         "start": {
           "column": 10,
-          "line": 109
+          "line": 108
         }
       },
       {
         "defaultMessage": "!!!Zoom Out",
         "end": {
           "column": 3,
-          "line": 116
+          "line": 115
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.zoomOut",
         "start": {
           "column": 11,
-          "line": 113
+          "line": 112
         }
       },
       {
         "defaultMessage": "!!!Toggle Full Screen",
         "end": {
           "column": 3,
-          "line": 120
+          "line": 119
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.toggleFullScreen",
         "start": {
           "column": 20,
-          "line": 117
+          "line": 116
         }
       },
       {
         "defaultMessage": "!!!Toggle Dark Mode",
         "end": {
           "column": 3,
-          "line": 124
+          "line": 123
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.toggleDarkMode",
         "start": {
           "column": 18,
-          "line": 121
+          "line": 120
         }
       },
       {
         "defaultMessage": "!!!Toggle Developer Tools",
         "end": {
           "column": 3,
-          "line": 128
+          "line": 127
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.toggleDevTools",
         "start": {
           "column": 18,
-          "line": 125
+          "line": 124
         }
       },
       {
         "defaultMessage": "!!!Toggle Todos Developer Tools",
         "end": {
           "column": 3,
-          "line": 132
+          "line": 131
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.toggleTodosDevTools",
         "start": {
           "column": 23,
-          "line": 129
+          "line": 128
         }
       },
       {
         "defaultMessage": "!!!Toggle Service Developer Tools",
         "end": {
           "column": 3,
-          "line": 136
+          "line": 135
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.toggleServiceDevTools",
         "start": {
           "column": 25,
-          "line": 133
+          "line": 132
         }
       },
       {
         "defaultMessage": "!!!Reload Service",
         "end": {
           "column": 3,
-          "line": 140
+          "line": 139
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.reloadService",
         "start": {
           "column": 17,
-          "line": 137
+          "line": 136
         }
       },
       {
         "defaultMessage": "!!!Reload Ferdi",
         "end": {
           "column": 3,
-          "line": 144
+          "line": 143
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.reloadFerdi",
         "start": {
           "column": 15,
-          "line": 141
+          "line": 140
         }
       },
       {
         "defaultMessage": "!!!Lock Ferdi",
         "end": {
           "column": 3,
-          "line": 148
+          "line": 147
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.lockFerdi",
         "start": {
           "column": 13,
-          "line": 145
+          "line": 144
         }
       },
       {
         "defaultMessage": "!!!Reload ToDos",
         "end": {
           "column": 3,
-          "line": 152
+          "line": 151
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.reloadTodos",
         "start": {
           "column": 15,
-          "line": 149
+          "line": 148
         }
       },
       {
         "defaultMessage": "!!!Minimize",
         "end": {
           "column": 3,
-          "line": 156
+          "line": 155
         },
         "file": "src/lib/Menu.js",
         "id": "menu.window.minimize",
         "start": {
           "column": 12,
-          "line": 153
+          "line": 152
         }
       },
       {
         "defaultMessage": "!!!Close",
         "end": {
           "column": 3,
-          "line": 160
+          "line": 159
         },
         "file": "src/lib/Menu.js",
         "id": "menu.window.close",
         "start": {
           "column": 9,
-          "line": 157
+          "line": 156
         }
       },
       {
         "defaultMessage": "!!!Learn More",
         "end": {
           "column": 3,
-          "line": 164
+          "line": 163
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.learnMore",
         "start": {
           "column": 13,
-          "line": 161
+          "line": 160
         }
       },
       {
         "defaultMessage": "!!!Changelog",
         "end": {
           "column": 3,
-          "line": 168
+          "line": 167
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.changelog",
         "start": {
           "column": 13,
-          "line": 165
+          "line": 164
         }
       },
       {
         "defaultMessage": "!!!Import/Export Configuration Data",
         "end": {
           "column": 3,
-          "line": 172
+          "line": 171
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.importExportData",
         "start": {
           "column": 20,
-          "line": 169
+          "line": 168
         }
       },
       {
         "defaultMessage": "!!!Support",
         "end": {
           "column": 3,
-          "line": 176
+          "line": 175
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.support",
         "start": {
           "column": 11,
-          "line": 173
+          "line": 172
         }
       },
       {
         "defaultMessage": "!!!Copy Debug Information",
         "end": {
           "column": 3,
-          "line": 180
+          "line": 179
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.debugInfo",
         "start": {
           "column": 13,
-          "line": 177
+          "line": 176
         }
       },
       {
         "defaultMessage": "!!!Publish Debug Information",
         "end": {
           "column": 3,
-          "line": 184
+          "line": 183
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.publishDebugInfo",
         "start": {
           "column": 20,
-          "line": 181
+          "line": 180
         }
       },
       {
         "defaultMessage": "!!!Ferdi Debug Information",
         "end": {
           "column": 3,
-          "line": 188
+          "line": 187
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.debugInfoCopiedHeadline",
         "start": {
           "column": 27,
-          "line": 185
+          "line": 184
         }
       },
       {
         "defaultMessage": "!!!Your Debug Information has been copied to your clipboard.",
         "end": {
           "column": 3,
-          "line": 193
+          "line": 192
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.debugInfoCopiedBody",
         "start": {
           "column": 23,
-          "line": 189
+          "line": 188
         }
       },
       {
         "defaultMessage": "!!!Unlock with Touch ID",
         "end": {
           "column": 3,
-          "line": 197
+          "line": 196
         },
         "file": "src/lib/Menu.js",
         "id": "locked.touchId",
         "start": {
           "column": 11,
-          "line": 194
+          "line": 193
         }
       },
       {
         "defaultMessage": "!!!unlock via Touch ID",
         "end": {
           "column": 3,
-          "line": 201
+          "line": 200
         },
         "file": "src/lib/Menu.js",
         "id": "locked.touchIdPrompt",
         "start": {
           "column": 17,
-          "line": 198
+          "line": 197
         }
       },
       {
         "defaultMessage": "!!!Terms of Service",
         "end": {
           "column": 3,
-          "line": 205
+          "line": 204
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.tos",
         "start": {
           "column": 7,
-          "line": 202
+          "line": 201
         }
       },
       {
         "defaultMessage": "!!!Privacy Statement",
         "end": {
           "column": 3,
-          "line": 209
+          "line": 208
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.privacy",
         "start": {
           "column": 11,
-          "line": 206
+          "line": 205
         }
       },
       {
         "defaultMessage": "!!!File",
         "end": {
           "column": 3,
-          "line": 213
+          "line": 212
         },
         "file": "src/lib/Menu.js",
         "id": "menu.file",
         "start": {
           "column": 8,
-          "line": 210
+          "line": 209
         }
       },
       {
         "defaultMessage": "!!!View",
         "end": {
           "column": 3,
-          "line": 217
+          "line": 216
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view",
         "start": {
           "column": 8,
-          "line": 214
+          "line": 213
         }
       },
       {
         "defaultMessage": "!!!Services",
         "end": {
           "column": 3,
-          "line": 221
+          "line": 220
         },
         "file": "src/lib/Menu.js",
         "id": "menu.services",
         "start": {
           "column": 12,
-          "line": 218
+          "line": 217
         }
       },
       {
         "defaultMessage": "!!!Window",
         "end": {
           "column": 3,
-          "line": 225
+          "line": 224
         },
         "file": "src/lib/Menu.js",
         "id": "menu.window",
         "start": {
           "column": 10,
-          "line": 222
+          "line": 221
         }
       },
       {
         "defaultMessage": "!!!Help",
         "end": {
           "column": 3,
-          "line": 229
+          "line": 228
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help",
         "start": {
           "column": 8,
-          "line": 226
+          "line": 225
         }
       },
       {
         "defaultMessage": "!!!About Ferdi",
         "end": {
           "column": 3,
-          "line": 233
+          "line": 232
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.about",
         "start": {
           "column": 9,
-          "line": 230
+          "line": 229
         }
       },
       {
         "defaultMessage": "!!!Check for updates",
         "end": {
           "column": 3,
-          "line": 237
+          "line": 236
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.checkForUpdates",
         "start": {
           "column": 19,
-          "line": 234
+          "line": 233
         }
       },
       {
         "defaultMessage": "!!!Hide",
         "end": {
           "column": 3,
-          "line": 241
+          "line": 240
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.hide",
         "start": {
           "column": 8,
-          "line": 238
+          "line": 237
         }
       },
       {
         "defaultMessage": "!!!Hide Others",
         "end": {
           "column": 3,
-          "line": 245
+          "line": 244
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.hideOthers",
         "start": {
           "column": 14,
-          "line": 242
+          "line": 241
         }
       },
       {
         "defaultMessage": "!!!Unhide",
         "end": {
           "column": 3,
-          "line": 249
+          "line": 248
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.unhide",
         "start": {
           "column": 10,
-          "line": 246
+          "line": 245
         }
       },
       {
         "defaultMessage": "!!!Auto-hide menu bar",
         "end": {
           "column": 3,
-          "line": 253
+          "line": 252
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.autohideMenuBar",
         "start": {
           "column": 19,
-          "line": 250
+          "line": 249
         }
       },
       {
         "defaultMessage": "!!!Add New Service...",
         "end": {
           "column": 3,
-          "line": 257
+          "line": 256
         },
         "file": "src/lib/Menu.js",
         "id": "menu.services.addNewService",
         "start": {
           "column": 17,
-          "line": 254
+          "line": 253
         }
       },
       {
         "defaultMessage": "!!!Add New Workspace...",
         "end": {
           "column": 3,
-          "line": 261
+          "line": 260
         },
         "file": "src/lib/Menu.js",
         "id": "menu.workspaces.addNewWorkspace",
         "start": {
           "column": 19,
-          "line": 258
+          "line": 257
         }
       },
       {
         "defaultMessage": "!!!Open workspace drawer",
         "end": {
           "column": 3,
-          "line": 265
+          "line": 264
         },
         "file": "src/lib/Menu.js",
         "id": "menu.workspaces.openWorkspaceDrawer",
         "start": {
           "column": 23,
-          "line": 262
+          "line": 261
         }
       },
       {
         "defaultMessage": "!!!Close workspace drawer",
         "end": {
           "column": 3,
-          "line": 269
+          "line": 268
         },
         "file": "src/lib/Menu.js",
         "id": "menu.workspaces.closeWorkspaceDrawer",
         "start": {
           "column": 24,
-          "line": 266
+          "line": 265
         }
       },
       {
         "defaultMessage": "!!!Activate next service...",
         "end": {
           "column": 3,
-          "line": 273
+          "line": 272
         },
         "file": "src/lib/Menu.js",
         "id": "menu.services.setNextServiceActive",
         "start": {
           "column": 23,
-          "line": 270
+          "line": 269
         }
       },
       {
         "defaultMessage": "!!!Activate previous service...",
         "end": {
           "column": 3,
-          "line": 277
+          "line": 276
         },
         "file": "src/lib/Menu.js",
         "id": "menu.services.activatePreviousService",
         "start": {
           "column": 27,
-          "line": 274
+          "line": 273
         }
       },
       {
         "defaultMessage": "!!!Disable notifications & audio",
         "end": {
           "column": 3,
-          "line": 281
+          "line": 280
         },
         "file": "src/lib/Menu.js",
         "id": "sidebar.muteApp",
         "start": {
           "column": 11,
-          "line": 278
+          "line": 277
         }
       },
       {
         "defaultMessage": "!!!Enable notifications & audio",
         "end": {
           "column": 3,
-          "line": 285
+          "line": 284
         },
         "file": "src/lib/Menu.js",
         "id": "sidebar.unmuteApp",
         "start": {
           "column": 13,
-          "line": 282
+          "line": 281
         }
       },
       {
         "defaultMessage": "!!!Workspaces",
         "end": {
           "column": 3,
-          "line": 289
+          "line": 288
         },
         "file": "src/lib/Menu.js",
         "id": "menu.workspaces",
         "start": {
           "column": 14,
-          "line": 286
+          "line": 285
         }
       },
       {
         "defaultMessage": "!!!Default",
         "end": {
           "column": 3,
-          "line": 293
+          "line": 292
         },
         "file": "src/lib/Menu.js",
         "id": "menu.workspaces.defaultWorkspace",
         "start": {
           "column": 20,
-          "line": 290
+          "line": 289
         }
       },
       {
         "defaultMessage": "!!!Todos",
         "end": {
           "column": 3,
-          "line": 297
+          "line": 296
         },
         "file": "src/lib/Menu.js",
         "id": "menu.todos",
         "start": {
           "column": 9,
-          "line": 294
+          "line": 293
         }
       },
       {
         "defaultMessage": "!!!Open Todos drawer",
         "end": {
           "column": 3,
-          "line": 301
+          "line": 300
         },
         "file": "src/lib/Menu.js",
         "id": "menu.Todoss.openTodosDrawer",
         "start": {
           "column": 19,
-          "line": 298
+          "line": 297
         }
       },
       {
         "defaultMessage": "!!!Close Todos drawer",
         "end": {
           "column": 3,
-          "line": 305
+          "line": 304
         },
         "file": "src/lib/Menu.js",
         "id": "menu.Todoss.closeTodosDrawer",
         "start": {
           "column": 20,
-          "line": 302
+          "line": 301
         }
       },
       {
         "defaultMessage": "!!!Enable Todos",
         "end": {
           "column": 3,
-          "line": 309
+          "line": 308
         },
         "file": "src/lib/Menu.js",
         "id": "menu.todos.enableTodos",
         "start": {
           "column": 15,
-          "line": 306
+          "line": 305
         }
       },
       {
         "defaultMessage": "!!!Home",
         "end": {
           "column": 3,
-          "line": 313
+          "line": 312
         },
         "file": "src/lib/Menu.js",
         "id": "menu.services.goHome",
         "start": {
           "column": 17,
-          "line": 310
+          "line": 309
         }
       }
     ],
diff --git a/src/i18n/locales/pl.json b/src/i18n/locales/pl.json
index 39b72e367..ea37ec76c 100644
--- a/src/i18n/locales/pl.json
+++ b/src/i18n/locales/pl.json
@@ -9,7 +9,7 @@
   "connectionLostBanner.cta": "Przeładuj usługę",
   "connectionLostBanner.informationLink": "Co się stało?",
   "connectionLostBanner.message": "O nie! Ferdi stracił połączenie z {name}.",
-  "feature.basicAuth.signIn": "Sign In",
+  "feature.basicAuth.signIn": "Zaloguj się",
   "feature.debugger.title": "Opublikuj dane diagnostyczne",
   "feature.nightlyBuilds.activate": "Aktywuj",
   "feature.nightlyBuilds.info": "Kompilacje testowe to wysoce eksperymentalne wersje Ferdi, które mogą zawierać niedopracowane lub nieukończone funkcje. Te kompilacje są przewidziane głównie dla programistów testujących nowe funkcje będące w opracowaniu oraz ostateczne działanie ukończonej kompilacji. Jeśli nie masz pewności co do tej funkcji, zalecamy nie włączać wersji testowych.",
@@ -27,26 +27,26 @@
   "global.api.unhealthy": "Nie można połączyć się z usługami Ferdi online",
   "global.cancel": "Anuluj",
   "global.edit": "Edytuj",
-  "global.no": "No",
+  "global.no": "Nie",
   "global.notConnectedToTheInternet": "Nie masz połączenia z Internetem.",
   "global.ok": "Ok",
-  "global.quit": "Quit",
-  "global.quitConfirmation": "Do you really want to quit Ferdi?",
-  "global.save": "Save",
+  "global.quit": "Wyjdź",
+  "global.quitConfirmation": "Czy napewno chcesz wyjść z Ferdi?",
+  "global.save": "Zapisz",
   "global.settings": "Ustawienia",
   "global.spellchecker.useDefault": "Użyj domyślnego dla systemu ({default})",
   "global.spellchecking.autodetect": "Automatycznie wykryj język",
   "global.spellchecking.autodetect.short": "Automatycznie",
   "global.spellchecking.language": "Język sprawdzania pisowni",
-  "global.submit": "Wyślij",
-  "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
-  "global.userAgentPref": "User Agent",
-  "global.yes": "Yes",
+  "global.submit": "Prześlij",
+  "global.userAgentHelp": "Użyj 'https://whatmyuseragent.com/' (aby odkryć) lub 'https://developers.whatismybrowser.com/useragents/explore/' (aby wybrać) swój user-agent i skopiuj go tutaj.",
+  "global.userAgentPref": "User-Agent",
+  "global.yes": "Tak",
   "import.headline": "Importuj usługi Ferdi 4",
   "import.notSupportedHeadline": "Usługi, które nie są jeszcze obsługiwane w Ferdi 5",
   "import.skip.label": "Chcę dodać usługi samodzielnie",
   "import.submit.label": "Zaimportuj usługi",
-  "infobar.authRequestFailed": "There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.",
+  "infobar.authRequestFailed": "Pojawiły się błędy podczas próby uwierzytelniania. Proszę spróbuj się wylogować i zalogować ponownie, jeśli ten błąd będzie się powtarzał.",
   "infobar.buttonChangelog": "Co nowego?",
   "infobar.buttonInstallUpdate": "Uruchom ponownie i zainstaluj aktualizację",
   "infobar.buttonReloadServices": "Odśwież usługi",
@@ -87,30 +87,30 @@
   "menu.app.autohideMenuBar": "Automatycznie ukrywaj pasek menu",
   "menu.app.checkForUpdates": "Sprawdź aktualizacje",
   "menu.app.hide": "Ukryj",
-  "menu.app.hideOthers": "Hide Others",
-  "menu.app.unhide": "Unhide",
+  "menu.app.hideOthers": "Ukryj pozostałe",
+  "menu.app.unhide": "Pokaż",
   "menu.edit": "Edytuj",
-  "menu.edit.copy": "Copy",
-  "menu.edit.cut": "Cut",
+  "menu.edit.copy": "Kopiuj",
+  "menu.edit.cut": "Wytnij",
   "menu.edit.delete": "Usuń",
   "menu.edit.emojiSymbols": "Emoji i symbole",
   "menu.edit.findInPage": "Znajdź na stronie",
-  "menu.edit.paste": "Paste",
-  "menu.edit.pasteAndMatchStyle": "Paste And Match Style",
-  "menu.edit.redo": "Redo",
-  "menu.edit.selectAll": "Select All",
+  "menu.edit.paste": "Wklej",
+  "menu.edit.pasteAndMatchStyle": "Wklej i Dopasuj Styl",
+  "menu.edit.redo": "Ponów",
+  "menu.edit.selectAll": "Zaznacz wszystko",
   "menu.edit.speech": "Mowa",
   "menu.edit.startDictation": "Zacznij dyktować",
   "menu.edit.startSpeaking": "Zacznij mówić",
   "menu.edit.stopSpeaking": "Przestań mówić",
-  "menu.edit.undo": "Undo",
+  "menu.edit.undo": "Cofnij",
   "menu.file": "Plik",
-  "menu.help": "Help",
+  "menu.help": "Pomoc",
   "menu.help.changelog": "Lista zmian",
   "menu.help.debugInfo": "Kopiuj dane diagnostyczne",
   "menu.help.debugInfoCopiedBody": "Dane diagnostyczne zostały skopiowane do schowka.",
   "menu.help.debugInfoCopiedHeadline": "Dane diagnostyczne",
-  "menu.help.importExportData": "Import/Export Configuration Data",
+  "menu.help.importExportData": "Importuj/Eksportuj Dane Konfiguracyjne",
   "menu.help.learnMore": "Dowiedz się więcej",
   "menu.help.privacy": "Polityka prywatności",
   "menu.help.publishDebugInfo": "Opublikuj dane diagnostyczne",
@@ -128,20 +128,20 @@
   "menu.view.forward": "Prześlij dalej",
   "menu.view.lockFerdi": "Zablokuj Ferdi",
   "menu.view.openQuickSwitch": "Otwórz Quick Switch",
-  "menu.view.reloadFerdi": "Reload Ferdi",
+  "menu.view.reloadFerdi": "Przeładuj Ferdi",
   "menu.view.reloadService": "Przeładuj usługę",
   "menu.view.reloadTodos": "Odśwież Zadania",
-  "menu.view.resetZoom": "Actual Size",
+  "menu.view.resetZoom": "Rozmiar rzeczywisty",
   "menu.view.toggleDarkMode": "Tryb ciemny",
   "menu.view.toggleDevTools": "Pokaż narzędzia developerskie",
-  "menu.view.toggleFullScreen": "Toggle Full Screen",
+  "menu.view.toggleFullScreen": "Przełącz Tryb Pełnoekranowy",
   "menu.view.toggleServiceDevTools": "Włącz narzędzia developerskie usługi",
   "menu.view.toggleTodosDevTools": "Przełącz narzędzia deweloperskie Listy zadań",
-  "menu.view.zoomIn": "Zoom In",
-  "menu.view.zoomOut": "Zoom Out",
-  "menu.window": "Window",
-  "menu.window.close": "Close",
-  "menu.window.minimize": "Minimize",
+  "menu.view.zoomIn": "Powiększ",
+  "menu.view.zoomOut": "Pomniejsz",
+  "menu.window": "Okno",
+  "menu.window.close": "Zamknij",
+  "menu.window.minimize": "Minimalizuj",
   "menu.workspaces": "Obszary robocze",
   "menu.workspaces.addNewWorkspace": "Dodaj nowy obszar roboczy...",
   "menu.workspaces.closeWorkspaceDrawer": "Zamknij edytor obszaru roboczego",
@@ -156,9 +156,9 @@
   "pricing.features.accountSync": "Synchronizacja konta",
   "pricing.features.customWebsites": "Dodawanie dowolnych stron internetowych",
   "pricing.features.desktopNotifications": "Powiadomienia na pulpicie",
-  "pricing.features.onPremise": "On-premise & other Hosted Services",
+  "pricing.features.onPremise": "Lokalne i inne hostowane usługi",
   "pricing.features.recipes": "Wybierz spośród ponad 70 usług",
-  "pricing.features.serviceProxies": "Service Proxies",
+  "pricing.features.serviceProxies": "Proxy usługi",
   "pricing.features.spellchecker": "Obsługa sprawdzania pisowni",
   "pricing.features.teamManagement": "Zarządzanie zespołem",
   "pricing.features.thirdPartyServices": "Instalacja zewnętrznych usług",
@@ -202,7 +202,7 @@
   "settings.app.accentColorInfo": "Zdefiniuj kolor akcentu w formacie zgodnym z CSS. (Domyślnie: {defaultAccentColor})",
   "settings.app.buttonClearAllCache": "Wyczyść pamięć podręczną (cache)",
   "settings.app.buttonInstallUpdate": "Uruchom ponownie i zainstaluj aktualizację",
-  "settings.app.buttonOpenFerdiProfileFolder": "Open Profile folder",
+  "settings.app.buttonOpenFerdiProfileFolder": "Pokaż folder z profilami",
   "settings.app.buttonOpenFerdiServiceRecipesFolder": "Open Service Recipes folder",
   "settings.app.buttonSearchForUpdate": "Sprawdź aktualizacje",
   "settings.app.cacheInfo": "Pamięć podręczna zajmuje obecnie {size} przestrzeni dyskowej",
@@ -218,7 +218,7 @@
   "settings.app.form.beta": "Uwzględnij wersje beta",
   "settings.app.form.clipboardNotifications": "Nie wyświetlaj powiadomień dla schowka",
   "settings.app.form.closeToSystemTray": "Zminimalizuj Ferdi do paska zadań",
-  "settings.app.form.confirmOnQuit": "Confirm when quitting Ferdi",
+  "settings.app.form.confirmOnQuit": "Potwierdź podczas opuszczania Ferdi",
   "settings.app.form.customTodoServer": "Własny serwer listy zadań",
   "settings.app.form.darkMode": "Włącz tryb ciemny",
   "settings.app.form.enableGPUAcceleration": "Włącz akcelerację GPU",
@@ -228,7 +228,7 @@
   "settings.app.form.enableSystemTray": "Pokaż Ferdia w obszarze powiadomień",
   "settings.app.form.enableTodos": "Włącz Zadania Ferdi",
   "settings.app.form.hibernateOnStartup": "Hibernacja usług po starcie systemu",
-  "settings.app.form.hibernationStrategy": "Hibernation strategy",
+  "settings.app.form.hibernationStrategy": "Strategia hibernacji",
   "settings.app.form.iconSize": "Rozmiar ikony usługi",
   "settings.app.form.inactivityLock": "Zablokuj przy braku aktywności",
   "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
@@ -237,8 +237,8 @@
   "settings.app.form.minimizeToSystemTray": "Zminimalizuj aplikację Ferdi",
   "settings.app.form.navigationBarBehaviour": "Zachowanie paska nawigacji",
   "settings.app.form.notifyTaskBarOnMessage": "Notify TaskBar/Dock on new message",
-  "settings.app.form.passwordToggle": "Password toggle",
-  "settings.app.form.predefinedTodoServer": "Todo Server",
+  "settings.app.form.passwordToggle": "Przełącznik hasła",
+  "settings.app.form.predefinedTodoServer": "Serwer Todo",
   "settings.app.form.privateNotifications": "Nie pokazuj treści wiadomości w powiadomieniach",
   "settings.app.form.reloadAfterResume": "Odśwież Ferdi po wznowieniu systemu",
   "settings.app.form.runInBackground": "Zachowaj aplikację Ferdi w tle po zamknięciu okna",
@@ -254,8 +254,8 @@
   "settings.app.form.startMinimized": "Uruchom zminimalizowany",
   "settings.app.form.universalDarkMode": "Włącz uniwersalny tryb ciemny",
   "settings.app.form.useTouchIdToUnlock": "Zezwól na odblokowanie Ferdi przez Touch ID",
-  "settings.app.form.useVerticalStyle": "Use horizontal style",
-  "settings.app.form.wakeUpStrategy": "Wake up strategy",
+  "settings.app.form.useVerticalStyle": "Użyj stylu poziomego",
+  "settings.app.form.wakeUpStrategy": "Strategia wybudzania",
   "settings.app.headlineAdvanced": "Zaawansowane",
   "settings.app.headlineAppearance": "Wygląd",
   "settings.app.headlineGeneral": "Ogólne",
@@ -274,7 +274,7 @@
   "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data!",
   "settings.app.spellCheckerLanguageInfo": "Ferdi używa sprawdzania pisowni wbudowanego w Twojego Maca do sprawdzania pomyłek. Aby zmienić języki ze sprawdzaniem pisowni, przejdź do Preferencji systemowych swojego Maca.",
   "settings.app.subheadlineCache": "Pamięć podręczna",
-  "settings.app.subheadlineFerdiProfile": "Ferdi Profile",
+  "settings.app.subheadlineFerdiProfile": "Profil Ferdi",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
   "settings.app.translationHelp": "Pomóż nam tłumaczyć Ferdi na Twój język.",
   "settings.app.universalDarkModeInfo": "Uniwersalny tryb ciemny próbuje dynamicznie generować tryb ciemny dla usług, które jeszcze go nie wspierają.",
@@ -362,18 +362,18 @@
   "settings.supportFerdi.aboutIntro": "<p>Ferdi is an open-source and a community-lead application.</p><p>Thanks to the people who make this possbile:</p>",
   "settings.supportFerdi.bannerText": "Do you want to help us improve Ferdi?",
   "settings.supportFerdi.headline": "O Ferdi",
-  "settings.supportFerdi.openSurvey": "Open survey",
+  "settings.supportFerdi.openSurvey": "Otwarta ankieta",
   "settings.supportFerdi.textDonation": "If you feel like supporting Ferdi development with a donation, you can do so on both,",
-  "settings.supportFerdi.textDonationAnd": "and",
+  "settings.supportFerdi.textDonationAnd": "i",
   "settings.supportFerdi.textExpenses": "While volunteers do most of the work, we still need to pay for servers and certificates. As a community, we are fully transparent on funds we collect and spend - see our",
-  "settings.supportFerdi.textGitHubSponsors": "GitHub Sponsors",
+  "settings.supportFerdi.textGitHubSponsors": "Sponsor na Guthub",
   "settings.supportFerdi.textListContributors": "Pełna lista współtwórców",
   "settings.supportFerdi.textListContributorsHere": "tutaj",
   "settings.supportFerdi.textOpenCollective": "Open Collective",
   "settings.supportFerdi.textSupportWelcome": "Doceniamy każde wsparcie. Listę rzeczy, z którymi potrzebujemy pomocy znajdziesz",
   "settings.supportFerdi.textSupportWelcomeHere": "tutaj",
   "settings.supportFerdi.textVolunteers": "The development of Ferdi is done by volunteers. People who use Ferdi like you. They maintain, fix, and improve Ferdi in their spare time.",
-  "settings.supportFerdi.title": "Do you like Ferdi?",
+  "settings.supportFerdi.title": "Lubisz Ferdi?",
   "settings.team.contentHeadline": "Franz Team Management",
   "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   "settings.team.headline": "Zespół",
@@ -439,9 +439,9 @@
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Aktywuj powiadomienia",
   "tabs.item.enableService": "Aktywuj usługę",
-  "tabs.item.hibernateService": "Hibernate service",
+  "tabs.item.hibernateService": "Hibernuj usługę",
   "tabs.item.reload": "Odśwież",
-  "tabs.item.wakeUpService": "Wake up service",
+  "tabs.item.wakeUpService": "Wybudź usługę",
   "validation.email": "Pole {field} nie jest poprawne",
   "validation.minLength": "Pole {field} powinno składać się z co najmniej {length} znaków",
   "validation.oneRequired": "Przynajmniej jeden jest wymagany",
diff --git a/src/i18n/messages/src/lib/Menu.json b/src/i18n/messages/src/lib/Menu.json
index 947ce8b6a..35f2e3b7b 100644
--- a/src/i18n/messages/src/lib/Menu.json
+++ b/src/i18n/messages/src/lib/Menu.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Edit",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 33,
+      "line": 32,
       "column": 8
     },
     "end": {
-      "line": 36,
+      "line": 35,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Undo",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 37,
+      "line": 36,
       "column": 8
     },
     "end": {
-      "line": 40,
+      "line": 39,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Redo",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 41,
+      "line": 40,
       "column": 8
     },
     "end": {
-      "line": 44,
+      "line": 43,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Cut",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 45,
+      "line": 44,
       "column": 7
     },
     "end": {
-      "line": 48,
+      "line": 47,
       "column": 3
     }
   },
@@ -56,11 +56,11 @@
     "defaultMessage": "!!!Copy",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 49,
+      "line": 48,
       "column": 8
     },
     "end": {
-      "line": 52,
+      "line": 51,
       "column": 3
     }
   },
@@ -69,11 +69,11 @@
     "defaultMessage": "!!!Paste",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 53,
+      "line": 52,
       "column": 9
     },
     "end": {
-      "line": 56,
+      "line": 55,
       "column": 3
     }
   },
@@ -82,11 +82,11 @@
     "defaultMessage": "!!!Paste And Match Style",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 57,
+      "line": 56,
       "column": 22
     },
     "end": {
-      "line": 60,
+      "line": 59,
       "column": 3
     }
   },
@@ -95,11 +95,11 @@
     "defaultMessage": "!!!Delete",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 61,
+      "line": 60,
       "column": 10
     },
     "end": {
-      "line": 64,
+      "line": 63,
       "column": 3
     }
   },
@@ -108,11 +108,11 @@
     "defaultMessage": "!!!Select All",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 65,
+      "line": 64,
       "column": 13
     },
     "end": {
-      "line": 68,
+      "line": 67,
       "column": 3
     }
   },
@@ -121,11 +121,11 @@
     "defaultMessage": "!!!Find in Page",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 69,
+      "line": 68,
       "column": 14
     },
     "end": {
-      "line": 72,
+      "line": 71,
       "column": 3
     }
   },
@@ -134,11 +134,11 @@
     "defaultMessage": "!!!Speech",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 73,
+      "line": 72,
       "column": 10
     },
     "end": {
-      "line": 76,
+      "line": 75,
       "column": 3
     }
   },
@@ -147,11 +147,11 @@
     "defaultMessage": "!!!Start Speaking",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 77,
+      "line": 76,
       "column": 17
     },
     "end": {
-      "line": 80,
+      "line": 79,
       "column": 3
     }
   },
@@ -160,11 +160,11 @@
     "defaultMessage": "!!!Stop Speaking",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 81,
+      "line": 80,
       "column": 16
     },
     "end": {
-      "line": 84,
+      "line": 83,
       "column": 3
     }
   },
@@ -173,11 +173,11 @@
     "defaultMessage": "!!!Start Dictation",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 85,
+      "line": 84,
       "column": 18
     },
     "end": {
-      "line": 88,
+      "line": 87,
       "column": 3
     }
   },
@@ -186,11 +186,11 @@
     "defaultMessage": "!!!Emoji & Symbols",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 89,
+      "line": 88,
       "column": 16
     },
     "end": {
-      "line": 92,
+      "line": 91,
       "column": 3
     }
   },
@@ -199,11 +199,11 @@
     "defaultMessage": "!!!Open Quick Switch",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 93,
+      "line": 92,
       "column": 19
     },
     "end": {
-      "line": 96,
+      "line": 95,
       "column": 3
     }
   },
@@ -212,11 +212,11 @@
     "defaultMessage": "!!!Back",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 97,
+      "line": 96,
       "column": 8
     },
     "end": {
-      "line": 100,
+      "line": 99,
       "column": 3
     }
   },
@@ -225,11 +225,11 @@
     "defaultMessage": "!!!Forward",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 101,
+      "line": 100,
       "column": 11
     },
     "end": {
-      "line": 104,
+      "line": 103,
       "column": 3
     }
   },
@@ -238,11 +238,11 @@
     "defaultMessage": "!!!Actual Size",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 105,
+      "line": 104,
       "column": 13
     },
     "end": {
-      "line": 108,
+      "line": 107,
       "column": 3
     }
   },
@@ -251,11 +251,11 @@
     "defaultMessage": "!!!Zoom In",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 109,
+      "line": 108,
       "column": 10
     },
     "end": {
-      "line": 112,
+      "line": 111,
       "column": 3
     }
   },
@@ -264,11 +264,11 @@
     "defaultMessage": "!!!Zoom Out",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 113,
+      "line": 112,
       "column": 11
     },
     "end": {
-      "line": 116,
+      "line": 115,
       "column": 3
     }
   },
@@ -277,11 +277,11 @@
     "defaultMessage": "!!!Toggle Full Screen",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 117,
+      "line": 116,
       "column": 20
     },
     "end": {
-      "line": 120,
+      "line": 119,
       "column": 3
     }
   },
@@ -290,11 +290,11 @@
     "defaultMessage": "!!!Toggle Dark Mode",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 121,
+      "line": 120,
       "column": 18
     },
     "end": {
-      "line": 124,
+      "line": 123,
       "column": 3
     }
   },
@@ -303,11 +303,11 @@
     "defaultMessage": "!!!Toggle Developer Tools",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 125,
+      "line": 124,
       "column": 18
     },
     "end": {
-      "line": 128,
+      "line": 127,
       "column": 3
     }
   },
@@ -316,11 +316,11 @@
     "defaultMessage": "!!!Toggle Todos Developer Tools",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 129,
+      "line": 128,
       "column": 23
     },
     "end": {
-      "line": 132,
+      "line": 131,
       "column": 3
     }
   },
@@ -329,11 +329,11 @@
     "defaultMessage": "!!!Toggle Service Developer Tools",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 133,
+      "line": 132,
       "column": 25
     },
     "end": {
-      "line": 136,
+      "line": 135,
       "column": 3
     }
   },
@@ -342,11 +342,11 @@
     "defaultMessage": "!!!Reload Service",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 137,
+      "line": 136,
       "column": 17
     },
     "end": {
-      "line": 140,
+      "line": 139,
       "column": 3
     }
   },
@@ -355,11 +355,11 @@
     "defaultMessage": "!!!Reload Ferdi",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 141,
+      "line": 140,
       "column": 15
     },
     "end": {
-      "line": 144,
+      "line": 143,
       "column": 3
     }
   },
@@ -368,11 +368,11 @@
     "defaultMessage": "!!!Lock Ferdi",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 145,
+      "line": 144,
       "column": 13
     },
     "end": {
-      "line": 148,
+      "line": 147,
       "column": 3
     }
   },
@@ -381,11 +381,11 @@
     "defaultMessage": "!!!Reload ToDos",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 149,
+      "line": 148,
       "column": 15
     },
     "end": {
-      "line": 152,
+      "line": 151,
       "column": 3
     }
   },
@@ -394,11 +394,11 @@
     "defaultMessage": "!!!Minimize",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 153,
+      "line": 152,
       "column": 12
     },
     "end": {
-      "line": 156,
+      "line": 155,
       "column": 3
     }
   },
@@ -407,11 +407,11 @@
     "defaultMessage": "!!!Close",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 157,
+      "line": 156,
       "column": 9
     },
     "end": {
-      "line": 160,
+      "line": 159,
       "column": 3
     }
   },
@@ -420,11 +420,11 @@
     "defaultMessage": "!!!Learn More",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 161,
+      "line": 160,
       "column": 13
     },
     "end": {
-      "line": 164,
+      "line": 163,
       "column": 3
     }
   },
@@ -433,11 +433,11 @@
     "defaultMessage": "!!!Changelog",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 165,
+      "line": 164,
       "column": 13
     },
     "end": {
-      "line": 168,
+      "line": 167,
       "column": 3
     }
   },
@@ -446,11 +446,11 @@
     "defaultMessage": "!!!Import/Export Configuration Data",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 169,
+      "line": 168,
       "column": 20
     },
     "end": {
-      "line": 172,
+      "line": 171,
       "column": 3
     }
   },
@@ -459,11 +459,11 @@
     "defaultMessage": "!!!Support",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 173,
+      "line": 172,
       "column": 11
     },
     "end": {
-      "line": 176,
+      "line": 175,
       "column": 3
     }
   },
@@ -472,11 +472,11 @@
     "defaultMessage": "!!!Copy Debug Information",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 177,
+      "line": 176,
       "column": 13
     },
     "end": {
-      "line": 180,
+      "line": 179,
       "column": 3
     }
   },
@@ -485,11 +485,11 @@
     "defaultMessage": "!!!Publish Debug Information",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 181,
+      "line": 180,
       "column": 20
     },
     "end": {
-      "line": 184,
+      "line": 183,
       "column": 3
     }
   },
@@ -498,11 +498,11 @@
     "defaultMessage": "!!!Ferdi Debug Information",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 185,
+      "line": 184,
       "column": 27
     },
     "end": {
-      "line": 188,
+      "line": 187,
       "column": 3
     }
   },
@@ -511,11 +511,11 @@
     "defaultMessage": "!!!Your Debug Information has been copied to your clipboard.",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 189,
+      "line": 188,
       "column": 23
     },
     "end": {
-      "line": 193,
+      "line": 192,
       "column": 3
     }
   },
@@ -524,11 +524,11 @@
     "defaultMessage": "!!!Unlock with Touch ID",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 194,
+      "line": 193,
       "column": 11
     },
     "end": {
-      "line": 197,
+      "line": 196,
       "column": 3
     }
   },
@@ -537,11 +537,11 @@
     "defaultMessage": "!!!unlock via Touch ID",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 198,
+      "line": 197,
       "column": 17
     },
     "end": {
-      "line": 201,
+      "line": 200,
       "column": 3
     }
   },
@@ -550,11 +550,11 @@
     "defaultMessage": "!!!Terms of Service",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 202,
+      "line": 201,
       "column": 7
     },
     "end": {
-      "line": 205,
+      "line": 204,
       "column": 3
     }
   },
@@ -563,11 +563,11 @@
     "defaultMessage": "!!!Privacy Statement",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 206,
+      "line": 205,
       "column": 11
     },
     "end": {
-      "line": 209,
+      "line": 208,
       "column": 3
     }
   },
@@ -576,11 +576,11 @@
     "defaultMessage": "!!!File",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 210,
+      "line": 209,
       "column": 8
     },
     "end": {
-      "line": 213,
+      "line": 212,
       "column": 3
     }
   },
@@ -589,11 +589,11 @@
     "defaultMessage": "!!!View",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 214,
+      "line": 213,
       "column": 8
     },
     "end": {
-      "line": 217,
+      "line": 216,
       "column": 3
     }
   },
@@ -602,11 +602,11 @@
     "defaultMessage": "!!!Services",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 218,
+      "line": 217,
       "column": 12
     },
     "end": {
-      "line": 221,
+      "line": 220,
       "column": 3
     }
   },
@@ -615,11 +615,11 @@
     "defaultMessage": "!!!Window",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 222,
+      "line": 221,
       "column": 10
     },
     "end": {
-      "line": 225,
+      "line": 224,
       "column": 3
     }
   },
@@ -628,11 +628,11 @@
     "defaultMessage": "!!!Help",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 226,
+      "line": 225,
       "column": 8
     },
     "end": {
-      "line": 229,
+      "line": 228,
       "column": 3
     }
   },
@@ -641,11 +641,11 @@
     "defaultMessage": "!!!About Ferdi",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 230,
+      "line": 229,
       "column": 9
     },
     "end": {
-      "line": 233,
+      "line": 232,
       "column": 3
     }
   },
@@ -654,11 +654,11 @@
     "defaultMessage": "!!!Check for updates",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 234,
+      "line": 233,
       "column": 19
     },
     "end": {
-      "line": 237,
+      "line": 236,
       "column": 3
     }
   },
@@ -667,11 +667,11 @@
     "defaultMessage": "!!!Hide",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 238,
+      "line": 237,
       "column": 8
     },
     "end": {
-      "line": 241,
+      "line": 240,
       "column": 3
     }
   },
@@ -680,11 +680,11 @@
     "defaultMessage": "!!!Hide Others",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 242,
+      "line": 241,
       "column": 14
     },
     "end": {
-      "line": 245,
+      "line": 244,
       "column": 3
     }
   },
@@ -693,11 +693,11 @@
     "defaultMessage": "!!!Unhide",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 246,
+      "line": 245,
       "column": 10
     },
     "end": {
-      "line": 249,
+      "line": 248,
       "column": 3
     }
   },
@@ -706,11 +706,11 @@
     "defaultMessage": "!!!Auto-hide menu bar",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 250,
+      "line": 249,
       "column": 19
     },
     "end": {
-      "line": 253,
+      "line": 252,
       "column": 3
     }
   },
@@ -719,11 +719,11 @@
     "defaultMessage": "!!!Add New Service...",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 254,
+      "line": 253,
       "column": 17
     },
     "end": {
-      "line": 257,
+      "line": 256,
       "column": 3
     }
   },
@@ -732,11 +732,11 @@
     "defaultMessage": "!!!Add New Workspace...",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 258,
+      "line": 257,
       "column": 19
     },
     "end": {
-      "line": 261,
+      "line": 260,
       "column": 3
     }
   },
@@ -745,11 +745,11 @@
     "defaultMessage": "!!!Open workspace drawer",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 262,
+      "line": 261,
       "column": 23
     },
     "end": {
-      "line": 265,
+      "line": 264,
       "column": 3
     }
   },
@@ -758,11 +758,11 @@
     "defaultMessage": "!!!Close workspace drawer",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 266,
+      "line": 265,
       "column": 24
     },
     "end": {
-      "line": 269,
+      "line": 268,
       "column": 3
     }
   },
@@ -771,11 +771,11 @@
     "defaultMessage": "!!!Activate next service...",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 270,
+      "line": 269,
       "column": 23
     },
     "end": {
-      "line": 273,
+      "line": 272,
       "column": 3
     }
   },
@@ -784,11 +784,11 @@
     "defaultMessage": "!!!Activate previous service...",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 274,
+      "line": 273,
       "column": 27
     },
     "end": {
-      "line": 277,
+      "line": 276,
       "column": 3
     }
   },
@@ -797,11 +797,11 @@
     "defaultMessage": "!!!Disable notifications & audio",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 278,
+      "line": 277,
       "column": 11
     },
     "end": {
-      "line": 281,
+      "line": 280,
       "column": 3
     }
   },
@@ -810,11 +810,11 @@
     "defaultMessage": "!!!Enable notifications & audio",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 282,
+      "line": 281,
       "column": 13
     },
     "end": {
-      "line": 285,
+      "line": 284,
       "column": 3
     }
   },
@@ -823,11 +823,11 @@
     "defaultMessage": "!!!Workspaces",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 286,
+      "line": 285,
       "column": 14
     },
     "end": {
-      "line": 289,
+      "line": 288,
       "column": 3
     }
   },
@@ -836,11 +836,11 @@
     "defaultMessage": "!!!Default",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 290,
+      "line": 289,
       "column": 20
     },
     "end": {
-      "line": 293,
+      "line": 292,
       "column": 3
     }
   },
@@ -849,11 +849,11 @@
     "defaultMessage": "!!!Todos",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 294,
+      "line": 293,
       "column": 9
     },
     "end": {
-      "line": 297,
+      "line": 296,
       "column": 3
     }
   },
@@ -862,11 +862,11 @@
     "defaultMessage": "!!!Open Todos drawer",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 298,
+      "line": 297,
       "column": 19
     },
     "end": {
-      "line": 301,
+      "line": 300,
       "column": 3
     }
   },
@@ -875,11 +875,11 @@
     "defaultMessage": "!!!Close Todos drawer",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 302,
+      "line": 301,
       "column": 20
     },
     "end": {
-      "line": 305,
+      "line": 304,
       "column": 3
     }
   },
@@ -888,11 +888,11 @@
     "defaultMessage": "!!!Enable Todos",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 306,
+      "line": 305,
       "column": 15
     },
     "end": {
-      "line": 309,
+      "line": 308,
       "column": 3
     }
   },
@@ -901,11 +901,11 @@
     "defaultMessage": "!!!Home",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 310,
+      "line": 309,
       "column": 17
     },
     "end": {
-      "line": 313,
+      "line": 312,
       "column": 3
     }
   }
diff --git a/src/index.js b/src/index.js
index ae75865c6..1f3510361 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,6 +1,6 @@
 /* eslint-disable import/first */
 
-import { app, BrowserWindow, ipcMain, session } from 'electron';
+import { app, BrowserWindow, ipcMain, session, dialog } from 'electron';
 
 import { emptyDirSync, ensureFileSync } from 'fs-extra';
 import { join } from 'path';
@@ -10,6 +10,7 @@ import ms from 'ms';
 
 require('@electron/remote/main').initialize();
 
+import osName from 'os-name';
 import { DEFAULT_WINDOW_OPTIONS } from './config';
 
 import {
@@ -18,10 +19,14 @@ import {
   isMac,
   isWindows,
   isLinux,
-  aboutAppDetails,
   userDataRecipesPath,
   userDataPath,
+  ferdiVersion,
+  electronVersion,
+  chromeVersion,
+  nodeVersion,
 } from './environment';
+import { ifUndefinedBoolean } from './jsUtils';
 
 import { mainIpcHandler as basicAuthHandler } from './features/basicAuth';
 import ipcApi from './electron/ipc-api';
@@ -36,6 +41,7 @@ import './electron/exception';
 import { asarPath } from './helpers/asar-helpers';
 import { openExternalUrl } from './helpers/url-helpers';
 import userAgent from './helpers/userAgent-helpers';
+import * as buildInfo from './buildInfo.json'; // eslint-disable-line import/no-unresolved
 
 const debug = require('debug')('Ferdi:App');
 
@@ -77,13 +83,14 @@ if (isWindows) {
 const settings = new Settings('app', DEFAULT_APP_SETTINGS);
 const proxySettings = new Settings('proxy');
 
-if (settings.get('sentry')) {
+const retrieveSettingValue = (key, defaultValue = true) => ifUndefinedBoolean(settings.get(key), defaultValue);
+
+if (retrieveSettingValue('sentry')) {
   // eslint-disable-next-line global-require
   require('./sentry');
 }
 
-// add `liftSingleInstanceLock` to settings.json to override the single instance lock
-const liftSingleInstanceLock = settings.get('liftSingleInstanceLock') || false;
+const liftSingleInstanceLock = retrieveSettingValue('liftSingleInstanceLock', false);
 
 // Force single window
 const gotTheLock = liftSingleInstanceLock
@@ -147,13 +154,23 @@ if (
 }
 
 // Disable GPU acceleration
-if (!settings.get('enableGPUAcceleration')) {
+if (!retrieveSettingValue('enableGPUAcceleration', false)) {
   debug('Disable GPU Acceleration');
   app.disableHardwareAcceleration();
 }
 
 app.setAboutPanelOptions({
-  applicationVersion: aboutAppDetails(),
+  applicationVersion: [
+    `Version: ${ferdiVersion}`,
+    `Electron: ${electronVersion}`,
+    `Chrome: ${chromeVersion}`,
+    `Node.js: ${nodeVersion}`,
+    `Platform: ${osName()}`,
+    `Arch: ${process.arch}`,
+    `Build date: ${new Date(Number(buildInfo.timestamp))}`,
+    `Git SHA: ${buildInfo.gitHashShort}`,
+    `Git branch: ${buildInfo.gitBranch}`,
+  ].join('\n'),
   version: '',
 });
 
@@ -176,7 +193,7 @@ const createWindow = () => {
   }
 
   // Create the browser window.
-  const backgroundColor = settings.get('darkMode')
+  const backgroundColor = retrieveSettingValue('darkMode', false)
     ? '#1E1E1E'
     : settings.get('accentColor');
 
@@ -190,7 +207,7 @@ const createWindow = () => {
     show: false,
     titleBarStyle: isMac ? 'hidden' : '',
     frame: isLinux,
-    spellcheck: settings.get('enableSpellchecking'),
+    spellcheck: retrieveSettingValue('enableSpellchecking'),
     backgroundColor,
     webPreferences: {
       nodeIntegration: true,
@@ -268,15 +285,14 @@ const createWindow = () => {
     // when you should delete the corresponding element.
     if (
       !willQuitApp &&
-      (settings.get('runInBackground') === undefined ||
-        settings.get('runInBackground'))
+      retrieveSettingValue('runInBackground')
     ) {
       e.preventDefault();
       if (isWindows) {
         debug('Window: minimize');
         mainWindow.minimize();
 
-        if (settings.get('closeToSystemTray')) {
+        if (retrieveSettingValue('closeToSystemTray')) {
           debug('Skip taskbar: true');
           mainWindow.setSkipTaskbar(true);
         }
@@ -300,7 +316,7 @@ const createWindow = () => {
   mainWindow.on('minimize', () => {
     app.wasMaximized = app.isMaximized;
 
-    if (settings.get('minimizeToSystemTray')) {
+    if (retrieveSettingValue('minimizeToSystemTray')) {
       debug('Skip taskbar: true');
       mainWindow.setSkipTaskbar(true);
       trayIcon.show();
@@ -326,7 +342,7 @@ const createWindow = () => {
       mainWindow.maximize();
     }
 
-    if (!settings.get('enableSystemTray')) {
+    if (!retrieveSettingValue('enableSystemTray')) {
       debug('Tray: hiding tray icon');
       trayIcon.hide();
     }
@@ -351,7 +367,7 @@ const createWindow = () => {
     openExternalUrl(url);
   });
 
-  if (settings.get('startMinimized')) {
+  if (retrieveSettingValue('startMinimized', false)) {
     mainWindow.hide();
   } else {
     mainWindow.show();
@@ -551,10 +567,7 @@ ipcMain.on('stop-find-in-page', (e, action) => {
 app.on('window-all-closed', () => {
   // On OS X it is common for applications and their menu bar
   // to stay active until the user quits explicitly with Cmd + Q
-  if (
-    settings.get('runInBackground') === undefined ||
-    settings.get('runInBackground')
-  ) {
+  if (retrieveSettingValue('runInBackground')) {
     debug('Window: all windows closed, quit app');
     app.quit();
   } else {
@@ -562,8 +575,25 @@ app.on('window-all-closed', () => {
   }
 });
 
-app.on('before-quit', () => {
-  willQuitApp = true;
+app.on('before-quit', (event) => {
+  const yesButtonIndex = 0;
+  let selection = yesButtonIndex;
+  if (retrieveSettingValue('confirmOnQuit')) {
+    selection = dialog.showMessageBoxSync(app.mainWindow, {
+      type: 'question',
+      message: 'Quit',
+      detail: 'Do you really want to quit Ferdi?',
+      buttons: [
+        'Yes',
+        'No',
+      ],
+    });
+  }
+  if (selection === yesButtonIndex) {
+    willQuitApp = true;
+  } else {
+    event.preventDefault();
+  }
 });
 
 app.on('activate', () => {
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index 2c24b696b..5dae56544 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -1,5 +1,5 @@
 import { clipboard } from 'electron';
-import { app, Menu, dialog, systemPreferences } from '@electron/remote';
+import { app, Menu, systemPreferences } from '@electron/remote';
 import { autorun, observable } from 'mobx';
 import { defineMessages } from 'react-intl';
 import {
@@ -14,7 +14,6 @@ import {
   settingsShortcutKey,
   isLinux,
   isMac,
-  aboutAppDetails,
   lockFerdiShortcutKey,
   todosToggleShortcutKey,
   workspaceToggleShortcutKey,
@@ -592,23 +591,6 @@ export default class FranzMenu {
     const tpl = _titleBarTemplateFactory(intl, this.stores.settings.app.locked);
     const { actions } = this;
 
-    // TODO: Extract this into a reusable component and remove the duplications
-    const quitApp = () => {
-      const yesButtonIndex = 0;
-      let selection = yesButtonIndex;
-      if (window.ferdi.stores.settings.app.confirmOnQuit) {
-        selection = dialog.showMessageBoxSync(app.mainWindow, {
-          type: 'question',
-          message: intl.formatMessage(globalMessages.quit),
-          detail: intl.formatMessage(globalMessages.quitConfirmation),
-          buttons: [intl.formatMessage(globalMessages.yes), intl.formatMessage(globalMessages.no)],
-        });
-      }
-      if (selection === yesButtonIndex) {
-        app.quit();
-      }
-    };
-
     if (!isMac) {
       tpl[1].submenu.push({
         label: intl.formatMessage(menuItems.autohideMenuBar),
@@ -813,7 +795,9 @@ export default class FranzMenu {
         {
           label: intl.formatMessage(globalMessages.quit),
           accelerator: `${cmdOrCtrlShortcutKey()}+Q`,
-          click: quitApp,
+          click() {
+            app.quit();
+          },
         },
       ],
     });
@@ -821,12 +805,7 @@ export default class FranzMenu {
     const about = {
       label: intl.formatMessage(menuItems.about),
       click: () => {
-        dialog.showMessageBox({
-          type: 'info',
-          title: 'Franz Ferdinand',
-          message: 'Ferdi',
-          detail: aboutAppDetails(),
-        });
+        app.showAboutPanel();
       },
     };
 
@@ -857,7 +836,7 @@ export default class FranzMenu {
     } else {
       tpl[0].submenu = [
         {
-          label: intl.formatMessage(menuItems.settings),
+          label: intl.formatMessage(globalMessages.settings),
           accelerator: `${settingsShortcutKey()}`,
           click: () => {
             this.actions.ui.openSettings({ path: 'app' });
@@ -871,7 +850,9 @@ export default class FranzMenu {
         {
           label: intl.formatMessage(globalMessages.quit),
           accelerator: `${cmdOrCtrlShortcutKey()}+Q`,
-          click: quitApp,
+          click() {
+            app.quit();
+          },
         },
       ];
 
diff --git a/src/lib/Tray.js b/src/lib/Tray.js
index c897d597a..7360611cd 100644
--- a/src/lib/Tray.js
+++ b/src/lib/Tray.js
@@ -1,5 +1,5 @@
 import {
-  app, Menu, nativeImage, nativeTheme, systemPreferences, Tray, ipcMain, dialog,
+  app, Menu, nativeImage, nativeTheme, systemPreferences, Tray, ipcMain,
 } from 'electron';
 import { join } from 'path';
 import macosVersion from 'macos-version';
@@ -10,6 +10,7 @@ const INDICATOR_TRAY_PLAIN = 'tray';
 const INDICATOR_TRAY_UNREAD = 'tray-unread';
 const INDICATOR_TRAY_INDIRECT = 'tray-indirect';
 
+// TODO: Need to support i18n for a lot of the hard-coded strings in this file
 export default class TrayIcon {
   trayIcon = null;
 
@@ -43,7 +44,9 @@ export default class TrayIcon {
     },
     {
       label: 'Quit Ferdi',
-      click: this.quitApp,
+      click() {
+        app.quit();
+      },
     },
   ];
 
@@ -176,22 +179,4 @@ export default class TrayIcon {
       __dirname, '..', 'assets', 'images', type, platform, `${asset}.${FILE_EXTENSION}`,
     ));
   }
-
-  // TODO: Extract this into a reusable component and remove the duplications
-  quitApp = () => {
-    const yesButtonIndex = 0;
-    let selection = yesButtonIndex;
-    if (window.ferdi.stores.settings.app.confirmOnQuit) {
-      selection = dialog.showMessageBoxSync(app.mainWindow, {
-        // TODO: Externalize strings
-        type: 'question',
-        message: 'Quit',
-        detail: 'Do you really want to quit Ferdi?',
-        buttons: ['Yes', 'No'],
-      });
-    }
-    if (selection === yesButtonIndex) {
-      app.quit();
-    }
-  };
 }