Merge branch 'develop' into notificationTitleFix

10 files changed, 430 insertions, 33 deletions

diff --git a/src/actions/service.js b/src/actions/service.js
index cdd4bbf16..ea6ea5acc 100644
--- a/src/actions/service.js
+++ b/src/actions/service.js
@@ -63,6 +63,7 @@ export default {
     needle: PropTypes.string.isRequired,
   },
   resetFilter: {},
+  resetStatus: {},
   reorder: {
     oldIndex: PropTypes.number.isRequired,
     newIndex: PropTypes.number.isRequired,
diff --git a/src/containers/settings/ServicesScreen.js b/src/containers/settings/ServicesScreen.js
index d0580041f..8cfe5efbf 100644
--- a/src/containers/settings/ServicesScreen.js
+++ b/src/containers/settings/ServicesScreen.js
@@ -18,6 +18,7 @@ export default class ServicesScreen extends Component {
 
   componentWillUnmount() {
     this.props.actions.service.resetFilter();
+    this.props.actions.service.resetStatus();
   }
 
   deleteService() {
@@ -70,6 +71,7 @@ ServicesScreen.wrappedComponent.propTypes = {
       toggleService: PropTypes.func.isRequired,
       filter: PropTypes.func.isRequired,
       resetFilter: PropTypes.func.isRequired,
+      resetStatus: PropTypes.func.isRequired,
     }).isRequired,
   }).isRequired,
 };
diff --git a/src/environment.js b/src/environment.js
index e185120c0..7bb2db134 100644
--- a/src/environment.js
+++ b/src/environment.js
@@ -8,7 +8,16 @@ export const isMac = process.platform === 'darwin';
 export const isWindows = process.platform === 'win32';
 export const isLinux = process.platform === 'linux';
 
