Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	src/components/layout/AppLayout.js

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 @@
   "menu.file": "File",
   "menu.help": "Help",
   "menu.help.changelog": "Changelog",
+  "menu.help.debugInfo": "Copy Debug Information",
+  "menu.help.debugInfoCopiedBody": "Your Debug Information has been copied to your clipboard.",
+  "menu.help.debugInfoCopiedHeadline": "Franz Debug Information",
   "menu.help.learnMore": "Learn More",
   "menu.help.privacy": "Privacy Statement",
   "menu.help.support": "Support",
@@ -329,4 +332,4 @@
   "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>",
   "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
   "workspaces.switchingIndicator.switchingTo": "Switching to"
-}
\ No newline at end of file
+}