From 9977f8b7aa609f65b29ed0fbd44559fed538d9b7 Mon Sep 17 00:00:00 2001 From: Peter Migotto Date: Wed, 25 Oct 2017 19:12:26 +0100 Subject: Added "enableSystemTray" line and minor fixes Added the line for the option to (dis)able minimizing to the system tray. Changed term for "settings" to a synonym to better fit the UI. --- src/i18n/locales/pt-BR.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/i18n/locales/pt-BR.json b/src/i18n/locales/pt-BR.json index 38f0836a7..0fd6288e5 100644 --- a/src/i18n/locales/pt-BR.json +++ b/src/i18n/locales/pt-BR.json @@ -59,7 +59,7 @@ "infobar.buttonReloadServices": "Recarregar serviços", "infobar.buttonInstallUpdate": "Reiniciar & instalar atualização", "infobar.requiredRequestsFailed": "Não foi possível carregar serviços e informações do usuário", - "sidebar.settings": "Configurações", + "sidebar.settings": "Ajustes", "services.welcome": "Bem-vindo ao Franz", "services.getStarted": "Começar", "settings.account.headline": "Conta", @@ -85,7 +85,7 @@ "settings.navigation.availableServices": "Serviços disponíveis", "settings.navigation.yourServices": "Seus serviços", "settings.navigation.account": "Conta", - "settings.navigation.settings": "Configurações", + "settings.navigation.settings": "Ajustes", "settings.navigation.logout": "Logout", "settings.recipes.headline": "Serviços disponíveis", "settings.recipes.mostPopular": "Mais populares", @@ -115,7 +115,7 @@ "settings.services.discoverServices": "Descobrir serviços", "settings.services.updatedInfo": "Suas mudanças foram salvas", "settings.services.deletedInfo": "Serviço apagado", - "settings.app.headline": "Configurações", + "settings.app.headline": "Ajustes", "settings.app.headlineGeneral": "Geral", "settings.app.headlineLanguage": "Idioma", "settings.app.headlineUpdates": "Atualizações", @@ -126,6 +126,7 @@ "settings.app.updateStatusUpToDate": "Você está usando a última versão do Franz", "settings.app.form.autoLaunchOnStart": "Abrir o Franz iniciar o sistema", "settings.app.form.autoLaunchInBackground": "Abrir no fundo", + "settings.app.form.enableSystemTray": "Mostrar o Franz na bandeja do sistema", "settings.app.form.minimizeToSystemTray": "Minimizar o Franz para a bandeja do sistema", "settings.app.form.runInBackground": "Manter o Franz no fundo quando fechar a janela", "settings.app.form.language": "Idioma", -- cgit v1.2.3-70-g09d2 From ee949e5024956152c76ce12ce9c81465401d7274 Mon Sep 17 00:00:00 2001 From: Peter Migotto Date: Thu, 26 Oct 2017 16:30:33 +0100 Subject: Fixes hover on "Add new service" not showing translation --- src/components/services/tabs/TabBarSortableList.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/components/services/tabs/TabBarSortableList.js b/src/components/services/tabs/TabBarSortableList.js index c0a68d1a5..1060ad5f5 100644 --- a/src/components/services/tabs/TabBarSortableList.js +++ b/src/components/services/tabs/TabBarSortableList.js @@ -5,6 +5,13 @@ import { SortableContainer } from 'react-sortable-hoc'; import TabItem from './TabItem'; import { ctrlKey } from '../../../environment'; +const messages = defineMessages({ + addservice: { + id: 'sidebar.addservice', + defaultMessage: '!!!Add new service', + }, +}); + export default SortableContainer(observer(({ services, setActive, @@ -35,7 +42,7 @@ export default SortableContainer(observer(({ -- cgit v1.2.3-70-g09d2 From 9795e4a51d64d64b7fb9d79758c108b702cc58cd Mon Sep 17 00:00:00 2001 From: Peter Migotto Date: Thu, 26 Oct 2017 16:32:46 +0100 Subject: Added "sidebar.addservice" --- src/i18n/locales/en-US.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index b9ed51b83..9cfc66f1e 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json @@ -60,6 +60,7 @@ "infobar.buttonInstallUpdate": "Restart & install update", "infobar.requiredRequestsFailed": "Could not load services and user information", "sidebar.settings": "Settings", + "sidebar.addservice": "Add new service", "services.welcome": "Welcome to Franz", "services.getStarted": "Get started", "settings.account.headline": "Account", -- cgit v1.2.3-70-g09d2 From 655ea3ad6d12b31f0c793f909cb907a44434ea5f Mon Sep 17 00:00:00 2001 From: Peter Migotto Date: Thu, 26 Oct 2017 16:44:17 +0100 Subject: Update en-US.json --- src/i18n/locales/en-US.json | 1 - 1 file changed, 1 deletion(-) diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index 9cfc66f1e..b9ed51b83 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json @@ -60,7 +60,6 @@ "infobar.buttonInstallUpdate": "Restart & install update", "infobar.requiredRequestsFailed": "Could not load services and user information", "sidebar.settings": "Settings", - "sidebar.addservice": "Add new service", "services.welcome": "Welcome to Franz", "services.getStarted": "Get started", "settings.account.headline": "Account", -- cgit v1.2.3-70-g09d2 From fa8fbd75bbf36e64d7a8dc9720109007f4ad795a Mon Sep 17 00:00:00 2001 From: Peter Migotto Date: Thu, 26 Oct 2017 16:44:48 +0100 Subject: Update TabBarSortableList.js --- src/components/services/tabs/TabBarSortableList.js | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/components/services/tabs/TabBarSortableList.js b/src/components/services/tabs/TabBarSortableList.js index 1060ad5f5..c0a68d1a5 100644 --- a/src/components/services/tabs/TabBarSortableList.js +++ b/src/components/services/tabs/TabBarSortableList.js @@ -5,13 +5,6 @@ import { SortableContainer } from 'react-sortable-hoc'; import TabItem from './TabItem'; import { ctrlKey } from '../../../environment'; -const messages = defineMessages({ - addservice: { - id: 'sidebar.addservice', - defaultMessage: '!!!Add new service', - }, -}); - export default SortableContainer(observer(({ services, setActive, @@ -42,7 +35,7 @@ export default SortableContainer(observer(({ -- cgit v1.2.3-70-g09d2