From 83fa2b34298c566e96aaaeaed67903196736fbd7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Sep 2023 08:12:23 +0000 Subject: [PATCH 01/55] chore(deps-dev): Bump jest-environment-jsdom from 29.6.4 to 29.7.0 (#15787) Bumps [jest-environment-jsdom](https://github.com/jestjs/jest/tree/HEAD/packages/jest-environment-jsdom) from 29.6.4 to 29.7.0. - [Release notes](https://github.com/jestjs/jest/releases) - [Changelog](https://github.com/jestjs/jest/blob/main/CHANGELOG.md) - [Commits](https://github.com/jestjs/jest/commits/v29.7.0/packages/jest-environment-jsdom) --- updated-dependencies: - dependency-name: jest-environment-jsdom dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 0c03b72685d..985bf0c728c 100644 --- a/package.json +++ b/package.json @@ -116,7 +116,7 @@ "intersection-observer": "0.12.2", "jest": "29.7.0", "jest-canvas-mock": "2.5.2", - "jest-environment-jsdom": "29.6.4", + "jest-environment-jsdom": "29.7.0", "jest-jasmine2": "29.6.4", "jsdom-worker": "0.3.0", "less": "4.2.0", diff --git a/yarn.lock b/yarn.lock index 75edccf4e31..303f854d5cd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11683,24 +11683,24 @@ __metadata: languageName: node linkType: hard -"jest-environment-jsdom@npm:29.6.4": - version: 29.6.4 - resolution: "jest-environment-jsdom@npm:29.6.4" +"jest-environment-jsdom@npm:29.7.0": + version: 29.7.0 + resolution: "jest-environment-jsdom@npm:29.7.0" dependencies: - "@jest/environment": ^29.6.4 - "@jest/fake-timers": ^29.6.4 + "@jest/environment": ^29.7.0 + "@jest/fake-timers": ^29.7.0 "@jest/types": ^29.6.3 "@types/jsdom": ^20.0.0 "@types/node": "*" - jest-mock: ^29.6.3 - jest-util: ^29.6.3 + jest-mock: ^29.7.0 + jest-util: ^29.7.0 jsdom: ^20.0.0 peerDependencies: canvas: ^2.5.0 peerDependenciesMeta: canvas: optional: true - checksum: 2afe105f12d7d93ca56e2e6f67ab07ada3dd3da0516d1198f254930683ab9feb2b8c14417baaca53544eed88fd7fb5744f0dbce2e100269746187317ce0347df + checksum: 559aac134c196fccc1dfc794d8fc87377e9f78e894bb13012b0831d88dec0abd7ece99abec69da564b8073803be4f04a9eb4f4d1bb80e29eec0cb252c254deb8 languageName: node linkType: hard @@ -18799,7 +18799,7 @@ __metadata: intersection-observer: 0.12.2 jest: 29.7.0 jest-canvas-mock: 2.5.2 - jest-environment-jsdom: 29.6.4 + jest-environment-jsdom: 29.7.0 jest-jasmine2: 29.6.4 jimp: 0.22.10 jquery: 3.7.1 From 6f47735d1cf19d2548b1932307bc40fdd73adfa5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Sep 2023 08:15:54 +0000 Subject: [PATCH 02/55] chore(deps): Bump @wireapp/react-ui-kit from 9.9.4 to 9.9.5 (#15790) Bumps [@wireapp/react-ui-kit](https://github.com/wireapp/wire-web-packages) from 9.9.4 to 9.9.5. - [Commits](https://github.com/wireapp/wire-web-packages/compare/@wireapp/react-ui-kit@9.9.4...@wireapp/react-ui-kit@9.9.5) --- updated-dependencies: - dependency-name: "@wireapp/react-ui-kit" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 985bf0c728c..5ba154f3952 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "@wireapp/avs": "9.3.7", "@wireapp/core": "42.1.0", "@wireapp/lru-cache": "3.8.1", - "@wireapp/react-ui-kit": "9.9.4", + "@wireapp/react-ui-kit": "9.9.5", "@wireapp/store-engine-dexie": "2.1.6", "@wireapp/store-engine-sqleet": "1.8.9", "@wireapp/webapp-events": "0.18.3", diff --git a/yarn.lock b/yarn.lock index 303f854d5cd..3930c500df4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4544,12 +4544,12 @@ __metadata: languageName: node linkType: hard -"@types/color@npm:3.0.3": - version: 3.0.3 - resolution: "@types/color@npm:3.0.3" +"@types/color@npm:3.0.4": + version: 3.0.4 + resolution: "@types/color@npm:3.0.4" dependencies: "@types/color-convert": "*" - checksum: 4a54a6eca687b1f19d393c6c44e292009e913fa2377b5b815d1cd04470131087d7a799718d9e66a970f43e6ba16e7056a5b40b49d2d0d1d0f1530aff23864528 + checksum: 46935626ddeb8ae8877488b1f8f2f71b17a529c113673301a1dd7a64d917cb7a748545ac34ed30c188d66a2cd09c33abc24c87bd5b3a80d520cf1f35aaa2e476 languageName: node linkType: hard @@ -5644,11 +5644,11 @@ __metadata: languageName: node linkType: hard -"@wireapp/react-ui-kit@npm:9.9.4": - version: 9.9.4 - resolution: "@wireapp/react-ui-kit@npm:9.9.4" +"@wireapp/react-ui-kit@npm:9.9.5": + version: 9.9.5 + resolution: "@wireapp/react-ui-kit@npm:9.9.5" dependencies: - "@types/color": 3.0.3 + "@types/color": 3.0.4 color: 4.2.3 emotion-normalize: 11.0.1 react-select: 5.7.4 @@ -5661,7 +5661,7 @@ __metadata: peerDependenciesMeta: "@types/react": optional: true - checksum: b7d11f3792a3f46c64b4ed7d696cd4d17fa2d3d22394d155a56b2a11736ea3ab35f3a178535e2d2015114e9ec5d59c6de3cb5dc216ed8b4c83250cd4901d55e5 + checksum: 0bfbe5ec70172b43123a45e797660a3d8e067d77532ac87ab75dddaf01f796657e870ec6924730a5cc34df44e5818e6c31bcfc82a3d75ac9ec18eb28f75f6602 languageName: node linkType: hard @@ -18761,7 +18761,7 @@ __metadata: "@wireapp/eslint-config": 3.0.4 "@wireapp/lru-cache": 3.8.1 "@wireapp/prettier-config": 0.6.3 - "@wireapp/react-ui-kit": 9.9.4 + "@wireapp/react-ui-kit": 9.9.5 "@wireapp/store-engine": ^5.1.4 "@wireapp/store-engine-dexie": 2.1.6 "@wireapp/store-engine-sqleet": 1.8.9 From 589f3250708d445c5a94241fafdfaf46fce1fe76 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Sep 2023 08:18:01 +0000 Subject: [PATCH 03/55] chore(deps-dev): Bump jest-jasmine2 from 29.6.4 to 29.7.0 (#15788) Bumps [jest-jasmine2](https://github.com/jestjs/jest/tree/HEAD/packages/jest-jasmine2) from 29.6.4 to 29.7.0. - [Release notes](https://github.com/jestjs/jest/releases) - [Changelog](https://github.com/jestjs/jest/blob/main/CHANGELOG.md) - [Commits](https://github.com/jestjs/jest/commits/v29.7.0/packages/jest-jasmine2) --- updated-dependencies: - dependency-name: jest-jasmine2 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 277 +++------------------------------------------------ 2 files changed, 17 insertions(+), 262 deletions(-) diff --git a/package.json b/package.json index 5ba154f3952..3370d32e696 100644 --- a/package.json +++ b/package.json @@ -117,7 +117,7 @@ "jest": "29.7.0", "jest-canvas-mock": "2.5.2", "jest-environment-jsdom": "29.7.0", - "jest-jasmine2": "29.6.4", + "jest-jasmine2": "29.7.0", "jsdom-worker": "0.3.0", "less": "4.2.0", "less-loader": "^11.1.3", diff --git a/yarn.lock b/yarn.lock index 3930c500df4..7351923a064 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3275,20 +3275,6 @@ __metadata: languageName: node linkType: hard -"@jest/console@npm:^29.6.4": - version: 29.6.4 - resolution: "@jest/console@npm:29.6.4" - dependencies: - "@jest/types": ^29.6.3 - "@types/node": "*" - chalk: ^4.0.0 - jest-message-util: ^29.6.3 - jest-util: ^29.6.3 - slash: ^3.0.0 - checksum: 1caf061a39266b86e96ca13358401839e4d930742cbaa9e87e79d7ce170a83195e52e5b2d22eb5aa9a949219b61a163a81e337ec98b8323d88d79853051df96c - languageName: node - linkType: hard - "@jest/console@npm:^29.7.0": version: 29.7.0 resolution: "@jest/console@npm:29.7.0" @@ -3344,18 +3330,6 @@ __metadata: languageName: node linkType: hard -"@jest/environment@npm:^29.6.4": - version: 29.6.4 - resolution: "@jest/environment@npm:29.6.4" - dependencies: - "@jest/fake-timers": ^29.6.4 - "@jest/types": ^29.6.3 - "@types/node": "*" - jest-mock: ^29.6.3 - checksum: 810d8f1fc26d293acfc44927bcb78adc58ed4ea580a64c8d94aa6c67239dcb149186bf25b94ff28b79de15253e0c877ad8d330feac205f185f3517593168510c - languageName: node - linkType: hard - "@jest/environment@npm:^29.7.0": version: 29.7.0 resolution: "@jest/environment@npm:29.7.0" @@ -3386,16 +3360,6 @@ __metadata: languageName: node linkType: hard -"@jest/expect@npm:^29.6.4": - version: 29.6.4 - resolution: "@jest/expect@npm:29.6.4" - dependencies: - expect: ^29.6.4 - jest-snapshot: ^29.6.4 - checksum: e9d7306a96e2f9f9f7a0d93d41850cbad987ebda951a5d9a63d3f5fb61da4c1e41adb54af7f7222e4a185454ecb17ddc77845e18001ee28ac114f7a7fe9e671d - languageName: node - linkType: hard - "@jest/expect@npm:^29.7.0": version: 29.7.0 resolution: "@jest/expect@npm:29.7.0" @@ -3406,20 +3370,6 @@ __metadata: languageName: node linkType: hard -"@jest/fake-timers@npm:^29.6.4": - version: 29.6.4 - resolution: "@jest/fake-timers@npm:29.6.4" - dependencies: - "@jest/types": ^29.6.3 - "@sinonjs/fake-timers": ^10.0.2 - "@types/node": "*" - jest-message-util: ^29.6.3 - jest-mock: ^29.6.3 - jest-util: ^29.6.3 - checksum: 3f06d1090cbaaf781920fe59b10509ad86b587c401818a066ee1550101c6203e0718f0f83bbd2afa8bdf7b43eb280f89fb9f8c98886094e53ccabe5e64de9be1 - languageName: node - linkType: hard - "@jest/fake-timers@npm:^29.7.0": version: 29.7.0 resolution: "@jest/fake-timers@npm:29.7.0" @@ -3434,18 +3384,6 @@ __metadata: languageName: node linkType: hard -"@jest/globals@npm:^29.6.4": - version: 29.6.4 - resolution: "@jest/globals@npm:29.6.4" - dependencies: - "@jest/environment": ^29.6.4 - "@jest/expect": ^29.6.4 - "@jest/types": ^29.6.3 - jest-mock: ^29.6.3 - checksum: a41b18871a248151264668a38b13cb305f03db112bfd89ec44e858af0e79066e0b03d6b68c8baf1ec6c578be6fdb87519389c83438608b91471d17a5724858e0 - languageName: node - linkType: hard - "@jest/globals@npm:^29.7.0": version: 29.7.0 resolution: "@jest/globals@npm:29.7.0" @@ -3515,18 +3453,6 @@ __metadata: languageName: node linkType: hard -"@jest/test-result@npm:^29.6.4": - version: 29.6.4 - resolution: "@jest/test-result@npm:29.6.4" - dependencies: - "@jest/console": ^29.6.4 - "@jest/types": ^29.6.3 - "@types/istanbul-lib-coverage": ^2.0.0 - collect-v8-coverage: ^1.0.0 - checksum: a13c82d29038e80059191a1a443240678c6934ea832fdabaec12b3ece397b6303022a064494a6bbd167a024f04e6b4d9ace1001300927ff70405ec9d854f1193 - languageName: node - linkType: hard - "@jest/test-result@npm:^29.7.0": version: 29.7.0 resolution: "@jest/test-result@npm:29.7.0" @@ -3551,29 +3477,6 @@ __metadata: languageName: node linkType: hard -"@jest/transform@npm:^29.6.4": - version: 29.6.4 - resolution: "@jest/transform@npm:29.6.4" - dependencies: - "@babel/core": ^7.11.6 - "@jest/types": ^29.6.3 - "@jridgewell/trace-mapping": ^0.3.18 - babel-plugin-istanbul: ^6.1.1 - chalk: ^4.0.0 - convert-source-map: ^2.0.0 - fast-json-stable-stringify: ^2.1.0 - graceful-fs: ^4.2.9 - jest-haste-map: ^29.6.4 - jest-regex-util: ^29.6.3 - jest-util: ^29.6.3 - micromatch: ^4.0.4 - pirates: ^4.0.4 - slash: ^3.0.0 - write-file-atomic: ^4.0.2 - checksum: 0341a200a0bb926fc67ab9aede91c7b4009458206495e92057e72a115c55da5fed117457e68c6ea821e24c58b55da75c6a7b0f272ed63c2693db583d689a3383 - languageName: node - linkType: hard - "@jest/transform@npm:^29.7.0": version: 29.7.0 resolution: "@jest/transform@npm:29.7.0" @@ -9356,7 +9259,7 @@ __metadata: languageName: node linkType: hard -"expect@npm:^29.0.0, expect@npm:^29.6.4": +"expect@npm:^29.0.0": version: 29.6.4 resolution: "expect@npm:29.6.4" dependencies: @@ -11657,19 +11560,6 @@ __metadata: languageName: node linkType: hard -"jest-each@npm:^29.6.3": - version: 29.6.3 - resolution: "jest-each@npm:29.6.3" - dependencies: - "@jest/types": ^29.6.3 - chalk: ^4.0.0 - jest-get-type: ^29.6.3 - jest-util: ^29.6.3 - pretty-format: ^29.6.3 - checksum: fe06e80b3554e2a8464f5f5c61943e02db1f8a7177139cb55b3201a1d1513cb089d8800401f102729a31bf8dd6f88229044e6088fea9dd5647ed11e841b6b88c - languageName: node - linkType: hard - "jest-each@npm:^29.7.0": version: 29.7.0 resolution: "jest-each@npm:29.7.0" @@ -11725,29 +11615,6 @@ __metadata: languageName: node linkType: hard -"jest-haste-map@npm:^29.6.4": - version: 29.6.4 - resolution: "jest-haste-map@npm:29.6.4" - dependencies: - "@jest/types": ^29.6.3 - "@types/graceful-fs": ^4.1.3 - "@types/node": "*" - anymatch: ^3.0.3 - fb-watchman: ^2.0.0 - fsevents: ^2.3.2 - graceful-fs: ^4.2.9 - jest-regex-util: ^29.6.3 - jest-util: ^29.6.3 - jest-worker: ^29.6.4 - micromatch: ^4.0.4 - walker: ^1.0.8 - dependenciesMeta: - fsevents: - optional: true - checksum: 4f720fd3813bb38400b7a9a094e55664cbddd907ba1769457ed746f6c870c615167647a5b697a788183d832b1dcb1b66143e52990a6f4403283f6686077fa868 - languageName: node - linkType: hard - "jest-haste-map@npm:^29.7.0": version: 29.7.0 resolution: "jest-haste-map@npm:29.7.0" @@ -11771,28 +11638,28 @@ __metadata: languageName: node linkType: hard -"jest-jasmine2@npm:29.6.4": - version: 29.6.4 - resolution: "jest-jasmine2@npm:29.6.4" +"jest-jasmine2@npm:29.7.0": + version: 29.7.0 + resolution: "jest-jasmine2@npm:29.7.0" dependencies: - "@jest/environment": ^29.6.4 - "@jest/expect": ^29.6.4 + "@jest/environment": ^29.7.0 + "@jest/expect": ^29.7.0 "@jest/source-map": ^29.6.3 - "@jest/test-result": ^29.6.4 + "@jest/test-result": ^29.7.0 "@jest/types": ^29.6.3 "@types/node": "*" chalk: ^4.0.0 co: ^4.6.0 is-generator-fn: ^2.0.0 - jest-each: ^29.6.3 - jest-matcher-utils: ^29.6.4 - jest-message-util: ^29.6.3 - jest-runtime: ^29.6.4 - jest-snapshot: ^29.6.4 - jest-util: ^29.6.3 + jest-each: ^29.7.0 + jest-matcher-utils: ^29.7.0 + jest-message-util: ^29.7.0 + jest-runtime: ^29.7.0 + jest-snapshot: ^29.7.0 + jest-util: ^29.7.0 p-limit: ^3.1.0 - pretty-format: ^29.6.3 - checksum: 8e98a10b11ed31df0ea4e9e6d80532ab73b1fc9295e0071a74d44841f81ea4752255d6e1e442e95072466da9d0d3cf31bfbdfff10f4ab61bc196f246bde1bf8e + pretty-format: ^29.7.0 + checksum: 41070ff8c02bfc6abb2acfad543f80e8501a5a613214715e4d3df10a2c30cf03c3db7d62f13979acf9b8f2d756e7ed0e604275ddbfe276a499da9edfc831b96b languageName: node linkType: hard @@ -11864,17 +11731,6 @@ __metadata: languageName: node linkType: hard -"jest-mock@npm:^29.6.3": - version: 29.6.3 - resolution: "jest-mock@npm:29.6.3" - dependencies: - "@jest/types": ^29.6.3 - "@types/node": "*" - jest-util: ^29.6.3 - checksum: 35772968010c0afb1bb1ef78570b9cbea907c6f967d24b4e95e1a596a1000c63d60e225fb9ddfdd5218674da4aa61d92a09927fc26310cecbbfaa8278d919e32 - languageName: node - linkType: hard - "jest-mock@npm:^29.7.0": version: 29.7.0 resolution: "jest-mock@npm:29.7.0" @@ -11915,23 +11771,6 @@ __metadata: languageName: node linkType: hard -"jest-resolve@npm:^29.6.4": - version: 29.6.4 - resolution: "jest-resolve@npm:29.6.4" - dependencies: - chalk: ^4.0.0 - graceful-fs: ^4.2.9 - jest-haste-map: ^29.6.4 - jest-pnp-resolver: ^1.2.2 - jest-util: ^29.6.3 - jest-validate: ^29.6.3 - resolve: ^1.20.0 - resolve.exports: ^2.0.0 - slash: ^3.0.0 - checksum: 5f0ef260aec79ef00e16e0ba7b27d527054e1faed08a144279cd191b5c5b71af67c52b9ddfd24aa2f563d254618ce9bf7519809f23fb2abf6c4fa375503caa28 - languageName: node - linkType: hard - "jest-resolve@npm:^29.7.0": version: 29.7.0 resolution: "jest-resolve@npm:29.7.0" @@ -11978,36 +11817,6 @@ __metadata: languageName: node linkType: hard -"jest-runtime@npm:^29.6.4": - version: 29.6.4 - resolution: "jest-runtime@npm:29.6.4" - dependencies: - "@jest/environment": ^29.6.4 - "@jest/fake-timers": ^29.6.4 - "@jest/globals": ^29.6.4 - "@jest/source-map": ^29.6.3 - "@jest/test-result": ^29.6.4 - "@jest/transform": ^29.6.4 - "@jest/types": ^29.6.3 - "@types/node": "*" - chalk: ^4.0.0 - cjs-module-lexer: ^1.0.0 - collect-v8-coverage: ^1.0.0 - glob: ^7.1.3 - graceful-fs: ^4.2.9 - jest-haste-map: ^29.6.4 - jest-message-util: ^29.6.3 - jest-mock: ^29.6.3 - jest-regex-util: ^29.6.3 - jest-resolve: ^29.6.4 - jest-snapshot: ^29.6.4 - jest-util: ^29.6.3 - slash: ^3.0.0 - strip-bom: ^4.0.0 - checksum: 93deacd06f8f2bb808dbfb8acbcbc0b724187b3d3fffafd497a32c939bf385ca21f5a3f03eebd5b958a0e93865d0e68a0db73bd0fe16dafbd5e922558aa7b359 - languageName: node - linkType: hard - "jest-runtime@npm:^29.7.0": version: 29.7.0 resolution: "jest-runtime@npm:29.7.0" @@ -12038,34 +11847,6 @@ __metadata: languageName: node linkType: hard -"jest-snapshot@npm:^29.6.4": - version: 29.6.4 - resolution: "jest-snapshot@npm:29.6.4" - dependencies: - "@babel/core": ^7.11.6 - "@babel/generator": ^7.7.2 - "@babel/plugin-syntax-jsx": ^7.7.2 - "@babel/plugin-syntax-typescript": ^7.7.2 - "@babel/types": ^7.3.3 - "@jest/expect-utils": ^29.6.4 - "@jest/transform": ^29.6.4 - "@jest/types": ^29.6.3 - babel-preset-current-node-syntax: ^1.0.0 - chalk: ^4.0.0 - expect: ^29.6.4 - graceful-fs: ^4.2.9 - jest-diff: ^29.6.4 - jest-get-type: ^29.6.3 - jest-matcher-utils: ^29.6.4 - jest-message-util: ^29.6.3 - jest-util: ^29.6.3 - natural-compare: ^1.4.0 - pretty-format: ^29.6.3 - semver: ^7.5.3 - checksum: 0c9b5ec640457fb780ac6c9b6caa814436e9e16bf744772eee3bfd055ae5f7a3085a6a09b2f30910e31915dafc3955d92357cc98189e4d5dcb417b5fdafda6e3 - languageName: node - linkType: hard - "jest-snapshot@npm:^29.7.0": version: 29.7.0 resolution: "jest-snapshot@npm:29.7.0" @@ -12122,20 +11903,6 @@ __metadata: languageName: node linkType: hard -"jest-validate@npm:^29.6.3": - version: 29.6.3 - resolution: "jest-validate@npm:29.6.3" - dependencies: - "@jest/types": ^29.6.3 - camelcase: ^6.2.0 - chalk: ^4.0.0 - jest-get-type: ^29.6.3 - leven: ^3.1.0 - pretty-format: ^29.6.3 - checksum: caa489ed11080441c636b8035ab71bafbdc0c052b1e452855e4d2dd24ac15e497710a270ea6fc5ef8926b22c1ce4d6e07ec2dc193f0810cff5851d7a2222c045 - languageName: node - linkType: hard - "jest-validate@npm:^29.7.0": version: 29.7.0 resolution: "jest-validate@npm:29.7.0" @@ -12188,18 +11955,6 @@ __metadata: languageName: node linkType: hard -"jest-worker@npm:^29.6.4": - version: 29.6.4 - resolution: "jest-worker@npm:29.6.4" - dependencies: - "@types/node": "*" - jest-util: ^29.6.3 - merge-stream: ^2.0.0 - supports-color: ^8.0.0 - checksum: 05d19a5759ebfeb964036065be55ad8d8e8ddffa85d9b3a4c0b95765695efb1d8226ec824a4d8e660c38cda3389bfeb98d819f47232acf9fb0e79f553b7c0a76 - languageName: node - linkType: hard - "jest-worker@npm:^29.7.0": version: 29.7.0 resolution: "jest-worker@npm:29.7.0" @@ -18800,7 +18555,7 @@ __metadata: jest: 29.7.0 jest-canvas-mock: 2.5.2 jest-environment-jsdom: 29.7.0 - jest-jasmine2: 29.6.4 + jest-jasmine2: 29.7.0 jimp: 0.22.10 jquery: 3.7.1 js-cookie: 3.0.5 From d07ef0dd36b694b853a87e4cae54ecb5b664efbf Mon Sep 17 00:00:00 2001 From: Otto the Bot Date: Tue, 12 Sep 2023 11:24:24 +0200 Subject: [PATCH 04/55] chore: Update translations (#15784) --- src/i18n/ar-SA.json | 12 ++++++++---- src/i18n/bn-BD.json | 12 ++++++++---- src/i18n/ca-ES.json | 12 ++++++++---- src/i18n/cs-CZ.json | 12 ++++++++---- src/i18n/da-DK.json | 12 ++++++++---- src/i18n/de-DE.json | 12 ++++++++---- src/i18n/el-GR.json | 12 ++++++++---- src/i18n/en-US.json | 4 ++-- src/i18n/es-ES.json | 12 ++++++++---- src/i18n/et-EE.json | 12 ++++++++---- src/i18n/fa-IR.json | 12 ++++++++---- src/i18n/fi-FI.json | 12 ++++++++---- src/i18n/fr-FR.json | 12 ++++++++---- src/i18n/ga-IE.json | 12 ++++++++---- src/i18n/he-IL.json | 12 ++++++++---- src/i18n/hi-IN.json | 12 ++++++++---- src/i18n/hr-HR.json | 12 ++++++++---- src/i18n/hu-HU.json | 12 ++++++++---- src/i18n/id-ID.json | 12 ++++++++---- src/i18n/is-IS.json | 12 ++++++++---- src/i18n/it-IT.json | 12 ++++++++---- src/i18n/ja-JP.json | 12 ++++++++---- src/i18n/lt-LT.json | 12 ++++++++---- src/i18n/lv-LV.json | 12 ++++++++---- src/i18n/ms-MY.json | 12 ++++++++---- src/i18n/nl-NL.json | 12 ++++++++---- src/i18n/no-NO.json | 12 ++++++++---- src/i18n/pl-PL.json | 12 ++++++++---- src/i18n/pt-BR.json | 12 ++++++++---- src/i18n/pt-PT.json | 12 ++++++++---- src/i18n/ro-RO.json | 12 ++++++++---- src/i18n/ru-RU.json | 12 ++++++++---- src/i18n/si-LK.json | 12 ++++++++---- src/i18n/sk-SK.json | 12 ++++++++---- src/i18n/sl-SI.json | 12 ++++++++---- src/i18n/sr-SP.json | 12 ++++++++---- src/i18n/sv-SE.json | 12 ++++++++---- src/i18n/th-TH.json | 12 ++++++++---- src/i18n/tr-TR.json | 12 ++++++++---- src/i18n/uk-UA.json | 12 ++++++++---- src/i18n/uz-UZ.json | 12 ++++++++---- src/i18n/vi-VN.json | 12 ++++++++---- src/i18n/zh-CN.json | 12 ++++++++---- src/i18n/zh-HK.json | 12 ++++++++---- src/i18n/zh-TW.json | 12 ++++++++---- 45 files changed, 354 insertions(+), 178 deletions(-) diff --git a/src/i18n/ar-SA.json b/src/i18n/ar-SA.json index 8b6671e1e08..c6d9522000a 100644 --- a/src/i18n/ar-SA.json +++ b/src/i18n/ar-SA.json @@ -198,6 +198,7 @@ "authPostedResendDetail": "تحقق من بريدك الإلكتروني الوارد واتبع الإرشادات التي تظهر.", "authPostedResendHeadline": "وصلك بريد", "authSSOLoginTitle": "Log in with single sign-on", + "authSetUsername": "Set username", "authVerifyAccountAdd": "إضافة", "authVerifyAccountDetail": "هذا يمكنك من استخدام واير على أجهزة متعددة.", "authVerifyAccountHeadline": "إضافة عنوان البريد الإلكتروني وكلمة المرور", @@ -959,11 +960,14 @@ "modalUserBlockHeadline": "احظر {{user}}؟", "modalUserBlockMessage": "لن يستطيع {{user}} التواصل معك أو إضافتك إلى محادثات جماعية.", "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]", + "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted", "modalUserCannotBeAddedHeadline": "Guests cannot be added", - "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user", - "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", - "modalUserCannotConnectNotFederatingHeadline": "Connecting not possible", - "modalUserCannotConnectNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", + "modalUserCannotCancelConnectionMessage": "Connection request could not be cancelled", + "modalUserCannotConnectHeadline": "Connecting not possible", + "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored", + "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", + "modalUserCannotSendConnectionMessage": "Connection request could not be sent", + "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", "modalUserLearnMore": "Learn more", "modalUserUnblockAction": "إلغاء حظر", "modalUserUnblockHeadline": "إلغاء الحظر؟", diff --git a/src/i18n/bn-BD.json b/src/i18n/bn-BD.json index 28042f11f35..1255ce270eb 100644 --- a/src/i18n/bn-BD.json +++ b/src/i18n/bn-BD.json @@ -198,6 +198,7 @@ "authPostedResendDetail": "Check your email inbox and follow the instructions.", "authPostedResendHeadline": "You’ve got mail.", "authSSOLoginTitle": "Log in with single sign-on", + "authSetUsername": "Set username", "authVerifyAccountAdd": "Add", "authVerifyAccountDetail": "This lets you use {{brandName}} on multiple devices.", "authVerifyAccountHeadline": "Add email address and password.", @@ -959,11 +960,14 @@ "modalUserBlockHeadline": "Block {{user}}?", "modalUserBlockMessage": "{{user}} won’t be able to contact you or add you to group conversations.", "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]", + "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted", "modalUserCannotBeAddedHeadline": "Guests cannot be added", - "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user", - "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", - "modalUserCannotConnectNotFederatingHeadline": "Connecting not possible", - "modalUserCannotConnectNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", + "modalUserCannotCancelConnectionMessage": "Connection request could not be cancelled", + "modalUserCannotConnectHeadline": "Connecting not possible", + "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored", + "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", + "modalUserCannotSendConnectionMessage": "Connection request could not be sent", + "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", "modalUserLearnMore": "Learn more", "modalUserUnblockAction": "Unblock", "modalUserUnblockHeadline": "Unblock?", diff --git a/src/i18n/ca-ES.json b/src/i18n/ca-ES.json index 28042f11f35..1255ce270eb 100644 --- a/src/i18n/ca-ES.json +++ b/src/i18n/ca-ES.json @@ -198,6 +198,7 @@ "authPostedResendDetail": "Check your email inbox and follow the instructions.", "authPostedResendHeadline": "You’ve got mail.", "authSSOLoginTitle": "Log in with single sign-on", + "authSetUsername": "Set username", "authVerifyAccountAdd": "Add", "authVerifyAccountDetail": "This lets you use {{brandName}} on multiple devices.", "authVerifyAccountHeadline": "Add email address and password.", @@ -959,11 +960,14 @@ "modalUserBlockHeadline": "Block {{user}}?", "modalUserBlockMessage": "{{user}} won’t be able to contact you or add you to group conversations.", "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]", + "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted", "modalUserCannotBeAddedHeadline": "Guests cannot be added", - "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user", - "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", - "modalUserCannotConnectNotFederatingHeadline": "Connecting not possible", - "modalUserCannotConnectNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", + "modalUserCannotCancelConnectionMessage": "Connection request could not be cancelled", + "modalUserCannotConnectHeadline": "Connecting not possible", + "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored", + "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", + "modalUserCannotSendConnectionMessage": "Connection request could not be sent", + "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", "modalUserLearnMore": "Learn more", "modalUserUnblockAction": "Unblock", "modalUserUnblockHeadline": "Unblock?", diff --git a/src/i18n/cs-CZ.json b/src/i18n/cs-CZ.json index 2ec63f3fe52..99b9cdad66c 100644 --- a/src/i18n/cs-CZ.json +++ b/src/i18n/cs-CZ.json @@ -198,6 +198,7 @@ "authPostedResendDetail": "Zkontrolujte doručenou poštu a postupujte dle instrukcí.", "authPostedResendHeadline": "Přišel ti email.", "authSSOLoginTitle": "Log in with single sign-on", + "authSetUsername": "Set username", "authVerifyAccountAdd": "Přidat", "authVerifyAccountDetail": "To umožňuje používat {{brandName}} na více zařízeních.", "authVerifyAccountHeadline": "Přidat emailovou adresu a heslo.", @@ -959,11 +960,14 @@ "modalUserBlockHeadline": "Blokovat {{user}}?", "modalUserBlockMessage": "{{user}} vás nebude moci kontaktovat nebo přizvat ke skupinové konverzaci.", "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]", + "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted", "modalUserCannotBeAddedHeadline": "Guests cannot be added", - "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user", - "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", - "modalUserCannotConnectNotFederatingHeadline": "Connecting not possible", - "modalUserCannotConnectNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", + "modalUserCannotCancelConnectionMessage": "Connection request could not be cancelled", + "modalUserCannotConnectHeadline": "Connecting not possible", + "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored", + "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", + "modalUserCannotSendConnectionMessage": "Connection request could not be sent", + "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", "modalUserLearnMore": "Learn more", "modalUserUnblockAction": "Odblokovat", "modalUserUnblockHeadline": "Odblokovat?", diff --git a/src/i18n/da-DK.json b/src/i18n/da-DK.json index a1ba502f17c..85e49700dfe 100644 --- a/src/i18n/da-DK.json +++ b/src/i18n/da-DK.json @@ -198,6 +198,7 @@ "authPostedResendDetail": "Tjek din email indbakke og følg anvisningerne.", "authPostedResendHeadline": "Du har post.", "authSSOLoginTitle": "Log in with single sign-on", + "authSetUsername": "Set username", "authVerifyAccountAdd": "Tilføj", "authVerifyAccountDetail": "Dette gør, at du kan bruge {{brandName}} på flere enheder.", "authVerifyAccountHeadline": "Tilføj email adresse og adgangskode.", @@ -959,11 +960,14 @@ "modalUserBlockHeadline": "Blokkér {{user}}?", "modalUserBlockMessage": "{{user}} vil ikke kunne kontakte dig eller tilføje dig til gruppesamtaler.", "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]", + "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted", "modalUserCannotBeAddedHeadline": "Guests cannot be added", - "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user", - "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", - "modalUserCannotConnectNotFederatingHeadline": "Connecting not possible", - "modalUserCannotConnectNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", + "modalUserCannotCancelConnectionMessage": "Connection request could not be cancelled", + "modalUserCannotConnectHeadline": "Connecting not possible", + "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored", + "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", + "modalUserCannotSendConnectionMessage": "Connection request could not be sent", + "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", "modalUserLearnMore": "Learn more", "modalUserUnblockAction": "Fjern Blokering", "modalUserUnblockHeadline": "Fjern Blokering?", diff --git a/src/i18n/de-DE.json b/src/i18n/de-DE.json index 42768c7e46e..27e5af98ea3 100644 --- a/src/i18n/de-DE.json +++ b/src/i18n/de-DE.json @@ -198,6 +198,7 @@ "authPostedResendDetail": "Überprüfen Sie Ihren Posteingang und folgen Sie den Anweisungen.", "authPostedResendHeadline": "Posteingang prüfen", "authSSOLoginTitle": "Mit Single Sign-On anmelden", + "authSetUsername": "Set username", "authVerifyAccountAdd": "Hinzufügen", "authVerifyAccountDetail": "Dadurch ist {{brandName}} auf mehreren Geräten nutzbar.", "authVerifyAccountHeadline": "E-Mail-Adresse und Passwort hinzufügen.", @@ -959,11 +960,14 @@ "modalUserBlockHeadline": "{{user}} blockieren?", "modalUserBlockMessage": "{{user}} wird Sie nicht mehr kontaktieren oder zu Gruppenunterhaltungen hinzufügen können.", "modalUserBlockedForLegalHold": "Dieser Nutzer ist aufgrund der gesetzlichen Aufbewahrung gesperrt. [link]Mehr erfahren[/link]", + "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted", "modalUserCannotBeAddedHeadline": "Gäste können nicht hinzugefügt werden", - "modalUserCannotConnectLegalHoldHeadline": "Keine Verbindung zu diesem Benutzer ", - "modalUserCannotConnectLegalHoldMessage": "Aufgrund der gesetzlichen Aufbewahrung können Sie sich mit diesem Nutzer nicht verbinden. [link]Mehr erfahren[/link]", - "modalUserCannotConnectNotFederatingHeadline": "Verbinden nicht möglich", - "modalUserCannotConnectNotFederatingMessage": "Sie können keine Kontaktanfrage senden, da Ihr Backend nicht mit dem von {{Benutzername}} verbunden ist.", + "modalUserCannotCancelConnectionMessage": "Connection request could not be cancelled", + "modalUserCannotConnectHeadline": "Connecting not possible", + "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored", + "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", + "modalUserCannotSendConnectionMessage": "Connection request could not be sent", + "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", "modalUserLearnMore": "Mehr erfahren", "modalUserUnblockAction": "Freigeben", "modalUserUnblockHeadline": "Freigeben?", diff --git a/src/i18n/el-GR.json b/src/i18n/el-GR.json index 572a1c424f8..4ebd237534b 100644 --- a/src/i18n/el-GR.json +++ b/src/i18n/el-GR.json @@ -198,6 +198,7 @@ "authPostedResendDetail": "Ελέγξτε τα email σας και ακολουθήστε τις οδηγίες που θα βρείτε.", "authPostedResendHeadline": "Έχετε μήνυμα.", "authSSOLoginTitle": "Log in with single sign-on", + "authSetUsername": "Set username", "authVerifyAccountAdd": "Προσθήκη", "authVerifyAccountDetail": "Αυτό σας επιτρέπει να χρησιμοποιήσετε το {{brandName}} σε πολλαπλές συσκευές.", "authVerifyAccountHeadline": "Προσθέστε email και κωδικό πρόσβασης.", @@ -959,11 +960,14 @@ "modalUserBlockHeadline": "Αποκλεισμός {{user}},", "modalUserBlockMessage": "{{user}} δεν θα μπορέσει να επικοινωνήσει μαζί σας ή να σας προσθέσει σε ομαδικές συνομιλίες.", "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]", + "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted", "modalUserCannotBeAddedHeadline": "Guests cannot be added", - "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user", - "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", - "modalUserCannotConnectNotFederatingHeadline": "Connecting not possible", - "modalUserCannotConnectNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", + "modalUserCannotCancelConnectionMessage": "Connection request could not be cancelled", + "modalUserCannotConnectHeadline": "Connecting not possible", + "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored", + "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", + "modalUserCannotSendConnectionMessage": "Connection request could not be sent", + "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", "modalUserLearnMore": "Learn more", "modalUserUnblockAction": "Άρση αποκλεισμού", "modalUserUnblockHeadline": "Άρση αποκλεισμού", diff --git a/src/i18n/en-US.json b/src/i18n/en-US.json index 4f37e44ac0b..1255ce270eb 100644 --- a/src/i18n/en-US.json +++ b/src/i18n/en-US.json @@ -177,7 +177,6 @@ "authErrorSignIn": "Please verify your details and try again.", "authErrorSuspended": "This account is no longer authorized to log in.", "authForgotPasswordTitle": "Change your password", - "authSetUsername": "Set username", "authHistoryButton": "OK", "authHistoryDescription": "For privacy reasons, your conversation history will not appear here.", "authHistoryHeadline": "It’s the first time you’re using {{brandName}} on this device.", @@ -199,6 +198,7 @@ "authPostedResendDetail": "Check your email inbox and follow the instructions.", "authPostedResendHeadline": "You’ve got mail.", "authSSOLoginTitle": "Log in with single sign-on", + "authSetUsername": "Set username", "authVerifyAccountAdd": "Add", "authVerifyAccountDetail": "This lets you use {{brandName}} on multiple devices.", "authVerifyAccountHeadline": "Add email address and password.", @@ -965,8 +965,8 @@ "modalUserCannotCancelConnectionMessage": "Connection request could not be cancelled", "modalUserCannotConnectHeadline": "Connecting not possible", "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored", - "modalUserCannotSendConnectionMessage": "Connection request could not be sent", "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", + "modalUserCannotSendConnectionMessage": "Connection request could not be sent", "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", "modalUserLearnMore": "Learn more", "modalUserUnblockAction": "Unblock", diff --git a/src/i18n/es-ES.json b/src/i18n/es-ES.json index eccffe9348e..c2c0a4dc035 100644 --- a/src/i18n/es-ES.json +++ b/src/i18n/es-ES.json @@ -198,6 +198,7 @@ "authPostedResendDetail": "Revise su buzón de correo electrónico y siga las instrucciones", "authPostedResendHeadline": "Tiene un correo electrónico.", "authSSOLoginTitle": "Log in with single sign-on", + "authSetUsername": "Set username", "authVerifyAccountAdd": "Agregar", "authVerifyAccountDetail": "Esto le permite usar {{brandName}} en múltiples dispositivos.", "authVerifyAccountHeadline": "Agregar dirección de correo electrónico y contraseña.", @@ -959,11 +960,14 @@ "modalUserBlockHeadline": "¿Bloquear a {{user}}?", "modalUserBlockMessage": "{{user}} no podrá ponerse en contacto contigo o añadirte a chats de grupo.", "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]", + "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted", "modalUserCannotBeAddedHeadline": "Guests cannot be added", - "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user", - "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", - "modalUserCannotConnectNotFederatingHeadline": "Connecting not possible", - "modalUserCannotConnectNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", + "modalUserCannotCancelConnectionMessage": "Connection request could not be cancelled", + "modalUserCannotConnectHeadline": "Connecting not possible", + "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored", + "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", + "modalUserCannotSendConnectionMessage": "Connection request could not be sent", + "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", "modalUserLearnMore": "Learn more", "modalUserUnblockAction": "Desbloquear", "modalUserUnblockHeadline": "¿Desbloquear?", diff --git a/src/i18n/et-EE.json b/src/i18n/et-EE.json index 7f2f44b0391..e6f0f7b56c1 100644 --- a/src/i18n/et-EE.json +++ b/src/i18n/et-EE.json @@ -198,6 +198,7 @@ "authPostedResendDetail": "Kontrolli oma e-postkasti ja järgi kirjas olevaid juhiseid.", "authPostedResendHeadline": "Sulle tuli kiri.", "authSSOLoginTitle": "Log in with single sign-on", + "authSetUsername": "Set username", "authVerifyAccountAdd": "Lisa", "authVerifyAccountDetail": "See võimaldab kasutada {{brandName}}’i mitmes seadmes.", "authVerifyAccountHeadline": "Lisa meiliaadress ja parool.", @@ -959,11 +960,14 @@ "modalUserBlockHeadline": "Blokeerid kasutaja {{user}}?", "modalUserBlockMessage": "{{user}} ei saa sulle sõnumeid saata ega sind grupivestlustesse lisada.", "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]", + "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted", "modalUserCannotBeAddedHeadline": "Guests cannot be added", - "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user", - "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", - "modalUserCannotConnectNotFederatingHeadline": "Connecting not possible", - "modalUserCannotConnectNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", + "modalUserCannotCancelConnectionMessage": "Connection request could not be cancelled", + "modalUserCannotConnectHeadline": "Connecting not possible", + "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored", + "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", + "modalUserCannotSendConnectionMessage": "Connection request could not be sent", + "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", "modalUserLearnMore": "Learn more", "modalUserUnblockAction": "Eemalda blokeering", "modalUserUnblockHeadline": "Eemaldad blokeeringu?", diff --git a/src/i18n/fa-IR.json b/src/i18n/fa-IR.json index 5783635a188..c09581cd449 100644 --- a/src/i18n/fa-IR.json +++ b/src/i18n/fa-IR.json @@ -198,6 +198,7 @@ "authPostedResendDetail": "صندوق ایمیل خود را بررسی و دستورالعمل‌های داخل ایمیل را دنبال کنید.", "authPostedResendHeadline": "شما ایمیل دریافت کردید.", "authSSOLoginTitle": "Log in with single sign-on", + "authSetUsername": "Set username", "authVerifyAccountAdd": "اضافه کردن", "authVerifyAccountDetail": "این به شما کمک می‌کند تا در دستگاه‌های مختلف از {{brandName}} استفاده کنید.", "authVerifyAccountHeadline": "ایمیل آدرس خود و رمز عبور جدیدی را وارد کنید.", @@ -959,11 +960,14 @@ "modalUserBlockHeadline": "آیا {{user}} مسدود شود?", "modalUserBlockMessage": "{{user}} قادر به تماس با شما یا افزودن شما به مکالمات گروهی نخواهد بود.", "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]", + "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted", "modalUserCannotBeAddedHeadline": "Guests cannot be added", - "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user", - "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", - "modalUserCannotConnectNotFederatingHeadline": "Connecting not possible", - "modalUserCannotConnectNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", + "modalUserCannotCancelConnectionMessage": "Connection request could not be cancelled", + "modalUserCannotConnectHeadline": "Connecting not possible", + "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored", + "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", + "modalUserCannotSendConnectionMessage": "Connection request could not be sent", + "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", "modalUserLearnMore": "Learn more", "modalUserUnblockAction": "خارج کردن از مسدود بودن", "modalUserUnblockHeadline": "خارج کردن از مسدود بودن", diff --git a/src/i18n/fi-FI.json b/src/i18n/fi-FI.json index cdeb401b863..be1198cd728 100644 --- a/src/i18n/fi-FI.json +++ b/src/i18n/fi-FI.json @@ -198,6 +198,7 @@ "authPostedResendDetail": "Tarkista sähköpostisi saapuneet-kansio ja seuraa ohjeita.", "authPostedResendHeadline": "Sinulle on sähköpostia.", "authSSOLoginTitle": "Log in with single sign-on", + "authSetUsername": "Set username", "authVerifyAccountAdd": "Lisää", "authVerifyAccountDetail": "Tämä mahdollistaa Wiren käytön useilla laitteilla.", "authVerifyAccountHeadline": "Lisää sähköpostiosoitteesi ja salasanasi.", @@ -959,11 +960,14 @@ "modalUserBlockHeadline": "Estä {{user}}?", "modalUserBlockMessage": "{{user}} ei pysty ottamaan sinuun yhteyttä tai lisäämään sinua ryhmäkeskusteluihin.", "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]", + "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted", "modalUserCannotBeAddedHeadline": "Guests cannot be added", - "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user", - "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", - "modalUserCannotConnectNotFederatingHeadline": "Connecting not possible", - "modalUserCannotConnectNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", + "modalUserCannotCancelConnectionMessage": "Connection request could not be cancelled", + "modalUserCannotConnectHeadline": "Connecting not possible", + "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored", + "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", + "modalUserCannotSendConnectionMessage": "Connection request could not be sent", + "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", "modalUserLearnMore": "Learn more", "modalUserUnblockAction": "Poista esto", "modalUserUnblockHeadline": "Poista esto?", diff --git a/src/i18n/fr-FR.json b/src/i18n/fr-FR.json index 8af2a93eb9d..aa68c1324e2 100644 --- a/src/i18n/fr-FR.json +++ b/src/i18n/fr-FR.json @@ -198,6 +198,7 @@ "authPostedResendDetail": "Vérifiez votre boîte de réception et suivez les instructions.", "authPostedResendHeadline": "Vous avez du courrier.", "authSSOLoginTitle": "Log in with single sign-on", + "authSetUsername": "Set username", "authVerifyAccountAdd": "Ajouter", "authVerifyAccountDetail": "Cela vous permet d’utiliser {{brandName}} sur plusieurs appareils.", "authVerifyAccountHeadline": "Ajouter une adresse e-mail et un mot de passe.", @@ -959,11 +960,14 @@ "modalUserBlockHeadline": "Bloquer {{user}} ?", "modalUserBlockMessage": "{{user}} ne pourra plus vous contacter ou vous ajouter à des conversations de groupe.", "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]", + "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted", "modalUserCannotBeAddedHeadline": "Guests cannot be added", - "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user", - "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", - "modalUserCannotConnectNotFederatingHeadline": "Connecting not possible", - "modalUserCannotConnectNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", + "modalUserCannotCancelConnectionMessage": "Connection request could not be cancelled", + "modalUserCannotConnectHeadline": "Connecting not possible", + "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored", + "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", + "modalUserCannotSendConnectionMessage": "Connection request could not be sent", + "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", "modalUserLearnMore": "Learn more", "modalUserUnblockAction": "Débloquer", "modalUserUnblockHeadline": "Débloquer ?", diff --git a/src/i18n/ga-IE.json b/src/i18n/ga-IE.json index 28042f11f35..1255ce270eb 100644 --- a/src/i18n/ga-IE.json +++ b/src/i18n/ga-IE.json @@ -198,6 +198,7 @@ "authPostedResendDetail": "Check your email inbox and follow the instructions.", "authPostedResendHeadline": "You’ve got mail.", "authSSOLoginTitle": "Log in with single sign-on", + "authSetUsername": "Set username", "authVerifyAccountAdd": "Add", "authVerifyAccountDetail": "This lets you use {{brandName}} on multiple devices.", "authVerifyAccountHeadline": "Add email address and password.", @@ -959,11 +960,14 @@ "modalUserBlockHeadline": "Block {{user}}?", "modalUserBlockMessage": "{{user}} won’t be able to contact you or add you to group conversations.", "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]", + "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted", "modalUserCannotBeAddedHeadline": "Guests cannot be added", - "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user", - "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", - "modalUserCannotConnectNotFederatingHeadline": "Connecting not possible", - "modalUserCannotConnectNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", + "modalUserCannotCancelConnectionMessage": "Connection request could not be cancelled", + "modalUserCannotConnectHeadline": "Connecting not possible", + "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored", + "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", + "modalUserCannotSendConnectionMessage": "Connection request could not be sent", + "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", "modalUserLearnMore": "Learn more", "modalUserUnblockAction": "Unblock", "modalUserUnblockHeadline": "Unblock?", diff --git a/src/i18n/he-IL.json b/src/i18n/he-IL.json index 28042f11f35..1255ce270eb 100644 --- a/src/i18n/he-IL.json +++ b/src/i18n/he-IL.json @@ -198,6 +198,7 @@ "authPostedResendDetail": "Check your email inbox and follow the instructions.", "authPostedResendHeadline": "You’ve got mail.", "authSSOLoginTitle": "Log in with single sign-on", + "authSetUsername": "Set username", "authVerifyAccountAdd": "Add", "authVerifyAccountDetail": "This lets you use {{brandName}} on multiple devices.", "authVerifyAccountHeadline": "Add email address and password.", @@ -959,11 +960,14 @@ "modalUserBlockHeadline": "Block {{user}}?", "modalUserBlockMessage": "{{user}} won’t be able to contact you or add you to group conversations.", "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]", + "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted", "modalUserCannotBeAddedHeadline": "Guests cannot be added", - "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user", - "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", - "modalUserCannotConnectNotFederatingHeadline": "Connecting not possible", - "modalUserCannotConnectNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", + "modalUserCannotCancelConnectionMessage": "Connection request could not be cancelled", + "modalUserCannotConnectHeadline": "Connecting not possible", + "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored", + "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", + "modalUserCannotSendConnectionMessage": "Connection request could not be sent", + "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", "modalUserLearnMore": "Learn more", "modalUserUnblockAction": "Unblock", "modalUserUnblockHeadline": "Unblock?", diff --git a/src/i18n/hi-IN.json b/src/i18n/hi-IN.json index eb980bf223d..e9bef0f9d0b 100644 --- a/src/i18n/hi-IN.json +++ b/src/i18n/hi-IN.json @@ -198,6 +198,7 @@ "authPostedResendDetail": "अपने ईमेल इनबॉक्स का जांच करें और निर्देशों का पालन करें।", "authPostedResendHeadline": "आपका ईमेल आया है|", "authSSOLoginTitle": "Log in with single sign-on", + "authSetUsername": "Set username", "authVerifyAccountAdd": "Add", "authVerifyAccountDetail": "यह आपको {{brandName}} का इस्तेमाल कई उपकरणों मैं करने देता है|", "authVerifyAccountHeadline": "ईमेल पता तथा पासवर्ड को जोड़े|", @@ -959,11 +960,14 @@ "modalUserBlockHeadline": "{{user}} को ब्लॉक करें?", "modalUserBlockMessage": "{{user}} won’t be able to contact you or add you to group conversations.", "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]", + "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted", "modalUserCannotBeAddedHeadline": "Guests cannot be added", - "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user", - "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", - "modalUserCannotConnectNotFederatingHeadline": "Connecting not possible", - "modalUserCannotConnectNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", + "modalUserCannotCancelConnectionMessage": "Connection request could not be cancelled", + "modalUserCannotConnectHeadline": "Connecting not possible", + "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored", + "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", + "modalUserCannotSendConnectionMessage": "Connection request could not be sent", + "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", "modalUserLearnMore": "Learn more", "modalUserUnblockAction": "Unblock", "modalUserUnblockHeadline": "Unblock?", diff --git a/src/i18n/hr-HR.json b/src/i18n/hr-HR.json index 78d389c1b17..5810c403a9f 100644 --- a/src/i18n/hr-HR.json +++ b/src/i18n/hr-HR.json @@ -198,6 +198,7 @@ "authPostedResendDetail": "Provjerite svoj email sandučić i slijedite upute.", "authPostedResendHeadline": "Imate poštu.", "authSSOLoginTitle": "Log in with single sign-on", + "authSetUsername": "Set username", "authVerifyAccountAdd": "Dodaj", "authVerifyAccountDetail": "Ovo Vam omogućuje da koristite {{brandName}} na više uređaja.", "authVerifyAccountHeadline": "Dodajte email adresu i lozinku.", @@ -959,11 +960,14 @@ "modalUserBlockHeadline": "Blokiraj {{user}}?", "modalUserBlockMessage": "{{user}} Vas neće moći kontaktirati niti dodati u grupne razgovore.", "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]", + "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted", "modalUserCannotBeAddedHeadline": "Guests cannot be added", - "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user", - "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", - "modalUserCannotConnectNotFederatingHeadline": "Connecting not possible", - "modalUserCannotConnectNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", + "modalUserCannotCancelConnectionMessage": "Connection request could not be cancelled", + "modalUserCannotConnectHeadline": "Connecting not possible", + "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored", + "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", + "modalUserCannotSendConnectionMessage": "Connection request could not be sent", + "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", "modalUserLearnMore": "Learn more", "modalUserUnblockAction": "Odblokiraj", "modalUserUnblockHeadline": "Odblokirati?", diff --git a/src/i18n/hu-HU.json b/src/i18n/hu-HU.json index 3264ff987d6..a8be46ef6c7 100644 --- a/src/i18n/hu-HU.json +++ b/src/i18n/hu-HU.json @@ -198,6 +198,7 @@ "authPostedResendDetail": "Ellenőrizd bejövő e-mailjeidet és kövesd az utasításokat.", "authPostedResendHeadline": "Leveled érkezett.", "authSSOLoginTitle": "Log in with single sign-on", + "authSetUsername": "Set username", "authVerifyAccountAdd": "Hozzáadás", "authVerifyAccountDetail": "Ezáltal akár több eszközön is használhatod a {{brandName}}-t.", "authVerifyAccountHeadline": "E-mail cím és jelszó megadása.", @@ -959,11 +960,14 @@ "modalUserBlockHeadline": "{{user}} tiltása?", "modalUserBlockMessage": "{{user}} nem tud majd kapcsolatba lépni veled, sem meghívni téged csoportos beszélgetésekbe.", "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]", + "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted", "modalUserCannotBeAddedHeadline": "Guests cannot be added", - "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user", - "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", - "modalUserCannotConnectNotFederatingHeadline": "Connecting not possible", - "modalUserCannotConnectNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", + "modalUserCannotCancelConnectionMessage": "Connection request could not be cancelled", + "modalUserCannotConnectHeadline": "Connecting not possible", + "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored", + "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", + "modalUserCannotSendConnectionMessage": "Connection request could not be sent", + "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", "modalUserLearnMore": "Learn more", "modalUserUnblockAction": "Tiltás feloldása", "modalUserUnblockHeadline": "Feloldod a letiltást?", diff --git a/src/i18n/id-ID.json b/src/i18n/id-ID.json index bb15e584bf3..a4563fe614e 100644 --- a/src/i18n/id-ID.json +++ b/src/i18n/id-ID.json @@ -198,6 +198,7 @@ "authPostedResendDetail": "Periksa kotak masuk email Anda dan ikuti petunjuk.", "authPostedResendHeadline": "Anda telah mendapatkan pesan.", "authSSOLoginTitle": "Log in with single sign-on", + "authSetUsername": "Set username", "authVerifyAccountAdd": "Tambahkan", "authVerifyAccountDetail": "Ini memungkinkan Anda menggunakan {{brandName}} di beberapa perangkat.", "authVerifyAccountHeadline": "Tambahkan alamat email dan sandi.", @@ -959,11 +960,14 @@ "modalUserBlockHeadline": "Blokir {{user}} ?", "modalUserBlockMessage": "{{user}} tidak dapat menghubungi Anda atau menambahkan Anda ke percakapan grup.", "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]", + "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted", "modalUserCannotBeAddedHeadline": "Guests cannot be added", - "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user", - "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", - "modalUserCannotConnectNotFederatingHeadline": "Connecting not possible", - "modalUserCannotConnectNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", + "modalUserCannotCancelConnectionMessage": "Connection request could not be cancelled", + "modalUserCannotConnectHeadline": "Connecting not possible", + "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored", + "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", + "modalUserCannotSendConnectionMessage": "Connection request could not be sent", + "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", "modalUserLearnMore": "Learn more", "modalUserUnblockAction": "Buka blokir", "modalUserUnblockHeadline": "Buka blokir?", diff --git a/src/i18n/is-IS.json b/src/i18n/is-IS.json index 28042f11f35..1255ce270eb 100644 --- a/src/i18n/is-IS.json +++ b/src/i18n/is-IS.json @@ -198,6 +198,7 @@ "authPostedResendDetail": "Check your email inbox and follow the instructions.", "authPostedResendHeadline": "You’ve got mail.", "authSSOLoginTitle": "Log in with single sign-on", + "authSetUsername": "Set username", "authVerifyAccountAdd": "Add", "authVerifyAccountDetail": "This lets you use {{brandName}} on multiple devices.", "authVerifyAccountHeadline": "Add email address and password.", @@ -959,11 +960,14 @@ "modalUserBlockHeadline": "Block {{user}}?", "modalUserBlockMessage": "{{user}} won’t be able to contact you or add you to group conversations.", "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]", + "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted", "modalUserCannotBeAddedHeadline": "Guests cannot be added", - "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user", - "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", - "modalUserCannotConnectNotFederatingHeadline": "Connecting not possible", - "modalUserCannotConnectNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", + "modalUserCannotCancelConnectionMessage": "Connection request could not be cancelled", + "modalUserCannotConnectHeadline": "Connecting not possible", + "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored", + "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", + "modalUserCannotSendConnectionMessage": "Connection request could not be sent", + "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", "modalUserLearnMore": "Learn more", "modalUserUnblockAction": "Unblock", "modalUserUnblockHeadline": "Unblock?", diff --git a/src/i18n/it-IT.json b/src/i18n/it-IT.json index fb82e038b3a..45abeb7eeb6 100644 --- a/src/i18n/it-IT.json +++ b/src/i18n/it-IT.json @@ -198,6 +198,7 @@ "authPostedResendDetail": "Verifica la tua casella di posta e segui le istruzioni.", "authPostedResendHeadline": "C’è posta per te.", "authSSOLoginTitle": "Log in with single sign-on", + "authSetUsername": "Set username", "authVerifyAccountAdd": "Aggiungi", "authVerifyAccountDetail": "Questo ti consente di usare {{brandName}} su più dispositivi.", "authVerifyAccountHeadline": "Aggiungi indirizzo email e password.", @@ -959,11 +960,14 @@ "modalUserBlockHeadline": "Bloccare {{user}}?", "modalUserBlockMessage": "{{user}} non sarà in grado di contattarti o aggiungerti alle conversazioni di gruppo.", "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]", + "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted", "modalUserCannotBeAddedHeadline": "Guests cannot be added", - "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user", - "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", - "modalUserCannotConnectNotFederatingHeadline": "Connecting not possible", - "modalUserCannotConnectNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", + "modalUserCannotCancelConnectionMessage": "Connection request could not be cancelled", + "modalUserCannotConnectHeadline": "Connecting not possible", + "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored", + "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", + "modalUserCannotSendConnectionMessage": "Connection request could not be sent", + "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", "modalUserLearnMore": "Learn more", "modalUserUnblockAction": "Sblocca", "modalUserUnblockHeadline": "Sblocca?", diff --git a/src/i18n/ja-JP.json b/src/i18n/ja-JP.json index 9176b3d225c..aed0060f2cf 100644 --- a/src/i18n/ja-JP.json +++ b/src/i18n/ja-JP.json @@ -198,6 +198,7 @@ "authPostedResendDetail": "メールの受信トレイを確認して、手順に従ってください。", "authPostedResendHeadline": "メールを受信しました", "authSSOLoginTitle": "Log in with single sign-on", + "authSetUsername": "Set username", "authVerifyAccountAdd": "追加する", "authVerifyAccountDetail": "これにより、複数のデバイスで {{brandName}} を使用できます。", "authVerifyAccountHeadline": "メールアドレスとパスワードを追加", @@ -959,11 +960,14 @@ "modalUserBlockHeadline": "{{user}} をブロックしますか？", "modalUserBlockMessage": "{{user}} は、あなたにコンタクトをすることやグループ会話にあなたを追加することができません。", "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]", + "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted", "modalUserCannotBeAddedHeadline": "Guests cannot be added", - "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user", - "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", - "modalUserCannotConnectNotFederatingHeadline": "Connecting not possible", - "modalUserCannotConnectNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", + "modalUserCannotCancelConnectionMessage": "Connection request could not be cancelled", + "modalUserCannotConnectHeadline": "Connecting not possible", + "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored", + "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", + "modalUserCannotSendConnectionMessage": "Connection request could not be sent", + "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", "modalUserLearnMore": "Learn more", "modalUserUnblockAction": "ブロック解除", "modalUserUnblockHeadline": "ブロック解除？", diff --git a/src/i18n/lt-LT.json b/src/i18n/lt-LT.json index f07f0e42020..9dd9ae3524a 100644 --- a/src/i18n/lt-LT.json +++ b/src/i18n/lt-LT.json @@ -198,6 +198,7 @@ "authPostedResendDetail": "Patikrinkite savo el. paštą ir sekite nurodymus.", "authPostedResendHeadline": "Jūs gavote laišką.", "authSSOLoginTitle": "Log in with single sign-on", + "authSetUsername": "Set username", "authVerifyAccountAdd": "Pridėti", "authVerifyAccountDetail": "Tai leidžia jums naudoti „{{brandName}}“ keliuose įrenginiuose.", "authVerifyAccountHeadline": "Pridėkite el. pašto adresą ir slaptažodį.", @@ -959,11 +960,14 @@ "modalUserBlockHeadline": "Užblokuoti {{user}}?", "modalUserBlockMessage": "{{user}} negalės su jumis susisiekti ar pridėti jus į grupės pokalbius.", "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]", + "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted", "modalUserCannotBeAddedHeadline": "Guests cannot be added", - "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user", - "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", - "modalUserCannotConnectNotFederatingHeadline": "Connecting not possible", - "modalUserCannotConnectNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", + "modalUserCannotCancelConnectionMessage": "Connection request could not be cancelled", + "modalUserCannotConnectHeadline": "Connecting not possible", + "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored", + "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", + "modalUserCannotSendConnectionMessage": "Connection request could not be sent", + "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", "modalUserLearnMore": "Learn more", "modalUserUnblockAction": "Atblokuoti", "modalUserUnblockHeadline": "Atblokuoti?", diff --git a/src/i18n/lv-LV.json b/src/i18n/lv-LV.json index 3c67c3a203a..f33ee293338 100644 --- a/src/i18n/lv-LV.json +++ b/src/i18n/lv-LV.json @@ -198,6 +198,7 @@ "authPostedResendDetail": "Pārbaudiet savu e-pasta iesūtni un sekojiet norādījumiem.", "authPostedResendHeadline": "Tev ir pienācis pasts.", "authSSOLoginTitle": "Log in with single sign-on", + "authSetUsername": "Set username", "authVerifyAccountAdd": "Pievienot", "authVerifyAccountDetail": "Šis ļauj izmantot {{brandName}} uz vairākām ierīcēm.", "authVerifyAccountHeadline": "Pievienot e-pasta adresi un paroli.", @@ -959,11 +960,14 @@ "modalUserBlockHeadline": "Block {{user}}?", "modalUserBlockMessage": "{{user}} won’t be able to contact you or add you to group conversations.", "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]", + "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted", "modalUserCannotBeAddedHeadline": "Guests cannot be added", - "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user", - "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", - "modalUserCannotConnectNotFederatingHeadline": "Connecting not possible", - "modalUserCannotConnectNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", + "modalUserCannotCancelConnectionMessage": "Connection request could not be cancelled", + "modalUserCannotConnectHeadline": "Connecting not possible", + "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored", + "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", + "modalUserCannotSendConnectionMessage": "Connection request could not be sent", + "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", "modalUserLearnMore": "Learn more", "modalUserUnblockAction": "Unblock", "modalUserUnblockHeadline": "Atbloķēt?", diff --git a/src/i18n/ms-MY.json b/src/i18n/ms-MY.json index 28042f11f35..1255ce270eb 100644 --- a/src/i18n/ms-MY.json +++ b/src/i18n/ms-MY.json @@ -198,6 +198,7 @@ "authPostedResendDetail": "Check your email inbox and follow the instructions.", "authPostedResendHeadline": "You’ve got mail.", "authSSOLoginTitle": "Log in with single sign-on", + "authSetUsername": "Set username", "authVerifyAccountAdd": "Add", "authVerifyAccountDetail": "This lets you use {{brandName}} on multiple devices.", "authVerifyAccountHeadline": "Add email address and password.", @@ -959,11 +960,14 @@ "modalUserBlockHeadline": "Block {{user}}?", "modalUserBlockMessage": "{{user}} won’t be able to contact you or add you to group conversations.", "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]", + "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted", "modalUserCannotBeAddedHeadline": "Guests cannot be added", - "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user", - "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", - "modalUserCannotConnectNotFederatingHeadline": "Connecting not possible", - "modalUserCannotConnectNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", + "modalUserCannotCancelConnectionMessage": "Connection request could not be cancelled", + "modalUserCannotConnectHeadline": "Connecting not possible", + "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored", + "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", + "modalUserCannotSendConnectionMessage": "Connection request could not be sent", + "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", "modalUserLearnMore": "Learn more", "modalUserUnblockAction": "Unblock", "modalUserUnblockHeadline": "Unblock?", diff --git a/src/i18n/nl-NL.json b/src/i18n/nl-NL.json index 7767312ffb4..37ecf06836c 100644 --- a/src/i18n/nl-NL.json +++ b/src/i18n/nl-NL.json @@ -198,6 +198,7 @@ "authPostedResendDetail": "Controleer je inbox en volg de instructies.", "authPostedResendHeadline": "Je hebt e-mail ontvangen.", "authSSOLoginTitle": "Log in with single sign-on", + "authSetUsername": "Set username", "authVerifyAccountAdd": "Toevoegen", "authVerifyAccountDetail": "Dit zorgt ervoor dat je {{brandName}} op meerdere apparaten kunt gebruiken.", "authVerifyAccountHeadline": "E-mailadres en wachtwoord toevoegen.", @@ -959,11 +960,14 @@ "modalUserBlockHeadline": "{{user}} blokkeren?", "modalUserBlockMessage": "{{user}} zal niet in staat zijn je te contacteren of toe te voegen aan een groepsgesprek.", "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]", + "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted", "modalUserCannotBeAddedHeadline": "Guests cannot be added", - "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user", - "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", - "modalUserCannotConnectNotFederatingHeadline": "Connecting not possible", - "modalUserCannotConnectNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", + "modalUserCannotCancelConnectionMessage": "Connection request could not be cancelled", + "modalUserCannotConnectHeadline": "Connecting not possible", + "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored", + "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", + "modalUserCannotSendConnectionMessage": "Connection request could not be sent", + "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", "modalUserLearnMore": "Learn more", "modalUserUnblockAction": "Deblokkeer", "modalUserUnblockHeadline": "Deblokkeer?", diff --git a/src/i18n/no-NO.json b/src/i18n/no-NO.json index 58205e6f3b7..5acae4392d8 100644 --- a/src/i18n/no-NO.json +++ b/src/i18n/no-NO.json @@ -198,6 +198,7 @@ "authPostedResendDetail": "Sjekk e-postboksen din og følg instruksjonene.", "authPostedResendHeadline": "Du har en ny e-post.", "authSSOLoginTitle": "Log in with single sign-on", + "authSetUsername": "Set username", "authVerifyAccountAdd": "Legg til", "authVerifyAccountDetail": "Dette lar deg bruke {{brandName}} på flere enheter.", "authVerifyAccountHeadline": "Legg til e-postadresse og et passord.", @@ -959,11 +960,14 @@ "modalUserBlockHeadline": "Block {{user}}?", "modalUserBlockMessage": "{{user}} won’t be able to contact you or add you to group conversations.", "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]", + "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted", "modalUserCannotBeAddedHeadline": "Guests cannot be added", - "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user", - "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", - "modalUserCannotConnectNotFederatingHeadline": "Connecting not possible", - "modalUserCannotConnectNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", + "modalUserCannotCancelConnectionMessage": "Connection request could not be cancelled", + "modalUserCannotConnectHeadline": "Connecting not possible", + "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored", + "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", + "modalUserCannotSendConnectionMessage": "Connection request could not be sent", + "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", "modalUserLearnMore": "Learn more", "modalUserUnblockAction": "Opphev blokkering", "modalUserUnblockHeadline": "Opphev blokkering?", diff --git a/src/i18n/pl-PL.json b/src/i18n/pl-PL.json index a2476c1997f..02b7f1829ba 100644 --- a/src/i18n/pl-PL.json +++ b/src/i18n/pl-PL.json @@ -198,6 +198,7 @@ "authPostedResendDetail": "Sprawdź swoją skrzynkę e-mail i postępuj zgodnie z instrukcjami.", "authPostedResendHeadline": "Masz wiadomość.", "authSSOLoginTitle": "Log in with single sign-on", + "authSetUsername": "Set username", "authVerifyAccountAdd": "Dodaj", "authVerifyAccountDetail": "To pozwala Ci używać {{brandName}} na więcej niż jednym urządzeniu.", "authVerifyAccountHeadline": "Dodaj adres e-mail i hasło.", @@ -959,11 +960,14 @@ "modalUserBlockHeadline": "Zablokować {{user}}?", "modalUserBlockMessage": "{{user}} nie będzie mógł się z Tobą skontaktować, ani dodać do rozmowy grupowej.", "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]", + "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted", "modalUserCannotBeAddedHeadline": "Guests cannot be added", - "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user", - "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", - "modalUserCannotConnectNotFederatingHeadline": "Connecting not possible", - "modalUserCannotConnectNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", + "modalUserCannotCancelConnectionMessage": "Connection request could not be cancelled", + "modalUserCannotConnectHeadline": "Connecting not possible", + "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored", + "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", + "modalUserCannotSendConnectionMessage": "Connection request could not be sent", + "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", "modalUserLearnMore": "Learn more", "modalUserUnblockAction": "Odblokuj", "modalUserUnblockHeadline": "Odblokować?", diff --git a/src/i18n/pt-BR.json b/src/i18n/pt-BR.json index 167f3beb1d5..baf1f6d2f17 100644 --- a/src/i18n/pt-BR.json +++ b/src/i18n/pt-BR.json @@ -198,6 +198,7 @@ "authPostedResendDetail": "Verifique sua caixa de entrada do e-mail e siga as instruções.", "authPostedResendHeadline": "Você recebeu um e-mail.", "authSSOLoginTitle": "Iniciar sessão com SSO", + "authSetUsername": "Set username", "authVerifyAccountAdd": "Adicionar", "authVerifyAccountDetail": "Isso permite que você use o {{brandName}} em vários dispositivos.", "authVerifyAccountHeadline": "Adicionar o endereço de e-mail e senha.", @@ -959,11 +960,14 @@ "modalUserBlockHeadline": "Bloquear {{user}}?", "modalUserBlockMessage": "{{user}} não conseguirá entrar em contato com você ou convidá-lo para uma conversa em grupo.", "modalUserBlockedForLegalHold": "Este usuário está bloqueado devido à Retenção Legal. [link]Saiba mais[/link]", + "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted", "modalUserCannotBeAddedHeadline": "Os convidados não podem ser adicionados", - "modalUserCannotConnectLegalHoldHeadline": "Não é possível conectar a este usuário", - "modalUserCannotConnectLegalHoldMessage": "Você não pode se conectar a este usuário devido à Retenção Legal. [link]Saiba mais[/link] ", - "modalUserCannotConnectNotFederatingHeadline": "Connecting not possible", - "modalUserCannotConnectNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", + "modalUserCannotCancelConnectionMessage": "Connection request could not be cancelled", + "modalUserCannotConnectHeadline": "Connecting not possible", + "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored", + "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", + "modalUserCannotSendConnectionMessage": "Connection request could not be sent", + "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", "modalUserLearnMore": "Saiba mais", "modalUserUnblockAction": "Desbloquear", "modalUserUnblockHeadline": "Desbloquear?", diff --git a/src/i18n/pt-PT.json b/src/i18n/pt-PT.json index 3f067d4391d..a036af8f90a 100644 --- a/src/i18n/pt-PT.json +++ b/src/i18n/pt-PT.json @@ -198,6 +198,7 @@ "authPostedResendDetail": "Verifique sua caixa de correio eletrónico e siga as instruções.", "authPostedResendHeadline": "Recebeu email.", "authSSOLoginTitle": "Log in with single sign-on", + "authSetUsername": "Set username", "authVerifyAccountAdd": "Adicionar", "authVerifyAccountDetail": "Permite que use o {{brandName}} em vários dispositivos.", "authVerifyAccountHeadline": "Adicionar o endereço de e-mail e palavra-passe.", @@ -959,11 +960,14 @@ "modalUserBlockHeadline": "Bloquear {{user}}?", "modalUserBlockMessage": "{{user}} não será capaz de o contactar ou adicioná-lo para conversas em grupo.", "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]", + "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted", "modalUserCannotBeAddedHeadline": "Guests cannot be added", - "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user", - "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", - "modalUserCannotConnectNotFederatingHeadline": "Connecting not possible", - "modalUserCannotConnectNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", + "modalUserCannotCancelConnectionMessage": "Connection request could not be cancelled", + "modalUserCannotConnectHeadline": "Connecting not possible", + "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored", + "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", + "modalUserCannotSendConnectionMessage": "Connection request could not be sent", + "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", "modalUserLearnMore": "Learn more", "modalUserUnblockAction": "Desbloquear", "modalUserUnblockHeadline": "Desbloquear?", diff --git a/src/i18n/ro-RO.json b/src/i18n/ro-RO.json index d7a85ffd189..044359b33ac 100644 --- a/src/i18n/ro-RO.json +++ b/src/i18n/ro-RO.json @@ -198,6 +198,7 @@ "authPostedResendDetail": "Verifică e-mailul și urmează instrucțiunile.", "authPostedResendHeadline": "Ai primit un mesaj.", "authSSOLoginTitle": "Log in with single sign-on", + "authSetUsername": "Set username", "authVerifyAccountAdd": "Adaugă", "authVerifyAccountDetail": "Aceasta îți permite să folosești {{brandName}} pe mai multe dispozitive.", "authVerifyAccountHeadline": "Adaugă o adresă de e-mail și o parolă.", @@ -959,11 +960,14 @@ "modalUserBlockHeadline": "Blochează pe {{user}}?", "modalUserBlockMessage": "{{user}} nu te va putea contacta sau adăuga la conversații de grup.", "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]", + "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted", "modalUserCannotBeAddedHeadline": "Guests cannot be added", - "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user", - "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", - "modalUserCannotConnectNotFederatingHeadline": "Connecting not possible", - "modalUserCannotConnectNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", + "modalUserCannotCancelConnectionMessage": "Connection request could not be cancelled", + "modalUserCannotConnectHeadline": "Connecting not possible", + "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored", + "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", + "modalUserCannotSendConnectionMessage": "Connection request could not be sent", + "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", "modalUserLearnMore": "Learn more", "modalUserUnblockAction": "Deblochează", "modalUserUnblockHeadline": "Deblochează?", diff --git a/src/i18n/ru-RU.json b/src/i18n/ru-RU.json index 466afae07aa..986bfe9f829 100644 --- a/src/i18n/ru-RU.json +++ b/src/i18n/ru-RU.json @@ -198,6 +198,7 @@ "authPostedResendDetail": "Проверьте свой почтовый ящик и следуйте инструкциям.", "authPostedResendHeadline": "Вам письмо.", "authSSOLoginTitle": "Войти с помощью единого входа", + "authSetUsername": "Set username", "authVerifyAccountAdd": "Добавить", "authVerifyAccountDetail": "Это позволит использовать {{brandName}} на нескольких устройствах.", "authVerifyAccountHeadline": "Добавить email и пароль.", @@ -959,11 +960,14 @@ "modalUserBlockHeadline": "Заблокировать {{user}}?", "modalUserBlockMessage": "{{user}} больше не сможет связаться с вами или добавить вас в групповые беседы.", "modalUserBlockedForLegalHold": "Этот пользователь заблокирован из-за юридических ограничений. [link]Подробнее[/link]", + "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted", "modalUserCannotBeAddedHeadline": "Гости не могут быть добавлены", - "modalUserCannotConnectLegalHoldHeadline": "Невозможно подключиться к этому пользователю", - "modalUserCannotConnectLegalHoldMessage": "Вы не можете подключиться к этому пользователю из-за юридических ограничений. [link]Подробнее[/link]", - "modalUserCannotConnectNotFederatingHeadline": "Подключение невозможно", - "modalUserCannotConnectNotFederatingMessage": "Вы не можете отправить запрос на подключение, поскольку ваш бэкэнд не объединен с бэкэндом {{username}}.", + "modalUserCannotCancelConnectionMessage": "Connection request could not be cancelled", + "modalUserCannotConnectHeadline": "Connecting not possible", + "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored", + "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", + "modalUserCannotSendConnectionMessage": "Connection request could not be sent", + "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", "modalUserLearnMore": "Подробнее", "modalUserUnblockAction": "Разблокировать", "modalUserUnblockHeadline": "Разблокировать?", diff --git a/src/i18n/si-LK.json b/src/i18n/si-LK.json index 28042f11f35..1255ce270eb 100644 --- a/src/i18n/si-LK.json +++ b/src/i18n/si-LK.json @@ -198,6 +198,7 @@ "authPostedResendDetail": "Check your email inbox and follow the instructions.", "authPostedResendHeadline": "You’ve got mail.", "authSSOLoginTitle": "Log in with single sign-on", + "authSetUsername": "Set username", "authVerifyAccountAdd": "Add", "authVerifyAccountDetail": "This lets you use {{brandName}} on multiple devices.", "authVerifyAccountHeadline": "Add email address and password.", @@ -959,11 +960,14 @@ "modalUserBlockHeadline": "Block {{user}}?", "modalUserBlockMessage": "{{user}} won’t be able to contact you or add you to group conversations.", "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]", + "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted", "modalUserCannotBeAddedHeadline": "Guests cannot be added", - "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user", - "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", - "modalUserCannotConnectNotFederatingHeadline": "Connecting not possible", - "modalUserCannotConnectNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", + "modalUserCannotCancelConnectionMessage": "Connection request could not be cancelled", + "modalUserCannotConnectHeadline": "Connecting not possible", + "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored", + "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", + "modalUserCannotSendConnectionMessage": "Connection request could not be sent", + "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", "modalUserLearnMore": "Learn more", "modalUserUnblockAction": "Unblock", "modalUserUnblockHeadline": "Unblock?", diff --git a/src/i18n/sk-SK.json b/src/i18n/sk-SK.json index e28a9cc96be..81f4d64157a 100644 --- a/src/i18n/sk-SK.json +++ b/src/i18n/sk-SK.json @@ -198,6 +198,7 @@ "authPostedResendDetail": "Skontrolujte Vašu e-mailovú schránku a postupujte podľa pokynov.", "authPostedResendHeadline": "Máte e-mail.", "authSSOLoginTitle": "Log in with single sign-on", + "authSetUsername": "Set username", "authVerifyAccountAdd": "Pridať", "authVerifyAccountDetail": "To vám umožní používať {{brandName}} na viacerých zariadeniach.", "authVerifyAccountHeadline": "Pridať e-mailovú adresu a heslo.", @@ -959,11 +960,14 @@ "modalUserBlockHeadline": "Blokovať {{user}}?", "modalUserBlockMessage": "{{user}} Vás nebude môcť kontaktovať, alebo Vás pozvať do skupinového rozhovoru.", "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]", + "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted", "modalUserCannotBeAddedHeadline": "Guests cannot be added", - "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user", - "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", - "modalUserCannotConnectNotFederatingHeadline": "Connecting not possible", - "modalUserCannotConnectNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", + "modalUserCannotCancelConnectionMessage": "Connection request could not be cancelled", + "modalUserCannotConnectHeadline": "Connecting not possible", + "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored", + "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", + "modalUserCannotSendConnectionMessage": "Connection request could not be sent", + "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", "modalUserLearnMore": "Learn more", "modalUserUnblockAction": "Odblokovať", "modalUserUnblockHeadline": "Odblokovať?", diff --git a/src/i18n/sl-SI.json b/src/i18n/sl-SI.json index 0ae7ea2423f..2cceee9123b 100644 --- a/src/i18n/sl-SI.json +++ b/src/i18n/sl-SI.json @@ -198,6 +198,7 @@ "authPostedResendDetail": "Preverite vašo e-pošto in sledite navodilom.", "authPostedResendHeadline": "Imate pošto.", "authSSOLoginTitle": "Log in with single sign-on", + "authSetUsername": "Set username", "authVerifyAccountAdd": "Dodaj", "authVerifyAccountDetail": "To vam omogoča uporabo {{brandName}} na večih napravah.", "authVerifyAccountHeadline": "Dodajte e-poštni naslov in geslo.", @@ -959,11 +960,14 @@ "modalUserBlockHeadline": "Blokiraj {{user}}?", "modalUserBlockMessage": "{{user}} vas ne bo mogel kontaktirati ali dodati v skupinske pogovore.", "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]", + "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted", "modalUserCannotBeAddedHeadline": "Guests cannot be added", - "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user", - "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", - "modalUserCannotConnectNotFederatingHeadline": "Connecting not possible", - "modalUserCannotConnectNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", + "modalUserCannotCancelConnectionMessage": "Connection request could not be cancelled", + "modalUserCannotConnectHeadline": "Connecting not possible", + "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored", + "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", + "modalUserCannotSendConnectionMessage": "Connection request could not be sent", + "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", "modalUserLearnMore": "Learn more", "modalUserUnblockAction": "Odblokiraj", "modalUserUnblockHeadline": "Odblokiraj?", diff --git a/src/i18n/sr-SP.json b/src/i18n/sr-SP.json index bb0e1c091c6..e706901a671 100644 --- a/src/i18n/sr-SP.json +++ b/src/i18n/sr-SP.json @@ -198,6 +198,7 @@ "authPostedResendDetail": "Проверите сандуче е-поште и следите упутства.", "authPostedResendHeadline": "Стигла вам је пошта.", "authSSOLoginTitle": "Log in with single sign-on", + "authSetUsername": "Set username", "authVerifyAccountAdd": "Додај", "authVerifyAccountDetail": "Ово омогућава коришћење Вајера на више уређаја.", "authVerifyAccountHeadline": "Додај адресу е-поште и лозинку.", @@ -959,11 +960,14 @@ "modalUserBlockHeadline": "Блокирај {{user}}?", "modalUserBlockMessage": "{{user}} неће бити у могућности да вас контактира или да вас дода у групне разговоре.", "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]", + "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted", "modalUserCannotBeAddedHeadline": "Guests cannot be added", - "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user", - "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", - "modalUserCannotConnectNotFederatingHeadline": "Connecting not possible", - "modalUserCannotConnectNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", + "modalUserCannotCancelConnectionMessage": "Connection request could not be cancelled", + "modalUserCannotConnectHeadline": "Connecting not possible", + "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored", + "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", + "modalUserCannotSendConnectionMessage": "Connection request could not be sent", + "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", "modalUserLearnMore": "Learn more", "modalUserUnblockAction": "Одблокирај", "modalUserUnblockHeadline": "Одблокирати?", diff --git a/src/i18n/sv-SE.json b/src/i18n/sv-SE.json index f23c4b26921..99d93124d33 100644 --- a/src/i18n/sv-SE.json +++ b/src/i18n/sv-SE.json @@ -198,6 +198,7 @@ "authPostedResendDetail": "Kontrollera din inkorg och följ instruktionerna.", "authPostedResendHeadline": "Du har fått mail.", "authSSOLoginTitle": "Log in with single sign-on", + "authSetUsername": "Set username", "authVerifyAccountAdd": "Lägg till", "authVerifyAccountDetail": "Detta gör så du kan använda {{brandName}} på flera enheter.", "authVerifyAccountHeadline": "Lägg till e-postadress och lösenord.", @@ -959,11 +960,14 @@ "modalUserBlockHeadline": "Blockera {{user}}?", "modalUserBlockMessage": "{{user}} kommer inte kunna kontakta dig eller lägga till dig till gruppkonversationer.", "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]", + "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted", "modalUserCannotBeAddedHeadline": "Guests cannot be added", - "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user", - "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", - "modalUserCannotConnectNotFederatingHeadline": "Connecting not possible", - "modalUserCannotConnectNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", + "modalUserCannotCancelConnectionMessage": "Connection request could not be cancelled", + "modalUserCannotConnectHeadline": "Connecting not possible", + "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored", + "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", + "modalUserCannotSendConnectionMessage": "Connection request could not be sent", + "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", "modalUserLearnMore": "Learn more", "modalUserUnblockAction": "Avblockera", "modalUserUnblockHeadline": "Avblockera?", diff --git a/src/i18n/th-TH.json b/src/i18n/th-TH.json index 28042f11f35..1255ce270eb 100644 --- a/src/i18n/th-TH.json +++ b/src/i18n/th-TH.json @@ -198,6 +198,7 @@ "authPostedResendDetail": "Check your email inbox and follow the instructions.", "authPostedResendHeadline": "You’ve got mail.", "authSSOLoginTitle": "Log in with single sign-on", + "authSetUsername": "Set username", "authVerifyAccountAdd": "Add", "authVerifyAccountDetail": "This lets you use {{brandName}} on multiple devices.", "authVerifyAccountHeadline": "Add email address and password.", @@ -959,11 +960,14 @@ "modalUserBlockHeadline": "Block {{user}}?", "modalUserBlockMessage": "{{user}} won’t be able to contact you or add you to group conversations.", "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]", + "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted", "modalUserCannotBeAddedHeadline": "Guests cannot be added", - "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user", - "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", - "modalUserCannotConnectNotFederatingHeadline": "Connecting not possible", - "modalUserCannotConnectNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", + "modalUserCannotCancelConnectionMessage": "Connection request could not be cancelled", + "modalUserCannotConnectHeadline": "Connecting not possible", + "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored", + "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", + "modalUserCannotSendConnectionMessage": "Connection request could not be sent", + "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", "modalUserLearnMore": "Learn more", "modalUserUnblockAction": "Unblock", "modalUserUnblockHeadline": "Unblock?", diff --git a/src/i18n/tr-TR.json b/src/i18n/tr-TR.json index 7a266e9dc21..c5df39d613d 100644 --- a/src/i18n/tr-TR.json +++ b/src/i18n/tr-TR.json @@ -198,6 +198,7 @@ "authPostedResendDetail": "E-posta gelen kutunuzu kontrol edin ve talimatları izleyin.", "authPostedResendHeadline": "E-posta geldi.", "authSSOLoginTitle": "Log in with single sign-on", + "authSetUsername": "Set username", "authVerifyAccountAdd": "Ekle", "authVerifyAccountDetail": "Bu sizin {{brandName}}’ı birden fazla cihazda kullanmanıza olanak sağlar.", "authVerifyAccountHeadline": "Bir e-posta adresi ve şifre ekleyin.", @@ -959,11 +960,14 @@ "modalUserBlockHeadline": "{{user}} engellensin mi?", "modalUserBlockMessage": "{{user}} sizinle iletişim kuramayacak ve sizi grup konuşmalarına ekleyemeyecek.", "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]", + "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted", "modalUserCannotBeAddedHeadline": "Guests cannot be added", - "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user", - "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", - "modalUserCannotConnectNotFederatingHeadline": "Connecting not possible", - "modalUserCannotConnectNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", + "modalUserCannotCancelConnectionMessage": "Connection request could not be cancelled", + "modalUserCannotConnectHeadline": "Connecting not possible", + "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored", + "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", + "modalUserCannotSendConnectionMessage": "Connection request could not be sent", + "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", "modalUserLearnMore": "Learn more", "modalUserUnblockAction": "Engeli kaldır", "modalUserUnblockHeadline": "Engeli kaldır?", diff --git a/src/i18n/uk-UA.json b/src/i18n/uk-UA.json index 42ae9cbc8fa..5ec4e69095f 100644 --- a/src/i18n/uk-UA.json +++ b/src/i18n/uk-UA.json @@ -198,6 +198,7 @@ "authPostedResendDetail": "Перевірте вашу поштову скриньку і дотримуйтесь надісланих інструкцій.", "authPostedResendHeadline": "Ви отримали нового листа.", "authSSOLoginTitle": "Log in with single sign-on", + "authSetUsername": "Set username", "authVerifyAccountAdd": "Додати", "authVerifyAccountDetail": "Це дасть змогу використовувати {{brandName}} на різних пристроях.", "authVerifyAccountHeadline": "Додайте email та пароль.", @@ -959,11 +960,14 @@ "modalUserBlockHeadline": "Заблокувати {{user}}?", "modalUserBlockMessage": "{{user}} не буде мати можливості зв’язатися з вами або додати вас до групових розмов.", "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]", + "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted", "modalUserCannotBeAddedHeadline": "Guests cannot be added", - "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user", - "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", - "modalUserCannotConnectNotFederatingHeadline": "Connecting not possible", - "modalUserCannotConnectNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", + "modalUserCannotCancelConnectionMessage": "Connection request could not be cancelled", + "modalUserCannotConnectHeadline": "Connecting not possible", + "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored", + "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", + "modalUserCannotSendConnectionMessage": "Connection request could not be sent", + "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", "modalUserLearnMore": "Learn more", "modalUserUnblockAction": "Розблокувати", "modalUserUnblockHeadline": "Розблокувати?", diff --git a/src/i18n/uz-UZ.json b/src/i18n/uz-UZ.json index 28042f11f35..1255ce270eb 100644 --- a/src/i18n/uz-UZ.json +++ b/src/i18n/uz-UZ.json @@ -198,6 +198,7 @@ "authPostedResendDetail": "Check your email inbox and follow the instructions.", "authPostedResendHeadline": "You’ve got mail.", "authSSOLoginTitle": "Log in with single sign-on", + "authSetUsername": "Set username", "authVerifyAccountAdd": "Add", "authVerifyAccountDetail": "This lets you use {{brandName}} on multiple devices.", "authVerifyAccountHeadline": "Add email address and password.", @@ -959,11 +960,14 @@ "modalUserBlockHeadline": "Block {{user}}?", "modalUserBlockMessage": "{{user}} won’t be able to contact you or add you to group conversations.", "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]", + "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted", "modalUserCannotBeAddedHeadline": "Guests cannot be added", - "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user", - "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", - "modalUserCannotConnectNotFederatingHeadline": "Connecting not possible", - "modalUserCannotConnectNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", + "modalUserCannotCancelConnectionMessage": "Connection request could not be cancelled", + "modalUserCannotConnectHeadline": "Connecting not possible", + "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored", + "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", + "modalUserCannotSendConnectionMessage": "Connection request could not be sent", + "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", "modalUserLearnMore": "Learn more", "modalUserUnblockAction": "Unblock", "modalUserUnblockHeadline": "Unblock?", diff --git a/src/i18n/vi-VN.json b/src/i18n/vi-VN.json index 28042f11f35..1255ce270eb 100644 --- a/src/i18n/vi-VN.json +++ b/src/i18n/vi-VN.json @@ -198,6 +198,7 @@ "authPostedResendDetail": "Check your email inbox and follow the instructions.", "authPostedResendHeadline": "You’ve got mail.", "authSSOLoginTitle": "Log in with single sign-on", + "authSetUsername": "Set username", "authVerifyAccountAdd": "Add", "authVerifyAccountDetail": "This lets you use {{brandName}} on multiple devices.", "authVerifyAccountHeadline": "Add email address and password.", @@ -959,11 +960,14 @@ "modalUserBlockHeadline": "Block {{user}}?", "modalUserBlockMessage": "{{user}} won’t be able to contact you or add you to group conversations.", "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]", + "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted", "modalUserCannotBeAddedHeadline": "Guests cannot be added", - "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user", - "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", - "modalUserCannotConnectNotFederatingHeadline": "Connecting not possible", - "modalUserCannotConnectNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", + "modalUserCannotCancelConnectionMessage": "Connection request could not be cancelled", + "modalUserCannotConnectHeadline": "Connecting not possible", + "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored", + "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", + "modalUserCannotSendConnectionMessage": "Connection request could not be sent", + "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", "modalUserLearnMore": "Learn more", "modalUserUnblockAction": "Unblock", "modalUserUnblockHeadline": "Unblock?", diff --git a/src/i18n/zh-CN.json b/src/i18n/zh-CN.json index 2c69cf9ec5c..0c63747c8ea 100644 --- a/src/i18n/zh-CN.json +++ b/src/i18n/zh-CN.json @@ -198,6 +198,7 @@ "authPostedResendDetail": "检查您的收件箱并按照说明进行操作。", "authPostedResendHeadline": "您有新邮件", "authSSOLoginTitle": "Log in with single sign-on", + "authSetUsername": "Set username", "authVerifyAccountAdd": "新增", "authVerifyAccountDetail": "允许您在不同设备上使用{{brandName}}。", "authVerifyAccountHeadline": "添加电子邮件地址和密码。", @@ -959,11 +960,14 @@ "modalUserBlockHeadline": "屏蔽 {{user}} 吗？", "modalUserBlockMessage": "{{user}} 将不能联系您或将您加入到任何对话中。", "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]", + "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted", "modalUserCannotBeAddedHeadline": "Guests cannot be added", - "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user", - "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", - "modalUserCannotConnectNotFederatingHeadline": "Connecting not possible", - "modalUserCannotConnectNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", + "modalUserCannotCancelConnectionMessage": "Connection request could not be cancelled", + "modalUserCannotConnectHeadline": "Connecting not possible", + "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored", + "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", + "modalUserCannotSendConnectionMessage": "Connection request could not be sent", + "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", "modalUserLearnMore": "Learn more", "modalUserUnblockAction": "取消屏蔽", "modalUserUnblockHeadline": "解除屏蔽？", diff --git a/src/i18n/zh-HK.json b/src/i18n/zh-HK.json index 28042f11f35..1255ce270eb 100644 --- a/src/i18n/zh-HK.json +++ b/src/i18n/zh-HK.json @@ -198,6 +198,7 @@ "authPostedResendDetail": "Check your email inbox and follow the instructions.", "authPostedResendHeadline": "You’ve got mail.", "authSSOLoginTitle": "Log in with single sign-on", + "authSetUsername": "Set username", "authVerifyAccountAdd": "Add", "authVerifyAccountDetail": "This lets you use {{brandName}} on multiple devices.", "authVerifyAccountHeadline": "Add email address and password.", @@ -959,11 +960,14 @@ "modalUserBlockHeadline": "Block {{user}}?", "modalUserBlockMessage": "{{user}} won’t be able to contact you or add you to group conversations.", "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]", + "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted", "modalUserCannotBeAddedHeadline": "Guests cannot be added", - "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user", - "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", - "modalUserCannotConnectNotFederatingHeadline": "Connecting not possible", - "modalUserCannotConnectNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", + "modalUserCannotCancelConnectionMessage": "Connection request could not be cancelled", + "modalUserCannotConnectHeadline": "Connecting not possible", + "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored", + "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", + "modalUserCannotSendConnectionMessage": "Connection request could not be sent", + "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", "modalUserLearnMore": "Learn more", "modalUserUnblockAction": "Unblock", "modalUserUnblockHeadline": "Unblock?", diff --git a/src/i18n/zh-TW.json b/src/i18n/zh-TW.json index 8fc8e74fea6..7b5e4e013ac 100644 --- a/src/i18n/zh-TW.json +++ b/src/i18n/zh-TW.json @@ -198,6 +198,7 @@ "authPostedResendDetail": "請查收您的電子郵件信箱並依照指示進行操作。", "authPostedResendHeadline": "您收到了新郵件", "authSSOLoginTitle": "Log in with single sign-on", + "authSetUsername": "Set username", "authVerifyAccountAdd": "加入", "authVerifyAccountDetail": "這樣可以讓您在多個設備上使用 {{brandName}}。", "authVerifyAccountHeadline": "加入電子郵件信箱位址以及密碼。", @@ -959,11 +960,14 @@ "modalUserBlockHeadline": "確定要封鎖 {{user}} 嗎？", "modalUserBlockMessage": "{{user}} 將無法與您聯繫或將您添加到對話群組。", "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]", + "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted", "modalUserCannotBeAddedHeadline": "Guests cannot be added", - "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user", - "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", - "modalUserCannotConnectNotFederatingHeadline": "Connecting not possible", - "modalUserCannotConnectNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", + "modalUserCannotCancelConnectionMessage": "Connection request could not be cancelled", + "modalUserCannotConnectHeadline": "Connecting not possible", + "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored", + "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]", + "modalUserCannotSendConnectionMessage": "Connection request could not be sent", + "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.", "modalUserLearnMore": "Learn more", "modalUserUnblockAction": "解除封鎖", "modalUserUnblockHeadline": "解除封鎖？", From 4e912bb659a8837b127feb7663472e08f0f8a269 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patryk=20G=C3=B3rka?= Date: Tue, 12 Sep 2023 16:36:34 +0200 Subject: [PATCH 05/55] chore: bump core with new corecrypto (#15792) --- package.json | 2 +- yarn.lock | 30 +++++++++++++++--------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/package.json b/package.json index 3370d32e696..87590901dae 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "@datadog/browser-rum": "^4.48.2", "@emotion/react": "11.11.1", "@wireapp/avs": "9.3.7", - "@wireapp/core": "42.1.0", + "@wireapp/core": "42.3.0", "@wireapp/lru-cache": "3.8.1", "@wireapp/react-ui-kit": "9.9.5", "@wireapp/store-engine-dexie": "2.1.6", diff --git a/yarn.lock b/yarn.lock index 7351923a064..7c45abf3e99 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5405,27 +5405,27 @@ __metadata: languageName: node linkType: hard -"@wireapp/core-crypto@npm:1.0.0-rc.6": - version: 1.0.0-rc.6 - resolution: "@wireapp/core-crypto@npm:1.0.0-rc.6" - checksum: 1ae7a609f265eb3b9d5e90bec15778462f334dfa918d9a3b5bce000f15ae1f0eafbd3e7231794a4381bf5ef93fbc8667661fc6d9a78e123b9a78227edd98492f +"@wireapp/core-crypto@npm:1.0.0-rc.12": + version: 1.0.0-rc.12 + resolution: "@wireapp/core-crypto@npm:1.0.0-rc.12" + checksum: 55673f2cdeceb8da5bc3648c9b60b58cbf77268de6f8dd7a82cc78f4146233048dfce0e8336208fe69b67c7bf605520732299db8611e68fbdd43efee75de1e27 languageName: node linkType: hard -"@wireapp/core@npm:42.1.0": - version: 42.1.0 - resolution: "@wireapp/core@npm:42.1.0" +"@wireapp/core@npm:42.3.0": + version: 42.3.0 + resolution: "@wireapp/core@npm:42.3.0" dependencies: "@wireapp/api-client": ^26.0.4 "@wireapp/commons": ^5.1.3 - "@wireapp/core-crypto": 1.0.0-rc.6 + "@wireapp/core-crypto": 1.0.0-rc.12 "@wireapp/cryptobox": 12.8.0 "@wireapp/promise-queue": ^2.2.4 "@wireapp/protocol-messaging": 1.44.0 "@wireapp/store-engine": 5.1.4 "@wireapp/store-engine-dexie": ^2.1.6 axios: 1.5.0 - bazinga64: 6.1.6 + bazinga64: ^6.3.0 deepmerge-ts: 5.1.0 hash.js: 1.1.7 http-status-codes: 2.2.0 @@ -5433,7 +5433,7 @@ __metadata: logdown: 3.3.1 long: ^5.2.0 uuidjs: 4.2.13 - checksum: 8e31e7526b3ed17561b65c57671a9d5a9b3120d4d39e2058c85121c1e7c1b912af09191d37909349601a16c6d6d70b8069028948d79604dd8b42c32c7cf3eb71 + checksum: 32b878779aead05fe5743a2bc1a8e8f48ff8f3066b7be99b6c34d0440cac0ee441c4f4e429bc5d64f606068e96eeea78cb3bc87373cbc3bff80b75344613f3b0 languageName: node linkType: hard @@ -6505,10 +6505,10 @@ __metadata: languageName: node linkType: hard -"bazinga64@npm:6.1.6": - version: 6.1.6 - resolution: "bazinga64@npm:6.1.6" - checksum: 244da42d134f9dd86b97f43b734a7bdfccebf26ac16af773ee49c8ea61a5059a4008f3a497ab8d10fe66f06ccb065dada56a7087414d7f4d85e8485ee0ce15da +"bazinga64@npm:^6.3.0": + version: 6.3.0 + resolution: "bazinga64@npm:6.3.0" + checksum: 8221f157a5d4bf53c2da03deaa4770da0a756b9f2829c2da5662519f211497e726b4994c5802179eb98d85d340e024c03522c69c9bbe6b21039b785aa20cd3a1 languageName: node linkType: hard @@ -18512,7 +18512,7 @@ __metadata: "@types/webpack-env": 1.18.1 "@wireapp/avs": 9.3.7 "@wireapp/copy-config": 2.1.7 - "@wireapp/core": 42.1.0 + "@wireapp/core": 42.3.0 "@wireapp/eslint-config": 3.0.4 "@wireapp/lru-cache": 3.8.1 "@wireapp/prettier-config": 0.6.3 From 58b7e751324cf73e64ee0cdbd00d52921f9bf84b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Sep 2023 17:00:16 +0000 Subject: [PATCH 06/55] chore(deps): Bump crowdin/github-action from 1.12.0 to 1.13.0 (#15795) Bumps [crowdin/github-action](https://github.com/crowdin/github-action) from 1.12.0 to 1.13.0. - [Release notes](https://github.com/crowdin/github-action/releases) - [Commits](https://github.com/crowdin/github-action/compare/v1.12.0...v1.13.0) --- updated-dependencies: - dependency-name: crowdin/github-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/sync_translations.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sync_translations.yml b/.github/workflows/sync_translations.yml index 357d01dc94f..72858f45040 100644 --- a/.github/workflows/sync_translations.yml +++ b/.github/workflows/sync_translations.yml @@ -37,7 +37,7 @@ jobs: run: yarn translate:merge - name: Download translations - uses: crowdin/github-action@v1.12.0 + uses: crowdin/github-action@v1.13.0 env: GITHUB_TOKEN: ${{secrets.OTTO_THE_BOT_GH_TOKEN}} CROWDIN_PROJECT_ID: 342359 From f36bd4f67056cf734005cbf30193fd48087079e5 Mon Sep 17 00:00:00 2001 From: Thomas Belin Date: Wed, 13 Sep 2023 09:23:37 +0200 Subject: [PATCH 07/55] refactor: Inject self user into component (#15793) --- .../components/Conversation/Conversation.tsx | 2 +- .../GroupCreation/GroupCreationModal.tsx | 2 + .../Modals/LegalHoldModal/LegalHoldModal.tsx | 1 + .../Modals/UserModal/UserModal.test.tsx | 5 +-- .../components/Modals/UserModal/UserModal.tsx | 15 +++---- .../components/TitleBar/TitleBar.test.tsx | 42 +++++++++---------- src/script/components/TitleBar/TitleBar.tsx | 8 ++-- src/script/components/UserSearchableList.tsx | 7 ++-- src/script/entity/User/User.ts | 2 + src/script/main/app.ts | 11 ++--- src/script/page/AppMain.tsx | 13 +++--- src/script/page/MainContent/MainContent.tsx | 4 +- .../panels/preferences/OptionPreferences.tsx | 12 ++---- .../AddParticipants/AddParticipants.tsx | 1 + .../ConversationDetails.tsx | 9 +++- .../ConversationParticipants.tsx | 1 + .../GroupParticipantService.tsx | 6 +-- .../GroupParticipantUser.tsx | 11 ++--- .../MessageDetails/MessageDetails.test.tsx | 1 + .../MessageDetails/MessageDetails.tsx | 4 ++ src/script/page/RightSidebar/RightSidebar.tsx | 6 ++- src/script/user/UserState.ts | 5 --- src/script/view_model/ListViewModel.ts | 2 +- 23 files changed, 89 insertions(+), 81 deletions(-) diff --git a/src/script/components/Conversation/Conversation.tsx b/src/script/components/Conversation/Conversation.tsx index 51e075fc7b8..a6844957402 100644 --- a/src/script/components/Conversation/Conversation.tsx +++ b/src/script/components/Conversation/Conversation.tsx @@ -467,7 +467,7 @@ export const Conversation: FC = ({ = ({ isMLSEnabled: isMLSEnabledForTeam, isProtocolToggleEnabledForUser, } = useKoSubscribableChildren(teamState, ['isTeam', 'isMLSEnabled', 'isProtocolToggleEnabledForUser']); + const {self: selfUser} = useKoSubscribableChildren(userState, ['self']); const isMLSFeatureEnabled = Config.getConfig().FEATURE.ENABLE_MLS; @@ -406,6 +407,7 @@ const GroupCreationModal: React.FC = ({ {filteredContacts.length > 0 && ( = ({ searchRepository={searchRepository} teamRepository={teamRepository} onClick={setUserDevices} + selfUser={selfUser} noUnderline /> diff --git a/src/script/components/Modals/UserModal/UserModal.test.tsx b/src/script/components/Modals/UserModal/UserModal.test.tsx index 2839a61d3d0..93b49dea328 100644 --- a/src/script/components/Modals/UserModal/UserModal.test.tsx +++ b/src/script/components/Modals/UserModal/UserModal.test.tsx @@ -24,7 +24,6 @@ import {User} from 'src/script/entity/User'; import {Core} from 'src/script/service/CoreSingleton'; import {TeamState} from 'src/script/team/TeamState'; import {UserRepository} from 'src/script/user/UserRepository'; -import {UserState} from 'src/script/user/UserState'; import {UserModal, UserModalProps} from './UserModal'; import {showUserModal} from './UserModal.state'; @@ -42,7 +41,7 @@ describe('UserModal', () => { userRepository: { getUserById, } as unknown as UserRepository, - userState: {} as UserState, + selfUser: new User(), }; showUserModal({domain: 'test-domain.mock', id: 'mock-id'}); const {getByTestId} = render(); @@ -65,7 +64,7 @@ describe('UserModal', () => { userRepository: { getUserById, } as unknown as UserRepository, - userState: {} as UserState, + selfUser: new User(), }; showUserModal({domain: 'test-domain.mock', id: 'mock-id'}); diff --git a/src/script/components/Modals/UserModal/UserModal.tsx b/src/script/components/Modals/UserModal/UserModal.tsx index 3175d963674..df797595651 100644 --- a/src/script/components/Modals/UserModal/UserModal.tsx +++ b/src/script/components/Modals/UserModal/UserModal.tsx @@ -44,11 +44,10 @@ import {RootContext} from '../../../page/RootProvider'; import {Core} from '../../../service/CoreSingleton'; import {TeamState} from '../../../team/TeamState'; import {UserRepository} from '../../../user/UserRepository'; -import {UserState} from '../../../user/UserState'; export interface UserModalProps { userRepository: UserRepository; - userState?: UserState; + selfUser: User; teamState?: TeamState; core?: Core; } @@ -127,8 +126,8 @@ export const UnverifiedUserWarning: React.FC = ({use const UserModal: React.FC = ({ userRepository, + selfUser, core = container.resolve(Core), - userState = container.resolve(UserState), teamState = container.resolve(TeamState), }) => { const onClose = useUserModalState(state => state.onClose); @@ -146,9 +145,11 @@ const UserModal: React.FC = ({ resetState(); }; const {classifiedDomains} = useKoSubscribableChildren(teamState, ['classifiedDomains']); - const {self, isActivatedAccount} = useKoSubscribableChildren(userState, ['self', 'isActivatedAccount']); - const {is_trusted: isTrusted} = useKoSubscribableChildren(self, ['is_trusted']); - const {is_verified: isSelfVerified} = useKoSubscribableChildren(self, ['is_verified']); + const { + is_trusted: isTrusted, + is_verified: isSelfVerified, + isActivatedAccount, + } = useKoSubscribableChildren(selfUser, ['is_trusted', 'is_verified', 'isActivatedAccount']); const isFederated = core.backendFeatures?.isFederated; useEffect(() => { @@ -219,7 +220,7 @@ const UserModal: React.FC = ({ user={user} onAction={hide} isSelfActivated={isActivatedAccount} - selfUser={self} + selfUser={selfUser} /> )} diff --git a/src/script/components/TitleBar/TitleBar.test.tsx b/src/script/components/TitleBar/TitleBar.test.tsx index 6101d91899e..05d84c3567f 100644 --- a/src/script/components/TitleBar/TitleBar.test.tsx +++ b/src/script/components/TitleBar/TitleBar.test.tsx @@ -38,7 +38,6 @@ import {Conversation} from '../../entity/Conversation'; import {User} from '../../entity/User'; import {PanelState} from '../../page/RightSidebar/RightSidebar'; import {TeamState} from '../../team/TeamState'; -import {UserState} from '../../user/UserState'; import {ViewModelRepositories} from '../../view_model/MainViewModel'; jest.mock('@wireapp/react-ui-kit', () => ({ @@ -85,7 +84,7 @@ const getDefaultProps = (callingRepository: CallingRepository, conversation: Con } as CallingRepository, } as ViewModelRepositories, teamState: new TeamState(), - userState: new UserState(), + selfUser: new User(), }); describe('TitleBar', () => { @@ -101,22 +100,22 @@ describe('TitleBar', () => { }); it("doesn't show conversation search button for user with activated account", async () => { - const userState = createUserState({isActivatedAccount: ko.pureComputed(() => false)}); + const selfUser = createUser(false); const conversation = new Conversation(); const {queryByText} = render( - withTheme(), + withTheme(), ); expect(queryByText('tooltipConversationSearch')).toBeNull(); }); it('opens search area after search button click', async () => { - const userState = createUserState({isActivatedAccount: ko.pureComputed(() => true)}); + const selfUser = createUser(true); const conversation = new Conversation(); const {getByText} = render( - withTheme(), + withTheme(), ); const searchButton = getByText('tooltipConversationSearch'); @@ -128,13 +127,13 @@ describe('TitleBar', () => { }); it('opens conversation details on conversation name click', async () => { - const userState = createUserState({isActivatedAccount: ko.pureComputed(() => true)}); + const selfUser = createUser(true); const displayName = 'test name'; const conversation = createConversationEntity({ display_name: ko.pureComputed(() => displayName), }); const props = getDefaultProps(callingRepository, conversation); - const {getByText} = render(withTheme()); + const {getByText} = render(withTheme()); const conversationName = getByText(displayName); expect(conversationName).toBeDefined(); @@ -144,13 +143,13 @@ describe('TitleBar', () => { }); it('opens conversation details on info button click', async () => { - const userState = createUserState({isActivatedAccount: ko.pureComputed(() => true)}); + const selfUser = createUser(true); const conversation = createConversationEntity(); const props = getDefaultProps(callingRepository, conversation); mockedUiKit.useMatchMedia.mockReturnValue(false); - const {getByLabelText} = render(withTheme()); + const {getByLabelText} = render(withTheme()); const infoButton = getByLabelText('tooltipConversationInfo'); expect(infoButton).toBeDefined(); @@ -172,11 +171,11 @@ describe('TitleBar', () => { }); it("doesn't show legal-hold icon for non legal-hold user", async () => { - const userState = createUserState({isActivatedAccount: ko.pureComputed(() => true)}); + const selfUser = createUser(true); const conversation = createConversationEntity({hasLegalHold: ko.pureComputed(() => false)}); const {container} = render( - withTheme(), + withTheme(), ); const legalHoldDotButton = container.querySelector('button[data-uie-name="status-legal-hold-conversation"]'); @@ -184,11 +183,11 @@ describe('TitleBar', () => { }); it('shows legal-hold icon for legal-hold user', async () => { - const userState = createUserState({isActivatedAccount: ko.pureComputed(() => true)}); + const selfUser = createUser(true); const conversation = createConversationEntity({hasLegalHold: ko.pureComputed(() => true)}); const {container} = render( - withTheme(), + withTheme(), ); const legalHoldDotButton = container.querySelector('button[data-uie-name="status-legal-hold-conversation"]'); @@ -198,13 +197,13 @@ describe('TitleBar', () => { it.each([ConversationVerificationState.UNVERIFIED, ConversationVerificationState.DEGRADED])( "doesn't show verified icon in not-verified conversation", async state => { - const userState = createUserState({isActivatedAccount: ko.pureComputed(() => true)}); + const selfUser = createUser(true); const conversation = createConversationEntity({ verification_state: ko.observable(state), }); const {container} = render( - withTheme(), + withTheme(), ); const verifiedIcon = container.querySelector('[data-uie-name="conversation-title-bar-verified-icon"]'); @@ -213,13 +212,13 @@ describe('TitleBar', () => { ); it('shows verified icon in verified conversation', async () => { - const userState = createUserState({isActivatedAccount: ko.pureComputed(() => true)}); + const selfUser = createUser(true); const conversation = createConversationEntity({ verification_state: ko.observable(ConversationVerificationState.VERIFIED), }); const {container} = render( - withTheme(), + withTheme(), ); const verifiedIcon = container.querySelector('[data-uie-name="conversation-title-bar-verified-icon"]'); @@ -302,9 +301,10 @@ describe('TitleBar', () => { }); }); -function createUserState(user?: Partial) { - const userState = new UserState(); - return Object.assign(userState, user) as UserState; +function createUser(activated: boolean = true) { + const user = new User(); + user.isTemporaryGuest(!activated); + return user; } function createTeamState(team?: Partial) { diff --git a/src/script/components/TitleBar/TitleBar.tsx b/src/script/components/TitleBar/TitleBar.tsx index a4c3e82d351..6517bfcddcf 100644 --- a/src/script/components/TitleBar/TitleBar.tsx +++ b/src/script/components/TitleBar/TitleBar.tsx @@ -30,6 +30,7 @@ import {WebAppEvents} from '@wireapp/webapp-events'; import {useCallAlertState} from 'Components/calling/useCallAlertState'; import {Icon} from 'Components/Icon'; import {LegalHoldDot} from 'Components/LegalHoldDot'; +import {User} from 'src/script/entity/User'; import {useAppMainState, ViewType} from 'src/script/page/state'; import {ContentState} from 'src/script/page/useAppState'; import {useKoSubscribableChildren} from 'Util/ComponentUtil'; @@ -47,7 +48,6 @@ import {PanelState} from '../../page/RightSidebar/RightSidebar'; import {TeamState} from '../../team/TeamState'; import {Shortcut} from '../../ui/Shortcut'; import {ShortcutType} from '../../ui/ShortcutType'; -import {UserState} from '../../user/UserState'; import {CallActions} from '../../view_model/CallingViewModel'; import {ViewModelRepositories} from '../../view_model/MainViewModel'; @@ -56,7 +56,7 @@ export interface TitleBarProps { conversation: Conversation; openRightSidebar: (panelState: PanelState, params: RightSidebarParams, compareEntityId?: boolean) => void; repositories: ViewModelRepositories; - userState: UserState; + selfUser: User; teamState: TeamState; isRightSidebarOpen?: boolean; callState?: CallState; @@ -66,9 +66,9 @@ export const TitleBar: React.FC = ({ repositories, conversation, callActions, + selfUser, openRightSidebar, isRightSidebarOpen = false, - userState = container.resolve(UserState), callState = container.resolve(CallState), teamState = container.resolve(TeamState), }) => { @@ -101,7 +101,7 @@ export const TitleBar: React.FC = ({ 'verification_state', ]); - const {isActivatedAccount} = useKoSubscribableChildren(userState, ['isActivatedAccount']); + const {isActivatedAccount} = useKoSubscribableChildren(selfUser, ['isActivatedAccount']); const {joinedCall, activeCalls} = useKoSubscribableChildren(callState, ['joinedCall', 'activeCalls']); const {isVideoCallingEnabled} = useKoSubscribableChildren(teamState, ['isVideoCallingEnabled']); diff --git a/src/script/components/UserSearchableList.tsx b/src/script/components/UserSearchableList.tsx index 39911871bdb..a9949d73654 100644 --- a/src/script/components/UserSearchableList.tsx +++ b/src/script/components/UserSearchableList.tsx @@ -37,7 +37,6 @@ import {SearchRepository} from '../search/SearchRepository'; import type {TeamRepository} from '../team/TeamRepository'; import {TeamState} from '../team/TeamState'; import {validateHandle} from '../user/UserHandleGenerator'; -import {UserState} from '../user/UserState'; export type UserListProps = React.ComponentProps & { conversationState?: ConversationState; @@ -51,7 +50,7 @@ export type UserListProps = React.ComponentProps & { teamRepository: TeamRepository; teamState?: TeamState; truncate?: boolean; - userState?: UserState; + selfUser: User; dataUieName?: string; /** will prevent showing those users in the list */ excludeUsers?: QualifiedId[]; @@ -66,16 +65,16 @@ const UserSearchableList: React.FC = ({ highlightedUsers, selected: selectedUsers, allowRemoteSearch, + selfUser, users, ...props }) => { const {searchRepository, teamRepository, selfFirst, ...userListProps} = props; - const {userState = container.resolve(UserState), conversationState = container.resolve(ConversationState)} = props; + const {conversationState = container.resolve(ConversationState)} = props; const [filteredUsers, setFilteredUsers] = useState([]); const [remoteTeamMembers, setRemoteTeamMembers] = useState([]); - const {self: selfUser} = useKoSubscribableChildren(userState, ['self']); const {inTeam: selfInTeam} = useKoSubscribableChildren(selfUser, ['inTeam']); /** diff --git a/src/script/entity/User/User.ts b/src/script/entity/User/User.ts index 1e39217e15a..f3f4655e24b 100644 --- a/src/script/entity/User/User.ts +++ b/src/script/entity/User/User.ts @@ -70,6 +70,7 @@ export class User { public readonly isExpired: ko.Observable; public readonly isExternal: ko.PureComputed; public readonly isGuest: ko.Observable; + public readonly isActivatedAccount: ko.PureComputed; /** indicates whether that user entity is available (if we have metadata for the user, it's considered available) */ public readonly isAvailable: ko.PureComputed; @@ -185,6 +186,7 @@ export class User { return this.isGuest() && !this.isFederated; }); this.isTemporaryGuest = ko.observable(false); + this.isActivatedAccount = ko.pureComputed(() => !this.isTemporaryGuest()); this.teamRole = ko.observable(TEAM_ROLE.NONE); this.teamId = undefined; diff --git a/src/script/main/app.ts b/src/script/main/app.ts index ebcd12b3790..398dff87351 100644 --- a/src/script/main/app.ts +++ b/src/script/main/app.ts @@ -60,6 +60,7 @@ import {ConversationRepository} from '../conversation/ConversationRepository'; import {ConversationService} from '../conversation/ConversationService'; import {MessageRepository} from '../conversation/MessageRepository'; import {CryptographyRepository} from '../cryptography/CryptographyRepository'; +import {User} from '../entity/User'; import {AccessTokenError} from '../error/AccessTokenError'; import {AuthError} from '../error/AuthError'; import {BaseError} from '../error/BaseError'; @@ -418,7 +419,7 @@ export class App { onProgress(25, t('initReceivedUserData')); telemetry.addStatistic(AppInitStatisticsValue.CONVERSATIONS, conversations.length, 50); - this._subscribeToUnloadEvents(); + this._subscribeToUnloadEvents(selfUser); await conversationRepository.conversationRoleRepository.loadTeamRoles(); @@ -467,7 +468,7 @@ export class App { amplify.publish(WebAppEvents.LIFECYCLE.LOADED); telemetry.timeStep(AppInitTimingsStep.UPDATED_CONVERSATIONS); - if (userRepository['userState'].isActivatedAccount()) { + if (selfUser.isActivatedAccount()) { // start regularly polling the server to check if there is a new version of Wire startNewVersionPolling(Environment.version(false), this.update); } @@ -611,13 +612,13 @@ export class App { /** * Subscribe to 'beforeunload' to stop calls and disconnect the WebSocket. */ - private _subscribeToUnloadEvents(): void { + private _subscribeToUnloadEvents(selfUser: User): void { window.addEventListener('unload', () => { this.logger.info("'window.onunload' was triggered, so we will disconnect from the backend."); this.repository.event.disconnectWebSocket(); this.repository.calling.destroy(); - if (this.repository.user['userState'].isActivatedAccount()) { + if (selfUser.isActivatedAccount()) { if (this.service.storage.isTemporaryAndNonPersistent) { this.logout(SIGN_OUT_REASON.CLIENT_REMOVED, true); } else { @@ -772,7 +773,7 @@ export class App { redirectToLogin(signOutReason: SIGN_OUT_REASON): void { this.logger.info(`Redirecting to login after connectivity verification. Reason: ${signOutReason}`); const isTemporaryGuestReason = App.CONFIG.SIGN_OUT_REASONS.TEMPORARY_GUEST.includes(signOutReason); - const isLeavingGuestRoom = isTemporaryGuestReason && this.repository.user['userState'].isTemporaryGuest(); + const isLeavingGuestRoom = isTemporaryGuestReason && this.repository.user['userState'].self()?.isTemporaryGuest(); if (isLeavingGuestRoom) { const websiteUrl = getWebsiteUrl(); diff --git a/src/script/page/AppMain.tsx b/src/script/page/AppMain.tsx index 6d43938a273..f442cb16be4 100644 --- a/src/script/page/AppMain.tsx +++ b/src/script/page/AppMain.tsx @@ -88,16 +88,15 @@ const AppMain: FC = ({ const {repository: repositories} = app; - const {accent_id, availability: userAvailability} = useKoSubscribableChildren(selfUser, [ - 'accent_id', - 'availability', - ]); + const { + accent_id, + availability: userAvailability, + isActivatedAccount, + } = useKoSubscribableChildren(selfUser, ['accent_id', 'availability', 'isActivatedAccount']); const teamState = container.resolve(TeamState); const userState = container.resolve(UserState); - const {isActivatedAccount} = useKoSubscribableChildren(userState, ['isActivatedAccount']); - const { history, entity: currentEntity, @@ -263,7 +262,7 @@ const AppMain: FC = ({ /> {/*The order of these elements matter to show proper modals stack upon each other*/} - + diff --git a/src/script/page/MainContent/MainContent.tsx b/src/script/page/MainContent/MainContent.tsx index 2467b009f65..e100bb237ca 100644 --- a/src/script/page/MainContent/MainContent.tsx +++ b/src/script/page/MainContent/MainContent.tsx @@ -78,7 +78,7 @@ const MainContent: FC = ({ const teamState = container.resolve(TeamState); const {showRequestModal} = useLegalHoldModalState(); - const {isActivatedAccount} = useKoSubscribableChildren(userState, ['self', 'isActivatedAccount']); + const {isActivatedAccount} = useKoSubscribableChildren(selfUser, ['isActivatedAccount']); const contentState = useAppState(state => state.contentState); const isShowingConversation = useAppState(state => state.isShowingConversation); @@ -216,7 +216,7 @@ const MainContent: FC = ({ className={cx('preferences-page preferences-options', incomingCssClass)} ref={removeAnimationsClass} > - + )} diff --git a/src/script/page/MainContent/panels/preferences/OptionPreferences.tsx b/src/script/page/MainContent/panels/preferences/OptionPreferences.tsx index 404e1002aae..53a3c279ba8 100644 --- a/src/script/page/MainContent/panels/preferences/OptionPreferences.tsx +++ b/src/script/page/MainContent/panels/preferences/OptionPreferences.tsx @@ -22,12 +22,12 @@ import React, {useEffect, useState} from 'react'; import {AudioPreference, NotificationPreference, WebappProperties} from '@wireapp/api-client/lib/user/data/'; import {TabIndex} from '@wireapp/react-ui-kit/lib/types/enums'; import {amplify} from 'amplify'; -import {container} from 'tsyringe'; import {Checkbox, CheckboxLabel, IndicatorRangeInput} from '@wireapp/react-ui-kit'; import {WebAppEvents} from '@wireapp/webapp-events'; import {RadioGroup} from 'Components/Radio'; +import {User} from 'src/script/entity/User'; import {useKoSubscribableChildren} from 'Util/ComponentUtil'; import {t} from 'Util/LocalizerUtil'; @@ -38,19 +38,15 @@ import {Theme} from '../../../../components/AppContainer/hooks/useTheme'; import {RootFontSize, useRootFontSize} from '../../../../hooks/useRootFontSize'; import {PropertiesRepository} from '../../../../properties/PropertiesRepository'; import {PROPERTIES_TYPE} from '../../../../properties/PropertiesType'; -import {UserState} from '../../../../user/UserState'; interface OptionPreferencesProps { propertiesRepository: PropertiesRepository; - userState?: UserState; + selfUser: User; } const fontSizes = Object.values(RootFontSize); -const OptionPreferences: React.FC = ({ - propertiesRepository, - userState = container.resolve(UserState), -}) => { - const {isActivatedAccount} = useKoSubscribableChildren(userState, ['self', 'isActivatedAccount']); +const OptionPreferences: React.FC = ({propertiesRepository, selfUser}) => { + const {isActivatedAccount} = useKoSubscribableChildren(selfUser, ['isActivatedAccount']); const { properties: {settings}, } = propertiesRepository; diff --git a/src/script/page/RightSidebar/AddParticipants/AddParticipants.tsx b/src/script/page/RightSidebar/AddParticipants/AddParticipants.tsx index 86d36e13893..7038cc0e13a 100644 --- a/src/script/page/RightSidebar/AddParticipants/AddParticipants.tsx +++ b/src/script/page/RightSidebar/AddParticipants/AddParticipants.tsx @@ -235,6 +235,7 @@ const AddParticipants: FC = ({ teamRepository={teamRepository} conversationRepository={conversationRepository} excludeUsers={participatingUserIds} + selfUser={selfUser} isSelectable allowRemoteSearch /> diff --git a/src/script/page/RightSidebar/ConversationDetails/ConversationDetails.tsx b/src/script/page/RightSidebar/ConversationDetails/ConversationDetails.tsx index 7ee44105629..3be9a48c07e 100644 --- a/src/script/page/RightSidebar/ConversationDetails/ConversationDetails.tsx +++ b/src/script/page/RightSidebar/ConversationDetails/ConversationDetails.tsx @@ -155,8 +155,12 @@ const ConversationDetails = forwardRef 'team', ]); - const {self: selfUser, isActivatedAccount} = useKoSubscribableChildren(userState, ['self', 'isActivatedAccount']); - const {is_verified: isSelfVerified, teamRole} = useKoSubscribableChildren(selfUser, ['is_verified', 'teamRole']); + const {self: selfUser} = useKoSubscribableChildren(userState, ['self']); + const { + is_verified: isSelfVerified, + teamRole, + isActivatedAccount, + } = useKoSubscribableChildren(selfUser, ['is_verified', 'teamRole', 'isActivatedAccount']); const isActiveGroupParticipant = isGroup && !removedFromConversation; @@ -373,6 +377,7 @@ const ConversationDetails = forwardRef truncate showEmptyAdmin selfFirst={false} + selfUser={selfUser} noSelfInteraction /> diff --git a/src/script/page/RightSidebar/ConversationParticipants/ConversationParticipants.tsx b/src/script/page/RightSidebar/ConversationParticipants/ConversationParticipants.tsx index e97b89a7a36..65ded3f7d2b 100644 --- a/src/script/page/RightSidebar/ConversationParticipants/ConversationParticipants.tsx +++ b/src/script/page/RightSidebar/ConversationParticipants/ConversationParticipants.tsx @@ -113,6 +113,7 @@ const ConversationParticipants: FC = ({ conversationRepository={conversationRepository} conversation={activeConversation} selfFirst={false} + selfUser={selfUser} noSelfInteraction /> diff --git a/src/script/page/RightSidebar/GroupParticipantService/GroupParticipantService.tsx b/src/script/page/RightSidebar/GroupParticipantService/GroupParticipantService.tsx index 1bcd5872004..79494f322ec 100644 --- a/src/script/page/RightSidebar/GroupParticipantService/GroupParticipantService.tsx +++ b/src/script/page/RightSidebar/GroupParticipantService/GroupParticipantService.tsx @@ -34,7 +34,6 @@ import {User} from '../../../entity/User'; import {IntegrationRepository} from '../../../integration/IntegrationRepository'; import {ServiceEntity} from '../../../integration/ServiceEntity'; import {generatePermissionHelpers} from '../../../user/UserPermission'; -import {UserState} from '../../../user/UserState'; import {ActionsViewModel} from '../../../view_model/ActionsViewModel'; import {PanelHeader} from '../PanelHeader'; @@ -47,7 +46,7 @@ interface GroupParticipantServiceProps { onClose: () => void; serviceEntity: ServiceEntity; userEntity: User; - userState: UserState; + selfUser: User; isAddMode?: boolean; } @@ -60,7 +59,7 @@ const GroupParticipantService: FC = ({ onClose, serviceEntity, userEntity, - userState, + selfUser, isAddMode = false, }) => { const { @@ -68,7 +67,6 @@ const GroupParticipantService: FC = ({ isActiveParticipant, participating_user_ids: participatingUserIds, } = useKoSubscribableChildren(activeConversation, ['inTeam', 'isActiveParticipant', 'participating_user_ids']); - const {self: selfUser} = useKoSubscribableChildren(userState, ['self']); const {teamRole} = useKoSubscribableChildren(selfUser, ['teamRole']); const {canChatWithServices, canUpdateGroupParticipants} = generatePermissionHelpers(teamRole); diff --git a/src/script/page/RightSidebar/GroupParticipantUser/GroupParticipantUser.tsx b/src/script/page/RightSidebar/GroupParticipantUser/GroupParticipantUser.tsx index 1a86c6e6255..17a2fbb86a7 100644 --- a/src/script/page/RightSidebar/GroupParticipantUser/GroupParticipantUser.tsx +++ b/src/script/page/RightSidebar/GroupParticipantUser/GroupParticipantUser.tsx @@ -42,7 +42,6 @@ import {User} from '../../../entity/User'; import {ClientEvent} from '../../../event/Client'; import {TeamRepository} from '../../../team/TeamRepository'; import {TeamState} from '../../../team/TeamState'; -import {UserState} from '../../../user/UserState'; import {ActionsViewModel} from '../../../view_model/ActionsViewModel'; import {PanelHeader} from '../PanelHeader'; import {PanelEntity} from '../RightSidebar'; @@ -58,7 +57,7 @@ interface GroupParticipantUserProps { conversationRoleRepository: ConversationRoleRepository; teamRepository: TeamRepository; teamState: TeamState; - userState: UserState; + selfUser: User; isFederated?: boolean; } @@ -73,7 +72,7 @@ const GroupParticipantUser: FC = ({ conversationRoleRepository, teamRepository, teamState, - userState, + selfUser, isFederated = false, }) => { const {isGroup, roles} = useKoSubscribableChildren(activeConversation, ['isGroup', 'roles']); @@ -83,8 +82,10 @@ const GroupParticipantUser: FC = ({ 'isTeam', 'team', ]); - const {isActivatedAccount, self: selfUser} = useKoSubscribableChildren(userState, ['isActivatedAccount', 'self']); - const {is_verified: isSelfVerified} = useKoSubscribableChildren(selfUser, ['is_verified']); + const {is_verified: isSelfVerified, isActivatedAccount} = useKoSubscribableChildren(selfUser, [ + 'is_verified', + 'isActivatedAccount', + ]); const canChangeRole = conversationRoleRepository.canChangeParticipantRoles(activeConversation) && !currentUser.isMe && !isTemporaryGuest; diff --git a/src/script/page/RightSidebar/MessageDetails/MessageDetails.test.tsx b/src/script/page/RightSidebar/MessageDetails/MessageDetails.test.tsx index 8130000eb01..56e56bf67e4 100644 --- a/src/script/page/RightSidebar/MessageDetails/MessageDetails.test.tsx +++ b/src/script/page/RightSidebar/MessageDetails/MessageDetails.test.tsx @@ -90,6 +90,7 @@ describe('MessageDetails', () => { const {getByText} = render( undefined} activeConversation={conversation} messageEntity={message} diff --git a/src/script/page/RightSidebar/MessageDetails/MessageDetails.tsx b/src/script/page/RightSidebar/MessageDetails/MessageDetails.tsx index c8f06ab2b75..c39aa5c8c5f 100644 --- a/src/script/page/RightSidebar/MessageDetails/MessageDetails.tsx +++ b/src/script/page/RightSidebar/MessageDetails/MessageDetails.tsx @@ -93,6 +93,7 @@ interface MessageDetailsProps { searchRepository: SearchRepository; userRepository: UserRepository; showReactions?: boolean; + selfUser: User; updateEntity: (message: Message) => void; togglePanel: (state: PanelState, entity: PanelEntity, addMode?: boolean) => void; } @@ -105,6 +106,7 @@ const MessageDetails: FC = ({ searchRepository, showReactions = false, userRepository, + selfUser, onClose, updateEntity, togglePanel, @@ -262,6 +264,7 @@ const MessageDetails: FC = ({ {messageState === MESSAGE_STATES.RECEIPTS && ( = ({ ({emojiCount}) = ({ const {conversationRoleRepository} = conversationRepository; const conversationState = container.resolve(ConversationState); const {activeConversation} = useKoSubscribableChildren(conversationState, ['activeConversation']); + const {self: selfUser} = useKoSubscribableChildren(userState, ['self']); const [isAddMode, setIsAddMode] = useState(false); const [animatePanelToLeft, setAnimatePanelToLeft] = useState(true); @@ -223,7 +224,7 @@ const RightSidebar: FC = ({ conversationRoleRepository={conversationRoleRepository} teamRepository={teamRepository} teamState={teamState} - userState={userState} + selfUser={selfUser} isFederated={isFederated} /> )} @@ -278,7 +279,7 @@ const RightSidebar: FC = ({ onClose={closePanel} serviceEntity={serviceEntity} userEntity={userServiceEntity} - userState={userState} + selfUser={selfUser} isAddMode={isAddMode} /> )} @@ -301,6 +302,7 @@ const RightSidebar: FC = ({ {currentState === PanelState.MESSAGE_DETAILS && messageEntity && ( ; public readonly connectRequests: ko.PureComputed; - public readonly isActivatedAccount: ko.PureComputed; - public readonly isTemporaryGuest: ko.PureComputed; public readonly numberOfContacts: ko.PureComputed; public readonly self = ko.observable(); @@ -56,9 +54,6 @@ export class UserState { }) .extend({rateLimit: TIME_IN_MILLIS.SECOND}); - this.isActivatedAccount = ko.pureComputed(() => !this.self()?.isTemporaryGuest()); - this.isTemporaryGuest = ko.pureComputed(() => this.self()?.isTemporaryGuest()); - this.isTeam = ko.observable(); this.teamMembers = ko.pureComputed((): User[] => []); this.teamUsers = ko.pureComputed((): User[] => []); diff --git a/src/script/view_model/ListViewModel.ts b/src/script/view_model/ListViewModel.ts index 3c0e3e07f06..038f7641a64 100644 --- a/src/script/view_model/ListViewModel.ts +++ b/src/script/view_model/ListViewModel.ts @@ -96,9 +96,9 @@ export class ListViewModel { this.contentViewModel = mainViewModel.content; this.callingViewModel = mainViewModel.calling; - this.isActivatedAccount = this.userState.isActivatedAccount; this.isProAccount = this.teamState.isTeam; this.selfUser = this.userState.self; + this.isActivatedAccount = ko.pureComputed(() => this.selfUser()?.isActivatedAccount()); // State this.lastUpdate = ko.observable(); From 28c0e0cdd3438143405c526a2dc247e8dbe5913b Mon Sep 17 00:00:00 2001 From: Thomas Belin Date: Wed, 13 Sep 2023 09:54:21 +0200 Subject: [PATCH 08/55] fix: Use fully qualified conversation for lastRead message (#15796) --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 87590901dae..ae96dfa6339 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "@datadog/browser-rum": "^4.48.2", "@emotion/react": "11.11.1", "@wireapp/avs": "9.3.7", - "@wireapp/core": "42.3.0", + "@wireapp/core": "42.3.1", "@wireapp/lru-cache": "3.8.1", "@wireapp/react-ui-kit": "9.9.5", "@wireapp/store-engine-dexie": "2.1.6", diff --git a/yarn.lock b/yarn.lock index 7c45abf3e99..d016d974577 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5412,9 +5412,9 @@ __metadata: languageName: node linkType: hard -"@wireapp/core@npm:42.3.0": - version: 42.3.0 - resolution: "@wireapp/core@npm:42.3.0" +"@wireapp/core@npm:42.3.1": + version: 42.3.1 + resolution: "@wireapp/core@npm:42.3.1" dependencies: "@wireapp/api-client": ^26.0.4 "@wireapp/commons": ^5.1.3 @@ -5433,7 +5433,7 @@ __metadata: logdown: 3.3.1 long: ^5.2.0 uuidjs: 4.2.13 - checksum: 32b878779aead05fe5743a2bc1a8e8f48ff8f3066b7be99b6c34d0440cac0ee441c4f4e429bc5d64f606068e96eeea78cb3bc87373cbc3bff80b75344613f3b0 + checksum: b17cf5b2f203491c41c248f6dd2385fb83283cd8a64cd3e4cf1e4894ea9f021ad970f359cb15cfa51f33fbf317794cdbe9c131698052a893c4b6beb5ffbb0754 languageName: node linkType: hard @@ -18512,7 +18512,7 @@ __metadata: "@types/webpack-env": 1.18.1 "@wireapp/avs": 9.3.7 "@wireapp/copy-config": 2.1.7 - "@wireapp/core": 42.3.0 + "@wireapp/core": 42.3.1 "@wireapp/eslint-config": 3.0.4 "@wireapp/lru-cache": 3.8.1 "@wireapp/prettier-config": 0.6.3 From d52d901aa8ba77b0d9688c4640e995ae4a4927a5 Mon Sep 17 00:00:00 2001 From: Arjita Date: Wed, 13 Sep 2023 10:01:54 +0200 Subject: [PATCH 09/55] fix: reaction tooltip reacted user's click closes right panel if clicked on another message tooltip (#15797) --- src/script/components/Conversation/Conversation.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/script/components/Conversation/Conversation.tsx b/src/script/components/Conversation/Conversation.tsx index a6844957402..34ef90da1ce 100644 --- a/src/script/components/Conversation/Conversation.tsx +++ b/src/script/components/Conversation/Conversation.tsx @@ -260,7 +260,7 @@ export const Conversation: FC = ({ }; const showMessageReactions = (message: Message, showReactions = true) => { - openRightSidebar(PanelState.MESSAGE_DETAILS, {entity: message, showReactions}); + openRightSidebar(PanelState.MESSAGE_DETAILS, {entity: message, showReactions}, true); }; const handleEmailClick = (event: Event, messageDetails: MessageDetails) => { From 6a061fef2e62d2b49dbb6b5cf777ea986a2a69e6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 13 Sep 2023 08:09:46 +0000 Subject: [PATCH 10/55] chore(deps-dev): Bump cspell from 7.3.5 to 7.3.6 (#15798) Bumps [cspell](https://github.com/streetsidesoftware/cspell) from 7.3.5 to 7.3.6. - [Release notes](https://github.com/streetsidesoftware/cspell/releases) - [Changelog](https://github.com/streetsidesoftware/cspell/blob/main/CHANGELOG.md) - [Commits](https://github.com/streetsidesoftware/cspell/compare/v7.3.5...v7.3.6) --- updated-dependencies: - dependency-name: cspell dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 242 +++++++++++++++++++++++++++++---------------------- 2 files changed, 140 insertions(+), 104 deletions(-) diff --git a/package.json b/package.json index ae96dfa6339..f1f58be1a03 100644 --- a/package.json +++ b/package.json @@ -100,7 +100,7 @@ "babel-loader": "9.1.3", "babel-plugin-transform-import-meta": "^2.2.1", "cross-env": "7.0.3", - "cspell": "7.3.5", + "cspell": "7.3.6", "css-loader": "^6.8.1", "cssnano": "6.0.1", "dexie": "3.2.4", diff --git a/yarn.lock b/yarn.lock index d016d974577..639c85085ee 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1996,9 +1996,9 @@ __metadata: languageName: node linkType: hard -"@cspell/cspell-bundled-dicts@npm:7.3.5": - version: 7.3.5 - resolution: "@cspell/cspell-bundled-dicts@npm:7.3.5" +"@cspell/cspell-bundled-dicts@npm:7.3.6": + version: 7.3.6 + resolution: "@cspell/cspell-bundled-dicts@npm:7.3.6" dependencies: "@cspell/dict-ada": ^4.0.2 "@cspell/dict-aws": ^4.0.0 @@ -2047,46 +2047,46 @@ __metadata: "@cspell/dict-swift": ^2.0.1 "@cspell/dict-typescript": ^3.1.1 "@cspell/dict-vue": ^3.0.0 - checksum: 0b7008a4da6726fda8491dc61dd98a8377bed79821ea04e8f02695078c9c74b5c16af34a53173d73fc3b92ad5c7c7666ca5b3bbdef1f88be74ec42748003ef8d + checksum: 05b584e04ae412764379321bda5b007fb9844128fb1e71a55287cd372f6a19dc791d32c7c4f32f0a344e46579fd5a4cdcd0f52ceb0ab8c65222946e23ba5ba33 languageName: node linkType: hard -"@cspell/cspell-json-reporter@npm:7.3.5": - version: 7.3.5 - resolution: "@cspell/cspell-json-reporter@npm:7.3.5" +"@cspell/cspell-json-reporter@npm:7.3.6": + version: 7.3.6 + resolution: "@cspell/cspell-json-reporter@npm:7.3.6" dependencies: - "@cspell/cspell-types": 7.3.5 - checksum: 87de06b347972b5b5e99d8346261617d50efda634c46a8e11fbdf607c8cd9151c911f1491349e6cfb7e070e097434975a9b5fa642f6a1e138360274f2d7e5b48 + "@cspell/cspell-types": 7.3.6 + checksum: 3f49de901fca8d3eea520a309abd7e1b29b50764fdf69a8d103041330e984bbc7fcbd62acbda2e73305791ade08144c0da6b902eb7c49723ffc33d84566146f8 languageName: node linkType: hard -"@cspell/cspell-pipe@npm:7.3.5": - version: 7.3.5 - resolution: "@cspell/cspell-pipe@npm:7.3.5" - checksum: dbc7ee6d1becdbbee00f0667bbcc2751b7187e1f31df7648dd8be30b5d4343058979f8dfd4c87d61c99142a3a19004ccfcb1bbc25f21eacbf57c2141a5fbe66a +"@cspell/cspell-pipe@npm:7.3.6": + version: 7.3.6 + resolution: "@cspell/cspell-pipe@npm:7.3.6" + checksum: c858f9ac6f6636e35abda16a986853903f7091b6aa4e8b60737a87ac6a04a6bc2e9312fed9062fc9878e8681b6bba61613a1d32b5522c4627c088c0c0bf9f3c8 languageName: node linkType: hard -"@cspell/cspell-resolver@npm:7.3.5": - version: 7.3.5 - resolution: "@cspell/cspell-resolver@npm:7.3.5" +"@cspell/cspell-resolver@npm:7.3.6": + version: 7.3.6 + resolution: "@cspell/cspell-resolver@npm:7.3.6" dependencies: global-dirs: ^3.0.1 - checksum: 76e0e10eb2e0ce0f874628466b499b5de721788ff94b0c60298a7d49e9f9b81eb9ef5656bf030744ae20c0bdeea4e252a21f0ea0905f7079444ed6bd18e715bb + checksum: e1e7f92a49222de5b145b043baab8f7dea46db6bb3211b8fde365c144ab15fa8976222b4c11fcf71a3c51549a9a31dd0c4b09c9082111143d3cec7ca26ba9ab4 languageName: node linkType: hard -"@cspell/cspell-service-bus@npm:7.3.5": - version: 7.3.5 - resolution: "@cspell/cspell-service-bus@npm:7.3.5" - checksum: fe724a9037faa8a7be98e2e257b6e2b118a2c4c739346b489fef0d87a842f74f988ffcb4a1f0c4bfd6469a5d020ae1e3913ddd242b4f579957eb549379f55eac +"@cspell/cspell-service-bus@npm:7.3.6": + version: 7.3.6 + resolution: "@cspell/cspell-service-bus@npm:7.3.6" + checksum: 1d8fc7789857a72f5d55f34e9c61814f449eebda5f640940ceafc058d6e7aef3fcefe4c99b247cf52ec20f6bf76e04db49018ff912a45fce56a4e42331d5f216 languageName: node linkType: hard -"@cspell/cspell-types@npm:7.3.5": - version: 7.3.5 - resolution: "@cspell/cspell-types@npm:7.3.5" - checksum: 8926d1967ff0f9ac6c9278ad33936fb553855e34b4e6db9a4e7066a555846db9e5c2535fa9126bb407912d4c717d03507421f88375ca6e49b2043f0ea8ae8238 +"@cspell/cspell-types@npm:7.3.6": + version: 7.3.6 + resolution: "@cspell/cspell-types@npm:7.3.6" + checksum: d29109a6b808935f4353af8577140d2e767a71989cadc72e9edf5bf1e75e895c0b9dd256a4f574ec6086e206571996698a0225156cd520a63c68cac12b847bf0 languageName: node linkType: hard @@ -2428,19 +2428,19 @@ __metadata: languageName: node linkType: hard -"@cspell/dynamic-import@npm:7.3.5": - version: 7.3.5 - resolution: "@cspell/dynamic-import@npm:7.3.5" +"@cspell/dynamic-import@npm:7.3.6": + version: 7.3.6 + resolution: "@cspell/dynamic-import@npm:7.3.6" dependencies: import-meta-resolve: ^3.0.0 - checksum: bb171b4410afd2414b72c5c6a05a9811ae6bc5a79f52e475e44d66b2b7dca2130d967abbb56a1a19eaf5965775a7319754794da3e9cb38cd9035cfdfa53fc216 + checksum: db57c587ce6aa24d13f494808879ea0cf85f364967b8b89316aa436eea4eb7c792ddd21f183467cb04dabb7c78c75a83abf18636f2931b87a5f328d41309fc99 languageName: node linkType: hard -"@cspell/strong-weak-map@npm:7.3.5": - version: 7.3.5 - resolution: "@cspell/strong-weak-map@npm:7.3.5" - checksum: b797c47bccd2be37153cc4078f3cfb0c49c4a90084b002beb00193bf9ec17509258e8273c352a7d681879303d909b939bfc7dd2dafc5020165b796e56a654853 +"@cspell/strong-weak-map@npm:7.3.6": + version: 7.3.6 + resolution: "@cspell/strong-weak-map@npm:7.3.6" + checksum: f6c0823a528cb5a8d62aa98f1ff80effbfbc7fe132f5997c8e022c1c21f00517ddfe86d41dc0986d037db36726bb4aeec1db91d61d51b7f06b69622b6dc2ba2e languageName: node linkType: hard @@ -7481,121 +7481,121 @@ __metadata: languageName: node linkType: hard -"cspell-dictionary@npm:7.3.5": - version: 7.3.5 - resolution: "cspell-dictionary@npm:7.3.5" +"cspell-dictionary@npm:7.3.6": + version: 7.3.6 + resolution: "cspell-dictionary@npm:7.3.6" dependencies: - "@cspell/cspell-pipe": 7.3.5 - "@cspell/cspell-types": 7.3.5 - cspell-trie-lib: 7.3.5 + "@cspell/cspell-pipe": 7.3.6 + "@cspell/cspell-types": 7.3.6 + cspell-trie-lib: 7.3.6 fast-equals: ^4.0.3 - gensequence: ^5.0.2 - checksum: 0485f8d7364facd29b4fae28dcbef747a1a5a875af4c2507ae8bab8b1cd4ee10ae2494c7802fa7d352fbc7f8a058b9e385fb26e532c78c3a187353c4665ef6e5 + gensequence: ^6.0.0 + checksum: 80b9ab5b607ecac6f9bca0bc9836697a8e98bedbeb56b787d3f799d22ad49478c778357f64d65cf2f1d845a8dbe111f8e721005e2a710a6fa429326d03d67663 languageName: node linkType: hard -"cspell-gitignore@npm:7.3.5": - version: 7.3.5 - resolution: "cspell-gitignore@npm:7.3.5" +"cspell-gitignore@npm:7.3.6": + version: 7.3.6 + resolution: "cspell-gitignore@npm:7.3.6" dependencies: - cspell-glob: 7.3.5 + cspell-glob: 7.3.6 find-up: ^5.0.0 bin: cspell-gitignore: bin.mjs - checksum: 16d591fe8319f75e6aebb43ce713d624ab7600b365a07312ded73bcd3a6e9405c6052ebc109f52e42efea4173052280ac4eef76a577ae2a0e71576f2c6d8169d + checksum: 62b4a99c7c0f11d4b578cdab79c4ae01a78b2de87075553216758b27457560183f1f80c74c068ebb6e05189a57175cc1251ca501ba6f80405074d036b4052828 languageName: node linkType: hard -"cspell-glob@npm:7.3.5": - version: 7.3.5 - resolution: "cspell-glob@npm:7.3.5" +"cspell-glob@npm:7.3.6": + version: 7.3.6 + resolution: "cspell-glob@npm:7.3.6" dependencies: micromatch: ^4.0.5 - checksum: ee3ebf97a16b111f16cf9f9d376febcce4e936797bbdc5eb8b2af4c85862d80cd96e46a25cafcb0d73c4313994cdc91010383922816f3c3532a85c83dd2c46a9 + checksum: fba36f9580f7f1090d8e17d54f818806ced85268af89c053ca1b24e3ca0afd612aec1327e48cda388affd8eca6ce50cf6276711e050179d90d4259d8f8820db0 languageName: node linkType: hard -"cspell-grammar@npm:7.3.5": - version: 7.3.5 - resolution: "cspell-grammar@npm:7.3.5" +"cspell-grammar@npm:7.3.6": + version: 7.3.6 + resolution: "cspell-grammar@npm:7.3.6" dependencies: - "@cspell/cspell-pipe": 7.3.5 - "@cspell/cspell-types": 7.3.5 + "@cspell/cspell-pipe": 7.3.6 + "@cspell/cspell-types": 7.3.6 bin: cspell-grammar: bin.mjs - checksum: 73c0aa354c9d0ed9da47679700b27e54b7a29b6a73926009911f5960156690005e74b9cee6686633d08c154059e2679c166cd041640bbfa0362491f9c534c1f1 + checksum: 11f1be1837f84b29ca5f3d8cdf9cb2ce99cecc0527fc8b3a305fb147d835ef7b0eb836465c175f9c6871d89f7551d3d36aa05f53ba2a5a0a29437e455bea36d3 languageName: node linkType: hard -"cspell-io@npm:7.3.5": - version: 7.3.5 - resolution: "cspell-io@npm:7.3.5" +"cspell-io@npm:7.3.6": + version: 7.3.6 + resolution: "cspell-io@npm:7.3.6" dependencies: - "@cspell/cspell-service-bus": 7.3.5 + "@cspell/cspell-service-bus": 7.3.6 node-fetch: ^2.7.0 - checksum: 260456a1bf10e4fae3e3b97401ce2cacb9dbc42f2cc198378e3fb111f87db1ff959d9a8fd505f8c1b565ba8a170b9aa5f33768a5cbad35959f15dde7cac924ce + checksum: 0c6bd323b1e4b166f4a60a5a71324a63bd3e25c7cf38c87fba7083c7f40584dbb17e8831659db205b10422b20b53a8189712f051ac1f7231bf9de7e60333046f languageName: node linkType: hard -"cspell-lib@npm:7.3.5": - version: 7.3.5 - resolution: "cspell-lib@npm:7.3.5" +"cspell-lib@npm:7.3.6": + version: 7.3.6 + resolution: "cspell-lib@npm:7.3.6" dependencies: - "@cspell/cspell-bundled-dicts": 7.3.5 - "@cspell/cspell-pipe": 7.3.5 - "@cspell/cspell-resolver": 7.3.5 - "@cspell/cspell-types": 7.3.5 - "@cspell/dynamic-import": 7.3.5 - "@cspell/strong-weak-map": 7.3.5 + "@cspell/cspell-bundled-dicts": 7.3.6 + "@cspell/cspell-pipe": 7.3.6 + "@cspell/cspell-resolver": 7.3.6 + "@cspell/cspell-types": 7.3.6 + "@cspell/dynamic-import": 7.3.6 + "@cspell/strong-weak-map": 7.3.6 clear-module: ^4.1.2 comment-json: ^4.2.3 configstore: ^6.0.0 cosmiconfig: 8.0.0 - cspell-dictionary: 7.3.5 - cspell-glob: 7.3.5 - cspell-grammar: 7.3.5 - cspell-io: 7.3.5 - cspell-trie-lib: 7.3.5 + cspell-dictionary: 7.3.6 + cspell-glob: 7.3.6 + cspell-grammar: 7.3.6 + cspell-io: 7.3.6 + cspell-trie-lib: 7.3.6 fast-equals: ^5.0.1 find-up: ^6.3.0 - gensequence: ^5.0.2 + gensequence: ^6.0.0 import-fresh: ^3.3.0 resolve-from: ^5.0.0 vscode-languageserver-textdocument: ^1.0.8 vscode-uri: ^3.0.7 - checksum: 0eace255d74770078e517346239a68d644728152c4ae3ac57dd3d7d8c33676d1f4a976c499adfa2316bfa81776fc19ee880db2eae5033d7e2f699761aab06f19 + checksum: c855488a233c3d8e350494e295e3cce62503977c266d35b054b601f62725d98543211bc7f4afecb203c093542331c25dc0f38b45db7b464c0bd50b70752a9e4b languageName: node linkType: hard -"cspell-trie-lib@npm:7.3.5": - version: 7.3.5 - resolution: "cspell-trie-lib@npm:7.3.5" +"cspell-trie-lib@npm:7.3.6": + version: 7.3.6 + resolution: "cspell-trie-lib@npm:7.3.6" dependencies: - "@cspell/cspell-pipe": 7.3.5 - "@cspell/cspell-types": 7.3.5 - gensequence: ^5.0.2 - checksum: a182ae1fb092ba234ba9c810acb1f0926d06ed5ba635d34211ffb36763bc4b999529fc3a9c222985b7e74c3c7534d04878af29747f7ecae46d86322bc861acba + "@cspell/cspell-pipe": 7.3.6 + "@cspell/cspell-types": 7.3.6 + gensequence: ^6.0.0 + checksum: 2c39f0246b19284b291128b152689fdf32e9fb727dc3e901443396857342d48a98d6ec3c845ef2755974ea8e456550eacc405ef59ec22b4b44324d41e1efb302 languageName: node linkType: hard -"cspell@npm:7.3.5": - version: 7.3.5 - resolution: "cspell@npm:7.3.5" +"cspell@npm:7.3.6": + version: 7.3.6 + resolution: "cspell@npm:7.3.6" dependencies: - "@cspell/cspell-json-reporter": 7.3.5 - "@cspell/cspell-pipe": 7.3.5 - "@cspell/cspell-types": 7.3.5 - "@cspell/dynamic-import": 7.3.5 + "@cspell/cspell-json-reporter": 7.3.6 + "@cspell/cspell-pipe": 7.3.6 + "@cspell/cspell-types": 7.3.6 + "@cspell/dynamic-import": 7.3.6 chalk: ^5.3.0 chalk-template: ^1.1.0 commander: ^11.0.0 - cspell-gitignore: 7.3.5 - cspell-glob: 7.3.5 - cspell-io: 7.3.5 - cspell-lib: 7.3.5 + cspell-gitignore: 7.3.6 + cspell-glob: 7.3.6 + cspell-io: 7.3.6 + cspell-lib: 7.3.6 fast-glob: ^3.3.1 fast-json-stable-stringify: ^2.1.0 - file-entry-cache: ^6.0.1 + file-entry-cache: ^7.0.0 get-stdin: ^9.0.0 semver: ^7.5.4 strip-ansi: ^7.1.0 @@ -7603,7 +7603,7 @@ __metadata: bin: cspell: bin.mjs cspell-esm: bin.mjs - checksum: 2f148fb8b94233555925f628b8c32842a7b0ee88a4727c0ea68308e111c5b8c35ebf95c076b563197cc6c420985227c0cc3178731415c6df3463afdc90485d93 + checksum: 67d4c81b4279b7396a21c8f93f31db1dc756ab83b3930460df9457b25229eb95a7f61c290725010ec6e5ad58bab6812679f4ce7d77178da21977d13d6cba6b06 languageName: node linkType: hard @@ -9448,6 +9448,15 @@ __metadata: languageName: node linkType: hard +"file-entry-cache@npm:^7.0.0": + version: 7.0.0 + resolution: "file-entry-cache@npm:7.0.0" + dependencies: + flat-cache: ^3.1.0 + checksum: 0e8147ace9520f34274913e3e54331499901088ff360c344371980982b8968a6006a7133747d718133d1285abd2de2a22ecbebc7c4bb95517674933e40badea0 + languageName: node + linkType: hard + "file-stat@npm:^0.1.0": version: 0.1.3 resolution: "file-stat@npm:0.1.3" @@ -9567,7 +9576,18 @@ __metadata: languageName: node linkType: hard -"flatted@npm:^3.1.0": +"flat-cache@npm:^3.1.0": + version: 3.1.0 + resolution: "flat-cache@npm:3.1.0" + dependencies: + flatted: ^3.2.7 + keyv: ^4.5.3 + rimraf: ^3.0.2 + checksum: 99312601d5b90f44aef403f17f056dc09be7e437703740b166cdc9386d99e681f74e6b6e8bd7d010bda66904ea643c9527276b1b80308a2119741d94108a4d8f + languageName: node + linkType: hard + +"flatted@npm:^3.1.0, flatted@npm:^3.2.7": version: 3.2.7 resolution: "flatted@npm:3.2.7" checksum: 427633049d55bdb80201c68f7eb1cbd533e03eac541f97d3aecab8c5526f12a20ccecaeede08b57503e772c769e7f8680b37e8d482d1e5f8d7e2194687f9ea35 @@ -9803,10 +9823,10 @@ __metadata: languageName: node linkType: hard -"gensequence@npm:^5.0.2": - version: 5.0.2 - resolution: "gensequence@npm:5.0.2" - checksum: b94af8d6591bbf5bc568813f31efbc5bfca010d83bce2a6c82dcf4211f56be8e13df956b239fecb1d7492bf02218e3d36dbc47e6f872df256312a507ae9ccd25 +"gensequence@npm:^6.0.0": + version: 6.0.0 + resolution: "gensequence@npm:6.0.0" + checksum: 7c23404b227647cb033a2c6cf5a5266442409e9dcc6bc140565d28de64adfa03dc474119ae14d776dc177fe63d605d2f4b228fa3bf926145dddd68c8df95d029 languageName: node linkType: hard @@ -12168,6 +12188,13 @@ __metadata: languageName: node linkType: hard +"json-buffer@npm:3.0.1": + version: 3.0.1 + resolution: "json-buffer@npm:3.0.1" + checksum: 9026b03edc2847eefa2e37646c579300a1f3a4586cfb62bf857832b60c852042d0d6ae55d1afb8926163fa54c2b01d83ae24705f34990348bdac6273a29d4581 + languageName: node + linkType: hard + "json-parse-even-better-errors@npm:^2.3.0, json-parse-even-better-errors@npm:^2.3.1": version: 2.3.1 resolution: "json-parse-even-better-errors@npm:2.3.1" @@ -12281,6 +12308,15 @@ __metadata: languageName: node linkType: hard +"keyv@npm:^4.5.3": + version: 4.5.3 + resolution: "keyv@npm:4.5.3" + dependencies: + json-buffer: 3.0.1 + checksum: 3ffb4d5b72b6b4b4af443bbb75ca2526b23c750fccb5ac4c267c6116888b4b65681015c2833cb20d26cf3e6e32dac6b988c77f7f022e1a571b7d90f1442257da + languageName: node + linkType: hard + "kind-of@npm:^3.0.2": version: 3.2.2 resolution: "kind-of@npm:3.2.2" @@ -18533,7 +18569,7 @@ __metadata: core-js: 3.32.2 countly-sdk-web: 23.6.0 cross-env: 7.0.3 - cspell: 7.3.5 + cspell: 7.3.6 css-loader: ^6.8.1 cssnano: 6.0.1 date-fns: 2.30.0 From 2010a014e1b97ea5ebe8345ddf7cdc1f63b3a9b8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 13 Sep 2023 08:13:40 +0000 Subject: [PATCH 11/55] chore(deps-dev): Bump dpdm from 3.13.1 to 3.14.0 (#15799) Bumps [dpdm](https://github.com/acrazing/dpdm) from 3.13.1 to 3.14.0. - [Release notes](https://github.com/acrazing/dpdm/releases) - [Commits](https://github.com/acrazing/dpdm/compare/v3.13.1...v3.14.0) --- updated-dependencies: - dependency-name: dpdm dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 71 +++++++++++++++++++++------------------------------- 2 files changed, 30 insertions(+), 43 deletions(-) diff --git a/package.json b/package.json index f1f58be1a03..5f07feb4c9e 100644 --- a/package.json +++ b/package.json @@ -105,7 +105,7 @@ "cssnano": "6.0.1", "dexie": "3.2.4", "dotenv": "16.3.1", - "dpdm": "3.13.1", + "dpdm": "3.14.0", "eslint": "^8.49.0", "eslint-plugin-prettier": "^5.0.0", "fake-indexeddb": "4.0.2", diff --git a/yarn.lock b/yarn.lock index 639c85085ee..502d33f45e5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8289,20 +8289,20 @@ __metadata: languageName: node linkType: hard -"dpdm@npm:3.13.1": - version: 3.13.1 - resolution: "dpdm@npm:3.13.1" +"dpdm@npm:3.14.0": + version: 3.14.0 + resolution: "dpdm@npm:3.14.0" dependencies: chalk: ^4.1.2 fs-extra: ^11.1.1 - glob: ^9.3.1 + glob: ^10.3.4 ora: ^5.4.1 - tslib: ^2.5.0 - typescript: ^5.0.2 - yargs: ^17.7.1 + tslib: ^2.6.2 + typescript: ^5.2.2 + yargs: ^17.7.2 bin: dpdm: lib/bin/dpdm.js - checksum: a19260fb6cfc72a81317c65d1f1104f811c763b80404e7a86f7621cd2de7002b57272718ea1dcf4649836e70656a53fe28344a92cd1c699c586ef5aa4d7bd65b + checksum: 86870216326db1b5d714d8297271e7cbafb0bb4e4e60b7c8eeffd22cab8cf8a1464b66db5ce62a4ba9ddb4efdba25b7903b8932b5aeb97df0e89374651c77c11 languageName: node linkType: hard @@ -9992,6 +9992,21 @@ __metadata: languageName: node linkType: hard +"glob@npm:^10.3.4": + version: 10.3.4 + resolution: "glob@npm:10.3.4" + dependencies: + foreground-child: ^3.1.0 + jackspeak: ^2.0.3 + minimatch: ^9.0.1 + minipass: ^5.0.0 || ^6.0.2 || ^7.0.0 + path-scurry: ^1.10.1 + bin: + glob: dist/cjs/src/bin.js + checksum: 176b97c124414401cb51329a93d2ba112cef8814adbed10348481916b9521b677773eee2691cb6b24d66632d8c8bb8913533f5ac4bfb2d0ef5454a1856082361 + languageName: node + linkType: hard + "glob@npm:^7.0.5, glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.1.6": version: 7.2.3 resolution: "glob@npm:7.2.3" @@ -10019,18 +10034,6 @@ __metadata: languageName: node linkType: hard -"glob@npm:^9.3.1": - version: 9.3.5 - resolution: "glob@npm:9.3.5" - dependencies: - fs.realpath: ^1.0.0 - minimatch: ^8.0.2 - minipass: ^4.2.4 - path-scurry: ^1.6.1 - checksum: 94b093adbc591bc36b582f77927d1fb0dbf3ccc231828512b017601408be98d1fe798fc8c0b19c6f2d1a7660339c3502ce698de475e9d938ccbb69b47b647c84 - languageName: node - linkType: hard - "global-dirs@npm:^3.0.1": version: 3.0.1 resolution: "global-dirs@npm:3.0.1" @@ -13212,15 +13215,6 @@ __metadata: languageName: node linkType: hard -"minimatch@npm:^8.0.2": - version: 8.0.4 - resolution: "minimatch@npm:8.0.4" - dependencies: - brace-expansion: ^2.0.1 - checksum: 2e46cffb86bacbc524ad45a6426f338920c529dd13f3a732cc2cf7618988ee1aae88df4ca28983285aca9e0f45222019ac2d14ebd17c1edadd2ee12221ab801a - languageName: node - linkType: hard - "minimatch@npm:^9.0.1": version: 9.0.3 resolution: "minimatch@npm:9.0.3" @@ -13308,13 +13302,6 @@ __metadata: languageName: node linkType: hard -"minipass@npm:^4.2.4": - version: 4.2.8 - resolution: "minipass@npm:4.2.8" - checksum: 7f4914d5295a9a30807cae5227a37a926e6d910c03f315930fde52332cf0575dfbc20295318f91f0baf0e6bb11a6f668e30cde8027dea7a11b9d159867a3c830 - languageName: node - linkType: hard - "minipass@npm:^5.0.0": version: 5.0.0 resolution: "minipass@npm:5.0.0" @@ -14157,7 +14144,7 @@ __metadata: languageName: node linkType: hard -"path-scurry@npm:^1.10.1, path-scurry@npm:^1.6.1": +"path-scurry@npm:^1.10.1": version: 1.10.1 resolution: "path-scurry@npm:1.10.1" dependencies: @@ -17585,7 +17572,7 @@ __metadata: languageName: node linkType: hard -"tslib@npm:^2.0.3, tslib@npm:^2.3.0, tslib@npm:^2.4.0, tslib@npm:^2.5.0, tslib@npm:^2.6.0": +"tslib@npm:^2.0.3, tslib@npm:^2.3.0, tslib@npm:^2.4.0, tslib@npm:^2.5.0, tslib@npm:^2.6.0, tslib@npm:^2.6.2": version: 2.6.2 resolution: "tslib@npm:2.6.2" checksum: 329ea56123005922f39642318e3d1f0f8265d1e7fcb92c633e0809521da75eeaca28d2cf96d7248229deb40e5c19adf408259f4b9640afd20d13aecc1430f3ad @@ -17731,7 +17718,7 @@ __metadata: languageName: node linkType: hard -"typescript@npm:5.2.2, typescript@npm:^5, typescript@npm:^5.0.2": +"typescript@npm:5.2.2, typescript@npm:^5, typescript@npm:^5.2.2": version: 5.2.2 resolution: "typescript@npm:5.2.2" bin: @@ -17751,7 +17738,7 @@ __metadata: languageName: node linkType: hard -"typescript@patch:typescript@5.2.2#~builtin, typescript@patch:typescript@^5#~builtin, typescript@patch:typescript@^5.0.2#~builtin": +"typescript@patch:typescript@5.2.2#~builtin, typescript@patch:typescript@^5#~builtin, typescript@patch:typescript@^5.2.2#~builtin": version: 5.2.2 resolution: "typescript@patch:typescript@npm%3A5.2.2#~builtin::version=5.2.2&hash=a1c5e5" bin: @@ -18576,7 +18563,7 @@ __metadata: dexie: 3.2.4 dexie-batch: 0.4.3 dotenv: 16.3.1 - dpdm: 3.13.1 + dpdm: 3.14.0 emoji-picker-react: ^4.5.1 eslint: ^8.49.0 eslint-plugin-prettier: ^5.0.0 @@ -19111,7 +19098,7 @@ __metadata: languageName: node linkType: hard -"yargs@npm:^17.3.1, yargs@npm:^17.7.1": +"yargs@npm:^17.3.1, yargs@npm:^17.7.2": version: 17.7.2 resolution: "yargs@npm:17.7.2" dependencies: From b8d1c78f7590faf0b842926f5ce18277b1660bc7 Mon Sep 17 00:00:00 2001 From: Timothy LeBon Date: Wed, 13 Sep 2023 10:20:46 +0200 Subject: [PATCH 12/55] chore: update translation (#15800) --- src/i18n/en-US.json | 6 +++--- src/script/strings.ts | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/i18n/en-US.json b/src/i18n/en-US.json index 1255ce270eb..45bed545852 100644 --- a/src/i18n/en-US.json +++ b/src/i18n/en-US.json @@ -381,18 +381,18 @@ "conversationJoin.fullConversationHeadline": "Unable to join conversation", "conversationJoin.fullConversationSubhead": "The maximum number of participants in this conversation has been reached.", "conversationJoin.hasAccount": "Already have an account?", - "conversationJoin.headline": "The conversation is hosted on {brandName}", + "conversationJoin.headline": "The conversation takes place on {brandName}", "conversationJoin.invalidCreateAccountLink": "Create an account", "conversationJoin.invalidCreateAccountText": "for group messaging and conference calls.", "conversationJoin.invalidHeadline": "Conversation not found", "conversationJoin.invalidSubhead": "The link to this group conversation expired or the conversation was set to private.", "conversationJoin.join": "Join", - "conversationJoin.joinButton": "Join as temporary user", + "conversationJoin.joinButton": "Join as Temporary Guest", "conversationJoin.joinWithOtherAccount": "Join with another account", "conversationJoin.loginLink": "Log in", "conversationJoin.mainHeadline": "Join Conversation", "conversationJoin.namePlaceholder": "Your name", - "conversationJoin.noAccountHead": "Dont have an account?", + "conversationJoin.noAccountHead": "Don't have an account?", "conversationJoin.subhead": "Join conversation as temporary guest (access expires after 24 hours)", "conversationJoin.unsupportedJoinHeadline": "You have been invited to join a conversation in {brandName}", "conversationJoin.unsupportedJoinMobileSubhead": "Open this link on your computer.", diff --git a/src/script/strings.ts b/src/script/strings.ts index 568ae7c7906..b5f9ecd23ed 100644 --- a/src/script/strings.ts +++ b/src/script/strings.ts @@ -435,7 +435,7 @@ export const conversationJoinStrings = defineMessages({ id: 'conversationJoin.hasAccount', }, headline: { - defaultMessage: 'The conversation is hosted on {brandName}', + defaultMessage: 'The conversation takes place on {brandName}', id: 'conversationJoin.headline', }, invalidCreateAccountLink: { @@ -463,7 +463,7 @@ export const conversationJoinStrings = defineMessages({ id: 'conversationJoin.namePlaceholder', }, noAccountHead: { - defaultMessage: 'Dont have an account?', + defaultMessage: "Don't have an account?", id: 'conversationJoin.noAccountHead', }, subhead: { @@ -471,7 +471,7 @@ export const conversationJoinStrings = defineMessages({ id: 'conversationJoin.subhead', }, joinButton: { - defaultMessage: 'Join as temporary user', + defaultMessage: 'Join as Temporary Guest', id: 'conversationJoin.joinButton', }, mainHeadline: { From 915b4ecb57fa563193b28255f5d9312a28ae116c Mon Sep 17 00:00:00 2001 From: Virgile <78490891+V-Gira@users.noreply.github.com> Date: Wed, 13 Sep 2023 11:01:38 +0200 Subject: [PATCH 13/55] chore: update translation (#15801) --- src/i18n/en-US.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/en-US.json b/src/i18n/en-US.json index 45bed545852..172f1ec3f04 100644 --- a/src/i18n/en-US.json +++ b/src/i18n/en-US.json @@ -544,7 +544,7 @@ "extensionsGiphyNoGifs": "Oops, no gifs", "extensionsGiphyRandom": "Random", "failedToAddParticipantSingularMvp": "[bold]{{name}}[/bold] could not be added to the group.", - "failedToAddParticipantSingularNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backend does not federate with other members of the group.", + "failedToAddParticipantSingularNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backend doesn't federate with the backends of all group participants.", "failedToAddParticipantSingularOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.", "failedToAddParticipantsPlural": "[bold]{{total}} participants[/bold] could not be added to the group.", "failedToAddParticipantsPluralDetailsMvp": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group.", From 872589d731c28b2425d307790c0d302b189e4106 Mon Sep 17 00:00:00 2001 From: Virgile <78490891+V-Gira@users.noreply.github.com> Date: Wed, 13 Sep 2023 12:12:30 +0200 Subject: [PATCH 14/55] chore: add plural string to reaction button's aria-label (#15802) --- src/i18n/en-US.json | 3 ++- .../MessageActions/MessageReactions/EmojiPill.tsx | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/i18n/en-US.json b/src/i18n/en-US.json index 172f1ec3f04..518f07e1085 100644 --- a/src/i18n/en-US.json +++ b/src/i18n/en-US.json @@ -118,6 +118,8 @@ "accessibility.messageActionsMenuLike": "React with heart", "accessibility.messageActionsMenuThumbsUp": "React with thumbs up", "accessibility.messageDetailsReadReceipts": "Message viewed by {{readReceiptText}}, open details", + "accessibility.messageReactionDetailsPlural": "{{emojiCount}} reactions, react with {{emojiName}} emoji", + "accessibility.messageReactionDetailsSingular": "{{emojiCount}} reaction, react with {{emojiName}} emoji", "accessibility.messages.like": "Like message", "accessibility.messages.liked": "Unlike message", "accessibility.openConversation": "Open profile of {{name}}", @@ -730,7 +732,6 @@ "messageFailedToSendWillNotReceiveSingular": "won't get your message.", "messageFailedToSendWillReceivePlural": "will get your message later.", "messageFailedToSendWillReceiveSingular": "will get your message later.", - "messageReactionDetails": "{{emojiCount}} reaction, react with {{emojiName}} emoji", "mlsConversationRecovered": "You haven’t used this device for a while, or an issue has occurred. Some older messages may not appear here.", "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.", "mlsToggleName": "MLS", diff --git a/src/script/components/MessagesList/Message/ContentMessage/MessageActions/MessageReactions/EmojiPill.tsx b/src/script/components/MessagesList/Message/ContentMessage/MessageActions/MessageReactions/EmojiPill.tsx index 0a630e39ae2..1d0709f3a52 100644 --- a/src/script/components/MessagesList/Message/ContentMessage/MessageActions/MessageReactions/EmojiPill.tsx +++ b/src/script/components/MessagesList/Message/ContentMessage/MessageActions/MessageReactions/EmojiPill.tsx @@ -108,7 +108,11 @@ const EmojiPill: FC = ({ >