Merge tag 'v1.7.34' into build

* Sanitize untrusted variables from message previews before translation Fixes element-hq#18314 * Fix editing of `<sub>` & `<sup`> & `<u>` [\element-hq#6469](matrix-org/matrix-react-sdk#6469) Fixes element-hq#18211 * Zoom images in lightbox to where the cursor points [\element-hq#6418](matrix-org/matrix-react-sdk#6418) Fixes element-hq#17870 * Avoid hitting the settings store from TextForEvent [\element-hq#6205](matrix-org/matrix-react-sdk#6205) Fixes element-hq#17650 * Initial MSC3083 + MSC3244 support [\element-hq#6212](matrix-org/matrix-react-sdk#6212) Fixes element-hq#17686 and element-hq#17661 * Navigate to the first room with notifications when clicked on space notification dot [\element-hq#5974](matrix-org/matrix-react-sdk#5974) * Add matrix: to the list of permitted URL schemes [\element-hq#6388](matrix-org/matrix-react-sdk#6388) * Add "Copy Link" to room context menu [\element-hq#6374](matrix-org/matrix-react-sdk#6374) * 💭 Message bubble layout [\element-hq#6291](matrix-org/matrix-react-sdk#6291) Fixes element-hq#4635, element-hq#17773 element-hq#16220 and element-hq#7687 * Play only one audio file at a time [\#6417](matrix-org/matrix-react-sdk#6417) Fixes element-hq#17439 * Move download button for media to the action bar [\element-hq#6386](matrix-org/matrix-react-sdk#6386) Fixes element-hq#17943 * Improved display of one-to-one call history with summary boxes for each call [\element-hq#6121](matrix-org/matrix-react-sdk#6121) Fixes element-hq#16409 * Notification settings UI refresh [\element-hq#6352](matrix-org/matrix-react-sdk#6352) Fixes element-hq#17782 * Fix EventIndex double handling events and erroring [\element-hq#6385](matrix-org/matrix-react-sdk#6385) Fixes element-hq#18008 * Improve reply rendering [\element-hq#3553](matrix-org/matrix-react-sdk#3553) Fixes element-hq#9217, element-hq#7633, element-hq#7530, element-hq#7169, element-hq#7151, element-hq#6692 element-hq#6579 and element-hq#17440 * Improve performance of room name calculation [\element-hq#1801](matrix-org/matrix-js-sdk#1801) * Fix browser history getting stuck looping back to the same room [\element-hq#18053](element-hq#18053) * Fix space shortcuts on layouts with non-English keys in the places of numbers [\element-hq#17780](element-hq#17780) Fixes element-hq#17776 * Fix CreateRoomDialog exploding when making public room outside of a space [\element-hq#6493](matrix-org/matrix-react-sdk#6493) * Fix regression where registration would soft-crash on captcha [\element-hq#6505](matrix-org/matrix-react-sdk#6505) Fixes element-hq#18284 * only send join rule event if we have a join rule to put in it [\element-hq#6517](matrix-org/matrix-react-sdk#6517) * Improve the new download button's discoverability and interactions. [\element-hq#6510](matrix-org/matrix-react-sdk#6510) * Fix voice recording UI looking broken while microphone permissions are being requested. [\element-hq#6479](matrix-org/matrix-react-sdk#6479) Fixes element-hq#18223 * Match colors of room and user avatars in DMs [\element-hq#6393](matrix-org/matrix-react-sdk#6393) Fixes element-hq#2449 * Fix onPaste handler to work with copying files from Finder [\element-hq#5389](matrix-org/matrix-react-sdk#5389) Fixes element-hq#15536 and element-hq#16255 * Fix infinite pagination loop when offline [\element-hq#6478](matrix-org/matrix-react-sdk#6478) Fixes element-hq#18242 * Fix blurhash rounded corners missing regression [\element-hq#6467](matrix-org/matrix-react-sdk#6467) Fixes element-hq#18110 * Fix position of the space hierarchy spinner [\element-hq#6462](matrix-org/matrix-react-sdk#6462) Fixes element-hq#18182 * Fix display of image messages that lack thumbnails [\element-hq#6456](matrix-org/matrix-react-sdk#6456) Fixes element-hq#18175 * Fix crash with large audio files. [\element-hq#6436](matrix-org/matrix-react-sdk#6436) Fixes element-hq#18149 * Make diff colors in codeblocks more pleasant [\element-hq#6355](matrix-org/matrix-react-sdk#6355) Fixes element-hq#17939 * Show the correct audio file duration while loading the file. [\element-hq#6435](matrix-org/matrix-react-sdk#6435) Fixes element-hq#18160 * Fix various timeline settings not applying immediately. [\element-hq#6261](matrix-org/matrix-react-sdk#6261) Fixes element-hq#17748 * Fix issues with room list duplication [\element-hq#6391](matrix-org/matrix-react-sdk#6391) Fixes element-hq#14508 * Fix grecaptcha throwing useless error sometimes [\element-hq#6401](matrix-org/matrix-react-sdk#6401) Fixes element-hq#15142 * Update Emojibase and Twemoji and switch to IamCal (Slack-style) shortcodes [\element-hq#6347](matrix-org/matrix-react-sdk#6347) Fixes element-hq#13857 and element-hq#13334 * Respect compound emojis in default avatar initial generation [\element-hq#6397](matrix-org/matrix-react-sdk#6397) Fixes element-hq#18040 * Fix bug where the 'other homeserver' field in the server selection dialog would become briefly focus and then unfocus when clicked. [\element-hq#6394](matrix-org/matrix-react-sdk#6394) Fixes element-hq#18031 * Standardise spelling and casing of homeserver, identity server, and integration manager [\element-hq#6365](matrix-org/matrix-react-sdk#6365) * Fix widgets not receiving decrypted events when they have permission. [\element-hq#6371](matrix-org/matrix-react-sdk#6371) Fixes element-hq#17615 * Prevent client hangs when calculating blurhashes [\element-hq#6366](matrix-org/matrix-react-sdk#6366) Fixes element-hq#17945 * Exclude state events from widgets reading room events [\element-hq#6378](matrix-org/matrix-react-sdk#6378) * Cache feature_spaces\* flags to improve performance [\element-hq#6381](matrix-org/matrix-react-sdk#6381)
boba-best · Aug 3, 2021 · 6c1c44e · 6c1c44e
2 parents 3cb9f14 + 245d138
commit 6c1c44e
Show file tree

