From c715fb72573cda4e22414b09ebc226e54865254c Mon Sep 17 00:00:00 2001 From: Vijay A Date: Tue, 24 Aug 2021 10:52:55 +0530 Subject: docs: updated Changelog with cumulative changes for 5.6.1-beta.2 [skip ci] --- CHANGELOG.md | 45 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8719e3387..390b15ed8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,46 @@ +# [v5.6.1-beta.2](https://github.com/getferdi/ferdi/compare/v5.6.1-beta.1...v5.6.1-beta.2) (2021-08-24) + +Please note that this is the same code as the `v5.6.1-nightly.37` tag. +The cumulative changes since the previous beta release are: + +- Upgraded to [electron 13.2.2](https://github.com/electron/electron/releases/tag/v13.2.2) 💖 @vraravam +- Remove checks that refers to paid subscription since Ferdi is always free 💖 @vraravam +- Remove 'shareFranz' feature since its always turned off for Ferdi 💖 @vraravam +- Sorted the recipes according to their service name in the 'Add new Service' screen 💖 @vraravam +- Moved some npm dependencies that were incorrectly classified as runtime deps. This has saved approx 16MB from the installed file (on macos) 💖 @vraravam, @mhatvan +- Add buttons in the 'Advanced' section of preferences to allow users to quickly open the ferdi profile in their file explorer 💖 @vraravam +- [Security] Refactored Url helpers to ensure that theres a single place for vetting and opening external urls as recommended by [this article](https://benjamin-altpeter.de/shell-openexternal-dangers/) (#1789) 💖 @vraravam +- Catch up with minor changes in Franz 5.7.0 +- Add entitlements for screen-capture-permissions 💖 @vraravam + +### Bug Fixes + +- Fixed bug where the service-defaults were not merged when creating a service 💖 @vraravam +- Audio toggle is now decoupled from notification toggle (#1691) 💖 @vraravam +- Incorrect position while adding a new service when there were pre-existing services (#1820) 💖 @vraravam +- Fixed issue with some shortcuts not working on macos (those that either used `alt` or `shift` keys) 💖 @vraravam +- Fix app focus detection 💖 @vraravam +- Fix beta channel release for snap 💖 @mhatvan + +### Internal + +- [Perf] Removed double nested looping while deactivating service (#1824) 💖 @vraravam +- Upgraded `electron-builder` to `22.12.1` which will allow converion from `npm` to `pnpm` 💖 @mhatvan +- Typescript conversion 💖 @vraravam +- Set stricter rules for typescript conversion 💖 @vraravam +- Move build-time js files out of 'src' and into 'scripts' 💖 @vraravam +- Check if default app protocol is different before overriding it (#1818) 💖 @ayxos, @vraravam +- Minor cleanup of 'NaN' logic when loading recipe badges 💖 @vraravam +- Completed plumbing required for conversion from javascript to typescript 💖 @vraravam +- npm upgrades 💖 @vraravam +- Started typescript conversion of some simple scripts 💖 @vraravam +- Added animations step in gulp to transpile scss and copy to build 💖 @mhatvan +- Generated '.gitignore' from gitignore.io 💖 @vraravam +- Setting some config rules for typescript (in preparation for external contributors during hacktoberfest) 💖 @vraravam +- Moved 'gulp'-related packages to 'devDependencies' resulting in slimming down the installation file considerably (8MB on macos) 💖 @vraravam +- Use destructured 'import' 💖 @vraravam +- Replace old '@meetfranz/electron-notification-state' with 'macos-notification-state' 💖 @vraravam + # [v5.6.1-nightly.37](https://github.com/getferdi/ferdi/compare/v5.6.1-nightly.36...v5.6.1-nightly.37) (2021-08-24) - Upgraded to [electron 13.2.2](https://github.com/electron/electron/releases/tag/v13.2.2) 💖 @vraravam @@ -113,7 +156,7 @@ - Use destructured 'import' 💖 @vraravam - Refactor to reuse already defined constants 💖 @vraravam - Use exported default object 💖 @vraravam -- Replace old '@meetfranz/electron-notification-state' with 'mac… … 💖 @vraravam +- Replace old '@meetfranz/electron-notification-state' with 'macos-notification-state' 💖 @vraravam # [v5.6.1-nightly.24](https://github.com/getferdi/ferdi/compare/v5.6.1-nightly.23...v5.6.1-nightly.24) (2021-08-13) -- cgit v1.2.3-70-g09d2 From 400ce485bee4bd4ba429588260bd03d35bf243c3 Mon Sep 17 00:00:00 2001 From: Vijay A Date: Tue, 24 Aug 2021 17:38:20 +0530 Subject: docs: updated CHANGELOG.md [skip ci] --- CHANGELOG.md | 10 ++++++++++ README.md | 4 ++-- recipes | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 390b15ed8..44d750b16 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +# [v5.6.1-nightly.38](https://github.com/getferdi/ferdi/compare/v5.6.1-nightly.37...v5.6.1-nightly.38) (2021-08-25) + +- Added `Google News` service 💖 @niutech + +### Bug Fixes + +### Internal + +- Fixing bug where the service-defaults are not merged when creating a service 💖 @vraravam + # [v5.6.1-beta.2](https://github.com/getferdi/ferdi/compare/v5.6.1-beta.1...v5.6.1-beta.2) (2021-08-24) Please note that this is the same code as the `v5.6.1-nightly.37` tag. diff --git a/README.md b/README.md index f23c0cb30..31276ca8b 100644 --- a/README.md +++ b/README.md @@ -65,7 +65,7 @@ Ferdi is a desktop app that helps you organize how you use your favourite apps b ## Features - [x] Ferdi puts all your web apps into one place -- [x] Native support for 100+ services +- [x] Native support for 180+ services - [x] Workspaces to keep your personal and work life separated - [x] Support for multiple accounts on any service - [x] Dark Mode support for all of your services @@ -77,7 +77,7 @@ Ferdi is a desktop app that helps you organize how you use your favourite apps b ...and best of all: -- [x] Its completely free! There are no restrictions on features, no paywalls +- [x] Its completely free! There are no restrictions on features, no paywalls, no ads ## What does Ferdi look like? diff --git a/recipes b/recipes index 4929cbff0..e5da7c39b 160000 --- a/recipes +++ b/recipes @@ -1 +1 @@ -Subproject commit 4929cbff010712f109f5805027c140f434e77032 +Subproject commit e5da7c39b74a615a09a77ca1dc5d132f107282b0 -- cgit v1.2.3-70-g09d2 From 1cafec32b2116241eb1e097e8b34e4fea0125ad8 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 25 Aug 2021 00:18:58 +0000 Subject: Update submodules, browserslist data updates and linter fixes [skip ci] --- recipes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes b/recipes index e5da7c39b..7ba12a89f 160000 --- a/recipes +++ b/recipes @@ -1 +1 @@ -Subproject commit e5da7c39b74a615a09a77ca1dc5d132f107282b0 +Subproject commit 7ba12a89f7fa1e667f77871c3b377b97304feaf6 -- cgit v1.2.3-70-g09d2 From 6de69d2fd03fb44aa949d6c806f4203f92135467 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 25 Aug 2021 01:19:42 +0000 Subject: 5.6.1-nightly.38 [skip ci] --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 43491797d..f7bf8302e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "ferdi", - "version": "5.6.1-nightly.37", + "version": "5.6.1-nightly.38", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 91e0731ed..4f0cb2bdb 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "productName": "Ferdi", "desktopName": "ferdi.desktop", "appId": "com.kytwb.ferdi", - "version": "5.6.1-nightly.37", + "version": "5.6.1-nightly.38", "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 0a25fe060cbaf690195398f017ca69ee03916702 Mon Sep 17 00:00:00 2001 From: Vijay A Date: Wed, 25 Aug 2021 12:27:52 +0530 Subject: chore: upgraded 'electron-builder' to '22.13.0' --- CHANGELOG.md | 6 ++++ package-lock.json | 86 +++++++++++++++++++++++++++---------------------------- package.json | 2 +- 3 files changed, 50 insertions(+), 44 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 44d750b16..ed14b3cf9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# [v5.6.1-nightly.39](https://github.com/getferdi/ferdi/compare/v5.6.1-nightly.38...v5.6.1-nightly.39) (2021-08-26) + +### Internal + +- Upgraded `electron-builder` to `22.13.0` 💖 @vraravam + # [v5.6.1-nightly.38](https://github.com/getferdi/ferdi/compare/v5.6.1-nightly.37...v5.6.1-nightly.38) (2021-08-25) - Added `Google News` service 💖 @niutech diff --git a/package-lock.json b/package-lock.json index f7bf8302e..cd7882a13 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7914,9 +7914,9 @@ "dev": true }, "app-builder-lib": { - "version": "22.12.1", - "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-22.12.1.tgz", - "integrity": "sha512-lE//wq64cp8zA/oDQKsmgtoJOmjNMebPeUBYai7yGAqwhR7P9ggYDwWCUd2sL+T6f1YJFCQ2GrLwf1qkm7xHMQ==", + "version": "22.13.0", + "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-22.13.0.tgz", + "integrity": "sha512-7W0EuvVx8r0ZNJTtBnnYELPFFBElBIp6bRFn43wN/OCZPJ/T/hDbYo7WoMSAX+oAr9AAprU+v5OeuhD+xR6pdA==", "dev": true, "requires": { "7zip-bin": "~5.1.1", @@ -7925,13 +7925,13 @@ "@malept/flatpak-bundler": "^0.4.0", "async-exit-hook": "^2.0.1", "bluebird-lst": "^1.0.9", - "builder-util": "22.12.1", - "builder-util-runtime": "8.7.10", + "builder-util": "22.13.0", + "builder-util-runtime": "8.8.0", "chromium-pickle-js": "^0.2.0", "debug": "^4.3.2", "ejs": "^3.1.6", "electron-osx-sign": "^0.5.0", - "electron-publish": "22.12.1", + "electron-publish": "22.13.0", "fs-extra": "^10.0.0", "hosted-git-info": "^4.0.2", "is-ci": "^3.0.0", @@ -7946,9 +7946,9 @@ }, "dependencies": { "builder-util-runtime": { - "version": "8.7.10", - "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.7.10.tgz", - "integrity": "sha512-zelTRebsOsj33pF+Jf/qwpvx9W6CeMQshqaRa70Ii6+NQGsspMXqlKDQb+1lvTv9aWARxa3+jy/syzm8jTE8Kw==", + "version": "8.8.0", + "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.8.0.tgz", + "integrity": "sha512-XMxCbIOuqZTalJ8Og0HzD6FpQ+MzmDnjM4yS5pVBGXCan0lMHdN84NThMErf4YBh1UknIVf7IYW2mZJVQfxYOQ==", "dev": true, "requires": { "debug": "^4.3.2", @@ -9297,9 +9297,9 @@ "dev": true }, "builder-util": { - "version": "22.12.1", - "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-22.12.1.tgz", - "integrity": "sha512-w0XF84saZZ8GLXy75tL1UzKEVCRHTIi/0NYV5WDqAUXLQWYWZr1m0TfsMXwD2+3TfzCAcavctzcpprm8Iw3gcQ==", + "version": "22.13.0", + "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-22.13.0.tgz", + "integrity": "sha512-yT2seIwK+pgKslgsMcZWLYuV6I1FAdMiSR4KPvaBPX+ZqkWEMIeHHjVx8TYwNCvTGhZQ59XIwTneuZyJA0PFow==", "dev": true, "requires": { "7zip-bin": "~5.1.1", @@ -9307,7 +9307,7 @@ "@types/fs-extra": "^9.0.11", "app-builder-bin": "3.7.1", "bluebird-lst": "^1.0.9", - "builder-util-runtime": "8.7.10", + "builder-util-runtime": "8.8.0", "chalk": "^4.1.1", "cross-spawn": "^7.0.3", "debug": "^4.3.2", @@ -9329,9 +9329,9 @@ } }, "builder-util-runtime": { - "version": "8.7.10", - "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.7.10.tgz", - "integrity": "sha512-zelTRebsOsj33pF+Jf/qwpvx9W6CeMQshqaRa70Ii6+NQGsspMXqlKDQb+1lvTv9aWARxa3+jy/syzm8jTE8Kw==", + "version": "8.8.0", + "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.8.0.tgz", + "integrity": "sha512-XMxCbIOuqZTalJ8Og0HzD6FpQ+MzmDnjM4yS5pVBGXCan0lMHdN84NThMErf4YBh1UknIVf7IYW2mZJVQfxYOQ==", "dev": true, "requires": { "debug": "^4.3.2", @@ -12089,14 +12089,14 @@ } }, "dmg-builder": { - "version": "22.12.1", - "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-22.12.1.tgz", - "integrity": "sha512-keh9hGtqZ6weOyFg7wd8VYS7U5oYKFzeOEDoEc5ciiaLHfYKqFbJskvCOM2+aA7One92hZMwaIhMNoEug+jsbw==", + "version": "22.13.0", + "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-22.13.0.tgz", + "integrity": "sha512-SqvXs10EsthwoqQEr0ae8fbvTywc0GNScY5XL2Nw1eHLLvjy8qaM4aC5ekOj422rqiBBGSrg1YgyUEmHzX6xqg==", "dev": true, "requires": { - "app-builder-lib": "22.12.1", - "builder-util": "22.12.1", - "builder-util-runtime": "8.7.10", + "app-builder-lib": "22.13.0", + "builder-util": "22.13.0", + "builder-util-runtime": "8.8.0", "dmg-license": "^1.0.9", "fs-extra": "^10.0.0", "iconv-lite": "^0.6.2", @@ -12104,9 +12104,9 @@ }, "dependencies": { "builder-util-runtime": { - "version": "8.7.10", - "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.7.10.tgz", - "integrity": "sha512-zelTRebsOsj33pF+Jf/qwpvx9W6CeMQshqaRa70Ii6+NQGsspMXqlKDQb+1lvTv9aWARxa3+jy/syzm8jTE8Kw==", + "version": "8.8.0", + "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.8.0.tgz", + "integrity": "sha512-XMxCbIOuqZTalJ8Og0HzD6FpQ+MzmDnjM4yS5pVBGXCan0lMHdN84NThMErf4YBh1UknIVf7IYW2mZJVQfxYOQ==", "dev": true, "requires": { "debug": "^4.3.2", @@ -12416,17 +12416,17 @@ } }, "electron-builder": { - "version": "22.12.1", - "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-22.12.1.tgz", - "integrity": "sha512-WttcOgfO5uy9OgKAWE3Yy2oiz39bTNXaKC3dKrwtKq0MaZL8DDvNGRNkFiZutOIF4wAUfwyG7Pm0KbI8Hl44Gw==", + "version": "22.13.0", + "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-22.13.0.tgz", + "integrity": "sha512-OCk7ZIk/nmxWe58F3hD49BW7V4T3l98IvDsLIWBYEmlT/HYAoxI69rv0M+7EXIKwe064ZAN5Z96e7wqMJECwmg==", "dev": true, "requires": { "@types/yargs": "^17.0.1", - "app-builder-lib": "22.12.1", - "builder-util": "22.12.1", - "builder-util-runtime": "8.7.10", + "app-builder-lib": "22.13.0", + "builder-util": "22.13.0", + "builder-util-runtime": "8.8.0", "chalk": "^4.1.1", - "dmg-builder": "22.12.1", + "dmg-builder": "22.13.0", "fs-extra": "^10.0.0", "is-ci": "^3.0.0", "lazy-val": "^1.0.5", @@ -12451,9 +12451,9 @@ } }, "builder-util-runtime": { - "version": "8.7.10", - "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.7.10.tgz", - "integrity": "sha512-zelTRebsOsj33pF+Jf/qwpvx9W6CeMQshqaRa70Ii6+NQGsspMXqlKDQb+1lvTv9aWARxa3+jy/syzm8jTE8Kw==", + "version": "8.8.0", + "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.8.0.tgz", + "integrity": "sha512-XMxCbIOuqZTalJ8Og0HzD6FpQ+MzmDnjM4yS5pVBGXCan0lMHdN84NThMErf4YBh1UknIVf7IYW2mZJVQfxYOQ==", "dev": true, "requires": { "debug": "^4.3.2", @@ -12692,14 +12692,14 @@ } }, "electron-publish": { - "version": "22.12.1", - "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-22.12.1.tgz", - "integrity": "sha512-863+dgShqdmfelCfteR2xkkHch9bPtmIdD1IDLPzL3+43HdEz0oGvRnRJTBKzLrI94D3CNOM4OoPUj3L2JMLqw==", + "version": "22.13.0", + "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-22.13.0.tgz", + "integrity": "sha512-ekBCgbzwKweQxFyvQqxNGZH2va1ZPNeCJRQowt7KV0McR161C+8XRa654DARIpjJ9jE+v+Ne1ImKzND1XCZ2PA==", "dev": true, "requires": { "@types/fs-extra": "^9.0.11", - "builder-util": "22.12.1", - "builder-util-runtime": "8.7.10", + "builder-util": "22.13.0", + "builder-util-runtime": "8.8.0", "chalk": "^4.1.1", "fs-extra": "^10.0.0", "lazy-val": "^1.0.5", @@ -12716,9 +12716,9 @@ } }, "builder-util-runtime": { - "version": "8.7.10", - "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.7.10.tgz", - "integrity": "sha512-zelTRebsOsj33pF+Jf/qwpvx9W6CeMQshqaRa70Ii6+NQGsspMXqlKDQb+1lvTv9aWARxa3+jy/syzm8jTE8Kw==", + "version": "8.8.0", + "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.8.0.tgz", + "integrity": "sha512-XMxCbIOuqZTalJ8Og0HzD6FpQ+MzmDnjM4yS5pVBGXCan0lMHdN84NThMErf4YBh1UknIVf7IYW2mZJVQfxYOQ==", "dev": true, "requires": { "debug": "^4.3.2", diff --git a/package.json b/package.json index 4f0cb2bdb..36bcf54f8 100644 --- a/package.json +++ b/package.json @@ -166,7 +166,7 @@ "cz-conventional-changelog": "3.3.0", "dotenv": "10.0.0", "electron": "13.2.2", - "electron-builder": "22.12.1", + "electron-builder": "22.13.0", "electron-notarize": "1.1.0", "eslint": "7.32.0", "eslint-config-airbnb": "18.2.1", -- cgit v1.2.3-70-g09d2 From 890780b900850d8023be30ed137db0a04932bec3 Mon Sep 17 00:00:00 2001 From: Vijay A Date: Wed, 25 Aug 2021 21:43:55 +0530 Subject: fix: fix reordering of services in vertical style layout fixes #1833 --- CHANGELOG.md | 4 ++++ src/components/layout/Sidebar.js | 1 + src/components/services/tabs/Tabbar.js | 8 ++++++-- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ed14b3cf9..1848b3ee9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # [v5.6.1-nightly.39](https://github.com/getferdi/ferdi/compare/v5.6.1-nightly.38...v5.6.1-nightly.39) (2021-08-26) +### Bug Fixes + +- Fix reordering of services in vertical style layout (#1833) 💖 @vraravam + ### Internal - Upgraded `electron-builder` to `22.13.0` 💖 @vraravam diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js index a9fb73f33..a1a4ab64f 100644 --- a/src/components/layout/Sidebar.js +++ b/src/components/layout/Sidebar.js @@ -134,6 +134,7 @@ export default @inject('stores', 'actions') @observer class Sidebar extends Comp {...this.props} enableToolTip={() => this.enableToolTip()} disableToolTip={() => this.disableToolTip()} + useVerticalStyle={stores.settings.all.app.useVerticalStyle} /> { isLoggedIn ? ( <> diff --git a/src/components/services/tabs/Tabbar.js b/src/components/services/tabs/Tabbar.js index ab1e46c9f..c1421a2b1 100644 --- a/src/components/services/tabs/Tabbar.js +++ b/src/components/services/tabs/Tabbar.js @@ -20,6 +20,7 @@ export default @observer class TabBar extends Component { updateService: PropTypes.func.isRequired, hibernateService: PropTypes.func.isRequired, wakeUpService: PropTypes.func.isRequired, + useVerticalStyle: PropTypes.bool.isRequired, showMessageBadgeWhenMutedSetting: PropTypes.bool.isRequired, showMessageBadgesEvenWhenMuted: PropTypes.bool.isRequired, }; @@ -81,10 +82,13 @@ export default @observer class TabBar extends Component { toggleAudio, toggleDarkMode, deleteService, + useVerticalStyle, showMessageBadgeWhenMutedSetting, showMessageBadgesEvenWhenMuted, } = this.props; + const axis = useVerticalStyle ? 'x' : 'y'; + return (
this.wakeUpService(args)} openSettings={openSettings} distance={20} - axis="y" - lockAxis="y" + axis={axis} + lockAxis={axis} helperClass="is-reordering" showMessageBadgeWhenMutedSetting={showMessageBadgeWhenMutedSetting} showMessageBadgesEvenWhenMuted={showMessageBadgesEvenWhenMuted} -- cgit v1.2.3-70-g09d2 From dff30ac603fb7b9efcaa98ea9b32cfdf9166223a Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 26 Aug 2021 01:17:47 +0000 Subject: 5.6.1-nightly.39 [skip ci] --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index cd7882a13..5a8b2b6d5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "ferdi", - "version": "5.6.1-nightly.38", + "version": "5.6.1-nightly.39", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 36bcf54f8..cb0f502ba 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "productName": "Ferdi", "desktopName": "ferdi.desktop", "appId": "com.kytwb.ferdi", - "version": "5.6.1-nightly.38", + "version": "5.6.1-nightly.39", "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 9bfd90717bae8360774db179862945d2e232cf27 Mon Sep 17 00:00:00 2001 From: Vijay A Date: Thu, 26 Aug 2021 11:47:17 +0530 Subject: chore: specify the channel to check if it fixes the in-app updater. --- src/electron/ipc-api/autoUpdate.js | 2 ++ src/stores/AppStore.js | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/electron/ipc-api/autoUpdate.js b/src/electron/ipc-api/autoUpdate.js index 5305d5618..255595b9e 100644 --- a/src/electron/ipc-api/autoUpdate.js +++ b/src/electron/ipc-api/autoUpdate.js @@ -17,9 +17,11 @@ export default (params) => { try { autoUpdater.autoInstallOnAppQuit = false; autoUpdater.allowPrerelease = Boolean(params.settings.app.get('beta')); + autoUpdater.channel = autoUpdater.allowPrerelease ? 'beta' : 'latest'; if (params.settings.app.get('nightly')) { autoUpdater.allowPrerelease = Boolean(params.settings.app.get('nightly')); + autoUpdater.channel = 'alpha'; autoUpdater.setFeedURL({ provider: 'github', owner: GITHUB_ORG_NAME, diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js index 9c8cce679..cb8c71268 100644 --- a/src/stores/AppStore.js +++ b/src/stores/AppStore.js @@ -567,7 +567,6 @@ export default class AppStore extends Store { debug('Checking if Do Not Disturb Mode is on'); const dnd = await ipcRenderer.invoke('get-dnd'); debug('Do not disturb mode is', dnd); - // ipcRenderer.on('autoUpdate', (event, data) => { if ( dnd !== this.stores.settings.all.app.isAppMuted && !this.isSystemMuteOverridden -- cgit v1.2.3-70-g09d2 From 34d3a12af3d8d03bf84a96e60ad86f0f5ec2d75f Mon Sep 17 00:00:00 2001 From: Vijay A Date: Thu, 26 Aug 2021 11:52:10 +0530 Subject: chore: revert the upgrade to 'electron-buidler' since it causes CI builds to fail --- CHANGELOG.md | 2 +- package-lock.json | 86 +++++++++++++++++++++++++++---------------------------- package.json | 2 +- 3 files changed, 45 insertions(+), 45 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1848b3ee9..302005caa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ ### Internal -- Upgraded `electron-builder` to `22.13.0` 💖 @vraravam +- Set the `channel` for the auto-update (check if this fixes the in-app updater) 💖 @vraravam # [v5.6.1-nightly.38](https://github.com/getferdi/ferdi/compare/v5.6.1-nightly.37...v5.6.1-nightly.38) (2021-08-25) diff --git a/package-lock.json b/package-lock.json index 5a8b2b6d5..80a998864 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7914,9 +7914,9 @@ "dev": true }, "app-builder-lib": { - "version": "22.13.0", - "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-22.13.0.tgz", - "integrity": "sha512-7W0EuvVx8r0ZNJTtBnnYELPFFBElBIp6bRFn43wN/OCZPJ/T/hDbYo7WoMSAX+oAr9AAprU+v5OeuhD+xR6pdA==", + "version": "22.12.1", + "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-22.12.1.tgz", + "integrity": "sha512-lE//wq64cp8zA/oDQKsmgtoJOmjNMebPeUBYai7yGAqwhR7P9ggYDwWCUd2sL+T6f1YJFCQ2GrLwf1qkm7xHMQ==", "dev": true, "requires": { "7zip-bin": "~5.1.1", @@ -7925,13 +7925,13 @@ "@malept/flatpak-bundler": "^0.4.0", "async-exit-hook": "^2.0.1", "bluebird-lst": "^1.0.9", - "builder-util": "22.13.0", - "builder-util-runtime": "8.8.0", + "builder-util": "22.12.1", + "builder-util-runtime": "8.7.10", "chromium-pickle-js": "^0.2.0", "debug": "^4.3.2", "ejs": "^3.1.6", "electron-osx-sign": "^0.5.0", - "electron-publish": "22.13.0", + "electron-publish": "22.12.1", "fs-extra": "^10.0.0", "hosted-git-info": "^4.0.2", "is-ci": "^3.0.0", @@ -7946,9 +7946,9 @@ }, "dependencies": { "builder-util-runtime": { - "version": "8.8.0", - "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.8.0.tgz", - "integrity": "sha512-XMxCbIOuqZTalJ8Og0HzD6FpQ+MzmDnjM4yS5pVBGXCan0lMHdN84NThMErf4YBh1UknIVf7IYW2mZJVQfxYOQ==", + "version": "8.7.10", + "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.7.10.tgz", + "integrity": "sha512-zelTRebsOsj33pF+Jf/qwpvx9W6CeMQshqaRa70Ii6+NQGsspMXqlKDQb+1lvTv9aWARxa3+jy/syzm8jTE8Kw==", "dev": true, "requires": { "debug": "^4.3.2", @@ -9297,9 +9297,9 @@ "dev": true }, "builder-util": { - "version": "22.13.0", - "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-22.13.0.tgz", - "integrity": "sha512-yT2seIwK+pgKslgsMcZWLYuV6I1FAdMiSR4KPvaBPX+ZqkWEMIeHHjVx8TYwNCvTGhZQ59XIwTneuZyJA0PFow==", + "version": "22.12.1", + "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-22.12.1.tgz", + "integrity": "sha512-w0XF84saZZ8GLXy75tL1UzKEVCRHTIi/0NYV5WDqAUXLQWYWZr1m0TfsMXwD2+3TfzCAcavctzcpprm8Iw3gcQ==", "dev": true, "requires": { "7zip-bin": "~5.1.1", @@ -9307,7 +9307,7 @@ "@types/fs-extra": "^9.0.11", "app-builder-bin": "3.7.1", "bluebird-lst": "^1.0.9", - "builder-util-runtime": "8.8.0", + "builder-util-runtime": "8.7.10", "chalk": "^4.1.1", "cross-spawn": "^7.0.3", "debug": "^4.3.2", @@ -9329,9 +9329,9 @@ } }, "builder-util-runtime": { - "version": "8.8.0", - "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.8.0.tgz", - "integrity": "sha512-XMxCbIOuqZTalJ8Og0HzD6FpQ+MzmDnjM4yS5pVBGXCan0lMHdN84NThMErf4YBh1UknIVf7IYW2mZJVQfxYOQ==", + "version": "8.7.10", + "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.7.10.tgz", + "integrity": "sha512-zelTRebsOsj33pF+Jf/qwpvx9W6CeMQshqaRa70Ii6+NQGsspMXqlKDQb+1lvTv9aWARxa3+jy/syzm8jTE8Kw==", "dev": true, "requires": { "debug": "^4.3.2", @@ -12089,14 +12089,14 @@ } }, "dmg-builder": { - "version": "22.13.0", - "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-22.13.0.tgz", - "integrity": "sha512-SqvXs10EsthwoqQEr0ae8fbvTywc0GNScY5XL2Nw1eHLLvjy8qaM4aC5ekOj422rqiBBGSrg1YgyUEmHzX6xqg==", + "version": "22.12.1", + "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-22.12.1.tgz", + "integrity": "sha512-keh9hGtqZ6weOyFg7wd8VYS7U5oYKFzeOEDoEc5ciiaLHfYKqFbJskvCOM2+aA7One92hZMwaIhMNoEug+jsbw==", "dev": true, "requires": { - "app-builder-lib": "22.13.0", - "builder-util": "22.13.0", - "builder-util-runtime": "8.8.0", + "app-builder-lib": "22.12.1", + "builder-util": "22.12.1", + "builder-util-runtime": "8.7.10", "dmg-license": "^1.0.9", "fs-extra": "^10.0.0", "iconv-lite": "^0.6.2", @@ -12104,9 +12104,9 @@ }, "dependencies": { "builder-util-runtime": { - "version": "8.8.0", - "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.8.0.tgz", - "integrity": "sha512-XMxCbIOuqZTalJ8Og0HzD6FpQ+MzmDnjM4yS5pVBGXCan0lMHdN84NThMErf4YBh1UknIVf7IYW2mZJVQfxYOQ==", + "version": "8.7.10", + "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.7.10.tgz", + "integrity": "sha512-zelTRebsOsj33pF+Jf/qwpvx9W6CeMQshqaRa70Ii6+NQGsspMXqlKDQb+1lvTv9aWARxa3+jy/syzm8jTE8Kw==", "dev": true, "requires": { "debug": "^4.3.2", @@ -12416,17 +12416,17 @@ } }, "electron-builder": { - "version": "22.13.0", - "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-22.13.0.tgz", - "integrity": "sha512-OCk7ZIk/nmxWe58F3hD49BW7V4T3l98IvDsLIWBYEmlT/HYAoxI69rv0M+7EXIKwe064ZAN5Z96e7wqMJECwmg==", + "version": "22.12.1", + "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-22.12.1.tgz", + "integrity": "sha512-WttcOgfO5uy9OgKAWE3Yy2oiz39bTNXaKC3dKrwtKq0MaZL8DDvNGRNkFiZutOIF4wAUfwyG7Pm0KbI8Hl44Gw==", "dev": true, "requires": { "@types/yargs": "^17.0.1", - "app-builder-lib": "22.13.0", - "builder-util": "22.13.0", - "builder-util-runtime": "8.8.0", + "app-builder-lib": "22.12.1", + "builder-util": "22.12.1", + "builder-util-runtime": "8.7.10", "chalk": "^4.1.1", - "dmg-builder": "22.13.0", + "dmg-builder": "22.12.1", "fs-extra": "^10.0.0", "is-ci": "^3.0.0", "lazy-val": "^1.0.5", @@ -12451,9 +12451,9 @@ } }, "builder-util-runtime": { - "version": "8.8.0", - "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.8.0.tgz", - "integrity": "sha512-XMxCbIOuqZTalJ8Og0HzD6FpQ+MzmDnjM4yS5pVBGXCan0lMHdN84NThMErf4YBh1UknIVf7IYW2mZJVQfxYOQ==", + "version": "8.7.10", + "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.7.10.tgz", + "integrity": "sha512-zelTRebsOsj33pF+Jf/qwpvx9W6CeMQshqaRa70Ii6+NQGsspMXqlKDQb+1lvTv9aWARxa3+jy/syzm8jTE8Kw==", "dev": true, "requires": { "debug": "^4.3.2", @@ -12692,14 +12692,14 @@ } }, "electron-publish": { - "version": "22.13.0", - "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-22.13.0.tgz", - "integrity": "sha512-ekBCgbzwKweQxFyvQqxNGZH2va1ZPNeCJRQowt7KV0McR161C+8XRa654DARIpjJ9jE+v+Ne1ImKzND1XCZ2PA==", + "version": "22.12.1", + "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-22.12.1.tgz", + "integrity": "sha512-863+dgShqdmfelCfteR2xkkHch9bPtmIdD1IDLPzL3+43HdEz0oGvRnRJTBKzLrI94D3CNOM4OoPUj3L2JMLqw==", "dev": true, "requires": { "@types/fs-extra": "^9.0.11", - "builder-util": "22.13.0", - "builder-util-runtime": "8.8.0", + "builder-util": "22.12.1", + "builder-util-runtime": "8.7.10", "chalk": "^4.1.1", "fs-extra": "^10.0.0", "lazy-val": "^1.0.5", @@ -12716,9 +12716,9 @@ } }, "builder-util-runtime": { - "version": "8.8.0", - "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.8.0.tgz", - "integrity": "sha512-XMxCbIOuqZTalJ8Og0HzD6FpQ+MzmDnjM4yS5pVBGXCan0lMHdN84NThMErf4YBh1UknIVf7IYW2mZJVQfxYOQ==", + "version": "8.7.10", + "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.7.10.tgz", + "integrity": "sha512-zelTRebsOsj33pF+Jf/qwpvx9W6CeMQshqaRa70Ii6+NQGsspMXqlKDQb+1lvTv9aWARxa3+jy/syzm8jTE8Kw==", "dev": true, "requires": { "debug": "^4.3.2", diff --git a/package.json b/package.json index cb0f502ba..9164ccf6b 100644 --- a/package.json +++ b/package.json @@ -166,7 +166,7 @@ "cz-conventional-changelog": "3.3.0", "dotenv": "10.0.0", "electron": "13.2.2", - "electron-builder": "22.13.0", + "electron-builder": "22.12.1", "electron-notarize": "1.1.0", "eslint": "7.32.0", "eslint-config-airbnb": "18.2.1", -- cgit v1.2.3-70-g09d2 From 66e03e8a53df5f9ebd6bf6a9a36f96b38c304659 Mon Sep 17 00:00:00 2001 From: Vijay A Date: Thu, 26 Aug 2021 11:53:42 +0530 Subject: docs: update changelog with new tag name [skip ci] --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 302005caa..5f8c47375 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# [v5.6.1-nightly.39](https://github.com/getferdi/ferdi/compare/v5.6.1-nightly.38...v5.6.1-nightly.39) (2021-08-26) +# [v5.6.1-nightly.40](https://github.com/getferdi/ferdi/compare/v5.6.1-nightly.38...v5.6.1-nightly.40) (2021-08-26) ### Bug Fixes -- cgit v1.2.3-70-g09d2 From 529ff3e6fe7e6c1b03fc084f7b2583efe7c68d08 Mon Sep 17 00:00:00 2001 From: Markus Hatvan Date: Thu, 26 Aug 2021 18:35:22 +0200 Subject: fix: address bar not updating (#1836) --- src/features/webControls/components/WebControls.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/features/webControls/components/WebControls.js b/src/features/webControls/components/WebControls.js index 9a95eb2d2..bebf52c08 100644 --- a/src/features/webControls/components/WebControls.js +++ b/src/features/webControls/components/WebControls.js @@ -199,12 +199,17 @@ class WebControls extends Component { }) } onFocus={event => { - console.log('on focus event'); event.target.select(); this.setState({ editUrl: true, }); }} + onBlur={event => { + event.target.blur(); + this.setState({ + editUrl: false, + }); + }} onKeyDown={event => { if (event.key === 'Enter') { this.setState({ @@ -217,7 +222,7 @@ class WebControls extends Component { editUrl: false, inputUrl: url, }); - event.target.blur(); + this.inputRef.current.blur(); } }} ref={this.inputRef} -- cgit v1.2.3-70-g09d2 From 296567fe6db959c37fa508a128e612d57e30a541 Mon Sep 17 00:00:00 2001 From: Vijay A Date: Thu, 26 Aug 2021 22:16:02 +0530 Subject: docs: updated Changelog [skip ci] Upgraded recipes to pull in discord screenshare fix --- CHANGELOG.md | 4 +++- recipes | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5f8c47375..81aa4f580 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,10 @@ -# [v5.6.1-nightly.40](https://github.com/getferdi/ferdi/compare/v5.6.1-nightly.38...v5.6.1-nightly.40) (2021-08-26) +# [v5.6.1-nightly.40](https://github.com/getferdi/ferdi/compare/v5.6.1-nightly.38...v5.6.1-nightly.40) (2021-08-27) ### Bug Fixes - Fix reordering of services in vertical style layout (#1833) 💖 @vraravam +- Fix address bar not updating (#1836) 💖 @mhatvan +- Fix screensharing in discord (getferdi/recipes#625) 💖 @oda-alexandre ### Internal diff --git a/recipes b/recipes index 7ba12a89f..fe613088a 160000 --- a/recipes +++ b/recipes @@ -1 +1 @@ -Subproject commit 7ba12a89f7fa1e667f77871c3b377b97304feaf6 +Subproject commit fe613088a813394760ca27afeee554cfa7290d67 -- cgit v1.2.3-70-g09d2 From 7fab2002e6ff8781bf5c7632369feae73747fee5 Mon Sep 17 00:00:00 2001 From: Vijay A Date: Fri, 27 Aug 2021 05:03:32 +0530 Subject: chore: Change user-visible text from 'use vertical style' to 'use horizontal style' I have refrained from changing the internal code (variables, etc) - since that will need a migration for existing user preferences on their local installation. That can be taken up separately after more analysis. --- src/containers/settings/EditSettingsScreen.js | 2 +- src/i18n/locales/af.json | 2 +- src/i18n/locales/ar.json | 2 +- src/i18n/locales/be.json | 2 +- src/i18n/locales/bs.json | 2 +- src/i18n/locales/ca.json | 2 +- src/i18n/locales/cs.json | 2 +- src/i18n/locales/defaultMessages.json | 2 +- src/i18n/locales/el.json | 2 +- src/i18n/locales/en-US.json | 2 +- src/i18n/locales/ga.json | 2 +- src/i18n/locales/he.json | 2 +- src/i18n/locales/hr.json | 2 +- src/i18n/locales/hu.json | 2 +- src/i18n/locales/id.json | 2 +- src/i18n/locales/ka.json | 2 +- src/i18n/locales/nl-BE.json | 2 +- src/i18n/locales/nl.json | 2 +- src/i18n/locales/no.json | 2 +- src/i18n/locales/pt.json | 2 +- src/i18n/locales/ro.json | 2 +- src/i18n/locales/ru.json | 2 +- src/i18n/locales/sk.json | 2 +- src/i18n/locales/sl.json | 2 +- src/i18n/locales/sr.json | 2 +- src/i18n/locales/sv.json | 2 +- src/i18n/locales/tr.json | 2 +- src/i18n/locales/uk.json | 2 +- src/i18n/locales/vi.json | 2 +- src/i18n/locales/zh-HANT.json | 2 +- src/i18n/locales/zh.json | 2 +- src/i18n/messages/src/containers/settings/EditSettingsScreen.json | 2 +- 32 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js index 0d718489a..d65d8d5d5 100644 --- a/src/containers/settings/EditSettingsScreen.js +++ b/src/containers/settings/EditSettingsScreen.js @@ -163,7 +163,7 @@ const messages = defineMessages({ }, useVerticalStyle: { id: 'settings.app.form.useVerticalStyle', - defaultMessage: '!!!Use vertical style', + defaultMessage: '!!!Use horizontal style', }, alwaysShowWorkspaces: { id: 'settings.app.form.alwaysShowWorkspaces', diff --git a/src/i18n/locales/af.json b/src/i18n/locales/af.json index 89060b506..ff3ed1486 100644 --- a/src/i18n/locales/af.json +++ b/src/i18n/locales/af.json @@ -249,7 +249,7 @@ "settings.app.form.startMinimized": "Start minimized", "settings.app.form.universalDarkMode": "Enable universal Dark Mode", "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi", - "settings.app.form.useVerticalStyle": "Use vertical style", + "settings.app.form.useVerticalStyle": "Use horizontal style", "settings.app.form.wakeUpStrategy": "Wake up strategy", "settings.app.headline": "Settings", "settings.app.headlineAdvanced": "Advanced", diff --git a/src/i18n/locales/ar.json b/src/i18n/locales/ar.json index e5caabd2b..cd8c65611 100644 --- a/src/i18n/locales/ar.json +++ b/src/i18n/locales/ar.json @@ -249,7 +249,7 @@ "settings.app.form.startMinimized": "البدء بنافذة مصغرة", "settings.app.form.universalDarkMode": "تمكين الوضع المظلم الكامل", "settings.app.form.useTouchIdToUnlock": "السماح باستخدام TouchID لفتح فردي", - "settings.app.form.useVerticalStyle": "Use vertical style", + "settings.app.form.useVerticalStyle": "Use horizontal style", "settings.app.form.wakeUpStrategy": "Wake up strategy", "settings.app.headline": "الإعدادات", "settings.app.headlineAdvanced": "متقدم", diff --git a/src/i18n/locales/be.json b/src/i18n/locales/be.json index 78b5f362e..30fae6dd8 100644 --- a/src/i18n/locales/be.json +++ b/src/i18n/locales/be.json @@ -249,7 +249,7 @@ "settings.app.form.startMinimized": "Start minimized", "settings.app.form.universalDarkMode": "Enable universal Dark Mode", "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi", - "settings.app.form.useVerticalStyle": "Use vertical style", + "settings.app.form.useVerticalStyle": "Use horizontal style", "settings.app.form.wakeUpStrategy": "Wake up strategy", "settings.app.headline": "Settings", "settings.app.headlineAdvanced": "Advanced", diff --git a/src/i18n/locales/bs.json b/src/i18n/locales/bs.json index 89060b506..ff3ed1486 100644 --- a/src/i18n/locales/bs.json +++ b/src/i18n/locales/bs.json @@ -249,7 +249,7 @@ "settings.app.form.startMinimized": "Start minimized", "settings.app.form.universalDarkMode": "Enable universal Dark Mode", "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi", - "settings.app.form.useVerticalStyle": "Use vertical style", + "settings.app.form.useVerticalStyle": "Use horizontal style", "settings.app.form.wakeUpStrategy": "Wake up strategy", "settings.app.headline": "Settings", "settings.app.headlineAdvanced": "Advanced", diff --git a/src/i18n/locales/ca.json b/src/i18n/locales/ca.json index 0d57b5b19..96741e317 100644 --- a/src/i18n/locales/ca.json +++ b/src/i18n/locales/ca.json @@ -249,7 +249,7 @@ "settings.app.form.startMinimized": "Start minimized", "settings.app.form.universalDarkMode": "Enable universal Dark Mode", "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi", - "settings.app.form.useVerticalStyle": "Use vertical style", + "settings.app.form.useVerticalStyle": "Use horizontal style", "settings.app.form.wakeUpStrategy": "Wake up strategy", "settings.app.headline": "Configuració", "settings.app.headlineAdvanced": "Avançat", diff --git a/src/i18n/locales/cs.json b/src/i18n/locales/cs.json index be17c2b00..a1326c772 100644 --- a/src/i18n/locales/cs.json +++ b/src/i18n/locales/cs.json @@ -249,7 +249,7 @@ "settings.app.form.startMinimized": "Start minimized", "settings.app.form.universalDarkMode": "Enable universal Dark Mode", "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi", - "settings.app.form.useVerticalStyle": "Use vertical style", + "settings.app.form.useVerticalStyle": "Use horizontal style", "settings.app.form.wakeUpStrategy": "Wake up strategy", "settings.app.headline": "Nastavení", "settings.app.headlineAdvanced": "Pokročilé", diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json index 418bf6bea..7aff45503 100644 --- a/src/i18n/locales/defaultMessages.json +++ b/src/i18n/locales/defaultMessages.json @@ -4679,7 +4679,7 @@ } }, { - "defaultMessage": "!!!Use vertical style", + "defaultMessage": "!!!Use horizontal style", "end": { "column": 3, "line": 167 diff --git a/src/i18n/locales/el.json b/src/i18n/locales/el.json index 0735df434..679720748 100644 --- a/src/i18n/locales/el.json +++ b/src/i18n/locales/el.json @@ -249,7 +249,7 @@ "settings.app.form.startMinimized": "Start minimized", "settings.app.form.universalDarkMode": "Enable universal Dark Mode", "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi", - "settings.app.form.useVerticalStyle": "Use vertical style", + "settings.app.form.useVerticalStyle": "Use horizontal style", "settings.app.form.wakeUpStrategy": "Wake up strategy", "settings.app.headline": "Ρυθμίσεις", "settings.app.headlineAdvanced": "Για προχωρημένους", diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index fe2eb6ec3..f7e3d662a 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json @@ -249,7 +249,7 @@ "settings.app.form.startMinimized": "Start minimized", "settings.app.form.universalDarkMode": "Enable universal Dark Mode", "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi", - "settings.app.form.useVerticalStyle": "Use vertical style", + "settings.app.form.useVerticalStyle": "Use horizontal style", "settings.app.form.wakeUpStrategy": "Wake up strategy", "settings.app.headline": "Settings", "settings.app.headlineAdvanced": "Advanced", diff --git a/src/i18n/locales/ga.json b/src/i18n/locales/ga.json index 52d5b89fb..da1f17bca 100644 --- a/src/i18n/locales/ga.json +++ b/src/i18n/locales/ga.json @@ -249,7 +249,7 @@ "settings.app.form.startMinimized": "Start minimized", "settings.app.form.universalDarkMode": "Enable universal Dark Mode", "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi", - "settings.app.form.useVerticalStyle": "Use vertical style", + "settings.app.form.useVerticalStyle": "Use horizontal style", "settings.app.form.wakeUpStrategy": "Wake up strategy", "settings.app.headline": "Socruithe", "settings.app.headlineAdvanced": "Casta", diff --git a/src/i18n/locales/he.json b/src/i18n/locales/he.json index 1ddcd2677..427e60640 100644 --- a/src/i18n/locales/he.json +++ b/src/i18n/locales/he.json @@ -249,7 +249,7 @@ "settings.app.form.startMinimized": "התחלה במצב ממוזער", "settings.app.form.universalDarkMode": "Enable universal Dark Mode", "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi", - "settings.app.form.useVerticalStyle": "Use vertical style", + "settings.app.form.useVerticalStyle": "Use horizontal style", "settings.app.form.wakeUpStrategy": "Wake up strategy", "settings.app.headline": "הגדרות", "settings.app.headlineAdvanced": "מתקדם", diff --git a/src/i18n/locales/hr.json b/src/i18n/locales/hr.json index 79b71986e..80cce61fa 100644 --- a/src/i18n/locales/hr.json +++ b/src/i18n/locales/hr.json @@ -249,7 +249,7 @@ "settings.app.form.startMinimized": "Start minimized", "settings.app.form.universalDarkMode": "Enable universal Dark Mode", "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi", - "settings.app.form.useVerticalStyle": "Use vertical style", + "settings.app.form.useVerticalStyle": "Use horizontal style", "settings.app.form.wakeUpStrategy": "Wake up strategy", "settings.app.headline": "Postavke", "settings.app.headlineAdvanced": "Napredne alatke", diff --git a/src/i18n/locales/hu.json b/src/i18n/locales/hu.json index 19ff83876..b542fcddf 100644 --- a/src/i18n/locales/hu.json +++ b/src/i18n/locales/hu.json @@ -249,7 +249,7 @@ "settings.app.form.startMinimized": "Indítás minimalizálva", "settings.app.form.universalDarkMode": "Enable universal Dark Mode", "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi", - "settings.app.form.useVerticalStyle": "Use vertical style", + "settings.app.form.useVerticalStyle": "Use horizontal style", "settings.app.form.wakeUpStrategy": "Wake up strategy", "settings.app.headline": "Beállítások", "settings.app.headlineAdvanced": "Haladó", diff --git a/src/i18n/locales/id.json b/src/i18n/locales/id.json index 0e6e3b951..330fb8122 100644 --- a/src/i18n/locales/id.json +++ b/src/i18n/locales/id.json @@ -249,7 +249,7 @@ "settings.app.form.startMinimized": "Start minimized", "settings.app.form.universalDarkMode": "Enable universal Dark Mode", "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi", - "settings.app.form.useVerticalStyle": "Use vertical style", + "settings.app.form.useVerticalStyle": "Use horizontal style", "settings.app.form.wakeUpStrategy": "Wake up strategy", "settings.app.headline": "Pengaturan", "settings.app.headlineAdvanced": "Tingkat Lanjut", diff --git a/src/i18n/locales/ka.json b/src/i18n/locales/ka.json index af5e5eb7c..ed74ed22b 100644 --- a/src/i18n/locales/ka.json +++ b/src/i18n/locales/ka.json @@ -249,7 +249,7 @@ "settings.app.form.startMinimized": "Start minimized", "settings.app.form.universalDarkMode": "Enable universal Dark Mode", "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi", - "settings.app.form.useVerticalStyle": "Use vertical style", + "settings.app.form.useVerticalStyle": "Use horizontal style", "settings.app.form.wakeUpStrategy": "Wake up strategy", "settings.app.headline": "პარამეტრები", "settings.app.headlineAdvanced": "Advanced", diff --git a/src/i18n/locales/nl-BE.json b/src/i18n/locales/nl-BE.json index a5a3601f7..e38a06004 100644 --- a/src/i18n/locales/nl-BE.json +++ b/src/i18n/locales/nl-BE.json @@ -249,7 +249,7 @@ "settings.app.form.startMinimized": "Start minimized", "settings.app.form.universalDarkMode": "Enable universal Dark Mode", "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi", - "settings.app.form.useVerticalStyle": "Use vertical style", + "settings.app.form.useVerticalStyle": "Use horizontal style", "settings.app.form.wakeUpStrategy": "Wake up strategy", "settings.app.headline": "Instellingen", "settings.app.headlineAdvanced": "Geavanceerd", diff --git a/src/i18n/locales/nl.json b/src/i18n/locales/nl.json index 7f1088849..35359f542 100644 --- a/src/i18n/locales/nl.json +++ b/src/i18n/locales/nl.json @@ -249,7 +249,7 @@ "settings.app.form.startMinimized": "Start minimized", "settings.app.form.universalDarkMode": "Enable universal Dark Mode", "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi", - "settings.app.form.useVerticalStyle": "Use vertical style", + "settings.app.form.useVerticalStyle": "Use horizontal style", "settings.app.form.wakeUpStrategy": "Wake up strategy", "settings.app.headline": "Instellingen", "settings.app.headlineAdvanced": "Geavanceerd", diff --git a/src/i18n/locales/no.json b/src/i18n/locales/no.json index 9c3184edf..ea5d4465a 100644 --- a/src/i18n/locales/no.json +++ b/src/i18n/locales/no.json @@ -249,7 +249,7 @@ "settings.app.form.startMinimized": "Start minimert", "settings.app.form.universalDarkMode": "Aktiver universelt mørkt tema", "settings.app.form.useTouchIdToUnlock": "Tillat å bruke TouchID for å låse opp Ferdi", - "settings.app.form.useVerticalStyle": "Use vertical style", + "settings.app.form.useVerticalStyle": "Use horizontal style", "settings.app.form.wakeUpStrategy": "Wake up strategy", "settings.app.headline": "Innstillinger", "settings.app.headlineAdvanced": "Avansert", diff --git a/src/i18n/locales/pt.json b/src/i18n/locales/pt.json index 56661cdfd..9bea37357 100644 --- a/src/i18n/locales/pt.json +++ b/src/i18n/locales/pt.json @@ -249,7 +249,7 @@ "settings.app.form.startMinimized": "Iniciar minimizado", "settings.app.form.universalDarkMode": "Ativar o Modo Noturno Universal", "settings.app.form.useTouchIdToUnlock": "Permite usar o TouchID para desbloquear Ferdi", - "settings.app.form.useVerticalStyle": "Use vertical style", + "settings.app.form.useVerticalStyle": "Use horizontal style", "settings.app.form.wakeUpStrategy": "Wake up strategy", "settings.app.headline": "Configurações", "settings.app.headlineAdvanced": "Avançado", diff --git a/src/i18n/locales/ro.json b/src/i18n/locales/ro.json index 056e41e4e..855576db4 100644 --- a/src/i18n/locales/ro.json +++ b/src/i18n/locales/ro.json @@ -249,7 +249,7 @@ "settings.app.form.startMinimized": "Start minimized", "settings.app.form.universalDarkMode": "Enable universal Dark Mode", "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi", - "settings.app.form.useVerticalStyle": "Use vertical style", + "settings.app.form.useVerticalStyle": "Use horizontal style", "settings.app.form.wakeUpStrategy": "Wake up strategy", "settings.app.headline": "Settings", "settings.app.headlineAdvanced": "Advanced", diff --git a/src/i18n/locales/ru.json b/src/i18n/locales/ru.json index dc63aaf2c..78654554b 100644 --- a/src/i18n/locales/ru.json +++ b/src/i18n/locales/ru.json @@ -249,7 +249,7 @@ "settings.app.form.startMinimized": "Запускать свернутым", "settings.app.form.universalDarkMode": "Enable universal Dark Mode", "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi", - "settings.app.form.useVerticalStyle": "Use vertical style", + "settings.app.form.useVerticalStyle": "Use horizontal style", "settings.app.form.wakeUpStrategy": "Wake up strategy", "settings.app.headline": "Настройки", "settings.app.headlineAdvanced": "Дополнительно", diff --git a/src/i18n/locales/sk.json b/src/i18n/locales/sk.json index a5ddfaea2..d41ab866c 100644 --- a/src/i18n/locales/sk.json +++ b/src/i18n/locales/sk.json @@ -249,7 +249,7 @@ "settings.app.form.startMinimized": "Start minimized", "settings.app.form.universalDarkMode": "Enable universal Dark Mode", "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi", - "settings.app.form.useVerticalStyle": "Use vertical style", + "settings.app.form.useVerticalStyle": "Use horizontal style", "settings.app.form.wakeUpStrategy": "Wake up strategy", "settings.app.headline": "Nastavenia", "settings.app.headlineAdvanced": "Pokročilé", diff --git a/src/i18n/locales/sl.json b/src/i18n/locales/sl.json index 89060b506..ff3ed1486 100644 --- a/src/i18n/locales/sl.json +++ b/src/i18n/locales/sl.json @@ -249,7 +249,7 @@ "settings.app.form.startMinimized": "Start minimized", "settings.app.form.universalDarkMode": "Enable universal Dark Mode", "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi", - "settings.app.form.useVerticalStyle": "Use vertical style", + "settings.app.form.useVerticalStyle": "Use horizontal style", "settings.app.form.wakeUpStrategy": "Wake up strategy", "settings.app.headline": "Settings", "settings.app.headlineAdvanced": "Advanced", diff --git a/src/i18n/locales/sr.json b/src/i18n/locales/sr.json index 54045d340..6eca2d9c2 100644 --- a/src/i18n/locales/sr.json +++ b/src/i18n/locales/sr.json @@ -249,7 +249,7 @@ "settings.app.form.startMinimized": "Start minimized", "settings.app.form.universalDarkMode": "Enable universal Dark Mode", "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi", - "settings.app.form.useVerticalStyle": "Use vertical style", + "settings.app.form.useVerticalStyle": "Use horizontal style", "settings.app.form.wakeUpStrategy": "Wake up strategy", "settings.app.headline": "Postavke", "settings.app.headlineAdvanced": "Napredne alatke", diff --git a/src/i18n/locales/sv.json b/src/i18n/locales/sv.json index 5dcd42154..f6dfdd4ad 100644 --- a/src/i18n/locales/sv.json +++ b/src/i18n/locales/sv.json @@ -249,7 +249,7 @@ "settings.app.form.startMinimized": "Starta i minimerat läge", "settings.app.form.universalDarkMode": "Aktivera globalt mörkt läge", "settings.app.form.useTouchIdToUnlock": "Tillåt att TouchID används för att låsa upp Ferdi", - "settings.app.form.useVerticalStyle": "Use vertical style", + "settings.app.form.useVerticalStyle": "Use horizontal style", "settings.app.form.wakeUpStrategy": "Wake up strategy", "settings.app.headline": "Inställningar", "settings.app.headlineAdvanced": "Avancerat", diff --git a/src/i18n/locales/tr.json b/src/i18n/locales/tr.json index b29ab81fc..f1094a69d 100644 --- a/src/i18n/locales/tr.json +++ b/src/i18n/locales/tr.json @@ -249,7 +249,7 @@ "settings.app.form.startMinimized": "Start minimized", "settings.app.form.universalDarkMode": "Enable universal Dark Mode", "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi", - "settings.app.form.useVerticalStyle": "Use vertical style", + "settings.app.form.useVerticalStyle": "Use horizontal style", "settings.app.form.wakeUpStrategy": "Wake up strategy", "settings.app.headline": "Ayarlar", "settings.app.headlineAdvanced": "Gelişmiş", diff --git a/src/i18n/locales/uk.json b/src/i18n/locales/uk.json index 7a1609dfb..69c62629c 100644 --- a/src/i18n/locales/uk.json +++ b/src/i18n/locales/uk.json @@ -249,7 +249,7 @@ "settings.app.form.startMinimized": "Запускати згорнутим", "settings.app.form.universalDarkMode": "Увімкнути універсальний темний режим", "settings.app.form.useTouchIdToUnlock": "Дозволити використання TouchID для розблокування Ferdi", - "settings.app.form.useVerticalStyle": "Use vertical style", + "settings.app.form.useVerticalStyle": "Use horizontal style", "settings.app.form.wakeUpStrategy": "Wake up strategy", "settings.app.headline": "Налаштування", "settings.app.headlineAdvanced": "Додаткові налаштування", diff --git a/src/i18n/locales/vi.json b/src/i18n/locales/vi.json index 01512a522..33b21b13c 100644 --- a/src/i18n/locales/vi.json +++ b/src/i18n/locales/vi.json @@ -249,7 +249,7 @@ "settings.app.form.startMinimized": "Start minimized", "settings.app.form.universalDarkMode": "Enable universal Dark Mode", "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi", - "settings.app.form.useVerticalStyle": "Use vertical style", + "settings.app.form.useVerticalStyle": "Use horizontal style", "settings.app.form.wakeUpStrategy": "Wake up strategy", "settings.app.headline": "Các thiết lập", "settings.app.headlineAdvanced": "Advanced", diff --git a/src/i18n/locales/zh-HANT.json b/src/i18n/locales/zh-HANT.json index 407f134cb..ff96a4107 100644 --- a/src/i18n/locales/zh-HANT.json +++ b/src/i18n/locales/zh-HANT.json @@ -249,7 +249,7 @@ "settings.app.form.startMinimized": "Start minimized", "settings.app.form.universalDarkMode": "Enable universal Dark Mode", "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi", - "settings.app.form.useVerticalStyle": "Use vertical style", + "settings.app.form.useVerticalStyle": "Use horizontal style", "settings.app.form.wakeUpStrategy": "Wake up strategy", "settings.app.headline": "設置", "settings.app.headlineAdvanced": "高級設置", diff --git a/src/i18n/locales/zh.json b/src/i18n/locales/zh.json index f33f67f8f..de9d937e3 100644 --- a/src/i18n/locales/zh.json +++ b/src/i18n/locales/zh.json @@ -249,7 +249,7 @@ "settings.app.form.startMinimized": "Start minimized", "settings.app.form.universalDarkMode": "Enable universal Dark Mode", "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi", - "settings.app.form.useVerticalStyle": "Use vertical style", + "settings.app.form.useVerticalStyle": "Use horizontal style", "settings.app.form.wakeUpStrategy": "Wake up strategy", "settings.app.headline": "设置", "settings.app.headlineAdvanced": "Advanced", diff --git a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json index b98c54d7d..9a4a8de64 100644 --- a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json +++ b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json @@ -430,7 +430,7 @@ }, { "id": "settings.app.form.useVerticalStyle", - "defaultMessage": "!!!Use vertical style", + "defaultMessage": "!!!Use horizontal style", "file": "src/containers/settings/EditSettingsScreen.js", "start": { "line": 164, -- cgit v1.2.3-70-g09d2 From a5695f33e02b81d40e1f1924376c3c252f1ef52f Mon Sep 17 00:00:00 2001 From: Vijay A Date: Fri, 27 Aug 2021 05:07:58 +0530 Subject: docs: update changelog [skip ci] --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 81aa4f580..7840cc6f6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - Fix reordering of services in vertical style layout (#1833) 💖 @vraravam - Fix address bar not updating (#1836) 💖 @mhatvan - Fix screensharing in discord (getferdi/recipes#625) 💖 @oda-alexandre +- Per popular demand, reworded `Use Vertical style` to `Use Horizontal style` 💖 @vraravam ### Internal -- cgit v1.2.3-70-g09d2 From dff17f7452de2d7986112b2c604dbc8ab81d224f Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Fri, 27 Aug 2021 01:43:51 +0200 Subject: New Crowdin updates (#1840) --- src/i18n/locales/da.json | 2 +- src/i18n/locales/de.json | 2 +- src/i18n/locales/es.json | 2 +- src/i18n/locales/fi.json | 2 +- src/i18n/locales/fr.json | 2 +- src/i18n/locales/it.json | 2 +- src/i18n/locales/ja.json | 2 +- src/i18n/locales/ko.json | 2 +- src/i18n/locales/pl.json | 2 +- src/i18n/locales/pt-BR.json | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/i18n/locales/da.json b/src/i18n/locales/da.json index 596e6400e..48fe12245 100644 --- a/src/i18n/locales/da.json +++ b/src/i18n/locales/da.json @@ -249,7 +249,7 @@ "settings.app.form.startMinimized": "Start minimeret", "settings.app.form.universalDarkMode": "Aktiver universel mørk tilstand", "settings.app.form.useTouchIdToUnlock": "Tillad brug af TouchID for at låse Ferdi op", - "settings.app.form.useVerticalStyle": "Brug lodret stil", + "settings.app.form.useVerticalStyle": "Use horizontal style", "settings.app.form.wakeUpStrategy": "Wake up strategy", "settings.app.headline": "Indstillinger", "settings.app.headlineAdvanced": "Avanceret", diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json index 20f55e851..5390ef35c 100644 --- a/src/i18n/locales/de.json +++ b/src/i18n/locales/de.json @@ -249,7 +249,7 @@ "settings.app.form.startMinimized": "Minimiert starten", "settings.app.form.universalDarkMode": "Universellen Dark Mode aktivieren", "settings.app.form.useTouchIdToUnlock": "Verwenden von Touch ID zum Entsperren von Ferdi erlauben", - "settings.app.form.useVerticalStyle": "Vertikalen Stil verwenden", + "settings.app.form.useVerticalStyle": "Use horizontal style", "settings.app.form.wakeUpStrategy": "Wake up strategy", "settings.app.headline": "Einstellungen", "settings.app.headlineAdvanced": "Erweitert", diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json index 32c7ef601..ae558c98f 100644 --- a/src/i18n/locales/es.json +++ b/src/i18n/locales/es.json @@ -249,7 +249,7 @@ "settings.app.form.startMinimized": "Iniciar minimizado", "settings.app.form.universalDarkMode": "Activar modo oscuro universal", "settings.app.form.useTouchIdToUnlock": "Permitir usar TouchID para desbloquear Ferdi", - "settings.app.form.useVerticalStyle": "Usar estilo vertical", + "settings.app.form.useVerticalStyle": "Use horizontal style", "settings.app.form.wakeUpStrategy": "Wake up strategy", "settings.app.headline": "Configuración", "settings.app.headlineAdvanced": "Avanzado", diff --git a/src/i18n/locales/fi.json b/src/i18n/locales/fi.json index 8cd5a23af..544c54c77 100644 --- a/src/i18n/locales/fi.json +++ b/src/i18n/locales/fi.json @@ -249,7 +249,7 @@ "settings.app.form.startMinimized": "Käynnistä pienennettynä", "settings.app.form.universalDarkMode": "Ota käyttöön yleinen tumma tila", "settings.app.form.useTouchIdToUnlock": "Salli TouchID:n käyttö Ferdin avaamiseksi", - "settings.app.form.useVerticalStyle": "Käytä pystysuoraa tyyliä", + "settings.app.form.useVerticalStyle": "Use horizontal style", "settings.app.form.wakeUpStrategy": "Wake up strategy", "settings.app.headline": "Asetukset", "settings.app.headlineAdvanced": "Lisäasetukset", diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json index 9b513eaeb..c3968b2c0 100644 --- a/src/i18n/locales/fr.json +++ b/src/i18n/locales/fr.json @@ -249,7 +249,7 @@ "settings.app.form.startMinimized": "Démarrage minimisé", "settings.app.form.universalDarkMode": "Activer le mode sombre universel", "settings.app.form.useTouchIdToUnlock": "Autoriser l'utilisation de TouchID pour déverrouiller Ferdi", - "settings.app.form.useVerticalStyle": "Utiliser le style vertical", + "settings.app.form.useVerticalStyle": "Use horizontal style", "settings.app.form.wakeUpStrategy": "Wake up strategy", "settings.app.headline": "Paramètres", "settings.app.headlineAdvanced": "Paramètres avancés", diff --git a/src/i18n/locales/it.json b/src/i18n/locales/it.json index d07a9bffd..163f62b21 100644 --- a/src/i18n/locales/it.json +++ b/src/i18n/locales/it.json @@ -249,7 +249,7 @@ "settings.app.form.startMinimized": "Avvio ridotto a icona", "settings.app.form.universalDarkMode": "Abilita la modalità scura universale", "settings.app.form.useTouchIdToUnlock": "Consenti l'utilizzo di TouchID per sbloccare Ferdi", - "settings.app.form.useVerticalStyle": "Usa stile verticale", + "settings.app.form.useVerticalStyle": "Use horizontal style", "settings.app.form.wakeUpStrategy": "Wake up strategy", "settings.app.headline": "Impostazioni", "settings.app.headlineAdvanced": "Avanzate", diff --git a/src/i18n/locales/ja.json b/src/i18n/locales/ja.json index 34d4c81cf..bb9157717 100644 --- a/src/i18n/locales/ja.json +++ b/src/i18n/locales/ja.json @@ -249,7 +249,7 @@ "settings.app.form.startMinimized": "最小化して起動", "settings.app.form.universalDarkMode": "ユニバーサルダークモードを有効にする", "settings.app.form.useTouchIdToUnlock": "Touch IDを使用してFerdiのロックを解除する", - "settings.app.form.useVerticalStyle": "垂直レイアウトを使用する", + "settings.app.form.useVerticalStyle": "Use horizontal style", "settings.app.form.wakeUpStrategy": "起動方法", "settings.app.headline": "設定", "settings.app.headlineAdvanced": "詳細", diff --git a/src/i18n/locales/ko.json b/src/i18n/locales/ko.json index 147e81647..573bcce19 100644 --- a/src/i18n/locales/ko.json +++ b/src/i18n/locales/ko.json @@ -249,7 +249,7 @@ "settings.app.form.startMinimized": "최소화 된 상태로 시작", "settings.app.form.universalDarkMode": "전체 다크 모드 활성화", "settings.app.form.useTouchIdToUnlock": "TouchID로 Ferdi 여는 것을 허용", - "settings.app.form.useVerticalStyle": "수직 스타일 사용", + "settings.app.form.useVerticalStyle": "Use horizontal style", "settings.app.form.wakeUpStrategy": "Wake up strategy", "settings.app.headline": "설정", "settings.app.headlineAdvanced": "고급", diff --git a/src/i18n/locales/pl.json b/src/i18n/locales/pl.json index 2bf259c66..2757914e5 100644 --- a/src/i18n/locales/pl.json +++ b/src/i18n/locales/pl.json @@ -249,7 +249,7 @@ "settings.app.form.startMinimized": "Uruchom zminimalizowany", "settings.app.form.universalDarkMode": "Włącz uniwersalny tryb ciemny", "settings.app.form.useTouchIdToUnlock": "Zezwól na odblokowanie Ferdi przez Touch ID", - "settings.app.form.useVerticalStyle": "Użyj stylu pionowego", + "settings.app.form.useVerticalStyle": "Use horizontal style", "settings.app.form.wakeUpStrategy": "Wake up strategy", "settings.app.headline": "Ustawienia", "settings.app.headlineAdvanced": "Zaawansowane", diff --git a/src/i18n/locales/pt-BR.json b/src/i18n/locales/pt-BR.json index b8865630e..fa76e582a 100644 --- a/src/i18n/locales/pt-BR.json +++ b/src/i18n/locales/pt-BR.json @@ -249,7 +249,7 @@ "settings.app.form.startMinimized": "Iniciar minimizado", "settings.app.form.universalDarkMode": "Habilitar modo noturno universal", "settings.app.form.useTouchIdToUnlock": "Permitir usar TouchID para desbloquear Ferdi", - "settings.app.form.useVerticalStyle": "Usar estilo vertical", + "settings.app.form.useVerticalStyle": "Use horizontal style", "settings.app.form.wakeUpStrategy": "Estratégia de despertar", "settings.app.headline": "Configurações", "settings.app.headlineAdvanced": "Avançado", -- cgit v1.2.3-70-g09d2 From cfae9f6fbc326245b8fb542a7fcfa5584bd49aad Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 27 Aug 2021 00:21:42 +0000 Subject: Update submodules, browserslist data updates and linter fixes [skip ci] --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 80a998864..c062fe39f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9706,9 +9706,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001251", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001251.tgz", - "integrity": "sha512-HOe1r+9VkU4TFmnU70z+r7OLmtR+/chB1rdcJUeQlAinjEeb0cKL20tlAtOagNZhbrtLnCvV19B4FmF1rgzl6A==", + "version": "1.0.30001252", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001252.tgz", + "integrity": "sha512-I56jhWDGMtdILQORdusxBOH+Nl/KgQSdDmpJezYddnAkVOmnoU8zwjTV9xAjMIYxr0iPreEAVylCGcmHCjfaOw==", "dev": true }, "caseless": { -- cgit v1.2.3-70-g09d2 From 829a9bef79dc30a9d1c70bbc39943dcb11b92082 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 27 Aug 2021 01:27:34 +0000 Subject: 5.6.1-nightly.40 [skip ci] --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index c062fe39f..91c6ae303 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "ferdi", - "version": "5.6.1-nightly.39", + "version": "5.6.1-nightly.40", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 9164ccf6b..a0fa8deed 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "productName": "Ferdi", "desktopName": "ferdi.desktop", "appId": "com.kytwb.ferdi", - "version": "5.6.1-nightly.39", + "version": "5.6.1-nightly.40", "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 a08bc62a14ac4081f8a36e7c3a62cf07de88d613 Mon Sep 17 00:00:00 2001 From: Vijay A Date: Fri, 27 Aug 2021 14:06:40 +0530 Subject: fix: allow the recipe to pass a string for the badge, ferdi can parse it correctly --- src/webview/badge.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/webview/badge.ts b/src/webview/badge.ts index fc420b903..b1da36271 100644 --- a/src/webview/badge.ts +++ b/src/webview/badge.ts @@ -21,9 +21,9 @@ export class BadgeHandler { return Math.max(adjustedNumber, 0); } - setBadge(direct: number, indirect: number) { - if (this.countCache.direct === direct - && this.countCache.indirect === indirect) { + setBadge(direct: string | number, indirect: string | number) { + if (this.countCache.direct.toString() === direct.toString() + && this.countCache.indirect.toString() === indirect.toString()) { return; } -- cgit v1.2.3-70-g09d2 From a053644936a882e8f31ddb5d3145d37456535cc5 Mon Sep 17 00:00:00 2001 From: Dawud <7688823+technowhizz@users.noreply.github.com> Date: Fri, 27 Aug 2021 09:46:42 +0100 Subject: Arabic translations --- src/i18n/locales/ar.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/i18n/locales/ar.json b/src/i18n/locales/ar.json index cd8c65611..b01c77aed 100644 --- a/src/i18n/locales/ar.json +++ b/src/i18n/locales/ar.json @@ -5,8 +5,8 @@ "changeserver.headline": "تغيير الخادم", "changeserver.label": "خادم", "changeserver.submit": "إرسال", - "changeserver.urlError": "Enter a valid URL", - "changeserver.warning": "Extra settings offered by Ferdi will not be saved", + "changeserver.urlError": "اكتب عنوان URL صالحًا", + "changeserver.warning": " لن يتم حفظ الإعدادات الإضافية التي يوفرها فردي ", "connectionLostBanner.cta": "إعادة تحميل الخدمة", "connectionLostBanner.informationLink": "ماذا حدث؟", "connectionLostBanner.message": "أوه لا! فقد فردي الاتصال بـ.", @@ -14,8 +14,8 @@ "feature.debugger.title": "نشر معلومات تصحيح الأخطاء", "feature.nightlyBuilds.activate": "Activate", "feature.nightlyBuilds.cancel": "إلغاء", - "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.", - "feature.nightlyBuilds.title": "Nightly Builds", + "feature.nightlyBuilds.info": "الإصدارات الليلية هي إصدارات تجريبية للغاية من فردي والتي قد تحتوي على ميزات غير مصقولة أو غير كاملة. يتم استخدام هذه الإنشاءات الليلية بشكل أساسي من قبل المطورين لاختبار ميزاتهم المطورة حديثًا وكيفية أدائهم في التصميم النهائي. إذا كنت لا تعرف ما تفعله ، فنقترح عدم تنشيط الإنشاءات الليلية.", + "feature.nightlyBuilds.title": "يبني ليلا", "feature.publishDebugInfo.error": "حدث خطأ أثناء محاولة نشر معلومات التصحيح. الرجاء المحاولة مرة أخرى لاحقاً أو عرض وحدة التحكم لمزيد من المعلومات.", "feature.publishDebugInfo.info": "نشر معلومات التصحيح الخاصة بك يساعدنا على العثور على المشاكل والأخطاء في فردي. بنشر معلومات التصحيح الخاصة بك فإنك تقبل سياسة الخصوصية وشروط خدمة مصحح فيردي", "feature.publishDebugInfo.privacy": "سياسة الخصوصية", @@ -85,22 +85,22 @@ "menu.app.settings": "الإعدادات", "menu.app.unhide": "Unhide", "menu.edit": "تعديل", - "menu.edit.copy": "Copy", - "menu.edit.cut": "Cut", + "menu.edit.copy": "نسخ", + "menu.edit.cut": "قطع", "menu.edit.delete": "حذف", "menu.edit.emojiSymbols": "الابتسامات والرموز التعبيرية", "menu.edit.findInPage": "البحث في الصفحة", - "menu.edit.paste": "Paste", + "menu.edit.paste": "لصق", "menu.edit.pasteAndMatchStyle": "Paste And Match Style", "menu.edit.redo": "Redo", - "menu.edit.selectAll": "Select All", + "menu.edit.selectAll": "اختر الكل", "menu.edit.speech": "الحديث", "menu.edit.startDictation": "بدء الإملاء", "menu.edit.startSpeaking": "بدء الحديث", "menu.edit.stopSpeaking": "إيقاف الحديث", "menu.edit.undo": "Undo", "menu.file": "الملف", - "menu.help": "Help", + "menu.help": "مساعدة", "menu.help.changelog": "سِجل التغيرات", "menu.help.debugInfo": "نسخ معلومات تصحيح الأخطاء", "menu.help.debugInfoCopiedBody": "تم نسخ معلومات تصحيح الأخطاء الخاصة بك إلى الحافظة.", @@ -113,7 +113,7 @@ "menu.help.tos": "شروط الخدمة", "menu.services": "الخدمات", "menu.services.activatePreviousService": "تفعيل الخدمة السابقة", - "menu.services.addNewService": "Add New Service", + "menu.services.addNewService": "أضف خدمة جديدة", "menu.services.goHome": "الرئيسية", "menu.services.setNextServiceActive": "تفعيل الخدمة التالية", "menu.todos": "المهام", @@ -249,7 +249,7 @@ "settings.app.form.startMinimized": "البدء بنافذة مصغرة", "settings.app.form.universalDarkMode": "تمكين الوضع المظلم الكامل", "settings.app.form.useTouchIdToUnlock": "السماح باستخدام TouchID لفتح فردي", - "settings.app.form.useVerticalStyle": "Use horizontal style", + "settings.app.form.useVerticalStyle": "استخدم النمط الأفقي", "settings.app.form.wakeUpStrategy": "Wake up strategy", "settings.app.headline": "الإعدادات", "settings.app.headlineAdvanced": "متقدم", -- cgit v1.2.3-70-g09d2 From a50a9c2e00e6213b5e9f9c9729b044a638d14437 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Fri, 27 Aug 2021 13:52:35 +0200 Subject: New Crowdin updates (#1845) --- src/i18n/locales/ar.json | 56 ++++++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/src/i18n/locales/ar.json b/src/i18n/locales/ar.json index b01c77aed..ded4a1913 100644 --- a/src/i18n/locales/ar.json +++ b/src/i18n/locales/ar.json @@ -5,17 +5,17 @@ "changeserver.headline": "تغيير الخادم", "changeserver.label": "خادم", "changeserver.submit": "إرسال", - "changeserver.urlError": "اكتب عنوان URL صالحًا", - "changeserver.warning": " لن يتم حفظ الإعدادات الإضافية التي يوفرها فردي ", + "changeserver.urlError": "الرجاء إدخال URL صحيح", + "changeserver.warning": "لن يتم حفظ الإعدادات الإضافية التي يوفرها فردي", "connectionLostBanner.cta": "إعادة تحميل الخدمة", "connectionLostBanner.informationLink": "ماذا حدث؟", "connectionLostBanner.message": "أوه لا! فقد فردي الاتصال بـ.", "feature.announcements.changelog.headline": "تغيرات في فريدي {version}", "feature.debugger.title": "نشر معلومات تصحيح الأخطاء", - "feature.nightlyBuilds.activate": "Activate", + "feature.nightlyBuilds.activate": "تفعيل", "feature.nightlyBuilds.cancel": "إلغاء", "feature.nightlyBuilds.info": "الإصدارات الليلية هي إصدارات تجريبية للغاية من فردي والتي قد تحتوي على ميزات غير مصقولة أو غير كاملة. يتم استخدام هذه الإنشاءات الليلية بشكل أساسي من قبل المطورين لاختبار ميزاتهم المطورة حديثًا وكيفية أدائهم في التصميم النهائي. إذا كنت لا تعرف ما تفعله ، فنقترح عدم تنشيط الإنشاءات الليلية.", - "feature.nightlyBuilds.title": "يبني ليلا", + "feature.nightlyBuilds.title": "المباني الليلية", "feature.publishDebugInfo.error": "حدث خطأ أثناء محاولة نشر معلومات التصحيح. الرجاء المحاولة مرة أخرى لاحقاً أو عرض وحدة التحكم لمزيد من المعلومات.", "feature.publishDebugInfo.info": "نشر معلومات التصحيح الخاصة بك يساعدنا على العثور على المشاكل والأخطاء في فردي. بنشر معلومات التصحيح الخاصة بك فإنك تقبل سياسة الخصوصية وشروط خدمة مصحح فيردي", "feature.publishDebugInfo.privacy": "سياسة الخصوصية", @@ -32,8 +32,8 @@ "global.spellchecking.autodetect": "الكشف عن اللغة تلقائياً", "global.spellchecking.autodetect.short": "تلقائي", "global.spellchecking.language": "لغة التدقيق الإملائي", - "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.", - "global.userAgentPref": "User Agent", + "global.userAgentHelp": "استخدم 'https://whatmyuseragent.com/' (لاكتشاف) أو 'https://developers.whatismybrowser.com/useragents/explore/' (لاختار) وكيل المستخدم المنشود و نسخه لصقه هنا.", + "global.userAgentPref": "وكيل المستخدم", "import.headline": "استيراد خدمات فردي الأربع", "import.notSupportedHeadline": "الخدمات غير مدعومة بعد في فردي الإصدار 5", "import.skip.label": "أريد أن أضيف الخدمات يدوياً", @@ -46,7 +46,7 @@ "infobar.requiredRequestsFailed": "تعذر تحميل الخدمات ومعلومات المستخدم", "infobar.servicesUpdated": "تم تحديث خدماتك.", "infobar.updateAvailable": "يتوفر تحديث جديد لفردي.", - "infobox.dismiss": "Dismiss", + "infobox.dismiss": "تجاهل", "invite.email.label": "البريد الإلكتروني", "invite.headline.friends": "قم بدعوة 3 من أصدقائك أو زملائك", "invite.name.label": "الاسم", @@ -80,10 +80,10 @@ "menu.app.autohideMenuBar": "إخفاء شريط القوائم تلقائيا", "menu.app.checkForUpdates": "التحقق من وجود تحديثات", "menu.app.hide": "إخفاء", - "menu.app.hideOthers": "Hide Others", - "menu.app.quit": "Quit", + "menu.app.hideOthers": "إخفاء الآخرين", + "menu.app.quit": "خروج", "menu.app.settings": "الإعدادات", - "menu.app.unhide": "Unhide", + "menu.app.unhide": "إظهار", "menu.edit": "تعديل", "menu.edit.copy": "نسخ", "menu.edit.cut": "قطع", @@ -91,21 +91,21 @@ "menu.edit.emojiSymbols": "الابتسامات والرموز التعبيرية", "menu.edit.findInPage": "البحث في الصفحة", "menu.edit.paste": "لصق", - "menu.edit.pasteAndMatchStyle": "Paste And Match Style", - "menu.edit.redo": "Redo", - "menu.edit.selectAll": "اختر الكل", + "menu.edit.pasteAndMatchStyle": "لصق ومطابقة النمط", + "menu.edit.redo": "إعادة", + "menu.edit.selectAll": "إختر الكل", "menu.edit.speech": "الحديث", "menu.edit.startDictation": "بدء الإملاء", "menu.edit.startSpeaking": "بدء الحديث", "menu.edit.stopSpeaking": "إيقاف الحديث", - "menu.edit.undo": "Undo", + "menu.edit.undo": "تراجع", "menu.file": "الملف", "menu.help": "مساعدة", "menu.help.changelog": "سِجل التغيرات", "menu.help.debugInfo": "نسخ معلومات تصحيح الأخطاء", "menu.help.debugInfoCopiedBody": "تم نسخ معلومات تصحيح الأخطاء الخاصة بك إلى الحافظة.", "menu.help.debugInfoCopiedHeadline": "معلومات تصحيح الأخطاء لفردي", - "menu.help.importExportData": "Import/Export Configuration Data", + "menu.help.importExportData": "استيراد/تصدير بيانات التكوين", "menu.help.learnMore": "معرفة المزيد", "menu.help.privacy": "بيان الخصوصية", "menu.help.publishDebugInfo": "نشر معلومات تصحيح الأخطاء", @@ -113,7 +113,7 @@ "menu.help.tos": "شروط الخدمة", "menu.services": "الخدمات", "menu.services.activatePreviousService": "تفعيل الخدمة السابقة", - "menu.services.addNewService": "أضف خدمة جديدة", + "menu.services.addNewService": "إضافة خدمة جديدة", "menu.services.goHome": "الرئيسية", "menu.services.setNextServiceActive": "تفعيل الخدمة التالية", "menu.todos": "المهام", @@ -123,20 +123,20 @@ "menu.view.forward": "تقدم", "menu.view.lockFerdi": "قفل فردي", "menu.view.openQuickSwitch": "فتح التبديل السريع", - "menu.view.reloadFerdi": "Reload Ferdi", + "menu.view.reloadFerdi": "إعادة فردي", "menu.view.reloadService": "إعادة تحميل الخدمة", "menu.view.reloadTodos": "Reload ToDos", - "menu.view.resetZoom": "Actual Size", + "menu.view.resetZoom": "الحجم الأصلي", "menu.view.toggleDarkMode": "تفعيل الوضع المظلم", "menu.view.toggleDevTools": "فتح أدوات المطور", - "menu.view.toggleFullScreen": "Toggle Full Screen", + "menu.view.toggleFullScreen": "تفعيل وضع ملء الشاشة", "menu.view.toggleServiceDevTools": "فتح أدوات المطور للخدمة", "menu.view.toggleTodosDevTools": "ادخل إلى أدوات مطوري تودوس", - "menu.view.zoomIn": "Zoom In", - "menu.view.zoomOut": "Zoom Out", - "menu.window": "Window", - "menu.window.close": "Close", - "menu.window.minimize": "Minimize", + "menu.view.zoomIn": "تكبير", + "menu.view.zoomOut": "تصغير", + "menu.window": "النافذة", + "menu.window.close": "إغلاق", + "menu.window.minimize": "تصغير النافذة", "menu.workspaces": "مساحاتُ العمل", "menu.workspaces.addNewWorkspace": "إضافة مساحة عمل جديدة...", "menu.workspaces.closeWorkspaceDrawer": "غلقُ دُرجِ مساحة العمل", @@ -198,12 +198,12 @@ "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})", "settings.app.buttonClearAllCache": "مسح ذاكرة التخزين المؤقت", "settings.app.buttonInstallUpdate": "إعادة التشغيل وتثبيت التحديث", - "settings.app.buttonOpenFerdiProfileFolder": "Open Profile folder", + "settings.app.buttonOpenFerdiProfileFolder": "فتح مجلد الملف الشخصي", "settings.app.buttonOpenFerdiServiceRecipesFolder": "Open Service Recipes folder", "settings.app.buttonSearchForUpdate": "التحقق من وجود تحديثات", "settings.app.cacheInfo": "التخزين المؤقت لفردي يستخدم حاليا {size} من مساحة القرص.", "settings.app.cacheNotCleared": "تعذر مسح كل ذاكرة التخزين المؤقت", - "settings.app.closeSettings": "Close settings", + "settings.app.closeSettings": "إغلاق الإعدادات", "settings.app.currentVersion": "الإصدار الحالي:", "settings.app.form.accentColor": "لون التمييز", "settings.app.form.adaptableDarkMode": "مزامنة الوضع المظلم مع إعداد الوضع المظلم لنظام التشغيل الخاص بي", @@ -232,7 +232,7 @@ "settings.app.form.minimizeToSystemTray": "تصغير النافذة إلى جانب شريط المهام", "settings.app.form.navigationBarBehaviour": "سلوك شريط التنقل", "settings.app.form.notifyTaskBarOnMessage": "Notify TaskBar/Dock on new message", - "settings.app.form.passwordToggle": "Password toggle", + "settings.app.form.passwordToggle": "تبديل كلمة المرور", "settings.app.form.predefinedTodoServer": "خادم Todo", "settings.app.form.privateNotifications": "عدم إظهار محتوى الرسالة في الإشعارات", "settings.app.form.reloadAfterResume": "إعادة تحميل فيردي بعد أعادة تشغيل النظام", @@ -249,7 +249,7 @@ "settings.app.form.startMinimized": "البدء بنافذة مصغرة", "settings.app.form.universalDarkMode": "تمكين الوضع المظلم الكامل", "settings.app.form.useTouchIdToUnlock": "السماح باستخدام TouchID لفتح فردي", - "settings.app.form.useVerticalStyle": "استخدم النمط الأفقي", + "settings.app.form.useVerticalStyle": "استخدام النمط الأفقي", "settings.app.form.wakeUpStrategy": "Wake up strategy", "settings.app.headline": "الإعدادات", "settings.app.headlineAdvanced": "متقدم", -- cgit v1.2.3-70-g09d2 From c289445c606be0b0d913a36542054b6fc4ec06b5 Mon Sep 17 00:00:00 2001 From: Bennett Date: Fri, 27 Aug 2021 15:46:13 +0200 Subject: docs: remove Franz brand; refactor: switch from misty to concurrently (#1846) * fix(docs): remove adlk's mail address from our docs * refactor(dev): move from misty to concurrently * fix(git): revert i18n change * fix(git): revert changes to i18n --- CODE_OF_CONDUCT.md | 2 +- CONTRIBUTING.md | 6 +- misty.yml | 6 - package-lock.json | 506 +++++++++++++++++++++++++++++++++++++++++++---------- package.json | 3 + 5 files changed, 424 insertions(+), 99 deletions(-) delete mode 100644 misty.yml diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 0b41fc123..f85cb2205 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -8,4 +8,4 @@ We promise to extend courtesy and respect to everyone involved in this project r If any member of the community violates this code of conduct, the maintainers of the Ferdi project may take action, removing issues, comments, and PRs or blocking accounts as deemed appropriate. -If you are subject to or witness unacceptable behavior, or have any other concerns, please open an issue or send an email to [Stefan](stefan@adlk.io). +If you are subject to or witness unacceptable behavior, or have any other concerns, please open an issue or send an email to [our contact mail](hello@getferdi.com). diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1c3fb977f..a0264ea98 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -38,7 +38,7 @@ ## Code of Conduct -This project and everyone participating in it is governed by the [Ferdi Code of Conduct](CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to [stefan@adlk.io](mailto:stefan@adlk.io). +This project and everyone participating in it is governed by the [Ferdi Code of Conduct](CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to [hello@getferdi.com](mailto:hello@getferdi.com). ## What should I know before I get started? @@ -195,10 +195,10 @@ npm run dev DEBUG=Ferdi:* npm run start ``` -- Optionally, you can run both commands in one terminal with [misty](https://github.com/adlk/misty) (see [misty.yml](https://github.com/getferdi/ferdi/blob/develop/misty.yml)): +- Optionally, you can run both commands in one terminal with [concurrently](https://www.npmjs.com/package/concurrently): ```bash -DEBUG=Ferdi:* npx misty +DEBUG=Ferdi:* npm run start:all-dev ``` Note: please prefer [`debug()`](https://github.com/visionmedia/debug) over `console.log()`. diff --git a/misty.yml b/misty.yml deleted file mode 100644 index f1184287d..000000000 --- a/misty.yml +++ /dev/null @@ -1,6 +0,0 @@ -code: - cmd: npm run dev - -app: - cmd: npm start - waitOn: http://localhost:8080 diff --git a/package-lock.json b/package-lock.json index 91c6ae303..ab0d82e82 100644 --- a/package-lock.json +++ b/package-lock.json @@ -45,6 +45,57 @@ "supports-color": "^5.3.0" } }, + "cliui": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz", + "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==", + "dev": true, + "requires": { + "string-width": "^2.1.1", + "strip-ansi": "^4.0.0", + "wrap-ansi": "^2.0.0" + } + }, + "concurrently": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-4.1.2.tgz", + "integrity": "sha512-Kim9SFrNr2jd8/0yNYqDTFALzUX1tvimmwFWxmp/D4mRI+kbqIIwE2RkBDrxS2ic25O1UgQMI5AtBqdtX3ynYg==", + "dev": true, + "requires": { + "chalk": "^2.4.2", + "date-fns": "^1.30.1", + "lodash": "^4.17.15", + "read-pkg": "^4.0.1", + "rxjs": "^6.5.2", + "spawn-command": "^0.0.2-1", + "supports-color": "^4.5.0", + "tree-kill": "^1.2.1", + "yargs": "^12.0.5" + }, + "dependencies": { + "supports-color": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz", + "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", + "dev": true, + "requires": { + "has-flag": "^2.0.0" + } + } + } + }, + "date-fns": { + "version": "1.30.1", + "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-1.30.1.tgz", + "integrity": "sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==", + "dev": true + }, + "has-flag": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", + "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=", + "dev": true + }, "js-yaml": { "version": "3.14.1", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", @@ -54,6 +105,66 @@ "argparse": "^1.0.7", "esprima": "^4.0.0" } + }, + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", + "dev": true + }, + "read-pkg": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-4.0.1.tgz", + "integrity": "sha1-ljYlN48+HE1IyFhytabsfV0JMjc=", + "dev": true, + "requires": { + "normalize-package-data": "^2.3.2", + "parse-json": "^4.0.0", + "pify": "^3.0.0" + } + }, + "wait-on": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-3.3.0.tgz", + "integrity": "sha512-97dEuUapx4+Y12aknWZn7D25kkjMk16PbWoYzpSdA8bYpVfS6hpl2a2pOWZ3c+Tyt3/i4/pglyZctG3J4V1hWQ==", + "dev": true, + "requires": { + "@hapi/joi": "^15.0.3", + "core-js": "^2.6.5", + "minimist": "^1.2.0", + "request": "^2.88.0", + "rx": "^4.1.0" + } + }, + "yargs": { + "version": "12.0.5", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz", + "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==", + "dev": true, + "requires": { + "cliui": "^4.0.0", + "decamelize": "^1.2.0", + "find-up": "^3.0.0", + "get-caller-file": "^1.0.1", + "os-locale": "^3.0.0", + "require-directory": "^2.1.1", + "require-main-filename": "^1.0.1", + "set-blocking": "^2.0.0", + "string-width": "^2.0.0", + "which-module": "^2.0.0", + "y18n": "^3.2.1 || ^4.0.0", + "yargs-parser": "^11.1.1" + } + }, + "yargs-parser": { + "version": "11.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz", + "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==", + "dev": true, + "requires": { + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + } } } }, @@ -2548,9 +2659,9 @@ "dev": true }, "@hapi/hoek": { - "version": "8.5.1", - "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.5.1.tgz", - "integrity": "sha512-yN7kbciD87WzLGc5539Tn0sApjyiGHAJgKvG9W8C7O+6c7qmoQMfVs0W4bX17eqz6C78QJqqFrtgdK5EWf6Qow==", + "version": "9.2.0", + "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.2.0.tgz", + "integrity": "sha512-sqKVVVOe5ivCaXDWivIJYVSaEgdQK9ul7a4Kity5Iw7u9+wBAPbX1RMSnLLmp7O4Vzj0WOWwMAJsTL00xwaNug==", "dev": true }, "@hapi/joi": { @@ -2563,15 +2674,32 @@ "@hapi/bourne": "1.x.x", "@hapi/hoek": "8.x.x", "@hapi/topo": "3.x.x" + }, + "dependencies": { + "@hapi/hoek": { + "version": "8.5.1", + "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.5.1.tgz", + "integrity": "sha512-yN7kbciD87WzLGc5539Tn0sApjyiGHAJgKvG9W8C7O+6c7qmoQMfVs0W4bX17eqz6C78QJqqFrtgdK5EWf6Qow==", + "dev": true + }, + "@hapi/topo": { + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-3.1.6.tgz", + "integrity": "sha512-tAag0jEcjwH+P2quUfipd7liWCNX2F8NvYjQp2wtInsZxnMlypdw0FtAOLxtvvkO+GSRRbmNi8m/5y42PQJYCQ==", + "dev": true, + "requires": { + "@hapi/hoek": "^8.3.0" + } + } } }, "@hapi/topo": { - "version": "3.1.6", - "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-3.1.6.tgz", - "integrity": "sha512-tAag0jEcjwH+P2quUfipd7liWCNX2F8NvYjQp2wtInsZxnMlypdw0FtAOLxtvvkO+GSRRbmNi8m/5y42PQJYCQ==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.1.0.tgz", + "integrity": "sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==", "dev": true, "requires": { - "@hapi/hoek": "^8.3.0" + "@hapi/hoek": "^9.0.0" } }, "@humanwhocodes/config-array": { @@ -6359,6 +6487,27 @@ } } }, + "@sideway/address": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.2.tgz", + "integrity": "sha512-idTz8ibqWFrPU8kMirL0CoPH/A29XOzzAzpyN3zQ4kAWnzmNfFmRaoMNN6VI8ske5M73HZyhIaW4OuSFIdM4oA==", + "dev": true, + "requires": { + "@hapi/hoek": "^9.0.0" + } + }, + "@sideway/formula": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@sideway/formula/-/formula-3.0.0.tgz", + "integrity": "sha512-vHe7wZ4NOXVfkoRb8T5otiENVlT7a3IAiw7H5M2+GO+9CDgcVUUsX1zalAztCmwyOr2RUTGJdgB+ZvSVqmdHmg==", + "dev": true + }, + "@sideway/pinpoint": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@sideway/pinpoint/-/pinpoint-2.0.0.tgz", + "integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==", + "dev": true + }, "@sindresorhus/is": { "version": "0.14.0", "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz", @@ -8463,6 +8612,15 @@ "integrity": "sha512-5LMaDRWm8ZFPAEdzTYmgjjEdj1YnQcpfrVajO/sn/LhbpGp0Y0H64c2hLZI1gRMxfA+w1S71Uc/nHaOXgcCvGg==", "dev": true }, + "axios": { + "version": "0.21.1", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz", + "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==", + "dev": true, + "requires": { + "follow-redirects": "^1.10.0" + } + }, "axobject-query": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz", @@ -9995,14 +10153,83 @@ "dev": true }, "cliui": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz", - "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==", + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", + "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", "dev": true, "requires": { - "string-width": "^2.1.1", - "strip-ansi": "^4.0.0", - "wrap-ansi": "^2.0.0" + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^7.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "dev": true + }, + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true + }, + "string-width": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", + "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==", + "dev": true, + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" + } + }, + "strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "dev": true, + "requires": { + "ansi-regex": "^5.0.0" + } + }, + "wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "requires": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + } + } } }, "clone": { @@ -10569,59 +10796,80 @@ } }, "concurrently": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-4.1.2.tgz", - "integrity": "sha512-Kim9SFrNr2jd8/0yNYqDTFALzUX1tvimmwFWxmp/D4mRI+kbqIIwE2RkBDrxS2ic25O1UgQMI5AtBqdtX3ynYg==", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-6.2.1.tgz", + "integrity": "sha512-emgwhH+ezkuYKSHZQ+AkgEpoUZZlbpPVYCVv7YZx0r+T7fny1H03r2nYRebpi2DudHR4n1Rgbo2YTxKOxVJ4+g==", "dev": true, "requires": { - "chalk": "^2.4.2", - "date-fns": "^1.30.1", - "lodash": "^4.17.15", - "read-pkg": "^4.0.1", - "rxjs": "^6.5.2", + "chalk": "^4.1.0", + "date-fns": "^2.16.1", + "lodash": "^4.17.21", + "read-pkg": "^5.2.0", + "rxjs": "^6.6.3", "spawn-command": "^0.0.2-1", - "supports-color": "^4.5.0", - "tree-kill": "^1.2.1", - "yargs": "^12.0.5" + "supports-color": "^8.1.0", + "tree-kill": "^1.2.2", + "yargs": "^16.2.0" }, "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" }, "dependencies": { "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, "requires": { - "has-flag": "^3.0.0" + "has-flag": "^4.0.0" } } } }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, "supports-color": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz", - "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", "dev": true, "requires": { - "has-flag": "^2.0.0" - }, - "dependencies": { - "has-flag": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", - "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=", - "dev": true - } + "has-flag": "^4.0.0" } } } @@ -11645,9 +11893,9 @@ } }, "date-fns": { - "version": "1.30.1", - "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-1.30.1.tgz", - "integrity": "sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==", + "version": "2.23.0", + "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.23.0.tgz", + "integrity": "sha512-5ycpauovVyAk0kXNZz6ZoB9AYMZB4DObse7P3BPWmyEjXNORTI8EJ6X0uaSAq4sCHzM1uajzrkr6HnsLQpxGXA==", "dev": true }, "dateformat": { @@ -19459,6 +19707,19 @@ } } }, + "joi": { + "version": "17.4.2", + "resolved": "https://registry.npmjs.org/joi/-/joi-17.4.2.tgz", + "integrity": "sha512-Lm56PP+n0+Z2A2rfRvsfWVDXGEWjXxatPopkQ8qQ5mxCEhwHG+Ettgg5o98FFaxilOxozoa14cFhrE/hOzh/Nw==", + "dev": true, + "requires": { + "@hapi/hoek": "^9.0.0", + "@hapi/topo": "^5.0.0", + "@sideway/address": "^4.1.0", + "@sideway/formula": "^3.0.0", + "@sideway/pinpoint": "^2.0.0" + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -25111,20 +25372,33 @@ } }, "read-pkg": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-4.0.1.tgz", - "integrity": "sha1-ljYlN48+HE1IyFhytabsfV0JMjc=", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", + "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==", "dev": true, "requires": { - "normalize-package-data": "^2.3.2", - "parse-json": "^4.0.0", - "pify": "^3.0.0" + "@types/normalize-package-data": "^2.4.0", + "normalize-package-data": "^2.5.0", + "parse-json": "^5.0.0", + "type-fest": "^0.6.0" }, "dependencies": { - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", + "parse-json": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", + "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "error-ex": "^1.3.1", + "json-parse-even-better-errors": "^2.3.0", + "lines-and-columns": "^1.1.6" + } + }, + "type-fest": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz", + "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==", "dev": true } } @@ -29034,16 +29308,33 @@ } }, "wait-on": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-3.3.0.tgz", - "integrity": "sha512-97dEuUapx4+Y12aknWZn7D25kkjMk16PbWoYzpSdA8bYpVfS6hpl2a2pOWZ3c+Tyt3/i4/pglyZctG3J4V1hWQ==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-6.0.0.tgz", + "integrity": "sha512-tnUJr9p5r+bEYXPUdRseolmz5XqJTTj98JgOsfBn7Oz2dxfE2g3zw1jE+Mo8lopM3j3et/Mq1yW7kKX6qw7RVw==", "dev": true, "requires": { - "@hapi/joi": "^15.0.3", - "core-js": "^2.6.5", - "minimist": "^1.2.0", - "request": "^2.88.0", - "rx": "^4.1.0" + "axios": "^0.21.1", + "joi": "^17.4.0", + "lodash": "^4.17.21", + "minimist": "^1.2.5", + "rxjs": "^7.1.0" + }, + "dependencies": { + "rxjs": { + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.3.0.tgz", + "integrity": "sha512-p2yuGIg9S1epc3vrjKf6iVb3RCaAYjYskkO+jHIaV0IjOPlJop4UnodOoFb2xeNwlguqLYvGw1b1McillYb5Gw==", + "dev": true, + "requires": { + "tslib": "~2.1.0" + } + }, + "tslib": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", + "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==", + "dev": true + } } }, "walker": { @@ -30328,34 +30619,71 @@ "dev": true }, "yargs": { - "version": "12.0.5", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz", - "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==", + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", + "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", "dev": true, "requires": { - "cliui": "^4.0.0", - "decamelize": "^1.2.0", - "find-up": "^3.0.0", - "get-caller-file": "^1.0.1", - "os-locale": "^3.0.0", + "cliui": "^7.0.2", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", - "set-blocking": "^2.0.0", - "string-width": "^2.0.0", - "which-module": "^2.0.0", - "y18n": "^3.2.1 || ^4.0.0", - "yargs-parser": "^11.1.1" + "string-width": "^4.2.0", + "y18n": "^5.0.5", + "yargs-parser": "^20.2.2" + }, + "dependencies": { + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "dev": true + }, + "get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true + }, + "string-width": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", + "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==", + "dev": true, + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" + } + }, + "strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "dev": true, + "requires": { + "ansi-regex": "^5.0.0" + } + }, + "y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "dev": true + } } }, "yargs-parser": { - "version": "11.1.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz", - "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==", - "dev": true, - "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - } + "version": "20.2.9", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", + "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", + "dev": true }, "yargs-unparser": { "version": "2.0.0", diff --git a/package.json b/package.json index a0fa8deed..7044b1f72 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,7 @@ "start": "electron ./build", "start:local": "cross-env USE_LOCAL_API=1 npm start", "start:live": "cross-env USE_LIVE_API=1 npm start", + "start:all-dev": "concurrently \"npm run dev\" \"wait-on http://localhost:8080 && npm start\"", "dev": "cross-env NODE_ENV=development gulp dev", "test": "jest", "test:watch": "jest --watch", @@ -161,6 +162,7 @@ "all-contributors-cli": "6.20.0", "babel-plugin-react-intl": "3.5.1", "commitizen": "4.2.4", + "concurrently": "6.2.1", "conventional-changelog-cli": "2.1.1", "cross-env": "7.0.3", "cz-conventional-changelog": "3.3.0", @@ -206,6 +208,7 @@ "terser": "4.8.0", "ts-loader": "5.4.5", "typescript": "3.9.10", + "wait-on": "6.0.0", "webpack": "4.46.0", "webpack-cli": "3.3.12", "webpack-dev-server": "3.11.2" -- cgit v1.2.3-70-g09d2 From 3c5d66739979859d456a711b6b7ce316e17d654f Mon Sep 17 00:00:00 2001 From: Vijay A Date: Fri, 27 Aug 2021 20:12:04 +0530 Subject: chore: upgrade 'nodejs' to '14.17.5' --- .github/workflows/dependency-updates.yml | 4 ++-- .github/workflows/ferdi-builds.yml | 12 ++++++------ .nvmrc | 2 +- CHANGELOG.md | 10 ++++++++++ CONTRIBUTING.md | 2 +- Dockerfile | 2 +- recipes | 2 +- 7 files changed, 22 insertions(+), 12 deletions(-) diff --git a/.github/workflows/dependency-updates.yml b/.github/workflows/dependency-updates.yml index a9406df23..dafcfa4d1 100644 --- a/.github/workflows/dependency-updates.yml +++ b/.github/workflows/dependency-updates.yml @@ -40,10 +40,10 @@ jobs: restore-keys: | ${{ runner.os }}-14.17-build-${{ env.cache-name }}- ${{ runner.os }}-14.17-build- - - name: Use Node.js 14.17.3 + - name: Use Node.js 14.17.5 uses: actions/setup-node@v2 with: - node-version: 14.17.3 + node-version: 14.17.5 - name: Uninstall locally and reinstall global npm modules run: | npm uninstall node-gyp diff --git a/.github/workflows/ferdi-builds.yml b/.github/workflows/ferdi-builds.yml index 7a701758e..ec40d267c 100644 --- a/.github/workflows/ferdi-builds.yml +++ b/.github/workflows/ferdi-builds.yml @@ -130,10 +130,10 @@ jobs: with: key: ${{ runner.os }}-${{ env.cache-name }} path: ${{ env.ELECTRON_BUILDER_CACHE }} - - name: Use Node.js 14.17.3 + - name: Use Node.js 14.17.5 uses: actions/setup-node@v2 with: - node-version: 14.17.3 + node-version: 14.17.5 - name: Upgrade Xcode version on the macOS 10.15 default runners provided by GH Actions run: | sudo rm -Rf /Library/Developer/CommandLineTools/SDKs/* @@ -228,10 +228,10 @@ jobs: with: key: ${{ runner.os }}-${{ env.cache-name }} path: ${{ env.ELECTRON_BUILDER_CACHE }} - - name: Use Node.js 14.17.3 + - name: Use Node.js 14.17.5 uses: actions/setup-node@v2 with: - node-version: 14.17.3 + node-version: 14.17.5 - name: Uninstall locally and reinstall global npm modules run: | npm uninstall node-gyp @@ -343,10 +343,10 @@ jobs: with: key: ${{ runner.os }}-${{ env.cache-name }} path: ${{ env.ELECTRON_BUILDER_CACHE }} - - name: Use Node.js 14.17.3 + - name: Use Node.js 14.17.5 uses: actions/setup-node@v2 with: - node-version: 14.17.3 + node-version: 14.17.5 - name: Uninstall locally and reinstall global npm modules run: | npm uninstall node-gyp diff --git a/.nvmrc b/.nvmrc index c6244cda0..18711d290 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -14.17.3 +14.17.5 diff --git a/CHANGELOG.md b/CHANGELOG.md index 7840cc6f6..76760ca0b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +# [v5.6.1-nightly.41](https://github.com/getferdi/ferdi/compare/v5.6.1-nightly.40...v5.6.1-nightly.41) (2021-08-28) + +### Internal + +- Upgraded 'nodejs' to '14.17.5' 💖 @vraravam +- Remove Franz brand 💖 @vantezzen +- Switch from `misty` to `concurrently` (#1846) 💖 @vantezzen +- Services: Normalized all service recipes to be es6 compliant 💖 @vraravam +- Services: Change entry point in the 'facebookpages' service (getferdi/recipes#640) 💖 @oda-alexandre, @vraravam + # [v5.6.1-nightly.40](https://github.com/getferdi/ferdi/compare/v5.6.1-nightly.38...v5.6.1-nightly.40) (2021-08-27) ### Bug Fixes diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a0264ea98..b79432d43 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -60,7 +60,7 @@ Currently, these are the combinations of system dependencies that work for MacOS ```bash node -v -v14.17.3 +v14.17.5 npm -v 6.14.13 ``` diff --git a/Dockerfile b/Dockerfile index 7fd79fb3a..e69babe2b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # Note: Before running this file, you should have already cloned the git repo + submodules on the host machine. This is used when actively developing on your local machine, but you want to build for a different architecture -FROM node:14.17.3-buster as builder +FROM node:14.17.5-buster as builder # TODO: Need to setup a non-root user for security purposes diff --git a/recipes b/recipes index fe613088a..79b0da05a 160000 --- a/recipes +++ b/recipes @@ -1 +1 @@ -Subproject commit fe613088a813394760ca27afeee554cfa7290d67 +Subproject commit 79b0da05aefae85bdea794fbe70e5d19fe609ac1 -- cgit v1.2.3-70-g09d2 From 958cdd73e2b286c4e125e0e9c649616f7535b1f6 Mon Sep 17 00:00:00 2001 From: Vijay A Date: Fri, 27 Aug 2021 23:12:21 +0530 Subject: feat: Added 'tinder' service. [skip ci] --- CHANGELOG.md | 2 ++ recipes | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 76760ca0b..c1ef5a3f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # [v5.6.1-nightly.41](https://github.com/getferdi/ferdi/compare/v5.6.1-nightly.40...v5.6.1-nightly.41) (2021-08-28) +- Services: Add 'tinder' service (getferdi/recipes#641) 💖 @oda-alexandre + ### Internal - Upgraded 'nodejs' to '14.17.5' 💖 @vraravam diff --git a/recipes b/recipes index 79b0da05a..38243e6b6 160000 --- a/recipes +++ b/recipes @@ -1 +1 @@ -Subproject commit 79b0da05aefae85bdea794fbe70e5d19fe609ac1 +Subproject commit 38243e6b6e4f38c0afe52a2f14743feb3f461894 -- cgit v1.2.3-70-g09d2 From 95ac9dabf1344a3292906c732585d0af8e4438a2 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 28 Aug 2021 01:16:04 +0000 Subject: 5.6.1-nightly.41 [skip ci] --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index ab0d82e82..bfc99e9e2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "ferdi", - "version": "5.6.1-nightly.40", + "version": "5.6.1-nightly.41", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 7044b1f72..7b1802759 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "productName": "Ferdi", "desktopName": "ferdi.desktop", "appId": "com.kytwb.ferdi", - "version": "5.6.1-nightly.40", + "version": "5.6.1-nightly.41", "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 c4a5812353d4f558a0f1f2b317b2905284fca545 Mon Sep 17 00:00:00 2001 From: Vijay A Date: Sat, 28 Aug 2021 07:18:57 +0530 Subject: chore: upgrade 'electron' to '13.2.3' --- CHANGELOG.md | 4 ++++ package-lock.json | 12 ++++++------ package.json | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c1ef5a3f2..aad2fc8c0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# [v5.6.1-nightly.42](https://github.com/getferdi/ferdi/compare/v5.6.1-nightly.41...v5.6.1-nightly.42) (2021-08-29) + +- Upgraded to [electron 13.2.3](https://github.com/electron/electron/releases/tag/v13.2.3) 💖 @vraravam + # [v5.6.1-nightly.41](https://github.com/getferdi/ferdi/compare/v5.6.1-nightly.40...v5.6.1-nightly.41) (2021-08-28) - Services: Add 'tinder' service (getferdi/recipes#641) 💖 @oda-alexandre diff --git a/package-lock.json b/package-lock.json index bfc99e9e2..b43fa9156 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12653,9 +12653,9 @@ } }, "electron": { - "version": "13.2.2", - "resolved": "https://registry.npmjs.org/electron/-/electron-13.2.2.tgz", - "integrity": "sha512-thGq2YaZqQWK1HexRghxdb26a8hA7ZSebukUSHlnHrY9+Sx9rW7e3uEHbibk/seRXVoXO76HndjKdHyObP9/Kw==", + "version": "13.2.3", + "resolved": "https://registry.npmjs.org/electron/-/electron-13.2.3.tgz", + "integrity": "sha512-FzWhbKHjq7ZTpPQFaYiLPL64erC8/BOsu5NlNN9nQ6f7rIP8ygKlNAlQit3vbOcksQAwItDUCIw4sW0mcaRpCA==", "dev": true, "requires": { "@electron/get": "^1.0.1", @@ -15727,9 +15727,9 @@ }, "dependencies": { "core-js": { - "version": "3.16.2", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.16.2.tgz", - "integrity": "sha512-P0KPukO6OjMpjBtHSceAZEWlDD1M2Cpzpg6dBbrjFqFhBHe/BwhxaP820xKOjRn/lZRQirrCusIpLS/n2sgXLQ==", + "version": "3.16.3", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.16.3.tgz", + "integrity": "sha512-lM3GftxzHNtPNUJg0v4pC2RC6puwMd6VZA7vXUczi+SKmCWSf4JwO89VJGMqbzmB7jlK7B5hr3S64PqwFL49cA==", "dev": true, "optional": true } diff --git a/package.json b/package.json index 7b1802759..0963b9f50 100644 --- a/package.json +++ b/package.json @@ -167,7 +167,7 @@ "cross-env": "7.0.3", "cz-conventional-changelog": "3.3.0", "dotenv": "10.0.0", - "electron": "13.2.2", + "electron": "13.2.3", "electron-builder": "22.12.1", "electron-notarize": "1.1.0", "eslint": "7.32.0", -- cgit v1.2.3-70-g09d2 From 5e0695014405789c989cb3cec6a624c7a6af5980 Mon Sep 17 00:00:00 2001 From: Vijay A Date: Sat, 28 Aug 2021 19:50:12 +0530 Subject: docs: Updated changelog [skip ci] --- CHANGELOG.md | 1 + README.md | 2 +- recipes | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aad2fc8c0..4b090c2fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # [v5.6.1-nightly.42](https://github.com/getferdi/ferdi/compare/v5.6.1-nightly.41...v5.6.1-nightly.42) (2021-08-29) - Upgraded to [electron 13.2.3](https://github.com/electron/electron/releases/tag/v13.2.3) 💖 @vraravam +- New services: amazon web services (getferdi/recipes#643), binance (getferdi/recipes#645), ovh-cloud (getferdi/recipes#650), scribens (getferdi/recipes#651), docker hub (getferdi/recipes#644), bitwarden (getferdi/recipes#647), google translate (getferdi/recipes#642) 💖 @oda-alexandre, @vraravam # [v5.6.1-nightly.41](https://github.com/getferdi/ferdi/compare/v5.6.1-nightly.40...v5.6.1-nightly.41) (2021-08-28) diff --git a/README.md b/README.md index 31276ca8b..056f0085d 100644 --- a/README.md +++ b/README.md @@ -65,7 +65,7 @@ Ferdi is a desktop app that helps you organize how you use your favourite apps b ## Features - [x] Ferdi puts all your web apps into one place -- [x] Native support for 180+ services +- [x] Native support for 189 services - [x] Workspaces to keep your personal and work life separated - [x] Support for multiple accounts on any service - [x] Dark Mode support for all of your services diff --git a/recipes b/recipes index 38243e6b6..a412aad89 160000 --- a/recipes +++ b/recipes @@ -1 +1 @@ -Subproject commit 38243e6b6e4f38c0afe52a2f14743feb3f461894 +Subproject commit a412aad89176dffa802d1df4bc888cbb354e6614 -- cgit v1.2.3-70-g09d2 From f60537150e55ed555d659f3c96a9dbf739d881de Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 29 Aug 2021 01:25:46 +0000 Subject: 5.6.1-nightly.42 [skip ci] --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index b43fa9156..2ee3d1e9e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "ferdi", - "version": "5.6.1-nightly.41", + "version": "5.6.1-nightly.42", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 0963b9f50..6c109d18e 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "productName": "Ferdi", "desktopName": "ferdi.desktop", "appId": "com.kytwb.ferdi", - "version": "5.6.1-nightly.41", + "version": "5.6.1-nightly.42", "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 ec08008e349ca8210c9620f75f816d5c1f9992b3 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 30 Aug 2021 00:19:29 +0000 Subject: Update submodules, browserslist data updates and linter fixes [skip ci] --- recipes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes b/recipes index a412aad89..7a3d8fa7f 160000 --- a/recipes +++ b/recipes @@ -1 +1 @@ -Subproject commit a412aad89176dffa802d1df4bc888cbb354e6614 +Subproject commit 7a3d8fa7f56986e0394e93ebbcb3d0a47785d737 -- cgit v1.2.3-70-g09d2 From 019ed498f4246d2c1df08bbd35b85623704a3f77 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 30 Aug 2021 02:03:01 +0000 Subject: 5.6.1-nightly.43 [skip ci] --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2ee3d1e9e..c9572ec89 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "ferdi", - "version": "5.6.1-nightly.42", + "version": "5.6.1-nightly.43", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 6c109d18e..e8668f1a6 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "productName": "Ferdi", "desktopName": "ferdi.desktop", "appId": "com.kytwb.ferdi", - "version": "5.6.1-nightly.42", + "version": "5.6.1-nightly.43", "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 555913db8351baa90e2adb325a685fc47b9b03f4 Mon Sep 17 00:00:00 2001 From: Vijay A Date: Mon, 30 Aug 2021 07:36:28 +0530 Subject: docs: update CHANGELOG [skip ci] --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b090c2fa..bf8be8b52 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# [v5.6.1-nightly.43](https://github.com/getferdi/ferdi/compare/v5.6.1-nightly.42...v5.6.1-nightly.43) (2021-08-30) + +- Services: Remove duplicated recipes for `Outlook Web App` and `Enterprise OWA` (getferdi/recipes#523 getferdi/recipes#1808) 💖 @vraravam + # [v5.6.1-nightly.42](https://github.com/getferdi/ferdi/compare/v5.6.1-nightly.41...v5.6.1-nightly.42) (2021-08-29) - Upgraded to [electron 13.2.3](https://github.com/electron/electron/releases/tag/v13.2.3) 💖 @vraravam -- cgit v1.2.3-70-g09d2 From 1ce77bd918be3b5b68e25a266d742cb0a2b1f662 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 31 Aug 2021 00:18:41 +0000 Subject: Update submodules, browserslist data updates and linter fixes [skip ci] --- recipes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes b/recipes index 7a3d8fa7f..b63978d00 160000 --- a/recipes +++ b/recipes @@ -1 +1 @@ -Subproject commit 7a3d8fa7f56986e0394e93ebbcb3d0a47785d737 +Subproject commit b63978d0038c4774f820843cb4b45052918f943e -- cgit v1.2.3-70-g09d2 From 90d934054c776a34fdcc6f8c65ea59d90f5e3fa2 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 31 Aug 2021 01:20:49 +0000 Subject: 5.6.1-nightly.44 [skip ci] --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index c9572ec89..94bb2eab5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "ferdi", - "version": "5.6.1-nightly.43", + "version": "5.6.1-nightly.44", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index e8668f1a6..fa38ae65d 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "productName": "Ferdi", "desktopName": "ferdi.desktop", "appId": "com.kytwb.ferdi", - "version": "5.6.1-nightly.43", + "version": "5.6.1-nightly.44", "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 91ebfb1c7dc2ef63be02f614585fdf9fd9ef6773 Mon Sep 17 00:00:00 2001 From: Vijay A Date: Tue, 31 Aug 2021 16:29:31 +0530 Subject: refactor: expose safeParseInt so that all recipes can use the same for consistent error handling --- CHANGELOG.md | 8 ++++++++ recipes | 2 +- src/webview/badge.ts | 13 +++++++++---- src/webview/lib/RecipeWebview.js | 9 +++++++++ src/webview/recipe.js | 2 ++ 5 files changed, 29 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bf8be8b52..af75cb27b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +# [v5.6.1-nightly.45](https://github.com/getferdi/ferdi/compare/v5.6.1-nightly.43...v5.6.1-nightly.45) (2021-09-01) + +- Services: Add `odoo` and `wakatime` 💖 @oda-alexandre + +### Internal + +- Use `Ferdi.safeParseInt` to ensure that parsing for unread count is done consistently in all recipes 💖 @vraravam + # [v5.6.1-nightly.43](https://github.com/getferdi/ferdi/compare/v5.6.1-nightly.42...v5.6.1-nightly.43) (2021-08-30) - Services: Remove duplicated recipes for `Outlook Web App` and `Enterprise OWA` (getferdi/recipes#523 getferdi/recipes#1808) 💖 @vraravam diff --git a/recipes b/recipes index b63978d00..2486fbbd7 160000 --- a/recipes +++ b/recipes @@ -1 +1 @@ -Subproject commit b63978d0038c4774f820843cb4b45052918f943e +Subproject commit 2486fbbd72f08b759a2781913f388e91149e79ea diff --git a/src/webview/badge.ts b/src/webview/badge.ts index b1da36271..753e90fef 100644 --- a/src/webview/badge.ts +++ b/src/webview/badge.ts @@ -12,11 +12,16 @@ export class BadgeHandler { }; } - _normalizeNumber(count: string | number) { + // TODO: Need to extract this into a utility class and reuse outside of the recipes + safeParseInt(text: string | number | undefined | null) { + if (text === undefined || text === null) { + return 0; + } + // Parse number to integer // This will correct errors that recipes may introduce, e.g. // by sending a String instead of an integer - const parsedNumber = parseInt(count.toString(), 10); + const parsedNumber = parseInt(text.toString(), 10); const adjustedNumber = Number.isNaN(parsedNumber) ? 0 : parsedNumber; return Math.max(adjustedNumber, 0); } @@ -28,8 +33,8 @@ export class BadgeHandler { } const count = { - direct: this._normalizeNumber(direct), - indirect: this._normalizeNumber(indirect), + direct: this.safeParseInt(direct), + indirect: this.safeParseInt(indirect), }; debug('Sending badge count to host', count); diff --git a/src/webview/lib/RecipeWebview.js b/src/webview/lib/RecipeWebview.js index 96caa125e..2bd6bad8d 100644 --- a/src/webview/lib/RecipeWebview.js +++ b/src/webview/lib/RecipeWebview.js @@ -46,6 +46,15 @@ class RecipeWebview { this.badgeHandler.setBadge(direct, indirect); } + /** + * Safely parse the given text into an integer + * + * @param {string | number | undefined | null} text to be parsed + */ + safeParseInt(text) { + return this.badgeHandler.safeParseInt(text); + } + /** * Injects the contents of a CSS file into the current webview * diff --git a/src/webview/recipe.js b/src/webview/recipe.js index f88b94cfe..1981c8731 100644 --- a/src/webview/recipe.js +++ b/src/webview/recipe.js @@ -102,6 +102,8 @@ contextBridge.exposeInMainWorld('ferdi', { open: window.open, setBadge: (direct, indirect) => badgeHandler.setBadge(direct, indirect), + safeParseInt: (text) => + badgeHandler.safeParseInt(text), displayNotification: (title, options) => notificationsHandler.displayNotification(title, options), getDisplayMediaSelector, -- cgit v1.2.3-70-g09d2 From b94a10e4f2016453f336ffd4fefb30127404fecc Mon Sep 17 00:00:00 2001 From: Vijay A Date: Wed, 1 Sep 2021 05:11:39 +0530 Subject: chore: upgrade 'electron' to '13.3.0' --- CHANGELOG.md | 1 + README.md | 2 +- package-lock.json | 12 ++++++------ package.json | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index af75cb27b..342c21c63 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # [v5.6.1-nightly.45](https://github.com/getferdi/ferdi/compare/v5.6.1-nightly.43...v5.6.1-nightly.45) (2021-09-01) +- Upgrade to [electron 13.3.0](https://github.com/electron/electron/releases/tag/v13.3.0) 💖 @vraravam - Services: Add `odoo` and `wakatime` 💖 @oda-alexandre ### Internal diff --git a/README.md b/README.md index 056f0085d..1824a0894 100644 --- a/README.md +++ b/README.md @@ -226,7 +226,7 @@ If you use an AUR Helper e.g. yay, simply install it via `yay -S ferdi`. ### Adds internal changes -- [x] Upgrades to Electron 13.2.2 +- [x] Upgrades to Electron 13.3.0 - [x] Switches to [`electron-spellchecker`](https://github.com/electron-userland/electron-spellchecker) to improve application size - [x] Minifies build files to improve app size - [x] Adds "npm run prepare-code" command for development to lint and beautify code diff --git a/package-lock.json b/package-lock.json index 94bb2eab5..8fa2164c5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12653,9 +12653,9 @@ } }, "electron": { - "version": "13.2.3", - "resolved": "https://registry.npmjs.org/electron/-/electron-13.2.3.tgz", - "integrity": "sha512-FzWhbKHjq7ZTpPQFaYiLPL64erC8/BOsu5NlNN9nQ6f7rIP8ygKlNAlQit3vbOcksQAwItDUCIw4sW0mcaRpCA==", + "version": "13.3.0", + "resolved": "https://registry.npmjs.org/electron/-/electron-13.3.0.tgz", + "integrity": "sha512-d/BvOLDjI4i7yf9tqCuLL2fFGA2TrM/D9PyRpua+rJolG0qrwp/FohP02L0m+44kmPpofIo4l3NPwLmzyKKimA==", "dev": true, "requires": { "@electron/get": "^1.0.1", @@ -15727,9 +15727,9 @@ }, "dependencies": { "core-js": { - "version": "3.16.3", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.16.3.tgz", - "integrity": "sha512-lM3GftxzHNtPNUJg0v4pC2RC6puwMd6VZA7vXUczi+SKmCWSf4JwO89VJGMqbzmB7jlK7B5hr3S64PqwFL49cA==", + "version": "3.16.4", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.16.4.tgz", + "integrity": "sha512-Tq4GVE6XCjE+hcyW6hPy0ofN3hwtLudz5ZRdrlCnsnD/xkm/PWQRudzYHiKgZKUcefV6Q57fhDHjZHJP5dpfSg==", "dev": true, "optional": true } diff --git a/package.json b/package.json index fa38ae65d..1e6fbac02 100644 --- a/package.json +++ b/package.json @@ -167,7 +167,7 @@ "cross-env": "7.0.3", "cz-conventional-changelog": "3.3.0", "dotenv": "10.0.0", - "electron": "13.2.3", + "electron": "13.3.0", "electron-builder": "22.12.1", "electron-notarize": "1.1.0", "eslint": "7.32.0", -- cgit v1.2.3-70-g09d2 From d519e6220f047de7ac8fb924612910eea8ecb06e Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 1 Sep 2021 01:29:53 +0000 Subject: 5.6.1-nightly.45 [skip ci] --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8fa2164c5..554274474 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "ferdi", - "version": "5.6.1-nightly.44", + "version": "5.6.1-nightly.45", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 1e6fbac02..b7f6b6bd0 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "productName": "Ferdi", "desktopName": "ferdi.desktop", "appId": "com.kytwb.ferdi", - "version": "5.6.1-nightly.44", + "version": "5.6.1-nightly.45", "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 3820ba772eb640e4b1087f719ca3836664d378be Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Sep 2021 08:12:02 +0530 Subject: build(deps): bump tar from 4.4.15 to 4.4.18 (#1852) Bumps [tar](https://github.com/npm/node-tar) from 4.4.15 to 4.4.18. - [Release notes](https://github.com/npm/node-tar/releases) - [Changelog](https://github.com/npm/node-tar/blob/main/CHANGELOG.md) - [Commits](https://github.com/npm/node-tar/compare/v4.4.15...v4.4.18) --- updated-dependencies: - dependency-name: tar dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 27 ++++++++++++++++----------- package.json | 2 +- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index 554274474..be62c407f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -27759,19 +27759,24 @@ "dev": true }, "tar": { - "version": "4.4.15", - "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.15.tgz", - "integrity": "sha512-ItbufpujXkry7bHH9NpQyTXPbJ72iTlXgkBAYsAjDXk3Ds8t/3NfO5P4xZGy7u+sYuQUbimgzswX4uQIEeNVOA==", - "requires": { - "chownr": "^1.1.1", - "fs-minipass": "^1.2.5", - "minipass": "^2.8.6", - "minizlib": "^1.2.1", - "mkdirp": "^0.5.0", - "safe-buffer": "^5.1.2", - "yallist": "^3.0.3" + "version": "4.4.18", + "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.18.tgz", + "integrity": "sha512-ZuOtqqmkV9RE1+4odd+MhBpibmCxNP6PJhH/h2OqNuotTX7/XHPZQJv2pKvWMplFH9SIZZhitehh6vBH6LO8Pg==", + "requires": { + "chownr": "^1.1.4", + "fs-minipass": "^1.2.7", + "minipass": "^2.9.0", + "minizlib": "^1.3.3", + "mkdirp": "^0.5.5", + "safe-buffer": "^5.2.1", + "yallist": "^3.1.1" }, "dependencies": { + "safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" + }, "yallist": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", diff --git a/package.json b/package.json index b7f6b6bd0..ace87d3bf 100644 --- a/package.json +++ b/package.json @@ -124,7 +124,7 @@ "route-parser": "0.0.5", "semver": "7.3.5", "sqlite3": "5.0.0", - "tar": "4.4.15", + "tar": "4.4.18", "tslib": "2.3.1", "useragent-generator": "1.1.1-amkt-22079-finish.0", "uuid": "3.3.3", -- cgit v1.2.3-70-g09d2 From d0bad11661cb93756891e7fafe729b7f4e415fb1 Mon Sep 17 00:00:00 2001 From: Vijay Raghavan Aravamudhan Date: Wed, 1 Sep 2021 09:29:49 +0530 Subject: Fix issue with workspace feature - fixes #1682 (#1854) * fix issue with workspace feature not being turned on, and then randomly turning on somehow. * when deleting the active workspace, auto-select the default workspace. * consolidated the toggling of features into a single place in the config file. Co-authored-by: Sadetdin EYILI Signed-off-by: Vijay A --- CHANGELOG.md | 6 ++++ src/config.ts | 5 +-- .../workspaces/components/EditWorkspaceForm.js | 1 + src/features/workspaces/store.js | 38 ++++++++-------------- .../app/Controllers/Http/StaticController.js | 16 +++------ 5 files changed, 28 insertions(+), 38 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 342c21c63..3cb1970ca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# [v5.6.1-nightly.46](https://github.com/getferdi/ferdi/compare/v5.6.1-nightly.45...v5.6.1-nightly.46) (2021-09-01) + +### Bug Fixes + +- Workspaces are now working. When the active workspace gets deleted, the default workspace gets auto-selected. 💖 @sad270, @vraravam + # [v5.6.1-nightly.45](https://github.com/getferdi/ferdi/compare/v5.6.1-nightly.43...v5.6.1-nightly.45) (2021-09-01) - Upgrade to [electron 13.3.0](https://github.com/electron/electron/releases/tag/v13.3.0) 💖 @vraravam diff --git a/src/config.ts b/src/config.ts index 0647b8f52..835d130da 100644 --- a/src/config.ts +++ b/src/config.ts @@ -134,10 +134,11 @@ export const ICON_SIZES = { export const iconSizeBias = 20; export const DEFAULT_FEATURES_CONFIG = { - isServiceProxyEnabled: false, + isServiceProxyEnabled: true, isAnnouncementsEnabled: true, - isWorkspaceEnabled: false, + isWorkspaceEnabled: true, isTodosEnabled: true, + isSettingsWSEnabled: false, }; export const DEFAULT_WINDOW_OPTIONS = { diff --git a/src/features/workspaces/components/EditWorkspaceForm.js b/src/features/workspaces/components/EditWorkspaceForm.js index 0ff836cba..c97d4bd9c 100644 --- a/src/features/workspaces/components/EditWorkspaceForm.js +++ b/src/features/workspaces/components/EditWorkspaceForm.js @@ -224,6 +224,7 @@ class EditWorkspaceForm extends Component { busy={isSaving} buttonType={isSaving ? 'secondary' : 'primary'} onClick={this.save.bind(this, form)} + // TODO: Need to disable if no services have been added to this workspace disabled={isSaving} />
diff --git a/src/features/workspaces/store.js b/src/features/workspaces/store.js index 8c73516bc..ec9d7ee7f 100644 --- a/src/features/workspaces/store.js +++ b/src/features/workspaces/store.js @@ -155,38 +155,26 @@ export default class WorkspacesStore extends FeatureStore { }; @action _create = async ({ name }) => { - // eslint-disable-next-line no-useless-catch - try { - const workspace = await createWorkspaceRequest.execute(name); - await getUserWorkspacesRequest.result.push(workspace); - this._edit({ workspace }); - } catch (error) { - throw error; - } + const workspace = await createWorkspaceRequest.execute(name); + await getUserWorkspacesRequest.result.push(workspace); + this._edit({ workspace }); }; @action _delete = async ({ workspace }) => { - // eslint-disable-next-line no-useless-catch - try { - await deleteWorkspaceRequest.execute(workspace); - await getUserWorkspacesRequest.result.remove(workspace); - this.stores.router.push('/settings/workspaces'); - } catch (error) { - throw error; + await deleteWorkspaceRequest.execute(workspace); + await getUserWorkspacesRequest.result.remove(workspace); + this.stores.router.push('/settings/workspaces'); + if (this.activeWorkspace === workspace) { + this._deactivateActiveWorkspace(); } }; @action _update = async ({ workspace }) => { - // eslint-disable-next-line no-useless-catch - try { - await updateWorkspaceRequest.execute(workspace); - // Path local result optimistically - const localWorkspace = this._getWorkspaceById(workspace.id); - Object.assign(localWorkspace, workspace); - this.stores.router.push('/settings/workspaces'); - } catch (error) { - throw error; - } + await updateWorkspaceRequest.execute(workspace); + // Path local result optimistically + const localWorkspace = this._getWorkspaceById(workspace.id); + Object.assign(localWorkspace, workspace); + this.stores.router.push('/settings/workspaces'); }; @action _setActiveWorkspace = ({ workspace }) => { diff --git a/src/internal-server/app/Controllers/Http/StaticController.js b/src/internal-server/app/Controllers/Http/StaticController.js index b9a145061..28c5389a9 100644 --- a/src/internal-server/app/Controllers/Http/StaticController.js +++ b/src/internal-server/app/Controllers/Http/StaticController.js @@ -2,21 +2,15 @@ * Controller for routes with static responses */ +import { DEFAULT_FEATURES_CONFIG } from '../../../../config'; + +// TODO: This endpoint and associated code needs to be remoeved as cleanup class StaticController { // Enable all features features({ response, }) { - return response.send({ - isServiceProxyEnabled: true, - isWorkspaceEnabled: true, - isAnnouncementsEnabled: true, - isSettingsWSEnabled: false, - isMagicBarEnabled: true, - isTodosEnabled: true, - subscribeURL: 'https://getferdi.com', - hasInlineCheckout: true, - }); + return response.send(DEFAULT_FEATURES_CONFIG); } // Return an empty array @@ -34,4 +28,4 @@ class StaticController { } } -module.exports = StaticController; +export default StaticController; -- cgit v1.2.3-70-g09d2 From 4e8fe0bb0fa5c653a531e1f663b06a19b31e8fea Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Wed, 1 Sep 2021 06:00:51 +0200 Subject: New Crowdin updates (#1848) --- src/i18n/locales/vi.json | 482 +++++++++++++++++++++++------------------------ 1 file changed, 241 insertions(+), 241 deletions(-) diff --git a/src/i18n/locales/vi.json b/src/i18n/locales/vi.json index 33b21b13c..b860ad8c8 100644 --- a/src/i18n/locales/vi.json +++ b/src/i18n/locales/vi.json @@ -1,7 +1,7 @@ { "app.errorHandler.action": "Tải lại", "app.errorHandler.headline": "Đã xảy ra lỗi", - "changeserver.customServerLabel": "Custom server", + "changeserver.customServerLabel": "Máy chủ tùy chỉnh", "changeserver.headline": "Thay đổi máy chủ", "changeserver.label": "Máy chủ", "changeserver.submit": "Gửi", @@ -16,45 +16,45 @@ "feature.nightlyBuilds.cancel": "Hủy", "feature.nightlyBuilds.info": "Các bản Nightly là các phiên bản Ferdi mang tính thử nghiệm có thể chứa các tính năng chưa được hoàn thiện. Các bản Nightly chủ yếu được các nhà phát triển sử dụng để kiểm tra các tính năng mới được phát triển của họ và cách chúng sẽ hoạt động trong bản dựng cuối cùng. Nếu bạn không biết mình đang làm gì, chúng tôi khuyên bạn không nên kích hoạt các bản dựng hàng đêm.", "feature.nightlyBuilds.title": "Phiên bản Nightly", - "feature.publishDebugInfo.error": "There was an error while trying to publish the debug information. Please try again later or view the console for more information.", - "feature.publishDebugInfo.info": "Publishing your debug information helps us find issues and errors in Ferdi. By publishing your debug information you accept Ferdi Debugger's privacy policy and terms of service", + "feature.publishDebugInfo.error": "Đã xảy ra lỗi khi cố gắng xuất bản thông tin gỡ lỗi. Vui lòng thử lại sau hoặc xem bảng điều khiển để biết thêm thông tin.", + "feature.publishDebugInfo.info": "Việc xuất bản thông tin gỡ lỗi của bạn sẽ giúp chúng tôi tìm ra các vấn đề và lỗi trong Ferdi. Bằng cách xuất bản thông tin gỡ lỗi của bạn, bạn chấp nhận chính sách bảo mật và điều khoản dịch vụ của Trình gỡ lỗi Ferdi", "feature.publishDebugInfo.privacy": "Chính sách", "feature.publishDebugInfo.publish": "Chấp nhận và xuất bản", - "feature.publishDebugInfo.published": "Your debug log was published and is now availible at", - "feature.publishDebugInfo.terms": "Terms of service", - "feature.publishDebugInfo.title": "Publish debug information", - "feature.quickSwitch.info": "Select a service with TAB, ↑ and ↓. Open a service with ENTER.", + "feature.publishDebugInfo.published": "Nhật ký gỡ lỗi của bạn đã được xuất bản và hiện có sẵn tại", + "feature.publishDebugInfo.terms": "Điều khoản dịch vụ", + "feature.publishDebugInfo.title": "Xuất bản thông tin gỡ lỗi", + "feature.quickSwitch.info": "Chọn một dịch vụ với TAB, ↑ và ↓. Mở một dịch vụ bằng ENTER.", "feature.quickSwitch.search": "Tìm kiếm...", "feature.quickSwitch.title": "Chuyển đổi nhanh", "global.api.unhealthy": "Không thể kết nối đến máy chủ trực tuyến của Ferdi", - "global.notConnectedToTheInternet": "You are not connected to the internet.", + "global.notConnectedToTheInternet": "Bạn không kết nối với Internet.", "global.spellchecker.useDefault": "Dùng mặc định hệ thống ({default})", "global.spellchecking.autodetect": "Tự động phát hiện ngôn ngữ", "global.spellchecking.autodetect.short": "Tự động", - "global.spellchecking.language": "Spell checking language", - "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.", - "global.userAgentPref": "User Agent", - "import.headline": "Import your Ferdi 4 services", - "import.notSupportedHeadline": "Services not yet supported in Ferdi 5", - "import.skip.label": "I want to add services manually", + "global.spellchecking.language": "Ngôn ngữ kiểm tra chính tả", + "global.userAgentHelp": "Sử dụng 'https://whatmyuseragent.com/' (để khám phá) hoặc 'https://developers.whatismybrowser.com/useragents/explore/' (để chọn) tác nhân người dùng mong muốn của bạn và sao chép-dán nó vào đây.", + "global.userAgentPref": "Tác nhân Người dùng", + "import.headline": "Nhập các dịch vụ Ferdi 4 của bạn", + "import.notSupportedHeadline": "Các dịch vụ chưa được hỗ trợ trong Ferdi 5", + "import.skip.label": "Tôi muốn thêm dịch vụ theo cách thủ công", "import.submit.label": "Nhập Dịch vụ", - "infobar.authRequestFailed": "There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.", + "infobar.authRequestFailed": "Đã xảy ra lỗi khi cố gắng thực hiện một yêu cầu đã xác thực. Vui lòng thử đăng xuất và đăng nhập lại nếu lỗi này vẫn tiếp diễn.", "infobar.buttonChangelog": "Có gì mới?", "infobar.buttonInstallUpdate": "Khởi động lại và cài đặt bản cập nhật", "infobar.buttonReloadServices": "Tải lại dịch vụ", "infobar.hide": "Ẩn", - "infobar.requiredRequestsFailed": "Could not load services and user information", - "infobar.servicesUpdated": "Your services have been updated.", - "infobar.updateAvailable": "A new update for Ferdi is available.", - "infobox.dismiss": "Dismiss", + "infobar.requiredRequestsFailed": "Không thể tải dịch vụ và thông tin người dùng", + "infobar.servicesUpdated": "Các dịch vụ của bạn đã được cập nhật.", + "infobar.updateAvailable": "Đã có bản cập nhật mới cho Ferdi.", + "infobox.dismiss": "Bỏ qua", "invite.email.label": "Địa chỉ E-mail", - "invite.headline.friends": "Invite 3 of your friends or colleagues", + "invite.headline.friends": "Mời 3 người bạn hoặc đồng nghiệp của bạn", "invite.name.label": "Tên", "invite.skip.label": "Tôi sẽ thực hiện sau này", "invite.submit.label": "Gửi lời mời", "invite.successInfo": "Lời mời đã được gửi thành công", "locked.headline": "Đã khóa", - "locked.info": "Ferdi is currently locked. Please unlock Ferdi with your password to see your messages.", + "locked.info": "Ferdi hiện đang bị khóa. Vui lòng mở khóa Ferdi bằng mật khẩu của bạn để xem tin nhắn của bạn.", "locked.invalidCredentials": "Mật khẩu không hợp lệ", "locked.password.label": "Mật khẩu", "locked.submit.label": "Mở khoá", @@ -80,68 +80,68 @@ "menu.app.autohideMenuBar": "Tự động ẩn thanh Menu", "menu.app.checkForUpdates": "Kiểm tra cập nhật", "menu.app.hide": "Ẩn", - "menu.app.hideOthers": "Hide Others", - "menu.app.quit": "Quit", + "menu.app.hideOthers": "Ẩn các mục khác", + "menu.app.quit": "Thoát", "menu.app.settings": "Các thiết lập", - "menu.app.unhide": "Unhide", + "menu.app.unhide": "Bỏ ẩn", "menu.edit": "Chỉnh sửa", - "menu.edit.copy": "Copy", - "menu.edit.cut": "Cut", + "menu.edit.copy": "Sao chép", + "menu.edit.cut": "Cắt", "menu.edit.delete": "Xóa", "menu.edit.emojiSymbols": "Biểu tượng cảm xúc", "menu.edit.findInPage": "Tìm trong trang", - "menu.edit.paste": "Paste", - "menu.edit.pasteAndMatchStyle": "Paste And Match Style", - "menu.edit.redo": "Redo", - "menu.edit.selectAll": "Select All", + "menu.edit.paste": "Dán", + "menu.edit.pasteAndMatchStyle": "Dán và Khớp Kiểu", + "menu.edit.redo": "Làm lại", + "menu.edit.selectAll": "Chọn tất cả", "menu.edit.speech": "Nói", "menu.edit.startDictation": "Bắt đầu đăng kí", "menu.edit.startSpeaking": "Bắt đầu nói", "menu.edit.stopSpeaking": "Dừng Nói", - "menu.edit.undo": "Undo", + "menu.edit.undo": "Hoàn tác", "menu.file": "Tập tin", - "menu.help": "Help", + "menu.help": "Hỗ trợ", "menu.help.changelog": "Nhật ký thay đổi", "menu.help.debugInfo": "Sao chép thông tin gỡ lỗi", "menu.help.debugInfoCopiedBody": "Thông tin sản phẩm đã được sao chép vào bộ nhớ tạm của bạn.", "menu.help.debugInfoCopiedHeadline": "Thông tin gỡ lỗi", - "menu.help.importExportData": "Import/Export Configuration Data", + "menu.help.importExportData": "Nhập/Xuất dữ liệu cấu hình", "menu.help.learnMore": "Tìm Hiểu Thêm", - "menu.help.privacy": "Privacy Statement", + "menu.help.privacy": "Cam kết Bảo mật", "menu.help.publishDebugInfo": "Gửi thông tin gỡ lỗi", "menu.help.support": "Hỗ trợ", - "menu.help.tos": "Terms of Service", + "menu.help.tos": "Điều khoản Dịch vụ", "menu.services": "Dịch vụ", - "menu.services.activatePreviousService": "Activate previous service", + "menu.services.activatePreviousService": "Kích hoạt dịch vụ trước đó", "menu.services.addNewService": "Thêm Dịch vụ mới", "menu.services.goHome": "Trang chủ", - "menu.services.setNextServiceActive": "Activate next service", + "menu.services.setNextServiceActive": "Kích hoạt dịch vụ tiếp theo", "menu.todos": "Danh sách cần làm", "menu.todos.enableTodos": "Mở danh sách cần làm", - "menu.view": "View", + "menu.view": "Hiển thị", "menu.view.back": "Quay lại", "menu.view.forward": "Tới trước", "menu.view.lockFerdi": "Khoá ứng dụng", "menu.view.openQuickSwitch": "Mở chuyển nhanh", - "menu.view.reloadFerdi": "Reload Ferdi", + "menu.view.reloadFerdi": "Tải lại Ferdi", "menu.view.reloadService": "Tải lại dịch vụ", "menu.view.reloadTodos": "Làm mới lại ds cần làm", - "menu.view.resetZoom": "Actual Size", + "menu.view.resetZoom": "Kích thước thật", "menu.view.toggleDarkMode": "Chuyển sang Chế độ nền tối", "menu.view.toggleDevTools": "Chuyển sang Công cụ dành cho nhà phát triển", - "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.view.toggleFullScreen": "Chuyển sang Chế độ toàn màn hình", + "menu.view.toggleServiceDevTools": "Chuyển sang công cụ dành cho nhà phát triển dịch vụ", + "menu.view.toggleTodosDevTools": "Chuyển sang Công cụ dành cho nhà phát triển Todos", + "menu.view.zoomIn": "Phóng to", + "menu.view.zoomOut": "Thu nhỏ", + "menu.window": "Cửa sổ", + "menu.window.close": "Đóng", + "menu.window.minimize": "Thu nhỏ", "menu.workspaces": "Không gian làm việc", "menu.workspaces.addNewWorkspace": "Thêm mới Không gian làm việc...", - "menu.workspaces.closeWorkspaceDrawer": "Close workspace drawer", + "menu.workspaces.closeWorkspaceDrawer": "Đóng không gian làm việc", "menu.workspaces.defaultWorkspace": "Tất cả Dịch vụ", - "menu.workspaces.openWorkspaceDrawer": "Open workspace drawer", + "menu.workspaces.openWorkspaceDrawer": "Mở không gian làm việc", "password.email.label": "Địa chỉ E-mail", "password.headline": "Đặt lại mật khẩu", "password.link.login": "Đăng nhập Tài khoản", @@ -152,38 +152,38 @@ "pricing.features.accountSync": "Đồng bộ hóa Tài khoản", "pricing.features.customWebsites": "Thêm Trang web tùy chỉnh", "pricing.features.desktopNotifications": "Thông báo", - "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.onPremise": "Tại chỗ & các dịch vụ được lưu trữ khác", + "pricing.features.recipes": "Chọn từ hơn 70 Dịch vụ", + "pricing.features.serviceProxies": "Các Proxy Dịch vụ", + "pricing.features.spellchecker": "Hỗ trợ Công cụ kiểm tra chính tả", + "pricing.features.teamManagement": "Quản lý nhóm", + "pricing.features.thirdPartyServices": "Cài đặt dịch vụ của bên thứ 3", "pricing.features.unlimitedServices": "Thêm dịch vụ không giới hạn", "pricing.features.workspaces": "Không gian làm việc", - "service.crashHandler.action": "Reload {name}", - "service.crashHandler.autoReload": "Trying to automatically restore {name} in {seconds} seconds", + "service.crashHandler.action": "Tải lại {name}", + "service.crashHandler.autoReload": "Đang cố gắng tự động khôi phục {name} sau {seconds} giây", "service.crashHandler.headline": "Ồ không!", - "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.crashHandler.text": "{name} đã gây ra lỗi.", + "service.disabledHandler.action": "Bật {name}", + "service.disabledHandler.headline": "{name} đã bị vô hiệu hóa", + "service.errorHandler.action": "Tải lại {name}", "service.errorHandler.editAction": "Chỉnh sửa {name}", "service.errorHandler.headline": "Ồ không!", "service.errorHandler.message": "Lỗi", - "service.errorHandler.text": "{name} has failed to load.", + "service.errorHandler.text": "Không tải được {name}.", "service.webviewLoader.loading": "Đang tải {service}", "services.getStarted": "Bắt đầu", "services.login": "Vui lòng đăng nhập để sử dụng Ferdi.", - "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!", + "services.serverInfo": "Theo tùy chọn, bạn có thể thay đổi máy chủ Ferdi của mình bằng cách nhấp vào bánh răng ở góc dưới cùng bên trái. Nếu bạn đang chuyển qua (từ một trong các máy chủ được lưu trữ) sang sử dụng Ferdi mà không có tài khoản, vui lòng thông báo rằng bạn có thể xuất dữ liệu của mình từ máy chủ đó và sau đó nhập dữ liệu đó bằng menu Trợ giúp để phục hồi tất cả không gian làm việc và dịch vụ đã định cấu hình của bạn!", "services.serverless": "Sử dụng Ferdi không cần Đăng nhập Tài khoản", "services.welcome": "Chào mừng bạn đến với Ferdi", "settings.account.account.editButton": "Chỉnh sửa Tài khoản", "settings.account.accountUnavailable": "Tài khoản không hợp lệ", - "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.", + "settings.account.accountUnavailableInfo": "Bạn đang sử dụng Ferdi mà không có tài khoản. Nếu bạn muốn sử dụng Ferdi với một tài khoản và giữ cho các dịch vụ của mình được đồng bộ hóa giữa các bản cài đặt, vui lòng chọn một máy chủ trong tab Cài đặt rồi đăng nhập.", "settings.account.buttonSave": "Cập nhật Hồ sơ", "settings.account.deleteAccount": "Xóa Tài khoản", - "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.deleteEmailSent": "Bạn đã nhận được một email có liên kết để xác nhận việc xóa tài khoản của bạn. Tài khoản và dữ liệu của bạn không thể được khôi phục!", + "settings.account.deleteInfo": "Nếu bạn không cần tài khoản Ferdi nữa, bạn có thể xóa tài khoản của mình và tất cả dữ liệu liên quan tại đây.", "settings.account.headline": "Tài khoản", "settings.account.headlineAccount": "Thông tin Tài khoản", "settings.account.headlineDangerZone": "Vùng Nguy hiểm", @@ -195,270 +195,270 @@ "settings.account.tryReloadUserInfoRequest": "Thử lại", "settings.account.userInfoRequestFailed": "Không thể tải được thông tin người dùng", "settings.account.yourLicense": "Giấy phép Ferdi của bạn", - "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})", + "settings.app.accentColorInfo": "Viết màu nhấn của bạn ở định dạng tương thích với CSS. (Mặc định: {defaultAccentColor})", "settings.app.buttonClearAllCache": "Xóa bộ nhớ cache", "settings.app.buttonInstallUpdate": "Khởi động lại và cài đặt bản cập nhật", - "settings.app.buttonOpenFerdiProfileFolder": "Open Profile folder", - "settings.app.buttonOpenFerdiServiceRecipesFolder": "Open Service Recipes folder", + "settings.app.buttonOpenFerdiProfileFolder": "Mở thư mục Hồ sơ", + "settings.app.buttonOpenFerdiServiceRecipesFolder": "Mở thư mục Công thức dịch vụ", "settings.app.buttonSearchForUpdate": "Kiểm tra cập nhật", - "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.", - "settings.app.cacheNotCleared": "Couldn't clear all cache", - "settings.app.closeSettings": "Close settings", + "settings.app.cacheInfo": "Bộ nhớ đệm Ferdi hiện đang sử dụng {size} dung lượng ổ đĩa.", + "settings.app.cacheNotCleared": "Không thể xóa tất cả bộ nhớ cache", + "settings.app.closeSettings": "Đóng cài đặt", "settings.app.currentVersion": "Phiên bản hiện tại:", "settings.app.form.accentColor": "Màu Accent", - "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting", - "settings.app.form.alwaysShowWorkspaces": "Always show workspace drawer", + "settings.app.form.adaptableDarkMode": "Đồng bộ hóa chế độ tối với cài đặt chế độ tối trên Hệ điều hành của tôi", + "settings.app.form.alwaysShowWorkspaces": "Luôn hiển thị không gian làm việc", "settings.app.form.autoLaunchInBackground": "Mở trong nền", "settings.app.form.autoLaunchOnStart": "Mở Ferdi khi khởi động máy", "settings.app.form.automaticUpdates": "Cho phép cập nhật", "settings.app.form.beta": "Bao gồm phiên bản thử nghiệp", - "settings.app.form.clipboardNotifications": "Don't show notifications for clipboard events", + "settings.app.form.clipboardNotifications": "Không hiển thị thông báo cho các sự kiện khay nhớ tạm", "settings.app.form.closeToSystemTray": "Thu nhỏ Ferdi xuống khay hệ thống", "settings.app.form.customTodoServer": "Tùy chỉnh Server Todo", "settings.app.form.darkMode": "Cho phép Chế độ nền tối", - "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration", + "settings.app.form.enableGPUAcceleration": "Bật Tăng tốc GPU", "settings.app.form.enableLock": "Cho phép khóa bằng mật khẩu", - "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar", - "settings.app.form.enableSpellchecking": "Enable spell checking", - "settings.app.form.enableSystemTray": "Show Ferdi in system tray", + "settings.app.form.enableMenuBar": "Luôn hiển thị Ferdi trong Menu Bar", + "settings.app.form.enableSpellchecking": "Kích hoạt tính năng kiểm tra chính tả", + "settings.app.form.enableSystemTray": "Hiển thị Ferdi trong khay hệ thống", "settings.app.form.enableTodos": "Cho phép Ferdi Todos", - "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup", - "settings.app.form.hibernationStrategy": "Hibernation strategy", + "settings.app.form.hibernateOnStartup": "Giữ các dịch vụ ở chế độ ngủ đông khi khởi động", + "settings.app.form.hibernationStrategy": "Chiến lược ngủ đông", "settings.app.form.iconSize": "Kích thước icon Dịch vụ", "settings.app.form.inactivityLock": "Khóa khi không hoạt động", - "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded", + "settings.app.form.keepAllWorkspacesLoaded": "Luôn tải tất cả các không gian làm việc", "settings.app.form.language": "Ngôn ngữ", "settings.app.form.lockPassword": "Mật khẩu", - "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray", - "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour", - "settings.app.form.notifyTaskBarOnMessage": "Notify TaskBar/Dock on new message", - "settings.app.form.passwordToggle": "Password toggle", + "settings.app.form.minimizeToSystemTray": "Thu nhỏ Ferdi xuống khay hệ thống", + "settings.app.form.navigationBarBehaviour": "Hành vi của thanh điều hướng", + "settings.app.form.notifyTaskBarOnMessage": "Thông báo Thanh Tác vụ/Dock khi có tin nhắn mới", + "settings.app.form.passwordToggle": "Chuyển đổi mật khẩu", "settings.app.form.predefinedTodoServer": "Máy chủ Todo", - "settings.app.form.privateNotifications": "Don't show message content in notifications", - "settings.app.form.reloadAfterResume": "Reload Ferdi after system resume", - "settings.app.form.runInBackground": "Keep Ferdi in background when closing the window", - "settings.app.form.scheduledDNDEnabled": "Enable scheduled Do-not-Disturb", + "settings.app.form.privateNotifications": "Không hiển thị nội dung tin nhắn trong thông báo", + "settings.app.form.reloadAfterResume": "Tải lại Ferdi sau khi hệ thống hoạt động trở lại", + "settings.app.form.runInBackground": "Giữ Ferdi ở chế độ nền khi đóng cửa sổ", + "settings.app.form.scheduledDNDEnabled": "Bật chế độ Không làm phiền đã lên lịch", "settings.app.form.scheduledDNDEnd": "Đến", "settings.app.form.scheduledDNDStart": "Từ", - "settings.app.form.searchEngine": "Search engine", - "settings.app.form.sentry": "Send telemetry data", + "settings.app.form.searchEngine": "Công cụ tìm kiếm", + "settings.app.form.sentry": "Gửi dữ liệu đo từ xa", "settings.app.form.serviceRibbonWidth": "Chiều rộng Sidebar", - "settings.app.form.showDisabledServices": "Display disabled services tabs", - "settings.app.form.showDragArea": "Show draggable area on window", - "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled", - "settings.app.form.startMinimized": "Start minimized", - "settings.app.form.universalDarkMode": "Enable universal Dark Mode", - "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi", - "settings.app.form.useVerticalStyle": "Use horizontal style", - "settings.app.form.wakeUpStrategy": "Wake up strategy", + "settings.app.form.showDisabledServices": "Hiển thị các tab dịch vụ bị vô hiệu hóa", + "settings.app.form.showDragArea": "Hiển thị khu vực có thể kéo trên cửa sổ", + "settings.app.form.showMessagesBadgesWhenMuted": "Hiển thị huy hiệu tin nhắn chưa đọc khi tắt thông báo", + "settings.app.form.startMinimized": "Bắt đầu thu nhỏ", + "settings.app.form.universalDarkMode": "Bật Chế độ tối chung", + "settings.app.form.useTouchIdToUnlock": "Cho phép sử dụng TouchID để mở khóa Ferdi", + "settings.app.form.useVerticalStyle": "Sử dụng kiểu ngang", + "settings.app.form.wakeUpStrategy": "Chiến lược đánh thức", "settings.app.headline": "Các thiết lập", - "settings.app.headlineAdvanced": "Advanced", + "settings.app.headlineAdvanced": "Nâng cao", "settings.app.headlineAppearance": "Giao diện", "settings.app.headlineGeneral": "Chung", "settings.app.headlineLanguage": "Ngôn ngữ", - "settings.app.headlinePrivacy": "Privacy", + "settings.app.headlinePrivacy": "Riêng tư", "settings.app.headlineUpdates": "Cập nhật", - "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.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable", - "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.", - "settings.app.lockInfo": "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 {lockShortcut}.", + "settings.app.hibernateInfo": "Theo mặc định, Ferdi sẽ giữ cho tất cả các dịch vụ của bạn luôn mở và được tải ở chế độ nền để chúng luôn sẵn sàng khi bạn muốn sử dụng. Service Hibernation sẽ dỡ bỏ các dịch vụ của bạn sau một khoảng thời gian cụ thể. Điều này rất hữu ích để tiết kiệm RAM hoặc giữ cho các dịch vụ không làm chậm máy tính của bạn.", + "settings.app.inactivityLockInfo": "Vài phút không hoạt động, sau đó Ferdi sẽ tự động khóa. Sử dụng 0 để tắt", + "settings.app.languageDisclaimer": "Bản dịch chính thức là tiếng Anh và tiếng Đức. Tất cả các ngôn ngữ khác là bản dịch dựa trên cộng đồng.", + "settings.app.lockInfo": "Khóa mật khẩu cho phép bạn bảo vệ tin nhắn của mình.\nSử dụng Khóa mật khẩu, bạn sẽ được nhắc nhập mật khẩu của mình mỗi khi khởi động Ferdi hoặc tự khóa Ferdi bằng biểu tượng ổ khóa ở góc dưới cùng bên trái hoặc phím tắt {lockShortcut}.", "settings.app.lockedPassword": "Mật khẩu", - "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.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data!", - "settings.app.spellCheckerLanguageInfo": "Ferdi uses your Mac's build-in spellchecker to check for typos. If you want to change the languages the spellchecker checks for, you can do so in your Mac's System Preferences.", - "settings.app.subheadlineCache": "Cache", - "settings.app.subheadlineFerdiProfile": "Ferdi Profile", - "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.", - "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.lockedPasswordInfo": "Hãy chắc chắn rằng bạn đã đặt mật khẩu mà bạn sẽ nhớ.\nNếu bạn mất mật khẩu này, bạn sẽ phải cài đặt lại Ferdi.", + "settings.app.restartRequired": "Các thay đổi yêu cầu khởi động lại", + "settings.app.scheduledDNDInfo": "Theo lịch trình Không làm phiền cho phép bạn xác định khoảng thời gian mà bạn không muốn nhận Thông báo từ Ferdi.", + "settings.app.scheduledDNDTimeInfo": "Thời gian ở định dạng 24 giờ. Thời gian kết thúc có thể trước thời gian bắt đầu (ví dụ: bắt đầu từ 17:00, kết thúc lúc 09:00) để bật chế độ Không làm phiền qua đêm.", + "settings.app.sentryInfo": "Việc gửi dữ liệu đo từ xa cho phép chúng tôi tìm ra lỗi trong Ferdi - chúng tôi sẽ không gửi bất kỳ thông tin cá nhân nào như dữ liệu tin nhắn của bạn!", + "settings.app.spellCheckerLanguageInfo": "Ferdi sử dụng trình kiểm tra chính tả tích hợp trên máy Mac của bạn để kiểm tra lỗi chính tả. Nếu bạn muốn thay đổi ngôn ngữ mà trình kiểm tra chính tả kiểm tra, bạn có thể làm như vậy trong Tùy chọn hệ thống của máy Mac.", + "settings.app.subheadlineCache": "Bộ nhớ đệm", + "settings.app.subheadlineFerdiProfile": "Hồ sơ Ferdi", + "settings.app.todoServerInfo": "Máy chủ này sẽ được sử dụng cho tính năng \"Ferdi Todo\".", + "settings.app.translationHelp": "Giúp chúng tôi dịch Ferdi sang ngôn ngữ của bạn.", + "settings.app.universalDarkModeInfo": "Chế độ tối chung cố gắng tạo động các kiểu chế độ tối cho các dịch vụ hiện không được hỗ trợ.", "settings.app.updateStatusAvailable": "Bản cập nhật phù hợp, đang tải...", "settings.app.updateStatusSearching": "Đang tìm bản cập nhật", - "settings.app.updateStatusUpToDate": "You are using the latest version of Ferdi", + "settings.app.updateStatusUpToDate": "Bạn đang sử dụng phiên bản mới nhất của Ferdi", "settings.invite.headline": "Mời bạn bè", "settings.navigation.account": "Tài khoản", - "settings.navigation.availableServices": "Available services", + "settings.navigation.availableServices": "Các dịch vụ có sẵn", "settings.navigation.logout": "Đăng xuất", "settings.navigation.settings": "Các thiết lập", "settings.navigation.supportFerdi": "Giới thiệu về phần mềm Ferdi", "settings.navigation.team": "Quản lý Nhóm", "settings.navigation.yourServices": "Dịch vụ của bạn", - "settings.navigation.yourWorkspaces": "Your workspaces", + "settings.navigation.yourWorkspaces": "Không gian làm việc của bạn", "settings.recipes.all": "Tất cả Dịch vụ", - "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.custom": "Các dịch vụ tùy chỉnh", + "settings.recipes.customService.headline.communityRecipes": "Công thức của cộng đồng bên thứ 3", + "settings.recipes.customService.headline.customRecipes": "Công thức của tùy chỉnh bên thứ 3", + "settings.recipes.customService.headline.devRecipes": "Công thức dịch vụ phát triển của bạn", + "settings.recipes.customService.intro": "Để thêm một dịch vụ tùy chỉnh, hãy sao chép công thức dịch vụ vào:", + "settings.recipes.customService.openDevDocs": "Tài liệu dành cho nhà phát triển", "settings.recipes.customService.openFolder": "Mở thư mục", - "settings.recipes.headline": "Available services", - "settings.recipes.missingService": "Missing a service?", - "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.", - "settings.recipes.servicesSuccessfulAddedInfo": "Service successfully added", + "settings.recipes.headline": "Các dịch vụ có sẵn", + "settings.recipes.missingService": "Thiếu một dịch vụ?", + "settings.recipes.nothingFound": "Xin lỗi, không có dịch vụ nào phù hợp với cụm từ tìm kiếm của bạn - nhưng bạn vẫn có thể thêm nó bằng cách sử dụng tùy chọn \"Trang web tùy chỉnh\". Xin lưu ý rằng trang web có thể hiển thị nhiều dịch vụ hơn đã được thêm vào Ferdi kể từ phiên bản bạn đang sử dụng. Để nhận các dịch vụ mới đó, vui lòng xem xét nâng cấp lên phiên bản Ferdi mới hơn.", + "settings.recipes.servicesSuccessfulAddedInfo": "Đã thêm dịch vụ thành công", "settings.searchService": "Tìm kiếm dịch vụ", - "settings.service.error.goBack": "Back to services", + "settings.service.error.goBack": "Quay lại dịch vụ", "settings.service.error.headline": "Lỗi", - "settings.service.error.message": "Could not load service recipe.", - "settings.service.form.addServiceHeadline": "Add {name}", - "settings.service.form.availableServices": "Available services", - "settings.service.form.customUrl": "Custom server", - "settings.service.form.customUrlValidationError": "Could not validate custom {name} server.", - "settings.service.form.darkReaderBrightness": "Dark Reader Brightness", - "settings.service.form.darkReaderContrast": "Dark Reader Contrast", - "settings.service.form.darkReaderSepia": "Dark Reader Sepia", + "settings.service.error.message": "Không thể tải công thức dịch vụ.", + "settings.service.form.addServiceHeadline": "Thêm {name}", + "settings.service.form.availableServices": "Các dịch vụ có sẵn", + "settings.service.form.customUrl": "Máy chủ tùy chỉnh", + "settings.service.form.customUrlValidationError": "Không thể xác thực máy chủ {name} tùy chỉnh.", + "settings.service.form.darkReaderBrightness": "Độ sáng trình đọc tối", + "settings.service.form.darkReaderContrast": "Độ tương phản trình đọc tối", + "settings.service.form.darkReaderSepia": "Màu nâu đỏ của trình đọc tối", "settings.service.form.deleteButton": "Xóa dịch vụ", "settings.service.form.editServiceHeadline": "Chỉnh sửa {name}", "settings.service.form.enableAudio": "Cho phép âm thanh", - "settings.service.form.enableBadge": "Show unread message badges", + "settings.service.form.enableBadge": "Hiển thị huy hiệu tin nhắn chưa đọc", "settings.service.form.enableDarkMode": "Cho phép chế độ nền tối", - "settings.service.form.enableHibernation": "Enable hibernation", - "settings.service.form.enableNotification": "Enable notifications", - "settings.service.form.enableService": "Enable service", - "settings.service.form.headlineBadges": "Unread message badges", - "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings", + "settings.service.form.enableHibernation": "Kích hoạt ngủ đông", + "settings.service.form.enableNotification": "Kích hoạt thông báo", + "settings.service.form.enableService": "Kích hoạt dịch vụ", + "settings.service.form.headlineBadges": "Huy hiệu tin nhắn chưa đọc", + "settings.service.form.headlineDarkReaderSettings": "Cài đặt trình đọc tối", "settings.service.form.headlineGeneral": "Chung", "settings.service.form.headlineNotifications": "Thông báo", "settings.service.form.icon": "Tùy chỉnh icon", "settings.service.form.iconDelete": "Xóa", - "settings.service.form.iconUpload": "Drop your image, or click here", - "settings.service.form.indirectMessageInfo": "You will be notified about all new messages in a channel, not just @username, @channel, @here, ...", - "settings.service.form.indirectMessages": "Show message badge for all new messages", - "settings.service.form.isHibernatedEnabledInfo": "When enabled, a service will be shut down after a period of time to save system resources.", - "settings.service.form.isMutedInfo": "When disabled, all notification sounds and audio playback are muted", + "settings.service.form.iconUpload": "Thả hình ảnh của bạn hoặc bấm vào đây", + "settings.service.form.indirectMessageInfo": "Bạn sẽ được thông báo về tất cả các tin nhắn mới trong một kênh, không chỉ @username, @channel, @here, ...", + "settings.service.form.indirectMessages": "Hiển thị huy hiệu tin nhắn cho tất cả các tin nhắn mới", + "settings.service.form.isHibernatedEnabledInfo": "Khi được kích hoạt, một dịch vụ sẽ bị tắt sau một khoảng thời gian để tiết kiệm tài nguyên hệ thống.", + "settings.service.form.isMutedInfo": "Khi bị vô hiệu hóa, tất cả âm thanh thông báo và phát lại âm thanh sẽ bị tắt tiếng", "settings.service.form.name": "Tên", - "settings.service.form.openDarkmodeCss": "Open darkmode.css", - "settings.service.form.openUserCss": "Open user.css", - "settings.service.form.openUserJs": "Open user.js", - "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.openDarkmodeCss": "Mở darkmode.css", + "settings.service.form.openUserCss": "Mở user.css", + "settings.service.form.openUserJs": "Mở user.js", + "settings.service.form.proxy.headline": "Cài đặt Proxy HTTP / HTTPS", + "settings.service.form.proxy.host": "Máy chủ Proxy/IP", + "settings.service.form.proxy.info": "Cài đặt proxy sẽ không được đồng bộ hóa với máy chủ Ferdi.", + "settings.service.form.proxy.isEnabled": "Sử dụng Proxy", + "settings.service.form.proxy.password": "Mật khẩu (tùy chọn)", "settings.service.form.proxy.port": "Cổng", - "settings.service.form.proxy.restartInfo": "Please restart Ferdi after changing proxy Settings.", - "settings.service.form.proxy.user": "User (optional)", - "settings.service.form.recipeFileInfo": "Your user files will be inserted into the webpage so you can customize services in any way you like. User files are only stored locally and are not transferred to other computers using the same account.", - "settings.service.form.saveButton": "Save service", - "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.proxy.restartInfo": "Vui lòng khởi động lại Ferdi sau khi thay đổi Cài đặt proxy.", + "settings.service.form.proxy.user": "Người dùng (tùy chọn)", + "settings.service.form.recipeFileInfo": "Các tệp người dùng của bạn sẽ được chèn vào trang web để bạn có thể tùy chỉnh các dịch vụ theo bất kỳ cách nào bạn muốn. Các tệp người dùng chỉ được lưu trữ cục bộ và không được chuyển sang các máy tính khác sử dụng cùng một tài khoản.", + "settings.service.form.saveButton": "Lưu dịch vụ", + "settings.service.form.tabHosted": "Trở thành host", + "settings.service.form.tabOnPremise": "Tự trở thành host ⭐️", + "settings.service.form.team": "Nhóm", + "settings.service.form.useHostedService": "Sử dụng dịch vụ {name} được lưu trữ.", "settings.service.form.yourServices": "Dịch vụ của bạn", - "settings.services.deletedInfo": "Service has been deleted", - "settings.services.discoverServices": "Discover services", + "settings.services.deletedInfo": "Dịch vụ đã bị xóa", + "settings.services.discoverServices": "Khám phá các dịch vụ", "settings.services.headline": "Dịch vụ của bạn", - "settings.services.noServicesAdded": "Start by adding a service.", - "settings.services.servicesRequestFailed": "Could not load your services", + "settings.services.noServicesAdded": "Bắt đầu bằng cách thêm một dịch vụ.", + "settings.services.servicesRequestFailed": "Không thể tải các dịch vụ của bạn", "settings.services.tooltip.isDisabled": "Dịch vụ bị vô hiệu hóa", - "settings.services.tooltip.isMuted": "All sounds are muted", - "settings.services.tooltip.notificationsDisabled": "Notifications are disabled", + "settings.services.tooltip.isMuted": "Tất cả âm thanh đều bị tắt tiếng", + "settings.services.tooltip.notificationsDisabled": "Thông báo bị vô hiệu hoá", "settings.services.updatedInfo": "Mọi thay đổi đã được lưu lại", - "settings.supportFerdi.aboutIntro": "

Ferdi is an open-source and a community-lead application.

Thanks to the people who make this possbile:

", - "settings.supportFerdi.bannerText": "Do you want to help us improve Ferdi?", + "settings.supportFerdi.aboutIntro": "

Ferdi là một ứng dụng mã nguồn mở và dẫn dắt cộng đồng.

Cảm ơn những người tạo nên sự khả thi này:

", + "settings.supportFerdi.bannerText": "Bạn có muốn giúp chúng tôi cải thiện Ferdi không?", "settings.supportFerdi.headline": "Giới thiệu về phần mềm Ferdi", - "settings.supportFerdi.openSurvey": "Open survey", - "settings.supportFerdi.textDonation": "If you feel like supporting Ferdi development with a donation, you can do so on both,", + "settings.supportFerdi.openSurvey": "Mở khảo sát", + "settings.supportFerdi.textDonation": "Nếu bạn cảm thấy muốn hỗ trợ sự phát triển của Ferdi bằng một khoản đóng góp, bạn có thể làm như vậy trên cả hai,", "settings.supportFerdi.textDonationAnd": "và", - "settings.supportFerdi.textExpenses": "While volunteers do most of the work, we still need to pay for servers and certificates. As a community, we are fully transparent on funds we collect and spend - see our", + "settings.supportFerdi.textExpenses": "Trong khi các tình nguyện viên thực hiện hầu hết công việc, chúng tôi vẫn cần trả tiền cho các máy chủ và chứng chỉ. Là một cộng đồng, chúng tôi hoàn toàn minh bạch về các khoản tiền mà chúng tôi thu thập và chi tiêu - hãy xem", "settings.supportFerdi.textGitHubSponsors": "Tài trợ bởi GitHub", "settings.supportFerdi.textListContributors": "Toàn danh sách người đóng góp", "settings.supportFerdi.textListContributorsHere": "tại đây", - "settings.supportFerdi.textOpenCollective": "Open Collective", - "settings.supportFerdi.textSupportWelcome": "Support is always welcome. You can find a list of the help we need", + "settings.supportFerdi.textOpenCollective": "Mở Cộng đồng", + "settings.supportFerdi.textSupportWelcome": "Hỗ trợ luôn được chào đón. Bạn có thể tìm thấy danh sách trợ giúp mà chúng tôi cần", "settings.supportFerdi.textSupportWelcomeHere": "tại đây", - "settings.supportFerdi.textVolunteers": "The development of Ferdi is done by volunteers. People who use Ferdi like you. They maintain, fix, and improve Ferdi in their spare time.", + "settings.supportFerdi.textVolunteers": "Sự phát triển của Ferdi được thực hiện bởi các tình nguyện viên. Những người sử dụng Ferdi như bạn. Họ bảo trì, sửa chữa và cải tiến Ferdi trong thời gian rảnh rỗi.", "settings.supportFerdi.title": "Bạn có thích Ferdi không?", - "settings.team.contentHeadline": "Franz Team Management", - "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.", - "settings.team.headline": "Team", - "settings.team.intro": "You are currently using Franz Servers, which is why you have access to Team Management.", - "settings.team.manageAction": "Manage your Team on meetfranz.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.user.form.accountType.company": "Company", - "settings.user.form.accountType.individual": "Individual", + "settings.team.contentHeadline": "Quản lý nhóm Franz", + "settings.team.copy": "Quản lý nhóm của Franz cho phép bạn quản lý Đăng ký Franz cho nhiều người dùng. Xin lưu ý rằng việc đăng ký Franz Premium sẽ không mang lại lợi ích gì cho bạn khi sử dụng Ferdi: Lý do duy nhất bạn vẫn có quyền truy cập vào Quản lý nhóm là để bạn có thể quản lý Nhóm Franz cũ của mình và để bạn không mất bất kỳ chức năng nào trong việc quản lý tài khoản của bạn.", + "settings.team.headline": "Nhóm", + "settings.team.intro": "Bạn hiện đang sử dụng Máy chủ Franz, đó là lý do bạn có quyền truy cập vào Quản lý nhóm.", + "settings.team.manageAction": "Quản lý Nhóm của bạn trên meetfranz.com", + "settings.team.teamsUnavailable": "Các đội không có sẵn", + "settings.team.teamsUnavailableInfo": "Nhóm hiện chỉ khả dụng khi sử dụng Máy chủ Franz và sau khi thanh toán cho Franz Professional. Vui lòng thay đổi máy chủ của bạn thành https://api.franzinfra.com để sử dụng nhóm.", + "settings.user.form.accountType.company": "Công ty", + "settings.user.form.accountType.individual": "Cá nhân", "settings.user.form.accountType.label": "Loại tài khoản", - "settings.user.form.accountType.non-profit": "Non-Profit", + "settings.user.form.accountType.non-profit": "Phi lợi nhuận", "settings.user.form.currentPassword": "Mật khẩu hiện tại", "settings.user.form.email": "E-mail", "settings.user.form.firstname": "Tên", "settings.user.form.lastname": "Họ, tên đệm", "settings.user.form.newPassword": "Mật khẩu mới", "settings.workspace.add.form.name": "Tên", - "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.add.form.submitButton": "Tạo không gian làm việc", + "settings.workspace.form.buttonDelete": "Xoá không gian làm việc", + "settings.workspace.form.buttonSave": "Lưu không gian làm việc", + "settings.workspace.form.keepLoaded": "Luôn tải không gian làm việc này*", + "settings.workspace.form.keepLoadedInfo": "* Tùy chọn này sẽ bị ghi đè bởi tùy chọn chung \"Giữ tất cả không gian làm việc được tải\".", "settings.workspace.form.name": "Tên", - "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 created any workspaces yet.", + "settings.workspace.form.servicesInWorkspaceHeadline": "Các dịch vụ trong Không gian làm việc này", + "settings.workspace.form.yourWorkspaces": "Không gian làm việc của bạn", + "settings.workspaces.deletedInfo": "Không gian làm việc đã bị xóa", + "settings.workspaces.headline": "Không gian làm việc của bạn", + "settings.workspaces.noWorkspacesAdded": "Bạn chưa tạo bất kỳ không gian làm việc nào.", "settings.workspaces.tryReloadWorkspaces": "Thử lại", "settings.workspaces.updatedInfo": "Mọi thay đổi đã được lưu lại", - "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", - "setupAssistant.headline": "Let's get started", - "setupAssistant.subheadline": "Choose from our most used services and get back on top of your messaging now.", - "setupAssistant.submit.label": "Let's go", - "sidebar.addNewService": "Add new service", - "sidebar.closeTodosDrawer": "Close Ferdi Todos", - "sidebar.closeWorkspaceDrawer": "Close workspace drawer", + "settings.workspaces.workspaceFeatureHeadline": "Ít hơn là Nhiều hơn: Giới thiệu Không gian làm việc Ferdi", + "settings.workspaces.workspaceFeatureInfo": "Không gian làm việc Ferdi cho phép bạn tập trung vào những gì quan trọng ngay bây giờ. Thiết lập các nhóm dịch vụ khác nhau và dễ dàng chuyển đổi giữa chúng bất kỳ lúc nào. Bạn quyết định dịch vụ nào bạn cần khi nào và ở đâu, vì vậy chúng tôi có thể giúp bạn luôn cập nhật trò chơi của mình - hoặc dễ dàng tắt công việc bất cứ khi nào bạn muốn.", + "settings.workspaces.workspacesRequestFailed": "Không thể tải không gian làm việc của bạn", + "setupAssistant.headline": "Bắt đầu nào", + "setupAssistant.subheadline": "Chọn từ các dịch vụ được sử dụng nhiều nhất của chúng tôi và nhận lại tin nhắn của bạn ngay bây giờ.", + "setupAssistant.submit.label": "Bắt đầu nào", + "sidebar.addNewService": "Thêm Dịch vụ mới", + "sidebar.closeTodosDrawer": "Đóng Ferdi Todos", + "sidebar.closeWorkspaceDrawer": "Đóng không gian làm việc", "sidebar.lockFerdi": "Khoá ứng dụng", - "sidebar.muteApp": "Disable notifications & audio", - "sidebar.openTodosDrawer": "Open Ferdi Todos", - "sidebar.openWorkspaceDrawer": "Open workspace drawer", + "sidebar.muteApp": "Tắt thông báo và âm thanh", + "sidebar.openTodosDrawer": "Mở Ferdi Todos", + "sidebar.openWorkspaceDrawer": "Mở không gian làm việc", "sidebar.settings": "Các thiết lập", - "sidebar.unmuteApp": "Enable notifications & audio", + "sidebar.unmuteApp": "Bật thông báo và âm thanh", "signup.email.label": "Địa chỉ E-mail", - "signup.emailDuplicate": "A user with that email address already exists", + "signup.emailDuplicate": "Một người dùng với địa chỉ email đó đã tồn tại", "signup.firstname.label": "Tên", "signup.headline": "Đăng ký", "signup.lastname.label": "Họ, tên đệm", - "signup.legal.info": "By creating a Ferdi account you accept the", - "signup.legal.privacy": "Privacy Statement", - "signup.legal.terms": "Terms of service", - "signup.link.login": "Already have an account, sign in?", + "signup.legal.info": "Bằng cách tạo tài khoản Ferdi, bạn chấp nhận", + "signup.legal.privacy": "Cam kết Bảo mật", + "signup.legal.terms": "Điều khoản dịch vụ", + "signup.link.login": "Đã có tài khoản, Đăng nhập?", "signup.password.label": "Mật khẩu", "signup.submit.label": "Tạo Tài khoản", - "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?", + "tabs.item.confirmDeleteService": "Bạn có thực sự muốn xóa dịch vụ {serviceName} không?", "tabs.item.deleteService": "Xóa dịch vụ", - "tabs.item.disableAudio": "Disable audio", - "tabs.item.disableDarkMode": "Disable Dark mode", - "tabs.item.disableNotifications": "Disable notifications", - "tabs.item.disableService": "Disable service", + "tabs.item.disableAudio": "Vô hiệu hóa âm thanh", + "tabs.item.disableDarkMode": "Vô hiệu hóa chế độ tối", + "tabs.item.disableNotifications": "Vô hiệu hóa thông báo", + "tabs.item.disableService": "Vô hiệu hóa dịch vụ", "tabs.item.edit": "Chỉnh sửa", "tabs.item.enableAudio": "Cho phép âm thanh", - "tabs.item.enableDarkMode": "Enable Dark mode", - "tabs.item.enableNotification": "Enable notifications", - "tabs.item.enableService": "Enable service", - "tabs.item.hibernateService": "Hibernate service", + "tabs.item.enableDarkMode": "Kích hoạt chế độ tối", + "tabs.item.enableNotification": "Kích hoạt thông báo", + "tabs.item.enableService": "Kích hoạt dịch vụ", + "tabs.item.hibernateService": "Đưa dịch vụ vào trạng thái ngủ đông", "tabs.item.reload": "Tải lại", - "tabs.item.wakeUpService": "Wake up service", - "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", + "tabs.item.wakeUpService": "Đánh thức dịch vụ", + "validation.email": "{field} không hợp lệ", + "validation.minLength": "{field} phải dài ít nhất {length} ký tự", + "validation.oneRequired": "Ít nhất một cái được yêu cầu", + "validation.required": "{field} là bắt buộc", + "validation.url": "{field} không phải là URL hợp lệ", "webControls.back": "Quay lại", "webControls.forward": "Tới trước", "webControls.goHome": "Trang chủ", - "webControls.openInBrowser": "Open in Browser", + "webControls.openInBrowser": "Mở trong trình duyệt", "webControls.reload": "Tải lại", - "welcome.loginButton": "Login to your account", + "welcome.loginButton": "Đăng nhập vào tài khoản của bạn", "welcome.signupButton": "Tạo tài khoản miễn phí", - "workspaceDrawer.addNewWorkspaceLabel": "Add new workspace", + "workspaceDrawer.addNewWorkspaceLabel": "Thêm Không gian làm việc mới", "workspaceDrawer.allServices": "Tất cả Dịch vụ", "workspaceDrawer.headline": "Không gian làm việc", "workspaceDrawer.item.contextMenuEdit": "chỉnh sửa", - "workspaceDrawer.item.noServicesAddedYet": "No services added yet", - "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" + "workspaceDrawer.item.noServicesAddedYet": "Không có dịch vụ bổ sung", + "workspaceDrawer.workspaceFeatureInfo": "

Ferdi Workspaces cho phép bạn tập trung vào những gì quan trọng ngay bây giờ. Thiết lập các nhóm dịch vụ khác nhau và dễ dàng chuyển đổi giữa chúng bất kỳ lúc nào.

Bạn quyết định dịch vụ nào bạn cần khi nào và ở đâu, vì vậy chúng tôi có thể giúp bạn luôn cập nhật trò chơi của mình - hoặc dễ dàng tắt khỏi công việc bất cứ khi nào bạn muốn.

", + "workspaceDrawer.workspacesSettingsTooltip": "Chỉnh sửa cài đặt không gian làm việc", + "workspaces.switchingIndicator.switchingTo": "Chuyển sang" } -- cgit v1.2.3-70-g09d2 From 8778ed0cde409e6318867d2df047386dde37d121 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 1 Sep 2021 04:04:11 +0000 Subject: 5.6.1-nightly.46 [skip ci] --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index be62c407f..269c2b585 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "ferdi", - "version": "5.6.1-nightly.45", + "version": "5.6.1-nightly.46", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index ace87d3bf..9682738ce 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "productName": "Ferdi", "desktopName": "ferdi.desktop", "appId": "com.kytwb.ferdi", - "version": "5.6.1-nightly.45", + "version": "5.6.1-nightly.46", "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 df8fa015304117119c24e29abcf8f2ad0f421f8f Mon Sep 17 00:00:00 2001 From: Vijay A Date: Wed, 1 Sep 2021 14:11:27 +0530 Subject: docs: updated Changelog with cumulative changes for 5.6.1-beta.3 [skip ci] --- CHANGELOG.md | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3cb1970ca..9dbc909f5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,33 @@ +# [v5.6.1-beta.3](https://github.com/getferdi/ferdi/compare/v5.6.1-beta.2...v5.6.1-beta.3) (2021-09-01) + +Please note that this is the same code as the `v5.6.1-nightly.46` tag. +The cumulative changes since the previous beta release are: + +- Upgrade to [electron 13.3.0](https://github.com/electron/electron/releases/tag/v13.3.0) 💖 @vraravam +- New services: Add `odoo`, `tinder` and `wakatime` 💖 @oda-alexandre +- New services: Add `Google News` service 💖 @niutech +- New services: Add `amazon web services` (getferdi/recipes#643), `binance` (getferdi/recipes#645), `ovh-cloud` (getferdi/recipes#650), `scribens` (getferdi/recipes#651), `docker hub` (getferdi/recipes#644), `bitwarden` (getferdi/recipes#647), `google translate` (getferdi/recipes#642) 💖 @oda-alexandre, @vraravam +- Services: Remove duplicated recipes for `Outlook Web App` and `Enterprise OWA` (getferdi/recipes#523, getferdi/recipes#1808) 💖 @vraravam + +### Bug Fixes + +- Workspaces are now working. When the active workspace gets deleted, the default workspace gets auto-selected. 💖 @sad270, @vraravam +- Fix reordering of services in vertical style layout (#1833) 💖 @vraravam +- Fix address bar not updating (#1836) 💖 @mhatvan +- Fix screensharing in discord (getferdi/recipes#625) 💖 @oda-alexandre +- Per popular demand, reworded `Use Vertical style` to `Use Horizontal style` 💖 @vraravam + +### Internal + +- Use `Ferdi.safeParseInt` to ensure that parsing for unread count is done consistently in all recipes 💖 @vraravam +- Upgraded `nodejs` to `14.17.5` 💖 @vraravam +- Remove some leftover Franz branding 💖 @vantezzen +- Switch from `misty` to `concurrently` (#1846) 💖 @vantezzen +- Services: Normalized all service recipes to be `es6` compliant 💖 @vraravam +- Services: Change entry point in the `facebookpages` service (getferdi/recipes#640) 💖 @oda-alexandre, @vraravam +- Set the `channel` for the auto-update (check if this fixes the in-app updater) 💖 @vraravam +- Fixing bug where the service-defaults are not merged when creating a service 💖 @vraravam + # [v5.6.1-nightly.46](https://github.com/getferdi/ferdi/compare/v5.6.1-nightly.45...v5.6.1-nightly.46) (2021-09-01) ### Bug Fixes @@ -29,7 +59,7 @@ ### Internal - Upgraded 'nodejs' to '14.17.5' 💖 @vraravam -- Remove Franz brand 💖 @vantezzen +- Remove some leftover Franz branding 💖 @vantezzen - Switch from `misty` to `concurrently` (#1846) 💖 @vantezzen - Services: Normalized all service recipes to be es6 compliant 💖 @vraravam - Services: Change entry point in the 'facebookpages' service (getferdi/recipes#640) 💖 @oda-alexandre, @vraravam -- cgit v1.2.3-70-g09d2