diff options
author | 2019-08-05 19:06:51 +0700 | |
---|---|---|
committer | 2019-08-05 19:06:51 +0700 | |
commit | 19ff9d112fda59d114df1079622a3d365a51c14a (patch) | |
tree | 90e3e09e051a96a78ec80cd34363a062eac089a3 /src/i18n/locales/en-US.json | |
parent | Mention releases in README (diff) | |
parent | bump version to 5.2.1-beta.1 (diff) | |
download | ferdium-app-19ff9d112fda59d114df1079622a3d365a51c14a.tar.gz ferdium-app-19ff9d112fda59d114df1079622a3d365a51c14a.tar.zst ferdium-app-19ff9d112fda59d114df1079622a3d365a51c14a.zip |
Merge remote-tracking branch 'upstream/master'
# Conflicts:
# src/components/layout/AppLayout.js
Diffstat (limited to 'src/i18n/locales/en-US.json')
-rw-r--r-- | src/i18n/locales/en-US.json | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index e2edbd596..27987e5b7 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json | |||
@@ -68,6 +68,9 @@ | |||
68 | "menu.file": "File", | 68 | "menu.file": "File", |
69 | "menu.help": "Help", | 69 | "menu.help": "Help", |
70 | "menu.help.changelog": "Changelog", | 70 | "menu.help.changelog": "Changelog", |
71 | "menu.help.debugInfo": "Copy Debug Information", | ||
72 | "menu.help.debugInfoCopiedBody": "Your Debug Information has been copied to your clipboard.", | ||
73 | "menu.help.debugInfoCopiedHeadline": "Franz Debug Information", | ||
71 | "menu.help.learnMore": "Learn More", | 74 | "menu.help.learnMore": "Learn More", |
72 | "menu.help.privacy": "Privacy Statement", | 75 | "menu.help.privacy": "Privacy Statement", |
73 | "menu.help.support": "Support", | 76 | "menu.help.support": "Support", |
@@ -329,4 +332,4 @@ | |||
329 | "workspaceDrawer.workspaceFeatureInfo": "<p>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.</p><p>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.</p>", | 332 | "workspaceDrawer.workspaceFeatureInfo": "<p>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.</p><p>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.</p>", |
330 | "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings", | 333 | "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings", |
331 | "workspaces.switchingIndicator.switchingTo": "Switching to" | 334 | "workspaces.switchingIndicator.switchingTo": "Switching to" |
332 | } \ No newline at end of file | 335 | } |