From 2796c15250432bac67f7924e682cbd94a9ffa94a Mon Sep 17 00:00:00 2001
From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com>
Date: Fri, 1 Nov 2019 23:44:23 +0700
Subject: New translations en-US.json (Portuguese)

---
 src/i18n/locales/pt-BR.json | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/i18n/locales/pt-BR.json b/src/i18n/locales/pt-BR.json
index af03b302a..01b977cfd 100644
--- a/src/i18n/locales/pt-BR.json
+++ b/src/i18n/locales/pt-BR.json
@@ -9,17 +9,17 @@
   "feature.delayApp.trial.headline": "Empieza el periodo de prueba de Ferdi Profesional por 14 días y cruza la linea.",
   "feature.delayApp.upgrade.action": "Adquira uma licença de suporte Ferdi",
   "feature.delayApp.upgrade.actionShort": "Atualizar conta",
-  "feature.planSelection.cta.ctaDowngradeFree": "Downgrade to Free",
-  "feature.planSelection.cta.stayOnFree": "Stay on Free",
-  "feature.planSelection.cta.trial": "Start my free 14-days Trial",
-  "feature.planSelection.cta.upgradePersonal": "Choose Personal",
-  "feature.planSelection.cta.upgradePro": "Choose Professional",
-  "feature.planSelection.free.text": "Basic functionality",
-  "feature.planSelection.fullFeatureList": "Complete comparison of all plans",
-  "feature.planSelection.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.planSelection.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.planSelection.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.planSelection.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
+  "feature.planSelection.cta.ctaDowngradeFree": "Despromover para Gratuito",
+  "feature.planSelection.cta.stayOnFree": "Continuar em Gratuito",
+  "feature.planSelection.cta.trial": "Iniciar meu teste grátis de 14 dias",
+  "feature.planSelection.cta.upgradePersonal": "Escolha Pessoal",
+  "feature.planSelection.cta.upgradePro": "Escolha Profissional",
+  "feature.planSelection.free.text": "Funcionalidade básica",
+  "feature.planSelection.fullFeatureList": "Comparação completa de todos os planos",
+  "feature.planSelection.fullscreen.dialog.cta.downgrade": "Despromover para Gratuito",
+  "feature.planSelection.fullscreen.dialog.cta.upgrade": "Escolha Pessoal",
+  "feature.planSelection.fullscreen.dialog.message": "Você está prestes a fazer a despromoção para nossa conta gratuita. Você tem certeza? Clique aqui para obter mais serviços e funcionalidade por apenas {currency}{price} por mês.",
+  "feature.planSelection.fullscreen.dialog.title": "Despromover o seu Plano Ferdi",
   "feature.planSelection.fullscreen.subheadline": "It's time to make a choice. Ferdi works best on our Personal and Professional plans. Please have a look and choose the best one for you.",
   "feature.planSelection.fullscreen.welcome": "Are you ready to choose, {name}",
   "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.",
@@ -41,10 +41,10 @@
   "feature.todos.premium.upgrade": "Actualizar cuenta",
   "feature.trialStatusBar.cta": "Upgrade now",
   "feature.trialStatusBar.expired": "Your free Ferdi {plan} Trial has expired, please upgrade your account.",
-  "feature.trialStatusBar.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.trialStatusBar.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.trialStatusBar.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.trialStatusBar.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
+  "feature.trialStatusBar.fullscreen.dialog.cta.downgrade": "Despromover para Gratuito",
+  "feature.trialStatusBar.fullscreen.dialog.cta.upgrade": "Escolha Pessoal",
+  "feature.trialStatusBar.fullscreen.dialog.message": "Você está prestes a fazer a despromoção para nossa conta gratuita. Você tem certeza? Clique aqui para obter mais serviços e funcionalidade por apenas {currency}{price} por mês.",
+  "feature.trialStatusBar.fullscreen.dialog.title": "Despromover o seu Plano Ferdi",
   "feature.trialStatusBar.restTime": "Your Free Ferdi {plan} Trial ends in {time}.",
   "global.api.unhealthy": "Não foi possível conectar-se aos serviços on-line do Ferdi.",
   "global.franzProRequired": "Se requiere una cuenta Ferdi Profesional",
-- 
cgit v1.2.3-54-g00ecf


From b078e58b7a263eee96025ad515ccd95a4aed6d61 Mon Sep 17 00:00:00 2001
From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com>
Date: Sat, 2 Nov 2019 00:47:33 +0700
Subject: New translations en-US.json (Portuguese)

---
 src/i18n/locales/pt-BR.json | 110 ++++++++++++++++++++++----------------------
 1 file changed, 55 insertions(+), 55 deletions(-)

