From bcd6128fb6a423d5fd1e7bd63a126c14267b192b Mon Sep 17 00:00:00 2001 From: Bennett Date: Wed, 9 Oct 2019 09:37:23 +0200 Subject: Ignore l10n_develop branch --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index dc97cc119..aaeb2639b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,3 +26,4 @@ branches: except: - i18n - l10n_master + - l10n_develop -- cgit v1.2.3-70-g09d2 From b75ab680ce9231052e9ad86c0c206509e443f1d5 Mon Sep 17 00:00:00 2001 From: Bennett Date: Wed, 9 Oct 2019 09:37:46 +0200 Subject: Ignore l10n_develop branch --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index 39d7f793a..b362af441 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -26,3 +26,4 @@ branches: except: - i18n - l10n_master + - l10n_develop -- cgit v1.2.3-70-g09d2 From d13cb0937953a74eaa6e9aadaa506af2a694d055 Mon Sep 17 00:00:00 2001 From: vantezzen Date: Thu, 24 Oct 2019 17:12:45 +0200 Subject: Fix travis build Electron 6 has longer build times than Electron 4 - Travis would otherwise terminate --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ff015b92c..ebc96d2cd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ language: node_js install: - echo do nothing before_script: - - npx lerna bootstrap + - travis_wait 60 npx lerna bootstrap - npm install node-sass -g script: - npm run test -- cgit v1.2.3-70-g09d2 From 1fb6001fc27c6a4641ca463ee7a978feb98f843d Mon Sep 17 00:00:00 2001 From: vantezzen Date: Fri, 25 Oct 2019 10:26:18 +0200 Subject: Bump version number --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b26986270..1198da4f6 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "ferdi", "productName": "Ferdi", "appId": "com.kytwb.ferdi", - "version": "5.4.0-beta.3", + "version": "5.4.0-beta.4", "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.", "copyright": "kytwb", "main": "index.js", -- cgit v1.2.3-70-g09d2 From b9c85b44706c94d59893fcf2a32a2ccaf3ceb12f Mon Sep 17 00:00:00 2001 From: Makazzz Date: Sat, 26 Oct 2019 00:02:25 -0400 Subject: Improved README.md --- README.md | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 51 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 285c80bb0..8df081753 100644 --- a/README.md +++ b/README.md @@ -4,14 +4,52 @@ # Ferdi -[![Backers on Open Collective](https://opencollective.com/getferdi/backers/badge.svg)](#backers) [![Sponsors on Open Collective](https://opencollective.com/getferdi/sponsors/badge.svg)](#sponsors) [![Build Status Windows](https://ci.appveyor.com/api/projects/status/2ckfbmoxp36fye5b?svg=true)](https://ci.appveyor.com/project/kytwb/ferdi) -[![Build Status Mac & Linux](https://travis-ci.org/getferdi/ferdi.svg?branch=master)](https://travis-ci.org/getferdi/ferdi) +

+Open Collective backers +Open Collective sponsors +Build Status Windows +Build Status Mac & Linux +

