From ddab3a88b297fe244971b0d4fb9ff3fca3a8a1fe Mon Sep 17 00:00:00 2001 From: Dominik Guzei Date: Wed, 11 Sep 2019 14:17:13 +0200 Subject: feat(Workspaces): Setting to keep all workspaces loaded --- .../containers/settings/EditSettingsScreen.json | 65 +++++++++++++--------- 1 file changed, 39 insertions(+), 26 deletions(-) (limited to 'src/i18n') diff --git a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json index 2b666e7e9..d0a243ec0 100644 --- a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json +++ b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json @@ -4,11 +4,11 @@ "defaultMessage": "!!!Launch Franz on start", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 24, + "line": 26, "column": 21 }, "end": { - "line": 27, + "line": 29, "column": 3 } }, @@ -17,11 +17,11 @@ "defaultMessage": "!!!Open in background", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 28, + "line": 30, "column": 26 }, "end": { - "line": 31, + "line": 33, "column": 3 } }, @@ -30,11 +30,11 @@ "defaultMessage": "!!!Keep Franz in background when closing the window", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 32, + "line": 34, "column": 19 }, "end": { - "line": 35, + "line": 37, "column": 3 } }, @@ -43,11 +43,11 @@ "defaultMessage": "!!!Show Franz in system tray", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 36, + "line": 38, "column": 20 }, "end": { - "line": 39, + "line": 41, "column": 3 } }, @@ -56,11 +56,11 @@ "defaultMessage": "!!!Minimize Franz to system tray", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 40, + "line": 42, "column": 24 }, "end": { - "line": 43, + "line": 45, "column": 3 } }, @@ -69,11 +69,11 @@ "defaultMessage": "!!!Language", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 44, + "line": 46, "column": 12 }, "end": { - "line": 47, + "line": 49, "column": 3 } }, @@ -82,11 +82,11 @@ "defaultMessage": "!!!Dark Mode", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 48, + "line": 50, "column": 12 }, "end": { - "line": 51, + "line": 53, "column": 3 } }, @@ -95,11 +95,11 @@ "defaultMessage": "!!!Display disabled services tabs", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 52, + "line": 54, "column": 24 }, "end": { - "line": 55, + "line": 57, "column": 3 } }, @@ -108,11 +108,11 @@ "defaultMessage": "!!!Show unread message badge when notifications are disabled", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 56, + "line": 58, "column": 29 }, "end": { - "line": 59, + "line": 61, "column": 3 } }, @@ -121,11 +121,11 @@ "defaultMessage": "!!!Enable spell checking", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 60, + "line": 62, "column": 23 }, "end": { - "line": 63, + "line": 65, "column": 3 } }, @@ -134,11 +134,11 @@ "defaultMessage": "!!!Enable GPU Acceleration", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 64, + "line": 66, "column": 25 }, "end": { - "line": 67, + "line": 69, "column": 3 } }, @@ -147,11 +147,11 @@ "defaultMessage": "!!!Include beta versions", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 68, + "line": 70, "column": 8 }, "end": { - "line": 71, + "line": 73, "column": 3 } }, @@ -160,11 +160,24 @@ "defaultMessage": "!!!Enable Franz Todos", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 72, + "line": 74, "column": 15 }, "end": { - "line": 75, + "line": 77, + "column": 3 + } + }, + { + "id": "settings.app.form.keepAllWorkspacesLoaded", + "defaultMessage": "!!!Keep all workspaces loaded", + "file": "src/containers/settings/EditSettingsScreen.js", + "start": { + "line": 78, + "column": 27 + }, + "end": { + "line": 81, "column": 3 } } -- cgit v1.2.3-70-g09d2 From f01e7f2f66732a5af40c14ebde0d1331159dfc4b Mon Sep 17 00:00:00 2001 From: Dominik Guzei Date: Wed, 11 Sep 2019 14:18:07 +0200 Subject: Update generated i18n changes --- src/i18n/locales/defaultMessages.json | 65 +++++++++++++++++++++-------------- src/i18n/locales/en-US.json | 3 +- 2 files changed, 41 insertions(+), 27 deletions(-) (limited to 'src/i18n') diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json index 44a49317e..3f815dda7 100644 --- a/src/i18n/locales/defaultMessages.json +++ b/src/i18n/locales/defaultMessages.json @@ -3414,169 +3414,182 @@ "defaultMessage": "!!!Launch Franz on start", "end": { "column": 3, - "line": 27 + "line": 29 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.autoLaunchOnStart", "start": { "column": 21, - "line": 24 + "line": 26 } }, { "defaultMessage": "!!!Open in background", "end": { "column": 3, - "line": 31 + "line": 33 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.autoLaunchInBackground", "start": { "column": 26, - "line": 28 + "line": 30 } }, { "defaultMessage": "!!!Keep Franz in background when closing the window", "end": { "column": 3, - "line": 35 + "line": 37 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.runInBackground", "start": { "column": 19, - "line": 32 + "line": 34 } }, { "defaultMessage": "!!!Show Franz in system tray", "end": { "column": 3, - "line": 39 + "line": 41 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.enableSystemTray", "start": { "column": 20, - "line": 36 + "line": 38 } }, { "defaultMessage": "!!!Minimize Franz to system tray", "end": { "column": 3, - "line": 43 + "line": 45 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.minimizeToSystemTray", "start": { "column": 24, - "line": 40 + "line": 42 } }, { "defaultMessage": "!!!Language", "end": { "column": 3, - "line": 47 + "line": 49 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.language", "start": { "column": 12, - "line": 44 + "line": 46 } }, { "defaultMessage": "!!!Dark Mode", "end": { "column": 3, - "line": 51 + "line": 53 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.darkMode", "start": { "column": 12, - "line": 48 + "line": 50 } }, { "defaultMessage": "!!!Display disabled services tabs", "end": { "column": 3, - "line": 55 + "line": 57 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.showDisabledServices", "start": { "column": 24, - "line": 52 + "line": 54 } }, { "defaultMessage": "!!!Show unread message badge when notifications are disabled", "end": { "column": 3, - "line": 59 + "line": 61 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.showMessagesBadgesWhenMuted", "start": { "column": 29, - "line": 56 + "line": 58 } }, { "defaultMessage": "!!!Enable spell checking", "end": { "column": 3, - "line": 63 + "line": 65 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.enableSpellchecking", "start": { "column": 23, - "line": 60 + "line": 62 } }, { "defaultMessage": "!!!Enable GPU Acceleration", "end": { "column": 3, - "line": 67 + "line": 69 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.enableGPUAcceleration", "start": { "column": 25, - "line": 64 + "line": 66 } }, { "defaultMessage": "!!!Include beta versions", "end": { "column": 3, - "line": 71 + "line": 73 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.beta", "start": { "column": 8, - "line": 68 + "line": 70 } }, { "defaultMessage": "!!!Enable Franz Todos", "end": { "column": 3, - "line": 75 + "line": 77 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.enableTodos", "start": { "column": 15, - "line": 72 + "line": 74 + } + }, + { + "defaultMessage": "!!!Keep all workspaces loaded", + "end": { + "column": 3, + "line": 81 + }, + "file": "src/containers/settings/EditSettingsScreen.js", + "id": "settings.app.form.keepAllWorkspacesLoaded", + "start": { + "column": 27, + "line": 78 } } ], diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index 9e63fdbca..33a2bf739 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json @@ -207,6 +207,7 @@ "settings.app.form.enableSpellchecking": "Enable spell checking", "settings.app.form.enableSystemTray": "Show Franz in system tray", "settings.app.form.enableTodos": "Enable Franz Todos", + "settings.app.form.keepAllWorkspacesLoaded": "!!!Keep all workspaces loaded", "settings.app.form.language": "Language", "settings.app.form.minimizeToSystemTray": "Minimize Franz to system tray", "settings.app.form.runInBackground": "Keep Franz in background when closing the window", @@ -379,4 +380,4 @@ "workspaceDrawer.workspaceFeatureInfo": "

Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.

You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.

", "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings", "workspaces.switchingIndicator.switchingTo": "Switching to" -} +} \ No newline at end of file -- cgit v1.2.3-70-g09d2 From 08e268e03c41185a51ec4697c98c815c185654c3 Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Thu, 12 Sep 2019 09:21:43 +0200 Subject: Fix language string --- src/i18n/locales/en-US.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/i18n') diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index 33a2bf739..57f2028dc 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json @@ -207,7 +207,7 @@ "settings.app.form.enableSpellchecking": "Enable spell checking", "settings.app.form.enableSystemTray": "Show Franz in system tray", "settings.app.form.enableTodos": "Enable Franz Todos", - "settings.app.form.keepAllWorkspacesLoaded": "!!!Keep all workspaces loaded", + "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded", "settings.app.form.language": "Language", "settings.app.form.minimizeToSystemTray": "Minimize Franz to system tray", "settings.app.form.runInBackground": "Keep Franz in background when closing the window", @@ -380,4 +380,4 @@ "workspaceDrawer.workspaceFeatureInfo": "

Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.

You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.

", "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings", "workspaces.switchingIndicator.switchingTo": "Switching to" -} \ No newline at end of file +} -- cgit v1.2.3-70-g09d2 From 7209aa9c7a1d3ebf34218f5f414570df509b59ff Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Thu, 12 Sep 2019 09:22:11 +0200 Subject: Update en-US.json --- src/i18n/locales/en-US.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/i18n') diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index 57f2028dc..991af277b 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json @@ -380,4 +380,4 @@ "workspaceDrawer.workspaceFeatureInfo": "

Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.

You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.

", "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings", "workspaces.switchingIndicator.switchingTo": "Switching to" -} +} \ No newline at end of file -- cgit v1.2.3-70-g09d2