Hide file tree

Showing 26 changed files with 2,252 additions and 1,927 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,3 +1,11 @@
-<!-- Please read https://github.com/matrix-org/matrix-js-sdk/blob/develop/CONTRIBUTING.rst before submitting your pull request -->
+<!-- Please read https://github.com/matrix-org/matrix-js-sdk/blob/develop/CONTRIBUTING.md before submitting your pull request -->
 
-<!-- Include a Sign-Off as described in https://github.com/matrix-org/matrix-js-sdk/blob/develop/CONTRIBUTING.rst#sign-off -->
+<!-- Include a Sign-Off as described in https://github.com/matrix-org/matrix-js-sdk/blob/develop/CONTRIBUTING.md#sign-off -->
+
+<!-- To specify text for the changelog entry (otherwise the PR title will be used):
+Notes:
+
+Changelog entries will also appear in element-desktop. For PRs that *only* affect the desktop version:
+Notes: none
+element-desktop notes: <notes>
+-->
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,129 @@
+Changes in [1.7.34](https://github.com/vector-im/element-desktop/releases/tag/v1.7.34) (2021-07-02)
+===================================================================================================
+
+## 🔒 SECURITY FIXES
+ * Sanitize untrusted variables from message previews before translation
+   Fixes vector-im/element-web#18314
+
+## ✨ Features
+ * Fix editing of `<sub>` & `<sup`> & `<u>`
+   [\#6469](https://github.com/matrix-org/matrix-react-sdk/pull/6469)
+   Fixes #18211
+ * Zoom images in lightbox to where the cursor points
+   [\#6418](https://github.com/matrix-org/matrix-react-sdk/pull/6418)
+   Fixes #17870
+ * Avoid hitting the settings store from TextForEvent
+   [\#6205](https://github.com/matrix-org/matrix-react-sdk/pull/6205)
+   Fixes #17650
+ * Initial MSC3083 + MSC3244 support
+   [\#6212](https://github.com/matrix-org/matrix-react-sdk/pull/6212)
+   Fixes #17686 and #17661
+ * Navigate to the first room with notifications when clicked on space notification dot
+   [\#5974](https://github.com/matrix-org/matrix-react-sdk/pull/5974)
+ * Add matrix: to the list of permitted URL schemes
+   [\#6388](https://github.com/matrix-org/matrix-react-sdk/pull/6388)
+ * Add "Copy Link" to room context menu
+   [\#6374](https://github.com/matrix-org/matrix-react-sdk/pull/6374)
+ * 💭 Message bubble layout
+   [\#6291](https://github.com/matrix-org/matrix-react-sdk/pull/6291)
+   Fixes #4635, #17773 #16220 and #7687
+ * Play only one audio file at a time
+   [\#6417](https://github.com/matrix-org/matrix-react-sdk/pull/6417)
+   Fixes #17439
+ * Move download button for media to the action bar
+   [\#6386](https://github.com/matrix-org/matrix-react-sdk/pull/6386)
+   Fixes #17943
+ * Improved display of one-to-one call history with summary boxes for each call
+   [\#6121](https://github.com/matrix-org/matrix-react-sdk/pull/6121)
+   Fixes #16409
+ * Notification settings UI refresh
+   [\#6352](https://github.com/matrix-org/matrix-react-sdk/pull/6352)
+   Fixes #17782
+ * Fix EventIndex double handling events and erroring
+   [\#6385](https://github.com/matrix-org/matrix-react-sdk/pull/6385)
+   Fixes #18008
+ * Improve reply rendering
+   [\#3553](https://github.com/matrix-org/matrix-react-sdk/pull/3553)
+   Fixes vector-im/riot-web#9217, vector-im/riot-web#7633, vector-im/riot-web#7530, vector-im/riot-web#7169, vector-im/riot-web#7151, vector-im/riot-web#6692 vector-im/riot-web#6579 and #17440
+ * Improve performance of room name calculation
+   [\#1801](https://github.com/matrix-org/matrix-js-sdk/pull/1801)
+
+## 🐛 Bug Fixes
+ * Fix browser history getting stuck looping back to the same room
+   [\#18053](https://github.com/vector-im/element-web/pull/18053)
+ * Fix space shortcuts on layouts with non-English keys in the places of numbers
+   [\#17780](https://github.com/vector-im/element-web/pull/17780)
+   Fixes #17776
+ * Fix CreateRoomDialog exploding when making public room outside of a space
+   [\#6493](https://github.com/matrix-org/matrix-react-sdk/pull/6493)
+ * Fix regression where registration would soft-crash on captcha
+   [\#6505](https://github.com/matrix-org/matrix-react-sdk/pull/6505)
+   Fixes #18284
+ * only send join rule event if we have a join rule to put in it
+   [\#6517](https://github.com/matrix-org/matrix-react-sdk/pull/6517)
+ * Improve the new download button's discoverability and interactions.
+   [\#6510](https://github.com/matrix-org/matrix-react-sdk/pull/6510)
+ * Fix voice recording UI looking broken while microphone permissions are being requested.
+   [\#6479](https://github.com/matrix-org/matrix-react-sdk/pull/6479)
+   Fixes #18223
+ * Match colors of room and user avatars in DMs
+   [\#6393](https://github.com/matrix-org/matrix-react-sdk/pull/6393)
+   Fixes #2449
+ * Fix onPaste handler to work with copying files from Finder
+   [\#5389](https://github.com/matrix-org/matrix-react-sdk/pull/5389)
+   Fixes #15536 and #16255
+ * Fix infinite pagination loop when offline
+   [\#6478](https://github.com/matrix-org/matrix-react-sdk/pull/6478)
+   Fixes #18242
+ * Fix blurhash rounded corners missing regression
+   [\#6467](https://github.com/matrix-org/matrix-react-sdk/pull/6467)
+   Fixes #18110
+ * Fix position of the space hierarchy spinner
+   [\#6462](https://github.com/matrix-org/matrix-react-sdk/pull/6462)
+   Fixes #18182
+ * Fix display of image messages that lack thumbnails
+   [\#6456](https://github.com/matrix-org/matrix-react-sdk/pull/6456)
+   Fixes #18175
+ * Fix crash with large audio files.
+   [\#6436](https://github.com/matrix-org/matrix-react-sdk/pull/6436)
+   Fixes #18149
+ * Make diff colors in codeblocks more pleasant
+   [\#6355](https://github.com/matrix-org/matrix-react-sdk/pull/6355)
+   Fixes #17939
+ * Show the correct audio file duration while loading the file.
+   [\#6435](https://github.com/matrix-org/matrix-react-sdk/pull/6435)
+   Fixes #18160
+ * Fix various timeline settings not applying immediately.
+   [\#6261](https://github.com/matrix-org/matrix-react-sdk/pull/6261)
+   Fixes #17748
+ * Fix issues with room list duplication
+   [\#6391](https://github.com/matrix-org/matrix-react-sdk/pull/6391)
+   Fixes #14508
+ * Fix grecaptcha throwing useless error sometimes
+   [\#6401](https://github.com/matrix-org/matrix-react-sdk/pull/6401)
+   Fixes #15142
+ * Update Emojibase and Twemoji and switch to IamCal (Slack-style) shortcodes
+   [\#6347](https://github.com/matrix-org/matrix-react-sdk/pull/6347)
+   Fixes #13857 and #13334
+ * Respect compound emojis in default avatar initial generation
+   [\#6397](https://github.com/matrix-org/matrix-react-sdk/pull/6397)
+   Fixes #18040
+ * Fix bug where the 'other homeserver' field in the server selection dialog would become briefly focus and then unfocus when clicked.
+   [\#6394](https://github.com/matrix-org/matrix-react-sdk/pull/6394)
+   Fixes #18031
+ * Standardise spelling and casing of homeserver, identity server, and integration manager 
+   [\#6365](https://github.com/matrix-org/matrix-react-sdk/pull/6365)
+ * Fix widgets not receiving decrypted events when they have permission.
+   [\#6371](https://github.com/matrix-org/matrix-react-sdk/pull/6371)
+   Fixes #17615
+ * Prevent client hangs when calculating blurhashes
+   [\#6366](https://github.com/matrix-org/matrix-react-sdk/pull/6366)
+   Fixes #17945
+ * Exclude state events from widgets reading room events
+   [\#6378](https://github.com/matrix-org/matrix-react-sdk/pull/6378)
+ * Cache feature_spaces\* flags to improve performance
+   [\#6381](https://github.com/matrix-org/matrix-react-sdk/pull/6381)
+
 Changes in [1.7.33](https://github.com/vector-im/element-web/releases/tag/v1.7.33) (2021-07-19)
 ===============================================================================================
 [Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.33-rc.1...v1.7.33)

diff --git a/CONTRIBUTING.rst → CONTRIBUTING.md b/CONTRIBUTING.rst → CONTRIBUTING.md
diff --git a/docs/translating.md b/docs/translating.md
@@ -8,8 +8,9 @@
 
 ## Step 0: Join #element-translations:matrix.org
 
-1. Come and join https://matrix.to/#/#element-translations:matrix.org
-2. Read scrollback and/or ask if anyone else is working on your language, and co-ordinate if needed.  In general little-or-no coordination is needed though :)
+1. Come and join https://matrix.to/#/#element-translations:matrix.org for general discussion 
+2. Join https://matrix.to/#/#element-translators:matrix.org for language-specific rooms
+3. Read scrollback and/or ask if anyone else is working on your language, and co-ordinate if needed.  In general little-or-no coordination is needed though :)
 
 ## Step 1: Preparing your Weblate Profile
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "element-web",
-  "version": "1.7.33",
+  "version": "1.7.34",
   "description": "A feature-rich client for Matrix.org",
   "author": "New Vector Ltd.",
   "repository": {
@@ -48,7 +48,8 @@
     "start:res": "yarn build:jitsi && node scripts/copy-res.js -w",
     "start:js": "webpack-dev-server --host=0.0.0.0 --output-filename=bundles/_dev_/[name].js --output-chunk-filename=bundles/_dev_/[name].js -w --progress --mode development --disable-host-check",
     "lint": "yarn lint:types && yarn lint:js && yarn lint:style",
-    "lint:js": "eslint src",
+    "lint:js": "eslint --max-warnings 0 src",
+    "lint:js-fix": "eslint --fix src",
     "lint:types": "tsc --noEmit --jsx react",
     "lint:style": "stylelint 'res/css/**/*.scss'",
     "test": "jest"
@@ -60,8 +61,8 @@
     "highlight.js": "^10.5.0",
     "jsrsasign": "^10.2.0",
     "katex": "^0.12.0",
-    "matrix-js-sdk": "12.1.0",
-    "matrix-react-sdk": "3.26.0",
+    "matrix-js-sdk": "12.2.0",
+    "matrix-react-sdk": "3.27.0",
     "matrix-widget-api": "^0.1.0-beta.15",
     "prop-types": "^15.7.2",
     "react": "^17.0.2",
@@ -141,16 +142,19 @@
     "shell-escape": "^0.2.0",
     "simple-proxy-agent": "^1.1.0",
     "stylelint": "^13.9.0",
+    "stylelint-config-standard": "^20.0.0",
+    "stylelint-scss": "^3.18.0",
     "terser-webpack-plugin": "^2.3.8",
     "typescript": "^4.1.3",
     "webpack": "^4.46.0",
     "webpack-cli": "^3.3.12",
-    "webpack-dev-server": "^3.11.2"
+    "webpack-dev-server": "^3.11.2",
+    "worker-loader": "^2.0.0"
   },
   "jest": {
     "testEnvironment": "jest-environment-jsdom-sixteen",
     "testMatch": [
-      "<rootDir>/test/**/*-test.js"
+      "<rootDir>/test/**/*-test.[tj]s"
     ],
     "setupFilesAfterEnv": [
       "<rootDir>/node_modules/matrix-react-sdk/test/setupTests.js"
@@ -168,7 +172,8 @@
       "decoderWorker\\.min\\.wasm": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/empty.js",
       "waveWorker\\.min\\.js": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/empty.js",
       "context-filter-polyfill": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/empty.js",
-      "FontManager.ts": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/FontManager.js"
+      "FontManager.ts": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/FontManager.js",
+      "workers/(.+)\\.worker\\.ts": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/workerMock.js"
     },
     "transformIgnorePatterns": [
       "/node_modules/(?!matrix-js-sdk).+$",

diff --git a/src/async-components/structures/CompatibilityView.tsx b/src/async-components/structures/CompatibilityView.tsx
@@ -71,7 +71,7 @@ const CompatibilityView: React.FC<IProps> = ({ onAccept }) => {
         android = [];
     }
 
-    let mobileHeader = <h2 id="step2_heading">{_t("Use %(brand)s on mobile", { brand })}</h2>;
+    let mobileHeader = <h2 id="step2_heading">{ _t("Use %(brand)s on mobile", { brand }) }</h2>;
     if (!android.length && !ios) {
         mobileHeader = null;
     }
@@ -102,11 +102,11 @@ const CompatibilityView: React.FC<IProps> = ({ onAccept }) => {
                                 'or <safariLink>Safari</safariLink> for the best experience.',
                                 {},
                                 {
-                                    'chromeLink': (sub) => <a href="https://www.google.com/chrome">{sub}</a>,
-                                    'firefoxLink': (sub) => <a href="https://firefox.com">{sub}</a>,
-                                    'safariLink': (sub) => <a href="https://apple.com/safari">{sub}</a>,
+                                    'chromeLink': (sub) => <a href="https://www.google.com/chrome">{ sub }</a>,
+                                    'firefoxLink': (sub) => <a href="https://firefox.com">{ sub }</a>,
+                                    'safariLink': (sub) => <a href="https://apple.com/safari">{ sub }</a>,
                                 },
-                            )}
+                            ) }
                         </p>
                         <p>
                             { _t(
@@ -124,9 +124,9 @@ const CompatibilityView: React.FC<IProps> = ({ onAccept }) => {
             <div className="mx_HomePage_col">
                 <div className="mx_HomePage_row">
                     <div>
-                        {mobileHeader}
-                        {ios}
-                        {android}
+                        { mobileHeader }
+                        { ios }
+                        { android }
                     </div>
                 </div>
             </div>

diff --git a/src/async-components/structures/ErrorView.tsx b/src/async-components/structures/ErrorView.tsx
@@ -40,9 +40,9 @@ const ErrorView: React.FC<IProps> = ({ title, messages }) => {
                 <div className="mx_HomePage_row">
                     <div>
                         <h2 id="step1_heading">{ title }</h2>
-                        {messages && messages.map(msg => <p key={msg}>
+                        { messages && messages.map(msg => <p key={msg}>
                             { msg }
-                        </p>)}
+                        </p>) }
                     </div>
                 </div>
             </div>

diff --git a/src/components/views/auth/VectorAuthFooter.tsx b/src/components/views/auth/VectorAuthFooter.tsx
@@ -35,14 +35,14 @@ const VectorAuthFooter = () => {
     for (const linkEntry of links) {
         authFooterLinks.push(
             <a href={linkEntry.url} key={linkEntry.text} target="_blank" rel="noreferrer noopener">
-                {linkEntry.text}
+                { linkEntry.text }
             </a>,
         );
     }
 
     return (
         <div className="mx_AuthFooter">
-            {authFooterLinks}
+            { authFooterLinks }
             <a href="https://matrix.org" target="_blank" rel="noreferrer noopener">{ _t('Powered by Matrix') }</a>
         </div>
     );

diff --git a/src/i18n/strings/ca.json b/src/i18n/strings/ca.json
@@ -32,5 +32,7 @@
     "I understand the risks and wish to continue": "Entenc els riscos i vull continuar",
     "Go to element.io": "Vés a element.io",
     "Failed to start": "Ha fallat l'inici",
-    "Missing indexeddb worker script!": "Falta l'script del treballador indexeddb!"
+    "Missing indexeddb worker script!": "Falta l'script del treballador indexeddb!",
+    "Use %(brand)s on mobile": "Utilitza %(brand)s al mòbil",
+    "Switch to space by number": "Canvia d'espai per número"
 }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
@@ -1,5 +1,4 @@
 {
-    "Missing indexeddb worker script!": "Missing indexeddb worker script!",
     "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.",
     "Invalid configuration: no default server specified.": "Invalid configuration: no default server specified.",
     "Your Element is misconfigured": "Your Element is misconfigured",

diff --git a/src/i18n/strings/fa.json b/src/i18n/strings/fa.json
@@ -33,5 +33,6 @@
     "Go to element.io": "برو به element.io",
     "Failed to start": "مشکل در آغاز",
     "Powered by Matrix": "قدرت‌گرفته از ماتریکس",
-    "Use %(brand)s on mobile": "استفاده از %(brand)s روی گوشی"
+    "Use %(brand)s on mobile": "استفاده از %(brand)s روی گوشی",
+    "Switch to space by number": "تغییر به فضا با شماره"
 }
diff --git a/src/i18n/strings/he.json b/src/i18n/strings/he.json
@@ -4,20 +4,20 @@
     "Unknown device": "מכשיר לא ידוע",
     "You need to be using HTTPS to place a screen-sharing call.": "עליך להשתמש ב HTTPS בכדי לבצע שיחת ווידאו משותפת.",
     "Welcome to Element": "ברוכים הבאים ל Element",
-    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "צא'ט וכלי שיתוף פעולה מבוזר ומוצפן &amp;  מופעל ע\"י [matrix]",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "צא'ט וכלי שיתוף פעולה מבוזר ומוצפן &amp; מופעל באמצעות [matrix]",
     "Invalid JSON": "JSON לא חוקי",
     "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "תצורה שגויה: ניתן לציין רק אחד מהערכים הבאים, default_server_config, default_server_name, או default_hs_url.",
     "Invalid configuration: no default server specified.": "תצורה שגויה: לא צוין שרת ברירת מחדל.",
     "Open user settings": "פתח הגדרות משתמש",
     "Go to your browser to complete Sign In": "עבור לדפדפן להמשך ההתחברות",
-    "Explore rooms": "שיטוט בחדרים",
+    "Explore rooms": "גלה חדרים",
     "Create Account": "יצירת חשבון",
     "Sign In": "כניסה",
     "Previous/next recently visited room or community": "הבא\\קודם חדרים וקהילות שביקרתם לאחרונה",
     "Open": "פתח",
     "Download Completed": "ההורדה הושלמה",
-    "Unexpected error preparing the app. See console for details.": "שגיאה לא צפויה במהלך הכנת האפליקציה. ראו קונסול לפרטים נוספים.",
-    "Unable to load config file: please refresh the page to try again.": "לא יכול לטעון את קובץ ההגדרות: יש לרענן את הדף כדי לנסות שנית.",
+    "Unexpected error preparing the app. See console for details.": "שגיאה לא צפויה במהלך טעינת האפליקציה. ראו קונסול לפרטים נוספים.",
+    "Unable to load config file: please refresh the page to try again.": "לא ניתן לטעון את קובץ ההגדרות: יש לרענן את הדף כדי לנסות שנית.",
     "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "האלמנט מכיל הגדרת JSON שגויה, אנא תקנו את הבעיה ואתחלו את הדף.",
     "Your Element is misconfigured": "האלמנט מוגדר באופן שגוי",
     "Go to element.io": "חזור לאתר הראשי: element.io",