From 6f19bf95d0573f2d7d1c575d9c684653f59efe72 Mon Sep 17 00:00:00 2001 From: Vijay A Date: Sun, 16 May 2021 05:13:37 +0530 Subject: Fix for #1417: Mac Nomenclature for Menu Bar --- src/i18n/locales/defaultMessages.json | 187 ++++++++++++++++++---------------- src/i18n/locales/en-US.json | 1 + 2 files changed, 101 insertions(+), 87 deletions(-) (limited to 'src/i18n/locales') diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json index 50e7871dd..cdad061ca 100644 --- a/src/i18n/locales/defaultMessages.json +++ b/src/i18n/locales/defaultMessages.json @@ -4902,559 +4902,572 @@ "defaultMessage": "!!!Launch Ferdi on start", "end": { "column": 3, - "line": 33 + "line": 34 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.autoLaunchOnStart", "start": { "column": 21, - "line": 30 + "line": 31 } }, { "defaultMessage": "!!!Open in background", "end": { "column": 3, - "line": 37 + "line": 38 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.autoLaunchInBackground", "start": { "column": 26, - "line": 34 + "line": 35 } }, { "defaultMessage": "!!!Keep Ferdi in background when closing the window", "end": { "column": 3, - "line": 41 + "line": 42 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.runInBackground", "start": { "column": 19, - "line": 38 + "line": 39 } }, { "defaultMessage": "!!!Start minimized", "end": { "column": 3, - "line": 45 + "line": 46 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.startMinimized", "start": { "column": 18, - "line": 42 + "line": 43 } }, { - "defaultMessage": "!!!Always show Ferdi in system tray", + "defaultMessage": "!!!Always show Ferdi in System Tray", "end": { "column": 3, - "line": 49 + "line": 50 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.enableSystemTray", "start": { "column": 20, - "line": 46 + "line": 47 + } + }, + { + "defaultMessage": "!!!Always show Ferdi in Menu Bar", + "end": { + "column": 3, + "line": 54 + }, + "file": "src/containers/settings/EditSettingsScreen.js", + "id": "settings.app.form.enableMenuBar", + "start": { + "column": 17, + "line": 51 } }, { "defaultMessage": "!!!Reload Ferdi after system resume", "end": { "column": 3, - "line": 53 + "line": 58 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.reloadAfterResume", "start": { "column": 21, - "line": 50 + "line": 55 } }, { "defaultMessage": "!!!Minimize Ferdi to system tray", "end": { "column": 3, - "line": 57 + "line": 62 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.minimizeToSystemTray", "start": { "column": 24, - "line": 54 + "line": 59 } }, { "defaultMessage": "!!!Close Ferdi to system tray", "end": { "column": 3, - "line": 61 + "line": 66 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.closeToSystemTray", "start": { "column": 21, - "line": 58 + "line": 63 } }, { "defaultMessage": "!!!Don't show message content in notifications", "end": { "column": 3, - "line": 65 + "line": 70 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.privateNotifications", "start": { "column": 24, - "line": 62 + "line": 67 } }, { "defaultMessage": "!!!Notify TaskBar/Dock on new message", "end": { "column": 3, - "line": 69 + "line": 74 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.notifyTaskBarOnMessage", "start": { "column": 26, - "line": 66 + "line": 71 } }, { "defaultMessage": "!!!Navigation bar behaviour", "end": { "column": 3, - "line": 73 + "line": 78 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.navigationBarBehaviour", "start": { "column": 26, - "line": 70 + "line": 75 } }, { "defaultMessage": "!!!Search engine", "end": { "column": 3, - "line": 77 + "line": 82 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.searchEngine", "start": { "column": 16, - "line": 74 + "line": 79 } }, { "defaultMessage": "!!!Send telemetry data", "end": { "column": 3, - "line": 81 + "line": 86 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.sentry", "start": { "column": 10, - "line": 78 + "line": 83 } }, { "defaultMessage": "!!!Enable service hibernation", "end": { "column": 3, - "line": 85 + "line": 90 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.hibernate", "start": { "column": 13, - "line": 82 + "line": 87 } }, { "defaultMessage": "!!!Keep services in hibernation on startup", "end": { "column": 3, - "line": 89 + "line": 94 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.hibernateOnStartup", "start": { "column": 22, - "line": 86 + "line": 91 } }, { "defaultMessage": "!!!Hibernation strategy", "end": { "column": 3, - "line": 93 + "line": 98 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.hibernationStrategy", "start": { "column": 23, - "line": 90 + "line": 95 } }, { "defaultMessage": "!!!Todo Server", "end": { "column": 3, - "line": 97 + "line": 102 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.predefinedTodoServer", "start": { "column": 24, - "line": 94 + "line": 99 } }, { "defaultMessage": "!!!Custom TodoServer", "end": { "column": 3, - "line": 101 + "line": 106 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.customTodoServer", "start": { "column": 20, - "line": 98 + "line": 103 } }, { "defaultMessage": "!!!Enable Password Lock", "end": { "column": 3, - "line": 105 + "line": 110 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.enableLock", "start": { "column": 14, - "line": 102 + "line": 107 } }, { "defaultMessage": "!!!Password", "end": { "column": 3, - "line": 109 + "line": 114 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.lockPassword", "start": { "column": 16, - "line": 106 + "line": 111 } }, { "defaultMessage": "!!!Allow using Touch ID to unlock", "end": { "column": 3, - "line": 113 + "line": 118 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.useTouchIdToUnlock", "start": { "column": 22, - "line": 110 + "line": 115 } }, { "defaultMessage": "!!!Lock after inactivity", "end": { "column": 3, - "line": 117 + "line": 122 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.inactivityLock", "start": { "column": 18, - "line": 114 + "line": 119 } }, { "defaultMessage": "!!!Enable scheduled Do-not-Disturb", "end": { "column": 3, - "line": 121 + "line": 126 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.scheduledDNDEnabled", "start": { "column": 23, - "line": 118 + "line": 123 } }, { "defaultMessage": "!!!From", "end": { "column": 3, - "line": 125 + "line": 130 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.scheduledDNDStart", "start": { "column": 21, - "line": 122 + "line": 127 } }, { "defaultMessage": "!!!To", "end": { "column": 3, - "line": 129 + "line": 134 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.scheduledDNDEnd", "start": { "column": 19, - "line": 126 + "line": 131 } }, { "defaultMessage": "!!!Language", "end": { "column": 3, - "line": 133 + "line": 138 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.language", "start": { "column": 12, - "line": 130 + "line": 135 } }, { "defaultMessage": "!!!Dark Mode", "end": { "column": 3, - "line": 137 + "line": 142 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.darkMode", "start": { "column": 12, - "line": 134 + "line": 139 } }, { "defaultMessage": "!!!Synchronize dark mode with my OS's dark mode setting", "end": { "column": 3, - "line": 141 + "line": 146 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.adaptableDarkMode", "start": { "column": 21, - "line": 138 + "line": 143 } }, { "defaultMessage": "!!!Enable universal Dark Mode", "end": { "column": 3, - "line": 145 + "line": 150 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.universalDarkMode", "start": { "column": 21, - "line": 142 + "line": 147 } }, { "defaultMessage": "!!!Sidebar width", "end": { "column": 3, - "line": 149 + "line": 154 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.serviceRibbonWidth", "start": { "column": 22, - "line": 146 + "line": 151 } }, { "defaultMessage": "!!!Service icon size", "end": { "column": 3, - "line": 153 + "line": 158 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.iconSize", "start": { "column": 12, - "line": 150 + "line": 155 } }, { "defaultMessage": "!!!Use vertical style", "end": { "column": 3, - "line": 157 + "line": 162 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.useVerticalStyle", "start": { "column": 20, - "line": 154 + "line": 159 } }, { "defaultMessage": "!!!Always show workspace drawer", "end": { "column": 3, - "line": 161 + "line": 166 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.alwaysShowWorkspaces", "start": { "column": 24, - "line": 158 + "line": 163 } }, { "defaultMessage": "!!!Accent color", "end": { "column": 3, - "line": 165 + "line": 170 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.accentColor", "start": { "column": 15, - "line": 162 + "line": 167 } }, { "defaultMessage": "!!!Display disabled services tabs", "end": { "column": 3, - "line": 169 + "line": 174 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.showDisabledServices", "start": { "column": 24, - "line": 166 + "line": 171 } }, { "defaultMessage": "!!!Show unread message badge when notifications are disabled", "end": { "column": 3, - "line": 173 + "line": 178 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.showMessagesBadgesWhenMuted", "start": { "column": 29, - "line": 170 + "line": 175 } }, { "defaultMessage": "!!!Show draggable area on window", "end": { "column": 3, - "line": 177 + "line": 182 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.showDragArea", "start": { "column": 16, - "line": 174 + "line": 179 } }, { "defaultMessage": "!!!Enable spell checking", "end": { "column": 3, - "line": 181 + "line": 186 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.enableSpellchecking", "start": { "column": 23, - "line": 178 + "line": 183 } }, { "defaultMessage": "!!!Enable GPU Acceleration", "end": { "column": 3, - "line": 185 + "line": 190 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.enableGPUAcceleration", "start": { "column": 25, - "line": 182 + "line": 187 } }, { "defaultMessage": "!!!Include beta versions", "end": { "column": 3, - "line": 189 + "line": 194 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.beta", "start": { "column": 8, - "line": 186 + "line": 191 } }, { "defaultMessage": "!!!Enable updates", "end": { "column": 3, - "line": 193 + "line": 198 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.automaticUpdates", "start": { "column": 20, - "line": 190 + "line": 195 } }, { "defaultMessage": "!!!Enable Franz Todos", "end": { "column": 3, - "line": 197 + "line": 202 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.enableTodos", "start": { "column": 15, - "line": 194 + "line": 199 } }, { "defaultMessage": "!!!Keep all workspaces loaded", "end": { "column": 3, - "line": 201 + "line": 206 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.keepAllWorkspacesLoaded", "start": { "column": 27, - "line": 198 + "line": 203 } } ], diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index 1c1cbb882..ef1da3d08 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json @@ -298,6 +298,7 @@ "settings.app.form.darkMode": "Enable dark mode", "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration", "settings.app.form.enableLock": "Enable Password Lock", + "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar", "settings.app.form.enableSpellchecking": "Enable spell checking", "settings.app.form.enableSystemTray": "Show Ferdi in system tray", "settings.app.form.enableTodos": "Enable Ferdi Todos", -- cgit v1.2.3-70-g09d2