-export const ctrlKey = isMac ? '⌘' : 'Ctrl';
+let ctrlShortcutKey;
+if (isMac) {
+  ctrlShortcutKey = '⌘';
+} else if (isWindows) {
+  ctrlShortcutKey = 'Ctrl';
+} else {
+  ctrlShortcutKey = 'Alt';
+}
+
+export const ctrlKey = ctrlShortcutKey;
 
 let api;
 if (!isDevMode || (isDevMode && useLiveAPI)) {
diff --git a/src/i18n/languages.js b/src/i18n/languages.js
index 8777cf89a..72d7b26c1 100644
--- a/src/i18n/languages.js
+++ b/src/i18n/languages.js
@@ -10,6 +10,8 @@ module.exports = {
   pl: 'Polish',
   ru: 'Русский',
   ua: 'Українська',
+  it: 'Italian',
   'es-ES': 'Español - España',
   'zh-Hant': 'Chinese (Traditional)',
+  'nb-NO': 'Norsk',
 };
diff --git a/src/i18n/locales/it.json b/src/i18n/locales/it.json
new file mode 100644
index 000000000..dd87599bb
--- /dev/null
+++ b/src/i18n/locales/it.json
@@ -0,0 +1,168 @@
+{
+  "global.api.unhealthy": "Impossibile connettersi ai servizi online di Franz",
+  "global.notConnectedToTheInternet": "Non sei connesso ad internet.",
+  "welcome.signupButton": "Iscriviti gratis",
+  "welcome.loginButton": "Accedi",
+  "welcome.slogan": "Messagistica che lavora per te",
+  "login.headline": "Accedi",
+  "login.email.label": "Indirizzo email",
+  "login.password.label": "Password",
+  "login.submit.label": "Accedi",
+  "login.invalidCredentials": "Email o password non validi",
+  "login.tokenExpired": "La tua sessione è scaduta, accedi di nuovo per favore.",
+  "login.serverLogout": "La tua sessione è scaduta, accedi di nuovo per favore.",
+  "login.link.signup": "Iscriviti gratis",
+  "login.link.password": "Reimposta password",
+  "password.headline": "Reimposta password",
+  "password.email.label": "Indirizzo email",
+  "password.submit.label": "Invia",
+  "password.noUser": "Non è stato trovato nessun utente con questa email",
+  "password.successInfo": "Per favore controlla la tua email",
+  "password.link.signup": "Iscriviti gratis",
+  "password.link.login": "Accedi",
+  "signup.headline": "Accedi",
+  "signup.firstname.label": "Nome",
+  "signup.lastname.label": "Cognome",
+  "signup.email.label": "Indirizzo email",
+  "signup.company.label": "Azienda",
+  "signup.password.label": "Password",
+  "signup.submit.label": "Registrati",
+  "signup.link.login": "Hai già fatto l'iscrizione? Accedi",
+  "signup.emailDuplicate": "Esiste già un utente con questo indirizzo email",
+  "signup.legal.info": "Iscrivendoti a Franz accetti",
+  "signup.legal.terms": "Termini di servizio",
+  "signup.legal.privacy": "Informativa sulla Privacy",
+  "pricing.headline": "Supporta Franz",
+  "pricing.support.label": "Seleziona il tuo piano di sostegno",
+  "pricing.submit.label": "Voglio sostenere lo sviluppo di Franz",
+  "pricing.link.skipPayment": "Non voglio sostenere lo sviluppo Franz.",
+  "import.headline": "Importa i tuoi servizi di Franz 4",
+  "import.notSupportedHeadline": "Servzi non ancora supportati in Franz 5",
+  "import.submit.label": "Importa servizi",
+  "import.skip.label": "Voglio aggiungere i servizi a mano",
+  "invite.submit.label": "Manda inviti",
+  "invite.headline.friends": "Invita 3 dei tuoi amici o colleghi",
+  "invite.name.label": "Nome",
+  "invite.email.label": "Indirizzo email",
+  "invite.skip.label": "Voglio farlo dopo",
+  "subscription.submit.label": "Voglio sostenere lo sviluppo di Franz",
+  "subscription.paymentSessionError": "Impossibile inizializzare il modulo di pagamento",
+  "subscription.includedFeatures": "La sottoscrizione a pagamento Franz Premium Supporter include",
+  "subscription.features.onpremise": "Agiunge servizi on-premise/hosted come HipChat",
+  "subscription.features.customServices": "Servizi privati per te ed il tuo team",
+  "subscription.features.encryptedSync": "Sincronizzazione sessione crittografata",
+  "subscription.features.vpn": "Supporto di Proxy e VPN",
+  "subscription.features.ads": "Nessuna pubblicità",
+  "subscription.features.comingSoon": "Presto disponibile",
+  "infobar.servicesUpdated": "I tuoi servizi sono stati aggiornati.",
+  "infobar.updateAvailable": "È disponibile un nuovo aggiornamento per Franz.",
+  "infobar.buttonReloadServices": "Ricarica i servizi",
+  "infobar.buttonInstallUpdate": "Riavvia e installa l'aggiornamento",
+  "infobar.requiredRequestsFailed": "Impossibile caricare i servizi e le informazioni dell'utente",
+  "sidebar.settings": "Impostazioni",
+  "services.welcome": "Benvenuto in Franz",
+  "services.getStarted": "Inizia",
+  "settings.account.headline": "Conto",
+  "settings.account.headlineSubscription": "La tua sottoscrizione",
+  "settings.account.headlineUpgrade": "Aggiorna il tuo conto e supporta Franz",
+  "settings.account.headlineInvoices": "Fatture",
+  "settings.account.manageSubscription.label": "Gestisci la tua sottoscrizione",
+  "settings.account.accountType.basic": "Conto Base",
+  "settings.account.accountType.premium": "Conto Premium Supporter",
+  "settings.account.account.editButton": "Modifica conto",
+  "settings.account.invoiceDownload": "Scarica",
+  "settings.account.userInfoRequestFailed": "Impossibile caricare le informazioni dell'utente",
+  "settings.account.tryReloadUserInfoRequest": "Prova ancora",
+  "settings.account.headlineProfile": "Aggiorna profilo",
+  "settings.account.headlineAccount": "Informazioni sul conto",
+  "settings.account.headlinePassword": "Cambia la password",
+  "settings.account.successInfo": "Le tue modifiche sono state salvate",
+  "settings.account.buttonSave": "Aggiorna profilo",
+  "settings.account.mining.thankyou": "Grazie per supportare Franz con la tua potenza di calcolo.",
+  "settings.account.mining.active": "Al momento stai eseguendo {hashes} calcoli al secondo.",
+  "settings.account.mining.moreInformation": "Ottieni piú informazioni",
+  "settings.account.mining.cancel": "Annulla mining",
+  "settings.navigation.availableServices": "Servizi disponibili",
+  "settings.navigation.yourServices": "I tuoi servizi",
+  "settings.navigation.account": "Conto",
+  "settings.navigation.settings": "Impostazioni",
+  "settings.navigation.logout": "Disconnetti",
+  "settings.recipes.headline": "Servizi disponibili",
+  "settings.recipes.mostPopular": "Piú popolari",
+  "settings.recipes.all": "Tutti i servizi",
+  "settings.recipes.dev": "Sviluppo",
+  "settings.recipes.nothingFound": "Mi dispiace, nessuno servizio corrisponde alla tua ricerca.",
+  "settings.recipes.servicesSuccessfulAddedInfo": "Servizio aggiunto con successo",
+  "settings.service.form.saveButton": "Salva servizio",
+  "settings.service.form.deleteButton": "Elimina servizio",
+  "settings.service.form.availableServices": "Servizi disponibili",
+  "settings.service.form.yourServices": "I tuoi servizi",
+  "settings.service.form.addServiceHeadline": "Aggiungi {name}",
+  "settings.service.form.editServiceHeadline": "Modifica {name}",
+  "settings.service.form.tabHosted": "Hosted",
+  "settings.service.form.tabOnPremise": "Self hosted ⭐️",
+  "settings.service.form.customUrlValidationError": "Impossibile validare il server personale {name}.",
+  "settings.service.form.customUrlPremiumInfo": "Per aggiungere servizi self hosted devi avere un conto Franz Premium Supporter.",
+  "settings.service.form.customUrlUpgradeAccount": "Aggiorna il tuo conto",
+  "settings.service.form.indirectMessageInfo": "Riceverai notifiche per tutti i nuovi messaggi in un canale, non solo @username, @channel, @here, ...",
+  "settings.service.error.headline": "Errore",
+  "settings.service.error.goBack": "Torna ai servizi",
+  "settings.service.error.message": "Impossibile caricare le specifiche del servizio.",
+  "settings.services.tooltip.isDisabled": "Il servizio è disabilitato",
+  "settings.services.tooltip.notificationsDisabled": "Le notifiche sono disabilitate",
+  "settings.services.headline": "I tuoi servizi",
+  "settings.services.noServicesAdded": "Non hai ancora aggiunto nessun servizio.",
+  "settings.services.discoverServices": "Trova servizi",
+  "settings.services.updatedInfo": "Le tue modifiche sono state salvate",
+  "settings.services.deletedInfo": "Il servizio è stato eliminato",
+  "settings.app.headline": "Impostazioni",
+  "settings.app.headlineGeneral": "Generale",
+  "settings.app.headlineLanguage": "Lingua",
+  "settings.app.headlineUpdates": "Aggiornamento",
+  "settings.app.buttonSearchForUpdate": "Controlla aggiornamento versione",
+  "settings.app.buttonInstallUpdate": "Riavvia e installa l'aggiornamento",
+  "settings.app.updateStatusSearching": "Sto cercando l'aggiornamento",
+  "settings.app.updateStatusAvailable": "Aggiornamento disponibile, scarico...",
+  "settings.app.updateStatusUpToDate": "You are using the latest version of Franz",
+  "settings.app.form.autoLaunchOnStart": "Lancia Franz all'avvio",
+  "settings.app.form.autoLaunchInBackground": "Apri in background",
+  "settings.app.form.enableSystemTray": "Mostra Franz nella zona delle notifiche di sistema",
+  "settings.app.form.minimizeToSystemTray": "Minimizza Franz nella zona delle notifiche di sistema",
+  "settings.app.form.runInBackground": "Maniteni Franz attivo in background quando chiudi la finestra",
+  "settings.app.form.language": "Lingua",
+  "settings.app.form.beta": "Includi versioni beta",
+  "settings.app.currentVersion": "Versione corrente:",
+  "settings.service.form.name": "Nome",
+  "settings.service.form.enableService": "Abilita servizio",
+  "settings.service.form.enableNotification": "Abilita notifiche",
+  "settings.service.form.team": "Team",
+  "settings.service.form.customUrl": "Server personale",
+  "settings.service.form.indirectMessages": "Mostra il badge del messaggio per tutti i nuovi messaggi",
+  "settings.user.form.firstname": "Nome",
+  "settings.user.form.lastname": "Cognome",
+  "settings.user.form.email": "Email",
+  "settings.user.form.currentPassword": "Password corrente",
+  "settings.user.form.newPassword": "Nuova password",
+  "settings.user.form.accountType.label": "Tipo di conto",
+  "settings.user.form.accountType.individual": "Individuale",
+  "settings.user.form.accountType.non-profit": "Non-Profit",
+  "settings.user.form.accountType.company": "Azienda",
+  "subscription.type.free": "gratis",
+  "subscription.type.month": "mese",
+  "subscription.type.year": "anno",
+  "subscription.type.mining": "Supporta Franz con della potenza di calcolo",
+  "subscription.mining.headline": "Come funziona?",
+  "subscription.mining.experimental": "sperimentale",
+  "subscription.mining.line1": "Abilitando \"Supporta Franz con della potenza di calcolo\",Franz userà circa il 20-50% della tua CPU per fare il mining della criptovaluta Monero che equivale approssimativamente a 5$/anno.",
+  "subscription.mining.line2": "Adatteremo l'utilizzo della CPU in base all tue abitudini di lavoro per non scaricare la tua batteria e rallentare la tua macchina.",
+  "subscription.mining.line3": "Fino a che il mining è attivo, avrai accesso illimitato a tutte le funzionalità del conto Franz Premium Supporter.",
+  "subscription.mining.moreInformation": "Ottieni più informazioni su questo piano.",
+  "subscriptionPopup.buttonCancel": "Annulla",
+  "subscriptionPopup.buttonDone": "Fatto",
+  "tabs.item.reload": "Ricarica",
+  "tabs.item.edit": "Modifica",
+  "tabs.item.disableNotifications": "Disabilita le notifiche",
+  "tabs.item.enableNotification": "Abilita le notifiche",
+  "tabs.item.disableService": "Disabilita servizio",
+  "tabs.item.deleteService": "Elimina servizio"
+}
diff --git a/src/i18n/locales/nb-NO.json b/src/i18n/locales/nb-NO.json
new file mode 100644
index 000000000..976c54787
--- /dev/null
+++ b/src/i18n/locales/nb-NO.json
@@ -0,0 +1,169 @@
+{
+  "global.api.unhealthy": "Kan ikke koble til Franz' tjenester",
+  "global.notConnectedToTheInternet": "Du er ikke koblet til internett.",
+  "welcome.signupButton": "Opprett en gratis konto",
+  "welcome.loginButton": "Logg inn til din konto",
+  "welcome.slogan": "Teksting som funker for deg",
+  "login.headline": "Logg inn",
+  "login.email.label": "Email adresse",
+  "login.password.label": "Passord",
+  "login.submit.label": "Logg inn",
+  "login.invalidCredentials": "Ugyldig email eller passord",
+  "login.tokenExpired": "Din økt utløpte, vennligst logg inn igjen.",
+  "login.serverLogout": "Din økt utløpte, vennligst logg inn igjen.",
+  "login.link.signup": "Opprett en gratis konto",
+  "login.link.password": "Reset passord",
+  "password.headline": "Reset passord",
+  "password.email.label": "Email adresse",
+  "password.submit.label": "Send inn",
+  "password.noUser": "Ingen bruker med den emailen finnes",
+  "password.successInfo": "Vennligst sjekk din email",
+  "password.link.signup": "Opprett en gratis konto",
+  "password.link.login": "Logg inn til din konto",
+  "signup.headline": "Registrer deg",
+  "signup.firstname.label": "Fornavn",
+  "signup.lastname.label": "Etternavn",
+  "signup.email.label": "Email adresse",
+  "signup.company.label": "Firma",
+  "signup.password.label": "Passord",
+  "signup.submit.label": "Opprett konto",
+  "signup.link.login": "Har du allerede en konto? Logg inn",
+  "signup.emailDuplicate": "En konto med den epost adresse eksiterer allerede",
+  "signup.legal.info": "Ved å opprette en Franz konto aksepterer du",
+  "signup.legal.terms": "Vilkår for bruk",
+  "signup.legal.privacy": "Personvern",
+  "pricing.headline": "Støtt Franz",
+  "pricing.support.label": "Velg din støtteplan",
+  "pricing.submit.label": "Jeg vil støtte utviklingen av Franz",
+  "pricing.link.skipPayment": "Jeg vil ikke støtte utviklingen av Franz.",
+  "import.headline": "Importer dine Franz 4 tjenester",
+  "import.notSupportedHeadline": "Tjenester ikke enda støttet i Franz 5",
+  "import.submit.label": "Importer tjenester",
+  "import.skip.label": "Jeg vil legge til en tjeneste manuelt",
+  "invite.submit.label": "Send invitasjoner",
+  "invite.headline.friends": "Inviter 3 av dine venner eller kolleger",
+  "invite.name.label": "Navn",
+  "invite.email.label": "Email adresse",
+  "invite.skip.label": "Jeg vil gjøre dette senere",
+  "subscription.submit.label": "Jeg vil ikke støtte utviklingen av Franz",
+  "subscription.paymentSessionError": "Kunne ikke laste betalingsskjemaet",
+  "subscription.includedFeatures": "Betalte Franz Premium konto inkluderer",
+  "subscription.features.onpremise": "Legg til on-premise/hosted tjenester som HipChat",
+  "subscription.features.customServices": "Private tjenester for deg og ditt lag",
+  "subscription.features.encryptedSync": "Kryptert øktsynkronisering",
+  "subscription.features.vpn": "Proxy & VPN støtte",
+  "subscription.features.ads": "Ingen annonser, noensinne!",
+  "subscription.features.comingSoon": "Kommer snart",
+  "infobar.servicesUpdated": "Dine tjenester er oppdatert.",
+  "infobar.updateAvailable": "En ny oppdatering for Franz er tilgjengelig.",
+  "infobar.buttonReloadServices": "Oppdater tjenester",
+  "infobar.buttonInstallUpdate": "Restart & installer oppdatering",
+  "infobar.requiredRequestsFailed": "Kunne ikke laste tjenester og brukerinformasjon",
+  "sidebar.settings": "Innstillinger",
+  "sidebar.addNewService": "Legg til ny tjeneste",
+  "services.welcome": "Velkommen til Franz",
+  "services.getStarted": "Kom i gang",
+  "settings.account.headline": "Konto",
+  "settings.account.headlineSubscription": "Ditt abonnement",
+  "settings.account.headlineUpgrade": "Oppgrader din konto og støtt Franz",
+  "settings.account.headlineInvoices": "Fakturaer",
+  "settings.account.manageSubscription.label": "Administrer dine abonnement",
+  "settings.account.accountType.basic": "Enkel Konto",
+  "settings.account.accountType.premium": "Premium Konto",
+  "settings.account.account.editButton": "Rediger konto",
+  "settings.account.invoiceDownload": "Last ned",
+  "settings.account.userInfoRequestFailed": "Kunne ikke laste brukerinformasjon",
+  "settings.account.tryReloadUserInfoRequest": "Prøv igjen",
+  "settings.account.headlineProfile": "Oppdater profil",
+  "settings.account.headlineAccount": "Kontoinformasjon",
+  "settings.account.headlinePassword": "Endre passord",
+  "settings.account.successInfo": "Dine endringer er lagret",
+  "settings.account.buttonSave": "Oppdater profil",
+  "settings.account.mining.thankyou": "Takk for at du støtter Franz med din prosessorkraft.",
+  "settings.account.mining.active": "Du utfører nå {hashes} beregninger per sekund.",
+  "settings.account.mining.moreInformation": "Få mer informasjon",
+  "settings.account.mining.cancel": "Avbryt mining",
+  "settings.navigation.availableServices": "Tilgjengelige tjenester",
+  "settings.navigation.yourServices": "Dine tjenester",
+  "settings.navigation.account": "Konto",
+  "settings.navigation.settings": "Innstillinger",
+  "settings.navigation.logout": "Logg ut",
+  "settings.recipes.headline": "Tilgjengelige tjenester",
+  "settings.recipes.mostPopular": "Mest populære",
+  "settings.recipes.all": "Alle tjenester",
+  "settings.recipes.dev": "Utvikling",
+  "settings.recipes.nothingFound": "Beklager, men ingen tjeneste samsvarer med søkeordet ditt.",
+  "settings.recipes.servicesSuccessfulAddedInfo": "Tjenesten ble lagt til",
+  "settings.service.form.saveButton": "Lagre tjeneste",
+  "settings.service.form.deleteButton": "Slett tjeneste",
+  "settings.service.form.availableServices": "Tilgjengelige tjenester",
+  "settings.service.form.yourServices": "Dine tjenester",
+  "settings.service.form.addServiceHeadline": "Legg til {name}",
+  "settings.service.form.editServiceHeadline": "Rediger {name}",
+  "settings.service.form.tabHosted": "Hosted",
+  "settings.service.form.tabOnPremise": "Selv hosted ⭐️",
+  "settings.service.form.customUrlValidationError": "Kunne ikke validere egendefinert {name} server.",
+  "settings.service.form.customUrlPremiumInfo": "For å legge til selvhost-baserte tjenester trenger du en Franz Premium konto.",
+  "settings.service.form.customUrlUpgradeAccount": "Oppgrader din konto",
+  "settings.service.form.indirectMessageInfo": "Du vil bli varslet om alle nye meldinger i en kanal, ikke bare @brukernavn, @kanal, @here, ...",
+  "settings.service.error.headline": "Error",
+  "settings.service.error.goBack": "Tilbake til tjenester",
+  "settings.service.error.message": "Kunne ikke laste tjeneste oppskrift.",
+  "settings.services.tooltip.isDisabled": "Tjenesten er deaktivert",
+  "settings.services.tooltip.notificationsDisabled": "Varsler er deaktivert",
+  "settings.services.headline": "Dine tjenester",
+  "settings.services.noServicesAdded": "Du har ikke lagt til noen tjenester enda.",
+  "settings.services.discoverServices": "Oppdag tjenester",
+  "settings.services.updatedInfo": "Dine endringer er lagret",
+  "settings.services.deletedInfo": "Tjenester har blitt slettet",
+  "settings.app.headline": "Innstillinger",
+  "settings.app.headlineGeneral": "Genelert",
+  "settings.app.headlineLanguage": "Språk",
+  "settings.app.headlineUpdates": "Oppdateringer",
+  "settings.app.buttonSearchForUpdate": "Se etter oppdateringer",
+  "settings.app.buttonInstallUpdate": "Restart & installer oppdatering",
+  "settings.app.updateStatusSearching": "Søker etter en oppdatering",
+  "settings.app.updateStatusAvailable": "Oppdatering tilgjengelig, laster ned...",
+  "settings.app.updateStatusUpToDate": "Du bruker siste versjon av Franz",
+  "settings.app.form.autoLaunchOnStart": "Start Franz ved oppstart",
+  "settings.app.form.autoLaunchInBackground": "Åpne i bakgrunnen",
+  "settings.app.form.enableSystemTray": "Vis Franz i systemfeltet",
+  "settings.app.form.minimizeToSystemTray": "Minimer Franz til systemfeltet",
+  "settings.app.form.runInBackground": "Behold Franz i bakgrunnen når du lukker vinduet",
+  "settings.app.form.language": "Språk",
+  "settings.app.form.beta": "Inkluder beta versjoner",
+  "settings.app.currentVersion": "Gjeldende versjon:",
+  "settings.service.form.name": "Navn",
+  "settings.service.form.enableService": "Slå på tjeneste",
+  "settings.service.form.enableNotification": "Slå på varsler",
+  "settings.service.form.team": "Lag",
+  "settings.service.form.customUrl": "Egendefinert server",
+  "settings.service.form.indirectMessages": "Vis merke for alle nye meldinger",
+  "settings.user.form.firstname": "Fornavn",
+  "settings.user.form.lastname": "Etternavn",
+  "settings.user.form.email": "Email",
+  "settings.user.form.currentPassword": "Gjeldende passord",
+  "settings.user.form.newPassword": "Nytt passord",
+  "settings.user.form.accountType.label": "Konto type",
+  "settings.user.form.accountType.individual": "Individuell",
+  "settings.user.form.accountType.non-profit": "Non-Profit",
+  "settings.user.form.accountType.company": "Firma",
+  "subscription.type.free": "gratis",
+  "subscription.type.month": "måned",
+  "subscription.type.year": "år",
+  "subscription.type.mining": "Støtt Franz med prosessorkraft",
+  "subscription.mining.headline": "Hvordan fungerer dette?",
+  "subscription.mining.experimental": "eksperimental",
+  "subscription.mining.line1": "Ved å aktivere \"Støtt Franz med prosessorkraft\" vil Franz bruke cirka 20-50% av prosessore din til å mine kryptovalutaen Monero, som vil tilsvare omtrent $5/år",
+  "subscription.mining.line2": "Vi vil tilpasse prosessor bruken basert på arbeidsadferd for å ikke tømme batteriet og senke hastigheten på maskinen din.",
+  "subscription.mining.line3": "Så lenge du miner, har du ubegrenset tilgang til alle Franz Premium funksjoner.",
+  "subscription.mining.moreInformation": "Få mer informasjon om denne planen.",
+  "subscriptionPopup.buttonCancel": "Kanseller",
+  "subscriptionPopup.buttonDone": "Ferdig",
+  "tabs.item.reload": "Reload",
+  "tabs.item.edit": "Rediger",
+  "tabs.item.disableNotifications": "Deaktiver varsler",
+  "tabs.item.enableNotification": "Aktiver varsler",
+  "tabs.item.disableService": "Deaktiver tjeneste",
+  "tabs.item.deleteService": "Slett tjeneste"
+}
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index a6cde4d36..6bbf302ca 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -1,9 +1,9 @@
 import { remote, shell } from 'electron';
 import { autorun, computed, observable, toJS } from 'mobx';
 
-import { isDevMode, isMac } from '../environment';
+import { isMac, isLinux } from '../environment';
 
-const { app, Menu } = remote;
+const { app, Menu, dialog } = remote;
 
 const template = [
   {
@@ -84,6 +84,28 @@ const template = [
         label: 'Learn More',
         click() { shell.openExternal('http://meetfranz.com'); },
       },
+      {
+        label: 'Changelog',
+        click() { shell.openExternal('https://github.com/meetfranz/franz/blob/master/CHANGELOG.md'); },
+      },
+      {
+        type: 'separator',
+      },
+      {
+        label: 'Support',
+        click() { shell.openExternal('http://meetfranz.com/support'); },
+      },
+      {
+        type: 'separator',
+      },
+      {
+        label: 'Terms of Service',
+        click() { shell.openExternal('https://meetfranz.com/terms'); },
+      },
+      {
+        label: 'Privacy Statement',
+        click() { shell.openExternal('https://meetfranz.com/privacy'); },
+      },
     ],
   },
 ];