🤴🏽 Hard-fork of [Franz](https://github.com/meetfranz/franz), adding awesome features and removing unwanted ones. +#### Table of contents + +
+Ferdi + +
+ +### What is Ferdi ? + +Ferdi is based on Franz - a messaging browser already used by thousands of people. Due to this, Ferdi is compatible with all Franz recipes and your existing Franz account. Ferdi is a messaging browser that allows you to combine your favorite messaging services into one application and doesn't restrict its usage. Use every service you want, as many times as you want and how you want. + +### What Ferdi looks like ? + +
+Screenshots +Keep all your messaging services in one place. +Order your services with Ferdi Workspaces. +Always keep your Todo list open with Ferdi Todos. +Supporting all your services. +
+ ## Download Ferdi -You can find the installers in the [latest release](https://github.com/getferdi/ferdi/releases) assets. +You can find the installers in the [latest stable release](https://github.com/getferdi/ferdi/releases/latest) assets and the [pre-release ones here](https://github.com/getferdi/ferdi/releases). ### Or use homebrew (macOS only) @@ -94,7 +132,7 @@ $ git submodule update --init --recursive It is important you execute the last command to get the required submodules (recipes, server). -### Install dependencies +#### Install dependencies Run the following command to install all dependencies, and link sibling modules with Ferdi. @@ -104,13 +142,13 @@ $ npx lerna bootstrap If you previously ran `npm install` it sometimes is necessary to delete your `node_modules` folder before running `npx lerna bootstrap`. -### Fix native modules to match current electron node version +#### Fix native modules to match current electron node version ```bash $ npm run rebuild ``` -### Start development app +#### Start development app Run these two commands **simultaneously** in different console tabs: @@ -121,7 +159,7 @@ $ npm run start Be aware that the development database will be reset regularly. -### Packaging +#### Packaging ```bash $ npm run build @@ -129,7 +167,7 @@ $ npm run build Deliverables will be available in the `out` folder. -### Release +#### Release ```bash $ git checkout develop && git pull && git checkout master @@ -187,4 +225,8 @@ This project follows the [all-contributors](https://github.com/all-contributors/ ## Backers via OpenCollective - + + +## Sponsors via OpenCollective + + -- cgit v1.2.3-70-g09d2 From 1c0788fc00b3cd9d5aaf80cfe38d9d4c0407fb0a Mon Sep 17 00:00:00 2001 From: Makazzz Date: Sat, 26 Oct 2019 00:08:46 -0400 Subject: Fix lint --- README.md | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 8df081753..2eb2f346b 100644 --- a/README.md +++ b/README.md @@ -13,13 +13,13 @@ 🤴🏽 Hard-fork of [Franz](https://github.com/meetfranz/franz), adding awesome features and removing unwanted ones. -#### Table of contents +### Table of contents
Ferdi
    -
  • What is Ferdi ?
    • -
  • What Ferdi looks like ?
    • +
  • What is Ferdi ?
    • +
  • What Ferdi looks like ?
  • Download Ferdi @@ -49,7 +49,7 @@ Ferdi is based on Franz - a messaging browser already used by thousands of peopl ## Download Ferdi -You can find the installers in the [latest stable release](https://github.com/getferdi/ferdi/releases/latest) assets and the [pre-release ones here](https://github.com/getferdi/ferdi/releases). +You can find the installers in the [latest stable release](https://github.com/getferdi/ferdi/releases/latest) assets and [all the release here](https://github.com/getferdi/ferdi/releases). ### Or use homebrew (macOS only) @@ -122,7 +122,7 @@ $ npm install --global windows-build-tools // Windows 10 $ npm install --global windows-build-tools --vs2015 // Windows 7 ``` -#### Clone repository with submodule +### Clone repository with submodule ```bash $ git clone https://github.com/getferdi/ferdi.git @@ -132,7 +132,7 @@ $ git submodule update --init --recursive It is important you execute the last command to get the required submodules (recipes, server). -#### Install dependencies +### Install dependencies Run the following command to install all dependencies, and link sibling modules with Ferdi. @@ -142,13 +142,13 @@ $ npx lerna bootstrap If you previously ran `npm install` it sometimes is necessary to delete your `node_modules` folder before running `npx lerna bootstrap`. -#### Fix native modules to match current electron node version +### Fix native modules to match current electron node version ```bash $ npm run rebuild ``` -#### Start development app +### Start development app Run these two commands **simultaneously** in different console tabs: @@ -159,7 +159,7 @@ $ npm run start Be aware that the development database will be reset regularly. -#### Packaging +### Packaging ```bash $ npm run build @@ -167,7 +167,7 @@ $ npm run build Deliverables will be available in the `out` folder. -#### Release +### Release ```bash $ git checkout develop && git pull && git checkout master -- cgit v1.2.3-70-g09d2 From 590be3b22c8ef41071046ed305ae537bf2f8aaa2 Mon Sep 17 00:00:00 2001 From: Makazzz Date: Sat, 26 Oct 2019 00:16:07 -0400 Subject: Add word --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2eb2f346b..8e4d6c8de 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ Ferdi is based on Franz - a messaging browser already used by thousands of peopl ## Download Ferdi -You can find the installers in the [latest stable release](https://github.com/getferdi/ferdi/releases/latest) assets and [all the release here](https://github.com/getferdi/ferdi/releases). +You can find the installers in the [latest stable release](https://github.com/getferdi/ferdi/releases/latest) assets and [all the other release here](https://github.com/getferdi/ferdi/releases). ### Or use homebrew (macOS only) -- cgit v1.2.3-70-g09d2 From 478475f96436ac7a7c8fbf7cf6a1f7b7ace4fd82 Mon Sep 17 00:00:00 2001 From: Makazzz Date: Sat, 26 Oct 2019 13:27:16 -0400 Subject: Change appData env --- src/config.js | 3 ++- src/index.js | 8 +++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/config.js b/src/config.js index 761d26eea..ad4fc6165 100644 --- a/src/config.js +++ b/src/config.js @@ -113,7 +113,8 @@ export const FILE_SYSTEM_SETTINGS_TYPES = [ export const LOCAL_SERVER = 'You are using Ferdi without a server'; -export const SETTINGS_PATH = path.join(app.getPath('userData'), 'config'); +// export const SETTINGS_PATH = path.join(app.getPath('userData'), 'config'); +export const SETTINGS_PATH = path.join(app.getPath('appData'), 'config'); // Replacing app.asar is not beautiful but unforunately necessary export const RECIPES_PATH = asarPath(path.join(__dirname, 'recipes')); diff --git a/src/index.js b/src/index.js index 87aa6357b..edcea2049 100644 --- a/src/index.js +++ b/src/index.js @@ -9,9 +9,11 @@ import fs from 'fs-extra'; import path from 'path'; import windowStateKeeper from 'electron-window-state'; -if (process.platform === 'win32') { - app.setPath('appData', process.env.LOCALAPPDATA); - app.setPath('userData', path.join(process.env.LOCALAPPDATA, app.getName())); +// Set app directory before loading user modules +if (process.env.FERDI_APPDATA_DIR != null) { + app.setPath('appData', process.env.FERDI_APPDATA_DIR); +} else if (process.env.PORTABLE_EXECUTABLE_DIR != null) { + app.setPath('appData', process.env.PORTABLE_EXECUTABLE_DIR, `${app.getName()}-appdata`); } if (isDevMode) { -- cgit v1.2.3-70-g09d2 From bc21d533bd2c1b9f4bdfb8553b4a3f21d1b845e1 Mon Sep 17 00:00:00 2001 From: Makazzz Date: Sat, 26 Oct 2019 15:24:16 -0400 Subject: Testing --- src/config.js | 3 +-- src/index.js | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/config.js b/src/config.js index ad4fc6165..761d26eea 100644 --- a/src/config.js +++ b/src/config.js @@ -113,8 +113,7 @@ export const FILE_SYSTEM_SETTINGS_TYPES = [ export const LOCAL_SERVER = 'You are using Ferdi without a server'; -// export const SETTINGS_PATH = path.join(app.getPath('userData'), 'config'); -export const SETTINGS_PATH = path.join(app.getPath('appData'), 'config'); +export const SETTINGS_PATH = path.join(app.getPath('userData'), 'config'); // Replacing app.asar is not beautiful but unforunately necessary export const RECIPES_PATH = asarPath(path.join(__dirname, 'recipes')); diff --git a/src/index.js b/src/index.js index edcea2049..fd96f8a49 100644 --- a/src/index.js +++ b/src/index.js @@ -10,10 +10,10 @@ import path from 'path'; import windowStateKeeper from 'electron-window-state'; // Set app directory before loading user modules -if (process.env.FERDI_APPDATA_DIR != null) { - app.setPath('appData', process.env.FERDI_APPDATA_DIR); -} else if (process.env.PORTABLE_EXECUTABLE_DIR != null) { - app.setPath('appData', process.env.PORTABLE_EXECUTABLE_DIR, `${app.getName()}-appdata`); +if (process.env.FERDI_APPDATA_DIR || process.env.PORTABLE_EXECUTABLE_DIR) { + const appDataPath = process.env.FERDI_APPDATA_DIR || process.env.PORTABLE_EXECUTABLE_DIR + app.setPath('appData', appDataPath); + app.setPath('userData', path.join(app.getPath('appData'), app.getName())); } if (isDevMode) { -- cgit v1.2.3-70-g09d2 From 3af37cc8f8b3988d969f9c46a623e7f9995025ad Mon Sep 17 00:00:00 2001 From: Makazzz Date: Sat, 26 Oct 2019 15:31:20 -0400 Subject: Suggested by @vantezzen --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8e4d6c8de..ee27f9a91 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ ### What is Ferdi ? -Ferdi is based on Franz - a messaging browser already used by thousands of people. Due to this, Ferdi is compatible with all Franz recipes and your existing Franz account. Ferdi is a messaging browser that allows you to combine your favorite messaging services into one application and doesn't restrict its usage. Use every service you want, as many times as you want and how you want. +Ferdi is a messaging browser that allows you to combine your favorite messaging services into one application. It is based on Franz - a software already used by thousands of people - with the difference that Ferdi gives you many additonal features and doesn't restrict its usage! Ferdi is compatible with your existing Franz account so you can continue right where you left off. Find out more about Ferdi and its features on [getferdi.com](https://getferdi.com). ### What Ferdi looks like ? -- cgit v1.2.3-70-g09d2 From 93e718a148588b7cc56f1e3e3183ca1000c13137 Mon Sep 17 00:00:00 2001 From: Makazzz Date: Sun, 27 Oct 2019 17:28:42 -0400 Subject: Add portable dir --- src/config.js | 12 ++++++++++++ src/index.js | 11 ++++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/config.js b/src/config.js index 761d26eea..a7389b8bc 100644 --- a/src/config.js +++ b/src/config.js @@ -113,6 +113,18 @@ export const FILE_SYSTEM_SETTINGS_TYPES = [ export const LOCAL_SERVER = 'You are using Ferdi without a server'; +// Set app directory before loading user modules +if (process.env.FERDI_APPDATA_DIR != null) { + app.setPath('appData', process.env.FERDI_APPDATA_DIR); + app.setPath('userData', path.join(app.getPath('appData'))); +} else if (process.env.PORTABLE_EXECUTABLE_DIR != null) { + app.setPath('appData', process.env.PORTABLE_EXECUTABLE_DIR, `${app.getName()}AppData`); + app.setPath('userData', path.join(app.getPath('appData'), `${app.getName()}AppData`)); +} else if (process.platform === 'win32') { + app.setPath('appData', process.env.APPDATA); + app.setPath('userData', path.join(app.getPath('appData'), app.getName())); +} + export const SETTINGS_PATH = path.join(app.getPath('userData'), 'config'); // Replacing app.asar is not beautiful but unforunately necessary diff --git a/src/index.js b/src/index.js index fd96f8a49..3453b46f7 100644 --- a/src/index.js +++ b/src/index.js @@ -10,9 +10,14 @@ import path from 'path'; import windowStateKeeper from 'electron-window-state'; // Set app directory before loading user modules -if (process.env.FERDI_APPDATA_DIR || process.env.PORTABLE_EXECUTABLE_DIR) { - const appDataPath = process.env.FERDI_APPDATA_DIR || process.env.PORTABLE_EXECUTABLE_DIR - app.setPath('appData', appDataPath); +if (process.env.FERDI_APPDATA_DIR != null) { + app.setPath('appData', process.env.FERDI_APPDATA_DIR); + app.setPath('userData', path.join(app.getPath('appData'))); +} else if (process.env.PORTABLE_EXECUTABLE_DIR != null) { + app.setPath('appData', process.env.PORTABLE_EXECUTABLE_DIR, `${app.getName()}AppData`); + app.setPath('userData', path.join(app.getPath('appData'), `${app.getName()}AppData`)); +} else if (process.platform === 'win32') { + app.setPath('appData', process.env.APPDATA); app.setPath('userData', path.join(app.getPath('appData'), app.getName())); } -- cgit v1.2.3-70-g09d2 From 1b9e8bc69564f150b6cbfe218dbe6a06e68063c4 Mon Sep 17 00:00:00 2001 From: Makazzz Date: Sun, 27 Oct 2019 18:18:15 -0400 Subject: Finish dropdown Development --- README.md | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ee27f9a91..a4af36bff 100644 --- a/README.md +++ b/README.md @@ -27,6 +27,15 @@
  • Ferdi-specific Features
  • Development
    • +
  • Contributors ✨
  • Backers via OpenCollective
  • Sponsors via OpenCollective
    • @@ -91,8 +100,6 @@ You can find the installers in the [latest stable release](https://github.com/ge ## Development -### Preparations - #### Install OS dependencies ##### Node.js -- cgit v1.2.3-70-g09d2 From d618bf5b24696aca4294e05055596f48bed5fd04 Mon Sep 17 00:00:00 2001 From: Makazzz Date: Sun, 27 Oct 2019 18:27:21 -0400 Subject: Add catchphrases --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index a4af36bff..52824960e 100644 --- a/README.md +++ b/README.md @@ -50,10 +50,16 @@ Ferdi is a messaging browser that allows you to combine your favorite messaging
    Screenshots +

    Keep all your messaging services in one place. +"Keep all your messaging services in one place." Order your services with Ferdi Workspaces. +"Order your services with Ferdi Workspaces." Always keep your Todo list open with Ferdi Todos. +"Always keep your Todo list open with Ferdi Todos." Supporting all your services. +"Supporting all your services." +

    ## Download Ferdi -- cgit v1.2.3-70-g09d2 From 1ed020cf86cb6ea0d1e5f0c821bd05ba6a018b4d Mon Sep 17 00:00:00 2001 From: Makazzz Date: Sun, 27 Oct 2019 18:31:13 -0400 Subject: Change size of topics dev --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 52824960e..90a01b091 100644 --- a/README.md +++ b/README.md @@ -106,29 +106,29 @@ You can find the installers in the [latest stable release](https://github.com/ge ## Development -#### Install OS dependencies +### Install OS dependencies -##### Node.js +#### Node.js Please make sure you are running NodeJS v10 ([v10.16.3](https://nodejs.org/dist/v10.16.3/) suggested). Versions above will throw an errow when trying to install due to an [old fsevent dependency](https://github.com/fsevents/fsevents/issues/278). -##### Git +#### Git The version [2.23.0](https://github.com/git-for-windows/git/releases/tag/v2.23.0.windows.1) for Git is working fine for development. You can then use the console from Git to do the development procedure. -##### Debian/Ubuntu +#### Debian/Ubuntu ```bash $ apt install libx11-dev libxext-dev libxss-dev libxkbfile-dev ``` -##### Fedora +#### Fedora ```bash $ dnf install libX11-devel libXext-devel libXScrnSaver-devel libxkbfile-devel ``` -##### Windows +#### Windows ```bash $ npm install --global windows-build-tools // Windows 10 -- cgit v1.2.3-70-g09d2 From 62f30ccd4c430213860da36d52de793cfcfd293a Mon Sep 17 00:00:00 2001 From: Makazzz Date: Tue, 29 Oct 2019 14:45:00 -0400 Subject: Creating function instead --- src/config.js | 14 +++----------- src/helpers/portable-helpers.js | 16 ++++++++++++++++ src/index.js | 14 +++----------- 3 files changed, 22 insertions(+), 22 deletions(-) create mode 100644 src/helpers/portable-helpers.js diff --git a/src/config.js b/src/config.js index a7389b8bc..33067fc9d 100644 --- a/src/config.js +++ b/src/config.js @@ -113,17 +113,9 @@ export const FILE_SYSTEM_SETTINGS_TYPES = [ export const LOCAL_SERVER = 'You are using Ferdi without a server'; -// Set app directory before loading user modules -if (process.env.FERDI_APPDATA_DIR != null) { - app.setPath('appData', process.env.FERDI_APPDATA_DIR); - app.setPath('userData', path.join(app.getPath('appData'))); -} else if (process.env.PORTABLE_EXECUTABLE_DIR != null) { - app.setPath('appData', process.env.PORTABLE_EXECUTABLE_DIR, `${app.getName()}AppData`); - app.setPath('userData', path.join(app.getPath('appData'), `${app.getName()}AppData`)); -} else if (process.platform === 'win32') { - app.setPath('appData', process.env.APPDATA); - app.setPath('userData', path.join(app.getPath('appData'), app.getName())); -} +import { portable } from './helpers/portable-helpers'; + +portable(); export const SETTINGS_PATH = path.join(app.getPath('userData'), 'config'); diff --git a/src/helpers/portable-helpers.js b/src/helpers/portable-helpers.js new file mode 100644 index 000000000..60b7b91f1 --- /dev/null +++ b/src/helpers/portable-helpers.js @@ -0,0 +1,16 @@ +import { app } from 'electron'; +import path from 'path'; + +// Set app directory before loading user modules +export function portable() { + if (process.env.FERDI_APPDATA_DIR != null) { + app.setPath('appData', process.env.FERDI_APPDATA_DIR); + app.setPath('userData', path.join(app.getPath('appData'))); + } else if (process.env.PORTABLE_EXECUTABLE_DIR != null) { + app.setPath('appData', process.env.PORTABLE_EXECUTABLE_DIR, `${app.getName()}AppData`); + app.setPath('userData', path.join(app.getPath('appData'), `${app.getName()}AppData`)); + } else if (process.platform === 'win32') { + app.setPath('appData', process.env.APPDATA); + app.setPath('userData', path.join(app.getPath('appData'), app.getName())); + } +} diff --git a/src/index.js b/src/index.js index 3453b46f7..8d52e5396 100644 --- a/src/index.js +++ b/src/index.js @@ -9,17 +9,9 @@ import fs from 'fs-extra'; import path from 'path'; import windowStateKeeper from 'electron-window-state'; -// Set app directory before loading user modules -if (process.env.FERDI_APPDATA_DIR != null) { - app.setPath('appData', process.env.FERDI_APPDATA_DIR); - app.setPath('userData', path.join(app.getPath('appData'))); -} else if (process.env.PORTABLE_EXECUTABLE_DIR != null) { - app.setPath('appData', process.env.PORTABLE_EXECUTABLE_DIR, `${app.getName()}AppData`); - app.setPath('userData', path.join(app.getPath('appData'), `${app.getName()}AppData`)); -} else if (process.platform === 'win32') { - app.setPath('appData', process.env.APPDATA); - app.setPath('userData', path.join(app.getPath('appData'), app.getName())); -} +import { portable } from './helpers/portable-helpers'; + +portable(); if (isDevMode) { app.setPath('userData', path.join(app.getPath('appData'), `${app.getName()}Dev`)); -- cgit v1.2.3-70-g09d2 From 4b69f1d1047efc64705e08ffbb363643147d7206 Mon Sep 17 00:00:00 2001 From: Makazzz Date: Tue, 29 Oct 2019 15:06:56 -0400 Subject: Revert to 93e718a --- src/config.js | 14 +++++++++++--- src/helpers/portable-helpers.js | 16 ---------------- src/index.js | 14 +++++++++++--- 3 files changed, 22 insertions(+), 22 deletions(-) delete mode 100644 src/helpers/portable-helpers.js diff --git a/src/config.js b/src/config.js index 33067fc9d..a7389b8bc 100644 --- a/src/config.js +++ b/src/config.js @@ -113,9 +113,17 @@ export const FILE_SYSTEM_SETTINGS_TYPES = [ export const LOCAL_SERVER = 'You are using Ferdi without a server'; -import { portable } from './helpers/portable-helpers'; - -portable(); +// Set app directory before loading user modules +if (process.env.FERDI_APPDATA_DIR != null) { + app.setPath('appData', process.env.FERDI_APPDATA_DIR); + app.setPath('userData', path.join(app.getPath('appData'))); +} else if (process.env.PORTABLE_EXECUTABLE_DIR != null) { + app.setPath('appData', process.env.PORTABLE_EXECUTABLE_DIR, `${app.getName()}AppData`); + app.setPath('userData', path.join(app.getPath('appData'), `${app.getName()}AppData`)); +} else if (process.platform === 'win32') { + app.setPath('appData', process.env.APPDATA); + app.setPath('userData', path.join(app.getPath('appData'), app.getName())); +} export const SETTINGS_PATH = path.join(app.getPath('userData'), 'config'); diff --git a/src/helpers/portable-helpers.js b/src/helpers/portable-helpers.js deleted file mode 100644 index 60b7b91f1..000000000 --- a/src/helpers/portable-helpers.js +++ /dev/null @@ -1,16 +0,0 @@ -import { app } from 'electron'; -import path from 'path'; - -// Set app directory before loading user modules -export function portable() { - if (process.env.FERDI_APPDATA_DIR != null) { - app.setPath('appData', process.env.FERDI_APPDATA_DIR); - app.setPath('userData', path.join(app.getPath('appData'))); - } else if (process.env.PORTABLE_EXECUTABLE_DIR != null) { - app.setPath('appData', process.env.PORTABLE_EXECUTABLE_DIR, `${app.getName()}AppData`); - app.setPath('userData', path.join(app.getPath('appData'), `${app.getName()}AppData`)); - } else if (process.platform === 'win32') { - app.setPath('appData', process.env.APPDATA); - app.setPath('userData', path.join(app.getPath('appData'), app.getName())); - } -} diff --git a/src/index.js b/src/index.js index 8d52e5396..3453b46f7 100644 --- a/src/index.js +++ b/src/index.js @@ -9,9 +9,17 @@ import fs from 'fs-extra'; import path from 'path'; import windowStateKeeper from 'electron-window-state'; -import { portable } from './helpers/portable-helpers'; - -portable(); +// Set app directory before loading user modules +if (process.env.FERDI_APPDATA_DIR != null) { + app.setPath('appData', process.env.FERDI_APPDATA_DIR); + app.setPath('userData', path.join(app.getPath('appData'))); +} else if (process.env.PORTABLE_EXECUTABLE_DIR != null) { + app.setPath('appData', process.env.PORTABLE_EXECUTABLE_DIR, `${app.getName()}AppData`); + app.setPath('userData', path.join(app.getPath('appData'), `${app.getName()}AppData`)); +} else if (process.platform === 'win32') { + app.setPath('appData', process.env.APPDATA); + app.setPath('userData', path.join(app.getPath('appData'), app.getName())); +} if (isDevMode) { app.setPath('userData', path.join(app.getPath('appData'), `${app.getName()}Dev`)); -- cgit v1.2.3-70-g09d2 From 9677ac2def28f16e732f171dcf7a1449f8f22e15 Mon Sep 17 00:00:00 2001 From: vantezzen Date: Tue, 29 Oct 2019 21:22:53 +0100 Subject: Update submodules --- recipes | 2 +- src/server | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes b/recipes index 7aa76feba..f32213eba 160000 --- a/recipes +++ b/recipes @@ -1 +1 @@ -Subproject commit 7aa76feba8bd94368d27bee556480313c636f941 +Subproject commit f32213ebafaa63bc87202317580abb80d6e05866 diff --git a/src/server b/src/server index b5973cdc4..8249d625b 160000 --- a/src/server +++ b/src/server @@ -1 +1 @@ -Subproject commit b5973cdc4cdd60e61d2fba25a317bb4d216a0d1c +Subproject commit 8249d625bbd80498ae18257a52e480d0ebb368c0 -- cgit v1.2.3-70-g09d2 From 530b7296ede00790cf8e46d3846e0b5cd9c87051 Mon Sep 17 00:00:00 2001 From: vantezzen Date: Tue, 29 Oct 2019 21:26:57 +0100 Subject: Update theme information --- src/assets/themeInfo.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/assets/themeInfo.json b/src/assets/themeInfo.json index d6017de23..eaea65ca7 100644 --- a/src/assets/themeInfo.json +++ b/src/assets/themeInfo.json @@ -1 +1 @@ -{"color":".theme__dark .app .sidebar .sidebar__button.is-muted, .theme__dark .app .sidebar .sidebar__button.is-active, .sidebar .sidebar__button.is-muted, .sidebar .sidebar__button.is-active, .settings .account .invoices .invoices__action button, .settings-navigation .settings-navigation__link.is-active .badge, a.button, a.link, .auth .welcome .button:hover, .auth .welcome .button__inverted, .franz-form .franz-form__radio.is-selected, .theme__dark .franz-form__button.franz-form__button--inverted, .franz-form__button.franz-form__button--inverted","border-left-color":".tab-item.is-active","border-color":".theme__dark .settings .premium-info, a.button, .franz-form .franz-form__radio.is-selected","background":".settings .settings__header, .settings .settings__close, .settings .settings__close:hover, .settings-navigation .settings-navigation__link.is-active, a.button:hover, .info-bar, .info-bar.info-bar--primary, .infobox.infobox--primary, .theme__dark .badge.badge--primary, .theme__dark .badge.badge--premium, .badge.badge--primary, .badge.badge--premium, .content-tabs .content-tabs__tabs .content-tabs__item.is-active, #electron-app-title-bar .toolbar-dropdown:not(.open) > .toolbar-button > button:hover, #electron-app-title-bar .list-item.selected .menu-item, #electron-app-title-bar .list-item.selected:focus .menu-item, .theme__dark .quick-switch .active, .franz-form .franz-form__toggle-wrapper .franz-form__toggle.is-active .franz-form__toggle-button, .theme__dark .franz-form__button, .theme__dark .franz-form__button:hover, .theme__dark .franz-form__button.franz-form__button--inverted:hover, .franz-form__button, .franz-form__button:hover, .franz-form__button.franz-form__button--inverted:hover","border-right-color":".settings .settings__header .separator"} \ No newline at end of file +{"color":".theme__dark .app .sidebar .sidebar__button.is-muted, .theme__dark .app .sidebar .sidebar__button.is-active, .sidebar .sidebar__button.is-muted, .sidebar .sidebar__button.is-active, .settings .account .invoices .invoices__action button, .settings-navigation .settings-navigation__link.is-active .badge, a.button, button.button, a.link, button.link, .auth .welcome .button:hover, .auth .welcome .button__inverted, .franz-form .franz-form__radio.is-selected, .theme__dark .franz-form__button.franz-form__button--inverted, .franz-form__button.franz-form__button--inverted","border-left-color":".tab-item.is-active","border-color":".theme__dark .settings .premium-info, a.button, button.button, .franz-form .franz-form__radio.is-selected","background":".settings .settings__header, .settings .settings__close, .settings .settings__close:hover, .settings-navigation .settings-navigation__link.is-active, a.button:hover, button.button:hover, .info-bar, .info-bar.info-bar--primary, .infobox.infobox--primary, .theme__dark .badge.badge--primary, .theme__dark .badge.badge--premium, .badge.badge--primary, .badge.badge--premium, .content-tabs .content-tabs__tabs .content-tabs__item.is-active, #electron-app-title-bar .toolbar-dropdown:not(.open) > .toolbar-button > button:hover, #electron-app-title-bar .list-item.selected .menu-item, #electron-app-title-bar .list-item.selected:focus .menu-item, .theme__dark .quick-switch .active, .franz-form .franz-form__toggle-wrapper .franz-form__toggle.is-active .franz-form__toggle-button, .theme__dark .franz-form__button, .theme__dark .franz-form__button:hover, .theme__dark .franz-form__button.franz-form__button--inverted:hover, .franz-form__button, .franz-form__button:hover, .franz-form__button.franz-form__button--inverted:hover","border-right-color":".settings .settings__header .separator"} \ No newline at end of file -- cgit v1.2.3-70-g09d2 From b0e698520f0be4e054b8f3d1feff694d1ddf1779 Mon Sep 17 00:00:00 2001 From: Steliyan Stoyanov Date: Tue, 29 Oct 2019 20:34:19 +0200 Subject: Add "adaptable dark mode" checkbox --- .../settings/settings/EditSettingsForm.js | 3 + src/containers/settings/EditSettingsScreen.js | 10 ++ src/i18n/locales/defaultMessages.json | 169 +++++++++++---------- src/i18n/locales/en-US.json | 1 + .../settings/settings/EditSettingsForm.json | 116 +++++++------- .../containers/settings/EditSettingsScreen.json | 53 ++++--- src/stores/ServicesStore.js | 5 + 7 files changed, 201 insertions(+), 156 deletions(-) diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index 2be5c4ed7..d567a47d1 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js @@ -12,6 +12,7 @@ import PremiumFeatureContainer from '../../ui/PremiumFeatureContainer'; import Input from '../../ui/Input'; import { FRANZ_TRANSLATION } from '../../../config'; +import { isMac } from '../../../environment'; function escapeHtml(unsafe) { return unsafe @@ -383,8 +384,10 @@ export default @observer class EditSettingsForm extends Component { + {isMac && } {isDarkmodeEnabled && ( <> +

    this._shareSettingsWithServiceProcess(), ); + reaction( + () => this.stores.settings.app.adaptableDarkMode, + () => this._shareSettingsWithServiceProcess(), + ); + reaction( () => this.stores.settings.app.universalDarkMode, () => this._shareSettingsWithServiceProcess(), -- cgit v1.2.3-70-g09d2 From b3d2bad9c5a481132d3d4c81b876b6754d684592 Mon Sep 17 00:00:00 2001 From: Steliyan Stoyanov Date: Tue, 29 Oct 2019 22:53:10 +0200 Subject: Respect MacOS current theme --- src/stores/UIStore.js | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/stores/UIStore.js b/src/stores/UIStore.js index 9680c5bcc..44bc7c974 100644 --- a/src/stores/UIStore.js +++ b/src/stores/UIStore.js @@ -5,12 +5,18 @@ import { reaction, } from 'mobx'; import { theme } from '@meetfranz/theme'; +import { remote } from 'electron'; import Store from './lib/Store'; +import { isMac } from '../environment'; + +const { systemPreferences } = remote; export default class UIStore extends Store { @observable showServicesUpdatedInfoBar = false; + @observable isOsDarkThemeActive = isMac ? systemPreferences.isDarkMode() : false; + constructor(...args) { super(...args); @@ -18,6 +24,13 @@ export default class UIStore extends Store { this.actions.ui.openSettings.listen(this._openSettings.bind(this)); this.actions.ui.closeSettings.listen(this._closeSettings.bind(this)); this.actions.ui.toggleServiceUpdatedInfoBar.listen(this._toggleServiceUpdatedInfoBar.bind(this)); + + // Listen for theme change on MacOS + if (isMac) { + systemPreferences.subscribeNotification('AppleInterfaceThemeChangedNotification', () => { + this.isOsDarkThemeActive = systemPreferences.isDarkMode(); + }); + } } setup() { @@ -35,7 +48,7 @@ export default class UIStore extends Store { } @computed get isDarkThemeActive() { - return this.stores.settings.all.app.darkMode; + return this.stores.settings.all.app.darkMode || (this.stores.settings.all.app.adaptableDarkMode && this.isOsDarkThemeActive); } @computed get theme() { -- cgit v1.2.3-70-g09d2 From cdf783bc156c605b9783b45c952f3464a341667f Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 30 Oct 2019 09:02:27 +0000 Subject: docs: update README.md --- README.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 38fb8cd47..c2762a498 100644 --- a/README.md +++ b/README.md @@ -196,8 +196,7 @@ When pushing a new tag, the CI builds will create a draft GitHub release and upl Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)): - - + @@ -226,11 +225,10 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d +
    Bennett
    Bennett
    💻 🎨 📖 🤔 🌍 💡 🐛 🖋 🚇 📓 💬 📆 👀
    Benjamin Staneck
    Benjamin Staneck
    🎨    		 ammarmalhas
    ammarmalhas
    🐛 🛡️    		Steliyan Stoyanov
    Steliyan Stoyanov
    💻 🤔
    - - -- cgit v1.2.3-70-g09d2 From cb355f90b7ee31b55dadcc2bfca24506de940396 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 30 Oct 2019 09:02:28 +0000 Subject: docs: update .all-contributorsrc --- .all-contributorsrc | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index c4378fe4b..832fcd243 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -232,6 +232,16 @@ "bug", "security" ] + }, + { + "login": "steliyan", + "name": "Steliyan Stoyanov", + "avatar_url": "https://avatars1.githubusercontent.com/u/1850292?v=4", + "profile": "https://github.com/steliyan", + "contributions": [ + "code", + "ideas" + ] } ], "contributorsPerLine": 6 -- cgit v1.2.3-70-g09d2 From 78cd61f12f66b3f91f8ac6b902a1ebabb20ecf0d Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Wed, 30 Oct 2019 16:10:12 +0700 Subject: New translations en-US.json (French) --- src/i18n/locales/fr.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json index 66fa17f1e..908e2ace7 100644 --- a/src/i18n/locales/fr.json +++ b/src/i18n/locales/fr.json @@ -255,6 +255,7 @@ "settings.app.cacheInfo": "Le cache de Ferdi occupe actuellement {size} en espace disque.", "settings.app.currentVersion": "Version actuelle :", "settings.app.form.accentColor": "Accent de couleur", + "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", "settings.app.form.autoLaunchInBackground": "Ouvrir en arrière-plan", "settings.app.form.autoLaunchOnStart": "Lancer Ferdi au démarrage", "settings.app.form.beta": "Accepter les versions bêta", -- cgit v1.2.3-70-g09d2 From ef4a107b596757641750333b8be596cab9b78fb3 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Wed, 30 Oct 2019 16:10:16 +0700 Subject: New translations en-US.json (Romanian) --- src/i18n/locales/ro.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/ro.json b/src/i18n/locales/ro.json index edcc67771..8eb2053bc 100644 --- a/src/i18n/locales/ro.json +++ b/src/i18n/locales/ro.json @@ -255,6 +255,7 @@ "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.", "settings.app.currentVersion": "Current version:", "settings.app.form.accentColor": "Accent color", + "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", "settings.app.form.autoLaunchInBackground": "Open in background", "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start", "settings.app.form.beta": "Include beta versions", -- cgit v1.2.3-70-g09d2 From e40dd97d5aff9f5f6b348f13730b8898ff5da9f7 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Wed, 30 Oct 2019 16:10:19 +0700 Subject: New translations en-US.json (Japanese) --- src/i18n/locales/ja.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/ja.json b/src/i18n/locales/ja.json index b9b6da6c3..0f5a14be1 100644 --- a/src/i18n/locales/ja.json +++ b/src/i18n/locales/ja.json @@ -255,6 +255,7 @@ "settings.app.cacheInfo": "現在、Ferdiのキャッシュはディスクの{size}分を使用しています。", "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": "システム起動時にFerdiを開く", "settings.app.form.beta": "Betaバージョンを含める", -- cgit v1.2.3-70-g09d2 From 43dbf4ab78e07ec7023950c89ac2ac3730a22815 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Wed, 30 Oct 2019 16:10:21 +0700 Subject: New translations en-US.json (Korean) --- src/i18n/locales/ko.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/ko.json b/src/i18n/locales/ko.json index edcc67771..8eb2053bc 100644 --- a/src/i18n/locales/ko.json +++ b/src/i18n/locales/ko.json @@ -255,6 +255,7 @@ "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.", "settings.app.currentVersion": "Current version:", "settings.app.form.accentColor": "Accent color", + "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", "settings.app.form.autoLaunchInBackground": "Open in background", "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start", "settings.app.form.beta": "Include beta versions", -- cgit v1.2.3-70-g09d2 From 9d4fd22451faab5fe50ccf99c8850f39d5042a01 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Wed, 30 Oct 2019 16:10:25 +0700 Subject: New translations en-US.json (Norwegian) --- src/i18n/locales/no.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/no.json b/src/i18n/locales/no.json index edcc67771..8eb2053bc 100644 --- a/src/i18n/locales/no.json +++ b/src/i18n/locales/no.json @@ -255,6 +255,7 @@ "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.", "settings.app.currentVersion": "Current version:", "settings.app.form.accentColor": "Accent color", + "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", "settings.app.form.autoLaunchInBackground": "Open in background", "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start", "settings.app.form.beta": "Include beta versions", -- cgit v1.2.3-70-g09d2 From b99272386b4eef849fefb2946879ecc861bd64b2 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Wed, 30 Oct 2019 16:10:28 +0700 Subject: New translations en-US.json (Polish) --- src/i18n/locales/pl.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/pl.json b/src/i18n/locales/pl.json index 6cc75eaf3..e29e80e9f 100644 --- a/src/i18n/locales/pl.json +++ b/src/i18n/locales/pl.json @@ -255,6 +255,7 @@ "settings.app.cacheInfo": "Pamięć podręczna zajmuje obecnie {size} przestrzeni dyskowej", "settings.app.currentVersion": "Aktualna wersja:", "settings.app.form.accentColor": "Accent color", + "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", "settings.app.form.autoLaunchInBackground": "Otwórz w tle", "settings.app.form.autoLaunchOnStart": "Uruchom Ferdi na początku", "settings.app.form.beta": "Uwzględnij wersje beta", -- cgit v1.2.3-70-g09d2 From b64cee65887335164b36c3bfce765ccfc2e9e46a Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Wed, 30 Oct 2019 16:10:34 +0700 Subject: New translations en-US.json (Portuguese) --- src/i18n/locales/pt-BR.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/pt-BR.json b/src/i18n/locales/pt-BR.json index 9dec7e7a3..af03b302a 100644 --- a/src/i18n/locales/pt-BR.json +++ b/src/i18n/locales/pt-BR.json @@ -255,6 +255,7 @@ "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.adaptableDarkMode": "Enable adaptable Dark Mode", "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", -- cgit v1.2.3-70-g09d2 From 7f88f518f55e1fe4444b8597f1ea0caa37d2a9c5 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Wed, 30 Oct 2019 16:10:38 +0700 Subject: New translations en-US.json (Portuguese, Brazilian) --- src/i18n/locales/pt.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/pt.json b/src/i18n/locales/pt.json index f5beac6b3..3d14d5414 100644 --- a/src/i18n/locales/pt.json +++ b/src/i18n/locales/pt.json @@ -255,6 +255,7 @@ "settings.app.cacheInfo": "A cache do Ferdi está a usar {size} de espaço em disco.", "settings.app.currentVersion": "Versão atual", "settings.app.form.accentColor": "Accent color", + "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", "settings.app.form.autoLaunchInBackground": "Abrir em segundo plano", "settings.app.form.autoLaunchOnStart": "Iniciar o Ferdi após iniciar o computador", "settings.app.form.beta": "Incluir versões instáveis (beta)", -- cgit v1.2.3-70-g09d2 From ad229e887ebd9605283926dce6ff6d5acf507c6b Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Wed, 30 Oct 2019 16:10:40 +0700 Subject: New translations en-US.json (Russian) --- src/i18n/locales/ru.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/ru.json b/src/i18n/locales/ru.json index b329522f4..5d3636d9e 100644 --- a/src/i18n/locales/ru.json +++ b/src/i18n/locales/ru.json @@ -255,6 +255,7 @@ "settings.app.cacheInfo": "Кэш занимает {size} на диске.", "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": "Запускать Ferdi при старте", "settings.app.form.beta": "Включая бета версии", -- cgit v1.2.3-70-g09d2 From 204ebcd59bc89fade97150925a9b674eb35f049a Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Wed, 30 Oct 2019 16:10:43 +0700 Subject: New translations en-US.json (Irish) --- src/i18n/locales/ga.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/ga.json b/src/i18n/locales/ga.json index e96d9e14f..ebc7b1dbe 100644 --- a/src/i18n/locales/ga.json +++ b/src/i18n/locales/ga.json @@ -255,6 +255,7 @@ "settings.app.cacheInfo": "Tá taisce Ferdi ag baint úsáid as {size} den spás diosca.", "settings.app.currentVersion": "Leagan reatha:", "settings.app.form.accentColor": "Accent color", + "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", "settings.app.form.autoLaunchInBackground": "Oscail sa chúlra", "settings.app.form.autoLaunchOnStart": "Láinseáil Ferdi ón tús", "settings.app.form.beta": "Cuir leagain béite san áireamh", -- cgit v1.2.3-70-g09d2 From ef24f8e6a2e66d79dabdfd7f9d929fe7f1ce2aca Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Wed, 30 Oct 2019 16:10:47 +0700 Subject: New translations en-US.json (Serbian (Cyrillic)) --- src/i18n/locales/sr.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/sr.json b/src/i18n/locales/sr.json index 1190fee0a..f1257ac1e 100644 --- a/src/i18n/locales/sr.json +++ b/src/i18n/locales/sr.json @@ -255,6 +255,7 @@ "settings.app.cacheInfo": "Франз кеш тренутно користи {величина} простора на диску.", "settings.app.currentVersion": "Trenutna verzija:", "settings.app.form.accentColor": "Accent color", + "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", "settings.app.form.autoLaunchInBackground": "Otvori u pozadini", "settings.app.form.autoLaunchOnStart": "Pokreni Ferdi sa sistemom", "settings.app.form.beta": "Obuhvati i beta verzije", -- cgit v1.2.3-70-g09d2 From a8883c984aed3bdec6a285d5c8b69ffa5c204235 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Wed, 30 Oct 2019 16:10:50 +0700 Subject: New translations en-US.json (Slovak) --- src/i18n/locales/sk.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/sk.json b/src/i18n/locales/sk.json index 0b4c0d3fa..b9805e2a6 100644 --- a/src/i18n/locales/sk.json +++ b/src/i18n/locales/sk.json @@ -255,6 +255,7 @@ "settings.app.cacheInfo": "Vyrovnávacia pamäť Ferdi momentálne používa {size} miesta na disku.", "settings.app.currentVersion": "Súčasná verzia:", "settings.app.form.accentColor": "Accent color", + "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", "settings.app.form.autoLaunchInBackground": "Otvoriť na pozadí", "settings.app.form.autoLaunchOnStart": "Spustiť Ferdi pri štarte", "settings.app.form.beta": "Vrátane beta verzií", -- cgit v1.2.3-70-g09d2 From 721bdd2937d631834275d65b44f7e98a8e9e75e6 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Wed, 30 Oct 2019 16:10:53 +0700 Subject: New translations en-US.json (Slovenian) --- src/i18n/locales/sl.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/sl.json b/src/i18n/locales/sl.json index edcc67771..8eb2053bc 100644 --- a/src/i18n/locales/sl.json +++ b/src/i18n/locales/sl.json @@ -255,6 +255,7 @@ "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.", "settings.app.currentVersion": "Current version:", "settings.app.form.accentColor": "Accent color", + "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", "settings.app.form.autoLaunchInBackground": "Open in background", "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start", "settings.app.form.beta": "Include beta versions", -- cgit v1.2.3-70-g09d2 From f3eea4bb8a602869847a36d515b8df589a8211c6 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Wed, 30 Oct 2019 16:10:58 +0700 Subject: New translations en-US.json (Spanish) --- src/i18n/locales/es.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json index e3aad888f..462d74d39 100644 --- a/src/i18n/locales/es.json +++ b/src/i18n/locales/es.json @@ -255,6 +255,7 @@ "settings.app.cacheInfo": "El cache de Ferdi actualmente usa {size} de espacio en disco.", "settings.app.currentVersion": "Versión actual:", "settings.app.form.accentColor": "Accent color", + "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", "settings.app.form.autoLaunchInBackground": "Abrir en segundo plano", "settings.app.form.autoLaunchOnStart": "Iniciar Ferdi al iniciar", "settings.app.form.beta": "Incluir versiones beta", -- cgit v1.2.3-70-g09d2 From 9e2ca728f880b9d67ca18e9edf38f9b15b425b73 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Wed, 30 Oct 2019 16:11:02 +0700 Subject: New translations en-US.json (Swedish) --- src/i18n/locales/sv.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/sv.json b/src/i18n/locales/sv.json index edcc67771..8eb2053bc 100644 --- a/src/i18n/locales/sv.json +++ b/src/i18n/locales/sv.json @@ -255,6 +255,7 @@ "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.", "settings.app.currentVersion": "Current version:", "settings.app.form.accentColor": "Accent color", + "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", "settings.app.form.autoLaunchInBackground": "Open in background", "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start", "settings.app.form.beta": "Include beta versions", -- cgit v1.2.3-70-g09d2 From ab81601ff7666b23cf88a6f444da52d45e8c4678 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Wed, 30 Oct 2019 16:11:04 +0700 Subject: New translations en-US.json (Turkish) --- src/i18n/locales/tr.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/tr.json b/src/i18n/locales/tr.json index 8e55a66f9..34c406981 100644 --- a/src/i18n/locales/tr.json +++ b/src/i18n/locales/tr.json @@ -255,6 +255,7 @@ "settings.app.cacheInfo": "Ferdi önbelleği şu anda {size} disk alanı kullanıyor.", "settings.app.currentVersion": "Geçerli sürüm:", "settings.app.form.accentColor": "Accent color", + "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", "settings.app.form.autoLaunchInBackground": "Arka planda aç", "settings.app.form.autoLaunchOnStart": "Ferdi'ı başlangıçta aç", "settings.app.form.beta": "Beta versiyonları dahil et", -- cgit v1.2.3-70-g09d2 From 4eeb3bf5bbbbc7435f0e021b9981454a636823fb Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Wed, 30 Oct 2019 16:11:07 +0700 Subject: New translations en-US.json (Ukrainian) --- src/i18n/locales/uk.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/uk.json b/src/i18n/locales/uk.json index 1deed25fe..c1657b2c0 100644 --- a/src/i18n/locales/uk.json +++ b/src/i18n/locales/uk.json @@ -255,6 +255,7 @@ "settings.app.cacheInfo": "Кеш, який використовує Ferdi, займає {size} дискового простору.", "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": "Запускати Ferdi на початку", "settings.app.form.beta": "Включити бета-версії", -- cgit v1.2.3-70-g09d2 From 4d88e18b44a681d660c3146649dafb14603c94c6 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Wed, 30 Oct 2019 16:11:09 +0700 Subject: New translations en-US.json (Italian) --- src/i18n/locales/it.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/it.json b/src/i18n/locales/it.json index f3ed42e3a..07a4dc98d 100644 --- a/src/i18n/locales/it.json +++ b/src/i18n/locales/it.json @@ -255,6 +255,7 @@ "settings.app.cacheInfo": "Ferdi sta utilizzando {size} di spazio su disco.", "settings.app.currentVersion": "Versione attuale:", "settings.app.form.accentColor": "Accent color", + "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", "settings.app.form.autoLaunchInBackground": "Apri in background", "settings.app.form.autoLaunchOnStart": "Esegui Ferdi all'avvio", "settings.app.form.beta": "Includi versioni beta", -- cgit v1.2.3-70-g09d2 From 1980d71efc49578fe36e4340c211cbbef9e7cb52 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Wed, 30 Oct 2019 16:11:11 +0700 Subject: New translations en-US.json (Indonesian) --- src/i18n/locales/id.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/id.json b/src/i18n/locales/id.json index 2378bfbad..e48458d07 100644 --- a/src/i18n/locales/id.json +++ b/src/i18n/locales/id.json @@ -255,6 +255,7 @@ "settings.app.cacheInfo": "Singgahan Ferdi sedang menggunakan ruang disk {size}.", "settings.app.currentVersion": "Versi saat ini:", "settings.app.form.accentColor": "Accent color", + "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", "settings.app.form.autoLaunchInBackground": "Buka di latar belakang", "settings.app.form.autoLaunchOnStart": "Jalankan Ferdi saat komputer dimulai", "settings.app.form.beta": "Sertakan versi beta", -- cgit v1.2.3-70-g09d2 From 3c2e8001755dbaf71cdb3c1d042772f8789abfb0 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Wed, 30 Oct 2019 16:11:14 +0700 Subject: New translations en-US.json (Afrikaans) --- src/i18n/locales/af.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/af.json b/src/i18n/locales/af.json index edcc67771..8eb2053bc 100644 --- a/src/i18n/locales/af.json +++ b/src/i18n/locales/af.json @@ -255,6 +255,7 @@ "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.", "settings.app.currentVersion": "Current version:", "settings.app.form.accentColor": "Accent color", + "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", "settings.app.form.autoLaunchInBackground": "Open in background", "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start", "settings.app.form.beta": "Include beta versions", -- cgit v1.2.3-70-g09d2 From db3fbd0eccd62050edd7759b2890ae8d4c661f6d Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Wed, 30 Oct 2019 16:11:17 +0700 Subject: New translations en-US.json (Czech) --- src/i18n/locales/cs.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/cs.json b/src/i18n/locales/cs.json index e8d3827dd..7ec1ce369 100644 --- a/src/i18n/locales/cs.json +++ b/src/i18n/locales/cs.json @@ -255,6 +255,7 @@ "settings.app.cacheInfo": "Ferdi momentálně používá {size} místa na disku.", "settings.app.currentVersion": "Aktuální verze:", "settings.app.form.accentColor": "Accent color", + "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", "settings.app.form.autoLaunchInBackground": "Spustit na pozadí", "settings.app.form.autoLaunchOnStart": "Spustit Ferdi při startu", "settings.app.form.beta": "Zahrnout beta verze", -- cgit v1.2.3-70-g09d2 From e0fe5a5a7045339da348e0db26faab905b43648f Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Wed, 30 Oct 2019 16:11:20 +0700 Subject: New translations en-US.json (Arabic) --- src/i18n/locales/ar.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/ar.json b/src/i18n/locales/ar.json index edcc67771..8eb2053bc 100644 --- a/src/i18n/locales/ar.json +++ b/src/i18n/locales/ar.json @@ -255,6 +255,7 @@ "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.", "settings.app.currentVersion": "Current version:", "settings.app.form.accentColor": "Accent color", + "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", "settings.app.form.autoLaunchInBackground": "Open in background", "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start", "settings.app.form.beta": "Include beta versions", -- cgit v1.2.3-70-g09d2 From d84d66583b37b03a426b42a98a5b51e9e0081154 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Wed, 30 Oct 2019 16:11:23 +0700 Subject: New translations en-US.json (Bosnian) --- src/i18n/locales/bs.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/bs.json b/src/i18n/locales/bs.json index edcc67771..8eb2053bc 100644 --- a/src/i18n/locales/bs.json +++ b/src/i18n/locales/bs.json @@ -255,6 +255,7 @@ "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.", "settings.app.currentVersion": "Current version:", "settings.app.form.accentColor": "Accent color", + "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", "settings.app.form.autoLaunchInBackground": "Open in background", "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start", "settings.app.form.beta": "Include beta versions", -- cgit v1.2.3-70-g09d2 From c42aea3f7c351b6777350011113b4e376bc0f50c Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Wed, 30 Oct 2019 16:11:26 +0700 Subject: New translations en-US.json (Catalan) --- src/i18n/locales/ca.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/ca.json b/src/i18n/locales/ca.json index 5f55f804a..f7de90243 100644 --- a/src/i18n/locales/ca.json +++ b/src/i18n/locales/ca.json @@ -255,6 +255,7 @@ "settings.app.cacheInfo": "La memòria cau de Ferdi està utilitzant {size} d'espai al disc", "settings.app.currentVersion": "Versió actual:", "settings.app.form.accentColor": "Accent color", + "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", "settings.app.form.autoLaunchInBackground": "Obrir en segon plà", "settings.app.form.autoLaunchOnStart": "Iniciar Ferdi a l'inici", "settings.app.form.beta": "Inclou versions beta", -- cgit v1.2.3-70-g09d2 From 702aabf45a4abf67338e12a568b5503876f5fd27 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Wed, 30 Oct 2019 16:11:28 +0700 Subject: New translations en-US.json (Chinese Simplified) --- src/i18n/locales/zh.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/zh.json b/src/i18n/locales/zh.json index edcc67771..8eb2053bc 100644 --- a/src/i18n/locales/zh.json +++ b/src/i18n/locales/zh.json @@ -255,6 +255,7 @@ "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.", "settings.app.currentVersion": "Current version:", "settings.app.form.accentColor": "Accent color", + "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", "settings.app.form.autoLaunchInBackground": "Open in background", "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start", "settings.app.form.beta": "Include beta versions", -- cgit v1.2.3-70-g09d2 From d5b19b5a1fc38042be3f208df31819185cb64bee Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Wed, 30 Oct 2019 16:11:31 +0700 Subject: New translations en-US.json (Chinese Traditional) --- src/i18n/locales/zh-Hant.json | 486 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 486 insertions(+) create mode 100644 src/i18n/locales/zh-Hant.json diff --git a/src/i18n/locales/zh-Hant.json b/src/i18n/locales/zh-Hant.json new file mode 100644 index 000000000..fd1ea9977 --- /dev/null +++ b/src/i18n/locales/zh-Hant.json @@ -0,0 +1,486 @@ +{ + "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": "

    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.

    ", + "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings", + "workspaces.switchingIndicator.switchingTo": "Switching to" +} -- cgit v1.2.3-70-g09d2 From 7756bd8e199d70217ff31389bd1d189892d62778 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Wed, 30 Oct 2019 16:11:34 +0700 Subject: New translations en-US.json (Croatian) --- src/i18n/locales/hr.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/hr.json b/src/i18n/locales/hr.json index 5ad85cc1a..5d6f353f0 100644 --- a/src/i18n/locales/hr.json +++ b/src/i18n/locales/hr.json @@ -255,6 +255,7 @@ "settings.app.cacheInfo": "Ferdi predmemorija trenutno koristi {size} prostora na disku", "settings.app.currentVersion": "Trenutna verzija:", "settings.app.form.accentColor": "Accent color", + "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", "settings.app.form.autoLaunchInBackground": "Otvori u pozadini", "settings.app.form.autoLaunchOnStart": "Pokreni Ferdi sa sistemom", "settings.app.form.beta": "Obuhvati i beta verzije", -- cgit v1.2.3-70-g09d2 From b15ae60b42566bd74c1d4252846a0ed949cbefbc Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Wed, 30 Oct 2019 16:11:38 +0700 Subject: New translations en-US.json (Danish) --- src/i18n/locales/da.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/da.json b/src/i18n/locales/da.json index edcc67771..8eb2053bc 100644 --- a/src/i18n/locales/da.json +++ b/src/i18n/locales/da.json @@ -255,6 +255,7 @@ "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.", "settings.app.currentVersion": "Current version:", "settings.app.form.accentColor": "Accent color", + "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", "settings.app.form.autoLaunchInBackground": "Open in background", "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start", "settings.app.form.beta": "Include beta versions", -- cgit v1.2.3-70-g09d2 From db6de336a86938e0d21dec62618af380b52a2f4f Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Wed, 30 Oct 2019 16:11:41 +0700 Subject: New translations en-US.json (Hungarian) --- src/i18n/locales/hu.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/hu.json b/src/i18n/locales/hu.json index 940db5dff..7695f5fc4 100644 --- a/src/i18n/locales/hu.json +++ b/src/i18n/locales/hu.json @@ -255,6 +255,7 @@ "settings.app.cacheInfo": "A Ferdi gyorsítótár jelenleg {size} lemezterületet használ.", "settings.app.currentVersion": "Aktuális verzió:", "settings.app.form.accentColor": "Accent color", + "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", "settings.app.form.autoLaunchInBackground": "Megnyitás háttérben", "settings.app.form.autoLaunchOnStart": "Ferdi betöltése indításkor", "settings.app.form.beta": "Béta verziók keresése", -- cgit v1.2.3-70-g09d2 From 8218fb020d30361e1239daee55219bf6a86a749d Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Wed, 30 Oct 2019 16:11:43 +0700 Subject: New translations en-US.json (Dutch) --- src/i18n/locales/nl.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/nl.json b/src/i18n/locales/nl.json index e5467c877..c71954427 100644 --- a/src/i18n/locales/nl.json +++ b/src/i18n/locales/nl.json @@ -255,6 +255,7 @@ "settings.app.cacheInfo": "Ferdi gebruikt op dit moment {size} schijfruimte aan tijdelijke bestanden.", "settings.app.currentVersion": "Huidige versie:", "settings.app.form.accentColor": "Accent color", + "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", "settings.app.form.autoLaunchInBackground": "Open op de achtergrond", "settings.app.form.autoLaunchOnStart": "Open Ferdi bij opstarten", "settings.app.form.beta": "Inclusief bètaversies", -- cgit v1.2.3-70-g09d2 From 4e9b74814239dcbea4fc174fa7b4e84ff2e9a2f9 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Wed, 30 Oct 2019 16:11:46 +0700 Subject: New translations en-US.json (Finnish) --- src/i18n/locales/fi.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/fi.json b/src/i18n/locales/fi.json index edcc67771..8eb2053bc 100644 --- a/src/i18n/locales/fi.json +++ b/src/i18n/locales/fi.json @@ -255,6 +255,7 @@ "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.", "settings.app.currentVersion": "Current version:", "settings.app.form.accentColor": "Accent color", + "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", "settings.app.form.autoLaunchInBackground": "Open in background", "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start", "settings.app.form.beta": "Include beta versions", -- cgit v1.2.3-70-g09d2 From c7d8a7f2e7be1b555337d8ae6e88bc4df304fce3 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Wed, 30 Oct 2019 16:11:49 +0700 Subject: New translations en-US.json (Flemish) --- src/i18n/locales/nl-BE.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/nl-BE.json b/src/i18n/locales/nl-BE.json index ce8a35ce8..80f33d583 100644 --- a/src/i18n/locales/nl-BE.json +++ b/src/i18n/locales/nl-BE.json @@ -255,6 +255,7 @@ "settings.app.cacheInfo": "Ferdi cache gebruikt momenteel {size} schijfruimte.", "settings.app.currentVersion": "Huidige versie:", "settings.app.form.accentColor": "Accent color", + "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", "settings.app.form.autoLaunchInBackground": "Open op de achtergrond", "settings.app.form.autoLaunchOnStart": "Lanceer Ferdi bij opstarten", "settings.app.form.beta": "Inclusief beta versies", -- cgit v1.2.3-70-g09d2 From f941eb8f8fe815f8443c7d65fb094dc71175cd08 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Wed, 30 Oct 2019 16:11:53 +0700 Subject: New translations en-US.json (Georgian) --- src/i18n/locales/ka.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/ka.json b/src/i18n/locales/ka.json index 2f0aaa5ae..302b513d2 100644 --- a/src/i18n/locales/ka.json +++ b/src/i18n/locales/ka.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": "გაეშვას Ferdi სისტემის ჩატვირთვისას", "settings.app.form.beta": "ჩართეთ ბეტა ვერსიები", -- cgit v1.2.3-70-g09d2 From 4fdca821d0b06bf7c2dd0a61a3e684abc5a42cc1 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Wed, 30 Oct 2019 16:11:55 +0700 Subject: New translations en-US.json (German) --- src/i18n/locales/de.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json index 85dc1925f..01688d5cb 100644 --- a/src/i18n/locales/de.json +++ b/src/i18n/locales/de.json @@ -255,6 +255,7 @@ "settings.app.cacheInfo": "Der Ferdi Cache belegt derzeit {size}.", "settings.app.currentVersion": "Aktuelle Version:", "settings.app.form.accentColor": "Akzentfarbe", + "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", "settings.app.form.autoLaunchInBackground": "Im Hintergrund öffnen", "settings.app.form.autoLaunchOnStart": "Ferdi beim Systemstart ausführen", "settings.app.form.beta": "Beta-Versionen einbeziehen", -- cgit v1.2.3-70-g09d2 From a8a9df54d445d2ff544708389a69e3478fbc9e38 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Wed, 30 Oct 2019 16:11:57 +0700 Subject: New translations en-US.json (Greek) --- src/i18n/locales/el.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/el.json b/src/i18n/locales/el.json index 89c0d62b6..c383a18fb 100644 --- a/src/i18n/locales/el.json +++ b/src/i18n/locales/el.json @@ -255,6 +255,7 @@ "settings.app.cacheInfo": "Το Ferdi χρησιμοποιεί αυτήν τη στιγμή {size} χώρου στο δίσκο.", "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": "Εκκίνηση του Ferdi κατά την εκκίνηση του συστήματος", "settings.app.form.beta": "Συμπεριλάβετε εκδόσεις beta", -- cgit v1.2.3-70-g09d2 From 767081ce81aea705f3c6de1ce6ae53feb2300ea0 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Wed, 30 Oct 2019 16:12:00 +0700 Subject: New translations en-US.json (Hebrew) --- src/i18n/locales/he.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/he.json b/src/i18n/locales/he.json index edcc67771..8eb2053bc 100644 --- a/src/i18n/locales/he.json +++ b/src/i18n/locales/he.json @@ -255,6 +255,7 @@ "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.", "settings.app.currentVersion": "Current version:", "settings.app.form.accentColor": "Accent color", + "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", "settings.app.form.autoLaunchInBackground": "Open in background", "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start", "settings.app.form.beta": "Include beta versions", -- cgit v1.2.3-70-g09d2 From 1742ca7aca4cd8d40c58c7db3b99579c13658993 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Wed, 30 Oct 2019 16:12:04 +0700 Subject: New translations en-US.json (Vietnamese) --- src/i18n/locales/vi.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/vi.json b/src/i18n/locales/vi.json index edcc67771..8eb2053bc 100644 --- a/src/i18n/locales/vi.json +++ b/src/i18n/locales/vi.json @@ -255,6 +255,7 @@ "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.", "settings.app.currentVersion": "Current version:", "settings.app.form.accentColor": "Accent color", + "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", "settings.app.form.autoLaunchInBackground": "Open in background", "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start", "settings.app.form.beta": "Include beta versions", -- cgit v1.2.3-70-g09d2 From e60763c8c51d99c33715f1e87c06e776d6704297 Mon Sep 17 00:00:00 2001 From: vantezzen Date: Wed, 30 Oct 2019 10:16:51 +0100 Subject: #173 Update feature list --- README.md | 1 + next_release.md | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 38fb8cd47..b7f43c337 100644 --- a/README.md +++ b/README.md @@ -86,6 +86,7 @@ You can find the installers in the [latest stable release](https://github.com/ge - [x] Add Password Lock feature to keep your messages protected ([#41](https://github.com/getferdi/ferdi/issues/41), [franz#810](https://github.com/meetfranz/franz/issues/810), [franz#950](https://github.com/meetfranz/franz/issues/950), [franz#1430](https://github.com/meetfranz/franz/issues/1430)) - [x] Add an option to keep individual workspaces always loaded ([#37](https://github.com/getferdi/ferdi/issues/37)) - [x] Add universal Dark-Mode via the [DarkReader extension](https://github.com/darkreader/darkreader) ([#71](https://github.com/getferdi/ferdi/issues/71)) +- [x] Add adaptable Dark Mode that will respect the system's darkmode setting ([#173](https://github.com/getferdi/ferdi/issues/173)) - [x] Add an option to auto-hide the menubar ([#7](https://github.com/getferdi/ferdi/issues/7), [franz#833](https://github.com/meetfranz/franz/issues/833)) - [x] Add "Quick Switch" feature to help you navigate a long list of services (similar to Rambox's [Quick Switcher](https://rambox.pro/#feature-details/quick_switcher)) - [x] Add "Service Hibernation" that will automatically unload services when they are unused diff --git a/next_release.md b/next_release.md index 0e4bc411b..ae472bce9 100644 --- a/next_release.md +++ b/next_release.md @@ -10,6 +10,7 @@ v5.4.0-beta.5: - Move hibernation indicator to bottom left (#129 (comment)) - Add fix for 1.1.1.1 hack (#146) - Fix darkmode not loading correctly (#158) +- Add adaptable Dark Mode that will respect the system's darkmode setting ([#173](https://github.com/getferdi/ferdi/issues/173)) ## Minor v5.4.0 @@ -18,7 +19,9 @@ v5.4.0 - **Merge Franz 5.4.0** - **Use Ferdi without an Account**: Simply choose "Use Ferdi without an Account" on the login screen - **Accent color**: Change Ferdi's accent color -- **Darkmode**: Easily open and edit any service's `darkmode.css` through the new "Open darkmode.css" button +- **Darkmode**: + - Easily open and edit any service's `darkmode.css` through the new "Open darkmode.css" button + - Add adaptable Dark Mode that will respect the system's darkmode setting ([#173](https://github.com/getferdi/ferdi/issues/173) - @steliyan) - **Hibernation**: Activate service hibernation to save battery - **Smaller file size**: Ferdi is now 17% smaller - **Annoucements**: Always get notified about the latest features of Ferdi -- cgit v1.2.3-70-g09d2 From 98c14d8e3af9667560c5e7461fda54131c88078e Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Wed, 30 Oct 2019 19:41:11 +0700 Subject: New translations en-US.json (French) --- src/i18n/locales/fr.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json index 908e2ace7..2edf358f5 100644 --- a/src/i18n/locales/fr.json +++ b/src/i18n/locales/fr.json @@ -255,11 +255,11 @@ "settings.app.cacheInfo": "Le cache de Ferdi occupe actuellement {size} en espace disque.", "settings.app.currentVersion": "Version actuelle :", "settings.app.form.accentColor": "Accent de couleur", - "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", + "settings.app.form.adaptableDarkMode": "Activer le mode sombre adaptable", "settings.app.form.autoLaunchInBackground": "Ouvrir en arrière-plan", "settings.app.form.autoLaunchOnStart": "Lancer Ferdi au démarrage", "settings.app.form.beta": "Accepter les versions bêta", - "settings.app.form.darkMode": "Activer le thème sombre", + "settings.app.form.darkMode": "Joindre le côté obscure", "settings.app.form.enableGPUAcceleration": "Activer l'accélération GPU", "settings.app.form.enableLock": "Activer le verrouillage de Ferdi", "settings.app.form.enableSpellchecking": "Activer la vérification orthographique", -- cgit v1.2.3-70-g09d2 From 46974a5b1281dd999205b4c8a9c9930145af3281 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Wed, 30 Oct 2019 20:47:47 +0700 Subject: New translations en-US.json (German) --- src/i18n/locales/de.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json index 01688d5cb..2709f7788 100644 --- a/src/i18n/locales/de.json +++ b/src/i18n/locales/de.json @@ -188,7 +188,7 @@ "pricing.plan.pro-yearly": "Ferdi Professional jährlich", "pricing.trial.cta.accept": "Ja, Upgrade zu Ferdi Professional durchführen", "pricing.trial.cta.skip": "Weiter zu Ferdi", - "pricing.trial.cta.start": "Start using Ferdi", + "pricing.trial.cta.start": "Ferdi verwenden", "pricing.trial.error": "Tut uns leid, wir konnten deine kostenlose Testlizenz nicht aktivieren!", "pricing.trial.features.headline": "Ferdi Professional beinhaltet:", "pricing.trial.headline.pro": "Hi {name}, willkommen bei Ferdi", @@ -255,7 +255,7 @@ "settings.app.cacheInfo": "Der Ferdi Cache belegt derzeit {size}.", "settings.app.currentVersion": "Aktuelle Version:", "settings.app.form.accentColor": "Akzentfarbe", - "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", + "settings.app.form.adaptableDarkMode": "Angepassten DarkMode aktivieren", "settings.app.form.autoLaunchInBackground": "Im Hintergrund öffnen", "settings.app.form.autoLaunchOnStart": "Ferdi beim Systemstart ausführen", "settings.app.form.beta": "Beta-Versionen einbeziehen", -- cgit v1.2.3-70-g09d2 From d0afab6bde6bdc1b1e2ed98b230c5838ce65ea5c Mon Sep 17 00:00:00 2001 From: Amine Mouafik Date: Thu, 31 Oct 2019 14:04:34 +0700 Subject: #178 Fetch in-app news from Ferdi server only --- src/api/server/ServerApi.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/api/server/ServerApi.js b/src/api/server/ServerApi.js index 164bc237b..627425948 100644 --- a/src/api/server/ServerApi.js +++ b/src/api/server/ServerApi.js @@ -458,7 +458,7 @@ export default class ServerApi { // News async getLatestNews() { - const url = `${apiBase()}/news?platform=${os.platform()}&arch=${os.arch()}&version=${app.getVersion()}`; + const url = `https://api.getferdi.com/v1/news?platform=${os.platform()}&arch=${os.arch()}&version=${app.getVersion()}`; const request = await sendAuthRequest(url); if (!request.ok) throw request; const data = await request.json(); @@ -468,7 +468,7 @@ export default class ServerApi { } async hideNews(id) { - const request = await sendAuthRequest(`${apiBase()}/news/${id}/read`); + const request = await sendAuthRequest(`https://api.getferdi.com/v1/news/${id}/read`); if (!request.ok) throw request; debug('ServerApi::hideNews resolves', id); } -- cgit v1.2.3-70-g09d2 From fc6e64329773f29fc9eee28bc3f4a1a1b01f218d Mon Sep 17 00:00:00 2001 From: Amine Mouafik Date: Thu, 31 Oct 2019 14:55:19 +0700 Subject: #160 Setup Sentry for Electron --- package-lock.json | 191 ++++++++++++++++++++++++++++++++++++++++++------------ package.json | 1 + src/index.html | 1 + src/index.js | 2 + src/sentry.js | 5 ++ 5 files changed, 160 insertions(+), 40 deletions(-) create mode 100644 src/sentry.js diff --git a/package-lock.json b/package-lock.json index a5b797e14..c84c1afbc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3071,14 +3071,6 @@ "version": "3.9.97", "resolved": "https://registry.npmjs.org/@mdi/js/-/js-3.9.97.tgz", "integrity": "sha512-JzX6rDlUcNZHaoUg9sAzdg5Js287tvgRbNmMIyKoJK2ZCP9JupeWTYlpbX4oNJ9Zg9v8YH76WuWLALKOospQgw==" - }, - "@meetfranz/theme": { - "version": "1.0.14", - "resolved": "https://registry.npmjs.org/@meetfranz/theme/-/theme-1.0.14.tgz", - "integrity": "sha512-iWP+3ifiNum98sHKiNdUJK+R0p4Z7TT8OenA1N2BnSC6CFob+dLhzAK+o5lxcyEcKZKYDwd7JKRZj93wqpBPpg==", - "requires": { - "color": "^3.1.0" - } } } }, @@ -3101,14 +3093,6 @@ "version": "3.9.97", "resolved": "https://registry.npmjs.org/@mdi/js/-/js-3.9.97.tgz", "integrity": "sha512-JzX6rDlUcNZHaoUg9sAzdg5Js287tvgRbNmMIyKoJK2ZCP9JupeWTYlpbX4oNJ9Zg9v8YH76WuWLALKOospQgw==" - }, - "@meetfranz/theme": { - "version": "1.0.14", - "resolved": "https://registry.npmjs.org/@meetfranz/theme/-/theme-1.0.14.tgz", - "integrity": "sha512-iWP+3ifiNum98sHKiNdUJK+R0p4Z7TT8OenA1N2BnSC6CFob+dLhzAK+o5lxcyEcKZKYDwd7JKRZj93wqpBPpg==", - "requires": { - "color": "^3.1.0" - } } } }, @@ -3229,6 +3213,136 @@ "universal-user-agent": "^4.0.0" } }, + "@sentry/browser": { + "version": "4.6.6", + "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-4.6.6.tgz", + "integrity": "sha512-+9VsQ+oQYU+PYlLJG2ex7JCMSVQbnUvWPI2uZOofWdI9sWIPUub3boWItMzRQNQ1T4S3FZd4FqAWNFd3azdnBw==", + "requires": { + "@sentry/core": "4.6.6", + "@sentry/types": "4.5.3", + "@sentry/utils": "4.6.5", + "tslib": "^1.9.3" + } + }, + "@sentry/core": { + "version": "4.6.6", + "resolved": "https://registry.npmjs.org/@sentry/core/-/core-4.6.6.tgz", + "integrity": "sha512-7z9HKLTNr3zVBR3tBRheTxkkkuK2IqISUc5Iyo3crN2OecOLtpptT96f5XjLndBEL2ab39eCBPpA5OFjbpzrIA==", + "requires": { + "@sentry/hub": "4.6.5", + "@sentry/minimal": "4.6.5", + "@sentry/types": "4.5.3", + "@sentry/utils": "4.6.5", + "tslib": "^1.9.3" + } + }, + "@sentry/electron": { + "version": "0.17.4", + "resolved": "https://registry.npmjs.org/@sentry/electron/-/electron-0.17.4.tgz", + "integrity": "sha512-1IU0o+E8eY5Lrthj6Pqf+Dh8MptddHsFFmcOwKlft/bbZ+6RTKEefLtFOclKUMLR64C7GTqa80Yddq0ssjOv5w==", + "requires": { + "@sentry/browser": "4.6.2 || ~4.6.4", + "@sentry/core": "4.6.2 || ~4.6.4", + "@sentry/minimal": "^4.5.0", + "@sentry/node": "4.6.2 || ~4.6.4", + "@sentry/types": "^4.5.0", + "@sentry/utils": "4.6.2 || ~4.6.4", + "electron-fetch": "1.3.0", + "form-data": "2.3.2", + "util.promisify": "1.0.0" + }, + "dependencies": { + "combined-stream": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz", + "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=", + "requires": { + "delayed-stream": "~1.0.0" + } + }, + "form-data": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz", + "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=", + "requires": { + "asynckit": "^0.4.0", + "combined-stream": "1.0.6", + "mime-types": "^2.1.12" + } + } + } + }, + "@sentry/hub": { + "version": "4.6.5", + "resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-4.6.5.tgz", + "integrity": "sha512-v9vee8s8C1fK/DPtNOzv6r+AMbPDOWfnasouNcBUkbQUSN5wUNyCDvt51QbWaw5kMMY5TSqjdVqY6gXQZI0APQ==", + "requires": { + "@sentry/types": "4.5.3", + "@sentry/utils": "4.6.5", + "tslib": "^1.9.3" + } + }, + "@sentry/minimal": { + "version": "4.6.5", + "resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-4.6.5.tgz", + "integrity": "sha512-tf+J+uUNmSgzC7d9JSN8Ekw1HeBAX87Efa/jyFbzLvaw80oibvTiLSLqDjQ9PgvyIzBUuuPImkS2NpvPQGWFtg==", + "requires": { + "@sentry/hub": "4.6.5", + "@sentry/types": "4.5.3", + "tslib": "^1.9.3" + } + }, + "@sentry/node": { + "version": "4.6.6", + "resolved": "https://registry.npmjs.org/@sentry/node/-/node-4.6.6.tgz", + "integrity": "sha512-+zZHE2uOwQTgypP6N9oBd0Io6BKXaJh6mdmZBauF0G46/8V28sBQ/dXBtJJNZ8tW7eVlLGpLSGuJb9Ai7c/rNw==", + "requires": { + "@sentry/core": "4.6.6", + "@sentry/hub": "4.6.5", + "@sentry/types": "4.5.3", + "@sentry/utils": "4.6.5", + "@types/stack-trace": "0.0.29", + "cookie": "0.3.1", + "https-proxy-agent": "2.2.1", + "lru_map": "0.3.3", + "lsmod": "1.0.0", + "stack-trace": "0.0.10", + "tslib": "^1.9.3" + }, + "dependencies": { + "debug": { + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", + "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "requires": { + "ms": "^2.1.1" + } + }, + "https-proxy-agent": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz", + "integrity": "sha512-HPCTS1LW51bcyMYbxUIOO4HEOlQ1/1qRaFWcyxvwaqUS9TY88aoEuHUY33kuAh1YhVVaDQhLZsnPd+XNARWZlQ==", + "requires": { + "agent-base": "^4.1.0", + "debug": "^3.1.0" + } + } + } + }, + "@sentry/types": { + "version": "4.5.3", + "resolved": "https://registry.npmjs.org/@sentry/types/-/types-4.5.3.tgz", + "integrity": "sha512-7ll1PAFNjrBNX9rzy3P2qAQrpQwHaDO3uKj735qsnGw34OtAS8Xr8WYrjI14f9fMPa/XIeWvMPb4GMic28V/ag==" + }, + "@sentry/utils": { + "version": "4.6.5", + "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-4.6.5.tgz", + "integrity": "sha512-rTISJtRRbWsd3UE+TkA3QG1C0VzPKPW8w74tieBwYhtTCGmOHNwz2nDC/MZGbGj4OgDmNKKl4CCyQr88EX08hA==", + "requires": { + "@sentry/types": "4.5.3", + "tslib": "^1.9.3" + } + }, "@sindresorhus/is": { "version": "0.14.0", "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz", @@ -3456,6 +3570,11 @@ "resolved": "https://registry.npmjs.org/@types/semver/-/semver-6.0.2.tgz", "integrity": "sha512-G1Ggy7/9Nsa1Jt2yiBR2riEuyK2DFNnqow6R7cromXPMNynackRY1vqFTLz/gwnef1LHokbXThcPhqMRjUbkpQ==" }, + "@types/stack-trace": { + "version": "0.0.29", + "resolved": "https://registry.npmjs.org/@types/stack-trace/-/stack-trace-0.0.29.tgz", + "integrity": "sha512-TgfOX+mGY/NyNxJLIbDWrO9DjGoVSW9+aB8H2yy1fy32jsvxijhmyJI9fDFgvz3YP4lvJaq9DzdR/M1bOgVc9g==" + }, "@types/stack-utils": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz", @@ -3820,7 +3939,6 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz", "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==", - "dev": true, "requires": { "es6-promisify": "^5.0.0" } @@ -7529,7 +7647,6 @@ "version": "1.1.3", "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", - "dev": true, "requires": { "object-keys": "^1.0.12" } @@ -8946,7 +9063,6 @@ "version": "1.14.2", "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.14.2.tgz", "integrity": "sha512-DgoQmbpFNOofkjJtKwr87Ma5EW4Dc8fWhD0R+ndq7Oc456ivUfGOOP6oAZTTKl5/CcNMP+EN+e3/iUzgE0veZg==", - "dev": true, "requires": { "es-to-primitive": "^1.2.0", "function-bind": "^1.1.1", @@ -8964,7 +9080,6 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz", "integrity": "sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==", - "dev": true, "requires": { "is-callable": "^1.1.4", "is-date-object": "^1.0.1", @@ -8994,14 +9109,12 @@ "es6-promise": { "version": "4.2.8", "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz", - "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==", - "dev": true + "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==" }, "es6-promisify": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz", "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=", - "dev": true, "requires": { "es6-promise": "^4.0.3" } @@ -11224,8 +11337,7 @@ "function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", - "dev": true + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" }, "functional-red-black-tree": { "version": "1.0.1", @@ -13397,7 +13509,6 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "dev": true, "requires": { "function-bind": "^1.1.1" } @@ -13458,8 +13569,7 @@ "has-symbols": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz", - "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=", - "dev": true + "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=" }, "has-unicode": { "version": "2.0.1", @@ -14331,8 +14441,7 @@ "is-date-object": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz", - "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=", - "dev": true + "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=" }, "is-descriptor": { "version": "0.1.6", @@ -14525,7 +14634,6 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz", "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=", - "dev": true, "requires": { "has": "^1.0.1" } @@ -14556,7 +14664,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz", "integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==", - "dev": true, "requires": { "has-symbols": "^1.0.0" } @@ -16513,6 +16620,16 @@ "es5-ext": "~0.10.2" } }, + "lru_map": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/lru_map/-/lru_map-0.3.3.tgz", + "integrity": "sha1-tcg1G5Rky9dQM1p5ZQoOwOVhGN0=" + }, + "lsmod": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/lsmod/-/lsmod-1.0.0.tgz", + "integrity": "sha1-mgD3bco26yP6BTUK/htYXUKZ5ks=" + }, "macos-notification-state": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/macos-notification-state/-/macos-notification-state-1.3.1.tgz", @@ -18555,8 +18672,7 @@ "object-inspect": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.6.0.tgz", - "integrity": "sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ==", - "dev": true + "integrity": "sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ==" }, "object-is": { "version": "1.0.1", @@ -18567,8 +18683,7 @@ "object-keys": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", - "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", - "dev": true + "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==" }, "object-visit": { "version": "1.0.1", @@ -18617,7 +18732,6 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz", "integrity": "sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=", - "dev": true, "requires": { "define-properties": "^1.1.2", "es-abstract": "^1.5.1" @@ -23134,7 +23248,6 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz", "integrity": "sha512-FJ6b7EgdKxxbDxc79cOlok6Afd++TTs5szo+zJTUyow3ycrRfJVE2pq3vcN53XexvKZu/DJMDfeI/qMiZTrjTw==", - "dev": true, "requires": { "define-properties": "^1.1.3", "function-bind": "^1.1.1" @@ -23144,7 +23257,6 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz", "integrity": "sha512-fXZTSV55dNBwv16uw+hh5jkghxSnc5oHq+5K/gXgizHwAvMetdAJlHqqoFC1FSDVPYWLkAKl2cxpUT41sV7nSg==", - "dev": true, "requires": { "define-properties": "^1.1.3", "function-bind": "^1.1.1" @@ -24738,7 +24850,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz", "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==", - "dev": true, "requires": { "define-properties": "^1.1.2", "object.getownpropertydescriptors": "^2.0.3" diff --git a/package.json b/package.json index 6bafa0f2b..a3b6d9377 100644 --- a/package.json +++ b/package.json @@ -56,6 +56,7 @@ "@meetfranz/forms": "file:packages/forms", "@meetfranz/theme": "file:packages/theme", "@meetfranz/ui": "file:packages/ui", + "@sentry/electron": "0.17.4", "address-rfc2822": "^2.0.1", "atob": "2.1.2", "auto-launch": "5.0.5", diff --git a/src/index.html b/src/index.html index 7f223b662..31e8aa553 100644 --- a/src/index.html +++ b/src/index.html @@ -14,6 +14,7 @@ - -- cgit v1.2.3-70-g09d2 From d4ba692994467ca2c28cf27bb63b9a4c67f04195 Mon Sep 17 00:00:00 2001 From: Andrzej Ressel Date: Thu, 30 Jan 2020 00:03:02 +0100 Subject: Start in tray --- .../settings/settings/EditSettingsForm.js | 3 + src/config.js | 1 + src/containers/settings/EditSettingsScreen.js | 11 ++ .../containers/settings/EditSettingsScreen.json | 117 ++++++++++++--------- src/index.html | 2 +- src/index.js | 10 +- 6 files changed, 90 insertions(+), 54 deletions(-) diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index d567a47d1..0badd3b98 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js @@ -162,6 +162,7 @@ export default @observer class EditSettingsForm extends Component { noUpdates: PropTypes.bool.isRequired, hibernationEnabled: PropTypes.bool.isRequired, isDarkmodeEnabled: PropTypes.bool.isRequired, + isTrayEnabled: PropTypes.bool.isRequired, openProcessManager: PropTypes.func.isRequired, }; @@ -199,6 +200,7 @@ export default @observer class EditSettingsForm extends Component { noUpdates, hibernationEnabled, isDarkmodeEnabled, + isTrayEnabled, openProcessManager, } = this.props; const { intl } = this.context; @@ -235,6 +237,7 @@ export default @observer class EditSettingsForm extends Component { + {isTrayEnabled && } diff --git a/src/config.js b/src/config.js index bd67aee6b..f877f4f2e 100644 --- a/src/config.js +++ b/src/config.js @@ -48,6 +48,7 @@ export const DEFAULT_APP_SETTINGS = { autoLaunchInBackground: false, runInBackground: true, enableSystemTray: true, + startMinimized: false, minimizeToSystemTray: false, privateNotifications: false, showDisabledServices: true, diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js index 07efbb881..c961d7541 100644 --- a/src/containers/settings/EditSettingsScreen.js +++ b/src/containers/settings/EditSettingsScreen.js @@ -38,6 +38,10 @@ const messages = defineMessages({ id: 'settings.app.form.runInBackground', defaultMessage: '!!!Keep Ferdi in background when closing the window', }, + startMinimized: { + id: 'settings.app.form.startMinimized', + defaultMessage: '!!!Start minimized' + }, enableSystemTray: { id: 'settings.app.form.enableSystemTray', defaultMessage: '!!!Show Ferdi in system tray', @@ -169,6 +173,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e data: { runInBackground: settingsData.runInBackground, enableSystemTray: settingsData.enableSystemTray, + startMinimized: settingsData.startMinimized, minimizeToSystemTray: settingsData.minimizeToSystemTray, privateNotifications: settingsData.privateNotifications, showServiceNavigationBar: settingsData.showServiceNavigationBar, @@ -260,6 +265,11 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e value: settings.all.app.runInBackground, default: DEFAULT_APP_SETTINGS.runInBackground, }, + startMinimized: { + label: intl.formatMessage(messages.startMinimized), + value: settings.all.app.startMinimized, + default: DEFAULT_APP_SETTINGS.startMinimized, + }, enableSystemTray: { label: intl.formatMessage(messages.enableSystemTray), value: settings.all.app.enableSystemTray, @@ -455,6 +465,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e noUpdates={this.props.stores.settings.app.noUpdates} hibernationEnabled={this.props.stores.settings.app.hibernate} isDarkmodeEnabled={this.props.stores.settings.app.darkMode} + isTrayEnabled={this.props.stores.settings.app.enableSystemTray} openProcessManager={() => this.openProcessManager()} /> diff --git a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json index 411e35dab..6a723ceca 100644 --- a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json +++ b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json @@ -38,16 +38,29 @@ "column": 3 } }, + { + "id": "settings.app.form.startMinimized", + "defaultMessage": "!!!Start minimized", + "file": "src/containers/settings/EditSettingsScreen.js", + "start": { + "line": 41, + "column": 18 + }, + "end": { + "line": 44, + "column": 3 + } + }, { "id": "settings.app.form.enableSystemTray", "defaultMessage": "!!!Show Ferdi in system tray", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 41, + "line": 45, "column": 20 }, "end": { - "line": 44, + "line": 48, "column": 3 } }, @@ -56,11 +69,11 @@ "defaultMessage": "!!!Minimize Ferdi to system tray", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 45, + "line": 49, "column": 24 }, "end": { - "line": 48, + "line": 52, "column": 3 } }, @@ -69,11 +82,11 @@ "defaultMessage": "!!!Don't show message content in notifications", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 49, + "line": 53, "column": 24 }, "end": { - "line": 52, + "line": 56, "column": 3 } }, @@ -82,11 +95,11 @@ "defaultMessage": "!!!Always show service navigation bar", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 53, + "line": 57, "column": 28 }, "end": { - "line": 56, + "line": 60, "column": 3 } }, @@ -95,11 +108,11 @@ "defaultMessage": "!!!Enable service hibernation", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 57, + "line": 61, "column": 13 }, "end": { - "line": 60, + "line": 64, "column": 3 } }, @@ -108,11 +121,11 @@ "defaultMessage": "!!!Hibernation strategy", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 61, + "line": 65, "column": 23 }, "end": { - "line": 64, + "line": 68, "column": 3 } }, @@ -121,11 +134,11 @@ "defaultMessage": "!!!Server", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 65, + "line": 69, "column": 10 }, "end": { - "line": 68, + "line": 72, "column": 3 } }, @@ -134,11 +147,11 @@ "defaultMessage": "!!!Todo Server", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 69, + "line": 73, "column": 14 }, "end": { - "line": 72, + "line": 76, "column": 3 } }, @@ -147,11 +160,11 @@ "defaultMessage": "!!!Enable Ferdi password lock", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 73, + "line": 77, "column": 14 }, "end": { - "line": 76, + "line": 80, "column": 3 } }, @@ -160,11 +173,11 @@ "defaultMessage": "!!!Ferdi Lock password", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 77, + "line": 81, "column": 16 }, "end": { - "line": 80, + "line": 84, "column": 3 } }, @@ -173,11 +186,11 @@ "defaultMessage": "!!!Enable scheduled Do-not-Disturb", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 81, + "line": 85, "column": 23 }, "end": { - "line": 84, + "line": 88, "column": 3 } }, @@ -186,11 +199,11 @@ "defaultMessage": "!!!From", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 85, + "line": 89, "column": 21 }, "end": { - "line": 88, + "line": 92, "column": 3 } }, @@ -199,11 +212,11 @@ "defaultMessage": "!!!To", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 89, + "line": 93, "column": 19 }, "end": { - "line": 92, + "line": 96, "column": 3 } }, @@ -212,11 +225,11 @@ "defaultMessage": "!!!Language", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 93, + "line": 97, "column": 12 }, "end": { - "line": 96, + "line": 100, "column": 3 } }, @@ -225,11 +238,11 @@ "defaultMessage": "!!!Dark Mode", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 97, + "line": 101, "column": 12 }, "end": { - "line": 100, + "line": 104, "column": 3 } }, @@ -238,11 +251,11 @@ "defaultMessage": "!!!Enable adaptable Dark Mode", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 101, + "line": 105, "column": 21 }, "end": { - "line": 104, + "line": 108, "column": 3 } }, @@ -251,11 +264,11 @@ "defaultMessage": "!!!Enable universal Dark Mode", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 105, + "line": 109, "column": 21 }, "end": { - "line": 108, + "line": 112, "column": 3 } }, @@ -264,11 +277,11 @@ "defaultMessage": "!!!Accent color", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 109, + "line": 113, "column": 15 }, "end": { - "line": 112, + "line": 116, "column": 3 } }, @@ -277,11 +290,11 @@ "defaultMessage": "!!!Display disabled services tabs", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 113, + "line": 117, "column": 24 }, "end": { - "line": 116, + "line": 120, "column": 3 } }, @@ -290,11 +303,11 @@ "defaultMessage": "!!!Show unread message badge when notifications are disabled", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 117, + "line": 121, "column": 29 }, "end": { - "line": 120, + "line": 124, "column": 3 } }, @@ -303,11 +316,11 @@ "defaultMessage": "!!!Enable spell checking", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 121, + "line": 125, "column": 23 }, "end": { - "line": 124, + "line": 128, "column": 3 } }, @@ -316,11 +329,11 @@ "defaultMessage": "!!!Enable GPU Acceleration", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 125, + "line": 129, "column": 25 }, "end": { - "line": 128, + "line": 132, "column": 3 } }, @@ -329,11 +342,11 @@ "defaultMessage": "!!!Include beta versions", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 129, + "line": 133, "column": 8 }, "end": { - "line": 132, + "line": 136, "column": 3 } }, @@ -342,11 +355,11 @@ "defaultMessage": "!!!Disable updates", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 133, + "line": 137, "column": 13 }, "end": { - "line": 136, + "line": 140, "column": 3 } }, @@ -355,11 +368,11 @@ "defaultMessage": "!!!Enable Franz Todos", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 137, + "line": 141, "column": 15 }, "end": { - "line": 140, + "line": 144, "column": 3 } }, @@ -368,11 +381,11 @@ "defaultMessage": "!!!Keep all workspaces loaded", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 141, + "line": 145, "column": 27 }, "end": { - "line": 144, + "line": 148, "column": 3 } } diff --git a/src/index.html b/src/index.html index 31e8aa553..6b67cc248 100644 --- a/src/index.html +++ b/src/index.html @@ -56,5 +56,5 @@ })(); } - diff --git a/src/index.js b/src/index.js index 12ea7f646..4c61c5c8e 100644 --- a/src/index.js +++ b/src/index.js @@ -91,7 +91,7 @@ if (!gotTheLock) { app.on('second-instance', (event, argv) => { // Someone tried to run a second instance, we should focus our window. if (mainWindow) { - mainWindow.show(); + //mainWindow.show(); if (mainWindow.isMinimized()) { mainWindow.restore(); } @@ -142,6 +142,8 @@ const createWindow = () => { const mainWindowState = windowStateKeeper({ defaultWidth: DEFAULT_WINDOW_OPTIONS.width, defaultHeight: DEFAULT_WINDOW_OPTIONS.height, + maximize: false, + fullScreen: false }); let posX = mainWindowState.x || DEFAULT_WINDOW_OPTIONS.x; @@ -168,6 +170,7 @@ const createWindow = () => { height: mainWindowState.height, minWidth: 600, minHeight: 500, + show: false, titleBarStyle: isMac ? 'hidden' : '', frame: isLinux, backgroundColor, @@ -298,6 +301,11 @@ const createWindow = () => { shell.openExternal(url); } }); + + if (!(settings.get('enableSystemTray') && settings.get('startMinimized'))) { + mainWindow.show(); + } + }; // Allow passing command line parameters/switches to electron -- cgit v1.2.3-70-g09d2 From d93b4461a193169a1b35ea3c097544b0f32a2d8e Mon Sep 17 00:00:00 2001 From: Andrzej Ressel Date: Thu, 30 Jan 2020 00:06:14 +0100 Subject: Update --- src/containers/settings/EditSettingsScreen.js | 2 +- src/i18n/locales/defaultMessages.json | 117 ++++++++++++++------------ src/i18n/locales/en-US.json | 1 + src/index.js | 5 +- 4 files changed, 69 insertions(+), 56 deletions(-) diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js index c961d7541..10ca376f8 100644 --- a/src/containers/settings/EditSettingsScreen.js +++ b/src/containers/settings/EditSettingsScreen.js @@ -40,7 +40,7 @@ const messages = defineMessages({ }, startMinimized: { id: 'settings.app.form.startMinimized', - defaultMessage: '!!!Start minimized' + defaultMessage: '!!!Start minimized', }, enableSystemTray: { id: 'settings.app.form.enableSystemTray', diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json index 10092cd9e..a3f53b6dc 100644 --- a/src/i18n/locales/defaultMessages.json +++ b/src/i18n/locales/defaultMessages.json @@ -4071,341 +4071,354 @@ } }, { - "defaultMessage": "!!!Show Ferdi in system tray", + "defaultMessage": "!!!Start minimized", "end": { "column": 3, "line": 44 }, "file": "src/containers/settings/EditSettingsScreen.js", + "id": "settings.app.form.startMinimized", + "start": { + "column": 18, + "line": 41 + } + }, + { + "defaultMessage": "!!!Show Ferdi in system tray", + "end": { + "column": 3, + "line": 48 + }, + "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.enableSystemTray", "start": { "column": 20, - "line": 41 + "line": 45 } }, { "defaultMessage": "!!!Minimize Ferdi to system tray", "end": { "column": 3, - "line": 48 + "line": 52 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.minimizeToSystemTray", "start": { "column": 24, - "line": 45 + "line": 49 } }, { "defaultMessage": "!!!Don't show message content in notifications", "end": { "column": 3, - "line": 52 + "line": 56 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.privateNotifications", "start": { "column": 24, - "line": 49 + "line": 53 } }, { "defaultMessage": "!!!Always show service navigation bar", "end": { "column": 3, - "line": 56 + "line": 60 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.showServiceNavigationBar", "start": { "column": 28, - "line": 53 + "line": 57 } }, { "defaultMessage": "!!!Enable service hibernation", "end": { "column": 3, - "line": 60 + "line": 64 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.hibernate", "start": { "column": 13, - "line": 57 + "line": 61 } }, { "defaultMessage": "!!!Hibernation strategy", "end": { "column": 3, - "line": 64 + "line": 68 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.hibernationStrategy", "start": { "column": 23, - "line": 61 + "line": 65 } }, { "defaultMessage": "!!!Server", "end": { "column": 3, - "line": 68 + "line": 72 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.server", "start": { "column": 10, - "line": 65 + "line": 69 } }, { "defaultMessage": "!!!Todo Server", "end": { "column": 3, - "line": 72 + "line": 76 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.todoServer", "start": { "column": 14, - "line": 69 + "line": 73 } }, { "defaultMessage": "!!!Enable Ferdi password lock", "end": { "column": 3, - "line": 76 + "line": 80 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.enableLock", "start": { "column": 14, - "line": 73 + "line": 77 } }, { "defaultMessage": "!!!Ferdi Lock password", "end": { "column": 3, - "line": 80 + "line": 84 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.lockPassword", "start": { "column": 16, - "line": 77 + "line": 81 } }, { "defaultMessage": "!!!Enable scheduled Do-not-Disturb", "end": { "column": 3, - "line": 84 + "line": 88 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.scheduledDNDEnabled", "start": { "column": 23, - "line": 81 + "line": 85 } }, { "defaultMessage": "!!!From", "end": { "column": 3, - "line": 88 + "line": 92 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.scheduledDNDStart", "start": { "column": 21, - "line": 85 + "line": 89 } }, { "defaultMessage": "!!!To", "end": { "column": 3, - "line": 92 + "line": 96 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.scheduledDNDEnd", "start": { "column": 19, - "line": 89 + "line": 93 } }, { "defaultMessage": "!!!Language", "end": { "column": 3, - "line": 96 + "line": 100 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.language", "start": { "column": 12, - "line": 93 + "line": 97 } }, { "defaultMessage": "!!!Dark Mode", "end": { "column": 3, - "line": 100 + "line": 104 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.darkMode", "start": { "column": 12, - "line": 97 + "line": 101 } }, { "defaultMessage": "!!!Enable adaptable Dark Mode", "end": { "column": 3, - "line": 104 + "line": 108 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.adaptableDarkMode", "start": { "column": 21, - "line": 101 + "line": 105 } }, { "defaultMessage": "!!!Enable universal Dark Mode", "end": { "column": 3, - "line": 108 + "line": 112 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.universalDarkMode", "start": { "column": 21, - "line": 105 + "line": 109 } }, { "defaultMessage": "!!!Accent color", "end": { "column": 3, - "line": 112 + "line": 116 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.accentColor", "start": { "column": 15, - "line": 109 + "line": 113 } }, { "defaultMessage": "!!!Display disabled services tabs", "end": { "column": 3, - "line": 116 + "line": 120 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.showDisabledServices", "start": { "column": 24, - "line": 113 + "line": 117 } }, { "defaultMessage": "!!!Show unread message badge when notifications are disabled", "end": { "column": 3, - "line": 120 + "line": 124 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.showMessagesBadgesWhenMuted", "start": { "column": 29, - "line": 117 + "line": 121 } }, { "defaultMessage": "!!!Enable spell checking", "end": { "column": 3, - "line": 124 + "line": 128 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.enableSpellchecking", "start": { "column": 23, - "line": 121 + "line": 125 } }, { "defaultMessage": "!!!Enable GPU Acceleration", "end": { "column": 3, - "line": 128 + "line": 132 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.enableGPUAcceleration", "start": { "column": 25, - "line": 125 + "line": 129 } }, { "defaultMessage": "!!!Include beta versions", "end": { "column": 3, - "line": 132 + "line": 136 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.beta", "start": { "column": 8, - "line": 129 + "line": 133 } }, { "defaultMessage": "!!!Disable updates", "end": { "column": 3, - "line": 136 + "line": 140 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.noUpdates", "start": { "column": 13, - "line": 133 + "line": 137 } }, { "defaultMessage": "!!!Enable Franz Todos", "end": { "column": 3, - "line": 140 + "line": 144 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.enableTodos", "start": { "column": 15, - "line": 137 + "line": 141 } }, { "defaultMessage": "!!!Keep all workspaces loaded", "end": { "column": 3, - "line": 144 + "line": 148 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.keepAllWorkspacesLoaded", "start": { "column": 27, - "line": 141 + "line": 145 } } ], diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index b7d81356e..5beb51495 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json @@ -281,6 +281,7 @@ "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.startMinimized": "Start minimized", "settings.app.form.todoServer": "Todo Server", "settings.app.form.universalDarkMode": "Enable universal Dark Mode", "settings.app.headline": "Settings", diff --git a/src/index.js b/src/index.js index 4c61c5c8e..69aae3dde 100644 --- a/src/index.js +++ b/src/index.js @@ -91,7 +91,7 @@ if (!gotTheLock) { app.on('second-instance', (event, argv) => { // Someone tried to run a second instance, we should focus our window. if (mainWindow) { - //mainWindow.show(); + mainWindow.show(); if (mainWindow.isMinimized()) { mainWindow.restore(); } @@ -143,7 +143,7 @@ const createWindow = () => { defaultWidth: DEFAULT_WINDOW_OPTIONS.width, defaultHeight: DEFAULT_WINDOW_OPTIONS.height, maximize: false, - fullScreen: false + fullScreen: false, }); let posX = mainWindowState.x || DEFAULT_WINDOW_OPTIONS.x; @@ -305,7 +305,6 @@ const createWindow = () => { if (!(settings.get('enableSystemTray') && settings.get('startMinimized'))) { mainWindow.show(); } - }; // Allow passing command line parameters/switches to electron -- cgit v1.2.3-70-g09d2 From 86c4dba849a9313e5eb7f48c10c82b4a58537630 Mon Sep 17 00:00:00 2001 From: Andrzej Ressel Date: Thu, 30 Jan 2020 00:23:10 +0100 Subject: Fix default message --- src/containers/settings/EditSettingsScreen.js | 2 +- src/i18n/locales/en-US.json | 2 +- src/i18n/messages/src/containers/settings/EditSettingsScreen.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js index 10ca376f8..f404f8e8c 100644 --- a/src/containers/settings/EditSettingsScreen.js +++ b/src/containers/settings/EditSettingsScreen.js @@ -40,7 +40,7 @@ const messages = defineMessages({ }, startMinimized: { id: 'settings.app.form.startMinimized', - defaultMessage: '!!!Start minimized', + defaultMessage: '!!!Start minimized in tray', }, enableSystemTray: { id: 'settings.app.form.enableSystemTray', diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index 5beb51495..ad2fb6f84 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json @@ -281,7 +281,7 @@ "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.startMinimized": "Start minimized", + "settings.app.form.startMinimized": "Start minimized in tray", "settings.app.form.todoServer": "Todo Server", "settings.app.form.universalDarkMode": "Enable universal Dark Mode", "settings.app.headline": "Settings", diff --git a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json index 6a723ceca..53e9a61a9 100644 --- a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json +++ b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json @@ -40,7 +40,7 @@ }, { "id": "settings.app.form.startMinimized", - "defaultMessage": "!!!Start minimized", + "defaultMessage": "!!!Start minimized in tray", "file": "src/containers/settings/EditSettingsScreen.js", "start": { "line": 41, -- cgit v1.2.3-70-g09d2 From 6222ca3dd3176fcfcdfb51cd1d7b406dd1ec7e80 Mon Sep 17 00:00:00 2001 From: Andrzej Ressel Date: Thu, 30 Jan 2020 00:24:56 +0100 Subject: Update --- src/i18n/locales/defaultMessages.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json index a3f53b6dc..1b789fb6e 100644 --- a/src/i18n/locales/defaultMessages.json +++ b/src/i18n/locales/defaultMessages.json @@ -4071,7 +4071,7 @@ } }, { - "defaultMessage": "!!!Start minimized", + "defaultMessage": "!!!Start minimized in tray", "end": { "column": 3, "line": 44 -- cgit v1.2.3-70-g09d2 From 87cf1af5b932a1fe922905bb8dc16fb1da1cbe9e Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Thu, 30 Jan 2020 09:21:43 +0000 Subject: docs: update README.md [skip ci] --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index f7eb28fac..d73f9a5a1 100644 --- a/README.md +++ b/README.md @@ -250,6 +250,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
    Lennart Weller
    📦 +
    Andrzej Ressel
    💻 -- cgit v1.2.3-70-g09d2 From 3831eec7bf55e6627095b452d89b5df728f15868 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Thu, 30 Jan 2020 09:21:43 +0000 Subject: docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index b62d0e442..2644b1edb 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -278,6 +278,15 @@ "contributions": [ "platform" ] + }, + { + "login": "jereksel", + "name": "Andrzej Ressel", + "avatar_url": "https://avatars0.githubusercontent.com/u/1307829?v=4", + "profile": "https://github.com/jereksel", + "contributions": [ + "code" + ] } ], "contributorsPerLine": 6, -- cgit v1.2.3-70-g09d2 From c562fa60dd488261b32fdca8fbdd34ca446c8111 Mon Sep 17 00:00:00 2001 From: vantezzen Date: Fri, 31 Jan 2020 11:58:24 +0100 Subject: #285 Fix DarkReader for FastMail --- src/webview/recipe.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/webview/recipe.js b/src/webview/recipe.js index 2cb2d3a98..770532be1 100644 --- a/src/webview/recipe.js +++ b/src/webview/recipe.js @@ -4,6 +4,12 @@ import { autorun, computed, observable } from 'mobx'; import fs from 'fs-extra'; import { loadModule } from 'cld3-asm'; import { debounce } from 'lodash'; + +// For some services darkreader tries to use the chrome extension message API +// This will cause the service to fail loading +// As the message API is not actually needed, we'll add this shim sendMessage +// function in order for darkreader to continue working +window.chrome.runtime.sendMessage = () => {}; import { enable as enableDarkMode, disable as disableDarkMode, -- cgit v1.2.3-70-g09d2 From 0a89e919b3caf4d4935d135d687ad5b31bdc4441 Mon Sep 17 00:00:00 2001 From: vantezzen Date: Fri, 31 Jan 2020 13:40:00 +0100 Subject: #328 Implement local updates --- package-lock.json | 2 +- package.json | 2 +- src/stores/RecipesStore.js | 29 ++++++++++++++++++++++++++++- 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9c9b1aeb7..fd54e00b0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "ferdi", - "version": "5.4.1-beta.4", + "version": "5.4.3", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index eef920a16..d51f02997 100644 --- a/package.json +++ b/package.json @@ -112,7 +112,7 @@ "react-sortable-hoc": "1.10.1", "react-tooltip": "3.11.1", "route-parser": "^0.0.5", - "semver": "^5.4.1", + "semver": "5.7.1", "smoothscroll-polyfill": "0.4.4", "sqlite3": "4.1.0", "tar": "^4.0.2", diff --git a/src/stores/RecipesStore.js b/src/stores/RecipesStore.js index 8b2bde5df..fc7a07dd8 100644 --- a/src/stores/RecipesStore.js +++ b/src/stores/RecipesStore.js @@ -1,9 +1,13 @@ import { action, computed, observable } from 'mobx'; +import fs from 'fs-extra'; +import path from 'path'; +import semver from 'semver'; import Store from './lib/Store'; import CachedRequest from './lib/CachedRequest'; import Request from './lib/Request'; import { matchRoute } from '../helpers/routing-helpers'; +import { RECIPES_PATH } from '../config'; const debug = require('debug')('Ferdi:RecipeStore'); @@ -83,7 +87,30 @@ export default class RecipesStore extends Store { if (Object.keys(recipes).length === 0) return; - const updates = await this.getRecipeUpdatesRequest.execute(recipes)._promise; + const remoteUpdates = await this.getRecipeUpdatesRequest.execute(recipes)._promise; + + // Check for local updates + const allJsonFile = path.join(RECIPES_PATH, 'all.json'); + const allJson = await fs.readJSON(allJsonFile); + const localUpdates = []; + + Object.keys(recipes).forEach((recipe) => { + const version = recipes[recipe]; + + // Find recipe in local recipe repository + const localRecipe = allJson.find((r) => r.id === recipe); + + if (localRecipe && semver.lt(version, localRecipe.version)) { + localUpdates.push(recipe); + } + }); + + const updates = [ + ...remoteUpdates, + ...localUpdates, + ]; + debug('Got update information (local, remote):', localUpdates, remoteUpdates); + const length = updates.length - 1; const syncUpdate = async (i) => { const update = updates[i]; -- cgit v1.2.3-70-g09d2 From 63a0a2667807596154dc7c297c8e48f82cd050d8 Mon Sep 17 00:00:00 2001 From: vantezzen Date: Fri, 31 Jan 2020 16:11:28 +0100 Subject: Fix lint --- src/stores/RecipesStore.js | 2 +- src/webview/recipe.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/stores/RecipesStore.js b/src/stores/RecipesStore.js index fc7a07dd8..cf5d0a074 100644 --- a/src/stores/RecipesStore.js +++ b/src/stores/RecipesStore.js @@ -98,7 +98,7 @@ export default class RecipesStore extends Store { const version = recipes[recipe]; // Find recipe in local recipe repository - const localRecipe = allJson.find((r) => r.id === recipe); + const localRecipe = allJson.find(r => r.id === recipe); if (localRecipe && semver.lt(version, localRecipe.version)) { localUpdates.push(recipe); diff --git a/src/webview/recipe.js b/src/webview/recipe.js index 770532be1..8ea2fabd9 100644 --- a/src/webview/recipe.js +++ b/src/webview/recipe.js @@ -1,3 +1,4 @@ +/* eslint-disable import/first */ import { ipcRenderer } from 'electron'; import path from 'path'; import { autorun, computed, observable } from 'mobx'; -- cgit v1.2.3-70-g09d2 From 5714e2fbae7d8b6f69adc3ae064cded2bb8c35d7 Mon Sep 17 00:00:00 2001 From: vantezzen Date: Fri, 31 Jan 2020 16:44:56 +0100 Subject: Add better sync between Ferdi and service dark mode --- src/actions/service.js | 1 + src/stores/ServicesStore.js | 6 +++++- src/stores/UIStore.js | 1 + src/webview/recipe.js | 9 +++++++-- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/actions/service.js b/src/actions/service.js index 3283d8fee..d32bb80d3 100644 --- a/src/actions/service.js +++ b/src/actions/service.js @@ -98,4 +98,5 @@ export default { serviceId: PropTypes.string.isRequired, hibernating: PropTypes.bool.isRequired, }, + shareSettingsWithServiceProcess: {}, }; diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js index 3dd601bc3..731305141 100644 --- a/src/stores/ServicesStore.js +++ b/src/stores/ServicesStore.js @@ -83,6 +83,7 @@ export default class ServicesStore extends Store { this.actions.service.openDevTools.listen(this._openDevTools.bind(this)); this.actions.service.openDevToolsForActiveService.listen(this._openDevToolsForActiveService.bind(this)); this.actions.service.setHibernation.listen(this._setHibernation.bind(this)); + this.actions.service.shareSettingsWithServiceProcess.listen(this._shareSettingsWithServiceProcess.bind(this)); this.registerReactions([ this._focusServiceReaction.bind(this), @@ -771,7 +772,10 @@ export default class ServicesStore extends Store { } _shareSettingsWithServiceProcess() { - const settings = this.stores.settings.app; + const settings = { + ...this.stores.settings.app, + isDarkThemeActive: this.stores.ui.isDarkThemeActive + }; this.actions.service.sendIPCMessageToAllServices({ channel: 'settings-update', args: settings, diff --git a/src/stores/UIStore.js b/src/stores/UIStore.js index 7e6f89fed..5b9672798 100644 --- a/src/stores/UIStore.js +++ b/src/stores/UIStore.js @@ -32,6 +32,7 @@ export default class UIStore extends Store { 'AppleInterfaceThemeChangedNotification', () => { this.isOsDarkThemeActive = nativeTheme.shouldUseDarkColors; + this.actions.service.shareSettingsWithServiceProcess(); }, ); } diff --git a/src/webview/recipe.js b/src/webview/recipe.js index 8ea2fabd9..4e2f5233a 100644 --- a/src/webview/recipe.js +++ b/src/webview/recipe.js @@ -127,8 +127,13 @@ class RecipeController { } } - console.log('Set theme to: ', this.settings.service.isDarkModeEnabled ? 'Dark' : 'Light'); - if (this.settings.service.isDarkModeEnabled) { + console.log( + 'Darkmode enabled?', + this.settings.service.isDarkModeEnabled, + 'Dark theme active?', + this.settings.app.isDarkThemeActive + ); + if (this.settings.service.isDarkModeEnabled && this.settings.app.isDarkThemeActive !== false) { debug('Enable dark mode'); // Check if recipe has a darkmode.css -- cgit v1.2.3-70-g09d2 From eefda6c7b3e9f0e9b0cfc056efbf59d04a54be85 Mon Sep 17 00:00:00 2001 From: vantezzen Date: Fri, 31 Jan 2020 16:54:14 +0100 Subject: Improve dark mode behaviour on macOS --- src/components/settings/settings/EditSettingsForm.js | 8 +++++--- src/containers/settings/EditSettingsScreen.js | 3 ++- src/i18n/locales/en-US.json | 4 ++-- src/i18n/messages/src/containers/settings/EditSettingsScreen.json | 2 +- src/stores/UIStore.js | 1 - 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index 9064ff234..61c31ac93 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js @@ -170,6 +170,7 @@ export default @observer class EditSettingsForm extends Component { noUpdates: PropTypes.bool.isRequired, hibernationEnabled: PropTypes.bool.isRequired, isDarkmodeEnabled: PropTypes.bool.isRequired, + isAdaptableDarkModeEnabled: PropTypes.bool.isRequired, openProcessManager: PropTypes.func.isRequired, }; @@ -194,6 +195,7 @@ export default @observer class EditSettingsForm extends Component { installUpdate, form, isCheckingForUpdates, + isAdaptableDarkModeEnabled, isUpdateAvailable, noUpdateAvailable, updateIsReadyToInstall, @@ -429,10 +431,10 @@ export default @observer class EditSettingsForm extends Component {

    {intl.formatMessage(messages.headlineAppearance)}

    - - {isDarkmodeEnabled && ( + {isMac && } + {!(isMac && isAdaptableDarkModeEnabled) && } + {(isDarkmodeEnabled || isAdaptableDarkModeEnabled) && ( <> - {isMac && }

    this.openProcessManager()} /> diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index 510a29143..f1acf9904 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json @@ -257,11 +257,11 @@ "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.", "settings.app.currentVersion": "Current version:", "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", "settings.app.form.autoLaunchInBackground": "Open in background", "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start", "settings.app.form.beta": "Include beta versions", - "settings.app.form.darkMode": "Join the Dark Side", + "settings.app.form.darkMode": "Enable dark mode", "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration", "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Enable spell checking", diff --git a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json index 06874d97e..82a9a7cd5 100644 --- a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json +++ b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json @@ -248,7 +248,7 @@ }, { "id": "settings.app.form.adaptableDarkMode", - "defaultMessage": "!!!Enable adaptable Dark Mode", + "defaultMessage": "!!!Synchronize dark mode with my Mac's dark mode setting", "file": "src/containers/settings/EditSettingsScreen.js", "start": { "line": 105, diff --git a/src/stores/UIStore.js b/src/stores/UIStore.js index 5b9672798..6941cf086 100644 --- a/src/stores/UIStore.js +++ b/src/stores/UIStore.js @@ -57,7 +57,6 @@ export default class UIStore extends Store { @computed get isDarkThemeActive() { const isMacWithAdaptableInDarkMode = isMac - && this.stores.settings.all.app.darkMode && this.stores.settings.all.app.adaptableDarkMode && this.isOsDarkThemeActive; const isMacWithoutAdaptableInDarkMode = isMac -- cgit v1.2.3-70-g09d2 From 8ed2eebc21ebd9b83a281da727ae0026f142cc7b Mon Sep 17 00:00:00 2001 From: vantezzen Date: Fri, 31 Jan 2020 17:20:03 +0100 Subject: Add update-submodules script --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index d51f02997..e86de3761 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,8 @@ "uidev": "cd uidev && webpack-dev-server", "postinstall": "npx lerna run prepare", "apply-branding": "node ./src/i18n/apply-branding.js", - "prepare-code": "npm run lint && npm run reformat-files && npm run manage-translations && npm run apply-branding", + "update-submodules": "git submodule update --remote --force && git add .", + "prepare-code": "npm run update-submodules && npm run lint && npm run reformat-files && npm run manage-translations && npm run apply-branding", "build-theme-info": "node src/scripts/build-theme-info.js" }, "keywords": [], -- cgit v1.2.3-70-g09d2 From 9cc8591a911b78dc84248fa1801f8fec41443f8a Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Fri, 31 Jan 2020 23:21:28 +0700 Subject: New translations en-US.json (Spanish) --- src/i18n/locales/es.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json index b29c72f5c..6ab593c85 100644 --- a/src/i18n/locales/es.json +++ b/src/i18n/locales/es.json @@ -257,11 +257,11 @@ "settings.app.cacheInfo": "El cache de Ferdi actualmente usa {size} de espacio en disco.", "settings.app.currentVersion": "Versión actual:", "settings.app.form.accentColor": "Color de realce", - "settings.app.form.adaptableDarkMode": "Activar modo oscuro", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", "settings.app.form.autoLaunchInBackground": "Abrir en segundo plano", "settings.app.form.autoLaunchOnStart": "Iniciar Ferdi al iniciar", "settings.app.form.beta": "Incluir versiones beta", - "settings.app.form.darkMode": "Únete al Lado Oscuro", + "settings.app.form.darkMode": "Enable dark mode", "settings.app.form.enableGPUAcceleration": "Habilitar aceleración de GPU", "settings.app.form.enableLock": "Activar bloqueo por contraseña", "settings.app.form.enableSpellchecking": "Activar corrección ortográfica", -- cgit v1.2.3-70-g09d2 From 7adc85d9888450ea37f6a41e173693a861424ce5 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Fri, 31 Jan 2020 23:21:30 +0700 Subject: New translations en-US.json (Portuguese, Brazilian) --- src/i18n/locales/pt.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/locales/pt.json b/src/i18n/locales/pt.json index dd7ee189b..385231c91 100644 --- a/src/i18n/locales/pt.json +++ b/src/i18n/locales/pt.json @@ -257,11 +257,11 @@ "settings.app.cacheInfo": "A cache do Ferdi está a usar {size} de espaço em disco.", "settings.app.currentVersion": "Versão atual", "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", "settings.app.form.autoLaunchInBackground": "Abrir em segundo plano", "settings.app.form.autoLaunchOnStart": "Iniciar o Ferdi após iniciar o computador", "settings.app.form.beta": "Incluir versões instáveis (beta)", - "settings.app.form.darkMode": "Junta-te ao Lado Negro", + "settings.app.form.darkMode": "Enable dark mode", "settings.app.form.enableGPUAcceleration": "Activar Aceleração de GPU", "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Ativar verificação ortográfica", -- cgit v1.2.3-70-g09d2 From d4488c90d66252111462a0367177d53af46e5917 Mon Sep 17 00:00:00 2001 From: vantezzen Date: Fri, 31 Jan 2020 17:21:30 +0100 Subject: Fix lint --- recipes | 2 +- src/i18n/locales/defaultMessages.json | 2 +- src/internal-server | 2 +- src/stores/ServicesStore.js | 2 +- src/webview/recipe.js | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/recipes b/recipes index 3dcb305ff..dbc43bfd2 160000 --- a/recipes +++ b/recipes @@ -1 +1 @@ -Subproject commit 3dcb305ffb706a7604cdfbadf7f2d2e236cb223d +Subproject commit dbc43bfd258d4d7db25b36895a1bfc202361173b diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json index 22953ffb0..62203d5e8 100644 --- a/src/i18n/locales/defaultMessages.json +++ b/src/i18n/locales/defaultMessages.json @@ -4318,7 +4318,7 @@ } }, { - "defaultMessage": "!!!Enable adaptable Dark Mode", + "defaultMessage": "!!!Synchronize dark mode with my Mac's dark mode setting", "end": { "column": 3, "line": 108 diff --git a/src/internal-server b/src/internal-server index c39e8b45a..65d146890 160000 --- a/src/internal-server +++ b/src/internal-server @@ -1 +1 @@ -Subproject commit c39e8b45a51387f24d30e62a170681fc3422ad08 +Subproject commit 65d1468901b7394c95e510c5aed1a23c22f0f71d diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js index 731305141..fda18b514 100644 --- a/src/stores/ServicesStore.js +++ b/src/stores/ServicesStore.js @@ -774,7 +774,7 @@ export default class ServicesStore extends Store { _shareSettingsWithServiceProcess() { const settings = { ...this.stores.settings.app, - isDarkThemeActive: this.stores.ui.isDarkThemeActive + isDarkThemeActive: this.stores.ui.isDarkThemeActive, }; this.actions.service.sendIPCMessageToAllServices({ channel: 'settings-update', diff --git a/src/webview/recipe.js b/src/webview/recipe.js index 4e2f5233a..e95cae18b 100644 --- a/src/webview/recipe.js +++ b/src/webview/recipe.js @@ -131,7 +131,7 @@ class RecipeController { 'Darkmode enabled?', this.settings.service.isDarkModeEnabled, 'Dark theme active?', - this.settings.app.isDarkThemeActive + this.settings.app.isDarkThemeActive, ); if (this.settings.service.isDarkModeEnabled && this.settings.app.isDarkThemeActive !== false) { debug('Enable dark mode'); -- cgit v1.2.3-70-g09d2 From e9a52224b76b975d685e2330712033c37d191fc9 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Fri, 31 Jan 2020 23:21:34 +0700 Subject: New translations en-US.json (Italian) --- src/i18n/locales/it.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/locales/it.json b/src/i18n/locales/it.json index f93a5772c..d45830382 100644 --- a/src/i18n/locales/it.json +++ b/src/i18n/locales/it.json @@ -257,11 +257,11 @@ "settings.app.cacheInfo": "Ferdi sta utilizzando {size} di spazio su disco.", "settings.app.currentVersion": "Versione attuale:", "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", "settings.app.form.autoLaunchInBackground": "Apri in background", "settings.app.form.autoLaunchOnStart": "Esegui Ferdi all'avvio", "settings.app.form.beta": "Includi versioni beta", - "settings.app.form.darkMode": "Unisciti al Lato Oscuro", + "settings.app.form.darkMode": "Enable dark mode", "settings.app.form.enableGPUAcceleration": "Attiva Accelerazione GPU", "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Attiva controllo ortografico", -- cgit v1.2.3-70-g09d2 From 67f1c4d8ffd61350425d7e710e7fb45c49196470 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Fri, 31 Jan 2020 23:21:37 +0700 Subject: New translations en-US.json (Japanese) --- src/i18n/locales/ja.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/locales/ja.json b/src/i18n/locales/ja.json index ee72edfd1..b7432535e 100644 --- a/src/i18n/locales/ja.json +++ b/src/i18n/locales/ja.json @@ -257,11 +257,11 @@ "settings.app.cacheInfo": "現在、Ferdiのキャッシュはディスクの{size}分を使用しています。", "settings.app.currentVersion": "現在のバージョン:", "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", "settings.app.form.autoLaunchInBackground": "バックグラウンドで開く", "settings.app.form.autoLaunchOnStart": "システム起動時にFerdiを開く", "settings.app.form.beta": "Betaバージョンを含める", - "settings.app.form.darkMode": "ダークモードを有効にする", + "settings.app.form.darkMode": "Enable dark mode", "settings.app.form.enableGPUAcceleration": "GPUアクセラレーションを有効にする", "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "スペルチェックを有効にする", -- cgit v1.2.3-70-g09d2 From 4150142511b50ed476b20ff446b673ff9a26c0a3 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Fri, 31 Jan 2020 23:21:41 +0700 Subject: New translations en-US.json (Korean) --- src/i18n/locales/ko.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/locales/ko.json b/src/i18n/locales/ko.json index 8b3fcea8c..8d7bfcff7 100644 --- a/src/i18n/locales/ko.json +++ b/src/i18n/locales/ko.json @@ -257,11 +257,11 @@ "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.", "settings.app.currentVersion": "Current version:", "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", "settings.app.form.autoLaunchInBackground": "Open in background", "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start", "settings.app.form.beta": "Include beta versions", - "settings.app.form.darkMode": "Join the Dark Side", + "settings.app.form.darkMode": "Enable dark mode", "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration", "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Enable spell checking", -- cgit v1.2.3-70-g09d2 From 255d4e6bd72ac558b5b1a6f40492188988775793 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Fri, 31 Jan 2020 23:21:42 +0700 Subject: New translations en-US.json (Norwegian) --- src/i18n/locales/no.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/locales/no.json b/src/i18n/locales/no.json index 8b3fcea8c..8d7bfcff7 100644 --- a/src/i18n/locales/no.json +++ b/src/i18n/locales/no.json @@ -257,11 +257,11 @@ "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.", "settings.app.currentVersion": "Current version:", "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", "settings.app.form.autoLaunchInBackground": "Open in background", "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start", "settings.app.form.beta": "Include beta versions", - "settings.app.form.darkMode": "Join the Dark Side", + "settings.app.form.darkMode": "Enable dark mode", "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration", "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Enable spell checking", -- cgit v1.2.3-70-g09d2 From 7226eb739cff99859e30dab0abe5a289bc66c17e Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Fri, 31 Jan 2020 23:21:44 +0700 Subject: New translations en-US.json (Polish) --- src/i18n/locales/pl.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/locales/pl.json b/src/i18n/locales/pl.json index e81bfa10c..974ad4655 100644 --- a/src/i18n/locales/pl.json +++ b/src/i18n/locales/pl.json @@ -257,11 +257,11 @@ "settings.app.cacheInfo": "Pamięć podręczna zajmuje obecnie {size} przestrzeni dyskowej", "settings.app.currentVersion": "Aktualna wersja:", "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", "settings.app.form.autoLaunchInBackground": "Otwórz w tle", "settings.app.form.autoLaunchOnStart": "Uruchom Ferdi na początku", "settings.app.form.beta": "Uwzględnij wersje beta", - "settings.app.form.darkMode": "Przejdź na Ciemną Stronę", + "settings.app.form.darkMode": "Enable dark mode", "settings.app.form.enableGPUAcceleration": "Włącz akcelerację GPU", "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Włącz sprawdzanie pisowni", -- cgit v1.2.3-70-g09d2 From 04b9b12cb44cac6a4c689d20e906731f5f967907 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Fri, 31 Jan 2020 23:21:46 +0700 Subject: New translations en-US.json (Portuguese) --- src/i18n/locales/pt-BR.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/locales/pt-BR.json b/src/i18n/locales/pt-BR.json index 7348a190c..878a7dd3b 100644 --- a/src/i18n/locales/pt-BR.json +++ b/src/i18n/locales/pt-BR.json @@ -257,11 +257,11 @@ "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": "Activar modo de escuridão adaptável", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", "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.darkMode": "Enable dark mode", "settings.app.form.enableGPUAcceleration": "Ativar Aceleração de GPU", "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Ativar correção ortográfica", -- cgit v1.2.3-70-g09d2 From 125666e496d36d7ccb9ec4f00cbcca75e78b1046 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Fri, 31 Jan 2020 23:21:48 +0700 Subject: New translations en-US.json (Romanian) --- src/i18n/locales/ro.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/locales/ro.json b/src/i18n/locales/ro.json index 8b3fcea8c..8d7bfcff7 100644 --- a/src/i18n/locales/ro.json +++ b/src/i18n/locales/ro.json @@ -257,11 +257,11 @@ "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.", "settings.app.currentVersion": "Current version:", "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", "settings.app.form.autoLaunchInBackground": "Open in background", "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start", "settings.app.form.beta": "Include beta versions", - "settings.app.form.darkMode": "Join the Dark Side", + "settings.app.form.darkMode": "Enable dark mode", "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration", "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Enable spell checking", -- cgit v1.2.3-70-g09d2 From 62059074379dc994686c0034ad1123f77cff9b53 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Fri, 31 Jan 2020 23:21:50 +0700 Subject: New translations en-US.json (Indonesian) --- src/i18n/locales/id.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/locales/id.json b/src/i18n/locales/id.json index 9985926bf..236f201d9 100644 --- a/src/i18n/locales/id.json +++ b/src/i18n/locales/id.json @@ -257,11 +257,11 @@ "settings.app.cacheInfo": "Singgahan Ferdi sedang menggunakan ruang disk {size}.", "settings.app.currentVersion": "Versi saat ini:", "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", "settings.app.form.autoLaunchInBackground": "Buka di latar belakang", "settings.app.form.autoLaunchOnStart": "Jalankan Ferdi saat komputer dimulai", "settings.app.form.beta": "Sertakan versi beta", - "settings.app.form.darkMode": "Sisi Kelam menunggu Anda (Mode Gelap)", + "settings.app.form.darkMode": "Enable dark mode", "settings.app.form.enableGPUAcceleration": "Aktifkan Akselerasi GPU", "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Aktifkan pemeriksaan ejaan", -- cgit v1.2.3-70-g09d2 From 97c4a6bcc7ee00b33169e01e5e5774065cc112f2 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Fri, 31 Jan 2020 23:21:53 +0700 Subject: New translations en-US.json (Russian) --- src/i18n/locales/ru.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/locales/ru.json b/src/i18n/locales/ru.json index b1ce32b08..01bf09e52 100644 --- a/src/i18n/locales/ru.json +++ b/src/i18n/locales/ru.json @@ -257,11 +257,11 @@ "settings.app.cacheInfo": "Кэш занимает {size} на диске.", "settings.app.currentVersion": "Текущая версия:", "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", "settings.app.form.autoLaunchInBackground": "Открывать в фоне", "settings.app.form.autoLaunchOnStart": "Запускать Ferdi при старте", "settings.app.form.beta": "Включая бета версии", - "settings.app.form.darkMode": "Перейти на Тёмную сторону", + "settings.app.form.darkMode": "Enable dark mode", "settings.app.form.enableGPUAcceleration": "Включить ускорение GPU", "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Включить проверку правописания", -- cgit v1.2.3-70-g09d2 From 4f6a3694ed350b0e82d1c5835de9d91bf138b129 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Fri, 31 Jan 2020 23:21:56 +0700 Subject: New translations en-US.json (Serbian (Cyrillic)) --- src/i18n/locales/sr.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/locales/sr.json b/src/i18n/locales/sr.json index 44bf2fb6c..9623e5c48 100644 --- a/src/i18n/locales/sr.json +++ b/src/i18n/locales/sr.json @@ -257,11 +257,11 @@ "settings.app.cacheInfo": "Франз кеш тренутно користи {величина} простора на диску.", "settings.app.currentVersion": "Trenutna verzija:", "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", "settings.app.form.autoLaunchInBackground": "Otvori u pozadini", "settings.app.form.autoLaunchOnStart": "Pokreni Ferdi sa sistemom", "settings.app.form.beta": "Obuhvati i beta verzije", - "settings.app.form.darkMode": "Join the Dark Side", + "settings.app.form.darkMode": "Enable dark mode", "settings.app.form.enableGPUAcceleration": "Омогући убрзање графичке јединице", "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Omogući provjeru pravopisa", -- cgit v1.2.3-70-g09d2 From 07b25b10bab313e9879d8558449137ee8f90d7d3 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Fri, 31 Jan 2020 23:21:59 +0700 Subject: New translations en-US.json (Slovak) --- src/i18n/locales/sk.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/locales/sk.json b/src/i18n/locales/sk.json index 8e7ccf4ca..e3db0c6c7 100644 --- a/src/i18n/locales/sk.json +++ b/src/i18n/locales/sk.json @@ -257,11 +257,11 @@ "settings.app.cacheInfo": "Vyrovnávacia pamäť Ferdi momentálne používa {size} miesta na disku.", "settings.app.currentVersion": "Súčasná verzia:", "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", "settings.app.form.autoLaunchInBackground": "Otvoriť na pozadí", "settings.app.form.autoLaunchOnStart": "Spustiť Ferdi pri štarte", "settings.app.form.beta": "Vrátane beta verzií", - "settings.app.form.darkMode": "Spustiť Dark Side", + "settings.app.form.darkMode": "Enable dark mode", "settings.app.form.enableGPUAcceleration": "Zapnúť GPU zrýchlenie", "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Zapnúť kontrolu pravopisu", -- cgit v1.2.3-70-g09d2 From 758b38da1af9c85510e21d443eb46c06e3f8cec5 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Fri, 31 Jan 2020 23:22:01 +0700 Subject: New translations en-US.json (Slovenian) --- src/i18n/locales/sl.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/locales/sl.json b/src/i18n/locales/sl.json index 8b3fcea8c..8d7bfcff7 100644 --- a/src/i18n/locales/sl.json +++ b/src/i18n/locales/sl.json @@ -257,11 +257,11 @@ "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.", "settings.app.currentVersion": "Current version:", "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", "settings.app.form.autoLaunchInBackground": "Open in background", "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start", "settings.app.form.beta": "Include beta versions", - "settings.app.form.darkMode": "Join the Dark Side", + "settings.app.form.darkMode": "Enable dark mode", "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration", "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Enable spell checking", -- cgit v1.2.3-70-g09d2 From 8187611ff4c37b2d150fa3cee515ac16dd2e8a65 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Fri, 31 Jan 2020 23:22:02 +0700 Subject: New translations en-US.json (Swedish) --- src/i18n/locales/sv.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/locales/sv.json b/src/i18n/locales/sv.json index 8b3fcea8c..8d7bfcff7 100644 --- a/src/i18n/locales/sv.json +++ b/src/i18n/locales/sv.json @@ -257,11 +257,11 @@ "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.", "settings.app.currentVersion": "Current version:", "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", "settings.app.form.autoLaunchInBackground": "Open in background", "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start", "settings.app.form.beta": "Include beta versions", - "settings.app.form.darkMode": "Join the Dark Side", + "settings.app.form.darkMode": "Enable dark mode", "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration", "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Enable spell checking", -- cgit v1.2.3-70-g09d2 From ace86424571552391174879752c6339d38702e28 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Fri, 31 Jan 2020 23:22:05 +0700 Subject: New translations en-US.json (Turkish) --- src/i18n/locales/tr.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/locales/tr.json b/src/i18n/locales/tr.json index dbdd34c20..512a8838c 100644 --- a/src/i18n/locales/tr.json +++ b/src/i18n/locales/tr.json @@ -257,11 +257,11 @@ "settings.app.cacheInfo": "Ferdi önbelleği şu anda {size} disk alanı kullanıyor.", "settings.app.currentVersion": "Geçerli sürüm:", "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", "settings.app.form.autoLaunchInBackground": "Arka planda aç", "settings.app.form.autoLaunchOnStart": "Ferdi'ı başlangıçta aç", "settings.app.form.beta": "Beta versiyonları dahil et", - "settings.app.form.darkMode": "Karanlık tarafa katıl", + "settings.app.form.darkMode": "Enable dark mode", "settings.app.form.enableGPUAcceleration": "Grafik İşlemci Ünitesi (GPU) Hızlandırıcısını Aktif et", "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Yazım denetimini etkinleştir", -- cgit v1.2.3-70-g09d2 From 42ea446bbbc95d7b8c0755a640683dd686b0781f Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Fri, 31 Jan 2020 23:22:06 +0700 Subject: New translations en-US.json (Ukrainian) --- src/i18n/locales/uk.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/locales/uk.json b/src/i18n/locales/uk.json index c543ad9a0..6ae94de3a 100644 --- a/src/i18n/locales/uk.json +++ b/src/i18n/locales/uk.json @@ -257,11 +257,11 @@ "settings.app.cacheInfo": "Кеш, який використовує Ferdi, займає {size} дискового простору.", "settings.app.currentVersion": "Поточна версія:", "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", "settings.app.form.autoLaunchInBackground": "Відкрити у фоновому режимі", "settings.app.form.autoLaunchOnStart": "Запускати Ferdi на початку", "settings.app.form.beta": "Включити бета-версії", - "settings.app.form.darkMode": "Переходь на Темну Сторону", + "settings.app.form.darkMode": "Enable dark mode", "settings.app.form.enableGPUAcceleration": "Ввімкнути прискорення GPU", "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Увімкнути перевірку орфографії", -- cgit v1.2.3-70-g09d2 From 9a22f2c3cc3271f86417922143e5a82a22f9afc0 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Fri, 31 Jan 2020 23:22:08 +0700 Subject: New translations en-US.json (Irish) --- src/i18n/locales/ga.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/locales/ga.json b/src/i18n/locales/ga.json index 37d853ba6..cfd31e48f 100644 --- a/src/i18n/locales/ga.json +++ b/src/i18n/locales/ga.json @@ -257,11 +257,11 @@ "settings.app.cacheInfo": "Tá taisce Ferdi ag baint úsáid as {size} den spás diosca.", "settings.app.currentVersion": "Leagan reatha:", "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", "settings.app.form.autoLaunchInBackground": "Oscail sa chúlra", "settings.app.form.autoLaunchOnStart": "Láinseáil Ferdi ón tús", "settings.app.form.beta": "Cuir leagain béite san áireamh", - "settings.app.form.darkMode": "Join the Dark Side", + "settings.app.form.darkMode": "Enable dark mode", "settings.app.form.enableGPUAcceleration": "Cumasaigh luasghéarú APG", "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Cumasaigh seiceáil litrithe", -- cgit v1.2.3-70-g09d2 From 8923300e6ecb6bda9d3598a26b691e84de7d5e22 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Fri, 31 Jan 2020 23:22:09 +0700 Subject: New translations en-US.json (Hungarian) --- src/i18n/locales/hu.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/locales/hu.json b/src/i18n/locales/hu.json index 69c3e3cec..61041a428 100644 --- a/src/i18n/locales/hu.json +++ b/src/i18n/locales/hu.json @@ -257,11 +257,11 @@ "settings.app.cacheInfo": "A Ferdi gyorsítótár jelenleg {size} lemezterületet használ.", "settings.app.currentVersion": "Aktuális verzió:", "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", "settings.app.form.autoLaunchInBackground": "Megnyitás háttérben", "settings.app.form.autoLaunchOnStart": "Ferdi betöltése indításkor", "settings.app.form.beta": "Béta verziók keresése", - "settings.app.form.darkMode": "Csatlakozz a Sötét Oldalhoz", + "settings.app.form.darkMode": "Enable dark mode", "settings.app.form.enableGPUAcceleration": "Hardveres gyorsítás engedélyezése", "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Helyesírás-ellenőrzés engedélyezése", -- cgit v1.2.3-70-g09d2 From b62452d28d8076ba2c95cb3cd74fda35485f7263 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Fri, 31 Jan 2020 23:22:12 +0700 Subject: New translations en-US.json (Afrikaans) --- src/i18n/locales/af.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/locales/af.json b/src/i18n/locales/af.json index 8b3fcea8c..8d7bfcff7 100644 --- a/src/i18n/locales/af.json +++ b/src/i18n/locales/af.json @@ -257,11 +257,11 @@ "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.", "settings.app.currentVersion": "Current version:", "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", "settings.app.form.autoLaunchInBackground": "Open in background", "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start", "settings.app.form.beta": "Include beta versions", - "settings.app.form.darkMode": "Join the Dark Side", + "settings.app.form.darkMode": "Enable dark mode", "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration", "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Enable spell checking", -- cgit v1.2.3-70-g09d2 From cefb73df2ce5e8aeba305ddb04ceb10c14ec9e30 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Fri, 31 Jan 2020 23:22:15 +0700 Subject: New translations en-US.json (Czech) --- src/i18n/locales/cs.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/locales/cs.json b/src/i18n/locales/cs.json index 3c82b3ea5..a29eefccf 100644 --- a/src/i18n/locales/cs.json +++ b/src/i18n/locales/cs.json @@ -257,11 +257,11 @@ "settings.app.cacheInfo": "Ferdi momentálně používá {size} místa na disku.", "settings.app.currentVersion": "Aktuální verze:", "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", "settings.app.form.autoLaunchInBackground": "Spustit na pozadí", "settings.app.form.autoLaunchOnStart": "Spustit Ferdi při startu", "settings.app.form.beta": "Zahrnout beta verze", - "settings.app.form.darkMode": "Připoj se k Temné straně", + "settings.app.form.darkMode": "Enable dark mode", "settings.app.form.enableGPUAcceleration": "Aktivovat GPU zrychlení", "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Zapnout kontrolu pravopisu", -- cgit v1.2.3-70-g09d2 From 43e236e27767859a042ab1c6c5dedefcf37f62fb Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Fri, 31 Jan 2020 23:22:18 +0700 Subject: New translations en-US.json (Arabic) --- src/i18n/locales/ar.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/locales/ar.json b/src/i18n/locales/ar.json index b091b5405..be64581aa 100644 --- a/src/i18n/locales/ar.json +++ b/src/i18n/locales/ar.json @@ -257,11 +257,11 @@ "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.", "settings.app.currentVersion": "Current version:", "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", "settings.app.form.autoLaunchInBackground": "Open in background", "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start", "settings.app.form.beta": "Include beta versions", - "settings.app.form.darkMode": "Join the Dark Side", + "settings.app.form.darkMode": "Enable dark mode", "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration", "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Enable spell checking", -- cgit v1.2.3-70-g09d2 From 97941d822079f0fd73758b247456b6fe16cc5d29 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Fri, 31 Jan 2020 23:22:20 +0700 Subject: New translations en-US.json (Bosnian) --- src/i18n/locales/bs.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/locales/bs.json b/src/i18n/locales/bs.json index 8b3fcea8c..8d7bfcff7 100644 --- a/src/i18n/locales/bs.json +++ b/src/i18n/locales/bs.json @@ -257,11 +257,11 @@ "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.", "settings.app.currentVersion": "Current version:", "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", "settings.app.form.autoLaunchInBackground": "Open in background", "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start", "settings.app.form.beta": "Include beta versions", - "settings.app.form.darkMode": "Join the Dark Side", + "settings.app.form.darkMode": "Enable dark mode", "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration", "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Enable spell checking", -- cgit v1.2.3-70-g09d2 From 772ac90d5e1a6a962f752a993d7bbd1452a341c4 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Fri, 31 Jan 2020 23:22:23 +0700 Subject: New translations en-US.json (Catalan) --- src/i18n/locales/ca.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/locales/ca.json b/src/i18n/locales/ca.json index 1516b0cae..41eff1e38 100644 --- a/src/i18n/locales/ca.json +++ b/src/i18n/locales/ca.json @@ -257,11 +257,11 @@ "settings.app.cacheInfo": "La memòria cau de Ferdi està utilitzant {size} d'espai al disc", "settings.app.currentVersion": "Versió actual:", "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", "settings.app.form.autoLaunchInBackground": "Obrir en segon plà", "settings.app.form.autoLaunchOnStart": "Iniciar Ferdi a l'inici", "settings.app.form.beta": "Inclou versions beta", - "settings.app.form.darkMode": "Uneix-te al Cantó Fosc", + "settings.app.form.darkMode": "Enable dark mode", "settings.app.form.enableGPUAcceleration": "Activar acceleració GPU", "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Habilita la comprobació ortogràfica", -- cgit v1.2.3-70-g09d2 From 49ca4c85645f4d912bdd4f67a44c732057eb707f Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Fri, 31 Jan 2020 23:22:24 +0700 Subject: New translations en-US.json (Chinese Simplified) --- src/i18n/locales/zh.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/locales/zh.json b/src/i18n/locales/zh.json index 8b3fcea8c..8d7bfcff7 100644 --- a/src/i18n/locales/zh.json +++ b/src/i18n/locales/zh.json @@ -257,11 +257,11 @@ "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.", "settings.app.currentVersion": "Current version:", "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", "settings.app.form.autoLaunchInBackground": "Open in background", "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start", "settings.app.form.beta": "Include beta versions", - "settings.app.form.darkMode": "Join the Dark Side", + "settings.app.form.darkMode": "Enable dark mode", "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration", "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Enable spell checking", -- cgit v1.2.3-70-g09d2 From 781d837be9f0506456d1ee4e0d811d3d6d81450f Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Fri, 31 Jan 2020 23:22:26 +0700 Subject: New translations en-US.json (Chinese Traditional) --- src/i18n/locales/zh-HANT.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/locales/zh-HANT.json b/src/i18n/locales/zh-HANT.json index bcb475a26..5f9b6d3e5 100644 --- a/src/i18n/locales/zh-HANT.json +++ b/src/i18n/locales/zh-HANT.json @@ -257,11 +257,11 @@ "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.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", "settings.app.form.autoLaunchInBackground": "背景啟動", "settings.app.form.autoLaunchOnStart": "開機時啟動", "settings.app.form.beta": "包含開發中版本", - "settings.app.form.darkMode": "Join the Dark Side", + "settings.app.form.darkMode": "Enable dark mode", "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration", "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Enable spell checking", -- cgit v1.2.3-70-g09d2 From 7e1d90192fbb0c4b859fb804e55cadfbcc5074bf Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Fri, 31 Jan 2020 23:22:27 +0700 Subject: New translations en-US.json (Croatian) --- src/i18n/locales/hr.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/locales/hr.json b/src/i18n/locales/hr.json index 2e84985e4..61d53f8b1 100644 --- a/src/i18n/locales/hr.json +++ b/src/i18n/locales/hr.json @@ -257,11 +257,11 @@ "settings.app.cacheInfo": "Ferdi predmemorija trenutno koristi {size} prostora na disku", "settings.app.currentVersion": "Trenutna verzija:", "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", "settings.app.form.autoLaunchInBackground": "Otvori u pozadini", "settings.app.form.autoLaunchOnStart": "Pokreni Ferdi sa sistemom", "settings.app.form.beta": "Obuhvati i beta verzije", - "settings.app.form.darkMode": "Join the Dark Side", + "settings.app.form.darkMode": "Enable dark mode", "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration", "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Omogući provjeru pravopisa", -- cgit v1.2.3-70-g09d2 From 936974aff36b287a7fb9de9cdad01df527575934 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Fri, 31 Jan 2020 23:22:29 +0700 Subject: New translations en-US.json (Danish) --- src/i18n/locales/da.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/locales/da.json b/src/i18n/locales/da.json index 8b3fcea8c..8d7bfcff7 100644 --- a/src/i18n/locales/da.json +++ b/src/i18n/locales/da.json @@ -257,11 +257,11 @@ "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.", "settings.app.currentVersion": "Current version:", "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", "settings.app.form.autoLaunchInBackground": "Open in background", "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start", "settings.app.form.beta": "Include beta versions", - "settings.app.form.darkMode": "Join the Dark Side", + "settings.app.form.darkMode": "Enable dark mode", "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration", "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Enable spell checking", -- cgit v1.2.3-70-g09d2 From fbc3326d77c2c6bfb3f2e6764715916b3369183d Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Fri, 31 Jan 2020 23:22:31 +0700 Subject: New translations en-US.json (Hebrew) --- src/i18n/locales/he.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/locales/he.json b/src/i18n/locales/he.json index 8b3fcea8c..8d7bfcff7 100644 --- a/src/i18n/locales/he.json +++ b/src/i18n/locales/he.json @@ -257,11 +257,11 @@ "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.", "settings.app.currentVersion": "Current version:", "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", "settings.app.form.autoLaunchInBackground": "Open in background", "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start", "settings.app.form.beta": "Include beta versions", - "settings.app.form.darkMode": "Join the Dark Side", + "settings.app.form.darkMode": "Enable dark mode", "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration", "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Enable spell checking", -- cgit v1.2.3-70-g09d2 From 218186125dd40f053e127a3b6f524ab88aea2477 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Fri, 31 Jan 2020 23:22:33 +0700 Subject: New translations en-US.json (Dutch) --- src/i18n/locales/nl.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/locales/nl.json b/src/i18n/locales/nl.json index f35d55cea..4fbfc74f5 100644 --- a/src/i18n/locales/nl.json +++ b/src/i18n/locales/nl.json @@ -257,11 +257,11 @@ "settings.app.cacheInfo": "Ferdi gebruikt op dit moment {size} schijfruimte aan tijdelijke bestanden.", "settings.app.currentVersion": "Huidige versie:", "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", "settings.app.form.autoLaunchInBackground": "Open op de achtergrond", "settings.app.form.autoLaunchOnStart": "Open Ferdi bij opstarten", "settings.app.form.beta": "Inclusief bètaversies", - "settings.app.form.darkMode": "Stap over naar de donkere kant", + "settings.app.form.darkMode": "Enable dark mode", "settings.app.form.enableGPUAcceleration": "Schakel videokaart-acceleratie in ", "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Zet spellingcontrole aan", -- cgit v1.2.3-70-g09d2 From 31d23e460b5c78fc8a1b9c23a1d76b4443b644e1 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Fri, 31 Jan 2020 23:22:35 +0700 Subject: New translations en-US.json (Finnish) --- src/i18n/locales/fi.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/locales/fi.json b/src/i18n/locales/fi.json index 8b3fcea8c..8d7bfcff7 100644 --- a/src/i18n/locales/fi.json +++ b/src/i18n/locales/fi.json @@ -257,11 +257,11 @@ "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.", "settings.app.currentVersion": "Current version:", "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", "settings.app.form.autoLaunchInBackground": "Open in background", "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start", "settings.app.form.beta": "Include beta versions", - "settings.app.form.darkMode": "Join the Dark Side", + "settings.app.form.darkMode": "Enable dark mode", "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration", "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Enable spell checking", -- cgit v1.2.3-70-g09d2 From d5bf88bcc9ed9327a3e3639b18f386039a71bf06 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Fri, 31 Jan 2020 23:22:38 +0700 Subject: New translations en-US.json (Flemish) --- src/i18n/locales/nl-BE.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/locales/nl-BE.json b/src/i18n/locales/nl-BE.json index f05fd8567..ecaf0c92f 100644 --- a/src/i18n/locales/nl-BE.json +++ b/src/i18n/locales/nl-BE.json @@ -257,11 +257,11 @@ "settings.app.cacheInfo": "Ferdi cache gebruikt momenteel {size} schijfruimte.", "settings.app.currentVersion": "Huidige versie:", "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", "settings.app.form.autoLaunchInBackground": "Open op de achtergrond", "settings.app.form.autoLaunchOnStart": "Lanceer Ferdi bij opstarten", "settings.app.form.beta": "Inclusief beta versies", - "settings.app.form.darkMode": "Word lid van de Dark Side", + "settings.app.form.darkMode": "Enable dark mode", "settings.app.form.enableGPUAcceleration": "GPU Acceleratie Activeren", "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Spellingcontrole inschakelen", -- cgit v1.2.3-70-g09d2 From 53c8fbffa2244e5d5eba27689d7e27e77bff9118 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Fri, 31 Jan 2020 23:22:40 +0700 Subject: New translations en-US.json (French) --- src/i18n/locales/fr.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json index 1324a943f..2611c4737 100644 --- a/src/i18n/locales/fr.json +++ b/src/i18n/locales/fr.json @@ -257,11 +257,11 @@ "settings.app.cacheInfo": "Le cache de Ferdi occupe actuellement {size} en espace disque.", "settings.app.currentVersion": "Version actuelle :", "settings.app.form.accentColor": "Accent de couleur", - "settings.app.form.adaptableDarkMode": "Activer le mode sombre adaptable", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", "settings.app.form.autoLaunchInBackground": "Ouvrir en arrière-plan", "settings.app.form.autoLaunchOnStart": "Lancer Ferdi au démarrage", "settings.app.form.beta": "Accepter les versions bêta", - "settings.app.form.darkMode": "Joindre le côté obscure", + "settings.app.form.darkMode": "Enable dark mode", "settings.app.form.enableGPUAcceleration": "Activer l'accélération GPU", "settings.app.form.enableLock": "Activer le verrouillage par mot de passe", "settings.app.form.enableSpellchecking": "Activer la vérification orthographique", -- cgit v1.2.3-70-g09d2 From 4d08afdc5acbca7090df1b84e221e10a0bdeefcc Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Fri, 31 Jan 2020 23:22:44 +0700 Subject: New translations en-US.json (Georgian) --- src/i18n/locales/ka.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/locales/ka.json b/src/i18n/locales/ka.json index cd33ad060..2e723a419 100644 --- a/src/i18n/locales/ka.json +++ b/src/i18n/locales/ka.json @@ -257,11 +257,11 @@ "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.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", "settings.app.form.autoLaunchInBackground": "გახსენით ფონზე", "settings.app.form.autoLaunchOnStart": "გაეშვას Ferdi სისტემის ჩატვირთვისას", "settings.app.form.beta": "ჩართეთ ბეტა ვერსიები", - "settings.app.form.darkMode": "Join the Dark Side", + "settings.app.form.darkMode": "Enable dark mode", "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration", "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Enable spell checking", -- cgit v1.2.3-70-g09d2 From 8b5560500f16f9cf93748f3702cec2ade75813c8 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Fri, 31 Jan 2020 23:22:45 +0700 Subject: New translations en-US.json (German) --- src/i18n/locales/de.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json index 4c574f8c6..0c33dc79c 100644 --- a/src/i18n/locales/de.json +++ b/src/i18n/locales/de.json @@ -257,11 +257,11 @@ "settings.app.cacheInfo": "Der Ferdi Cache belegt derzeit {size}.", "settings.app.currentVersion": "Aktuelle Version:", "settings.app.form.accentColor": "Akzentfarbe", - "settings.app.form.adaptableDarkMode": "Angepassten DarkMode aktivieren", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", "settings.app.form.autoLaunchInBackground": "Im Hintergrund öffnen", "settings.app.form.autoLaunchOnStart": "Ferdi beim Systemstart ausführen", "settings.app.form.beta": "Beta-Versionen einbeziehen", - "settings.app.form.darkMode": "Die dunkle Seite erwartet dich! (Dark Mode)", + "settings.app.form.darkMode": "Enable dark mode", "settings.app.form.enableGPUAcceleration": "Hardwarebeschleunigung aktivieren", "settings.app.form.enableLock": "Passwort-Sperre aktivieren", "settings.app.form.enableSpellchecking": "Rechtschreibprüfung aktivieren", -- cgit v1.2.3-70-g09d2 From 532e094d7c17b35b7ae45b4018ed0c9b0995466a Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Fri, 31 Jan 2020 23:22:48 +0700 Subject: New translations en-US.json (Greek) --- src/i18n/locales/el.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/locales/el.json b/src/i18n/locales/el.json index 9b56cc9d3..2948bbb79 100644 --- a/src/i18n/locales/el.json +++ b/src/i18n/locales/el.json @@ -257,11 +257,11 @@ "settings.app.cacheInfo": "Το Ferdi χρησιμοποιεί αυτήν τη στιγμή {size} χώρου στο δίσκο.", "settings.app.currentVersion": "Τρέχουσα έκδοση:", "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", "settings.app.form.autoLaunchInBackground": "Άνοιγμα στο παρασκήνιο", "settings.app.form.autoLaunchOnStart": "Εκκίνηση του Ferdi κατά την εκκίνηση του συστήματος", "settings.app.form.beta": "Συμπεριλάβετε εκδόσεις beta", - "settings.app.form.darkMode": "Join the Dark Side", + "settings.app.form.darkMode": "Enable dark mode", "settings.app.form.enableGPUAcceleration": "Ενεργοποιήση Ενίσχυσης GPU ", "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Ενεργοποίηση ορθογραφικού ελέγχου", -- cgit v1.2.3-70-g09d2 From 6e9d71b71553597a186827f83d2b520fbbd31451 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Fri, 31 Jan 2020 23:22:50 +0700 Subject: New translations en-US.json (Vietnamese) --- src/i18n/locales/vi.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/locales/vi.json b/src/i18n/locales/vi.json index 8b3fcea8c..8d7bfcff7 100644 --- a/src/i18n/locales/vi.json +++ b/src/i18n/locales/vi.json @@ -257,11 +257,11 @@ "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.", "settings.app.currentVersion": "Current version:", "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", "settings.app.form.autoLaunchInBackground": "Open in background", "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start", "settings.app.form.beta": "Include beta versions", - "settings.app.form.darkMode": "Join the Dark Side", + "settings.app.form.darkMode": "Enable dark mode", "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration", "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Enable spell checking", -- cgit v1.2.3-70-g09d2 From b6626158d84858e63a0dc3f853ed4b0fc1f943ee Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sat, 1 Feb 2020 01:37:22 +0700 Subject: New translations en-US.json (Spanish) --- src/i18n/locales/es.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json index 6ab593c85..64dcaeece 100644 --- a/src/i18n/locales/es.json +++ b/src/i18n/locales/es.json @@ -284,6 +284,7 @@ "settings.app.form.showDisabledServices": "Mostrar pestañas de servicios desactivados", "settings.app.form.showMessagesBadgesWhenMuted": "Mostrar la insignia de mensajes sin leer cuando las notificaciones están desactivadas", "settings.app.form.showServiceNavigationBar": "Mostrar siempre barra de navegación", + "settings.app.form.startMinimized": "Start minimized in tray", "settings.app.form.todoServer": "Servidor de tareas", "settings.app.form.universalDarkMode": "Activar modo oscuro universal", "settings.app.headline": "Configuración", -- cgit v1.2.3-70-g09d2 From 5a45142937ebb9edf777258248295953196d82e0 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sat, 1 Feb 2020 01:37:24 +0700 Subject: New translations en-US.json (Portuguese, Brazilian) --- src/i18n/locales/pt.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/pt.json b/src/i18n/locales/pt.json index 385231c91..5781e0503 100644 --- a/src/i18n/locales/pt.json +++ b/src/i18n/locales/pt.json @@ -284,6 +284,7 @@ "settings.app.form.showDisabledServices": "Apresentar separadores de serviços desativados", "settings.app.form.showMessagesBadgesWhenMuted": "Apresentar emblema com o número de mensagens não lidas quando as notificações estão desativadas", "settings.app.form.showServiceNavigationBar": "Always show service navigation bar", + "settings.app.form.startMinimized": "Start minimized in tray", "settings.app.form.todoServer": "Todo Server", "settings.app.form.universalDarkMode": "Enable universal Dark Mode", "settings.app.headline": "Definições", -- cgit v1.2.3-70-g09d2 From 0944637b62eb18e347177542610324c18d260217 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sat, 1 Feb 2020 01:37:26 +0700 Subject: New translations en-US.json (Italian) --- src/i18n/locales/it.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/it.json b/src/i18n/locales/it.json index d45830382..c35de3bf1 100644 --- a/src/i18n/locales/it.json +++ b/src/i18n/locales/it.json @@ -284,6 +284,7 @@ "settings.app.form.showDisabledServices": "Mostra schede servizi disattivati", "settings.app.form.showMessagesBadgesWhenMuted": "Mostra l'etichetta dei messaggi non letti quando le notifiche sono disattivate", "settings.app.form.showServiceNavigationBar": "Always show service navigation bar", + "settings.app.form.startMinimized": "Start minimized in tray", "settings.app.form.todoServer": "Todo Server", "settings.app.form.universalDarkMode": "Enable universal Dark Mode", "settings.app.headline": "Impostazioni", -- cgit v1.2.3-70-g09d2 From 55439f29cf6e2d2e3a48e22df0ce4910a8b8d529 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sat, 1 Feb 2020 01:37:28 +0700 Subject: New translations en-US.json (Japanese) --- src/i18n/locales/ja.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/ja.json b/src/i18n/locales/ja.json index b7432535e..cb24c9116 100644 --- a/src/i18n/locales/ja.json +++ b/src/i18n/locales/ja.json @@ -284,6 +284,7 @@ "settings.app.form.showDisabledServices": "無効化されたサービスのタブを表示する", "settings.app.form.showMessagesBadgesWhenMuted": "通知の無効時に未読メッセージ件数を表示する", "settings.app.form.showServiceNavigationBar": "Always show service navigation bar", + "settings.app.form.startMinimized": "Start minimized in tray", "settings.app.form.todoServer": "Todo Server", "settings.app.form.universalDarkMode": "Enable universal Dark Mode", "settings.app.headline": "設定", -- cgit v1.2.3-70-g09d2 From e601d530c3cded848aa843d9e11d27c8e8911d10 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sat, 1 Feb 2020 01:37:29 +0700 Subject: New translations en-US.json (Korean) --- src/i18n/locales/ko.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/ko.json b/src/i18n/locales/ko.json index 8d7bfcff7..23a14392c 100644 --- a/src/i18n/locales/ko.json +++ b/src/i18n/locales/ko.json @@ -284,6 +284,7 @@ "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.startMinimized": "Start minimized in tray", "settings.app.form.todoServer": "Todo Server", "settings.app.form.universalDarkMode": "Enable universal Dark Mode", "settings.app.headline": "Settings", -- cgit v1.2.3-70-g09d2 From d72725b1959b425416b7ac9d3f25b09cc418de58 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sat, 1 Feb 2020 01:37:32 +0700 Subject: New translations en-US.json (Norwegian) --- src/i18n/locales/no.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/no.json b/src/i18n/locales/no.json index 8d7bfcff7..23a14392c 100644 --- a/src/i18n/locales/no.json +++ b/src/i18n/locales/no.json @@ -284,6 +284,7 @@ "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.startMinimized": "Start minimized in tray", "settings.app.form.todoServer": "Todo Server", "settings.app.form.universalDarkMode": "Enable universal Dark Mode", "settings.app.headline": "Settings", -- cgit v1.2.3-70-g09d2 From 1ac13b2c86f5901603e53fb6b602b93f9ef2f5cd Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sat, 1 Feb 2020 01:37:35 +0700 Subject: New translations en-US.json (Polish) --- src/i18n/locales/pl.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/pl.json b/src/i18n/locales/pl.json index 974ad4655..d916adf9f 100644 --- a/src/i18n/locales/pl.json +++ b/src/i18n/locales/pl.json @@ -284,6 +284,7 @@ "settings.app.form.showDisabledServices": "Wyłącz wyświetlanie zakładek z usługami", "settings.app.form.showMessagesBadgesWhenMuted": "Pokaż licznik nieprzeczytanych wiadomości gdy powiadomienia są wyłączone", "settings.app.form.showServiceNavigationBar": "Always show service navigation bar", + "settings.app.form.startMinimized": "Start minimized in tray", "settings.app.form.todoServer": "Todo Server", "settings.app.form.universalDarkMode": "Enable universal Dark Mode", "settings.app.headline": "Ustawienia", -- cgit v1.2.3-70-g09d2 From 1105369d67068e24aae02c1599af328e3d5886a1 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sat, 1 Feb 2020 01:37:37 +0700 Subject: New translations en-US.json (Portuguese) --- src/i18n/locales/pt-BR.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/pt-BR.json b/src/i18n/locales/pt-BR.json index 878a7dd3b..1be907669 100644 --- a/src/i18n/locales/pt-BR.json +++ b/src/i18n/locales/pt-BR.json @@ -284,6 +284,7 @@ "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": "Sempre mostrar a barra de navegação do serviço", + "settings.app.form.startMinimized": "Start minimized in tray", "settings.app.form.todoServer": "Tarefa do Servidor", "settings.app.form.universalDarkMode": "Enable universal Dark Mode", "settings.app.headline": "Configurações", -- cgit v1.2.3-70-g09d2 From 17cd6f7f8047319ef0a2ef9e48bbc3ef7c4bcc16 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sat, 1 Feb 2020 01:37:40 +0700 Subject: New translations en-US.json (Romanian) --- src/i18n/locales/ro.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/ro.json b/src/i18n/locales/ro.json index 8d7bfcff7..23a14392c 100644 --- a/src/i18n/locales/ro.json +++ b/src/i18n/locales/ro.json @@ -284,6 +284,7 @@ "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.startMinimized": "Start minimized in tray", "settings.app.form.todoServer": "Todo Server", "settings.app.form.universalDarkMode": "Enable universal Dark Mode", "settings.app.headline": "Settings", -- cgit v1.2.3-70-g09d2 From 204fbd091ee9ea70db75a7d2784e8bc704e0ceab Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sat, 1 Feb 2020 01:37:41 +0700 Subject: New translations en-US.json (Indonesian) --- src/i18n/locales/id.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/id.json b/src/i18n/locales/id.json index 236f201d9..30cff1166 100644 --- a/src/i18n/locales/id.json +++ b/src/i18n/locales/id.json @@ -284,6 +284,7 @@ "settings.app.form.showDisabledServices": "Tampilkan tab layanan yang dinonaktifkan", "settings.app.form.showMessagesBadgesWhenMuted": "Tampilkan lencana pesan belum dibaca saat pemberitahuan dinonaktifkan", "settings.app.form.showServiceNavigationBar": "Always show service navigation bar", + "settings.app.form.startMinimized": "Start minimized in tray", "settings.app.form.todoServer": "Todo Server", "settings.app.form.universalDarkMode": "Enable universal Dark Mode", "settings.app.headline": "Pengaturan", -- cgit v1.2.3-70-g09d2 From 20fada77d45d8ad797ab63b41becae3eb343691b Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sat, 1 Feb 2020 01:37:44 +0700 Subject: New translations en-US.json (Russian) --- src/i18n/locales/ru.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/ru.json b/src/i18n/locales/ru.json index 01bf09e52..4a8f16f53 100644 --- a/src/i18n/locales/ru.json +++ b/src/i18n/locales/ru.json @@ -284,6 +284,7 @@ "settings.app.form.showDisabledServices": "Показывать вкладки отключённых служб", "settings.app.form.showMessagesBadgesWhenMuted": "Показывать значок непрочитанного сообщения при отключённых уведомлениях", "settings.app.form.showServiceNavigationBar": "Always show service navigation bar", + "settings.app.form.startMinimized": "Start minimized in tray", "settings.app.form.todoServer": "Todo Server", "settings.app.form.universalDarkMode": "Enable universal Dark Mode", "settings.app.headline": "Настройки", -- cgit v1.2.3-70-g09d2 From 25693c5e42113a33905ea83e07c6abe70302bf18 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sat, 1 Feb 2020 01:37:46 +0700 Subject: New translations en-US.json (Serbian (Cyrillic)) --- src/i18n/locales/sr.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/sr.json b/src/i18n/locales/sr.json index 9623e5c48..a1f5b8fb8 100644 --- a/src/i18n/locales/sr.json +++ b/src/i18n/locales/sr.json @@ -284,6 +284,7 @@ "settings.app.form.showDisabledServices": "Prikaži ploče s onemogućenim servisima", "settings.app.form.showMessagesBadgesWhenMuted": "Покажи беџ за непрочитане поруке када су обавештења онемогућена", "settings.app.form.showServiceNavigationBar": "Always show service navigation bar", + "settings.app.form.startMinimized": "Start minimized in tray", "settings.app.form.todoServer": "Todo Server", "settings.app.form.universalDarkMode": "Enable universal Dark Mode", "settings.app.headline": "Postavke", -- cgit v1.2.3-70-g09d2 From 42d0d875b7f39d1013cbf214821b290c45782e51 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sat, 1 Feb 2020 01:37:49 +0700 Subject: New translations en-US.json (Slovak) --- src/i18n/locales/sk.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/sk.json b/src/i18n/locales/sk.json index e3db0c6c7..35efa174a 100644 --- a/src/i18n/locales/sk.json +++ b/src/i18n/locales/sk.json @@ -284,6 +284,7 @@ "settings.app.form.showDisabledServices": "Zobraziť záložky vypnutých služieb", "settings.app.form.showMessagesBadgesWhenMuted": "Zobraziť symbol pre neprečítané správy, keď sú vypnuté upozornenia", "settings.app.form.showServiceNavigationBar": "Always show service navigation bar", + "settings.app.form.startMinimized": "Start minimized in tray", "settings.app.form.todoServer": "Todo Server", "settings.app.form.universalDarkMode": "Enable universal Dark Mode", "settings.app.headline": "Nastavenia", -- cgit v1.2.3-70-g09d2 From 61f62c5c6d0e6610b4729a007b9a4229c2667101 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sat, 1 Feb 2020 01:37:50 +0700 Subject: New translations en-US.json (Slovenian) --- src/i18n/locales/sl.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/sl.json b/src/i18n/locales/sl.json index 8d7bfcff7..23a14392c 100644 --- a/src/i18n/locales/sl.json +++ b/src/i18n/locales/sl.json @@ -284,6 +284,7 @@ "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.startMinimized": "Start minimized in tray", "settings.app.form.todoServer": "Todo Server", "settings.app.form.universalDarkMode": "Enable universal Dark Mode", "settings.app.headline": "Settings", -- cgit v1.2.3-70-g09d2 From b445d35b1cd8fe2b9ee0de301feea85a8221269c Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sat, 1 Feb 2020 01:37:52 +0700 Subject: New translations en-US.json (Swedish) --- src/i18n/locales/sv.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/sv.json b/src/i18n/locales/sv.json index 8d7bfcff7..23a14392c 100644 --- a/src/i18n/locales/sv.json +++ b/src/i18n/locales/sv.json @@ -284,6 +284,7 @@ "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.startMinimized": "Start minimized in tray", "settings.app.form.todoServer": "Todo Server", "settings.app.form.universalDarkMode": "Enable universal Dark Mode", "settings.app.headline": "Settings", -- cgit v1.2.3-70-g09d2 From 5fc9e8b3dff9594111d0673e539147614622dafc Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sat, 1 Feb 2020 01:37:54 +0700 Subject: New translations en-US.json (Turkish) --- src/i18n/locales/tr.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/tr.json b/src/i18n/locales/tr.json index 512a8838c..67fbc9048 100644 --- a/src/i18n/locales/tr.json +++ b/src/i18n/locales/tr.json @@ -284,6 +284,7 @@ "settings.app.form.showDisabledServices": "Devre dışı bırakılan servis sekmelerini göster", "settings.app.form.showMessagesBadgesWhenMuted": "Bildirimler kapalı iken okunmamış mesaj sayısını göster", "settings.app.form.showServiceNavigationBar": "Always show service navigation bar", + "settings.app.form.startMinimized": "Start minimized in tray", "settings.app.form.todoServer": "Todo Server", "settings.app.form.universalDarkMode": "Enable universal Dark Mode", "settings.app.headline": "Ayarlar", -- cgit v1.2.3-70-g09d2 From 5551698d93f0308a56a0047f7d32e39e8716566c Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sat, 1 Feb 2020 01:37:57 +0700 Subject: New translations en-US.json (Ukrainian) --- src/i18n/locales/uk.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/uk.json b/src/i18n/locales/uk.json index 6ae94de3a..4e15d2569 100644 --- a/src/i18n/locales/uk.json +++ b/src/i18n/locales/uk.json @@ -284,6 +284,7 @@ "settings.app.form.showDisabledServices": "Показати вкладку вимкнених сервісів", "settings.app.form.showMessagesBadgesWhenMuted": "Показувати значок непрочитаних повідомлень коли сповіщення вимкнені", "settings.app.form.showServiceNavigationBar": "Always show service navigation bar", + "settings.app.form.startMinimized": "Start minimized in tray", "settings.app.form.todoServer": "Todo Server", "settings.app.form.universalDarkMode": "Enable universal Dark Mode", "settings.app.headline": "Налаштування", -- cgit v1.2.3-70-g09d2 From 042385fe230b4dff15d482045371c143c766b57c Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sat, 1 Feb 2020 01:37:59 +0700 Subject: New translations en-US.json (Irish) --- src/i18n/locales/ga.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/ga.json b/src/i18n/locales/ga.json index cfd31e48f..513869963 100644 --- a/src/i18n/locales/ga.json +++ b/src/i18n/locales/ga.json @@ -284,6 +284,7 @@ "settings.app.form.showDisabledServices": "Taispeáin tabanna do sheirbhísí dhíchumasaithe", "settings.app.form.showMessagesBadgesWhenMuted": "Taispeáin teachtaireachtaí neamhléite, nuair a dhíchumasaítear fógraí", "settings.app.form.showServiceNavigationBar": "Always show service navigation bar", + "settings.app.form.startMinimized": "Start minimized in tray", "settings.app.form.todoServer": "Todo Server", "settings.app.form.universalDarkMode": "Enable universal Dark Mode", "settings.app.headline": "Socruithe", -- cgit v1.2.3-70-g09d2 From a7b2d6ae297cdab921a263986d2268f08d64b335 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sat, 1 Feb 2020 01:38:02 +0700 Subject: New translations en-US.json (Hungarian) --- src/i18n/locales/hu.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/hu.json b/src/i18n/locales/hu.json index 61041a428..676c8b634 100644 --- a/src/i18n/locales/hu.json +++ b/src/i18n/locales/hu.json @@ -284,6 +284,7 @@ "settings.app.form.showDisabledServices": "Letiltott szolgáltatások megjelenítése", "settings.app.form.showMessagesBadgesWhenMuted": "Mutassa az 'olvasatlan üzenet' jelzést, amikor az értesítések le vannak tiltva", "settings.app.form.showServiceNavigationBar": "Always show service navigation bar", + "settings.app.form.startMinimized": "Start minimized in tray", "settings.app.form.todoServer": "Todo Server", "settings.app.form.universalDarkMode": "Enable universal Dark Mode", "settings.app.headline": "Beállítások", -- cgit v1.2.3-70-g09d2 From bde48f09c369780f55be593b37509f6034b57d6e Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sat, 1 Feb 2020 01:38:03 +0700 Subject: New translations en-US.json (Afrikaans) --- src/i18n/locales/af.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/af.json b/src/i18n/locales/af.json index 8d7bfcff7..23a14392c 100644 --- a/src/i18n/locales/af.json +++ b/src/i18n/locales/af.json @@ -284,6 +284,7 @@ "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.startMinimized": "Start minimized in tray", "settings.app.form.todoServer": "Todo Server", "settings.app.form.universalDarkMode": "Enable universal Dark Mode", "settings.app.headline": "Settings", -- cgit v1.2.3-70-g09d2 From 957fabc4e58ff4e321054e4159438330f712ec46 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sat, 1 Feb 2020 01:38:07 +0700 Subject: New translations en-US.json (Czech) --- src/i18n/locales/cs.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/cs.json b/src/i18n/locales/cs.json index a29eefccf..f5899b29a 100644 --- a/src/i18n/locales/cs.json +++ b/src/i18n/locales/cs.json @@ -284,6 +284,7 @@ "settings.app.form.showDisabledServices": "Zobrazit záložky vypnutých služeb", "settings.app.form.showMessagesBadgesWhenMuted": "Zobrazit odznak pro nepřečtené zprávy když jsou upozornění vypnutá", "settings.app.form.showServiceNavigationBar": "Always show service navigation bar", + "settings.app.form.startMinimized": "Start minimized in tray", "settings.app.form.todoServer": "Todo Server", "settings.app.form.universalDarkMode": "Enable universal Dark Mode", "settings.app.headline": "Nastavení", -- cgit v1.2.3-70-g09d2 From 74c67c683eaf9e7a82b5102ac40de276418d4ff2 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sat, 1 Feb 2020 01:38:10 +0700 Subject: New translations en-US.json (Arabic) --- src/i18n/locales/ar.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/ar.json b/src/i18n/locales/ar.json index be64581aa..c151f7ac2 100644 --- a/src/i18n/locales/ar.json +++ b/src/i18n/locales/ar.json @@ -284,6 +284,7 @@ "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.startMinimized": "Start minimized in tray", "settings.app.form.todoServer": "Todo Server", "settings.app.form.universalDarkMode": "Enable universal Dark Mode", "settings.app.headline": "Settings", -- cgit v1.2.3-70-g09d2 From 67aa214de94cd1f27d599dc8970a1c963b258cae Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sat, 1 Feb 2020 01:38:12 +0700 Subject: New translations en-US.json (Bosnian) --- src/i18n/locales/bs.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/bs.json b/src/i18n/locales/bs.json index 8d7bfcff7..23a14392c 100644 --- a/src/i18n/locales/bs.json +++ b/src/i18n/locales/bs.json @@ -284,6 +284,7 @@ "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.startMinimized": "Start minimized in tray", "settings.app.form.todoServer": "Todo Server", "settings.app.form.universalDarkMode": "Enable universal Dark Mode", "settings.app.headline": "Settings", -- cgit v1.2.3-70-g09d2 From 37fc574b7d2b68ffa57482bfa6c3878dbf4b940d Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sat, 1 Feb 2020 01:38:15 +0700 Subject: New translations en-US.json (Catalan) --- src/i18n/locales/ca.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/ca.json b/src/i18n/locales/ca.json index 41eff1e38..f8868af1a 100644 --- a/src/i18n/locales/ca.json +++ b/src/i18n/locales/ca.json @@ -284,6 +284,7 @@ "settings.app.form.showDisabledServices": "Mostra les pestanyes dels serveis desactivats", "settings.app.form.showMessagesBadgesWhenMuted": "Mostra la insígnia de missatges no llegits quan les notificacions estiguin desactivades", "settings.app.form.showServiceNavigationBar": "Always show service navigation bar", + "settings.app.form.startMinimized": "Start minimized in tray", "settings.app.form.todoServer": "Todo Server", "settings.app.form.universalDarkMode": "Enable universal Dark Mode", "settings.app.headline": "Configuració", -- cgit v1.2.3-70-g09d2 From dd71370d625b8a980ded20211ab8cfb17b474096 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sat, 1 Feb 2020 01:38:17 +0700 Subject: New translations en-US.json (Chinese Simplified) --- src/i18n/locales/zh.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/zh.json b/src/i18n/locales/zh.json index 8d7bfcff7..23a14392c 100644 --- a/src/i18n/locales/zh.json +++ b/src/i18n/locales/zh.json @@ -284,6 +284,7 @@ "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.startMinimized": "Start minimized in tray", "settings.app.form.todoServer": "Todo Server", "settings.app.form.universalDarkMode": "Enable universal Dark Mode", "settings.app.headline": "Settings", -- cgit v1.2.3-70-g09d2 From d3e58d4ee6e510a21d176ca2dd63a7b51f65bb9e Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sat, 1 Feb 2020 01:38:20 +0700 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 5f9b6d3e5..c25c23d6e 100644 --- a/src/i18n/locales/zh-HANT.json +++ b/src/i18n/locales/zh-HANT.json @@ -284,6 +284,7 @@ "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.startMinimized": "Start minimized in tray", "settings.app.form.todoServer": "Todo Server", "settings.app.form.universalDarkMode": "Enable universal Dark Mode", "settings.app.headline": "Settings", -- cgit v1.2.3-70-g09d2 From 3b50c9e267ebaa656e8d453826e8cd60c2ae98c9 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sat, 1 Feb 2020 01:38:21 +0700 Subject: New translations en-US.json (Croatian) --- src/i18n/locales/hr.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/hr.json b/src/i18n/locales/hr.json index 61d53f8b1..1141da23a 100644 --- a/src/i18n/locales/hr.json +++ b/src/i18n/locales/hr.json @@ -284,6 +284,7 @@ "settings.app.form.showDisabledServices": "Prikaži ploče s onemogućenim servisima", "settings.app.form.showMessagesBadgesWhenMuted": "Pokaži nepročitane značke poruka kad se obavještenja onemoguće", "settings.app.form.showServiceNavigationBar": "Always show service navigation bar", + "settings.app.form.startMinimized": "Start minimized in tray", "settings.app.form.todoServer": "Todo Server", "settings.app.form.universalDarkMode": "Enable universal Dark Mode", "settings.app.headline": "Postavke", -- cgit v1.2.3-70-g09d2 From 055983d83b2270a6c5fcdcbd5d7382002cf5c186 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sat, 1 Feb 2020 01:38:24 +0700 Subject: New translations en-US.json (Danish) --- src/i18n/locales/da.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/da.json b/src/i18n/locales/da.json index 8d7bfcff7..23a14392c 100644 --- a/src/i18n/locales/da.json +++ b/src/i18n/locales/da.json @@ -284,6 +284,7 @@ "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.startMinimized": "Start minimized in tray", "settings.app.form.todoServer": "Todo Server", "settings.app.form.universalDarkMode": "Enable universal Dark Mode", "settings.app.headline": "Settings", -- cgit v1.2.3-70-g09d2 From 1970345847b59997a8581296850b4454ab5290ec Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sat, 1 Feb 2020 01:38:26 +0700 Subject: New translations en-US.json (Hebrew) --- src/i18n/locales/he.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/he.json b/src/i18n/locales/he.json index 8d7bfcff7..23a14392c 100644 --- a/src/i18n/locales/he.json +++ b/src/i18n/locales/he.json @@ -284,6 +284,7 @@ "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.startMinimized": "Start minimized in tray", "settings.app.form.todoServer": "Todo Server", "settings.app.form.universalDarkMode": "Enable universal Dark Mode", "settings.app.headline": "Settings", -- cgit v1.2.3-70-g09d2 From 4ec493af844a940953136466aec18052159568ee Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sat, 1 Feb 2020 01:38:27 +0700 Subject: New translations en-US.json (Dutch) --- src/i18n/locales/nl.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/nl.json b/src/i18n/locales/nl.json index 4fbfc74f5..f5334c421 100644 --- a/src/i18n/locales/nl.json +++ b/src/i18n/locales/nl.json @@ -284,6 +284,7 @@ "settings.app.form.showDisabledServices": "Toon uitgeschakelde services", "settings.app.form.showMessagesBadgesWhenMuted": "Toon badge met ongelezen berichten wanneer meldingen zijn uitgeschakeld", "settings.app.form.showServiceNavigationBar": "Always show service navigation bar", + "settings.app.form.startMinimized": "Start minimized in tray", "settings.app.form.todoServer": "Todo Server", "settings.app.form.universalDarkMode": "Enable universal Dark Mode", "settings.app.headline": "Instellingen", -- cgit v1.2.3-70-g09d2 From 0be32e8c8a326daac4578279fe06a11e319c7b70 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sat, 1 Feb 2020 01:38:30 +0700 Subject: New translations en-US.json (Finnish) --- src/i18n/locales/fi.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/fi.json b/src/i18n/locales/fi.json index 8d7bfcff7..23a14392c 100644 --- a/src/i18n/locales/fi.json +++ b/src/i18n/locales/fi.json @@ -284,6 +284,7 @@ "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.startMinimized": "Start minimized in tray", "settings.app.form.todoServer": "Todo Server", "settings.app.form.universalDarkMode": "Enable universal Dark Mode", "settings.app.headline": "Settings", -- cgit v1.2.3-70-g09d2 From 8b982e41c4cbab35db0e9414c6059383a313f187 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sat, 1 Feb 2020 01:38:32 +0700 Subject: New translations en-US.json (Flemish) --- src/i18n/locales/nl-BE.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/nl-BE.json b/src/i18n/locales/nl-BE.json index ecaf0c92f..0f80c3af8 100644 --- a/src/i18n/locales/nl-BE.json +++ b/src/i18n/locales/nl-BE.json @@ -284,6 +284,7 @@ "settings.app.form.showDisabledServices": "Toon uitgeschakelde services", "settings.app.form.showMessagesBadgesWhenMuted": "Toon badge met ongelezen berichten wanneer meldingen zijn uitgeschakeld", "settings.app.form.showServiceNavigationBar": "Always show service navigation bar", + "settings.app.form.startMinimized": "Start minimized in tray", "settings.app.form.todoServer": "Todo Server", "settings.app.form.universalDarkMode": "Enable universal Dark Mode", "settings.app.headline": "Instellingen", -- cgit v1.2.3-70-g09d2 From be83201f5c2fd9d2c9b5538e0cd18e3a1c730bc6 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sat, 1 Feb 2020 01:38:34 +0700 Subject: New translations en-US.json (French) --- src/i18n/locales/fr.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json index 2611c4737..30a361454 100644 --- a/src/i18n/locales/fr.json +++ b/src/i18n/locales/fr.json @@ -284,6 +284,7 @@ "settings.app.form.showDisabledServices": "Afficher les onglets des services désactivés", "settings.app.form.showMessagesBadgesWhenMuted": "Afficher les badges de messages non lus quand les notifications sont désactivées", "settings.app.form.showServiceNavigationBar": "Toujours afficher la barre de navigation du service", + "settings.app.form.startMinimized": "Start minimized in tray", "settings.app.form.todoServer": "Serveur Todo", "settings.app.form.universalDarkMode": "Activer le mode sombre universel", "settings.app.headline": "Paramètres", -- cgit v1.2.3-70-g09d2 From f90a46abe6d5be923021dec3f4c8545561d385fe Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sat, 1 Feb 2020 01:38:36 +0700 Subject: New translations en-US.json (Georgian) --- src/i18n/locales/ka.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/ka.json b/src/i18n/locales/ka.json index 2e723a419..0f8d1a969 100644 --- a/src/i18n/locales/ka.json +++ b/src/i18n/locales/ka.json @@ -284,6 +284,7 @@ "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.startMinimized": "Start minimized in tray", "settings.app.form.todoServer": "Todo Server", "settings.app.form.universalDarkMode": "Enable universal Dark Mode", "settings.app.headline": "პარამეტრები", -- cgit v1.2.3-70-g09d2 From eac6f422aa804453f1ae6645efedef65ce1c3886 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sat, 1 Feb 2020 01:38:38 +0700 Subject: New translations en-US.json (German) --- src/i18n/locales/de.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json index 0c33dc79c..7b302cd9f 100644 --- a/src/i18n/locales/de.json +++ b/src/i18n/locales/de.json @@ -284,6 +284,7 @@ "settings.app.form.showDisabledServices": "Deaktivierte Services-Tabs anzeigen", "settings.app.form.showMessagesBadgesWhenMuted": "Ungelesene Nachrichten zeigen, wenn die Benachrichtigungen deaktiviert sind", "settings.app.form.showServiceNavigationBar": "Navigationsleiste immer anzeigen", + "settings.app.form.startMinimized": "Start minimized in tray", "settings.app.form.todoServer": "Todo-Server", "settings.app.form.universalDarkMode": "Universellen Dark Mode aktivieren", "settings.app.headline": "Einstellungen", -- cgit v1.2.3-70-g09d2 From bef62fb2fd50983c3b6d1e9d2b5364d868e182b7 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sat, 1 Feb 2020 01:38:41 +0700 Subject: New translations en-US.json (Greek) --- src/i18n/locales/el.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/el.json b/src/i18n/locales/el.json index 2948bbb79..ea9bd6efa 100644 --- a/src/i18n/locales/el.json +++ b/src/i18n/locales/el.json @@ -284,6 +284,7 @@ "settings.app.form.showDisabledServices": "Προβολή καρτελών των απενεργοποιημένων υπηρεσιών", "settings.app.form.showMessagesBadgesWhenMuted": "Προβολή του εικονιδίου μη αναγνωσμένου μηνύματος όταν οι ειδοποιήσεις είναι απενεργοποιημένες", "settings.app.form.showServiceNavigationBar": "Always show service navigation bar", + "settings.app.form.startMinimized": "Start minimized in tray", "settings.app.form.todoServer": "Todo Server", "settings.app.form.universalDarkMode": "Enable universal Dark Mode", "settings.app.headline": "Ρυθμίσεις", -- cgit v1.2.3-70-g09d2 From c4001f15ec6df546dc5f81283a42b71988563261 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sat, 1 Feb 2020 01:38:44 +0700 Subject: New translations en-US.json (Vietnamese) --- src/i18n/locales/vi.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/locales/vi.json b/src/i18n/locales/vi.json index 8d7bfcff7..23a14392c 100644 --- a/src/i18n/locales/vi.json +++ b/src/i18n/locales/vi.json @@ -284,6 +284,7 @@ "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.startMinimized": "Start minimized in tray", "settings.app.form.todoServer": "Todo Server", "settings.app.form.universalDarkMode": "Enable universal Dark Mode", "settings.app.headline": "Settings", -- cgit v1.2.3-70-g09d2 From c2a8dce24722528928d8e107bdf5f123138a1bf2 Mon Sep 17 00:00:00 2001 From: vantezzen Date: Fri, 31 Jan 2020 20:32:24 +0100 Subject: Change Sentry reporting to be opt-in only --- recipes | 2 +- .../settings/settings/EditSettingsForm.js | 6 + src/config.js | 1 + src/containers/settings/EditSettingsScreen.js | 10 + src/i18n/locales/defaultMessages.json | 230 ++++++++++++--------- src/i18n/locales/en-US.json | 2 + .../settings/settings/EditSettingsForm.json | 125 ++++++----- .../containers/settings/EditSettingsScreen.json | 105 +++++----- src/index.js | 6 +- 9 files changed, 281 insertions(+), 206 deletions(-) diff --git a/recipes b/recipes index dbc43bfd2..6ff794422 160000 --- a/recipes +++ b/recipes @@ -1 +1 @@ -Subproject commit dbc43bfd258d4d7db25b36895a1bfc202361173b +Subproject commit 6ff794422f296f5370299e497792ee91eccb8dc6 diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index efb6eaa18..58ffd277e 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js @@ -32,6 +32,10 @@ const messages = defineMessages({ id: 'settings.app.headlineGeneral', defaultMessage: '!!!General', }, + sentryInfo: { + id: 'settings.app.sentryInfo', + defaultMessage: '!!!Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.', + }, hibernateInfo: { id: 'settings.app.hibernateInfo', defaultMessage: '!!!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.', @@ -250,6 +254,8 @@ export default @observer class EditSettingsForm extends Component { {isTrayEnabled && } + +

    {intl.formatMessage(messages.sentryInfo)}

    diff --git a/src/config.js b/src/config.js index 8868d7c41..b4705105d 100644 --- a/src/config.js +++ b/src/config.js @@ -81,6 +81,7 @@ export const DEFAULT_APP_SETTINGS = { adaptableDarkMode: true, accentColor: '#7367f0', serviceRibbonWidth: 68, + sentry: false, }; export const DEFAULT_FEATURES_CONFIG = { diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js index 665444f50..595cfdcc7 100644 --- a/src/containers/settings/EditSettingsScreen.js +++ b/src/containers/settings/EditSettingsScreen.js @@ -58,6 +58,10 @@ const messages = defineMessages({ id: 'settings.app.form.showServiceNavigationBar', defaultMessage: '!!!Always show service navigation bar', }, + sentry: { + id: 'settings.app.form.sentry', + defaultMessage: '!!!Send telemetry data', + }, hibernate: { id: 'settings.app.form.hibernate', defaultMessage: '!!!Enable service hibernation', @@ -181,6 +185,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e minimizeToSystemTray: settingsData.minimizeToSystemTray, privateNotifications: settingsData.privateNotifications, showServiceNavigationBar: settingsData.showServiceNavigationBar, + sentry: settingsData.sentry, hibernate: settingsData.hibernate, hibernationStrategy: settingsData.hibernationStrategy, server: settingsData.server, @@ -295,6 +300,11 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e value: settings.all.app.showServiceNavigationBar, default: DEFAULT_APP_SETTINGS.showServiceNavigationBar, }, + sentry: { + label: intl.formatMessage(messages.sentry), + value: settings.all.app.sentry, + default: DEFAULT_APP_SETTINGS.sentry, + }, hibernate: { label: intl.formatMessage(messages.hibernate), value: settings.all.app.hibernate, diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json index 083148c3d..59930a054 100644 --- a/src/i18n/locales/defaultMessages.json +++ b/src/i18n/locales/defaultMessages.json @@ -2657,367 +2657,380 @@ } }, { - "defaultMessage": "!!!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.", + "defaultMessage": "!!!Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.", "end": { "column": 3, "line": 38 }, "file": "src/components/settings/settings/EditSettingsForm.js", + "id": "settings.app.sentryInfo", + "start": { + "column": 14, + "line": 35 + } + }, + { + "defaultMessage": "!!!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.", + "end": { + "column": 3, + "line": 42 + }, + "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.hibernateInfo", "start": { "column": 17, - "line": 35 + "line": 39 } }, { "defaultMessage": "!!!Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable", "end": { "column": 3, - "line": 42 + "line": 46 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.inactivityLockInfo", "start": { "column": 22, - "line": 39 + "line": 43 } }, { "defaultMessage": "!!!We advice you to logout after changing your server as your settings might not be saved otherwise.", "end": { "column": 3, - "line": 46 + "line": 50 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.serverInfo", "start": { "column": 14, - "line": 43 + "line": 47 } }, { "defaultMessage": "!!!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.", "end": { "column": 3, - "line": 50 + "line": 54 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.serverMoneyInfo", "start": { "column": 19, - "line": 47 + "line": 51 } }, { "defaultMessage": "!!!This server will be used for the \"Franz Todo\" feature. (default: https://app.franztodos.com)", "end": { "column": 3, - "line": 54 + "line": 58 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.todoServerInfo", "start": { "column": 18, - "line": 51 + "line": 55 } }, { "defaultMessage": "!!!Password", "end": { "column": 3, - "line": 58 + "line": 62 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.lockedPassword", "start": { "column": 18, - "line": 55 + "line": 59 } }, { "defaultMessage": "!!!Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.", "end": { "column": 3, - "line": 62 + "line": 66 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.lockedPasswordInfo", "start": { "column": 22, - "line": 59 + "line": 63 } }, { "defaultMessage": "!!!Password Lock allows you to keep your messages protected.\nUsing 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.", "end": { "column": 3, - "line": 66 + "line": 70 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.lockInfo", "start": { "column": 12, - "line": 63 + "line": 67 } }, { "defaultMessage": "!!!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.", "end": { "column": 3, - "line": 70 + "line": 74 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.scheduledDNDTimeInfo", "start": { "column": 24, - "line": 67 + "line": 71 } }, { "defaultMessage": "!!!Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", "end": { "column": 3, - "line": 74 + "line": 78 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.scheduledDNDInfo", "start": { "column": 20, - "line": 71 + "line": 75 } }, { "defaultMessage": "!!!Language", "end": { "column": 3, - "line": 78 + "line": 82 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.headlineLanguage", "start": { "column": 20, - "line": 75 + "line": 79 } }, { "defaultMessage": "!!!Updates", "end": { "column": 3, - "line": 82 + "line": 86 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.headlineUpdates", "start": { "column": 19, - "line": 79 + "line": 83 } }, { "defaultMessage": "!!!Appearance", "end": { "column": 3, - "line": 86 + "line": 90 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.headlineAppearance", "start": { "column": 22, - "line": 83 + "line": 87 } }, { "defaultMessage": "!!!Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.", "end": { "column": 3, - "line": 90 + "line": 94 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.universalDarkModeInfo", "start": { "column": 25, - "line": 87 + "line": 91 } }, { "defaultMessage": "!!!Write your accent color in a CSS-compatible format. (Default: #7367f0)", "end": { "column": 3, - "line": 94 + "line": 98 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.accentColorInfo", "start": { "column": 19, - "line": 91 + "line": 95 } }, { "defaultMessage": "!!!Advanced", "end": { "column": 3, - "line": 98 + "line": 102 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.headlineAdvanced", "start": { "column": 20, - "line": 95 + "line": 99 } }, { "defaultMessage": "!!!Help us to translate Ferdi into your language.", "end": { "column": 3, - "line": 102 + "line": 106 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.translationHelp", "start": { "column": 19, - "line": 99 + "line": 103 } }, { "defaultMessage": "!!!Cache", "end": { "column": 3, - "line": 106 + "line": 110 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.subheadlineCache", "start": { "column": 20, - "line": 103 + "line": 107 } }, { "defaultMessage": "!!!Ferdi cache is currently using {size} of disk space.", "end": { "column": 3, - "line": 110 + "line": 114 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.cacheInfo", "start": { "column": 13, - "line": 107 + "line": 111 } }, { "defaultMessage": "!!!Clear cache", "end": { "column": 3, - "line": 114 + "line": 118 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.buttonClearAllCache", "start": { "column": 23, - "line": 111 + "line": 115 } }, { "defaultMessage": "!!!Check for updates", "end": { "column": 3, - "line": 118 + "line": 122 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.buttonSearchForUpdate", "start": { "column": 25, - "line": 115 + "line": 119 } }, { "defaultMessage": "!!!Restart & install update", "end": { "column": 3, - "line": 122 + "line": 126 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.buttonInstallUpdate", "start": { "column": 23, - "line": 119 + "line": 123 } }, { "defaultMessage": "!!!Is searching for update", "end": { "column": 3, - "line": 126 + "line": 130 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.updateStatusSearching", "start": { "column": 25, - "line": 123 + "line": 127 } }, { "defaultMessage": "!!!Update available, downloading...", "end": { "column": 3, - "line": 130 + "line": 134 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.updateStatusAvailable", "start": { "column": 25, - "line": 127 + "line": 131 } }, { "defaultMessage": "!!!You are using the latest version of Ferdi", "end": { "column": 3, - "line": 134 + "line": 138 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.updateStatusUpToDate", "start": { "column": 24, - "line": 131 + "line": 135 } }, { "defaultMessage": "!!!Current version:", "end": { "column": 3, - "line": 138 + "line": 142 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.currentVersion", "start": { "column": 18, - "line": 135 + "line": 139 } }, { "defaultMessage": "!!!Changes require restart", "end": { "column": 3, - "line": 142 + "line": 146 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.restartRequired", "start": { "column": 29, - "line": 139 + "line": 143 } }, { "defaultMessage": "!!!Official translations are English & German. All other languages are community based translations.", "end": { "column": 3, - "line": 146 + "line": 150 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.languageDisclaimer", "start": { "column": 22, - "line": 143 + "line": 147 } } ], @@ -4175,302 +4188,315 @@ } }, { - "defaultMessage": "!!!Enable service hibernation", + "defaultMessage": "!!!Send telemetry data", "end": { "column": 3, "line": 64 }, "file": "src/containers/settings/EditSettingsScreen.js", + "id": "settings.app.form.sentry", + "start": { + "column": 10, + "line": 61 + } + }, + { + "defaultMessage": "!!!Enable service hibernation", + "end": { + "column": 3, + "line": 68 + }, + "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.hibernate", "start": { "column": 13, - "line": 61 + "line": 65 } }, { "defaultMessage": "!!!Hibernation strategy", "end": { "column": 3, - "line": 68 + "line": 72 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.hibernationStrategy", "start": { "column": 23, - "line": 65 + "line": 69 } }, { "defaultMessage": "!!!Server", "end": { "column": 3, - "line": 72 + "line": 76 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.server", "start": { "column": 10, - "line": 69 + "line": 73 } }, { "defaultMessage": "!!!Todo Server", "end": { "column": 3, - "line": 76 + "line": 80 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.todoServer", "start": { "column": 14, - "line": 73 + "line": 77 } }, { "defaultMessage": "!!!Enable Password Lock", "end": { "column": 3, - "line": 80 + "line": 84 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.enableLock", "start": { "column": 14, - "line": 77 + "line": 81 } }, { "defaultMessage": "!!!Password", "end": { "column": 3, - "line": 84 + "line": 88 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.lockPassword", "start": { "column": 16, - "line": 81 + "line": 85 } }, { "defaultMessage": "!!!Lock after inactivity", "end": { "column": 3, - "line": 88 + "line": 92 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.inactivityLock", "start": { "column": 18, - "line": 81 + "line": 89 } }, { "defaultMessage": "!!!Enable scheduled Do-not-Disturb", "end": { "column": 3, - "line": 88 + "line": 96 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.scheduledDNDEnabled", "start": { "column": 23, - "line": 85 + "line": 93 } }, { "defaultMessage": "!!!From", "end": { "column": 3, - "line": 92 + "line": 100 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.scheduledDNDStart", "start": { "column": 21, - "line": 89 + "line": 97 } }, { "defaultMessage": "!!!To", "end": { "column": 3, - "line": 96 + "line": 104 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.scheduledDNDEnd", "start": { "column": 19, - "line": 93 + "line": 101 } }, { "defaultMessage": "!!!Language", "end": { "column": 3, - "line": 100 + "line": 108 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.language", "start": { "column": 12, - "line": 97 + "line": 105 } }, { "defaultMessage": "!!!Dark Mode", "end": { "column": 3, - "line": 104 + "line": 112 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.darkMode", "start": { "column": 12, - "line": 101 + "line": 109 } }, { "defaultMessage": "!!!Synchronize dark mode with my Mac's dark mode setting", "end": { "column": 3, - "line": 108 + "line": 116 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.adaptableDarkMode", "start": { "column": 21, - "line": 105 + "line": 113 } }, { "defaultMessage": "!!!Enable universal Dark Mode", "end": { "column": 3, - "line": 112 + "line": 120 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.universalDarkMode", "start": { "column": 21, - "line": 109 + "line": 117 } }, { "defaultMessage": "!!!Accent color", "end": { "column": 3, - "line": 116 + "line": 124 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.accentColor", "start": { "column": 15, - "line": 113 + "line": 121 } }, { "defaultMessage": "!!!Display disabled services tabs", "end": { "column": 3, - "line": 120 + "line": 128 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.showDisabledServices", "start": { "column": 24, - "line": 117 + "line": 125 } }, { "defaultMessage": "!!!Show unread message badge when notifications are disabled", "end": { "column": 3, - "line": 124 + "line": 132 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.showMessagesBadgesWhenMuted", "start": { "column": 29, - "line": 121 + "line": 129 } }, { "defaultMessage": "!!!Enable spell checking", "end": { "column": 3, - "line": 128 + "line": 136 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.enableSpellchecking", "start": { "column": 23, - "line": 125 + "line": 133 } }, { "defaultMessage": "!!!Enable GPU Acceleration", "end": { "column": 3, - "line": 132 + "line": 140 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.enableGPUAcceleration", "start": { "column": 25, - "line": 129 + "line": 137 } }, { "defaultMessage": "!!!Include beta versions", "end": { "column": 3, - "line": 136 + "line": 144 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.beta", "start": { "column": 8, - "line": 133 + "line": 141 } }, { "defaultMessage": "!!!Disable updates", "end": { "column": 3, - "line": 140 + "line": 148 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.noUpdates", "start": { "column": 13, - "line": 137 + "line": 145 } }, { "defaultMessage": "!!!Enable Franz Todos", "end": { "column": 3, - "line": 144 + "line": 152 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.enableTodos", "start": { "column": 15, - "line": 141 + "line": 149 } }, { "defaultMessage": "!!!Keep all workspaces loaded", "end": { "column": 3, - "line": 148 + "line": 156 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.keepAllWorkspacesLoaded", "start": { "column": 27, - "line": 145 + "line": 153 } } ], diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index f077f23bc..1a8e9f743 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json @@ -280,6 +280,7 @@ "settings.app.form.scheduledDNDEnabled": "Enable scheduled Do-not-Disturb", "settings.app.form.scheduledDNDEnd": "To", "settings.app.form.scheduledDNDStart": "From", + "settings.app.form.sentry": "Send telemetry data", "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", @@ -302,6 +303,7 @@ "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.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.", "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", diff --git a/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json b/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json index 9be6f507d..8bdbf9f3a 100644 --- a/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json +++ b/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json @@ -25,16 +25,29 @@ "column": 3 } }, + { + "id": "settings.app.sentryInfo", + "defaultMessage": "!!!Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.", + "file": "src/components/settings/settings/EditSettingsForm.js", + "start": { + "line": 35, + "column": 14 + }, + "end": { + "line": 38, + "column": 3 + } + }, { "id": "settings.app.hibernateInfo", "defaultMessage": "!!!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.", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 35, + "line": 39, "column": 17 }, "end": { - "line": 38, + "line": 42, "column": 3 } }, @@ -43,11 +56,11 @@ "defaultMessage": "!!!Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 39, + "line": 43, "column": 22 }, "end": { - "line": 42, + "line": 46, "column": 3 } }, @@ -56,11 +69,11 @@ "defaultMessage": "!!!We advice you to logout after changing your server as your settings might not be saved otherwise.", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 43, + "line": 47, "column": 14 }, "end": { - "line": 46, + "line": 50, "column": 3 } }, @@ -69,11 +82,11 @@ "defaultMessage": "!!!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.", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 47, + "line": 51, "column": 19 }, "end": { - "line": 50, + "line": 54, "column": 3 } }, @@ -82,11 +95,11 @@ "defaultMessage": "!!!This server will be used for the \"Franz Todo\" feature. (default: https://app.franztodos.com)", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 51, + "line": 55, "column": 18 }, "end": { - "line": 54, + "line": 58, "column": 3 } }, @@ -95,11 +108,11 @@ "defaultMessage": "!!!Password", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 55, + "line": 59, "column": 18 }, "end": { - "line": 58, + "line": 62, "column": 3 } }, @@ -108,11 +121,11 @@ "defaultMessage": "!!!Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 59, + "line": 63, "column": 22 }, "end": { - "line": 62, + "line": 66, "column": 3 } }, @@ -121,11 +134,11 @@ "defaultMessage": "!!!Password Lock allows you to keep your messages protected.\nUsing 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.", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 63, + "line": 67, "column": 12 }, "end": { - "line": 66, + "line": 70, "column": 3 } }, @@ -134,11 +147,11 @@ "defaultMessage": "!!!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.", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 67, + "line": 71, "column": 24 }, "end": { - "line": 70, + "line": 74, "column": 3 } }, @@ -147,11 +160,11 @@ "defaultMessage": "!!!Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 71, + "line": 75, "column": 20 }, "end": { - "line": 74, + "line": 78, "column": 3 } }, @@ -160,11 +173,11 @@ "defaultMessage": "!!!Language", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 75, + "line": 79, "column": 20 }, "end": { - "line": 78, + "line": 82, "column": 3 } }, @@ -173,11 +186,11 @@ "defaultMessage": "!!!Updates", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 79, + "line": 83, "column": 19 }, "end": { - "line": 82, + "line": 86, "column": 3 } }, @@ -186,11 +199,11 @@ "defaultMessage": "!!!Appearance", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 83, + "line": 87, "column": 22 }, "end": { - "line": 86, + "line": 90, "column": 3 } }, @@ -199,11 +212,11 @@ "defaultMessage": "!!!Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 87, + "line": 91, "column": 25 }, "end": { - "line": 90, + "line": 94, "column": 3 } }, @@ -212,11 +225,11 @@ "defaultMessage": "!!!Write your accent color in a CSS-compatible format. (Default: #7367f0)", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 91, + "line": 95, "column": 19 }, "end": { - "line": 94, + "line": 98, "column": 3 } }, @@ -225,11 +238,11 @@ "defaultMessage": "!!!Advanced", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 95, + "line": 99, "column": 20 }, "end": { - "line": 98, + "line": 102, "column": 3 } }, @@ -238,11 +251,11 @@ "defaultMessage": "!!!Help us to translate Ferdi into your language.", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 99, + "line": 103, "column": 19 }, "end": { - "line": 102, + "line": 106, "column": 3 } }, @@ -251,11 +264,11 @@ "defaultMessage": "!!!Cache", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 103, + "line": 107, "column": 20 }, "end": { - "line": 106, + "line": 110, "column": 3 } }, @@ -264,11 +277,11 @@ "defaultMessage": "!!!Ferdi cache is currently using {size} of disk space.", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 107, + "line": 111, "column": 13 }, "end": { - "line": 110, + "line": 114, "column": 3 } }, @@ -277,11 +290,11 @@ "defaultMessage": "!!!Clear cache", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 111, + "line": 115, "column": 23 }, "end": { - "line": 114, + "line": 118, "column": 3 } }, @@ -290,11 +303,11 @@ "defaultMessage": "!!!Check for updates", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 115, + "line": 119, "column": 25 }, "end": { - "line": 118, + "line": 122, "column": 3 } }, @@ -303,11 +316,11 @@ "defaultMessage": "!!!Restart & install update", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 119, + "line": 123, "column": 23 }, "end": { - "line": 122, + "line": 126, "column": 3 } }, @@ -316,11 +329,11 @@ "defaultMessage": "!!!Is searching for update", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 123, + "line": 127, "column": 25 }, "end": { - "line": 126, + "line": 130, "column": 3 } }, @@ -329,11 +342,11 @@ "defaultMessage": "!!!Update available, downloading...", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 127, + "line": 131, "column": 25 }, "end": { - "line": 130, + "line": 134, "column": 3 } }, @@ -342,11 +355,11 @@ "defaultMessage": "!!!You are using the latest version of Ferdi", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 131, + "line": 135, "column": 24 }, "end": { - "line": 134, + "line": 138, "column": 3 } }, @@ -355,11 +368,11 @@ "defaultMessage": "!!!Current version:", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 135, + "line": 139, "column": 18 }, "end": { - "line": 138, + "line": 142, "column": 3 } }, @@ -368,11 +381,11 @@ "defaultMessage": "!!!Changes require restart", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 139, + "line": 143, "column": 29 }, "end": { - "line": 142, + "line": 146, "column": 3 } }, @@ -381,11 +394,11 @@ "defaultMessage": "!!!Official translations are English & German. All other languages are community based translations.", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 143, + "line": 147, "column": 22 }, "end": { - "line": 146, + "line": 150, "column": 3 } } diff --git a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json index 0a0291037..22417f340 100644 --- a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json +++ b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json @@ -103,16 +103,29 @@ "column": 3 } }, + { + "id": "settings.app.form.sentry", + "defaultMessage": "!!!Send telemetry data", + "file": "src/containers/settings/EditSettingsScreen.js", + "start": { + "line": 61, + "column": 10 + }, + "end": { + "line": 64, + "column": 3 + } + }, { "id": "settings.app.form.hibernate", "defaultMessage": "!!!Enable service hibernation", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 61, + "line": 65, "column": 13 }, "end": { - "line": 64, + "line": 68, "column": 3 } }, @@ -121,11 +134,11 @@ "defaultMessage": "!!!Hibernation strategy", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 65, + "line": 69, "column": 23 }, "end": { - "line": 68, + "line": 72, "column": 3 } }, @@ -134,11 +147,11 @@ "defaultMessage": "!!!Server", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 69, + "line": 73, "column": 10 }, "end": { - "line": 72, + "line": 76, "column": 3 } }, @@ -147,11 +160,11 @@ "defaultMessage": "!!!Todo Server", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 73, + "line": 77, "column": 14 }, "end": { - "line": 76, + "line": 80, "column": 3 } }, @@ -160,11 +173,11 @@ "defaultMessage": "!!!Enable Password Lock", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 77, + "line": 81, "column": 14 }, "end": { - "line": 80, + "line": 84, "column": 3 } }, @@ -173,11 +186,11 @@ "defaultMessage": "!!!Password", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 81, + "line": 85, "column": 16 }, "end": { - "line": 84, + "line": 88, "column": 3 } }, @@ -186,11 +199,11 @@ "defaultMessage": "!!!Lock after inactivity", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 81, + "line": 89, "column": 18 }, "end": { - "line": 84, + "line": 92, "column": 3 } }, @@ -199,11 +212,11 @@ "defaultMessage": "!!!Enable scheduled Do-not-Disturb", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 85, + "line": 93, "column": 23 }, "end": { - "line": 88, + "line": 96, "column": 3 } }, @@ -212,11 +225,11 @@ "defaultMessage": "!!!From", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 89, + "line": 97, "column": 21 }, "end": { - "line": 92, + "line": 100, "column": 3 } }, @@ -225,11 +238,11 @@ "defaultMessage": "!!!To", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 93, + "line": 101, "column": 19 }, "end": { - "line": 96, + "line": 104, "column": 3 } }, @@ -238,11 +251,11 @@ "defaultMessage": "!!!Language", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 97, + "line": 105, "column": 12 }, "end": { - "line": 100, + "line": 108, "column": 3 } }, @@ -251,11 +264,11 @@ "defaultMessage": "!!!Dark Mode", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 101, + "line": 109, "column": 12 }, "end": { - "line": 104, + "line": 112, "column": 3 } }, @@ -264,11 +277,11 @@ "defaultMessage": "!!!Synchronize dark mode with my Mac's dark mode setting", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 105, + "line": 113, "column": 21 }, "end": { - "line": 108, + "line": 116, "column": 3 } }, @@ -277,11 +290,11 @@ "defaultMessage": "!!!Enable universal Dark Mode", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 109, + "line": 117, "column": 21 }, "end": { - "line": 112, + "line": 120, "column": 3 } }, @@ -290,11 +303,11 @@ "defaultMessage": "!!!Accent color", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 113, + "line": 121, "column": 15 }, "end": { - "line": 116, + "line": 124, "column": 3 } }, @@ -303,11 +316,11 @@ "defaultMessage": "!!!Display disabled services tabs", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 117, + "line": 125, "column": 24 }, "end": { - "line": 120, + "line": 128, "column": 3 } }, @@ -316,11 +329,11 @@ "defaultMessage": "!!!Show unread message badge when notifications are disabled", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 121, + "line": 129, "column": 29 }, "end": { - "line": 124, + "line": 132, "column": 3 } }, @@ -329,11 +342,11 @@ "defaultMessage": "!!!Enable spell checking", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 125, + "line": 133, "column": 23 }, "end": { - "line": 128, + "line": 136, "column": 3 } }, @@ -342,11 +355,11 @@ "defaultMessage": "!!!Enable GPU Acceleration", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 129, + "line": 137, "column": 25 }, "end": { - "line": 132, + "line": 140, "column": 3 } }, @@ -355,11 +368,11 @@ "defaultMessage": "!!!Include beta versions", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 133, + "line": 141, "column": 8 }, "end": { - "line": 136, + "line": 144, "column": 3 } }, @@ -368,11 +381,11 @@ "defaultMessage": "!!!Disable updates", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 137, + "line": 145, "column": 13 }, "end": { - "line": 140, + "line": 148, "column": 3 } }, @@ -381,11 +394,11 @@ "defaultMessage": "!!!Enable Franz Todos", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 141, + "line": 149, "column": 15 }, "end": { - "line": 144, + "line": 152, "column": 3 } }, @@ -394,11 +407,11 @@ "defaultMessage": "!!!Keep all workspaces loaded", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 145, + "line": 153, "column": 27 }, "end": { - "line": 148, + "line": 156, "column": 3 } } diff --git a/src/index.js b/src/index.js index 7bc0be0ea..46230abd6 100644 --- a/src/index.js +++ b/src/index.js @@ -39,7 +39,6 @@ import handleDeepLink from './electron/deepLinking'; import { isPositionValid } from './electron/windowUtils'; import { appId } from './package.json'; // eslint-disable-line import/no-unresolved import './electron/exception'; -import './sentry'; import { DEFAULT_APP_SETTINGS, @@ -80,6 +79,11 @@ if (isWindows) { const settings = new Settings('app', DEFAULT_APP_SETTINGS); const proxySettings = new Settings('proxy'); +if (settings.get('sentry')) { + // eslint-disable-next-line global-require + require('./sentry'); +} + // add `liftSingleInstanceLock` to settings.json to override the single instance lock const liftSingleInstanceLock = settings.get('liftSingleInstanceLock') || false; -- cgit v1.2.3-70-g09d2 From dcc05d2e9e066ce0a64425b9b2c7772bf2add3aa Mon Sep 17 00:00:00 2001 From: vantezzen Date: Fri, 31 Jan 2020 20:41:35 +0100 Subject: Add more seperators to settings screen --- src/components/settings/settings/EditSettingsForm.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index 58ffd277e..f7868db50 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js @@ -254,6 +254,9 @@ export default @observer class EditSettingsForm extends Component { {isTrayEnabled && } + +
    +

    {intl.formatMessage(messages.sentryInfo)}

    @@ -319,6 +322,9 @@ export default @observer class EditSettingsForm extends Component { />

    )} + +
    + {isWorkspaceEnabled && ( )} @@ -440,6 +446,9 @@ export default @observer class EditSettingsForm extends Component {

    {intl.formatMessage(messages.headlineAppearance)}

    + +
    + {isMac && } {!(isMac && isAdaptableDarkModeEnabled) && } {(isDarkmodeEnabled || isAdaptableDarkModeEnabled) && ( @@ -458,6 +467,8 @@ export default @observer class EditSettingsForm extends Component { )} +
    + this.submit(e)} @@ -468,6 +479,9 @@ export default @observer class EditSettingsForm extends Component { {/* Language */}

    {intl.formatMessage(messages.headlineLanguage)}