From f013899bd27a7072f384e9c49e2179c2d61e99f8 Mon Sep 17 00:00:00 2001 From: Romain <46404814+yourcontact@users.noreply.github.com> Date: Thu, 9 Apr 2020 10:28:07 +0200 Subject: Refactor updates settings (#506) * Reorder updates toggle buttons * Updated 'Disable updates' message to 'Enable automatic updates' * Update 'noUpdates' to 'automaticUpdates' * Update 'noUpdates' to 'automaticUpdates' * Add condition for 'Include beta version' to show * Enable automatic updates by default * Update file so when automaticUpdates is true automatic updates are enabled * Fix conditions with enableUpdate * Apply code style * Fix wrong condition with enableUpdate * Delete unsued variable 'server' * Apply style code * Commit changes to submodule 'recipes' * Update default message to 'Enable updates' from 'Disable updates' * Update text to 'Enable updates' from 'Enable automatic update' * Add migration for updates settings * Update default messages to 'Enable updates' from 'Disable updates' * Remove empty line * Check for updates was disabled when updates were enabled * Avoid superfluous break line when updates are disabled * Add fragments to up-to-date message * Add fragments to up-to-date message * Remove file from previous commit * Remove extra line * Add 'Show draggable area on window' to en-US.json file * Apply prepare-code script changes Co-authored-by: Amine --- src/i18n/locales/defaultMessages.json | 243 ++++++++++++++++++---------------- 1 file changed, 128 insertions(+), 115 deletions(-) (limited to 'src/i18n/locales/defaultMessages.json') diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json index 36d930218..56d0b1971 100644 --- a/src/i18n/locales/defaultMessages.json +++ b/src/i18n/locales/defaultMessages.json @@ -4570,81 +4570,94 @@ } }, { - "defaultMessage": "!!!Enable spell checking", + "defaultMessage": "!!!Show draggable area on window", "end": { "column": 3, "line": 152 }, "file": "src/containers/settings/EditSettingsScreen.js", + "id": "settings.app.form.showDragArea", + "start": { + "column": 16, + "line": 149 + } + }, + { + "defaultMessage": "!!!Enable spell checking", + "end": { + "column": 3, + "line": 156 + }, + "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.enableSpellchecking", "start": { "column": 23, - "line": 149 + "line": 153 } }, { "defaultMessage": "!!!Enable GPU Acceleration", "end": { "column": 3, - "line": 156 + "line": 160 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.enableGPUAcceleration", "start": { "column": 25, - "line": 153 + "line": 157 } }, { "defaultMessage": "!!!Include beta versions", "end": { "column": 3, - "line": 160 + "line": 164 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.beta", "start": { "column": 8, - "line": 157 + "line": 161 } }, { - "defaultMessage": "!!!Disable updates", + "defaultMessage": "!!!Enable updates", "end": { "column": 3, - "line": 164 + "line": 168 }, "file": "src/containers/settings/EditSettingsScreen.js", - "id": "settings.app.form.noUpdates", + "id": "settings.app.form.automaticUpdates", "start": { - "column": 13, - "line": 161 + "column": 20, + "line": 165 } }, { "defaultMessage": "!!!Enable Franz Todos", "end": { "column": 3, - "line": 168 + "line": 172 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.enableTodos", "start": { "column": 15, - "line": 165 + "line": 169 } }, { "defaultMessage": "!!!Keep all workspaces loaded", "end": { "column": 3, - "line": 172 + "line": 176 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.keepAllWorkspacesLoaded", "start": { "column": 27, - "line": 169 + "line": 173 } } ], @@ -6712,640 +6725,640 @@ } }, { - "defaultMessage": "!!!Toggle Developer Tools", + "defaultMessage": "!!!Toggle Dark Mode", "end": { "column": 3, "line": 117 }, "file": "src/lib/Menu.js", - "id": "menu.view.toggleDevTools", + "id": "menu.view.toggleDarkMode", "start": { "column": 18, "line": 114 } }, { - "defaultMessage": "!!!Toggle Dark Mode", + "defaultMessage": "!!!Toggle Developer Tools", "end": { "column": 3, - "line": 117 + "line": 121 }, "file": "src/lib/Menu.js", - "id": "menu.view.toggleDarkMode", + "id": "menu.view.toggleDevTools", "start": { "column": 18, - "line": 114 + "line": 118 } }, { "defaultMessage": "!!!Toggle Todos Developer Tools", "end": { "column": 3, - "line": 121 + "line": 125 }, "file": "src/lib/Menu.js", "id": "menu.view.toggleTodosDevTools", "start": { "column": 23, - "line": 118 + "line": 122 } }, { "defaultMessage": "!!!Toggle Service Developer Tools", "end": { "column": 3, - "line": 125 + "line": 129 }, "file": "src/lib/Menu.js", "id": "menu.view.toggleServiceDevTools", "start": { "column": 25, - "line": 122 + "line": 126 } }, { "defaultMessage": "!!!Reload Service", "end": { "column": 3, - "line": 129 + "line": 133 }, "file": "src/lib/Menu.js", "id": "menu.view.reloadService", "start": { "column": 17, - "line": 126 + "line": 130 } }, { "defaultMessage": "!!!Reload Ferdi", "end": { "column": 3, - "line": 133 + "line": 137 }, "file": "src/lib/Menu.js", "id": "menu.view.reloadFranz", "start": { "column": 15, - "line": 130 + "line": 134 } }, { "defaultMessage": "!!!Lock Ferdi", "end": { "column": 3, - "line": 137 + "line": 141 }, "file": "src/lib/Menu.js", "id": "menu.view.lockFerdi", "start": { "column": 13, - "line": 134 + "line": 138 } }, { "defaultMessage": "!!!Minimize", "end": { "column": 3, - "line": 141 + "line": 145 }, "file": "src/lib/Menu.js", "id": "menu.window.minimize", "start": { "column": 12, - "line": 138 + "line": 142 } }, { "defaultMessage": "!!!Close", "end": { "column": 3, - "line": 145 + "line": 149 }, "file": "src/lib/Menu.js", "id": "menu.window.close", "start": { "column": 9, - "line": 142 + "line": 146 } }, { "defaultMessage": "!!!Learn More", "end": { "column": 3, - "line": 149 + "line": 153 }, "file": "src/lib/Menu.js", "id": "menu.help.learnMore", "start": { "column": 13, - "line": 146 + "line": 150 } }, { "defaultMessage": "!!!Changelog", "end": { "column": 3, - "line": 153 + "line": 157 }, "file": "src/lib/Menu.js", "id": "menu.help.changelog", "start": { "column": 13, - "line": 150 + "line": 154 } }, { "defaultMessage": "!!!Support", "end": { "column": 3, - "line": 157 + "line": 161 }, "file": "src/lib/Menu.js", "id": "menu.help.support", "start": { "column": 11, - "line": 154 + "line": 158 } }, { "defaultMessage": "!!!Copy Debug Information", "end": { "column": 3, - "line": 161 + "line": 165 }, "file": "src/lib/Menu.js", "id": "menu.help.debugInfo", "start": { "column": 13, - "line": 158 + "line": 162 } }, { "defaultMessage": "!!!Publish Debug Information", "end": { "column": 3, - "line": 165 + "line": 169 }, "file": "src/lib/Menu.js", "id": "menu.help.publishDebugInfo", "start": { "column": 20, - "line": 162 + "line": 166 } }, { "defaultMessage": "!!!Ferdi Debug Information", "end": { "column": 3, - "line": 169 + "line": 173 }, "file": "src/lib/Menu.js", "id": "menu.help.debugInfoCopiedHeadline", "start": { "column": 27, - "line": 166 + "line": 170 } }, { "defaultMessage": "!!!Your Debug Information has been copied to your clipboard.", "end": { "column": 3, - "line": 173 + "line": 177 }, "file": "src/lib/Menu.js", "id": "menu.help.debugInfoCopiedBody", "start": { "column": 23, - "line": 170 + "line": 174 } }, { "defaultMessage": "!!!Unlock with Touch ID", "end": { "column": 3, - "line": 177 + "line": 181 }, "file": "src/lib/Menu.js", "id": "locked.touchId", "start": { "column": 11, - "line": 174 + "line": 178 } }, { "defaultMessage": "!!!unlock via Touch ID", "end": { "column": 3, - "line": 181 + "line": 185 }, "file": "src/lib/Menu.js", "id": "locked.touchIdPrompt", "start": { "column": 17, - "line": 178 + "line": 182 } }, { "defaultMessage": "!!!Terms of Service", "end": { "column": 3, - "line": 185 + "line": 189 }, "file": "src/lib/Menu.js", "id": "menu.help.tos", "start": { "column": 7, - "line": 182 + "line": 186 } }, { "defaultMessage": "!!!Privacy Statement", "end": { "column": 3, - "line": 189 + "line": 193 }, "file": "src/lib/Menu.js", "id": "menu.help.privacy", "start": { "column": 11, - "line": 186 + "line": 190 } }, { "defaultMessage": "!!!File", "end": { "column": 3, - "line": 193 + "line": 197 }, "file": "src/lib/Menu.js", "id": "menu.file", "start": { "column": 8, - "line": 190 + "line": 194 } }, { "defaultMessage": "!!!View", "end": { "column": 3, - "line": 197 + "line": 201 }, "file": "src/lib/Menu.js", "id": "menu.view", "start": { "column": 8, - "line": 194 + "line": 198 } }, { "defaultMessage": "!!!Services", "end": { "column": 3, - "line": 201 + "line": 205 }, "file": "src/lib/Menu.js", "id": "menu.services", "start": { "column": 12, - "line": 198 + "line": 202 } }, { "defaultMessage": "!!!Window", "end": { "column": 3, - "line": 205 + "line": 209 }, "file": "src/lib/Menu.js", "id": "menu.window", "start": { "column": 10, - "line": 202 + "line": 206 } }, { "defaultMessage": "!!!Help", "end": { "column": 3, - "line": 209 + "line": 213 }, "file": "src/lib/Menu.js", "id": "menu.help", "start": { "column": 8, - "line": 206 + "line": 210 } }, { "defaultMessage": "!!!About Ferdi", "end": { "column": 3, - "line": 213 + "line": 217 }, "file": "src/lib/Menu.js", "id": "menu.app.about", "start": { "column": 9, - "line": 210 + "line": 214 } }, { "defaultMessage": "!!!What's new?", "end": { "column": 3, - "line": 217 + "line": 221 }, "file": "src/lib/Menu.js", "id": "menu.app.announcement", "start": { "column": 16, - "line": 214 + "line": 218 } }, { "defaultMessage": "!!!Settings", "end": { "column": 3, - "line": 221 + "line": 225 }, "file": "src/lib/Menu.js", "id": "menu.app.settings", "start": { "column": 12, - "line": 218 + "line": 222 } }, { "defaultMessage": "!!!Check for updates", "end": { "column": 3, - "line": 225 + "line": 229 }, "file": "src/lib/Menu.js", "id": "menu.app.checkForUpdates", "start": { "column": 19, - "line": 222 + "line": 226 } }, { "defaultMessage": "!!!Hide", "end": { "column": 3, - "line": 229 + "line": 233 }, "file": "src/lib/Menu.js", "id": "menu.app.hide", "start": { "column": 8, - "line": 226 + "line": 230 } }, { "defaultMessage": "!!!Hide Others", "end": { "column": 3, - "line": 233 + "line": 237 }, "file": "src/lib/Menu.js", "id": "menu.app.hideOthers", "start": { "column": 14, - "line": 230 + "line": 234 } }, { "defaultMessage": "!!!Unhide", "end": { "column": 3, - "line": 237 + "line": 241 }, "file": "src/lib/Menu.js", "id": "menu.app.unhide", "start": { "column": 10, - "line": 234 + "line": 238 } }, { "defaultMessage": "!!!Auto-hide menu bar", "end": { "column": 3, - "line": 241 + "line": 245 }, "file": "src/lib/Menu.js", "id": "menu.app.autohideMenuBar", "start": { "column": 19, - "line": 238 + "line": 242 } }, { "defaultMessage": "!!!Quit", "end": { "column": 3, - "line": 245 + "line": 249 }, "file": "src/lib/Menu.js", "id": "menu.app.quit", "start": { "column": 8, - "line": 242 + "line": 246 } }, { "defaultMessage": "!!!Add New Service...", "end": { "column": 3, - "line": 249 + "line": 253 }, "file": "src/lib/Menu.js", "id": "menu.services.addNewService", "start": { "column": 17, - "line": 246 + "line": 250 } }, { "defaultMessage": "!!!Add New Workspace...", "end": { "column": 3, - "line": 253 + "line": 257 }, "file": "src/lib/Menu.js", "id": "menu.workspaces.addNewWorkspace", "start": { "column": 19, - "line": 250 + "line": 254 } }, { "defaultMessage": "!!!Open workspace drawer", "end": { "column": 3, - "line": 257 + "line": 261 }, "file": "src/lib/Menu.js", "id": "menu.workspaces.openWorkspaceDrawer", "start": { "column": 23, - "line": 254 + "line": 258 } }, { "defaultMessage": "!!!Close workspace drawer", "end": { "column": 3, - "line": 261 + "line": 265 }, "file": "src/lib/Menu.js", "id": "menu.workspaces.closeWorkspaceDrawer", "start": { "column": 24, - "line": 258 + "line": 262 } }, { "defaultMessage": "!!!Activate next service...", "end": { "column": 3, - "line": 265 + "line": 269 }, "file": "src/lib/Menu.js", "id": "menu.services.setNextServiceActive", "start": { "column": 23, - "line": 262 + "line": 266 } }, { "defaultMessage": "!!!Activate previous service...", "end": { "column": 3, - "line": 269 + "line": 273 }, "file": "src/lib/Menu.js", "id": "menu.services.activatePreviousService", "start": { "column": 27, - "line": 266 + "line": 270 } }, { "defaultMessage": "!!!Disable notifications & audio", "end": { "column": 3, - "line": 273 + "line": 277 }, "file": "src/lib/Menu.js", "id": "sidebar.muteApp", "start": { "column": 11, - "line": 270 + "line": 274 } }, { "defaultMessage": "!!!Enable notifications & audio", "end": { "column": 3, - "line": 277 + "line": 281 }, "file": "src/lib/Menu.js", "id": "sidebar.unmuteApp", "start": { "column": 13, - "line": 274 + "line": 278 } }, { "defaultMessage": "!!!Workspaces", "end": { "column": 3, - "line": 281 + "line": 285 }, "file": "src/lib/Menu.js", "id": "menu.workspaces", "start": { "column": 14, - "line": 278 + "line": 282 } }, { "defaultMessage": "!!!Default", "end": { "column": 3, - "line": 285 + "line": 289 }, "file": "src/lib/Menu.js", "id": "menu.workspaces.defaultWorkspace", "start": { "column": 20, - "line": 282 + "line": 286 } }, { "defaultMessage": "!!!Todos", "end": { "column": 3, - "line": 289 + "line": 293 }, "file": "src/lib/Menu.js", "id": "menu.todos", "start": { "column": 9, - "line": 286 + "line": 290 } }, { "defaultMessage": "!!!Open Todos drawer", "end": { "column": 3, - "line": 293 + "line": 297 }, "file": "src/lib/Menu.js", "id": "menu.Todoss.openTodosDrawer", "start": { "column": 19, - "line": 290 + "line": 294 } }, { "defaultMessage": "!!!Close Todos drawer", "end": { "column": 3, - "line": 297 + "line": 301 }, "file": "src/lib/Menu.js", "id": "menu.Todoss.closeTodosDrawer", "start": { "column": 20, - "line": 294 + "line": 298 } }, { "defaultMessage": "!!!Enable Todos", "end": { "column": 3, - "line": 301 + "line": 305 }, "file": "src/lib/Menu.js", "id": "menu.todos.enableTodos", "start": { "column": 15, - "line": 298 + "line": 302 } }, { "defaultMessage": "!!!Home", "end": { "column": 3, - "line": 305 + "line": 309 }, "file": "src/lib/Menu.js", "id": "menu.services.goHome", "start": { "column": 17, - "line": 302 + "line": 306 } } ], -- cgit v1.2.3-70-g09d2