Skip to content

Commit 58fd158

Browse files
estellecommentestellecomment
committed
Merge tag 'v1.11.12' into upgrade/element-web-v1.11.12. Patches not fixed yet.
* Fix config.json failing to load for Jitsi wrapper in non-root deployment ([\#23577](element-hq/element-web#23577)).
2 parents 2c93809 + 271d2d7 commit 58fd158

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+1298
-890
lines changed

‎.eslintrc.js

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ module.exports = {
2020
overrides: [{
2121
files: [
2222
"src/**/*.{ts,tsx}",
23+
"test/**/*.{ts,tsx}",
2324
"module_system/**/*.{ts,tsx}",
2425
// :TCHAP: Lint our cypress files, copied from react-sdk. React-sdk lints them too, so we keep up !
2526
"cypress/**/*.ts",

‎.github/ISSUE_TEMPLATE/enhancement.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ body:
55
- type: markdown
66
attributes:
77
value: |
8-
Thank you for taking the time to propose a new feature or make a suggestion.
8+
Thank you for taking the time to propose an enhancement to an existing feature. If you would like to propose a new feature or a major cross-platform change, please [start a discussion here](https://github.com/vector-im/element-meta/discussions/new?category=ideas).
99
- type: textarea
1010
id: usecase
1111
attributes:

‎.github/deactivated_workflows/triage-labelled.yml

+78
Original file line numberDiff line numberDiff line change
@@ -229,3 +229,81 @@ jobs:
229229
env:
230230
PROJECT_ID: "PN_kwDOAM0swc4AArk0"
231231
GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
232+
233+
ps_features1:
234+
name: Add labelled issues to PS features team 1
235+
runs-on: ubuntu-latest
236+
if: >
237+
contains(github.event.issue.labels.*.name, 'A-Polls') ||
238+
contains(github.event.issue.labels.*.name, 'A-Location-Sharing') ||
239+
(contains(github.event.issue.labels.*.name, 'A-Voice-Messages') &&
240+
!contains(github.event.issue.labels.*.name, 'A-Broadcast')) ||
241+
(contains(github.event.issue.labels.*.name, 'A-Session-Mgmt') &&
242+
contains(github.event.issue.labels.*.name, 'A-User-Settings'))
243+
steps:
244+
- uses: octokit/[email protected]
245+
id: add_to_project
246+
with:
247+
headers: '{"GraphQL-Features": "projects_next_graphql"}'
248+
query: |
249+
mutation add_to_project($projectid:ID!,$contentid:ID!) {
250+
addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
251+
item {
252+
id
253+
}
254+
}
255+
}
256+
projectid: ${{ env.PROJECT_ID }}
257+
contentid: ${{ github.event.issue.node_id }}
258+
env:
259+
PROJECT_ID: "PVT_kwDOAM0swc4AHJKF"
260+
GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
261+
262+
ps_features2:
263+
name: Add labelled issues to PS features team 2
264+
runs-on: ubuntu-latest
265+
if: >
266+
contains(github.event.issue.labels.*.name, 'A-DM-Start') ||
267+
contains(github.event.issue.labels.*.name, 'A-Broadcast')
268+
steps:
269+
- uses: octokit/[email protected]
270+
id: add_to_project
271+
with:
272+
headers: '{"GraphQL-Features": "projects_next_graphql"}'
273+
query: |
274+
mutation add_to_project($projectid:ID!,$contentid:ID!) {
275+
addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
276+
item {
277+
id
278+
}
279+
}
280+
}
281+
projectid: ${{ env.PROJECT_ID }}
282+
contentid: ${{ github.event.issue.node_id }}
283+
env:
284+
PROJECT_ID: "PVT_kwDOAM0swc4AHJKd"
285+
GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
286+
287+
ps_features3:
288+
name: Add labelled issues to PS features team 3
289+
runs-on: ubuntu-latest
290+
if: >
291+
contains(github.event.issue.labels.*.name, 'A-Composer-WYSIWYG')
292+
steps:
293+
- uses: octokit/[email protected]
294+
id: add_to_project
295+
with:
296+
headers: '{"GraphQL-Features": "projects_next_graphql"}'
297+
query: |
298+
mutation add_to_project($projectid:ID!,$contentid:ID!) {
299+
addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
300+
item {
301+
id
302+
}
303+
}
304+
}
305+
projectid: ${{ env.PROJECT_ID }}
306+
contentid: ${{ github.event.issue.node_id }}
307+
env:
308+
PROJECT_ID: "PVT_kwDOAM0swc4AHJKW"
309+
GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}

‎CHANGELOG.md

+60
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,63 @@
1+
Changes in [1.11.12](https://github.com/vector-im/element-web/releases/tag/v1.11.12) (2022-10-26)
2+
=================================================================================================
3+
4+
## 🐛 Bug Fixes
5+
* Fix config.json failing to load for Jitsi wrapper in non-root deployment ([\#23577](https://github.com/vector-im/element-web/pull/23577)).
6+
7+
Changes in [1.11.11](https://github.com/vector-im/element-web/releases/tag/v1.11.11) (2022-10-25)
8+
=================================================================================================
9+
10+
## ✨ Features
11+
* Device manager - tweak string formatting of default device name ([\#23457](https://github.com/vector-im/element-web/pull/23457)).
12+
* Add Element Call participant limit ([\#23431](https://github.com/vector-im/element-web/pull/23431)).
13+
* Add Element Call `brand` ([\#23443](https://github.com/vector-im/element-web/pull/23443)).
14+
* Include a file-safe room name and ISO date in chat exports ([\#9440](https://github.com/matrix-org/matrix-react-sdk/pull/9440)). Fixes #21812 and #19724.
15+
* Room call banner ([\#9378](https://github.com/matrix-org/matrix-react-sdk/pull/9378)). Fixes #23453. Contributed by @toger5.
16+
* Device manager - spinners while devices are signing out ([\#9433](https://github.com/matrix-org/matrix-react-sdk/pull/9433)). Fixes #15865.
17+
* Device manager - silence call ringers when local notifications are silenced ([\#9420](https://github.com/matrix-org/matrix-react-sdk/pull/9420)).
18+
* Pass the current language to Element Call ([\#9427](https://github.com/matrix-org/matrix-react-sdk/pull/9427)).
19+
* Hide screen-sharing button in Element Call on desktop ([\#9423](https://github.com/matrix-org/matrix-react-sdk/pull/9423)).
20+
* Add reply support to WysiwygComposer ([\#9422](https://github.com/matrix-org/matrix-react-sdk/pull/9422)). Contributed by @florianduros.
21+
* Disconnect other connected devices (of the same user) when joining an Element call ([\#9379](https://github.com/matrix-org/matrix-react-sdk/pull/9379)).
22+
* Device manager - device tile main click target ([\#9409](https://github.com/matrix-org/matrix-react-sdk/pull/9409)).
23+
* Add formatting buttons to the rich text editor ([\#9410](https://github.com/matrix-org/matrix-react-sdk/pull/9410)). Contributed by @florianduros.
24+
* Device manager - current session context menu ([\#9386](https://github.com/matrix-org/matrix-react-sdk/pull/9386)).
25+
* Remove piwik config fallback for privacy policy URL ([\#9390](https://github.com/matrix-org/matrix-react-sdk/pull/9390)).
26+
* Add the first step to integrate the matrix wysiwyg composer ([\#9374](https://github.com/matrix-org/matrix-react-sdk/pull/9374)). Contributed by @florianduros.
27+
* Device manager - UA parsing tweaks ([\#9382](https://github.com/matrix-org/matrix-react-sdk/pull/9382)).
28+
* Device manager - remove client information events when disabling setting ([\#9384](https://github.com/matrix-org/matrix-react-sdk/pull/9384)).
29+
* Add Element Call participant limit ([\#9358](https://github.com/matrix-org/matrix-react-sdk/pull/9358)).
30+
* Add Element Call room settings ([\#9347](https://github.com/matrix-org/matrix-react-sdk/pull/9347)).
31+
* Device manager - render extended device information ([\#9360](https://github.com/matrix-org/matrix-react-sdk/pull/9360)).
32+
* New group call experience: Room header and PiP designs ([\#9351](https://github.com/matrix-org/matrix-react-sdk/pull/9351)).
33+
* Pass language to Jitsi Widget ([\#9346](https://github.com/matrix-org/matrix-react-sdk/pull/9346)). Contributed by @Fox32.
34+
* Add notifications and toasts for Element Call calls ([\#9337](https://github.com/matrix-org/matrix-react-sdk/pull/9337)).
35+
* Device manager - device type icon ([\#9355](https://github.com/matrix-org/matrix-react-sdk/pull/9355)).
36+
* Delete the remainder of groups ([\#9357](https://github.com/matrix-org/matrix-react-sdk/pull/9357)). Fixes #22770.
37+
* Device manager - display client information in device details ([\#9315](https://github.com/matrix-org/matrix-react-sdk/pull/9315)).
38+
39+
## 🐛 Bug Fixes
40+
* Send Content-Type: application/json header for integration manager /register API ([\#9490](https://github.com/matrix-org/matrix-react-sdk/pull/9490)). Fixes #23580.
41+
* Make ErrorView & CompatibilityView scrollable ([\#23468](https://github.com/vector-im/element-web/pull/23468)). Fixes #23376.
42+
* Device manager - put client/browser device metadata in correct section ([\#9447](https://github.com/matrix-org/matrix-react-sdk/pull/9447)).
43+
* update the room unread notification counter when the server changes the value without any related read receipt ([\#9438](https://github.com/matrix-org/matrix-react-sdk/pull/9438)).
44+
* Don't show call banners in video rooms ([\#9441](https://github.com/matrix-org/matrix-react-sdk/pull/9441)).
45+
* Prevent useContextMenu isOpen from being true if the button ref goes away ([\#9418](https://github.com/matrix-org/matrix-react-sdk/pull/9418)). Fixes matrix-org/element-web-rageshakes#15637.
46+
* Automatically focus the WYSIWYG composer when you enter a room ([\#9412](https://github.com/matrix-org/matrix-react-sdk/pull/9412)).
47+
* Improve the tooltips on the call lobby join button ([\#9428](https://github.com/matrix-org/matrix-react-sdk/pull/9428)).
48+
* Pass the homeserver's base URL to Element Call ([\#9429](https://github.com/matrix-org/matrix-react-sdk/pull/9429)). Fixes #23301.
49+
* Better accommodate long room names in call toasts ([\#9426](https://github.com/matrix-org/matrix-react-sdk/pull/9426)).
50+
* Hide virtual widgets from the room info panel ([\#9424](https://github.com/matrix-org/matrix-react-sdk/pull/9424)). Fixes #23494.
51+
* Inhibit clicking on sender avatar in threads list ([\#9417](https://github.com/matrix-org/matrix-react-sdk/pull/9417)). Fixes #23482.
52+
* Correct the dir parameter of MSC3715 ([\#9391](https://github.com/matrix-org/matrix-react-sdk/pull/9391)). Contributed by @dhenneke.
53+
* Use a more correct subset of users in `/remakeolm` developer command ([\#9402](https://github.com/matrix-org/matrix-react-sdk/pull/9402)).
54+
* use correct default for notification silencing ([\#9388](https://github.com/matrix-org/matrix-react-sdk/pull/9388)). Fixes #23456.
55+
* Device manager - eagerly create `m.local_notification_settings` events ([\#9353](https://github.com/matrix-org/matrix-react-sdk/pull/9353)).
56+
* Close incoming Element call toast when viewing the call lobby ([\#9375](https://github.com/matrix-org/matrix-react-sdk/pull/9375)).
57+
* Always allow enabling sending read receipts ([\#9367](https://github.com/matrix-org/matrix-react-sdk/pull/9367)). Fixes #23433.
58+
* Fixes (vector-im/element-web/issues/22609) where the white theme is not applied when `white -> dark -> white` sequence is done. ([\#9320](https://github.com/matrix-org/matrix-react-sdk/pull/9320)). Contributed by @florianduros.
59+
* Fix applying programmatically set height for "top" room layout ([\#9339](https://github.com/matrix-org/matrix-react-sdk/pull/9339)). Contributed by @Fox32.
60+
161
Changes in [1.11.10](https://github.com/vector-im/element-web/releases/tag/v1.11.10) (2022-10-11)
262
=================================================================================================
363

‎Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Builder
2-
FROM node:14-buster as builder
2+
FROM node:16-buster as builder
33

44
# Support custom branches of the react-sdk and js-sdk. This also helps us build
55
# images of element-web develop.

‎docs/config.md

+5-2
Original file line numberDiff line numberDiff line change
@@ -323,6 +323,10 @@ The VoIP and Jitsi options are:
323323
and may be removed at any time without notice. Defaults to `https://call.element.io`.
324324
- `use_exclusively`: A boolean specifying whether Element Call should be used exclusively as the only VoIP stack in
325325
the app, removing the ability to start legacy 1:1 calls or Jitsi calls. Defaults to `false`.
326+
- `participant_limit`: The maximum number of users who can join a call; if
327+
this number is exceeded, the user will not be able to join a given call.
328+
- `brand`: Optional name for the app. Defaults to `Element Call`. This is
329+
used throughout the application in various strings/locations.
326330

327331
## Bug reporting
328332

@@ -356,8 +360,7 @@ For example:
356360
## Integration managers
357361

358362
Integration managers are embedded applications within Element to help the user configure bots, bridges, and widgets. An integration manager
359-
is a separate piece of software not typically available with your homeserver. To disable integrations, leave the options defined here out of
360-
your config.
363+
is a separate piece of software not typically available with your homeserver. To disable integrations, set the options defined here to `null`.
361364

362365
1. `integrations_ui_url`: The UI URL for the integration manager.
363366
2. `integrations_rest_url`: The REST interface URL for the integration manager.

‎package.json

+10-11
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "element-web",
33
"productName": "Tchap",
4-
"version": "4.0.5_1.11.10",
4+
"version": "4.0.5_1.11.12",
55
"description": "A feature-rich client for Matrix.org",
66
"author": "DINUM",
77
"repository": {
@@ -49,8 +49,8 @@
4949
"start:res": "yarn build:jitsi && node scripts/copy-res.js -w",
5050
"start:js": "webpack-dev-server --host=0.0.0.0 --output-filename=bundles/_dev_/[name].js --output-chunk-filename=bundles/_dev_/[name].js -w --mode development --disable-host-check --hot",
5151
"lint": "yarn lint:types && yarn lint:js && yarn lint:style",
52-
"lint:js": "eslint --max-warnings 0 src module_system",
53-
"lint:js-fix": "eslint --fix src module_system",
52+
"lint:js": "eslint --max-warnings 0 src module_system test",
53+
"lint:js-fix": "eslint --fix src module_system test",
5454
"lint:types": "tsc --noEmit --jsx react && tsc --noEmit --project ./tsconfig.module_system.json",
5555
"lint:style": "stylelint \"res/css/**/*.pcss\"",
5656
"test": "jest",
@@ -66,12 +66,11 @@
6666
"dependencies": {
6767
"@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.12.tgz",
6868
"@matrix-org/react-sdk-module-api": "^0.0.3",
69-
"browser-request": "^0.3.3",
7069
"gfm.css": "^1.1.2",
7170
"jsrsasign": "^10.5.25",
7271
"katex": "^0.16.0",
73-
"matrix-js-sdk": "20.1.0",
74-
"matrix-react-sdk": "3.58.1",
72+
"matrix-js-sdk": "21.0.0",
73+
"matrix-react-sdk": "3.59.0",
7574
"matrix-widget-api": "^1.1.1",
7675
"prop-types": "^15.7.2",
7776
"react": "17.0.2",
@@ -111,6 +110,7 @@
111110
"@testing-library/react": "^12.1.5",
112111
"@types/flux": "^3.1.9",
113112
"@types/jest": "^29.0.0",
113+
"@types/jsrsasign": "^10.5.4",
114114
"@types/modernizr": "^3.5.3",
115115
"@types/node": "^14.18.28",
116116
"@types/react": "^17.0.49",
@@ -144,19 +144,19 @@
144144
"eslint-plugin-react-hooks": "^4.3.0",
145145
"extract-text-webpack-plugin": "^4.0.0-beta.0",
146146
"fake-indexeddb": "^3.1.2",
147+
"fetch-mock-jest": "^1.5.1",
147148
"file-loader": "^5.1.0",
148149
"fs-extra": "^9.0.13",
149150
"html-webpack-plugin": "^4.5.2",
150151
"jest": "^29.0.0",
151152
"jest-canvas-mock": "^2.3.0",
152153
"jest-environment-jsdom": "^29.0.0",
153-
"jest-mock": "^27.5.1",
154+
"jest-mock": "^29.0.0",
154155
"jest-raw-loader": "^1.0.1",
155156
"jest-sonar-reporter": "^2.0.0",
156157
"json-loader": "^0.5.7",
157158
"loader-utils": "^1.4.0",
158-
"matrix-mock-request": "^2.0.0",
159-
"matrix-react-test-utils": "^0.2.3",
159+
"matrix-mock-request": "^2.5.0",
160160
"matrix-web-i18n": "^1.3.0",
161161
"mini-css-extract-plugin": "^1",
162162
"minimist": "^1.2.6",
@@ -228,7 +228,6 @@
228228
"\\.(gif|png|ttf|woff2)$": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/imageMock.js",
229229
"\\.svg$": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/svg.js",
230230
"\\$webapp/i18n/languages.json": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/languages.json",
231-
"^browser-request$": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/browser-request.js",
232231
"^react$": "<rootDir>/node_modules/react",
233232
"^react-dom$": "<rootDir>/node_modules/react-dom",
234233
"^matrix-js-sdk$": "<rootDir>/node_modules/matrix-js-sdk/src",
@@ -261,6 +260,6 @@
261260
"sonar56x": true
262261
},
263262
"engines": {
264-
"node": ">=14.19 <15"
263+
"node": ">=16"
265264
}
266265
}

‎res/css/structures/ErrorView.pcss

+5-3
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,12 @@ limitations under the License.
3636
"Apple Color Emoji",
3737
"Segoe UI Emoji",
3838
"Segoe UI Symbol";
39-
width: 100%;
40-
min-height: 100%;
41-
height: auto;
4239
color: #000;
40+
width: 100%;
41+
height: 100%;
42+
overflow: auto;
43+
padding: 0 20px;
44+
box-sizing: border-box;
4345

4446
.mx_ErrorView_container {
4547
max-width: 680px;

‎scripts/fetch-develop.deps.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# the branch the current checkout is on, use that branch. Otherwise,
77
# use develop.
88

9-
set -ex
9+
set -x
1010

1111
GIT_CLONE_ARGS=("$@")
1212
[ -z "$defbranch" ] && defbranch="develop"

‎scripts/genflags.sh

+2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
# all phonenumber.js-supported country flags (as SVGs) into
2626
# PNGs that can be used by CountryDropdown.js.
2727

28+
set -e
29+
2830
# Allow CTRL+C to terminate the script
2931
trap "echo Exited!; exit;" SIGINT SIGTERM
3032

‎scripts/get-version-from-git.sh

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
# Echoes a version based on the git hashes of the element-web, react-sdk & js-sdk checkouts, for the case where
44
# these dependencies are git checkouts.
55

6+
set -e
7+
68
# Since the deps are fetched from git, we can rev-parse
79
REACT_SHA=$(git -C node_modules/matrix-react-sdk rev-parse --short=12 HEAD)
810
JSSDK_SHA=$(git -C node_modules/matrix-js-sdk rev-parse --short=12 HEAD)

‎scripts/layered.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
set -x
3+
set -ex
44

55
# Creates a layered environment with the full repo for the app and SDKs cloned
66
# and linked. This gives an element-web dev environment ready to build with

‎scripts/make-icons.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ then
1212
exit
1313
fi
1414

15-
set -e
16-
set -x
15+
set -ex
1716

1817
tmpdir=`mktemp -d 2>/dev/null || mktemp -d -t 'icontmp'`
1918

‎scripts/normalize-version.sh

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#!/bin/bash
22

3+
set -e
4+
35
# If $1 looks like v1.2.3 or v1.2.3-foo, strip the leading v, then print it to stdout
46
if [[ $1 =~ ^v[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+(-.+)?$ ]]; then
57
echo ${1:1}

‎src/i18n/strings/bg.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,7 @@
2828
"%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s използва модерни функции на браузъра, които не се поддържат от Вашия.",
2929
"Powered by Matrix": "Базирано на Matrix",
3030
"Use %(brand)s on mobile": "Използвайте %(brand)s на мобилен телефон",
31-
"Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Децентрализиран, криптиран чат &amp; сътрудничество, захранено от $matrixlogo"
31+
"Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Децентрализиран, криптиран чат &amp; сътрудничество, захранено от $matrixlogo",
32+
"%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s под %(osName)s",
33+
"%(brand)s Desktop: %(platformName)s": "%(brand)s Desktop: %(platformName)s"
3234
}

‎src/i18n/strings/cs.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,7 @@
2828
"Powered by Matrix": "Běží na Matrixu",
2929
"%(brand)s Desktop (%(platformName)s)": "%(brand)s pro desktopový počítač (%(platformName)s)",
3030
"Use %(brand)s on mobile": "Používání %(brand)s v mobilních zařízeních",
31-
"Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Decentralizovaný, šifrovaný chat a spolupráce na platformě $matrixLogo"
31+
"Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Decentralizovaný, šifrovaný chat a spolupráce na platformě $matrixLogo",
32+
"%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s na %(osName)s",
33+
"%(brand)s Desktop: %(platformName)s": "%(brand)s Desktop: %(platformName)s"
3234
}

‎src/i18n/strings/de_DE.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,7 @@
2828
"Your browser can't run %(brand)s": "Dein Browser kann %(brand)s nicht ausführen",
2929
"Powered by Matrix": "Betrieben mit Matrix",
3030
"Use %(brand)s on mobile": "Verwende %(brand)s am Handy",
31-
"Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Dezentralisierter, verschlüsselter Chat &amp; Zusammenarbeit unterstützt von $matrixLogo"
31+
"Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Dezentralisierter, verschlüsselter Chat &amp; Zusammenarbeit unterstützt von $matrixLogo",
32+
"%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s auf %(osName)s",
33+
"%(brand)s Desktop: %(platformName)s": "%(brand)s Desktop: %(platformName)s"
3234
}

0 commit comments

Comments
 (0)