Merge branch 'develop' into i18n

1 files changed, 5 insertions, 11 deletions

diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 7fc9eac1c..d5c0ea441 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -45,6 +45,7 @@
   "invite.name.label": "Name",
   "invite.email.label": "Email address",
   "invite.skip.label": "I want to do this later",
+  "invite.successInfo": "Invitations sent successfully",
   "subscription.submit.label": "I want to support the development of Franz",
   "subscription.paymentSessionError": "Could not initialize payment form",
   "subscription.includedFeatures": "Paid Franz Premium Supporter Account includes",
@@ -84,17 +85,15 @@
   "settings.account.headlinePassword": "Change password",
   "settings.account.successInfo": "Your changes have been saved",
   "settings.account.buttonSave": "Update profile",
-  "settings.account.mining.thankyou": "Thank you for supporting Franz with your processing power.",
-  "settings.account.mining.active": "You are right now performing {hashes} calculations per second.",
-  "settings.account.mining.moreInformation": "Get more information",
-  "settings.account.mining.cancel": "Cancel mining",
   "settings.account.deleteAccount": "Delete account",
   "settings.account.deleteInfo": "If you don't need your Franz account any longer, you can delete your account and all related data here.",
   "settings.account.deleteEmailSent": "You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
+  "settings.invite.headline": "Invite Friends",
   "settings.navigation.availableServices": "Available services",
   "settings.navigation.yourServices": "Your services",
   "settings.navigation.account": "Account",
   "settings.navigation.settings": "Settings",
+  "settings.navigation.inviteFriends": "Invite Friends",
   "settings.navigation.logout": "Logout",
   "settings.recipes.headline": "Available services",
   "settings.recipes.mostPopular": "Most popular",
@@ -160,6 +159,8 @@
   "settings.app.form.autoLaunchInBackground": "Open in background",
   "settings.app.form.enableSystemTray": "Show Franz in system tray",
   "settings.app.form.minimizeToSystemTray": "Minimize Franz to system tray",
+  "settings.app.form.enableMenuBar": "Show Franz in Menu Bar",
+  "settings.app.form.hideDockIcon": "Hide Franz icon in Dock",
   "settings.app.form.runInBackground": "Keep Franz in background when closing the window",
   "settings.app.form.language": "Language",
   "settings.app.form.enableSpellchecking": "Enable spell checking",
@@ -181,13 +182,6 @@
   "subscription.type.free": "free",
   "subscription.type.month": "month",
   "subscription.type.year": "year",
-  "subscription.type.mining": "Support Franz with processing power",
-  "subscription.mining.headline": "How does this work?",
-  "subscription.mining.experimental": "experimental",
-  "subscription.mining.line1": "By enabling \"Support with processing power\", Franz will use about 20-50% of your CPU to mine the cryptocurrency Monero which equals approximately $ 5/year.",
-  "subscription.mining.line2": "We will adapt the CPU usage based to your work behaviour to not drain your battery and slow you and your machine down.",
-  "subscription.mining.line3": "As long as the miner is active, you will have unlimited access to all the Franz Premium Supporter Features.",
-  "subscription.mining.moreInformation": "Get more information about this plan.",
   "subscription.euTaxInfo": "EU residents: local sales tax may apply",
   "subscriptionPopup.buttonCancel": "Cancel",
   "subscriptionPopup.buttonDone": "Done",