diff --git a/CHANGELOG.md b/CHANGELOG.md
index b95cc03595..ee71ea7f68 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,95 @@
+Changes in [1.7.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v1.7.1) (2019-11-04)
+===================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v1.7.1-rc.2...v1.7.1)
+
+ * No changes since rc.2
+
+Changes in [1.7.1-rc.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v1.7.1-rc.2) (2019-11-01)
+=============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v1.7.1-rc.1...v1.7.1-rc.2)
+
+ * Fix bug where rooms would not appear when filtering
+   [\#3586](https://github.com/matrix-org/matrix-react-sdk/pull/3586)
+
+Changes in [1.7.1-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v1.7.1-rc.1) (2019-10-30)
+=============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v1.7.0...v1.7.1-rc.1)
+
+ * Add ability to hide tray icon on non-Mac
+   [\#3573](https://github.com/matrix-org/matrix-react-sdk/pull/3573)
+ * Update from Weblate
+   [\#3579](https://github.com/matrix-org/matrix-react-sdk/pull/3579)
+ * Fix call state logging
+   [\#3578](https://github.com/matrix-org/matrix-react-sdk/pull/3578)
+ * Match widgets up with their integration manager
+   [\#3576](https://github.com/matrix-org/matrix-react-sdk/pull/3576)
+ * Add diagnostic log to catch events without an ID
+   [\#3575](https://github.com/matrix-org/matrix-react-sdk/pull/3575)
+ * Fix missing i18n for RoomTile ARIA labels and add a case for notif-off bold
+   [\#3574](https://github.com/matrix-org/matrix-react-sdk/pull/3574)
+ * LifeCycle onLoggedOut unmount before stopping client
+   [\#3566](https://github.com/matrix-org/matrix-react-sdk/pull/3566)
+ * Remove unneeded help about identity servers
+   [\#3572](https://github.com/matrix-org/matrix-react-sdk/pull/3572)
+ * Remove messages implying you need an identity server for email recovery
+   [\#3571](https://github.com/matrix-org/matrix-react-sdk/pull/3571)
+ * Fix quick reactions to be aligned with other emoji
+   [\#3570](https://github.com/matrix-org/matrix-react-sdk/pull/3570)
+ * If ToS gets rejected/any Scalar error then don't make Jitsi widget
+   [\#3569](https://github.com/matrix-org/matrix-react-sdk/pull/3569)
+ * Update from Weblate
+   [\#3568](https://github.com/matrix-org/matrix-react-sdk/pull/3568)
+ * Fix Room Create ELS using MXID instead of newly set Displayname/Avatar
+   [\#3567](https://github.com/matrix-org/matrix-react-sdk/pull/3567)
+ * Improve opening emoji picker performance
+   [\#3565](https://github.com/matrix-org/matrix-react-sdk/pull/3565)
+ * Update ServerTypeSelector for new matrix.org CS API URL
+   [\#3564](https://github.com/matrix-org/matrix-react-sdk/pull/3564)
+ * Accessibility Improvements
+   [\#3563](https://github.com/matrix-org/matrix-react-sdk/pull/3563)
+ * A11Y fixes in the Left Panel
+   [\#3562](https://github.com/matrix-org/matrix-react-sdk/pull/3562)
+ * Fix lint and i18n test failures
+   [\#3560](https://github.com/matrix-org/matrix-react-sdk/pull/3560)
+ * Fix: editor tests
+   [\#3561](https://github.com/matrix-org/matrix-react-sdk/pull/3561)
+ * Use Navigation Treeview pattern for RoomList Accessibility
+   [\#3556](https://github.com/matrix-org/matrix-react-sdk/pull/3556)
+ * Abort scroll updates when already unmounted
+   [\#3557](https://github.com/matrix-org/matrix-react-sdk/pull/3557)
+ * UserInfo consolidation of GroupMemberInfo and MemberInfo panels
+   [\#3465](https://github.com/matrix-org/matrix-react-sdk/pull/3465)
+ * Fix some things in the edit HTML parser
+   [\#3552](https://github.com/matrix-org/matrix-react-sdk/pull/3552)
+ * Update from Weblate
+   [\#3559](https://github.com/matrix-org/matrix-react-sdk/pull/3559)
+ * Merge end-to-end tests
+   [\#3537](https://github.com/matrix-org/matrix-react-sdk/pull/3537)
+ * Add full emoji picker for reactions
+   [\#3554](https://github.com/matrix-org/matrix-react-sdk/pull/3554)
+ * Accessibility fixes to autocomplete and tabpanels
+   [\#3555](https://github.com/matrix-org/matrix-react-sdk/pull/3555)
+ * Show warning dialog when changing unreachable IS
+   [\#3549](https://github.com/matrix-org/matrix-react-sdk/pull/3549)
+ * Fix reply fallback being included in edit m.new_content
+   [\#3551](https://github.com/matrix-org/matrix-react-sdk/pull/3551)
+ * Document composer features
+   [\#3548](https://github.com/matrix-org/matrix-react-sdk/pull/3548)
+ * Correctly update the banned users list when a user is unbanned
+   [\#3547](https://github.com/matrix-org/matrix-react-sdk/pull/3547)
+ * Summarise state events after room creation
+   [\#3433](https://github.com/matrix-org/matrix-react-sdk/pull/3433)
+ * Don't intercept TAB on the app outside of the composer, fix tabIndex > 0
+   [\#3543](https://github.com/matrix-org/matrix-react-sdk/pull/3543)
+ * Add some type checking on event body
+   [\#3546](https://github.com/matrix-org/matrix-react-sdk/pull/3546)
+ * Fix: crash while canceling editing an event when no selection
+   [\#3544](https://github.com/matrix-org/matrix-react-sdk/pull/3544)
+ * SettingsFlag always run ToggleSwitch fully-controlled
+   [\#3541](https://github.com/matrix-org/matrix-react-sdk/pull/3541)
+ * Use Keyboard Key consts instead of hardcoded strings
+   [\#3540](https://github.com/matrix-org/matrix-react-sdk/pull/3540)
+
 Changes in [1.7.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v1.7.0) (2019-10-18)
 ===================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v1.7.0-rc.1...v1.7.0)
diff --git a/package.json b/package.json
index e709662020..5cc23a9fe3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {
@@ -87,7 +87,7 @@
     "linkifyjs": "^2.1.6",
     "lodash": "^4.17.14",
     "lolex": "4.2",
-    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
+    "matrix-js-sdk": "2.4.3",
     "optimist": "^0.6.1",
     "pako": "^1.0.5",
     "png-chunks-extract": "^1.0.0",
diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 29771f6f2b..2287c5b295 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -2189,5 +2189,20 @@
     "Hide advanced": "Скрий разширени настройки",
     "Show advanced": "Покажи разширени настройки",
     "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "Блокирай присъединяването на потребители от други Matrix сървъри в тази стая (Тази настройка не може да се промени по-късно!)",
-    "Close dialog": "Затвори прозореца"
+    "Close dialog": "Затвори прозореца",
+    "Add Email Address": "Добави имейл адрес",
+    "Add Phone Number": "Добави телефонен номер",
+    "This action requires accessing the default identity server <server /> to validate an email address or phone number, but the server does not have any terms of service.": "Това действие изисква връзка със сървъра за самоличност <server /> за валидиране на имейл адреса или телефонния номер, но сървърът не предоставя условия за ползване.",
+    "Trust": "Довери се",
+    "Use the new, consistent UserInfo panel for Room Members and Group Members": "Използвай новия UserInfo панел за членове на стаи и групи",
+    "Use the new, faster, composer for writing messages": "Използвай новия, по-бърз редактор за писане на съобщения",
+    "Show previews/thumbnails for images": "Показвай преглед (умален размер) на снимки",
+    "You should <b>remove your personal data</b> from identity server <idserver /> before disconnecting. Unfortunately, identity server <idserver /> is currently offline or cannot be reached.": "Би било добре да <b>премахнете личните си данни</b> от сървъра за самоличност <idserver /> преди прекъсване на връзката. За съжаление, сървърът за самоличност <idserver /> в момента не е достъпен.",
+    "You should:": "Ще е добре да:",
+    "check your browser plugins for anything that might block the identity server (such as Privacy Badger)": "проверите браузър добавките за всичко, което може да блокира връзката със сървъра за самоличност (например Privacy Badger)",
+    "contact the administrators of identity server <idserver />": "се свържете с администратора на сървъра за самоличност <idserver />",
+    "wait and try again later": "изчакате и опитате пак",
+    "Clear cache and reload": "Изчисти кеша и презареди",
+    "Show tray icon and minimize window to it on close": "Показвай икона в лентата и минимизирай прозореца там при затваряне",
+    "Your email address hasn't been verified yet": "Имейл адресът ви все още не е потвърден"
 }
diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index ef2dd9fe8b..72b6fff50d 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -2188,5 +2188,39 @@
     "Emoji Autocomplete": "Emoji osatze automatikoa",
     "Notification Autocomplete": "Jakinarazpen osatze automatikoa",
     "Room Autocomplete": "Gela osatze automatikoa",
-    "User Autocomplete": "Erabiltzaile osatze automatikoa"
+    "User Autocomplete": "Erabiltzaile osatze automatikoa",
+    "Use the new, consistent UserInfo panel for Room Members and Group Members": "Erabili erabiltzaile-informazio panel berria gelako eta taldeko kideentzat",
+    "You should <b>remove your personal data</b> from identity server <idserver /> before disconnecting. Unfortunately, identity server <idserver /> is currently offline or cannot be reached.": "Zure <b>datu pribatuak kendu</b> beharko zenituzke <idserver /> identitate-zerbitzaritik deskonektatu aurretik. Zoritxarrez <idserver /> identitate-zerbitzaria lineaz kanpo dago eta ezin da atzitu.",
+    "You should:": "Hau egin beharko zenuke:",
+    "check your browser plugins for anything that might block the identity server (such as Privacy Badger)": "egiaztatu zure nabigatzailearen gehigarriren batek ez duela identitate-zerbitzaria blokeatzen (esaterako Privacy Badger)",
+    "contact the administrators of identity server <idserver />": "<idserver /> identitate-zerbitzariko administratzaileekin kontaktuak jarri",
+    "wait and try again later": "itxaron eta berriro saiatu",
+    "Show tray icon and minimize window to it on close": "Erakutsi egoera-barrako ikonoa eta minimizatu leihoa itxi ordez",
+    "Room %(name)s": "%(name)s gela",
+    "Recent rooms": "Azken gelak",
+    "%(count)s unread messages including mentions.|one": "Irakurri gabeko aipamen 1.",
+    "%(count)s unread messages.|one": "Irakurri gabeko mezu 1.",
+    "Unread messages.": "Irakurri gabeko mezuak.",
+    "Trust & Devices": "Fidagarritasuna eta gailuak",
+    "Direct messages": "Mezu zuzenak",
+    "Failed to deactivate user": "Huts egin du erabiltzailea desaktibatzeak",
+    "This client does not support end-to-end encryption.": "Bezero honek ez du muturretik muturrerako zifratzea onartzen.",
+    "Messages in this room are not end-to-end encrypted.": "Gela honetako mezuak ez daude muturretik muturrera zifratuta.",
+    "React": "Erreakzioa",
+    "Frequently Used": "Maiz erabilia",
+    "Smileys & People": "Irribartxoak eta jendea",
+    "Animals & Nature": "Animaliak eta natura",
+    "Food & Drink": "Jana eta edana",
+    "Activities": "Jarduerak",
+    "Travel & Places": "Bidaiak eta tokiak",
+    "Objects": "Objektuak",
+    "Symbols": "Ikurrak",
+    "Flags": "Banderak",
+    "Quick Reactions": "Erreakzio azkarrak",
+    "Cancel search": "Ezeztatu bilaketa",
+    "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "Ez da identitate-zerbitzaririk konfiguratu, beraz ezin duzu e-mail helbide bat gehitu etorkizunean pasahitza berrezartzeko.",
+    "Jump to first unread room.": "Jauzi irakurri gabeko lehen gelara.",
+    "Jump to first invite.": "Jauzi lehen gonbidapenera.",
+    "Command Autocomplete": "Aginduak auto-osatzea",
+    "DuckDuckGo Results": "DuckDuckGo emaitzak"
 }
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index af6634992f..7807facb1c 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2273,5 +2273,11 @@
     "Jump to first invite.": "Sauter à la première invitation.",
     "Room %(name)s": "Salon %(name)s",
     "Recent rooms": "Salons récents",
-    "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "Aucun serveur d’identité n’est configuré donc vous ne pouvez pas ajouter une adresse e-mail afin de réinitialiser votre mot de passe dans l’avenir."
+    "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "Aucun serveur d’identité n’est configuré donc vous ne pouvez pas ajouter une adresse e-mail afin de réinitialiser votre mot de passe dans l’avenir.",
+    "%(count)s unread messages including mentions.|one": "1 mention non lue.",
+    "%(count)s unread messages.|one": "1 message non lu.",
+    "Unread messages.": "Messages non lus.",
+    "Show tray icon and minimize window to it on close": "Afficher l’icône dans la barre d’état et minimiser la fenêtre lors de la fermeture",
+    "This action requires accessing the default identity server <server /> to validate an email address or phone number, but the server does not have any terms of service.": "Cette action nécessite l’accès au serveur d’identité par défaut <server /> afin de valider une adresse e-mail ou un numéro de téléphone, mais le serveur n’a aucune condition de service.",
+    "Trust": "Confiance"
 }
diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index dc8c42b109..4946c7b14f 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2263,5 +2263,8 @@
     "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "Azonosítási szerver nincs beállítva, így nem tudsz hozzáadni e-mail címet amivel vissza lehetne állítani a jelszót a későbbiekben.",
     "%(count)s unread messages including mentions.|one": "1 olvasatlan megemlítés.",
     "%(count)s unread messages.|one": "1 olvasatlan üzenet.",
-    "Unread messages.": "Olvasatlan üzenetek."
+    "Unread messages.": "Olvasatlan üzenetek.",
+    "Show tray icon and minimize window to it on close": "Tálcaikon mutatása és az ablak összecsukása bezáráskor",
+    "This action requires accessing the default identity server <server /> to validate an email address or phone number, but the server does not have any terms of service.": "Ez a művelet az e-mail cím vagy telefonszám ellenőrzése miatt hozzáférést igényel az alapértelmezett azonosítási szerverhez (<server />), de a szervernek nincsen semmilyen felhasználási feltétele.",
+    "Trust": "Megbízom benne"
 }
diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index f1f66b44d2..6262315012 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -2223,5 +2223,6 @@
     "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "Nessun server di identità configurato, perciò non puoi aggiungere un indirizzo email per ripristinare la tua password in futuro.",
     "%(count)s unread messages including mentions.|one": "1 citazione non letta.",
     "%(count)s unread messages.|one": "1 messaggio non letto.",
-    "Unread messages.": "Messaggi non letti."
+    "Unread messages.": "Messaggi non letti.",
+    "Show tray icon and minimize window to it on close": "Mostra icona in tray e usala alla chiusura della finestra"
 }
diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json
index 47e53e2ffe..23199094e8 100644
--- a/src/i18n/strings/ja.json
+++ b/src/i18n/strings/ja.json
@@ -1303,5 +1303,45 @@
     "Upgrade": "アップグレード",
     "Sets the room name": "部屋名を設定する",
     "Change room name": "部屋名を変える",
-    "Room Name": "部屋名"
+    "Room Name": "部屋名",
+    "Add Email Address": "メールアドレスの追加",
+    "Add Phone Number": "電話番号の追加",
+    "Call failed due to misconfigured server": "サーバの誤設定により呼び出し失敗",
+    "Try using turn.matrix.org": "turn.matrix.orgで試してみる",
+    "A conference call could not be started because the integrations server is not available": "統合サーバーが利用できないので電話会議を開始できませんでした",
+    "Replying With Files": "ファイルを添付して返信",
+    "The file '%(fileName)s' failed to upload.": "ファイル '%(fileName)s' のアップロードに失敗しました。",
+    "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "ファイル '%(fileName)s' はこのホームサーバのアップロードのサイズ上限を超えています",
+    "The server does not support the room version specified.": "このサーバは指定された部屋バージョンに対応していません。",
+    "Name or Matrix ID": "名前またはMatrix ID",
+    "Identity server has no terms of service": "IDサーバーは利用規約を持っていません",
+    "Email, name or Matrix ID": "メールアドレス、名前、またはMatrix ID",
+    "Failed to start chat": "対話開始に失敗しました",
+    "Messages": "メッセージ",
+    "Actions": "アクション",
+    "Other": "その他",
+    "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "¯\\_(ツ)_/¯ を平文メッセージの前に挿入する",
+    "Sends a message as plain text, without interpreting it as markdown": "メッセージをマークダウンと解釈せずプレーンテキストとして送信する",
+    "Upgrades a room to a new version": "部屋を新しいバージョンへアップグレードする",
+    "You do not have the required permissions to use this command.": "このコマンドを実行するのに必要な権限がありません。",
+    "Room upgrade confirmation": "部屋のアップグレードの確認",
+    "Changes your display nickname in the current room only": "表示されるニックネームをこの部屋に関してのみ変更する",
+    "Changes the avatar of the current room": "現在の部屋のアバターを変更する",
+    "Changes your avatar in this current room only": "アバターをこの部屋に関してのみ変更する",
+    "Changes your avatar in all rooms": "全ての部屋に対するアバターを変更する",
+    "Gets or sets the room topic": "部屋のトピック情報を取得または設定する",
+    "This room has no topic.": "この部屋はトピックを持ちません。",
+    "Use an identity server": "IDサーバーを使用する",
+    "Unbans user with given ID": "与えられたIDを持つユーザーの追放を解除する",
+    "Adds a custom widget by URL to the room": "部屋にURLで指定したカスタムウィジェットを追加する",
+    "Please supply a https:// or http:// widget URL": "https:// または http:// で始まるウィジェット URLを指定してください",
+    "You cannot modify widgets in this room.": "あなたはこの部屋のウィジェットを変更できません。",
+    "Sends the given message coloured as a rainbow": "与えられたメッセージを虹色にして送信する",
+    "Sends the given emote coloured as a rainbow": "与えられたエモートを虹色で送信する",
+    "Displays list of commands with usages and descriptions": "使い方と説明付きのコマンド一覧を表示する",
+    "%(senderName)s made no change.": "%(senderName)s は変更されませんでした。",
+    "%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s はこの部屋をアップグレードしました。",
+    "%(senderDisplayName)s made the room public to whoever knows the link.": "%(senderDisplayName)s はこの部屋をリンクを知っている人全てに公開しました。",
+    "%(senderDisplayName)s made the room invite only.": "%(senderDisplayName)s はこの部屋を招待者のみに変更しました。",
+    "%(senderDisplayName)s has allowed guests to join the room.": "%(senderDisplayName)s はゲストがこの部屋に参加できるようにしました。"
 }
diff --git a/src/i18n/strings/ko.json b/src/i18n/strings/ko.json
index 4e94a06dc3..1aebd0ce17 100644
--- a/src/i18n/strings/ko.json
+++ b/src/i18n/strings/ko.json
@@ -2120,5 +2120,8 @@
     "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "설정된 ID 서버가 없어서 이후 비밀번호를 초기화하기 위한 이메일 주소를 추가할 수 없습니다.",
     "%(count)s unread messages including mentions.|one": "1개의 읽지 않은 언급.",
     "%(count)s unread messages.|one": "1개의 읽지 않은 메시지.",
-    "Unread messages.": "읽지 않은 메시지."
+    "Unread messages.": "읽지 않은 메시지.",
+    "Show tray icon and minimize window to it on close": "닫을 때 창을 최소화하고 트레이 아이콘으로 표시하기",
+    "This action requires accessing the default identity server <server /> to validate an email address or phone number, but the server does not have any terms of service.": "이 작업에는 이메일 주소 또는 전화번호를 확인하기 위해 기본 ID 서버 <server />에 접근해야 합니다. 하지만 서버가 서비스 약관을 갖고 있지 않습니다.",
+    "Trust": "신뢰함"
 }
diff --git a/src/i18n/strings/lt.json b/src/i18n/strings/lt.json
index d7f5e2bf74..6a8076ac96 100644
--- a/src/i18n/strings/lt.json
+++ b/src/i18n/strings/lt.json
@@ -181,7 +181,7 @@
     "%(count)s Members|one": "%(count)s narys",
     "Developer Tools": "Programuotojo įrankiai",
     "Unhide Preview": "Rodyti paržiūrą",
-    "Custom Server Options": "Tinkinto serverio parametrai",
+    "Custom Server Options": "Pasirinktiniai Serverio Nustatymai",
     "Event Content": "Įvykio turinys",
     "Thank you!": "Ačiū!",
     "Collapse panel": "Suskleisti skydelį",
@@ -997,5 +997,8 @@
     "Whether or not you're logged in (we don't record your username)": "Nepriklausomai nuo to ar jūs prisijungę (mes neįrašome jūsų vartotojo vardo)",
     "Chat with Riot Bot": "Kalbėtis su Riot botu",
     "Sign In": "Prisijungti",
-    "Explore rooms": "Peržiūrėti kambarius"
+    "Explore rooms": "Peržiūrėti kambarius",
+    "Your Riot is misconfigured": "Jūsų Riot yra neteisingai sukonfigūruotas",
+    "Sign in to your Matrix account on %(serverName)s": "Prisijunkite prie savo paskyros %(serverName)s serveryje",
+    "Sign in to your Matrix account on <underlinedServerName />": "Prisijunkite prie savo paskyros <underlinedServerName /> serveryje"
 }
diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index f322affd1b..6d611be464 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -946,7 +946,7 @@
     "Verified key": "Verifierad nyckel",
     "Unrecognised command:": "Oigenkänt kommando:",
     "Unbans user with given id": "Avbannar användare med givet id",
-    "Verifies a user, device, and pubkey tuple": "Verifierar en användare, enhet och nycklar",
+    "Verifies a user, device, and pubkey tuple": "Verifierar en användare, enhet och offentlig nyckel-tupel",
     "VoIP conference started.": "VoIP-konferens startad.",
     "VoIP conference finished.": "VoIP-konferens avslutad.",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s gjorde framtida rumshistorik synligt för okänd (%(visibility)s).",
@@ -1812,5 +1812,10 @@
     "Connect this device to Key Backup": "Anslut den här enheten till nyckelsäkerhetskopiering",
     "Backing up %(sessionsRemaining)s keys...": "Säkerhetskopierar %(sessionsRemaining)s nycklar...",
     "All keys backed up": "Alla nycklar säkerhetskopierade",
-    "Backup has a signature from <verify>unknown</verify> device with ID %(deviceId)s.": "Säkerhetskopian har en signatur från <verify>okänd</verify> enhet med ID %(deviceId)s."
+    "Backup has a signature from <verify>unknown</verify> device with ID %(deviceId)s.": "Säkerhetskopian har en signatur från <verify>okänd</verify> enhet med ID %(deviceId)s.",
+    "Add Email Address": "Lägg till e-postadress",
+    "Add Phone Number": "Lägg till telefonnummer",
+    "Identity server has no terms of service": "Identitetsserver har inga användarvillkor",
+    "This action requires accessing the default identity server <server /> to validate an email address or phone number, but the server does not have any terms of service.": "Den här åtgärden kräver åtkomst till standardidentitetsservern <server /> för att validera en e-postadress eller telefonnummer, men servern har inga användarvillkor.",
+    "Trust": "Förtroende"
 }
diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index bb383c7f5a..94183ef83f 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2269,5 +2269,8 @@
     "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "未設定身份識別伺服器，所以您無法新增電子郵件以在未來重設您的密碼。",
     "%(count)s unread messages including mentions.|one": "1 則未讀的提及。",
     "%(count)s unread messages.|one": "1 則未讀的訊息。",
-    "Unread messages.": "未讀的訊息。"
+    "Unread messages.": "未讀的訊息。",
+    "Show tray icon and minimize window to it on close": "顯示系統匣圖示並在關閉視窗時將其最小化至其中",
+    "This action requires accessing the default identity server <server /> to validate an email address or phone number, but the server does not have any terms of service.": "此動作需要存取預設的身份識別伺服器 <server /> 以驗證電子郵件或電話號碼，但伺服器沒有任何服務條款。",
+    "Trust": "信任"
 }
diff --git a/yarn.lock b/yarn.lock
index aa0a06e588..fa7868d270 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5192,9 +5192,10 @@ mathml-tag-names@^2.0.1:
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.1.tgz#6dff66c99d55ecf739ca53c492e626f1d12a33cc"
   integrity sha512-pWB896KPGSGkp1XtyzRBftpTzwSOL0Gfk0wLvxt4f2mgzjY19o0LxJ3U25vNWTzsh7da+KTbuXQoQ3lOJZ8WHw==
 
-"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
-  version "2.4.2"
-  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/46d7e4c7075386f1330d6a49941e9979fc26be0a"
+matrix-js-sdk@2.4.3:
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.4.3.tgz#23b78cc707a02eb0ce7eecb3aa50129e46dd5b6e"
+  integrity sha512-8qTqILd/NmTWF24tpaxmDIzkTk/bZhPD5N8h69PlvJ5Y6kMFctpRj+Tud5zZjl5/yhO07+g+JCyDzg+AagiM/A==
   dependencies:
     another-json "^0.2.0"
     babel-runtime "^6.26.0"