diff --git a/src/i18n/locales/pt-BR.json b/src/i18n/locales/pt-BR.json
index 01b977cfd..b190c6819 100644
--- a/src/i18n/locales/pt-BR.json
+++ b/src/i18n/locales/pt-BR.json
@@ -1,8 +1,8 @@
 {
-  "app.errorHandler.action": "Recarregar",
-  "app.errorHandler.headline": "Opa! Algo deu errado.",
-  "feature.announcements.changelog.headline": "Mudanças no Ferdi {version}",
-  "feature.delayApp.headline": "Por favor, adquira uma licença para pular o tempo de espera",
+  "app.errorHandler.action": "Actualizar",
+  "app.errorHandler.headline": "Uoops! Algo correu mal",
+  "feature.announcements.changelog.headline": "Alterações no Ferdi {version}",
+  "feature.delayApp.headline": "Por favor, adquira uma licença Ferdi para não ter tempo de espera",
   "feature.delayApp.text": "Ferdi continuará em {seconds} segundos.",
   "feature.delayApp.trial.action": "Sim, eu quero o período de testes gratuito de 14 dias do Ferdi Professional",
   "feature.delayApp.trial.actionShort": "Ativar período de testes gratuito do Ferdi Professional",
@@ -20,14 +20,14 @@
   "feature.planSelection.fullscreen.dialog.cta.upgrade": "Escolha Pessoal",
   "feature.planSelection.fullscreen.dialog.message": "Você está prestes a fazer a despromoção para nossa conta gratuita. Você tem certeza? Clique aqui para obter mais serviços e funcionalidade por apenas {currency}{price} por mês.",
   "feature.planSelection.fullscreen.dialog.title": "Despromover o seu Plano Ferdi",
-  "feature.planSelection.fullscreen.subheadline": "It's time to make a choice. Ferdi works best on our Personal and Professional plans. Please have a look and choose the best one for you.",
-  "feature.planSelection.fullscreen.welcome": "Are you ready to choose, {name}",
-  "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.",
-  "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment",
-  "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.",
-  "feature.quickSwitch.info": "Select a service with TAB, ↑ and ↓. Open a service with ENTER.",
-  "feature.quickSwitch.search": "Search...",
-  "feature.quickSwitch.title": "QuickSwitch",
+  "feature.planSelection.fullscreen.subheadline": "Agora tem de fazer uma escolha. O Ferdi trabalha melhor em nossos planos pessoais e profissionais. Por favor, compare estes planos e escolha o que melhor se adapta a si.",
+  "feature.planSelection.fullscreen.welcome": "Está prestes a escolher, {name}",
+  "feature.planSelection.personal.text": "Mais serviços, sem espera - ideal para uso pessoal.",
+  "feature.planSelection.pricesBasedOnAnnualPayment": "Todos os preços são baseados no pagamento anual",
+  "feature.planSelection.pro.text": "Serviços ilimitados e recursos profissionais para si - e para a sua equipa.",
+  "feature.quickSwitch.info": "Seleccione um serviço com TAB, ↑ e ↓. Abra um serviço com ENTER.",
+  "feature.quickSwitch.search": "A procurar...",
+  "feature.quickSwitch.title": "Troca Rápida",
   "feature.serviceLimit.limitReached": "Você adicionou {amount} serviços de um total de {limit} que estão inclusos no seu plano. Por favor, atualize sua conta para adicionar mais serviços.",
   "feature.shareFranz.action.email": "Enviar por e-mail",
   "feature.shareFranz.action.facebook": "Compartilhar no Facebook",
@@ -39,13 +39,13 @@
   "feature.todos.premium.info": "As Listas de Tarefa do Ferdi estão disponíveis para usuários premium!",
   "feature.todos.premium.rollout": "As outras pessoas terão que esperar um pouquinho mais.",
   "feature.todos.premium.upgrade": "Actualizar cuenta",
-  "feature.trialStatusBar.cta": "Upgrade now",
-  "feature.trialStatusBar.expired": "Your free Ferdi {plan} Trial has expired, please upgrade your account.",
+  "feature.trialStatusBar.cta": "Promover agora",
+  "feature.trialStatusBar.expired": "Seu teste grátis Ferdi {plan} expirou, por favor actualize sua conta.",
   "feature.trialStatusBar.fullscreen.dialog.cta.downgrade": "Despromover para Gratuito",
   "feature.trialStatusBar.fullscreen.dialog.cta.upgrade": "Escolha Pessoal",
   "feature.trialStatusBar.fullscreen.dialog.message": "Você está prestes a fazer a despromoção para nossa conta gratuita. Você tem certeza? Clique aqui para obter mais serviços e funcionalidade por apenas {currency}{price} por mês.",
   "feature.trialStatusBar.fullscreen.dialog.title": "Despromover o seu Plano Ferdi",
-  "feature.trialStatusBar.restTime": "Your Free Ferdi {plan} Trial ends in {time}.",
+  "feature.trialStatusBar.restTime": "Seu teste grátis Ferdi {plan} termina em {time}.",
   "global.api.unhealthy": "Não foi possível conectar-se aos serviços on-line do Ferdi.",
   "global.franzProRequired": "Se requiere una cuenta Ferdi Profesional",
   "global.notConnectedToTheInternet": "Você não está conectado à internet",
@@ -58,7 +58,7 @@
   "import.notSupportedHeadline": "Serviços ainda não suportados pelo Ferdi 5 ",
   "import.skip.label": "Quero adicionar serviços manualmente",
   "import.submit.label": "Importar serviços",
-  "infobar.authRequestFailed": "There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.",
+  "infobar.authRequestFailed": "Houve erros ao tentar autenticar. Por favor, tente desconectar e autenticar novamente se o erro persistir.",
   "infobar.buttonChangelog": "O que há de novo?",
   "infobar.buttonInstallUpdate": "Reiniciar e instalar atualizações ",
   "infobar.buttonReloadServices": "Recarregar serviços",
@@ -72,12 +72,12 @@
   "invite.skip.label": "Quero fazer isso depois",
   "invite.submit.label": "Enviar convites",
   "invite.successInfo": "Convites enviados com sucesso",
-  "locked.headline": "Locked",
-  "locked.info": "Ferdi is currently locked. Please unlock Ferdi with your password to see your messages.",
-  "locked.invalidCredentials": "Password invalid",
-  "locked.password.label": "Password",
-  "locked.submit.label": "Unlock",
-  "login.changeServer": "Change server",
+  "locked.headline": "Bloqueado",
+  "locked.info": "Ferdi está bloqueado no momento. Por favor, desbloqueie Ferdi com sua senha para ver suas mensagens.",
+  "locked.invalidCredentials": "Senha inválida",
+  "locked.password.label": "Senha",
+  "locked.submit.label": "Desbloquear",
+  "login.changeServer": "Alterar servidor",
   "login.customServerQuestion": "Using a custom Ferdi server?",
   "login.customServerSuggestion": "Try importing your Franz account",
   "login.email.label": "Endereço de E-mail",
@@ -85,7 +85,7 @@
   "login.invalidCredentials": "E-mail ou senha inválida",
   "login.link.password": "Trocar a senha",
   "login.link.signup": "Criar uma conta gratuita",
-  "login.password.label": "Password",
+  "login.password.label": "Senha",
   "login.serverLogout": "Sua sessão expirou, faça o login novamente.",
   "login.submit.label": "Entrar",
   "login.tokenExpired": "Sua sessão expirou, faça o login novamente.",
@@ -93,7 +93,7 @@
   "menu.Todoss.openTodosDrawer": "Abrir a gaveta de Listas de Tarefa",
   "menu.app.about": "Sobre Ferdi",
   "menu.app.announcement": "Quais as novidades?",
-  "menu.app.autohideMenuBar": "Auto-hide menu bar",
+  "menu.app.autohideMenuBar": "Auto-ocultar barra de menu",
   "menu.app.checkForUpdates": "Verificar se há atualizações",
   "menu.app.hide": "Ocultar",
   "menu.app.hideOthers": "Ocultar Outros",
@@ -127,17 +127,17 @@
   "menu.services": "Serviços",
   "menu.services.activatePreviousService": "Pular para serviço anterior",
   "menu.services.addNewService": "Adicionar Novo Serviço",
-  "menu.services.goHome": "Home",
+  "menu.services.goHome": "Início",
   "menu.services.setNextServiceActive": "Pular para próximo serviço",
   "menu.todos": "Tareas pendientes",
   "menu.todos.enableTodos": "Habilitar Tareas pendientes",
   "menu.view": "Visualizar ",
-  "menu.view.back": "Back",
+  "menu.view.back": "Anterior",
   "menu.view.enterFullScreen": "Modo Tela Cheia",
   "menu.view.exitFullScreen": "Sair da Tela Cheia",
-  "menu.view.forward": "Forward",
-  "menu.view.lockFerdi": "Lock Ferdi",
-  "menu.view.openQuickSwitch": "Open Quick Switch",
+  "menu.view.forward": "Seguinte",
+  "menu.view.lockFerdi": "Bloquear Ferdi",
+  "menu.view.openQuickSwitch": "Abrir Troca Rápida",
   "menu.view.reloadFranz": "Recarregar Ferdi",
   "menu.view.reloadService": "Reiniciar o Serviço",
   "menu.view.resetZoom": "Tamanho real",
@@ -163,20 +163,20 @@
   "password.submit.label": "Enviar",
   "password.successInfo": "Por favor, verifique o seu e-mail",
   "premiumFeature.button.upgradeAccount": "Atualizar conta",
-  "pricing.features.accountSync": "Account Synchronisation",
+  "pricing.features.accountSync": "Sincronização Automática",
   "pricing.features.adFree": "Sin anuncios para siempre!",
   "pricing.features.appDelays": "Sem Telas de Espera",
   "pricing.features.customWebsites": "Adicionar Websites Personalizados",
-  "pricing.features.desktopNotifications": "Desktop Notifications",
+  "pricing.features.desktopNotifications": "Notificações no ambiente de trabalho",
   "pricing.features.onPremise": "En sitio y otros servicios alojados",
-  "pricing.features.recipes": "Choose from more than 70 Services",
+  "pricing.features.recipes": "Escolha entre mais de 70 serviços",
   "pricing.features.serviceProxies": "Apoderados de Servicio",
   "pricing.features.spellchecker": "Soporte de corrector ortográfico",
   "pricing.features.teamManagement": "Gestão de Time",
   "pricing.features.thirdPartyServices": "Instalar servicios de terceros",
   "pricing.features.unlimitedServices": "Agregar servicios ilimitados",
-  "pricing.features.upToSixServices": "Add up to 6 services",
-  "pricing.features.upToThreeServices": "Add up to 3 services",
+  "pricing.features.upToSixServices": "Adicionar até 6 serviços",
+  "pricing.features.upToThreeServices": "Adicionar até 3 serviços",
   "pricing.features.workspaces": "Áreas de trabalho",
   "pricing.plan.free": "Ferdi Gratuito",
   "pricing.plan.legacy": "Ferdi Premium",
@@ -188,17 +188,17 @@
   "pricing.plan.pro-yearly": "Ferdi Profissional Anual",
   "pricing.trial.cta.accept": "Sim, atualizar minha conta para o Ferdi Profissional",
   "pricing.trial.cta.skip": "Continuar para o Ferdi",
-  "pricing.trial.cta.start": "Start using Ferdi",
+  "pricing.trial.cta.start": "Começar a usar Ferdi",
   "pricing.trial.error": "Desculpe, não conseguimos ativar o seu período de testes",
   "pricing.trial.features.headline": "Incluso no Ferdi Profissional:",
-  "pricing.trial.headline.pro": "Hi {name}, welcome to Ferdi",
-  "pricing.trial.intro.happyMessaging": "Happy messaging,",
-  "pricing.trial.intro.specialTreat": "We have a special treat for you.",
-  "pricing.trial.intro.tryPro": "Enjoy the full Ferdi Professional experience completely free for 14 days.",
+  "pricing.trial.headline.pro": "Olá {name}, bem-vindo/a ao Ferdi",
+  "pricing.trial.intro.happyMessaging": "Mensagens felizes,",
+  "pricing.trial.intro.specialTreat": "Temos uma oferta especial para si.",
+  "pricing.trial.intro.tryPro": "Aproveite a experiência completa de Ferdi Profissional completamente gratuita durante 14 dias.",
   "pricing.trial.terms.automaticTrialEnd": "Seu período de testes encerra automaticamente em 14 dias",
   "pricing.trial.terms.headline": "Sem vínculos",
   "pricing.trial.terms.noCreditCard": "No necesita tarjeta de crédito",
-  "pricing.trial.terms.trialWorth": "Free trial (normally {currency}{price} per month)",
+  "pricing.trial.terms.trialWorth": "Teste gratuito (normalmente {currency}{price} por mês)",
   "service.crashHandler.action": "Recarregar {name}",
   "service.crashHandler.autoReload": "Tentando reestabelecer {name} automaticamente em {seconds} segundos",
   "service.crashHandler.headline": "Ah, não!",
@@ -217,9 +217,9 @@
   "service.restrictedHandler.serviceLimit.text": "Por favor mejore su cuenta para poder utilizar más de {count} servicios.",
   "service.webviewLoader.loading": "Carregando",
   "services.getStarted": "Iniciar",
-  "services.login": "Please login to use Ferdi.",
-  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
-  "services.serverless": "Use Ferdi without an Account",
+  "services.login": "Por favor, inicie sua sessão para usar Ferdi.",
+  "services.serverInfo": "Opcionalmente, você pode mudar seu servidor Ferdi clicando no icon de roda dentada no canto inferior esquerdo.",
+  "services.serverless": "Use Ferdi sem uma conta",
   "services.welcome": "Bem-vindo ao Ferdi!",
   "settings.account.account.editButton": "Editar conta",
   "settings.account.accountType.basic": "Conta Básica",
@@ -248,13 +248,13 @@
   "settings.account.upgradeToPro.label": "Atualizar para o Ferdi Profissional",
   "settings.account.userInfoRequestFailed": "Não foi possível carregar as informações do usuário",
   "settings.account.yourLicense": "Su Licencia Ferdi",
-  "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: #7367f0)",
+  "settings.app.accentColorInfo": "Escreva sua cor de destaque em um formato compatível com CSS. (Padrão: #7367f0)",
   "settings.app.buttonClearAllCache": "Limpar cache",
   "settings.app.buttonInstallUpdate": "Reiniciar e instalar atualizações ",
   "settings.app.buttonSearchForUpdate": "Verificar se há atualizações",
   "settings.app.cacheInfo": "O cache do Ferdi está usando {size} de espaço em disco atualmente.",
   "settings.app.currentVersion": "Versão atual:",
-  "settings.app.form.accentColor": "Accent color",
+  "settings.app.form.accentColor": "Cor de destaque",
   "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode",
   "settings.app.form.autoLaunchInBackground": "Abrir em segundo plano",
   "settings.app.form.autoLaunchOnStart": "Abrir o Ferdi ao iniciar o sistema",
@@ -421,7 +421,7 @@
   "sidebar.addNewService": "Adicionar novo serviço",
   "sidebar.closeTodosDrawer": "Close Ferdi Todos",
   "sidebar.closeWorkspaceDrawer": "Fechar menu da área de trabalho",
-  "sidebar.lockFerdi": "Lock Ferdi",
+  "sidebar.lockFerdi": "Bloquear Ferdi",
   "sidebar.muteApp": "Desativar notificações e áudio",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Abrir o menu da área de trabalho",
@@ -436,7 +436,7 @@
   "signup.legal.privacy": "Declaração de Privacidade ",
   "signup.legal.terms": "Termos de serviço",
   "signup.link.login": "Já tem uma conta?",
-  "signup.password.label": "Password",
+  "signup.password.label": "Senha",
   "signup.submit.label": "Criar uma conta",
   "subscription.bestValue": "Best value",
   "subscription.cta.activateTrial": "Yes, start the free Ferdi Professional trial",
@@ -445,9 +445,9 @@
   "subscription.includedProFeatures": "The Ferdi Professional Plan includes:",
   "subscription.interval.per": "per {interval}",
   "subscription.interval.perMonth": "per month",
-  "subscription.interval.perMonthPerUser": "per month & user",
+  "subscription.interval.perMonthPerUser": "por mês e por utilizador",
   "subscription.planItem.upgradeAccount": "Actualizar cuenta",
-  "subscription.teaser.includedFeatures": "Paid Ferdi Plans include:",
+  "subscription.teaser.includedFeatures": "Planos pagos Ferdi incluem:",
   "subscription.teaser.intro": "O Ferdi 5 vem com uma variedade de novas funcionalidades para melhorar a sua comunicação diária - pilhas inclusas. Confira os nossos novos planos e encontre aquele que melhor serve para você!",
   "subscriptionPopup.buttonCancel": "Cancelar",
   "subscriptionPopup.buttonDone": "Feito",
@@ -459,17 +459,17 @@
   "tabs.item.enableAudio": "Ativar áudio",
   "tabs.item.enableNotification": "Ativar notificações",
   "tabs.item.enableService": "Ativar serviço",
-  "tabs.item.reload": "Recarregar",
+  "tabs.item.reload": "Actualizar",
   "validation.email": "inválido",
   "validation.minLength": "{campo} deve ter pelo menos {comprimento} mais caracteres ",
   "validation.oneRequired": "Necessário pelo menos um",
   "validation.required": "{campo} obrigatório",
   "validation.url": "{campo} essa URL não é válida",
-  "webControls.back": "Back",
-  "webControls.forward": "Forward",
-  "webControls.goHome": "Home",
-  "webControls.openInBrowser": "Open in Browser",
-  "webControls.reload": "Recarregar",
+  "webControls.back": "Anterior",
+  "webControls.forward": "Seguinte",
+  "webControls.goHome": "Início",
+  "webControls.openInBrowser": "Abrir no navegador",
+  "webControls.reload": "Actualizar",
   "welcome.loginButton": "Entrar na sua conta",
   "welcome.signupButton": "Criar uma conta gratuita",
   "workspaceDrawer.addNewWorkspaceLabel": "Adicionar uma nova área de trabalho",
-- 
cgit v1.2.3-54-g00ecf


From d978493ddc42aac1d2237573dc49aa449bfc57d2 Mon Sep 17 00:00:00 2001
From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com>
Date: Sat, 2 Nov 2019 11:26:21 +0700
Subject: New translations en-US.json (Portuguese)

---
 src/i18n/locales/pt-BR.json | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/i18n/locales/pt-BR.json b/src/i18n/locales/pt-BR.json
index b190c6819..591b35610 100644
--- a/src/i18n/locales/pt-BR.json
+++ b/src/i18n/locales/pt-BR.json
@@ -255,33 +255,33 @@
   "settings.app.cacheInfo": "O cache do Ferdi está usando {size} de espaço em disco atualmente.",
   "settings.app.currentVersion": "Versão atual:",
   "settings.app.form.accentColor": "Cor de destaque",
-  "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode",
+  "settings.app.form.adaptableDarkMode": "Activar modo de escuridão adaptável",
   "settings.app.form.autoLaunchInBackground": "Abrir em segundo plano",
   "settings.app.form.autoLaunchOnStart": "Abrir o Ferdi ao iniciar o sistema",
   "settings.app.form.beta": "Incluir versões beta",
   "settings.app.form.darkMode": "Venha para o Lado Negro da força",
   "settings.app.form.enableGPUAcceleration": "Ativar Aceleração de GPU",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Activar o bloqueio com palavra-passe do Ferdi",
   "settings.app.form.enableSpellchecking": "Ativar correção ortográfica",
   "settings.app.form.enableSystemTray": "Exibir o Ferdi na barra de sistema",
   "settings.app.form.enableTodos": "Activar Ferdi Todos",
-  "settings.app.form.hibernate": "Enable service hibernation",
-  "settings.app.form.hibernationStrategy": "Hibernation strategy",
+  "settings.app.form.hibernate": "Activar hibernação do serviço",
+  "settings.app.form.hibernationStrategy": "Estratégia de Hibernação",
   "settings.app.form.keepAllWorkspacesLoaded": "Mantener todas las Áreas de trabajo cargadas",
   "settings.app.form.language": "Idioma",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Palavra-passe para bloqueio do Ferdi",
   "settings.app.form.minimizeToSystemTray": "Minimizar o Ferdi para a área de sistema",
-  "settings.app.form.noUpdates": "Disable updates",
-  "settings.app.form.privateNotifications": "Don't show message content in notifications",
+  "settings.app.form.noUpdates": "Desactivar actualizações",
+  "settings.app.form.privateNotifications": "Não mostrar o conteúdo das mensagens nas notificações",
   "settings.app.form.runInBackground": "Manter o Ferdi no fundo quando fechar a janela",
-  "settings.app.form.scheduledDNDEnabled": "Enable scheduled Do-not-Disturb",
-  "settings.app.form.scheduledDNDEnd": "To",
-  "settings.app.form.scheduledDNDStart": "From",
-  "settings.app.form.server": "Server",
+  "settings.app.form.scheduledDNDEnabled": "Activar Não-Perturbar agendado",
+  "settings.app.form.scheduledDNDEnd": "Até",
+  "settings.app.form.scheduledDNDStart": "Desde",
+  "settings.app.form.server": "Servidor",
   "settings.app.form.showDisabledServices": "Mostrar abas de serviços desativados",
   "settings.app.form.showMessagesBadgesWhenMuted": "Mostrar ícone de mensagem não lida quando as notificações estiverem desativadas",
-  "settings.app.form.showServiceNavigationBar": "Always show service navigation bar",
-  "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.showServiceNavigationBar": "Sempre mostrar a barra de navegação do serviço",
+  "settings.app.form.todoServer": "Tarefa do Servidor",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.headline": "Configurações",
   "settings.app.headlineAdvanced": "Avançado",
-- 
cgit v1.2.3-54-g00ecf


From 33a1daa4dc0a01a8d2fd68300ddd63503aab8d41 Mon Sep 17 00:00:00 2001
From: Amine Mouafik 穆昂明 <amine@mouafik.fr>
Date: Mon, 4 Nov 2019 10:54:46 +0700
Subject: Review misleading build dependencies for Windows

---
 README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.md b/README.md
index ec0f8a338..6a2c61e07 100644
--- a/README.md
+++ b/README.md
@@ -132,8 +132,7 @@ $ dnf install libX11-devel libXext-devel libXScrnSaver-devel libxkbfile-devel
 #### Windows
 
 ```bash
-$ npm install --global windows-build-tools // Windows 10
-$ npm install --global windows-build-tools --vs2015 // Windows 7
+$ npm install --global windows-build-tools --vs2015
 ```
 
 ### Clone repository with submodule
-- 
cgit v1.2.3-54-g00ecf


From 075ee51642a1363ce0d38ce5efb9dad5aa9d3e9e Mon Sep 17 00:00:00 2001
From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com>
Date: Mon, 4 Nov 2019 10:40:05 +0100
Subject: New translations en-US.json (Chinese Traditional)

---
 src/i18n/locales/zh-HANT.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/i18n/locales/zh-HANT.json b/src/i18n/locales/zh-HANT.json
index 872bfd9d7..fd1ea9977 100644
--- a/src/i18n/locales/zh-HANT.json
+++ b/src/i18n/locales/zh-HANT.json
@@ -255,6 +255,7 @@
   "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.",
   "settings.app.currentVersion": "當前版本：",
   "settings.app.form.accentColor": "Accent color",
+  "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode",
   "settings.app.form.autoLaunchInBackground": "背景啟動",
   "settings.app.form.autoLaunchOnStart": "開機時啟動",
   "settings.app.form.beta": "包含開發中版本",
-- 
cgit v1.2.3-54-g00ecf


From 3f42c0942b846d63928cacf045626e2497cc9345 Mon Sep 17 00:00:00 2001
From: Bennett <hello@vantezzen.io>
Date: Mon, 4 Nov 2019 10:43:00 +0100
Subject: Delete zh-Hant.json

---
 src/i18n/locales/zh-Hant.json | 486 ------------------------------------------
 1 file changed, 486 deletions(-)
 delete mode 100644 src/i18n/locales/zh-Hant.json

diff --git a/src/i18n/locales/zh-Hant.json b/src/i18n/locales/zh-Hant.json
deleted file mode 100644
index fd1ea9977..000000000
--- a/src/i18n/locales/zh-Hant.json
+++ /dev/null
@@ -1,486 +0,0 @@
-{
-  "app.errorHandler.action": "Reload",
-  "app.errorHandler.headline": "Something went wrong",
-  "feature.announcements.changelog.headline": "Changes in Ferdi {version}",
-  "feature.delayApp.headline": "Please purchase a Ferdi Supporter License to skip waiting",
-  "feature.delayApp.text": "Ferdi will continue in {seconds} seconds.",
-  "feature.delayApp.trial.action": "Yes, I want the free 14 day trial of Ferdi Professional",
-  "feature.delayApp.trial.actionShort": "Activate the free Ferdi Professional trial",
-  "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14 day trial and skip the line",
-  "feature.delayApp.upgrade.action": "Get a Ferdi Supporter License",
-  "feature.delayApp.upgrade.actionShort": "Upgrade account",
-  "feature.planSelection.cta.ctaDowngradeFree": "Downgrade to Free",
-  "feature.planSelection.cta.stayOnFree": "Stay on Free",
-  "feature.planSelection.cta.trial": "Start my free 14-days Trial",
-  "feature.planSelection.cta.upgradePersonal": "Choose Personal",
-  "feature.planSelection.cta.upgradePro": "Choose Professional",
-  "feature.planSelection.free.text": "Basic functionality",
-  "feature.planSelection.fullFeatureList": "Complete comparison of all plans",
-  "feature.planSelection.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.planSelection.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.planSelection.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.planSelection.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.planSelection.fullscreen.subheadline": "It's time to make a choice. Ferdi works best on our Personal and Professional plans. Please have a look and choose the best one for you.",
-  "feature.planSelection.fullscreen.welcome": "Are you ready to choose, {name}",
-  "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.",
-  "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment",
-  "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.",
-  "feature.quickSwitch.info": "Select a service with TAB, ↑ and ↓. Open a service with ENTER.",
-  "feature.quickSwitch.search": "Search...",
-  "feature.quickSwitch.title": "QuickSwitch",
-  "feature.serviceLimit.limitReached": "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
-  "feature.shareFranz.action.email": "Send as email",
-  "feature.shareFranz.action.facebook": "Share on Facebook",
-  "feature.shareFranz.action.twitter": "Share on Twitter",
-  "feature.shareFranz.headline": "Ferdi is better together!",
-  "feature.shareFranz.shareText.email": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com",
-  "feature.shareFranz.shareText.twitter": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com /cc @FerdiMessenger",
-  "feature.shareFranz.text": "Tell your friends and colleagues how awesome Ferdi is and help us to spread the word.",
-  "feature.todos.premium.info": "Ferdi Todos are available to premium users now!",
-  "feature.todos.premium.rollout": "Everyone else will have to wait a little longer.",
-  "feature.todos.premium.upgrade": "Upgrade Account",
-  "feature.trialStatusBar.cta": "Upgrade now",
-  "feature.trialStatusBar.expired": "Your free Ferdi {plan} Trial has expired, please upgrade your account.",
-  "feature.trialStatusBar.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.trialStatusBar.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.trialStatusBar.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.trialStatusBar.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.trialStatusBar.restTime": "Your Free Ferdi {plan} Trial ends in {time}.",
-  "global.api.unhealthy": "無法連接到Ferdi網路服務",
-  "global.franzProRequired": "Ferdi Professional Required",
-  "global.notConnectedToTheInternet": "您未連上網際網路",
-  "global.spellchecker.useDefault": "Use System Default ({default})",
-  "global.spellchecking.autodetect": "Detect language automatically",
-  "global.spellchecking.autodetect.short": "Automatic",
-  "global.spellchecking.language": "Spell checking language",
-  "global.upgradeButton.upgradeToPro": "Upgrade to Ferdi Professional",
-  "import.headline": "匯入您的 Ferdi 4 服務",
-  "import.notSupportedHeadline": "此服務不被 Ferdi 5 支持",
-  "import.skip.label": "我想手動匯入",
-  "import.submit.label": "匯入服務",
-  "infobar.authRequestFailed": "There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.",
-  "infobar.buttonChangelog": "What is new?",
-  "infobar.buttonInstallUpdate": "重新啟動並且更新",
-  "infobar.buttonReloadServices": "重新載入",
-  "infobar.requiredRequestsFailed": "無法載入服務與帳戶資訊",
-  "infobar.servicesUpdated": "您的服務已更新",
-  "infobar.trialActivated": "Your trial was successfully activated. Happy messaging!",
-  "infobar.updateAvailable": "有新的更新可安裝",
-  "invite.email.label": "電子郵件信箱",
-  "invite.headline.friends": "邀請三個人",
-  "invite.name.label": "名子",
-  "invite.skip.label": "我想晚點進行",
-  "invite.submit.label": "Send invites",
-  "invite.successInfo": "Invitations sent successfully",
-  "locked.headline": "Locked",
-  "locked.info": "Ferdi is currently locked. Please unlock Ferdi with your password to see your messages.",
-  "locked.invalidCredentials": "Password invalid",
-  "locked.password.label": "Password",
-  "locked.submit.label": "Unlock",
-  "login.changeServer": "Change server",
-  "login.customServerQuestion": "Using a custom Ferdi server?",
-  "login.customServerSuggestion": "Try importing your Franz account",
-  "login.email.label": "電子郵件信箱",
-  "login.headline": "登入",
-  "login.invalidCredentials": "電子郵件帳戶或密碼有誤",
-  "login.link.password": "密碼重設",
-  "login.link.signup": "建立一個免費帳戶",
-  "login.password.label": "Password",
-  "login.serverLogout": "登入狀態過期，請重新登入",
-  "login.submit.label": "登入",
-  "login.tokenExpired": "登入狀態過期，請重新登入",
-  "menu.Todoss.closeTodosDrawer": "Close Todos drawer",
-  "menu.Todoss.openTodosDrawer": "Open Todos drawer",
-  "menu.app.about": "About Ferdi",
-  "menu.app.announcement": "What's new?",
-  "menu.app.autohideMenuBar": "Auto-hide menu bar",
-  "menu.app.checkForUpdates": "Check for updates",
-  "menu.app.hide": "Hide",
-  "menu.app.hideOthers": "Hide Others",
-  "menu.app.quit": "Quit",
-  "menu.app.settings": "Settings",
-  "menu.app.unhide": "Unhide",
-  "menu.edit": "Edit",
-  "menu.edit.copy": "Copy",
-  "menu.edit.cut": "Cut",
-  "menu.edit.delete": "Delete",
-  "menu.edit.emojiSymbols": "Emoji & Symbols",
-  "menu.edit.paste": "Paste",
-  "menu.edit.pasteAndMatchStyle": "Paste And Match Style",
-  "menu.edit.redo": "Redo",
-  "menu.edit.selectAll": "Select All",
-  "menu.edit.speech": "Speech",
-  "menu.edit.startDictation": "Start Dictation",
-  "menu.edit.startSpeaking": "Start Speaking",
-  "menu.edit.stopSpeaking": "Stop Speaking",
-  "menu.edit.undo": "Undo",
-  "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": "Ferdi Debug Information",
-  "menu.help.learnMore": "Learn More",
-  "menu.help.privacy": "Privacy Statement",
-  "menu.help.support": "Support",
-  "menu.help.tos": "Terms of Service",
-  "menu.services": "Services",
-  "menu.services.activatePreviousService": "Activate previous service",
-  "menu.services.addNewService": "Add New Service...",
-  "menu.services.goHome": "Home",
-  "menu.services.setNextServiceActive": "Activate next service",
-  "menu.todos": "Todos",
-  "menu.todos.enableTodos": "Enable Todos",
-  "menu.view": "View",
-  "menu.view.back": "Back",
-  "menu.view.enterFullScreen": "Enter Full Screen",
-  "menu.view.exitFullScreen": "Exit Full Screen",
-  "menu.view.forward": "Forward",
-  "menu.view.lockFerdi": "Lock Ferdi",
-  "menu.view.openQuickSwitch": "Open Quick Switch",
-  "menu.view.reloadFranz": "Reload Ferdi",
-  "menu.view.reloadService": "Reload Service",
-  "menu.view.resetZoom": "Actual Size",
-  "menu.view.toggleDevTools": "Toggle Developer Tools",
-  "menu.view.toggleFullScreen": "Toggle Full Screen",
-  "menu.view.toggleServiceDevTools": "Toggle Service Developer Tools",
-  "menu.view.toggleTodosDevTools": "Toggle Todos Developer Tools",
-  "menu.view.zoomIn": "Zoom In",
-  "menu.view.zoomOut": "Zoom Out",
-  "menu.window": "Window",
-  "menu.window.close": "Close",
-  "menu.window.minimize": "Minimize",
-  "menu.workspaces": "Workspaces",
-  "menu.workspaces.addNewWorkspace": "Add New Workspace...",
-  "menu.workspaces.closeWorkspaceDrawer": "Close workspace drawer",
-  "menu.workspaces.defaultWorkspace": "All services",
-  "menu.workspaces.openWorkspaceDrawer": "Open workspace drawer",
-  "password.email.label": "電子郵件信箱",
-  "password.headline": "密碼重設",
-  "password.link.login": "登入您的帳戶",
-  "password.link.signup": "建立一個免費帳戶",
-  "password.noUser": "此電子郵件帳戶不存在",
-  "password.submit.label": "送出",
-  "password.successInfo": "請重新確認您的電子郵件信箱",
-  "premiumFeature.button.upgradeAccount": "Upgrade account",
-  "pricing.features.accountSync": "Account Synchronisation",
-  "pricing.features.adFree": "Forever ad-free",
-  "pricing.features.appDelays": "No Waiting Screens",
-  "pricing.features.customWebsites": "Add Custom Websites",
-  "pricing.features.desktopNotifications": "Desktop Notifications",
-  "pricing.features.onPremise": "On-premise & other Hosted Services",
-  "pricing.features.recipes": "Choose from more than 70 Services",
-  "pricing.features.serviceProxies": "Service Proxies",
-  "pricing.features.spellchecker": "Spellchecker support",
-  "pricing.features.teamManagement": "Team Management",
-  "pricing.features.thirdPartyServices": "Install 3rd party services",
-  "pricing.features.unlimitedServices": "Add unlimited services",
-  "pricing.features.upToSixServices": "Add up to 6 services",
-  "pricing.features.upToThreeServices": "Add up to 3 services",
-  "pricing.features.workspaces": "Workspaces",
-  "pricing.plan.free": "Ferdi Free",
-  "pricing.plan.legacy": "Ferdi Premium",
-  "pricing.plan.personal": "Ferdi Personal",
-  "pricing.plan.personal-monthly": "Ferdi Personal Monthly",
-  "pricing.plan.personal-yearly": "Ferdi Personal Yearly",
-  "pricing.plan.pro": "Ferdi Professional",
-  "pricing.plan.pro-monthly": "Ferdi Professional Monthly",
-  "pricing.plan.pro-yearly": "Ferdi Professional Yearly",
-  "pricing.trial.cta.accept": "Yes, upgrade my account to Ferdi Professional",
-  "pricing.trial.cta.skip": "Continue to Ferdi",
-  "pricing.trial.cta.start": "Start using Ferdi",
-  "pricing.trial.error": "Sorry, we could not activate your trial!",
-  "pricing.trial.features.headline": "Ferdi Professional includes:",
-  "pricing.trial.headline.pro": "Hi {name}, welcome to Ferdi",
-  "pricing.trial.intro.happyMessaging": "Happy messaging,",
-  "pricing.trial.intro.specialTreat": "We have a special treat for you.",
-  "pricing.trial.intro.tryPro": "Enjoy the full Ferdi Professional experience completely free for 14 days.",
-  "pricing.trial.terms.automaticTrialEnd": "Your free trial ends automatically after 14 days",
-  "pricing.trial.terms.headline": "No strings attached",
-  "pricing.trial.terms.noCreditCard": "No credit card required",
-  "pricing.trial.terms.trialWorth": "Free trial (normally {currency}{price} per month)",
-  "service.crashHandler.action": "Reload {name}",
-  "service.crashHandler.autoReload": "Trying to automatically restore {name} in {seconds} seconds",
-  "service.crashHandler.headline": "Oh no!",
-  "service.crashHandler.text": "{name} has caused an error.",
-  "service.disabledHandler.action": "Enable {name}",
-  "service.disabledHandler.headline": "{name} is disabled",
-  "service.errorHandler.action": "Reload {name}",
-  "service.errorHandler.editAction": "Edit {name}",
-  "service.errorHandler.headline": "Oh no!",
-  "service.errorHandler.message": "Error",
-  "service.errorHandler.text": "{name} has failed to load.",
-  "service.restrictedHandler.action": "Upgrade Account",
-  "service.restrictedHandler.customUrl.headline": "Ferdi Professional Plan required",
-  "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
-  "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
-  "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
-  "service.webviewLoader.loading": "Loading",
-  "services.getStarted": "開始使用",
-  "services.login": "Please login to use Ferdi.",
-  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
-  "services.serverless": "Use Ferdi without an Account",
-  "services.welcome": "歡迎使用 Ferdi",
-  "settings.account.account.editButton": "更改帳戶資訊",
-  "settings.account.accountType.basic": "基本帳戶",
-  "settings.account.accountType.premium": "Premium Supporter Account",
-  "settings.account.buttonSave": "更新帳戶資訊",
-  "settings.account.deleteAccount": "Delete account",
-  "settings.account.deleteEmailSent": "You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
-  "settings.account.deleteInfo": "If you don't need your Ferdi account any longer, you can delete your account and all related data here.",
-  "settings.account.headline": "帳戶",
-  "settings.account.headlineAccount": "帳戶資訊",
-  "settings.account.headlineDangerZone": "Danger Zone",
-  "settings.account.headlineInvoices": "Invoices",
-  "settings.account.headlinePassword": "更改密碼",
-  "settings.account.headlineProfile": "更新帳戶資訊",
-  "settings.account.headlineSubscription": "您的訂閱",
-  "settings.account.headlineTrialUpgrade": "Get the free 14 day Ferdi Professional Trial",
-  "settings.account.headlineUpgradeAccount": "Upgrade your account & get the full Ferdi experience",
-  "settings.account.invoiceDownload": "下載",
-  "settings.account.manageSubscription.label": "管理訂閱",
-  "settings.account.successInfo": "您的更改已經儲存",
-  "settings.account.trial": "Free Trial",
-  "settings.account.trialEndsIn": "Your free trial ends in {duration}.",
-  "settings.account.trialUpdateBillingInfo": "Please update your billing info to continue using {license} after your trial period.",
-  "settings.account.tryReloadServices": "Try again",
-  "settings.account.tryReloadUserInfoRequest": "Try again",
-  "settings.account.upgradeToPro.label": "Upgrade to Ferdi Professional",
-  "settings.account.userInfoRequestFailed": "無法載入帳戶資訊",
-  "settings.account.yourLicense": "Your Ferdi License",
-  "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: #7367f0)",
-  "settings.app.buttonClearAllCache": "Clear cache",
-  "settings.app.buttonInstallUpdate": "重新啟動並且更新",
-  "settings.app.buttonSearchForUpdate": "Check for updates",
-  "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.",
-  "settings.app.currentVersion": "當前版本：",
-  "settings.app.form.accentColor": "Accent color",
-  "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode",
-  "settings.app.form.autoLaunchInBackground": "背景啟動",
-  "settings.app.form.autoLaunchOnStart": "開機時啟動",
-  "settings.app.form.beta": "包含開發中版本",
-  "settings.app.form.darkMode": "Join the Dark Side",
-  "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
-  "settings.app.form.enableSpellchecking": "Enable spell checking",
-  "settings.app.form.enableSystemTray": "在系統匣上顯示",
-  "settings.app.form.enableTodos": "Enable Ferdi Todos",
-  "settings.app.form.hibernate": "Enable service hibernation",
-  "settings.app.form.hibernationStrategy": "Hibernation strategy",
-  "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
-  "settings.app.form.language": "語言",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
-  "settings.app.form.minimizeToSystemTray": "最小化至系統匣",
-  "settings.app.form.noUpdates": "Disable updates",
-  "settings.app.form.privateNotifications": "Don't show message content in notifications",
-  "settings.app.form.runInBackground": "關閉時保持在背景運作",
-  "settings.app.form.scheduledDNDEnabled": "Enable scheduled Do-not-Disturb",
-  "settings.app.form.scheduledDNDEnd": "To",
-  "settings.app.form.scheduledDNDStart": "From",
-  "settings.app.form.server": "Server",
-  "settings.app.form.showDisabledServices": "Display disabled services tabs",
-  "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
-  "settings.app.form.showServiceNavigationBar": "Always show service navigation bar",
-  "settings.app.form.todoServer": "Todo Server",
-  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
-  "settings.app.headline": "Settings",
-  "settings.app.headlineAdvanced": "Advanced",
-  "settings.app.headlineAppearance": "Appearance",
-  "settings.app.headlineGeneral": "一般",
-  "settings.app.headlineLanguage": "語言",
-  "settings.app.headlineUpdates": "更新",
-  "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
-  "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
-  "settings.app.lockedPassword": "Ferdi Lock Password",
-  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
-  "settings.app.restartRequired": "Changes require restart",
-  "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
-  "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
-  "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.",
-  "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.",
-  "settings.app.subheadlineCache": "Cache",
-  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
-  "settings.app.translationHelp": "Help us to translate Ferdi into your language.",
-  "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
-  "settings.app.updateStatusAvailable": "有可用更新，下載中...",
-  "settings.app.updateStatusSearching": "檢查更新中...",
-  "settings.app.updateStatusUpToDate": "已經是最新版本了",
-  "settings.invite.headline": "Invite Friends",
-  "settings.navigation.account": "帳戶",
-  "settings.navigation.availableServices": "可用服務",
-  "settings.navigation.logout": "登出",
-  "settings.navigation.settings": "Settings",
-  "settings.navigation.supportFerdi": "Support Ferdi",
-  "settings.navigation.team": "Manage Team",
-  "settings.navigation.yourServices": "您的服務",
-  "settings.navigation.yourWorkspaces": "Your workspaces",
-  "settings.recipes.all": "All services",
-  "settings.recipes.custom": "Custom Services",
-  "settings.recipes.customService.headline.communityRecipes": "Community 3rd Party Recipes",
-  "settings.recipes.customService.headline.customRecipes": "Custom 3rd Party Recipes",
-  "settings.recipes.customService.headline.devRecipes": "Your Development Service Recipes",
-  "settings.recipes.customService.intro": "To add a custom service, copy the service recipe to:",
-  "settings.recipes.customService.openDevDocs": "Developer Documentation",
-  "settings.recipes.customService.openFolder": "Open folder",
-  "settings.recipes.headline": "可用服務",
-  "settings.recipes.missingService": "Missing a service?",
-  "settings.recipes.mostPopular": "熱門",
-  "settings.recipes.nothingFound": "抱歉，找不到您所要的服務",
-  "settings.recipes.servicesSuccessfulAddedInfo": "新增服務成功",
-  "settings.searchService": "Search service",
-  "settings.service.error.goBack": "返回",
-  "settings.service.error.headline": "Error",
-  "settings.service.error.message": "無法載入服務元件",
-  "settings.service.form.addServiceHeadline": "新增 {name}",
-  "settings.service.form.availableServices": "可用服務",
-  "settings.service.form.customUrl": "Custom server",
-  "settings.service.form.customUrlPremiumInfo": "To add self hosted services, you need a Ferdi Premium Supporter Account.",
-  "settings.service.form.customUrlUpgradeAccount": "升級帳戶",
-  "settings.service.form.customUrlValidationError": "Could not validate custom {name} server.",
-  "settings.service.form.deleteButton": "刪除",
-  "settings.service.form.editServiceHeadline": "Edit {name}",
-  "settings.service.form.enableAudio": "Enable audio",
-  "settings.service.form.enableBadge": "Show unread message badges",
-  "settings.service.form.enableDarkMode": "Enable Dark Mode",
-  "settings.service.form.enableNotification": "啟用通知",
-  "settings.service.form.enableService": "啟用服務",
-  "settings.service.form.headlineBadges": "Unread message badges",
-  "settings.service.form.headlineGeneral": "一般",
-  "settings.service.form.headlineNotifications": "Notifications",
-  "settings.service.form.icon": "Custom icon",
-  "settings.service.form.iconDelete": "Delete",
-  "settings.service.form.iconUpload": "Drop your image, or click here",
-  "settings.service.form.indirectMessageInfo": "除了 @username, @channel, @here 之外，當您參與的頻道有訊息時，就會通知",
-  "settings.service.form.indirectMessages": "針對全部訊息顯示通知",
-  "settings.service.form.isMutedInfo": "When disabled, all notification sounds and audio playback are muted",
-  "settings.service.form.name": "名子",
-  "settings.service.form.openDarkmodeCss": "Open darkmode.css",
-  "settings.service.form.proxy.headline": "HTTP/HTTPS Proxy Settings",
-  "settings.service.form.proxy.host": "Proxy Host/IP",
-  "settings.service.form.proxy.info": "Proxy settings will not synced with the Ferdi servers.",
-  "settings.service.form.proxy.isEnabled": "Use Proxy",
-  "settings.service.form.proxy.password": "Password (optional)",
-  "settings.service.form.proxy.port": "Port",
-  "settings.service.form.proxy.restartInfo": "Please restart Ferdi after changing proxy Settings.",
-  "settings.service.form.proxy.user": "User (optional)",
-  "settings.service.form.saveButton": "儲存",
-  "settings.service.form.tabHosted": "Hosted",
-  "settings.service.form.tabOnPremise": "Self hosted ⭐️",
-  "settings.service.form.team": "Team",
-  "settings.service.form.useHostedService": "Use the hosted {name} service.",
-  "settings.service.form.yourServices": "您的服務",
-  "settings.services.deletedInfo": "服務已刪除",
-  "settings.services.discoverServices": "服務列表",
-  "settings.services.headline": "您的服務",
-  "settings.services.noServicesAdded": "您還沒加入任何服務",
-  "settings.services.servicesRequestFailed": "Could not load your services",
-  "settings.services.tooltip.isDisabled": "已停用服務",
-  "settings.services.tooltip.isMuted": "All sounds are muted",
-  "settings.services.tooltip.notificationsDisabled": "已停用通知",
-  "settings.services.updatedInfo": "您的更改已經儲存",
-  "settings.supportFerdi.github": "Star on GitHub",
-  "settings.supportFerdi.headline": "Support Ferdi",
-  "settings.supportFerdi.openCollective": "Support our Open Collective",
-  "settings.supportFerdi.share": "Tell your Friends",
-  "settings.supportFerdi.title": "Do you like Ferdi? Spread the love!",
-  "settings.team.contentHeadline": "Ferdi for Teams",
-  "settings.team.copy": "Ferdi for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
-  "settings.team.headline": "Team",
-  "settings.team.intro": "You and your team use Ferdi? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
-  "settings.team.manageAction": "Manage your Team on getferdi.com",
-  "settings.team.teamsUnavailable": "Teams are unavailable",
-  "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
-  "settings.team.upgradeAction": "Upgrade your Account",
-  "settings.user.form.accountType.company": "公司",
-  "settings.user.form.accountType.individual": "個人",
-  "settings.user.form.accountType.label": "帳戶類型",
-  "settings.user.form.accountType.non-profit": "非營利",
-  "settings.user.form.currentPassword": "舊密碼",
-  "settings.user.form.email": "電子郵件信箱",
-  "settings.user.form.firstname": "名子",
-  "settings.user.form.lastname": "姓氏",
-  "settings.user.form.newPassword": "新密碼",
-  "settings.workspace.add.form.name": "名子",
-  "settings.workspace.add.form.submitButton": "Create workspace",
-  "settings.workspace.form.buttonDelete": "Delete workspace",
-  "settings.workspace.form.buttonSave": "Save workspace",
-  "settings.workspace.form.keepLoaded": "Keep this workspace loaded*",
-  "settings.workspace.form.keepLoadedInfo": "*This option will be overwritten by the global \"Keep all workspaces loaded\" option.",
-  "settings.workspace.form.name": "名子",
-  "settings.workspace.form.servicesInWorkspaceHeadline": "Services in this Workspace",
-  "settings.workspace.form.yourWorkspaces": "Your workspaces",
-  "settings.workspaces.deletedInfo": "Workspace has been deleted",
-  "settings.workspaces.headline": "Your workspaces",
-  "settings.workspaces.noWorkspacesAdded": "You haven't added any workspaces yet.",
-  "settings.workspaces.tryReloadWorkspaces": "Try again",
-  "settings.workspaces.updatedInfo": "您的更改已經儲存",
-  "settings.workspaces.workspaceFeatureHeadline": "Less is More: Introducing Ferdi Workspaces",
-  "settings.workspaces.workspaceFeatureInfo": "Ferdi 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.",
-  "settings.workspaces.workspacesRequestFailed": "Could not load your workspaces",
-  "sidebar.addNewService": "Add new service",
-  "sidebar.closeTodosDrawer": "Close Ferdi Todos",
-  "sidebar.closeWorkspaceDrawer": "Close workspace drawer",
-  "sidebar.lockFerdi": "Lock Ferdi",
-  "sidebar.muteApp": "Disable notifications & audio",
-  "sidebar.openTodosDrawer": "Open Ferdi Todos",
-  "sidebar.openWorkspaceDrawer": "Open workspace drawer",
-  "sidebar.settings": "Settings",
-  "sidebar.unmuteApp": "Enable notifications & audio",
-  "signup.email.label": "電子郵件信箱",
-  "signup.emailDuplicate": "此電子郵件信箱已被註冊",
-  "signup.firstname.label": "名子",
-  "signup.headline": "註冊",
-  "signup.lastname.label": "姓氏",
-  "signup.legal.info": "在建立帳戶同時，您同意：",
-  "signup.legal.privacy": "Privacy Statement",
-  "signup.legal.terms": "服務條款",
-  "signup.link.login": "您已有一個帳戶，請問是否要登入？",
-  "signup.password.label": "Password",
-  "signup.submit.label": "建立帳戶",
-  "subscription.bestValue": "Best value",
-  "subscription.cta.activateTrial": "Yes, start the free Ferdi Professional trial",
-  "subscription.cta.allOptions": "See all options",
-  "subscription.cta.choosePlan": "Choose your plan",
-  "subscription.includedProFeatures": "The Ferdi Professional Plan includes:",
-  "subscription.interval.per": "per {interval}",
-  "subscription.interval.perMonth": "per month",
-  "subscription.interval.perMonthPerUser": "per month & user",
-  "subscription.planItem.upgradeAccount": "Upgrade Account",
-  "subscription.teaser.includedFeatures": "Paid Ferdi Plans include:",
-  "subscription.teaser.intro": "Ferdi 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-  "subscriptionPopup.buttonCancel": "取消",
-  "subscriptionPopup.buttonDone": "完成",
-  "tabs.item.deleteService": "刪除",
-  "tabs.item.disableAudio": "Disable audio",
-  "tabs.item.disableNotifications": "停用通知",
-  "tabs.item.disableService": "停用服務",
-  "tabs.item.edit": "Edit",
-  "tabs.item.enableAudio": "Enable audio",
-  "tabs.item.enableNotification": "啟用通知",
-  "tabs.item.enableService": "啟用服務",
-  "tabs.item.reload": "Reload",
-  "validation.email": "{field} is not valid",
-  "validation.minLength": "{field} should be at least {length} characters long",
-  "validation.oneRequired": "At least one is required",
-  "validation.required": "{field} is required",
-  "validation.url": "{field} is not a valid URL",
-  "webControls.back": "Back",
-  "webControls.forward": "Forward",
-  "webControls.goHome": "Home",
-  "webControls.openInBrowser": "Open in Browser",
-  "webControls.reload": "Reload",
-  "welcome.loginButton": "登入",
-  "welcome.signupButton": "建立一個免費帳戶",
-  "workspaceDrawer.addNewWorkspaceLabel": "Add new workspace",
-  "workspaceDrawer.allServices": "All services",
-  "workspaceDrawer.headline": "Workspaces",
-  "workspaceDrawer.item.contextMenuEdit": "edit",
-  "workspaceDrawer.item.noServicesAddedYet": "No services added yet",
-  "workspaceDrawer.premiumCtaButtonLabel": "Create your first workspace",
-  "workspaceDrawer.proFeatureBadge": "Premium feature",
-  "workspaceDrawer.reactivatePremiumAccountLabel": "Reactivate premium account",
-  "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi 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"
-}
-- 
cgit v1.2.3-54-g00ecf


From 5b9d196f8a567d5702a586824c2cd84c47902bc3 Mon Sep 17 00:00:00 2001
From: Amine Mouafik <amine@mouafik.fr>
Date: Tue, 5 Nov 2019 14:56:15 +0700
Subject: Reverse submodules to use https

Thread on 07a52285111f6f5d1fbf15f0e9055187ef67d612
---
 .gitmodules | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index d121d6c01..00bc1d26d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,8 +1,8 @@
 [submodule "recipes"]
 	path = recipes
-	url = git@github.com:getferdi/recipes.git
+	url = https://github.com/getferdi/recipes.git
 	ignore = all
 [submodule "src/server"]
 	path = src/server
-	url = git@github.com:getferdi/internal-server.git
+	url = https://github.com/getferdi/internal-server.git
 	ignore = all
-- 
cgit v1.2.3-54-g00ecf


From d2964acb829ebb2a21df7467f924fc2c45e8b614 Mon Sep 17 00:00:00 2001
From: Amine Mouafik <amine@mouafik.fr>
Date: Tue, 5 Nov 2019 15:09:50 +0700
Subject: Specify branch attribute of submodules

---
 .gitmodules | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitmodules b/.gitmodules
index 00bc1d26d..78e0c5221 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,7 +2,9 @@
 	path = recipes
 	url = https://github.com/getferdi/recipes.git
 	ignore = all
+	branch = master
 [submodule "src/server"]
 	path = src/server
 	url = https://github.com/getferdi/internal-server.git
 	ignore = all
+	branch = master
-- 
cgit v1.2.3-54-g00ecf


From c4f0aa0201778893e39806d1cfbcc7cb9e691d96 Mon Sep 17 00:00:00 2001
From: Amine Mouafik <amine@mouafik.fr>
Date: Tue, 5 Nov 2019 15:10:19 +0700
Subject: Remove Travis hack for submodules

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index ba8bc86ac..9b5025b62 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,7 +18,6 @@ git:
   submodules: false
 # Use sed to replace the SSH URL with the public URL, then initialize submodules
 before_install:
-  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sed -i 's/git@github.com:/https:\/\/github.com\//' .gitmodules; else sed -i '' 's/git@github.com:/https:\/\/github.com\//' .gitmodules; fi
   - git submodule update --init --recursive
 install:
   - echo do nothing
-- 
cgit v1.2.3-54-g00ecf


From 950a48367aab1197764239d6e7c604f95f46c33d Mon Sep 17 00:00:00 2001
From: Amine Mouafik <amine@mouafik.fr>
Date: Tue, 5 Nov 2019 15:10:55 +0700
Subject: Remove AppVeyor need for private key

---
 appveyor.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 5d2e0c6bd..1034565ed 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -4,10 +4,6 @@ environment:
 version: 5.0.1.{build}
 
 install:
-  - ps: $fileContent = "-----BEGIN RSA PRIVATE KEY-----`n"
-  - ps: $fileContent += $env:priv_key.Replace(' ', "`n")
-  - ps: $fileContent += "`n-----END RSA PRIVATE KEY-----`n"
-  - ps: Set-Content $env:userprofile\.ssh\id_rsa $fileContent
   - git submodule update --init --recursive
   - ps: Install-Product node 10
   - npx lerna bootstrap
-- 
cgit v1.2.3-54-g00ecf


From 7669b577e8c250bcc4bf918c658dd49b298ea677 Mon Sep 17 00:00:00 2001
From: Amine Mouafik <amine@mouafik.fr>
Date: Tue, 5 Nov 2019 16:43:15 +0700
Subject: #185 Add RPM target to electron-builder

---
 electron-builder.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/electron-builder.yml b/electron-builder.yml
index f6dceabce..4fa6c0b15 100644
--- a/electron-builder.yml
+++ b/electron-builder.yml
@@ -43,6 +43,7 @@ linux:
     - target: AppImage
     - target: deb
     - target: tar.gz
+    - target: rpm
 
 nsis:
   perMachine: false
-- 
cgit v1.2.3-54-g00ecf


From 326f0edc2467c8d686c6401387c2240855dd8d65 Mon Sep 17 00:00:00 2001
From: Bennett <hello@vantezzen.io>
Date: Tue, 5 Nov 2019 10:46:38 +0100
Subject: Add AUR package

---
 README.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/README.md b/README.md
index 6a2c61e07..53c977957 100644
--- a/README.md
+++ b/README.md
@@ -72,6 +72,14 @@ You can find the installers in the [latest stable release](https://github.com/ge
 
 (Don't know homebrew? [brew.sh](https://brew.sh/))
 
+### Or use AUR (Arch Linux)
+
+Ferdi has two seperate AUR packages you can use:
+- **ferdi-git**: Uses system electron version
+- **ferdi-build**: Uses your debian build and extracts it to Arch
+
+If you use a AUR Helper e.g. yay, simply install it via ´yay -S ferdi-bin´
+
 ## Ferdi-specific Features
 
 - [x] Removes the counter-productive fullscreen app delay inviting users to upgrade
-- 
cgit v1.2.3-54-g00ecf


From 192026074dc2d209889fc497a6a4796b1d8a18a7 Mon Sep 17 00:00:00 2001
From: Bennett <hello@vantezzen.io>
Date: Tue, 5 Nov 2019 10:48:48 +0100
Subject: Add info about ferdi-git not working

---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 53c977957..6aac3d449 100644
--- a/README.md
+++ b/README.md
@@ -75,11 +75,13 @@ You can find the installers in the [latest stable release](https://github.com/ge
 ### Or use AUR (Arch Linux)
 
 Ferdi has two seperate AUR packages you can use:
-- **ferdi-git**: Uses system electron version
 - **ferdi-build**: Uses your debian build and extracts it to Arch
+- **ferdi-git**: Uses system electron version
 
 If you use a AUR Helper e.g. yay, simply install it via ´yay -S ferdi-bin´
 
+`ferdi-git` may not work on all systems so we advice you to use `ferdi-bin` instead.
+
 ## Ferdi-specific Features
 
 - [x] Removes the counter-productive fullscreen app delay inviting users to upgrade
-- 
cgit v1.2.3-54-g00ecf


From 9c0ea5def9439029de2362adf949d1587c89949a Mon Sep 17 00:00:00 2001
From: Amine Mouafik <amine@mouafik.fr>
Date: Tue, 5 Nov 2019 17:20:13 +0700
Subject: Install rpm for rpmbuild dependency

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 9b5025b62..95cf24e8f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,6 +9,7 @@ matrix:
             - libxext-dev
             - libxss-dev
             - libxkbfile-dev
+            - rpm
     - os: osx
       osx_image: xcode11
 
-- 
cgit v1.2.3-54-g00ecf