@@ -101,17 +123,15 @@ export default class FranzMenu {
   _build() {
     const tpl = toJS(this.tpl);
 
-    if (isDevMode) {
-      tpl[1].submenu.push({
-        role: 'toggledevtools',
-      }, {
-        label: 'Toggle Service Developer Tools',
-        accelerator: 'CmdOrCtrl+Shift+Alt+i',
-        click: () => {
-          this.actions.service.openDevToolsForActiveService();
-        },
-      });
-    }
+    tpl[1].submenu.push({
+      role: 'toggledevtools',
+    }, {
+      label: 'Toggle Service Developer Tools',
+      accelerator: 'CmdOrCtrl+Shift+Alt+i',
+      click: () => {
+        this.actions.service.openDevToolsForActiveService();
+      },
+    });
 
     tpl[1].submenu.unshift({
       label: 'Reload Service',
@@ -218,6 +238,18 @@ export default class FranzMenu {
           role: 'front',
         },
       ];
+    } else {
+      tpl[4].submenu.unshift({
+        role: 'about',
+        click: () => {
+          dialog.showMessageBox({
+            type: 'info',
+            title: 'Franz',
+            message: 'Franz',
+            detail: `Version: ${remote.app.getVersion()}\nRelease: ${process.versions.electron} / ${process.platform} / ${process.arch}`,
+          });
+        },
+      });
     }
 
     const serviceTpl = this.serviceTpl;
@@ -244,9 +276,10 @@ export default class FranzMenu {
     const services = this.stores.services.enabled;
 
     if (this.stores.user.isLoggedIn) {
+      const systemAcceleratorKey = isLinux ? 'Alt' : 'CmdOrCtrl';
       return services.map((service, i) => ({
         label: service.name,
-        accelerator: i <= 9 ? `CmdOrCtrl+${i + 1}` : null,
+        accelerator: i <= 9 ? `${systemAcceleratorKey}+${i + 1}` : null,
         type: 'radio',
         checked: service.isActive,
         click: () => {
diff --git a/src/lib/Tray.js b/src/lib/Tray.js
index 525ce592e..2efe71a71 100644
--- a/src/lib/Tray.js
+++ b/src/lib/Tray.js
@@ -7,6 +7,8 @@ const INDICATOR_TRAY_UNREAD = 'tray-unread';
 
 export default class TrayIcon {
   trayIcon = null;
+  indicator = 0;
+  themeChangeSubscriberId = null;
 
   show() {
     if (this.trayIcon) return;
@@ -32,28 +34,43 @@ export default class TrayIcon {
     this.trayIcon.on('click', () => {
       app.mainWindow.show();
     });
+
+    if (process.platform === 'darwin') {
+      this.themeChangeSubscriberId = systemPreferences.subscribeNotification('AppleInterfaceThemeChangedNotification', () => {
+        this._refreshIcon();
+      });
+    }
   }
 
   hide() {
-    if (this.trayIcon) {
-      this.trayIcon.destroy();
-      this.trayIcon = null;
+    if (!this.trayIcon) return;
+
+    this.trayIcon.destroy();
+    this.trayIcon = null;
+
+    if (process.platform === 'darwin' && this.themeChangeSubscriberId) {
+      systemPreferences.unsubscribeNotification(this.themeChangeSubscriberId);
+      this.themeChangeSubscriberId = null;
     }
   }
 
   setIndicator(indicator) {
+    this.indicator = indicator;
+    this._refreshIcon();
+  }
+
+  _refreshIcon() {
     if (!this.trayIcon) return;
 
-    this.trayIcon.setImage(this._getAsset('tray', indicator !== 0 ? INDICATOR_TRAY_UNREAD : INDICATOR_TRAY_PLAIN));
+    this.trayIcon.setImage(this._getAsset('tray', this.indicator !== 0 ? INDICATOR_TRAY_UNREAD : INDICATOR_TRAY_PLAIN));
 
     if (process.platform === 'darwin') {
       this.trayIcon.setPressedImage(
-        this._getAsset('tray', `${indicator !== 0 ? INDICATOR_TRAY_UNREAD : INDICATOR_TRAY_PLAIN}-active`),
+        this._getAsset('tray', `${this.indicator !== 0 ? INDICATOR_TRAY_UNREAD : INDICATOR_TRAY_PLAIN}-active`),
       );
     }
   }
 
-
   _getAsset(type, asset) {
     let platform = process.platform;
 
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index 7dbef985d..f608a689e 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -13,7 +13,7 @@ import locales from '../i18n/translations';
 import { gaEvent } from '../lib/analytics';
 import Miner from '../lib/Miner';
 
-const { app, getCurrentWindow, powerMonitor } = remote;
+const { app, powerMonitor } = remote;
 const defaultLocale = 'en-US';
 
 export default class AppStore extends Store {
@@ -112,24 +112,15 @@ export default class AppStore extends Store {
       setTimeout(window.location.reload, 5000);
     });
 
-    // Open Dev Tools (even in production mode)
-    key('⌘+ctrl+shift+alt+i, ctrl+shift+alt+i', () => {
-      getCurrentWindow().toggleDevTools();
-    });
-
-    key('⌘+ctrl+shift+alt+pageup, ctrl+shift+alt+pageup', () => {
-      this.actions.service.openDevToolsForActiveService();
-    });
-
     // Set active the next service
     key(
-      '⌘+pagedown, ctrl+pagedown, ⌘+shift+tab, ctrl+shift+tab', () => {
+      '⌘+pagedown, ctrl+pagedown, ⌘+tab, ctrl+tab', () => {
         this.actions.service.setActiveNext();
       });
 
     // Set active the prev service
     key(
-      '⌘+pageup, ctrl+pageup, ⌘+tab, ctrl+tab', () => {
+      '⌘+pageup, ctrl+pageup, ⌘+shift+tab, ctrl+shift+tab', () => {
         this.actions.service.setActivePrev();
       });
 
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 7e797ce55..2ddeeffd4 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -41,6 +41,7 @@ export default class ServicesStore extends Store {
     this.actions.service.openWindow.listen(this._openWindow.bind(this));
     this.actions.service.filter.listen(this._filter.bind(this));
     this.actions.service.resetFilter.listen(this._resetFilter.bind(this));
+    this.actions.service.resetStatus.listen(this._resetStatus.bind(this));
     this.actions.service.reload.listen(this._reload.bind(this));
     this.actions.service.reloadActive.listen(this._reloadActive.bind(this));
     this.actions.service.reloadAll.listen(this._reloadAll.bind(this));
@@ -341,6 +342,10 @@ export default class ServicesStore extends Store {
     this.filterNeedle = null;
   }
 
+  @action _resetStatus() {
+    this.actionStatus = [];
+  }
+
   @action _reload({ serviceId }) {
     const service = this.one(serviceId);
     service.resetMessageCount();