diff --git a/.eslintignore.errorfiles b/.eslintignore.errorfiles index c6f25c2480..430546d281 100644 --- a/.eslintignore.errorfiles +++ b/.eslintignore.errorfiles @@ -2,7 +2,6 @@ src/autocomplete/AutocompleteProvider.js src/autocomplete/Autocompleter.js -src/autocomplete/EmojiProvider.js src/autocomplete/UserProvider.js src/component-index.js src/components/structures/BottomLeftMenu.js @@ -17,7 +16,6 @@ src/components/structures/MessagePanel.js src/components/structures/NotificationPanel.js src/components/structures/RoomDirectory.js src/components/structures/RoomStatusBar.js -src/components/structures/RoomSubList.js src/components/structures/RoomView.js src/components/structures/ScrollPanel.js src/components/structures/SearchBox.js @@ -29,7 +27,6 @@ src/components/views/avatars/BaseAvatar.js src/components/views/avatars/MemberAvatar.js src/components/views/create_room/RoomAlias.js src/components/views/dialogs/ChangelogDialog.js -src/components/views/dialogs/ChatCreateOrReuseDialog.js src/components/views/dialogs/DeactivateAccountDialog.js src/components/views/dialogs/SetPasswordDialog.js src/components/views/dialogs/UnknownDeviceDialog.js @@ -37,7 +34,6 @@ src/components/views/directory/NetworkDropdown.js src/components/views/elements/AddressSelector.js src/components/views/elements/DeviceVerifyButtons.js src/components/views/elements/DirectorySearchBox.js -src/components/views/elements/EditableText.js src/components/views/elements/ImageView.js src/components/views/elements/InlineSpinner.js src/components/views/elements/MemberEventListSummary.js @@ -81,7 +77,6 @@ src/components/views/rooms/TopUnreadMessagesBar.js src/components/views/rooms/UserTile.js src/components/views/settings/AddPhoneNumber.js src/components/views/settings/ChangeAvatar.js -src/components/views/settings/ChangeDisplayName.js src/components/views/settings/ChangePassword.js src/components/views/settings/DevicesPanel.js src/components/views/settings/IntegrationsManager.js diff --git a/.eslintrc.js b/.eslintrc.js index bf423a1ad8..62d24ea707 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -95,6 +95,7 @@ module.exports = { "new-cap": ["warn"], "key-spacing": ["warn"], "prefer-const": ["warn"], + "arrow-parens": "off", // crashes currently: https://github.com/eslint/eslint/issues/6274 "generator-star-spacing": "off", diff --git a/.gitignore b/.gitignore index f828c37393..6acf1b565a 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,6 @@ npm-debug.log /src/component-index.js .DS_Store + +# https://github.com/vector-im/riot-web/issues/7083 +package-lock.json diff --git a/.travis-test-riot.sh b/.travis-test-riot.sh index eeba4d0b7e..7f2660a906 100755 --- a/.travis-test-riot.sh +++ b/.travis-test-riot.sh @@ -10,7 +10,7 @@ RIOT_WEB_DIR=riot-web REACT_SDK_DIR=`pwd` scripts/fetchdep.sh vector-im riot-web -cd "$RIOT_WEB_DIR" +pushd "$RIOT_WEB_DIR" mkdir node_modules npm install @@ -23,4 +23,16 @@ ln -s "$REACT_SDK_DIR/node_modules/matrix-js-sdk" node_modules/matrix-js-sdk rm -r node_modules/matrix-react-sdk ln -s "$REACT_SDK_DIR" node_modules/matrix-react-sdk +npm run build npm run test +popd + +# run end to end tests +git clone https://github.com/matrix-org/matrix-react-end-to-end-tests.git --branch master +pushd matrix-react-end-to-end-tests +ln -s $REACT_SDK_DIR/$RIOT_WEB_DIR riot/riot-web +# PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true ./install.sh +# CHROME_PATH=$(which google-chrome-stable) ./run.sh +./install.sh +./run.sh --travis +popd diff --git a/.travis.yml b/.travis.yml index ec07243a28..0def6d50f7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,5 +15,7 @@ addons: chrome: stable install: - npm install +# install synapse prerequisites for end to end tests + - sudo apt-get install build-essential python2.7-dev libffi-dev python-pip python-setuptools sqlite3 libssl-dev python-virtualenv libjpeg-dev libxslt1-dev script: ./scripts/travis.sh diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b97251604..d007be0f4b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,542 @@ +Changes in [0.13.5](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.13.5) (2018-10-01) +===================================================================================================== +[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.13.5-rc.1...v0.13.5) + + * No changes since rc.1 + +Changes in [0.13.5-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.13.5-rc.1) (2018-09-27) +=============================================================================================================== +[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.13.4...v0.13.5-rc.1) + + * resync when LL is toggled, show message when enabled + [\#2178](https://github.com/matrix-org/matrix-react-sdk/pull/2178) + * Update from Weblate. + [\#2179](https://github.com/matrix-org/matrix-react-sdk/pull/2179) + * Split npm start into an init and watch script + [\#2175](https://github.com/matrix-org/matrix-react-sdk/pull/2175) + * show canonical aliases in timeline, and set/remove implicit ones + [\#2171](https://github.com/matrix-org/matrix-react-sdk/pull/2171) + * Fix stale RR and improve LL reliability in RoomView & MemberList. + [\#2168](https://github.com/matrix-org/matrix-react-sdk/pull/2168) + * pass --travis flag to e2e tests to disable tests known not to work Travis CI + [\#2170](https://github.com/matrix-org/matrix-react-sdk/pull/2170) + * Add m.room.aliases to the timeline + [\#2167](https://github.com/matrix-org/matrix-react-sdk/pull/2167) + * postpone loading the members until the user joined the room + [\#2165](https://github.com/matrix-org/matrix-react-sdk/pull/2165) + * Allow translation tags object to be a variable + [\#2166](https://github.com/matrix-org/matrix-react-sdk/pull/2166) + * Don't try to exit fullscreen if not fullscreen + [\#2164](https://github.com/matrix-org/matrix-react-sdk/pull/2164) + * avoid updating the memberlist while the spinner is shown + [\#2161](https://github.com/matrix-org/matrix-react-sdk/pull/2161) + * fix logging room id when LL members fail + [\#2163](https://github.com/matrix-org/matrix-react-sdk/pull/2163) + * dont keep the spinner in the memberlist when fetching /members fails + [\#2162](https://github.com/matrix-org/matrix-react-sdk/pull/2162) + * only dispatch an action for self-membership + [\#2160](https://github.com/matrix-org/matrix-react-sdk/pull/2160) + * avoid unneeded lookups in memberDict + [\#2153](https://github.com/matrix-org/matrix-react-sdk/pull/2153) + * Update from Weblate. + [\#2157](https://github.com/matrix-org/matrix-react-sdk/pull/2157) + * avoid memberlist refresh for events related to rooms other but the current + [\#2156](https://github.com/matrix-org/matrix-react-sdk/pull/2156) + +Changes in [0.13.4](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.13.4) (2018-09-10) +===================================================================================================== +[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.13.4-rc.1...v0.13.4) + + * No changes since rc.1 + +Changes in [0.13.4-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.13.4-rc.1) (2018-09-07) +=============================================================================================================== +[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.13.3...v0.13.4-rc.1) + + * Error on splash screen if sync is failing + [\#2155](https://github.com/matrix-org/matrix-react-sdk/pull/2155) + * Do full registration if HS doesn't support ILAG + [\#2150](https://github.com/matrix-org/matrix-react-sdk/pull/2150) + * Re-apply "Don't rely on room members to query power levels" + [\#2152](https://github.com/matrix-org/matrix-react-sdk/pull/2152) + * s/DidMount/WillMount/ in MessageComposerInput + [\#2151](https://github.com/matrix-org/matrix-react-sdk/pull/2151) + * Revert "Don't rely on room members to query power levels" + [\#2149](https://github.com/matrix-org/matrix-react-sdk/pull/2149) + * Don't rely on room members to query power levels + [\#2145](https://github.com/matrix-org/matrix-react-sdk/pull/2145) + * Correctly mark email as optional + [\#2148](https://github.com/matrix-org/matrix-react-sdk/pull/2148) + * guests trying to join communities should fire the ILAG flow. + [\#2059](https://github.com/matrix-org/matrix-react-sdk/pull/2059) + * Fix DM avatars, part 3 + [\#2146](https://github.com/matrix-org/matrix-react-sdk/pull/2146) + * Fix: show spinner again while recovering from connection error + [\#2143](https://github.com/matrix-org/matrix-react-sdk/pull/2143) + * Fix: infinite spinner on trying to create welcomeUserId room without consent + [\#2147](https://github.com/matrix-org/matrix-react-sdk/pull/2147) + * Show spinner in member list while loading members + [\#2139](https://github.com/matrix-org/matrix-react-sdk/pull/2139) + * Slash command to discard megolm session + [\#2140](https://github.com/matrix-org/matrix-react-sdk/pull/2140) + +Changes in [0.13.3](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.13.3) (2018-09-03) +===================================================================================================== +[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.13.3-rc.2...v0.13.3) + + * No changes since rc.2 + +Changes in [0.13.3-rc.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.13.3-rc.2) (2018-08-31) +=============================================================================================================== +[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.13.3-rc.1...v0.13.3-rc.2) + + * Update js-sdk to fix exception + +Changes in [0.13.3-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.13.3-rc.1) (2018-08-30) +=============================================================================================================== +[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.13.2...v0.13.3-rc.1) + + * Fix DM avatar + [\#2141](https://github.com/matrix-org/matrix-react-sdk/pull/2141) + * Update from Weblate. + [\#2142](https://github.com/matrix-org/matrix-react-sdk/pull/2142) + * Support m.room.tombstone events + [\#2124](https://github.com/matrix-org/matrix-react-sdk/pull/2124) + * Support room creation events + [\#2123](https://github.com/matrix-org/matrix-react-sdk/pull/2123) + * Support for room upgrades + [\#2122](https://github.com/matrix-org/matrix-react-sdk/pull/2122) + * Fix: dont show 1:1 avatar for rooms +2 members but only <=2 members loaded + [\#2137](https://github.com/matrix-org/matrix-react-sdk/pull/2137) + * Render terms & conditions in settings + [\#2136](https://github.com/matrix-org/matrix-react-sdk/pull/2136) + * Don't crash if the value of a room tag is null + [\#2133](https://github.com/matrix-org/matrix-react-sdk/pull/2133) + * Add stub for getVisibleRooms() + [\#2134](https://github.com/matrix-org/matrix-react-sdk/pull/2134) + * Fix LL crash trying to render own avatar in composer when member isn't + available yet + [\#2132](https://github.com/matrix-org/matrix-react-sdk/pull/2132) + * Support M_INCOMPATIBLE_ROOM_VERSION + [\#2125](https://github.com/matrix-org/matrix-react-sdk/pull/2125) + * Hide replaced rooms + [\#2127](https://github.com/matrix-org/matrix-react-sdk/pull/2127) + * Fix CPU spin on joining large room + [\#2128](https://github.com/matrix-org/matrix-react-sdk/pull/2128) + * Change format of server usage limit message + [\#2131](https://github.com/matrix-org/matrix-react-sdk/pull/2131) + * Re-apply "Fix showing peek preview while LL members are loading"" + [\#2130](https://github.com/matrix-org/matrix-react-sdk/pull/2130) + * Revert "Fix showing peek preview while LL members are loading" + [\#2129](https://github.com/matrix-org/matrix-react-sdk/pull/2129) + * Fix showing peek preview while LL members are loading + [\#2126](https://github.com/matrix-org/matrix-react-sdk/pull/2126) + * Destroy non-persistent widgets when switching room + [\#2098](https://github.com/matrix-org/matrix-react-sdk/pull/2098) + * Lazy loading of room members + [\#2118](https://github.com/matrix-org/matrix-react-sdk/pull/2118) + * Lazy loading: feature toggle + [\#2115](https://github.com/matrix-org/matrix-react-sdk/pull/2115) + * Lazy loading: cleanup + [\#2116](https://github.com/matrix-org/matrix-react-sdk/pull/2116) + * Lazy loading: fix end-to-end encryption rooms + [\#2113](https://github.com/matrix-org/matrix-react-sdk/pull/2113) + * Lazy loading: Lazy load members while backpaginating + [\#2104](https://github.com/matrix-org/matrix-react-sdk/pull/2104) + * Lazy loading: don't assume we have our own member available + [\#2102](https://github.com/matrix-org/matrix-react-sdk/pull/2102) + * Lazy load room members - Part I + [\#2072](https://github.com/matrix-org/matrix-react-sdk/pull/2072) + +Changes in [0.13.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.13.2) (2018-08-23) +===================================================================================================== +[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.13.1...v0.13.2) + + * Don't crash if the value of a room tag is null + [\#2135](https://github.com/matrix-org/matrix-react-sdk/pull/2135) + +Changes in [0.13.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.13.1) (2018-08-20) +===================================================================================================== +[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.13.1-rc.1...v0.13.1) + + * No changes since rc.1 + +Changes in [0.13.1-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.13.1-rc.1) (2018-08-16) +=============================================================================================================== +[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.13.0...v0.13.1-rc.1) + + * Update from Weblate. + [\#2121](https://github.com/matrix-org/matrix-react-sdk/pull/2121) + * Shift to M_RESOURCE_LIMIT_EXCEEDED errors + [\#2120](https://github.com/matrix-org/matrix-react-sdk/pull/2120) + * Fix RoomSettings test + [\#2119](https://github.com/matrix-org/matrix-react-sdk/pull/2119) + * Show room version number in room settings + [\#2117](https://github.com/matrix-org/matrix-react-sdk/pull/2117) + * Warning bar for MAU limit hit + [\#2114](https://github.com/matrix-org/matrix-react-sdk/pull/2114) + * Recognise server notices room(s) + [\#2112](https://github.com/matrix-org/matrix-react-sdk/pull/2112) + * Update room tags behaviour to match spec more + [\#2111](https://github.com/matrix-org/matrix-react-sdk/pull/2111) + * while logging out ignore `Session.logged_out` as it is intentional + [\#2058](https://github.com/matrix-org/matrix-react-sdk/pull/2058) + * Don't show 'connection lost' bar on MAU error + [\#2110](https://github.com/matrix-org/matrix-react-sdk/pull/2110) + * Support MAU error on sync + [\#2108](https://github.com/matrix-org/matrix-react-sdk/pull/2108) + * Support active user limit on message send + [\#2106](https://github.com/matrix-org/matrix-react-sdk/pull/2106) + * Run end to end tests as part of Travis build + [\#2091](https://github.com/matrix-org/matrix-react-sdk/pull/2091) + * Remove package-lock.json for now + [\#2097](https://github.com/matrix-org/matrix-react-sdk/pull/2097) + * Support montly active user limit error on /login + [\#2103](https://github.com/matrix-org/matrix-react-sdk/pull/2103) + * Unpin sanitize-html + [\#2105](https://github.com/matrix-org/matrix-react-sdk/pull/2105) + * Pin sanitize-html to 0.18.2 + [\#2101](https://github.com/matrix-org/matrix-react-sdk/pull/2101) + * Make clicking on side panels close settings (mk 3) + [\#2096](https://github.com/matrix-org/matrix-react-sdk/pull/2096) + * Fix persistent element location not updating + [\#2092](https://github.com/matrix-org/matrix-react-sdk/pull/2092) + * fix Devtools input autofocus && state traversal when len === 1 && key="" + [\#2090](https://github.com/matrix-org/matrix-react-sdk/pull/2090) + * allow autocompleting Emoji by common aliases, e.g :+1: to :thumbsup: + [\#2085](https://github.com/matrix-org/matrix-react-sdk/pull/2085) + +Changes in [0.13.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.13.0) (2018-07-30) +===================================================================================================== +[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.13.0-rc.2...v0.13.0) + + * Fix composer bug where cursor position would change when Riot regained focus + [\#2093](https://github.com/matrix-org/matrix-react-sdk/pull/2093) + * Fix persistend element location not updating + [\#2094](https://github.com/matrix-org/matrix-react-sdk/pull/2094) + * Slate Fixes 42? + [\#2089](https://github.com/matrix-org/matrix-react-sdk/pull/2089) + +Changes in [0.13.0-rc.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.13.0-rc.2) (2018-07-24) +=============================================================================================================== +[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.13.0-rc.1...v0.13.0-rc.2) + + * Take jitsi conf calling out of labs + [\#2087](https://github.com/matrix-org/matrix-react-sdk/pull/2087) + +Changes in [0.13.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.13.0-rc.1) (2018-07-24) +=============================================================================================================== +[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.9...v0.13.0-rc.1) + + * Update from Weblate. + [\#2086](https://github.com/matrix-org/matrix-react-sdk/pull/2086) + * Moar Slate Fixes + [\#2082](https://github.com/matrix-org/matrix-react-sdk/pull/2082) + * Destroy the widget when its permission is revoked + [\#2081](https://github.com/matrix-org/matrix-react-sdk/pull/2081) + * Make ActiveWidgetStore clear persistent widgets + [\#2084](https://github.com/matrix-org/matrix-react-sdk/pull/2084) + * CreateRoomDialog is rendered before getting the config default_federate + [\#2078](https://github.com/matrix-org/matrix-react-sdk/pull/2078) + * Slate Fixes + [\#2076](https://github.com/matrix-org/matrix-react-sdk/pull/2076) + * FIX: Don't error on rooms the user has left already + [\#2077](https://github.com/matrix-org/matrix-react-sdk/pull/2077) + * Fix persistent apps being the wrong size + [\#2080](https://github.com/matrix-org/matrix-react-sdk/pull/2080) + * Fix widgets resetting when going to the top-left + [\#2079](https://github.com/matrix-org/matrix-react-sdk/pull/2079) + * Jitsi: Use integrations URL from config + [\#2062](https://github.com/matrix-org/matrix-react-sdk/pull/2062) + * Allow jitsi in e2e rooms + [\#2075](https://github.com/matrix-org/matrix-react-sdk/pull/2075) + * Fix border around persisted widgets + [\#2071](https://github.com/matrix-org/matrix-react-sdk/pull/2071) + * Fix e2e icons floating above jitsi + [\#2073](https://github.com/matrix-org/matrix-react-sdk/pull/2073) + * hide some commands after space as they have special semantics + [\#2074](https://github.com/matrix-org/matrix-react-sdk/pull/2074) + * Even More Slate Fixes :D + [\#2070](https://github.com/matrix-org/matrix-react-sdk/pull/2070) + * Improve UX for Jitsi by adding local echo for widgets + [\#2035](https://github.com/matrix-org/matrix-react-sdk/pull/2035) + * Jitsi: Check integrations server before call + [\#2063](https://github.com/matrix-org/matrix-react-sdk/pull/2063) + * Jitsi: Error message on no permission + [\#2061](https://github.com/matrix-org/matrix-react-sdk/pull/2061) + * Fix read receipts on top of Jitsi + [\#2065](https://github.com/matrix-org/matrix-react-sdk/pull/2065) + * Moar Slate Fixes + [\#2069](https://github.com/matrix-org/matrix-react-sdk/pull/2069) + * fix 2nd typo in one PR :( + [\#2068](https://github.com/matrix-org/matrix-react-sdk/pull/2068) + * check if has some completions, not if >=0 + [\#2067](https://github.com/matrix-org/matrix-react-sdk/pull/2067) + * Slate fixes + [\#2066](https://github.com/matrix-org/matrix-react-sdk/pull/2066) + * Implement always-on-screen capability for widgets + [\#2056](https://github.com/matrix-org/matrix-react-sdk/pull/2056) + * simplify MessageComposerStore and improve its performance + [\#2064](https://github.com/matrix-org/matrix-react-sdk/pull/2064) + * Replace Draft with Slate + [\#1890](https://github.com/matrix-org/matrix-react-sdk/pull/1890) + * Fix not stopping to peek when navigating away from peeked room + [\#2055](https://github.com/matrix-org/matrix-react-sdk/pull/2055) + * T3chguy/slate cont2 + [\#2049](https://github.com/matrix-org/matrix-react-sdk/pull/2049) + * add null-guard for stickerpickerWidget in StickerPicker + [\#2057](https://github.com/matrix-org/matrix-react-sdk/pull/2057) + * Implement always-on-screen capability for widgets + [\#2053](https://github.com/matrix-org/matrix-react-sdk/pull/2053) + * fix nullguard on EventTile, getComponent never returns falsey, it throws + [\#2024](https://github.com/matrix-org/matrix-react-sdk/pull/2024) + * Fix stickerpicker PersistedElement usage + [\#2051](https://github.com/matrix-org/matrix-react-sdk/pull/2051) + * encrypt for invited users if history visibility allows. + [\#2042](https://github.com/matrix-org/matrix-react-sdk/pull/2042) + * move nag bar clear statement to any desktop notif toggle not just 0->1 + [\#2031](https://github.com/matrix-org/matrix-react-sdk/pull/2031) + * use TruncatedList to prevent rendering hundreds/thousands of DOM nodes + [\#2041](https://github.com/matrix-org/matrix-react-sdk/pull/2041) + * Fix stuff + [\#2047](https://github.com/matrix-org/matrix-react-sdk/pull/2047) + * Show m.room.server_acl + [\#2046](https://github.com/matrix-org/matrix-react-sdk/pull/2046) + +Changes in [0.12.9](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.9) (2018-07-09) +===================================================================================================== +[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.9-rc.2...v0.12.9) + + * No changes since rc.1 + +Changes in [0.12.9-rc.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.9-rc.2) (2018-07-06) +=============================================================================================================== +[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.9-rc.1...v0.12.9-rc.2) + + * Implement aggregation by error type for tracked decryption failures + [\#2045](https://github.com/matrix-org/matrix-react-sdk/pull/2045) + * make new hiding of roomsublist behaviour opt-in + [\#2044](https://github.com/matrix-org/matrix-react-sdk/pull/2044) + * Implement aggregation by error type for tracked decryption failures + [\#2043](https://github.com/matrix-org/matrix-react-sdk/pull/2043) + * make new hiding of roomsublist behaviour opt-in + [\#2030](https://github.com/matrix-org/matrix-react-sdk/pull/2030) + +Changes in [0.12.9-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.9-rc.1) (2018-07-04) +=============================================================================================================== +[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.8...v0.12.9-rc.1) + + * Update from Weblate. + [\#2040](https://github.com/matrix-org/matrix-react-sdk/pull/2040) + * Import react as React in src/components/views/messages/MStickerBody.js + [\#2039](https://github.com/matrix-org/matrix-react-sdk/pull/2039) + * Import react as React in src/GroupAddressPicker.js + [\#2038](https://github.com/matrix-org/matrix-react-sdk/pull/2038) + * Give PersistedElement a key + [\#2036](https://github.com/matrix-org/matrix-react-sdk/pull/2036) + * Revert " make click to insert nick work on join/parts, /me's etc" + [\#2034](https://github.com/matrix-org/matrix-react-sdk/pull/2034) + * Track an event name when tracking a decryption failure + [\#2033](https://github.com/matrix-org/matrix-react-sdk/pull/2033) + * warn on self-mute + [\#1974](https://github.com/matrix-org/matrix-react-sdk/pull/1974) + * make click to insert nick work on join/parts, /me's etc + [\#1945](https://github.com/matrix-org/matrix-react-sdk/pull/1945) + * Fix layout bug introduced by #2025 + [\#2029](https://github.com/matrix-org/matrix-react-sdk/pull/2029) + * Fix room topics/names resetting when UserSetting re-renders + [\#2028](https://github.com/matrix-org/matrix-react-sdk/pull/2028) + * Improve tracking of UISIs + [\#2027](https://github.com/matrix-org/matrix-react-sdk/pull/2027) + * Replace share icons + [\#2026](https://github.com/matrix-org/matrix-react-sdk/pull/2026) + * Improve status bar errors (namely the consent error) + [\#2025](https://github.com/matrix-org/matrix-react-sdk/pull/2025) + * Fix incorrectly positioned copy button on `
` blocks
+   [\#2023](https://github.com/matrix-org/matrix-react-sdk/pull/2023)
+ * Redact pathnames with origin `file://`
+   [\#2018](https://github.com/matrix-org/matrix-react-sdk/pull/2018)
+ * Update package-lock.json
+   [\#2022](https://github.com/matrix-org/matrix-react-sdk/pull/2022)
+ * on room sub list badge click goto first relevant room
+   [\#2021](https://github.com/matrix-org/matrix-react-sdk/pull/2021)
+ * improve linkifier AGAIN
+   [\#2020](https://github.com/matrix-org/matrix-react-sdk/pull/2020)
+ * fix historical section
+   [\#2016](https://github.com/matrix-org/matrix-react-sdk/pull/2016)
+ * Fix RoomSubList headers by re-commiting 1faecfd
+   [\#2014](https://github.com/matrix-org/matrix-react-sdk/pull/2014)
+ * don't fire share dialog when clicking timestamp of event,
+   [\#2017](https://github.com/matrix-org/matrix-react-sdk/pull/2017)
+ * Revert "affix copyButton so that it doesn't get scrolled horizontally"
+   [\#2013](https://github.com/matrix-org/matrix-react-sdk/pull/2013)
+ * when the user switches room, close room settings
+   [\#2019](https://github.com/matrix-org/matrix-react-sdk/pull/2019)
+ * Refactor widgets code
+   [\#2015](https://github.com/matrix-org/matrix-react-sdk/pull/2015)
+ * Login local errors for blank fields
+   [\#2009](https://github.com/matrix-org/matrix-react-sdk/pull/2009)
+ * Update lolex to 2.7.0
+   [\#1917](https://github.com/matrix-org/matrix-react-sdk/pull/1917)
+ * Improve Linkifier
+   [\#2011](https://github.com/matrix-org/matrix-react-sdk/pull/2011)
+ * use enum constants for EventStatus and correct isSent check
+   [\#2010](https://github.com/matrix-org/matrix-react-sdk/pull/2010)
+ * accent insensitive autocomplete
+   [\#2007](https://github.com/matrix-org/matrix-react-sdk/pull/2007)
+ * default to not showing url previews in e2ee rooms.
+   [\#2001](https://github.com/matrix-org/matrix-react-sdk/pull/2001)
+ * allow chaining right click contextmenus
+   [\#1999](https://github.com/matrix-org/matrix-react-sdk/pull/1999)
+ * hide empty roomsublists when filtering via search/tagpanel
+   [\#1954](https://github.com/matrix-org/matrix-react-sdk/pull/1954)
+ * prevent user,room,group autocomplete firing mid-word
+   [\#2012](https://github.com/matrix-org/matrix-react-sdk/pull/2012)
+ * fix instances of composer not getting/regaining focus
+   [\#2008](https://github.com/matrix-org/matrix-react-sdk/pull/2008)
+ * notif panel fixes
+   [\#2006](https://github.com/matrix-org/matrix-react-sdk/pull/2006)
+ * factor out conditional LanguageSelector as functional component
+   [\#2003](https://github.com/matrix-org/matrix-react-sdk/pull/2003)
+ * Autocomplete and Pillify Communities
+   [\#1993](https://github.com/matrix-org/matrix-react-sdk/pull/1993)
+ * Very basic Jitsi integration
+   [\#1971](https://github.com/matrix-org/matrix-react-sdk/pull/1971)
+ * add additional classes which protect the text from overflowing
+   [\#1994](https://github.com/matrix-org/matrix-react-sdk/pull/1994)
+ * Upload File confirmation modal steals focus, send it back to composer
+   [\#1992](https://github.com/matrix-org/matrix-react-sdk/pull/1992)
+ * delint MImageBody, fixes anonymous class and hyphenated style keys which
+   made react cry
+   [\#1991](https://github.com/matrix-org/matrix-react-sdk/pull/1991)
+ * allow using tab to navigate room list in a smarter way
+   [\#1977](https://github.com/matrix-org/matrix-react-sdk/pull/1977)
+ * fix no displayname usersettings
+   [\#1990](https://github.com/matrix-org/matrix-react-sdk/pull/1990)
+ * trigger TagTile context menu on right click
+   [\#1989](https://github.com/matrix-org/matrix-react-sdk/pull/1989)
+ * hide already chosen results from AddressPickerDialog
+   [\#2000](https://github.com/matrix-org/matrix-react-sdk/pull/2000)
+ * delint ChatCreateOrReuseDialog
+   [\#2002](https://github.com/matrix-org/matrix-react-sdk/pull/2002)
+ * fix set password & email flow possible to get stuck and onBlur murdering
+   your email
+   [\#1982](https://github.com/matrix-org/matrix-react-sdk/pull/1982)
+
+Changes in [0.12.8](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.8) (2018-06-29)
+=====================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.8-rc.2...v0.12.8)
+
+ * Revert "affix copyButton so that it doesn't get scrolled horizontally"
+   [\#2013](https://github.com/matrix-org/matrix-react-sdk/pull/2013)
+ * don't fire share dialog when clicking timestamp of event
+   [\#2017](https://github.com/matrix-org/matrix-react-sdk/pull/2017)
+ * when the user switches room, close room settings
+   [\#2019](https://github.com/matrix-org/matrix-react-sdk/pull/2019)
+
+Changes in [0.12.8-rc.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.8-rc.2) (2018-06-22)
+===============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.8-rc.1...v0.12.8-rc.2)
+
+ * slash got consumed in the consolidation
+   [\#1998](https://github.com/matrix-org/matrix-react-sdk/pull/1998)
+
+Changes in [0.12.8-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.8-rc.1) (2018-06-21)
+===============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.7...v0.12.8-rc.1)
+
+ * Update from Weblate.
+   [\#1997](https://github.com/matrix-org/matrix-react-sdk/pull/1997)
+ * refactor, consolidate and improve SlashCommands
+   [\#1988](https://github.com/matrix-org/matrix-react-sdk/pull/1988)
+ * Take replies out of labs!
+   [\#1996](https://github.com/matrix-org/matrix-react-sdk/pull/1996)
+ * re-merge reset PR
+   [\#1987](https://github.com/matrix-org/matrix-react-sdk/pull/1987)
+ * once command has a space, strict match instead of fuzzy match
+   [\#1985](https://github.com/matrix-org/matrix-react-sdk/pull/1985)
+ * Fix matrix.to URL RegExp
+   [\#1986](https://github.com/matrix-org/matrix-react-sdk/pull/1986)
+ * Fix blank sticker picker
+   [\#1984](https://github.com/matrix-org/matrix-react-sdk/pull/1984)
+ * fix e2ee file/media stuff
+   [\#1972](https://github.com/matrix-org/matrix-react-sdk/pull/1972)
+ * right click for room tile context menu
+   [\#1978](https://github.com/matrix-org/matrix-react-sdk/pull/1978)
+ * only show m.room.message in FilePanel
+   [\#1983](https://github.com/matrix-org/matrix-react-sdk/pull/1983)
+ * improve command provider
+   [\#1981](https://github.com/matrix-org/matrix-react-sdk/pull/1981)
+ * affix copyButton so that it doesn't get scrolled horizontally
+   [\#1980](https://github.com/matrix-org/matrix-react-sdk/pull/1980)
+ * split continuation if there is a gap in conversation
+   [\#1979](https://github.com/matrix-org/matrix-react-sdk/pull/1979)
+ * fix a bunch of instances of react console spam
+   [\#1973](https://github.com/matrix-org/matrix-react-sdk/pull/1973)
+ * Track decryption success/failure rate with piwik
+   [\#1949](https://github.com/matrix-org/matrix-react-sdk/pull/1949)
+ * route matrix.to/#/+... links internally (not just group ids)
+   [\#1975](https://github.com/matrix-org/matrix-react-sdk/pull/1975)
+ * implement `hitting enter after Ctrl-K should switch to the first result`
+   [\#1976](https://github.com/matrix-org/matrix-react-sdk/pull/1976)
+ * Remove tag panel feature flag
+   [\#1970](https://github.com/matrix-org/matrix-react-sdk/pull/1970)
+ * QuestionDialog pass hasCancelButton to DialogButtons
+   [\#1968](https://github.com/matrix-org/matrix-react-sdk/pull/1968)
+ * check type before msgtype in the case of `m.sticker` with msgtype
+   [\#1965](https://github.com/matrix-org/matrix-react-sdk/pull/1965)
+ * apply roomlist searchFilter to aliases if it begins with a `#`
+   [\#1957](https://github.com/matrix-org/matrix-react-sdk/pull/1957)
+ * Share Dialog
+   [\#1948](https://github.com/matrix-org/matrix-react-sdk/pull/1948)
+ * make RoomTooltip generic and add ContextMenu&Tooltip to GroupInviteTile
+   [\#1950](https://github.com/matrix-org/matrix-react-sdk/pull/1950)
+ *  Fix widgets re-appearing after being deleted
+   [\#1958](https://github.com/matrix-org/matrix-react-sdk/pull/1958)
+ * Fix crash on unspecified thumbnail info, and handle gracefully
+   [\#1967](https://github.com/matrix-org/matrix-react-sdk/pull/1967)
+ * fix styling of clearButton when its not there
+   [\#1964](https://github.com/matrix-org/matrix-react-sdk/pull/1964)
+ *  Implement slightly magical CSS soln. to thumbnail sizing
+   [\#1912](https://github.com/matrix-org/matrix-react-sdk/pull/1912)
+ * Select audio output for WebRTC
+   [\#1932](https://github.com/matrix-org/matrix-react-sdk/pull/1932)
+ * move css rule to be more generic; remove overriden rule
+   [\#1962](https://github.com/matrix-org/matrix-react-sdk/pull/1962)
+ * improve tag panel accessibility and remove a no-op dispatch
+   [\#1960](https://github.com/matrix-org/matrix-react-sdk/pull/1960)
+ * Revert "Fix exception when opening dev tools"
+   [\#1963](https://github.com/matrix-org/matrix-react-sdk/pull/1963)
+ * fix message appears unencrypted while encrypting and not_sent
+   [\#1959](https://github.com/matrix-org/matrix-react-sdk/pull/1959)
+ * Fix exception when opening dev tools
+   [\#1961](https://github.com/matrix-org/matrix-react-sdk/pull/1961)
+ * show redacted stickers like other redacted messages
+   [\#1956](https://github.com/matrix-org/matrix-react-sdk/pull/1956)
+ * add mx_filterFlipColor to mx_MemberInfo_cancel img
+   [\#1951](https://github.com/matrix-org/matrix-react-sdk/pull/1951)
+ * don't set the displayname on registration as Synapse now does it
+   [\#1953](https://github.com/matrix-org/matrix-react-sdk/pull/1953)
+ * allow CreateRoom to scale properly horizontally
+   [\#1955](https://github.com/matrix-org/matrix-react-sdk/pull/1955)
+ * Keep context menus that extend downwards vertically on screen
+   [\#1952](https://github.com/matrix-org/matrix-react-sdk/pull/1952)
+ * re-run checkIfAlone if a member change occurred in the active room
+   [\#1947](https://github.com/matrix-org/matrix-react-sdk/pull/1947)
+ * Persist pinned message open-ness between room switches
+   [\#1935](https://github.com/matrix-org/matrix-react-sdk/pull/1935)
+ * Pinned message cosmetic improvements
+   [\#1933](https://github.com/matrix-org/matrix-react-sdk/pull/1933)
+ * Update sinon to 5.0.7
+   [\#1916](https://github.com/matrix-org/matrix-react-sdk/pull/1916)
+ * re-run checkIfAlone if a member change occurred in the active room
+   [\#1946](https://github.com/matrix-org/matrix-react-sdk/pull/1946)
+ * Replace "Login as guest" with "Try the app first" on login page
+   [\#1937](https://github.com/matrix-org/matrix-react-sdk/pull/1937)
+ * kill stream when using gUM for permission to device labels to turn off
+   camera
+   [\#1931](https://github.com/matrix-org/matrix-react-sdk/pull/1931)
+
 Changes in [0.12.7](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.7) (2018-06-12)
 =====================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.7-rc.1...v0.12.7)
@@ -365,7 +904,7 @@ Changes in [0.12.0-rc.7](https://github.com/matrix-org/matrix-react-sdk/releases
   [\#1816](https://github.com/matrix-org/matrix-react-sdk/pull/1816)
  * Improve group joining/leaving feedback
   [\#1831](https://github.com/matrix-org/matrix-react-sdk/pull/1831)
- 
+
 Changes in [0.12.0-rc.6](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.0-rc.6) (2018-04-09)
 ===============================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.0-rc.5...v0.12.0-rc.6)
diff --git a/README.md b/README.md
index c3106ccec7..ac45497dd4 100644
--- a/README.md
+++ b/README.md
@@ -11,16 +11,8 @@ a 'skin'. A skin provides:
  * The containing application
  * Zero or more 'modules' containing non-UI functionality
 
-**WARNING: As of July 2016, the skinning abstraction is broken due to rapid
-development of `matrix-react-sdk` to meet the needs of Riot (codenamed Vector), the first app
-to be built on top of the SDK** (https://github.com/vector-im/riot-web).
-Right now `matrix-react-sdk` depends on some functionality from `riot-web`
-(e.g. CSS), and `matrix-react-sdk` contains some Riot specific behaviour
-(grep for 'vector').  This layering will be fixed asap once Riot development
-has stabilised, but for now we do not advise trying to create new skins for
-matrix-react-sdk until the layers are clearly separated again.
-
-In the interim, `vector-im/riot-web` and `matrix-org/matrix-react-sdk` should
+As of Aug 2018, the only skin that exists is `vector-im/riot-web`; it and
+`matrix-org/matrix-react-sdk` should effectively
 be considered as a single project (for instance, matrix-react-sdk bugs
 are currently filed against vector-im/riot-web rather than this project).
 
@@ -48,15 +40,14 @@ https://github.com/matrix-org/synapse/tree/master/CONTRIBUTING.rst
 Please follow the Matrix JS/React code style as per:
 https://github.com/matrix-org/matrix-react-sdk/blob/master/code_style.md
 
-Whilst the layering separation between matrix-react-sdk and Riot is broken
-(as of July 2016), code should be committed as follows:
+Code should be committed as follows:
  * All new components: https://github.com/matrix-org/matrix-react-sdk/tree/master/src/components
  * Riot-specific components: https://github.com/vector-im/riot-web/tree/master/src/components
    * In practice, `matrix-react-sdk` is still evolving so fast that the maintenance
      burden of customising and overriding these components for Riot can seriously
      impede development.  So right now, there should be very few (if any) customisations for Riot.
- * CSS for Matrix SDK components: https://github.com/vector-im/riot-web/tree/master/src/skins/vector/css/matrix-react-sdk
- * CSS for Riot-specific overrides and components: https://github.com/vector-im/riot-web/tree/master/src/skins/vector/css/riot-web
+ * CSS: https://github.com/vector-im/riot-web/tree/master/src/skins/vector/css/matrix-react-sdk
+ * Theme specific CSS & resources: https://github.com/matrix-org/matrix-react-sdk/tree/master/res/themes
 
 React components in matrix-react-sdk are come in two different flavours:
 'structures' and 'views'.  Structures are stateful components which handle the
@@ -84,6 +75,7 @@ practices that anyone working with the SDK needs to be be aware of and uphold:
 
   * Per-view CSS is optional - it could choose to inherit all its styling from
     the context of the rest of the app, although this is unusual for any but
+ * Theme specific CSS & resources: https://github.com/matrix-org/matrix-react-sdk/tree/master/res/themes
     structural components (lacking presentation logic) and the simplest view
     components.
 
@@ -139,8 +131,7 @@ for now.
 OUTDATED: To Create Your Own Skin
 =================================
 
-**This is ALL LIES currently, as skinning is currently broken - see the WARNING
-section at the top of this readme.**
+**This is ALL LIES currently, and needs to be updated**
 
 Skins are modules are exported from such a package in the `lib` directory.
 `lib/skins` contains one directory per-skin, named after the skin, and the
diff --git a/docs/slate-formats.md b/docs/slate-formats.md
new file mode 100644
index 0000000000..7bb2fc9c5f
--- /dev/null
+++ b/docs/slate-formats.md
@@ -0,0 +1,88 @@
+Guide to data types used by the Slate-based Rich Text Editor
+------------------------------------------------------------
+
+We always store the Slate editor state in its Value form.
+
+The schema for the Value is the same whether the editor is in MD or rich text mode, and is currently (rather arbitrarily)
+dictated by the schema expected by slate-md-serializer, simply because it was the only bit of the pipeline which
+has opinions on the schema. (slate-html-serializer lets you define how to serialize whatever schema you like).
+
+The BLOCK_TAGS and MARK_TAGS give the mapping from HTML tags to the schema's node types (for blocks, which describe
+block content like divs, and marks, which describe inline formatted sections like spans).
+
+We use 
 as the parent tag for the message (XXX: although some tags are technically not allowed to be nested within p's)
+
+Various conversions are performed as content is moved between HTML, MD, and plaintext representations of HTML and MD.
+
+The primitives used are:
+
+ * Markdown.js - models commonmark-formatted MD strings (as entered by the composer in MD mode)
+   * toHtml() - renders them to HTML suitable for sending on the wire
+   * isPlainText() - checks whether the parsed MD contains anything other than simple text.
+   * toPlainText() - renders MD to plain text in order to remove backslashes.  Only works if the MD is already plaintext (otherwise it just emits HTML)
+
+ * slate-html-serializer
+   * converts Values to HTML (serialising) using our schema rules
+   * converts HTML to Values (deserialising) using our schema rules
+
+ * slate-md-serializer
+   * converts rich Values to MD strings (serialising) but using a non-commonmark generic MD dialect.
+   * This should use commonmark, but we use the serializer here for expedience rather than writing a commonmark one.
+
+ * slate-plain-serializer
+  * converts Values to plain text strings (serialising them) by concatenating the strings together
+  * converts Values from plain text strings (deserialiasing them).
+  * Used to initialise the editor by deserializing "" into a Value. Apparently this is the idiomatic way to initialise a blank editor.
+  * Used (as a bodge) to turn a rich text editor into a MD editor, when deserialising the converted MD string of the editor into a value
+
+ * PlainWithPillsSerializer
+  * A fork of slate-plain-serializer which is aware of Pills (hence the name) and Emoji.
+  * It can be configured to output Pills as:
+    * "plain": Pills are rendered via their 'completion' text - e.g. 'Matthew'; used for sending messages)
+    * "md": Pills are rendered as MD, e.g. [Matthew](https://matrix.to/#/@matthew:matrix.org) )
+    * "id": Pills are rendered as IDs, e.g. '@matthew:matrix.org' (used for authoring / commands)
+  * Emoji nodes are converted to inline utf8 emoji.
+
+The actual conversion transitions are:
+
+ * Quoting:
+   * The message being quoted is taken as HTML
+   * ...and deserialised into a Value
+   * ...and then serialised into MD via slate-md-serializer if the editor is in MD mode
+
+ * Roundtripping between MD and rich text editor mode
+   * From MD to richtext (mdToRichEditorState):
+     * Serialise the MD-format Value to a MD string (converting pills to MD) with PlainWithPillsSerializer in 'md' mode
+     * Convert that MD string to HTML via Markdown.js
+     * Deserialise that Value to HTML via slate-html-serializer
+   * From richtext to MD (richToMdEditorState):
+     * Serialise the richtext-format Value to a MD string with slate-md-serializer (XXX: this should use commonmark)
+     * Deserialise that to a plain text value via slate-plain-serializer
+
+ * Loading history in one format into an editor which is in the other format
+   * Uses the same functions as for roundtripping
+
+ * Scanning the editor for a slash command
+   * If the editor is a single line node starting with /, then serialize it to a string with PlainWithPillsSerializer in 'id' mode
+     So that pills get converted to IDs suitable for commands being passed around
+
+ * Sending messages
+   * In RT mode:
+     * If there is rich content, serialize the RT-format Value to HTML body via slate-html-serializer
+     * Serialize the RT-format Value to the plain text fallback via PlainWithPillsSerializer in 'plain' mode
+   * In MD mode:
+     * Serialize the MD-format Value into an MD string with PlainWithPillsSerializer in 'md' mode
+     * Parse the string with Markdown.js
+     * If it contains no formatting:
+       * Send as plaintext (as taken from Markdown.toPlainText())
+     * Otherwise
+       * Send as HTML (as taken from Markdown.toHtml())
+       * Serialize the RT-format Value to the plain text fallback via PlainWithPillsSerializer in 'plain' mode
+
+ * Pasting HTML
+   * Deserialize HTML to a RT Value via slate-html-serializer
+   * In RT mode, insert it straight into the editor as a fragment
+   * In MD mode, serialise it to an MD string via slate-md-serializer and then insert the string into the editor as a fragment.
+
+The various scenarios and transitions could be drawn into a pretty diagram if one felt the urge, but hopefully the above
+gives sufficient detail on how it's all meant to work.
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
deleted file mode 100644
index 97ed7b5dea..0000000000
--- a/package-lock.json
+++ /dev/null
@@ -1,6729 +0,0 @@
-{
-  "name": "matrix-react-sdk",
-  "version": "0.12.4",
-  "lockfileVersion": 1,
-  "requires": true,
-  "dependencies": {
-    "@sinonjs/formatio": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-2.0.0.tgz",
-      "integrity": "sha512-ls6CAMA6/5gG+O/IdsBcblvnd8qcO/l1TYoNeAzp3wcISOxlPXQEus0mLcdwazEkWjaBdaJ3TaxmNgCLWwvWzg==",
-      "dev": true,
-      "requires": {
-        "samsam": "1.3.0"
-      }
-    },
-    "accepts": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz",
-      "integrity": "sha1-w8p0NJOGSMPg2cHjKN1otiLChMo=",
-      "dev": true,
-      "requires": {
-        "mime-types": "~2.1.11",
-        "negotiator": "0.6.1"
-      }
-    },
-    "acorn": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.1.2.tgz",
-      "integrity": "sha512-o96FZLJBPY1lvTuJylGA9Bk3t/GKPPJG8H0ydQQl01crzwJgspa4AEIq/pVTXigmK0PHVQhiAtn8WMBLL9D2WA==",
-      "dev": true
-    },
-    "acorn-jsx": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz",
-      "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=",
-      "dev": true,
-      "requires": {
-        "acorn": "^3.0.4"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
-          "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=",
-          "dev": true
-        }
-      }
-    },
-    "after": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/after/-/after-0.8.2.tgz",
-      "integrity": "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=",
-      "dev": true
-    },
-    "ajv": {
-      "version": "5.5.2",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
-      "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
-      "requires": {
-        "co": "^4.6.0",
-        "fast-deep-equal": "^1.0.0",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.3.0"
-      }
-    },
-    "ajv-keywords": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.1.tgz",
-      "integrity": "sha1-MU3QpLM2j609/NxU7eYXG4htrzw=",
-      "dev": true
-    },
-    "align-text": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz",
-      "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=",
-      "dev": true,
-      "requires": {
-        "kind-of": "^3.0.2",
-        "longest": "^1.0.1",
-        "repeat-string": "^1.5.2"
-      }
-    },
-    "amdefine": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
-      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
-      "dev": true
-    },
-    "another-json": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/another-json/-/another-json-0.2.0.tgz",
-      "integrity": "sha1-tfQBnJc7bdXGUGotk0acttMq7tw="
-    },
-    "ansi-escapes": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz",
-      "integrity": "sha1-06ioOzGapneTZisT52HHkRQiMG4=",
-      "dev": true
-    },
-    "ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-      "dev": true
-    },
-    "ansi-styles": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-      "dev": true
-    },
-    "anymatch": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
-      "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
-      "dev": true,
-      "requires": {
-        "micromatch": "^2.1.5",
-        "normalize-path": "^2.0.0"
-      }
-    },
-    "argparse": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz",
-      "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=",
-      "dev": true,
-      "requires": {
-        "sprintf-js": "~1.0.2"
-      },
-      "dependencies": {
-        "sprintf-js": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-          "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
-          "dev": true
-        }
-      }
-    },
-    "arr-diff": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
-      "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
-      "dev": true,
-      "requires": {
-        "arr-flatten": "^1.0.1"
-      }
-    },
-    "arr-flatten": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
-      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
-      "dev": true
-    },
-    "array-includes": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.0.3.tgz",
-      "integrity": "sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0=",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.2",
-        "es-abstract": "^1.7.0"
-      }
-    },
-    "array-slice": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
-      "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=",
-      "dev": true
-    },
-    "array-union": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
-      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
-      "dev": true,
-      "requires": {
-        "array-uniq": "^1.0.1"
-      }
-    },
-    "array-uniq": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
-      "dev": true
-    },
-    "array-unique": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
-      "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
-      "dev": true
-    },
-    "arraybuffer.slice": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz",
-      "integrity": "sha1-8zshWfBTKj8xB6JywMz70a0peco=",
-      "dev": true
-    },
-    "arrify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-      "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
-      "dev": true
-    },
-    "asap": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
-      "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY="
-    },
-    "asn1": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
-      "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y="
-    },
-    "assert": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz",
-      "integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=",
-      "dev": true,
-      "requires": {
-        "util": "0.10.3"
-      }
-    },
-    "assert-plus": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
-    },
-    "async": {
-      "version": "0.9.2",
-      "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
-      "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=",
-      "dev": true
-    },
-    "async-each": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz",
-      "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=",
-      "dev": true
-    },
-    "asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
-    },
-    "aws-sign2": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
-    },
-    "aws4": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz",
-      "integrity": "sha512-32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w=="
-    },
-    "babel-cli": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-cli/-/babel-cli-6.26.0.tgz",
-      "integrity": "sha1-UCq1SHTX24itALiHoGODzgPQAvE=",
-      "dev": true,
-      "requires": {
-        "babel-core": "^6.26.0",
-        "babel-polyfill": "^6.26.0",
-        "babel-register": "^6.26.0",
-        "babel-runtime": "^6.26.0",
-        "chokidar": "^1.6.1",
-        "commander": "^2.11.0",
-        "convert-source-map": "^1.5.0",
-        "fs-readdir-recursive": "^1.0.0",
-        "glob": "^7.1.2",
-        "lodash": "^4.17.4",
-        "output-file-sync": "^1.1.2",
-        "path-is-absolute": "^1.0.1",
-        "slash": "^1.0.0",
-        "source-map": "^0.5.6",
-        "v8flags": "^2.1.1"
-      },
-      "dependencies": {
-        "glob": {
-          "version": "7.1.2",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-          "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
-          "dev": true,
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        }
-      }
-    },
-    "babel-code-frame": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
-      "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
-      "dev": true,
-      "requires": {
-        "chalk": "^1.1.3",
-        "esutils": "^2.0.2",
-        "js-tokens": "^3.0.2"
-      }
-    },
-    "babel-core": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.0.tgz",
-      "integrity": "sha1-rzL3izGm/O8RnIew/Y2XU/A6C7g=",
-      "dev": true,
-      "requires": {
-        "babel-code-frame": "^6.26.0",
-        "babel-generator": "^6.26.0",
-        "babel-helpers": "^6.24.1",
-        "babel-messages": "^6.23.0",
-        "babel-register": "^6.26.0",
-        "babel-runtime": "^6.26.0",
-        "babel-template": "^6.26.0",
-        "babel-traverse": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "babylon": "^6.18.0",
-        "convert-source-map": "^1.5.0",
-        "debug": "^2.6.8",
-        "json5": "^0.5.1",
-        "lodash": "^4.17.4",
-        "minimatch": "^3.0.4",
-        "path-is-absolute": "^1.0.1",
-        "private": "^0.1.7",
-        "slash": "^1.0.0",
-        "source-map": "^0.5.6"
-      }
-    },
-    "babel-eslint": {
-      "version": "6.1.2",
-      "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-6.1.2.tgz",
-      "integrity": "sha1-UpNBn+NnLWZZjTJ9qWlFZ7pqXy8=",
-      "dev": true,
-      "requires": {
-        "babel-traverse": "^6.0.20",
-        "babel-types": "^6.0.19",
-        "babylon": "^6.0.18",
-        "lodash.assign": "^4.0.0",
-        "lodash.pickby": "^4.0.0"
-      }
-    },
-    "babel-generator": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.0.tgz",
-      "integrity": "sha1-rBriAHC3n248odMmlhMFN3TyDcU=",
-      "dev": true,
-      "requires": {
-        "babel-messages": "^6.23.0",
-        "babel-runtime": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "detect-indent": "^4.0.0",
-        "jsesc": "^1.3.0",
-        "lodash": "^4.17.4",
-        "source-map": "^0.5.6",
-        "trim-right": "^1.0.1"
-      }
-    },
-    "babel-helper-builder-binary-assignment-operator-visitor": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz",
-      "integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=",
-      "dev": true,
-      "requires": {
-        "babel-helper-explode-assignable-expression": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
-      }
-    },
-    "babel-helper-builder-react-jsx": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-helper-builder-react-jsx/-/babel-helper-builder-react-jsx-6.26.0.tgz",
-      "integrity": "sha1-Of+DE7dci2Xc7/HzHTg+D/KkCKA=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "esutils": "^2.0.2"
-      }
-    },
-    "babel-helper-call-delegate": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz",
-      "integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=",
-      "dev": true,
-      "requires": {
-        "babel-helper-hoist-variables": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-traverse": "^6.24.1",
-        "babel-types": "^6.24.1"
-      }
-    },
-    "babel-helper-define-map": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz",
-      "integrity": "sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8=",
-      "dev": true,
-      "requires": {
-        "babel-helper-function-name": "^6.24.1",
-        "babel-runtime": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "lodash": "^4.17.4"
-      }
-    },
-    "babel-helper-explode-assignable-expression": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz",
-      "integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0",
-        "babel-traverse": "^6.24.1",
-        "babel-types": "^6.24.1"
-      }
-    },
-    "babel-helper-function-name": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz",
-      "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=",
-      "dev": true,
-      "requires": {
-        "babel-helper-get-function-arity": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1",
-        "babel-traverse": "^6.24.1",
-        "babel-types": "^6.24.1"
-      }
-    },
-    "babel-helper-get-function-arity": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz",
-      "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
-      }
-    },
-    "babel-helper-hoist-variables": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz",
-      "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
-      }
-    },
-    "babel-helper-optimise-call-expression": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz",
-      "integrity": "sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
-      }
-    },
-    "babel-helper-regex": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz",
-      "integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "lodash": "^4.17.4"
-      }
-    },
-    "babel-helper-remap-async-to-generator": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz",
-      "integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=",
-      "dev": true,
-      "requires": {
-        "babel-helper-function-name": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1",
-        "babel-traverse": "^6.24.1",
-        "babel-types": "^6.24.1"
-      }
-    },
-    "babel-helper-replace-supers": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz",
-      "integrity": "sha1-v22/5Dk40XNpohPKiov3S2qQqxo=",
-      "dev": true,
-      "requires": {
-        "babel-helper-optimise-call-expression": "^6.24.1",
-        "babel-messages": "^6.23.0",
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1",
-        "babel-traverse": "^6.24.1",
-        "babel-types": "^6.24.1"
-      }
-    },
-    "babel-helpers": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz",
-      "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1"
-      }
-    },
-    "babel-loader": {
-      "version": "6.4.1",
-      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-6.4.1.tgz",
-      "integrity": "sha1-CzQRLVsHSKjc2/Uaz2+b1C1QuMo=",
-      "dev": true,
-      "requires": {
-        "find-cache-dir": "^0.1.1",
-        "loader-utils": "^0.2.16",
-        "mkdirp": "^0.5.1",
-        "object-assign": "^4.0.1"
-      }
-    },
-    "babel-messages": {
-      "version": "6.23.0",
-      "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
-      "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0"
-      }
-    },
-    "babel-plugin-add-module-exports": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-add-module-exports/-/babel-plugin-add-module-exports-0.2.1.tgz",
-      "integrity": "sha1-mumh9KjcZ/DN7E9K7aHkOl/2XiU=",
-      "dev": true
-    },
-    "babel-plugin-check-es2015-constants": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz",
-      "integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0"
-      }
-    },
-    "babel-plugin-syntax-async-functions": {
-      "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz",
-      "integrity": "sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU=",
-      "dev": true
-    },
-    "babel-plugin-syntax-class-properties": {
-      "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz",
-      "integrity": "sha1-1+sjt5oxf4VDlixQW4J8fWysJ94=",
-      "dev": true
-    },
-    "babel-plugin-syntax-exponentiation-operator": {
-      "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz",
-      "integrity": "sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=",
-      "dev": true
-    },
-    "babel-plugin-syntax-flow": {
-      "version": "6.18.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.18.0.tgz",
-      "integrity": "sha1-TDqyCiryaqIM0lmVw5jE63AxDI0=",
-      "dev": true
-    },
-    "babel-plugin-syntax-jsx": {
-      "version": "6.18.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz",
-      "integrity": "sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY=",
-      "dev": true
-    },
-    "babel-plugin-syntax-object-rest-spread": {
-      "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz",
-      "integrity": "sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=",
-      "dev": true
-    },
-    "babel-plugin-syntax-trailing-function-commas": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz",
-      "integrity": "sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM=",
-      "dev": true
-    },
-    "babel-plugin-transform-async-to-bluebird": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-async-to-bluebird/-/babel-plugin-transform-async-to-bluebird-1.1.1.tgz",
-      "integrity": "sha1-Ruo+fFr2KXgqyfHtG3zTj4Qlr9Q=",
-      "dev": true,
-      "requires": {
-        "babel-helper-function-name": "^6.8.0",
-        "babel-plugin-syntax-async-functions": "^6.8.0",
-        "babel-template": "^6.9.0",
-        "babel-traverse": "^6.10.4"
-      }
-    },
-    "babel-plugin-transform-async-to-generator": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz",
-      "integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=",
-      "dev": true,
-      "requires": {
-        "babel-helper-remap-async-to-generator": "^6.24.1",
-        "babel-plugin-syntax-async-functions": "^6.8.0",
-        "babel-runtime": "^6.22.0"
-      }
-    },
-    "babel-plugin-transform-class-properties": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.24.1.tgz",
-      "integrity": "sha1-anl2PqYdM9NvN7YRqp3vgagbRqw=",
-      "dev": true,
-      "requires": {
-        "babel-helper-function-name": "^6.24.1",
-        "babel-plugin-syntax-class-properties": "^6.8.0",
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1"
-      }
-    },
-    "babel-plugin-transform-es2015-arrow-functions": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz",
-      "integrity": "sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0"
-      }
-    },
-    "babel-plugin-transform-es2015-block-scoped-functions": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz",
-      "integrity": "sha1-u8UbSflk1wy42OC5ToICRs46YUE=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0"
-      }
-    },
-    "babel-plugin-transform-es2015-block-scoping": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz",
-      "integrity": "sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.26.0",
-        "babel-template": "^6.26.0",
-        "babel-traverse": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "lodash": "^4.17.4"
-      }
-    },
-    "babel-plugin-transform-es2015-classes": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz",
-      "integrity": "sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=",
-      "dev": true,
-      "requires": {
-        "babel-helper-define-map": "^6.24.1",
-        "babel-helper-function-name": "^6.24.1",
-        "babel-helper-optimise-call-expression": "^6.24.1",
-        "babel-helper-replace-supers": "^6.24.1",
-        "babel-messages": "^6.23.0",
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1",
-        "babel-traverse": "^6.24.1",
-        "babel-types": "^6.24.1"
-      }
-    },
-    "babel-plugin-transform-es2015-computed-properties": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz",
-      "integrity": "sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1"
-      }
-    },
-    "babel-plugin-transform-es2015-destructuring": {
-      "version": "6.23.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz",
-      "integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0"
-      }
-    },
-    "babel-plugin-transform-es2015-duplicate-keys": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz",
-      "integrity": "sha1-c+s9MQypaePvnskcU3QabxV2Qj4=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
-      }
-    },
-    "babel-plugin-transform-es2015-for-of": {
-      "version": "6.23.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz",
-      "integrity": "sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0"
-      }
-    },
-    "babel-plugin-transform-es2015-function-name": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz",
-      "integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=",
-      "dev": true,
-      "requires": {
-        "babel-helper-function-name": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
-      }
-    },
-    "babel-plugin-transform-es2015-literals": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz",
-      "integrity": "sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0"
-      }
-    },
-    "babel-plugin-transform-es2015-modules-amd": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz",
-      "integrity": "sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=",
-      "dev": true,
-      "requires": {
-        "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1"
-      }
-    },
-    "babel-plugin-transform-es2015-modules-commonjs": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.0.tgz",
-      "integrity": "sha1-DYOUApt9xqvhqX7xgeAHWN0uXYo=",
-      "dev": true,
-      "requires": {
-        "babel-plugin-transform-strict-mode": "^6.24.1",
-        "babel-runtime": "^6.26.0",
-        "babel-template": "^6.26.0",
-        "babel-types": "^6.26.0"
-      }
-    },
-    "babel-plugin-transform-es2015-modules-systemjs": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz",
-      "integrity": "sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=",
-      "dev": true,
-      "requires": {
-        "babel-helper-hoist-variables": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1"
-      }
-    },
-    "babel-plugin-transform-es2015-modules-umd": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz",
-      "integrity": "sha1-rJl+YoXNGO1hdq22B9YCNErThGg=",
-      "dev": true,
-      "requires": {
-        "babel-plugin-transform-es2015-modules-amd": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1"
-      }
-    },
-    "babel-plugin-transform-es2015-object-super": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz",
-      "integrity": "sha1-JM72muIcuDp/hgPa0CH1cusnj40=",
-      "dev": true,
-      "requires": {
-        "babel-helper-replace-supers": "^6.24.1",
-        "babel-runtime": "^6.22.0"
-      }
-    },
-    "babel-plugin-transform-es2015-parameters": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz",
-      "integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=",
-      "dev": true,
-      "requires": {
-        "babel-helper-call-delegate": "^6.24.1",
-        "babel-helper-get-function-arity": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1",
-        "babel-traverse": "^6.24.1",
-        "babel-types": "^6.24.1"
-      }
-    },
-    "babel-plugin-transform-es2015-shorthand-properties": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz",
-      "integrity": "sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
-      }
-    },
-    "babel-plugin-transform-es2015-spread": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz",
-      "integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0"
-      }
-    },
-    "babel-plugin-transform-es2015-sticky-regex": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz",
-      "integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=",
-      "dev": true,
-      "requires": {
-        "babel-helper-regex": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
-      }
-    },
-    "babel-plugin-transform-es2015-template-literals": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz",
-      "integrity": "sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0"
-      }
-    },
-    "babel-plugin-transform-es2015-typeof-symbol": {
-      "version": "6.23.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz",
-      "integrity": "sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0"
-      }
-    },
-    "babel-plugin-transform-es2015-unicode-regex": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz",
-      "integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=",
-      "dev": true,
-      "requires": {
-        "babel-helper-regex": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "regexpu-core": "^2.0.0"
-      }
-    },
-    "babel-plugin-transform-exponentiation-operator": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz",
-      "integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=",
-      "dev": true,
-      "requires": {
-        "babel-helper-builder-binary-assignment-operator-visitor": "^6.24.1",
-        "babel-plugin-syntax-exponentiation-operator": "^6.8.0",
-        "babel-runtime": "^6.22.0"
-      }
-    },
-    "babel-plugin-transform-flow-strip-types": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-flow-strip-types/-/babel-plugin-transform-flow-strip-types-6.22.0.tgz",
-      "integrity": "sha1-hMtnKTXUNxT9wyvOhFaNh0Qc988=",
-      "dev": true,
-      "requires": {
-        "babel-plugin-syntax-flow": "^6.18.0",
-        "babel-runtime": "^6.22.0"
-      }
-    },
-    "babel-plugin-transform-object-rest-spread": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz",
-      "integrity": "sha1-DzZpLVD+9rfi1LOsFHgTepY7ewY=",
-      "dev": true,
-      "requires": {
-        "babel-plugin-syntax-object-rest-spread": "^6.8.0",
-        "babel-runtime": "^6.26.0"
-      }
-    },
-    "babel-plugin-transform-react-display-name": {
-      "version": "6.25.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-display-name/-/babel-plugin-transform-react-display-name-6.25.0.tgz",
-      "integrity": "sha1-Z+K/Hx6ck6sI25Z5LgU5K/LMKNE=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0"
-      }
-    },
-    "babel-plugin-transform-react-jsx": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-jsx/-/babel-plugin-transform-react-jsx-6.24.1.tgz",
-      "integrity": "sha1-hAoCjn30YN/DotKfDA2R9jduZqM=",
-      "dev": true,
-      "requires": {
-        "babel-helper-builder-react-jsx": "^6.24.1",
-        "babel-plugin-syntax-jsx": "^6.8.0",
-        "babel-runtime": "^6.22.0"
-      }
-    },
-    "babel-plugin-transform-react-jsx-self": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-jsx-self/-/babel-plugin-transform-react-jsx-self-6.22.0.tgz",
-      "integrity": "sha1-322AqdomEqEh5t3XVYvL7PBuY24=",
-      "dev": true,
-      "requires": {
-        "babel-plugin-syntax-jsx": "^6.8.0",
-        "babel-runtime": "^6.22.0"
-      }
-    },
-    "babel-plugin-transform-react-jsx-source": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-jsx-source/-/babel-plugin-transform-react-jsx-source-6.22.0.tgz",
-      "integrity": "sha1-ZqwSFT9c0tF7PBkmj0vwGX9E7NY=",
-      "dev": true,
-      "requires": {
-        "babel-plugin-syntax-jsx": "^6.8.0",
-        "babel-runtime": "^6.22.0"
-      }
-    },
-    "babel-plugin-transform-regenerator": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz",
-      "integrity": "sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8=",
-      "dev": true,
-      "requires": {
-        "regenerator-transform": "^0.10.0"
-      }
-    },
-    "babel-plugin-transform-runtime": {
-      "version": "6.23.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.23.0.tgz",
-      "integrity": "sha1-iEkNRGUC6puOfvsP4J7E2ZR5se4=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0"
-      }
-    },
-    "babel-plugin-transform-strict-mode": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz",
-      "integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
-      }
-    },
-    "babel-polyfill": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz",
-      "integrity": "sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.26.0",
-        "core-js": "^2.5.0",
-        "regenerator-runtime": "^0.10.5"
-      },
-      "dependencies": {
-        "regenerator-runtime": {
-          "version": "0.10.5",
-          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
-          "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg=",
-          "dev": true
-        }
-      }
-    },
-    "babel-preset-es2015": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-preset-es2015/-/babel-preset-es2015-6.24.1.tgz",
-      "integrity": "sha1-1EBQ1rwsn+6nAqrzjXJ6AhBTiTk=",
-      "dev": true,
-      "requires": {
-        "babel-plugin-check-es2015-constants": "^6.22.0",
-        "babel-plugin-transform-es2015-arrow-functions": "^6.22.0",
-        "babel-plugin-transform-es2015-block-scoped-functions": "^6.22.0",
-        "babel-plugin-transform-es2015-block-scoping": "^6.24.1",
-        "babel-plugin-transform-es2015-classes": "^6.24.1",
-        "babel-plugin-transform-es2015-computed-properties": "^6.24.1",
-        "babel-plugin-transform-es2015-destructuring": "^6.22.0",
-        "babel-plugin-transform-es2015-duplicate-keys": "^6.24.1",
-        "babel-plugin-transform-es2015-for-of": "^6.22.0",
-        "babel-plugin-transform-es2015-function-name": "^6.24.1",
-        "babel-plugin-transform-es2015-literals": "^6.22.0",
-        "babel-plugin-transform-es2015-modules-amd": "^6.24.1",
-        "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1",
-        "babel-plugin-transform-es2015-modules-systemjs": "^6.24.1",
-        "babel-plugin-transform-es2015-modules-umd": "^6.24.1",
-        "babel-plugin-transform-es2015-object-super": "^6.24.1",
-        "babel-plugin-transform-es2015-parameters": "^6.24.1",
-        "babel-plugin-transform-es2015-shorthand-properties": "^6.24.1",
-        "babel-plugin-transform-es2015-spread": "^6.22.0",
-        "babel-plugin-transform-es2015-sticky-regex": "^6.24.1",
-        "babel-plugin-transform-es2015-template-literals": "^6.22.0",
-        "babel-plugin-transform-es2015-typeof-symbol": "^6.22.0",
-        "babel-plugin-transform-es2015-unicode-regex": "^6.24.1",
-        "babel-plugin-transform-regenerator": "^6.24.1"
-      }
-    },
-    "babel-preset-es2016": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-preset-es2016/-/babel-preset-es2016-6.24.1.tgz",
-      "integrity": "sha1-+QC/k+LrwNJ235uKtZck6/2Vn4s=",
-      "dev": true,
-      "requires": {
-        "babel-plugin-transform-exponentiation-operator": "^6.24.1"
-      }
-    },
-    "babel-preset-es2017": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-preset-es2017/-/babel-preset-es2017-6.24.1.tgz",
-      "integrity": "sha1-WXvq37n38gi8/YoS6bKym4svFNE=",
-      "dev": true,
-      "requires": {
-        "babel-plugin-syntax-trailing-function-commas": "^6.22.0",
-        "babel-plugin-transform-async-to-generator": "^6.24.1"
-      }
-    },
-    "babel-preset-flow": {
-      "version": "6.23.0",
-      "resolved": "https://registry.npmjs.org/babel-preset-flow/-/babel-preset-flow-6.23.0.tgz",
-      "integrity": "sha1-5xIYiHCFrpoktb5Baa/7WZgWxJ0=",
-      "dev": true,
-      "requires": {
-        "babel-plugin-transform-flow-strip-types": "^6.22.0"
-      }
-    },
-    "babel-preset-react": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-preset-react/-/babel-preset-react-6.24.1.tgz",
-      "integrity": "sha1-umnfrqRfw+xjm2pOzqbhdwLJE4A=",
-      "dev": true,
-      "requires": {
-        "babel-plugin-syntax-jsx": "^6.3.13",
-        "babel-plugin-transform-react-display-name": "^6.23.0",
-        "babel-plugin-transform-react-jsx": "^6.24.1",
-        "babel-plugin-transform-react-jsx-self": "^6.22.0",
-        "babel-plugin-transform-react-jsx-source": "^6.22.0",
-        "babel-preset-flow": "^6.23.0"
-      }
-    },
-    "babel-register": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz",
-      "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=",
-      "dev": true,
-      "requires": {
-        "babel-core": "^6.26.0",
-        "babel-runtime": "^6.26.0",
-        "core-js": "^2.5.0",
-        "home-or-tmp": "^2.0.0",
-        "lodash": "^4.17.4",
-        "mkdirp": "^0.5.1",
-        "source-map-support": "^0.4.15"
-      }
-    },
-    "babel-runtime": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
-      "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
-      "requires": {
-        "core-js": "^2.4.0",
-        "regenerator-runtime": "^0.11.0"
-      }
-    },
-    "babel-template": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
-      "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.26.0",
-        "babel-traverse": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "babylon": "^6.18.0",
-        "lodash": "^4.17.4"
-      }
-    },
-    "babel-traverse": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
-      "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
-      "dev": true,
-      "requires": {
-        "babel-code-frame": "^6.26.0",
-        "babel-messages": "^6.23.0",
-        "babel-runtime": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "babylon": "^6.18.0",
-        "debug": "^2.6.8",
-        "globals": "^9.18.0",
-        "invariant": "^2.2.2",
-        "lodash": "^4.17.4"
-      }
-    },
-    "babel-types": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
-      "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.26.0",
-        "esutils": "^2.0.2",
-        "lodash": "^4.17.4",
-        "to-fast-properties": "^1.0.3"
-      }
-    },
-    "babylon": {
-      "version": "6.18.0",
-      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
-      "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
-      "dev": true
-    },
-    "backo2": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz",
-      "integrity": "sha1-MasayLEpNjRj41s+u2n038+6eUc=",
-      "dev": true
-    },
-    "balanced-match": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
-    },
-    "base64-arraybuffer": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz",
-      "integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg=",
-      "dev": true
-    },
-    "base64-js": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.1.tgz",
-      "integrity": "sha512-dwVUVIXsBZXwTuwnXI9RK8sBmgq09NDHzyR9SAph9eqk76gKK2JSQmZARC2zRC81JC2QTtxD0ARU5qTS25gIGw==",
-      "dev": true
-    },
-    "base64id": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/base64id/-/base64id-1.0.0.tgz",
-      "integrity": "sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY=",
-      "dev": true
-    },
-    "bcrypt-pbkdf": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
-      "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
-      "optional": true,
-      "requires": {
-        "tweetnacl": "^0.14.3"
-      }
-    },
-    "better-assert": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz",
-      "integrity": "sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI=",
-      "dev": true,
-      "requires": {
-        "callsite": "1.0.0"
-      }
-    },
-    "big.js": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz",
-      "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==",
-      "dev": true
-    },
-    "binary-extensions": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.10.0.tgz",
-      "integrity": "sha1-muuabF6IY4qtFx4Wf1kAq+JINdA=",
-      "dev": true
-    },
-    "blob": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.4.tgz",
-      "integrity": "sha1-vPEwUspURj8w+fx+lbmkdjCpSSE=",
-      "dev": true
-    },
-    "bluebird": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
-      "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA=="
-    },
-    "blueimp-canvas-to-blob": {
-      "version": "3.14.0",
-      "resolved": "https://registry.npmjs.org/blueimp-canvas-to-blob/-/blueimp-canvas-to-blob-3.14.0.tgz",
-      "integrity": "sha512-i6I2CiX1VR8YwUNYBo+dM8tg89ns4TTHxSpWjaDeHKcYS3yFalpLCwDaY21/EsJMufLy2tnG4j0JN5L8OVNkKQ=="
-    },
-    "body-parser": {
-      "version": "1.18.2",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.2.tgz",
-      "integrity": "sha1-h2eKGdhLR9hZuDGZvVm84iKxBFQ=",
-      "dev": true,
-      "requires": {
-        "bytes": "3.0.0",
-        "content-type": "~1.0.4",
-        "debug": "2.6.9",
-        "depd": "~1.1.1",
-        "http-errors": "~1.6.2",
-        "iconv-lite": "0.4.19",
-        "on-finished": "~2.3.0",
-        "qs": "6.5.1",
-        "raw-body": "2.3.2",
-        "type-is": "~1.6.15"
-      }
-    },
-    "brace-expansion": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
-      "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
-      "requires": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "braces": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
-      "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
-      "dev": true,
-      "requires": {
-        "expand-range": "^1.8.1",
-        "preserve": "^0.2.0",
-        "repeat-element": "^1.1.2"
-      }
-    },
-    "browser-encrypt-attachment": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/browser-encrypt-attachment/-/browser-encrypt-attachment-0.3.0.tgz",
-      "integrity": "sha1-IFqUyq3w3H6BQTlBgS9lW9GQ/xw="
-    },
-    "browser-request": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/browser-request/-/browser-request-0.3.3.tgz",
-      "integrity": "sha1-ns5bWsqJopkyJC4Yv5M975h2zBc="
-    },
-    "browser-stdout": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
-      "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
-      "dev": true
-    },
-    "browserify-aes": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-0.4.0.tgz",
-      "integrity": "sha1-BnFJtmjfMcS1hTPgLQHoBthgjiw=",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.1"
-      }
-    },
-    "browserify-zlib": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz",
-      "integrity": "sha1-uzX4pRn2AOD6a4SFJByXnQFB+y0=",
-      "dev": true,
-      "requires": {
-        "pako": "~0.2.0"
-      },
-      "dependencies": {
-        "pako": {
-          "version": "0.2.9",
-          "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz",
-          "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=",
-          "dev": true
-        }
-      }
-    },
-    "buffer": {
-      "version": "4.9.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
-      "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
-      "dev": true,
-      "requires": {
-        "base64-js": "^1.0.2",
-        "ieee754": "^1.1.4",
-        "isarray": "^1.0.0"
-      }
-    },
-    "builtin-status-codes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
-      "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
-      "dev": true
-    },
-    "bytes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-      "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
-      "dev": true
-    },
-    "caller-path": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz",
-      "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=",
-      "dev": true,
-      "requires": {
-        "callsites": "^0.2.0"
-      }
-    },
-    "callsite": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz",
-      "integrity": "sha1-KAOY5dZkvXQDi28JBRU+borxvCA=",
-      "dev": true
-    },
-    "callsites": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz",
-      "integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=",
-      "dev": true
-    },
-    "camelcase": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
-      "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
-      "dev": true
-    },
-    "caseless": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
-    },
-    "center-align": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz",
-      "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=",
-      "dev": true,
-      "requires": {
-        "align-text": "^0.1.3",
-        "lazy-cache": "^1.0.3"
-      }
-    },
-    "chalk": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-      "dev": true,
-      "requires": {
-        "ansi-styles": "^2.2.1",
-        "escape-string-regexp": "^1.0.2",
-        "has-ansi": "^2.0.0",
-        "strip-ansi": "^3.0.0",
-        "supports-color": "^2.0.0"
-      }
-    },
-    "chokidar": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz",
-      "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=",
-      "dev": true,
-      "requires": {
-        "anymatch": "^1.3.0",
-        "async-each": "^1.0.0",
-        "fsevents": "^1.0.0",
-        "glob-parent": "^2.0.0",
-        "inherits": "^2.0.1",
-        "is-binary-path": "^1.0.0",
-        "is-glob": "^2.0.0",
-        "path-is-absolute": "^1.0.0",
-        "readdirp": "^2.0.0"
-      }
-    },
-    "circular-json": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz",
-      "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==",
-      "dev": true
-    },
-    "classnames": {
-      "version": "2.2.5",
-      "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.2.5.tgz",
-      "integrity": "sha1-+zgB1FNGdknvNgPH1hoCvRKb3m0="
-    },
-    "cli-cursor": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz",
-      "integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=",
-      "dev": true,
-      "requires": {
-        "restore-cursor": "^1.0.1"
-      }
-    },
-    "cli-width": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
-      "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
-      "dev": true
-    },
-    "cliui": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
-      "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
-      "dev": true,
-      "requires": {
-        "center-align": "^0.1.1",
-        "right-align": "^0.1.1",
-        "wordwrap": "0.0.2"
-      },
-      "dependencies": {
-        "wordwrap": {
-          "version": "0.0.2",
-          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
-          "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
-          "dev": true
-        }
-      }
-    },
-    "clone": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz",
-      "integrity": "sha1-Jgt6meux7f4kdTgXX3gyQ8sZ0Uk=",
-      "dev": true
-    },
-    "co": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
-    },
-    "code-point-at": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-      "dev": true
-    },
-    "colors": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
-      "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
-      "dev": true
-    },
-    "combine-lists": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/combine-lists/-/combine-lists-1.0.1.tgz",
-      "integrity": "sha1-RYwH4J4NkA/Ci3Cj/sLazR0st/Y=",
-      "dev": true,
-      "requires": {
-        "lodash": "^4.5.0"
-      }
-    },
-    "combined-stream": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz",
-      "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=",
-      "requires": {
-        "delayed-stream": "~1.0.0"
-      }
-    },
-    "commander": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz",
-      "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==",
-      "dev": true
-    },
-    "commondir": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
-      "dev": true
-    },
-    "commonmark": {
-      "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/commonmark/-/commonmark-0.28.1.tgz",
-      "integrity": "sha1-Buq41SM4uDn6Gi11rwCF7tGxvq4=",
-      "requires": {
-        "entities": "~ 1.1.1",
-        "mdurl": "~ 1.0.1",
-        "minimist": "~ 1.2.0",
-        "string.prototype.repeat": "^0.2.0"
-      }
-    },
-    "component-bind": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz",
-      "integrity": "sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=",
-      "dev": true
-    },
-    "component-emitter": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz",
-      "integrity": "sha1-KWWU8nU9qmOZbSrwjRWpURbJrsM=",
-      "dev": true
-    },
-    "component-inherit": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz",
-      "integrity": "sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=",
-      "dev": true
-    },
-    "concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
-    },
-    "concat-stream": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz",
-      "integrity": "sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc=",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.2.2",
-        "typedarray": "^0.0.6"
-      }
-    },
-    "connect": {
-      "version": "3.6.5",
-      "resolved": "https://registry.npmjs.org/connect/-/connect-3.6.5.tgz",
-      "integrity": "sha1-+43ee6B2OHfQ7J352sC0tA5yx9o=",
-      "dev": true,
-      "requires": {
-        "debug": "2.6.9",
-        "finalhandler": "1.0.6",
-        "parseurl": "~1.3.2",
-        "utils-merge": "1.0.1"
-      }
-    },
-    "console-browserify": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
-      "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
-      "dev": true,
-      "requires": {
-        "date-now": "^0.1.4"
-      }
-    },
-    "constants-browserify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
-      "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
-      "dev": true
-    },
-    "content-type": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="
-    },
-    "convert-source-map": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.0.tgz",
-      "integrity": "sha1-ms1whRxtXf3ZPZKC5e35SgP/RrU=",
-      "dev": true
-    },
-    "cookie": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
-      "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=",
-      "dev": true
-    },
-    "core-js": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.1.tgz",
-      "integrity": "sha1-rmh03GaTd4m4B1T/VCjfZoGcpQs="
-    },
-    "core-util-is": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
-    },
-    "counterpart": {
-      "version": "0.18.3",
-      "resolved": "https://registry.npmjs.org/counterpart/-/counterpart-0.18.3.tgz",
-      "integrity": "sha512-tli4qPAFeYB34LvvCc/1xYRLCWjf4WsUt6sXfpggDfGDKoI8rhnabz0SljDoBpAK8z1u8GBCg0YDkbvWb16uUQ==",
-      "requires": {
-        "date-names": "^0.1.9",
-        "except": "^0.1.3",
-        "extend": "^3.0.0",
-        "pluralizers": "^0.1.6",
-        "sprintf-js": "^1.0.3"
-      }
-    },
-    "create-react-class": {
-      "version": "15.6.2",
-      "resolved": "https://registry.npmjs.org/create-react-class/-/create-react-class-15.6.2.tgz",
-      "integrity": "sha1-zx7RXxKq1/FO9fLf4F5sQvke8Co=",
-      "requires": {
-        "fbjs": "^0.8.9",
-        "loose-envify": "^1.3.1",
-        "object-assign": "^4.1.1"
-      }
-    },
-    "crypto-browserify": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.3.0.tgz",
-      "integrity": "sha1-ufx1u0oO1h3PHNXa6W6zDJw+UGw=",
-      "dev": true,
-      "requires": {
-        "browserify-aes": "0.4.0",
-        "pbkdf2-compat": "2.0.1",
-        "ripemd160": "0.2.0",
-        "sha.js": "2.2.6"
-      }
-    },
-    "custom-event": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz",
-      "integrity": "sha1-XQKkaFCt8bSjF5RqOSj8y1v9BCU=",
-      "dev": true
-    },
-    "d": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz",
-      "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
-      "dev": true,
-      "requires": {
-        "es5-ext": "^0.10.9"
-      }
-    },
-    "dashdash": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-      "requires": {
-        "assert-plus": "^1.0.0"
-      }
-    },
-    "date-names": {
-      "version": "0.1.10",
-      "resolved": "https://registry.npmjs.org/date-names/-/date-names-0.1.10.tgz",
-      "integrity": "sha1-YvjZMyKVBEZX8852FtijQCH47ys="
-    },
-    "date-now": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz",
-      "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=",
-      "dev": true
-    },
-    "debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "requires": {
-        "ms": "2.0.0"
-      }
-    },
-    "decamelize": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
-      "dev": true
-    },
-    "deep-is": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
-      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
-      "dev": true
-    },
-    "define-properties": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz",
-      "integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=",
-      "dev": true,
-      "requires": {
-        "foreach": "^2.0.5",
-        "object-keys": "^1.0.8"
-      }
-    },
-    "del": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz",
-      "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=",
-      "dev": true,
-      "requires": {
-        "globby": "^5.0.0",
-        "is-path-cwd": "^1.0.0",
-        "is-path-in-cwd": "^1.0.0",
-        "object-assign": "^4.0.1",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0",
-        "rimraf": "^2.2.8"
-      }
-    },
-    "delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
-    },
-    "depd": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz",
-      "integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k=",
-      "dev": true
-    },
-    "detect-indent": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz",
-      "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=",
-      "dev": true,
-      "requires": {
-        "repeating": "^2.0.0"
-      }
-    },
-    "di": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz",
-      "integrity": "sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=",
-      "dev": true
-    },
-    "diff": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
-      "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
-      "dev": true
-    },
-    "doctrine": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.0.0.tgz",
-      "integrity": "sha1-xz2NKQnSIpHhoAejlYBNqLZl/mM=",
-      "dev": true,
-      "requires": {
-        "esutils": "^2.0.2",
-        "isarray": "^1.0.0"
-      }
-    },
-    "dom-serialize": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz",
-      "integrity": "sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=",
-      "dev": true,
-      "requires": {
-        "custom-event": "~1.0.0",
-        "ent": "~2.2.0",
-        "extend": "^3.0.0",
-        "void-elements": "^2.0.0"
-      }
-    },
-    "dom-serializer": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
-      "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=",
-      "requires": {
-        "domelementtype": "~1.1.1",
-        "entities": "~1.1.1"
-      },
-      "dependencies": {
-        "domelementtype": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz",
-          "integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs="
-        }
-      }
-    },
-    "domain-browser": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.7.tgz",
-      "integrity": "sha1-hnqksJP6oF8d4IwG9NeyH9+GmLw=",
-      "dev": true
-    },
-    "domelementtype": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz",
-      "integrity": "sha1-sXrtguirWeUt2cGbF1bg/BhyBMI="
-    },
-    "domhandler": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.1.tgz",
-      "integrity": "sha1-iS5HAAqZvlW783dP/qBWHYh5wlk=",
-      "requires": {
-        "domelementtype": "1"
-      }
-    },
-    "domutils": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.6.2.tgz",
-      "integrity": "sha1-GVjMC0yUJuntNn+xyOhUiRsPo/8=",
-      "requires": {
-        "dom-serializer": "0",
-        "domelementtype": "1"
-      }
-    },
-    "draft-js": {
-      "version": "0.11.0-alpha",
-      "resolved": "https://registry.npmjs.org/draft-js/-/draft-js-0.11.0-alpha.tgz",
-      "integrity": "sha1-MtshCPkn6bhEbaH3nkR1wrf4aK4=",
-      "requires": {
-        "fbjs": "^0.8.12",
-        "immutable": "~3.7.4",
-        "object-assign": "^4.1.0"
-      }
-    },
-    "draft-js-export-html": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/draft-js-export-html/-/draft-js-export-html-0.6.0.tgz",
-      "integrity": "sha1-zIDwVExD0Kf+28U8DLCRToCQ92k=",
-      "requires": {
-        "draft-js-utils": ">=0.2.0"
-      }
-    },
-    "draft-js-export-markdown": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/draft-js-export-markdown/-/draft-js-export-markdown-0.3.0.tgz",
-      "integrity": "sha1-hjkOA86vHTR/xhaGerf1Net2v0I=",
-      "requires": {
-        "draft-js-utils": ">=0.2.0"
-      }
-    },
-    "draft-js-utils": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/draft-js-utils/-/draft-js-utils-1.2.0.tgz",
-      "integrity": "sha1-9csj6xZzJf/tPXmIL9wxdyHS/RI="
-    },
-    "ecc-jsbn": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
-      "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
-      "optional": true,
-      "requires": {
-        "jsbn": "~0.1.0"
-      }
-    },
-    "ee-first": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
-      "dev": true
-    },
-    "emojione": {
-      "version": "2.2.7",
-      "resolved": "https://registry.npmjs.org/emojione/-/emojione-2.2.7.tgz",
-      "integrity": "sha1-RkV89rmy+NoTroouTlR94G7hXpY="
-    },
-    "emojis-list": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
-      "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
-      "dev": true
-    },
-    "encodeurl": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.1.tgz",
-      "integrity": "sha1-eePVhlU0aQn+bw9Fpd5oEDspTSA=",
-      "dev": true
-    },
-    "encoding": {
-      "version": "0.1.12",
-      "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz",
-      "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=",
-      "requires": {
-        "iconv-lite": "~0.4.13"
-      }
-    },
-    "engine.io": {
-      "version": "1.8.3",
-      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-1.8.3.tgz",
-      "integrity": "sha1-jef5eJXSDTm4X4ju7nd7K9QrE9Q=",
-      "dev": true,
-      "requires": {
-        "accepts": "1.3.3",
-        "base64id": "1.0.0",
-        "cookie": "0.3.1",
-        "debug": "2.3.3",
-        "engine.io-parser": "1.3.2",
-        "ws": "1.1.2"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.3.3",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz",
-          "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=",
-          "dev": true,
-          "requires": {
-            "ms": "0.7.2"
-          }
-        },
-        "ms": {
-          "version": "0.7.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz",
-          "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=",
-          "dev": true
-        }
-      }
-    },
-    "engine.io-client": {
-      "version": "1.8.3",
-      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.3.tgz",
-      "integrity": "sha1-F5jtk0USRkU9TG9jXXogH+lA1as=",
-      "dev": true,
-      "requires": {
-        "component-emitter": "1.2.1",
-        "component-inherit": "0.0.3",
-        "debug": "2.3.3",
-        "engine.io-parser": "1.3.2",
-        "has-cors": "1.1.0",
-        "indexof": "0.0.1",
-        "parsejson": "0.0.3",
-        "parseqs": "0.0.5",
-        "parseuri": "0.0.5",
-        "ws": "1.1.2",
-        "xmlhttprequest-ssl": "1.5.3",
-        "yeast": "0.1.2"
-      },
-      "dependencies": {
-        "component-emitter": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
-          "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
-          "dev": true
-        },
-        "debug": {
-          "version": "2.3.3",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz",
-          "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=",
-          "dev": true,
-          "requires": {
-            "ms": "0.7.2"
-          }
-        },
-        "ms": {
-          "version": "0.7.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz",
-          "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=",
-          "dev": true
-        }
-      }
-    },
-    "engine.io-parser": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.3.2.tgz",
-      "integrity": "sha1-k3sHnwAH0Ik+xW1GyyILjLQ1Igo=",
-      "dev": true,
-      "requires": {
-        "after": "0.8.2",
-        "arraybuffer.slice": "0.0.6",
-        "base64-arraybuffer": "0.1.5",
-        "blob": "0.0.4",
-        "has-binary": "0.1.7",
-        "wtf-8": "1.0.0"
-      }
-    },
-    "enhanced-resolve": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-0.9.1.tgz",
-      "integrity": "sha1-TW5omzcl+GCQknzMhs2fFjW4ni4=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.2",
-        "memory-fs": "^0.2.0",
-        "tapable": "^0.1.8"
-      },
-      "dependencies": {
-        "memory-fs": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.2.0.tgz",
-          "integrity": "sha1-8rslNovBIeORwlIN6Slpyu4KApA=",
-          "dev": true
-        }
-      }
-    },
-    "ent": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz",
-      "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=",
-      "dev": true
-    },
-    "entities": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz",
-      "integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA="
-    },
-    "errno": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.4.tgz",
-      "integrity": "sha1-uJbiOp5ei6M4cfyZar02NfyaHH0=",
-      "dev": true,
-      "requires": {
-        "prr": "~0.0.0"
-      }
-    },
-    "es-abstract": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.9.0.tgz",
-      "integrity": "sha512-kk3IJoKo7A3pWJc0OV8yZ/VEX2oSUytfekrJiqoxBlKJMFAJVJVpGdHClCCTdv+Fn2zHfpDHHIelMFhZVfef3Q==",
-      "dev": true,
-      "requires": {
-        "es-to-primitive": "^1.1.1",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.1",
-        "is-callable": "^1.1.3",
-        "is-regex": "^1.0.4"
-      }
-    },
-    "es-to-primitive": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.1.1.tgz",
-      "integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=",
-      "dev": true,
-      "requires": {
-        "is-callable": "^1.1.1",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.1"
-      }
-    },
-    "es5-ext": {
-      "version": "0.10.35",
-      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.35.tgz",
-      "integrity": "sha1-GO6FjOajxFx9eekcFfzKnsVoSU8=",
-      "dev": true,
-      "requires": {
-        "es6-iterator": "~2.0.1",
-        "es6-symbol": "~3.1.1"
-      }
-    },
-    "es6-iterator": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
-      "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
-      "dev": true,
-      "requires": {
-        "d": "1",
-        "es5-ext": "^0.10.35",
-        "es6-symbol": "^3.1.1"
-      }
-    },
-    "es6-map": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz",
-      "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=",
-      "dev": true,
-      "requires": {
-        "d": "1",
-        "es5-ext": "~0.10.14",
-        "es6-iterator": "~2.0.1",
-        "es6-set": "~0.1.5",
-        "es6-symbol": "~3.1.1",
-        "event-emitter": "~0.3.5"
-      }
-    },
-    "es6-set": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz",
-      "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=",
-      "dev": true,
-      "requires": {
-        "d": "1",
-        "es5-ext": "~0.10.14",
-        "es6-iterator": "~2.0.1",
-        "es6-symbol": "3.1.1",
-        "event-emitter": "~0.3.5"
-      }
-    },
-    "es6-symbol": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz",
-      "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
-      "dev": true,
-      "requires": {
-        "d": "1",
-        "es5-ext": "~0.10.14"
-      }
-    },
-    "es6-weak-map": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.2.tgz",
-      "integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=",
-      "dev": true,
-      "requires": {
-        "d": "1",
-        "es5-ext": "^0.10.14",
-        "es6-iterator": "^2.0.1",
-        "es6-symbol": "^3.1.1"
-      }
-    },
-    "escape-html": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=",
-      "dev": true
-    },
-    "escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "dev": true
-    },
-    "escope": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz",
-      "integrity": "sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=",
-      "dev": true,
-      "requires": {
-        "es6-map": "^0.1.3",
-        "es6-weak-map": "^2.0.1",
-        "esrecurse": "^4.1.0",
-        "estraverse": "^4.1.1"
-      }
-    },
-    "eslint": {
-      "version": "3.19.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-3.19.0.tgz",
-      "integrity": "sha1-yPxiAcf0DdCJQbh8CFdnOGpnmsw=",
-      "dev": true,
-      "requires": {
-        "babel-code-frame": "^6.16.0",
-        "chalk": "^1.1.3",
-        "concat-stream": "^1.5.2",
-        "debug": "^2.1.1",
-        "doctrine": "^2.0.0",
-        "escope": "^3.6.0",
-        "espree": "^3.4.0",
-        "esquery": "^1.0.0",
-        "estraverse": "^4.2.0",
-        "esutils": "^2.0.2",
-        "file-entry-cache": "^2.0.0",
-        "glob": "^7.0.3",
-        "globals": "^9.14.0",
-        "ignore": "^3.2.0",
-        "imurmurhash": "^0.1.4",
-        "inquirer": "^0.12.0",
-        "is-my-json-valid": "^2.10.0",
-        "is-resolvable": "^1.0.0",
-        "js-yaml": "^3.5.1",
-        "json-stable-stringify": "^1.0.0",
-        "levn": "^0.3.0",
-        "lodash": "^4.0.0",
-        "mkdirp": "^0.5.0",
-        "natural-compare": "^1.4.0",
-        "optionator": "^0.8.2",
-        "path-is-inside": "^1.0.1",
-        "pluralize": "^1.2.1",
-        "progress": "^1.1.8",
-        "require-uncached": "^1.0.2",
-        "shelljs": "^0.7.5",
-        "strip-bom": "^3.0.0",
-        "strip-json-comments": "~2.0.1",
-        "table": "^3.7.8",
-        "text-table": "~0.2.0",
-        "user-home": "^2.0.0"
-      },
-      "dependencies": {
-        "glob": {
-          "version": "7.1.2",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-          "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
-          "dev": true,
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        },
-        "user-home": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/user-home/-/user-home-2.0.0.tgz",
-          "integrity": "sha1-nHC/2Babwdy/SGBODwS4tJzenp8=",
-          "dev": true,
-          "requires": {
-            "os-homedir": "^1.0.0"
-          }
-        }
-      }
-    },
-    "eslint-config-google": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/eslint-config-google/-/eslint-config-google-0.7.1.tgz",
-      "integrity": "sha1-VZj4SY6eB4Qg80uASVuNlZ9lH7I=",
-      "dev": true
-    },
-    "eslint-plugin-babel": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-babel/-/eslint-plugin-babel-4.1.2.tgz",
-      "integrity": "sha1-eSAqDjV1fdkngJGbIzbx+i/lPB4=",
-      "dev": true
-    },
-    "eslint-plugin-flowtype": {
-      "version": "2.39.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-flowtype/-/eslint-plugin-flowtype-2.39.1.tgz",
-      "integrity": "sha512-RiQv+7Z9QDJuzt+NO8sYgkLGT+h+WeCrxP7y8lI7wpU41x3x/2o3PGtHk9ck8QnA9/mlbNcy/hG0eKvmd7npaA==",
-      "dev": true,
-      "requires": {
-        "lodash": "^4.15.0"
-      }
-    },
-    "eslint-plugin-react": {
-      "version": "7.7.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.7.0.tgz",
-      "integrity": "sha512-KC7Snr4YsWZD5flu6A5c0AcIZidzW3Exbqp7OT67OaD2AppJtlBr/GuPrW/vaQM/yfZotEvKAdrxrO+v8vwYJA==",
-      "dev": true,
-      "requires": {
-        "doctrine": "^2.0.2",
-        "has": "^1.0.1",
-        "jsx-ast-utils": "^2.0.1",
-        "prop-types": "^15.6.0"
-      },
-      "dependencies": {
-        "doctrine": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-          "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-          "dev": true,
-          "requires": {
-            "esutils": "^2.0.2"
-          }
-        }
-      }
-    },
-    "espree": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.1.tgz",
-      "integrity": "sha1-DJiLirRttTEAoZVK5LqZXd0n2H4=",
-      "dev": true,
-      "requires": {
-        "acorn": "^5.1.1",
-        "acorn-jsx": "^3.0.0"
-      }
-    },
-    "esprima": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz",
-      "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==",
-      "dev": true
-    },
-    "esquery": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.0.tgz",
-      "integrity": "sha1-z7qLV9f7qT8XKYqKAGoEzaE9gPo=",
-      "dev": true,
-      "requires": {
-        "estraverse": "^4.0.0"
-      }
-    },
-    "esrecurse": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.0.tgz",
-      "integrity": "sha1-+pVo2Y04I/mkHZHpAtyrnqblsWM=",
-      "dev": true,
-      "requires": {
-        "estraverse": "^4.1.0",
-        "object-assign": "^4.0.1"
-      }
-    },
-    "estraverse": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
-      "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
-      "dev": true
-    },
-    "estree-walker": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.5.0.tgz",
-      "integrity": "sha1-quO1fELeuAEONJyJJGLw5xxd0ao=",
-      "dev": true
-    },
-    "esutils": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
-      "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
-      "dev": true
-    },
-    "event-emitter": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
-      "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
-      "dev": true,
-      "requires": {
-        "d": "1",
-        "es5-ext": "~0.10.14"
-      }
-    },
-    "eventemitter3": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.2.0.tgz",
-      "integrity": "sha1-HIaZHYFq0eUEdQ5zh0Ik7PO+xQg=",
-      "dev": true
-    },
-    "events": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
-      "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=",
-      "dev": true
-    },
-    "except": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/except/-/except-0.1.3.tgz",
-      "integrity": "sha1-mCYckZWFUVNrREgiOOl4P7c9KSo=",
-      "requires": {
-        "indexof": "0.0.1"
-      }
-    },
-    "exit-hook": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz",
-      "integrity": "sha1-8FyiM7SMBdVP/wd2XfhQfpXAL/g=",
-      "dev": true
-    },
-    "expand-braces": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/expand-braces/-/expand-braces-0.1.2.tgz",
-      "integrity": "sha1-SIsdHSRRyz06axks/AMPRMWFX+o=",
-      "dev": true,
-      "requires": {
-        "array-slice": "^0.2.3",
-        "array-unique": "^0.2.1",
-        "braces": "^0.1.2"
-      },
-      "dependencies": {
-        "braces": {
-          "version": "0.1.5",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-0.1.5.tgz",
-          "integrity": "sha1-wIVxEIUpHYt1/ddOqw+FlygHEeY=",
-          "dev": true,
-          "requires": {
-            "expand-range": "^0.1.0"
-          }
-        },
-        "expand-range": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-0.1.1.tgz",
-          "integrity": "sha1-TLjtoJk8pW+k9B/ELzy7TMrf8EQ=",
-          "dev": true,
-          "requires": {
-            "is-number": "^0.1.1",
-            "repeat-string": "^0.2.2"
-          }
-        },
-        "is-number": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-0.1.1.tgz",
-          "integrity": "sha1-aaevEWlj1HIG7JvZtIoUIW8eOAY=",
-          "dev": true
-        },
-        "repeat-string": {
-          "version": "0.2.2",
-          "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-0.2.2.tgz",
-          "integrity": "sha1-x6jTI2BoNiBZp+RlH8aITosftK4=",
-          "dev": true
-        }
-      }
-    },
-    "expand-brackets": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
-      "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
-      "dev": true,
-      "requires": {
-        "is-posix-bracket": "^0.1.0"
-      }
-    },
-    "expand-range": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
-      "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
-      "dev": true,
-      "requires": {
-        "fill-range": "^2.1.0"
-      }
-    },
-    "expect": {
-      "version": "1.20.2",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-1.20.2.tgz",
-      "integrity": "sha1-1Fj+TFYAQDa64yMkFqP2Nh8E+WU=",
-      "dev": true,
-      "requires": {
-        "define-properties": "~1.1.2",
-        "has": "^1.0.1",
-        "is-equal": "^1.5.1",
-        "is-regex": "^1.0.3",
-        "object-inspect": "^1.1.0",
-        "object-keys": "^1.0.9",
-        "tmatch": "^2.0.1"
-      }
-    },
-    "extend": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-      "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ="
-    },
-    "extglob": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
-      "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
-      "dev": true,
-      "requires": {
-        "is-extglob": "^1.0.0"
-      }
-    },
-    "extsprintf": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
-    },
-    "fast-deep-equal": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
-      "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ="
-    },
-    "fast-json-stable-stringify": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
-      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I="
-    },
-    "fast-levenshtein": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
-      "dev": true
-    },
-    "fbemitter": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/fbemitter/-/fbemitter-2.1.1.tgz",
-      "integrity": "sha1-Uj4U/a9SSIBbsC9i78M75wP1GGU=",
-      "requires": {
-        "fbjs": "^0.8.4"
-      }
-    },
-    "fbjs": {
-      "version": "0.8.16",
-      "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.16.tgz",
-      "integrity": "sha1-XmdDL1UNxBtXK/VYR7ispk5TN9s=",
-      "requires": {
-        "core-js": "^1.0.0",
-        "isomorphic-fetch": "^2.1.1",
-        "loose-envify": "^1.0.0",
-        "object-assign": "^4.1.0",
-        "promise": "^7.1.1",
-        "setimmediate": "^1.0.5",
-        "ua-parser-js": "^0.7.9"
-      },
-      "dependencies": {
-        "core-js": {
-          "version": "1.2.7",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz",
-          "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY="
-        }
-      }
-    },
-    "figures": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
-      "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
-      "dev": true,
-      "requires": {
-        "escape-string-regexp": "^1.0.5",
-        "object-assign": "^4.1.0"
-      }
-    },
-    "file-entry-cache": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz",
-      "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=",
-      "dev": true,
-      "requires": {
-        "flat-cache": "^1.2.1",
-        "object-assign": "^4.0.1"
-      }
-    },
-    "file-saver": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-1.3.3.tgz",
-      "integrity": "sha1-zdTETTqiZOrC9o7BZbx5HDSvEjI="
-    },
-    "filename-regex": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
-      "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=",
-      "dev": true
-    },
-    "filesize": {
-      "version": "3.5.6",
-      "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.5.6.tgz",
-      "integrity": "sha1-X9mPPqyU7JUW747VeC+thKAaCho="
-    },
-    "fill-range": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz",
-      "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=",
-      "dev": true,
-      "requires": {
-        "is-number": "^2.1.0",
-        "isobject": "^2.0.0",
-        "randomatic": "^1.1.3",
-        "repeat-element": "^1.1.2",
-        "repeat-string": "^1.5.2"
-      }
-    },
-    "finalhandler": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.6.tgz",
-      "integrity": "sha1-AHrqM9Gk0+QgF/YkhIrVjSEvgU8=",
-      "dev": true,
-      "requires": {
-        "debug": "2.6.9",
-        "encodeurl": "~1.0.1",
-        "escape-html": "~1.0.3",
-        "on-finished": "~2.3.0",
-        "parseurl": "~1.3.2",
-        "statuses": "~1.3.1",
-        "unpipe": "~1.0.0"
-      }
-    },
-    "find-cache-dir": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-0.1.1.tgz",
-      "integrity": "sha1-yN765XyKUqinhPnjHFfHQumToLk=",
-      "dev": true,
-      "requires": {
-        "commondir": "^1.0.1",
-        "mkdirp": "^0.5.1",
-        "pkg-dir": "^1.0.0"
-      }
-    },
-    "find-up": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-      "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
-      "dev": true,
-      "requires": {
-        "path-exists": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
-      }
-    },
-    "flat-cache": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.0.tgz",
-      "integrity": "sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=",
-      "dev": true,
-      "requires": {
-        "circular-json": "^0.3.1",
-        "del": "^2.0.2",
-        "graceful-fs": "^4.1.2",
-        "write": "^0.2.1"
-      }
-    },
-    "flow-parser": {
-      "version": "0.57.3",
-      "resolved": "https://registry.npmjs.org/flow-parser/-/flow-parser-0.57.3.tgz",
-      "integrity": "sha1-uNJBobHLrgQ6+nl2458mmYjY/jQ=",
-      "dev": true
-    },
-    "flux": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/flux/-/flux-2.1.1.tgz",
-      "integrity": "sha1-LGrGUtQzdIiWhInGWG86/yajjqQ=",
-      "requires": {
-        "fbemitter": "^2.0.0",
-        "fbjs": "0.1.0-alpha.7",
-        "immutable": "^3.7.4"
-      },
-      "dependencies": {
-        "core-js": {
-          "version": "1.2.7",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz",
-          "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY="
-        },
-        "fbjs": {
-          "version": "0.1.0-alpha.7",
-          "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.1.0-alpha.7.tgz",
-          "integrity": "sha1-rUMIuPIy+zxzYDNJ6nJdHpw5Mjw=",
-          "requires": {
-            "core-js": "^1.0.0",
-            "promise": "^7.0.3",
-            "whatwg-fetch": "^0.9.0"
-          }
-        },
-        "whatwg-fetch": {
-          "version": "0.9.0",
-          "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-0.9.0.tgz",
-          "integrity": "sha1-DjaExsuZlbQ+/J3wPkw2XZX9nMA="
-        }
-      }
-    },
-    "focus-trap": {
-      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-2.4.3.tgz",
-      "integrity": "sha512-sT5Ip9nyAIxWq8Apt1Fdv6yTci5GotaOtO5Ro1/+F3PizttNBcCYz8j/Qze54PPFK73KUbOqh++HUCiyNPqvhA==",
-      "requires": {
-        "tabbable": "^1.0.3"
-      }
-    },
-    "focus-trap-react": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/focus-trap-react/-/focus-trap-react-3.1.2.tgz",
-      "integrity": "sha512-MoQmONoy9gRPyrC5DGezkcOMGgx7MtIOAQDHe098UtL2sA2vmucJwEmQisb+8LRXNYFHxuw5zJ1oLFeKu4Mteg==",
-      "requires": {
-        "focus-trap": "^2.0.1"
-      }
-    },
-    "for-in": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
-      "dev": true
-    },
-    "for-own": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
-      "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
-      "dev": true,
-      "requires": {
-        "for-in": "^1.0.1"
-      }
-    },
-    "foreach": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
-      "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=",
-      "dev": true
-    },
-    "foreachasync": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/foreachasync/-/foreachasync-3.0.0.tgz",
-      "integrity": "sha1-VQKYfchxS+M5IJfzLgBxyd7gfPY=",
-      "dev": true
-    },
-    "forever-agent": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
-    },
-    "form-data": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz",
-      "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=",
-      "requires": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "1.0.6",
-        "mime-types": "^2.1.12"
-      }
-    },
-    "fs-access": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/fs-access/-/fs-access-1.0.1.tgz",
-      "integrity": "sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=",
-      "dev": true,
-      "requires": {
-        "null-check": "^1.0.0"
-      }
-    },
-    "fs-readdir-recursive": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs-readdir-recursive/-/fs-readdir-recursive-1.0.0.tgz",
-      "integrity": "sha1-jNF0XItPiinIyuw5JHaSG6GV9WA=",
-      "dev": true
-    },
-    "fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-      "dev": true
-    },
-    "fsevents": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.2.tgz",
-      "integrity": "sha1-MoK3E/s62A7eDp/PRhG1qm/AM/Q=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "nan": "^2.3.0",
-        "node-pre-gyp": "^0.6.36"
-      },
-      "dependencies": {
-        "abbrev": {
-          "version": "1.1.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "ajv": {
-          "version": "4.11.8",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "co": "4.6.0",
-            "json-stable-stringify": "1.0.1"
-          }
-        },
-        "ansi-regex": {
-          "version": "2.1.1",
-          "bundled": true,
-          "dev": true
-        },
-        "aproba": {
-          "version": "1.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "are-we-there-yet": {
-          "version": "1.1.4",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "delegates": "^1.0.0",
-            "readable-stream": "^2.0.6"
-          }
-        },
-        "asn1": {
-          "version": "0.2.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "assert-plus": {
-          "version": "0.2.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "asynckit": {
-          "version": "0.4.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "aws-sign2": {
-          "version": "0.6.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "aws4": {
-          "version": "1.6.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "balanced-match": {
-          "version": "0.4.2",
-          "bundled": true,
-          "dev": true
-        },
-        "bcrypt-pbkdf": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "tweetnacl": "^0.14.3"
-          }
-        },
-        "block-stream": {
-          "version": "0.0.9",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "inherits": "~2.0.0"
-          }
-        },
-        "boom": {
-          "version": "2.10.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "hoek": "2.x.x"
-          }
-        },
-        "brace-expansion": {
-          "version": "1.1.7",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "balanced-match": "^0.4.1",
-            "concat-map": "0.0.1"
-          }
-        },
-        "buffer-shims": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true
-        },
-        "caseless": {
-          "version": "0.12.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "co": {
-          "version": "4.6.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "code-point-at": {
-          "version": "1.1.0",
-          "bundled": true,
-          "dev": true
-        },
-        "combined-stream": {
-          "version": "1.0.5",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "delayed-stream": "~1.0.0"
-          }
-        },
-        "concat-map": {
-          "version": "0.0.1",
-          "bundled": true,
-          "dev": true
-        },
-        "console-control-strings": {
-          "version": "1.1.0",
-          "bundled": true,
-          "dev": true
-        },
-        "core-util-is": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true
-        },
-        "cryptiles": {
-          "version": "2.0.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "boom": "2.x.x"
-          }
-        },
-        "dashdash": {
-          "version": "1.14.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "assert-plus": "^1.0.0"
-          },
-          "dependencies": {
-            "assert-plus": {
-              "version": "1.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            }
-          }
-        },
-        "debug": {
-          "version": "2.6.8",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "deep-extend": {
-          "version": "0.4.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "delayed-stream": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true
-        },
-        "delegates": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "ecc-jsbn": {
-          "version": "0.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "jsbn": "~0.1.0"
-          }
-        },
-        "extend": {
-          "version": "3.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "extsprintf": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true
-        },
-        "forever-agent": {
-          "version": "0.6.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "form-data": {
-          "version": "2.1.4",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "asynckit": "0.4.0",
-            "combined-stream": "1.0.5",
-            "mime-types": "2.1.15"
-          }
-        },
-        "fs.realpath": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true
-        },
-        "fstream": {
-          "version": "1.0.11",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "inherits": "~2.0.0",
-            "mkdirp": ">=0.5 0",
-            "rimraf": "2"
-          }
-        },
-        "fstream-ignore": {
-          "version": "1.0.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "fstream": "^1.0.0",
-            "inherits": "2",
-            "minimatch": "^3.0.0"
-          }
-        },
-        "gauge": {
-          "version": "2.7.4",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "aproba": "^1.0.3",
-            "console-control-strings": "^1.0.0",
-            "has-unicode": "^2.0.0",
-            "object-assign": "^4.1.0",
-            "signal-exit": "^3.0.0",
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1",
-            "wide-align": "^1.1.0"
-          }
-        },
-        "getpass": {
-          "version": "0.1.7",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "assert-plus": "^1.0.0"
-          },
-          "dependencies": {
-            "assert-plus": {
-              "version": "1.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            }
-          }
-        },
-        "glob": {
-          "version": "7.1.2",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        },
-        "graceful-fs": {
-          "version": "4.1.11",
-          "bundled": true,
-          "dev": true
-        },
-        "har-schema": {
-          "version": "1.0.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "har-validator": {
-          "version": "4.2.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ajv": "4.11.8",
-            "har-schema": "1.0.5"
-          }
-        },
-        "has-unicode": {
-          "version": "2.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "hawk": {
-          "version": "3.1.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "boom": "2.10.1",
-            "cryptiles": "2.0.5",
-            "hoek": "2.16.3",
-            "sntp": "1.0.9"
-          }
-        },
-        "hoek": {
-          "version": "2.16.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "http-signature": {
-          "version": "1.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "assert-plus": "^0.2.0",
-            "jsprim": "^1.2.2",
-            "sshpk": "^1.7.0"
-          }
-        },
-        "inflight": {
-          "version": "1.0.6",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "once": "^1.3.0",
-            "wrappy": "1"
-          }
-        },
-        "inherits": {
-          "version": "2.0.3",
-          "bundled": true,
-          "dev": true
-        },
-        "ini": {
-          "version": "1.3.4",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "number-is-nan": "1.0.1"
-          }
-        },
-        "is-typedarray": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "isarray": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true
-        },
-        "isstream": {
-          "version": "0.1.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "jodid25519": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "jsbn": "~0.1.0"
-          }
-        },
-        "jsbn": {
-          "version": "0.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "json-schema": {
-          "version": "0.2.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "json-stable-stringify": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "jsonify": "~0.0.0"
-          }
-        },
-        "json-stringify-safe": {
-          "version": "5.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "jsonify": {
-          "version": "0.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "jsprim": {
-          "version": "1.4.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "assert-plus": "1.0.0",
-            "extsprintf": "1.0.2",
-            "json-schema": "0.2.3",
-            "verror": "1.3.6"
-          },
-          "dependencies": {
-            "assert-plus": {
-              "version": "1.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            }
-          }
-        },
-        "mime-db": {
-          "version": "1.27.0",
-          "bundled": true,
-          "dev": true
-        },
-        "mime-types": {
-          "version": "2.1.15",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "mime-db": "1.27.0"
-          }
-        },
-        "minimatch": {
-          "version": "3.0.4",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "brace-expansion": "1.1.7"
-          }
-        },
-        "minimist": {
-          "version": "0.0.8",
-          "bundled": true,
-          "dev": true
-        },
-        "mkdirp": {
-          "version": "0.5.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "minimist": "0.0.8"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "node-pre-gyp": {
-          "version": "0.6.36",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "mkdirp": "^0.5.1",
-            "nopt": "^4.0.1",
-            "npmlog": "^4.0.2",
-            "rc": "^1.1.7",
-            "request": "^2.81.0",
-            "rimraf": "^2.6.1",
-            "semver": "^5.3.0",
-            "tar": "^2.2.1",
-            "tar-pack": "^3.4.0"
-          }
-        },
-        "nopt": {
-          "version": "4.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "abbrev": "1.1.0",
-            "osenv": "0.1.4"
-          }
-        },
-        "npmlog": {
-          "version": "4.1.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "are-we-there-yet": "~1.1.2",
-            "console-control-strings": "~1.1.0",
-            "gauge": "~2.7.3",
-            "set-blocking": "~2.0.0"
-          }
-        },
-        "number-is-nan": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true
-        },
-        "oauth-sign": {
-          "version": "0.8.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "object-assign": {
-          "version": "4.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "once": {
-          "version": "1.4.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "wrappy": "1"
-          }
-        },
-        "os-homedir": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "os-tmpdir": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "osenv": {
-          "version": "0.1.4",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "os-homedir": "1.0.2",
-            "os-tmpdir": "1.0.2"
-          }
-        },
-        "path-is-absolute": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true
-        },
-        "performance-now": {
-          "version": "0.2.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "process-nextick-args": {
-          "version": "1.0.7",
-          "bundled": true,
-          "dev": true
-        },
-        "punycode": {
-          "version": "1.4.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "qs": {
-          "version": "6.4.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "rc": {
-          "version": "1.2.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "deep-extend": "0.4.2",
-            "ini": "1.3.4",
-            "minimist": "1.2.0",
-            "strip-json-comments": "2.0.1"
-          },
-          "dependencies": {
-            "minimist": {
-              "version": "1.2.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            }
-          }
-        },
-        "readable-stream": {
-          "version": "2.2.9",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "buffer-shims": "~1.0.0",
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~1.0.6",
-            "string_decoder": "~1.0.0",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "request": {
-          "version": "2.81.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "aws-sign2": "~0.6.0",
-            "aws4": "^1.2.1",
-            "caseless": "~0.12.0",
-            "combined-stream": "~1.0.5",
-            "extend": "~3.0.0",
-            "forever-agent": "~0.6.1",
-            "form-data": "~2.1.1",
-            "har-validator": "~4.2.1",
-            "hawk": "~3.1.3",
-            "http-signature": "~1.1.0",
-            "is-typedarray": "~1.0.0",
-            "isstream": "~0.1.2",
-            "json-stringify-safe": "~5.0.1",
-            "mime-types": "~2.1.7",
-            "oauth-sign": "~0.8.1",
-            "performance-now": "^0.2.0",
-            "qs": "~6.4.0",
-            "safe-buffer": "^5.0.1",
-            "stringstream": "~0.0.4",
-            "tough-cookie": "~2.3.0",
-            "tunnel-agent": "^0.6.0",
-            "uuid": "^3.0.0"
-          }
-        },
-        "rimraf": {
-          "version": "2.6.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "glob": "^7.0.5"
-          }
-        },
-        "safe-buffer": {
-          "version": "5.0.1",
-          "bundled": true,
-          "dev": true
-        },
-        "semver": {
-          "version": "5.3.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "set-blocking": {
-          "version": "2.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "signal-exit": {
-          "version": "3.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "sntp": {
-          "version": "1.0.9",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "hoek": "2.16.3"
-          }
-        },
-        "sshpk": {
-          "version": "1.13.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "asn1": "~0.2.3",
-            "assert-plus": "^1.0.0",
-            "bcrypt-pbkdf": "^1.0.0",
-            "dashdash": "^1.12.0",
-            "ecc-jsbn": "~0.1.1",
-            "getpass": "^0.1.1",
-            "jodid25519": "^1.0.0",
-            "jsbn": "~0.1.0",
-            "tweetnacl": "~0.14.0"
-          },
-          "dependencies": {
-            "assert-plus": {
-              "version": "1.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            }
-          }
-        },
-        "string-width": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "code-point-at": "1.1.0",
-            "is-fullwidth-code-point": "1.0.0",
-            "strip-ansi": "3.0.1"
-          }
-        },
-        "string_decoder": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "safe-buffer": "5.0.1"
-          }
-        },
-        "stringstream": {
-          "version": "0.0.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "ansi-regex": "2.1.1"
-          }
-        },
-        "strip-json-comments": {
-          "version": "2.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "tar": {
-          "version": "2.2.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "block-stream": "*",
-            "fstream": "^1.0.2",
-            "inherits": "2"
-          }
-        },
-        "tar-pack": {
-          "version": "3.4.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "debug": "^2.2.0",
-            "fstream": "^1.0.10",
-            "fstream-ignore": "^1.0.5",
-            "once": "^1.3.3",
-            "readable-stream": "^2.1.4",
-            "rimraf": "^2.5.1",
-            "tar": "^2.2.1",
-            "uid-number": "^0.0.6"
-          }
-        },
-        "tough-cookie": {
-          "version": "2.3.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "punycode": "1.4.1"
-          }
-        },
-        "tunnel-agent": {
-          "version": "0.6.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "safe-buffer": "5.0.1"
-          }
-        },
-        "tweetnacl": {
-          "version": "0.14.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "uid-number": {
-          "version": "0.0.6",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "util-deprecate": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true
-        },
-        "uuid": {
-          "version": "3.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "verror": {
-          "version": "1.3.6",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "extsprintf": "1.0.2"
-          }
-        },
-        "wide-align": {
-          "version": "1.1.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "string-width": "^1.0.2"
-          }
-        },
-        "wrappy": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true
-        }
-      }
-    },
-    "function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-      "dev": true
-    },
-    "fuse.js": {
-      "version": "2.7.4",
-      "resolved": "https://registry.npmjs.org/fuse.js/-/fuse.js-2.7.4.tgz",
-      "integrity": "sha1-luQg/efvARrEnCWKYhMU/ldlNvk="
-    },
-    "gemini-scrollbar": {
-      "version": "github:matrix-org/gemini-scrollbar#b302279810d05319ac5ff1bd34910bff32325c7b",
-      "from": "gemini-scrollbar@github:matrix-org/gemini-scrollbar#b302279810d05319ac5ff1bd34910bff32325c7b"
-    },
-    "generate-function": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz",
-      "integrity": "sha1-aFj+fAlpt9TpCTM3ZHrHn2DfvnQ=",
-      "dev": true
-    },
-    "generate-object-property": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
-      "integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=",
-      "dev": true,
-      "requires": {
-        "is-property": "^1.0.0"
-      }
-    },
-    "getpass": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-      "requires": {
-        "assert-plus": "^1.0.0"
-      }
-    },
-    "gfm.css": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/gfm.css/-/gfm.css-1.1.2.tgz",
-      "integrity": "sha512-KhK3rqxMj+UTLRxWnfUA5n8XZYMWfHrrcCxtWResYR2B3hWIqBM6v9FPGZSlVuX+ScLewizOvNkjYXuPs95ThQ=="
-    },
-    "glob": {
-      "version": "5.0.15",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-      "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
-      "requires": {
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "2 || 3",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      }
-    },
-    "glob-base": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
-      "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
-      "dev": true,
-      "requires": {
-        "glob-parent": "^2.0.0",
-        "is-glob": "^2.0.0"
-      }
-    },
-    "glob-parent": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
-      "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
-      "dev": true,
-      "requires": {
-        "is-glob": "^2.0.0"
-      }
-    },
-    "globals": {
-      "version": "9.18.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
-      "integrity": "sha1-qjiWs+abSH8X4x7SFD1pqOMMLYo=",
-      "dev": true
-    },
-    "globby": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz",
-      "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=",
-      "dev": true,
-      "requires": {
-        "array-union": "^1.0.1",
-        "arrify": "^1.0.0",
-        "glob": "^7.0.3",
-        "object-assign": "^4.0.1",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
-      },
-      "dependencies": {
-        "glob": {
-          "version": "7.1.2",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-          "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
-          "dev": true,
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        }
-      }
-    },
-    "graceful-fs": {
-      "version": "4.1.11",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
-      "dev": true
-    },
-    "har-schema": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
-    },
-    "har-validator": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
-      "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
-      "requires": {
-        "ajv": "^5.1.0",
-        "har-schema": "^2.0.0"
-      }
-    },
-    "has": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz",
-      "integrity": "sha1-hGFzP1OLCDfJNh45qauelwTcLyg=",
-      "dev": true,
-      "requires": {
-        "function-bind": "^1.0.2"
-      }
-    },
-    "has-ansi": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-      "dev": true,
-      "requires": {
-        "ansi-regex": "^2.0.0"
-      }
-    },
-    "has-binary": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/has-binary/-/has-binary-0.1.7.tgz",
-      "integrity": "sha1-aOYesWIQyVRaClzOBqhzkS/h5ow=",
-      "dev": true,
-      "requires": {
-        "isarray": "0.0.1"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-          "dev": true
-        }
-      }
-    },
-    "has-cors": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz",
-      "integrity": "sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=",
-      "dev": true
-    },
-    "has-flag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-      "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-      "dev": true
-    },
-    "he": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz",
-      "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=",
-      "dev": true
-    },
-    "highlight.js": {
-      "version": "9.12.0",
-      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.12.0.tgz",
-      "integrity": "sha1-5tnb5Xy+/mB1HwKvM2GVhwyQwB4="
-    },
-    "hoist-non-react-statics": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.0.tgz",
-      "integrity": "sha512-6Bl6XsDT1ntE0lHbIhr4Kp2PGcleGZ66qu5Jqk8lc0Xc/IeG6gVLmwUGs/K0Us+L8VWoKgj0uWdPMataOsm31w=="
-    },
-    "home-or-tmp": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz",
-      "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=",
-      "dev": true,
-      "requires": {
-        "os-homedir": "^1.0.0",
-        "os-tmpdir": "^1.0.1"
-      }
-    },
-    "htmlparser2": {
-      "version": "3.9.2",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz",
-      "integrity": "sha1-G9+HrMoPP55T+k/M6w9LTLsAszg=",
-      "requires": {
-        "domelementtype": "^1.3.0",
-        "domhandler": "^2.3.0",
-        "domutils": "^1.5.1",
-        "entities": "^1.1.1",
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.0.2"
-      }
-    },
-    "http-errors": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz",
-      "integrity": "sha1-CgAsyFcHGSp+eUbO7cERVfYOxzY=",
-      "dev": true,
-      "requires": {
-        "depd": "1.1.1",
-        "inherits": "2.0.3",
-        "setprototypeof": "1.0.3",
-        "statuses": ">= 1.3.1 < 2"
-      }
-    },
-    "http-proxy": {
-      "version": "1.16.2",
-      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.16.2.tgz",
-      "integrity": "sha1-Bt/ykpUr9k2+hHH6nfcwZtTzd0I=",
-      "dev": true,
-      "requires": {
-        "eventemitter3": "1.x.x",
-        "requires-port": "1.x.x"
-      }
-    },
-    "http-signature": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
-      "requires": {
-        "assert-plus": "^1.0.0",
-        "jsprim": "^1.2.2",
-        "sshpk": "^1.7.0"
-      }
-    },
-    "https-browserify": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz",
-      "integrity": "sha1-P5E2XKvmC3ftDruiS0VOPgnZWoI=",
-      "dev": true
-    },
-    "iconv-lite": {
-      "version": "0.4.19",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz",
-      "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ=="
-    },
-    "ieee754": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz",
-      "integrity": "sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q=",
-      "dev": true
-    },
-    "ignore": {
-      "version": "3.3.5",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.5.tgz",
-      "integrity": "sha512-JLH93mL8amZQhh/p6mfQgVBH3M6epNq3DfsXsTSuSrInVjwyYlFE1nv2AgfRCC8PoOhM0jwQ5v8s9LgbK7yGDw==",
-      "dev": true
-    },
-    "immutable": {
-      "version": "3.7.6",
-      "resolved": "https://registry.npmjs.org/immutable/-/immutable-3.7.6.tgz",
-      "integrity": "sha1-E7TTyxK++hVIKib+Gy665kAHHks="
-    },
-    "imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
-      "dev": true
-    },
-    "indexof": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz",
-      "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10="
-    },
-    "inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "requires": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
-    },
-    "inquirer": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz",
-      "integrity": "sha1-HvK/1jUE3wvHV4X/+MLEHfEvB34=",
-      "dev": true,
-      "requires": {
-        "ansi-escapes": "^1.1.0",
-        "ansi-regex": "^2.0.0",
-        "chalk": "^1.0.0",
-        "cli-cursor": "^1.0.1",
-        "cli-width": "^2.0.0",
-        "figures": "^1.3.5",
-        "lodash": "^4.3.0",
-        "readline2": "^1.0.1",
-        "run-async": "^0.1.0",
-        "rx-lite": "^3.1.2",
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.0",
-        "through": "^2.3.6"
-      }
-    },
-    "interpret": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.0.4.tgz",
-      "integrity": "sha1-ggzdWIuGj/sZGoCVBtbJyPISsbA=",
-      "dev": true
-    },
-    "invariant": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz",
-      "integrity": "sha1-nh9WrArNtr8wMwbzOL47IErmA2A=",
-      "requires": {
-        "loose-envify": "^1.0.0"
-      }
-    },
-    "is-arrow-function": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/is-arrow-function/-/is-arrow-function-2.0.3.tgz",
-      "integrity": "sha1-Kb4sLY2UUIUri7r7Y1unuNjofsI=",
-      "dev": true,
-      "requires": {
-        "is-callable": "^1.0.4"
-      }
-    },
-    "is-binary-path": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
-      "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
-      "dev": true,
-      "requires": {
-        "binary-extensions": "^1.0.0"
-      }
-    },
-    "is-boolean-object": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.0.0.tgz",
-      "integrity": "sha1-mPiygDBoQhmpXzdc+9iM40Bd/5M=",
-      "dev": true
-    },
-    "is-buffer": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz",
-      "integrity": "sha1-Hzsm72E7IUuIy8ojzGwB2Hlh7sw=",
-      "dev": true
-    },
-    "is-callable": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.3.tgz",
-      "integrity": "sha1-hut1OSgF3cM69xySoO7fdO52BLI=",
-      "dev": true
-    },
-    "is-date-object": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
-      "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=",
-      "dev": true
-    },
-    "is-dotfile": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz",
-      "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=",
-      "dev": true
-    },
-    "is-equal": {
-      "version": "1.5.5",
-      "resolved": "https://registry.npmjs.org/is-equal/-/is-equal-1.5.5.tgz",
-      "integrity": "sha1-XoXxlX4FKIMkf+s4aWWju6Ffuz0=",
-      "dev": true,
-      "requires": {
-        "has": "^1.0.1",
-        "is-arrow-function": "^2.0.3",
-        "is-boolean-object": "^1.0.0",
-        "is-callable": "^1.1.3",
-        "is-date-object": "^1.0.1",
-        "is-generator-function": "^1.0.6",
-        "is-number-object": "^1.0.3",
-        "is-regex": "^1.0.3",
-        "is-string": "^1.0.4",
-        "is-symbol": "^1.0.1",
-        "object.entries": "^1.0.4"
-      }
-    },
-    "is-equal-shallow": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
-      "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
-      "dev": true,
-      "requires": {
-        "is-primitive": "^2.0.0"
-      }
-    },
-    "is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-      "dev": true
-    },
-    "is-extglob": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-      "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-      "dev": true
-    },
-    "is-finite": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
-      "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
-      "dev": true,
-      "requires": {
-        "number-is-nan": "^1.0.0"
-      }
-    },
-    "is-fullwidth-code-point": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-      "dev": true,
-      "requires": {
-        "number-is-nan": "^1.0.0"
-      }
-    },
-    "is-generator-function": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.6.tgz",
-      "integrity": "sha1-nnFlPNFf/zQcecQVFGChMdMen8Q=",
-      "dev": true
-    },
-    "is-glob": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-      "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-      "dev": true,
-      "requires": {
-        "is-extglob": "^1.0.0"
-      }
-    },
-    "is-my-json-valid": {
-      "version": "2.16.1",
-      "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.1.tgz",
-      "integrity": "sha512-ochPsqWS1WXj8ZnMIV0vnNXooaMhp7cyL4FMSIPKTtnV0Ha/T19G2b9kkhcNsabV9bxYkze7/aLZJb/bYuFduQ==",
-      "dev": true,
-      "requires": {
-        "generate-function": "^2.0.0",
-        "generate-object-property": "^1.1.0",
-        "jsonpointer": "^4.0.0",
-        "xtend": "^4.0.0"
-      }
-    },
-    "is-number": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
-      "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
-      "dev": true,
-      "requires": {
-        "kind-of": "^3.0.2"
-      }
-    },
-    "is-number-object": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.3.tgz",
-      "integrity": "sha1-8mWrian0RQNO9q/xWo8AsA9VF5k=",
-      "dev": true
-    },
-    "is-path-cwd": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
-      "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=",
-      "dev": true
-    },
-    "is-path-in-cwd": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz",
-      "integrity": "sha1-ZHdYK4IU1gI0YJRWcAO+ip6sBNw=",
-      "dev": true,
-      "requires": {
-        "is-path-inside": "^1.0.0"
-      }
-    },
-    "is-path-inside": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.0.tgz",
-      "integrity": "sha1-/AbloWg/vaE95mev9xe7wQpI838=",
-      "dev": true,
-      "requires": {
-        "path-is-inside": "^1.0.1"
-      }
-    },
-    "is-posix-bracket": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
-      "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=",
-      "dev": true
-    },
-    "is-primitive": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
-      "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=",
-      "dev": true
-    },
-    "is-property": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
-      "integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=",
-      "dev": true
-    },
-    "is-regex": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
-      "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
-      "dev": true,
-      "requires": {
-        "has": "^1.0.1"
-      }
-    },
-    "is-resolvable": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.0.0.tgz",
-      "integrity": "sha1-jfV8YeouPFAUCNEA+wE8+NbgzGI=",
-      "dev": true,
-      "requires": {
-        "tryit": "^1.0.1"
-      }
-    },
-    "is-stream": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
-    },
-    "is-string": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.4.tgz",
-      "integrity": "sha1-zDqbaYV9Yh6WNyWiTK7shzuCbmQ=",
-      "dev": true
-    },
-    "is-symbol": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz",
-      "integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI=",
-      "dev": true
-    },
-    "is-typedarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
-    },
-    "isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
-    },
-    "isbinaryfile": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.2.tgz",
-      "integrity": "sha1-Sj6XTsDLqQBNP8bN5yCeppNopiE=",
-      "dev": true
-    },
-    "isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-      "dev": true
-    },
-    "isobject": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-      "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-      "dev": true,
-      "requires": {
-        "isarray": "1.0.0"
-      }
-    },
-    "isomorphic-fetch": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz",
-      "integrity": "sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=",
-      "requires": {
-        "node-fetch": "^1.0.1",
-        "whatwg-fetch": ">=0.10.0"
-      }
-    },
-    "isstream": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
-    },
-    "jquery": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.2.1.tgz",
-      "integrity": "sha1-XE2d5lKvbNCncBVKYxu6ErAVx4c="
-    },
-    "js-tokens": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
-      "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls="
-    },
-    "js-yaml": {
-      "version": "3.10.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz",
-      "integrity": "sha512-O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA==",
-      "dev": true,
-      "requires": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      }
-    },
-    "jsbn": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-      "optional": true
-    },
-    "jsesc": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
-      "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=",
-      "dev": true
-    },
-    "json-loader": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/json-loader/-/json-loader-0.5.7.tgz",
-      "integrity": "sha512-QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w==",
-      "dev": true
-    },
-    "json-schema": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
-    },
-    "json-schema-traverse": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
-      "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A="
-    },
-    "json-stable-stringify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
-      "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
-      "dev": true,
-      "requires": {
-        "jsonify": "~0.0.0"
-      }
-    },
-    "json-stringify-safe": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
-    },
-    "json3": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz",
-      "integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=",
-      "dev": true
-    },
-    "json5": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
-      "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
-      "dev": true
-    },
-    "jsonify": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
-      "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
-      "dev": true
-    },
-    "jsonpointer": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz",
-      "integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=",
-      "dev": true
-    },
-    "jsprim": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-      "requires": {
-        "assert-plus": "1.0.0",
-        "extsprintf": "1.3.0",
-        "json-schema": "0.2.3",
-        "verror": "1.10.0"
-      }
-    },
-    "jsx-ast-utils": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-2.0.1.tgz",
-      "integrity": "sha1-6AGxs5mF4g//yHtA43SAgOLcrH8=",
-      "dev": true,
-      "requires": {
-        "array-includes": "^3.0.3"
-      }
-    },
-    "just-extend": {
-      "version": "1.1.27",
-      "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-1.1.27.tgz",
-      "integrity": "sha512-mJVp13Ix6gFo3SBAy9U/kL+oeZqzlYYYLQBwXVBlVzIsZwBqGREnOro24oC/8s8aox+rJhtZ2DiQof++IrkA+g==",
-      "dev": true
-    },
-    "karma": {
-      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/karma/-/karma-1.7.1.tgz",
-      "integrity": "sha512-k5pBjHDhmkdaUccnC7gE3mBzZjcxyxYsYVaqiL2G5AqlfLyBO5nw2VdNK+O16cveEPd/gIOWULH7gkiYYwVNHg==",
-      "dev": true,
-      "requires": {
-        "bluebird": "^3.3.0",
-        "body-parser": "^1.16.1",
-        "chokidar": "^1.4.1",
-        "colors": "^1.1.0",
-        "combine-lists": "^1.0.0",
-        "connect": "^3.6.0",
-        "core-js": "^2.2.0",
-        "di": "^0.0.1",
-        "dom-serialize": "^2.2.0",
-        "expand-braces": "^0.1.1",
-        "glob": "^7.1.1",
-        "graceful-fs": "^4.1.2",
-        "http-proxy": "^1.13.0",
-        "isbinaryfile": "^3.0.0",
-        "lodash": "^3.8.0",
-        "log4js": "^0.6.31",
-        "mime": "^1.3.4",
-        "minimatch": "^3.0.2",
-        "optimist": "^0.6.1",
-        "qjobs": "^1.1.4",
-        "range-parser": "^1.2.0",
-        "rimraf": "^2.6.0",
-        "safe-buffer": "^5.0.1",
-        "socket.io": "1.7.3",
-        "source-map": "^0.5.3",
-        "tmp": "0.0.31",
-        "useragent": "^2.1.12"
-      },
-      "dependencies": {
-        "glob": {
-          "version": "7.1.2",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-          "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
-          "dev": true,
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        },
-        "lodash": {
-          "version": "3.10.1",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
-          "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=",
-          "dev": true
-        }
-      }
-    },
-    "karma-chrome-launcher": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-0.2.3.tgz",
-      "integrity": "sha1-TG1wDRY6nTTGGO/YeRi+SeekqMk=",
-      "dev": true,
-      "requires": {
-        "fs-access": "^1.0.0",
-        "which": "^1.2.1"
-      }
-    },
-    "karma-cli": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/karma-cli/-/karma-cli-0.1.2.tgz",
-      "integrity": "sha1-ys6oQ3Hs4Zh2JlyPoQLru5/uSow=",
-      "dev": true,
-      "requires": {
-        "resolve": "^1.1.6"
-      }
-    },
-    "karma-junit-reporter": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/karma-junit-reporter/-/karma-junit-reporter-0.4.2.tgz",
-      "integrity": "sha1-SSojZyj+TJKqz0GfzQEQpDJ+nX8=",
-      "dev": true,
-      "requires": {
-        "path-is-absolute": "^1.0.0",
-        "xmlbuilder": "3.1.0"
-      }
-    },
-    "karma-logcapture-reporter": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/karma-logcapture-reporter/-/karma-logcapture-reporter-0.0.1.tgz",
-      "integrity": "sha1-vxsLHJFeDeKVoV/i8BedQoG6zdw=",
-      "dev": true
-    },
-    "karma-mocha": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/karma-mocha/-/karma-mocha-0.2.2.tgz",
-      "integrity": "sha1-OI7ZF9oV3LGW0bkVwZNO+AMZP44=",
-      "dev": true
-    },
-    "karma-sourcemap-loader": {
-      "version": "0.3.7",
-      "resolved": "https://registry.npmjs.org/karma-sourcemap-loader/-/karma-sourcemap-loader-0.3.7.tgz",
-      "integrity": "sha1-kTIsd/jxPUb+0GKwQuEAnUxFBdg=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.2"
-      }
-    },
-    "karma-spec-reporter": {
-      "version": "0.0.31",
-      "resolved": "https://registry.npmjs.org/karma-spec-reporter/-/karma-spec-reporter-0.0.31.tgz",
-      "integrity": "sha1-SDDccUihVcfXoYbmMjOaDYD63sM=",
-      "dev": true,
-      "requires": {
-        "colors": "^1.1.2"
-      }
-    },
-    "karma-summary-reporter": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/karma-summary-reporter/-/karma-summary-reporter-1.3.3.tgz",
-      "integrity": "sha1-nHQKJLYL+RNes59acylsTM0Q2Zs=",
-      "dev": true,
-      "requires": {
-        "chalk": "^1.1.3"
-      }
-    },
-    "karma-webpack": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/karma-webpack/-/karma-webpack-1.8.1.tgz",
-      "integrity": "sha1-OdX9Lt7qPMPvW0BZibN9Ww5qO04=",
-      "dev": true,
-      "requires": {
-        "async": "~0.9.0",
-        "loader-utils": "^0.2.5",
-        "lodash": "^3.8.0",
-        "source-map": "^0.1.41",
-        "webpack-dev-middleware": "^1.0.11"
-      },
-      "dependencies": {
-        "lodash": {
-          "version": "3.10.1",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
-          "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.1.43",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
-          "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
-          "dev": true,
-          "requires": {
-            "amdefine": ">=0.0.4"
-          }
-        }
-      }
-    },
-    "kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "requires": {
-        "is-buffer": "^1.1.5"
-      }
-    },
-    "lazy-cache": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
-      "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=",
-      "dev": true
-    },
-    "levn": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
-      "dev": true,
-      "requires": {
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2"
-      }
-    },
-    "linkifyjs": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/linkifyjs/-/linkifyjs-2.1.5.tgz",
-      "integrity": "sha512-8FqxPXQDLjI2nNHlM7eGewxE6DHvMbtiW0AiXzm0s4RkTwVZYRDTeVXkiRxLHTd4CuRBQY/JPtvtqJWdS7gHyA==",
-      "requires": {
-        "jquery": ">=1.9.0",
-        "react": ">=0.14.0",
-        "react-dom": ">=0.14.0"
-      }
-    },
-    "loader-utils": {
-      "version": "0.2.17",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz",
-      "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=",
-      "dev": true,
-      "requires": {
-        "big.js": "^3.1.3",
-        "emojis-list": "^2.0.0",
-        "json5": "^0.5.0",
-        "object-assign": "^4.0.1"
-      }
-    },
-    "lodash": {
-      "version": "4.17.4",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-      "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4="
-    },
-    "lodash-es": {
-      "version": "4.17.10",
-      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.10.tgz",
-      "integrity": "sha512-iesFYPmxYYGTcmQK0sL8bX3TGHyM6b2qREaB4kamHfQyfPJP0xgoGxp19nsH16nsfquLdiyKyX3mQkfiSGV8Rg=="
-    },
-    "lodash.assign": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz",
-      "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=",
-      "dev": true
-    },
-    "lodash.get": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
-      "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=",
-      "dev": true
-    },
-    "lodash.pickby": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/lodash.pickby/-/lodash.pickby-4.6.0.tgz",
-      "integrity": "sha1-feoh2MGNdwOifHBMFdO4SmfjOv8=",
-      "dev": true
-    },
-    "log4js": {
-      "version": "0.6.38",
-      "resolved": "https://registry.npmjs.org/log4js/-/log4js-0.6.38.tgz",
-      "integrity": "sha1-LElBFmldb7JUgJQ9P8hy5mKlIv0=",
-      "dev": true,
-      "requires": {
-        "readable-stream": "~1.0.2",
-        "semver": "~4.3.3"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "1.0.34",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
-            "isarray": "0.0.1",
-            "string_decoder": "~0.10.x"
-          }
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-          "dev": true
-        }
-      }
-    },
-    "lolex": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/lolex/-/lolex-2.3.2.tgz",
-      "integrity": "sha512-A5pN2tkFj7H0dGIAM6MFvHKMJcPnjZsOMvR7ujCjfgW5TbV6H9vb1PgxLtHvjqNZTHsUolz+6/WEO0N1xNx2ng=="
-    },
-    "longest": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
-      "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=",
-      "dev": true
-    },
-    "loose-envify": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz",
-      "integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=",
-      "requires": {
-        "js-tokens": "^3.0.0"
-      }
-    },
-    "lru-cache": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz",
-      "integrity": "sha1-bGWGGb7PFAMdDQtZSxYELOTcBj0=",
-      "dev": true
-    },
-    "matrix-js-sdk": {
-      "version": "0.10.2",
-      "resolved": "https://registry.npmjs.org/matrix-js-sdk/-/matrix-js-sdk-0.10.2.tgz",
-      "integrity": "sha512-7o9a+4wWmxoW4cfdGVLGjZgTFLpWf/I0UqyicIzdV73qotYIO/q6k1bLf1+G0hgwZ/umwke4CB7GemxvvvxMcA==",
-      "requires": {
-        "another-json": "^0.2.0",
-        "babel-runtime": "^6.26.0",
-        "bluebird": "^3.5.0",
-        "browser-request": "^0.3.3",
-        "content-type": "^1.0.2",
-        "request": "^2.53.0"
-      }
-    },
-    "matrix-mock-request": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/matrix-mock-request/-/matrix-mock-request-1.2.1.tgz",
-      "integrity": "sha1-2aWrqNPYJG6I/3YyWYuZwUE/QjI=",
-      "dev": true,
-      "requires": {
-        "bluebird": "^3.5.0",
-        "expect": "^1.20.2"
-      }
-    },
-    "matrix-react-test-utils": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/matrix-react-test-utils/-/matrix-react-test-utils-0.1.1.tgz",
-      "integrity": "sha1-tUiETQ6+M46hucjxZHTDDRfDvfQ=",
-      "dev": true,
-      "requires": {
-        "react": "^15.6.1",
-        "react-dom": "^15.6.1"
-      }
-    },
-    "mdurl": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
-      "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4="
-    },
-    "media-typer": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
-      "dev": true
-    },
-    "memoize-one": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-3.1.1.tgz",
-      "integrity": "sha512-YqVh744GsMlZu6xkhGslPSqSurOv6P+kLN2J3ysBZfagLcL5FdRK/0UpgLoL8hwjjEvvAVkjJZyFP+1T6p1vgA=="
-    },
-    "memory-fs": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
-      "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
-      "dev": true,
-      "requires": {
-        "errno": "^0.1.3",
-        "readable-stream": "^2.0.1"
-      }
-    },
-    "micromatch": {
-      "version": "2.3.11",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
-      "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
-      "dev": true,
-      "requires": {
-        "arr-diff": "^2.0.0",
-        "array-unique": "^0.2.1",
-        "braces": "^1.8.2",
-        "expand-brackets": "^0.1.4",
-        "extglob": "^0.3.1",
-        "filename-regex": "^2.0.0",
-        "is-extglob": "^1.0.0",
-        "is-glob": "^2.0.1",
-        "kind-of": "^3.0.2",
-        "normalize-path": "^2.0.1",
-        "object.omit": "^2.0.0",
-        "parse-glob": "^3.0.4",
-        "regex-cache": "^0.4.2"
-      }
-    },
-    "mime": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
-      "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==",
-      "dev": true
-    },
-    "mime-db": {
-      "version": "1.30.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz",
-      "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE="
-    },
-    "mime-types": {
-      "version": "2.1.17",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
-      "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=",
-      "requires": {
-        "mime-db": "~1.30.0"
-      }
-    },
-    "minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
-      "requires": {
-        "brace-expansion": "^1.1.7"
-      }
-    },
-    "minimist": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
-    },
-    "mkdirp": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-      "dev": true,
-      "requires": {
-        "minimist": "0.0.8"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "0.0.8",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-          "dev": true
-        }
-      }
-    },
-    "mocha": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-5.1.1.tgz",
-      "integrity": "sha512-kKKs/H1KrMMQIEsWNxGmb4/BGsmj0dkeyotEvbrAuQ01FcWRLssUNXCEUZk6SZtyJBi6EE7SL0zDDtItw1rGhw==",
-      "dev": true,
-      "requires": {
-        "browser-stdout": "1.3.1",
-        "commander": "2.11.0",
-        "debug": "3.1.0",
-        "diff": "3.5.0",
-        "escape-string-regexp": "1.0.5",
-        "glob": "7.1.2",
-        "growl": "1.10.3",
-        "he": "1.1.1",
-        "minimatch": "3.0.4",
-        "mkdirp": "0.5.1",
-        "supports-color": "4.4.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "diff": {
-          "version": "3.5.0",
-          "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
-          "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
-          "dev": true
-        },
-        "glob": {
-          "version": "7.1.2",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-          "dev": true,
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        },
-        "growl": {
-          "version": "1.10.3",
-          "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.3.tgz",
-          "integrity": "sha512-hKlsbA5Vu3xsh1Cg3J7jSmX/WaW6A5oBeqzM88oNbCRQFz+zUaXm6yxS4RVytp1scBoJzSYl4YAEOQIt6O8V1Q==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "4.4.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz",
-          "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^2.0.0"
-          }
-        }
-      }
-    },
-    "ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
-    },
-    "mute-stream": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz",
-      "integrity": "sha1-j7+rsKmKJT0xhDMfno3rc3L6xsA=",
-      "dev": true
-    },
-    "nan": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.7.0.tgz",
-      "integrity": "sha1-2Vv3IeyHfgjbJ27T/G63j5CDrUY=",
-      "dev": true,
-      "optional": true
-    },
-    "natural-compare": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
-      "dev": true
-    },
-    "negotiator": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz",
-      "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=",
-      "dev": true
-    },
-    "nise": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/nise/-/nise-1.3.3.tgz",
-      "integrity": "sha512-v1J/FLUB9PfGqZLGDBhQqODkbLotP0WtLo9R4EJY2PPu5f5Xg4o0rA8FDlmrjFSv9vBBKcfnOSpfYYuu5RTHqg==",
-      "dev": true,
-      "requires": {
-        "@sinonjs/formatio": "^2.0.0",
-        "just-extend": "^1.1.27",
-        "lolex": "^2.3.2",
-        "path-to-regexp": "^1.7.0",
-        "text-encoding": "^0.6.4"
-      },
-      "dependencies": {
-        "lolex": {
-          "version": "2.6.0",
-          "resolved": "https://registry.npmjs.org/lolex/-/lolex-2.6.0.tgz",
-          "integrity": "sha512-e1UtIo1pbrIqEXib/yMjHciyqkng5lc0rrIbytgjmRgDR9+2ceNIAcwOWSgylRjoEP9VdVguCSRwnNmlbnOUwA==",
-          "dev": true
-        }
-      }
-    },
-    "node-fetch": {
-      "version": "1.7.3",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz",
-      "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==",
-      "requires": {
-        "encoding": "^0.1.11",
-        "is-stream": "^1.0.1"
-      }
-    },
-    "node-libs-browser": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-0.7.0.tgz",
-      "integrity": "sha1-PicsCBnjCJNeJmdECNevDhSRuDs=",
-      "dev": true,
-      "requires": {
-        "assert": "^1.1.1",
-        "browserify-zlib": "^0.1.4",
-        "buffer": "^4.9.0",
-        "console-browserify": "^1.1.0",
-        "constants-browserify": "^1.0.0",
-        "crypto-browserify": "3.3.0",
-        "domain-browser": "^1.1.1",
-        "events": "^1.0.0",
-        "https-browserify": "0.0.1",
-        "os-browserify": "^0.2.0",
-        "path-browserify": "0.0.0",
-        "process": "^0.11.0",
-        "punycode": "^1.2.4",
-        "querystring-es3": "^0.2.0",
-        "readable-stream": "^2.0.5",
-        "stream-browserify": "^2.0.1",
-        "stream-http": "^2.3.1",
-        "string_decoder": "^0.10.25",
-        "timers-browserify": "^2.0.2",
-        "tty-browserify": "0.0.0",
-        "url": "^0.11.0",
-        "util": "^0.10.3",
-        "vm-browserify": "0.0.4"
-      },
-      "dependencies": {
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-          "dev": true
-        }
-      }
-    },
-    "normalize-path": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-      "dev": true,
-      "requires": {
-        "remove-trailing-separator": "^1.0.1"
-      }
-    },
-    "null-check": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/null-check/-/null-check-1.0.0.tgz",
-      "integrity": "sha1-l33/1xdgErnsMNKjnbXPcqBDnt0=",
-      "dev": true
-    },
-    "number-is-nan": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-      "dev": true
-    },
-    "oauth-sign": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
-      "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM="
-    },
-    "object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
-    },
-    "object-component": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz",
-      "integrity": "sha1-8MaapQ78lbhmwYb0AKM3acsvEpE=",
-      "dev": true
-    },
-    "object-inspect": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.3.0.tgz",
-      "integrity": "sha512-OHHnLgLNXpM++GnJRyyhbr2bwl3pPVm4YvaraHrRvDt/N3r+s/gDVHciA7EJBTkijKXj61ssgSAikq1fb0IBRg==",
-      "dev": true
-    },
-    "object-keys": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz",
-      "integrity": "sha1-xUYBd4rVYPEULODgG8yotW0TQm0=",
-      "dev": true
-    },
-    "object.entries": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.0.4.tgz",
-      "integrity": "sha1-G/mk3SKI9bM/Opk9JXZh8F0WGl8=",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.2",
-        "es-abstract": "^1.6.1",
-        "function-bind": "^1.1.0",
-        "has": "^1.0.1"
-      }
-    },
-    "object.omit": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
-      "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
-      "dev": true,
-      "requires": {
-        "for-own": "^0.1.4",
-        "is-extendable": "^0.1.1"
-      }
-    },
-    "on-finished": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
-      "dev": true,
-      "requires": {
-        "ee-first": "1.1.1"
-      }
-    },
-    "once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "requires": {
-        "wrappy": "1"
-      }
-    },
-    "onetime": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
-      "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=",
-      "dev": true
-    },
-    "optimist": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
-      "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
-      "requires": {
-        "minimist": "~0.0.1",
-        "wordwrap": "~0.0.2"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "0.0.10",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
-          "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8="
-        }
-      }
-    },
-    "optionator": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
-      "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
-      "dev": true,
-      "requires": {
-        "deep-is": "~0.1.3",
-        "fast-levenshtein": "~2.0.4",
-        "levn": "~0.3.0",
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2",
-        "wordwrap": "~1.0.0"
-      },
-      "dependencies": {
-        "wordwrap": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
-          "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
-          "dev": true
-        }
-      }
-    },
-    "options": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/options/-/options-0.0.6.tgz",
-      "integrity": "sha1-7CLTEoBrtT5zF3Pnza788cZDEo8=",
-      "dev": true
-    },
-    "os-browserify": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.2.1.tgz",
-      "integrity": "sha1-Y/xMzuXS13Y9Jrv4YBB45sLgBE8=",
-      "dev": true
-    },
-    "os-homedir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
-      "dev": true
-    },
-    "os-tmpdir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-      "dev": true
-    },
-    "output-file-sync": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/output-file-sync/-/output-file-sync-1.1.2.tgz",
-      "integrity": "sha1-0KM+7+YaIF+suQCS6CZZjVJFznY=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.4",
-        "mkdirp": "^0.5.1",
-        "object-assign": "^4.1.0"
-      }
-    },
-    "pako": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz",
-      "integrity": "sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg=="
-    },
-    "parallelshell": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/parallelshell/-/parallelshell-3.0.2.tgz",
-      "integrity": "sha512-aW73W8tmYiFZtQi41pweV3WWT6o/EvSxAVQHbumOhN53H47OuWQwrRc11xQ2i44GFvR5AjtzhD92r8Kv9X+7Iw==",
-      "dev": true
-    },
-    "parse-glob": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
-      "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
-      "dev": true,
-      "requires": {
-        "glob-base": "^0.3.0",
-        "is-dotfile": "^1.0.0",
-        "is-extglob": "^1.0.0",
-        "is-glob": "^2.0.0"
-      }
-    },
-    "parsejson": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/parsejson/-/parsejson-0.0.3.tgz",
-      "integrity": "sha1-q343WfIJ7OmUN5c/fQ8fZK4OZKs=",
-      "dev": true,
-      "requires": {
-        "better-assert": "~1.0.0"
-      }
-    },
-    "parseqs": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz",
-      "integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=",
-      "dev": true,
-      "requires": {
-        "better-assert": "~1.0.0"
-      }
-    },
-    "parseuri": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz",
-      "integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=",
-      "dev": true,
-      "requires": {
-        "better-assert": "~1.0.0"
-      }
-    },
-    "parseurl": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz",
-      "integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=",
-      "dev": true
-    },
-    "path-browserify": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz",
-      "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=",
-      "dev": true
-    },
-    "path-exists": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-      "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-      "dev": true,
-      "requires": {
-        "pinkie-promise": "^2.0.0"
-      }
-    },
-    "path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
-    },
-    "path-is-inside": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
-      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=",
-      "dev": true
-    },
-    "path-parse": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz",
-      "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=",
-      "dev": true
-    },
-    "path-to-regexp": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz",
-      "integrity": "sha1-Wf3g9DW62suhA6hOnTvGTpa5k30=",
-      "dev": true,
-      "requires": {
-        "isarray": "0.0.1"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-          "dev": true
-        }
-      }
-    },
-    "pbkdf2-compat": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pbkdf2-compat/-/pbkdf2-compat-2.0.1.tgz",
-      "integrity": "sha1-tuDI+plJTZTgURV1gCpZpcFC8og=",
-      "dev": true
-    },
-    "performance-now": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
-    },
-    "pify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-      "dev": true
-    },
-    "pinkie": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
-      "dev": true
-    },
-    "pinkie-promise": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
-      "dev": true,
-      "requires": {
-        "pinkie": "^2.0.0"
-      }
-    },
-    "pkg-dir": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-1.0.0.tgz",
-      "integrity": "sha1-ektQio1bstYp1EcFb/TpyTFM89Q=",
-      "dev": true,
-      "requires": {
-        "find-up": "^1.0.0"
-      }
-    },
-    "pluralize": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-1.2.1.tgz",
-      "integrity": "sha1-0aIUg/0iu0HlihL6NCGCMUCJfEU=",
-      "dev": true
-    },
-    "pluralizers": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/pluralizers/-/pluralizers-0.1.6.tgz",
-      "integrity": "sha1-GrOLbnYOb5f5hGElCXuGK8l0yB4="
-    },
-    "prelude-ls": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
-      "dev": true
-    },
-    "preserve": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
-      "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=",
-      "dev": true
-    },
-    "private": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
-      "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==",
-      "dev": true
-    },
-    "process": {
-      "version": "0.11.10",
-      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
-      "dev": true
-    },
-    "process-nextick-args": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-      "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M="
-    },
-    "progress": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz",
-      "integrity": "sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74=",
-      "dev": true
-    },
-    "promise": {
-      "version": "7.3.1",
-      "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
-      "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==",
-      "requires": {
-        "asap": "~2.0.3"
-      }
-    },
-    "prop-types": {
-      "version": "15.6.0",
-      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.0.tgz",
-      "integrity": "sha1-zq8IMCL8RrSjX2nhPvda7Q1jmFY=",
-      "requires": {
-        "fbjs": "^0.8.16",
-        "loose-envify": "^1.3.1",
-        "object-assign": "^4.1.1"
-      }
-    },
-    "prr": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz",
-      "integrity": "sha1-GoS4WQgyVQFBGFPQCB7j+obikmo=",
-      "dev": true
-    },
-    "punycode": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
-    },
-    "qjobs": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/qjobs/-/qjobs-1.1.5.tgz",
-      "integrity": "sha1-ZZ3p8s+NzCehSBJ28gU3cnI4LnM=",
-      "dev": true
-    },
-    "qs": {
-      "version": "6.5.1",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
-      "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A=="
-    },
-    "querystring": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA="
-    },
-    "querystring-es3": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
-      "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
-      "dev": true
-    },
-    "raf": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.0.tgz",
-      "integrity": "sha512-pDP/NMRAXoTfrhCfyfSEwJAKLaxBU9eApMeBPB1TkDouZmvPerIClV8lTAd+uF8ZiTaVl69e1FCxQrAd/VTjGw==",
-      "requires": {
-        "performance-now": "^2.1.0"
-      }
-    },
-    "raf-schd": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/raf-schd/-/raf-schd-2.1.1.tgz",
-      "integrity": "sha512-ngcBQygUeE3kHlOaBSqgWKv7BT9kx5kQ6fAwFJRNRT7TD54M+hx1kpNHb8sONRskcYQedJg2RC2xKlAHRUQBig=="
-    },
-    "randomatic": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz",
-      "integrity": "sha1-x6vpzIuHwLqodrGf3oP9RkeX44w=",
-      "dev": true,
-      "requires": {
-        "is-number": "^3.0.0",
-        "kind-of": "^4.0.0"
-      },
-      "dependencies": {
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "kind-of": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-          "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
-    "range-parser": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz",
-      "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=",
-      "dev": true
-    },
-    "raw-body": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.2.tgz",
-      "integrity": "sha1-vNYMd9Prk83gBQKVw/N5OJvIj4k=",
-      "dev": true,
-      "requires": {
-        "bytes": "3.0.0",
-        "http-errors": "1.6.2",
-        "iconv-lite": "0.4.19",
-        "unpipe": "1.0.0"
-      }
-    },
-    "react": {
-      "version": "15.6.2",
-      "resolved": "https://registry.npmjs.org/react/-/react-15.6.2.tgz",
-      "integrity": "sha1-26BDSrQ5z+gvEI8PURZjkIF5qnI=",
-      "requires": {
-        "create-react-class": "^15.6.0",
-        "fbjs": "^0.8.9",
-        "loose-envify": "^1.1.0",
-        "object-assign": "^4.1.0",
-        "prop-types": "^15.5.10"
-      }
-    },
-    "react-addons-css-transition-group": {
-      "version": "15.3.2",
-      "resolved": "https://registry.npmjs.org/react-addons-css-transition-group/-/react-addons-css-transition-group-15.3.2.tgz",
-      "integrity": "sha1-2PpSvsm7Yb396LnkZSuAKXy/9mc="
-    },
-    "react-addons-test-utils": {
-      "version": "15.6.2",
-      "resolved": "https://registry.npmjs.org/react-addons-test-utils/-/react-addons-test-utils-15.6.2.tgz",
-      "integrity": "sha1-wStu/cIkfBDae4dw0YUICnsEcVY=",
-      "dev": true
-    },
-    "react-beautiful-dnd": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/react-beautiful-dnd/-/react-beautiful-dnd-4.0.1.tgz",
-      "integrity": "sha512-d73RMu4QOFCyjUELLWFyY/EuclnfqulI9pECx+2gIuJvV0ycf1uR88o+1x0RSB9ILD70inHMzCBKNkWVbbt+vA==",
-      "requires": {
-        "babel-runtime": "^6.26.0",
-        "invariant": "^2.2.2",
-        "memoize-one": "^3.0.1",
-        "prop-types": "^15.6.0",
-        "raf-schd": "^2.1.0",
-        "react-motion": "^0.5.2",
-        "react-redux": "^5.0.6",
-        "redux": "^3.7.2",
-        "redux-thunk": "^2.2.0",
-        "reselect": "^3.0.1"
-      }
-    },
-    "react-dom": {
-      "version": "15.6.2",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-15.6.2.tgz",
-      "integrity": "sha1-Qc+t9pO3V/rycIRDodH9WgK+9zA=",
-      "requires": {
-        "fbjs": "^0.8.9",
-        "loose-envify": "^1.1.0",
-        "object-assign": "^4.1.0",
-        "prop-types": "^15.5.10"
-      }
-    },
-    "react-gemini-scrollbar": {
-      "version": "github:matrix-org/react-gemini-scrollbar#5e97aef7e034efc8db1431f4b0efe3b26e249ae9",
-      "from": "react-gemini-scrollbar@github:matrix-org/react-gemini-scrollbar#5e97aef7e034efc8db1431f4b0efe3b26e249ae9",
-      "requires": {
-        "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#b302279810d05319ac5ff1bd34910bff32325c7b"
-      }
-    },
-    "react-motion": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/react-motion/-/react-motion-0.5.2.tgz",
-      "integrity": "sha512-9q3YAvHoUiWlP3cK0v+w1N5Z23HXMj4IF4YuvjvWegWqNPfLXsOBE/V7UvQGpXxHFKRQQcNcVQE31g9SB/6qgQ==",
-      "requires": {
-        "performance-now": "^0.2.0",
-        "prop-types": "^15.5.8",
-        "raf": "^3.1.0"
-      },
-      "dependencies": {
-        "performance-now": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
-          "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU="
-        }
-      }
-    },
-    "react-redux": {
-      "version": "5.0.7",
-      "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-5.0.7.tgz",
-      "integrity": "sha512-5VI8EV5hdgNgyjfmWzBbdrqUkrVRKlyTKk1sGH3jzM2M2Mhj/seQgPXaz6gVAj2lz/nz688AdTqMO18Lr24Zhg==",
-      "requires": {
-        "hoist-non-react-statics": "^2.5.0",
-        "invariant": "^2.0.0",
-        "lodash": "^4.17.5",
-        "lodash-es": "^4.17.5",
-        "loose-envify": "^1.1.0",
-        "prop-types": "^15.6.0"
-      },
-      "dependencies": {
-        "lodash": {
-          "version": "4.17.10",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz",
-          "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg=="
-        }
-      }
-    },
-    "readable-stream": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-      "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
-      "requires": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~1.0.6",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.0.3",
-        "util-deprecate": "~1.0.1"
-      }
-    },
-    "readdirp": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz",
-      "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.2",
-        "minimatch": "^3.0.2",
-        "readable-stream": "^2.0.2",
-        "set-immediate-shim": "^1.0.1"
-      }
-    },
-    "readline2": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/readline2/-/readline2-1.0.1.tgz",
-      "integrity": "sha1-QQWWCP/BVHV7cV2ZidGZ/783LjU=",
-      "dev": true,
-      "requires": {
-        "code-point-at": "^1.0.0",
-        "is-fullwidth-code-point": "^1.0.0",
-        "mute-stream": "0.0.5"
-      }
-    },
-    "rechoir": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
-      "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
-      "dev": true,
-      "requires": {
-        "resolve": "^1.1.6"
-      }
-    },
-    "redux": {
-      "version": "3.7.2",
-      "resolved": "https://registry.npmjs.org/redux/-/redux-3.7.2.tgz",
-      "integrity": "sha512-pNqnf9q1hI5HHZRBkj3bAngGZW/JMCmexDlOxw4XagXY2o1327nHH54LoTjiPJ0gizoqPDRqWyX/00g0hD6w+A==",
-      "requires": {
-        "lodash": "^4.2.1",
-        "lodash-es": "^4.2.1",
-        "loose-envify": "^1.1.0",
-        "symbol-observable": "^1.0.3"
-      }
-    },
-    "redux-thunk": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-2.2.0.tgz",
-      "integrity": "sha1-5hWhbha0ehmlFXZhM9Hj6Zt4UuU="
-    },
-    "regenerate": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.3.3.tgz",
-      "integrity": "sha512-jVpo1GadrDAK59t/0jRx5VxYWQEDkkEKi6+HjE3joFVLfDOh9Xrdh0dF1eSq+BI/SwvTQ44gSscJ8N5zYL61sg==",
-      "dev": true
-    },
-    "regenerator-runtime": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz",
-      "integrity": "sha512-/aA0kLeRb5N9K0d4fw7ooEbI+xDe+DKD499EQqygGqeS8N3xto15p09uY2xj7ixP81sNPXvRLnAQIqdVStgb1A=="
-    },
-    "regenerator-transform": {
-      "version": "0.10.1",
-      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.10.1.tgz",
-      "integrity": "sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q==",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.18.0",
-        "babel-types": "^6.19.0",
-        "private": "^0.1.6"
-      }
-    },
-    "regex-cache": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
-      "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
-      "dev": true,
-      "requires": {
-        "is-equal-shallow": "^0.1.3"
-      }
-    },
-    "regexp-quote": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/regexp-quote/-/regexp-quote-0.0.0.tgz",
-      "integrity": "sha1-Hg9GUMhi3L/tVP1CsUjpuxch/PI="
-    },
-    "regexpu-core": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz",
-      "integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=",
-      "dev": true,
-      "requires": {
-        "regenerate": "^1.2.1",
-        "regjsgen": "^0.2.0",
-        "regjsparser": "^0.1.4"
-      }
-    },
-    "regjsgen": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
-      "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=",
-      "dev": true
-    },
-    "regjsparser": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz",
-      "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
-      "dev": true,
-      "requires": {
-        "jsesc": "~0.5.0"
-      },
-      "dependencies": {
-        "jsesc": {
-          "version": "0.5.0",
-          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-          "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
-          "dev": true
-        }
-      }
-    },
-    "remove-trailing-separator": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
-      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
-      "dev": true
-    },
-    "repeat-element": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz",
-      "integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo=",
-      "dev": true
-    },
-    "repeat-string": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
-      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
-      "dev": true
-    },
-    "repeating": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
-      "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
-      "dev": true,
-      "requires": {
-        "is-finite": "^1.0.0"
-      }
-    },
-    "request": {
-      "version": "2.87.0",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.87.0.tgz",
-      "integrity": "sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==",
-      "requires": {
-        "aws-sign2": "~0.7.0",
-        "aws4": "^1.6.0",
-        "caseless": "~0.12.0",
-        "combined-stream": "~1.0.5",
-        "extend": "~3.0.1",
-        "forever-agent": "~0.6.1",
-        "form-data": "~2.3.1",
-        "har-validator": "~5.0.3",
-        "http-signature": "~1.2.0",
-        "is-typedarray": "~1.0.0",
-        "isstream": "~0.1.2",
-        "json-stringify-safe": "~5.0.1",
-        "mime-types": "~2.1.17",
-        "oauth-sign": "~0.8.2",
-        "performance-now": "^2.1.0",
-        "qs": "~6.5.1",
-        "safe-buffer": "^5.1.1",
-        "tough-cookie": "~2.3.3",
-        "tunnel-agent": "^0.6.0",
-        "uuid": "^3.1.0"
-      }
-    },
-    "require-json": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/require-json/-/require-json-0.0.1.tgz",
-      "integrity": "sha1-PIkU+T10Qt6Mv05oGsYqcqozZ/4=",
-      "dev": true
-    },
-    "require-uncached": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz",
-      "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=",
-      "dev": true,
-      "requires": {
-        "caller-path": "^0.1.0",
-        "resolve-from": "^1.0.0"
-      }
-    },
-    "requires-port": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-      "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
-      "dev": true
-    },
-    "reselect": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/reselect/-/reselect-3.0.1.tgz",
-      "integrity": "sha1-79qpjqdFEyTQkrKyFjpqHXqaIUc="
-    },
-    "resolve": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.4.0.tgz",
-      "integrity": "sha512-aW7sVKPufyHqOmyyLzg/J+8606v5nevBgaliIlV7nUpVMsDnoBGV/cbSLNjZAg9q0Cfd/+easKVKQ8vOu8fn1Q==",
-      "dev": true,
-      "requires": {
-        "path-parse": "^1.0.5"
-      }
-    },
-    "resolve-from": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz",
-      "integrity": "sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=",
-      "dev": true
-    },
-    "restore-cursor": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz",
-      "integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=",
-      "dev": true,
-      "requires": {
-        "exit-hook": "^1.0.0",
-        "onetime": "^1.0.0"
-      }
-    },
-    "right-align": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
-      "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=",
-      "dev": true,
-      "requires": {
-        "align-text": "^0.1.1"
-      }
-    },
-    "rimraf": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
-      "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
-      "dev": true,
-      "requires": {
-        "glob": "^7.0.5"
-      },
-      "dependencies": {
-        "glob": {
-          "version": "7.1.2",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-          "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
-          "dev": true,
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        }
-      }
-    },
-    "ripemd160": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-0.2.0.tgz",
-      "integrity": "sha1-K/GYveFnys+lHAqSjoS2i74XH84=",
-      "dev": true
-    },
-    "run-async": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/run-async/-/run-async-0.1.0.tgz",
-      "integrity": "sha1-yK1KXhEGYeQCp9IbUw4AnyX444k=",
-      "dev": true,
-      "requires": {
-        "once": "^1.3.0"
-      }
-    },
-    "rx-lite": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-3.1.2.tgz",
-      "integrity": "sha1-Gc5QLKVyZl87ZHsQk5+X/RYV8QI=",
-      "dev": true
-    },
-    "safe-buffer": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-      "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
-    },
-    "samsam": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/samsam/-/samsam-1.3.0.tgz",
-      "integrity": "sha512-1HwIYD/8UlOtFS3QO3w7ey+SdSDFE4HRNLZoZRYVQefrOY3l17epswImeB1ijgJFQJodIaHcwkp3r/myBjFVbg==",
-      "dev": true
-    },
-    "sanitize-html": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.14.1.tgz",
-      "integrity": "sha1-cw/6Ikm98YMz7/5FsoYXPJxa0Lg=",
-      "requires": {
-        "htmlparser2": "^3.9.0",
-        "regexp-quote": "0.0.0",
-        "xtend": "^4.0.0"
-      }
-    },
-    "semver": {
-      "version": "4.3.6",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz",
-      "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=",
-      "dev": true
-    },
-    "set-immediate-shim": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",
-      "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=",
-      "dev": true
-    },
-    "setimmediate": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
-      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU="
-    },
-    "setprototypeof": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz",
-      "integrity": "sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ=",
-      "dev": true
-    },
-    "sha.js": {
-      "version": "2.2.6",
-      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.2.6.tgz",
-      "integrity": "sha1-F93t3F9yL7ZlAWWIlUYZd4ZzFbo=",
-      "dev": true
-    },
-    "shelljs": {
-      "version": "0.7.8",
-      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.7.8.tgz",
-      "integrity": "sha1-3svPh0sNHl+3LhSxZKloMEjprLM=",
-      "dev": true,
-      "requires": {
-        "glob": "^7.0.0",
-        "interpret": "^1.0.0",
-        "rechoir": "^0.6.2"
-      },
-      "dependencies": {
-        "glob": {
-          "version": "7.1.2",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-          "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
-          "dev": true,
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        }
-      }
-    },
-    "sinon": {
-      "version": "5.0.7",
-      "resolved": "https://registry.npmjs.org/sinon/-/sinon-5.0.7.tgz",
-      "integrity": "sha512-GvNLrwpvLZ8jIMZBUhHGUZDq5wlUdceJWyHvZDmqBxnjazpxY1L0FNbGBX6VpcOEoQ8Q4XMWFzm2myJMvx+VjA==",
-      "dev": true,
-      "requires": {
-        "@sinonjs/formatio": "^2.0.0",
-        "diff": "^3.1.0",
-        "lodash.get": "^4.4.2",
-        "lolex": "^2.2.0",
-        "nise": "^1.2.0",
-        "supports-color": "^5.1.0",
-        "type-detect": "^4.0.5"
-      },
-      "dependencies": {
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-          "dev": true
-        },
-        "lolex": {
-          "version": "2.6.0",
-          "resolved": "https://registry.npmjs.org/lolex/-/lolex-2.6.0.tgz",
-          "integrity": "sha512-e1UtIo1pbrIqEXib/yMjHciyqkng5lc0rrIbytgjmRgDR9+2ceNIAcwOWSgylRjoEP9VdVguCSRwnNmlbnOUwA==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "5.4.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
-          "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "slash": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
-      "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
-      "dev": true
-    },
-    "slice-ansi": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz",
-      "integrity": "sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU=",
-      "dev": true
-    },
-    "socket.io": {
-      "version": "1.7.3",
-      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-1.7.3.tgz",
-      "integrity": "sha1-uK+cq6AJSeVo42nxMn6pvp6iRhs=",
-      "dev": true,
-      "requires": {
-        "debug": "2.3.3",
-        "engine.io": "1.8.3",
-        "has-binary": "0.1.7",
-        "object-assign": "4.1.0",
-        "socket.io-adapter": "0.5.0",
-        "socket.io-client": "1.7.3",
-        "socket.io-parser": "2.3.1"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.3.3",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz",
-          "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=",
-          "dev": true,
-          "requires": {
-            "ms": "0.7.2"
-          }
-        },
-        "ms": {
-          "version": "0.7.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz",
-          "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=",
-          "dev": true
-        },
-        "object-assign": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz",
-          "integrity": "sha1-ejs9DpgGPUP0wD8uiubNUahog6A=",
-          "dev": true
-        }
-      }
-    },
-    "socket.io-adapter": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz",
-      "integrity": "sha1-y21LuL7IHhB4uZZ3+c7QBGBmu4s=",
-      "dev": true,
-      "requires": {
-        "debug": "2.3.3",
-        "socket.io-parser": "2.3.1"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.3.3",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz",
-          "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=",
-          "dev": true,
-          "requires": {
-            "ms": "0.7.2"
-          }
-        },
-        "ms": {
-          "version": "0.7.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz",
-          "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=",
-          "dev": true
-        }
-      }
-    },
-    "socket.io-client": {
-      "version": "1.7.3",
-      "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.7.3.tgz",
-      "integrity": "sha1-sw6GqhDV7zVGYBwJzeR2Xjgdo3c=",
-      "dev": true,
-      "requires": {
-        "backo2": "1.0.2",
-        "component-bind": "1.0.0",
-        "component-emitter": "1.2.1",
-        "debug": "2.3.3",
-        "engine.io-client": "1.8.3",
-        "has-binary": "0.1.7",
-        "indexof": "0.0.1",
-        "object-component": "0.0.3",
-        "parseuri": "0.0.5",
-        "socket.io-parser": "2.3.1",
-        "to-array": "0.1.4"
-      },
-      "dependencies": {
-        "component-emitter": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
-          "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
-          "dev": true
-        },
-        "debug": {
-          "version": "2.3.3",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz",
-          "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=",
-          "dev": true,
-          "requires": {
-            "ms": "0.7.2"
-          }
-        },
-        "ms": {
-          "version": "0.7.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz",
-          "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=",
-          "dev": true
-        }
-      }
-    },
-    "socket.io-parser": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.3.1.tgz",
-      "integrity": "sha1-3VMgJRA85Clpcya+/WQAX8/ltKA=",
-      "dev": true,
-      "requires": {
-        "component-emitter": "1.1.2",
-        "debug": "2.2.0",
-        "isarray": "0.0.1",
-        "json3": "3.3.2"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
-          "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
-          "dev": true,
-          "requires": {
-            "ms": "0.7.1"
-          }
-        },
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-          "dev": true
-        },
-        "ms": {
-          "version": "0.7.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
-          "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=",
-          "dev": true
-        }
-      }
-    },
-    "source-list-map": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.8.tgz",
-      "integrity": "sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=",
-      "dev": true
-    },
-    "source-map": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-      "dev": true
-    },
-    "source-map-loader": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-0.2.3.tgz",
-      "integrity": "sha512-MYbFX9DYxmTQFfy2v8FC1XZwpwHKYxg3SK8Wb7VPBKuhDjz8gi9re2819MsG4p49HDyiOSUKlmZ+nQBArW5CGw==",
-      "dev": true,
-      "requires": {
-        "async": "^2.5.0",
-        "loader-utils": "~0.2.2",
-        "source-map": "~0.6.1"
-      },
-      "dependencies": {
-        "async": {
-          "version": "2.6.0",
-          "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz",
-          "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==",
-          "dev": true,
-          "requires": {
-            "lodash": "^4.14.0"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
-    "source-map-support": {
-      "version": "0.4.18",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz",
-      "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
-      "dev": true,
-      "requires": {
-        "source-map": "^0.5.6"
-      }
-    },
-    "sprintf-js": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.1.tgz",
-      "integrity": "sha1-Nr54Mgr+WAH2zqPueLblqrlA6gw="
-    },
-    "sshpk": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz",
-      "integrity": "sha1-Ew9Zde3a2WPx1W+SuaxsUfqfg+s=",
-      "requires": {
-        "asn1": "~0.2.3",
-        "assert-plus": "^1.0.0",
-        "bcrypt-pbkdf": "^1.0.0",
-        "dashdash": "^1.12.0",
-        "ecc-jsbn": "~0.1.1",
-        "getpass": "^0.1.1",
-        "jsbn": "~0.1.0",
-        "tweetnacl": "~0.14.0"
-      }
-    },
-    "statuses": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
-      "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=",
-      "dev": true
-    },
-    "stream-browserify": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz",
-      "integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=",
-      "dev": true,
-      "requires": {
-        "inherits": "~2.0.1",
-        "readable-stream": "^2.0.2"
-      }
-    },
-    "stream-http": {
-      "version": "2.7.2",
-      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.7.2.tgz",
-      "integrity": "sha1-QKBQ7I3DtTsz2ZCUFcAsC/Gr+60=",
-      "dev": true,
-      "requires": {
-        "builtin-status-codes": "^3.0.0",
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.2.6",
-        "to-arraybuffer": "^1.0.0",
-        "xtend": "^4.0.0"
-      }
-    },
-    "string-width": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-      "dev": true,
-      "requires": {
-        "code-point-at": "^1.0.0",
-        "is-fullwidth-code-point": "^1.0.0",
-        "strip-ansi": "^3.0.0"
-      }
-    },
-    "string.prototype.repeat": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/string.prototype.repeat/-/string.prototype.repeat-0.2.0.tgz",
-      "integrity": "sha1-q6Nt4I3O5qWjN9SbLqHaGyj8Ds8="
-    },
-    "string_decoder": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-      "requires": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
-    "strip-ansi": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-      "dev": true,
-      "requires": {
-        "ansi-regex": "^2.0.0"
-      }
-    },
-    "strip-bom": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-      "dev": true
-    },
-    "strip-json-comments": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
-      "dev": true
-    },
-    "supports-color": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-      "dev": true
-    },
-    "symbol-observable": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz",
-      "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ=="
-    },
-    "tabbable": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-1.1.2.tgz",
-      "integrity": "sha512-77oqsKEPrxIwgRcXUwipkj9W5ItO97L6eUT1Ar7vh+El16Zm4M6V+YU1cbipHEa6q0Yjw8O3Hoh8oRgatV5s7A=="
-    },
-    "table": {
-      "version": "3.8.3",
-      "resolved": "https://registry.npmjs.org/table/-/table-3.8.3.tgz",
-      "integrity": "sha1-K7xULw/amGGnVdOUf+/Ys/UThV8=",
-      "dev": true,
-      "requires": {
-        "ajv": "^4.7.0",
-        "ajv-keywords": "^1.0.0",
-        "chalk": "^1.1.1",
-        "lodash": "^4.0.0",
-        "slice-ansi": "0.0.4",
-        "string-width": "^2.0.0"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "4.11.8",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
-          "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
-          "dev": true,
-          "requires": {
-            "co": "^4.6.0",
-            "json-stable-stringify": "^1.0.1"
-          }
-        },
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-          "dev": true
-        },
-        "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-          "dev": true,
-          "requires": {
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^4.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^3.0.0"
-          }
-        }
-      }
-    },
-    "tapable": {
-      "version": "0.1.10",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.1.10.tgz",
-      "integrity": "sha1-KcNXB8K3DlDQdIK10gLo7URtr9Q=",
-      "dev": true
-    },
-    "text-encoding": {
-      "version": "0.6.4",
-      "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz",
-      "integrity": "sha1-45mpgiV6J22uQou5KEXLcb3CbRk=",
-      "dev": true
-    },
-    "text-encoding-utf-8": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/text-encoding-utf-8/-/text-encoding-utf-8-1.0.1.tgz",
-      "integrity": "sha1-Uepsen6y+09nRnt2NzVmH1YDSS0="
-    },
-    "text-table": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
-      "dev": true
-    },
-    "through": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
-      "dev": true
-    },
-    "time-stamp": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-2.0.0.tgz",
-      "integrity": "sha1-lcakRTDhW6jW9KPsuMOj+sRto1c=",
-      "dev": true
-    },
-    "timers-browserify": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.4.tgz",
-      "integrity": "sha512-uZYhyU3EX8O7HQP+J9fTVYwsq90Vr68xPEFo7yrVImIxYvHgukBEgOB/SgGoorWVTzGM/3Z+wUNnboA4M8jWrg==",
-      "dev": true,
-      "requires": {
-        "setimmediate": "^1.0.4"
-      }
-    },
-    "tmatch": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/tmatch/-/tmatch-2.0.1.tgz",
-      "integrity": "sha1-DFYkbzPzDaG409colauvFmYPOM8=",
-      "dev": true
-    },
-    "tmp": {
-      "version": "0.0.31",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz",
-      "integrity": "sha1-jzirlDjhcxXl29izZX6L+yd65Kc=",
-      "dev": true,
-      "requires": {
-        "os-tmpdir": "~1.0.1"
-      }
-    },
-    "to-array": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz",
-      "integrity": "sha1-F+bBH3PdTz10zaek/zI46a2b+JA=",
-      "dev": true
-    },
-    "to-arraybuffer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
-      "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
-      "dev": true
-    },
-    "to-fast-properties": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
-      "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
-      "dev": true
-    },
-    "tough-cookie": {
-      "version": "2.3.4",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz",
-      "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==",
-      "requires": {
-        "punycode": "^1.4.1"
-      }
-    },
-    "trim-right": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
-      "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
-      "dev": true
-    },
-    "tryit": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/tryit/-/tryit-1.0.3.tgz",
-      "integrity": "sha1-OTvnMKlEb9Hq1tpZoBQwjzbCics=",
-      "dev": true
-    },
-    "tty-browserify": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
-      "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
-      "dev": true
-    },
-    "tunnel-agent": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-      "requires": {
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "tweetnacl": {
-      "version": "0.14.5",
-      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-      "optional": true
-    },
-    "type-check": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
-      "dev": true,
-      "requires": {
-        "prelude-ls": "~1.1.2"
-      }
-    },
-    "type-detect": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
-      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
-      "dev": true
-    },
-    "type-is": {
-      "version": "1.6.15",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.15.tgz",
-      "integrity": "sha1-yrEPtJCeRByChC6v4a1kbIGARBA=",
-      "dev": true,
-      "requires": {
-        "media-typer": "0.3.0",
-        "mime-types": "~2.1.15"
-      }
-    },
-    "typedarray": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
-      "dev": true
-    },
-    "ua-parser-js": {
-      "version": "0.7.17",
-      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.17.tgz",
-      "integrity": "sha512-uRdSdu1oA1rncCQL7sCj8vSyZkgtL7faaw9Tc9rZ3mGgraQ7+Pdx7w5mnOSF3gw9ZNG6oc+KXfkon3bKuROm0g=="
-    },
-    "uglify-js": {
-      "version": "2.7.5",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz",
-      "integrity": "sha1-RhLAx7qu4rp8SH3kkErhIgefLKg=",
-      "dev": true,
-      "requires": {
-        "async": "~0.2.6",
-        "source-map": "~0.5.1",
-        "uglify-to-browserify": "~1.0.0",
-        "yargs": "~3.10.0"
-      },
-      "dependencies": {
-        "async": {
-          "version": "0.2.10",
-          "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
-          "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E=",
-          "dev": true
-        }
-      }
-    },
-    "uglify-to-browserify": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
-      "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=",
-      "dev": true
-    },
-    "ultron": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz",
-      "integrity": "sha1-rOEWq1V80Zc4ak6I9GhTeMiy5Po=",
-      "dev": true
-    },
-    "unpipe": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
-      "dev": true
-    },
-    "url": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
-      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
-      "requires": {
-        "punycode": "1.3.2",
-        "querystring": "0.2.0"
-      },
-      "dependencies": {
-        "punycode": {
-          "version": "1.3.2",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-          "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0="
-        }
-      }
-    },
-    "user-home": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz",
-      "integrity": "sha1-K1viOjK2Onyd640PKNSFcko98ZA=",
-      "dev": true
-    },
-    "useragent": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/useragent/-/useragent-2.2.1.tgz",
-      "integrity": "sha1-z1k+9PLRdYdei7ZY6pLhik/QbY4=",
-      "dev": true,
-      "requires": {
-        "lru-cache": "2.2.x",
-        "tmp": "0.0.x"
-      }
-    },
-    "util": {
-      "version": "0.10.3",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
-      "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
-      "dev": true,
-      "requires": {
-        "inherits": "2.0.1"
-      },
-      "dependencies": {
-        "inherits": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
-          "dev": true
-        }
-      }
-    },
-    "util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
-    },
-    "utils-merge": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
-      "dev": true
-    },
-    "uuid": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz",
-      "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA=="
-    },
-    "v8flags": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-2.1.1.tgz",
-      "integrity": "sha1-qrGh+jDUX4jdMhFIh1rALAtV5bQ=",
-      "dev": true,
-      "requires": {
-        "user-home": "^1.1.1"
-      }
-    },
-    "velocity-vector": {
-      "version": "github:vector-im/velocity#059e3b2348f1110888d033974d3109fd5a3af00f",
-      "from": "velocity-vector@github:vector-im/velocity#059e3b2348f1110888d033974d3109fd5a3af00f",
-      "requires": {
-        "jquery": ">= 1.4.3"
-      }
-    },
-    "verror": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-      "requires": {
-        "assert-plus": "^1.0.0",
-        "core-util-is": "1.0.2",
-        "extsprintf": "^1.2.0"
-      }
-    },
-    "vm-browserify": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
-      "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=",
-      "dev": true,
-      "requires": {
-        "indexof": "0.0.1"
-      }
-    },
-    "void-elements": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz",
-      "integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=",
-      "dev": true
-    },
-    "walk": {
-      "version": "2.3.9",
-      "resolved": "https://registry.npmjs.org/walk/-/walk-2.3.9.tgz",
-      "integrity": "sha1-MbTbZnjyrgHDnqn7hyWpAx5Vins=",
-      "dev": true,
-      "requires": {
-        "foreachasync": "^3.0.0"
-      }
-    },
-    "watchpack": {
-      "version": "0.2.9",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-0.2.9.tgz",
-      "integrity": "sha1-Yuqkq15bo1/fwBgnVibjwPXj+ws=",
-      "dev": true,
-      "requires": {
-        "async": "^0.9.0",
-        "chokidar": "^1.0.0",
-        "graceful-fs": "^4.1.2"
-      }
-    },
-    "webpack": {
-      "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-1.15.0.tgz",
-      "integrity": "sha1-T/MfU9sDM55VFkqdRo7gMklo/pg=",
-      "dev": true,
-      "requires": {
-        "acorn": "^3.0.0",
-        "async": "^1.3.0",
-        "clone": "^1.0.2",
-        "enhanced-resolve": "~0.9.0",
-        "interpret": "^0.6.4",
-        "loader-utils": "^0.2.11",
-        "memory-fs": "~0.3.0",
-        "mkdirp": "~0.5.0",
-        "node-libs-browser": "^0.7.0",
-        "optimist": "~0.6.0",
-        "supports-color": "^3.1.0",
-        "tapable": "~0.1.8",
-        "uglify-js": "~2.7.3",
-        "watchpack": "^0.2.1",
-        "webpack-core": "~0.6.9"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
-          "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=",
-          "dev": true
-        },
-        "async": {
-          "version": "1.5.2",
-          "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
-          "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
-          "dev": true
-        },
-        "interpret": {
-          "version": "0.6.6",
-          "resolved": "https://registry.npmjs.org/interpret/-/interpret-0.6.6.tgz",
-          "integrity": "sha1-/s16GOfOXKar+5U+H4YhOknxYls=",
-          "dev": true
-        },
-        "memory-fs": {
-          "version": "0.3.0",
-          "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.3.0.tgz",
-          "integrity": "sha1-e8xrYp46Q+hx1+Kaymrop/FcuyA=",
-          "dev": true,
-          "requires": {
-            "errno": "^0.1.3",
-            "readable-stream": "^2.0.1"
-          }
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "^1.0.0"
-          }
-        }
-      }
-    },
-    "webpack-core": {
-      "version": "0.6.9",
-      "resolved": "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.9.tgz",
-      "integrity": "sha1-/FcViMhVjad76e+23r3Fo7FyvcI=",
-      "dev": true,
-      "requires": {
-        "source-list-map": "~0.1.7",
-        "source-map": "~0.4.1"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.4.4",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
-          "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
-          "dev": true,
-          "requires": {
-            "amdefine": ">=0.0.4"
-          }
-        }
-      }
-    },
-    "webpack-dev-middleware": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-1.12.0.tgz",
-      "integrity": "sha1-007++y7dp+HTtdvgcolRMhllFwk=",
-      "dev": true,
-      "requires": {
-        "memory-fs": "~0.4.1",
-        "mime": "^1.3.4",
-        "path-is-absolute": "^1.0.0",
-        "range-parser": "^1.0.3",
-        "time-stamp": "^2.0.0"
-      }
-    },
-    "whatwg-fetch": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-1.1.1.tgz",
-      "integrity": "sha1-rDydOfMgxtzlM5lp0FTvQ90zMxk="
-    },
-    "which": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz",
-      "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==",
-      "dev": true,
-      "requires": {
-        "isexe": "^2.0.0"
-      }
-    },
-    "window-size": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz",
-      "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=",
-      "dev": true
-    },
-    "wordwrap": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
-      "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc="
-    },
-    "wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
-    },
-    "write": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/write/-/write-0.2.1.tgz",
-      "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=",
-      "dev": true,
-      "requires": {
-        "mkdirp": "^0.5.1"
-      }
-    },
-    "ws": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-1.1.2.tgz",
-      "integrity": "sha1-iiRPoFJAHgjJiGz0SoUYnh/UBn8=",
-      "dev": true,
-      "requires": {
-        "options": ">=0.0.5",
-        "ultron": "1.0.x"
-      }
-    },
-    "wtf-8": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/wtf-8/-/wtf-8-1.0.0.tgz",
-      "integrity": "sha1-OS2LotDxw00e4tYw8V0O+2jhBIo=",
-      "dev": true
-    },
-    "xmlbuilder": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-3.1.0.tgz",
-      "integrity": "sha1-LIaIjy1OrehQ+jjKf3Ij9yCVFuE=",
-      "dev": true,
-      "requires": {
-        "lodash": "^3.5.0"
-      },
-      "dependencies": {
-        "lodash": {
-          "version": "3.10.1",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
-          "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=",
-          "dev": true
-        }
-      }
-    },
-    "xmlhttprequest-ssl": {
-      "version": "1.5.3",
-      "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz",
-      "integrity": "sha1-GFqIjATspGw+QHDZn3tJ3jUomS0=",
-      "dev": true
-    },
-    "xtend": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
-    },
-    "yargs": {
-      "version": "3.10.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
-      "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
-      "dev": true,
-      "requires": {
-        "camelcase": "^1.0.2",
-        "cliui": "^2.1.0",
-        "decamelize": "^1.0.0",
-        "window-size": "0.1.0"
-      }
-    },
-    "yeast": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz",
-      "integrity": "sha1-AI4G2AlDIMNy28L47XagymyKxBk=",
-      "dev": true
-    }
-  }
-}
diff --git a/package.json b/package.json
index 33aa428d4b..72481f2e3c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "0.12.7",
+  "version": "0.13.5",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {
@@ -38,10 +38,12 @@
     "reskindex:watch": "node scripts/reskindex.js -h header -w",
     "i18n": "matrix-gen-i18n",
     "prunei18n": "matrix-prune-i18n",
-    "build": "npm run reskindex && babel src -d lib --source-maps --copy-files",
-    "build:watch": "babel src -w -d lib --source-maps --copy-files",
+    "build": "npm run reskindex && npm run start:init",
+    "build:watch": "babel src -w --skip-initial-build -d lib --source-maps --copy-files",
     "emoji-data-strip": "node scripts/emoji-data-strip.js",
-    "start": "parallelshell \"npm run build:watch\" \"npm run reskindex:watch\"",
+    "start": "npm run start:init && npm run start:all",
+    "start:all": "concurrently --kill-others-on-fail --prefix \"{time} [{name}]\" -n build,reskindex \"npm run build:watch\" \"npm run reskindex:watch\"",
+    "start:init": "babel src -d lib --source-maps --copy-files",
     "lint": "eslint src/",
     "lintall": "eslint src/ test/",
     "lintwithexclusions": "eslint --max-warnings 20 --ignore-path .eslintignore.errorfiles src test",
@@ -59,9 +61,6 @@
     "classnames": "^2.1.2",
     "commonmark": "^0.28.1",
     "counterpart": "^0.18.0",
-    "draft-js": "^0.11.0-alpha",
-    "draft-js-export-html": "^0.6.0",
-    "draft-js-export-markdown": "^0.3.0",
     "emojione": "2.2.7",
     "file-saver": "^1.3.3",
     "filesize": "3.5.6",
@@ -73,10 +72,10 @@
     "glob": "^5.0.14",
     "highlight.js": "^9.0.0",
     "isomorphic-fetch": "^2.2.1",
-    "linkifyjs": "^2.1.3",
+    "linkifyjs": "^2.1.6",
     "lodash": "^4.13.1",
     "lolex": "2.3.2",
-    "matrix-js-sdk": "0.10.4",
+    "matrix-js-sdk": "0.11.1",
     "optimist": "^0.6.1",
     "pako": "^1.0.5",
     "prop-types": "^15.5.8",
@@ -87,11 +86,16 @@
     "react-beautiful-dnd": "^4.0.1",
     "react-dom": "^15.6.0",
     "react-gemini-scrollbar": "matrix-org/react-gemini-scrollbar#5e97aef",
-    "sanitize-html": "^1.14.1",
+    "resize-observer-polyfill": "^1.5.0",
+    "sanitize-html": "^1.18.4",
+    "slate": "0.34.7",
+    "slate-html-serializer": "^0.6.1",
+    "slate-md-serializer": "matrix-org/slate-md-serializer#f7c4ad3",
+    "slate-react": "^0.12.4",
     "text-encoding-utf-8": "^1.0.1",
     "url": "^0.11.0",
     "velocity-vector": "vector-im/velocity#059e3b2",
-    "whatwg-fetch": "^1.0.0"
+    "whatwg-fetch": "^1.1.1"
   },
   "devDependencies": {
     "babel-cli": "^6.5.2",
@@ -109,6 +113,7 @@
     "babel-preset-es2017": "^6.14.0",
     "babel-preset-react": "^6.11.1",
     "chokidar": "^1.6.1",
+    "concurrently": "^4.0.1",
     "eslint": "^3.13.1",
     "eslint-config-google": "^0.7.1",
     "eslint-plugin-babel": "^4.0.1",
@@ -118,20 +123,19 @@
     "expect": "^1.16.0",
     "flow-parser": "^0.57.3",
     "json-loader": "^0.5.3",
-    "karma": "^1.7.0",
+    "karma": "^3.0.0",
     "karma-chrome-launcher": "^0.2.3",
     "karma-cli": "^0.1.2",
-    "karma-junit-reporter": "^0.4.1",
+    "karma-junit-reporter": "^1.2.0",
     "karma-logcapture-reporter": "0.0.1",
     "karma-mocha": "^0.2.2",
     "karma-sourcemap-loader": "^0.3.7",
     "karma-spec-reporter": "^0.0.31",
     "karma-summary-reporter": "^1.3.3",
-    "karma-webpack": "^1.7.0",
+    "karma-webpack": "^3.0.5",
     "matrix-mock-request": "^1.2.1",
     "matrix-react-test-utils": "^0.1.1",
     "mocha": "^5.0.5",
-    "parallelshell": "^3.0.2",
     "react-addons-test-utils": "^15.4.0",
     "require-json": "0.0.1",
     "rimraf": "^2.4.3",
diff --git a/res/css/_common.scss b/res/css/_common.scss
index c4cda6821e..38f576a532 100644
--- a/res/css/_common.scss
+++ b/res/css/_common.scss
@@ -291,6 +291,10 @@ textarea {
     vertical-align: middle;
 }
 
+.mx_emojione_selected {
+    background-color: $accent-color;
+}
+
 ::-moz-selection {
     background-color: $accent-color;
     color: $selection-fg-color;
diff --git a/res/css/_components.scss b/res/css/_components.scss
index 173939e143..0e40b40a29 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -39,6 +39,7 @@
 @import "./views/dialogs/_EncryptedEventDialog.scss";
 @import "./views/dialogs/_GroupAddressPicker.scss";
 @import "./views/dialogs/_QuestionDialog.scss";
+@import "./views/dialogs/_RoomUpgradeDialog.scss";
 @import "./views/dialogs/_SetEmailDialog.scss";
 @import "./views/dialogs/_SetMxIdDialog.scss";
 @import "./views/dialogs/_SetPasswordDialog.scss";
@@ -67,6 +68,7 @@
 @import "./views/groups/_GroupUserSettings.scss";
 @import "./views/login/_InteractiveAuthEntryComponents.scss";
 @import "./views/login/_ServerConfig.scss";
+@import "./views/messages/_CreateEvent.scss";
 @import "./views/messages/_DateSeparator.scss";
 @import "./views/messages/_MEmoteBody.scss";
 @import "./views/messages/_MFileBody.scss";
@@ -99,6 +101,7 @@
 @import "./views/rooms/_RoomSettings.scss";
 @import "./views/rooms/_RoomTile.scss";
 @import "./views/rooms/_RoomTooltip.scss";
+@import "./views/rooms/_RoomUpgradeWarningBar.scss";
 @import "./views/rooms/_SearchBar.scss";
 @import "./views/rooms/_SearchableEntityList.scss";
 @import "./views/rooms/_Stickers.scss";
diff --git a/res/css/structures/_LeftPanel.scss b/res/css/structures/_LeftPanel.scss
index 96ed5878ac..7cf6dd1119 100644
--- a/res/css/structures/_LeftPanel.scss
+++ b/res/css/structures/_LeftPanel.scss
@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -54,6 +55,10 @@ limitations under the License.
 
 }
 
+.mx_LeftPanel .mx_AppTile_mini {
+    height: 132px;
+}
+
 .mx_LeftPanel .mx_RoomList_scrollbar {
     order: 1;
 
diff --git a/res/css/structures/_MatrixChat.scss b/res/css/structures/_MatrixChat.scss
index 156b1709fe..eae1f56180 100644
--- a/res/css/structures/_MatrixChat.scss
+++ b/res/css/structures/_MatrixChat.scss
@@ -56,6 +56,18 @@ limitations under the License.
     flex: 1;
 }
 
+.mx_MatrixChat_syncError {
+    color: $accent-fg-color;
+    background-color: $warning-bg-color;
+    border-radius: 5px;
+    display: table;
+    padding: 30px;
+    position: absolute;
+    top: 100px;
+    left: 50%;
+    transform: translateX(-50%);
+}
+
 .mx_MatrixChat .mx_LeftPanel {
     order: 1;
 
diff --git a/res/css/structures/_RoomStatusBar.scss b/res/css/structures/_RoomStatusBar.scss
index ca7431eac2..2a9cc9f6c7 100644
--- a/res/css/structures/_RoomStatusBar.scss
+++ b/res/css/structures/_RoomStatusBar.scss
@@ -113,6 +113,8 @@ limitations under the License.
 }
 
 .mx_RoomStatusBar_connectionLostBar {
+    display: flex;
+
     margin-top: 19px;
     min-height: 58px;
 }
@@ -132,6 +134,7 @@ limitations under the License.
     color: $primary-fg-color;
     font-size: 13px;
     opacity: 0.5;
+    padding-bottom: 20px;
 }
 
 .mx_RoomStatusBar_resend_link {
diff --git a/res/css/structures/_RoomSubList.scss b/res/css/structures/_RoomSubList.scss
index a2863460ad..6798f75a14 100644
--- a/res/css/structures/_RoomSubList.scss
+++ b/res/css/structures/_RoomSubList.scss
@@ -91,6 +91,10 @@ limitations under the License.
     background-color: $accent-color;
 }
 
+.mx_RoomSubList_label .mx_RoomSubList_badge:hover {
+    filter: brightness($focus-brightness);
+}
+
 /*
 .collapsed .mx_RoomSubList_badge {
     display: none;
diff --git a/res/css/structures/_RoomView.scss b/res/css/structures/_RoomView.scss
index b8e1190375..02418f70db 100644
--- a/res/css/structures/_RoomView.scss
+++ b/res/css/structures/_RoomView.scss
@@ -176,10 +176,7 @@ hr.mx_RoomView_myReadMarker {
     z-index: 1000;
     overflow: hidden;
 
-    -webkit-transition: all .2s ease-out;
-    -moz-transition: all .2s ease-out;
-    -ms-transition: all .2s ease-out;
-    -o-transition: all .2s ease-out;
+    transition: all .2s ease-out;
 }
 
 .mx_RoomView_statusArea_expanded {
diff --git a/res/css/views/dialogs/_RoomUpgradeDialog.scss b/res/css/views/dialogs/_RoomUpgradeDialog.scss
new file mode 100644
index 0000000000..2e3ac5fdea
--- /dev/null
+++ b/res/css/views/dialogs/_RoomUpgradeDialog.scss
@@ -0,0 +1,19 @@
+/*
+Copyright 2018 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_RoomUpgradeDialog {
+    padding-right: 70px;
+}
diff --git a/res/css/views/elements/_RichText.scss b/res/css/views/elements/_RichText.scss
index e21fc184ba..cea4b7897d 100644
--- a/res/css/views/elements/_RichText.scss
+++ b/res/css/views/elements/_RichText.scss
@@ -27,6 +27,10 @@
     padding-right: 5px;
 }
 
+.mx_UserPill_selected {
+    background-color: $accent-color ! important;
+}
+
 .mx_EventTile_highlight .mx_EventTile_content .markdown-body a.mx_UserPill_me,
 .mx_EventTile_content .mx_AtRoomPill,
 .mx_MessageComposer_input .mx_AtRoomPill {
diff --git a/res/css/views/globals/_MatrixToolbar.scss b/res/css/views/globals/_MatrixToolbar.scss
index be69b15f37..1791d619ae 100644
--- a/res/css/views/globals/_MatrixToolbar.scss
+++ b/res/css/views/globals/_MatrixToolbar.scss
@@ -28,6 +28,18 @@ limitations under the License.
     margin-top: -2px;
 }
 
+.mx_MatrixToolbar_info {
+    padding-left: 16px;
+    padding-right: 8px;
+    background-color: $info-bg-color;
+}
+
+.mx_MatrixToolbar_error {
+    padding-left: 16px;
+    padding-right: 8px;
+    background-color: $warning-bg-color;
+}
+
 .mx_MatrixToolbar_content {
     flex: 1;
 }
@@ -59,4 +71,4 @@ limitations under the License.
 
 .mx_MatrixToolbar_changelog {
     white-space: pre;
-}
\ No newline at end of file
+}
diff --git a/res/css/views/messages/_CreateEvent.scss b/res/css/views/messages/_CreateEvent.scss
new file mode 100644
index 0000000000..c095fc26af
--- /dev/null
+++ b/res/css/views/messages/_CreateEvent.scss
@@ -0,0 +1,37 @@
+/*
+Copyright 2018 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_CreateEvent {
+    background-color: $info-plinth-bg-color;
+    padding-left: 20px;
+    padding-right: 20px;
+    padding-top: 10px;
+    padding-bottom: 10px;
+}
+
+.mx_CreateEvent_image {
+    float: left;
+    padding-right: 20px;
+    width: 72px;
+    height: 34px;
+}
+
+.mx_CreateEvent_header {
+    font-weight: bold;
+}
+
+.mx_CreateEvent_link {
+}
diff --git a/res/css/views/rooms/_AppsDrawer.scss b/res/css/views/rooms/_AppsDrawer.scss
index 28d432686d..4a46063376 100644
--- a/res/css/views/rooms/_AppsDrawer.scss
+++ b/res/css/views/rooms/_AppsDrawer.scss
@@ -75,6 +75,22 @@ limitations under the License.
     border-radius: 2px;
 }
 
+.mx_AppTile_mini {
+    max-width: 960px;
+    width: 100%;
+    height: 100%;
+    margin: 0;
+    padding: 0;
+}
+
+.mx_AppTile_persistedWrapper {
+    height: 280px;
+}
+
+.mx_AppTile_mini .mx_AppTile_persistedWrapper {
+    height: 114px;
+}
+
 .mx_AppTileMenuBar {
     margin: 0;
     padding: 2px 10px;
@@ -126,6 +142,18 @@ limitations under the License.
     overflow: hidden;
 }
 
+.mx_AppTileBody_mini {
+    height: 112px;
+    width: 100%;
+    overflow: hidden;
+}
+
+.mx_AppTileBody_mini iframe {
+    border: none;
+    width: 100%;
+    height: 100%;
+}
+
 .mx_AppTileBody iframe {
     width: 100%;
     height: 280px;
diff --git a/res/css/views/rooms/_Autocomplete.scss b/res/css/views/rooms/_Autocomplete.scss
index 732ada088b..3e1016f60d 100644
--- a/res/css/views/rooms/_Autocomplete.scss
+++ b/res/css/views/rooms/_Autocomplete.scss
@@ -69,7 +69,8 @@
     flex-flow: wrap;
 }
 
-.mx_Autocomplete_Completion.selected {
+.mx_Autocomplete_Completion.selected,
+.mx_Autocomplete_Completion:hover {
     background: $menu-bg-color;
     outline: none;
 }
diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index 525855f3ed..f74e2e0850 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -31,7 +31,6 @@ limitations under the License.
     top: 14px;
     left: 8px;
     cursor: pointer;
-    z-index: 2;
 }
 
 .mx_EventTile.mx_EventTile_info .mx_EventTile_avatar {
@@ -187,7 +186,6 @@ limitations under the License.
 .mx_EventTile_msgOption {
     float: right;
     text-align: right;
-    z-index: 1;
     position: relative;
     width: 90px;
 
@@ -290,7 +288,6 @@ limitations under the License.
     position: absolute;
     top: 9px;
     left: 46px;
-    z-index: 2;
     cursor: pointer;
 }
 
@@ -392,7 +389,6 @@ limitations under the License.
     overflow-x: overlay;
     overflow-y: visible;
     max-height: 30vh;
-    position: static;
 }
 
 .mx_EventTile_content .markdown-body code {
@@ -401,20 +397,25 @@ limitations under the License.
     color: #333;
 }
 
+.mx_EventTile_pre_container {
+    // For correct positioning of _copyButton (See TextualBody)
+    position: relative;
+}
+
+// Inserted adjacent to 
 blocks, (See TextualBody)
 .mx_EventTile_copyButton {
     position: absolute;
     display: inline-block;
     visibility: hidden;
     cursor: pointer;
     top: 6px;
-    right: 36px;
+    right: 6px;
     width: 19px;
     height: 19px;
     background-image: url($copy-button-url);
 }
 
 .mx_EventTile_body pre {
-    position: relative;
     border: 1px solid transparent;
 }
 
@@ -423,7 +424,7 @@ limitations under the License.
     border: 1px solid #e5e5e5; // deliberate constant as we're behind an invert filter
 }
 
-.mx_EventTile_body pre:hover .mx_EventTile_copyButton
+.mx_EventTile_body .mx_EventTile_pre_container:hover .mx_EventTile_copyButton
 {
     visibility: visible;
 }
@@ -445,6 +446,7 @@ limitations under the License.
 .mx_EventTile_content .markdown-body h2
 {
     font-size: 1.5em;
+    border-bottom: none ! important; // override GFM
 }
 
 .mx_EventTile_content .markdown-body a {
diff --git a/res/css/views/rooms/_MessageComposer.scss b/res/css/views/rooms/_MessageComposer.scss
index 0a708a8edc..e6a532d072 100644
--- a/res/css/views/rooms/_MessageComposer.scss
+++ b/res/css/views/rooms/_MessageComposer.scss
@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -22,6 +23,29 @@ limitations under the License.
     position: relative;
 }
 
+.mx_MessageComposer_replaced_wrapper {
+    margin-left: auto;
+    margin-right: auto;
+}
+
+.mx_MessageComposer_replaced_valign {
+    height: 60px;
+    display: table-cell;
+    vertical-align: middle;
+}
+
+.mx_MessageComposer_roomReplaced_icon {
+    float: left;
+    margin-right: 20px;
+    margin-top: 5px;
+    width: 31px;
+    height: 31px;
+}
+
+.mx_MessageComposer_roomReplaced_header {
+    font-weight: bold;
+}
+
 .mx_MessageComposer_autocomplete_wrapper {
     position: relative;
     height: 0;
@@ -70,6 +94,7 @@ limitations under the License.
     flex: 1;
     display: flex;
     flex-direction: column;
+    cursor: text;
 }
 
 .mx_MessageComposer_input {
@@ -78,12 +103,29 @@ limitations under the License.
     display: flex;
     flex-direction: column;
     min-height: 60px;
-    justify-content: center;
+    justify-content: start;
     align-items: flex-start;
     font-size: 14px;
     margin-right: 6px;
 }
 
+.mx_MessageComposer_editor {
+    width: 100%;
+    max-height: 120px;
+    min-height: 19px;
+    overflow: auto;
+    word-break: break-word;
+}
+
+// FIXME: rather unpleasant hack to get rid of 
 margins.
+// really we should be mixing in markdown-body from gfm.css instead
+.mx_MessageComposer_editor > :first-child {
+    margin-top: 0 ! important;
+}
+.mx_MessageComposer_editor > :last-child {
+    margin-bottom: 0 ! important;
+}
+
 @keyframes visualbell
 {
     from { background-color: #faa }
@@ -94,28 +136,6 @@ limitations under the License.
     animation: 0.2s visualbell;
 }
 
-.mx_MessageComposer_input_empty .public-DraftEditorPlaceholder-root {
-    display: none;
-}
-
-.mx_MessageComposer_input .DraftEditor-root {
-    width: 100%;
-    flex: 1;
-    word-break: break-word;
-    max-height: 120px;
-    min-height: 21px;
-    overflow: auto;
-}
-
-.mx_MessageComposer_input .DraftEditor-root .DraftEditor-editorContainer {
-    /* Ensure mx_UserPill and mx_RoomPill (see _RichText) are not obscured from the top */
-    padding-top: 2px;
-}
-
-.mx_MessageComposer .public-DraftStyleDefault-block {
-    overflow-x: hidden;
-}
-
 .mx_MessageComposer_input blockquote {
     color: $blockquote-fg-color;
     margin: 0 0 16px;
@@ -123,7 +143,7 @@ limitations under the License.
     border-left: 4px solid $blockquote-bar-color;
 }
 
-.mx_MessageComposer_input pre.public-DraftStyleDefault-pre pre {
+.mx_MessageComposer_input pre {
     background-color: $rte-code-bg-color;
     border-radius: 3px;
     padding: 10px;
diff --git a/res/css/views/rooms/_RoomSettings.scss b/res/css/views/rooms/_RoomSettings.scss
index 4013af4c7c..f04042ea77 100644
--- a/res/css/views/rooms/_RoomSettings.scss
+++ b/res/css/views/rooms/_RoomSettings.scss
@@ -20,6 +20,7 @@ limitations under the License.
     margin-bottom: 20px;
 }
 
+.mx_RoomSettings_upgradeButton,
 .mx_RoomSettings_leaveButton,
 .mx_RoomSettings_unbanButton {
     @mixin mx_DialogButton;
@@ -27,11 +28,16 @@ limitations under the License.
     margin-right: 8px;
 }
 
+.mx_RoomSettings_upgradeButton,
 .mx_RoomSettings_leaveButton:hover,
 .mx_RoomSettings_unbanButton:hover {
     @mixin mx_DialogButton_hover;
 }
 
+.mx_RoomSettings_upgradeButton.danger {
+    @mixin mx_DialogButton_danger;
+}
+
 .mx_RoomSettings_integrationsButton_error {
     position: relative;
     cursor: not-allowed;
diff --git a/res/css/views/rooms/_RoomUpgradeWarningBar.scss b/res/css/views/rooms/_RoomUpgradeWarningBar.scss
new file mode 100644
index 0000000000..82785b82d2
--- /dev/null
+++ b/res/css/views/rooms/_RoomUpgradeWarningBar.scss
@@ -0,0 +1,48 @@
+/*
+Copyright 2018 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_RoomUpgradeWarningBar {
+    text-align: center;
+    height: 176px;
+    background-color: $event-selected-color;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    display: flex;
+    background-color: $preview-bar-bg-color;
+    -webkit-align-items: center;
+    padding-left: 20px;
+    padding-right: 20px;
+}
+
+.mx_RoomUpgradeWarningBar_header {
+    color: $warning-color;
+    font-weight: bold;
+}
+
+.mx_RoomUpgradeWarningBar_body {
+    color: $warning-color;
+}
+
+.mx_RoomUpgradeWarningBar_upgradelink {
+    color: $warning-color;
+    text-decoration: underline;
+}
+
+.mx_RoomUpgradeWarningBar_small {
+    color: $greyed-fg-color;
+    font-size: 70%;
+}
diff --git a/res/img/button-text-quote-o-n.svg b/res/img/button-text-block-quote-on.svg
similarity index 100%
rename from res/img/button-text-quote-o-n.svg
rename to res/img/button-text-block-quote-on.svg
diff --git a/res/img/button-text-quote.svg b/res/img/button-text-block-quote.svg
similarity index 100%
rename from res/img/button-text-quote.svg
rename to res/img/button-text-block-quote.svg
diff --git a/res/img/button-text-bold-o-n.svg b/res/img/button-text-bold-on.svg
similarity index 100%
rename from res/img/button-text-bold-o-n.svg
rename to res/img/button-text-bold-on.svg
diff --git a/res/img/button-text-bullet-o-n.svg b/res/img/button-text-bulleted-list-on.svg
similarity index 100%
rename from res/img/button-text-bullet-o-n.svg
rename to res/img/button-text-bulleted-list-on.svg
diff --git a/res/img/button-text-bullet.svg b/res/img/button-text-bulleted-list.svg
similarity index 100%
rename from res/img/button-text-bullet.svg
rename to res/img/button-text-bulleted-list.svg
diff --git a/res/img/button-text-strike-o-n.svg b/res/img/button-text-deleted-on.svg
similarity index 100%
rename from res/img/button-text-strike-o-n.svg
rename to res/img/button-text-deleted-on.svg
diff --git a/res/img/button-text-strike.svg b/res/img/button-text-deleted.svg
similarity index 100%
rename from res/img/button-text-strike.svg
rename to res/img/button-text-deleted.svg
diff --git a/res/img/button-text-code-o-n.svg b/res/img/button-text-inline-code-on.svg
similarity index 100%
rename from res/img/button-text-code-o-n.svg
rename to res/img/button-text-inline-code-on.svg
diff --git a/res/img/button-text-code.svg b/res/img/button-text-inline-code.svg
similarity index 100%
rename from res/img/button-text-code.svg
rename to res/img/button-text-inline-code.svg
diff --git a/res/img/button-text-italic-o-n.svg b/res/img/button-text-italic-on.svg
similarity index 100%
rename from res/img/button-text-italic-o-n.svg
rename to res/img/button-text-italic-on.svg
diff --git a/res/img/button-text-numbullet-o-n.svg b/res/img/button-text-numbered-list-on.svg
similarity index 100%
rename from res/img/button-text-numbullet-o-n.svg
rename to res/img/button-text-numbered-list-on.svg
diff --git a/res/img/button-text-numbullet.svg b/res/img/button-text-numbered-list.svg
similarity index 100%
rename from res/img/button-text-numbullet.svg
rename to res/img/button-text-numbered-list.svg
diff --git a/res/img/button-text-underline-o-n.svg b/res/img/button-text-underlined-on.svg
similarity index 100%
rename from res/img/button-text-underline-o-n.svg
rename to res/img/button-text-underlined-on.svg
diff --git a/res/img/button-text-underline.svg b/res/img/button-text-underlined.svg
similarity index 100%
rename from res/img/button-text-underline.svg
rename to res/img/button-text-underlined.svg
diff --git a/res/img/room-continuation.svg b/res/img/room-continuation.svg
new file mode 100644
index 0000000000..dc7e15462a
--- /dev/null
+++ b/res/img/room-continuation.svg
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/res/img/room_replaced.svg b/res/img/room_replaced.svg
new file mode 100644
index 0000000000..fa5abd1c9f
--- /dev/null
+++ b/res/img/room_replaced.svg
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/res/img/social/facebook.png b/res/img/social/facebook.png
index 6a29e3820a..457ef761a1 100644
Binary files a/res/img/social/facebook.png and b/res/img/social/facebook.png differ
diff --git a/res/img/social/linkedin.png b/res/img/social/linkedin.png
index 2b868a585b..4c92adb56b 100644
Binary files a/res/img/social/linkedin.png and b/res/img/social/linkedin.png differ
diff --git a/res/img/social/reddit.png b/res/img/social/reddit.png
index bd6131186f..1310168470 100644
Binary files a/res/img/social/reddit.png and b/res/img/social/reddit.png differ
diff --git a/res/img/social/twitter-2.png b/res/img/social/twitter-2.png
index 84f8033a30..9f6e7c602b 100644
Binary files a/res/img/social/twitter-2.png and b/res/img/social/twitter-2.png differ
diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss
index 31773ebd09..8ab338790e 100644
--- a/res/themes/dark/css/_dark.scss
+++ b/res/themes/dark/css/_dark.scss
@@ -19,6 +19,8 @@ $focus-brightness: 200%;
 
 // red warning colour
 $warning-color: #ff0064;
+$warning-bg-color: #DF2A8B;
+$info-bg-color: #2A9EDF;
 
 // groups
 $info-plinth-bg-color: #454545;
diff --git a/res/themes/light/css/_base.scss b/res/themes/light/css/_base.scss
index 55c761e8d9..c7fd38259c 100644
--- a/res/themes/light/css/_base.scss
+++ b/res/themes/light/css/_base.scss
@@ -25,6 +25,9 @@ $focus-brightness: 125%;
 
 // red warning colour
 $warning-color: #ff0064;
+// background colour for warnings
+$warning-bg-color: #DF2A8B;
+$info-bg-color: #2A9EDF;
 $mention-user-pill-bg-color: #ff0064;
 $other-user-pill-bg-color: rgba(0, 0, 0, 0.1);
 
@@ -168,6 +171,10 @@ $progressbar-color: #000;
     outline: none;
 }
 
+@define-mixin mx_DialogButton_danger {
+    background-color: $warning-color;
+}
+
 @define-mixin mx_DialogButton_hover {
 }
 
diff --git a/scripts/emoji-data-strip.js b/scripts/emoji-data-strip.js
index 40156471fe..42bf2ac2de 100644
--- a/scripts/emoji-data-strip.js
+++ b/scripts/emoji-data-strip.js
@@ -12,6 +12,9 @@ const output = Object.keys(EMOJI_DATA).map(
             category: datum.category,
             emoji_order: datum.emoji_order,
         };
+        if (datum.aliases.length > 0) {
+            newDatum.aliases = datum.aliases;
+        }
         if (datum.aliases_ascii.length > 0) {
             newDatum.aliases_ascii = datum.aliases_ascii;
         }
diff --git a/scripts/gen-i18n.js b/scripts/gen-i18n.js
index fa9ccc8ed7..a1a2e6f7c5 100755
--- a/scripts/gen-i18n.js
+++ b/scripts/gen-i18n.js
@@ -143,7 +143,7 @@ function getTranslationsJs(file) {
                         // Validate tag replacements
                         if (node.arguments.length > 2) {
                             const tagMap = node.arguments[2];
-                            for (const prop of tagMap.properties) {
+                            for (const prop of tagMap.properties || []) {
                                 if (prop.key.type === 'Literal') {
                                     const tag = prop.key.value;
                                     // RegExp same as in src/languageHandler.js
@@ -158,6 +158,7 @@ function getTranslationsJs(file) {
                     } catch (e) {
                         console.log();
                         console.error(`ERROR: ${file}:${node.loc.start.line} ${tKey}`);
+                        console.error(e);
                         process.exit(1);
                     }
                 }
diff --git a/src/Analytics.js b/src/Analytics.js
index 8ffce7077f..d85d635b28 100644
--- a/src/Analytics.js
+++ b/src/Analytics.js
@@ -39,9 +39,17 @@ function getRedactedHash(hash) {
     return hash.replace(hashRegex, "#/$1");
 }
 
-// Return the current origin and hash separated with a `/`. This does not include query parameters.
+// Return the current origin, path and hash separated with a `/`. This does
+// not include query parameters.
 function getRedactedUrl() {
-    const { origin, pathname, hash } = window.location;
+    const { origin, hash } = window.location;
+    let { pathname } = window.location;
+
+    // Redact paths which could contain unexpected PII
+    if (origin.startsWith('file://')) {
+        pathname = "//";
+    }
+
     return origin + pathname + getRedactedHash(hash);
 }
 
@@ -191,9 +199,9 @@ class Analytics {
         this._paq.push(['trackPageView']);
     }
 
-    trackEvent(category, action, name) {
+    trackEvent(category, action, name, value) {
         if (this.disabled) return;
-        this._paq.push(['trackEvent', category, action, name]);
+        this._paq.push(['trackEvent', category, action, name, value]);
     }
 
     logout() {
diff --git a/src/CallHandler.js b/src/CallHandler.js
index a65d82fe85..acdc3e5122 100644
--- a/src/CallHandler.js
+++ b/src/CallHandler.js
@@ -59,8 +59,11 @@ import sdk from './index';
 import { _t } from './languageHandler';
 import Matrix from 'matrix-js-sdk';
 import dis from './dispatcher';
+import SdkConfig from './SdkConfig';
 import { showUnknownDeviceDialogForCalls } from './cryptodevices';
-import SettingsStore from "./settings/SettingsStore";
+import WidgetUtils from './utils/WidgetUtils';
+import WidgetEchoStore from './stores/WidgetEchoStore';
+import ScalarAuthClient from './ScalarAuthClient';
 
 global.mxCalls = {
     //room_id: MatrixCall
@@ -297,67 +300,7 @@ function _onAction(payload) {
             break;
         case 'place_conference_call':
             console.log("Place conference call in %s", payload.room_id);
-
-            if (MatrixClientPeg.get().isRoomEncrypted(payload.room_id)) {
-                // Conference calls are implemented by sending the media to central
-                // server which combines the audio from all the participants together
-                // into a single stream. This is incompatible with end-to-end encryption
-                // because a central server would be decrypting the audio for each
-                // participant.
-                // Therefore we disable conference calling in E2E rooms.
-                const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-                Modal.createTrackedDialog('Call Handler', 'Conference calls unsupported e2e', ErrorDialog, {
-                    description: _t('Conference calls are not supported in encrypted rooms'),
-                });
-                return;
-            }
-
-            if (SettingsStore.isFeatureEnabled('feature_jitsi')) {
-                _startCallApp(payload.room_id, payload.type);
-            } else {
-                if (!ConferenceHandler) {
-                    const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-                    Modal.createTrackedDialog('Call Handler', 'Conference call unsupported client', ErrorDialog, {
-                        description: _t('Conference calls are not supported in this client'),
-                    });
-                } else if (!MatrixClientPeg.get().supportsVoip()) {
-                    const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-                    Modal.createTrackedDialog('Call Handler', 'VoIP is unsupported', ErrorDialog, {
-                        title: _t('VoIP is unsupported'),
-                        description: _t('You cannot place VoIP calls in this browser.'),
-                    });
-                } else {
-                    const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
-                    Modal.createTrackedDialog('Call Handler', 'Conference calling in development', QuestionDialog, {
-                        title: _t('Warning!'),
-                        description: _t('Conference calling is in development and may not be reliable.'),
-                        onFinished: (confirm)=>{
-                            if (confirm) {
-                                ConferenceHandler.createNewMatrixCall(
-                                    MatrixClientPeg.get(), payload.room_id,
-                                ).done(function(call) {
-                                    placeCall(call);
-                                }, function(err) {
-                                    const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-                                    console.error("Conference call failed: " + err);
-                                    Modal.createTrackedDialog(
-                                        'Call Handler',
-                                        'Failed to set up conference call',
-                                        ErrorDialog,
-                                        {
-                                            title: _t('Failed to set up conference call'),
-                                            description: (
-                                                _t('Conference call failed.') +
-                                                ' ' + ((err && err.message) ? err.message : '')
-                                            ),
-                                        },
-                                    );
-                                });
-                            }
-                        },
-                    });
-                }
-            }
+            _startCallApp(payload.room_id, payload.type);
             break;
         case 'incoming_call':
             {
@@ -400,27 +343,61 @@ function _onAction(payload) {
     }
 }
 
-function _startCallApp(roomId, type) {
+async function _startCallApp(roomId, type) {
+    // check for a working intgrations manager. Technically we could put
+    // the state event in anyway, but the resulting widget would then not
+    // work for us. Better that the user knows before everyone else in the
+    // room sees it.
+    const scalarClient = new ScalarAuthClient();
+    let haveScalar = false;
+    try {
+        await scalarClient.connect();
+        haveScalar = scalarClient.hasCredentials();
+    } catch (e) {
+        // fall through
+    }
+    if (!haveScalar) {
+        const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+
+        Modal.createTrackedDialog('Could not connect to the integration server', '', ErrorDialog, {
+            title: _t('Could not connect to the integration server'),
+            description: _t('A conference call could not be started because the intgrations server is not available'),
+        });
+        return;
+    }
+
     dis.dispatch({
         action: 'appsDrawer',
         show: true,
     });
 
     const room = MatrixClientPeg.get().getRoom(roomId);
-    if (!room) {
-        console.error("Attempted to start conference call widget in unknown room: " + roomId);
+    const currentRoomWidgets = WidgetUtils.getRoomWidgets(room);
+
+    if (WidgetEchoStore.roomHasPendingWidgetsOfType(roomId, currentRoomWidgets, 'jitsi')) {
+        const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+
+        Modal.createTrackedDialog('Call already in progress', '', ErrorDialog, {
+            title: _t('Call in Progress'),
+            description: _t('A call is currently being placed!'),
+        });
         return;
     }
 
-    const appsStateEvents = room.currentState.getStateEvents('im.vector.modular.widgets');
-    const currentJitsiWidgets = appsStateEvents.filter((ev) => {
-        ev.getContent().type == 'jitsi';
+    const currentJitsiWidgets = currentRoomWidgets.filter((ev) => {
+        return ev.getContent().type === 'jitsi';
     });
     if (currentJitsiWidgets.length > 0) {
         console.warn(
             "Refusing to start conference call widget in " + roomId +
             " a conference call widget is already present",
         );
+        const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+
+        Modal.createTrackedDialog('Already have Jitsi Widget', '', ErrorDialog, {
+            title: _t('Call in Progress'),
+            description: _t('A call is already in progress!'),
+        });
         return;
     }
 
@@ -437,31 +414,38 @@ function _startCallApp(roomId, type) {
         'avatarUrl=$matrix_avatar_url',
         'email=$matrix_user_id',
     ].join('&');
-    const widgetUrl = (
-        'https://scalar.vector.im/api/widgets' +
-        '/jitsi.html?' +
-        queryString
-    );
 
-    const jitsiEvent = {
-        type: 'jitsi',
-        url: widgetUrl,
-        data: {
-            widgetSessionId: widgetSessionId,
-        },
-    };
+    let widgetUrl;
+    if (SdkConfig.get().integrations_jitsi_widget_url) {
+        // Try this config key. This probably isn't ideal as a way of discovering this
+        // URL, but this will at least allow the integration manager to not be hardcoded.
+        widgetUrl = SdkConfig.get().integrations_jitsi_widget_url + '?' + queryString;
+    } else {
+        widgetUrl = SdkConfig.get().integrations_rest_url + '/widgets/jitsi.html?' + queryString;
+    }
+
+    const widgetData = { widgetSessionId };
+
     const widgetId = (
         'jitsi_' +
         MatrixClientPeg.get().credentials.userId +
         '_' +
         Date.now()
     );
-    MatrixClientPeg.get().sendStateEvent(
-        roomId,
-        'im.vector.modular.widgets',
-        jitsiEvent,
-        widgetId,
-    ).then(() => console.log('Sent jitsi widget state event'), (e) => console.error(e));
+
+    WidgetUtils.setRoomWidget(roomId, widgetId, 'jitsi', widgetUrl, 'Jitsi', widgetData).then(() => {
+        console.log('Jitsi widget added');
+    }).catch((e) => {
+        if (e.errcode === 'M_FORBIDDEN') {
+            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+
+            Modal.createTrackedDialog('Call Failed', '', ErrorDialog, {
+                title: _t('Permission Required'),
+                description: _t("You do not have permission to start a conference call in this room"),
+            });
+        }
+        console.error(e);
+    });
 }
 
 // FIXME: Nasty way of making sure we only register
@@ -498,6 +482,24 @@ const callHandler = {
         return null;
     },
 
+    /**
+     * The conference handler is a module that deals with implementation-specific
+     * multi-party calling implementations. Riot passes in its own which creates
+     * a one-to-one call with a freeswitch conference bridge. As of July 2018,
+     * the de-facto way of conference calling is a Jitsi widget, so this is
+     * deprecated. It reamins here for two reasons:
+     *  1. So Riot still supports joining existing freeswitch conference calls
+     *     (but doesn't support creating them). After a transition period, we can
+     *     remove support for joining them too.
+     *  2. To hide the one-to-one rooms that old-style conferencing creates. This
+     *     is much harder to remove: probably either we make Riot leave & forget these
+     *     rooms after we remove support for joining freeswitch conferences, or we
+     *     accept that random rooms with cryptic users will suddently appear for
+     *     anyone who's ever used conference calling, or we are stuck with this
+     *     code forever.
+     *
+     * @param {object} confHandler The conference handler object
+     */
     setConferenceHandler: function(confHandler) {
         ConferenceHandler = confHandler;
     },
diff --git a/src/ComposerHistoryManager.js b/src/ComposerHistoryManager.js
index 2757c5bd3d..0164e6c4cd 100644
--- a/src/ComposerHistoryManager.js
+++ b/src/ComposerHistoryManager.js
@@ -15,46 +15,44 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {ContentState, convertToRaw, convertFromRaw} from 'draft-js';
-import * as RichText from './RichText';
-import Markdown from './Markdown';
+import { Value } from 'slate';
+
 import _clamp from 'lodash/clamp';
 
-type MessageFormat = 'html' | 'markdown';
+type MessageFormat = 'rich' | 'markdown';
 
 class HistoryItem {
 
-    // Keeping message for backwards-compatibility
-    message: string;
-    rawContentState: RawDraftContentState;
-    format: MessageFormat = 'html';
+    // We store history items in their native format to ensure history is accurate
+    // and then convert them if our RTE has subsequently changed format.
+    value: Value;
+    format: MessageFormat = 'rich';
 
-    constructor(contentState: ?ContentState, format: ?MessageFormat) {
-        this.rawContentState = contentState ? convertToRaw(contentState) : null;
+    constructor(value: ?Value, format: ?MessageFormat) {
+        this.value = value;
         this.format = format;
     }
 
-    toContentState(outputFormat: MessageFormat): ContentState {
-        const contentState = convertFromRaw(this.rawContentState);
-        if (outputFormat === 'markdown') {
-            if (this.format === 'html') {
-                return ContentState.createFromText(RichText.stateToMarkdown(contentState));
-            }
-        } else {
-            if (this.format === 'markdown') {
-                return RichText.htmlToContentState(new Markdown(contentState.getPlainText()).toHTML());
-            }
-        }
-        // history item has format === outputFormat
-        return contentState;
+    static fromJSON(obj: Object): HistoryItem {
+        return new HistoryItem(
+            Value.fromJSON(obj.value),
+            obj.format,
+        );
+    }
+
+    toJSON(): Object {
+        return {
+            value: this.value.toJSON(),
+            format: this.format,
+        };
     }
 }
 
 export default class ComposerHistoryManager {
     history: Array = [];
     prefix: string;
-    lastIndex: number = 0;
-    currentIndex: number = 0;
+    lastIndex: number = 0; // used for indexing the storage
+    currentIndex: number = 0; // used for indexing the loaded validated history Array
 
     constructor(roomId: string, prefix: string = 'mx_composer_history_') {
         this.prefix = prefix + roomId;
@@ -62,23 +60,28 @@ export default class ComposerHistoryManager {
         // TODO: Performance issues?
         let item;
         for (; item = sessionStorage.getItem(`${this.prefix}[${this.currentIndex}]`); this.currentIndex++) {
-            this.history.push(
-                Object.assign(new HistoryItem(), JSON.parse(item)),
-            );
+            try {
+                this.history.push(
+                    HistoryItem.fromJSON(JSON.parse(item)),
+                );
+            } catch (e) {
+                console.warn("Throwing away unserialisable history", e);
+            }
         }
         this.lastIndex = this.currentIndex;
+        // reset currentIndex to account for any unserialisable history
+        this.currentIndex = this.history.length;
     }
 
-    save(contentState: ContentState, format: MessageFormat) {
-        const item = new HistoryItem(contentState, format);
+    save(value: Value, format: MessageFormat) {
+        const item = new HistoryItem(value, format);
         this.history.push(item);
-        this.currentIndex = this.lastIndex + 1;
-        sessionStorage.setItem(`${this.prefix}[${this.lastIndex++}]`, JSON.stringify(item));
+        this.currentIndex = this.history.length;
+        sessionStorage.setItem(`${this.prefix}[${this.lastIndex++}]`, JSON.stringify(item.toJSON()));
     }
 
-    getItem(offset: number, format: MessageFormat): ?ContentState {
-        this.currentIndex = _clamp(this.currentIndex + offset, 0, this.lastIndex - 1);
-        const item = this.history[this.currentIndex];
-        return item ? item.toContentState(format) : null;
+    getItem(offset: number): ?HistoryItem {
+        this.currentIndex = _clamp(this.currentIndex + offset, 0, this.history.length - 1);
+        return this.history[this.currentIndex];
     }
 }
diff --git a/src/DecryptionFailureTracker.js b/src/DecryptionFailureTracker.js
index b1c6a71289..b02a5e937b 100644
--- a/src/DecryptionFailureTracker.js
+++ b/src/DecryptionFailureTracker.js
@@ -14,22 +14,25 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-class DecryptionFailure {
-    constructor(failedEventId) {
+export class DecryptionFailure {
+    constructor(failedEventId, errorCode) {
         this.failedEventId = failedEventId;
+        this.errorCode = errorCode;
         this.ts = Date.now();
     }
 }
 
-export default class DecryptionFailureTracker {
+export class DecryptionFailureTracker {
     // Array of items of type DecryptionFailure. Every `CHECK_INTERVAL_MS`, this list
     // is checked for failures that happened > `GRACE_PERIOD_MS` ago. Those that did
-    // are added to `failuresToTrack`.
+    // are accumulated in `failureCounts`.
     failures = [];
 
-    // Every TRACK_INTERVAL_MS (so as to spread the number of hits done on Analytics),
-    // one DecryptionFailure of this FIFO is removed and tracked.
-    failuresToTrack = [];
+    // A histogram of the number of failures that will be tracked at the next tracking
+    // interval, split by failure error code.
+    failureCounts = {
+        // [errorCode]: 42
+    };
 
     // Event IDs of failures that were tracked previously
     trackedEventHashMap = {
@@ -40,23 +43,41 @@ export default class DecryptionFailureTracker {
     checkInterval = null;
     trackInterval = null;
 
-    // Spread the load on `Analytics` by sending at most 1 event per
-    // `TRACK_INTERVAL_MS`.
-    static TRACK_INTERVAL_MS = 1000;
+    // Spread the load on `Analytics` by tracking at a low frequency, `TRACK_INTERVAL_MS`.
+    static TRACK_INTERVAL_MS = 60000;
 
     // Call `checkFailures` every `CHECK_INTERVAL_MS`.
     static CHECK_INTERVAL_MS = 5000;
 
-    // Give events a chance to be decrypted by waiting `GRACE_PERIOD_MS` before moving
-    // the failure to `failuresToTrack`.
-    static GRACE_PERIOD_MS = 5000;
+    // Give events a chance to be decrypted by waiting `GRACE_PERIOD_MS` before counting
+    // the failure in `failureCounts`.
+    static GRACE_PERIOD_MS = 60000;
 
-    constructor(fn) {
+    /**
+     * Create a new DecryptionFailureTracker.
+     *
+     * Call `eventDecrypted(event, err)` on this instance when an event is decrypted.
+     *
+     * Call `start()` to start the tracker, and `stop()` to stop tracking.
+     *
+     * @param {function} fn The tracking function, which will be called when failures
+     * are tracked. The function should have a signature `(count, trackedErrorCode) => {...}`,
+     * where `count` is the number of failures and `errorCode` matches the `.code` of
+     * provided DecryptionError errors (by default, unless `errorCodeMapFn` is specified.
+     * @param {function?} errorCodeMapFn The function used to map error codes to the
+     * trackedErrorCode. If not provided, the `.code` of errors will be used.
+     */
+    constructor(fn, errorCodeMapFn) {
         if (!fn || typeof fn !== 'function') {
             throw new Error('DecryptionFailureTracker requires tracking function');
         }
 
-        this.trackDecryptionFailure = fn;
+        if (errorCodeMapFn && typeof errorCodeMapFn !== 'function') {
+            throw new Error('DecryptionFailureTracker second constructor argument should be a function');
+        }
+
+        this._trackDecryptionFailure = fn;
+        this._mapErrorCode = errorCodeMapFn;
     }
 
     // loadTrackedEventHashMap() {
@@ -67,17 +88,17 @@ export default class DecryptionFailureTracker {
     //     localStorage.setItem('mx-decryption-failure-event-id-hashes', JSON.stringify(this.trackedEventHashMap));
     // }
 
-    eventDecrypted(e) {
-        if (e.isDecryptionFailure()) {
-            this.addDecryptionFailureForEvent(e);
+    eventDecrypted(e, err) {
+        if (err) {
+            this.addDecryptionFailure(new DecryptionFailure(e.getId(), err.code));
         } else {
             // Could be an event in the failures, remove it
             this.removeDecryptionFailuresForEvent(e);
         }
     }
 
-    addDecryptionFailureForEvent(e) {
-        this.failures.push(new DecryptionFailure(e.getId()));
+    addDecryptionFailure(failure) {
+        this.failures.push(failure);
     }
 
     removeDecryptionFailuresForEvent(e) {
@@ -94,7 +115,7 @@ export default class DecryptionFailureTracker {
         );
 
         this.trackInterval = setInterval(
-            () => this.trackFailure(),
+            () => this.trackFailures(),
             DecryptionFailureTracker.TRACK_INTERVAL_MS,
         );
     }
@@ -107,7 +128,7 @@ export default class DecryptionFailureTracker {
         clearInterval(this.trackInterval);
 
         this.failures = [];
-        this.failuresToTrack = [];
+        this.failureCounts = {};
     }
 
     /**
@@ -154,16 +175,28 @@ export default class DecryptionFailureTracker {
 
         const dedupedFailures = dedupedFailuresMap.values();
 
-        this.failuresToTrack = [...this.failuresToTrack, ...dedupedFailures];
+        this._aggregateFailures(dedupedFailures);
+    }
+
+    _aggregateFailures(failures) {
+        for (const failure of failures) {
+            const errorCode = failure.errorCode;
+            this.failureCounts[errorCode] = (this.failureCounts[errorCode] || 0) + 1;
+        }
     }
 
     /**
-     * If there is a failure that should be tracked, call the given trackDecryptionFailure
-     * function with the first failure in the FIFO of failures that should be tracked.
+     * If there are failures that should be tracked, call the given trackDecryptionFailure
+     * function with the number of failures that should be tracked.
      */
-    trackFailure() {
-        if (this.failuresToTrack.length > 0) {
-            this.trackDecryptionFailure(this.failuresToTrack.shift());
+    trackFailures() {
+        for (const errorCode of Object.keys(this.failureCounts)) {
+            if (this.failureCounts[errorCode] > 0) {
+                const trackedErrorCode = this._mapErrorCode ? this._mapErrorCode(errorCode) : errorCode;
+
+                this._trackDecryptionFailure(this.failureCounts[errorCode], trackedErrorCode);
+                this.failureCounts[errorCode] = 0;
+            }
         }
     }
 }
diff --git a/src/FromWidgetPostMessageApi.js b/src/FromWidgetPostMessageApi.js
index 792fd73733..ea7eeba756 100644
--- a/src/FromWidgetPostMessageApi.js
+++ b/src/FromWidgetPostMessageApi.js
@@ -18,6 +18,7 @@ import URL from 'url';
 import dis from './dispatcher';
 import IntegrationManager from './IntegrationManager';
 import WidgetMessagingEndpoint from './WidgetMessagingEndpoint';
+import ActiveWidgetStore from './stores/ActiveWidgetStore';
 
 const WIDGET_API_VERSION = '0.0.1'; // Current API version
 const SUPPORTED_WIDGET_API_VERSIONS = [
@@ -155,6 +156,14 @@ export default class FromWidgetPostMessageApi {
             const integType = (data && data.integType) ? data.integType : null;
             const integId = (data && data.integId) ? data.integId : null;
             IntegrationManager.open(integType, integId);
+        } else if (action === 'set_always_on_screen') {
+            // This is a new message: there is no reason to support the deprecated widgetData here
+            const data = event.data.data;
+            const val = data.value;
+
+            if (ActiveWidgetStore.widgetHasCapability(widgetId, 'm.always_on_screen')) {
+                ActiveWidgetStore.setWidgetPersistence(widgetId, val);
+            }
         } else {
             console.warn('Widget postMessage event unhandled');
             this.sendError(event, {message: 'The postMessage was unhandled'});
diff --git a/src/GroupAddressPicker.js b/src/GroupAddressPicker.js
index 91380b6eed..532ee23c25 100644
--- a/src/GroupAddressPicker.js
+++ b/src/GroupAddressPicker.js
@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import React from 'react';
 import Modal from './Modal';
 import sdk from './';
 import MultiInviter from './utils/MultiInviter';
diff --git a/src/HtmlUtils.js b/src/HtmlUtils.js
index 57be007209..b6a2bd0acb 100644
--- a/src/HtmlUtils.js
+++ b/src/HtmlUtils.js
@@ -112,7 +112,6 @@ export function charactersToImageNode(alt, useSvg, ...unicode) {
     />;
 }
 
-
 export function processHtmlForSending(html: string): string {
     const contentDiv = document.createElement('div');
     contentDiv.innerHTML = html;
@@ -130,13 +129,6 @@ export function processHtmlForSending(html: string): string {
             if (i !== contentDiv.children.length - 1) {
                 contentHTML += '
';
             }
-        } else if (element.tagName.toLowerCase() === 'pre') {
-            // Replace "
\n" with "\n" within `
` tags because the 
 is
-            // redundant. This is a workaround for a bug in draft-js-export-html:
-            //   https://github.com/sstur/draft-js-export-html/issues/62
-            contentHTML += '
' +
-                element.innerHTML.replace(/
\n/g, '\n').trim() +
-                '
';
         } else {
             const temp = document.createElement('div');
             temp.appendChild(element.cloneNode(true));
@@ -176,6 +168,99 @@ export function isUrlPermitted(inputUrl) {
     }
 }
 
+const transformTags = { // custom to matrix
+    // add blank targets to all hyperlinks except vector URLs
+    'a': function(tagName, attribs) {
+        if (attribs.href) {
+            attribs.target = '_blank'; // by default
+
+            let m;
+            // FIXME: horrible duplication with linkify-matrix
+            m = attribs.href.match(linkifyMatrix.VECTOR_URL_PATTERN);
+            if (m) {
+                attribs.href = m[1];
+                delete attribs.target;
+            } else {
+                m = attribs.href.match(linkifyMatrix.MATRIXTO_URL_PATTERN);
+                if (m) {
+                    const entity = m[1];
+                    switch (entity[0]) {
+                        case '@':
+                            attribs.href = '#/user/' + entity;
+                            break;
+                        case '+':
+                            attribs.href = '#/group/' + entity;
+                            break;
+                        case '#':
+                        case '!':
+                            attribs.href = '#/room/' + entity;
+                            break;
+                    }
+                    delete attribs.target;
+                }
+            }
+        }
+        attribs.rel = 'noopener'; // https://mathiasbynens.github.io/rel-noopener/
+        return { tagName, attribs };
+    },
+    'img': function(tagName, attribs) {
+        // Strip out imgs that aren't `mxc` here instead of using allowedSchemesByTag
+        // because transformTags is used _before_ we filter by allowedSchemesByTag and
+        // we don't want to allow images with `https?` `src`s.
+        if (!attribs.src || !attribs.src.startsWith('mxc://')) {
+            return { tagName, attribs: {}};
+        }
+        attribs.src = MatrixClientPeg.get().mxcUrlToHttp(
+            attribs.src,
+            attribs.width || 800,
+            attribs.height || 600,
+        );
+        return { tagName, attribs };
+    },
+    'code': function(tagName, attribs) {
+        if (typeof attribs.class !== 'undefined') {
+            // Filter out all classes other than ones starting with language- for syntax highlighting.
+            const classes = attribs.class.split(/\s+/).filter(function(cl) {
+                return cl.startsWith('language-');
+            });
+            attribs.class = classes.join(' ');
+        }
+        return { tagName, attribs };
+    },
+    '*': function(tagName, attribs) {
+        // Delete any style previously assigned, style is an allowedTag for font and span
+        // because attributes are stripped after transforming
+        delete attribs.style;
+
+        // Sanitise and transform data-mx-color and data-mx-bg-color to their CSS
+        // equivalents
+        const customCSSMapper = {
+            'data-mx-color': 'color',
+            'data-mx-bg-color': 'background-color',
+            // $customAttributeKey: $cssAttributeKey
+        };
+
+        let style = "";
+        Object.keys(customCSSMapper).forEach((customAttributeKey) => {
+            const cssAttributeKey = customCSSMapper[customAttributeKey];
+            const customAttributeValue = attribs[customAttributeKey];
+            if (customAttributeValue &&
+                typeof customAttributeValue === 'string' &&
+                COLOR_REGEX.test(customAttributeValue)
+            ) {
+                style += cssAttributeKey + ":" + customAttributeValue + ";";
+                delete attribs[customAttributeKey];
+            }
+        });
+
+        if (style) {
+            attribs.style = style;
+        }
+
+        return { tagName, attribs };
+    },
+};
+
 const sanitizeHtmlParams = {
     allowedTags: [
         'font', // custom to matrix for IRC-style font coloring
@@ -199,102 +284,14 @@ const sanitizeHtmlParams = {
     allowedSchemes: PERMITTED_URL_SCHEMES,
 
     allowProtocolRelative: false,
+    transformTags,
+};
 
-    transformTags: { // custom to matrix
-        // add blank targets to all hyperlinks except vector URLs
-        'a': function(tagName, attribs) {
-            if (attribs.href) {
-                attribs.target = '_blank'; // by default
-
-                let m;
-                // FIXME: horrible duplication with linkify-matrix
-                m = attribs.href.match(linkifyMatrix.VECTOR_URL_PATTERN);
-                if (m) {
-                    attribs.href = m[1];
-                    delete attribs.target;
-                } else {
-                    m = attribs.href.match(linkifyMatrix.MATRIXTO_URL_PATTERN);
-                    if (m) {
-                        const entity = m[1];
-                        switch (entity[0]) {
-                            case '@':
-                                attribs.href = '#/user/' + entity;
-                                break;
-                            case '+':
-                                attribs.href = '#/group/' + entity;
-                                break;
-                            case '#':
-                            case '!':
-                                attribs.href = '#/room/' + entity;
-                                break;
-                        }
-                        delete attribs.target;
-                    }
-                }
-            }
-            attribs.rel = 'noopener'; // https://mathiasbynens.github.io/rel-noopener/
-            return { tagName: tagName, attribs: attribs };
-        },
-        'img': function(tagName, attribs) {
-            // Strip out imgs that aren't `mxc` here instead of using allowedSchemesByTag
-            // because transformTags is used _before_ we filter by allowedSchemesByTag and
-            // we don't want to allow images with `https?` `src`s.
-            if (!attribs.src || !attribs.src.startsWith('mxc://')) {
-                return { tagName, attribs: {}};
-            }
-            attribs.src = MatrixClientPeg.get().mxcUrlToHttp(
-                attribs.src,
-                attribs.width || 800,
-                attribs.height || 600,
-            );
-            return { tagName: tagName, attribs: attribs };
-        },
-        'code': function(tagName, attribs) {
-            if (typeof attribs.class !== 'undefined') {
-                // Filter out all classes other than ones starting with language- for syntax highlighting.
-                const classes = attribs.class.split(/\s+/).filter(function(cl) {
-                    return cl.startsWith('language-');
-                });
-                attribs.class = classes.join(' ');
-            }
-            return {
-                tagName: tagName,
-                attribs: attribs,
-            };
-        },
-        '*': function(tagName, attribs) {
-            // Delete any style previously assigned, style is an allowedTag for font and span
-            // because attributes are stripped after transforming
-            delete attribs.style;
-
-            // Sanitise and transform data-mx-color and data-mx-bg-color to their CSS
-            // equivalents
-            const customCSSMapper = {
-                'data-mx-color': 'color',
-                'data-mx-bg-color': 'background-color',
-                // $customAttributeKey: $cssAttributeKey
-            };
-
-            let style = "";
-            Object.keys(customCSSMapper).forEach((customAttributeKey) => {
-                const cssAttributeKey = customCSSMapper[customAttributeKey];
-                const customAttributeValue = attribs[customAttributeKey];
-                if (customAttributeValue &&
-                    typeof customAttributeValue === 'string' &&
-                    COLOR_REGEX.test(customAttributeValue)
-                ) {
-                    style += cssAttributeKey + ":" + customAttributeValue + ";";
-                    delete attribs[customAttributeKey];
-                }
-            });
-
-            if (style) {
-                attribs.style = style;
-            }
-
-            return { tagName: tagName, attribs: attribs };
-        },
-    },
+// this is the same as the above except with less rewriting
+const composerSanitizeHtmlParams = Object.assign({}, sanitizeHtmlParams);
+composerSanitizeHtmlParams.transformTags = {
+    'code': transformTags['code'],
+    '*': transformTags['*'],
 };
 
 class BaseHighlighter {
@@ -409,21 +406,30 @@ class TextHighlighter extends BaseHighlighter {
 }
 
 
-    /* turn a matrix event body into html
-     *
-     * content: 'content' of the MatrixEvent
-     *
-     * highlights: optional list of words to highlight, ordered by longest word first
-     *
-     * opts.highlightLink: optional href to add to highlighted words
-     * opts.disableBigEmoji: optional argument to disable the big emoji class.
-     * opts.stripReplyFallback: optional argument specifying the event is a reply and so fallback needs removing
-     */
+/* turn a matrix event body into html
+ *
+ * content: 'content' of the MatrixEvent
+ *
+ * highlights: optional list of words to highlight, ordered by longest word first
+ *
+ * opts.highlightLink: optional href to add to highlighted words
+ * opts.disableBigEmoji: optional argument to disable the big emoji class.
+ * opts.stripReplyFallback: optional argument specifying the event is a reply and so fallback needs removing
+ * opts.returnString: return an HTML string rather than JSX elements
+ * opts.emojiOne: optional param to do emojiOne (default true)
+ * opts.forComposerQuote: optional param to lessen the url rewriting done by sanitization, for quoting into composer
+ */
 export function bodyToHtml(content, highlights, opts={}) {
     const isHtmlMessage = content.format === "org.matrix.custom.html" && content.formatted_body;
 
+    const doEmojiOne = opts.emojiOne === undefined ? true : opts.emojiOne;
     let bodyHasEmoji = false;
 
+    let sanitizeParams = sanitizeHtmlParams;
+    if (opts.forComposerQuote) {
+        sanitizeParams = composerSanitizeHtmlParams;
+    }
+
     let strippedBody;
     let safeBody;
     let isDisplayedWithHtml;
@@ -435,10 +441,10 @@ export function bodyToHtml(content, highlights, opts={}) {
         if (highlights && highlights.length > 0) {
             const highlighter = new HtmlHighlighter("mx_EventTile_searchHighlight", opts.highlightLink);
             const safeHighlights = highlights.map(function(highlight) {
-                return sanitizeHtml(highlight, sanitizeHtmlParams);
+                return sanitizeHtml(highlight, sanitizeParams);
             });
-            // XXX: hacky bodge to temporarily apply a textFilter to the sanitizeHtmlParams structure.
-            sanitizeHtmlParams.textFilter = function(safeText) {
+            // XXX: hacky bodge to temporarily apply a textFilter to the sanitizeParams structure.
+            sanitizeParams.textFilter = function(safeText) {
                 return highlighter.applyHighlights(safeText, safeHighlights).join('');
             };
         }
@@ -447,19 +453,20 @@ export function bodyToHtml(content, highlights, opts={}) {
         if (opts.stripReplyFallback && formattedBody) formattedBody = ReplyThread.stripHTMLReply(formattedBody);
         strippedBody = opts.stripReplyFallback ? ReplyThread.stripPlainReply(content.body) : content.body;
 
-        bodyHasEmoji = containsEmoji(isHtmlMessage ? formattedBody : content.body);
-
+        if (doEmojiOne) {
+            bodyHasEmoji = containsEmoji(isHtmlMessage ? formattedBody : content.body);
+        }
 
         // Only generate safeBody if the message was sent as org.matrix.custom.html
         if (isHtmlMessage) {
             isDisplayedWithHtml = true;
-            safeBody = sanitizeHtml(formattedBody, sanitizeHtmlParams);
+            safeBody = sanitizeHtml(formattedBody, sanitizeParams);
         } else {
             // ... or if there are emoji, which we insert as HTML alongside the
             // escaped plaintext body.
             if (bodyHasEmoji) {
                 isDisplayedWithHtml = true;
-                safeBody = sanitizeHtml(escape(strippedBody), sanitizeHtmlParams);
+                safeBody = sanitizeHtml(escape(strippedBody), sanitizeParams);
             }
         }
 
@@ -470,7 +477,11 @@ export function bodyToHtml(content, highlights, opts={}) {
             safeBody = unicodeToImage(safeBody);
         }
     } finally {
-        delete sanitizeHtmlParams.textFilter;
+        delete sanitizeParams.textFilter;
+    }
+
+    if (opts.returnString) {
+        return isDisplayedWithHtml ? safeBody : strippedBody;
     }
 
     let emojiBody = false;
diff --git a/src/Lifecycle.js b/src/Lifecycle.js
index 7378e982ef..434975a5bc 100644
--- a/src/Lifecycle.js
+++ b/src/Lifecycle.js
@@ -30,6 +30,8 @@ import DMRoomMap from './utils/DMRoomMap';
 import RtsClient from './RtsClient';
 import Modal from './Modal';
 import sdk from './index';
+import ActiveWidgetStore from './stores/ActiveWidgetStore';
+import PlatformPeg from "./PlatformPeg";
 
 /**
  * Called at startup, to attempt to build a logged-in Matrix session. It tries
@@ -236,6 +238,27 @@ async function _restoreFromLocalStorage() {
 function _handleLoadSessionFailure(e) {
     console.log("Unable to load session", e);
 
+    if (e instanceof Matrix.InvalidStoreError) {
+        if (e.reason === Matrix.InvalidStoreError.TOGGLED_LAZY_LOADING) {
+            return Promise.resolve().then(() => {
+                const lazyLoadEnabled = e.value;
+                if (lazyLoadEnabled) {
+                    const LazyLoadingResyncDialog =
+                        sdk.getComponent("views.dialogs.LazyLoadingResyncDialog");
+                    return new Promise((resolve) => {
+                        Modal.createDialog(LazyLoadingResyncDialog, {
+                            onFinished: resolve,
+                        });
+                    });
+                }
+            }).then(() => {
+                return MatrixClientPeg.get().store.deleteAllData();
+            }).then(() => {
+                PlatformPeg.get().reload();
+            });
+        }
+    }
+
     const def = Promise.defer();
     const SessionRestoreErrorDialog =
           sdk.getComponent('views.dialogs.SessionRestoreErrorDialog');
@@ -385,6 +408,8 @@ function _persistCredentialsToLocalStorage(credentials) {
     console.log(`Session persisted for ${credentials.userId}`);
 }
 
+let _isLoggingOut = false;
+
 /**
  * Logs the current session out and transitions to the logged-out state
  */
@@ -404,6 +429,7 @@ export function logout() {
         return;
     }
 
+    _isLoggingOut = true;
     MatrixClientPeg.get().logout().then(onLoggedOut,
         (err) => {
             // Just throwing an error here is going to be very unhelpful
@@ -419,6 +445,10 @@ export function logout() {
     ).done();
 }
 
+export function isLoggingOut() {
+    return _isLoggingOut;
+}
+
 /**
  * Starts the matrix client and all other react-sdk services that
  * listen for events while a session is logged in.
@@ -436,6 +466,7 @@ async function startMatrixClient() {
     UserActivity.start();
     Presence.start();
     DMRoomMap.makeShared().start();
+    ActiveWidgetStore.start();
 
     await MatrixClientPeg.start();
 
@@ -449,6 +480,7 @@ async function startMatrixClient() {
  * storage. Used after a session has been logged out.
  */
 export function onLoggedOut() {
+    _isLoggingOut = false;
     stopMatrixClient();
     _clearStorage().done();
     dis.dispatch({action: 'on_logged_out'});
@@ -488,6 +520,7 @@ export function stopMatrixClient() {
     Notifier.stop();
     UserActivity.stop();
     Presence.stop();
+    ActiveWidgetStore.stop();
     if (DMRoomMap.shared()) DMRoomMap.shared().stop();
     const cli = MatrixClientPeg.get();
     if (cli) {
diff --git a/src/Markdown.js b/src/Markdown.js
index aa1c7e45b1..acfea52100 100644
--- a/src/Markdown.js
+++ b/src/Markdown.js
@@ -102,6 +102,16 @@ export default class Markdown {
             // (https://github.com/vector-im/riot-web/issues/3154)
             softbreak: '
',
         });
+
+        // Trying to strip out the wrapping 
 causes a lot more complication
+        // than it's worth, i think.  For instance, this code will go and strip
+        // out any 
 tag (no matter where it is in the tree) which doesn't
+        // contain \n's.
+        // On the flip side, 
s are quite opionated and restricted on where
+        // you can nest them.
+        //
+        // Let's try sending with 
s anyway for now, though.
+
         const real_paragraph = renderer.paragraph;
 
         renderer.paragraph = function(node, entering) {
@@ -115,15 +125,20 @@ export default class Markdown {
             }
         };
 
+
         renderer.html_inline = html_if_tag_allowed;
+
         renderer.html_block = function(node) {
+/*
             // as with `paragraph`, we only insert line breaks
             // if there are multiple lines in the markdown.
             const isMultiLine = is_multi_line(node);
-
             if (isMultiLine) this.cr();
+*/
             html_if_tag_allowed.call(this, node);
+/*
             if (isMultiLine) this.cr();
+*/
         };
 
         return renderer.render(this.parsed);
@@ -133,7 +148,10 @@ export default class Markdown {
      * Render the markdown message to plain text. That is, essentially
      * just remove any backslashes escaping what would otherwise be
      * markdown syntax
-     * (to fix https://github.com/vector-im/riot-web/issues/2870)
+     * (to fix https://github.com/vector-im/riot-web/issues/2870).
+     *
+     * N.B. this does **NOT** render arbitrary MD to plain text - only MD
+     * which has no formatting.  Otherwise it emits HTML(!).
      */
     toPlaintext() {
         const renderer = new commonmark.HtmlRenderer({safe: false});
@@ -156,6 +174,7 @@ export default class Markdown {
                 }
             }
         };
+
         renderer.html_block = function(node) {
             this.lit(node.literal);
             if (is_multi_line(node) && node.next) this.lit('\n\n');
diff --git a/src/MatrixClientPeg.js b/src/MatrixClientPeg.js
index 9d86a62de4..9865044717 100644
--- a/src/MatrixClientPeg.js
+++ b/src/MatrixClientPeg.js
@@ -99,13 +99,17 @@ class MatrixClientPeg {
         // the react sdk doesn't work without this, so don't allow
         opts.pendingEventOrdering = "detached";
 
+        if (SettingsStore.isFeatureEnabled('feature_lazyloading')) {
+            opts.lazyLoadMembers = true;
+        }
+
         try {
             const promise = this.matrixClient.store.startup();
             console.log(`MatrixClientPeg: waiting for MatrixClient store to initialise`);
             await promise;
         } catch (err) {
             // log any errors when starting up the database (if one exists)
-            console.error(`Error starting matrixclient store: ${err}`);
+            console.error('Error starting matrixclient store', err);
         }
 
         // regardless of errors, start the client. If we did error out, we'll
@@ -115,7 +119,7 @@ class MatrixClientPeg {
         MatrixActionCreators.start(this.matrixClient);
 
         console.log(`MatrixClientPeg: really starting MatrixClient`);
-        this.get().startClient(opts);
+        await this.get().startClient(opts);
         console.log(`MatrixClientPeg: MatrixClient started`);
     }
 
diff --git a/src/Notifier.js b/src/Notifier.js
index b823c4df05..80e8be1084 100644
--- a/src/Notifier.js
+++ b/src/Notifier.js
@@ -170,15 +170,15 @@ const Notifier = {
                     value: true,
                 });
             });
-            // clear the notifications_hidden flag, so that if notifications are
-            // disabled again in the future, we will show the banner again.
-            this.setToolbarHidden(true);
         } else {
             dis.dispatch({
                 action: "notifier_enabled",
                 value: false,
             });
         }
+        // set the notifications_hidden flag, as the user has knowingly interacted
+        // with the setting we shouldn't nag them any further
+        this.setToolbarHidden(true);
     },
 
     isEnabled: function() {
diff --git a/src/Registration.js b/src/Registration.js
new file mode 100644
index 0000000000..070178fecb
--- /dev/null
+++ b/src/Registration.js
@@ -0,0 +1,92 @@
+/*
+Copyright 2018 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/**
+ * Utility code for registering with a homeserver
+ * Note that this is currently *not* used by the actual
+ * registration code.
+ */
+
+import dis from './dispatcher';
+import sdk from './index';
+import MatrixClientPeg from './MatrixClientPeg';
+import Modal from './Modal';
+import { _t } from './languageHandler';
+
+/**
+ * Starts either the ILAG or full registration flow, depending
+ * on what the HS supports
+ *
+ * @param {object} options
+ * @param {bool} options.go_home_on_cancel If true, goes to
+ *     the hame page if the user cancels the action
+ */
+export async function startAnyRegistrationFlow(options) {
+    if (options === undefined) options = {};
+    const flows = await _getRegistrationFlows();
+    // look for an ILAG compatible flow. We define this as one
+    // which has only dummy or recaptcha flows. In practice it
+    // would support any stage InteractiveAuth supports, just not
+    // ones like email & msisdn which require the user to supply
+    // the relevant details in advance. We err on the side of
+    // caution though.
+    const hasIlagFlow = flows.some((flow) => {
+        return flow.stages.every((stage) => {
+            return ['m.login.dummy', 'm.login.recaptcha'].includes(stage);
+        });
+    });
+
+    if (hasIlagFlow) {
+        dis.dispatch({
+            action: 'view_set_mxid',
+            go_home_on_cancel: options.go_home_on_cancel,
+        });
+    } else {
+        const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
+        Modal.createTrackedDialog('Registration required', '', QuestionDialog, {
+            title: _t("Registration Required"),
+            description: _t("You need to register to do this. Would you like to register now?"),
+            button: _t("Register"),
+            onFinished: (proceed) => {
+                if (proceed) {
+                    dis.dispatch({action: 'start_registration'});
+                } else if (options.go_home_on_cancel) {
+                    dis.dispatch({action: 'view_home_page'});
+                }
+            },
+        });
+    }
+}
+
+async function _getRegistrationFlows() {
+    try {
+        await MatrixClientPeg.get().register(
+            null,
+            null,
+            undefined,
+            {},
+            {},
+        );
+        console.log("Register request succeeded when it should have returned 401!");
+    } catch (e) {
+        if (e.httpStatus === 401) {
+            return e.data.flows;
+        }
+        throw e;
+    }
+    throw new Error("Register request succeeded when it should have returned 401!");
+}
+
diff --git a/src/RichText.js b/src/RichText.js
index 12274ee9f3..3e8f834da6 100644
--- a/src/RichText.js
+++ b/src/RichText.js
@@ -1,307 +1,40 @@
-import React from 'react';
-import {
-    Editor,
-    EditorState,
-    Modifier,
-    ContentState,
-    ContentBlock,
-    convertFromHTML,
-    DefaultDraftBlockRenderMap,
-    DefaultDraftInlineStyle,
-    CompositeDecorator,
-    SelectionState,
-    Entity,
-} from 'draft-js';
-import * as sdk from './index';
+/*
+Copyright 2015 - 2017 OpenMarket Ltd
+Copyright 2017 Vector Creations Ltd
+Copyright 2018 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 import * as emojione from 'emojione';
-import {stateToHTML} from 'draft-js-export-html';
-import {SelectionRange} from "./autocomplete/Autocompleter";
-import {stateToMarkdown as __stateToMarkdown} from 'draft-js-export-markdown';
 
-const MARKDOWN_REGEX = {
-    LINK: /(?:\[([^\]]+)\]\(([^\)]+)\))|\<(\w+:\/\/[^\>]+)\>/g,
-    ITALIC: /([\*_])([\w\s]+?)\1/g,
-    BOLD: /([\*_])\1([\w\s]+?)\1\1/g,
-    HR: /(\n|^)((-|\*|_) *){3,}(\n|$)/g,
-    CODE: /`[^`]*`/g,
-    STRIKETHROUGH: /~{2}[^~]*~{2}/g,
-};
 
-const USERNAME_REGEX = /@\S+:\S+/g;
-const ROOM_REGEX = /#\S+:\S+/g;
-const EMOJI_REGEX = new RegExp(emojione.unicodeRegexp, 'g');
+export function unicodeToEmojiUri(str) {
+    const mappedUnicode = emojione.mapUnicodeToShort();
 
-const ZWS_CODE = 8203;
-const ZWS = String.fromCharCode(ZWS_CODE); // zero width space
-export function stateToMarkdown(state) {
-    return __stateToMarkdown(state)
-        .replace(
-            ZWS, // draft-js-export-markdown adds these
-            ''); // this is *not* a zero width space, trust me :)
-}
-
-export const contentStateToHTML = (contentState: ContentState) => {
-    return stateToHTML(contentState, {
-        inlineStyles: {
-            UNDERLINE: {
-                element: 'u',
-            },
-        },
-    });
-};
-
-export function htmlToContentState(html: string): ContentState {
-    const blockArray = convertFromHTML(html).contentBlocks;
-    return ContentState.createFromBlockArray(blockArray);
-}
-
-function unicodeToEmojiUri(str) {
-    let replaceWith, unicode, alt;
-    if ((!emojione.unicodeAlt) || (emojione.sprites)) {
-        // if we are using the shortname as the alt tag then we need a reversed array to map unicode code point to shortnames
-        const mappedUnicode = emojione.mapUnicodeToShort();
-    }
-
-    str = str.replace(emojione.regUnicode, function(unicodeChar) {
-        if ( (typeof unicodeChar === 'undefined') || (unicodeChar === '') || (!(unicodeChar in emojione.jsEscapeMap)) ) {
-            // if the unicodeChar doesnt exist just return the entire match
+    // remove any zero width joiners/spaces used in conjugate emojis as the emojione URIs don't contain them
+    return str.replace(emojione.regUnicode, function(unicodeChar) {
+        if ((typeof unicodeChar === 'undefined') || (unicodeChar === '') || (!(unicodeChar in emojione.jsEscapeMap))) {
+            // if the unicodeChar doesn't exist just return the entire match
             return unicodeChar;
         } else {
-            // Remove variant selector VS16 (explicitly emoji) as it is unnecessary and leads to an incorrect URL below
-            if (unicodeChar.length == 2 && unicodeChar[1] == '\ufe0f') {
-                unicodeChar = unicodeChar[0];
-            }
-
             // get the unicode codepoint from the actual char
-            unicode = emojione.jsEscapeMap[unicodeChar];
+            const unicode = emojione.jsEscapeMap[unicodeChar];
 
-            return emojione.imagePathSVG+unicode+'.svg'+emojione.cacheBustParam;
+            const short = mappedUnicode[unicode];
+            const fname = emojione.emojioneList[short].fname;
+
+            return emojione.imagePathSVG+fname+'.svg'+emojione.cacheBustParam;
         }
     });
-
-    return str;
-}
-
-/**
- * Utility function that looks for regex matches within a ContentBlock and invokes {callback} with (start, end)
- * From https://facebook.github.io/draft-js/docs/advanced-topics-decorators.html
- */
-function findWithRegex(regex, contentBlock: ContentBlock, callback: (start: number, end: number) => any) {
-    const text = contentBlock.getText();
-    let matchArr, start;
-    while ((matchArr = regex.exec(text)) !== null) {
-        start = matchArr.index;
-        callback(start, start + matchArr[0].length);
-    }
-}
-
-// Workaround for https://github.com/facebook/draft-js/issues/414
-const emojiDecorator = {
-    strategy: (contentState, contentBlock, callback) => {
-        findWithRegex(EMOJI_REGEX, contentBlock, callback);
-    },
-    component: (props) => {
-        const uri = unicodeToEmojiUri(props.children[0].props.text);
-        const shortname = emojione.toShort(props.children[0].props.text);
-        const style = {
-            display: 'inline-block',
-            width: '1em',
-            maxHeight: '1em',
-            background: `url(${uri})`,
-            backgroundSize: 'contain',
-            backgroundPosition: 'center center',
-            overflow: 'hidden',
-        };
-        return ({ props.children });
-    },
-};
-
-/**
- * Returns a composite decorator which has access to provided scope.
- */
-export function getScopedRTDecorators(scope: any): CompositeDecorator {
-    return [emojiDecorator];
-}
-
-export function getScopedMDDecorators(scope: any): CompositeDecorator {
-    const markdownDecorators = ['HR', 'BOLD', 'ITALIC', 'CODE', 'STRIKETHROUGH'].map(
-        (style) => ({
-            strategy: (contentState, contentBlock, callback) => {
-                return findWithRegex(MARKDOWN_REGEX[style], contentBlock, callback);
-            },
-            component: (props) => (
-                
-                    { props.children }
-                
-            ),
-        }));
-
-    markdownDecorators.push({
-        strategy: (contentState, contentBlock, callback) => {
-            return findWithRegex(MARKDOWN_REGEX.LINK, contentBlock, callback);
-        },
-        component: (props) => (
-            
-                { props.children }
-            
-        ),
-    });
-    // markdownDecorators.push(emojiDecorator);
-    // TODO Consider renabling "syntax highlighting" when we can do it properly
-    return [emojiDecorator];
-}
-
-/**
- * Passes rangeToReplace to modifyFn and replaces it in contentState with the result.
- */
-export function modifyText(contentState: ContentState, rangeToReplace: SelectionState,
-                           modifyFn: (text: string) => string, inlineStyle, entityKey): ContentState {
-    let getText = (key) => contentState.getBlockForKey(key).getText(),
-        startKey = rangeToReplace.getStartKey(),
-        startOffset = rangeToReplace.getStartOffset(),
-        endKey = rangeToReplace.getEndKey(),
-        endOffset = rangeToReplace.getEndOffset(),
-        text = "";
-
-
-    for (let currentKey = startKey;
-            currentKey && currentKey !== endKey;
-            currentKey = contentState.getKeyAfter(currentKey)) {
-        const blockText = getText(currentKey);
-        text += blockText.substring(startOffset, blockText.length);
-
-        // from now on, we'll take whole blocks
-        startOffset = 0;
-    }
-
-    // add remaining part of last block
-    text += getText(endKey).substring(startOffset, endOffset);
-
-    return Modifier.replaceText(contentState, rangeToReplace, modifyFn(text), inlineStyle, entityKey);
-}
-
-/**
- * Computes the plaintext offsets of the given SelectionState.
- * Note that this inherently means we make assumptions about what that means (no separator between ContentBlocks, etc)
- * Used by autocomplete to show completions when the current selection lies within, or at the edges of a command.
- */
-export function selectionStateToTextOffsets(selectionState: SelectionState,
-                                            contentBlocks: Array): {start: number, end: number} {
-    let offset = 0, start = 0, end = 0;
-    for (const block of contentBlocks) {
-        if (selectionState.getStartKey() === block.getKey()) {
-            start = offset + selectionState.getStartOffset();
-        }
-        if (selectionState.getEndKey() === block.getKey()) {
-            end = offset + selectionState.getEndOffset();
-            break;
-        }
-        offset += block.getLength();
-    }
-
-    return {
-        start,
-        end,
-    };
-}
-
-export function textOffsetsToSelectionState({start, end}: SelectionRange,
-                                            contentBlocks: Array): SelectionState {
-    let selectionState = SelectionState.createEmpty();
-    // Subtract block lengths from `start` and `end` until they are less than the current
-    // block length (accounting for the NL at the end of each block). Set them to -1 to
-    // indicate that the corresponding selection state has been determined.
-    for (const block of contentBlocks) {
-        const blockLength = block.getLength();
-        // -1 indicating that the position start position has been found
-        if (start !== -1) {
-            if (start < blockLength + 1) {
-                selectionState = selectionState.merge({
-                    anchorKey: block.getKey(),
-                    anchorOffset: start,
-                });
-                start = -1; // selection state for the start calculated
-            } else {
-                start -= blockLength + 1; // +1 to account for newline between blocks
-            }
-        }
-        // -1 indicating that the position end position has been found
-        if (end !== -1) {
-            if (end < blockLength + 1) {
-                selectionState = selectionState.merge({
-                    focusKey: block.getKey(),
-                    focusOffset: end,
-                });
-                end = -1; // selection state for the end calculated
-            } else {
-                end -= blockLength + 1; // +1 to account for newline between blocks
-            }
-        }
-    }
-    return selectionState;
-}
-
-// modified version of https://github.com/draft-js-plugins/draft-js-plugins/blob/master/draft-js-emoji-plugin/src/modifiers/attachImmutableEntitiesToEmojis.js
-export function attachImmutableEntitiesToEmoji(editorState: EditorState): EditorState {
-    const contentState = editorState.getCurrentContent();
-    const blocks = contentState.getBlockMap();
-    let newContentState = contentState;
-
-    blocks.forEach((block) => {
-        const plainText = block.getText();
-
-        const addEntityToEmoji = (start, end) => {
-            const existingEntityKey = block.getEntityAt(start);
-            if (existingEntityKey) {
-                // avoid manipulation in case the emoji already has an entity
-                const entity = newContentState.getEntity(existingEntityKey);
-                if (entity && entity.get('type') === 'emoji') {
-                    return;
-                }
-            }
-
-            const selection = SelectionState.createEmpty(block.getKey())
-                .set('anchorOffset', start)
-                .set('focusOffset', end);
-            const emojiText = plainText.substring(start, end);
-            newContentState = newContentState.createEntity(
-                'emoji', 'IMMUTABLE', { emojiUnicode: emojiText },
-            );
-            const entityKey = newContentState.getLastCreatedEntityKey();
-            newContentState = Modifier.replaceText(
-                newContentState,
-                selection,
-                emojiText,
-                null,
-                entityKey,
-            );
-        };
-
-        findWithRegex(EMOJI_REGEX, block, addEntityToEmoji);
-    });
-
-    if (!newContentState.equals(contentState)) {
-        const oldSelection = editorState.getSelection();
-        editorState = EditorState.push(
-            editorState,
-            newContentState,
-            'convert-to-immutable-emojis',
-        );
-        // this is somewhat of a hack, we're undoing selection changes caused above
-        // it would be better not to make those changes in the first place
-        editorState = EditorState.forceSelection(editorState, oldSelection);
-    }
-
-    return editorState;
-}
-
-export function hasMultiLineSelection(editorState: EditorState): boolean {
-    const selectionState = editorState.getSelection();
-    const anchorKey = selectionState.getAnchorKey();
-    const currentContent = editorState.getCurrentContent();
-    const currentContentBlock = currentContent.getBlockForKey(anchorKey);
-    const start = selectionState.getStartOffset();
-    const end = selectionState.getEndOffset();
-    const selectedText = currentContentBlock.getText().slice(start, end);
-    return selectedText.includes('\n');
 }
diff --git a/src/RoomInvite.js b/src/RoomInvite.js
index 0bcc08eb06..a96d1b2f6b 100644
--- a/src/RoomInvite.js
+++ b/src/RoomInvite.js
@@ -191,14 +191,10 @@ function _showAnyInviteErrors(addrs, room) {
 function _getDirectMessageRooms(addr) {
     const dmRoomMap = new DMRoomMap(MatrixClientPeg.get());
     const dmRooms = dmRoomMap.getDMRoomsForUserId(addr);
-    const rooms = [];
-    dmRooms.forEach((dmRoom) => {
+    const rooms = dmRooms.filter((dmRoom) => {
         const room = MatrixClientPeg.get().getRoom(dmRoom);
         if (room) {
-            const me = room.getMember(MatrixClientPeg.get().credentials.userId);
-            if (me.membership == 'join') {
-                rooms.push(room);
-            }
+            return room.getMyMembership() === 'join';
         }
     });
     return rooms;
diff --git a/src/Rooms.js b/src/Rooms.js
index ffa39141ff..e24b8316b3 100644
--- a/src/Rooms.js
+++ b/src/Rooms.js
@@ -31,27 +31,27 @@ export function getDisplayAliasForRoom(room) {
  * If the room contains only two members including the logged-in user,
  * return the other one. Otherwise, return null.
  */
-export function getOnlyOtherMember(room, me) {
-    const joinedMembers = room.getJoinedMembers();
+export function getOnlyOtherMember(room, myUserId) {
 
-    if (joinedMembers.length === 2) {
-        return joinedMembers.filter(function(m) {
-            return m.userId !== me.userId;
+    if (room.currentState.getJoinedMemberCount() === 2) {
+        return room.getJoinedMembers().filter(function(m) {
+            return m.userId !== myUserId;
         })[0];
     }
 
     return null;
 }
 
-function _isConfCallRoom(room, me, conferenceHandler) {
+function _isConfCallRoom(room, myUserId, conferenceHandler) {
     if (!conferenceHandler) return false;
 
-    if (me.membership != "join") {
+    const myMembership = room.getMyMembership();
+    if (myMembership != "join") {
         return false;
     }
 
-    const otherMember = getOnlyOtherMember(room, me);
-    if (otherMember === null) {
+    const otherMember = getOnlyOtherMember(room, myUserId);
+    if (!otherMember) {
         return false;
     }
 
@@ -68,29 +68,31 @@ const isConfCallRoomCache = {
     // $roomId: bool
 };
 
-export function isConfCallRoom(room, me, conferenceHandler) {
+export function isConfCallRoom(room, myUserId, conferenceHandler) {
     if (isConfCallRoomCache[room.roomId] !== undefined) {
         return isConfCallRoomCache[room.roomId];
     }
 
-    const result = _isConfCallRoom(room, me, conferenceHandler);
+    const result = _isConfCallRoom(room, myUserId, conferenceHandler);
 
     isConfCallRoomCache[room.roomId] = result;
 
     return result;
 }
 
-export function looksLikeDirectMessageRoom(room, me) {
-    if (me.membership == "join" || me.membership === "ban" ||
-        (me.membership === "leave" && me.events.member.getSender() !== me.events.member.getStateKey())) {
+export function looksLikeDirectMessageRoom(room, myUserId) {
+    const myMembership = room.getMyMembership();
+    const me = room.getMember(myUserId);
+
+    if (myMembership == "join" || myMembership === "ban" || (me && me.isKicked())) {
         // Used to split rooms via tags
         const tagNames = Object.keys(room.tags);
         // Used for 1:1 direct chats
-        const members = room.currentState.getMembers();
-
         // Show 1:1 chats in seperate "Direct Messages" section as long as they haven't
         // been moved to a different tag section
-        if (members.length === 2 && !tagNames.length) {
+        const totalMemberCount = room.currentState.getJoinedMemberCount() +
+            room.currentState.getInvitedMemberCount();
+        if (totalMemberCount === 2 && !tagNames.length) {
             return true;
         }
     }
@@ -100,10 +102,10 @@ export function looksLikeDirectMessageRoom(room, me) {
 export function guessAndSetDMRoom(room, isDirect) {
     let newTarget;
     if (isDirect) {
-        const guessedTarget = guessDMRoomTarget(
-            room, room.getMember(MatrixClientPeg.get().credentials.userId),
+        const guessedUserId = guessDMRoomTargetId(
+            room, MatrixClientPeg.get().getUserId()
         );
-        newTarget = guessedTarget.userId;
+        newTarget = guessedUserId;
     } else {
         newTarget = null;
     }
@@ -159,15 +161,15 @@ export function setDMRoom(roomId, userId) {
  * Given a room, estimate which of its members is likely to
  * be the target if the room were a DM room and return that user.
  */
-export function guessDMRoomTarget(room, me) {
+function guessDMRoomTargetId(room, myUserId) {
     let oldestTs;
     let oldestUser;
 
     // Pick the joined user who's been here longest (and isn't us),
     for (const user of room.getJoinedMembers()) {
-        if (user.userId == me.userId) continue;
+        if (user.userId == myUserId) continue;
 
-        if (oldestTs === undefined || user.events.member.getTs() < oldestTs) {
+        if (oldestTs === undefined || (user.events.member && user.events.member.getTs() < oldestTs)) {
             oldestUser = user;
             oldestTs = user.events.member.getTs();
         }
@@ -176,14 +178,14 @@ export function guessDMRoomTarget(room, me) {
 
     // if there are no joined members other than us, use the oldest member
     for (const user of room.currentState.getMembers()) {
-        if (user.userId == me.userId) continue;
+        if (user.userId == myUserId) continue;
 
-        if (oldestTs === undefined || user.events.member.getTs() < oldestTs) {
+        if (oldestTs === undefined || (user.events.member && user.events.member.getTs() < oldestTs)) {
             oldestUser = user;
             oldestTs = user.events.member.getTs();
         }
     }
 
-    if (oldestUser === undefined) return me;
+    if (oldestUser === undefined) return myUserId;
     return oldestUser;
 }
diff --git a/src/ScalarAuthClient.js b/src/ScalarAuthClient.js
index c7e439bf2e..40467ec580 100644
--- a/src/ScalarAuthClient.js
+++ b/src/ScalarAuthClient.js
@@ -63,25 +63,24 @@ class ScalarAuthClient {
     validateToken(token) {
         let url = SdkConfig.get().integrations_rest_url + "/account";
 
-        const defer = Promise.defer();
-        request({
-            method: "GET",
-            uri: url,
-            qs: {scalar_token: token},
-            json: true,
-        }, (err, response, body) => {
-            if (err) {
-                defer.reject(err);
-            } else if (response.statusCode / 100 !== 2) {
-                defer.reject({statusCode: response.statusCode});
-            } else if (!body || !body.user_id) {
-                defer.reject(new Error("Missing user_id in response"));
-            } else {
-                defer.resolve(body.user_id);
-            }
-        });
-
-        return defer.promise;
+        return new Promise(function(resolve, reject) {
+            request({
+                method: "GET",
+                uri: url,
+                qs: {scalar_token: token},
+                json: true,
+            }, (err, response, body) => {
+                if (err) {
+                    reject(err);
+                } else if (response.statusCode / 100 !== 2) {
+                    reject({statusCode: response.statusCode});
+                } else if (!body || !body.user_id) {
+                    reject(new Error("Missing user_id in response"));
+                } else {
+                    resolve(body.user_id);
+                }
+            });
+        })
     }
 
     registerForToken() {
@@ -96,56 +95,54 @@ class ScalarAuthClient {
     }
 
     exchangeForScalarToken(openid_token_object) {
-        const defer = Promise.defer();
-
         const scalar_rest_url = SdkConfig.get().integrations_rest_url;
-        request({
-            method: 'POST',
-            uri: scalar_rest_url+'/register',
-            body: openid_token_object,
-            json: true,
-        }, (err, response, body) => {
-            if (err) {
-                defer.reject(err);
-            } else if (response.statusCode / 100 !== 2) {
-                defer.reject({statusCode: response.statusCode});
-            } else if (!body || !body.scalar_token) {
-                defer.reject(new Error("Missing scalar_token in response"));
-            } else {
-                defer.resolve(body.scalar_token);
-            }
-        });
 
-        return defer.promise;
+        return new Promise(function(resolve, reject) {
+            request({
+                method: 'POST',
+                uri: scalar_rest_url+'/register',
+                body: openid_token_object,
+                json: true,
+            }, (err, response, body) => {
+                if (err) {
+                    reject(err);
+                } else if (response.statusCode / 100 !== 2) {
+                    reject({statusCode: response.statusCode});
+                } else if (!body || !body.scalar_token) {
+                    reject(new Error("Missing scalar_token in response"));
+                } else {
+                    resolve(body.scalar_token);
+                }
+            });
+        })
     }
 
     getScalarPageTitle(url) {
-        const defer = Promise.defer();
-
         let scalarPageLookupUrl = SdkConfig.get().integrations_rest_url + '/widgets/title_lookup';
         scalarPageLookupUrl = this.getStarterLink(scalarPageLookupUrl);
         scalarPageLookupUrl += '&curl=' + encodeURIComponent(url);
-        request({
-            method: 'GET',
-            uri: scalarPageLookupUrl,
-            json: true,
-        }, (err, response, body) => {
-            if (err) {
-                defer.reject(err);
-            } else if (response.statusCode / 100 !== 2) {
-                defer.reject({statusCode: response.statusCode});
-            } else if (!body) {
-                defer.reject(new Error("Missing page title in response"));
-            } else {
-                let title = "";
-                if (body.page_title_cache_item && body.page_title_cache_item.cached_title) {
-                    title = body.page_title_cache_item.cached_title;
-                }
-                defer.resolve(title);
-            }
-        });
 
-        return defer.promise;
+        return new Promise(function(resolve, reject) {
+            request({
+                method: 'GET',
+                uri: scalarPageLookupUrl,
+                json: true,
+            }, (err, response, body) => {
+                if (err) {
+                    reject(err);
+                } else if (response.statusCode / 100 !== 2) {
+                    reject({statusCode: response.statusCode});
+                } else if (!body) {
+                    reject(new Error("Missing page title in response"));
+                } else {
+                    let title = "";
+                    if (body.page_title_cache_item && body.page_title_cache_item.cached_title) {
+                        title = body.page_title_cache_item.cached_title;
+                    }
+                    resolve(title);
+                }
+            });
+        })
     }
 
     /**
diff --git a/src/ScalarMessaging.js b/src/ScalarMessaging.js
index f80162e635..fa7b8c5b76 100644
--- a/src/ScalarMessaging.js
+++ b/src/ScalarMessaging.js
@@ -236,8 +236,7 @@ import SdkConfig from './SdkConfig';
 import MatrixClientPeg from './MatrixClientPeg';
 import { MatrixEvent } from 'matrix-js-sdk';
 import dis from './dispatcher';
-import Widgets from './utils/widgets';
-import WidgetUtils from './WidgetUtils';
+import WidgetUtils from './utils/WidgetUtils';
 import RoomViewStore from './stores/RoomViewStore';
 import { _t } from './languageHandler';
 
@@ -297,12 +296,6 @@ function setWidget(event, roomId) {
     const widgetData = event.data.data; // optional
     const userWidget = event.data.userWidget;
 
-    const client = MatrixClientPeg.get();
-    if (!client) {
-        sendError(event, _t('You need to be logged in.'));
-        return;
-    }
-
     // both adding/removing widgets need these checks
     if (!widgetId || widgetUrl === undefined) {
         sendError(event, _t("Unable to create widget."), new Error("Missing required widget fields."));
@@ -329,42 +322,8 @@ function setWidget(event, roomId) {
         }
     }
 
-    let content = {
-        type: widgetType,
-        url: widgetUrl,
-        name: widgetName,
-        data: widgetData,
-    };
-
     if (userWidget) {
-        const client = MatrixClientPeg.get();
-        const userWidgets = Widgets.getUserWidgets();
-
-        // Delete existing widget with ID
-        try {
-            delete userWidgets[widgetId];
-        } catch (e) {
-            console.error(`$widgetId is non-configurable`);
-        }
-
-        // Add new widget / update
-        if (widgetUrl !== null) {
-            userWidgets[widgetId] = {
-                content: content,
-                sender: client.getUserId(),
-                state_key: widgetId,
-                type: 'm.widget',
-                id: widgetId,
-            };
-        }
-
-        // This starts listening for when the echo comes back from the server
-        // since the widget won't appear added until this happens. If we don't
-        // wait for this, the action will complete but if the user is fast enough,
-        // the widget still won't actually be there.
-        client.setAccountData('m.widgets', userWidgets).then(() => {
-            return WidgetUtils.waitForUserWidget(widgetId, widgetUrl !== null);
-        }).then(() => {
+        WidgetUtils.setUserWidget(widgetId, widgetType, widgetUrl, widgetName, widgetData).then(() => {
             sendResponse(event, {
                 success: true,
             });
@@ -377,15 +336,7 @@ function setWidget(event, roomId) {
         if (!roomId) {
             sendError(event, _t('Missing roomId.'), null);
         }
-
-        if (widgetUrl === null) { // widget is being deleted
-            content = {};
-        }
-        // TODO - Room widgets need to be moved to 'm.widget' state events
-        // https://docs.google.com/document/d/1uPF7XWY_dXTKVKV7jZQ2KmsI19wn9-kFRgQ1tFQP7wQ/edit?usp=sharing
-        client.sendStateEvent(roomId, "im.vector.modular.widgets", content, widgetId).then(() => {
-            return WidgetUtils.waitForRoomWidget(widgetId, roomId, widgetUrl !== null);
-        }).then(() => {
+        WidgetUtils.setRoomWidget(roomId, widgetId, widgetType, widgetUrl, widgetName, widgetData).then(() => {
             sendResponse(event, {
                 success: true,
             });
@@ -409,21 +360,13 @@ function getWidgets(event, roomId) {
             sendError(event, _t('This room is not recognised.'));
             return;
         }
-        // TODO - Room widgets need to be moved to 'm.widget' state events
-        // https://docs.google.com/document/d/1uPF7XWY_dXTKVKV7jZQ2KmsI19wn9-kFRgQ1tFQP7wQ/edit?usp=sharing
-        const stateEvents = room.currentState.getStateEvents("im.vector.modular.widgets");
-        // Only return widgets which have required fields
-        if (room) {
-            stateEvents.forEach((ev) => {
-                if (ev.getContent().type && ev.getContent().url) {
-                    widgetStateEvents.push(ev.event); // return the raw event
-                }
-            });
-        }
+        // XXX: This gets the raw event object (I think because we can't
+        // send the MatrixEvent over postMessage?)
+        widgetStateEvents = WidgetUtils.getRoomWidgets(room).map((ev) => ev.event);
     }
 
     // Add user widgets (not linked to a specific room)
-    const userWidgets = Widgets.getUserWidgetsArray();
+    const userWidgets = WidgetUtils.getUserWidgetsArray();
     widgetStateEvents = widgetStateEvents.concat(userWidgets);
 
     sendResponse(event, widgetStateEvents);
@@ -537,7 +480,7 @@ function getMembershipCount(event, roomId) {
         sendError(event, _t('This room is not recognised.'));
         return;
     }
-    const count = room.getJoinedMembers().length;
+    const count = room.getJoinedMemberCount();
     sendResponse(event, count);
 }
 
@@ -554,12 +497,11 @@ function canSendEvent(event, roomId) {
         sendError(event, _t('This room is not recognised.'));
         return;
     }
-    const me = client.credentials.userId;
-    const member = room.getMember(me);
-    if (!member || member.membership !== "join") {
+    if (room.getMyMembership() !== "join") {
         sendError(event, _t('You are not in this room.'));
         return;
     }
+    const me = client.credentials.userId;
 
     let canSend = false;
     if (isState) {
diff --git a/src/SlashCommands.js b/src/SlashCommands.js
index 211a68e7b0..3a8e77293b 100644
--- a/src/SlashCommands.js
+++ b/src/SlashCommands.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -26,11 +27,12 @@ import SettingsStore, {SettingLevel} from './settings/SettingsStore';
 
 
 class Command {
-    constructor({name, args='', description, runFn}) {
+    constructor({name, args='', description, runFn, hideCompletionAfterSpace=false}) {
         this.command = '/' + name;
         this.args = args;
         this.description = description;
         this.runFn = runFn;
+        this.hideCompletionAfterSpace = hideCompletionAfterSpace;
     }
 
     getCommand() {
@@ -78,6 +80,7 @@ export const CommandMap = {
             });
             return success();
         },
+        hideCompletionAfterSpace: true,
     }),
 
     nick: new Command({
@@ -466,6 +469,20 @@ export const CommandMap = {
         name: 'me',
         args: '',
         description: _td('Displays action'),
+        hideCompletionAfterSpace: true,
+    }),
+
+    discardsession: new Command({
+        name: 'discardsession',
+        description: _td('Forces the current outbound group session in an encrypted room to be discarded'),
+        runFn: function(roomId) {
+            try {
+                MatrixClientPeg.get().forceDiscardSession(roomId);
+            } catch (e) {
+                return reject(e.message);
+            }
+            return success();
+        },
     }),
 };
 /* eslint-enable babel/no-invalid-this */
@@ -474,8 +491,10 @@ export const CommandMap = {
 // helpful aliases
 const aliases = {
     j: "join",
+    newballsplease: "discardsession",
 };
 
+
 /**
  * Process the given text for /commands and perform them.
  * @param {string} roomId The room in which the command was performed.
@@ -488,7 +507,7 @@ export function processCommandInput(roomId, input) {
     // trim any trailing whitespace, as it can confuse the parser for
     // IRC-style commands
     input = input.replace(/\s+$/, '');
-    if (input[0] !== '/' || input[1] === '/') return null; // not a command
+    if (input[0] !== '/') return null; // not a command
 
     const bits = input.match(/^(\S+?)( +((.|\n)*))?$/);
     let cmd;
diff --git a/src/TextForEvent.js b/src/TextForEvent.js
index 712150af4d..96cccf07fb 100644
--- a/src/TextForEvent.js
+++ b/src/TextForEvent.js
@@ -129,6 +129,64 @@ function textForRoomNameEvent(ev) {
     });
 }
 
+function textForServerACLEvent(ev) {
+    const senderDisplayName = ev.sender && ev.sender.name ? ev.sender.name : ev.getSender();
+    const prevContent = ev.getPrevContent();
+    const changes = [];
+    const current = ev.getContent();
+    const prev = {
+        deny: Array.isArray(prevContent.deny) ? prevContent.deny : [],
+        allow: Array.isArray(prevContent.allow) ? prevContent.allow : [],
+        allow_ip_literals: !(prevContent.allow_ip_literals === false),
+    };
+    let text = "";
+    if (prev.deny.length === 0 && prev.allow.length === 0) {
+        text = `${senderDisplayName} set server ACLs for this room: `;
+    } else {
+        text = `${senderDisplayName} changed the server ACLs for this room: `;
+    }
+
+    if (!Array.isArray(current.allow)) {
+        current.allow = [];
+    }
+    /* If we know for sure everyone is banned, don't bother showing the diff view */
+    if (current.allow.length === 0) {
+        return text + "🎉 All servers are banned from participating! This room can no longer be used.";
+    }
+
+    if (!Array.isArray(current.deny)) {
+        current.deny = [];
+    }
+
+    const bannedServers = current.deny.filter((srv) => typeof(srv) === 'string' && !prev.deny.includes(srv));
+    const unbannedServers = prev.deny.filter((srv) => typeof(srv) === 'string' && !current.deny.includes(srv));
+    const allowedServers = current.allow.filter((srv) => typeof(srv) === 'string' && !prev.allow.includes(srv));
+    const unallowedServers = prev.allow.filter((srv) => typeof(srv) === 'string' && !current.allow.includes(srv));
+
+    if (bannedServers.length > 0) {
+        changes.push(`Servers matching ${bannedServers.join(", ")} are now banned.`);
+    }
+
+    if (unbannedServers.length > 0) {
+        changes.push(`Servers matching ${unbannedServers.join(", ")} were removed from the ban list.`);
+    }
+
+    if (allowedServers.length > 0) {
+        changes.push(`Servers matching ${allowedServers.join(", ")} are now allowed.`);
+    }
+
+    if (unallowedServers.length > 0) {
+        changes.push(`Servers matching ${unallowedServers.join(", ")} were removed from the allowed list.`);
+    }
+
+    if (prev.allow_ip_literals !== current.allow_ip_literals) {
+        const allowban = current.allow_ip_literals ? "allowed" : "banned";
+        changes.push(`Participating from a server using an IP literal hostname is now ${allowban}.`);
+    }
+
+    return text + changes.join(" ");
+}
+
 function textForMessageEvent(ev) {
     const senderDisplayName = ev.sender && ev.sender.name ? ev.sender.name : ev.getSender();
     let message = senderDisplayName + ': ' + ev.getContent().body;
@@ -140,6 +198,63 @@ function textForMessageEvent(ev) {
     return message;
 }
 
+function textForRoomAliasesEvent(ev) {
+    // An alternative implementation of this as a first-class event can be found at
+    // https://github.com/matrix-org/matrix-react-sdk/blob/dc7212ec2bd12e1917233ed7153b3e0ef529a135/src/components/views/messages/RoomAliasesEvent.js
+    // This feels a bit overkill though, and it's not clear the i18n really needs it
+    // so instead it's landing as a simple textual event.
+
+    const senderName = ev.sender && ev.sender.name ? ev.sender.name : ev.getSender();
+    const oldAliases = ev.getPrevContent().aliases || [];
+    const newAliases = ev.getContent().aliases || [];
+
+    const addedAliases = newAliases.filter((x) => !oldAliases.includes(x));
+    const removedAliases = oldAliases.filter((x) => !newAliases.includes(x));
+
+    if (!addedAliases.length && !removedAliases.length) {
+        return '';
+    }
+
+    if (addedAliases.length && !removedAliases.length) {
+        return _t('%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.', {
+            senderName: senderName,
+            count: addedAliases.length,
+            addedAddresses: addedAliases.join(', '),
+        });
+    } else if (!addedAliases.length && removedAliases.length) {
+        return _t('%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.', {
+            senderName: senderName,
+            count: removedAliases.length,
+            removedAddresses: removedAliases.join(', '),
+        });
+    } else {
+        return _t(
+            '%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.', {
+                senderName: senderName,
+                addedAddresses: addedAliases.join(', '),
+                removedAddresses: removedAliases.join(', '),
+            },
+        );
+    }
+}
+
+function textForCanonicalAliasEvent(ev) {
+    const senderName = ev.sender && ev.sender.name ? ev.sender.name : ev.getSender();
+    const oldAlias = ev.getPrevContent().alias;
+    const newAlias = ev.getContent().alias;
+
+    if (newAlias) {
+        return _t('%(senderName)s set the main address for this room to %(address)s.', {
+            senderName: senderName,
+            address: ev.getContent().alias,
+        });
+    } else if (oldAlias) {
+        return _t('%(senderName)s removed the main address for this room.', {
+            senderName: senderName,
+        });
+    }
+}
+
 function textForCallAnswerEvent(event) {
     const senderName = event.sender ? event.sender.name : _t('Someone');
     const supported = MatrixClientPeg.get().supportsVoip() ? '' : _t('(not supported by this browser)');
@@ -157,6 +272,12 @@ function textForCallHangupEvent(event) {
             reason = _t('(could not connect media)');
         } else if (eventContent.reason === "invite_timeout") {
             reason = _t('(no answer)');
+        } else if (eventContent.reason === "user hangup") {
+            // workaround for https://github.com/vector-im/riot-web/issues/5178
+            // it seems Android randomly sets a reason of "user hangup" which is
+            // interpreted as an error code :(
+            // https://github.com/vector-im/riot-android/issues/2623
+            reason = '';
         } else {
             reason = _t('(unknown failure: %(reason)s)', {reason: eventContent.reason});
         }
@@ -301,6 +422,8 @@ const handlers = {
 };
 
 const stateHandlers = {
+    'm.room.aliases': textForRoomAliasesEvent,
+    'm.room.canonical_alias': textForCanonicalAliasEvent,
     'm.room.name': textForRoomNameEvent,
     'm.room.topic': textForTopicEvent,
     'm.room.member': textForMemberEvent,
@@ -309,6 +432,7 @@ const stateHandlers = {
     'm.room.encryption': textForEncryptionEvent,
     'm.room.power_levels': textForPowerEvent,
     'm.room.pinned_events': textForPinnedEvent,
+    'm.room.server_acl': textForServerACLEvent,
 
     'im.vector.modular.widgets': textForWidgetEvent,
 };
diff --git a/src/VectorConferenceHandler.js b/src/VectorConferenceHandler.js
index 19081726b2..c53a01d464 100644
--- a/src/VectorConferenceHandler.js
+++ b/src/VectorConferenceHandler.js
@@ -72,7 +72,7 @@ ConferenceCall.prototype._getConferenceUserRoom = function() {
     for (var i = 0; i < rooms.length; i++) {
         var confUser = rooms[i].getMember(this.confUserId);
         if (confUser && confUser.membership === "join" &&
-                rooms[i].getJoinedMembers().length === 2) {
+                rooms[i].getJoinedMemberCount() === 2) {
             confRoom = rooms[i];
             break;
         }
@@ -84,7 +84,7 @@ ConferenceCall.prototype._getConferenceUserRoom = function() {
         preset: "private_chat",
         invite: [this.confUserId]
     }).then(function(res) {
-        return new Room(res.room_id);
+        return new Room(res.room_id, null, client.getUserId());
     });
 };
 
diff --git a/src/WidgetUtils.js b/src/WidgetUtils.js
deleted file mode 100644
index 2e2dcf30cd..0000000000
--- a/src/WidgetUtils.js
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
-Copyright 2017 Vector Creations Ltd
-Copyright 2018 New Vector Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import MatrixClientPeg from './MatrixClientPeg';
-import SdkConfig from "./SdkConfig";
-import * as url from "url";
-
-export default class WidgetUtils {
-    /* Returns true if user is able to send state events to modify widgets in this room
-     * (Does not apply to non-room-based / user widgets)
-     * @param roomId -- The ID of the room to check
-     * @return Boolean -- true if the user can modify widgets in this room
-     * @throws Error -- specifies the error reason
-     */
-    static canUserModifyWidgets(roomId) {
-        if (!roomId) {
-            console.warn('No room ID specified');
-            return false;
-        }
-
-        const client = MatrixClientPeg.get();
-        if (!client) {
-            console.warn('User must be be logged in');
-            return false;
-        }
-
-        const room = client.getRoom(roomId);
-        if (!room) {
-            console.warn(`Room ID ${roomId} is not recognised`);
-            return false;
-        }
-
-        const me = client.credentials.userId;
-        if (!me) {
-            console.warn('Failed to get user ID');
-            return false;
-        }
-
-        const member = room.getMember(me);
-        if (!member || member.membership !== "join") {
-            console.warn(`User ${me} is not in room ${roomId}`);
-            return false;
-        }
-
-        return room.currentState.maySendStateEvent('im.vector.modular.widgets', me);
-    }
-
-    /**
-     * Returns true if specified url is a scalar URL, typically https://scalar.vector.im/api
-     * @param  {[type]}  testUrlString URL to check
-     * @return {Boolean} True if specified URL is a scalar URL
-     */
-    static isScalarUrl(testUrlString) {
-        if (!testUrlString) {
-            console.error('Scalar URL check failed. No URL specified');
-            return false;
-        }
-
-        const testUrl = url.parse(testUrlString);
-
-        let scalarUrls = SdkConfig.get().integrations_widgets_urls;
-        if (!scalarUrls || scalarUrls.length === 0) {
-            scalarUrls = [SdkConfig.get().integrations_rest_url];
-        }
-
-        for (let i = 0; i < scalarUrls.length; i++) {
-            const scalarUrl = url.parse(scalarUrls[i]);
-            if (testUrl && scalarUrl) {
-                if (
-                    testUrl.protocol === scalarUrl.protocol &&
-                    testUrl.host === scalarUrl.host &&
-                    testUrl.pathname.startsWith(scalarUrl.pathname)
-                ) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Returns a promise that resolves when a widget with the given
-     * ID has been added as a user widget (ie. the accountData event
-     * arrives) or rejects after a timeout
-     *
-     * @param {string} widgetId The ID of the widget to wait for
-     * @param {boolean} add True to wait for the widget to be added,
-     *     false to wait for it to be deleted.
-     * @returns {Promise} that resolves when the widget is in the
-     *     requested state according to the `add` param
-     */
-    static waitForUserWidget(widgetId, add) {
-        return new Promise((resolve, reject) => {
-            // Tests an account data event, returning true if it's in the state
-            // we're waiting for it to be in
-            function eventInIntendedState(ev) {
-                if (!ev || !ev.getContent()) return false;
-                if (add) {
-                    return ev.getContent()[widgetId] !== undefined;
-                } else {
-                    return ev.getContent()[widgetId] === undefined;
-                }
-            }
-
-            const startingAccountDataEvent = MatrixClientPeg.get().getAccountData('m.widgets');
-            if (eventInIntendedState(startingAccountDataEvent)) {
-                resolve();
-                return;
-            }
-
-            function onAccountData(ev) {
-                const currentAccountDataEvent = MatrixClientPeg.get().getAccountData('m.widgets');
-                if (eventInIntendedState(currentAccountDataEvent)) {
-                    MatrixClientPeg.get().removeListener('accountData', onAccountData);
-                    clearTimeout(timerId);
-                    resolve();
-                }
-            }
-            const timerId = setTimeout(() => {
-                MatrixClientPeg.get().removeListener('accountData', onAccountData);
-                reject(new Error("Timed out waiting for widget ID " + widgetId + " to appear"));
-            }, 10000);
-            MatrixClientPeg.get().on('accountData', onAccountData);
-        });
-    }
-
-    /**
-     * Returns a promise that resolves when a widget with the given
-     * ID has been added as a room widget in the given room (ie. the
-     * room state event arrives) or rejects after a timeout
-     *
-     * @param {string} widgetId The ID of the widget to wait for
-     * @param {string} roomId The ID of the room to wait for the widget in
-     * @param {boolean} add True to wait for the widget to be added,
-     *     false to wait for it to be deleted.
-     * @returns {Promise} that resolves when the widget is in the
-     *     requested state according to the `add` param
-     */
-    static waitForRoomWidget(widgetId, roomId, add) {
-        return new Promise((resolve, reject) => {
-            // Tests a list of state events, returning true if it's in the state
-            // we're waiting for it to be in
-            function eventsInIntendedState(evList) {
-                const widgetPresent = evList.some((ev) => {
-                    return ev.getContent() && ev.getContent()['id'] === widgetId;
-                });
-                if (add) {
-                    return widgetPresent;
-                } else {
-                    return !widgetPresent;
-                }
-            }
-
-            const room = MatrixClientPeg.get().getRoom(roomId);
-            const startingWidgetEvents = room.currentState.getStateEvents('im.vector.modular.widgets');
-            if (eventsInIntendedState(startingWidgetEvents)) {
-                resolve();
-                return;
-            }
-
-            function onRoomStateEvents(ev) {
-                if (ev.getRoomId() !== roomId) return;
-
-                const currentWidgetEvents = room.currentState.getStateEvents('im.vector.modular.widgets');
-
-                if (eventsInIntendedState(currentWidgetEvents)) {
-                    MatrixClientPeg.get().removeListener('RoomState.events', onRoomStateEvents);
-                    clearTimeout(timerId);
-                    resolve();
-                }
-            }
-            const timerId = setTimeout(() => {
-                MatrixClientPeg.get().removeListener('RoomState.events', onRoomStateEvents);
-                reject(new Error("Timed out waiting for widget ID " + widgetId + " to appear"));
-            }, 10000);
-            MatrixClientPeg.get().on('RoomState.events', onRoomStateEvents);
-        });
-    }
-}
diff --git a/src/actions/MatrixActionCreators.js b/src/actions/MatrixActionCreators.js
index 6e1d52a88f..31bcac3e52 100644
--- a/src/actions/MatrixActionCreators.js
+++ b/src/actions/MatrixActionCreators.js
@@ -144,23 +144,25 @@ function createRoomTimelineAction(matrixClient, timelineEvent, room, toStartOfTi
 /**
  * @typedef RoomMembershipAction
  * @type {Object}
- * @property {string} action 'MatrixActions.RoomMember.membership'.
- * @property {RoomMember} member the member whose membership was updated.
+ * @property {string} action 'MatrixActions.Room.myMembership'.
+ * @property {Room} room to room for which the self-membership changed.
+ * @property {string} membership the new membership
+ * @property {string} oldMembership the previous membership, can be null.
  */
 
 /**
- * Create a MatrixActions.RoomMember.membership action that represents
- * a MatrixClient `RoomMember.membership` matrix event, emitted when a
- * member's membership is updated.
+ * Create a MatrixActions.Room.myMembership action that represents
+ * a MatrixClient `Room.myMembership` event for the syncing user,
+ * emitted when the syncing user's membership is updated for a room.
  *
  * @param {MatrixClient} matrixClient the matrix client.
- * @param {MatrixEvent} membershipEvent the m.room.member event.
- * @param {RoomMember} member the member whose membership was updated.
- * @param {string} oldMembership the member's previous membership.
- * @returns {RoomMembershipAction} an action of type `MatrixActions.RoomMember.membership`.
+ * @param {Room} room to room for which the self-membership changed.
+ * @param {string} membership the new membership
+ * @param {string} oldMembership the previous membership, can be null.
+ * @returns {RoomMembershipAction} an action of type `MatrixActions.Room.myMembership`.
  */
-function createRoomMembershipAction(matrixClient, membershipEvent, member, oldMembership) {
-    return { action: 'MatrixActions.RoomMember.membership', member };
+function createSelfMembershipAction(matrixClient, room, membership, oldMembership) {
+    return { action: 'MatrixActions.Room.myMembership', room, membership, oldMembership};
 }
 
 /**
@@ -202,7 +204,7 @@ export default {
         this._addMatrixClientListener(matrixClient, 'Room', createRoomAction);
         this._addMatrixClientListener(matrixClient, 'Room.tags', createRoomTagsAction);
         this._addMatrixClientListener(matrixClient, 'Room.timeline', createRoomTimelineAction);
-        this._addMatrixClientListener(matrixClient, 'RoomMember.membership', createRoomMembershipAction);
+        this._addMatrixClientListener(matrixClient, 'Room.myMembership', createSelfMembershipAction);
         this._addMatrixClientListener(matrixClient, 'Event.decrypted', createEventDecryptedAction);
     },
 
@@ -217,7 +219,10 @@ export default {
      */
     _addMatrixClientListener(matrixClient, eventName, actionCreator) {
         const listener = (...args) => {
-            dis.dispatch(actionCreator(matrixClient, ...args), true);
+            const payload = actionCreator(matrixClient, ...args);
+            if (payload) {
+                dis.dispatch(payload, true);
+            }
         };
         matrixClient.on(eventName, listener);
         this._matrixClientListenersStop.push(() => {
diff --git a/src/autocomplete/AutocompleteProvider.js b/src/autocomplete/AutocompleteProvider.js
index 3fdb2998e7..f9fb61d3a3 100644
--- a/src/autocomplete/AutocompleteProvider.js
+++ b/src/autocomplete/AutocompleteProvider.js
@@ -20,13 +20,19 @@ import React from 'react';
 import type {Completion, SelectionRange} from './Autocompleter';
 
 export default class AutocompleteProvider {
-    constructor(commandRegex?: RegExp) {
+    constructor(commandRegex?: RegExp, forcedCommandRegex?: RegExp) {
         if (commandRegex) {
             if (!commandRegex.global) {
                 throw new Error('commandRegex must have global flag set');
             }
             this.commandRegex = commandRegex;
         }
+        if (forcedCommandRegex) {
+            if (!forcedCommandRegex.global) {
+                throw new Error('forcedCommandRegex must have global flag set');
+            }
+            this.forcedCommandRegex = forcedCommandRegex;
+        }
     }
 
     destroy() {
@@ -40,7 +46,7 @@ export default class AutocompleteProvider {
         let commandRegex = this.commandRegex;
 
         if (force && this.shouldForceComplete()) {
-            commandRegex = /\S+/g;
+            commandRegex = this.forcedCommandRegex || /\S+/g;
         }
 
         if (commandRegex == null) {
diff --git a/src/autocomplete/Autocompleter.js b/src/autocomplete/Autocompleter.js
index f5fec4c502..7f91676cc3 100644
--- a/src/autocomplete/Autocompleter.js
+++ b/src/autocomplete/Autocompleter.js
@@ -29,8 +29,9 @@ import NotifProvider from './NotifProvider';
 import Promise from 'bluebird';
 
 export type SelectionRange = {
-    start: number,
-    end: number
+    beginning: boolean, // whether the selection is in the first block of the editor or not
+    start: number, // byte offset relative to the start anchor of the current editor selection.
+    end: number, // byte offset relative to the end anchor of the current editor selection.
 };
 
 export type Completion = {
@@ -80,12 +81,12 @@ export default class Autocompleter {
             // Array of inspections of promises that might timeout. Instead of allowing a
             // single timeout to reject the Promise.all, reflect each one and once they've all
             // settled, filter for the fulfilled ones
-            this.providers.map((provider) => {
-                return provider
+            this.providers.map(provider =>
+                provider
                     .getCompletions(query, selection, force)
                     .timeout(PROVIDER_COMPLETION_TIMEOUT)
-                    .reflect();
-            }),
+                    .reflect()
+            ),
         );
 
         return completionsList.filter(
diff --git a/src/autocomplete/CommandProvider.js b/src/autocomplete/CommandProvider.js
index 5582b57e14..a35a31966a 100644
--- a/src/autocomplete/CommandProvider.js
+++ b/src/autocomplete/CommandProvider.js
@@ -42,10 +42,13 @@ export default class CommandProvider extends AutocompleteProvider {
         if (!command) return [];
 
         let matches = [];
+        // check if the full match differs from the first word (i.e. returns false if the command has args)
         if (command[0] !== command[1]) {
             // The input looks like a command with arguments, perform exact match
             const name = command[1].substr(1); // strip leading `/`
             if (CommandMap[name]) {
+                // some commands, namely `me` and `ddg` don't suit having the usage shown whilst typing their arguments
+                if (CommandMap[name].hideCompletionAfterSpace) return [];
                 matches = [CommandMap[name]];
             }
         } else {
diff --git a/src/autocomplete/CommunityProvider.js b/src/autocomplete/CommunityProvider.js
index 6b5438e8c8..6bcf1a02fd 100644
--- a/src/autocomplete/CommunityProvider.js
+++ b/src/autocomplete/CommunityProvider.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2018 New Vector Ltd
+Copyright 2018 Michael Telatynski <7t3chguy@gmail.com>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -26,7 +27,7 @@ import {makeGroupPermalink} from "../matrix-to";
 import type {Completion, SelectionRange} from "./Autocompleter";
 import FlairStore from "../stores/FlairStore";
 
-const COMMUNITY_REGEX = /(?=\+)(\S*)/g;
+const COMMUNITY_REGEX = /\B\+\S*/g;
 
 function score(query, space) {
     const index = space.indexOf(query);
diff --git a/src/autocomplete/EmojiProvider.js b/src/autocomplete/EmojiProvider.js
index 81f6144fd3..719550d59f 100644
--- a/src/autocomplete/EmojiProvider.js
+++ b/src/autocomplete/EmojiProvider.js
@@ -48,7 +48,7 @@ const CATEGORY_ORDER = [
 // (^|\s|(emojiUnicode)) to make sure we're either at the start of the string or there's a
 // whitespace character or an emoji before the emoji. The reason for unicodeRegexp is
 // that we need to support inputting multiple emoji with no space between them.
-const EMOJI_REGEX = new RegExp('(?:^|\\s|' + unicodeRegexp + ')(' + asciiRegexp + '|:\\w*:?)$', 'g');
+const EMOJI_REGEX = new RegExp('(?:^|\\s|' + unicodeRegexp + ')(' + asciiRegexp + '|:[+-\\w]*:?)$', 'g');
 
 // We also need to match the non-zero-length prefixes to remove them from the final match,
 // and update the range so that we don't replace the whitespace or the previous emoji.
@@ -65,6 +65,7 @@ const EMOJI_SHORTNAMES = Object.keys(EmojiData).map((key) => EmojiData[key]).sor
     return {
         name: a.name,
         shortname: a.shortname,
+        aliases: a.aliases ? a.aliases.join(' ') : '',
         aliases_ascii: a.aliases_ascii ? a.aliases_ascii.join(' ') : '',
         // Include the index so that we can preserve the original order
         _orderBy: index,
@@ -84,7 +85,7 @@ export default class EmojiProvider extends AutocompleteProvider {
     constructor() {
         super(EMOJI_REGEX);
         this.matcher = new FuzzyMatcher(EMOJI_SHORTNAMES, {
-            keys: ['aliases_ascii', 'shortname'],
+            keys: ['aliases_ascii', 'shortname', 'aliases'],
             // For matching against ascii equivalents
             shouldMatchWordsOnly: false,
         });
diff --git a/src/autocomplete/NotifProvider.js b/src/autocomplete/NotifProvider.js
index 842fb4fb18..432388c255 100644
--- a/src/autocomplete/NotifProvider.js
+++ b/src/autocomplete/NotifProvider.js
@@ -41,6 +41,7 @@ export default class NotifProvider extends AutocompleteProvider {
         if (command && command[0] && '@room'.startsWith(command[0]) && command[0].length > 1) {
             return [{
                 completion: '@room',
+                completionId: '@room',
                 suffix: ' ',
                 component: (
                     } title="@room" description={_t("Notify the whole room")} />
diff --git a/src/autocomplete/PlainWithPillsSerializer.js b/src/autocomplete/PlainWithPillsSerializer.js
new file mode 100644
index 0000000000..59cf1bde3b
--- /dev/null
+++ b/src/autocomplete/PlainWithPillsSerializer.js
@@ -0,0 +1,93 @@
+/*
+Copyright 2018 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Based originally on slate-plain-serializer
+
+import { Block } from 'slate';
+
+/**
+ * Plain text serializer, which converts a Slate `value` to a plain text string,
+ * serializing pills into various different formats as required.
+ *
+ * @type {PlainWithPillsSerializer}
+ */
+
+class PlainWithPillsSerializer {
+
+    /*
+     * @param {String} options.pillFormat - either 'md', 'plain', 'id'
+     */
+    constructor(options = {}) {
+        const {
+            pillFormat = 'plain',
+        } = options;
+        this.pillFormat = pillFormat;
+    }
+
+    /**
+     * Serialize a Slate `value` to a plain text string,
+     * serializing pills as either MD links, plain text representations or
+     * ID representations as required.
+     *
+     * @param {Value} value
+     * @return {String}
+     */
+    serialize = value => {
+        return this._serializeNode(value.document);
+    }
+
+    /**
+     * Serialize a `node` to plain text.
+     *
+     * @param {Node} node
+     * @return {String}
+     */
+    _serializeNode = node => {
+        if (
+            node.object == 'document' ||
+            (node.object == 'block' && Block.isBlockList(node.nodes))
+        ) {
+            return node.nodes.map(this._serializeNode).join('\n');
+        } else if (node.type == 'emoji') {
+            return node.data.get('emojiUnicode');
+        } else if (node.type == 'pill') {
+            const completion = node.data.get('completion');
+            // over the wire the @room pill is just plaintext
+            if (completion === '@room') return completion;
+
+            switch (this.pillFormat) {
+                case 'plain':
+                    return completion;
+                case 'md':
+                    return `[${ completion }](${ node.data.get('href') })`;
+                case 'id':
+                    return node.data.get('completionId') || completion;
+            }
+        } else if (node.nodes) {
+            return node.nodes.map(this._serializeNode).join('');
+        } else {
+            return node.text;
+        }
+    }
+}
+
+/**
+ * Export.
+ *
+ * @type {PlainWithPillsSerializer}
+ */
+
+export default PlainWithPillsSerializer;
diff --git a/src/autocomplete/QueryMatcher.js b/src/autocomplete/QueryMatcher.js
index 762b285685..9d4d4d0598 100644
--- a/src/autocomplete/QueryMatcher.js
+++ b/src/autocomplete/QueryMatcher.js
@@ -1,6 +1,7 @@
 //@flow
 /*
 Copyright 2017 Aviral Dasgupta
+Copyright 2018 Michael Telatynski <7t3chguy@gmail.com>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -27,6 +28,10 @@ class KeyMap {
     priorityMap = new Map();
 }
 
+function stripDiacritics(str: string): string {
+    return str.normalize('NFD').replace(/[\u0300-\u036f]/g, '');
+}
+
 export default class QueryMatcher {
     /**
      * @param {object[]} objects the objects to perform a match on
@@ -46,10 +51,11 @@ export default class QueryMatcher {
         objects.forEach((object, i) => {
             const keyValues = _at(object, keys);
             for (const keyValue of keyValues) {
-                if (!map.hasOwnProperty(keyValue)) {
-                    map[keyValue] = [];
+                const key = stripDiacritics(keyValue).toLowerCase();
+                if (!map.hasOwnProperty(key)) {
+                    map[key] = [];
                 }
-                map[keyValue].push(object);
+                map[key].push(object);
             }
             keyMap.priorityMap.set(object, i);
         });
@@ -82,7 +88,7 @@ export default class QueryMatcher {
     }
 
     match(query: String): Array {
-        query = query.toLowerCase();
+        query = stripDiacritics(query).toLowerCase();
         if (this.options.shouldMatchWordsOnly) {
             query = query.replace(/[^\w]/g, '');
         }
@@ -91,7 +97,7 @@ export default class QueryMatcher {
         }
         const results = [];
         this.keyMap.keys.forEach((key) => {
-            let resultKey = key.toLowerCase();
+            let resultKey = key;
             if (this.options.shouldMatchWordsOnly) {
                 resultKey = resultKey.replace(/[^\w]/g, '');
             }
diff --git a/src/autocomplete/RoomProvider.js b/src/autocomplete/RoomProvider.js
index c222ae95d4..38e2ab8373 100644
--- a/src/autocomplete/RoomProvider.js
+++ b/src/autocomplete/RoomProvider.js
@@ -2,6 +2,7 @@
 Copyright 2016 Aviral Dasgupta
 Copyright 2017 Vector Creations Ltd
 Copyright 2017, 2018 New Vector Ltd
+Copyright 2018 Michael Telatynski <7t3chguy@gmail.com>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -28,7 +29,7 @@ import _sortBy from 'lodash/sortBy';
 import {makeRoomPermalink} from "../matrix-to";
 import type {Completion, SelectionRange} from "./Autocompleter";
 
-const ROOM_REGEX = /(?=#)(\S*)/g;
+const ROOM_REGEX = /\B#\S*/g;
 
 function score(query, space) {
     const index = space.indexOf(query);
@@ -50,12 +51,6 @@ export default class RoomProvider extends AutocompleteProvider {
     async getCompletions(query: string, selection: SelectionRange, force?: boolean = false): Array {
         const RoomAvatar = sdk.getComponent('views.avatars.RoomAvatar');
 
-        // Disable autocompletions when composing commands because of various issues
-        // (see https://github.com/vector-im/riot-web/issues/4762)
-        if (/^(\/join|\/leave)/.test(query)) {
-            return [];
-        }
-
         const client = MatrixClientPeg.get();
         let completions = [];
         const {command, range} = this.getCurrentCommand(query, selection, force);
@@ -79,6 +74,7 @@ export default class RoomProvider extends AutocompleteProvider {
                 const displayAlias = getDisplayAliasForRoom(room.room) || room.roomId;
                 return {
                     completion: displayAlias,
+                    completionId: displayAlias,
                     suffix: ' ',
                     href: makeRoomPermalink(displayAlias),
                     component: (
diff --git a/src/autocomplete/UserProvider.js b/src/autocomplete/UserProvider.js
index bdc1753da7..24dfa8be3e 100644
--- a/src/autocomplete/UserProvider.js
+++ b/src/autocomplete/UserProvider.js
@@ -3,6 +3,7 @@
 Copyright 2016 Aviral Dasgupta
 Copyright 2017 Vector Creations Ltd
 Copyright 2017, 2018 New Vector Ltd
+Copyright 2018 Michael Telatynski <7t3chguy@gmail.com>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -26,25 +27,27 @@ import FuzzyMatcher from './FuzzyMatcher';
 import _sortBy from 'lodash/sortBy';
 import MatrixClientPeg from '../MatrixClientPeg';
 
-import type {Room, RoomMember} from 'matrix-js-sdk';
+import type {MatrixEvent, Room, RoomMember, RoomState} from 'matrix-js-sdk';
 import {makeUserPermalink} from "../matrix-to";
-import type {SelectionRange} from "./Autocompleter";
+import type {Completion, SelectionRange} from "./Autocompleter";
 
-const USER_REGEX = /@\S*/g;
+const USER_REGEX = /\B@\S*/g;
+
+// used when you hit 'tab' - we allow some separator chars at the beginning
+// to allow you to tab-complete /mat into /(matthew)
+const FORCED_USER_REGEX = /[^/,:; \t\n]\S*/g;
 
 export default class UserProvider extends AutocompleteProvider {
     users: Array = null;
     room: Room = null;
 
-    constructor(room: Room) {
-        super(USER_REGEX, {
-            keys: ['name'],
-        });
+    constructor(room) {
+        super(USER_REGEX, FORCED_USER_REGEX);
         this.room = room;
         this.matcher = new FuzzyMatcher([], {
             keys: ['name', 'userId'],
             shouldMatchPrefix: true,
-            shouldMatchWordsOnly: false
+            shouldMatchWordsOnly: false,
         });
 
         this._onRoomTimelineBound = this._onRoomTimeline.bind(this);
@@ -61,7 +64,7 @@ export default class UserProvider extends AutocompleteProvider {
         }
     }
 
-    _onRoomTimeline(ev, room, toStartOfTimeline, removed, data) {
+    _onRoomTimeline(ev: MatrixEvent, room: Room, toStartOfTimeline: boolean, removed: boolean, data: Object) {
         if (!room) return;
         if (removed) return;
         if (room.roomId !== this.room.roomId) return;
@@ -77,7 +80,7 @@ export default class UserProvider extends AutocompleteProvider {
         this.onUserSpoke(ev.sender);
     }
 
-    _onRoomStateMember(ev, state, member) {
+    _onRoomStateMember(ev: MatrixEvent, state: RoomState, member: RoomMember) {
         // ignore members in other rooms
         if (member.roomId !== this.room.roomId) {
             return;
@@ -87,15 +90,9 @@ export default class UserProvider extends AutocompleteProvider {
         this.users = null;
     }
 
-    async getCompletions(query: string, selection: SelectionRange, force?: boolean = false) {
+    async getCompletions(query: string, selection: SelectionRange, force?: boolean = false): Array {
         const MemberAvatar = sdk.getComponent('views.avatars.MemberAvatar');
 
-        // Disable autocompletions when composing commands because of various issues
-        // (see https://github.com/vector-im/riot-web/issues/4762)
-        if (/^(\/ban|\/unban|\/op|\/deop|\/invite|\/kick|\/verify)/.test(query)) {
-            return [];
-        }
-
         // lazy-load user list into matcher
         if (this.users === null) this._makeUsers();
 
@@ -113,7 +110,8 @@ export default class UserProvider extends AutocompleteProvider {
                     // Length of completion should equal length of text in decorator. draft-js
                     // relies on the length of the entity === length of the text in the decoration.
                     completion: user.rawDisplayName,
-                    suffix: range.start === 0 ? ': ' : ' ',
+                    completionId: user.userId,
+                    suffix: (selection.beginning && range.start === 0) ? ': ' : ' ',
                     href: makeUserPermalink(user.userId),
                     component: (
                          {
-            if (member.userId !== currentUserId) return true;
-        });
+        this.users = this.room.getJoinedMembers().filter(({userId}) => userId !== currentUserId);
 
-        this.users = _sortBy(this.users, (member) =>
-            1E20 - lastSpoken[member.userId] || 1E20,
-        );
+        this.users = _sortBy(this.users, (member) => 1E20 - lastSpoken[member.userId] || 1E20);
 
         this.matcher.setObjects(this.users);
     }
diff --git a/src/components/structures/ContextualMenu.js b/src/components/structures/ContextualMenu.js
index 91ec312f43..7295fd45d3 100644
--- a/src/components/structures/ContextualMenu.js
+++ b/src/components/structures/ContextualMenu.js
@@ -64,7 +64,9 @@ export default class ContextualMenu extends React.Component {
         // The component to render as the context menu
         elementClass: PropTypes.element.isRequired,
         // on resize callback
-        windowResize: PropTypes.func
+        windowResize: PropTypes.func,
+        // method to close menu
+        closeMenu: PropTypes.func,
     };
 
     constructor() {
@@ -73,6 +75,7 @@ export default class ContextualMenu extends React.Component {
             contextMenuRect: null,
         };
 
+        this.onContextMenu = this.onContextMenu.bind(this);
         this.collectContextMenuRect = this.collectContextMenuRect.bind(this);
     }
 
@@ -85,6 +88,28 @@ export default class ContextualMenu extends React.Component {
         });
     }
 
+    onContextMenu(e) {
+        if (this.props.closeMenu) {
+            this.props.closeMenu();
+
+            e.preventDefault();
+            const x = e.clientX;
+            const y = e.clientY;
+
+            // XXX: This isn't pretty but the only way to allow opening a different context menu on right click whilst
+            // a context menu and its click-guard are up without completely rewriting how the context menus work.
+            setImmediate(() => {
+                const clickEvent = document.createEvent('MouseEvents');
+                clickEvent.initMouseEvent(
+                    'contextmenu', true, true, window, 0,
+                    0, 0, x, y, false, false,
+                    false, false, 0, null,
+                );
+                document.elementFromPoint(x, y).dispatchEvent(clickEvent);
+            });
+        }
+    }
+
     render() {
         const position = {};
         let chevronFace = null;
@@ -195,7 +220,8 @@ export default class ContextualMenu extends React.Component {
                 { chevron }
                 
             
-            { props.hasBackground && 
 }
+            { props.hasBackground && 
 }
             
         
;
     }
diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index 801d2e282e..d104019a01 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -480,7 +480,7 @@ export default React.createClass({
                         group_id: groupId,
                     },
                 });
-                dis.dispatch({action: 'view_set_mxid'});
+                dis.dispatch({action: 'require_registration'});
                 willDoOnboarding = true;
             }
             this.setState({
@@ -723,6 +723,11 @@ export default React.createClass({
     },
 
     _onJoinClick: async function() {
+        if (this._matrixClient.isGuest()) {
+            dis.dispatch({action: 'require_registration'});
+            return;
+        }
+
         this.setState({membershipBusy: true});
 
         // Wait 500ms to prevent flashing. Do this before sending a request otherwise we risk the
diff --git a/src/components/structures/LoggedInView.js b/src/components/structures/LoggedInView.js
index 5dca359f32..0c4688a411 100644
--- a/src/components/structures/LoggedInView.js
+++ b/src/components/structures/LoggedInView.js
@@ -1,7 +1,7 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
 Copyright 2017 Vector Creations Ltd
-Copyright 2017 New Vector Ltd
+Copyright 2017, 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -30,10 +30,16 @@ import dis from '../../dispatcher';
 import sessionStore from '../../stores/SessionStore';
 import MatrixClientPeg from '../../MatrixClientPeg';
 import SettingsStore from "../../settings/SettingsStore";
+import RoomListStore from "../../stores/RoomListStore";
 
 import TagOrderActions from '../../actions/TagOrderActions';
 import RoomListActions from '../../actions/RoomListActions';
 
+// We need to fetch each pinned message individually (if we don't already have it)
+// so each pinned message may trigger a request. Limit the number per room for sanity.
+// NB. this is just for server notices rather than pinned messages in general.
+const MAX_PINNED_NOTICES_PER_ROOM = 2;
+
 /**
  * This is what our MatrixChat shows when we are logged in. The precise view is
  * determined by the page_type property.
@@ -80,6 +86,8 @@ const LoggedInView = React.createClass({
         return {
             // use compact timeline view
             useCompactLayout: SettingsStore.getValue('useCompactLayout'),
+            // any currently active server notice events
+            serverNoticeEvents: [],
         };
     },
 
@@ -97,12 +105,18 @@ const LoggedInView = React.createClass({
         );
         this._setStateFromSessionStore();
 
+        this._updateServerNoticeEvents();
+
         this._matrixClient.on("accountData", this.onAccountData);
+        this._matrixClient.on("sync", this.onSync);
+        this._matrixClient.on("RoomState.events", this.onRoomStateEvents);
     },
 
     componentWillUnmount: function() {
         document.removeEventListener('keydown', this._onKeyDown);
         this._matrixClient.removeListener("accountData", this.onAccountData);
+        this._matrixClient.removeListener("sync", this.onSync);
+        this._matrixClient.removeListener("RoomState.events", this.onRoomStateEvents);
         if (this._sessionStoreToken) {
             this._sessionStoreToken.remove();
         }
@@ -142,6 +156,56 @@ const LoggedInView = React.createClass({
         }
     },
 
+    onSync: function(syncState, oldSyncState, data) {
+        const oldErrCode = this.state.syncErrorData && this.state.syncErrorData.error && this.state.syncErrorData.error.errcode;
+        const newErrCode = data && data.error && data.error.errcode;
+        if (syncState === oldSyncState && oldErrCode === newErrCode) return;
+
+        if (syncState === 'ERROR') {
+            this.setState({
+                syncErrorData: data,
+            });
+        } else {
+            this.setState({
+                syncErrorData: null,
+            });
+        }
+
+        if (oldSyncState === 'PREPARED' && syncState === 'SYNCING') {
+            this._updateServerNoticeEvents();
+        }
+    },
+
+    onRoomStateEvents: function(ev, state) {
+        const roomLists = RoomListStore.getRoomLists();
+        if (roomLists['m.server_notice'] && roomLists['m.server_notice'].some(r => r.roomId === ev.getRoomId())) {
+            this._updateServerNoticeEvents();
+        }
+    },
+
+    _updateServerNoticeEvents: async function() {
+        const roomLists = RoomListStore.getRoomLists();
+        if (!roomLists['m.server_notice']) return [];
+        
+        const pinnedEvents = [];
+        for (const room of roomLists['m.server_notice']) {
+            const pinStateEvent = room.currentState.getStateEvents("m.room.pinned_events", "");
+
+            if (!pinStateEvent || !pinStateEvent.getContent().pinned) continue;
+            
+            const pinnedEventIds = pinStateEvent.getContent().pinned.slice(0, MAX_PINNED_NOTICES_PER_ROOM);
+            for (const eventId of pinnedEventIds) {
+                const timeline = await this._matrixClient.getEventTimeline(room.getUnfilteredTimelineSet(), eventId, 0);
+                const ev = timeline.getEvents().find(ev => ev.getId() === eventId);
+                if (ev) pinnedEvents.push(ev);
+            }
+        }
+        this.setState({
+            serverNoticeEvents: pinnedEvents,
+        });
+    },
+    
+
     _onKeyDown: function(ev) {
             /*
             // Remove this for now as ctrl+alt = alt-gr so this breaks keyboards which rely on alt-gr for numbers
@@ -259,15 +323,15 @@ const LoggedInView = React.createClass({
         // When the panels are disabled, clicking on them results in a mouse event
         // which bubbles to certain elements in the tree. When this happens, close
         // any settings page that is currently open (user/room/group).
-        if (this.props.leftDisabled &&
-            this.props.rightDisabled &&
-            (
-                ev.target.className === 'mx_MatrixChat' ||
-                ev.target.className === 'mx_MatrixChat_middlePanel' ||
-                ev.target.className === 'mx_RoomView'
-            )
-        ) {
-            dis.dispatch({ action: 'close_settings' });
+        if (this.props.leftDisabled && this.props.rightDisabled) {
+            const targetClasses = new Set(ev.target.className.split(' '));
+            if (
+                targetClasses.has('mx_MatrixChat') ||
+                targetClasses.has('mx_MatrixChat_middlePanel') ||
+                targetClasses.has('mx_RoomView')
+            ) {
+                dis.dispatch({ action: 'close_settings' });
+            }
         }
     },
 
@@ -286,6 +350,7 @@ const LoggedInView = React.createClass({
         const NewVersionBar = sdk.getComponent('globals.NewVersionBar');
         const UpdateCheckBar = sdk.getComponent('globals.UpdateCheckBar');
         const PasswordNagBar = sdk.getComponent('globals.PasswordNagBar');
+        const ServerLimitBar = sdk.getComponent('globals.ServerLimitBar');
 
         let page_element;
         let right_panel = '';
@@ -368,9 +433,26 @@ const LoggedInView = React.createClass({
                 break;
         }
 
+        const usageLimitEvent = this.state.serverNoticeEvents.find((e) => {
+            return (
+                e && e.getType() === 'm.room.message' &&
+                e.getContent()['server_notice_type'] === 'm.server_notice.usage_limit_reached'
+            );
+        });
+
         let topBar;
         const isGuest = this.props.matrixClient.isGuest();
-        if (this.props.showCookieBar &&
+        if (this.state.syncErrorData && this.state.syncErrorData.error.errcode === 'M_RESOURCE_LIMIT_EXCEEDED') {
+            topBar = ;
+        } else if (usageLimitEvent) {
+            topBar = ;
+        } else if (this.props.showCookieBar &&
             this.props.config.piwik
         ) {
             const policyUrl = this.props.config.piwik.policyUrl || null;
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 4b8b75ad74..3450626c54 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -23,7 +23,7 @@ import PropTypes from 'prop-types';
 import Matrix from "matrix-js-sdk";
 
 import Analytics from "../../Analytics";
-import DecryptionFailureTracker from "../../DecryptionFailureTracker";
+import { DecryptionFailureTracker } from "../../DecryptionFailureTracker";
 import MatrixClientPeg from "../../MatrixClientPeg";
 import PlatformPeg from "../../PlatformPeg";
 import SdkConfig from "../../SdkConfig";
@@ -45,6 +45,8 @@ import createRoom from "../../createRoom";
 import KeyRequestHandler from '../../KeyRequestHandler';
 import { _t, getCurrentLanguage } from '../../languageHandler';
 import SettingsStore, {SettingLevel} from "../../settings/SettingsStore";
+import { startAnyRegistrationFlow } from "../../Registration.js";
+import { messageForSyncError } from '../../utils/ErrorUtils';
 
 /** constants for MatrixChat.state.view */
 const VIEWS = {
@@ -178,6 +180,8 @@ export default React.createClass({
             // When showing Modal dialogs we need to set aria-hidden on the root app element
             // and disable it when there are no dialogs
             hideToSRUsers: false,
+
+            syncError: null, // If the current syncing status is ERROR, the error object, otherwise null.
         };
         return s;
     },
@@ -282,6 +286,14 @@ export default React.createClass({
                 register_hs_url: paramHs,
             });
         }
+        // Set a default IS with query param `is_url`
+        const paramIs = this.props.startingFragmentQueryParams.is_url;
+        if (paramIs) {
+            console.log('Setting register_is_url ', paramIs);
+            this.setState({
+                register_is_url: paramIs,
+            });
+        }
 
         // a thing to call showScreen with once login completes.  this is kept
         // outside this.state because updating it should never trigger a
@@ -471,7 +483,7 @@ export default React.createClass({
                 action: 'do_after_sync_prepared',
                 deferred_action: payload,
             });
-            dis.dispatch({action: 'view_set_mxid'});
+            dis.dispatch({action: 'require_registration'});
             return;
         }
 
@@ -479,7 +491,11 @@ export default React.createClass({
             case 'logout':
                 Lifecycle.logout();
                 break;
+            case 'require_registration':
+                startAnyRegistrationFlow(payload);
+                break;
             case 'start_registration':
+                // This starts the full registration flow
                 this._startRegistration(payload.params || {});
                 break;
             case 'start_login':
@@ -945,7 +961,7 @@ export default React.createClass({
                 });
             }
             dis.dispatch({
-                action: 'view_set_mxid',
+                action: 'require_registration',
                 // If the set_mxid dialog is cancelled, view /home because if the browser
                 // was pointing at /user/@someone:domain?action=chat, the URL needs to be
                 // reset so that they can revisit /user/.. // (and trigger
@@ -1132,7 +1148,7 @@ export default React.createClass({
      *
      * @param {string} teamToken
      */
-    _onLoggedIn: function(teamToken) {
+    _onLoggedIn: async function(teamToken) {
         this.setState({
             view: VIEWS.LOGGED_IN,
         });
@@ -1145,12 +1161,17 @@ export default React.createClass({
             this._is_registered = false;
 
             if (this.props.config.welcomeUserId && getCurrentLanguage().startsWith("en")) {
-                createRoom({
+                const roomId = await createRoom({
                     dmUserId: this.props.config.welcomeUserId,
                     // Only view the welcome user if we're NOT looking at a room
                     andView: !this.state.currentRoomId,
                 });
-                return;
+                // if successful, return because we're already
+                // viewing the welcomeUserId room
+                // else, if failed, fall through to view_home_page
+                if (roomId) {
+                    return;
+                }
             }
             // The user has just logged in after registering
             dis.dispatch({action: 'view_home_page'});
@@ -1232,13 +1253,20 @@ export default React.createClass({
             return self._loggedInView.child.canResetTimelineInRoom(roomId);
         });
 
-        cli.on('sync', function(state, prevState) {
+        cli.on('sync', function(state, prevState, data) {
             // LifecycleStore and others cannot directly subscribe to matrix client for
             // events because flux only allows store state changes during flux dispatches.
             // So dispatch directly from here. Ideally we'd use a SyncStateStore that
             // would do this dispatch and expose the sync state itself (by listening to
             // its own dispatch).
             dis.dispatch({action: 'sync_state', prevState, state});
+
+            if (state === "ERROR" || state === "RECONNECTING") {
+                self.setState({syncError: data.error || true});
+            } else if (self.state.syncError) {
+                self.setState({syncError: null});
+            }
+
             self.updateStatusIndicator(state, prevState);
             if (state === "SYNCING" && prevState === "SYNCING") {
                 return;
@@ -1262,6 +1290,7 @@ export default React.createClass({
             }, true);
         });
         cli.on('Session.logged_out', function(call) {
+            if (Lifecycle.isLoggingOut()) return;
             const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             Modal.createTrackedDialog('Signed out', '', ErrorDialog, {
                 title: _t('Signed Out'),
@@ -1304,9 +1333,20 @@ export default React.createClass({
             }
         });
 
-        const dft = new DecryptionFailureTracker((failure) => {
-            // TODO: Pass reason for failure as third argument to trackEvent
-            Analytics.trackEvent('E2E', 'Decryption failure');
+        const dft = new DecryptionFailureTracker((total, errorCode) => {
+            Analytics.trackEvent('E2E', 'Decryption failure', errorCode, total);
+        }, (errorCode) => {
+            // Map JS-SDK error codes to tracker codes for aggregation
+            switch (errorCode) {
+                case 'MEGOLM_UNKNOWN_INBOUND_SESSION_ID':
+                    return 'olm_keys_not_sent_error';
+                case 'OLM_UNKNOWN_MESSAGE_INDEX':
+                    return 'olm_index_error';
+                case undefined:
+                    return 'unexpected_error';
+                default:
+                    return 'unspecified_error';
+            }
         });
 
         // Shelved for later date when we have time to think about persisting history of
@@ -1317,7 +1357,7 @@ export default React.createClass({
 
         // When logging out, stop tracking failures and destroy state
         cli.on("Session.logged_out", () => dft.stop());
-        cli.on("Event.decrypted", (e) => dft.eventDecrypted(e));
+        cli.on("Event.decrypted", (e, err) => dft.eventDecrypted(e, err));
 
         const krh = new KeyRequestHandler(cli);
         cli.on("crypto.roomKeyRequest", (req) => {
@@ -1406,7 +1446,7 @@ export default React.createClass({
         } else if (screen == 'start') {
             this.showScreen('home');
             dis.dispatch({
-                action: 'view_set_mxid',
+                action: 'require_registration',
             });
         } else if (screen == 'directory') {
             dis.dispatch({
@@ -1722,8 +1762,15 @@ export default React.createClass({
             } else {
                 // we think we are logged in, but are still waiting for the /sync to complete
                 const Spinner = sdk.getComponent('elements.Spinner');
+                let errorBox;
+                if (this.state.syncError) {
+                    errorBox = 

+                        {messageForSyncError(this.state.syncError)}
+                    
;
+                }
                 return (
                     

+                        {errorBox}
                         
                         
                         { _t('Logout') }
diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js
index 18523ceb59..86870718e8 100644
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -160,7 +160,7 @@ module.exports = React.createClass({
 
     onInviteButtonClick: function() {
         if (this.context.matrixClient.isGuest()) {
-            dis.dispatch({action: 'view_set_mxid'});
+            dis.dispatch({action: 'require_registration'});
             return;
         }
 
@@ -186,6 +186,9 @@ module.exports = React.createClass({
     },
 
     onRoomStateMember: function(ev, state, member) {
+        if (member.roomId !== this.props.roomId) {
+            return;
+        }
         // redraw the badge on the membership list
         if (this.state.phase === this.Phase.RoomMemberList && member.roomId === this.props.roomId) {
             this._delayedUpdate();
@@ -280,7 +283,7 @@ module.exports = React.createClass({
             const room = cli.getRoom(this.props.roomId);
             let isUserInRoom;
             if (room) {
-                const numMembers = room.getJoinedMembers().length;
+                const numMembers = room.getJoinedMemberCount();
                 membersTitle = _t('%(count)s Members', { count: numMembers });
                 membersBadge = 
{ formatCount(numMembers) }
;
                 isUserInRoom = room.hasMembershipState(this.context.matrixClient.credentials.userId, 'join');
diff --git a/src/components/structures/RoomDirectory.js b/src/components/structures/RoomDirectory.js
index 76360383d6..f417932fd0 100644
--- a/src/components/structures/RoomDirectory.js
+++ b/src/components/structures/RoomDirectory.js
@@ -354,7 +354,7 @@ module.exports = React.createClass({
             // to the directory.
             if (MatrixClientPeg.get().isGuest()) {
                 if (!room.world_readable && !room.guest_can_join) {
-                    dis.dispatch({action: 'view_set_mxid'});
+                    dis.dispatch({action: 'require_registration'});
                     return;
                 }
             }
diff --git a/src/components/structures/RoomStatusBar.js b/src/components/structures/RoomStatusBar.js
index 8034923158..fec59aadd5 100644
--- a/src/components/structures/RoomStatusBar.js
+++ b/src/components/structures/RoomStatusBar.js
@@ -1,6 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2017 New Vector Ltd
+Copyright 2017, 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -18,13 +18,15 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import Matrix from 'matrix-js-sdk';
-import { _t } from '../../languageHandler';
+import { _t, _td } from '../../languageHandler';
 import sdk from '../../index';
 import WhoIsTyping from '../../WhoIsTyping';
 import MatrixClientPeg from '../../MatrixClientPeg';
 import MemberAvatar from '../views/avatars/MemberAvatar';
 import Resend from '../../Resend';
 import * as cryptodevices from '../../cryptodevices';
+import dis from '../../dispatcher';
+import { messageForResourceLimitError } from '../../utils/ErrorUtils';
 
 const STATUS_BAR_HIDDEN = 0;
 const STATUS_BAR_EXPANDED = 1;
@@ -106,6 +108,7 @@ module.exports = React.createClass({
     getInitialState: function() {
         return {
             syncState: MatrixClientPeg.get().getSyncState(),
+            syncStateData: MatrixClientPeg.get().getSyncStateData(),
             usersTyping: WhoIsTyping.usersTypingApartFromMe(this.props.room),
             unsentMessages: getUnsentMessages(this.props.room),
         };
@@ -133,12 +136,13 @@ module.exports = React.createClass({
         }
     },
 
-    onSyncStateChange: function(state, prevState) {
+    onSyncStateChange: function(state, prevState, data) {
         if (state === "SYNCING" && prevState === "SYNCING") {
             return;
         }
         this.setState({
             syncState: state,
+            syncStateData: data,
         });
     },
 
@@ -157,10 +161,12 @@ module.exports = React.createClass({
 
     _onResendAllClick: function() {
         Resend.resendUnsentEvents(this.props.room);
+        dis.dispatch({action: 'focus_composer'});
     },
 
     _onCancelAllClick: function() {
         Resend.cancelUnsentEvents(this.props.room);
+        dis.dispatch({action: 'focus_composer'});
     },
 
     _onShowDevicesClick: function() {
@@ -188,7 +194,7 @@ module.exports = React.createClass({
     // changed - so we use '0' to indicate normal size, and other values to
     // indicate other sizes.
     _getSize: function() {
-        if (this.state.syncState === "ERROR" ||
+        if (this._shouldShowConnectionError() ||
             (this.state.usersTyping.length > 0) ||
             this.props.numUnreadMessages ||
             !this.props.atEndOfLiveTimeline ||
@@ -235,7 +241,7 @@ module.exports = React.createClass({
             );
         }
 
-        if (this.state.syncState === "ERROR") {
+        if (this._shouldShowConnectionError()) {
             return null;
         }
 
@@ -282,6 +288,21 @@ module.exports = React.createClass({
         return avatars;
     },
 
+    _shouldShowConnectionError: function() {
+        // no conn bar trumps unread count since you can't get unread messages
+        // without a connection! (technically may already have some but meh)
+        // It also trumps the "some not sent" msg since you can't resend without
+        // a connection!
+        // There's one situation in which we don't show this 'no connection' bar, and that's
+        // if it's a resource limit exceeded error: those are shown in the top bar.
+        const errorIsMauError = Boolean(
+            this.state.syncStateData &&
+            this.state.syncStateData.error &&
+            this.state.syncStateData.error.errcode === 'M_RESOURCE_LIMIT_EXCEEDED'
+        );
+        return this.state.syncState === "ERROR" && !errorIsMauError;
+    },
+
     _getUnsentMessageContent: function() {
         const unsentMessages = this.state.unsentMessages;
         if (!unsentMessages.length) return null;
@@ -305,7 +326,43 @@ module.exports = React.createClass({
                 },
             );
         } else {
-            if (
+            let consentError = null;
+            let resourceLimitError = null;
+            for (const m of unsentMessages) {
+                if (m.error && m.error.errcode === 'M_CONSENT_NOT_GIVEN') {
+                    consentError = m.error;
+                    break;
+                } else if (m.error && m.error.errcode === 'M_RESOURCE_LIMIT_EXCEEDED') {
+                    resourceLimitError = m.error;
+                    break;
+                }
+            }
+            if (consentError) {
+                title = _t(
+                    "You can't send any messages until you review and agree to " +
+                    "our terms and conditions.",
+                    {},
+                    {
+                        'consentLink': (sub) =>
+                            
+                                { sub }
+                            ,
+                    },
+                );
+            } else if (resourceLimitError) {
+                title = messageForResourceLimitError(
+                    resourceLimitError.data.limit_type,
+                    resourceLimitError.data.admin_contact, {
+                    'monthly_active_user': _td(
+                        "Your message wasn't sent because this homeserver has hit its Monthly Active User Limit. " +
+                        "Please contact your service administrator to continue using the service.",
+                    ),
+                    '': _td(
+                        "Your message wasn't sent because this homeserver has exceeded a resource limit. " +
+                        "Please contact your service administrator to continue using the service.",
+                    ),
+                });
+            } else if (
                 unsentMessages.length === 1 &&
                 unsentMessages[0].error &&
                 unsentMessages[0].error.data &&
@@ -329,11 +386,13 @@ module.exports = React.createClass({
 
         return 

             {_t("Warning")}
-            

-                { title }
-            

-            

-                { content }
+            

+                

+                    { title }
+                

+                

+                    { content }
+                

             

         
;
     },
@@ -342,19 +401,17 @@ module.exports = React.createClass({
     _getContent: function() {
         const EmojiText = sdk.getComponent('elements.EmojiText');
 
-        // no conn bar trumps unread count since you can't get unread messages
-        // without a connection! (technically may already have some but meh)
-        // It also trumps the "some not sent" msg since you can't resend without
-        // a connection!
-        if (this.state.syncState === "ERROR") {
+        if (this._shouldShowConnectionError()) {
             return (
                 

                     /!\ 
-                    

-                        { _t('Connectivity to the server has been lost.') }
-                    

-                    

-                        { _t('Sent messages will be stored until your connection has returned.') }
+                    

+                        

+                            { _t('Connectivity to the server has been lost.') }
+                        

+                        

+                            { _t('Sent messages will be stored until your connection has returned.') }
+                        

                     

                 

             );
diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js
index 33ff17caa4..d798070659 100644
--- a/src/components/structures/RoomSubList.js
+++ b/src/components/structures/RoomSubList.js
@@ -1,6 +1,7 @@
 /*
-Copyright 2017 Vector Creations Ltd
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2017 Vector Creations Ltd
+Copyright 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -15,56 +16,53 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-'use strict';
-
-var React = require('react');
-var ReactDOM = require('react-dom');
-var classNames = require('classnames');
-var sdk = require('../../index');
+import React from 'react';
+import classNames from 'classnames';
+import sdk from '../../index';
 import { Droppable } from 'react-beautiful-dnd';
 import { _t } from '../../languageHandler';
-var dis = require('../../dispatcher');
-var Unread = require('../../Unread');
-var MatrixClientPeg = require('../../MatrixClientPeg');
-var RoomNotifs = require('../../RoomNotifs');
-var FormattingUtils = require('../../utils/FormattingUtils');
-var AccessibleButton = require('../../components/views/elements/AccessibleButton');
-import Modal from '../../Modal';
+import dis from '../../dispatcher';
+import Unread from '../../Unread';
+import * as RoomNotifs from '../../RoomNotifs';
+import * as FormattingUtils from '../../utils/FormattingUtils';
 import { KeyCode } from '../../Keyboard';
+import { Group } from 'matrix-js-sdk';
+import PropTypes from 'prop-types';
 
 
 // turn this on for drop & drag console debugging galore
-var debug = false;
+const debug = false;
 
 const TRUNCATE_AT = 10;
 
-var RoomSubList = React.createClass({
+const RoomSubList = React.createClass({
     displayName: 'RoomSubList',
 
     debug: debug,
 
     propTypes: {
-        list: React.PropTypes.arrayOf(React.PropTypes.object).isRequired,
-        label: React.PropTypes.string.isRequired,
-        tagName: React.PropTypes.string,
-        editable: React.PropTypes.bool,
+        list: PropTypes.arrayOf(PropTypes.object).isRequired,
+        label: PropTypes.string.isRequired,
+        tagName: PropTypes.string,
+        editable: PropTypes.bool,
 
-        order: React.PropTypes.string.isRequired,
+        order: PropTypes.string.isRequired,
 
         // passed through to RoomTile and used to highlight room with `!` regardless of notifications count
-        isInvite: React.PropTypes.bool,
+        isInvite: PropTypes.bool,
 
-        startAsHidden: React.PropTypes.bool,
-        showSpinner: React.PropTypes.bool, // true to show a spinner if 0 elements when expanded
-        collapsed: React.PropTypes.bool.isRequired, // is LeftPanel collapsed?
-        onHeaderClick: React.PropTypes.func,
-        alwaysShowHeader: React.PropTypes.bool,
-        incomingCall: React.PropTypes.object,
-        onShowMoreRooms: React.PropTypes.func,
-        searchFilter: React.PropTypes.string,
-        emptyContent: React.PropTypes.node, // content shown if the list is empty
-        headerItems: React.PropTypes.node, // content shown in the sublist header
-        extraTiles: React.PropTypes.arrayOf(React.PropTypes.node), // extra elements added beneath tiles
+        startAsHidden: PropTypes.bool,
+        showSpinner: PropTypes.bool, // true to show a spinner if 0 elements when expanded
+        collapsed: PropTypes.bool.isRequired, // is LeftPanel collapsed?
+        onHeaderClick: PropTypes.func,
+        alwaysShowHeader: PropTypes.bool,
+        incomingCall: PropTypes.object,
+        onShowMoreRooms: PropTypes.func,
+        searchFilter: PropTypes.string,
+        emptyContent: PropTypes.node, // content shown if the list is empty
+        headerItems: PropTypes.node, // content shown in the sublist header
+        extraTiles: PropTypes.arrayOf(PropTypes.node), // extra elements added beneath tiles
+        showEmpty: PropTypes.bool,
     },
 
     getInitialState: function() {
@@ -77,10 +75,13 @@ var RoomSubList = React.createClass({
 
     getDefaultProps: function() {
         return {
-            onHeaderClick: function() {}, // NOP
-            onShowMoreRooms: function() {}, // NOP
+            onHeaderClick: function() {
+            }, // NOP
+            onShowMoreRooms: function() {
+            }, // NOP
             extraTiles: [],
             isInvite: false,
+            showEmpty: true,
         };
     },
 
@@ -115,7 +116,7 @@ var RoomSubList = React.createClass({
     // The header is collapsable if it is hidden or not stuck
     // The dataset elements are added in the RoomList _initAndPositionStickyHeaders method
     isCollapsableOnClick: function() {
-        var stuck = this.refs.header.dataset.stuck;
+        const stuck = this.refs.header.dataset.stuck;
         if (this.state.hidden || stuck === undefined || stuck === "none") {
             return true;
         } else {
@@ -141,12 +142,12 @@ var RoomSubList = React.createClass({
     onClick: function(ev) {
         if (this.isCollapsableOnClick()) {
             // The header isCollapsable, so the click is to be interpreted as collapse and truncation logic
-            var isHidden = !this.state.hidden;
-            this.setState({ hidden : isHidden });
+            const isHidden = !this.state.hidden;
+            this.setState({hidden: isHidden});
 
             if (isHidden) {
                 // as good a way as any to reset the truncate state
-                this.setState({ truncateAt : TRUNCATE_AT });
+                this.setState({truncateAt: TRUNCATE_AT});
             }
 
             this.props.onShowMoreRooms();
@@ -161,7 +162,7 @@ var RoomSubList = React.createClass({
         dis.dispatch({
             action: 'view_room',
             room_id: roomId,
-            clear_search: (ev && (ev.keyCode == KeyCode.ENTER || ev.keyCode == KeyCode.SPACE)),
+            clear_search: (ev && (ev.keyCode === KeyCode.ENTER || ev.keyCode === KeyCode.SPACE)),
         });
     },
 
@@ -171,17 +172,17 @@ var RoomSubList = React.createClass({
     },
 
     _shouldShowMentionBadge: function(roomNotifState) {
-        return roomNotifState != RoomNotifs.MUTE;
+        return roomNotifState !== RoomNotifs.MUTE;
     },
 
     /**
      * Total up all the notification counts from the rooms
      *
-     * @param {Number} If supplied will only total notifications for rooms outside the truncation number
+     * @param {Number} truncateAt If supplied will only total notifications for rooms outside the truncation number
      * @returns {Array} The array takes the form [total, highlight] where highlight is a bool
      */
     roomNotificationCount: function(truncateAt) {
-        var self = this;
+        const self = this;
 
         if (this.props.isInvite) {
             return [0, true];
@@ -189,9 +190,9 @@ var RoomSubList = React.createClass({
 
         return this.props.list.reduce(function(result, room, index) {
             if (truncateAt === undefined || index >= truncateAt) {
-                var roomNotifState = RoomNotifs.getRoomNotifsState(room.roomId);
-                var highlight = room.getUnreadNotificationCount('highlight') > 0;
-                var notificationCount = room.getUnreadNotificationCount();
+                const roomNotifState = RoomNotifs.getRoomNotifsState(room.roomId);
+                const highlight = room.getUnreadNotificationCount('highlight') > 0;
+                const notificationCount = room.getUnreadNotificationCount();
 
                 const notifBadges = notificationCount > 0 && self._shouldShowNotifBadge(roomNotifState);
                 const mentionBadges = highlight && self._shouldShowMentionBadge(roomNotifState);
@@ -240,38 +241,83 @@ var RoomSubList = React.createClass({
         });
     },
 
+    _onNotifBadgeClick: function(e) {
+        // prevent the roomsublist collapsing
+        e.preventDefault();
+        e.stopPropagation();
+        // find first room which has notifications and switch to it
+        for (const room of this.state.sortedList) {
+            const roomNotifState = RoomNotifs.getRoomNotifsState(room.roomId);
+            const highlight = room.getUnreadNotificationCount('highlight') > 0;
+            const notificationCount = room.getUnreadNotificationCount();
+
+            const notifBadges = notificationCount > 0 && this._shouldShowNotifBadge(roomNotifState);
+            const mentionBadges = highlight && this._shouldShowMentionBadge(roomNotifState);
+
+            if (notifBadges || mentionBadges) {
+                dis.dispatch({
+                    action: 'view_room',
+                    room_id: room.roomId,
+                });
+                return;
+            }
+        }
+    },
+
+    _onInviteBadgeClick: function(e) {
+        // prevent the roomsublist collapsing
+        e.preventDefault();
+        e.stopPropagation();
+        // switch to first room in sortedList as that'll be the top of the list for the user
+        if (this.state.sortedList && this.state.sortedList.length > 0) {
+            dis.dispatch({
+                action: 'view_room',
+                room_id: this.state.sortedList[0].roomId,
+            });
+        } else if (this.props.extraTiles && this.props.extraTiles.length > 0) {
+            // Group Invites are different in that they are all extra tiles and not rooms
+            // XXX: this is a horrible special case because Group Invite sublist is a hack
+            if (this.props.extraTiles[0].props && this.props.extraTiles[0].props.group instanceof Group) {
+                dis.dispatch({
+                    action: 'view_group',
+                    group_id: this.props.extraTiles[0].props.group.groupId,
+                });
+            }
+        }
+    },
+
     _getHeaderJsx: function() {
-        var TintableSvg = sdk.getComponent("elements.TintableSvg");
+        const subListNotifications = this.roomNotificationCount();
+        const subListNotifCount = subListNotifications[0];
+        const subListNotifHighlight = subListNotifications[1];
 
-        var subListNotifications = this.roomNotificationCount();
-        var subListNotifCount = subListNotifications[0];
-        var subListNotifHighlight = subListNotifications[1];
+        const totalTiles = this.props.list.length + (this.props.extraTiles || []).length;
+        const roomCount = totalTiles > 0 ? totalTiles : '';
 
-        var totalTiles = this.props.list.length + (this.props.extraTiles || []).length;
-        var roomCount = totalTiles > 0 ? totalTiles : '';
-
-        var chevronClasses = classNames({
+        const chevronClasses = classNames({
             'mx_RoomSubList_chevron': true,
             'mx_RoomSubList_chevronRight': this.state.hidden,
             'mx_RoomSubList_chevronDown': !this.state.hidden,
         });
 
-        var badgeClasses = classNames({
+        const badgeClasses = classNames({
             'mx_RoomSubList_badge': true,
             'mx_RoomSubList_badgeHighlight': subListNotifHighlight,
         });
 
-        var badge;
+        let badge;
         if (subListNotifCount > 0) {
-            badge = 
{ FormattingUtils.formatCount(subListNotifCount) }
;
+            badge = 

+                { FormattingUtils.formatCount(subListNotifCount) }
+            
;
         } else if (this.props.isInvite) {
             // no notifications but highlight anyway because this is an invite badge
-            badge = 
!
;
+            badge = 
!
;
         }
 
         // When collapsed, allow a long hover on the header to show user
         // the full tag name and room count
-        var title;
+        let title;
         if (this.props.collapsed) {
             title = this.props.label;
             if (roomCount !== '') {
@@ -279,63 +325,66 @@ var RoomSubList = React.createClass({
             }
         }
 
-        var incomingCall;
+        let incomingCall;
         if (this.props.incomingCall) {
-            var self = this;
+            const self = this;
             // Check if the incoming call is for this section
-            var incomingCallRoom = this.props.list.filter(function(room) {
+            const incomingCallRoom = this.props.list.filter(function(room) {
                 return self.props.incomingCall.roomId === room.roomId;
             });
 
             if (incomingCallRoom.length === 1) {
-                var IncomingCallBox = sdk.getComponent("voip.IncomingCallBox");
-                incomingCall = ;
+                const IncomingCallBox = sdk.getComponent("voip.IncomingCallBox");
+                incomingCall =
+                    ;
             }
         }
 
-        var tabindex = this.props.searchFilter === "" ? "0" : "-1";
+        const tabindex = this.props.searchFilter === "" ? "0" : "-1";
 
+        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
         return (
-            

-                
-                    { this.props.collapsed ? '' : this.props.label }
-                    
{ roomCount }

-                    

-                    { badge }
-                    { incomingCall }
+            

+                
+                    {this.props.collapsed ? '' : this.props.label}
+                    
{roomCount}

+                    

+                    {badge}
+                    {incomingCall}
                 
             

         );
     },
 
     _createOverflowTile: function(overflowCount, totalCount) {
-        var content = 
;
+        let content = 
;
 
-        var overflowNotifications = this.roomNotificationCount(TRUNCATE_AT);
-        var overflowNotifCount = overflowNotifications[0];
-        var overflowNotifHighlight = overflowNotifications[1];
+        const overflowNotifications = this.roomNotificationCount(TRUNCATE_AT);
+        const overflowNotifCount = overflowNotifications[0];
+        const overflowNotifHighlight = overflowNotifications[1];
         if (overflowNotifCount && !this.props.collapsed) {
             content = FormattingUtils.formatCount(overflowNotifCount);
         }
 
-        var badgeClasses = classNames({
+        const badgeClasses = classNames({
             'mx_RoomSubList_moreBadge': true,
             'mx_RoomSubList_moreBadgeNotify': overflowNotifCount && !this.props.collapsed,
             'mx_RoomSubList_moreBadgeHighlight': overflowNotifHighlight && !this.props.collapsed,
         });
 
+        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
         return (
             
-                

-                
{ _t("more") }

-                
{ content }

+                

+                
{_t("more")}

+                
{content}

             
         );
     },
 
     _showFullMemberList: function() {
         this.setState({
-            truncateAt: -1
+            truncateAt: -1,
         });
 
         this.props.onShowMoreRooms();
@@ -343,37 +392,51 @@ var RoomSubList = React.createClass({
     },
 
     render: function() {
-        var connectDropTarget = this.props.connectDropTarget;
-        var TruncatedList = sdk.getComponent('elements.TruncatedList');
-
-        var label = this.props.collapsed ? null : this.props.label;
+        const TruncatedList = sdk.getComponent('elements.TruncatedList');
 
         let content;
-        if (this.state.sortedList.length === 0 && !this.props.searchFilter && this.props.extraTiles.length === 0) {
-            content = this.props.emptyContent;
+
+        if (this.props.showEmpty) {
+            // this is new behaviour with still controversial UX in that in hiding RoomSubLists the drop zones for DnD
+            // are also gone so when filtering users can't DnD rooms to some tags but is a lot cleaner otherwise.
+            if (this.state.sortedList.length === 0 && !this.props.searchFilter && this.props.extraTiles.length === 0) {
+                content = this.props.emptyContent;
+            } else {
+                content = this.makeRoomTiles();
+                content.push(...this.props.extraTiles);
+            }
         } else {
-            content = this.makeRoomTiles();
-            content.push(...this.props.extraTiles);
+            if (this.state.sortedList.length === 0 && this.props.extraTiles.length === 0) {
+                // if no search filter is applied and there is a placeholder defined then show it, otherwise show nothing
+                if (!this.props.searchFilter && this.props.emptyContent) {
+                    content = this.props.emptyContent;
+                } else {
+                    // don't show an empty sublist
+                    return null;
+                }
+            } else {
+                content = this.makeRoomTiles();
+                content.push(...this.props.extraTiles);
+            }
         }
 
         if (this.state.sortedList.length > 0 || this.props.extraTiles.length > 0 || this.props.editable) {
-            var subList;
-            var classes = "mx_RoomSubList";
+            let subList;
+            const classes = "mx_RoomSubList";
 
             if (!this.state.hidden) {
-                subList = 
-                                { content }
-                          ;
-            }
-            else {
-                subList = 
-                          ;
+                subList = 
+                    {content}
+                ;
+            } else {
+                subList = 
+                ;
             }
 
             const subListContent = 

-                { this._getHeaderJsx() }
-                { subList }
+                {this._getHeaderJsx()}
+                {subList}
             
;
 
             return this.props.editable ?
@@ -381,23 +444,26 @@ var RoomSubList = React.createClass({
                     droppableId={"room-sub-list-droppable_" + this.props.tagName}
                     type="draggable-RoomTile"
                 >
-                    { (provided, snapshot) => (
+                    {(provided, snapshot) => (
                         

-                            { subListContent }
+                            {subListContent}
                         

-                    ) }
+                    )}
                  : subListContent;
-        }
-        else {
-            var Loader = sdk.getComponent("elements.Spinner");
+        } else {
+            const Loader = sdk.getComponent("elements.Spinner");
+            if (this.props.showSpinner) {
+                content = ;
+            }
+
             return (
                 

-                    { this.props.alwaysShowHeader ? this._getHeaderJsx() : undefined }
-                    { (this.props.showSpinner && !this.state.hidden) ?  : undefined }
+                    {this.props.alwaysShowHeader ? this._getHeaderJsx() : undefined}
+                    { this.state.hidden ? undefined : content }
                 

             );
         }
-    }
+    },
 });
 
 module.exports = RoomSubList;
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 4beafb099c..e9e46a2ff6 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -1,6 +1,7 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
 Copyright 2017 Vector Creations Ltd
+Copyright 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -44,7 +45,9 @@ import { KeyCode, isOnlyCtrlOrCmdKeyEvent } from '../../Keyboard';
 
 import RoomViewStore from '../../stores/RoomViewStore';
 import RoomScrollStateStore from '../../stores/RoomScrollStateStore';
+import WidgetEchoStore from '../../stores/WidgetEchoStore';
 import SettingsStore, {SettingLevel} from "../../settings/SettingsStore";
+import WidgetUtils from '../../utils/WidgetUtils';
 
 const DEBUG = false;
 let debuglog = function() {};
@@ -88,13 +91,16 @@ module.exports = React.createClass({
     },
 
     getInitialState: function() {
+        const llMembers = MatrixClientPeg.get().hasLazyLoadMembersEnabled();
         return {
             room: null,
             roomId: null,
             roomLoading: true,
             peekLoading: false,
             shouldPeek: true,
-
+            // used to trigger a rerender in TimelinePanel once the members are loaded,
+            // so RR are rendered again (now with the members available), ...
+            membersLoaded: !llMembers,
             // The event to be scrolled to initially
             initialEventId: null,
             // The offset in pixels from the event with which to scroll vertically
@@ -145,12 +151,14 @@ module.exports = React.createClass({
         MatrixClientPeg.get().on("Room.name", this.onRoomName);
         MatrixClientPeg.get().on("Room.accountData", this.onRoomAccountData);
         MatrixClientPeg.get().on("RoomState.members", this.onRoomStateMember);
-        MatrixClientPeg.get().on("RoomMember.membership", this.onRoomMemberMembership);
+        MatrixClientPeg.get().on("Room.myMembership", this.onMyMembership);
         MatrixClientPeg.get().on("accountData", this.onAccountData);
 
         // Start listening for RoomViewStore updates
         this._roomStoreToken = RoomViewStore.addListener(this._onRoomViewStoreUpdate);
         this._onRoomViewStoreUpdate(true);
+
+        WidgetEchoStore.on('update', this._onWidgetEchoStoreUpdate);
     },
 
     _onRoomViewStoreUpdate: function(initial) {
@@ -241,6 +249,12 @@ module.exports = React.createClass({
         }
     },
 
+    _onWidgetEchoStoreUpdate: function() {
+        this.setState({
+            showApps: this._shouldShowApps(this.state.room),
+        });
+    },
+
     _setupRoom: function(room, roomId, joining, shouldPeek) {
         // if this is an unknown room then we're in one of three states:
         // - This is a room we can peek into (search engine) (we can /peek)
@@ -297,11 +311,13 @@ module.exports = React.createClass({
                         throw err;
                     }
                 });
+            } else if (room) {
+                //viewing a previously joined room, try to lazy load members
+
+                // Stop peeking because we have joined this room previously
+                MatrixClientPeg.get().stopPeeking();
+                this.setState({isPeeking: false});
             }
-        } else if (room) {
-            // Stop peeking because we have joined this room previously
-            MatrixClientPeg.get().stopPeeking();
-            this.setState({isPeeking: false});
         }
     },
 
@@ -317,14 +333,9 @@ module.exports = React.createClass({
             return false;
         }
 
-        const appsStateEvents = room.currentState.getStateEvents('im.vector.modular.widgets');
-        // any valid widget = show apps
-        for (let i = 0; i < appsStateEvents.length; i++) {
-            if (appsStateEvents[i].getContent().type && appsStateEvents[i].getContent().url) {
-                return true;
-            }
-        }
-        return false;
+        const widgets = WidgetEchoStore.getEchoedRoomWidgets(room.roomId, WidgetUtils.getRoomWidgets(room));
+
+        return widgets.length > 0 || WidgetEchoStore.roomHasPendingWidgets(room.roomId, WidgetUtils.getRoomWidgets(room));
     },
 
     componentDidMount: function() {
@@ -345,7 +356,7 @@ module.exports = React.createClass({
         // XXX: EVIL HACK to autofocus inviting on empty rooms.
         // We use the setTimeout to avoid racing with focus_composer.
         if (this.state.room &&
-            this.state.room.getJoinedMembers().length == 1 &&
+            this.state.room.getJoinedMemberCount() == 1 &&
             this.state.room.getLiveTimeline() &&
             this.state.room.getLiveTimeline().getEvents() &&
             this.state.room.getLiveTimeline().getEvents().length <= 6) {
@@ -404,8 +415,8 @@ module.exports = React.createClass({
             MatrixClientPeg.get().removeListener("Room.timeline", this.onRoomTimeline);
             MatrixClientPeg.get().removeListener("Room.name", this.onRoomName);
             MatrixClientPeg.get().removeListener("Room.accountData", this.onRoomAccountData);
+            MatrixClientPeg.get().removeListener("Room.myMembership", this.onMyMembership);
             MatrixClientPeg.get().removeListener("RoomState.members", this.onRoomStateMember);
-            MatrixClientPeg.get().removeListener("RoomMember.membership", this.onRoomMemberMembership);
             MatrixClientPeg.get().removeListener("accountData", this.onAccountData);
         }
 
@@ -419,6 +430,8 @@ module.exports = React.createClass({
             this._roomStoreToken.remove();
         }
 
+        WidgetEchoStore.removeListener('update', this._onWidgetEchoStoreUpdate);
+
         // cancel any pending calls to the rate_limited_funcs
         this._updateRoomMembers.cancelPendingCall();
 
@@ -572,6 +585,27 @@ module.exports = React.createClass({
         this._warnAboutEncryption(room);
         this._calculatePeekRules(room);
         this._updatePreviewUrlVisibility(room);
+        this._loadMembersIfJoined(room);
+    },
+
+    _loadMembersIfJoined: async function(room) {
+        // lazy load members if enabled
+        const cli = MatrixClientPeg.get();
+        if (cli.hasLazyLoadMembersEnabled()) {
+            if (room && room.getMyMembership() === 'join') {
+                try {
+                    await room.loadMembersIfNeeded();
+                    if (!this.unmounted) {
+                        this.setState({membersLoaded: true});
+                    }
+                } catch (err) {
+                    const errorMessage = `Fetching room members for ${room.roomId} failed.` +
+                        " Room members will appear incomplete.";
+                    console.error(errorMessage);
+                    console.error(err);
+                }
+            }
+        }
     },
 
     _warnAboutEncryption: function(room) {
@@ -618,9 +652,11 @@ module.exports = React.createClass({
         }
     },
 
-    _updatePreviewUrlVisibility: function(room) {
+    _updatePreviewUrlVisibility: function({roomId}) {
+        // URL Previews in E2EE rooms can be a privacy leak so use a different setting which is per-room explicit
+        const key = MatrixClientPeg.get().isRoomEncrypted(roomId) ? 'urlPreviewsEnabled_e2ee' : 'urlPreviewsEnabled';
         this.setState({
-            showUrlPreview: SettingsStore.getValue("urlPreviewsEnabled", room.roomId),
+            showUrlPreview: SettingsStore.getValue(key, roomId),
         });
     },
 
@@ -645,19 +681,23 @@ module.exports = React.createClass({
     },
 
     onAccountData: function(event) {
-        if (event.getType() === "org.matrix.preview_urls" && this.state.room) {
+        const type = event.getType();
+        if ((type === "org.matrix.preview_urls" || type === "im.vector.web.settings") && this.state.room) {
+            // non-e2ee url previews are stored in legacy event type `org.matrix.room.preview_urls`
             this._updatePreviewUrlVisibility(this.state.room);
         }
     },
 
     onRoomAccountData: function(event, room) {
         if (room.roomId == this.state.roomId) {
-            if (event.getType() === "org.matrix.room.color_scheme") {
+            const type = event.getType();
+            if (type === "org.matrix.room.color_scheme") {
                 const color_scheme = event.getContent();
                 // XXX: we should validate the event
                 console.log("Tinter.tint from onRoomAccountData");
                 Tinter.tint(color_scheme.primary_color, color_scheme.secondary_color);
-            } else if (event.getType() === "org.matrix.room.preview_urls") {
+            } else if (type === "org.matrix.room.preview_urls" || type === "im.vector.web.settings") {
+                // non-e2ee url previews are stored in legacy event type `org.matrix.room.preview_urls`
                 this._updatePreviewUrlVisibility(room);
             }
         }
@@ -675,12 +715,12 @@ module.exports = React.createClass({
         }
 
         this._updateRoomMembers();
-        this._checkIfAlone(this.state.room);
     },
 
-    onRoomMemberMembership: function(ev, member, oldMembership) {
-        if (member.userId == MatrixClientPeg.get().credentials.userId) {
+    onMyMembership: function(room, membership, oldMembership) {
+        if (room.roomId === this.state.roomId) {
             this.forceUpdate();
+            this._loadMembersIfJoined(room);
         }
     },
 
@@ -691,6 +731,7 @@ module.exports = React.createClass({
         // refresh the conf call notification state
         this._updateConfCallNotification();
         this._updateDMState();
+        this._checkIfAlone(this.state.room);
     }, 500),
 
     _checkIfAlone: function(room) {
@@ -703,8 +744,8 @@ module.exports = React.createClass({
             return;
         }
 
-        const joinedMembers = room.currentState.getMembers().filter((m) => m.membership === "join" || m.membership === "invite");
-        this.setState({isAlone: joinedMembers.length === 1});
+        const joinedOrInvitedMemberCount = room.getJoinedMemberCount() + room.getInvitedMemberCount();
+        this.setState({isAlone: joinedOrInvitedMemberCount === 1});
     },
 
     _updateConfCallNotification: function() {
@@ -732,40 +773,13 @@ module.exports = React.createClass({
     },
 
     _updateDMState() {
-        const me = this.state.room.getMember(MatrixClientPeg.get().credentials.userId);
-        if (!me || me.membership !== "join") {
+        const room = this.state.room;
+        if (room.getMyMembership() != "join") {
             return;
         }
-
-        // The user may have accepted an invite with is_direct set
-        if (me.events.member.getPrevContent().membership === "invite" &&
-            me.events.member.getPrevContent().is_direct
-        ) {
-            // This is a DM with the sender of the invite event (which we assume
-            // preceded the join event)
-            Rooms.setDMRoom(
-                this.state.room.roomId,
-                me.events.member.getUnsigned().prev_sender,
-            );
-            return;
-        }
-
-        const invitedMembers = this.state.room.getMembersWithMembership("invite");
-        const joinedMembers = this.state.room.getMembersWithMembership("join");
-
-        // There must be one invited member and one joined member
-        if (invitedMembers.length !== 1 || joinedMembers.length !== 1) {
-            return;
-        }
-
-        // The user may have sent an invite with is_direct sent
-        const other = invitedMembers[0];
-        if (other &&
-            other.membership === "invite" &&
-            other.events.member.getContent().is_direct
-        ) {
-            Rooms.setDMRoom(this.state.room.roomId, other.userId);
-            return;
+        const dmInviter = room.getDMInviter();
+        if (dmInviter) {
+            Rooms.setDMRoom(room.roomId, dmInviter);
         }
     },
 
@@ -916,7 +930,7 @@ module.exports = React.createClass({
         dis.dispatch({action: 'focus_composer'});
 
         if (MatrixClientPeg.get().isGuest()) {
-            dis.dispatch({action: 'view_set_mxid'});
+            dis.dispatch({action: 'require_registration'});
             return;
         }
 
@@ -947,7 +961,7 @@ module.exports = React.createClass({
 
     injectSticker: function(url, info, text) {
         if (MatrixClientPeg.get().isGuest()) {
-            dis.dispatch({action: 'view_set_mxid'});
+            dis.dispatch({action: 'require_registration'});
             return;
         }
 
@@ -1462,6 +1476,7 @@ module.exports = React.createClass({
         const RoomPreviewBar = sdk.getComponent("rooms.RoomPreviewBar");
         const Loader = sdk.getComponent("elements.Spinner");
         const TimelinePanel = sdk.getComponent("structures.TimelinePanel");
+        const RoomUpgradeWarningBar = sdk.getComponent("rooms.RoomUpgradeWarningBar");
 
         if (!this.state.room) {
             if (this.state.roomLoading || this.state.peekLoading) {
@@ -1508,9 +1523,8 @@ module.exports = React.createClass({
             }
         }
 
-        const myUserId = MatrixClientPeg.get().credentials.userId;
-        const myMember = this.state.room.getMember(myUserId);
-        if (myMember && myMember.membership == 'invite') {
+        const myMembership = this.state.room.getMyMembership();
+        if (myMembership == 'invite') {
             if (this.state.joining || this.state.rejecting) {
                 return (
                     

@@ -1518,6 +1532,8 @@ module.exports = React.createClass({
                     

                 );
             } else {
+                const myUserId = MatrixClientPeg.get().credentials.userId;
+                const myMember = this.state.room.getMember(myUserId);
                 const inviteEvent = myMember.events.member;
                 var inviterName = inviteEvent.sender ? inviteEvent.sender.name : inviteEvent.getSender();
 
@@ -1587,6 +1603,11 @@ module.exports = React.createClass({
             />;
         }
 
+        const showRoomUpgradeBar = (
+            this.state.room.shouldUpgradeToVersion() &&
+            this.state.room.userMayUpgradeRoom(MatrixClientPeg.get().credentials.userId)
+        );
+
         let aux = null;
         let hideCancel = false;
         if (this.state.editingRoomSettings) {
@@ -1598,10 +1619,13 @@ module.exports = React.createClass({
         } else if (this.state.searching) {
             hideCancel = true; // has own cancel
             aux = ;
+        } else if (showRoomUpgradeBar) {
+            aux = ;
+            hideCancel = true;
         } else if (this.state.showingPinned) {
             hideCancel = true; // has own cancel
             aux = ;
-        } else if (!myMember || myMember.membership !== "join") {
+        } else if (myMembership !== "join") {
             // We do have a room object for this room, but we're not currently in it.
             // We may have a 3rd party invite to it.
             var inviterName = undefined;
@@ -1643,7 +1667,7 @@ module.exports = React.createClass({
         let messageComposer, searchInfo;
         const canSpeak = (
             // joined and not showing search results
-            myMember && (myMember.membership == 'join') && !this.state.searchResults
+            myMembership == 'join' && !this.state.searchResults
         );
         if (canSpeak) {
             messageComposer =
@@ -1744,6 +1768,7 @@ module.exports = React.createClass({
                 onReadMarkerUpdated={this._updateTopUnreadMessagesBar}
                 showUrlPreview = {this.state.showUrlPreview}
                 className="mx_RoomView_messagePanel"
+                membersLoaded={this.state.membersLoaded}
             />);
 
         let topUnreadMessagesBar = null;
@@ -1778,15 +1803,15 @@ module.exports = React.createClass({
                     oobData={this.props.oobData}
                     editing={this.state.editingRoomSettings}
                     saving={this.state.uploadingRoomSettings}
-                    inRoom={myMember && myMember.membership === 'join'}
+                    inRoom={myMembership === 'join'}
                     collapsedRhs={this.props.collapsedRhs}
                     onSearchClick={this.onSearchClick}
                     onSettingsClick={this.onSettingsClick}
                     onPinnedClick={this.onPinnedClick}
                     onSaveClick={this.onSettingsSaveClick}
                     onCancelClick={(aux && !hideCancel) ? this.onCancelClick : null}
-                    onForgetClick={(myMember && myMember.membership === "leave") ? this.onForgetClick : null}
-                    onLeaveClick={(myMember && myMember.membership === "join") ? this.onLeaveClick : null}
+                    onForgetClick={(myMembership === "leave") ? this.onForgetClick : null}
+                    onLeaveClick={(myMembership === "join") ? this.onLeaveClick : null}
                 />
                 { auxPanel }
                 

diff --git a/src/components/structures/TagPanel.js b/src/components/structures/TagPanel.js
index 652211595b..f23ac698ba 100644
--- a/src/components/structures/TagPanel.js
+++ b/src/components/structures/TagPanel.js
@@ -76,7 +76,7 @@ const TagPanel = React.createClass({
 
     _onClientSync(syncState, prevState) {
         // Consider the client reconnected if there is no error with syncing.
-        // This means the state could be RECONNECTING, SYNCING or PREPARED.
+        // This means the state could be RECONNECTING, SYNCING, PREPARED or CATCHUP.
         const reconnected = syncState !== "ERROR" && prevState !== syncState;
         if (reconnected) {
             // Load joined groups
diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index 1a03b5d994..e06c652924 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -1146,10 +1146,11 @@ var TimelinePanel = React.createClass({
         // of paginating our way through the entire history of the room.
         const stickyBottom = !this._timelineWindow.canPaginate(EventTimeline.FORWARDS);
 
-        // If the state is PREPARED, we're still waiting for the js-sdk to sync with
+        // If the state is PREPARED or CATCHUP, we're still waiting for the js-sdk to sync with
         // the HS and fetch the latest events, so we are effectively forward paginating.
         const forwardPaginating = (
-            this.state.forwardPaginating || this.state.clientSyncState == 'PREPARED'
+            this.state.forwardPaginating ||
+            ['PREPARED', 'CATCHUP'].includes(this.state.clientSyncState)
         );
         return (
             
-                
{ _t("Debug Logs Submission") }

+                
{ _t("Submit Debug Logs") }

                 

                     
{
                         _t( "If you've submitted a bug via GitHub, debug logs can help " +
@@ -843,8 +844,16 @@ module.exports = React.createClass({
         SettingsStore.getLabsFeatures().forEach((featureId) => {
             // TODO: this ought to be a separate component so that we don't need
             // to rebind the onChange each time we render
-            const onChange = (e) => {
-                SettingsStore.setFeatureEnabled(featureId, e.target.checked);
+            const onChange = async (e) => {
+                const checked = e.target.checked;
+                if (featureId === "feature_lazyloading") {
+                    const confirmed = await this._onLazyLoadChanging(checked);
+                    if (!confirmed) {
+                        e.preventDefault();
+                        return;
+                    }
+                }
+                await SettingsStore.setFeatureEnabled(featureId, checked);
                 this.forceUpdate();
             };
 
@@ -854,7 +863,7 @@ module.exports = React.createClass({
                         type="checkbox"
                         id={featureId}
                         name={featureId}
-                        defaultChecked={SettingsStore.isFeatureEnabled(featureId)}
+                        checked={SettingsStore.isFeatureEnabled(featureId)}
                         onChange={onChange}
                     />
                     
@@ -877,6 +886,30 @@ module.exports = React.createClass({
         );
     },
 
+    _onLazyLoadChanging: async function(enabling) {
+        // don't prevent turning LL off when not supported
+        if (enabling) {
+            const supported = await MatrixClientPeg.get().doesServerSupportLazyLoading();
+            if (!supported) {
+                await new Promise((resolve) => {
+                    const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
+                    Modal.createDialog(QuestionDialog, {
+                        title: _t("Lazy loading members not supported"),
+                        description:
+                            

+                         { _t("Lazy loading is not supported by your " +
+                            "current homeserver.") }
+                            
,
+                        button: _t("OK"),
+                        onFinished: resolve,
+                    });
+                });
+                return false;
+            }
+        }
+        return true;
+    },
+
     _renderDeactivateAccount: function() {
         return 

             
{ _t("Deactivate Account") }

@@ -888,6 +921,25 @@ module.exports = React.createClass({
         
;
     },
 
+    _renderTermsAndConditionsLinks: function() {
+        if (SdkConfig.get().terms_and_conditions_links) {
+            const tncLinks = [];
+            for (const tncEntry of SdkConfig.get().terms_and_conditions_links) {
+                tncLinks.push();
+            }
+            return 

+                
{ _t("Legal") }

+                

+                    {tncLinks}
+                

+            
;
+        } else {
+            return null;
+        }
+    },
+
     _renderClearCache: function() {
         return 

             
{ _t("Clear Cache") }

@@ -1374,6 +1426,8 @@ module.exports = React.createClass({
 
                 { this._renderDeactivateAccount() }
 
+                { this._renderTermsAndConditionsLinks() }
+
                 
             

         );
diff --git a/src/components/structures/login/Login.js b/src/components/structures/login/Login.js
index bc04434bb2..45f523f141 100644
--- a/src/components/structures/login/Login.js
+++ b/src/components/structures/login/Login.js
@@ -20,11 +20,12 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import { _t } from '../../../languageHandler';
+import { _t, _td } from '../../../languageHandler';
 import sdk from '../../../index';
 import Login from '../../../Login';
 import SdkConfig from '../../../SdkConfig';
 import SettingsStore from "../../../settings/SettingsStore";
+import { messageForResourceLimitError } from '../../../utils/ErrorUtils';
 
 // For validating phone numbers without country codes
 const PHONE_NUMBER_REGEX = /^[0-9()\-\s]*$/;
@@ -93,6 +94,13 @@ module.exports = React.createClass({
         this._unmounted = true;
     },
 
+    onPasswordLoginError: function(errorText) {
+        this.setState({
+            errorText,
+            loginIncorrect: Boolean(errorText),
+        });
+    },
+
     onPasswordLogin: function(username, phoneCountry, phoneNumber, password) {
         this.setState({
             busy: true,
@@ -114,6 +122,30 @@ module.exports = React.createClass({
             const usingEmail = username.indexOf("@") > 0;
             if (error.httpStatus === 400 && usingEmail) {
                 errorText = _t('This Home Server does not support login using email address.');
+            } else if (error.errcode == 'M_RESOURCE_LIMIT_EXCEEDED') {
+                const errorTop = messageForResourceLimitError(
+                    error.data.limit_type,
+                    error.data.admin_contact, {
+                    'monthly_active_user': _td(
+                        "This homeserver has hit its Monthly Active User limit.",
+                    ),
+                    '': _td(
+                        "This homeserver has exceeded one of its resource limits.",
+                    ),
+                });
+                const errorDetail = messageForResourceLimitError(
+                    error.data.limit_type,
+                    error.data.admin_contact, {
+                    '': _td(
+                        "Please contact your service administrator to continue using this service.",
+                    ),
+                });
+                errorText = (
+                    

+                        
{errorTop}

+                        
{errorDetail}

+                    

+                );
             } else if (error.httpStatus === 401 || error.httpStatus === 403) {
                 if (SdkConfig.get()['disable_custom_urls']) {
                     errorText = (
@@ -357,6 +389,7 @@ module.exports = React.createClass({
         return (
              -1) {
+            if (response.errcode == 'M_RESOURCE_LIMIT_EXCEEDED') {
+                const errorTop = messageForResourceLimitError(
+                    response.data.limit_type,
+                    response.data.admin_contact, {
+                    'monthly_active_user': _td(
+                        "This homeserver has hit its Monthly Active User limit.",
+                    ),
+                    '': _td(
+                        "This homeserver has exceeded one of its resource limits.",
+                    ),
+                });
+                const errorDetail = messageForResourceLimitError(
+                    response.data.limit_type,
+                    response.data.admin_contact, {
+                    '': _td(
+                        "Please contact your service administrator to continue using this service.",
+                    ),
+                });
+                msg = 

+                    
{errorTop}

+                    
{errorDetail}

+                
;
+            } else if (response.required_stages && response.required_stages.indexOf('m.login.msisdn') > -1) {
                 let msisdnAvailable = false;
                 for (const flow of response.available_flows) {
                     msisdnAvailable |= flow.stages.indexOf('m.login.msisdn') > -1;
@@ -281,6 +321,12 @@ module.exports = React.createClass({
             case "RegistrationForm.ERR_PHONE_NUMBER_INVALID":
                 errMsg = _t('This doesn\'t look like a valid phone number.');
                 break;
+            case "RegistrationForm.ERR_MISSING_EMAIL":
+                errMsg = _t('An email address is required to register on this homeserver.');
+                break;
+            case "RegistrationForm.ERR_MISSING_PHONE_NUMBER":
+                errMsg = _t('A phone number is required to register on this homeserver.');
+                break;
             case "RegistrationForm.ERR_USERNAME_INVALID":
                 errMsg = _t('User names may only contain letters, numbers, dots, hyphens and underscores.');
                 break;
@@ -355,7 +401,7 @@ module.exports = React.createClass({
                     poll={true}
                 />
             );
-        } else if (this.state.busy || this.state.teamServerBusy) {
+        } else if (this.state.busy || this.state.teamServerBusy || !this.state.flows) {
             registerBody = ;
         } else {
             let serverConfigSection;
@@ -385,6 +431,7 @@ module.exports = React.createClass({
                         onError={this.onFormValidationFailed}
                         onRegisterClick={this.onFormSubmit}
                         onTeamSelected={this.onTeamSelected}
+                        flows={this.state.flows}
                     />
                     { serverConfigSection }
                 

diff --git a/src/components/views/avatars/BaseAvatar.js b/src/components/views/avatars/BaseAvatar.js
index 6fb86c9cd8..47de7c9dc4 100644
--- a/src/components/views/avatars/BaseAvatar.js
+++ b/src/components/views/avatars/BaseAvatar.js
@@ -87,7 +87,7 @@ module.exports = React.createClass({
         if (this.unmounted) return;
 
         // Consider the client reconnected if there is no error with syncing.
-        // This means the state could be RECONNECTING, SYNCING or PREPARED.
+        // This means the state could be RECONNECTING, SYNCING, PREPARED or CATCHUP.
         const reconnected = syncState !== "ERROR" && prevState !== syncState;
         if (reconnected &&
             // Did we fall back?
diff --git a/src/components/views/avatars/RoomAvatar.js b/src/components/views/avatars/RoomAvatar.js
index 821448207f..7b9cb10d51 100644
--- a/src/components/views/avatars/RoomAvatar.js
+++ b/src/components/views/avatars/RoomAvatar.js
@@ -19,6 +19,7 @@ import {ContentRepo} from "matrix-js-sdk";
 import MatrixClientPeg from "../../../MatrixClientPeg";
 import Modal from '../../../Modal';
 import sdk from "../../../index";
+import DMRoomMap from '../../../utils/DMRoomMap';
 
 module.exports = React.createClass({
     displayName: 'RoomAvatar',
@@ -107,58 +108,29 @@ module.exports = React.createClass({
     },
 
     getOneToOneAvatar: function(props) {
-        if (!props.room) return null;
-
-        const mlist = props.room.currentState.members;
-        const userIds = [];
-        const leftUserIds = [];
-        // for .. in optimisation to return early if there are >2 keys
-        for (const uid in mlist) {
-            if (mlist.hasOwnProperty(uid)) {
-                if (["join", "invite"].includes(mlist[uid].membership)) {
-                    userIds.push(uid);
-                } else {
-                    leftUserIds.push(uid);
-                }
-            }
-            if (userIds.length > 2) {
-                return null;
-            }
+        const room = props.room;
+        if (!room) {
+            return null;
         }
-
-        if (userIds.length == 2) {
-            let theOtherGuy = null;
-            if (mlist[userIds[0]].userId == MatrixClientPeg.get().credentials.userId) {
-                theOtherGuy = mlist[userIds[1]];
-            } else {
-                theOtherGuy = mlist[userIds[0]];
-            }
-            return theOtherGuy.getAvatarUrl(
-                MatrixClientPeg.get().getHomeserverUrl(),
-                Math.floor(props.width * window.devicePixelRatio),
-                Math.floor(props.height * window.devicePixelRatio),
-                props.resizeMethod,
-                false,
-            );
-        } else if (userIds.length == 1) {
-            // The other 1-1 user left, leaving just the current user, so show the left user's avatar
-            if (leftUserIds.length === 1) {
-                return mlist[leftUserIds[0]].getAvatarUrl(
-                    MatrixClientPeg.get().getHomeserverUrl(),
-                    props.width, props.height, props.resizeMethod,
-                    false,
-                );
-            }
-            return mlist[userIds[0]].getAvatarUrl(
-                MatrixClientPeg.get().getHomeserverUrl(),
-                Math.floor(props.width * window.devicePixelRatio),
-                Math.floor(props.height * window.devicePixelRatio),
-                props.resizeMethod,
-                false,
-            );
+        let otherMember = null;
+        const otherUserId = DMRoomMap.shared().getUserIdForRoomId(room.roomId);
+        if (otherUserId) {
+            otherMember = room.getMember(otherUserId);
         } else {
-           return null;
+            // if the room is not marked as a 1:1, but only has max 2 members
+            // then still try to show any avatar (pref. other member)
+            otherMember = room.getAvatarFallbackMember();
         }
+        if (otherMember) {
+            return otherMember.getAvatarUrl(
+                MatrixClientPeg.get().getHomeserverUrl(),
+                Math.floor(props.width * window.devicePixelRatio),
+                Math.floor(props.height * window.devicePixelRatio),
+                props.resizeMethod,
+                false,
+            );
+        }
+        return null;
     },
 
     onRoomAvatarClick: function() {
diff --git a/src/components/views/context_menus/MessageContextMenu.js b/src/components/views/context_menus/MessageContextMenu.js
index 59cdb61fd6..be718050c1 100644
--- a/src/components/views/context_menus/MessageContextMenu.js
+++ b/src/components/views/context_menus/MessageContextMenu.js
@@ -15,10 +15,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-'use strict';
-
 import React from 'react';
 import PropTypes from 'prop-types';
+import {EventStatus} from 'matrix-js-sdk';
 
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import dis from '../../../dispatcher';
@@ -179,7 +178,7 @@ module.exports = React.createClass({
     onQuoteClick: function() {
         dis.dispatch({
             action: 'quote',
-            text: this.props.eventTileOps.getInnerText(),
+            event: this.props.mxEvent,
         });
         this.closeMenu();
     },
@@ -220,7 +219,10 @@ module.exports = React.createClass({
         let replyButton;
         let collapseReplyThread;
 
-        if (eventStatus === 'not_sent') {
+        // status is SENT before remote-echo, null after
+        const isSent = !eventStatus || eventStatus === EventStatus.SENT;
+
+        if (eventStatus === EventStatus.NOT_SENT) {
             resendButton = (
                 

                     { _t('Resend') }
@@ -228,7 +230,7 @@ module.exports = React.createClass({
             );
         }
 
-        if (!eventStatus && this.state.canRedact) {
+        if (isSent && this.state.canRedact) {
             redactButton = (
                 

                     { _t('Remove') }
@@ -236,7 +238,7 @@ module.exports = React.createClass({
             );
         }
 
-        if (eventStatus === "queued" || eventStatus === "not_sent") {
+        if (eventStatus === EventStatus.QUEUED || eventStatus === EventStatus.NOT_SENT) {
             cancelButton = (
                 

                     { _t('Cancel Sending') }
@@ -244,7 +246,7 @@ module.exports = React.createClass({
             );
         }
 
-        if (!eventStatus && this.props.mxEvent.getType() === 'm.room.message') {
+        if (isSent && this.props.mxEvent.getType() === 'm.room.message') {
             const content = this.props.mxEvent.getContent();
             if (content.msgtype && content.msgtype !== 'm.bad.encrypted' && content.hasOwnProperty('body')) {
                 forwardButton = (
diff --git a/src/components/views/context_menus/RoomTileContextMenu.js b/src/components/views/context_menus/RoomTileContextMenu.js
index 77f71fa8fa..ce9895447e 100644
--- a/src/components/views/context_menus/RoomTileContextMenu.js
+++ b/src/components/views/context_menus/RoomTileContextMenu.js
@@ -346,20 +346,18 @@ module.exports = React.createClass({
     },
 
     render: function() {
-        const myMember = this.props.room.getMember(
-            MatrixClientPeg.get().credentials.userId,
-        );
+        const myMembership = this.props.room.getMyMembership();
 
         // Can't set notif level or tags on non-join rooms
-        if (myMember.membership !== 'join') {
-            return this._renderLeaveMenu(myMember.membership);
+        if (myMembership !== 'join') {
+            return this._renderLeaveMenu(myMembership);
         }
 
         return (
             

                 { this._renderNotifMenu() }
                 

-                { this._renderLeaveMenu(myMember.membership) }
+                { this._renderLeaveMenu(myMembership) }
                 

                 { this._renderRoomTagMenu() }
             

diff --git a/src/components/views/dialogs/BugReportDialog.js b/src/components/views/dialogs/BugReportDialog.js
index 83cdb1f07f..c874049cc6 100644
--- a/src/components/views/dialogs/BugReportDialog.js
+++ b/src/components/views/dialogs/BugReportDialog.js
@@ -140,9 +140,9 @@ export default class BugReportDialog extends React.Component {
                             "not contain messages.",
                         ) }
                     

-                    

+                    

                         { _t(
-                            "Riot bugs are tracked on GitHub: create a GitHub issue.",
+                            "Before submitting logs, you must create a GitHub issue to describe your problem.",
                             {},
                             {
                                 a: (sub) => ,
                             },
                         ) }
-                    

+                    

                     

                         
                         
                     

                     

diff --git a/src/components/views/dialogs/ChatCreateOrReuseDialog.js b/src/components/views/dialogs/ChatCreateOrReuseDialog.js
index b7cf0f5a6e..550abe5299 100644
--- a/src/components/views/dialogs/ChatCreateOrReuseDialog.js
+++ b/src/components/views/dialogs/ChatCreateOrReuseDialog.js
@@ -54,8 +54,8 @@ export default class ChatCreateOrReuseDialog extends React.Component {
         for (const roomId of dmRooms) {
             const room = client.getRoom(roomId);
             if (room) {
-                const me = room.getMember(client.credentials.userId);
-                const highlight = room.getUnreadNotificationCount('highlight') > 0 || me.membership === "invite";
+                const isInvite = room.getMyMembership() === "invite";
+                const highlight = room.getUnreadNotificationCount('highlight') > 0 || isInvite;
                 tiles.push(
                     ,
                 );
diff --git a/src/components/views/dialogs/CreateGroupDialog.js b/src/components/views/dialogs/CreateGroupDialog.js
index 04f99a0e15..6e14d1cf66 100644
--- a/src/components/views/dialogs/CreateGroupDialog.js
+++ b/src/components/views/dialogs/CreateGroupDialog.js
@@ -56,7 +56,7 @@ export default React.createClass({
     _checkGroupId: function(e) {
         let error = null;
         if (!this.state.groupId) {
-            error = _t("Community IDs cannot not be empty.");
+            error = _t("Community IDs cannot be empty.");
         } else if (!/^[a-z0-9=_\-\.\/]*$/.test(this.state.groupId)) {
             error = _t("Community IDs may only contain characters a-z, 0-9, or '=_-./'");
         }
diff --git a/src/components/views/dialogs/CreateRoomDialog.js b/src/components/views/dialogs/CreateRoomDialog.js
index 3b5369e8f6..3212e53c05 100644
--- a/src/components/views/dialogs/CreateRoomDialog.js
+++ b/src/components/views/dialogs/CreateRoomDialog.js
@@ -26,7 +26,7 @@ export default React.createClass({
         onFinished: PropTypes.func.isRequired,
     },
 
-    componentDidMount: function() {
+    componentWillMount: function() {
         const config = SdkConfig.get();
         // Dialog shows inverse of m.federate (noFederate) strict false check to skip undefined check (default = true)
         this.defaultNoFederate = config.default_federate === false;
diff --git a/src/components/views/dialogs/DevtoolsDialog.js b/src/components/views/dialogs/DevtoolsDialog.js
index 1566302e42..ea198461c5 100644
--- a/src/components/views/dialogs/DevtoolsDialog.js
+++ b/src/components/views/dialogs/DevtoolsDialog.js
@@ -61,7 +61,7 @@ class GenericEditor extends DevtoolsComponent {
                 
             

             

-                
+                
             

         
;
     }
@@ -242,6 +242,9 @@ class SendAccountData extends GenericEditor {
     }
 }
 
+const INITIAL_LOAD_TILES = 20;
+const LOAD_TILES_STEP_SIZE = 50;
+
 class FilteredList extends React.Component {
     static propTypes = {
         children: PropTypes.any,
@@ -249,31 +252,68 @@ class FilteredList extends React.Component {
         onChange: PropTypes.func,
     };
 
+    static filterChildren(children, query) {
+        if (!query) return children;
+        const lcQuery = query.toLowerCase();
+        return children.filter((child) => child.key.toLowerCase().includes(lcQuery));
+    }
+
     constructor(props, context) {
         super(props, context);
-        this.onQuery = this.onQuery.bind(this);
+
+        this.state = {
+            filteredChildren: FilteredList.filterChildren(this.props.children, this.props.query),
+            truncateAt: INITIAL_LOAD_TILES,
+        };
     }
 
-    onQuery(ev) {
+    componentWillReceiveProps(nextProps) {
+        if (this.props.children === nextProps.children && this.props.query === nextProps.query) return;
+        this.setState({
+            filteredChildren: FilteredList.filterChildren(nextProps.children, nextProps.query),
+            truncateAt: INITIAL_LOAD_TILES,
+        });
+    }
+
+    showAll = () => {
+        this.setState({
+            truncateAt: this.state.truncateAt + LOAD_TILES_STEP_SIZE,
+        });
+    };
+
+    createOverflowElement = (overflowCount: number, totalCount: number) => {
+        return ;
+    };
+
+    onQuery = (ev) => {
         if (this.props.onChange) this.props.onChange(ev.target.value);
-    }
+    };
 
-    filterChildren() {
-        if (this.props.query) {
-            const lowerQuery = this.props.query.toLowerCase();
-            return this.props.children.filter((child) => child.key.toLowerCase().includes(lowerQuery));
-        }
-        return this.props.children;
-    }
+    getChildren = (start: number, end: number) => {
+        return this.state.filteredChildren.slice(start, end);
+    };
+
+    getChildCount = (): number => {
+        return this.state.filteredChildren.length;
+    };
 
     render() {
+        const TruncatedList = sdk.getComponent("elements.TruncatedList");
         return 

             
-            { this.filterChildren() }
+                   className="mx_TextInputDialog_input mx_DevTools_RoomStateExplorer_query"
+                   // force re-render so that autoFocus is applied when this component is re-used
+                   key={this.props.children[0] ? this.props.children[0].key : ''} />
+            
         
;
     }
 }
@@ -377,10 +417,10 @@ class RoomStateExplorer extends DevtoolsComponent {
                         const stateKeys = Object.keys(stateGroup);
 
                         let onClickFn;
-                        if (stateKeys.length > 1) {
-                            onClickFn = this.browseEventType(evType);
-                        } else if (stateKeys.length === 1) {
+                        if (stateKeys.length === 1 && stateKeys[0] === '') {
                             onClickFn = this.onViewSourceClick(stateGroup[stateKeys[0]]);
+                        } else {
+                            onClickFn = this.browseEventType(evType);
                         }
 
                         return 
}
+        button={_t("OK")}
+        onFinished={props.onFinished}
+    />);
+};
diff --git a/src/components/views/dialogs/RoomUpgradeDialog.js b/src/components/views/dialogs/RoomUpgradeDialog.js
new file mode 100644
index 0000000000..936ff745d1
--- /dev/null
+++ b/src/components/views/dialogs/RoomUpgradeDialog.js
@@ -0,0 +1,106 @@
+/*
+Copyright 2018 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import PropTypes from 'prop-types';
+import sdk from '../../../index';
+import MatrixClientPeg from '../../../MatrixClientPeg';
+import Modal from '../../../Modal';
+import { _t } from '../../../languageHandler';
+
+export default React.createClass({
+    displayName: 'RoomUpgradeDialog',
+
+    propTypes: {
+        room: PropTypes.object.isRequired,
+        onFinished: PropTypes.func.isRequired,
+    },
+
+    componentWillMount: function() {
+        this._targetVersion = this.props.room.shouldUpgradeToVersion();
+    },
+
+    getInitialState: function() {
+        return {
+            busy: false,
+        };
+    },
+
+    _onCancelClick: function() {
+        this.props.onFinished(false);
+    },
+
+    _onUpgradeClick: function() {
+        this.setState({busy: true});
+        MatrixClientPeg.get().upgradeRoom(this.props.room.roomId, this._targetVersion).catch((err) => {
+            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+            Modal.createTrackedDialog('Failed to upgrade room', '', ErrorDialog, {
+                title: _t("Failed to upgrade room"),
+                description: ((err && err.message) ? err.message : _t("The room upgrade could not be completed")),
+            });
+        }).finally(() => {
+            this.setState({busy: false});
+        });
+    },
+
+    render: function() {
+        const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
+        const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
+        const Spinner = sdk.getComponent('views.elements.Spinner');
+
+        let buttons;
+        if (this.state.busy) {
+            buttons = ;
+        } else {
+            buttons = ;
+        }
+
+        return (
+            
+                

+                    {_t(
+                        "Upgrading this room requires closing down the current " +
+                        "instance of the room and creating a new room it its place. " +
+                        "To give room members the best possible experience, we will:",
+                    )}
+                

+                
    
+                    
  1. {_t("Create a new room with the same name, description and avatar")}
    2. 
+                    
  2. {_t("Update any local room aliases to point to the new room")}
    3. 
+                    
  3. {_t("Stop users from speaking in the old version of the room, and post a message advising users to move to the new room")}
    4. 
+                    
  4. {_t("Put a link back to the old room at the start of the new room so people can see old messages")}
    5. 
+                

+                {buttons}
+            
+        );
+    },
+});
diff --git a/src/components/views/elements/AppPermission.js b/src/components/views/elements/AppPermission.js
index 231ed52364..6b4536b620 100644
--- a/src/components/views/elements/AppPermission.js
+++ b/src/components/views/elements/AppPermission.js
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import url from 'url';
 import { _t } from '../../../languageHandler';
-import WidgetUtils from "../../../WidgetUtils";
+import WidgetUtils from "../../../utils/WidgetUtils";
 
 export default class AppPermission extends React.Component {
     constructor(props) {
diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 70b5bd651e..7be0bab33c 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -1,5 +1,6 @@
 /**
 Copyright 2017 Vector Creations Ltd
+Copyright 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -31,8 +32,9 @@ import sdk from '../../../index';
 import AppPermission from './AppPermission';
 import AppWarning from './AppWarning';
 import MessageSpinner from './MessageSpinner';
-import WidgetUtils from '../../../WidgetUtils';
+import WidgetUtils from '../../../utils/WidgetUtils';
 import dis from '../../../dispatcher';
+import ActiveWidgetStore from '../../../stores/ActiveWidgetStore';
 
 const ALLOWED_APP_URL_SCHEMES = ['https:', 'http:'];
 const ENABLE_REACT_PERF = false;
@@ -40,9 +42,13 @@ const ENABLE_REACT_PERF = false;
 export default class AppTile extends React.Component {
     constructor(props) {
         super(props);
+
+        // The key used for PersistedElement
+        this._persistKey = 'widget_' + this.props.id;
+
         this.state = this._getNewState(props);
 
-        this._onWidgetAction = this._onWidgetAction.bind(this);
+        this._onAction = this._onAction.bind(this);
         this._onMessage = this._onMessage.bind(this);
         this._onLoaded = this._onLoaded.bind(this);
         this._onEditClick = this._onEditClick.bind(this);
@@ -50,7 +56,6 @@ export default class AppTile extends React.Component {
         this._onSnapshotClick = this._onSnapshotClick.bind(this);
         this.onClickMenuBar = this.onClickMenuBar.bind(this);
         this._onMinimiseClick = this._onMinimiseClick.bind(this);
-        this._onInitialLoad = this._onInitialLoad.bind(this);
         this._grantWidgetPermission = this._grantWidgetPermission.bind(this);
         this._revokeWidgetPermission = this._revokeWidgetPermission.bind(this);
         this._onPopoutWidgetClick = this._onPopoutWidgetClick.bind(this);
@@ -66,9 +71,12 @@ export default class AppTile extends React.Component {
     _getNewState(newProps) {
         const widgetPermissionId = [newProps.room.roomId, encodeURIComponent(newProps.url)].join('_');
         const hasPermissionToLoad = localStorage.getItem(widgetPermissionId);
+
+        const PersistedElement = sdk.getComponent("elements.PersistedElement");
         return {
             initialising: true, // True while we are mangling the widget URL
-            loading: this.props.waitForIframeLoad, // True while the iframe content is loading
+            // True while the iframe content is loading
+            loading: this.props.waitForIframeLoad && !PersistedElement.isMounted(this._persistKey),
             widgetUrl: this._addWurlParams(newProps.url),
             widgetPermissionId: widgetPermissionId,
             // Assume that widget has permission to load if we are the user who
@@ -77,9 +85,6 @@ export default class AppTile extends React.Component {
             error: null,
             deleting: false,
             widgetPageTitle: newProps.widgetPageTitle,
-            allowedCapabilities: (this.props.whitelistCapabilities && this.props.whitelistCapabilities.length > 0) ?
-                this.props.whitelistCapabilities : [],
-            requestedCapabilities: [],
         };
     }
 
@@ -89,7 +94,7 @@ export default class AppTile extends React.Component {
      * @return {Boolean}            True if capability supported
      */
     _hasCapability(capability) {
-        return this.state.allowedCapabilities.some((c) => {return c === capability;});
+        return ActiveWidgetStore.widgetHasCapability(this.props.id, capability);
     }
 
     /**
@@ -112,8 +117,9 @@ export default class AppTile extends React.Component {
         const params = qs.parse(u.query);
         // Append widget ID to query parameters
         params.widgetId = this.props.id;
-        // Append current / parent URL
-        params.parentUrl = window.location.href;
+        // Append current / parent URL, minus the hash because that will change when
+        // we view a different room (ie. may change for persistent widgets)
+        params.parentUrl = window.location.href.split('#', 2)[0];
         u.search = undefined;
         u.query = params;
 
@@ -142,30 +148,22 @@ export default class AppTile extends React.Component {
         window.addEventListener('message', this._onMessage, false);
 
         // Widget action listeners
-        this.dispatcherRef = dis.register(this._onWidgetAction);
-    }
-
-    componentDidUpdate() {
-        // Allow parents to access widget messaging
-        if (this.props.collectWidgetMessaging) {
-            this.props.collectWidgetMessaging(this.widgetMessaging);
-        }
+        this.dispatcherRef = dis.register(this._onAction);
     }
 
     componentWillUnmount() {
         // Widget action listeners
         dis.unregister(this.dispatcherRef);
 
-        // Widget postMessage listeners
-        try {
-            if (this.widgetMessaging) {
-                this.widgetMessaging.stop();
-            }
-        } catch (e) {
-            console.error('Failed to stop listening for widgetMessaging events', e.message);
-        }
         // Jitsi listener
         window.removeEventListener('message', this._onMessage);
+
+        // if it's not remaining on screen, get rid of the PersistedElement container
+        if (!ActiveWidgetStore.getWidgetPersistence(this.props.id)) {
+            ActiveWidgetStore.destroyPersistentWidget();
+            const PersistedElement = sdk.getComponent("elements.PersistedElement");
+            PersistedElement.destroyElement(this._persistKey);
+        }
     }
 
     /**
@@ -286,7 +284,7 @@ export default class AppTile extends React.Component {
 
     _onSnapshotClick(e) {
         console.warn("Requesting widget snapshot");
-        this.widgetMessaging.getScreenshot()
+        ActiveWidgetStore.getWidgetMessaging(this.props.id).getScreenshot()
             .catch((err) => {
                 console.error("Failed to get screenshot", err);
             })
@@ -319,15 +317,18 @@ export default class AppTile extends React.Component {
                             return;
                         }
                         this.setState({deleting: true});
-                        MatrixClientPeg.get().sendStateEvent(
+
+                        WidgetUtils.setRoomWidget(
                             this.props.room.roomId,
-                            'im.vector.modular.widgets',
-                            {}, // empty content
                             this.props.id,
-                        ).then(() => {
-                            return WidgetUtils.waitForRoomWidget(this.props.id, this.props.room.roomId, false);
-                        }).catch((e) => {
+                        ).catch((e) => {
                             console.error('Failed to delete widget', e);
+                            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+
+                            Modal.createTrackedDialog('Failed to remove widget', '', ErrorDialog, {
+                                title: _t('Failed to remove widget'),
+                                description: _t('An error ocurred whilst trying to remove the widget from the room'),
+                            });
                         }).finally(() => {
                             this.setState({deleting: false});
                         });
@@ -344,19 +345,20 @@ export default class AppTile extends React.Component {
      * Called when widget iframe has finished loading
      */
     _onLoaded() {
-        if (!this.widgetMessaging) {
-            this._onInitialLoad();
+        if (!ActiveWidgetStore.getWidgetMessaging(this.props.id)) {
+            this._setupWidgetMessaging();
         }
+        ActiveWidgetStore.setRoomId(this.props.id, this.props.room.roomId);
         this.setState({loading: false});
     }
 
-    /**
-     * Called on initial load of the widget iframe
-     */
-    _onInitialLoad() {
-        this.widgetMessaging = new WidgetMessaging(this.props.id, this.props.url, this.refs.appFrame.contentWindow);
-        this.widgetMessaging.getCapabilities().then((requestedCapabilities) => {
-            console.log(`Widget ${this.props.id} requested capabilities:`, requestedCapabilities);
+    _setupWidgetMessaging() {
+        // FIXME: There's probably no reason to do this here: it should probably be done entirely
+        // in ActiveWidgetStore.
+        const widgetMessaging = new WidgetMessaging(this.props.id, this.props.url, this.refs.appFrame.contentWindow);
+        ActiveWidgetStore.setWidgetMessaging(this.props.id, widgetMessaging);
+        widgetMessaging.getCapabilities().then((requestedCapabilities) => {
+            console.log(`Widget ${this.props.id} requested capabilities: ` + requestedCapabilities);
             requestedCapabilities = requestedCapabilities || [];
 
             // Allow whitelisted capabilities
@@ -368,16 +370,15 @@ export default class AppTile extends React.Component {
                 }, this.props.whitelistCapabilities);
 
                 if (requestedWhitelistCapabilies.length > 0 ) {
-                    console.warn(`Widget ${this.props.id} allowing requested, whitelisted properties:`,
-                        requestedWhitelistCapabilies);
+                    console.warn(`Widget ${this.props.id} allowing requested, whitelisted properties: ` +
+                        requestedWhitelistCapabilies,
+                    );
                 }
             }
 
             // TODO -- Add UI to warn about and optionally allow requested capabilities
-            this.setState({
-                requestedCapabilities,
-                allowedCapabilities: this.state.allowedCapabilities.concat(requestedWhitelistCapabilies),
-            });
+
+            ActiveWidgetStore.setWidgetCapabilities(this.props.id, requestedWhitelistCapabilies);
 
             if (this.props.onCapabilityRequest) {
                 this.props.onCapabilityRequest(requestedCapabilities);
@@ -387,7 +388,7 @@ export default class AppTile extends React.Component {
         });
     }
 
-    _onWidgetAction(payload) {
+    _onAction(payload) {
         if (payload.widgetId === this.props.id) {
             switch (payload.action) {
                 case 'm.sticker':
@@ -435,6 +436,11 @@ export default class AppTile extends React.Component {
         console.warn('Revoking permission to load widget - ', this.state.widgetUrl);
         localStorage.removeItem(this.state.widgetPermissionId);
         this.setState({hasPermissionToLoad: false});
+
+        // Force the widget to be non-persistent
+        ActiveWidgetStore.destroyPersistentWidget();
+        const PersistedElement = sdk.getComponent("elements.PersistedElement");
+        PersistedElement.destroyElement(this._persistKey);
     }
 
     formatAppTileName() {
@@ -527,6 +533,8 @@ export default class AppTile extends React.Component {
         // (see - https://sites.google.com/a/chromium.org/dev/Home/chromium-security/deprecating-permissions-in-cross-origin-iframes and https://wicg.github.io/feature-policy/)
         const iframeFeatures = "microphone; camera; encrypted-media;";
 
+        const appTileBodyClass = 'mx_AppTileBody' + (this.props.miniMode ? '_mini  ' : ' ');
+
         if (this.props.show) {
             const loadingElement = (
                 

@@ -535,20 +543,20 @@ export default class AppTile extends React.Component {
             );
             if (this.state.initialising) {
                 appTileBody = (
-                    

+                    

                         { loadingElement }
                     

                 );
             } else if (this.state.hasPermissionToLoad == true) {
                 if (this.isMixedContent()) {
                     appTileBody = (
-                        

+                        

                             
                         

                     );
                 } else {
                     appTileBody = (
-                        

+                        

                             { this.state.loading && loadingElement }
                             { /*
                                 The "is" attribute in the following iframe tag is needed in order to enable rendering of the
@@ -565,11 +573,24 @@ export default class AppTile extends React.Component {
                             >
                         

                     );
+                    // if the widget would be allowed to remian on screen, we must put it in
+                    // a PersistedElement from the get-go, otherwise the iframe will be
+                    // re-mounted later when we do.
+                    if (this.props.whitelistCapabilities.includes('m.always_on_screen')) {
+                        const PersistedElement = sdk.getComponent("elements.PersistedElement");
+                        // Also wrap the PersistedElement in a div to fix the height, otherwise
+                        // AppTile's border is in the wrong place
+                        appTileBody = 

+                            
+                                {appTileBody}
+                            
+                        
;
+                    }
                 }
             } else {
                 const isRoomEncrypted = MatrixClientPeg.get().isRoomEncrypted(this.props.room.roomId);
                 appTileBody = (
-                    

+                    

                         
+            

                 { this.props.showMenubar &&
                 

                     
@@ -682,6 +712,8 @@ AppTile.propTypes = {
     // Specifying 'fullWidth' as true will render the app tile to fill the width of the app drawer continer.
     // This should be set to true when there is only one widget in the app drawer, otherwise it should be false.
     fullWidth: PropTypes.bool,
+    // Optional. If set, renders a smaller view of the widget
+    miniMode: PropTypes.bool,
     // UserId of the current user
     userId: PropTypes.string.isRequired,
     // UserId of the entity that added / modified the widget
@@ -734,4 +766,5 @@ AppTile.defaultProps = {
     handleMinimisePointerEvents: false,
     whitelistCapabilities: [],
     userWidget: false,
+    miniMode: false,
 };
diff --git a/src/components/views/elements/EditableItemList.js b/src/components/views/elements/EditableItemList.js
index 05ae625515..02fdc96a78 100644
--- a/src/components/views/elements/EditableItemList.js
+++ b/src/components/views/elements/EditableItemList.js
@@ -139,8 +139,11 @@ module.exports = React.createClass({
             

             { editableItems }
             { this.props.canEdit ?
+                // This is slightly evil; we want a new instance of
+                // EditableItem when the list grows. To make sure it's
+                // reset to its initial state.
                 
+        const content = 

             {this.props.children}
         
;
 
-        ReactDOM.render(content, getOrCreateContainer());
+        ReactDOM.render(content, getOrCreateContainer('mx_persistedElement_'+this.props.persistKey));
 
         return 
;
     }
 }
-
diff --git a/src/components/views/elements/PersistentApp.js b/src/components/views/elements/PersistentApp.js
new file mode 100644
index 0000000000..facf5d1179
--- /dev/null
+++ b/src/components/views/elements/PersistentApp.js
@@ -0,0 +1,96 @@
+/*
+Copyright 2018 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import RoomViewStore from '../../../stores/RoomViewStore';
+import ActiveWidgetStore from '../../../stores/ActiveWidgetStore';
+import WidgetUtils from '../../../utils/WidgetUtils';
+import sdk from '../../../index';
+import MatrixClientPeg from '../../../MatrixClientPeg';
+
+module.exports = React.createClass({
+    displayName: 'PersistentApp',
+
+    getInitialState: function() {
+        return {
+            roomId: RoomViewStore.getRoomId(),
+            persistentWidgetId: ActiveWidgetStore.getPersistentWidgetId(),
+        };
+    },
+
+    componentWillMount: function() {
+        this._roomStoreToken = RoomViewStore.addListener(this._onRoomViewStoreUpdate);
+        ActiveWidgetStore.on('update', this._onActiveWidgetStoreUpdate);
+    },
+
+    componentWillUnmount: function() {
+        if (this._roomStoreToken) {
+            this._roomStoreToken.remove();
+        }
+        ActiveWidgetStore.removeListener('update', this._onActiveWidgetStoreUpdate);
+    },
+
+    _onRoomViewStoreUpdate: function(payload) {
+        if (RoomViewStore.getRoomId() === this.state.roomId) return;
+        this.setState({
+            roomId: RoomViewStore.getRoomId(),
+        });
+    },
+
+    _onActiveWidgetStoreUpdate: function() {
+        this.setState({
+            persistentWidgetId: ActiveWidgetStore.getPersistentWidgetId(),
+        });
+    },
+
+    render: function() {
+        if (this.state.persistentWidgetId) {
+            const persistentWidgetInRoomId = ActiveWidgetStore.getRoomId(this.state.persistentWidgetId);
+            if (this.state.roomId !== persistentWidgetInRoomId) {
+                const persistentWidgetInRoom = MatrixClientPeg.get().getRoom(persistentWidgetInRoomId);
+                // get the widget data
+                const appEvent = WidgetUtils.getRoomWidgets(persistentWidgetInRoom).find((ev) => {
+                    return ev.getStateKey() === ActiveWidgetStore.getPersistentWidgetId();
+                });
+                const app = WidgetUtils.makeAppConfig(
+                    appEvent.getStateKey(), appEvent.getContent(), appEvent.sender, persistentWidgetInRoomId,
+                );
+                const capWhitelist = WidgetUtils.getCapWhitelistForAppTypeInRoomId(app.type, persistentWidgetInRoomId);
+                const AppTile = sdk.getComponent('elements.AppTile');
+                return ;
+            }
+        }
+        return null;
+    },
+});
+
diff --git a/src/components/views/elements/Pill.js b/src/components/views/elements/Pill.js
index e37e45838a..25b40d186d 100644
--- a/src/components/views/elements/Pill.js
+++ b/src/components/views/elements/Pill.js
@@ -62,6 +62,8 @@ const Pill = React.createClass({
         room: PropTypes.instanceOf(Room),
         // Whether to include an avatar in the pill
         shouldShowPillAvatar: PropTypes.bool,
+        // Whether to render this pill as if it were highlit by a selection
+        isSelected: PropTypes.bool,
     },
 
 
@@ -185,6 +187,9 @@ const Pill = React.createClass({
                 getContent: () => {
                     return {avatar_url: resp.avatar_url};
                 },
+                getDirectionalContent: function() {
+                    return this.getContent();
+                },
             };
             this.setState({member});
         }).catch((err) => {
@@ -268,6 +273,7 @@ const Pill = React.createClass({
 
         const classes = classNames(pillClass, {
             "mx_UserPill_me": userId === MatrixClientPeg.get().credentials.userId,
+            "mx_UserPill_selected": this.props.isSelected,
         });
 
         if (this.state.pillType) {
diff --git a/src/components/views/globals/ServerLimitBar.js b/src/components/views/globals/ServerLimitBar.js
new file mode 100644
index 0000000000..0b924fd2e2
--- /dev/null
+++ b/src/components/views/globals/ServerLimitBar.js
@@ -0,0 +1,98 @@
+/*
+Copyright 2018 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import PropTypes from 'prop-types';
+import classNames from 'classnames';
+import { _td } from '../../../languageHandler';
+import { messageForResourceLimitError } from '../../../utils/ErrorUtils';
+
+export default React.createClass({
+    propTypes: {
+        // 'hard' if the logged in user has been locked out, 'soft' if they haven't
+        kind: PropTypes.string,
+        adminContact: PropTypes.string,
+        // The type of limit that has been hit.
+        limitType: PropTypes.string.isRequired,
+    },
+
+    getDefaultProps: function() {
+        return {
+            kind: 'hard',
+        };
+    },
+
+    render: function() {
+        const toolbarClasses = {
+            'mx_MatrixToolbar': true,
+        };
+
+        let adminContact;
+        let limitError;
+        if (this.props.kind === 'hard') {
+            toolbarClasses['mx_MatrixToolbar_error'] = true;
+
+            adminContact = messageForResourceLimitError(
+                this.props.limitType,
+                this.props.adminContact,
+                {
+                    '': _td("Please contact your service administrator to continue using the service."),
+                },
+            );
+            limitError = messageForResourceLimitError(
+                this.props.limitType,
+                this.props.adminContact,
+                {
+                    'monthly_active_user': _td("This homeserver has hit its Monthly Active User limit."),
+                    '': _td("This homeserver has exceeded one of its resource limits."),
+                },
+            );
+        } else {
+            toolbarClasses['mx_MatrixToolbar_info'] = true;
+            adminContact = messageForResourceLimitError(
+                this.props.limitType,
+                this.props.adminContact,
+                {
+                    '': _td("Please contact your service administrator to get this limit increased."),
+                },
+            );
+            limitError = messageForResourceLimitError(
+                this.props.limitType,
+                this.props.adminContact,
+                {
+                    'monthly_active_user': _td(
+                        "This homeserver has hit its Monthly Active User limit so " +
+                        "some users will not be able to log in.",
+                    ),
+                    '': _td(
+                        "This homeserver has exceeded one of its resource limits so " +
+                        "some users will not be able to log in.",
+                    ),
+                },
+                {'b': sub => {sub}},
+            );
+        }
+        return (
+            

+                

+                    {limitError}
+                    {' '}
+                    {adminContact}
+                

+            

+        );
+    },
+});
diff --git a/src/components/views/groups/GroupInviteTile.js b/src/components/views/groups/GroupInviteTile.js
index 7c471cca2e..9e28ff5adf 100644
--- a/src/components/views/groups/GroupInviteTile.js
+++ b/src/components/views/groups/GroupInviteTile.js
@@ -134,7 +134,7 @@ export default React.createClass({
         ;
 
         const badgeEllipsis = this.state.badgeHover || this.state.menuDisplayed;
-        const badgeClasses = classNames('mx_RoomSubList_badge mx_RoomSubList_badgeHighlight', {
+        const badgeClasses = classNames('mx_RoomTile_badge mx_RoomTile_highlight', {
             'mx_RoomTile_badgeButton': badgeEllipsis,
         });
 
diff --git a/src/components/views/login/PasswordLogin.js b/src/components/views/login/PasswordLogin.js
index 71dfbe2c36..a0e5ab0ddb 100644
--- a/src/components/views/login/PasswordLogin.js
+++ b/src/components/views/login/PasswordLogin.js
@@ -28,6 +28,7 @@ import SdkConfig from '../../../SdkConfig';
  */
 class PasswordLogin extends React.Component {
     static defaultProps = {
+        onError: function() {},
         onUsernameChanged: function() {},
         onPasswordChanged: function() {},
         onPhoneCountryChanged: function() {},
@@ -56,33 +57,64 @@ class PasswordLogin extends React.Component {
         this.onPhoneCountryChanged = this.onPhoneCountryChanged.bind(this);
         this.onPhoneNumberChanged = this.onPhoneNumberChanged.bind(this);
         this.onPasswordChanged = this.onPasswordChanged.bind(this);
+        this.isLoginEmpty = this.isLoginEmpty.bind(this);
     }
 
     componentWillMount() {
         this._passwordField = null;
+        this._loginField = null;
     }
 
     componentWillReceiveProps(nextProps) {
         if (!this.props.loginIncorrect && nextProps.loginIncorrect) {
-            field_input_incorrect(this._passwordField);
+            field_input_incorrect(this.isLoginEmpty() ? this._loginField : this._passwordField);
         }
     }
 
     onSubmitForm(ev) {
         ev.preventDefault();
-        if (this.state.loginType === PasswordLogin.LOGIN_FIELD_PHONE) {
-            this.props.onSubmit(
-                '', // XXX: Synapse breaks if you send null here:
-                this.state.phoneCountry,
-                this.state.phoneNumber,
-                this.state.password,
-            );
+
+        let username = ''; // XXX: Synapse breaks if you send null here:
+        let phoneCountry = null;
+        let phoneNumber = null;
+        let error;
+
+        switch (this.state.loginType) {
+            case PasswordLogin.LOGIN_FIELD_EMAIL:
+                username = this.state.username;
+                if (!username) {
+                    error = _t('The email field must not be blank.');
+                }
+                break;
+            case PasswordLogin.LOGIN_FIELD_MXID:
+                username = this.state.username;
+                if (!username) {
+                    error = _t('The user name field must not be blank.');
+                }
+                break;
+            case PasswordLogin.LOGIN_FIELD_PHONE:
+                phoneCountry = this.state.phoneCountry;
+                phoneNumber = this.state.phoneNumber;
+                if (!phoneNumber) {
+                    error = _t('The phone number field must not be blank.');
+                }
+                break;
+        }
+
+        if (error) {
+            this.props.onError(error);
             return;
         }
+
+        if (!this.state.password) {
+            this.props.onError(_t('The password field must not be blank.'));
+            return;
+        }
+
         this.props.onSubmit(
-            this.state.username,
-            null,
-            null,
+            username,
+            phoneCountry,
+            phoneNumber,
             this.state.password,
         );
     }
@@ -93,6 +125,7 @@ class PasswordLogin extends React.Component {
     }
 
     onLoginTypeChange(loginType) {
+        this.props.onError(null); // send a null error to clear any error messages
         this.setState({
             loginType: loginType,
             username: "", // Reset because email and username use the same state
@@ -126,8 +159,10 @@ class PasswordLogin extends React.Component {
         switch (loginType) {
             case PasswordLogin.LOGIN_FIELD_EMAIL:
                 classes.mx_Login_email = true;
+                classes.error = this.props.loginIncorrect && !this.state.username;
                 return  {this._loginField = e;}}
                     key="email_input"
                     type="text"
                     name="username" // make it a little easier for browser's remember-password
@@ -139,8 +174,10 @@ class PasswordLogin extends React.Component {
                 />;
             case PasswordLogin.LOGIN_FIELD_MXID:
                 classes.mx_Login_username = true;
+                classes.error = this.props.loginIncorrect && !this.state.username;
                 return  {this._loginField = e;}}
                     key="username_input"
                     type="text"
                     name="username" // make it a little easier for browser's remember-password
@@ -153,14 +190,14 @@ class PasswordLogin extends React.Component {
                     autoFocus
                     disabled={disabled}
                 />;
-            case PasswordLogin.LOGIN_FIELD_PHONE:
+            case PasswordLogin.LOGIN_FIELD_PHONE: {
                 const CountryDropdown = sdk.getComponent('views.login.CountryDropdown');
                 classes.mx_Login_phoneNumberField = true;
                 classes.mx_Login_field_has_prefix = true;
+                classes.error = this.props.loginIncorrect && !this.state.phoneNumber;
                 return 

                     
                      {this._loginField = e;}}
                         key="phone_input"
                         type="text"
                         name="phoneNumber"
@@ -180,6 +217,17 @@ class PasswordLogin extends React.Component {
                         disabled={disabled}
                     />
                 
;
+            }
+        }
+    }
+
+    isLoginEmpty() {
+        switch (this.state.loginType) {
+            case PasswordLogin.LOGIN_FIELD_EMAIL:
+            case PasswordLogin.LOGIN_FIELD_MXID:
+                return !this.state.username;
+            case PasswordLogin.LOGIN_FIELD_PHONE:
+                return !this.state.phoneCountry || !this.state.phoneNumber;
         }
     }
 
@@ -207,7 +255,7 @@ class PasswordLogin extends React.Component {
         const pwFieldClass = classNames({
             mx_Login_field: true,
             mx_Login_field_disabled: matrixIdText === '',
-            error: this.props.loginIncorrect,
+            error: this.props.loginIncorrect && !this.isLoginEmpty(), // only error password if error isn't top field
         });
 
         const Dropdown = sdk.getComponent('elements.Dropdown');
@@ -258,6 +306,7 @@ PasswordLogin.LOGIN_FIELD_PHONE = "login_field_phone";
 
 PasswordLogin.propTypes = {
     onSubmit: PropTypes.func.isRequired, // fn(username, password)
+    onError: PropTypes.func,
     onForgotPasswordClick: PropTypes.func, // fn()
     initialUsername: PropTypes.string,
     initialPhoneCountry: PropTypes.string,
diff --git a/src/components/views/login/RegistrationForm.js b/src/components/views/login/RegistrationForm.js
index fff808cf22..fe977025ae 100644
--- a/src/components/views/login/RegistrationForm.js
+++ b/src/components/views/login/RegistrationForm.js
@@ -1,6 +1,7 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
 Copyright 2017 Vector Creations Ltd
+Copyright 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -49,7 +50,7 @@ module.exports = React.createClass({
         teamsConfig: PropTypes.shape({
             // Email address to request new teams
             supportEmail: PropTypes.string,
-            teams: PropTypes.arrayOf(React.PropTypes.shape({
+            teams: PropTypes.arrayOf(PropTypes.shape({
                 // The displayed name of the team
                 "name": PropTypes.string,
                 // The domain of team email addresses
@@ -60,6 +61,7 @@ module.exports = React.createClass({
         minPasswordLength: PropTypes.number,
         onError: PropTypes.func,
         onRegisterClick: PropTypes.func.isRequired, // onRegisterClick(Object) => ?Promise
+        flows: PropTypes.arrayOf(PropTypes.object).isRequired,
     },
 
     getDefaultProps: function() {
@@ -180,12 +182,16 @@ module.exports = React.createClass({
                     });
                 }
                 const emailValid = email === '' || Email.looksValid(email);
-                this.markFieldValid(field_id, emailValid, "RegistrationForm.ERR_EMAIL_INVALID");
+                if (this._authStepIsRequired('m.login.email.identity') && (!emailValid || email === '')) {
+                    this.markFieldValid(field_id, false, "RegistrationForm.ERR_MISSING_EMAIL");
+                } else this.markFieldValid(field_id, emailValid, "RegistrationForm.ERR_EMAIL_INVALID");
                 break;
             case FIELD_PHONE_NUMBER:
                 const phoneNumber = this.refs.phoneNumber ? this.refs.phoneNumber.value : '';
                 const phoneNumberValid = phoneNumber === '' || phoneNumberLooksValid(phoneNumber);
-                this.markFieldValid(field_id, phoneNumberValid, "RegistrationForm.ERR_PHONE_NUMBER_INVALID");
+                if (this._authStepIsRequired('m.login.msisdn') && (!phoneNumberValid || phoneNumber === '')) {
+                    this.markFieldValid(field_id, false, "RegistrationForm.ERR_MISSING_PHONE_NUMBER");
+                } else this.markFieldValid(field_id, phoneNumberValid, "RegistrationForm.ERR_PHONE_NUMBER_INVALID");
                 break;
             case FIELD_USERNAME:
                 // XXX: SPEC-1
@@ -273,12 +279,18 @@ module.exports = React.createClass({
         });
     },
 
+    _authStepIsRequired(step) {
+        // A step is required if no flow exists which does not include that step
+        // (Notwithstanding setups like either email or msisdn being required)
+        return !this.props.flows.some((flow) => {
+            return !flow.stages.includes(step);
+        });
+    },
+
     render: function() {
         const self = this;
 
-        const theme = SettingsStore.getValue("theme");
-        // FIXME: remove hardcoded Status team tweaks at some point
-        const emailPlaceholder = theme === 'status' ? _t("Email address") : _t("Email address (optional)");
+        const emailPlaceholder = this._authStepIsRequired('m.login.email.identity') ? _t("Email address") : _t("Email address (optional)");
 
         const emailSection = (
             

@@ -315,6 +327,7 @@ module.exports = React.createClass({
         const CountryDropdown = sdk.getComponent('views.login.CountryDropdown');
         let phoneSection;
         if (!SdkConfig.get().disable_3pid_login) {
+            const phonePlaceholder = this._authStepIsRequired('m.login.msisdn') ? _t("Mobile phone number") : _t("Mobile phone number (optional)");
             phoneSection = (
                 

                     
                     ; // We should never have been instaniated in this case
+        }
+        return 

+            
+            

+                {_t("This room is a continuation of another conversation.")}
+            

+            
+                {_t("Click here to see older messages.")}
+            
+        
;
+    },
+});
diff --git a/src/components/views/messages/SenderProfile.js b/src/components/views/messages/SenderProfile.js
index 620f66bb03..be40db50a1 100644
--- a/src/components/views/messages/SenderProfile.js
+++ b/src/components/views/messages/SenderProfile.js
@@ -72,14 +72,12 @@ export default React.createClass({
 
     _updateRelatedGroups() {
         if (this.unmounted) return;
-        const relatedGroupsEvent = this.context.matrixClient
-            .getRoom(this.props.mxEvent.getRoomId())
-            .currentState
-            .getStateEvents('m.room.related_groups', '');
+        const room = this.context.matrixClient.getRoom(this.props.mxEvent.getRoomId());
+        if (!room) return;
+
+        const relatedGroupsEvent = room.currentState.getStateEvents('m.room.related_groups', '');
         this.setState({
-            relatedGroups: relatedGroupsEvent ?
-                relatedGroupsEvent.getContent().groups || []
-                : [],
+            relatedGroups: relatedGroupsEvent ? relatedGroupsEvent.getContent().groups || [] : [],
         });
     },
 
diff --git a/src/components/views/messages/TextualBody.js b/src/components/views/messages/TextualBody.js
index 20cf2b69f4..17281dae09 100644
--- a/src/components/views/messages/TextualBody.js
+++ b/src/components/views/messages/TextualBody.js
@@ -203,7 +203,7 @@ module.exports = React.createClass({
                     // update the current node with one that's now taken its place
                     node = pillContainer;
                 }
-            } else if (node.nodeType == Node.TEXT_NODE) {
+            } else if (node.nodeType === Node.TEXT_NODE) {
                 const Pill = sdk.getComponent('elements.Pill');
 
                 let currentTextNode = node;
@@ -232,6 +232,12 @@ module.exports = React.createClass({
                     if (atRoomRule && pushProcessor.ruleMatchesEvent(atRoomRule, this.props.mxEvent)) {
                         // Now replace all those nodes with Pills
                         for (const roomNotifTextNode of roomNotifTextNodes) {
+                            // Set the next node to be processed to the one after the node
+                            // we're adding now, since we've just inserted nodes into the structure
+                            // we're iterating over.
+                            // Note we've checked roomNotifTextNodes.length > 0 so we'll do this at least once
+                            node = roomNotifTextNode.nextSibling;
+
                             const pillContainer = document.createElement('span');
                             const room = MatrixClientPeg.get().getRoom(this.props.mxEvent.getRoomId());
                             const pill =  0 so we'll do this at least once
-                            node = roomNotifTextNode.nextSibling;
                         }
                         // Nothing else to do for a text node (and we don't need to advance
                         // the loop pointer because we did it above)
@@ -340,7 +340,18 @@ module.exports = React.createClass({
                 }, false);
                 e.target.onmouseleave = close;
             };
-            p.appendChild(button);
+
+            // Wrap a div around 
 so that the copy button can be correctly positioned
+            // when the 
 overflows and is scrolled horizontally.
+            const div = document.createElement("div");
+            div.className = "mx_EventTile_pre_container";
+
+            // Insert containing div in place of 
 block
+            p.parentNode.replaceChild(div, p);
+
+            // Append 
 block and copy button to container
+            div.appendChild(p);
+            div.appendChild(button);
         });
     },
 
diff --git a/src/components/views/room_settings/AliasSettings.js b/src/components/views/room_settings/AliasSettings.js
index bd92d75dd9..f9bf52cd24 100644
--- a/src/components/views/room_settings/AliasSettings.js
+++ b/src/components/views/room_settings/AliasSettings.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2016 OpenMarket Ltd
+Copyright 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -97,18 +98,19 @@ module.exports = React.createClass({
             }
         }
 
-
-        // save new canonical alias
         let oldCanonicalAlias = null;
         if (this.props.canonicalAliasEvent) {
             oldCanonicalAlias = this.props.canonicalAliasEvent.getContent().alias;
         }
-        if (oldCanonicalAlias !== this.state.canonicalAlias) {
+
+        let newCanonicalAlias = this.state.canonicalAlias;
+
+        if (this.props.canSetCanonicalAlias && oldCanonicalAlias !== newCanonicalAlias) {
             console.log("AliasSettings: Updating canonical alias");
             promises = [Promise.all(promises).then(
                 MatrixClientPeg.get().sendStateEvent(
                     this.props.roomId, "m.room.canonical_alias", {
-                        alias: this.state.canonicalAlias,
+                        alias: newCanonicalAlias,
                     }, "",
                 ),
             )];
@@ -145,6 +147,7 @@ module.exports = React.createClass({
         if (!alias || alias.length === 0) return; // ignore attempts to create blank aliases
 
         const localDomain = MatrixClientPeg.get().getDomain();
+        if (!alias.includes(':')) alias += ':' + localDomain;
         if (this.isAliasValid(alias) && alias.endsWith(localDomain)) {
             this.state.domainToAliases[localDomain] = this.state.domainToAliases[localDomain] || [];
             this.state.domainToAliases[localDomain].push(alias);
@@ -161,11 +164,18 @@ module.exports = React.createClass({
                 description: _t('\'%(alias)s\' is not a valid format for an alias', { alias: alias }),
             });
         }
+
+        if (!this.props.canonicalAlias) {
+            this.setState({
+                canonicalAlias: alias
+            });
+        }
     },
 
     onLocalAliasChanged: function(alias, index) {
         if (alias === "") return; // hit the delete button to delete please
         const localDomain = MatrixClientPeg.get().getDomain();
+        if (!alias.includes(':')) alias += ':' + localDomain;
         if (this.isAliasValid(alias) && alias.endsWith(localDomain)) {
             this.state.domainToAliases[localDomain][index] = alias;
         } else {
@@ -184,10 +194,15 @@ module.exports = React.createClass({
         // promptly setState anyway, it's just about acceptable.  The alternative
         // would be to arbitrarily deepcopy to a temp variable and then setState
         // that, but why bother when we can cut this corner.
-        this.state.domainToAliases[localDomain].splice(index, 1);
+        const alias = this.state.domainToAliases[localDomain].splice(index, 1);
         this.setState({
             domainToAliases: this.state.domainToAliases,
         });
+        if (this.props.canonicalAlias === alias) {
+            this.setState({
+                canonicalAlias: null,
+            });
+        }
     },
 
     onCanonicalAliasChange: function(event) {
@@ -204,12 +219,14 @@ module.exports = React.createClass({
 
         let canonical_alias_section;
         if (this.props.canSetCanonicalAlias) {
+            let found = false;
             canonical_alias_section = (
-                
                     
                     {
-                        Object.keys(self.state.domainToAliases).map(function(domain, i) {
-                            return self.state.domainToAliases[domain].map(function(alias, j) {
+                        Object.keys(self.state.domainToAliases).map((domain, i) => {
+                            return self.state.domainToAliases[domain].map((alias, j) => {
+                                if (alias === this.state.canonicalAlias) found = true;
                                 return (
                                     
+                    }
                 
             );
         } else {
diff --git a/src/components/views/room_settings/ColorSettings.js b/src/components/views/room_settings/ColorSettings.js
index e82d3ffb0a..30621f9c15 100644
--- a/src/components/views/room_settings/ColorSettings.js
+++ b/src/components/views/room_settings/ColorSettings.js
@@ -90,7 +90,7 @@ module.exports = React.createClass({
                 secondary_color: this.state.secondary_color,
             }).catch(function(err) {
                 if (err.errcode === 'M_GUEST_ACCESS_FORBIDDEN') {
-                    dis.dispatch({action: 'view_set_mxid'});
+                    dis.dispatch({action: 'require_registration'});
                 }
             });
         }
diff --git a/src/components/views/room_settings/UrlPreviewSettings.js b/src/components/views/room_settings/UrlPreviewSettings.js
index ed58d610aa..fe2a2bacf4 100644
--- a/src/components/views/room_settings/UrlPreviewSettings.js
+++ b/src/components/views/room_settings/UrlPreviewSettings.js
@@ -1,6 +1,7 @@
 /*
 Copyright 2016 OpenMarket Ltd
 Copyright 2017 Travis Ralston
+Copyright 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -15,6 +16,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import {MatrixClient} from "matrix-js-sdk";
 const React = require('react');
 import PropTypes from 'prop-types';
 const sdk = require("../../../index");
@@ -29,6 +31,10 @@ module.exports = React.createClass({
         room: PropTypes.object,
     },
 
+    contextTypes: {
+        matrixClient: PropTypes.instanceOf(MatrixClient).isRequired,
+    },
+
     saveSettings: function() {
         const promises = [];
         if (this.refs.urlPreviewsRoom) promises.push(this.refs.urlPreviewsRoom.save());
@@ -39,42 +45,58 @@ module.exports = React.createClass({
     render: function() {
         const SettingsFlag = sdk.getComponent("elements.SettingsFlag");
         const roomId = this.props.room.roomId;
+        const isEncrypted = this.context.matrixClient.isRoomEncrypted(roomId);
 
         let previewsForAccount = null;
-        if (SettingsStore.getValueAt(SettingLevel.ACCOUNT, "urlPreviewsEnabled")) {
-            previewsForAccount = (
-                _t("You have enabled URL previews by default.", {}, { 'a': (sub)=>{ sub } })
-            );
-        } else {
-            previewsForAccount = (
-                _t("You have disabled URL previews by default.", {}, { 'a': (sub)=>{ sub } })
-            );
-        }
-
         let previewsForRoom = null;
-        if (SettingsStore.canSetValue("urlPreviewsEnabled", roomId, "room")) {
-            previewsForRoom = (
-                
-            );
-        } else {
-            let str = _td("URL previews are enabled by default for participants in this room.");
-            if (!SettingsStore.getValueAt(SettingLevel.ROOM, "urlPreviewsEnabled", roomId, /*explicit=*/true)) {
-                str = _td("URL previews are disabled by default for participants in this room.");
+
+        if (!isEncrypted) {
+            // Only show account setting state and room state setting state in non-e2ee rooms where they apply
+            const accountEnabled = SettingsStore.getValueAt(SettingLevel.ACCOUNT, "urlPreviewsEnabled");
+            if (accountEnabled) {
+                previewsForAccount = (
+                    _t("You have enabled URL previews by default.", {}, {
+                        'a': (sub)=>{ sub },
+                    })
+                );
+            } else if (accountEnabled) {
+                previewsForAccount = (
+                    _t("You have disabled URL previews by default.", {}, {
+                        'a': (sub)=>{ sub },
+                    })
+                );
             }
-            previewsForRoom = ();
+
+            if (SettingsStore.canSetValue("urlPreviewsEnabled", roomId, "room")) {
+                previewsForRoom = (
+                    
+                );
+            } else {
+                let str = _td("URL previews are enabled by default for participants in this room.");
+                if (!SettingsStore.getValueAt(SettingLevel.ROOM, "urlPreviewsEnabled", roomId, /*explicit=*/true)) {
+                    str = _td("URL previews are disabled by default for participants in this room.");
+                }
+                previewsForRoom = ();
+            }
+        } else {
+            previewsForAccount = (
+                _t("In encrypted rooms, like this one, URL previews are disabled by default to ensure that your " +
+                    "homeserver (where the previews are generated) cannot gather information about links you see in " +
+                    "this room.")
+            );
         }
 
-        const previewsForRoomAccount = (
-            
@@ -83,8 +105,13 @@ module.exports = React.createClass({
         return (
             

                 
{ _t("URL Previews") }

-
-                
+                

+                    { _t('When someone puts a URL in their message, a URL preview can be shown to give more ' +
+                        'information about that link such as the title, description, and an image from the website.') }
+                

+                

+                    { previewsForAccount }
+                

                 { previewsForRoom }
                 
             

diff --git a/src/components/views/rooms/AppsDrawer.js b/src/components/views/rooms/AppsDrawer.js
index f0b7eaa1d7..e6fe445b45 100644
--- a/src/components/views/rooms/AppsDrawer.js
+++ b/src/components/views/rooms/AppsDrawer.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2017 Vector Creations Ltd
+Copyright 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -27,8 +28,8 @@ import SdkConfig from '../../../SdkConfig';
 import ScalarAuthClient from '../../../ScalarAuthClient';
 import ScalarMessaging from '../../../ScalarMessaging';
 import { _t } from '../../../languageHandler';
-import WidgetUtils from '../../../WidgetUtils';
-import SettingsStore from "../../../settings/SettingsStore";
+import WidgetUtils from '../../../utils/WidgetUtils';
+import WidgetEchoStore from "../../../stores/WidgetEchoStore";
 
 // The maximum number of widgets that can be added in a room
 const MAX_WIDGETS = 2;
@@ -57,6 +58,7 @@ module.exports = React.createClass({
     componentWillMount: function() {
         ScalarMessaging.startListening();
         MatrixClientPeg.get().on('RoomState.events', this.onRoomStateEvents);
+        WidgetEchoStore.on('update', this._updateApps);
     },
 
     componentDidMount: function() {
@@ -82,6 +84,7 @@ module.exports = React.createClass({
         if (MatrixClientPeg.get()) {
             MatrixClientPeg.get().removeListener('RoomState.events', this.onRoomStateEvents);
         }
+        WidgetEchoStore.removeListener('update', this._updateApps);
         dis.unregister(this.dispatcherRef);
     },
 
@@ -106,55 +109,6 @@ module.exports = React.createClass({
         }
     },
 
-    /**
-     * Encodes a URI according to a set of template variables. Variables will be
-     * passed through encodeURIComponent.
-     * @param {string} pathTemplate The path with template variables e.g. '/foo/$bar'.
-     * @param {Object} variables The key/value pairs to replace the template
-     * variables with. E.g. { '$bar': 'baz' }.
-     * @return {string} The result of replacing all template variables e.g. '/foo/baz'.
-     */
-    encodeUri: function(pathTemplate, variables) {
-        for (const key in variables) {
-            if (!variables.hasOwnProperty(key)) {
-                continue;
-            }
-            pathTemplate = pathTemplate.replace(
-                key, encodeURIComponent(variables[key]),
-            );
-        }
-        return pathTemplate;
-    },
-
-    _initAppConfig: function(appId, app, sender) {
-        const user = MatrixClientPeg.get().getUser(this.props.userId);
-        const params = {
-            '$matrix_user_id': this.props.userId,
-            '$matrix_room_id': this.props.room.roomId,
-            '$matrix_display_name': user ? user.displayName : this.props.userId,
-            '$matrix_avatar_url': user ? MatrixClientPeg.get().mxcUrlToHttp(user.avatarUrl) : '',
-
-            // TODO: Namespace themes through some standard
-            '$theme': SettingsStore.getValue("theme"),
-        };
-
-        app.id = appId;
-        app.name = app.name || app.type;
-
-        if (app.data) {
-            Object.keys(app.data).forEach((key) => {
-                params['$' + key] = app.data[key];
-            });
-
-            app.waitForIframeLoad = (app.data.waitForIframeLoad === 'false' ? false : true);
-        }
-
-        app.url = this.encodeUri(app.url, params);
-        app.creatorUserId = (sender && sender.userId) ? sender.userId : null;
-
-        return app;
-    },
-
     onRoomStateEvents: function(ev, state) {
         if (ev.getRoomId() !== this.props.room.roomId || ev.getType() !== 'im.vector.modular.widgets') {
             return;
@@ -163,15 +117,11 @@ module.exports = React.createClass({
     },
 
     _getApps: function() {
-        const appsStateEvents = this.props.room.currentState.getStateEvents('im.vector.modular.widgets');
-        if (!appsStateEvents) {
-            return [];
-        }
-
-        return appsStateEvents.filter((ev) => {
-            return ev.getContent().type && ev.getContent().url;
-        }).map((ev) => {
-            return this._initAppConfig(ev.getStateKey(), ev.getContent(), ev.sender);
+        const widgets = WidgetEchoStore.getEchoedRoomWidgets(
+            this.props.room.roomId, WidgetUtils.getRoomWidgets(this.props.room),
+        );
+        return widgets.map((ev) => {
+            return WidgetUtils.makeAppConfig(ev.getStateKey(), ev.getContent(), ev.sender);
         });
     },
 
@@ -219,26 +169,25 @@ module.exports = React.createClass({
     },
 
     render: function() {
-        const enableScreenshots = SettingsStore.getValue("enableWidgetScreenshots", this.props.room.room_id);
+        const apps = this.state.apps.map((app, index, arr) => {
+            const capWhitelist = WidgetUtils.getCapWhitelistForAppTypeInRoomId(app.type, this.props.room.roomId);
 
-        const apps = this.state.apps.map(
-            (app, index, arr) => {
-                return ();
-            });
+            return ();
+        });
 
         let addWidget;
         if (this.props.showApps &&
@@ -257,10 +206,22 @@ module.exports = React.createClass({
             
;
         }
 
+        let spinner;
+        if (
+            apps.length === 0 && WidgetEchoStore.roomHasPendingWidgets(
+                this.props.room.roomId,
+                WidgetUtils.getRoomWidgets(this.props.room),
+            )
+        ) {
+            const Loader = sdk.getComponent("elements.Spinner");
+            spinner = ;
+        }
+
         return (
             

                 

                     { apps }
+                    { spinner }
                 

                 { this._canUserModify() && addWidget }
             

diff --git a/src/components/views/rooms/Autocomplete.js b/src/components/views/rooms/Autocomplete.js
index 4fb2a29381..ee6cc66d2d 100644
--- a/src/components/views/rooms/Autocomplete.js
+++ b/src/components/views/rooms/Autocomplete.js
@@ -114,7 +114,7 @@ export default class Autocomplete extends React.Component {
 
     processQuery(query, selection) {
         return this.autocompleter.getCompletions(
-            query, selection, this.state.forceComplete,
+            query, selection, this.state.forceComplete
         ).then((completions) => {
             // Only ever process the completions for the most recent query being processed
             if (query !== this.queryRequested) {
@@ -216,12 +216,12 @@ export default class Autocomplete extends React.Component {
         return done.promise;
     }
 
-    onCompletionClicked(): boolean {
-        if (this.countCompletions() === 0 || this.state.selectionOffset === COMPOSER_SELECTED) {
+    onCompletionClicked(selectionOffset: number): boolean {
+        if (this.countCompletions() === 0 || selectionOffset === COMPOSER_SELECTED) {
             return false;
         }
 
-        this.props.onConfirm(this.state.completionList[this.state.selectionOffset - 1]);
+        this.props.onConfirm(this.state.completionList[selectionOffset - 1]);
         this.hide();
 
         return true;
@@ -263,17 +263,14 @@ export default class Autocomplete extends React.Component {
                 const componentPosition = position;
                 position++;
 
-                const onMouseMove = () => this.setSelection(componentPosition);
                 const onClick = () => {
-                    this.setSelection(componentPosition);
-                    this.onCompletionClicked();
+                    this.onCompletionClicked(componentPosition);
                 };
 
                 return React.cloneElement(completion.component, {
                     key: i,
                     ref: `completion${position - 1}`,
                     className,
-                    onMouseMove,
                     onClick,
                 });
             });
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index aa2f28024e..8c58863249 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -47,6 +47,10 @@ const eventTileTypes = {
 };
 
 const stateEventTileTypes = {
+    'm.room.aliases': 'messages.TextualEvent',
+    // 'm.room.aliases': 'messages.RoomAliasesEvent', // too complex
+    'm.room.canonical_alias': 'messages.TextualEvent',
+    'm.room.create': 'messages.RoomCreate',
     'm.room.member': 'messages.TextualEvent',
     'm.room.name': 'messages.TextualEvent',
     'm.room.avatar': 'messages.RoomAvatarEvent',
@@ -56,7 +60,7 @@ const stateEventTileTypes = {
     'm.room.topic': 'messages.TextualEvent',
     'm.room.power_levels': 'messages.TextualEvent',
     'm.room.pinned_events': 'messages.TextualEvent',
-
+    'm.room.server_acl': 'messages.TextualEvent',
     'im.vector.modular.widgets': 'messages.TextualEvent',
 };
 
@@ -439,17 +443,6 @@ module.exports = withMatrixClient(React.createClass({
         });
     },
 
-    onPermalinkShareClicked: function(e) {
-        // These permalinks are like above, can be opened in new tab/window to matrix.to
-        // but otherwise fire the ShareDialog as it makes little sense to click permalink
-        // whilst it is in the current room
-        e.preventDefault();
-        const ShareDialog = sdk.getComponent("dialogs.ShareDialog");
-        Modal.createTrackedDialog('share room event dialog', '', ShareDialog, {
-            target: this.props.mxEvent,
-        });
-    },
-
     _renderE2EPadlock: function() {
         const ev = this.props.mxEvent;
         const props = {onClick: this.onCryptoClicked};
@@ -493,14 +486,23 @@ module.exports = withMatrixClient(React.createClass({
         const eventType = this.props.mxEvent.getType();
 
         // Info messages are basically information about commands processed on a room
-        const isInfoMessage = (eventType !== 'm.room.message' && eventType !== 'm.sticker');
+        const isInfoMessage = (
+            eventType !== 'm.room.message' && eventType !== 'm.sticker' && eventType != 'm.room.create'
+        );
 
-        const EventTileType = sdk.getComponent(getHandlerTile(this.props.mxEvent));
+        const tileHandler = getHandlerTile(this.props.mxEvent);
         // This shouldn't happen: the caller should check we support this type
         // before trying to instantiate us
-        if (!EventTileType) {
-            throw new Error("Event type not supported");
+        if (!tileHandler) {
+            const {mxEvent} = this.props;
+            console.warn(`Event type not supported: type:${mxEvent.getType()} isState:${mxEvent.isState()}`);
+            return 

+                

+                    { _t('This event could not be displayed') }
+                

+            
;
         }
+        const EventTileType = sdk.getComponent(tileHandler);
 
         const isSending = (['sending', 'queued', 'encrypting'].indexOf(this.props.eventSendStatus) !== -1);
         const isRedacted = isMessageEvent(this.props.mxEvent) && this.props.isRedacted;
@@ -538,6 +540,9 @@ module.exports = withMatrixClient(React.createClass({
         if (this.props.tileShape === "notif") {
             avatarSize = 24;
             needsSenderProfile = true;
+        } else if (tileHandler === 'messages.RoomCreate') {
+            avatarSize = 0;
+            needsSenderProfile = false;
         } else if (isInfoMessage) {
             // a small avatar, with no sender profile, for
             // joins/parts/etc
@@ -621,13 +626,14 @@ module.exports = withMatrixClient(React.createClass({
 
         switch (this.props.tileShape) {
             case 'notif': {
+                const EmojiText = sdk.getComponent('elements.EmojiText');
                 const room = this.props.matrixClient.getRoom(this.props.mxEvent.getRoomId());
                 return (
                     

                         
                         

                             { avatar }
@@ -680,7 +686,7 @@ module.exports = withMatrixClient(React.createClass({
                         { avatar }
                         { sender }
                         

-                            
+                            
                                 { timestamp }
                             
                             { this._renderE2EPadlock() }
@@ -704,10 +710,9 @@ module.exports = withMatrixClient(React.createClass({
                         

                             { readAvatars }
                         

-                        { avatar }
                         { sender }
                         

-                            
+                            
                                 { timestamp }
                             
                             { this._renderE2EPadlock() }
@@ -721,6 +726,12 @@ module.exports = withMatrixClient(React.createClass({
                             { keyRequestInfo }
                             { editButton }
                         

+                        {
+                            // The avatar goes after the event tile as it's absolutly positioned to be over the
+                            // event tile line, so needs to be later in the DOM so it appears on top (this avoids
+                            // the need for further z-indexing chaos)
+                        }
+                        { avatar }
                     

                 );
             }
@@ -742,6 +753,8 @@ module.exports.haveTileForEvent = function(e) {
     if (handler === undefined) return false;
     if (handler === 'messages.TextualEvent') {
         return TextForEvent.textForEvent(e) !== '';
+    } else if (handler === 'messages.RoomCreate') {
+        return Boolean(e.getContent()['predecessor']);
     } else {
         return true;
     }
diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js
index 8b4ade9c7d..e6e6350083 100644
--- a/src/components/views/rooms/MemberInfo.js
+++ b/src/components/views/rooms/MemberInfo.js
@@ -332,13 +332,40 @@ module.exports = withMatrixClient(React.createClass({
         });
     },
 
-    onMuteToggle: function() {
+    _warnSelfDemote: function() {
+        const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
+        return new Promise((resolve) => {
+            Modal.createTrackedDialog('Demoting Self', '', QuestionDialog, {
+                title: _t("Demote yourself?"),
+                description:
+                    

+                        { _t("You will not be able to undo this change as you are demoting yourself, " +
+                            "if you are the last privileged user in the room it will be impossible " +
+                            "to regain privileges.") }
+                    
,
+                button: _t("Demote"),
+                onFinished: resolve,
+            });
+        });
+    },
+
+    onMuteToggle: async function() {
         const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
         const roomId = this.props.member.roomId;
         const target = this.props.member.userId;
         const room = this.props.matrixClient.getRoom(roomId);
         if (!room) return;
 
+        // if muting self, warn as it may be irreversible
+        if (target === this.props.matrixClient.getUserId()) {
+            try {
+                if (!(await this._warnSelfDemote())) return;
+            } catch (e) {
+                console.error("Failed to warn about self demotion: ", e);
+                return;
+            }
+        }
+
         const powerLevelEvent = room.currentState.getStateEvents("m.room.power_levels", "");
         if (!powerLevelEvent) return;
 
@@ -402,7 +429,7 @@ module.exports = withMatrixClient(React.createClass({
                 console.log("Mod toggle success");
             }, function(err) {
                 if (err.errcode === 'M_GUEST_ACCESS_FORBIDDEN') {
-                    dis.dispatch({action: 'view_set_mxid'});
+                    dis.dispatch({action: 'require_registration'});
                 } else {
                     console.error("Toggle moderator error:" + err);
                     Modal.createTrackedDialog('Failed to toggle moderator status', '', ErrorDialog, {
@@ -436,7 +463,7 @@ module.exports = withMatrixClient(React.createClass({
         }).done();
     },
 
-    onPowerChange: function(powerLevel) {
+    onPowerChange: async function(powerLevel) {
         const roomId = this.props.member.roomId;
         const target = this.props.member.userId;
         const room = this.props.matrixClient.getRoom(roomId);
@@ -455,20 +482,12 @@ module.exports = withMatrixClient(React.createClass({
 
         // If we are changing our own PL it can only ever be decreasing, which we cannot reverse.
         if (myUserId === target) {
-            Modal.createTrackedDialog('Demoting Self', '', QuestionDialog, {
-                title: _t("Warning!"),
-                description:
-                    

-                        { _t("You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.") }

-                        { _t("Are you sure?") }
-                    
,
-                button: _t("Continue"),
-                onFinished: (confirmed) => {
-                    if (confirmed) {
-                        this._applyPowerChange(roomId, target, powerLevel, powerLevelEvent);
-                    }
-                },
-            });
+            try {
+                if (!(await this._warnSelfDemote())) return;
+                this._applyPowerChange(roomId, target, powerLevel, powerLevelEvent);
+            } catch (e) {
+                console.error("Failed to warn about self demotion: ", e);
+            }
             return;
         }
 
@@ -478,7 +497,8 @@ module.exports = withMatrixClient(React.createClass({
                 title: _t("Warning!"),
                 description:
                     

-                        { _t("You will not be able to undo this change as you are promoting the user to have the same power level as yourself.") }

+                        { _t("You will not be able to undo this change as you are promoting the user " +
+                            "to have the same power level as yourself.") }

                         { _t("Are you sure?") }
                     
,
                 button: _t("Continue"),
@@ -578,7 +598,7 @@ module.exports = withMatrixClient(React.createClass({
 
     onMemberAvatarClick: function() {
         const member = this.props.member;
-        const avatarUrl = member.user ? member.user.avatarUrl : member.events.member.getContent().avatar_url;
+        const avatarUrl = member.getMxcAvatarUrl();
         if (!avatarUrl) return;
 
         const httpUrl = this.props.matrixClient.mxcUrlToHttp(avatarUrl);
@@ -754,15 +774,15 @@ module.exports = withMatrixClient(React.createClass({
             for (const roomId of dmRooms) {
                 const room = this.props.matrixClient.getRoom(roomId);
                 if (room) {
-                    const me = room.getMember(this.props.matrixClient.credentials.userId);
-
+                    const myMembership = room.getMyMembership();
                     // not a DM room if we have are not joined
-                    if (!me.membership || me.membership !== 'join') continue;
-                    // not a DM room if they are not joined
+                    if (myMembership !== 'join') continue;
+                    
                     const them = this.props.member;
+                    // not a DM room if they are not joined
                     if (!them.membership || them.membership !== 'join') continue;
 
-                    const highlight = room.getUnreadNotificationCount('highlight') > 0 || me.membership === 'invite';
+                    const highlight = room.getUnreadNotificationCount('highlight') > 0;
 
                     tiles.push(
                         ,
                     );
diff --git a/src/components/views/rooms/MemberList.js b/src/components/views/rooms/MemberList.js
index 6f6188e0b5..67a6effc81 100644
--- a/src/components/views/rooms/MemberList.js
+++ b/src/components/views/rooms/MemberList.js
@@ -32,10 +32,93 @@ module.exports = React.createClass({
     displayName: 'MemberList',
 
     getInitialState: function() {
-        this.memberDict = this.getMemberDict();
-        const members = this.roomMembers();
+        const cli = MatrixClientPeg.get();
+        if (cli.hasLazyLoadMembersEnabled()) {
+            // show an empty list
+            return this._getMembersState([]);
+        } else {
+            return this._getMembersState(this.roomMembers());
+        }
+    },
 
+    componentWillMount: function() {
+        this._mounted = true;
+        const cli = MatrixClientPeg.get();
+        if (cli.hasLazyLoadMembersEnabled()) {
+            this._showMembersAccordingToMembershipWithLL();
+            cli.on("Room.myMembership", this.onMyMembership);
+        } else {
+            this._listenForMembersChanges();
+        }
+        cli.on("Room", this.onRoom); // invites & joining after peek
+        const enablePresenceByHsUrl = SdkConfig.get()["enable_presence_by_hs_url"];
+        const hsUrl = MatrixClientPeg.get().baseUrl;
+        this._showPresence = true;
+        if (enablePresenceByHsUrl && enablePresenceByHsUrl[hsUrl] !== undefined) {
+            this._showPresence = enablePresenceByHsUrl[hsUrl];
+        }
+    },
+
+    _listenForMembersChanges: function() {
+        const cli = MatrixClientPeg.get();
+        cli.on("RoomState.members", this.onRoomStateMember);
+        cli.on("RoomMember.name", this.onRoomMemberName);
+        cli.on("RoomState.events", this.onRoomStateEvent);
+        // We listen for changes to the lastPresenceTs which is essentially
+        // listening for all presence events (we display most of not all of
+        // the information contained in presence events).
+        cli.on("User.lastPresenceTs", this.onUserLastPresenceTs);
+        // cli.on("Room.timeline", this.onRoomTimeline);
+    },
+
+    componentWillUnmount: function() {
+        this._mounted = false;
+        const cli = MatrixClientPeg.get();
+        if (cli) {
+            cli.removeListener("RoomState.members", this.onRoomStateMember);
+            cli.removeListener("RoomMember.name", this.onRoomMemberName);
+            cli.removeListener("Room.myMembership", this.onMyMembership);
+            cli.removeListener("RoomState.events", this.onRoomStateEvent);
+            cli.removeListener("Room", this.onRoom);
+            cli.removeListener("User.lastPresenceTs", this.onUserLastPresenceTs);
+        }
+
+        // cancel any pending calls to the rate_limited_funcs
+        this._updateList.cancelPendingCall();
+    },
+
+    /**
+     * If lazy loading is enabled, either:
+     * show a spinner and load the members if the user is joined,
+     * or show the members available so far if the user is invited
+     */
+    _showMembersAccordingToMembershipWithLL: async function() {
+        const cli = MatrixClientPeg.get();
+        if (cli.hasLazyLoadMembersEnabled()) {
+            const cli = MatrixClientPeg.get();
+            const room = cli.getRoom(this.props.roomId);
+            const membership = room && room.getMyMembership();
+            if (membership === "join") {
+                this.setState({loading: true});
+                try {
+                    await room.loadMembersIfNeeded();
+                } catch (ex) {/* already logged in RoomView */}
+                if (this._mounted) {
+                    this.setState(this._getMembersState(this.roomMembers()));
+                    this._listenForMembersChanges();
+                }
+            } else if (membership === "invite") {
+                // show the members we've got when invited
+                this.setState(this._getMembersState(this.roomMembers()));
+            }
+        }
+    },
+
+    _getMembersState: function(members) {
+        // set the state after determining _showPresence to make sure it's
+        // taken into account while rerendering
         return {
+            loading: false,
             members: members,
             filteredJoinedMembers: this._filterMembers(members, 'join'),
             filteredInvitedMembers: this._filterMembers(members, 'invite'),
@@ -48,70 +131,6 @@ module.exports = React.createClass({
         };
     },
 
-    componentWillMount: function() {
-        const cli = MatrixClientPeg.get();
-        cli.on("RoomState.members", this.onRoomStateMember);
-        cli.on("RoomMember.name", this.onRoomMemberName);
-        cli.on("RoomState.events", this.onRoomStateEvent);
-        cli.on("Room", this.onRoom); // invites
-        // We listen for changes to the lastPresenceTs which is essentially
-        // listening for all presence events (we display most of not all of
-        // the information contained in presence events).
-        cli.on("User.lastPresenceTs", this.onUserLastPresenceTs);
-        // cli.on("Room.timeline", this.onRoomTimeline);
-
-        const enablePresenceByHsUrl = SdkConfig.get()["enable_presence_by_hs_url"];
-        const hsUrl = MatrixClientPeg.get().baseUrl;
-
-        this._showPresence = true;
-        if (enablePresenceByHsUrl && enablePresenceByHsUrl[hsUrl] !== undefined) {
-            this._showPresence = enablePresenceByHsUrl[hsUrl];
-        }
-    },
-
-    componentWillUnmount: function() {
-        const cli = MatrixClientPeg.get();
-        if (cli) {
-            cli.removeListener("RoomState.members", this.onRoomStateMember);
-            cli.removeListener("RoomMember.name", this.onRoomMemberName);
-            cli.removeListener("RoomState.events", this.onRoomStateEvent);
-            cli.removeListener("Room", this.onRoom);
-            cli.removeListener("User.lastPresenceTs", this.onUserLastPresenceTs);
-            // cli.removeListener("Room.timeline", this.onRoomTimeline);
-        }
-
-        // cancel any pending calls to the rate_limited_funcs
-        this._updateList.cancelPendingCall();
-    },
-
-/*
-    onRoomTimeline: function(ev, room, toStartOfTimeline, removed, data) {
-        // ignore anything but real-time updates at the end of the room:
-        // updates from pagination will happen when the paginate completes.
-        if (toStartOfTimeline || !data || !data.liveEvent) return;
-
-        // treat any activity from a user as implicit presence to update the
-        // ordering of the list whenever someone says something.
-        // Except right now we're not tiebreaking "active now" users in this way
-        // so don't bother for now.
-        if (ev.getSender()) {
-            // console.log("implicit presence from " + ev.getSender());
-
-            var tile = this.refs[ev.getSender()];
-            if (tile) {
-                // work around a race where you might have a room member object
-                // before the user object exists.  XXX: why does this ever happen?
-                var all_members = room.currentState.members;
-                var userId = ev.getSender();
-                if (all_members[userId].user === null) {
-                    all_members[userId].user = MatrixClientPeg.get().getUser(userId);
-                }
-                this._updateList(); // reorder the membership list
-            }
-        }
-    },
-*/
-
     onUserLastPresenceTs(event, user) {
         // Attach a SINGLE listener for global presence changes then locate the
         // member tile and re-render it. This is more efficient than every tile
@@ -130,28 +149,40 @@ module.exports = React.createClass({
         // We listen for room events because when we accept an invite
         // we need to wait till the room is fully populated with state
         // before refreshing the member list else we get a stale list.
-        this._updateList();
+        this._showMembersAccordingToMembershipWithLL();
+    },
+
+    onMyMembership: function(room, membership, oldMembership) {
+        if (room.roomId === this.props.roomId && membership === "join") {
+            this._showMembersAccordingToMembershipWithLL();
+        }
     },
 
     onRoomStateMember: function(ev, state, member) {
+        if (member.roomId !== this.props.roomId) {
+            return;
+        }
         this._updateList();
     },
 
     onRoomMemberName: function(ev, member) {
+        if (member.roomId !== this.props.roomId) {
+            return;
+        }
         this._updateList();
     },
 
     onRoomStateEvent: function(event, state) {
-        if (event.getType() === "m.room.third_party_invite") {
+        if (event.getRoomId() === this.props.roomId &&
+            event.getType() === "m.room.third_party_invite") {
             this._updateList();
         }
     },
 
     _updateList: new rate_limited_func(function() {
         // console.log("Updating memberlist");
-        this.memberDict = this.getMemberDict();
-
         const newState = {
+            loading: false,
             members: this.roomMembers(),
         };
         newState.filteredJoinedMembers = this._filterMembers(newState.members, 'join', this.state.searchQuery);
@@ -159,50 +190,43 @@ module.exports = React.createClass({
         this.setState(newState);
     }, 500),
 
-    getMemberDict: function() {
-        if (!this.props.roomId) return {};
+    getMembersWithUser: function() {
+        if (!this.props.roomId) return [];
         const cli = MatrixClientPeg.get();
         const room = cli.getRoom(this.props.roomId);
-        if (!room) return {};
+        if (!room) return [];
 
-        const all_members = room.currentState.members;
+        const allMembers = Object.values(room.currentState.members);
 
-        Object.keys(all_members).map(function(userId) {
+        allMembers.forEach(function(member) {
             // work around a race where you might have a room member object
             // before the user object exists.  This may or may not cause
             // https://github.com/vector-im/vector-web/issues/186
-            if (all_members[userId].user === null) {
-                all_members[userId].user = MatrixClientPeg.get().getUser(userId);
+            if (member.user === null) {
+                member.user = cli.getUser(member.userId);
             }
 
             // XXX: this user may have no lastPresenceTs value!
             // the right solution here is to fix the race rather than leave it as 0
         });
 
-        return all_members;
+        return allMembers;
     },
 
     roomMembers: function() {
-        const all_members = this.memberDict || {};
-        const all_user_ids = Object.keys(all_members);
         const ConferenceHandler = CallHandler.getConferenceHandler();
 
-        all_user_ids.sort(this.memberSort);
-
-        const to_display = [];
-        let count = 0;
-        for (let i = 0; i < all_user_ids.length; ++i) {
-            const user_id = all_user_ids[i];
-            const m = all_members[user_id];
-
-            if (m.membership === 'join' || m.membership === 'invite') {
-                if ((ConferenceHandler && !ConferenceHandler.isConferenceUser(user_id)) || !ConferenceHandler) {
-                    to_display.push(user_id);
-                    ++count;
-                }
-            }
-        }
-        return to_display;
+        const allMembers = this.getMembersWithUser();
+        const filteredAndSortedMembers = allMembers.filter((m) => {
+            return (
+                m.membership === 'join' || m.membership === 'invite'
+            ) && (
+                !ConferenceHandler ||
+                (ConferenceHandler && !ConferenceHandler.isConferenceUser(m.userId))
+            );
+        });
+        filteredAndSortedMembers.sort(this.memberSort);
+        return filteredAndSortedMembers;
     },
 
     _createOverflowTileJoined: function(overflowCount, totalCount) {
@@ -249,14 +273,12 @@ module.exports = React.createClass({
     // returns negative if a comes before b,
     // returns 0 if a and b are equivalent in ordering
     // returns positive if a comes after b.
-    memberSort: function(userIdA, userIdB) {
+    memberSort: function(memberA, memberB) {
             // order by last active, with "active now" first.
             // ...and then by power
             // ...and then alphabetically.
             // We could tiebreak instead by "last recently spoken in this room" if we wanted to.
 
-            const memberA = this.memberDict[userIdA];
-            const memberB = this.memberDict[userIdB];
             const userA = memberA.user;
             const userB = memberB.user;
 
@@ -306,9 +328,7 @@ module.exports = React.createClass({
     },
 
     _filterMembers: function(members, membership, query) {
-        return members.filter((userId) => {
-            const m = this.memberDict[userId];
-
+        return members.filter((m) => {
             if (query) {
                 query = query.toLowerCase();
                 const matchesName = m.name.toLowerCase().indexOf(query) !== -1;
@@ -350,10 +370,9 @@ module.exports = React.createClass({
     _makeMemberTiles: function(members, membership) {
         const MemberTile = sdk.getComponent("rooms.MemberTile");
 
-        const memberList = members.map((userId) => {
-            const m = this.memberDict[userId];
+        const memberList = members.map((m) => {
             return (
-                
+                
             );
         });
 
@@ -393,6 +412,11 @@ module.exports = React.createClass({
     },
 
     render: function() {
+        if (this.state.loading) {
+            const Spinner = sdk.getComponent("elements.Spinner");
+            return 
;
+        }
+
         const TruncatedList = sdk.getComponent("elements.TruncatedList");
         const GeminiScrollbarWrapper = sdk.getComponent("elements.GeminiScrollbarWrapper");
 
diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index bac996e65c..c5e389aa06 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -1,6 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2017 New Vector Ltd
+Copyright 2017, 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@ limitations under the License.
 */
 import React from 'react';
 import PropTypes from 'prop-types';
-import { _t } from '../../../languageHandler';
+import { _t, _td } from '../../../languageHandler';
 import CallHandler from '../../../CallHandler';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import Modal from '../../../Modal';
@@ -25,6 +25,18 @@ import dis from '../../../dispatcher';
 import RoomViewStore from '../../../stores/RoomViewStore';
 import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
 import Stickerpicker from './Stickerpicker';
+import { makeRoomPermalink } from '../../../matrix-to';
+
+const formatButtonList = [
+    _td("bold"),
+    _td("italic"),
+    _td("deleted"),
+    _td("underlined"),
+    _td("inline-code"),
+    _td("block-quote"),
+    _td("bulleted-list"),
+    _td("numbered-list"),
+];
 
 export default class MessageComposer extends React.Component {
     constructor(props, context) {
@@ -35,25 +47,24 @@ export default class MessageComposer extends React.Component {
         this.onUploadFileSelected = this.onUploadFileSelected.bind(this);
         this.uploadFiles = this.uploadFiles.bind(this);
         this.onVoiceCallClick = this.onVoiceCallClick.bind(this);
-        this.onInputContentChanged = this.onInputContentChanged.bind(this);
         this._onAutocompleteConfirm = this._onAutocompleteConfirm.bind(this);
         this.onToggleFormattingClicked = this.onToggleFormattingClicked.bind(this);
         this.onToggleMarkdownClicked = this.onToggleMarkdownClicked.bind(this);
         this.onInputStateChanged = this.onInputStateChanged.bind(this);
         this.onEvent = this.onEvent.bind(this);
+        this._onRoomStateEvents = this._onRoomStateEvents.bind(this);
         this._onRoomViewStoreUpdate = this._onRoomViewStoreUpdate.bind(this);
+        this._onTombstoneClick = this._onTombstoneClick.bind(this);
 
         this.state = {
-            autocompleteQuery: '',
-            selection: null,
             inputState: {
-                style: [],
+                marks: [],
                 blockType: null,
-                isRichtextEnabled: SettingsStore.getValue('MessageComposerInput.isRichTextEnabled'),
-                wordCount: 0,
+                isRichTextEnabled: SettingsStore.getValue('MessageComposerInput.isRichTextEnabled'),
             },
             showFormatting: SettingsStore.getValue('MessageComposer.showFormatting'),
             isQuoting: Boolean(RoomViewStore.getQuotingEvent()),
+            tombstone: this._getRoomTombstone(),
         };
     }
 
@@ -63,12 +74,31 @@ export default class MessageComposer extends React.Component {
         // marked as encrypted.
         // XXX: fragile as all hell - fixme somehow, perhaps with a dedicated Room.encryption event or something.
         MatrixClientPeg.get().on("event", this.onEvent);
+        MatrixClientPeg.get().on("RoomState.events", this._onRoomStateEvents);
         this._roomStoreToken = RoomViewStore.addListener(this._onRoomViewStoreUpdate);
+        this._waitForOwnMember();
+    }
+
+    _waitForOwnMember() {
+        // if we have the member already, do that
+        const me = this.props.room.getMember(MatrixClientPeg.get().getUserId());
+        if (me) {
+            this.setState({me});
+            return;
+        }
+        // Otherwise, wait for member loading to finish and then update the member for the avatar.
+        // The members should already be loading, and loadMembersIfNeeded
+        // will return the promise for the existing operation
+        this.props.room.loadMembersIfNeeded().then(() => {
+            const me = this.props.room.getMember(MatrixClientPeg.get().getUserId());
+            this.setState({me});
+        });
     }
 
     componentWillUnmount() {
         if (MatrixClientPeg.get()) {
             MatrixClientPeg.get().removeListener("event", this.onEvent);
+            MatrixClientPeg.get().removeListener("RoomState.events", this._onRoomStateEvents);
         }
         if (this._roomStoreToken) {
             this._roomStoreToken.remove();
@@ -81,6 +111,18 @@ export default class MessageComposer extends React.Component {
         this.forceUpdate();
     }
 
+    _onRoomStateEvents(ev, state) {
+        if (ev.getRoomId() !== this.props.room.roomId) return;
+
+        if (ev.getType() === 'm.room.tombstone') {
+            this.setState({tombstone: this._getRoomTombstone()});
+        }
+    }
+
+    _getRoomTombstone() {
+        return this.props.room.currentState.getStateEvents('m.room.tombstone', '');
+    }
+
     _onRoomViewStoreUpdate() {
         const isQuoting = Boolean(RoomViewStore.getQuotingEvent());
         if (this.state.isQuoting === isQuoting) return;
@@ -89,7 +131,7 @@ export default class MessageComposer extends React.Component {
 
     onUploadClick(ev) {
         if (MatrixClientPeg.get().isGuest()) {
-            dis.dispatch({action: 'view_set_mxid'});
+            dis.dispatch({action: 'require_registration'});
             return;
         }
 
@@ -175,13 +217,6 @@ export default class MessageComposer extends React.Component {
         });
     }
 
-    onInputContentChanged(content: string, selection: {start: number, end: number}) {
-        this.setState({
-            autocompleteQuery: content,
-            selection,
-        });
-    }
-
     onInputStateChanged(inputState) {
         this.setState({inputState});
     }
@@ -192,7 +227,7 @@ export default class MessageComposer extends React.Component {
         }
     }
 
-    onFormatButtonClicked(name: "bold" | "italic" | "strike" | "code" | "underline" | "quote" | "bullet" | "numbullet", event) {
+    onFormatButtonClicked(name, event) {
         event.preventDefault();
         this.messageComposerInput.onFormatButtonClicked(name, event);
     }
@@ -204,11 +239,21 @@ export default class MessageComposer extends React.Component {
 
     onToggleMarkdownClicked(e) {
         e.preventDefault(); // don't steal focus from the editor!
-        this.messageComposerInput.enableRichtext(!this.state.inputState.isRichtextEnabled);
+        this.messageComposerInput.enableRichtext(!this.state.inputState.isRichTextEnabled);
+    }
+
+    _onTombstoneClick(ev) {
+        ev.preventDefault();
+
+        const replacementRoomId = this.state.tombstone.getContent()['replacement_room'];
+        dis.dispatch({
+            action: 'view_room',
+            highlighted: true,
+            room_id: replacementRoomId,
+        });
     }
 
     render() {
-        const me = this.props.room.getMember(MatrixClientPeg.get().credentials.userId);
         const uploadInputStyle = {display: 'none'};
         const MemberAvatar = sdk.getComponent('avatars.MemberAvatar');
         const TintableSvg = sdk.getComponent("elements.TintableSvg");
@@ -216,11 +261,13 @@ export default class MessageComposer extends React.Component {
 
         const controls = [];
 
-        controls.push(
-            

-                
-            
,
-        );
+        if (this.state.me) {
+            controls.push(
+                

+                    
+                
,
+            );
+        }
 
         let e2eImg, e2eTitle, e2eClass;
         const roomIsEncrypted = MatrixClientPeg.get().isRoomEncrypted(this.props.room.roomId);
@@ -262,8 +309,8 @@ export default class MessageComposer extends React.Component {
                 
;
         }
 
-        const canSendMessages = this.props.room.currentState.maySendMessage(
-            MatrixClientPeg.get().credentials.userId);
+        const canSendMessages = !this.state.tombstone &&
+            this.props.room.maySendMessage();
 
         if (canSendMessages) {
             // This also currently includes the call buttons. Really we should
@@ -280,14 +327,14 @@ export default class MessageComposer extends React.Component {
                 

             );
 
-            const formattingButton = (
+            const formattingButton = this.state.inputState.isRichTextEnabled ? (
                 
-            );
+            ) : null;
 
             let placeholderText;
             if (this.state.isQuoting) {
@@ -314,7 +361,6 @@ export default class MessageComposer extends React.Component {
                     room={this.props.room}
                     placeholder={placeholderText}
                     onFilesPasted={this.uploadFiles}
-                    onContentChanged={this.onInputContentChanged}
                     onInputStateChanged={this.onInputStateChanged} />,
                 formattingButton,
                 stickerpickerButton,
@@ -323,6 +369,24 @@ export default class MessageComposer extends React.Component {
                 callButton,
                 videoCallButton,
             );
+        } else if (this.state.tombstone) {
+            const replacementRoomId = this.state.tombstone.getContent()['replacement_room'];
+
+            const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
+            controls.push(

+                

+                    
+                    
+                        {_t("This room has been replaced and is no longer active.")}
+                    

+                    
+                        {_t("The conversation continues here.")}
+                    
+                

+            
);
         } else {
             controls.push(
                 

@@ -331,11 +395,14 @@ export default class MessageComposer extends React.Component {
             );
         }
 
-        const {style, blockType} = this.state.inputState;
-        const formatButtons = ["bold", "italic", "strike", "underline", "code", "quote", "bullet", "numbullet"].map(
-            (name) => {
-                const active = style.includes(name) || blockType === name;
-                const suffix = active ? '-o-n' : '';
+        let formatBar;
+        if (this.state.showFormatting && this.state.inputState.isRichTextEnabled) {
+            const {marks, blockType} = this.state.inputState;
+            const formatButtons = formatButtonList.map((name) => {
+                // special-case to match the md serializer and the special-case in MessageComposerInput.js
+                const markName = name === 'inline-code' ? 'code' : name;
+                const active = marks.some(mark => mark.type === markName) || blockType === name;
+                const suffix = active ? '-on' : '';
                 const onFormatButtonClicked = this.onFormatButtonClicked.bind(this, name);
                 const className = 'mx_MessageComposer_format_button mx_filterFlipColor';
                 return ;
-            },
-        );
+                },
+            );
+
+            formatBar =
+                

+                    

+                        { formatButtons }
+                        

+                        
+                        
+                    

+                

+        }
 
         return (
             

@@ -354,20 +438,7 @@ export default class MessageComposer extends React.Component {
                         { controls }
                     

                 

-                

-                    

-                        { formatButtons }
-                        

-                        
-                        
-                    

-                

+                { formatBar }
             

         );
     }
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 4bb9c6fab5..c726f86808 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -1,6 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2017 New Vector Ltd
+Copyright 2017, 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -15,15 +15,21 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 import React from 'react';
+import ReactDOM from 'react-dom';
 import PropTypes from 'prop-types';
 import type SyntheticKeyboardEvent from 'react/lib/SyntheticKeyboardEvent';
 
-import {Editor, EditorState, RichUtils, CompositeDecorator, Modifier,
-    getDefaultKeyBinding, KeyBindingUtil, ContentState, ContentBlock, SelectionState,
-    Entity} from 'draft-js';
+import { Editor } from 'slate-react';
+import { getEventTransfer } from 'slate-react';
+import { Value, Document, Block, Inline, Text, Range, Node } from 'slate';
+import type { Change } from 'slate';
+
+import Html from 'slate-html-serializer';
+import Md from 'slate-md-serializer';
+import Plain from 'slate-plain-serializer';
+import PlainWithPillsSerializer from "../../../autocomplete/PlainWithPillsSerializer";
 
 import classNames from 'classnames';
-import escape from 'lodash/escape';
 import Promise from 'bluebird';
 
 import MatrixClientPeg from '../../../MatrixClientPeg';
@@ -45,10 +51,10 @@ import Markdown from '../../../Markdown';
 import ComposerHistoryManager from '../../../ComposerHistoryManager';
 import MessageComposerStore from '../../../stores/MessageComposerStore';
 
-import {MATRIXTO_MD_LINK_PATTERN} from '../../../linkify-matrix';
+import {MATRIXTO_MD_LINK_PATTERN, MATRIXTO_URL_PATTERN} from '../../../linkify-matrix';
 const REGEX_MATRIXTO_MARKDOWN_GLOBAL = new RegExp(MATRIXTO_MD_LINK_PATTERN, 'g');
 
-import {asciiRegexp, shortnameToUnicode, emojioneList, asciiList, mapUnicodeToShort} from 'emojione';
+import {asciiRegexp, unicodeRegexp, shortnameToUnicode, emojioneList, asciiList, mapUnicodeToShort, toShort} from 'emojione';
 import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
 import {makeUserPermalink} from "../../../matrix-to";
 import ReplyPreview from "./ReplyPreview";
@@ -59,22 +65,46 @@ import {ContentHelpers} from 'matrix-js-sdk';
 const EMOJI_SHORTNAMES = Object.keys(emojioneList);
 const EMOJI_UNICODE_TO_SHORTNAME = mapUnicodeToShort();
 const REGEX_EMOJI_WHITESPACE = new RegExp('(?:^|\\s)(' + asciiRegexp + ')\\s$');
+const EMOJI_REGEX = new RegExp(unicodeRegexp, 'g');
 
 const TYPING_USER_TIMEOUT = 10000, TYPING_SERVER_TIMEOUT = 30000;
 
-const ZWS_CODE = 8203;
-const ZWS = String.fromCharCode(ZWS_CODE); // zero width space
-
 const ENTITY_TYPES = {
     AT_ROOM_PILL: 'ATROOMPILL',
 };
 
-function stateToMarkdown(state) {
-    return __stateToMarkdown(state)
-        .replace(
-            ZWS, // draft-js-export-markdown adds these
-            ''); // this is *not* a zero width space, trust me :)
-}
+// the Slate node type to default to for unstyled text
+const DEFAULT_NODE = 'paragraph';
+
+// map HTML elements through to our Slate schema node types
+// used for the HTML deserializer.
+// (The names here are chosen to match the MD serializer's schema for convenience)
+const BLOCK_TAGS = {
+    p: 'paragraph',
+    blockquote: 'block-quote',
+    ul: 'bulleted-list',
+    h1: 'heading1',
+    h2: 'heading2',
+    h3: 'heading3',
+    h4: 'heading4',
+    h5: 'heading5',
+    h6: 'heading6',
+    li: 'list-item',
+    ol: 'numbered-list',
+    pre: 'code',
+};
+
+const MARK_TAGS = {
+    strong: 'bold',
+    b: 'bold', // deprecated
+    em: 'italic',
+    i: 'italic', // deprecated
+    code: 'code',
+    u: 'underlined',
+    del: 'deleted',
+    strike: 'deleted', // deprecated
+    s: 'deleted', // deprecated
+};
 
 function onSendMessageFailed(err, room) {
     // XXX: temporary logging to try to diagnose
@@ -85,6 +115,15 @@ function onSendMessageFailed(err, room) {
     });
 }
 
+function rangeEquals(a: Range, b: Range): boolean {
+    return (a.anchorKey === b.anchorKey
+        && a.anchorOffset === b.anchorOffset
+        && a.focusKey === b.focusKey
+        && a.focusOffset === b.focusOffset
+        && a.isFocused === b.isFocused
+        && a.isBackward === b.isBackward);
+}
+
 /*
  * The textInput part of the MessageComposer
  */
@@ -97,79 +136,170 @@ export default class MessageComposerInput extends React.Component {
         // js-sdk Room object
         room: PropTypes.object.isRequired,
 
-        // called with current plaintext content (as a string) whenever it changes
-        onContentChanged: PropTypes.func,
+        onFilesPasted: PropTypes.func,
 
         onInputStateChanged: PropTypes.func,
     };
 
-    static getKeyBinding(ev: SyntheticKeyboardEvent): string {
-        const ctrlCmdOnly = isOnlyCtrlOrCmdKeyEvent(ev);
-
-        // Restrict a subset of key bindings to ONLY having ctrl/meta* pressed and
-        // importantly NOT having alt, shift, meta/ctrl* pressed. draft-js does not
-        // handle this in `getDefaultKeyBinding` so we do it ourselves here.
-        //
-        // * if macOS, read second option
-        const ctrlCmdCommand = {
-            // C-m => Toggles between rich text and markdown modes
-            [KeyCode.KEY_M]: 'toggle-mode',
-            [KeyCode.KEY_B]: 'bold',
-            [KeyCode.KEY_I]: 'italic',
-            [KeyCode.KEY_U]: 'underline',
-            [KeyCode.KEY_J]: 'code',
-            [KeyCode.KEY_O]: 'split-block',
-        }[ev.keyCode];
-
-        if (ctrlCmdCommand) {
-            if (!ctrlCmdOnly) {
-                return null;
-            }
-            return ctrlCmdCommand;
-        }
-
-        // Handle keys such as return, left and right arrows etc.
-        return getDefaultKeyBinding(ev);
-    }
-
-    static getBlockStyle(block: ContentBlock): ?string {
-        if (block.getType() === 'strikethrough') {
-            return 'mx_Markdown_STRIKETHROUGH';
-        }
-
-        return null;
-    }
-
     client: MatrixClient;
     autocomplete: Autocomplete;
     historyManager: ComposerHistoryManager;
 
     constructor(props, context) {
         super(props, context);
-        this.onAction = this.onAction.bind(this);
-        this.handleReturn = this.handleReturn.bind(this);
-        this.handleKeyCommand = this.handleKeyCommand.bind(this);
-        this.onEditorContentChanged = this.onEditorContentChanged.bind(this);
-        this.onUpArrow = this.onUpArrow.bind(this);
-        this.onDownArrow = this.onDownArrow.bind(this);
-        this.onTab = this.onTab.bind(this);
-        this.onEscape = this.onEscape.bind(this);
-        this.setDisplayedCompletion = this.setDisplayedCompletion.bind(this);
-        this.onMarkdownToggleClicked = this.onMarkdownToggleClicked.bind(this);
-        this.onTextPasted = this.onTextPasted.bind(this);
 
-        const isRichtextEnabled = SettingsStore.getValue('MessageComposerInput.isRichTextEnabled');
+        const isRichTextEnabled = SettingsStore.getValue('MessageComposerInput.isRichTextEnabled');
 
-        Analytics.setRichtextMode(isRichtextEnabled);
+        Analytics.setRichtextMode(isRichTextEnabled);
 
+        this.client = MatrixClientPeg.get();
+
+        // track whether we should be trying to show autocomplete suggestions on the current editor
+        // contents. currently it's only suppressed when navigating history to avoid ugly flashes
+        // of unexpected corrections as you navigate.
+        // XXX: should this be in state?
+        this.suppressAutoComplete = false;
+
+        // track whether we've just pressed an arrowkey left or right in order to skip void nodes.
+        // see https://github.com/ianstormtaylor/slate/issues/762#issuecomment-304855095
+        this.direction = '';
+
+        this.plainWithMdPills    = new PlainWithPillsSerializer({ pillFormat: 'md' });
+        this.plainWithIdPills    = new PlainWithPillsSerializer({ pillFormat: 'id' });
+        this.plainWithPlainPills = new PlainWithPillsSerializer({ pillFormat: 'plain' });
+
+        this.md = new Md({
+            rules: [
+                {
+                    // if serialize returns undefined it falls through to the default hardcoded
+                    // serialization rules
+                    serialize: (obj, children) => {
+                        if (obj.object !== 'inline') return;
+                        switch (obj.type) {
+                            case 'pill':
+                                return `[${ obj.data.get('completion') }](${ obj.data.get('href') })`;
+                            case 'emoji':
+                                return obj.data.get('emojiUnicode');
+                        }
+                    },
+                }, {
+                    serialize: (obj, children) => {
+                        if (obj.object !== 'mark') return;
+                        // XXX: slate-md-serializer consumes marks other than bold, italic, code, inserted, deleted
+                        switch (obj.type) {
+                            case 'underlined':
+                                return `${ children }`;
+                            case 'deleted':
+                                return `${ children }`;
+                            case 'code':
+                                // XXX: we only ever get given `code` regardless of whether it was inline or block
+                                // XXX: workaround for https://github.com/tommoor/slate-md-serializer/issues/14
+                                // strip single backslashes from children, as they would have been escaped here
+                                return `\`${ children.split('\\').map((v) => v ? v : '\\').join('') }\``;
+                        }
+                    },
+                },
+            ],
+        });
+
+        this.html = new Html({
+            rules: [
+                {
+                    deserialize: (el, next) => {
+                        const tag = el.tagName.toLowerCase();
+                        let type = BLOCK_TAGS[tag];
+                        if (type) {
+                            return {
+                                object: 'block',
+                                type: type,
+                                nodes: next(el.childNodes),
+                            }
+                        }
+                        type = MARK_TAGS[tag];
+                        if (type) {
+                            return {
+                                object: 'mark',
+                                type: type,
+                                nodes: next(el.childNodes),
+                            }
+                        }
+                        // special case links
+                        if (tag === 'a') {
+                            const href = el.getAttribute('href');
+                            let m;
+                            if (href) {
+                                m = href.match(MATRIXTO_URL_PATTERN);
+                            }
+                            if (m) {
+                                return {
+                                    object: 'inline',
+                                    type: 'pill',
+                                    data: {
+                                        href,
+                                        completion: el.innerText,
+                                        completionId: m[1],
+                                    },
+                                    isVoid: true,
+                                }
+                            }
+                            else {
+                                return {
+                                    object: 'inline',
+                                    type: 'link',
+                                    data: { href },
+                                    nodes: next(el.childNodes),
+                                }
+                            }
+                        }
+                    },
+                    serialize: (obj, children) => {
+                        if (obj.object === 'block') {
+                            return this.renderNode({
+                                node: obj,
+                                children: children,
+                            });
+                        }
+                        else if (obj.object === 'mark') {
+                            return this.renderMark({
+                                mark: obj,
+                                children: children,
+                            });
+                        }
+                        else if (obj.object === 'inline') {
+                            // special case links, pills and emoji otherwise we
+                            // end up with React components getting rendered out(!)
+                            switch (obj.type) {
+                                case 'pill':
+                                    return { obj.data.get('completion') };
+                                case 'link':
+                                    return { children };
+                                case 'emoji':
+                                    // XXX: apparently you can't return plain strings from serializer rules
+                                    // until https://github.com/ianstormtaylor/slate/pull/1854 is merged.
+                                    // So instead we temporarily wrap emoji from RTE in an arbitrary tag
+                                    // ().   would be nicer, but in practice it causes CSS issues.
+                                    return { obj.data.get('emojiUnicode') };
+                            }
+                            return this.renderNode({
+                                node: obj,
+                                children: children,
+                            });
+                        }
+                    }
+                }
+            ]
+        });
+
+        const savedState = MessageComposerStore.getEditorState(this.props.room.roomId);
         this.state = {
             // whether we're in rich text or markdown mode
-            isRichtextEnabled,
+            isRichTextEnabled,
 
             // the currently displayed editor state (note: this is always what is modified on input)
             editorState: this.createEditorState(
-                isRichtextEnabled,
-                MessageComposerStore.getContentState(this.props.room.roomId),
+                isRichTextEnabled,
+                savedState ? savedState.editor_state : undefined,
+                savedState ? savedState.rich_text : undefined,
             ),
 
             // the original editor state, before we started tabbing through completions
@@ -182,144 +312,113 @@ export default class MessageComposerInput extends React.Component {
             // whether there were any completions
             someCompletions: null,
         };
-
-        this.client = MatrixClientPeg.get();
-    }
-
-    findPillEntities(contentState: ContentState, contentBlock: ContentBlock, callback) {
-        contentBlock.findEntityRanges(
-            (character) => {
-                const entityKey = character.getEntity();
-                return (
-                    entityKey !== null &&
-                    (
-                        contentState.getEntity(entityKey).getType() === 'LINK' ||
-                        contentState.getEntity(entityKey).getType() === ENTITY_TYPES.AT_ROOM_PILL
-                    )
-                );
-            }, callback,
-        );
     }
 
     /*
-     * "Does the right thing" to create an EditorState, based on:
+     * "Does the right thing" to create an Editor value, based on:
      * - whether we've got rich text mode enabled
      * - contentState was passed in
+     * - whether the contentState that was passed in was rich text
      */
-    createEditorState(richText: boolean, contentState: ?ContentState): EditorState {
-        const decorators = richText ? RichText.getScopedRTDecorators(this.props) :
-                RichText.getScopedMDDecorators(this.props);
-        const shouldShowPillAvatar = !SettingsStore.getValue("Pill.shouldHidePillAvatar");
-        decorators.push({
-            strategy: this.findPillEntities.bind(this),
-            component: (entityProps) => {
-                const Pill = sdk.getComponent('elements.Pill');
-                const type = entityProps.contentState.getEntity(entityProps.entityKey).getType();
-                const {url} = entityProps.contentState.getEntity(entityProps.entityKey).getData();
-                if (type === ENTITY_TYPES.AT_ROOM_PILL) {
-                    return ;
-                } else if (Pill.isPillUrl(url)) {
-                    return ;
-                }
-
-                return (
-                    
-                        { entityProps.children }
-                    
-                );
-            },
-        });
-        const compositeDecorator = new CompositeDecorator(decorators);
-
-        let editorState = null;
-        if (contentState) {
-            editorState = EditorState.createWithContent(contentState, compositeDecorator);
+    createEditorState(wantRichText: boolean, editorState: ?Value, wasRichText: ?boolean): Value {
+        if (editorState instanceof Value) {
+            if (wantRichText && !wasRichText) {
+                return this.mdToRichEditorState(editorState);
+            }
+            if (wasRichText && !wantRichText) {
+                return this.richToMdEditorState(editorState);
+            }
+            return editorState;
         } else {
-            editorState = EditorState.createEmpty(compositeDecorator);
+            // ...or create a new one. and explicitly focus it otherwise tab in-out issues
+            const base = Plain.deserialize('', { defaultBlock: DEFAULT_NODE });
+            return base.change().focus().value;
         }
-
-        return EditorState.moveFocusToEnd(editorState);
     }
 
-    componentDidMount() {
+    componentWillMount() {
         this.dispatcherRef = dis.register(this.onAction);
-        this.historyManager = new ComposerHistoryManager(this.props.room.roomId);
+        this.historyManager = new ComposerHistoryManager(this.props.room.roomId, 'mx_slate_composer_history_');
     }
 
     componentWillUnmount() {
         dis.unregister(this.dispatcherRef);
     }
 
-    componentWillUpdate(nextProps, nextState) {
-        // this is dirty, but moving all this state to MessageComposer is dirtier
-        if (this.props.onInputStateChanged && nextState !== this.state) {
-            const state = this.getSelectionInfo(nextState.editorState);
-            state.isRichtextEnabled = nextState.isRichtextEnabled;
-            this.props.onInputStateChanged(state);
-        }
-    }
-
     onAction = (payload) => {
         const editor = this.refs.editor;
-        let contentState = this.state.editorState.getCurrentContent();
+        let editorState = this.state.editorState;
 
         switch (payload.action) {
             case 'reply_to_event':
             case 'focus_composer':
-                editor.focus();
+                this.focusComposer();
                 break;
-            case 'insert_mention': {
-                // Pretend that we've autocompleted this user because keeping two code
-                // paths for inserting a user pill is not fun
-                const selection = this.state.editorState.getSelection();
-                const member = this.props.room.getMember(payload.user_id);
-                const completion = member ?
-                    member.rawDisplayName : payload.user_id;
-                this.setDisplayedCompletion({
-                    completion,
-                    selection,
-                    href: makeUserPermalink(payload.user_id),
-                    suffix: selection.getStartOffset() === 0 ? ': ' : ' ',
+            case 'insert_mention':
+                {
+                    // Pretend that we've autocompleted this user because keeping two code
+                    // paths for inserting a user pill is not fun
+                    const selection = this.getSelectionRange(this.state.editorState);
+                    const member = this.props.room.getMember(payload.user_id);
+                    const completion = member ?
+                        member.rawDisplayName : payload.user_id;
+                    this.setDisplayedCompletion({
+                        completion,
+                        completionId: payload.user_id,
+                        selection,
+                        href: makeUserPermalink(payload.user_id),
+                        suffix: (selection.beginning && selection.start === 0) ? ': ' : ' ',
+                    });
+                }
+                break;
+            case 'quote': {
+                const html = HtmlUtils.bodyToHtml(payload.event.getContent(), null, {
+                    forComposerQuote: true,
+                    returnString: true,
+                    emojiOne: false,
                 });
-            }
-                break;
+                const fragment = this.html.deserialize(html);
+                // FIXME: do we want to put in a permalink to the original quote here?
+                // If so, what should be the format, and how do we differentiate it from replies?
 
-            case 'quote': { // old quoting, whilst rich quoting is in labs
-                /// XXX: Not doing rich-text quoting from formatted-body because draft-js
-                /// has regressed such that when links are quoted, errors are thrown. See
-                /// https://github.com/vector-im/riot-web/issues/4756.
-                const body = escape(payload.text);
-                if (body) {
-                    let content = RichText.htmlToContentState(`
${body}
`);
-                    if (!this.state.isRichtextEnabled) {
-                        content = ContentState.createFromText(RichText.stateToMarkdown(content));
+                const quote = Block.create('block-quote');
+                if (this.state.isRichTextEnabled) {
+                    let change = editorState.change();
+                    const anchorText = editorState.anchorText;
+                    if ((!anchorText || anchorText.text === '') && editorState.anchorBlock.nodes.size === 1) {
+                        // replace the current block rather than split the block
+                        // XXX: this destroys our focus by deleting the thing we are anchored/focused on
+                        change = change.replaceNodeByKey(editorState.anchorBlock.key, quote);
+                    } else {
+                        // insert it into the middle of the block (splitting it)
+                        change = change.insertBlock(quote);
                     }
 
-                    const blockMap = content.getBlockMap();
-                    let startSelection = SelectionState.createEmpty(contentState.getFirstBlock().getKey());
-                    contentState = Modifier.splitBlock(contentState, startSelection);
-                    startSelection = SelectionState.createEmpty(contentState.getFirstBlock().getKey());
-                    contentState = Modifier.replaceWithFragment(contentState,
-                        startSelection,
-                        blockMap);
-                    startSelection = SelectionState.createEmpty(contentState.getFirstBlock().getKey());
-                    if (this.state.isRichtextEnabled) {
-                        contentState = Modifier.setBlockType(contentState, startSelection, 'blockquote');
+                    // XXX: heuristic to strip out wrapping 
 which breaks quoting in RT mode
+                    if (fragment.document.nodes.size && fragment.document.nodes.get(0).type === DEFAULT_NODE) {
+                        change = change.insertFragmentByKey(quote.key, 0, fragment.document.nodes.get(0));
+                    } else {
+                        change = change.insertFragmentByKey(quote.key, 0, fragment.document);
                     }
-                    let editorState = EditorState.push(this.state.editorState, contentState, 'insert-characters');
-                    editorState = EditorState.moveSelectionToEnd(editorState);
-                    this.onEditorContentChanged(editorState);
-                    editor.focus();
+
+                    // XXX: this is to bring back the focus in a sane place and add a paragraph after it
+                    change = change.select({
+                        anchorKey: quote.key,
+                        focusKey: quote.key,
+                    }).collapseToEndOfBlock().insertBlock(Block.create(DEFAULT_NODE)).focus();
+
+                    this.onChange(change);
+                } else {
+                    let fragmentChange = fragment.change();
+                    fragmentChange.moveToRangeOf(fragment.document)
+                                  .wrapBlock(quote);
+
+                    // FIXME: handle pills and use commonmark rather than md-serialize
+                    const md = this.md.serialize(fragmentChange.value);
+                    let change = editorState.change()
+                                            .insertText(md + '\n\n')
+                                            .focus();
+                    this.onChange(change);
                 }
             }
                 break;
@@ -373,7 +472,7 @@ export default class MessageComposerInput extends React.Component {
 
     stopServerTypingTimer() {
         if (this.serverTypingTimer) {
-            clearTimeout(this.servrTypingTimer);
+            clearTimeout(this.serverTypingTimer);
             this.serverTypingTimer = null;
         }
     }
@@ -393,195 +492,417 @@ export default class MessageComposerInput extends React.Component {
         }
     }
 
-    // Called by Draft to change editor contents
-    onEditorContentChanged = (editorState: EditorState) => {
-        editorState = RichText.attachImmutableEntitiesToEmoji(editorState);
+    onChange = (change: Change, originalEditorState?: Value) => {
+        let editorState = change.value;
 
-        const currentBlock = editorState.getSelection().getStartKey();
-        const currentSelection = editorState.getSelection();
-        const currentStartOffset = editorState.getSelection().getStartOffset();
-
-        const block = editorState.getCurrentContent().getBlockForKey(currentBlock);
-        const text = block.getText();
-
-        const entityBeforeCurrentOffset = block.getEntityAt(currentStartOffset - 1);
-        const entityAtCurrentOffset = block.getEntityAt(currentStartOffset);
-
-        // If the cursor is on the boundary between an entity and a non-entity and the
-        // text before the cursor has whitespace at the end, set the entity state of the
-        // character before the cursor (the whitespace) to null. This allows the user to
-        // stop editing the link.
-        if (entityBeforeCurrentOffset && !entityAtCurrentOffset &&
-            /\s$/.test(text.slice(0, currentStartOffset))) {
-            editorState = RichUtils.toggleLink(
-                editorState,
-                currentSelection.merge({
-                    anchorOffset: currentStartOffset - 1,
-                    focusOffset: currentStartOffset,
-                }),
-                null,
-            );
-            // Reset selection
-            editorState = EditorState.forceSelection(editorState, currentSelection);
-        }
-
-        // Automatic replacement of plaintext emoji to Unicode emoji
-        if (SettingsStore.getValue('MessageComposerInput.autoReplaceEmoji')) {
-            // The first matched group includes just the matched plaintext emoji
-            const emojiMatch = REGEX_EMOJI_WHITESPACE.exec(text.slice(0, currentStartOffset));
-            if (emojiMatch) {
-                // plaintext -> hex unicode
-                const emojiUc = asciiList[emojiMatch[1]];
-                // hex unicode -> shortname -> actual unicode
-                const unicodeEmoji = shortnameToUnicode(EMOJI_UNICODE_TO_SHORTNAME[emojiUc]);
-                const newContentState = Modifier.replaceText(
-                    editorState.getCurrentContent(),
-                    currentSelection.merge({
-                        anchorOffset: currentStartOffset - emojiMatch[1].length - 1,
-                        focusOffset: currentStartOffset,
-                    }),
-                    unicodeEmoji,
-                );
-                editorState = EditorState.push(
-                    editorState,
-                    newContentState,
-                    'insert-characters',
-                );
-                editorState = EditorState.forceSelection(editorState, newContentState.getSelectionAfter());
+        if (this.direction !== '') {
+            const focusedNode = editorState.focusInline || editorState.focusText;
+            if (focusedNode.isVoid) {
+                // XXX: does this work in RTL?
+                const edge = this.direction === 'Previous' ? 'End' : 'Start';
+                if (editorState.isCollapsed) {
+                    change = change[`collapseTo${ edge }Of${ this.direction }Text`]();
+                } else {
+                    const block = this.direction === 'Previous' ? editorState.previousText : editorState.nextText;
+                    if (block) {
+                        change = change[`moveFocusTo${ edge }Of`](block);
+                    }
+                }
+                editorState = change.value;
             }
         }
 
-        /* Since a modification was made, set originalEditorState to null, since newState is now our original */
+        // when in autocomplete mode and selection changes hide the autocomplete.
+        // Selection changes when we enter text so use a heuristic to compare documents without doing it recursively
+        if (this.autocomplete.state.completionList.length > 0 && !this.autocomplete.state.hide &&
+            !rangeEquals(this.state.editorState.selection, editorState.selection) &&
+            // XXX: the heuristic failed when inlines like pills weren't taken into account. This is inideal
+            this.state.editorState.document.toJSON() === editorState.document.toJSON())
+        {
+            this.autocomplete.hide();
+        }
+
+        if (!editorState.document.isEmpty) {
+            this.onTypingActivity();
+        } else {
+            this.onFinishedTyping();
+        }
+
+        if (editorState.startText !== null) {
+            const text = editorState.startText.text;
+            const currentStartOffset = editorState.startOffset;
+
+            // Automatic replacement of plaintext emoji to Unicode emoji
+            if (SettingsStore.getValue('MessageComposerInput.autoReplaceEmoji')) {
+                // The first matched group includes just the matched plaintext emoji
+                const emojiMatch = REGEX_EMOJI_WHITESPACE.exec(text.slice(0, currentStartOffset));
+                if (emojiMatch) {
+                    // plaintext -> hex unicode
+                    const emojiUc = asciiList[emojiMatch[1]];
+                    // hex unicode -> shortname -> actual unicode
+                    const unicodeEmoji = shortnameToUnicode(EMOJI_UNICODE_TO_SHORTNAME[emojiUc]);
+
+                    const range = Range.create({
+                        anchorKey: editorState.selection.startKey,
+                        anchorOffset: currentStartOffset - emojiMatch[1].length - 1,
+                        focusKey: editorState.selection.startKey,
+                        focusOffset: currentStartOffset - 1,
+                    });
+                    change = change.insertTextAtRange(range, unicodeEmoji);
+                    editorState = change.value;
+                }
+            }
+        }
+
+        // emojioneify any emoji
+        editorState.document.getTexts().forEach(node => {
+            if (node.text !== '' && HtmlUtils.containsEmoji(node.text)) {
+                let match;
+                while ((match = EMOJI_REGEX.exec(node.text)) !== null) {
+                    const range = Range.create({
+                        anchorKey: node.key,
+                        anchorOffset: match.index,
+                        focusKey: node.key,
+                        focusOffset: match.index + match[0].length,
+                    });
+                    const inline = Inline.create({
+                        type: 'emoji',
+                        data: { emojiUnicode: match[0] },
+                        isVoid: true,
+                    });
+                    change = change.insertInlineAtRange(range, inline);
+                    editorState = change.value;
+                }
+            }
+        });
+
+        // work around weird bug where inserting emoji via the macOS
+        // emoji picker can leave the selection stuck in the emoji's
+        // child text.  This seems to happen due to selection getting
+        // moved in the normalisation phase after calculating these changes
+        if (editorState.anchorKey &&
+            editorState.document.getParent(editorState.anchorKey).type === 'emoji')
+        {
+            change = change.collapseToStartOfNextText();
+            editorState = change.value;
+        }
+
+        if (this.props.onInputStateChanged && editorState.blocks.size > 0) {
+            let blockType = editorState.blocks.first().type;
+            // console.log("onInputStateChanged; current block type is " + blockType + " and marks are " + editorState.activeMarks);
+
+            if (blockType === 'list-item') {
+                const parent = editorState.document.getParent(editorState.blocks.first().key);
+                if (parent.type === 'numbered-list') {
+                    blockType = 'numbered-list';
+                }
+                else if (parent.type === 'bulleted-list') {
+                    blockType = 'bulleted-list';
+                }
+            }
+            const inputState = {
+                marks: editorState.activeMarks,
+                isRichTextEnabled: this.state.isRichTextEnabled,
+                blockType
+            };
+            this.props.onInputStateChanged(inputState);
+        }
+
+        // Record the editor state for this room so that it can be retrieved after switching to another room and back
+        MessageComposerStore.setEditorState(this.props.room.roomId, editorState, this.state.isRichTextEnabled);
+
         this.setState({
             editorState,
-            originalEditorState: null,
+            originalEditorState: originalEditorState || null
         });
     };
 
-    /**
-     * We're overriding setState here because it's the most convenient way to monitor changes to the editorState.
-     * Doing it using a separate function that calls setState is a possibility (and was the old approach), but that
-     * approach requires a callback and an extra setState whenever trying to set multiple state properties.
-     *
-     * @param state
-     * @param callback
-     */
-    setState(state, callback) {
-        if (state.editorState != null) {
-            state.editorState = RichText.attachImmutableEntitiesToEmoji(
-                state.editorState);
+    mdToRichEditorState(editorState: Value): Value {
+        // for consistency when roundtripping, we could use slate-md-serializer rather than
+        // commonmark, but then we would lose pills as the MD deserialiser doesn't know about
+        // them and doesn't have any extensibility hooks.
+        //
+        // The code looks like this:
+        //
+        // const markdown = this.plainWithMdPills.serialize(editorState);
+        //
+        // // weirdly, the Md serializer can't deserialize '' to a valid Value...
+        // if (markdown !== '') {
+        //     editorState = this.md.deserialize(markdown);
+        // }
+        // else {
+        //     editorState = Plain.deserialize('', { defaultBlock: DEFAULT_NODE });
+        // }
 
-            // Hide the autocomplete if the cursor location changes but the plaintext
-            // content stays the same. We don't hide if the pt has changed because the
-            // autocomplete will probably have different completions to show.
-            if (
-                !state.editorState.getSelection().equals(
-                    this.state.editorState.getSelection(),
-                )
-                && state.editorState.getCurrentContent().getPlainText() ===
-                this.state.editorState.getCurrentContent().getPlainText()
-            ) {
-                this.autocomplete.hide();
-            }
+        // so, instead, we use commonmark proper (which is arguably more logical to the user
+        // anyway, as they'll expect the RTE view to match what they'll see in the timeline,
+        // but the HTML->MD conversion is anyone's guess).
 
-            if (state.editorState.getCurrentContent().hasText()) {
-                this.onTypingActivity();
-            } else {
-                this.onFinishedTyping();
-            }
+        const textWithMdPills = this.plainWithMdPills.serialize(editorState);
+        const markdown = new Markdown(textWithMdPills);
+        // HTML deserialize has custom rules to turn matrix.to links into pill objects.
+        return this.html.deserialize(markdown.toHTML());
+    }
 
-            // Record the editor state for this room so that it can be retrieved after
-            // switching to another room and back
-            dis.dispatch({
-                action: 'content_state',
-                room_id: this.props.room.roomId,
-                content_state: state.editorState.getCurrentContent(),
-            });
-
-            if (!state.hasOwnProperty('originalEditorState')) {
-                state.originalEditorState = null;
-            }
-        }
-
-        super.setState(state, () => {
-            if (callback != null) {
-                callback();
-            }
-
-            const textContent = this.state.editorState.getCurrentContent().getPlainText();
-            const selection = RichText.selectionStateToTextOffsets(
-                this.state.editorState.getSelection(),
-                this.state.editorState.getCurrentContent().getBlocksAsArray());
-            if (this.props.onContentChanged) {
-                this.props.onContentChanged(textContent, selection);
-            }
-
-            // Scroll to the bottom of the editor if the cursor is on the last line of the
-            // composer. For some reason the editor won't scroll automatically if we paste
-            // blocks of text in or insert newlines.
-            if (textContent.slice(selection.start).indexOf("\n") === -1) {
-                let editorRoot = this.refs.editor.refs.editor.parentNode.parentNode;
-                editorRoot.scrollTop = editorRoot.scrollHeight;
-            }
-        });
+    richToMdEditorState(editorState: Value): Value {
+        // FIXME: this conversion loses pills (turning them into pure MD links).
+        // We need to add a pill-aware deserialize method
+        // to PlainWithPillsSerializer which recognises pills in raw MD and turns them into pills.
+        return Plain.deserialize(
+            // FIXME: we compile the MD out of the RTE state using slate-md-serializer
+            // which doesn't roundtrip symmetrically with commonmark, which we use for
+            // compiling MD out of the MD editor state above.
+            this.md.serialize(editorState),
+            { defaultBlock: DEFAULT_NODE }
+        );
     }
 
     enableRichtext(enabled: boolean) {
-        if (enabled === this.state.isRichtextEnabled) return;
+        if (enabled === this.state.isRichTextEnabled) return;
 
-        let contentState = null;
+        let editorState = null;
         if (enabled) {
-            const md = new Markdown(this.state.editorState.getCurrentContent().getPlainText());
-            contentState = RichText.htmlToContentState(md.toHTML());
+            editorState = this.mdToRichEditorState(this.state.editorState);
         } else {
-            let markdown = RichText.stateToMarkdown(this.state.editorState.getCurrentContent());
-            if (markdown[markdown.length - 1] === '\n') {
-                markdown = markdown.substring(0, markdown.length - 1); // stateToMarkdown tacks on an extra newline (?!?)
-            }
-            contentState = ContentState.createFromText(markdown);
+            editorState = this.richToMdEditorState(this.state.editorState);
         }
 
         Analytics.setRichtextMode(enabled);
 
         this.setState({
-            editorState: this.createEditorState(enabled, contentState),
-            isRichtextEnabled: enabled,
+            editorState: this.createEditorState(enabled, editorState),
+            isRichTextEnabled: enabled,
+        }, ()=>{
+            this.refs.editor.focus();
         });
+
         SettingsStore.setValue("MessageComposerInput.isRichTextEnabled", null, SettingLevel.ACCOUNT, enabled);
-    }
+    };
+
+    /**
+    * Check if the current selection has a mark with `type` in it.
+    *
+    * @param {String} type
+    * @return {Boolean}
+    */
+
+    hasMark = type => {
+        const { editorState } = this.state
+        return editorState.activeMarks.some(mark => mark.type === type)
+    };
+
+    /**
+    * Check if the any of the currently selected blocks are of `type`.
+    *
+    * @param {String} type
+    * @return {Boolean}
+    */
+
+    hasBlock = type => {
+        const { editorState } = this.state
+        return editorState.blocks.some(node => node.type === type)
+    };
+
+    onKeyDown = (ev: KeyboardEvent, change: Change, editor: Editor) => {
+
+        this.suppressAutoComplete = false;
+
+        // skip void nodes - see
+        // https://github.com/ianstormtaylor/slate/issues/762#issuecomment-304855095
+        if (ev.keyCode === KeyCode.LEFT) {
+            this.direction = 'Previous';
+        }
+        else if (ev.keyCode === KeyCode.RIGHT) {
+            this.direction = 'Next';
+        } else {
+            this.direction = '';
+        }
+
+        switch (ev.keyCode) {
+            case KeyCode.ENTER:
+                return this.handleReturn(ev, change);
+            case KeyCode.BACKSPACE:
+                return this.onBackspace(ev, change);
+            case KeyCode.UP:
+                return this.onVerticalArrow(ev, true);
+            case KeyCode.DOWN:
+                return this.onVerticalArrow(ev, false);
+            case KeyCode.TAB:
+                return this.onTab(ev);
+            case KeyCode.ESCAPE:
+                return this.onEscape(ev);
+            case KeyCode.SPACE:
+                return this.onSpace(ev, change);
+        }
+
+        if (isOnlyCtrlOrCmdKeyEvent(ev)) {
+            const ctrlCmdCommand = {
+                // C-m => Toggles between rich text and markdown modes
+                [KeyCode.KEY_M]: 'toggle-mode',
+                [KeyCode.KEY_B]: 'bold',
+                [KeyCode.KEY_I]: 'italic',
+                [KeyCode.KEY_U]: 'underlined',
+                [KeyCode.KEY_J]: 'inline-code',
+            }[ev.keyCode];
+
+            if (ctrlCmdCommand) {
+                ev.preventDefault(); // to prevent clashing with Mac's minimize window
+                return this.handleKeyCommand(ctrlCmdCommand);
+            }
+        }
+    };
+
+    onSpace = (ev: KeyboardEvent, change: Change): Change => {
+        if (ev.metaKey || ev.altKey || ev.shiftKey || ev.ctrlKey) {
+            return;
+        }
+
+        // drop a point in history so the user can undo a word
+        // XXX: this seems nasty but adding to history manually seems a no-go
+        ev.preventDefault();
+        return change.setOperationFlag("skip", false).setOperationFlag("merge", false).insertText(ev.key);
+    };
+
+    onBackspace = (ev: KeyboardEvent, change: Change): Change => {
+        if (ev.metaKey || ev.altKey || ev.shiftKey) {
+            return;
+        }
+
+        const { editorState } = this.state;
+
+        // Allow Ctrl/Cmd-Backspace when focus starts at the start of the composer (e.g select-all)
+        // for some reason if slate sees you Ctrl-backspace and your anchorOffset=0 it just resets your focus
+        if (!editorState.isCollapsed && editorState.anchorOffset === 0) {
+            return change.delete();
+        }
+
+        if (this.state.isRichTextEnabled) {
+            // let backspace exit lists
+            const isList = this.hasBlock('list-item');
+
+            if (isList && editorState.anchorOffset == 0) {
+                change
+                    .setBlocks(DEFAULT_NODE)
+                    .unwrapBlock('bulleted-list')
+                    .unwrapBlock('numbered-list');
+                return change;
+            }
+            else if (editorState.anchorOffset == 0 && editorState.isCollapsed) {
+                // turn blocks back into paragraphs
+                if ((this.hasBlock('block-quote') ||
+                     this.hasBlock('heading1') ||
+                     this.hasBlock('heading2') ||
+                     this.hasBlock('heading3') ||
+                     this.hasBlock('heading4') ||
+                     this.hasBlock('heading5') ||
+                     this.hasBlock('heading6') ||
+                     this.hasBlock('code')))
+                {
+                    return change.setBlocks(DEFAULT_NODE);
+                }
+
+                // remove paragraphs entirely if they're nested
+                const parent = editorState.document.getParent(editorState.anchorBlock.key);
+                if (editorState.anchorOffset == 0 &&
+                    this.hasBlock('paragraph') &&
+                    parent.nodes.size == 1 &&
+                    parent.object !== 'document')
+                {
+                    return change.replaceNodeByKey(editorState.anchorBlock.key, editorState.anchorText)
+                                 .collapseToEndOf(parent)
+                                 .focus();
+                }
+            }
+        }
+        return;
+    };
 
     handleKeyCommand = (command: string): boolean => {
         if (command === 'toggle-mode') {
-            this.enableRichtext(!this.state.isRichtextEnabled);
+            this.enableRichtext(!this.state.isRichTextEnabled);
             return true;
         }
-        let newState: ?EditorState = null;
+
+        let newState: ?Value = null;
 
         // Draft handles rich text mode commands by default but we need to do it ourselves for Markdown.
-        if (this.state.isRichtextEnabled) {
-            // These are block types, not handled by RichUtils by default.
-            const blockCommands = ['code-block', 'blockquote', 'unordered-list-item', 'ordered-list-item'];
-            const currentBlockType = RichUtils.getCurrentBlockType(this.state.editorState);
+        if (this.state.isRichTextEnabled) {
+            const type = command;
+            const { editorState } = this.state;
+            const change = editorState.change();
+            const { document } = editorState;
+            switch (type) {
+                // list-blocks:
+                case 'bulleted-list':
+                case 'numbered-list': {
+                    // Handle the extra wrapping required for list buttons.
+                    const isList = this.hasBlock('list-item');
+                    const isType = editorState.blocks.some(block => {
+                        return !!document.getClosest(block.key, parent => parent.type === type);
+                    });
 
-            const shouldToggleBlockFormat = (
-                command === 'backspace' ||
-                command === 'split-block'
-            ) && currentBlockType !== 'unstyled';
-
-            if (blockCommands.includes(command)) {
-                newState = RichUtils.toggleBlockType(this.state.editorState, command);
-            } else if (command === 'strike') {
-                // this is the only inline style not handled by Draft by default
-                newState = RichUtils.toggleInlineStyle(this.state.editorState, 'STRIKETHROUGH');
-            } else if (shouldToggleBlockFormat) {
-                const currentStartOffset = this.state.editorState.getSelection().getStartOffset();
-                const currentEndOffset = this.state.editorState.getSelection().getEndOffset();
-                if (currentStartOffset === 0 && currentEndOffset === 0) {
-                    // Toggle current block type (setting it to 'unstyled')
-                    newState = RichUtils.toggleBlockType(this.state.editorState, currentBlockType);
+                    if (isList && isType) {
+                        change
+                            .setBlocks(DEFAULT_NODE)
+                            .unwrapBlock('bulleted-list')
+                            .unwrapBlock('numbered-list');
+                    } else if (isList) {
+                        change
+                            .unwrapBlock(
+                                type === 'bulleted-list' ? 'numbered-list' : 'bulleted-list'
+                            )
+                            .wrapBlock(type);
+                    } else {
+                        change.setBlocks('list-item').wrapBlock(type);
+                    }
                 }
+                break;
+
+                // simple blocks
+                case 'paragraph':
+                case 'block-quote':
+                case 'heading1':
+                case 'heading2':
+                case 'heading3':
+                case 'heading4':
+                case 'heading5':
+                case 'heading6':
+                case 'list-item':
+                case 'code': {
+                    const isActive = this.hasBlock(type);
+                    const isList = this.hasBlock('list-item');
+
+                    if (isList) {
+                        change
+                            .setBlocks(isActive ? DEFAULT_NODE : type)
+                            .unwrapBlock('bulleted-list')
+                            .unwrapBlock('numbered-list');
+                    } else {
+                        change.setBlocks(isActive ? DEFAULT_NODE : type);
+                    }
+                }
+                break;
+
+                // marks:
+                case 'bold':
+                case 'italic':
+                case 'inline-code':
+                case 'underlined':
+                case 'deleted': {
+                    change.toggleMark(type === 'inline-code' ? 'code' : type);
+                }
+                break;
+
+                default:
+                    console.warn(`ignoring unrecognised RTE command ${type}`);
+                    return false;
             }
+
+            this.onChange(change);
+
+            return true;
         } else {
+/*
             const contentState = this.state.editorState.getCurrentContent();
             const multipleLinesSelected = RichText.hasMultiLineSelection(this.state.editorState);
 
@@ -601,7 +922,7 @@ export default class MessageComposerInput extends React.Component {
                 'strike': (text) => `${text}`,
                 // ("code" is triggered by ctrl+j by draft-js by default)
                 'code': (text) => treatInlineCodeAsBlock ? textMdCodeBlock(text) : `\`${text}\``,
-                'code-block': textMdCodeBlock,
+                'code': textMdCodeBlock,
                 'blockquote': (text) => text.split('\n').map((line) => `> ${line}\n`).join('') + '\n',
                 'unordered-list-item': (text) => text.split('\n').map((line) => `\n- ${line}`).join(''),
                 'ordered-list-item': (text) => text.split('\n').map((line, i) => `\n${i + 1}. ${line}`).join(''),
@@ -613,20 +934,21 @@ export default class MessageComposerInput extends React.Component {
                 'underline': -4,
                 'strike': -6,
                 'code': treatInlineCodeAsBlock ? -5 : -1,
-                'code-block': -5,
+                'code': -5,
                 'blockquote': -2,
             }[command];
 
-            // Returns a function that collapses a selectionState to its end and moves it by offset
-            const collapseAndOffsetSelection = (selectionState, offset) => {
-                const key = selectionState.getEndKey();
-                return new SelectionState({
+            // Returns a function that collapses a selection to its end and moves it by offset
+            const collapseAndOffsetSelection = (selection, offset) => {
+                const key = selection.endKey();
+                return new Range({
                     anchorKey: key, anchorOffset: offset,
                     focusKey: key, focusOffset: offset,
                 });
             };
 
             if (modifyFn) {
+
                 const previousSelection = this.state.editorState.getSelection();
                 const newContentState = RichText.modifyText(contentState, previousSelection, modifyFn);
                 newState = EditorState.push(
@@ -651,88 +973,106 @@ export default class MessageComposerInput extends React.Component {
             }
         }
 
-        if (newState == null) {
-            newState = RichUtils.handleKeyCommand(this.state.editorState, command);
-        }
-
         if (newState != null) {
             this.setState({editorState: newState});
             return true;
         }
-
+*/
+        }
         return false;
     };
 
-    onTextPasted(text: string, html?: string) {
-        const currentSelection = this.state.editorState.getSelection();
-        const currentContent = this.state.editorState.getCurrentContent();
+    onPaste = (event: Event, change: Change, editor: Editor): Change => {
+        const transfer = getEventTransfer(event);
 
-        let contentState = null;
-        if (html && this.state.isRichtextEnabled) {
-            contentState = Modifier.replaceWithFragment(
-                currentContent,
-                currentSelection,
-                RichText.htmlToContentState(html).getBlockMap(),
-            );
-        } else {
-            contentState = Modifier.replaceText(currentContent, currentSelection, text);
+        switch (transfer.type) {
+            case 'files':
+                return this.props.onFilesPasted(transfer.files);
+            case 'html': {
+                if (this.state.isRichTextEnabled) {
+                    // FIXME: https://github.com/ianstormtaylor/slate/issues/1497 means
+                    // that we will silently discard nested blocks (e.g. nested lists) :(
+                    const fragment = this.html.deserialize(transfer.html);
+                    return change
+                    // XXX: this somehow makes Slate barf on undo and get too empty and break entirely
+                    // .setOperationFlag("skip", false)
+                    // .setOperationFlag("merge", false)
+                        .insertFragment(fragment.document);
+                } else {
+                    // in MD mode we don't want the rich content pasted as the magic was annoying people so paste plain
+                    return change
+                        .setOperationFlag("skip", false)
+                        .setOperationFlag("merge", false)
+                        .insertText(transfer.text);
+                }
+            }
+            case 'text':
+                // don't skip/merge so that multiple consecutive pastes can be undone individually
+                return change
+                    .setOperationFlag("skip", false)
+                    .setOperationFlag("merge", false)
+                    .insertText(transfer.text);
         }
+    };
 
-        let newEditorState = EditorState.push(this.state.editorState, contentState, 'insert-characters');
-
-        newEditorState = EditorState.forceSelection(newEditorState, contentState.getSelectionAfter());
-        this.onEditorContentChanged(newEditorState);
-        return true;
-    }
-
-    handleReturn(ev) {
+    handleReturn = (ev, change) => {
         if (ev.shiftKey) {
-            this.onEditorContentChanged(RichUtils.insertSoftNewline(this.state.editorState));
-            return true;
+            return change.insertText('\n');
         }
 
-        const currentBlockType = RichUtils.getCurrentBlockType(this.state.editorState);
-        if (
-            ['code-block', 'blockquote', 'unordered-list-item', 'ordered-list-item']
-            .includes(currentBlockType)
-        ) {
-            // By returning false, we allow the default draft-js key binding to occur,
-            // which in this case invokes "split-block". This creates a new block of the
-            // same type, allowing the user to delete it with backspace.
-            // See handleKeyCommand (when command === 'backspace')
-            return false;
+        const editorState = this.state.editorState;
+
+        const lastBlock = editorState.blocks.last();
+        if (['code', 'block-quote', 'list-item'].includes(lastBlock.type)) {
+            const text = lastBlock.text;
+            if (text === '') {
+                // allow the user to cancel empty block by hitting return, useful in conjunction with below `inBlock`
+                return change
+                    .setBlocks(DEFAULT_NODE)
+                    .unwrapBlock('bulleted-list')
+                    .unwrapBlock('numbered-list');
+            }
+
+            // TODO strip trailing lines from blockquotes/list entries
+            // the below code seemingly works but doesn't account for edge cases like return with caret not at end
+            /* const trailingNewlines = text.match(/\n*$/);
+            if (trailingNewlines && trailingNewlines[0]) {
+                remove trailing newlines at the end of this block before making a new one
+                return change.deleteBackward(trailingNewlines[0].length);
+            }*/
+
+            return;
         }
 
-        const contentState = this.state.editorState.getCurrentContent();
-        if (!contentState.hasText()) {
-            return true;
+        let contentText;
+        let contentHTML;
+
+        // only look for commands if the first block contains simple unformatted text
+        // i.e. no pills or rich-text formatting and begins with a /.
+        let cmd, commandText;
+        const firstChild = editorState.document.nodes.get(0);
+        const firstGrandChild = firstChild && firstChild.nodes.get(0);
+        if (firstChild && firstGrandChild &&
+            firstChild.object === 'block' && firstGrandChild.object === 'text' &&
+            firstGrandChild.text[0] === '/')
+        {
+            commandText = this.plainWithIdPills.serialize(editorState);
+            cmd = processCommandInput(this.props.room.roomId, commandText);
         }
 
-
-        let contentText = contentState.getPlainText(), contentHTML;
-
-        // Strip MD user (tab-completed) mentions to preserve plaintext mention behaviour.
-        // We have to do this now as opposed to after calculating the contentText for MD
-        // mode because entity positions may not be maintained when using
-        // md.toPlaintext().
-        // Unfortunately this means we lose mentions in history when in MD mode. This
-        // would be fixed if history was stored as contentState.
-        contentText = this.removeMDLinks(contentState, ['@']);
-
-        // Some commands (/join) require pills to be replaced with their text content
-        const commandText = this.removeMDLinks(contentState, ['#']);
-        const cmd = processCommandInput(this.props.room.roomId, commandText);
         if (cmd) {
             if (!cmd.error) {
-                this.historyManager.save(contentState, this.state.isRichtextEnabled ? 'html' : 'markdown');
+                this.historyManager.save(editorState, this.state.isRichTextEnabled ? 'rich' : 'markdown');
                 this.setState({
                     editorState: this.createEditorState(),
+                }, ()=>{
+                    this.refs.editor.focus();
                 });
             }
             if (cmd.promise) {
-                cmd.promise.then(function() {
+                cmd.promise.then(()=>{
                     console.log("Command success.");
-                }, function(err) {
+                }, (err)=>{
                     console.error("Command failure: %s", err);
                     const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                     Modal.createTrackedDialog('Server error', '', ErrorDialog, {
@@ -755,74 +1095,43 @@ export default class MessageComposerInput extends React.Component {
         const replyingToEv = RoomViewStore.getQuotingEvent();
         const mustSendHTML = Boolean(replyingToEv);
 
-        if (this.state.isRichtextEnabled) {
+        if (this.state.isRichTextEnabled) {
             // We should only send HTML if any block is styled or contains inline style
             let shouldSendHTML = false;
 
             if (mustSendHTML) shouldSendHTML = true;
 
-            const blocks = contentState.getBlocksAsArray();
-            if (blocks.some((block) => block.getType() !== 'unstyled')) {
-                shouldSendHTML = true;
-            } else {
-                const characterLists = blocks.map((block) => block.getCharacterList());
-                // For each block of characters, determine if any inline styles are applied
-                // and if yes, send HTML
-                characterLists.forEach((characters) => {
-                    const numberOfStylesForCharacters = characters.map(
-                        (character) => character.getStyle().toArray().length,
-                    ).toArray();
-                    // If any character has more than 0 inline styles applied, send HTML
-                    if (numberOfStylesForCharacters.some((styles) => styles > 0)) {
-                        shouldSendHTML = true;
-                    }
-                });
-            }
             if (!shouldSendHTML) {
-                const hasLink = blocks.some((block) => {
-                    return block.getCharacterList().filter((c) => {
-                        const entityKey = c.getEntity();
-                        return entityKey && contentState.getEntity(entityKey).getType() === 'LINK';
-                    }).size > 0;
+                shouldSendHTML = !!editorState.document.findDescendant(node => {
+                    // N.B. node.getMarks() might be private?
+                    return ((node.object === 'block' && node.type !== 'paragraph') ||
+                            (node.object === 'inline') ||
+                            (node.object === 'text' && node.getMarks().size > 0));
                 });
-                shouldSendHTML = hasLink;
             }
+
+            contentText = this.plainWithPlainPills.serialize(editorState);
+            if (contentText === '') return true;
+
             if (shouldSendHTML) {
-                contentHTML = HtmlUtils.processHtmlForSending(
-                    RichText.contentStateToHTML(contentState),
-                );
+                contentHTML = HtmlUtils.processHtmlForSending(this.html.serialize(editorState));
             }
         } else {
-            // Use the original contentState because `contentText` has had mentions
-            // stripped and these need to end up in contentHTML.
+            const sourceWithPills = this.plainWithMdPills.serialize(editorState);
+            if (sourceWithPills === '') return true;
 
-            // Replace all Entities of type `LINK` with markdown link equivalents.
-            // TODO: move this into `Markdown` and do the same conversion in the other
-            // two places (toggling from MD->RT mode and loading MD history into RT mode)
-            // but this can only be done when history includes Entities.
-            const pt = contentState.getBlocksAsArray().map((block) => {
-                let blockText = block.getText();
-                let offset = 0;
-                this.findPillEntities(contentState, block, (start, end) => {
-                    const entity = contentState.getEntity(block.getEntityAt(start));
-                    if (entity.getType() !== 'LINK') {
-                        return;
-                    }
-                    const text = blockText.slice(offset + start, offset + end);
-                    const url = entity.getData().url;
-                    const mdLink = `[${text}](${url})`;
-                    blockText = blockText.slice(0, offset + start) + mdLink + blockText.slice(offset + end);
-                    offset += mdLink.length - text.length;
-                });
-                return blockText;
-            }).join('\n');
+            const mdWithPills = new Markdown(sourceWithPills);
 
-            const md = new Markdown(pt);
             // if contains no HTML and we're not quoting (needing HTML)
-            if (md.isPlainText() && !mustSendHTML) {
-                contentText = md.toPlaintext();
+            if (mdWithPills.isPlainText() && !mustSendHTML) {
+                // N.B. toPlainText is only usable here because we know that the MD
+                // didn't contain any formatting in the first place...
+                contentText = mdWithPills.toPlaintext();
             } else {
-                contentHTML = md.toHTML();
+                // to avoid ugliness on clients which ignore the HTML body we don't
+                // send pills in the plaintext body.
+                contentText = this.plainWithPlainPills.serialize(editorState);
+                contentHTML = mdWithPills.toHTML();
             }
         }
 
@@ -830,11 +1139,11 @@ export default class MessageComposerInput extends React.Component {
         let sendTextFn = ContentHelpers.makeTextMessage;
 
         this.historyManager.save(
-            contentState,
-            this.state.isRichtextEnabled ? 'html' : 'markdown',
+            editorState,
+            this.state.isRichTextEnabled ? 'rich' : 'markdown',
         );
 
-        if (contentText.startsWith('/me')) {
+        if (commandText && commandText.startsWith('/me')) {
             if (replyingToEv) {
                 const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                 Modal.createTrackedDialog('Emote Reply Fail', '', ErrorDialog, {
@@ -851,14 +1160,16 @@ export default class MessageComposerInput extends React.Component {
             sendTextFn = ContentHelpers.makeEmoteMessage;
         }
 
-
-        let content = contentHTML ? sendHtmlFn(contentText, contentHTML) : sendTextFn(contentText);
+        let content = contentHTML ?
+                      sendHtmlFn(contentText, contentHTML) :
+                      sendTextFn(contentText);
 
         if (replyingToEv) {
             const replyContent = ReplyThread.makeReplyMixIn(replyingToEv);
             content = Object.assign(replyContent, content);
 
-            // Part of Replies fallback support - prepend the text we're sending with the text we're replying to
+            // Part of Replies fallback support - prepend the text we're sending
+            // with the text we're replying to
             const nestedReply = ReplyThread.getNestedReplyText(replyingToEv);
             if (nestedReply) {
                 if (content.formatted_body) {
@@ -875,7 +1186,6 @@ export default class MessageComposerInput extends React.Component {
             });
         }
 
-
         this.client.sendMessage(this.props.room.roomId, content).then((res) => {
             dis.dispatch({
                 action: 'message_sent',
@@ -886,17 +1196,9 @@ export default class MessageComposerInput extends React.Component {
 
         this.setState({
             editorState: this.createEditorState(),
-        });
+        }, ()=>{ this.refs.editor.focus() });
 
         return true;
-    }
-
-    onUpArrow = (e) => {
-        this.onVerticalArrow(e, true);
-    };
-
-    onDownArrow = (e) => {
-        this.onVerticalArrow(e, false);
     };
 
     onVerticalArrow = (e, up) => {
@@ -906,26 +1208,19 @@ export default class MessageComposerInput extends React.Component {
 
         // Select history only if we are not currently auto-completing
         if (this.autocomplete.state.completionList.length === 0) {
-            // Don't go back in history if we're in the middle of a multi-line message
-            const selection = this.state.editorState.getSelection();
-            const blockKey = selection.getStartKey();
-            const firstBlock = this.state.editorState.getCurrentContent().getFirstBlock();
-            const lastBlock = this.state.editorState.getCurrentContent().getLastBlock();
+            const selection = this.state.editorState.selection;
 
-            let canMoveUp = false;
-            let canMoveDown = false;
-            if (blockKey === firstBlock.getKey()) {
-                canMoveUp = selection.getStartOffset() === selection.getEndOffset() &&
-                    selection.getStartOffset() === 0;
+            // selection must be collapsed
+            if (!selection.isCollapsed) return;
+            const document = this.state.editorState.document;
+
+            // and we must be at the edge of the document (up=start, down=end)
+            if (up) {
+                if (!selection.isAtStartOf(document)) return;
+            } else {
+                if (!selection.isAtEndOf(document)) return;
             }
 
-            if (blockKey === lastBlock.getKey()) {
-                canMoveDown = selection.getStartOffset() === selection.getEndOffset() &&
-                    selection.getStartOffset() === lastBlock.getText().length;
-            }
-
-            if ((up && !canMoveUp) || (!up && !canMoveDown)) return;
-
             const selected = this.selectHistory(up);
             if (selected) {
                 // We're selecting history, so prevent the key event from doing anything else
@@ -958,23 +1253,30 @@ export default class MessageComposerInput extends React.Component {
             return;
         }
 
-        const newContent = this.historyManager.getItem(delta, this.state.isRichtextEnabled ? 'html' : 'markdown');
-        if (!newContent) return false;
-        let editorState = EditorState.push(
-            this.state.editorState,
-            newContent,
-            'insert-characters',
-        );
+        let editorState;
+        const historyItem = this.historyManager.getItem(delta);
+        if (!historyItem) return;
+
+        if (historyItem.format === 'rich' && !this.state.isRichTextEnabled) {
+            editorState = this.richToMdEditorState(historyItem.value);
+        } else if (historyItem.format === 'markdown' && this.state.isRichTextEnabled) {
+            editorState = this.mdToRichEditorState(historyItem.value);
+        } else {
+            editorState = historyItem.value;
+        }
 
         // Move selection to the end of the selected history
-        let newSelection = SelectionState.createEmpty(newContent.getLastBlock().getKey());
-        newSelection = newSelection.merge({
-            focusOffset: newContent.getLastBlock().getLength(),
-            anchorOffset: newContent.getLastBlock().getLength(),
-        });
-        editorState = EditorState.forceSelection(editorState, newSelection);
+        const change = editorState.change().collapseToEndOf(editorState.document);
 
-        this.setState({editorState});
+        // We don't call this.onChange(change) now, as fixups on stuff like emoji
+        // should already have been done and persisted in the history.
+        editorState = change.value;
+
+        this.suppressAutoComplete = true;
+
+        this.setState({ editorState }, ()=>{
+            this.refs.editor.focus();
+        });
         return true;
     };
 
@@ -1008,6 +1310,14 @@ export default class MessageComposerInput extends React.Component {
         await this.setDisplayedCompletion(null); // restore originalEditorState
     };
 
+    onAutocompleteConfirm = (displayedCompletion: ?Completion) => {
+        this.focusComposer();
+        // XXX: this fails if the composer isn't focused so focus it and delay the completion until next tick
+        setImmediate(() => {
+            this.setDisplayedCompletion(displayedCompletion);
+        });
+    };
+
     /* If passed null, restores the original editor content from state.originalEditorState.
      * If passed a non-null displayedCompletion, modifies state.originalEditorState to compute new state.editorState.
      */
@@ -1017,137 +1327,214 @@ export default class MessageComposerInput extends React.Component {
         if (displayedCompletion == null) {
             if (this.state.originalEditorState) {
                 let editorState = this.state.originalEditorState;
-                // This is a workaround from https://github.com/facebook/draft-js/issues/458
-                // Due to the way we swap editorStates, Draft does not rerender at times
-                editorState = EditorState.forceSelection(editorState,
-                    editorState.getSelection());
                 this.setState({editorState});
             }
             return false;
         }
 
-        const {range = null, completion = '', href = null, suffix = ''} = displayedCompletion;
-        let contentState = activeEditorState.getCurrentContent();
+        const {
+            range = null,
+            completion = '',
+            completionId = '',
+            href = null,
+            suffix = ''
+        } = displayedCompletion;
 
-        let entityKey;
+        let inline;
         if (href) {
-            contentState = contentState.createEntity('LINK', 'IMMUTABLE', {
-                url: href,
-                isCompletion: true,
+            inline = Inline.create({
+                type: 'pill',
+                data: { completion, completionId, href },
+                // we can't put text in here otherwise the editor tries to select it
+                isVoid: true,
             });
-            entityKey = contentState.getLastCreatedEntityKey();
         } else if (completion === '@room') {
-            contentState = contentState.createEntity(ENTITY_TYPES.AT_ROOM_PILL, 'IMMUTABLE', {
-                isCompletion: true,
+            inline = Inline.create({
+                type: 'pill',
+                data: { completion, completionId },
+                // we can't put text in here otherwise the editor tries to select it
+                isVoid: true,
             });
-            entityKey = contentState.getLastCreatedEntityKey();
         }
 
-        let selection;
+        let editorState = activeEditorState;
+
         if (range) {
-            selection = RichText.textOffsetsToSelectionState(
-                range, contentState.getBlocksAsArray(),
-            );
-        } else {
-            selection = activeEditorState.getSelection();
+            const change = editorState.change()
+                                      .collapseToAnchor()
+                                      .moveOffsetsTo(range.start, range.end)
+                                      .focus();
+            editorState = change.value;
         }
 
-        contentState = Modifier.replaceText(contentState, selection, completion, null, entityKey);
-
-        // Move the selection to the end of the block
-        const afterSelection = contentState.getSelectionAfter();
-        if (suffix) {
-            contentState = Modifier.replaceText(contentState, afterSelection, suffix);
+        let change;
+        if (inline) {
+            change = editorState.change()
+                                .insertInlineAtRange(editorState.selection, inline)
+                                .insertText(suffix)
+                                .focus();
         }
+        else {
+            change = editorState.change()
+                                .insertTextAtRange(editorState.selection, completion)
+                                .insertText(suffix)
+                                .focus();
+        }
+        // for good hygiene, keep editorState updated to track the result of the change
+        // even though we don't do anything subsequently with it
+        editorState = change.value;
 
-        let editorState = EditorState.push(activeEditorState, contentState, 'insert-characters');
-        editorState = EditorState.forceSelection(editorState, contentState.getSelectionAfter());
-        this.setState({editorState, originalEditorState: activeEditorState});
+        this.onChange(change, activeEditorState);
 
-        // for some reason, doing this right away does not update the editor :(
-        // setTimeout(() => this.refs.editor.focus(), 50);
         return true;
     };
 
-    onFormatButtonClicked(name: "bold" | "italic" | "strike" | "code" | "underline" | "quote" | "bullet" | "numbullet", e) {
-        e.preventDefault(); // don't steal focus from the editor!
-        const command = {
-                code: 'code-block',
-                quote: 'blockquote',
-                bullet: 'unordered-list-item',
-                numbullet: 'ordered-list-item',
-            }[name] || name;
-        this.handleKeyCommand(command);
-    }
+    renderNode = props => {
+        const { attributes, children, node, isSelected } = props;
 
-    /* returns inline style and block type of current SelectionState so MessageComposer can render formatting
-     buttons. */
-    getSelectionInfo(editorState: EditorState) {
-        const styleName = {
-            BOLD: _td('bold'),
-            ITALIC: _td('italic'),
-            STRIKETHROUGH: _td('strike'),
-            UNDERLINE: _td('underline'),
-        };
+        switch (node.type) {
+            case 'paragraph':
+                return 
{children}
;
+            case 'block-quote':
+                return 
{children}
;
+            case 'bulleted-list':
+                return 
    {children}
;
+            case 'heading1':
+                return 
{children}
;
+            case 'heading2':
+                return 
{children}
;
+            case 'heading3':
+                return 
{children}
;
+            case 'heading4':
+                return 
{children}
;
+            case 'heading5':
+                return 
{children}
;
+            case 'heading6':
+                return 
{children}
;
+            case 'list-item':
+                return 
  • {children}
    • ;
+            case 'numbered-list':
+                return 
      {children}
    ;
+            case 'code':
+                return 
    {children}
    ;
+            case 'link':
+                return {children};
+            case 'pill': {
+                const { data } = node;
+                const url = data.get('href');
+                const completion = data.get('completion');
 
-        const originalStyle = editorState.getCurrentInlineStyle().toArray();
-        const style = originalStyle
-            .map((style) => styleName[style] || null)
-            .filter((styleName) => !!styleName);
+                const shouldShowPillAvatar = !SettingsStore.getValue("Pill.shouldHidePillAvatar");
+                const Pill = sdk.getComponent('elements.Pill');
 
-        const blockName = {
-            'code-block': _td('code'),
-            'blockquote': _td('quote'),
-            'unordered-list-item': _td('bullet'),
-            'ordered-list-item': _td('numbullet'),
-        };
-        const originalBlockType = editorState.getCurrentContent()
-            .getBlockForKey(editorState.getSelection().getStartKey())
-            .getType();
-        const blockType = blockName[originalBlockType] || null;
-
-        return {
-            style,
-            blockType,
-        };
-    }
-
-    getAutocompleteQuery(contentState: ContentState) {
-        // Don't send markdown links to the autocompleter
-        return this.removeMDLinks(contentState, ['@', '#']);
-    }
-
-    removeMDLinks(contentState: ContentState, prefixes: string[]) {
-        const plaintext = contentState.getPlainText();
-        if (!plaintext) return '';
-        return plaintext.replace(REGEX_MATRIXTO_MARKDOWN_GLOBAL,
-        (markdownLink, text, resource, prefix, offset) => {
-            if (!prefixes.includes(prefix)) return markdownLink;
-            // Calculate the offset relative to the current block that the offset is in
-            let sum = 0;
-            const blocks = contentState.getBlocksAsArray();
-            let block;
-            for (let i = 0; i < blocks.length; i++) {
-                block = blocks[i];
-                sum += block.getLength();
-                if (sum > offset) {
-                    sum -= block.getLength();
-                    break;
+                if (completion === '@room') {
+                    return ;
+                }
+                else if (Pill.isPillUrl(url)) {
+                    return ;
+                }
+                else {
+                    const { text } = node;
+                    return 
+                                { text }
+                           ;
                 }
             }
-            offset -= sum;
-
-            const entityKey = block.getEntityAt(offset);
-            const entity = entityKey ? contentState.getEntity(entityKey) : null;
-            if (entity && entity.getData().isCompletion) {
-                // This is a completed mention, so do not insert MD link, just text
-                return text;
-            } else {
-                // This is either a MD link that was typed into the composer or another
-                // type of pill (e.g. room pill)
-                return markdownLink;
+            case 'emoji': {
+                const { data } = node;
+                const emojiUnicode = data.get('emojiUnicode');
+                const uri = RichText.unicodeToEmojiUri(emojiUnicode);
+                const shortname = toShort(emojiUnicode);
+                const className = classNames('mx_emojione', {
+                    mx_emojione_selected: isSelected
+                });
+                return {;
             }
-        });
+        }
+    };
+
+    renderMark = props => {
+        const { children, mark, attributes } = props;
+        switch (mark.type) {
+            case 'bold':
+                return {children};
+            case 'italic':
+                return {children};
+            case 'code':
+                return {children};
+            case 'underlined':
+                return {children};
+            case 'deleted':
+                return {children};
+        }
+    };
+
+    onFormatButtonClicked = (name, e) => {
+        e.preventDefault();
+
+        // XXX: horrible evil hack to ensure the editor is focused so the act
+        // of focusing it doesn't then cancel the format button being pressed
+        // FIXME: can we just tell handleKeyCommand's change to invoke .focus()?
+        if (document.activeElement && document.activeElement.className !== 'mx_MessageComposer_editor') {
+            this.refs.editor.focus();
+            setTimeout(()=>{
+                this.handleKeyCommand(name);
+            }, 500); // can't find any callback to hook this to. onFocus and onChange and willComponentUpdate fire too early.
+            return;
+        }
+
+        this.handleKeyCommand(name);
+    };
+
+    getAutocompleteQuery(editorState: Value) {
+        // We can just return the current block where the selection begins, which
+        // should be enough to capture any autocompletion input, given autocompletion
+        // providers only search for the first match which intersects with the current selection.
+        // This avoids us having to serialize the whole thing to plaintext and convert
+        // selection offsets in & out of the plaintext domain.
+
+        if (editorState.selection.anchorKey) {
+            return editorState.document.getDescendant(editorState.selection.anchorKey).text;
+        }
+        else {
+            return '';
+        }
+    }
+
+    getSelectionRange(editorState: Value) {
+        let beginning = false;
+        const query = this.getAutocompleteQuery(editorState);
+        const firstChild = editorState.document.nodes.get(0);
+        const firstGrandChild = firstChild && firstChild.nodes.get(0);
+        beginning = (firstChild && firstGrandChild &&
+                     firstChild.object === 'block' && firstGrandChild.object === 'text' &&
+                     editorState.selection.anchorKey === firstGrandChild.key);
+
+        // return a character range suitable for handing to an autocomplete provider.
+        // the range is relative to the anchor of the current editor selection.
+        // if the selection spans multiple blocks, then we collapse it for the calculation.
+        const range = {
+            beginning, // whether the selection is in the first block of the editor or not
+            start: editorState.selection.anchorOffset,
+            end: (editorState.selection.anchorKey == editorState.selection.focusKey) ?
+                 editorState.selection.focusOffset : editorState.selection.anchorOffset,
+        }
+        if (range.start > range.end) {
+            const tmp = range.start;
+            range.start = range.end;
+            range.end = tmp;
+        }
+        return range;
     }
 
     onMarkdownToggleClicked = (e) => {
@@ -1155,82 +1542,58 @@ export default class MessageComposerInput extends React.Component {
         this.handleKeyCommand('toggle-mode');
     };
 
+    focusComposer = () => {
+        this.refs.editor.focus();
+    };
+
     render() {
         const activeEditorState = this.state.originalEditorState || this.state.editorState;
 
-        // From https://github.com/facebook/draft-js/blob/master/examples/rich/rich.html#L92
-        // If the user changes block type before entering any text, we can
-        // either style the placeholder or hide it.
-        let hidePlaceholder = false;
-        const contentState = activeEditorState.getCurrentContent();
-        if (!contentState.hasText()) {
-            if (contentState.getBlockMap().first().getType() !== 'unstyled') {
-                hidePlaceholder = true;
-            }
-        }
-
         const className = classNames('mx_MessageComposer_input', {
-            mx_MessageComposer_input_empty: hidePlaceholder,
             mx_MessageComposer_input_error: this.state.someCompletions === false,
         });
 
-        const content = activeEditorState.getCurrentContent();
-        const selection = RichText.selectionStateToTextOffsets(activeEditorState.getSelection(),
-            activeEditorState.getCurrentContent().getBlocksAsArray());
+        const isEmpty = this.state.editorState.document.isEmpty;
+
+        let {placeholder} = this.props;
+        // XXX: workaround for placeholder being shown when there is a formatting block e.g blockquote but no text
+        if (isEmpty && this.state.editorState.startBlock && this.state.editorState.startBlock.type !== DEFAULT_NODE) {
+            placeholder = undefined;
+        }
 
         return (
-            
    
+            
    
                 
    
                     
                      this.autocomplete = e}
                         room={this.props.room}
-                        onConfirm={this.setDisplayedCompletion}
+                        onConfirm={this.onAutocompleteConfirm}
                         onSelectionChange={this.setDisplayedCompletion}
-                        query={this.getAutocompleteQuery(content)}
-                        selection={selection}
+                        query={ this.suppressAutoComplete ? '' : this.getAutocompleteQuery(activeEditorState) }
+                        selection={this.getSelectionRange(activeEditorState)}
                     />
                 
    
                 
    
                     
+                         title={this.state.isRichTextEnabled ? _t("Markdown is disabled") : _t("Markdown is enabled")}
+                         src={`img/button-md-${!this.state.isRichTextEnabled}.png`} />
                     
+                            className="mx_MessageComposer_editor"
+                            placeholder={placeholder}
+                            value={this.state.editorState}
+                            onChange={this.onChange}
+                            onKeyDown={this.onKeyDown}
+                            onPaste={this.onPaste}
+                            renderNode={this.renderNode}
+                            renderMark={this.renderMark}
+                            // disable spell check for the placeholder because browsers don't like "unencrypted"
+                            spellCheck={!isEmpty}
+                            />
                 
    
             
    
         );
     }
 }
-
-MessageComposerInput.propTypes = {
-    // a callback which is called when the height of the composer is
-    // changed due to a change in content.
-    onResize: PropTypes.func,
-
-    // js-sdk Room object
-    room: PropTypes.object.isRequired,
-
-    // called with current plaintext content (as a string) whenever it changes
-    onContentChanged: PropTypes.func,
-
-    onFilesPasted: PropTypes.func,
-
-    onInputStateChanged: PropTypes.func,
-};
diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index 167603ecfb..3e632ba8ce 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -1,6 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2017 Vector Creations Ltd
+Copyright 2017, 2018 Vector Creations Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -16,6 +16,8 @@ limitations under the License.
 */
 
 'use strict';
+import SettingsStore from "../../../settings/SettingsStore";
+
 const React = require("react");
 const ReactDOM = require("react-dom");
 import PropTypes from 'prop-types';
@@ -33,7 +35,12 @@ import RoomListStore from '../../../stores/RoomListStore';
 import GroupStore from '../../../stores/GroupStore';
 
 const HIDE_CONFERENCE_CHANS = true;
-const STANDARD_TAGS_REGEX = /^(m\.(favourite|lowpriority)|im\.vector\.fake\.(invite|recent|direct|archived))$/;
+const STANDARD_TAGS_REGEX = /^(m\.(favourite|lowpriority|server_notice)|im\.vector\.fake\.(invite|recent|direct|archived))$/;
+
+function labelForTagName(tagName) {
+    if (tagName.startsWith('u.')) return tagName.slice(2);
+    return tagName;
+}
 
 function phraseForSection(section) {
     switch (section) {
@@ -90,7 +97,7 @@ module.exports = React.createClass({
         };
         // All rooms that should be kept in the room list when filtering.
         // By default, show all rooms.
-        this._visibleRooms = MatrixClientPeg.get().getRooms();
+        this._visibleRooms = MatrixClientPeg.get().getVisibleRooms();
 
         // Listen to updates to group data. RoomList cares about members and rooms in order
         // to filter the room list when group tags are selected.
@@ -295,7 +302,7 @@ module.exports = React.createClass({
             this._visibleRooms = Array.from(roomSet);
         } else {
             // Show all rooms
-            this._visibleRooms = MatrixClientPeg.get().getRooms();
+            this._visibleRooms = MatrixClientPeg.get().getVisibleRooms();
         }
         this._delayedRefreshRoomList();
     },
@@ -340,8 +347,8 @@ module.exports = React.createClass({
                 if (!taggedRoom) {
                     return;
                 }
-                const me = taggedRoom.getMember(MatrixClientPeg.get().credentials.userId);
-                if (HIDE_CONFERENCE_CHANS && Rooms.isConfCallRoom(taggedRoom, me, this.props.ConferenceHandler)) {
+                const myUserId = MatrixClientPeg.get().getUserId();
+                if (HIDE_CONFERENCE_CHANS && Rooms.isConfCallRoom(taggedRoom, myUserId, this.props.ConferenceHandler)) {
                     return;
                 }
 
@@ -444,6 +451,8 @@ module.exports = React.createClass({
             }
         }
 
+        if (!this.stickies) return;
+
         const self = this;
         let scrollStuckOffset = 0;
         // Scroll to the passed in position, i.e. a header was clicked and in a scroll to state
@@ -608,10 +617,14 @@ module.exports = React.createClass({
         const RoomSubList = sdk.getComponent('structures.RoomSubList');
         const GeminiScrollbarWrapper = sdk.getComponent("elements.GeminiScrollbarWrapper");
 
+        // XXX: we can't detect device-level (localStorage) settings onChange as the SettingsStore does not notify
+        // so checking on every render is the sanest thing at this time.
+        const showEmpty = SettingsStore.getValue('RoomSubList.showEmpty');
+
         const self = this;
         return (
             
+                autoshow={true} onScroll={self._whenScrolling} onResize={self._whenScrolling} wrappedRef={this._collectGemini}>
             
    
                 
 
                 
 
                 
+                             onShowMoreRooms={self.onShowMoreRooms}
+                             showEmpty={showEmpty} />
 
                 
+                             onShowMoreRooms={self.onShowMoreRooms}
+                             showEmpty={showEmpty} />
 
                 
+                             onShowMoreRooms={self.onShowMoreRooms}
+                             showEmpty={showEmpty} />
 
                 { Object.keys(self.state.lists).map((tagName) => {
                     if (!tagName.match(STANDARD_TAGS_REGEX)) {
                         return ;
+                             onShowMoreRooms={self.onShowMoreRooms}
+                                            showEmpty={showEmpty} />;
                     }
                 }) }
 
@@ -702,9 +721,17 @@ module.exports = React.createClass({
                              collapsed={self.props.collapsed}
                              searchFilter={self.props.searchFilter}
                              onHeaderClick={self.onSubListHeaderClick}
-                             onShowMoreRooms={self.onShowMoreRooms} />
+                             onShowMoreRooms={self.onShowMoreRooms}
+                             showEmpty={showEmpty} />
 
                 
+                                     
    
+                                         { _t('You have no historical rooms') }
+                                     
    
+                                 
    
+                             }
                              label={_t('Historical')}
                              editable={false}
                              order="recent"
@@ -712,10 +739,23 @@ module.exports = React.createClass({
                              alwaysShowHeader={true}
                              startAsHidden={true}
                              showSpinner={self.state.isLoadingLeftRooms}
-                             onHeaderClick= {self.onArchivedHeaderClick}
+                             onHeaderClick={self.onArchivedHeaderClick}
                              incomingCall={self.state.incomingCall}
                              searchFilter={self.props.searchFilter}
-                             onShowMoreRooms={self.onShowMoreRooms} />
+                             onShowMoreRooms={self.onShowMoreRooms}
+                             showEmpty={showEmpty} />
+
+                
             
    
             
         );
diff --git a/src/components/views/rooms/RoomPreviewBar.js b/src/components/views/rooms/RoomPreviewBar.js
index 536093807a..5ec19d185e 100644
--- a/src/components/views/rooms/RoomPreviewBar.js
+++ b/src/components/views/rooms/RoomPreviewBar.js
@@ -98,15 +98,11 @@ module.exports = React.createClass({
             
    );
         }
 
-        const myMember = this.props.room ? this.props.room.currentState.members[
-            MatrixClientPeg.get().credentials.userId
-        ] : null;
-        const kicked = (
-            myMember &&
-            myMember.membership == 'leave' &&
-            myMember.events.member.getSender() != MatrixClientPeg.get().credentials.userId
-        );
-        const banned = myMember && myMember.membership == 'ban';
+        const myMember = this.props.room ?
+            this.props.room.getMember(MatrixClientPeg.get().getUserId()) :
+            null;
+        const kicked = myMember && myMember.isKicked();
+        const banned = myMember && myMember && myMember.membership == 'ban';
 
         if (this.props.inviterName) {
             let emailMatchBlock;
diff --git a/src/components/views/rooms/RoomSettings.js b/src/components/views/rooms/RoomSettings.js
index 0ccfa23bf3..46869c1773 100644
--- a/src/components/views/rooms/RoomSettings.js
+++ b/src/components/views/rooms/RoomSettings.js
@@ -1,6 +1,7 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
 Copyright 2017 Vector Creations Ltd
+Copyright 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -571,6 +572,11 @@ module.exports = React.createClass({
         });
     },
 
+    _onRoomUpgradeClick: function() {
+        const RoomUpgradeDialog = sdk.getComponent('dialogs.RoomUpgradeDialog');
+        Modal.createTrackedDialog('Upgrade Room Version', '', RoomUpgradeDialog, {room: this.props.room});
+    },
+
     _onRoomMemberMembership: function() {
         // Update, since our banned user list may have changed
         this.forceUpdate();
@@ -793,15 +799,15 @@ module.exports = React.createClass({
         }
 
         let leaveButton = null;
-        const myMember = this.props.room.getMember(myUserId);
-        if (myMember) {
-            if (myMember.membership === "join") {
+        const myMemberShip = this.props.room.getMyMembership();
+        if (myMemberShip) {
+            if (myMemberShip === "join") {
                 leaveButton = (
                     
                         { _t('Leave room') }
                     
                 );
-            } else if (myMember.membership === "leave") {
+            } else if (myMemberShip === "leave") {
                 leaveButton = (
                     
                         { _t('Forget room') }
@@ -929,6 +935,13 @@ module.exports = React.createClass({
             );
         });
 
+        let roomUpgradeButton = null;
+        if (this.props.room.shouldUpgradeToVersion() && this.props.room.userMayUpgradeRoom(myUserId)) {
+            roomUpgradeButton = 
+                { _t("Upgrade room to version %(ver)s", {ver: this.props.room.shouldUpgradeToVersion()}) }
+            ;
+        }
+
         return (
             
    
 
@@ -1039,7 +1052,9 @@ module.exports = React.createClass({
 
                 
    { _t('Advanced') }
    
                 
    
-                    { _t('This room\'s internal ID is') } { this.props.room.roomId }
+                    { _t('Internal room ID: ') } { this.props.room.roomId }
    
+                    { _t('Room version number: ') } { this.props.room.getVersion() }
    
+                    { roomUpgradeButton }
                 
    
             
    
         );
diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index ee7f8a76c7..54044e8d65 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -243,9 +243,7 @@ module.exports = React.createClass({
     },
 
     render: function() {
-        const myUserId = MatrixClientPeg.get().credentials.userId;
-        const me = this.props.room.currentState.members[myUserId];
-
+        const isInvite = this.props.room.getMyMembership() === "invite";
         const notificationCount = this.state.notificationCount;
         // var highlightCount = this.props.room.getUnreadNotificationCount("highlight");
 
@@ -259,7 +257,7 @@ module.exports = React.createClass({
             'mx_RoomTile_unread': this.props.unread,
             'mx_RoomTile_unreadNotify': notifBadges,
             'mx_RoomTile_highlight': mentionBadges,
-            'mx_RoomTile_invited': (me && me.membership === 'invite'),
+            'mx_RoomTile_invited': isInvite,
             'mx_RoomTile_menuDisplayed': this.state.menuDisplayed,
             'mx_RoomTile_noBadges': !badges,
             'mx_RoomTile_transparent': this.props.transparent,
@@ -275,6 +273,7 @@ module.exports = React.createClass({
         });
 
         let name = this.state.roomName;
+        if (name == undefined || name == null) name = '';
         name = name.replace(":", ":\u200b"); // add a zero-width space to allow linewrapping after the colon
 
         let badgeContent;
diff --git a/src/components/views/rooms/RoomUpgradeWarningBar.js b/src/components/views/rooms/RoomUpgradeWarningBar.js
new file mode 100644
index 0000000000..75a5901fc9
--- /dev/null
+++ b/src/components/views/rooms/RoomUpgradeWarningBar.js
@@ -0,0 +1,57 @@
+/*
+Copyright 2018 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import PropTypes from 'prop-types';
+import sdk from '../../../index';
+import Modal from '../../../Modal';
+
+import { _t } from '../../../languageHandler';
+
+module.exports = React.createClass({
+    displayName: 'RoomUpgradeWarningBar',
+
+    propTypes: {
+        room: PropTypes.object.isRequired,
+    },
+
+    onUpgradeClick: function() {
+        const RoomUpgradeDialog = sdk.getComponent('dialogs.RoomUpgradeDialog');
+        Modal.createTrackedDialog('Upgrade Room Version', '', RoomUpgradeDialog, {room: this.props.room});
+    },
+
+    render: function() {
+        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
+        return (
+            
    
+                
    
+                    {_t("There is a known vulnerability affecting this room.")}
+                
    
+                
    
+                    {_t("This room version is vulnerable to malicious modification of room state.")}
+                
    
+                
    
+                    
+                        {_t("Click here to upgrade to the latest room version and ensure room integrity is protected.")}
+                    
+                
    
+                
    
+                    {_t("Only room administrators will see this warning")}
+                
    
+            
    
+        );
+    },
+});
diff --git a/src/components/views/rooms/Stickerpicker.js b/src/components/views/rooms/Stickerpicker.js
index 6152809c1a..841cfb9b03 100644
--- a/src/components/views/rooms/Stickerpicker.js
+++ b/src/components/views/rooms/Stickerpicker.js
@@ -15,7 +15,6 @@ limitations under the License.
 */
 import React from 'react';
 import { _t } from '../../../languageHandler';
-import Widgets from '../../../utils/widgets';
 import AppTile from '../elements/AppTile';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import Modal from '../../../Modal';
@@ -24,9 +23,15 @@ import SdkConfig from '../../../SdkConfig';
 import ScalarAuthClient from '../../../ScalarAuthClient';
 import dis from '../../../dispatcher';
 import AccessibleButton from '../elements/AccessibleButton';
+import WidgetUtils from '../../../utils/WidgetUtils';
+import ActiveWidgetStore from '../../../stores/ActiveWidgetStore';
 
 const widgetType = 'm.stickerpicker';
 
+// We sit in a context menu, so the persisted element container needs to float
+// above it, so it needs a greater z-index than the ContextMenu
+const STICKERPICKER_Z_INDEX = 5000;
+
 export default class Stickerpicker extends React.Component {
     constructor(props) {
         super(props);
@@ -39,8 +44,6 @@ export default class Stickerpicker extends React.Component {
         this._onResize = this._onResize.bind(this);
         this._onFinished = this._onFinished.bind(this);
 
-        this._collectWidgetMessaging = this._collectWidgetMessaging.bind(this);
-
         this.popoverWidth = 300;
         this.popoverHeight = 300;
 
@@ -67,7 +70,7 @@ export default class Stickerpicker extends React.Component {
         }
 
         this.setState({showStickers: false});
-        Widgets.removeStickerpickerWidgets().then(() => {
+        WidgetUtils.removeStickerpickerWidgets().then(() => {
             this.forceUpdate();
         }).catch((e) => {
             console.error('Failed to remove sticker picker widget', e);
@@ -119,7 +122,7 @@ export default class Stickerpicker extends React.Component {
     }
 
     _updateWidget() {
-        const stickerpickerWidget = Widgets.getStickerpickerWidgets()[0];
+        const stickerpickerWidget = WidgetUtils.getStickerpickerWidgets()[0];
         this.setState({
             stickerpickerWidget,
             widgetId: stickerpickerWidget ? stickerpickerWidget.id : null,
@@ -162,17 +165,11 @@ export default class Stickerpicker extends React.Component {
         );
     }
 
-    _collectWidgetMessaging(widgetMessaging) {
-        this._appWidgetMessaging = widgetMessaging;
-
-        // Do this now instead of in componentDidMount because we might not have had the
-        // reference to widgetMessaging when mounting
-        this._sendVisibilityToWidget(true);
-    }
-
     _sendVisibilityToWidget(visible) {
-        if (this._appWidgetMessaging && visible !== this._prevSentVisibility) {
-            this._appWidgetMessaging.sendVisibility(visible);
+        if (!this.state.stickerpickerWidget) return;
+        const widgetMessaging = ActiveWidgetStore.getWidgetMessaging(this.state.stickerpickerWidget.id);
+        if (widgetMessaging && visible !== this._prevSentVisibility) {
+            widgetMessaging.sendVisibility(visible);
             this._prevSentVisibility = visible;
         }
     }
@@ -211,9 +208,8 @@ export default class Stickerpicker extends React.Component {
                             width: this.popoverWidth,
                         }}
                     >
-                    
+                    
                         
             );
         }
-        return null;
+        const PersistentApp = sdk.getComponent('elements.PersistentApp');
+        return ;
     },
 });
 
diff --git a/src/components/views/voip/VideoView.js b/src/components/views/voip/VideoView.js
index 1820514129..d9843042ef 100644
--- a/src/components/views/voip/VideoView.js
+++ b/src/components/views/voip/VideoView.js
@@ -26,6 +26,15 @@ import dis from '../../../dispatcher';
 
 import SettingsStore from "../../../settings/SettingsStore";
 
+function getFullScreenElement() {
+    return (
+        document.fullscreenElement ||
+        document.mozFullScreenElement ||
+        document.webkitFullscreenElement ||
+        document.msFullscreenElement
+    );
+}
+
 module.exports = React.createClass({
     displayName: 'VideoView',
 
@@ -88,7 +97,7 @@ module.exports = React.createClass({
                         element.msRequestFullscreen
                     );
                     requestMethod.call(element);
-                } else {
+                } else if (getFullScreenElement()) {
                     const exitMethod = (
                         document.exitFullscreen ||
                         document.mozCancelFullScreen ||
@@ -108,10 +117,7 @@ module.exports = React.createClass({
         const VideoFeed = sdk.getComponent('voip.VideoFeed');
 
         // if we're fullscreen, we don't want to set a maxHeight on the video element.
-        const fullscreenElement = (document.fullscreenElement ||
-                 document.mozFullScreenElement ||
-                 document.webkitFullscreenElement);
-        const maxVideoHeight = fullscreenElement ? null : this.props.maxHeight;
+        const maxVideoHeight = getFullScreenElement() ? null : this.props.maxHeight;
         const localVideoFeedClasses = classNames("mx_VideoView_localVideoFeed",
             { "mx_VideoView_localVideoFeed_flipped":
                 SettingsStore.getValue('VideoView.flipVideoHorizontally'),
diff --git a/src/createRoom.js b/src/createRoom.js
index a767d09288..8b4220fc85 100644
--- a/src/createRoom.js
+++ b/src/createRoom.js
@@ -42,7 +42,7 @@ function createRoom(opts) {
 
     const client = MatrixClientPeg.get();
     if (client.isGuest()) {
-        dis.dispatch({action: 'view_set_mxid'});
+        dis.dispatch({action: 'require_registration'});
         return Promise.resolve(null);
     }
 
diff --git a/src/cryptodevices.js b/src/cryptodevices.js
index c0b7e3da6e..246fae3d73 100644
--- a/src/cryptodevices.js
+++ b/src/cryptodevices.js
@@ -16,6 +16,7 @@ limitations under the License.
 
 import Resend from './Resend';
 import sdk from './index';
+import dis from './dispatcher';
 import Modal from './Modal';
 import { _t } from './languageHandler';
 
@@ -42,27 +43,30 @@ export function markAllDevicesKnown(matrixClient, devices) {
  * @return {Promise} A promise which resolves to a map userId->deviceId->{@link
  * module:crypto~DeviceInfo|DeviceInfo}.
  */
-export function getUnknownDevicesForRoom(matrixClient, room) {
-    const roomMembers = room.getJoinedMembers().map((m) => {
+export async function getUnknownDevicesForRoom(matrixClient, room) {
+    const roomMembers = await room.getEncryptionTargetMembers().map((m) => {
         return m.userId;
     });
-    return matrixClient.downloadKeys(roomMembers, false).then((devices) => {
-        const unknownDevices = {};
-        // This is all devices in this room, so find the unknown ones.
-        Object.keys(devices).forEach((userId) => {
-            Object.keys(devices[userId]).map((deviceId) => {
-                const device = devices[userId][deviceId];
+    const devices = await matrixClient.downloadKeys(roomMembers, false);
+    const unknownDevices = {};
+    // This is all devices in this room, so find the unknown ones.
+    Object.keys(devices).forEach((userId) => {
+        Object.keys(devices[userId]).map((deviceId) => {
+            const device = devices[userId][deviceId];
 
-                if (device.isUnverified() && !device.isKnown()) {
-                    if (unknownDevices[userId] === undefined) {
-                        unknownDevices[userId] = {};
-                    }
-                    unknownDevices[userId][deviceId] = device;
+            if (device.isUnverified() && !device.isKnown()) {
+                if (unknownDevices[userId] === undefined) {
+                    unknownDevices[userId] = {};
                 }
-            });
+                unknownDevices[userId][deviceId] = device;
+            }
         });
-        return unknownDevices;
     });
+    return unknownDevices;
+}
+
+function focusComposer() {
+    dis.dispatch({action: 'focus_composer'});
 }
 
 /**
@@ -86,6 +90,7 @@ export function showUnknownDeviceDialogForMessages(matrixClient, room) {
             sendAnywayLabel: _t("Send anyway"),
             sendLabel: _t("Send"),
             onSend: onSendClicked,
+            onFinished: focusComposer,
         }, 'mx_Dialog_unknownDevice');
     });
 }
diff --git a/src/i18n/strings/ar.json b/src/i18n/strings/ar.json
index d461240e4b..7ea42b8ebd 100644
--- a/src/i18n/strings/ar.json
+++ b/src/i18n/strings/ar.json
@@ -65,5 +65,6 @@
     "Cancel Sending": "إلغاء الإرسال",
     "Collapse panel": "طي الجدول",
     "Set Password": "تعيين كلمة سرية",
-    "Checking for an update...": "البحث عن تحديث …"
+    "Checking for an update...": "البحث عن تحديث …",
+    "powered by Matrix": "مشغل بواسطة Matrix"
 }
diff --git a/src/i18n/strings/az.json b/src/i18n/strings/az.json
index 24f19a9ce6..13fd49e149 100644
--- a/src/i18n/strings/az.json
+++ b/src/i18n/strings/az.json
@@ -24,5 +24,380 @@
     "Notify me for anything else": "Bütün qalan hadisələrdə xəbər vermək",
     "Enable notifications for this account": "Bu hesab üçün xəbərdarlıqları qoşmaq",
     "All notifications are currently disabled for all targets.": "Bütün qurğular üçün bütün bildirişlər kəsilmişdir.",
-    "Add an email address above to configure email notifications": "Email-i bildirişlər üçün ünvanı əlavə edin"
+    "Add an email address above to configure email notifications": "Yuxarı email-i xəbərdarlıqların qurması üçün əlavə edin",
+    "Failed to verify email address: make sure you clicked the link in the email": "Email-i yoxlamağı bacarmadı: əmin olun ki, siz məktubda istinaddakı ünvana keçdiniz",
+    "The platform you're on": "İstifadə edilən platforma",
+    "The version of Riot.im": "Riot.im versiyası",
+    "Whether or not you're logged in (we don't record your user name)": "Siz sistemə girdiniz ya yox (biz sizin istifadəçinin adınızı saxlamırıq)",
+    "Your language of choice": "Seçilmiş dil",
+    "Which officially provided instance you are using, if any": "Hansı rəsmən dəstəklənən müştəri tərəfindən siz istifadə edirsiniz ( əgər istifadə edirsinizsə)",
+    "Whether or not you're using the Richtext mode of the Rich Text Editor": "Siz Rich Text Editor redaktorunda Richtext rejimindən istifadə edirsinizmi",
+    "Your homeserver's URL": "Serverin URL-ünvanı",
+    "Your identity server's URL": "Eyniləşdirmənin serverinin URL-ünvanı",
+    "Every page you use in the app": "Hər səhifə, hansını ki, siz proqramda istifadə edirsiniz",
+    "e.g. ": "məs. ",
+    "Your User Agent": "Sizin istifadəçi agentiniz",
+    "Your device resolution": "Sizin cihazınızın qətnaməsi",
+    "The information being sent to us to help make Riot.im better includes:": "Riot.im'i daha yaxşı etmək üçün bizə göndərilən məlumatlar daxildir:",
+    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Əgər bu səhifədə şəxsi xarakterin məlumatları rast gəlinirsə, məsələn otağın, istifadəçinin adının və ya qrupun adı, onlar serverə göndərilmədən əvvəl silinirlər.",
+    "Call Timeout": "Cavab yoxdur",
+    "Unable to capture screen": "Ekranın şəkilini etməyə müvəffəq olmur",
+    "Existing Call": "Cari çağırış",
+    "You are already in a call.": "Danışıq gedir.",
+    "VoIP is unsupported": "Zənglər dəstəklənmir",
+    "You cannot place VoIP calls in this browser.": "Zənglər bu brauzerdə dəstəklənmir.",
+    "You cannot place a call with yourself.": "Siz özünə zəng vura bilmirsiniz.",
+    "Conference calls are not supported in encrypted rooms": "Konfrans-əlaqə şifrlənmiş otaqlarda dəstəklənmir",
+    "Conference calls are not supported in this client": "Bu müştəridə konfrans-əlaqə dəstəklənmir",
+    "Warning!": "Diqqət!",
+    "Conference calling is in development and may not be reliable.": "Konfrans-əlaqə hazırlamadadır və işləməyə bilər.",
+    "Failed to set up conference call": "Konfrans-zəngi etməyi bacarmadı",
+    "Conference call failed.": "Konfrans-zəngin nasazlığı.",
+    "Upload Failed": "Faylın göndərilməsinin nasazlığı",
+    "Failure to create room": "Otağı yaratmağı bacarmadı",
+    "Sun": "Baz",
+    "Mon": "Ber",
+    "Tue": "Çax",
+    "Wed": "Çər",
+    "Thu": "Cax",
+    "Fri": "Cüm",
+    "Sat": "Şən",
+    "Jan": "Yan",
+    "Feb": "Fev",
+    "Mar": "Mar",
+    "Apr": "Apr",
+    "May": "May",
+    "Jun": "Iyun",
+    "Jul": "Iyul",
+    "Aug": "Avg",
+    "Sep": "Sen",
+    "Oct": "Okt",
+    "Nov": "Noy",
+    "Dec": "Dek",
+    "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s, %(day)s %(monthName)s %(time)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s %(monthName)s %(fullYear)s",
+    "Unable to enable Notifications": "Xəbərdarlıqları daxil qoşmağı bacarmadı",
+    "Default": "İştirakçı",
+    "Moderator": "Moderator",
+    "Admin": "Administrator",
+    "Start a chat": "Danışığa başlamaq",
+    "Who would you like to communicate with?": "Kimlə siz əlaqə saxlamaq istəyirdiniz?",
+    "Email, name or matrix ID": "Email, ad və ya ZT-ID",
+    "Start Chat": "Danışığa başlamaq",
+    "Invite new room members": "Yeni iştirakçıların otağına dəvət etmək",
+    "Who would you like to add to this room?": "Bu otaqa kimi dəvət etmək istərdiniz?",
+    "You need to be logged in.": "Siz sistemə girməlisiniz.",
+    "You need to be able to invite users to do that.": "Bunun üçün siz istifadəçiləri dəvət etmək imkanına malik olmalısınız.",
+    "Failed to send request.": "Sorğunu göndərməyi bacarmadı.",
+    "Power level must be positive integer.": "Hüquqların səviyyəsi müsbət tam ədəd olmalıdır.",
+    "Missing room_id in request": "Sorğuda room_id yoxdur",
+    "Missing user_id in request": "Sorğuda user_id yoxdur",
+    "Usage": "İstifadə",
+    "/ddg is not a command": "/ddg — bu komanda deyil",
+    "To use it, just wait for autocomplete results to load and tab through them.": "Bu funksiyadan istifadə etmək üçün, avto-əlavənin pəncərəsində nəticələrin yükləməsini gözləyin, sonra burulma üçün Tab-dan istifadə edin.",
+    "Changes your display nickname": "Sizin təxəllüsünüz dəyişdirir",
+    "Invites user with given id to current room": "Verilmiş ID-lə istifadəçini cari otağa dəvət edir",
+    "Joins room with given alias": "Verilmiş təxəllüslə otağa daxil olur",
+    "Leave room": "Otağı tərk etmək",
+    "Kicks user with given id": "Verilmiş ID-lə istifadəçini çıxarır",
+    "Bans user with given id": "Verilmiş ID-lə istifadəçini bloklayır",
+    "Ignores a user, hiding their messages from you": "Sizdən mesajları gizlədərək istifadəçini bloklayır",
+    "Ignored user": "İstifadəçi blokun siyahısına əlavə edilmişdir",
+    "You are now ignoring %(userId)s": "Siz %(userId)s blokladınız",
+    "Stops ignoring a user, showing their messages going forward": "Onların gələcək mesajlarını göstərərək istifadəçinin bloku edilməsi durdurur",
+    "Unignored user": "İstifadəçi blokun siyahısından götürülmüşdür",
+    "You are no longer ignoring %(userId)s": "Siz %(userId)s blokdan çıxardınız",
+    "Deops user with given id": "Verilmiş ID-lə istifadəçidən operatorun səlahiyyətlərini çıxardır",
+    "Displays action": "Hərəkətlərin nümayişi",
+    "Reason": "Səbəb",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s  %(displayName)s-dən dəvəti qəbul etdi.",
+    "%(targetName)s accepted an invitation.": "%(targetName)s dəvəti qəbul etdi.",
+    "%(senderName)s invited %(targetName)s.": "%(senderName)s %(targetName)s-nı dəvət edir.",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s  %(targetName)s-i blokladı.",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s öz görünüş adını sildi (%(oldDisplayName)s).",
+    "%(senderName)s removed their profile picture.": "%(senderName)s avatarını sildi.",
+    "%(senderName)s changed their profile picture.": "%(senderName)s öz avatar-ı dəyişdirdi.",
+    "VoIP conference started.": "Konfrans-zəng başlandı.",
+    "%(targetName)s joined the room.": "%(targetName)s otağa girdi.",
+    "VoIP conference finished.": "Konfrans-zəng qurtarılmışdır.",
+    "%(targetName)s rejected the invitation.": "%(targetName)s dəvəti rədd etdi.",
+    "%(targetName)s left the room.": "%(targetName)s otaqdan çıxdı.",
+    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s %(targetName)s blokdan çıxardı.",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s %(targetName)s-nı qovdu.",
+    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s öz dəvətini sildi %(targetName)s.",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s otağın mövzusunu \"%(topic)s\" dəyişdirdi.",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s otağın adını %(roomName)s dəyişdirdi.",
+    "(not supported by this browser)": "(bu brauzerlə dəstəklənmir)",
+    "%(senderName)s answered the call.": "%(senderName)s zəngə cavab verdi.",
+    "%(senderName)s ended the call.": "%(senderName)s zəng qurtardı.",
+    "%(senderName)s placed a %(callType)s call.": "%(senderName)s ) %(callType)s-zəng başladı.",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s dəvət edilmiş iştirakçılar üçün danışıqların tarixini açdı.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s girmiş iştirakçılar üçün danışıqların tarixini açdı.",
+    "%(senderName)s made future room history visible to all room members.": "%(senderName)s iştirakçılar üçün danışıqların tarixini açdı.",
+    "%(senderName)s made future room history visible to anyone.": "%(senderName)s hamı üçün danışıqların tarixini açdı.",
+    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s naməlum rejimdə otağın tarixini açdı (%(visibility)s).",
+    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s включил(а) в комнате сквозное шифрование (алгоритм %(algorithm)s).",
+    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s üçün  %(fromPowerLevel)s-dan %(toPowerLevel)s-lə",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s hüquqların səviyyələrini dəyişdirdi %(powerLevelDiffText)s.",
+    "%(displayName)s is typing": "%(displayName)s çap edir",
+    "%(names)s and %(lastPerson)s are typing": "%(names)s və %(lastPerson)s çap edirlər",
+    "Failed to join room": "Otağa girməyi bacarmadı",
+    "Disable Emoji suggestions while typing": "Mətnin yığılması vaxtı Emoji-i təklif etməmək",
+    "Hide read receipts": "Oxuma haqqında nişanları gizlətmək",
+    "Always show message timestamps": "Həmişə mesajların göndərilməsi vaxtını göstərmək",
+    "Autoplay GIFs and videos": "GIF animasiyalarını və videolarını avtomatik olaraq oynayır",
+    "Don't send typing notifications": "Nə vaxt ki, mən çap edirəm, o haqda bildirişləri göndərməmək",
+    "Never send encrypted messages to unverified devices from this device": "Heç vaxt (bu qurğudan) yoxlanılmamış qurğulara şifrlənmiş mesajları göndərməmək",
+    "Never send encrypted messages to unverified devices in this room from this device": "Heç vaxt (bu otaqda, bu qurğudan) yoxlanılmamış qurğulara şifrlənmiş mesajları göndərməmək",
+    "Accept": "Qəbul etmək",
+    "Error": "Səhv",
+    "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Mətn mesajı +%(msisdn)s-a göndərilmişdi. Mesajdan yoxlama kodunu daxil edin",
+    "Incorrect verification code": "Təsdiq etmənin səhv kodu",
+    "Enter Code": "Kodu daxil etmək",
+    "Phone": "Telefon",
+    "Add phone number": "Telefon nömrəsini əlavə etmək",
+    "New passwords don't match": "Yeni şifrlər uyğun gəlmir",
+    "Passwords can't be empty": "Şifrələr boş ola bilməz",
+    "Continue": "Davam etmək",
+    "Export E2E room keys": "Şifrləmənin açarlarının ixracı",
+    "Current password": "Cari şifrə",
+    "Password": "Şifrə",
+    "New Password": "Yeni şifrə",
+    "Confirm password": "Yeni şifrə təsdiq edin",
+    "Change Password": "Şifrəni dəyişdirin",
+    "Authentication": "Müəyyənləşdirilmə",
+    "Device ID": "Qurğunun ID-i",
+    "Failed to set display name": "Görünüş adını təyin etmək bacarmadı",
+    "Notification targets": "Xəbərdarlıqlar üçün qurğular",
+    "On": "Qoşmaq",
+    "Invalid alias format": "Adının yolverilməz formatı",
+    "'%(alias)s' is not a valid format for an alias": "Ad '%(alias)s' yolverilməz formata malikdir",
+    "Invalid address format": "Ünvanın yolverilməz formatı",
+    "'%(alias)s' is not a valid format for an address": "Ünvan '%(alias)s' yolverilməz formata malikdir",
+    "not specified": "qeyd edilmədi",
+    "not set": "qeyd edilmədi",
+    "Local addresses for this room:": "Sizin serverinizdə bu otağın ünvanları:",
+    "New address (e.g. #foo:%(localDomain)s)": "Yeni ünvan (məsələn, #nəsə:%(localDomain)s)",
+    "Blacklisted": "Qara siyahıda",
+    "Disinvite": "Dəvəti geri çağırmaq",
+    "Kick": "Qovmaq",
+    "Failed to kick": "Qovmağı bacarmadı",
+    "Unban": "Blokdan çıxarmaq",
+    "Ban": "Bloklamaq",
+    "Failed to ban user": "İstifadəçini bloklamağı bacarmadı",
+    "Failed to mute user": "İstifadəçini kəsməyi bacarmadı",
+    "Failed to toggle moderator status": "Moderatorun statusunu dəyişdirməyi bacarmadı",
+    "Failed to change power level": "Hüquqların səviyyəsini dəyişdirməyi bacarmadı",
+    "Are you sure?": "Siz əminsiniz?",
+    "No devices with registered encryption keys": "Şifrləmənin qeyd edilmiş açarlarıyla qurğu yoxdur",
+    "Devices": "Qurğular",
+    "Unignore": "Blokdan çıxarmaq",
+    "Ignore": "Bloklamaq",
+    "User Options": "Hərəkətlər",
+    "Direct chats": "Şəxsi çatlar",
+    "Level:": "Səviyyə:",
+    "Invited": "Dəvət edilmişdir",
+    "Filter room members": "İştirakçılara görə axtarış",
+    "Attachment": "Əlavə",
+    "Upload Files": "Faylların göndərilməsi",
+    "Are you sure you want to upload the following files?": "Siz əminsiniz ki, siz bu faylları göndərmək istəyirsiniz?",
+    "Encrypted room": "Şifrlənmiş otaq",
+    "Unencrypted room": "Şifrələnməyən otaq",
+    "Hangup": "Bitirmək",
+    "Voice call": "Səs çağırış",
+    "Video call": "Video çağırış",
+    "Upload file": "Faylı göndərmək",
+    "You do not have permission to post to this room": "Siz bu otağa yaza bilmirsiniz",
+    "Hide Text Formatting Toolbar": "Mətnin formatlaşdırılmasının alətlərini gizlətmək",
+    "Command error": "Komandanın səhvi",
+    "Markdown is disabled": "Markdown kəsilmişdir",
+    "Markdown is enabled": "Markdown qoşulmuşdur",
+    "Join Room": "Otağa girmək",
+    "Upload avatar": "Avatar-ı yükləmək",
+    "Settings": "Qurmalar",
+    "Forget room": "Otağı unutmaq",
+    "Drop here to tag %(section)s": "Bura daşıyın %(section)s nişan qoymaq üçün",
+    "Invites": "Dəvətlər",
+    "Favourites": "Seçilmişlər",
+    "People": "İnsanlar",
+    "Low priority": "Əhəmiyyətsizlər",
+    "Historical": "Arxiv",
+    "Rejoin": "Yenidən girmək",
+    "You are trying to access %(roomName)s.": "Siz %(roomName)s-a girməyə çalışırsınız.",
+    "You are trying to access a room.": "Siz otağa girməyə çalışırsınız.",
+    "Click here to join the discussion!": "Qoşulmaq üçün buraya basın!",
+    "Failed to unban": "Blokdan çıxarmağı bacarmadı",
+    "Banned by %(displayName)s": "%(displayName)s bloklanıb",
+    "Changes to who can read history will only apply to future messages in this room": "Tarixə girişin qaydalarının dəyişikliyi yalnız bu otaqda gələcək mesajlara tətbiq ediləcək",
+    "unknown error code": "naməlum səhv kodu",
+    "Failed to forget room %(errCode)s": "Otağı unutmağı bacarmadı: %(errCode)s",
+    "End-to-end encryption is in beta and may not be reliable": "İki tərəfi açıq şifrləmə indi beta-testdə və işləməyə bilər",
+    "You should not yet trust it to secure data": "Hal-hazırda yazışmalarınızın şifrələnəcəyinə etibar etməməlisiniz",
+    "Devices will not yet be able to decrypt history from before they joined the room": "Qurğular otağa girişinin anına qədər mesajların tarixinin şifrini aça bilməyəcək",
+    "Once encryption is enabled for a room it cannot be turned off again (for now)": "Otaqda şifrləmənin qoşmasından sonra siz o yenidən söndürə bilməyəcəksiniz  (müvəqqəti)",
+    "Encrypted messages will not be visible on clients that do not yet implement encryption": "Şifrlənmiş mesajlar daha iki tərəfi açıq şifrləməni dəstəkləməyən müştərilərdə görülməyəcək",
+    "Enable encryption": "Şifrləməni qoşmaq",
+    "(warning: cannot be disabled again!)": "(xəbərdarlıq: dəyişdirmək mümkün olmayacaq!)",
+    "To send messages, you must be a": "Mesajların göndərilməsi üçün, olmaq lazımdır",
+    "To invite users into the room, you must be a": "Otağa iştirakçıları dəvət etmək üçün, olmaq lazımdır",
+    "No users have specific privileges in this room": "Heç bir istifadəçi bu otaqda xüsusi hüquqlara malik deyil",
+    "Banned users": "Bloklanmış istifadəçilər",
+    "Favourite": "Seçilmiş",
+    "Click here to fix": "Düzəltmək üçün, buraya basın",
+    "Who can access this room?": "Kim bu otağa girə bilər?",
+    "Only people who have been invited": "Yalnız dəvət edilmiş iştirakçılar",
+    "Anyone who knows the room's link, apart from guests": "Hamı, kimdə bu otağa istinad var, qonaqlardan başqa",
+    "Anyone who knows the room's link, including guests": "Hamı, kimdə bu otağa istinad var, qonaqlar daxil olmaqla",
+    "Who can read history?": "Kim tarixi oxuya bilər?",
+    "Permissions": "Girişin hüquqları",
+    "Advanced": "Təfərrüatlar",
+    "Close": "Bağlamaq",
+    "Sunday": "Bazar",
+    "Friday": "Cümə",
+    "Today": "Bu gün",
+    "Decrypt %(text)s": "Şifrini açmaq %(text)s",
+    "Download %(text)s": "Yükləmək %(text)s",
+    "Message removed by %(userId)s": "%(userId)s mesajı silinmişdir",
+    "Password:": "Şifrə:",
+    "Username on %(hs)s": "İstifadəçinin adı %(hs)s",
+    "User name": "İstifadəçinin adı",
+    "Mobile phone number": "Mobil telefonun nömrəsi",
+    "Forgot your password?": "Şifrənizi unutmusunuz?",
+    "Sign in with": "Seçmək",
+    "Email address (optional)": "Email (qeyri-məcburi)",
+    "Mobile phone number (optional)": "Mobil telefonun (qeyri-məcburi) nömrəsi",
+    "Register": "Qeydiyyatdan keçmək",
+    "Remove": "Silmək",
+    "You are not receiving desktop notifications": "Siz sistem xəbərdarlıqlarını almırsınız",
+    "What's New": "Nə dəyişdi",
+    "Update": "Yeniləmək",
+    "Create new room": "Otağı yaratmaq",
+    "No results": "Nəticə yoxdur",
+    "Delete": "Silmək",
+    "Home": "Başlanğıc",
+    "Could not connect to the integration server": "İnteqrasiyanın serverinə qoşulmağ mümkün deyil",
+    "Manage Integrations": "İnteqrasiyaları idarə etmə",
+    "%(items)s and %(lastItem)s": "%(items)s və %(lastItem)s",
+    "Room directory": "Otaqların kataloqu",
+    "Start chat": "Çata başlamaq",
+    "Create Room": "Otağı yaratmaq",
+    "Advanced options": "Daha çox seçim",
+    "Block users on other matrix homeservers from joining this room": "Başqa serverlərdən bu otağa daxil olan istifadəçiləri bloklamaq",
+    "This setting cannot be changed later!": "Bu seçim sonra dəyişdirmək olmaz!",
+    "Deactivate Account": "Hesabı bağlamaq",
+    "Send Account Data": "Hesabın məlumatlarını göndərmək",
+    "An error has occurred.": "Səhv oldu.",
+    "Invalid Email Address": "Yanlış email",
+    "Verification Pending": "Gözləmə təsdiq etmələr",
+    "Please check your email and click on the link it contains. Once this is done, click continue.": "Öz elektron poçtunu yoxlayın və olan istinadı basın. Bundan sonra düyməni Davam etməyə basın.",
+    "Unable to add email address": "Email-i əlavə etməyə müvəffəq olmur",
+    "Unable to verify email address.": "Email-i yoxlamağı bacarmadı.",
+    "User names may only contain letters, numbers, dots, hyphens and underscores.": "İstifadəçilərin adları yalnız hərfləri, rəqəmləri, nöqtələri, defisləri və altından xətt çəkmənin simvollarını özündə saxlaya bilər.",
+    "Username not available": "İstifadəçi adı mövcud deyil",
+    "An error occurred: %(error_string)s": "Səhv baş verdi: %(error_string)s",
+    "Username available": "İstifadəçi adı mövcuddur",
+    "Failed to change password. Is your password correct?": "Şifrəni əvəz etməyi bacarmadı. Siz cari şifrə düzgün daxil etdiniz?",
+    "Reject invitation": "Dəvəti rədd etmək",
+    "Are you sure you want to reject the invitation?": "Siz əminsiniz ki, siz dəvəti rədd etmək istəyirsiniz?",
+    "Name": "Ad",
+    "Topic": "Mövzu",
+    "Make this room private": "Bu otağı bağlanmış etmək",
+    "Share message history with new users": "Mesajların tarixinə girişi yeni istifadəçilərə icazə vermək",
+    "Encrypt room": "Otağın şifrələnməsi",
+    "There are no visible files in this room": "Bu otaqda görülən fayl yoxdur",
+    "Featured Users:": "Seçilmiş istifadəçilər:",
+    "Couldn't load home page": "Ana səhifəni yükləməyi bacarmadı",
+    "Failed to reject invitation": "Dəvəti rədd etməyi bacarmadı",
+    "Failed to leave room": "Otaqdan çıxmağı bacarmadı",
+    "For security, this session has been signed out. Please sign in again.": "Təhlükəsizliyin təmin olunması üçün sizin sessiyanız başa çatmışdır idi. Zəhmət olmasa, yenidən girin.",
+    "Logout": "Çıxmaq",
+    "You have no visible notifications": "Görülən xəbərdarlıq yoxdur",
+    "Files": "Fayllar",
+    "Notifications": "Xəbərdarlıqlar",
+    "Hide panel": "Paneli gizlətmək",
+    "#example": "#misal",
+    "Connectivity to the server has been lost.": "Serverlə əlaqə itirilmişdir.",
+    "Sent messages will be stored until your connection has returned.": "Hələ ki serverlə əlaqə bərpa olmayacaq, göndərilmiş mesajlar saxlanacaq.",
+    "Active call": "Aktiv çağırış",
+    "Failed to upload file": "Faylı göndərməyi bacarmadı",
+    "No more results": "Daha çox nəticə yoxdur",
+    "Failed to save settings": "Qurmaları saxlamağı bacarmadı",
+    "Failed to reject invite": "Dəvəti rədd etməyi bacarmadı",
+    "Fill screen": "Ekranı doldurmaq",
+    "Click to unmute video": "Klikləyin, videonu qoşmaq üçün",
+    "Click to mute video": "Klikləyin, videonu söndürmək üçün",
+    "Click to unmute audio": "Klikləyin, səsi qoşmaq üçün",
+    "Click to mute audio": "Klikləyin, səsi söndürmək üçün",
+    "Expand panel": "Paneli açmaq",
+    "Filter room names": "Otaqlar üzrə axtarış",
+    "Failed to load timeline position": "Xronologiyadan nişanı yükləməyi bacarmadı",
+    "Can't load user settings": "İstifadəçi qurmalarını yükləmək mümkün deyil",
+    "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Şifrə uğurla dəyişdirildi. Təkrar avtorizasiyaya qədər siz başqa cihazlarda push-xəbərdarlıqları almayacaqsınız",
+    "Remove Contact Information?": "Əlaqə məlumatı silinsin?",
+    "Unable to remove contact information": "Əlaqə məlumatlarının silməyi bacarmadı",
+    "Interface Language": "İnterfeysin dili",
+    "User Interface": "İstifadəçi interfeysi",
+    "": "",
+    "Import E2E room keys": "Şifrləmənin açarlarının idxalı",
+    "Cryptography": "Kriptoqrafiya",
+    "Ignored Users": "Bloklanan istifadəçilər",
+    "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Məxfilik bizim üçün əhəmiyyətlidir, buna görə biz bizim analitikamız üçün heç bir şəxsi və ya müəyyən edən məlumat yığmırıq.",
+    "Learn more about how we use analytics.": "O haqda daha ətraflı, necə biz analitikadan istifadə edirik.",
+    "Labs": "Laboratoriya",
+    "Use with caution": "Ehtiyatlılıqla istifadə etmək",
+    "Deactivate my account": "Mənim hesabımı bağlamaq",
+    "Clear Cache": "Keşi təmizləmək",
+    "Clear Cache and Reload": "Keşi təmizləmək və yenidən yükləmək",
+    "Bulk Options": "Qrup parametrləri",
+    "Email": "E-poçt",
+    "Add email address": "Email-i əlavə etmək",
+    "Profile": "Profil",
+    "Display name": "Göstərilən ad",
+    "Account": "Hesab",
+    "Access Token:": "Girişin token-i:",
+    "click to reveal": "açılış üçün basın",
+    "Homeserver is": "Ev serveri bu",
+    "Identity Server is": "Eyniləşdirmənin serveri bu",
+    "matrix-react-sdk version:": "matrix-react-sdk versiyası:",
+    "olm version:": "Olm versiyası:",
+    "Failed to send email": "Email göndərilməsinin səhvi",
+    "A new password must be entered.": "Yeni parolu daxil edin.",
+    "New passwords must match each other.": "Yeni şifrələr uyğun olmalıdır.",
+    "I have verified my email address": "Mən öz email-i təsdiq etdim",
+    "Your password has been reset": "Sizin şifrə sıfırlandı",
+    "You have been logged out of all devices and will no longer receive push notifications. To re-enable notifications, sign in again on each device": "Siz bütün qurğulardan çıxdınız və push-xəbərdarlıqları almayacaqsınız. Xəbərdarlıq aktivləşdirmək üçün hər cihaza yenidən daxil olun",
+    "Return to login screen": "Girişin ekranına qayıtmaq",
+    "New password": "Yeni şifrə",
+    "Confirm your new password": "Yeni Şifrə təsdiq edin",
+    "Send Reset Email": "Şifrənizi sıfırlamaq üçün istinadla məktubu göndərmək",
+    "Create an account": "Hesabı yaratmaq",
+    "Set a display name:": "Görünüş adını daxil edin:",
+    "Upload an avatar:": "Avatar yüklə:",
+    "This server does not support authentication with a phone number.": "Bu server telefon nömrəsinin köməyi ilə müəyyənləşdirilməni dəstəkləmir.",
+    "Missing password.": "Şifrə yoxdur.",
+    "Passwords don't match.": "Şifrələr uyğun gəlmir.",
+    "Password too short (min %(MIN_PASSWORD_LENGTH)s).": "Şifrə çox qısa (min. %(MIN_PASSWORD_LENGTH)s).",
+    "This doesn't look like a valid email address.": "Bu etibarlı bir e-poçt kimi görünmür.",
+    "This doesn't look like a valid phone number.": "Yanlış telefon nömrəsi.",
+    "An unknown error occurred.": "Bilinməyən bir səhv baş verdi.",
+    "I already have an account": "Məndə hesab var",
+    "Commands": "Komandalar",
+    "Emoji": "Smaylar",
+    "Users": "İstifadəçilər",
+    "unknown device": "naməlum cihaz",
+    "NOT verified": "Yoxlanmamışdır",
+    "verified": "yoxlanmış",
+    "Verification": "Yoxlama",
+    "Ed25519 fingerprint": "Ed25519 iz",
+    "User ID": "İstifadəçinin ID-i",
+    "Curve25519 identity key": "Kimlik açarı Curve25519",
+    "none": "heç kim",
+    "Claimed Ed25519 fingerprint key": "Ed25519-un rəqəmli izinin tələb edilən açarı",
+    "Algorithm": "Alqoritm",
+    "unencrypted": "şifrləməsiz",
+    "Decryption error": "Şifrələmə xətası",
+    "End-to-end encryption information": "İki tərəfi açıq şifrləmə haqqında məlumatlar",
+    "Event information": "Hadisə haqqında informasiya",
+    "Confirm passphrase": "Şifrəni təsdiqləyin"
 }
diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 5ec9a93bc5..9e667a30aa 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -498,7 +498,7 @@
     "Failed to remove room from community": "Неуспешно премахване на стаята от общността",
     "Only visible to community members": "Видимо само за членове на общността",
     "Filter community rooms": "Филтрирай стаи на общността",
-    "Community IDs cannot not be empty.": "Идентификаторите на общността не могат да бъдат празни.",
+    "Community IDs cannot be empty.": "Идентификаторите на общността не могат да бъдат празни.",
     "Create Community": "Създай общност",
     "Community Name": "Име на общност",
     "Community ID": "Идентификатор на общност",
@@ -1181,5 +1181,100 @@
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "За да продължите да ползвате %(homeserverDomain)s е необходимо да прегледате и да се съгласите с правилата и условията за ползване.",
     "Review terms and conditions": "Прегледай правилата и условията",
     "Failed to indicate account erasure": "Неуспешно указване на желанието за изтриване на акаунта",
-    "Try the app first": "Първо пробвайте приложението"
+    "Try the app first": "Първо пробвайте приложението",
+    "Encrypting": "Шифроване",
+    "Encrypted, not sent": "Шифровано, неизпратено",
+    "Share Link to User": "Сподели връзка с потребител",
+    "Share room": "Сподели стая",
+    "Share Room": "Споделяне на стая",
+    "Link to most recent message": "Създай връзка към най-новото съобщение",
+    "Share User": "Споделяне на потребител",
+    "Share Community": "Споделяне на общност",
+    "Share Room Message": "Споделяне на съобщение от стая",
+    "Link to selected message": "Създай връзка към избраното съобщение",
+    "COPY": "КОПИРАЙ",
+    "Share Message": "Сподели съобщението",
+    "No Audio Outputs detected": "Не са открити аудио изходи",
+    "Audio Output": "Аудио изходи",
+    "Jitsi Conference Calling": "Jitsi конферентни разговори",
+    "Call in Progress": "Тече разговор",
+    "A call is already in progress!": "В момента вече тече разговор!",
+    "You have no historical rooms": "Нямате стаи в архива",
+    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "В шифровани стаи като тази, по подразбиране URL прегледите са изключени, за да се подсигури че сървърът (където става генерирането на прегледите) не може да събира информация за връзките споделени в стаята.",
+    "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "Когато някой сподели URL връзка в съобщение, може да бъде показан URL преглед даващ повече информация за връзката (заглавие, описание и картинка от уебсайта).",
+    "The email field must not be blank.": "Имейл полето не може да бъде празно.",
+    "The user name field must not be blank.": "Полето за потребителско име не може да е празно.",
+    "The phone number field must not be blank.": "Полето за телефонен номер не може да е празно.",
+    "The password field must not be blank.": "Полето за парола не може да е празно.",
+    "You can't send any messages until you review and agree to our terms and conditions.": "Не можете да изпращате съобщения докато не прегледате и се съгласите с нашите правила и условия.",
+    "Demote yourself?": "Понижете себе си?",
+    "Demote": "Понижение",
+    "This event could not be displayed": "Това събитие не може да бъде показано",
+    "A conference call could not be started because the intgrations server is not available": "Не може да бъде започнат конферентен разговор, защото сървърът с интеграции не е достъпен",
+    "Permission Required": "Необходимо е разрешение",
+    "A call is currently being placed!": "В момента се осъществява разговор!",
+    "You do not have permission to start a conference call in this room": "Нямате достъп да започнете конферентен разговор в тази стая",
+    "Show empty room list headings": "Показване на заглавия за празни стаи",
+    "deleted": "изтрито",
+    "underlined": "подчертано",
+    "inline-code": "код",
+    "block-quote": "цитат",
+    "bulleted-list": "списък (с тирета)",
+    "numbered-list": "номериран списък",
+    "Failed to remove widget": "Неуспешно премахване на приспособление",
+    "An error ocurred whilst trying to remove the widget from the room": "Възникна грешка при премахването на приспособлението от стаята",
+    "This homeserver has hit its Monthly Active User limit": "Този сървър достигна своя лимит за активни потребители на месец",
+    "Please contact your service administrator to continue using this service.": "Моля, свържете се с администратора на услугата за да продължите да я използвате.",
+    "This homeserver has hit its Monthly Active User limit. Please contact your service administrator to continue using the service.": "Този сървър достигна лимита си за активни потребители на месец. Моля, свържете се с администратора на услугата, за да продължите да я използвате.",
+    "Your message wasn’t sent because this homeserver has hit its Monthly Active User Limit. Please contact your service administrator to continue using the service.": "Съобщението Ви не бе изпратено, защото този сървър достигна лимита си за активни потребители на месец. Моля, свържете се с администратора на услугата, за да продължите да я използвате.",
+    "System Alerts": "Системни уведомления",
+    "Internal room ID: ": "Вътрешен идентификатор на стаята: ",
+    "Room version number: ": "Версия на стаята: ",
+    "This homeserver has hit its Monthly Active User limit. Please contact your service administrator to continue using the service.": "Този сървър достигна лимита си за активни потребители на месец. Моля, свържете се с администратора на услугата, за да продължите да я използвате.",
+    "This homeserver has hit its Monthly Active User limit so some users will not be able to log in. Please contact your service administrator to get this limit increased.": "Този сървър достигна лимита си за активни потребители на месец и някои потребители няма да успеят да влязат в профила си. Моля, свържете се с администратора на услугата за да се увеличи този лимит.",
+    "There is a known vulnerability affecting this room.": "Има пропуск в сигурността засягащ тази стая.",
+    "This room version is vulnerable to malicious modification of room state.": "Тази версия на стаята е уязвима към злонамерена модификация на състоянието й.",
+    "Click here to upgrade to the latest room version and ensure room integrity is protected.": "Кликнете тук за да обновите стаята до последна версия и подсигурите сигурността й.",
+    "Only room administrators will see this warning": "Само администратори на стаята виждат това предупреждение",
+    "Please contact your service administrator to continue using the service.": "Моля, свържете се с администратора на услугата за да продължите да я използвате.",
+    "This homeserver has hit its Monthly Active User limit.": "Този сървър е достигнал лимита си за активни потребители на месец.",
+    "This homeserver has exceeded one of its resource limits.": "Този сървър е надвишил някой от лимитите си.",
+    "Please contact your service administrator to get this limit increased.": "Моля, свържете се с администратора на услугата за да се увеличи този лимит.",
+    "This homeserver has hit its Monthly Active User limit so some users will not be able to log in.": "Този сървър е достигнал своя лимит за потребители на месец, така че някои потребители не биха успели да влязат.",
+    "This homeserver has exceeded one of its resource limits so some users will not be able to log in.": "Този сървър е достигнал някой от лимите си, така че някои потребители не биха успели да влязат.",
+    "Upgrade Room Version": "Обнови версията на стаята",
+    "Upgrading this room requires closing down the current instance of the room and creating a new room it its place. To give room members the best possible experience, we will:": "Обновяването на тази стая изисква затваряне на текущата и създаване на нова на нейно място. За да подсигурим най-доброто изживяване на потребителите, ще:",
+    "Create a new room with the same name, description and avatar": "Създадем нова стая със същото име, описание и снимка",
+    "Update any local room aliases to point to the new room": "Обновим всички локални адреси на стаята да сочат към новата",
+    "Stop users from speaking in the old version of the room, and post a message advising users to move to the new room": "Забраним комуникацията на потребителите в старата стая и публикуваме съобщение насочващо ги към новата",
+    "Put a link back to the old room at the start of the new room so people can see old messages": "Поставим връзка в новата стая, водещо обратно към старата, за да може хората да виждат старите съобщения",
+    "Your message wasn't sent because this homeserver has hit its Monthly Active User Limit. Please contact your service administrator to continue using the service.": "Съобщението Ви не бе изпратено, защото този сървър е достигнал лимита си за потребители на месец. Моля, свържете се с администратора на услугата за да продължите да я използвате.",
+    "Your message wasn't sent because this homeserver has exceeded a resource limit. Please contact your service administrator to continue using the service.": "Съобщението Ви не бе изпратено, защото този сървър е някой от лимитите си. Моля, свържете се с администратора на услугата за да продължите да я използвате.",
+    "Please contact your service administrator to continue using this service.": "Моля, свържете се с администратора на услугата за да продължите да я използвате.",
+    "Increase performance by only loading room members on first view": "Повишаване на бързодействието чрез отложено зареждане на членовете в стаите",
+    "Lazy loading members not supported": "Отложеното зареждане на членове не се поддържа",
+    "Lazy loading is not supported by your current homeserver.": "Отложеното зареждане не се поддържа от текущия сървър.",
+    "Sorry, your homeserver is too old to participate in this room.": "Съжаляваме, вашият сървър е прекалено стар за да участва в тази стая.",
+    "Please contact your homeserver administrator.": "Моля, свържете се се със сървърния администратор.",
+    "Legal": "Юридически",
+    "Registration Required": "Нужна е регистрация",
+    "You need to register to do this. Would you like to register now?": "За да направите това е нужно да се регистрирате. Искате ли да се регистрирате сега?",
+    "Unable to connect to Homeserver. Retrying...": "Неуспешно свързване със сървъра. Опитване отново...",
+    "This room has been replaced and is no longer active.": "Тази стая е била заменена и вече не е активна.",
+    "The conversation continues here.": "Разговора продължава тук.",
+    "Upgrade room to version %(ver)s": "Обновете стаята до версия %(ver)s",
+    "This room is a continuation of another conversation.": "Тази стая е продължение на предишен разговор.",
+    "Click here to see older messages.": "Кликнете тук за да видите предишните съобщения.",
+    "Failed to upgrade room": "Неуспешно обновяване на стаята",
+    "The room upgrade could not be completed": "Обновяването на тази стая не можа да бъде завършено",
+    "Upgrade this room to version %(version)s": "Обновете тази стая до версия %(version)s",
+    "Unable to query for supported registration methods": "Неуспешно запитване за поддържани методи за регистрация",
+    "Forces the current outbound group session in an encrypted room to be discarded": "Принудително прекратява текущата изходяща групова сесия в шифрована стая",
+    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|one": "%(senderName)s добави %(addedAddresses)s като адрес за тази стая.",
+    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|other": "%(senderName)s добави %(addedAddresses)s като адреси за тази стая.",
+    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|one": "%(senderName)s премахна %(removedAddresses)s като адрес за тази стая.",
+    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|other": "%(senderName)s премахна %(removedAddresses)s като адреси за тази стая.",
+    "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.": "%(senderName)s добави %(addedAddresses)s и премахна %(removedAddresses)s като адреси за тази стая.",
+    "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s настрой основния адрес на тази стая на %(address)s.",
+    "%(senderName)s removed the main address for this room.": "%(senderName)s премахна основния адрес на тази стая."
 }
diff --git a/src/i18n/strings/ca.json b/src/i18n/strings/ca.json
index 98d51e99ac..fc084e0d3f 100644
--- a/src/i18n/strings/ca.json
+++ b/src/i18n/strings/ca.json
@@ -130,7 +130,7 @@
     "Unable to create widget.": "No s'ha pogut crear el giny.",
     "Failed to send request.": "No s'ha pogut enviar la sol·licitud.",
     "This room is not recognised.": "No es reconeix aquesta sala.",
-    "Power level must be positive integer.": "El nivell de potència ha de ser un enter positiu.",
+    "Power level must be positive integer.": "El nivell de poders ha de ser un enter positiu.",
     "You are not in this room.": "No heu entrat a aquesta sala.",
     "You do not have permission to do that in this room.": "No teniu el permís per realitzar aquesta acció en aquesta sala.",
     "Missing room_id in request": "Falta l'ID de la sala en la vostra sol·licitud",
@@ -167,7 +167,7 @@
     "%(targetName)s joined the room.": "%(targetName)s ha entrat a la sala.",
     "VoIP conference finished.": "S'ha finalitzat la conferència VoIP.",
     "%(targetName)s rejected the invitation.": "%(targetName)s ha rebutjat la invitació.",
-    "%(targetName)s left the room.": "%(targetName)s ha sortir de la sala.",
+    "%(targetName)s left the room.": "%(targetName)s ha sortit de la sala.",
     "%(senderName)s unbanned %(targetName)s.": "%(senderName)s ha readmès a %(targetName)s.",
     "%(senderName)s kicked %(targetName)s.": "%(senderName)s ha fet fora a %(targetName)s.",
     "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s ha retirat la invitació per a %(targetName)s.",
@@ -191,7 +191,7 @@
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s ha fet visible l'històric de la sala per a desconeguts (%(visibility)s).",
     "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s ha activat l'encriptació d'extrem a extrem (algoritme %(algorithm)s).",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s de %(fromPowerLevel)s fins %(toPowerLevel)s",
-    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s ha canviat el nivell de potència de %(powerLevelDiffText)s.",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s ha canviat el nivell de poders de %(powerLevelDiffText)s.",
     "%(senderName)s changed the pinned messages for the room.": "%(senderName)s ha canviat els missatges fixats de la sala.",
     "%(widgetName)s widget modified by %(senderName)s": "%(senderName)s ha modificat el giny %(widgetName)s",
     "%(widgetName)s widget added by %(senderName)s": "%(senderName)s ha afegit el giny %(widgetName)s",
@@ -301,7 +301,7 @@
     "Failed to ban user": "No s'ha pogut expulsar l'usuari",
     "Failed to mute user": "No s'ha pogut silenciar l'usuari",
     "Failed to toggle moderator status": "No s'ha pogut canviar l'estat del moderador",
-    "Failed to change power level": "No s'ha pogut canviar el nivell de potència",
+    "Failed to change power level": "No s'ha pogut canviar el nivell de poders",
     "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "No podreu desfer aquest canvi ja que estareu baixant de grau de privilegis. Només un altre usuari amb més privilegis podrà fer que els recupereu.",
     "Are you sure?": "Esteu segur?",
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "No podreu desfer aquesta acció ja que esteu donant al usuari el mateix nivell de privilegi que el vostre.",
@@ -401,7 +401,7 @@
     "Press  to start a chat with someone": "Prem  per a començar un xat amb algú",
     "You may wish to login with a different account, or add this email to this account.": "És possible que vulgueu iniciar la sessió amb un altre compte o bé afegir aquest correu electrònic a aquest compte.",
     "You have been invited to join this room by %(inviterName)s": "Heu sigut convidat a aquesta sala per %(inviterName)s",
-    "Would you like to accept or decline this invitation?": "Voleu accept o bé declineText>decline aquesta invitació?",
+    "Would you like to accept or decline this invitation?": "Voleu accept o bé decline aquesta invitació?",
     "Reason: %(reasonText)s": "Raó: %(reasonText)s",
     "Rejoin": "Trona a entrar",
     "You have been kicked from %(roomName)s by %(userName)s.": "%(userName)s us ha fet fora de la sala %(roomName)s.",
@@ -654,7 +654,7 @@
     "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)s han sortit %(count)s vegades",
     "%(oneUser)sleft %(count)s times|other": "%(oneUser)s ha sortit %(count)s vegades",
     "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Les ID de les comunitats només poden contendre caràcters a-z, 0-9, o '=_-./'",
-    "Community IDs cannot not be empty.": "Les ID de les comunitats no poden estar buides.",
+    "Community IDs cannot be empty.": "Les ID de les comunitats no poden estar buides.",
     "Something went wrong whilst creating your community": "S'ha produït un error al crear la vostra comunitat",
     "Create Community": "Crea una comunitat",
     "Community Name": "Nom de la comunitat",
diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index b7298f80ab..04c22afcf0 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -1076,5 +1076,175 @@
     "Collapse panel": "Sbalit panel",
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Vzhled a chování aplikace může být ve vašem aktuální prohlížeči nesprávné a některé nebo všechny funkce mohou být chybné. Chcete-li i přes to pokračovat, nebudeme vám bránit, ale se všemi problémy, na které narazíte, si musíte poradit sami!",
     "Checking for an update...": "Kontrola aktualizací...",
-    "There are advanced notifications which are not shown here": "Jsou k dispozici pokročilá upozornění, která zde nejsou zobrazena"
+    "There are advanced notifications which are not shown here": "Jsou k dispozici pokročilá upozornění, která zde nejsou zobrazena",
+    "The platform you're on": "Platforma na které jsi",
+    "The version of Riot.im": "Verze Riot.im",
+    "Whether or not you're logged in (we don't record your user name)": "Jestli jsi, nebo nejsi přihlášen (tvou přezdívku neukládáme)",
+    "Your language of choice": "Tvá jazyková volba",
+    "Which officially provided instance you are using, if any": "Přes kterou oficiální podporovanou instanci Riot.im jste pripojeni (jestli nehostujete Riot sami)",
+    "Whether or not you're using the Richtext mode of the Rich Text Editor": "Jestli při psaní zpráv používáte rozbalenou lištu formátování textu",
+    "Your homeserver's URL": "URL vámi používaného domovského serveru",
+    "Your identity server's URL": "URL Vámi používaného serveru totožností",
+    "e.g. %(exampleValue)s": "např. %(exampleValue)s",
+    "Every page you use in the app": "Každou stránku v aplikaci, kterou navštívíte",
+    "e.g. ": "např. ",
+    "Your User Agent": "Řetězec User Agent Vašeho zařízení",
+    "Your device resolution": "Rozlišení obrazovky Vašeho zařízení",
+    "The information being sent to us to help make Riot.im better includes:": "S cílem vylepšovat aplikaci Riot.im shromažďujeme následující údaje:",
+    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "V případě, že se na stránce vyskytují identifikační údaje, jako například název místnosti, ID uživatele, místnosti a nebo skupiny, jsou tyto údaje před odesláním na server odstraněny.",
+    "A conference call could not be started because the intgrations server is not available": "Není možné uskutečnit konferenční hovor, integrační server není k dispozici",
+    "Call in Progress": "Probíhající hovor",
+    "A call is currently being placed!": "Právě probíhá jiný hovor!",
+    "A call is already in progress!": "Jeden hovor už probíhá!",
+    "Permission Required": "Vyžaduje oprávnění",
+    "You do not have permission to start a conference call in this room": "Nemáte oprávnění v této místnosti začít konferenční hovor",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s %(monthName)s %(fullYear)s",
+    "Missing roomId.": "Chybějící ID místnosti.",
+    "Opens the Developer Tools dialog": "Otevře dialog nástrojů pro vývojáře",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s si změnil zobrazované jméno na %(displayName)s.",
+    "Always show encryption icons": "Vždy zobrazovat ikony stavu šifrovaní",
+    "Disable Community Filter Panel": "Zakázat panel Filtr komunity",
+    "Send analytics data": "Odesílat analytická data",
+    "Enable widget screenshots on supported widgets": "Povolit screenshot widgetu pro podporované widgety",
+    "Show empty room list headings": "Zobrazovat nadpisy prázdných seznamů místností",
+    "This event could not be displayed": "Tato událost nemohla být zobrazena",
+    "Your key share request has been sent - please check your other devices for key share requests.": "Žádost o sdílení klíče byla odeslána - prosím zkontrolujte si Vaše ostatí zařízení.",
+    "Key share requests are sent to your other devices automatically. If you rejected or dismissed the key share request on your other devices, click here to request the keys for this session again.": "Žádost o sdílení klíčů je automaticky odesílaná na Vaše ostatní zařízení. Jestli jste žádost odmítly nebo zrušili dialogové okno se žádostí na ostatních zařízeních, kliknutím sem ji můžete opakovaně pro tuto relaci vyžádat.",
+    "If your other devices do not have the key for this message you will not be able to decrypt them.": "Pokud Vaše ostatní zařízení nemají klíč pro tyto zprávy, nebudete je moci dešifrovat.",
+    "Key request sent.": "Žádost o klíč poslána.",
+    "Re-request encryption keys from your other devices.": "Znovu vyžádat šifrovací klíče z vašich ostatních zařízení.",
+    "Encrypting": "Šifruje",
+    "Encrypted, not sent": "Zašifrováno, ale neodesláno",
+    "Demote yourself?": "Snížit Vaši vlastní hodnost?",
+    "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "Tuto změnu nebudete moci vzít zpět, protože snižujete svoji vlastní hodnost, jste-li poslední privilegovaný uživatel v místnosti, bude nemožné vaši současnou hodnost získat zpět.",
+    "Demote": "Degradovat",
+    "Share Link to User": "Sdílet odkaz na uživatele",
+    "deleted": "smazáno",
+    "underlined": "podtrženo",
+    "inline-code": "vnořený kód",
+    "block-quote": "citace",
+    "bulleted-list": "seznam s odrážkami",
+    "numbered-list": "číselný seznam",
+    "At this time it is not possible to reply with a file so this will be sent without being a reply.": "V současné době nejde odpovědět se souborem, proto toto bude odesláno jako by to odpověď nebyla.",
+    "Send an encrypted reply…": "Odeslat šifrovanou odpověď …",
+    "Send a reply (unencrypted)…": "Odeslat odpověď (nešifrovaně) …",
+    "Send an encrypted message…": "Odeslat šifrovanou zprávu …",
+    "Send a message (unencrypted)…": "Odeslat zprávu (nešifrovaně) …",
+    "Unable to reply": "Není možné odpovědět",
+    "At this time it is not possible to reply with an emote.": "V odpovědi zatím nejde vyjádřit pocit.",
+    "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "%(displayName)s (%(userName)s) viděl %(dateTime)s",
+    "Replying": "Odpovídá",
+    "Share room": "Sdílet místnost",
+    "You have no historical rooms": "Nemáte žádné historické místnosti",
+    "System Alerts": "Systémová varování",
+    "To notify everyone in the room, you must be a": "Abyste mohli upozornit všechny v místnosti, musíte být",
+    "%(user)s is a %(userRole)s": "%(user)s je %(userRole)s",
+    "Muted Users": "Umlčení uživatelé",
+    "Internal room ID: ": "Vnitřní ID mistnosti: ",
+    "Room version number: ": "Číslo verze místnosti: ",
+    "There is a known vulnerability affecting this room.": "Pro tuto místnost existuje známa zranitelnost.",
+    "This room version is vulnerable to malicious modification of room state.": "Tato verze místnosti je zranitelná zlomyslnou modifikací stavu místnosti.",
+    "Click here to upgrade to the latest room version and ensure room integrity is protected.": "Pro zaručení integrity místnosti klikněte sem a upgradeujte místnost na nejnovější verzi.",
+    "Only room administrators will see this warning": "Jen administrátoři místnosti uvidí toto varování",
+    "You don't currently have any stickerpacks enabled": "Momentálně nemáte aktívní žádné balíčky s nálepkami",
+    "Add a stickerpack": "Přidat balíček s nálepkami",
+    "Stickerpack": "Balíček s nálepkami",
+    "Hide Stickers": "Skrýt nálepky",
+    "Show Stickers": "Zobrazit nálepky",
+    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "V šifrovaných místnostech, jako je tato, jsou URL náhledy ve výchozím nastavení zakázané, aby bylo možné zajistit, že váš domácí server nemůže shromažďovat informace o odkazech, které v této místnosti vidíte.",
+    "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "Když někdo ve zprávě pošle URL adresu, může být zobrazen její náhled obsahující informace jako titulek, popis a obrázek z cílové stránky.",
+    "Code": "Kód",
+    "The email field must not be blank.": "E-mail nemůže být prázdný.",
+    "The user name field must not be blank.": "Uživatelské jméno nemůže být prázdné.",
+    "The phone number field must not be blank.": "Telefonní číslo nemůže být prázdné.",
+    "The password field must not be blank.": "Heslo nemůže být prázdné.",
+    "Please help improve Riot.im by sending anonymous usage data. This will use a cookie (please see our Cookie Policy).": "Prosím pomozte nám vylepšovat Riot.im odesíláním anonymních údajů o používaní. Na tento účel použijeme cookie (přečtěte si jak cookies používáme).",
+    "Please help improve Riot.im by sending anonymous usage data. This will use a cookie.": "Prosím pomozte nám vylepšovat Riot.im odesíláním anonymních údajů o používaní. Na tento účel použijeme cookie.",
+    "Yes, I want to help!": "Ano, chci pomoci!",
+    "Please contact your service administrator to continue using the service.": "Please contact your service administrator to continue using the service.\nProsím kontaktujte Vašeho administratora aby jste mohli pokračovat v používání Vašeho zařízení.",
+    "This homeserver has hit its Monthly Active User limit.": "Tento domovský server dosáhl svého měsíčního limitu pro aktivní uživatele.",
+    "This homeserver has exceeded one of its resource limits.": "Tento domovský server překročil některý z limitů.",
+    "Please contact your service administrator to get this limit increased.": "Prosím kontaktujte Vašeho administrátora pro zvýšení tohoto limitu.",
+    "This homeserver has hit its Monthly Active User limit so some users will not be able to log in.": "Tento domovský server dosáhl svého měsíčního limitu pro aktivní uživatele, proto se někteří uživatelé nebudou moci přihlásit.",
+    "This homeserver has exceeded one of its resource limits so some users will not be able to log in.": "Tento domovský server překročil některý z limitů, proto se někteří uživatelé nebudou moci přihlásit.",
+    "Warning: This widget might use cookies.": "Varování: tento widget může používat cookies.",
+    "Failed to remove widget": "Nepovedlo se odstranit widget",
+    "An error ocurred whilst trying to remove the widget from the room": "Při odstraňování widgetu z místnosti nastala chyba",
+    "Minimize apps": "Minimalizovat aplikace",
+    "Reload widget": "Obnovit widget",
+    "Popout widget": "Otevřít widget v novém okně",
+    "Picture": "Fotografie",
+    "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Není možné načíst událost, na kterou se odpovídalo. Buď neexistuje, nebo nemáte oprávnění ji zobrazit.",
+    "In reply to ": "V odpovědi na ",
+    "Preparing to send logs": "Příprava na odeslání záznamů",
+    "Logs sent": "Záznamy odeslány",
+    "Failed to send logs: ": "Nepodařilo se odeslat záznamy: ",
+    "Submit debug logs": "Odeslat ladící záznamy",
+    "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Ladící záznamy obsahují data o používání aplikace včetně Vašeho uživatelského jména, ID nebo aliasy navštívených místností a skupin a uživatelská jména jiných uživatelů. Neobsahují zprávy.",
+    "Riot bugs are tracked on GitHub: create a GitHub issue.": "Bugy Riotu jsou na Githubu: vytvořit bug na Githubu.",
+    "GitHub issue link:": "Odkaz na hlášení na GitHubu:",
+    "Notes:": "Poznámky:",
+    "Community IDs cannot be empty.": "ID komunity nemůže být prázdné.",
+    "Failed to indicate account erasure": "Nepovedlo se potvrdit výmaz účtu",
+    "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. This action is irreversible.": "Toto učiní účet permanentně nepoužitelný. Nebudete se moci přihlásit a nikdo se nebude moci se stejným uživatelskym ID znovu zaregistrovat. Účet bude odstraněn ze všech místnosti a bude vymazán ze servru identity.Tato akce je nevratná.",
+    "Deactivating your account does not by default cause us to forget messages you have sent. If you would like us to forget your messages, please tick the box below.": "Deaktivace účtu automaticky nesmaže zprávy, které jste poslali. Chcete-li je smazat, zaškrtněte prosím odpovídající pole níže.",
+    "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "Viditelnost zpráv v Matrixu je podobná e-mailu. Výmaz Vašich zpráv znamené, že už nebudou sdíleny s žádným novým nebo neregistrovaným uživatelem, ale registrovaní uživatelé, kteří už přístup ke zprávám mají, budou stále mít přístup k jejich kopii.",
+    "Please forget all messages I have sent when my account is deactivated (Warning: this will cause future users to see an incomplete view of conversations)": "S deaktivací účtu si přeji smazat všechny mnou odeslané zprávy (Pozor: způsobí, že noví uživatelé uvidí nekompletní konverzace)",
+    "To continue, please enter your password:": "Pro pokračování, zadejte Vaše heslo:",
+    "password": "heslo",
+    "Upgrade Room Version": "Upgradeovat verzi místnosti",
+    "Upgrading this room requires closing down the current instance of the room and creating a new room it its place. To give room members the best possible experience, we will:": "Upgradování této místnosti vyžaduje uzavření současné instance místnosti a vytvoření místností nové. Pro co možná nejhladší průběh:",
+    "Create a new room with the same name, description and avatar": "Vytvoříme místnost se stejným jménem, popisem a avatarem",
+    "Update any local room aliases to point to the new room": "Aktualizujeme všechny lokální aliasy místnosti tak, aby ukazovaly na novou místnost",
+    "Stop users from speaking in the old version of the room, and post a message advising users to move to the new room": "Přerušíme konverzace ve staré verzi místnosti a pošleme uživatelům zprávu o přechodu do nové mistnosti",
+    "Put a link back to the old room at the start of the new room so people can see old messages": "Na začátek nové místnosti umístíme odkaz na starou místnost tak, aby uživatelé mohli vidět staré zprávy",
+    "Log out and remove encryption keys?": "Odhlásit se a odstranit šifrovací klíče?",
+    "Clear Storage and Sign Out": "Vymazat uložiště a odhlásit se",
+    "Send Logs": "Odeslat záznamy",
+    "Refresh": "Obnovit",
+    "We encountered an error trying to restore your previous session.": "V průběhu obnovování Vaší minulé relace nastala chyba.",
+    "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Vymazání uložiště prohlížeče možna opraví Váš problem, zároveň se tím ale odhlásíte a historie Vašich šifrovaných konverzací se pro Vás může stát nečitelnou.",
+    "Share Room": "Sdílet místnost",
+    "Link to most recent message": "Odkaz na nejnovější zprávu",
+    "Share User": "Sdílet uživatele",
+    "Share Community": "Sdílet komunitu",
+    "Share Room Message": "Sdílet zprávu z místnosti",
+    "Link to selected message": "Odkaz na vybranou zprávu",
+    "COPY": "Kopírovat",
+    "Share Message": "Sdílet zprávu",
+    "Collapse Reply Thread": "Sbalit vlákno odpovědi",
+    "Unable to join community": "Není možné vstoupit do komunity",
+    "Unable to leave community": "Není možné opustit komunitu",
+    "Changes made to your community name and avatar might not be seen by other users for up to 30 minutes.": "Změny ve Vaší komunitě název a avatar možná nebudou viditelné pro ostatní uživatele po dobu až 30 minut.",
+    "Join this community": "Vstoupit do komunity",
+    "Leave this community": "Opustit komunitu",
+    "Who can join this community?": "Kdo může vstoupit do této komunity?",
+    "Everyone": "Všichni",
+    "This room is not public. You will not be able to rejoin without an invite.": "Tato místnost není veřejná. Bez pozvánky nebudete moci znovu vstoupit.",
+    "Can't leave Server Notices room": "Z místnosti \"Server Notices\" nejde odejit",
+    "This room is used for important messages from the Homeserver, so you cannot leave it.": "Tato místnost je určena pro důležité zprávy od domácího servru, a proto z ní nemůžete odejít.",
+    "Terms and Conditions": "Smluvní podmínky",
+    "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Chcete-li nadále používat domovský server %(homeserverDomain)s, měli byste si přečíst a odsouhlasit naše smluvní podmínky.",
+    "Review terms and conditions": "Přečíst smluvní podmínky",
+    "Did you know: you can use communities to filter your Riot.im experience!": "Věděli jste, že: práci s Riot.im si můžete zpříjemnit s použitím komunit!",
+    "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Pro nastavení filtru, přetáhněte obrázek komunity na pantel foltrování na leve straně obrazovky. Potom můžete kdykoliv kliknout na obrazek komunity na tomto panelu a Riot.im Vám bude zobrazovat jen místnosti a lidi z dané komunity.",
+    "Show devices, send anyway or cancel.": "Zobrazit zařízení, i tak odeslat a nebo  zrušit.",
+    "You can't send any messages until you review and agree to our terms and conditions.": "Dokud si nepřečtete a neodsouhlasíte naše smluvní podmínky, nebudete moci posílat žádné zprávy.",
+    "Your message wasn't sent because this homeserver has hit its Monthly Active User Limit. Please contact your service administrator to continue using the service.": "Vaše zpráva nebyla odeslána, protože tento domácí server dosáhl svého měsíčního limitu pro aktivní uživatele. Prosím kontaktujte Vašeho administratora pro další využívání služby.",
+    "Your message wasn't sent because this homeserver has exceeded a resource limit. Please contact your service administrator to continue using the service.": "Vaše zpráva nebyla odeslána, protože tento domácí server dosáhl limitu. Prosím kontaktujte Vašeho administratora pro další využívání služby.",
+    "%(count)s of your messages have not been sent.|one": "Vaše zpráva nebyla odeslána.",
+    "%(count)s Resend all or cancel all now. You can also select individual messages to resend or cancel.|other": "Znovu poslat všechny nebo zrušit všechny. Můžete též vybrat jednotlivé zprávy pro znovu odeslání nebo zrušení.",
+    "%(count)s Resend all or cancel all now. You can also select individual messages to resend or cancel.|one": "Znovu poslat zprávu nebo zrušit zprávu.",
+    "Clear filter": "Zrušit filtr",
+    "Debug Logs Submission": "Odeslání ladících záznamů",
+    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Jestli jste odeslali hlášení o chybě na GitHub, ladící záznamy nám pomohou problém najít. Ladicí záznamy obsahuji data o používání aplikate, která obsahují uživatelské jmeno, ID nebo aliasy navštívených místnosti a uživatelská jména dalších uživatelů. Neobsahují zprávy.",
+    "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Soukromí je pro nás důležité a proto neshromažďujeme osobní udaje ani udaje na zakladě, kterých by Vás bylo možne identifikovat.",
+    "Learn more about how we use analytics.": "Dozvědět se více o tom, jak zpracováváme analytické údaje.",
+    "No Audio Outputs detected": "Nebyly rozpoznány žádné zvukové výstupy",
+    "Audio Output": "Zvukový výstup",
+    "Please contact your service administrator to continue using this service.": "Pro pokračování využívání této služby prosím kontaktujte Vašeho administrátora.",
+    "Try the app first": "Zkuste aplikaci",
+    "Increase performance by only loading room members on first view": "Zvýšit výkon nahráváním členů místnosti jen poprvé",
+    "Lazy loading members not supported": "Líné nahrávání členů není podporováno",
+    "Lazy loading is not supported by your current homeserver.": "Líné nahrávání není podporováno současným domácím serverem."
 }
diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 9b1c5acb8d..88ee8fe75e 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -125,7 +125,7 @@
     "Return to login screen": "Zur Anmeldemaske zurückkehren",
     "Room Colour": "Raumfarbe",
     "Room name (optional)": "Raumname (optional)",
-    "Scroll to unread messages": "Zu den ungelesenen Nachrichten scrollen",
+    "Scroll to unread messages": "Zu den ungelesenen Nachrichten springen",
     "Send Invites": "Einladungen senden",
     "Send Reset Email": "E-Mail zum Zurücksetzen senden",
     "Server may be unavailable or overloaded": "Server ist eventuell nicht verfügbar oder überlastet",
@@ -260,7 +260,7 @@
     "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s hat den zukünftigen Chatverlauf sichtbar gemacht für alle Raum-Mitglieder (ab dem Zeitpunkt, an dem sie beigetreten sind).",
     "%(senderName)s made future room history visible to all room members.": "%(senderName)s hat den zukünftigen Chatverlauf sichtbar gemacht für: Alle Raum-Mitglieder.",
     "%(senderName)s made future room history visible to anyone.": "%(senderName)s hat den zukünftigen Chatverlauf sichtbar gemacht für Alle.",
-    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s hat den zukünftigen Chatverlauf sichtbar gemacht für unbekannt (%(visibility)s).",
+    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s hat den zukünftigen Chatverlauf für Unbekannte sichtbar gemacht (%(visibility)s).",
     "Missing room_id in request": "Fehlende room_id in Anfrage",
     "Missing user_id in request": "Fehlende user_id in Anfrage",
     "(not supported by this browser)": "(wird von diesem Browser nicht unterstützt)",
@@ -442,7 +442,7 @@
     "You can also set a custom identity server but this will typically prevent interaction with users based on email address.": "Du kannst auch einen angepassten Idantitätsserver angeben aber dies wird typischerweise Interaktionen mit anderen Nutzern auf Basis der E-Mail-Adresse verhindern.",
     "Please check your email to continue registration.": "Bitte prüfe deine E-Mails, um mit der Registrierung fortzufahren.",
     "Token incorrect": "Token fehlerhaft",
-    "Please enter the code it contains:": "Bitte gebe den Code ein, den sie enthält:",
+    "Please enter the code it contains:": "Bitte gib den darin enthaltenen Code ein:",
     "powered by Matrix": "betrieben mit Matrix",
     "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Wenn du keine E-Mail-Adresse angibst, wirst du nicht in der Lage sein, dein Passwort zurückzusetzen. Bist du sicher?",
     "You are registering with %(SelectedTeamName)s": "Du registrierst dich mit %(SelectedTeamName)s",
@@ -748,7 +748,7 @@
     "No rooms to show": "Keine anzeigbaren Räume",
     "Community Settings": "Community-Einstellungen",
     "Who would you like to add to this community?": "Wen möchtest du zu dieser Community hinzufügen?",
-    "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Warnung: Jede Person die du einer Community hinzufügst, wird für alle die die Community-ID kennen öffentlich sichtbar sein",
+    "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Warnung: Jede Person, die du einer Community hinzufügst, wird für alle, die die Community-ID kennen, öffentlich sichtbar sein",
     "Invite new community members": "Neue Community-Mitglieder einladen",
     "Invite to Community": "In die Community einladen",
     "Which rooms would you like to add to this community?": "Welche Räume möchtest du zu dieser Community hinzufügen?",
@@ -839,7 +839,7 @@
     "%(severalUsers)schanged their avatar %(count)s times|one": "%(severalUsers)shaben das Profilbild geändert",
     "%(oneUser)schanged their avatar %(count)s times|other": "%(oneUser)shat das Profilbild %(count)s-mal geändert",
     "%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)shat das Profilbild geändert",
-    "%(names)s and %(count)s others are typing|one": "%(names)s und eine weitere Person schreiben",
+    "%(names)s and %(count)s others are typing|one": "%(names)s und noch jemand schreiben",
     "Disinvite this user?": "Einladung für diesen Benutzer zurückziehen?",
     "Kick this user?": "Diesen Benutzer kicken?",
     "Unban this user?": "Verbannung für diesen Benutzer aufheben?",
@@ -915,7 +915,7 @@
     "Display your community flair in rooms configured to show it.": "Zeige deinen Community-Flair in den Räumen, die es erlauben.",
     "This homeserver doesn't offer any login flows which are supported by this client.": "Dieser Heimserver verfügt über keinen, von diesem Client unterstütztes Anmeldeverfahren.",
     "Call Failed": "Anruf fehlgeschlagen",
-    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "In diesem Raum befinden sich nicht verifizierte Geräte. Wenn du ohne sie zu verifizieren fortfährst, könnten Angreifer den Anruf mithören.",
+    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "In diesem Raum befinden sich nicht-verifizierte Geräte. Wenn du fortfährst ohne sie zu verifizieren, könnten Angreifer den Anruf mithören.",
     "Review Devices": "Geräte ansehen",
     "Call Anyway": "Trotzdem anrufen",
     "Answer Anyway": "Trotzdem annehmen",
@@ -929,13 +929,13 @@
     "Warning": "Warnung",
     "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Es wurden Daten von einer älteren Version von Riot entdeckt. Dies wird zu Fehlern in der Ende-zu-Ende-Verschlüsselung der älteren Version geführt haben. Ende-zu-Ende verschlüsselte Nachrichten, die ausgetauscht wruden, während die ältere Version genutzt wurde, werden in dieser Version nicht entschlüsselbar sein. Es kann auch zu Fehlern mit Nachrichten führen, die mit dieser Version versendet werden. Wenn du Probleme feststellst, melde dich ab und wieder an. Um die Historie zu behalten, ex- und reimportiere deine Schlüssel.",
     "Send an encrypted reply…": "Verschlüsselte Antwort senden…",
-    "Send a reply (unencrypted)…": "Antwort senden (unverschlüsselt)…",
+    "Send a reply (unencrypted)…": "Unverschlüsselte Antwort senden…",
     "Send an encrypted message…": "Verschlüsselte Nachricht senden…",
-    "Send a message (unencrypted)…": "Nachricht senden (unverschlüsselt)…",
+    "Send a message (unencrypted)…": "Unverschlüsselte Nachricht senden…",
     "Replying": "Antwortet",
     "Minimize apps": "Apps minimieren",
     "%(count)s of your messages have not been sent.|one": "Deine Nachricht wurde nicht gesendet.",
-    "%(count)s Resend all or cancel all now. You can also select individual messages to resend or cancel.|other": "Jetzt alle erneut senden oder alle abbrechen. Du kannst auch einzelne Nachrichten auswählen und erneut senden oder abbrechen.",
+    "%(count)s Resend all or cancel all now. You can also select individual messages to resend or cancel.|other": "Alle erneut senden oder alle abbrechen. Du kannst auch einzelne Nachrichten erneut senden oder abbrechen.",
     "%(count)s Resend all or cancel all now. You can also select individual messages to resend or cancel.|one": "Nachricht jetzt erneut senden oder senden abbrechen now.",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Privatsphäre ist uns wichtig, deshalb sammeln wir keine persönlichen oder identifizierbaren Daten für unsere Analysen.",
     "The information being sent to us to help make Riot.im better includes:": "Die Informationen, die an uns gesendet werden um Riot.im zu verbessern enthalten:",
@@ -947,13 +947,13 @@
     "Your identity server's URL": "Die URL deines Identitätsservers",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s",
     "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "Du wirst nicht in der Lage sein, die Änderung zurückzusetzen, da du dich degradierst. Wenn du der letze Nutzer mit Berechtigungen bist, wird es unmöglich sein die Privilegien zurückzubekommen.",
-    "Community IDs cannot not be empty.": "Community-IDs können nicht leer sein.",
+    "Community IDs cannot be empty.": "Community-IDs können nicht leer sein.",
     "Show devices, send anyway or cancel.": "Geräte anzeigen, trotzdem senden oder abbrechen.",
     "Learn more about how we use analytics.": "Lerne mehr darüber, wie wir die Analysedaten nutzen.",
-    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Wenn diese Seite identifizierbare Informationen sowie Raum, Nutzer oder Gruppen-ID enthalten, werden diese Daten entfernt bevor sie an den Server gesendet werden.",
+    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Wenn diese Seite identifizierbare Informationen wie Raum, Nutzer oder Gruppen-ID enthalten, werden diese Daten entfernt bevor sie an den Server gesendet werden.",
     "Whether or not you're logged in (we don't record your user name)": "Ob oder ob du nicht angemeldet bist (wir zeichnen deinen Benutzernamen nicht auf)",
     "Which officially provided instance you are using, if any": "Welche offiziell angebotene Instanz du nutzt, wenn es der Fall ist",
-    "In reply to ": "Antwort zu ",
+    "In reply to ": "Als Antwort auf ",
     "This room is not public. You will not be able to rejoin without an invite.": "Dies ist kein öffentlicher Raum. Du wirst diesen nicht ohne Einladung wieder beitreten können.",
     "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s änderte den Anzeigenamen auf %(displayName)s.",
     "Failed to set direct chat tag": "Fehler beim Setzen der Direkt-Chat-Markierung",
@@ -1149,7 +1149,7 @@
     "Always show encryption icons": "Immer Verschlüsselungssymbole zeigen",
     "At this time it is not possible to reply with a file so this will be sent without being a reply.": "Aktuell ist es nicht möglich mit einer Datei zu antworten, sodass diese gesendet wird ohne eine Antwort zu sein.",
     "Unable to reply": "Antworten nicht möglich",
-    "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Das Ereignis auf das geantwortet wurde könnte nicht geladen werden, da es entweder nicht existiert oder du keine Berechtigung hast, dieses anzusehen.",
+    "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Das Ereignis auf das geantwortet wurde konnte nicht geladen werden. Entweder es existiert nicht oder du hast keine Berechtigung, dieses anzusehen.",
     "Riot bugs are tracked on GitHub: create a GitHub issue.": "Riot-Fehler werden auf GitHub festgehalten: Erzeuge ein GitHub-Issue.",
     "Log out and remove encryption keys?": "Abmelden und alle Verschlüsselungs-Schlüssel löschen?",
     "Send Logs": "Sende Protokoll",
@@ -1165,8 +1165,8 @@
     "Reload widget": "Widget neu laden",
     "To notify everyone in the room, you must be a": "Notwendiges Berechtigungslevel, um jeden im Raum zu benachrichten:",
     "Muted Users": "Stummgeschaltete Benutzer",
-    "Please help improve Riot.im by sending anonymous usage data. This will use a cookie (please see our Cookie Policy).": "Bitte helfe uns Riot.im zu verbessern, in dem du anonyme Nutzungsdaten schickst. Dies wird ein Cookie benutzen (bitte beachte auch unsere Cookie-Richtlinie).",
-    "Please help improve Riot.im by sending anonymous usage data. This will use a cookie.": "Bitte helfe uns Riot.im zu verbessern, in dem du anonyme Nutzungsdaten schickst. Dies wird ein Cookie benutzen.",
+    "Please help improve Riot.im by sending anonymous usage data. This will use a cookie (please see our Cookie Policy).": "Bitte hilf uns Riot.im zu verbessern, in dem du anonyme Nutzungsdaten schickst. Dies wird ein Cookie benutzen (bitte beachte auch unsere Cookie-Richtlinie).",
+    "Please help improve Riot.im by sending anonymous usage data. This will use a cookie.": "Bitte hilf uns Riot.im zu verbessern, in dem du anonyme Nutzungsdaten schickst. Dies wird ein Cookie benutzen.",
     "Yes, I want to help!": "Ja, ich möchte helfen!",
     "Warning: This widget might use cookies.": "Warnung: Diese Widget mag Cookies verwenden.",
     "Failed to indicate account erasure": "Fehler beim Signalisieren der Account-Löschung",
@@ -1195,5 +1195,87 @@
     "Share Message": "Teile Nachricht",
     "No Audio Outputs detected": "Keine Ton-Ausgabe erkannt",
     "Audio Output": "Ton-Ausgabe",
-    "Try the app first": "App erst ausprobieren"
+    "Try the app first": "App erst ausprobieren",
+    "Jitsi Conference Calling": "Jitsi-Konferenz Anruf",
+    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "In verschlüsselten Räumen, wie diesem, ist die Link-Vorschau standardmäßig deaktiviert damit dein Heimserver (auf dem die Vorschau erzeugt wird) keine Informationen über Links in diesem Raum bekommt.",
+    "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "Wenn jemand eine Nachricht mit einem Link schickt, kann die Link-Vorschau mehr Informationen, wie Titel, Beschreibung und Bild der Webseite, über den Link anzeigen.",
+    "The email field must not be blank.": "Das E-Mail-Feld darf nicht leer sein.",
+    "The user name field must not be blank.": "Das Benutzername-Feld darf nicht leer sein.",
+    "The phone number field must not be blank.": "Das Telefonnummern-Feld darf nicht leer sein.",
+    "The password field must not be blank.": "Das Passwort-Feld darf nicht leer sein.",
+    "Call in Progress": "Gespräch läuft",
+    "A call is already in progress!": "Ein Gespräch läuft bereits!",
+    "You have no historical rooms": "Du hast keine historischen Räume",
+    "You can't send any messages until you review and agree to our terms and conditions.": "Du kannst keine Nachrichten senden bis du die unsere Geschläftsbedingungen gelesen und akzeptiert hast.",
+    "Show empty room list headings": "Zeige leere Raumlist-Köpfe",
+    "Demote yourself?": "Selbst zurückstufen?",
+    "Demote": "Zurückstufen",
+    "This event could not be displayed": "Dieses Ereignis konnte nicht angezeigt werden",
+    "A conference call could not be started because the intgrations server is not available": "Ein Konferenzgespräch konnte nicht gestartet werden, da der Integrations-Server nicht verfügbar ist",
+    "A call is currently being placed!": "Ein Anruf wurde schon gestartet!",
+    "Permission Required": "Berechtigung benötigt",
+    "You do not have permission to start a conference call in this room": "Du hast keine Berechtigung um ein Konferenzgespräch in diesem Raum zu starten",
+    "deleted": "gelöscht",
+    "underlined": "unterstrichen",
+    "bulleted-list": "Liste mit Punkten",
+    "numbered-list": "Liste mit Nummern",
+    "Failed to remove widget": "Widget konnte nicht entfernt werden",
+    "An error ocurred whilst trying to remove the widget from the room": "Ein Fehler trat auf, während versucht wurde das Widget aus diesem Raum zu entfernen",
+    "inline-code": "Quellcode in der Zeile",
+    "block-quote": "Quellcode im Block",
+    "This homeserver has hit its Monthly Active User limit": "Dieser Heimserver hat sein Limit für monatlich aktive Nutzer erreicht",
+    "Please contact your service administrator to continue using this service.": "Bitte kontaktiere deinen Administrator um diesen Dienst weiter zu nutzen.",
+    "System Alerts": "System-Benachrichtigung",
+    "This homeserver has hit its Monthly Active User limit. Please contact your service administrator to continue using the service.": "Der Server hat sein monatliches Nutzerlimit erreicht. Bitte kontaktiere deinen Administrator, um den Service weiter nutzen zu können.",
+    "Your message wasn’t sent because this homeserver has hit its Monthly Active User Limit. Please contact your service administrator to continue using the service.": "Deine Nachricht konnte nicht verschickt werden, weil der Homeserver sein monatliches Nutzerlimit erreicht hat. Bitte kontaktiere deine Administrator, um den Service weiter nutzen zu können.",
+    "Internal room ID: ": "Interne Raum-ID: ",
+    "Room version number: ": "Raum-Versionsnummer: ",
+    "This homeserver has hit its Monthly Active User limit. Please contact your service administrator to continue using the service.": "Dieser Heimserver hat sein monatliches Limit an aktiven Benutzern erreicht. Bitte kontaktiere deinen Systemadministrator um mit der Nutzung dieses Services fortzufahren.",
+    "This homeserver has hit its Monthly Active User limit so some users will not be able to log in. Please contact your service administrator to get this limit increased.": "Dieser Heimserver hat sein monatliches Limit an aktiven Benutzern erreicht. Bitte kontaktiere deinen Systemadministrator um dieses Limit zu erhöhen.",
+    "There is a known vulnerability affecting this room.": "Es gibt eine bekannte Schwachstelle, die diesen Raum betrifft.",
+    "This room version is vulnerable to malicious modification of room state.": "Dieser Raum ist verwundbar gegenüber bösartiger Veränderung des Raum-Status.",
+    "Click here to upgrade to the latest room version and ensure room integrity is protected.": "Klicke hier um den Raum zur letzten Raum-Version aufzurüsten und sicherzustellen, dass die Raum-Integrität gewahrt bleibt.",
+    "Only room administrators will see this warning": "Nur Raum-Administratoren werden diese Nachricht sehen",
+    "Please contact your service administrator to continue using the service.": "Bitte kontaktiere deinen Systemadministrator um diesen Dienst weiter zu nutzen.",
+    "This homeserver has hit its Monthly Active User limit.": "Dieser Heimserver hat sein Limit an monatlich aktiven Nutzern erreicht.",
+    "This homeserver has exceeded one of its resource limits.": "Dieser Heimserver hat einen seiner Ressourcen-Limits überschritten.",
+    "Please contact your service administrator to get this limit increased.": "Bitte kontaktiere deinen Systemadministrator um dieses Limit zu erhöht zu bekommen.",
+    "This homeserver has hit its Monthly Active User limit so some users will not be able to log in.": "Dieser Heimserver hat sein Limit an monatlich aktiven Nutzern erreicht, sodass einige Nutzer sich nicht anmelden können.",
+    "This homeserver has exceeded one of its resource limits so some users will not be able to log in.": "Dieser Heimserver hat einen seiner Ressourcen-Limits überschritten, sodass einige Benutzer nicht in der Lage sind sich anzumelden.",
+    "Upgrade Room Version": "Raum-Version aufrüsten",
+    "Upgrading this room requires closing down the current instance of the room and creating a new room it its place. To give room members the best possible experience, we will:": "Um diesen Raum aufzurüsten, wird der aktuelle geschlossen und ein neuer an seiner Stelle erstellt. Um den Raum-Mitgliedern die bestmögliche Erfahrung zu bieten, werden wir:",
+    "Create a new room with the same name, description and avatar": "Einen neuen Raum mit demselben Namen, Beschreibung und Profilbild erstellen",
+    "Update any local room aliases to point to the new room": "Alle lokalen Raum-Aliase aktualisieren, damit sie auf den neuen Raum zeigen",
+    "Stop users from speaking in the old version of the room, and post a message advising users to move to the new room": "Nutzern verbieten in dem Raum mit der alten Version zu schreiben und eine Nachricht senden, die den Nutzern rät in den neuen Raum zu wechseln",
+    "Put a link back to the old room at the start of the new room so people can see old messages": "Zu Beginn des neuen Raumes einen Link zum alten Raum setzen, damit Personen die alten Nachrichten sehen können",
+    "Your message wasn't sent because this homeserver has hit its Monthly Active User Limit. Please contact your service administrator to continue using the service.": "Deine Nachricht wurde nicht gesendet, weil dieser Heimserver sein Limit an monatlich aktiven Benutzern erreicht hat. Bitte kontaktiere deinen Systemadministrator um diesen Dienst weiter zu nutzen.",
+    "Your message wasn't sent because this homeserver has exceeded a resource limit. Please contact your service administrator to continue using the service.": "Deine Nachricht wurde nicht gesendet, weil dieser Heimserver ein Ressourcen-Limit erreicht hat. Bitte kontaktiere deinen Systemadministrator um diesen Dienst weiter zu nutzen.",
+    "Please contact your service administrator to continue using this service.": "Bitte kontaktiere deinen Systemadministrator um diesen Dienst weiter zu nutzen.",
+    "Increase performance by only loading room members on first view": "Verbessere Performanz, indem Raum-Mitglieder erst beim ersten Ansehen geladen werden",
+    "Lazy loading members not supported": "Verzögertes Laden von Mitgliedern nicht unterstützt",
+    "Lazy loading is not supported by your current homeserver.": "Verzögertes Laden wird von deinem aktuellen Heimserver.",
+    "Sorry, your homeserver is too old to participate in this room.": "Sorry, dein Homeserver ist zu alt, um an diesem Raum teilzunehmen.",
+    "Please contact your homeserver administrator.": "Bitte setze dich mit dem Administrator deines Homeservers in Verbindung.",
+    "Legal": "Rechtliches",
+    "This room has been replaced and is no longer active.": "Dieser Raum wurde ersetzt und ist nicht länger aktiv.",
+    "The conversation continues here.": "Die Konversation wird hier fortgesetzt.",
+    "Upgrade room to version %(ver)s": "Den Raum zur Version %(ver)s aufrüsten",
+    "This room is a continuation of another conversation.": "Dieser Raum ist eine Fortsetzung einer anderen Konversation.",
+    "Click here to see older messages.": "Klicke hier um ältere Nachrichten zu sehen.",
+    "Failed to upgrade room": "Konnte Raum nicht aufrüsten",
+    "The room upgrade could not be completed": "Die Raum-Aufrüstung konnte nicht fertiggestellt werden",
+    "Upgrade this room to version %(version)s": "Diesen Raum zur Version %(version)s aufrüsten",
+    "Forces the current outbound group session in an encrypted room to be discarded": "Erzwingt, dass die aktuell ausgehende Gruppen-Sitzung in einem verschlüsseltem Raum verworfen wird",
+    "Error Discarding Session": "Sitzung konnte nicht verworfen werden",
+    "Registration Required": "Registrierung erforderlich",
+    "You need to register to do this. Would you like to register now?": "Du musst dich registrieren um dies zu tun. Möchtest du dich jetzt registrieren?",
+    "Unable to connect to Homeserver. Retrying...": "Verbindung mit Heimserver nicht möglich. Versuche erneut...",
+    "Unable to query for supported registration methods": "Unterstützte Registrierungsmethoden können nicht abgefragt werden",
+    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|one": "%(senderName)s fügte %(addedAddresses)s als Adresse zu diesem Raum hinzu.",
+    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|other": "%(senderName)s fügte %(addedAddresses)s als Adressen zu diesem Raum hinzu.",
+    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|one": "%(senderName)s entfernte %(removedAddresses)s als Adresse von diesem Raum.",
+    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|other": "%(senderName)s entfernte %(removedAddresses)s als Adressen von diesem Raum.",
+    "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s setzte die Hauptadresse zu diesem Raum auf %(address)s.",
+    "%(senderName)s removed the main address for this room.": "%(senderName)s entfernte die Hauptadresse von diesem Raum.",
+    "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.": "%(senderName)s fügte %(addedAddresses)s hinzu und entfernte %(removedAddresses)s als Adressen von diesem Raum."
 }
diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json
index f6264ce8b0..c4514f629b 100644
--- a/src/i18n/strings/el.json
+++ b/src/i18n/strings/el.json
@@ -810,7 +810,6 @@
     "%(widgetName)s widget removed by %(senderName)s": "Το widget %(widgetName)s αφαιρέθηκε από τον/την %(senderName)s",
     "%(names)s and %(count)s others are typing|other": "Ο/Η %(names)s και άλλοι/ες %(count)s πληκτρολογούν",
     "%(names)s and %(count)s others are typing|one": "Ο/Η %(names)s και άλλος ένας πληκτρολογούν",
-    "Message Replies": "Απαντήσεις",
     "Message Pinning": "Καρφίτσωμα Μηνυμάτων",
     "Hide avatar changes": "Απόκρυψη αλλαγών εικονιδίων χρηστών",
     "Hide display name changes": "Απόκρυψη αλλαγών εμφανιζόμενων ονομάτων",
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index da47140c96..5ec6a7c1ff 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -33,15 +33,20 @@
     "VoIP is unsupported": "VoIP is unsupported",
     "You cannot place VoIP calls in this browser.": "You cannot place VoIP calls in this browser.",
     "You cannot place a call with yourself.": "You cannot place a call with yourself.",
-    "Conference calls are not supported in encrypted rooms": "Conference calls are not supported in encrypted rooms",
-    "Conference calls are not supported in this client": "Conference calls are not supported in this client",
-    "Warning!": "Warning!",
-    "Conference calling is in development and may not be reliable.": "Conference calling is in development and may not be reliable.",
-    "Failed to set up conference call": "Failed to set up conference call",
-    "Conference call failed.": "Conference call failed.",
+    "Could not connect to the integration server": "Could not connect to the integration server",
+    "A conference call could not be started because the intgrations server is not available": "A conference call could not be started because the intgrations server is not available",
+    "Call in Progress": "Call in Progress",
+    "A call is currently being placed!": "A call is currently being placed!",
+    "A call is already in progress!": "A call is already in progress!",
+    "Permission Required": "Permission Required",
+    "You do not have permission to start a conference call in this room": "You do not have permission to start a conference call in this room",
     "The file '%(fileName)s' failed to upload": "The file '%(fileName)s' failed to upload",
     "The file '%(fileName)s' exceeds this home server's size limit for uploads": "The file '%(fileName)s' exceeds this home server's size limit for uploads",
     "Upload Failed": "Upload Failed",
+    "Failure to create room": "Failure to create room",
+    "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.",
+    "Send anyway": "Send anyway",
+    "Send": "Send",
     "Sun": "Sun",
     "Mon": "Mon",
     "Tue": "Tue",
@@ -81,11 +86,15 @@
     "Failed to invite users to community": "Failed to invite users to community",
     "Failed to invite users to %(groupId)s": "Failed to invite users to %(groupId)s",
     "Failed to add the following rooms to %(groupId)s:": "Failed to add the following rooms to %(groupId)s:",
+    "Unnamed Room": "Unnamed Room",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riot does not have permission to send you notifications - please check your browser settings",
     "Riot was not given permission to send notifications - please try again": "Riot was not given permission to send notifications - please try again",
     "Unable to enable Notifications": "Unable to enable Notifications",
     "This email address was not found": "This email address was not found",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Your email address does not appear to be associated with a Matrix ID on this Homeserver.",
+    "Registration Required": "Registration Required",
+    "You need to register to do this. Would you like to register now?": "You need to register to do this. Would you like to register now?",
+    "Register": "Register",
     "Default": "Default",
     "Restricted": "Restricted",
     "Moderator": "Moderator",
@@ -144,6 +153,7 @@
     "Verified key": "Verified key",
     "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.",
     "Displays action": "Displays action",
+    "Forces the current outbound group session in an encrypted room to be discarded": "Forces the current outbound group session in an encrypted room to be discarded",
     "Unrecognised command:": "Unrecognised command:",
     "Reason": "Reason",
     "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s accepted the invitation for %(displayName)s.",
@@ -169,6 +179,13 @@
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s removed the room name.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s changed the room name to %(roomName)s.",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s sent an image.",
+    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|other": "%(senderName)s added %(addedAddresses)s as addresses for this room.",
+    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|one": "%(senderName)s added %(addedAddresses)s as an address for this room.",
+    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|other": "%(senderName)s removed %(removedAddresses)s as addresses for this room.",
+    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|one": "%(senderName)s removed %(removedAddresses)s as an address for this room.",
+    "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.": "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.",
+    "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s set the main address for this room to %(address)s.",
+    "%(senderName)s removed the main address for this room.": "%(senderName)s removed the main address for this room.",
     "Someone": "Someone",
     "(not supported by this browser)": "(not supported by this browser)",
     "%(senderName)s answered the call.": "%(senderName)s answered the call.",
@@ -194,17 +211,18 @@
     "%(names)s and %(count)s others are typing|other": "%(names)s and %(count)s others are typing",
     "%(names)s and %(count)s others are typing|one": "%(names)s and one other is typing",
     "%(names)s and %(lastPerson)s are typing": "%(names)s and %(lastPerson)s are typing",
-    "Failure to create room": "Failure to create room",
-    "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.",
-    "Send anyway": "Send anyway",
-    "Send": "Send",
-    "Unnamed Room": "Unnamed Room",
+    "This homeserver has hit its Monthly Active User limit.": "This homeserver has hit its Monthly Active User limit.",
+    "This homeserver has exceeded one of its resource limits.": "This homeserver has exceeded one of its resource limits.",
+    "Please contact your service administrator to continue using the service.": "Please contact your service administrator to continue using the service.",
+    "Unable to connect to Homeserver. Retrying...": "Unable to connect to Homeserver. Retrying...",
     "Your browser does not support the required cryptography extensions": "Your browser does not support the required cryptography extensions",
     "Not a valid Riot keyfile": "Not a valid Riot keyfile",
     "Authentication check failed: incorrect password?": "Authentication check failed: incorrect password?",
+    "Sorry, your homeserver is too old to participate in this room.": "Sorry, your homeserver is too old to participate in this room.",
+    "Please contact your homeserver administrator.": "Please contact your homeserver administrator.",
     "Failed to join room": "Failed to join room",
     "Message Pinning": "Message Pinning",
-    "Jitsi Conference Calling": "Jitsi Conference Calling",
+    "Increase performance by only loading room members on first view": "Increase performance by only loading room members on first view",
     "Disable Emoji suggestions while typing": "Disable Emoji suggestions while typing",
     "Use compact timeline layout": "Use compact timeline layout",
     "Hide removed messages": "Hide removed messages",
@@ -232,6 +250,7 @@
     "Enable URL previews by default for participants in this room": "Enable URL previews by default for participants in this room",
     "Room Colour": "Room Colour",
     "Enable widget screenshots on supported widgets": "Enable widget screenshots on supported widgets",
+    "Show empty room list headings": "Show empty room list headings",
     "Collecting app version information": "Collecting app version information",
     "Collecting logs": "Collecting logs",
     "Uploading report": "Uploading report",
@@ -263,6 +282,7 @@
     "No display name": "No display name",
     "New passwords don't match": "New passwords don't match",
     "Passwords can't be empty": "Passwords can't be empty",
+    "Warning!": "Warning!",
     "Changing password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Changing password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.",
     "Continue": "Continue",
     "Export E2E room keys": "Export E2E room keys",
@@ -311,6 +331,31 @@
     "Off": "Off",
     "On": "On",
     "Noisy": "Noisy",
+    "Invalid alias format": "Invalid alias format",
+    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias",
+    "Invalid address format": "Invalid address format",
+    "'%(alias)s' is not a valid format for an address": "'%(alias)s' is not a valid format for an address",
+    "not specified": "not specified",
+    "not set": "not set",
+    "Remote addresses for this room:": "Remote addresses for this room:",
+    "Addresses": "Addresses",
+    "The main address for this room is": "The main address for this room is",
+    "Local addresses for this room:": "Local addresses for this room:",
+    "This room has no local addresses": "This room has no local addresses",
+    "New address (e.g. #foo:%(localDomain)s)": "New address (e.g. #foo:%(localDomain)s)",
+    "Invalid community ID": "Invalid community ID",
+    "'%(groupId)s' is not a valid community ID": "'%(groupId)s' is not a valid community ID",
+    "Flair": "Flair",
+    "Showing flair for these communities:": "Showing flair for these communities:",
+    "This room is not showing flair for any communities": "This room is not showing flair for any communities",
+    "New community ID (e.g. +foo:%(localDomain)s)": "New community ID (e.g. +foo:%(localDomain)s)",
+    "You have enabled URL previews by default.": "You have enabled URL previews by default.",
+    "You have disabled URL previews by default.": "You have disabled URL previews by default.",
+    "URL previews are enabled by default for participants in this room.": "URL previews are enabled by default for participants in this room.",
+    "URL previews are disabled by default for participants in this room.": "URL previews are disabled by default for participants in this room.",
+    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.",
+    "URL Previews": "URL Previews",
+    "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.",
     "Cannot add any more widgets": "Cannot add any more widgets",
     "The maximum permitted number of widgets have already been added to this room.": "The maximum permitted number of widgets have already been added to this room.",
     "Add a widget": "Add a widget",
@@ -319,6 +364,7 @@
     " (unsupported)": " (unsupported)",
     "Join as voice or video.": "Join as voice or video.",
     "Ongoing conference call%(supportedText)s.": "Ongoing conference call%(supportedText)s.",
+    "This event could not be displayed": "This event could not be displayed",
     "%(senderName)s sent an image": "%(senderName)s sent an image",
     "%(senderName)s sent a video": "%(senderName)s sent a video",
     "%(senderName)s uploaded a file": "%(senderName)s uploaded a file",
@@ -349,12 +395,14 @@
     "Unban this user?": "Unban this user?",
     "Ban this user?": "Ban this user?",
     "Failed to ban user": "Failed to ban user",
+    "Demote yourself?": "Demote yourself?",
+    "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.",
+    "Demote": "Demote",
     "Failed to mute user": "Failed to mute user",
     "Failed to toggle moderator status": "Failed to toggle moderator status",
     "Failed to change power level": "Failed to change power level",
-    "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.",
-    "Are you sure?": "Are you sure?",
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.",
+    "Are you sure?": "Are you sure?",
     "No devices with registered encryption keys": "No devices with registered encryption keys",
     "Devices": "Devices",
     "Unignore": "Unignore",
@@ -376,6 +424,14 @@
     "Invited": "Invited",
     "Filter room members": "Filter room members",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (power %(powerLevelNumber)s)",
+    "bold": "bold",
+    "italic": "italic",
+    "deleted": "deleted",
+    "underlined": "underlined",
+    "inline-code": "inline-code",
+    "block-quote": "block-quote",
+    "bulleted-list": "bulleted-list",
+    "numbered-list": "numbered-list",
     "Attachment": "Attachment",
     "At this time it is not possible to reply with a file so this will be sent without being a reply.": "At this time it is not possible to reply with a file so this will be sent without being a reply.",
     "Upload Files": "Upload Files",
@@ -391,6 +447,8 @@
     "Send a reply (unencrypted)…": "Send a reply (unencrypted)…",
     "Send an encrypted message…": "Send an encrypted message…",
     "Send a message (unencrypted)…": "Send a message (unencrypted)…",
+    "This room has been replaced and is no longer active.": "This room has been replaced and is no longer active.",
+    "The conversation continues here.": "The conversation continues here.",
     "You do not have permission to post to this room": "You do not have permission to post to this room",
     "Turn Markdown on": "Turn Markdown on",
     "Turn Markdown off": "Turn Markdown off",
@@ -400,21 +458,13 @@
     "Command error": "Command error",
     "Unable to reply": "Unable to reply",
     "At this time it is not possible to reply with an emote.": "At this time it is not possible to reply with an emote.",
-    "bold": "bold",
-    "italic": "italic",
-    "strike": "strike",
-    "underline": "underline",
-    "code": "code",
-    "quote": "quote",
-    "bullet": "bullet",
-    "numbullet": "numbullet",
     "Markdown is disabled": "Markdown is disabled",
     "Markdown is enabled": "Markdown is enabled",
-    "Unpin Message": "Unpin Message",
-    "Jump to message": "Jump to message",
     "No pinned messages.": "No pinned messages.",
     "Loading...": "Loading...",
     "Pinned Messages": "Pinned Messages",
+    "Unpin Message": "Unpin Message",
+    "Jump to message": "Jump to message",
     "%(duration)ss": "%(duration)ss",
     "%(duration)sm": "%(duration)sm",
     "%(duration)sh": "%(duration)sh",
@@ -459,7 +509,9 @@
     "People": "People",
     "Rooms": "Rooms",
     "Low priority": "Low priority",
+    "You have no historical rooms": "You have no historical rooms",
     "Historical": "Historical",
+    "System Alerts": "System Alerts",
     "Unable to ascertain that the address this invite was sent to matches one associated with your account.": "Unable to ascertain that the address this invite was sent to matches one associated with your account.",
     "This invitation was sent to an email address which is not associated with this account:": "This invitation was sent to an email address which is not associated with this account:",
     "You may wish to login with a different account, or add this email to this account.": "You may wish to login with a different account, or add this email to this account.",
@@ -521,6 +573,7 @@
     "Guests cannot join this room even if explicitly invited.": "Guests cannot join this room even if explicitly invited.",
     "Click here to fix": "Click here to fix",
     "To send events of type , you must be a": "To send events of type , you must be a",
+    "Upgrade room to version %(ver)s": "Upgrade room to version %(ver)s",
     "Who can access this room?": "Who can access this room?",
     "Only people who have been invited": "Only people who have been invited",
     "Anyone who knows the room's link, apart from guests": "Anyone who knows the room's link, apart from guests",
@@ -533,8 +586,13 @@
     "Members only (since they joined)": "Members only (since they joined)",
     "Permissions": "Permissions",
     "Advanced": "Advanced",
-    "This room's internal ID is": "This room's internal ID is",
+    "Internal room ID: ": "Internal room ID: ",
+    "Room version number: ": "Room version number: ",
     "Add a topic": "Add a topic",
+    "There is a known vulnerability affecting this room.": "There is a known vulnerability affecting this room.",
+    "This room version is vulnerable to malicious modification of room state.": "This room version is vulnerable to malicious modification of room state.",
+    "Click here to upgrade to the latest room version and ensure room integrity is protected.": "Click here to upgrade to the latest room version and ensure room integrity is protected.",
+    "Only room administrators will see this warning": "Only room administrators will see this warning",
     "Search…": "Search…",
     "This Room": "This Room",
     "All Rooms": "All Rooms",
@@ -547,29 +605,6 @@
     "Scroll to unread messages": "Scroll to unread messages",
     "Jump to first unread message.": "Jump to first unread message.",
     "Close": "Close",
-    "Invalid alias format": "Invalid alias format",
-    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias",
-    "Invalid address format": "Invalid address format",
-    "'%(alias)s' is not a valid format for an address": "'%(alias)s' is not a valid format for an address",
-    "not specified": "not specified",
-    "not set": "not set",
-    "Remote addresses for this room:": "Remote addresses for this room:",
-    "Addresses": "Addresses",
-    "The main address for this room is": "The main address for this room is",
-    "Local addresses for this room:": "Local addresses for this room:",
-    "This room has no local addresses": "This room has no local addresses",
-    "New address (e.g. #foo:%(localDomain)s)": "New address (e.g. #foo:%(localDomain)s)",
-    "Invalid community ID": "Invalid community ID",
-    "'%(groupId)s' is not a valid community ID": "'%(groupId)s' is not a valid community ID",
-    "Flair": "Flair",
-    "Showing flair for these communities:": "Showing flair for these communities:",
-    "This room is not showing flair for any communities": "This room is not showing flair for any communities",
-    "New community ID (e.g. +foo:%(localDomain)s)": "New community ID (e.g. +foo:%(localDomain)s)",
-    "You have enabled URL previews by default.": "You have enabled URL previews by default.",
-    "You have disabled URL previews by default.": "You have disabled URL previews by default.",
-    "URL previews are enabled by default for participants in this room.": "URL previews are enabled by default for participants in this room.",
-    "URL previews are disabled by default for participants in this room.": "URL previews are disabled by default for participants in this room.",
-    "URL Previews": "URL Previews",
     "Sunday": "Sunday",
     "Monday": "Monday",
     "Tuesday": "Tuesday",
@@ -589,6 +624,8 @@
     "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s changed the avatar for %(roomName)s",
     "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s removed the room avatar.",
     "%(senderDisplayName)s changed the room avatar to ": "%(senderDisplayName)s changed the room avatar to ",
+    "This room is a continuation of another conversation.": "This room is a continuation of another conversation.",
+    "Click here to see older messages.": "Click here to see older messages.",
     "Copied!": "Copied!",
     "Failed to copy": "Failed to copy",
     "Add an Integration": "Add an Integration",
@@ -614,6 +651,10 @@
     "Code": "Code",
     "Start authentication": "Start authentication",
     "powered by Matrix": "powered by Matrix",
+    "The email field must not be blank.": "The email field must not be blank.",
+    "The user name field must not be blank.": "The user name field must not be blank.",
+    "The phone number field must not be blank.": "The phone number field must not be blank.",
+    "The password field must not be blank.": "The password field must not be blank.",
     "Username on %(hs)s": "Username on %(hs)s",
     "User name": "User name",
     "Mobile phone number": "Mobile phone number",
@@ -626,7 +667,6 @@
     "Email address (optional)": "Email address (optional)",
     "You are registering with %(SelectedTeamName)s": "You are registering with %(SelectedTeamName)s",
     "Mobile phone number (optional)": "Mobile phone number (optional)",
-    "Register": "Register",
     "Default server": "Default server",
     "Custom server": "Custom server",
     "Home server URL": "Home server URL",
@@ -665,6 +705,9 @@
     "A new version of Riot is available.": "A new version of Riot is available.",
     "To return to your account in future you need to set a password": "To return to your account in future you need to set a password",
     "Set Password": "Set Password",
+    "Please contact your service administrator to get this limit increased.": "Please contact your service administrator to get this limit increased.",
+    "This homeserver has hit its Monthly Active User limit so some users will not be able to log in.": "This homeserver has hit its Monthly Active User limit so some users will not be able to log in.",
+    "This homeserver has exceeded one of its resource limits so some users will not be able to log in.": "This homeserver has exceeded one of its resource limits so some users will not be able to log in.",
     "Error encountered (%(errorDetail)s).": "Error encountered (%(errorDetail)s).",
     "Checking for an update...": "Checking for an update...",
     "No update available.": "No update available.",
@@ -678,6 +721,8 @@
     "Delete Widget": "Delete Widget",
     "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?",
     "Delete widget": "Delete widget",
+    "Failed to remove widget": "Failed to remove widget",
+    "An error ocurred whilst trying to remove the widget from the room": "An error ocurred whilst trying to remove the widget from the room",
     "Revoke widget access": "Revoke widget access",
     "Minimize apps": "Minimize apps",
     "Reload widget": "Reload widget",
@@ -697,7 +742,6 @@
     "Uploaded on %(date)s by %(user)s": "Uploaded on %(date)s by %(user)s",
     "Download this file": "Download this file",
     "Integrations Error": "Integrations Error",
-    "Could not connect to the integration server": "Could not connect to the integration server",
     "Manage Integrations": "Manage Integrations",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
     "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)sjoined %(count)s times",
@@ -773,8 +817,8 @@
     "Failed to send logs: ": "Failed to send logs: ",
     "Submit debug logs": "Submit debug logs",
     "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.",
-    "Riot bugs are tracked on GitHub: create a GitHub issue.": "Riot bugs are tracked on GitHub: create a GitHub issue.",
-    "GitHub issue link:": "GitHub issue link:",
+    "Before submitting logs, you must create a GitHub issue to describe your problem.": "Before submitting logs, you must create a GitHub issue to describe your problem.",
+    "What GitHub issue are these logs for?": "What GitHub issue are these logs for?",
     "Notes:": "Notes:",
     "Send logs": "Send logs",
     "Unavailable": "Unavailable",
@@ -787,7 +831,7 @@
     "Start Chatting": "Start Chatting",
     "Confirm Removal": "Confirm Removal",
     "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.",
-    "Community IDs cannot not be empty.": "Community IDs cannot not be empty.",
+    "Community IDs cannot be empty.": "Community IDs cannot be empty.",
     "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Community IDs may only contain characters a-z, 0-9, or '=_-./'",
     "Something went wrong whilst creating your community": "Something went wrong whilst creating your community",
     "Create Community": "Create Community",
@@ -840,6 +884,17 @@
     "Ignore request": "Ignore request",
     "Loading device info...": "Loading device info...",
     "Encryption key request": "Encryption key request",
+    "Riot now uses 3-5x less memory, by only loading information about other users when needed. Please wait whilst we resynchronise with the server!": "Riot now uses 3-5x less memory, by only loading information about other users when needed. Please wait whilst we resynchronise with the server!",
+    "Updating Riot": "Updating Riot",
+    "Failed to upgrade room": "Failed to upgrade room",
+    "The room upgrade could not be completed": "The room upgrade could not be completed",
+    "Upgrade this room to version %(version)s": "Upgrade this room to version %(version)s",
+    "Upgrade Room Version": "Upgrade Room Version",
+    "Upgrading this room requires closing down the current instance of the room and creating a new room it its place. To give room members the best possible experience, we will:": "Upgrading this room requires closing down the current instance of the room and creating a new room it its place. To give room members the best possible experience, we will:",
+    "Create a new room with the same name, description and avatar": "Create a new room with the same name, description and avatar",
+    "Update any local room aliases to point to the new room": "Update any local room aliases to point to the new room",
+    "Stop users from speaking in the old version of the room, and post a message advising users to move to the new room": "Stop users from speaking in the old version of the room, and post a message advising users to move to the new room",
+    "Put a link back to the old room at the start of the new room so people can see old messages": "Put a link back to the old room at the start of the new room so people can see old messages",
     "Sign out": "Sign out",
     "Log out and remove encryption keys?": "Log out and remove encryption keys?",
     "Clear Storage and Sign Out": "Clear Storage and Sign Out",
@@ -929,7 +984,7 @@
     "You must register to use this functionality": "You must register to use this functionality",
     "You must join the room to see its files": "You must join the room to see its files",
     "There are no visible files in this room": "There are no visible files in this room",
-    "
    HTML for your community's page
    \n
    \n    Use the long description to introduce new members to the community, or distribute\n    some important links\n
    \n
    \n    You can even use 'img' tags\n
    \n": "
    HTML for your community's page
    \n
    \n    Use the long description to introduce new members to the community, or distribute\n    some important links\n
    \n
    \n    You can even use 'img' tags\n
    \n",
+    "
    HTML for your community's page
    \r\n
    \r\n    Use the long description to introduce new members to the community, or distribute\r\n    some important links\r\n
    \r\n
    \r\n    You can even use 'img' tags\r\n
    \r\n": "
    HTML for your community's page
    \r\n
    \r\n    Use the long description to introduce new members to the community, or distribute\r\n    some important links\r\n
    \r\n
    \r\n    You can even use 'img' tags\r\n
    \r\n",
     "Add rooms to the community summary": "Add rooms to the community summary",
     "Which rooms would you like to add to this summary?": "Which rooms would you like to add to this summary?",
     "Add to summary": "Add to summary",
@@ -1021,6 +1076,9 @@
     "Scroll to bottom of page": "Scroll to bottom of page",
     "Message not sent due to unknown devices being present": "Message not sent due to unknown devices being present",
     "Show devices, send anyway or cancel.": "Show devices, send anyway or cancel.",
+    "You can't send any messages until you review and agree to our terms and conditions.": "You can't send any messages until you review and agree to our terms and conditions.",
+    "Your message wasn't sent because this homeserver has hit its Monthly Active User Limit. Please contact your service administrator to continue using the service.": "Your message wasn't sent because this homeserver has hit its Monthly Active User Limit. Please contact your service administrator to continue using the service.",
+    "Your message wasn't sent because this homeserver has exceeded a resource limit. Please contact your service administrator to continue using the service.": "Your message wasn't sent because this homeserver has exceeded a resource limit. Please contact your service administrator to continue using the service.",
     "%(count)s of your messages have not been sent.|other": "Some of your messages have not been sent.",
     "%(count)s of your messages have not been sent.|one": "Your message was not sent.",
     "%(count)s Resend all or cancel all now. You can also select individual messages to resend or cancel.|other": "Resend all or cancel all now. You can also select individual messages to resend or cancel.",
@@ -1079,7 +1137,7 @@
     "Device ID:": "Device ID:",
     "Device key:": "Device key:",
     "Ignored Users": "Ignored Users",
-    "Debug Logs Submission": "Debug Logs Submission",
+    "Submit Debug Logs": "Submit Debug Logs",
     "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.",
     "Riot collects anonymous analytics to allow us to improve the application.": "Riot collects anonymous analytics to allow us to improve the application.",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.",
@@ -1087,7 +1145,10 @@
     "Labs": "Labs",
     "These are experimental features that may break in unexpected ways": "These are experimental features that may break in unexpected ways",
     "Use with caution": "Use with caution",
+    "Lazy loading members not supported": "Lazy loading members not supported",
+    "Lazy loading is not supported by your current homeserver.": "Lazy loading is not supported by your current homeserver.",
     "Deactivate my account": "Deactivate my account",
+    "Legal": "Legal",
     "Clear Cache": "Clear Cache",
     "Clear Cache and Reload": "Clear Cache and Reload",
     "Updates": "Updates",
@@ -1137,6 +1198,7 @@
     "Send Reset Email": "Send Reset Email",
     "Create an account": "Create an account",
     "This Home Server does not support login using email address.": "This Home Server does not support login using email address.",
+    "Please contact your service administrator to continue using this service.": "Please contact your service administrator to continue using this service.",
     "Incorrect username and/or password.": "Incorrect username and/or password.",
     "Please note you are logging into the %(hs)s server, not matrix.org.": "Please note you are logging into the %(hs)s server, not matrix.org.",
     "Guest access is disabled on this Home Server.": "Guest access is disabled on this Home Server.",
@@ -1150,12 +1212,15 @@
     "Failed to fetch avatar URL": "Failed to fetch avatar URL",
     "Set a display name:": "Set a display name:",
     "Upload an avatar:": "Upload an avatar:",
+    "Unable to query for supported registration methods": "Unable to query for supported registration methods",
     "This server does not support authentication with a phone number.": "This server does not support authentication with a phone number.",
     "Missing password.": "Missing password.",
     "Passwords don't match.": "Passwords don't match.",
     "Password too short (min %(MIN_PASSWORD_LENGTH)s).": "Password too short (min %(MIN_PASSWORD_LENGTH)s).",
     "This doesn't look like a valid email address.": "This doesn't look like a valid email address.",
     "This doesn't look like a valid phone number.": "This doesn't look like a valid phone number.",
+    "An email address is required to register on this homeserver.": "An email address is required to register on this homeserver.",
+    "A phone number is required to register on this homeserver.": "A phone number is required to register on this homeserver.",
     "You need to enter a user name.": "You need to enter a user name.",
     "An unknown error occurred.": "An unknown error occurred.",
     "I already have an account": "I already have an account",
diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index abcbcd636a..74cd5b255f 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -53,9 +53,9 @@
     "The file '%(fileName)s' exceeds this home server's size limit for uploads": "La dosiero «%(fileName)s» estas tro granda por la hejma servilo",
     "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Averto: ajna persono aldonita al komunumo estos publike videbla al iu ajn, kiu konas la identigilon de tiu komunumo",
     "Which rooms would you like to add to this community?": "Kiujn ĉambrojn vi volas aldoni al ĉi tiu komunumo?",
-    "Show these rooms to non-members on the community page and room list?": "Ĉu la ĉambroj montriĝu al malanoj en la komunuma paĝo kaj listo de ĉambroj?",
+    "Show these rooms to non-members on the community page and room list?": "Montri tiujn babilejojn al malanoj en la komunuma paĝo kaj listo de babilejoj?",
     "Add rooms to the community": "Aldoni ĉambrojn al la komunumo",
-    "Room name or alias": "Nomo aŭ kromnomo de ĉambro",
+    "Room name or alias": "Nomo aŭ kromnomo de babilejo",
     "Add to community": "Aldoni al komunumo",
     "Failed to invite the following users to %(groupId)s:": "Malsukcesis inviti jenajn uzantojn al %(groupId)s:",
     "Failed to invite users to community": "Malsukcesis inviti novajn uzantojn al komunumo",
@@ -74,28 +74,28 @@
     "Who would you like to communicate with?": "Kun kiu vi volas komuniki?",
     "Email, name or matrix ID": "Retpoŝtadreso, nomo, aŭ Matrix-identigaĵo",
     "Start Chat": "Komenci babilon",
-    "Invite new room members": "Inviti novajn ĉambranojn",
-    "Who would you like to add to this room?": "Kiun vi ŝatus aldoni al tiu ĉi ĉambro?",
+    "Invite new room members": "Inviti novajn babilejanojn",
+    "Who would you like to add to this room?": "Kiun vi ŝatus aldoni al tiu ĉi babilejo?",
     "Send Invites": "Sendi invitojn",
     "Failed to invite user": "Malsukcesis inviti uzanton",
     "Operation failed": "Ago malsukcesis",
     "Failed to invite": "Invito malsukcesis",
-    "Failed to invite the following users to the %(roomName)s room:": "Malsukcesis inviti la jenajn uzantojn al la ĉambro %(roomName)s:",
+    "Failed to invite the following users to the %(roomName)s room:": "Malsukcesis inviti la jenajn uzantojn al la babilejo %(roomName)s:",
     "You need to be logged in.": "Vi devas saluti.",
     "You need to be able to invite users to do that.": "Vi bezonas permeson inviti uzantojn por tio.",
     "Unable to create widget.": "Fenestraĵo ne kreeblas.",
     "Failed to send request.": "Malsukcesis sendi peton.",
-    "This room is not recognised.": "Ĉi tiu ĉambro ne estas rekonita.",
+    "This room is not recognised.": "Ĉi tiu babilejo ne estas rekonita.",
     "Power level must be positive integer.": "Nivelo de potenco devas esti entjero pozitiva.",
-    "You are not in this room.": "Vi ne estas en tiu ĉi ĉambro.",
-    "You do not have permission to do that in this room.": "Vi ne havas permeson fari tion en tiu ĉi ĉambro.",
+    "You are not in this room.": "Vi ne estas en tiu ĉi babilejo.",
+    "You do not have permission to do that in this room.": "Vi ne havas permeson fari tion en tiu babilejo.",
     "Missing room_id in request": "En peto mankas «room_id»",
-    "Room %(roomId)s not visible": "Ĉambro %(roomId)s ne videblas",
+    "Room %(roomId)s not visible": "babilejo %(roomId)s ne videblas",
     "Missing user_id in request": "En peto mankas «user_id»",
     "Usage": "Uzo",
     "/ddg is not a command": "/ddg ne estas komando",
     "To use it, just wait for autocomplete results to load and tab through them.": "Por uzi ĝin, atendu aperon de sugestaj rezultoj, kaj tabu tra ili.",
-    "Unrecognised room alias:": "Nerekonita ĉambra alinomo:",
+    "Unrecognised room alias:": "Nerekonita babileja kromnomo:",
     "Ignored user": "Malatentata uzanto",
     "You are now ignoring %(userId)s": "Vi nun malatentas uzanton %(userId)s",
     "Unignored user": "Reatentata uzanto",
@@ -119,16 +119,16 @@
     "%(senderName)s changed their profile picture.": "%(senderName)s ŝanĝis sian profilbildon.",
     "%(senderName)s set a profile picture.": "%(senderName)s agordis profilbildon.",
     "VoIP conference started.": "Rettelefona voko komenciĝis.",
-    "%(targetName)s joined the room.": "%(targetName)s venis en la ĉambron.",
+    "%(targetName)s joined the room.": "%(targetName)s venis en la babilejo.",
     "VoIP conference finished.": "Rettelefona voko finiĝis.",
     "%(targetName)s rejected the invitation.": "%(targetName)s rifuzis la inviton.",
-    "%(targetName)s left the room.": "%(targetName)s forlasis la ĉambron.",
+    "%(targetName)s left the room.": "%(targetName)s forlasis la babilejo.",
     "%(senderName)s unbanned %(targetName)s.": "%(senderName)s malbaris uzanton %(targetName)s.",
     "%(senderName)s kicked %(targetName)s.": "%(senderName)s forpelis uzanton %(targetName)s.",
     "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s nuligis inviton por %(targetName)s.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s ŝanĝis la temon al «%(topic)s».",
-    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s forigis nomon de la ĉambro.",
-    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s ŝanĝis nomon de la ĉambro al %(roomName)s.",
+    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s forigis nomon de la babilejo.",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s ŝanĝis nomon de la babilejo al %(roomName)s.",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s sendis bildon.",
     "Someone": "Iu",
     "(not supported by this browser)": "(nesubtenata de tiu ĉi foliumilo)",
@@ -138,16 +138,16 @@
     "(unknown failure: %(reason)s)": "(nekonata eraro: %(reason)s)",
     "%(senderName)s ended the call.": "%(senderName)s finis la vokon.",
     "%(senderName)s placed a %(callType)s call.": "%(senderName)s faris vokon de speco: %(callType)s.",
-    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s sendis ĉambran inviton al %(targetDisplayName)s.",
-    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s videbligis estontan historion de la ĉambro al ĉiuj ĉambranoj, de la tempo de invito.",
-    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s videbligis estontan historion de la ĉambro al ĉiuj ĉambranoj, de la tempo de aliĝo.",
-    "%(senderName)s made future room history visible to all room members.": "%(senderName)s videbligis estontan historion de la ĉambro al ĉiuj ĉambranoj.",
-    "%(senderName)s made future room history visible to anyone.": "%(senderName)s videbligis estontan historion de la ĉambro al ĉiuj.",
-    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s videbligis estontan historion de la ĉambro al nekonatoj (%(visibility)s).",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s sendis babilejan inviton al %(targetDisplayName)s.",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s videbligis estontan historion de la babilejo al ĉiuj babilejanoj, ekde la tempo de invito.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s videbligis estontan historion de la babilejo al ĉiuj babilejanoj, ekde la tempo de aliĝo.",
+    "%(senderName)s made future room history visible to all room members.": "%(senderName)s videbligis estontan historion de la babilejo al ĉiuj babilejanoj.",
+    "%(senderName)s made future room history visible to anyone.": "%(senderName)s videbligis estontan historion de la babilejo al ĉiuj.",
+    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s videbligis estontan historion de la babilejo al nekonata (%(visibility)s).",
     "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s ŝaltis ĝiscelan ĉifradon (algoritmo: %(algorithm)s).",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s de %(fromPowerLevel)s al %(toPowerLevel)s",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s ŝanĝis la potencan nivelon de %(powerLevelDiffText)s.",
-    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s ŝanĝis la fiksitajn mesaĝojn de la ĉambro.",
+    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s ŝanĝis la fiksitajn mesaĝojn de la babilejo.",
     "%(widgetName)s widget modified by %(senderName)s": "Fenestraĵon %(widgetName)s ŝanĝis %(senderName)s",
     "%(widgetName)s widget added by %(senderName)s": "Fenestraĵon %(widgetName)s aldonis %(senderName)s",
     "%(widgetName)s widget removed by %(senderName)s": "Fenestraĵon %(widgetName)s forigis %(senderName)s",
@@ -155,13 +155,13 @@
     "%(names)s and %(count)s others are typing|other": "%(names)s kaj %(count)s aliaj tajpas",
     "%(names)s and %(count)s others are typing|one": "%(names)s kaj unu alia tajpas",
     "%(names)s and %(lastPerson)s are typing": "%(names)s kaj %(lastPerson)s tajpas",
-    "Failure to create room": "Malsukcesis krei ĉambron",
+    "Failure to create room": "Malsukcesis krei babilejon",
     "Server may be unavailable, overloaded, or you hit a bug.": "Servilo povas esti neatingebla, troŝarĝita, aŭ vi renkontis cimon.",
-    "Unnamed Room": "Sennoma ĉambro",
+    "Unnamed Room": "Sennoma Babilejo",
     "Your browser does not support the required cryptography extensions": "Via foliumilo ne subtenas la bezonatajn ĉifrajn kromprogramojn",
     "Not a valid Riot keyfile": "Nevalida ŝlosila dosiero de Riot",
     "Authentication check failed: incorrect password?": "Aŭtentiga kontrolo malsukcesis: ĉu pro malĝusta pasvorto?",
-    "Failed to join room": "Malsukcesis aliĝi al ĉambro",
+    "Failed to join room": "Malsukcesis aliĝi al babilejo",
     "Message Pinning": "Fikso de mesaĝoj",
     "Disable Emoji suggestions while typing": "Malŝalti mienetajn sugestojn dum tajpado",
     "Use compact timeline layout": "Uzi densan okazordan aranĝon",
@@ -174,7 +174,7 @@
     "Always show message timestamps": "Ĉiam montri mesaĝajn tempindikojn",
     "Autoplay GIFs and videos": "Aŭtomate ludi GIF-bildojn kaj videojn",
     "Call Failed": "Voko malsukcesis",
-    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "En la ĉambro estas nekonataj aparatoj. Se vi daŭrigos ne kontrolinte ilin, iu povos subaŭskulti vian vokon.",
+    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "En la babilejo estas nekonataj aparatoj: se vi daŭrigos ne kontrolante ilin, iu povos subaŭskulti vian vokon.",
     "Review Devices": "Kontroli aparatojn",
     "Call Anyway": "Tamen voki",
     "Answer Anyway": "Tamen respondi",
@@ -183,18 +183,18 @@
     "Send anyway": "Tamen sendi",
     "Send": "Sendi",
     "Enable automatic language detection for syntax highlighting": "Ŝalti aŭtomatan rekonon de lingvo por sintaksa markado",
-    "Hide avatars in user and room mentions": "Kaŝi profilbildojn en mencioj de uzantoj kaj ĉambroj",
+    "Hide avatars in user and room mentions": "Kaŝi profilbildojn en mencioj de uzantoj kaj babilejoj",
     "Disable big emoji in chat": "Malŝalti grandajn mienetojn en babilo",
     "Don't send typing notifications": "Ne elsendi sciigojn pri tajpado",
     "Automatically replace plain text Emoji": "Aŭtomate anstataŭigi tekstajn mienetojn",
     "Mirror local video feed": "Speguli lokan videon",
     "Disable Peer-to-Peer for 1:1 calls": "Malŝalti samtavolajn duopajn vokojn",
     "Never send encrypted messages to unverified devices from this device": "Neniam sendi neĉifritajn mesaĝojn al nekontrolitaj aparatoj de tiu ĉi aparato",
-    "Never send encrypted messages to unverified devices in this room from this device": "Neniam sendi ĉifritajn mesaĝojn al nekontrolitaj aparatoj en tiu ĉi ĉambro de tiu ĉi aparto",
+    "Never send encrypted messages to unverified devices in this room from this device": "Neniam sendi ĉifritajn mesaĝojn al nekontrolitaj aparatoj en tiu ĉi babilejo el tiu ĉi aparato",
     "Enable inline URL previews by default": "Ŝalti entekstan antaŭrigardon al retadresoj",
-    "Enable URL previews for this room (only affects you)": "Ŝalti antaŭrigardon al retadresoj por ĉi tiu ĉambro (nur pro vi)",
-    "Enable URL previews by default for participants in this room": "Ŝalti antaŭrigardon al retadresoj por anoj de ĉi tiu ĉambro",
-    "Room Colour": "Koloro de ĉambro",
+    "Enable URL previews for this room (only affects you)": "Ŝalti URL-antaŭrigardon en ĉi tiu babilejo (nur por vi)",
+    "Enable URL previews by default for participants in this room": "Ŝalti URL-antaŭrigardon por anoj de ĉi tiu babilejo",
+    "Room Colour": "Babilejo-koloro",
     "Active call (%(roomName)s)": "Aktiva voko (%(roomName)s)",
     "unknown caller": "nekonata vokanto",
     "Incoming voice call from %(name)s": "Envena voĉvoko de %(name)s",
@@ -216,7 +216,7 @@
     "New passwords don't match": "Novaj pasvortoj ne kongruas",
     "Passwords can't be empty": "Pasvortoj ne povas esti malplenaj",
     "Continue": "Daŭrigi",
-    "Export E2E room keys": "Elporti ĝiscele ĉifrajn ŝlosilojn de la ĉambro",
+    "Export E2E room keys": "Elporti ĝiscele ĉifrajn ŝlosilojn de la babilejo",
     "Do you want to set an email address?": "Ĉu vi volas agordi retpoŝtadreson?",
     "Current password": "Nuna pasvorto",
     "Password": "Pasvorto",
@@ -236,7 +236,7 @@
     "Disable Notifications": "Malŝalti sciigojn",
     "Enable Notifications": "Ŝalti sciigojn",
     "Cannot add any more widgets": "Pluaj fenestraĵoj ne aldoneblas",
-    "The maximum permitted number of widgets have already been added to this room.": "La plejgranda nombro da fenestraĵoj jam aldoniĝis al ĉi tiu ĉambro.",
+    "The maximum permitted number of widgets have already been added to this room.": "La maksimuma permesata nombro de fenestraĵoj jam aldoniĝis al tiu babilejo.",
     "Add a widget": "Aldoni fenestraĵon",
     "Drop File Here": "Demetu dosieron tien ĉi",
     "Drop file here to upload": "Demetu dosieron tien ĉi por ĝin alŝuti",
@@ -275,7 +275,7 @@
     "Devices": "Aparatoj",
     "Unignore": "Reatenti",
     "Ignore": "Malatenti",
-    "Changing password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Ŝanĝo de pasvorto nuntempe nuligos ĉiujn ĝiscele ĉifrajn ŝlosilojn sur ĉiuj viaj aparatoj. Tio faros ĉifritajn babilajn historiojn nelegeblaj, krom se vi unue elportos viajn ĉambrajn ŝlosilojn kaj reenportos ilin poste. Estontece ĉi tio pliboniĝos.",
+    "Changing password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Ŝanĝo de pasvorto nuntempe nuligos ĉiujn ĝiscele ĉifrajn ŝlosilojn sur ĉiuj viaj aparatoj. Tio igos ĉifritajn babilajn historiojn nelegeblaj, krom se vi unue elportos viajn babilejajn ŝlosilojn kaj reenportos ilin poste. Estonte tio pliboniĝos.",
     "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s ŝanĝis la profilbildon de %(roomName)s",
     "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Vi estas direktota al ekstera retejo por aŭtentigi vian konton por uzo kun %(integrationsUrl)s. Ĉu vi volas daŭrigi tion?",
     "Jump to read receipt": "Salti al legokonfirmo",
@@ -360,7 +360,7 @@
     "Drop here to demote": "Demeti tien ĉi por malpligravigi",
     "Drop here to tag %(section)s": "Demeti tien ĉi por marki %(section)s",
     "Press  to start a chat with someone": "Premu  por komenci babilon kun iu",
-    "You're not in any rooms yet! Press  to make a room or  to browse the directory": "Vi ankoraŭ estas en neniuj ĉambroj! Premu  por fari ĉambron aŭ  por esplori la ĉambrujon",
+    "You're not in any rooms yet! Press  to make a room or  to browse the directory": "Vi ankoraŭ estas en neniu ĉambro! Premu  por krei ĉambron aŭ  por esplori la ĉambrujon",
     "Community Invites": "Komunumaj invitoj",
     "Invites": "Invitoj",
     "Favourites": "Ŝatataj",
@@ -413,7 +413,7 @@
     "No users have specific privileges in this room": "Neniuj uzantoj havas specialajn privilegiojn en tiu ĉi ĉambro",
     "Banned users": "Forbaritaj uzantoj",
     "This room is not accessible by remote Matrix servers": "Ĉi tiu ĉambro ne atingeblas por foraj serviloj de Matrix",
-    "Leave room": "Eliri el ĉambro",
+    "Leave room": "Eliri babilejon",
     "Favourite": "Ŝatata",
     "Tagged as: ": "Etikedita kiel: ",
     "To link to a room it must have an address.": "Por esti ligebla, ĉambro devas havi adreson.",
@@ -658,7 +658,7 @@
     "I verify that the keys match": "Mi kontrolas, ke la ŝlosiloj kongruas",
     "An error has occurred.": "Eraro okazis.",
     "OK": "Bone",
-    "You added a new device '%(displayName)s', which is requesting encryption keys.": "Vi aldonis novan aparaton ‹%(displayName)s›, kiu petas ĉifrajn ŝlasilojn.",
+    "You added a new device '%(displayName)s', which is requesting encryption keys.": "Vi aldonis novan aparaton “%(displayName)s”, kiu petas ĉifrajn ŝlosilojn.",
     "Your unverified device '%(displayName)s' is requesting encryption keys.": "Via nekontrolita aparato ‹%(displayName)s› petas ĉifrajn ŝlosilojn.",
     "Start verification": "Komenci kontrolon",
     "Share without verifying": "Kunhavigi sen kontrolo",
@@ -874,13 +874,13 @@
     "Unbans user with given id": "Malforbaras uzanton kun la donita identigaĵo",
     "Define the power level of a user": "Difini la potencan nivelon de uzanto",
     "Deops user with given id": "Senestrigas uzanton kun donita identigaĵo",
-    "Invites user with given id to current room": "Invitas uzanton kun donita identigaĵo al la nuna ĉambro",
-    "Joins room with given alias": "Aliĝigas al ĉambro kun la donita kromnomo",
-    "Sets the room topic": "Agordas la ĉambran temon",
+    "Invites user with given id to current room": "Invitas uzanton per identigilo al la nuna babilejo",
+    "Joins room with given alias": "Aliĝas al babilejo per kromnomo",
+    "Sets the room topic": "Agordas la babilejan temon",
     "Kicks user with given id": "Forpelas uzanton kun la donita identigaĵo",
     "Changes your display nickname": "Ŝanĝas vian vidigan nomon",
     "Searches DuckDuckGo for results": "Serĉas rezultojn per DuckDuckGo",
-    "Changes colour scheme of current room": "Ŝanĝas kolorsĥemon de la nuna ĉambro",
+    "Changes colour scheme of current room": "Ŝanĝas kolorskemon de la nuna babilejo",
     "Verifies a user, device, and pubkey tuple": "Kontrolas opon de uzanto, aparato, kaj publika ŝlosilo",
     "Ignores a user, hiding their messages from you": "Malatentas uzanton, kaŝante ĝiajn mesaĝojn de vi",
     "Stops ignoring a user, showing their messages going forward": "Ĉesas malatenti uzanton, montronte ĝiajn pluajn mesaĝojn",
@@ -938,7 +938,7 @@
     "The platform you're on": "Via sistemtipo",
     "Which officially provided instance you are using, if any": "Kiun oficiale disponeblan aperon vi uzas, se iun ajn",
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Ĉu vi uzas la riĉtekstan reĝimon de la riĉteksta redaktilo aŭ ne",
-    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Kiam ĉi tiu paĝo enhavas identigeblajn informojn, ekzemple ĉambron, uzantan aŭ grupan identigilon, ĝi sendiĝas al la servilo sen tiuj.",
+    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Kiam ĉi tiu paĝo enhavas identigeblajn informojn, ekzemple babilejon, uzantan aŭ grupan identigilon, ili estas formetataj antaŭ sendado al la servilo.",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s %(monthName)s %(fullYear)s",
     "Disable Community Filter Panel": "Malŝalti komunuman filtran breton",
     "Failed to add tag %(tagName)s to room": "Malsukcesis aldoni etikedon %(tagName)s al ĉambro",
@@ -1044,10 +1044,10 @@
     "Failed to send custom event.": "Malsukcesis sendi propran okazon.",
     "What's new?": "Kio novas?",
     "Notify me for anything else": "Sciigu min pri ĉio alia",
-    "When I'm invited to a room": "Kiam mi estas invitita al ĉambro",
+    "When I'm invited to a room": "Kiam mi estas invitita al babilejo",
     "Keywords": "Ŝlosilvortoj",
     "Can't update user notification settings": "Agordoj de sciigoj al uzanto ne ĝisdatigeblas",
-    "Notify for all other messages/rooms": "Sciigu min por ĉiu alia babilejo",
+    "Notify for all other messages/rooms": "Sciigu min por ĉiuj aliaj mesaĝoj/babilejoj",
     "Unable to look up room ID from server": "Ĉambra identigaĵo ne akireblas de la servilo",
     "Couldn't find a matching Matrix room": "Malsukcesis trovi kongruan ĉambron en Matrix",
     "All Rooms": "Ĉiuj babilejoj",
@@ -1096,5 +1096,19 @@
     "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Sencimigaj protokoloj enhavas informojn pri uzo de aplikaĵo, inkluzive vian salutnomon, la identigilojn aŭ nomojn de la ĉambroj aŭ grupoj kiujn vi vizitis, kaj la salutnomojn de aliaj uzantoj. Ili ne enhavas mesaĝojn.",
     "Failed to send logs: ": "Malsukcesis sendi protokolon: ",
     "Notes:": "Rimarkoj:",
-    "Preparing to send logs": "Pretiganta sendon de protokolo"
+    "Preparing to send logs": "Pretiganta sendon de protokolo",
+    "e.g. %(exampleValue)s": "ekz. %(exampleValue)s",
+    "Every page you use in the app": "Ĉiu paĝo kiun vi uzas en la aplikaĵo",
+    "e.g. ": "ekz. ",
+    "Your User Agent": "Via klienta aplikaĵo",
+    "Your device resolution": "La distingivo de via aparato",
+    "Call in Progress": "Voko farata",
+    "A call is already in progress!": "Voko estas jam farata!",
+    "Always show encryption icons": "Ĉiam montri bildetojn de ĉifrado",
+    "Send analytics data": "Sendi statistikajn datumojn",
+    "Key request sent.": "Demando de ŝlosilo sendita.",
+    "Re-request encryption keys from your other devices.": "Redemandi ĉifroŝlosilojn el viaj aliaj aparatoj.",
+    "Encrypting": "Ĉifranta",
+    "Encrypted, not sent": "Ĉifrita, ne sendita",
+    "If your other devices do not have the key for this message you will not be able to decrypt them.": "Se viaj aliaj aparatoj ne havas la ŝlosilon por ĉi tiu mesaĝo, vi ne povos malĉifri ĝin."
 }
diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index 5434c570f7..bdbe9232c3 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -1,172 +1,172 @@
 {
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Un mensaje de texto ha sido enviado a +%(msisdn)s. Por favor ingrese el código de verificación que lo contiene",
-    "%(targetName)s accepted an invitation.": "%(targetName)s ha aceptado una invitación.",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s ha aceptado la invitación para %(displayName)s.",
+    "%(targetName)s accepted an invitation.": "%(targetName)s aceptó una invitación.",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s aceptó la invitación para %(displayName)s.",
     "Account": "Cuenta",
     "Access Token:": "Token de Acceso:",
-    "Add email address": "Agregar correo eléctronico",
-    "Add phone number": "Agregar número telefónico",
+    "Add email address": "Añadir dirección de correo electrónico",
+    "Add phone number": "Añadir número telefónico",
     "Admin": "Administrador",
     "Advanced": "Avanzado",
     "Algorithm": "Algoritmo",
-    "Always show message timestamps": "Siempre mostrar la hora del mensaje",
+    "Always show message timestamps": "Siempre mostrar las marcas temporales de mensajes",
     "Authentication": "Autenticación",
     "%(items)s and %(lastItem)s": "%(items)s y %(lastItem)s",
-    "and %(count)s others...|other": "y %(count)s otros...",
-    "and %(count)s others...|one": "y otro...",
+    "and %(count)s others...|other": "y otros %(count)s...",
+    "and %(count)s others...|one": "y otro más...",
     "%(names)s and %(lastPerson)s are typing": "%(names)s y %(lastPerson)s están escribiendo",
-    "A new password must be entered.": "Una nueva clave debe ser ingresada.",
-    "%(senderName)s answered the call.": "%(senderName)s atendió la llamada.",
+    "A new password must be entered.": "Debes ingresar una contraseña nueva.",
+    "%(senderName)s answered the call.": "%(senderName)s contestó la llamada.",
     "An error has occurred.": "Un error ha ocurrido.",
-    "Anyone who knows the room's link, apart from guests": "Cualquiera que sepa el enlace de la sala, salvo invitados",
-    "Anyone who knows the room's link, including guests": "Cualquiera que sepa del enlace de la sala, incluyendo los invitados",
+    "Anyone who knows the room's link, apart from guests": "Cualquier persona que conozca el enlace a esta sala, excepto huéspedes",
+    "Anyone who knows the room's link, including guests": "Cualquier persona que conozca el enlace a esta sala, incluyendo huéspedes",
     "Are you sure?": "¿Estás seguro?",
     "Are you sure you want to reject the invitation?": "¿Estás seguro que quieres rechazar la invitación?",
     "Attachment": "Adjunto",
     "Autoplay GIFs and videos": "Reproducir automáticamente GIFs y videos",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s ha bloqueado a %(targetName)s.",
-    "Ban": "Bloquear",
-    "Banned users": "Usuarios bloqueados",
-    "Bans user with given id": "Bloquear usuario por ID",
-    "Blacklisted": "En lista negra",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s vetó a %(targetName)s.",
+    "Ban": "Vetar",
+    "Banned users": "Usuarios vetados",
+    "Bans user with given id": "Veta al usuario con la ID dada",
+    "Blacklisted": "Prohibido",
     "Bulk Options": "Opciones masivas",
     "Call Timeout": "Tiempo de espera de la llamada",
-    "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or enable unsafe scripts.": "No se puede conectar al servidor via HTTP, cuando es necesario un enlace HTTPS en la barra de direcciones de tu navegador. Ya sea usando HTTPS o habilitando los scripts inseguros.",
-    "Can't load user settings": "No se puede cargar las configuraciones del usuario",
-    "Change Password": "Cambiar clave",
-    "%(senderName)s changed their profile picture.": "%(senderName)s ha cambiado su foto de perfil.",
+    "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or enable unsafe scripts.": "No se puede conectar al servidor doméstico via HTTP, cuando es necesario un enlace HTTPS en la barra de direcciones de tu navegador. Ya sea usando HTTPS o habilitando los scripts inseguros.",
+    "Can't load user settings": "No se puede cargar los ajustes de usuario",
+    "Change Password": "Cambiar Contraseña",
+    "%(senderName)s changed their profile picture.": "%(senderName)s cambió su imagen de perfil.",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s ha cambiado el nivel de acceso de %(powerLevelDiffText)s.",
-    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s ha cambiado el nombre de la sala a %(roomName)s.",
-    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s ha cambiado el tema de la sala a \"%(topic)s\".",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s cambió el nombre de la sala a %(roomName)s.",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s cambió el tema a \"%(topic)s\".",
     "Changes to who can read history will only apply to future messages in this room": "Cambios para quien pueda leer el historial solo serán aplicados a futuros mensajes en la sala",
-    "Changes your display nickname": "Cambia la visualización de tu apodo",
+    "Changes your display nickname": "Cambia tu apodo público",
     "Changing password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "El cambio de contraseña restablecerá actualmente todas las claves de cifrado de extremo a extremo de todos los dispositivos, haciendo que el historial de chat cifrado sea ilegible, a menos que primero exporte las claves de la habitación y vuelva a importarlas después. En el futuro esto será mejorado.",
-    "Claimed Ed25519 fingerprint key": "Clave Ed25519 es necesaria",
-    "Clear Cache and Reload": "Borrar caché y recargar",
-    "Clear Cache": "Borrar caché",
+    "Claimed Ed25519 fingerprint key": "Clave de huella digital Ed25519 reclamada",
+    "Clear Cache and Reload": "Borrar Caché y Recargar",
+    "Clear Cache": "Borrar Caché",
     "Click here to fix": "Haz clic aquí para arreglar",
-    "Click to mute audio": "Haz clic para silenciar audio",
-    "Click to mute video": "Haz clic para silenciar video",
+    "Click to mute audio": "Haz clic para silenciar el audio",
+    "Click to mute video": "Haz clic para silenciar el vídeo",
     "click to reveal": "Haz clic para ver",
-    "Click to unmute video": "Haz clic para activar sonido del video",
-    "Click to unmute audio": "Haz clic para activar sonido de audio",
+    "Click to unmute video": "Haz clic para dejar de silenciar el vídeo",
+    "Click to unmute audio": "Haz clic para dejar de silenciar el audio",
     "Command error": "Error de comando",
     "Commands": "Comandos",
     "Conference call failed.": "La llamada de conferencia falló.",
-    "Conference calling is in development and may not be reliable.": "La llamada en conferencia esta en desarrollo y no podría ser segura.",
-    "Conference calls are not supported in encrypted rooms": "Las llamadas en conferencia no son soportadas en salas encriptadas",
-    "Conference calls are not supported in this client": "Las llamadas en conferencia no son soportadas en este navegador",
-    "Confirm password": "Confirmar clave",
-    "Confirm your new password": "Confirma tu nueva clave",
+    "Conference calling is in development and may not be reliable.": "La llamada en conferencia está en desarrollo y puede no ser fiable.",
+    "Conference calls are not supported in encrypted rooms": "Las llamadas en conferencia no son soportadas en salas cifradas",
+    "Conference calls are not supported in this client": "Las llamadas en conferencia no están soportadas en este cliente",
+    "Confirm password": "Confirmar contraseña",
+    "Confirm your new password": "Confirma tu contraseña nueva",
     "Continue": "Continuar",
     "Could not connect to the integration server": "No se pudo conectar al servidor de integración",
     "Create an account": "Crear una cuenta",
-    "Create Room": "Crear una sala",
+    "Create Room": "Crear Sala",
     "Cryptography": "Criptografía",
-    "Current password": "Clave actual",
+    "Current password": "Contraseña actual",
     "Curve25519 identity key": "Clave de identidad Curve25519",
     "/ddg is not a command": "/ddg no es un comando",
     "Deactivate Account": "Desactivar Cuenta",
     "Deactivate my account": "Desactivar mi cuenta",
     "Decrypt %(text)s": "Descifrar %(text)s",
-    "Decryption error": "Error al decifrar",
+    "Decryption error": "Error de descifrado",
     "Delete": "Eliminar",
-    "Deops user with given id": "Deops usuario con ID dado",
+    "Deops user with given id": "Degrada al usuario con la ID dada",
     "Default": "Por defecto",
-    "Device ID": "ID del dispositivo",
+    "Device ID": "ID de Dispositivo",
     "Devices": "Dispositivos",
-    "Devices will not yet be able to decrypt history from before they joined the room": "Los dispositivos aun no serán capaces de descifrar el historial antes de haberse unido a la sala",
+    "Devices will not yet be able to decrypt history from before they joined the room": "Los dispositivos todavía no podrán descifrar el historial desde antes de unirse a la sala",
     "Direct chats": "Conversaciones directas",
     "Disinvite": "Deshacer invitación",
-    "Display name": "Nombre para mostrar",
-    "Displays action": "Mostrar acción",
-    "Don't send typing notifications": "No enviar notificaciones cuando se escribe",
+    "Display name": "Nombre público",
+    "Displays action": "Muestra la acción",
+    "Don't send typing notifications": "No enviar notificaciones de estar escribiendo",
     "Download %(text)s": "Descargar %(text)s",
     "Drop here to tag %(section)s": "Suelta aquí para etiquetar %(section)s",
-    "Ed25519 fingerprint": "Clave de cifrado Ed25519",
+    "Ed25519 fingerprint": "Huella digital Ed25519",
     "Email": "Correo electrónico",
     "Email address": "Dirección de correo electrónico",
     "Email, name or matrix ID": "Correo electrónico, nombre o Matrix ID",
     "Emoji": "Emoticones",
-    "Enable encryption": "Habilitar encriptación",
-    "Encrypted messages will not be visible on clients that do not yet implement encryption": "Los mensajes encriptados no serán visibles en navegadores que no han implementado aun la encriptación",
+    "Enable encryption": "Habilitar cifrado",
+    "Encrypted messages will not be visible on clients that do not yet implement encryption": "Los mensajes cifrados no serán visibles en clientes que aún no implementen el cifrado",
     "Encrypted room": "Sala encriptada",
-    "%(senderName)s ended the call.": "%(senderName)s terminó la llamada.",
-    "End-to-end encryption information": "Información de encriptación de extremo a extremo",
-    "End-to-end encryption is in beta and may not be reliable": "El cifrado de extremo a extremo está en pruebas, podría no ser fiable",
+    "%(senderName)s ended the call.": "%(senderName)s finalizó la llamada.",
+    "End-to-end encryption information": "Información de cifrado de extremo a extremo",
+    "End-to-end encryption is in beta and may not be reliable": "El cifrado de extremo a extremo está en beta y puede no ser confiable",
     "Enter Code": "Ingresar Código",
     "Error": "Error",
     "Error decrypting attachment": "Error al descifrar adjunto",
-    "Event information": "Información del evento",
+    "Event information": "Información de eventos",
     "Existing Call": "Llamada existente",
-    "Export E2E room keys": "Exportar claves E2E de la sala",
+    "Export E2E room keys": "Exportar claves de salas con Cifrado de Extremo a Extremo",
     "Failed to ban user": "Bloqueo del usuario falló",
     "Failed to change password. Is your password correct?": "No se pudo cambiar la contraseña. ¿Está usando la correcta?",
     "Failed to change power level": "Falló al cambiar de nivel de acceso",
-    "Failed to forget room %(errCode)s": "Falló al olvidar la sala %(errCode)s",
-    "Failed to join room": "Falló al unirse a la sala",
+    "Failed to forget room %(errCode)s": "No se pudo olvidar la sala %(errCode)s",
+    "Failed to join room": "No se pudo unir a la sala",
     "Failed to kick": "Falló al expulsar",
-    "Failed to leave room": "Falló al dejar la sala",
+    "Failed to leave room": "No se pudo salir de la sala",
     "Failed to load timeline position": "Falló al cargar el historico",
-    "Failed to mute user": "Falló al silenciar el usuario",
+    "Failed to mute user": "No se pudo silenciar al usuario",
     "Failed to reject invite": "Falló al rechazar invitación",
     "Failed to reject invitation": "Falló al rechazar la invitación",
-    "Failed to save settings": "Falló al guardar la configuración",
-    "Failed to send email": "Falló al enviar el correo",
-    "Failed to send request.": "Falló al enviar la solicitud.",
-    "Failed to set avatar.": "Falló al establecer el avatar.",
-    "Failed to set display name": "Falló al establecer el nombre a mostrar",
+    "Failed to save settings": "No se pudieron guardar los ajustes",
+    "Failed to send email": "No se pudo enviar el correo electrónico",
+    "Failed to send request.": "El envío de la solicitud falló.",
+    "Failed to set avatar.": "Falló al establecer avatar.",
+    "Failed to set display name": "No se pudo establecer el nombre público",
     "Failed to set up conference call": "Falló al configurar la llamada en conferencia",
     "Failed to toggle moderator status": "Falló al cambiar estatus de moderador",
-    "Failed to unban": "Falló al desbloquear",
+    "Failed to unban": "No se pudo quitar veto",
     "Failed to upload file": "Error en el envío del fichero",
-    "Failed to verify email address: make sure you clicked the link in the email": "Falló al verificar el correo electrónico: Asegúrese hacer clic en el enlace del correo",
-    "Failure to create room": "Fallo al crear la sala",
-    "Favourite": "Favorito",
+    "Failed to verify email address: make sure you clicked the link in the email": "No se pudo verificar la dirección de correo electrónico: asegúrate de hacer clic en el enlace del correo electrónico",
+    "Failure to create room": "No se pudo crear sala",
+    "Favourite": "Agregar a Favoritos",
     "Favourites": "Favoritos",
     "Fill screen": "Llenar pantalla",
-    "Filter room members": "Filtrar los miembros de la sala",
+    "Filter room members": "Filtrar miembros de la sala",
     "Forget room": "Olvidar sala",
-    "Forgot your password?": "¿Olvidaste tu clave?",
+    "Forgot your password?": "¿Olvidaste tu contraseña?",
     "For security, this session has been signed out. Please sign in again.": "Por seguridad, esta sesión ha sido cerrada. Por favor inicia sesión nuevamente.",
-    "For security, logging out will delete any end-to-end encryption keys from this browser. If you want to be able to decrypt your conversation history from future Riot sessions, please export your room keys for safe-keeping.": "Por seguridad, al cerrar la sesión borrará cualquier clave de encriptación de extremo a extremo en este navegador. Si quieres ser capaz de descifrar tu historial de conversación, para las futuras sesiones en Riot, por favor exporta las claves de la sala para protegerlas.",
+    "For security, logging out will delete any end-to-end encryption keys from this browser. If you want to be able to decrypt your conversation history from future Riot sessions, please export your room keys for safe-keeping.": "Por seguridad, al cerrar la sesión borrará cualquier clave de cifrado de extremo a extremo en este navegador. Si quieres ser capaz de descifrar tu historial de conversación, para las futuras sesiones en Riot, por favor exporta las claves de la sala para protegerlas.",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s de %(fromPowerLevel)s a %(toPowerLevel)s",
     "Guests cannot join this room even if explicitly invited.": "Invitados no pueden unirse a esta sala aun cuando han sido invitados explícitamente.",
     "Hangup": "Colgar",
-    "Hide read receipts": "Ocultar mensajes leídos",
+    "Hide read receipts": "Ocultar recibos de lectura",
     "Hide Text Formatting Toolbar": "Ocultar barra de herramientas de formato de texto",
     "Historical": "Histórico",
-    "Homeserver is": "El servidor es",
-    "Identity Server is": "La identidad del servidor es",
+    "Homeserver is": "El Servidor Doméstico es",
+    "Identity Server is": "El Servidor de Identidad es",
     "I have verified my email address": "He verificado mi dirección de correo electrónico",
-    "Import E2E room keys": "Importar claves E2E de la sala",
+    "Import E2E room keys": "Importar claves de salas con Cifrado de Extremo a Extremo",
     "Incorrect verification code": "Verificación de código incorrecta",
-    "Interface Language": "Idioma de la interfaz",
+    "Interface Language": "Idioma de la Interfaz",
     "Invalid alias format": "Formato de alias inválido",
     "Invalid address format": "Formato de dirección inválida",
-    "Invalid Email Address": "Dirección de correo electrónico inválida",
+    "Invalid Email Address": "Dirección de Correo Electrónico Inválida",
     "Invalid file%(extra)s": "Archivo inválido %(extra)s",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s ha invitado a %(targetName)s.",
+    "%(senderName)s invited %(targetName)s.": "%(senderName)s invitó a %(targetName)s.",
     "Invite new room members": "Invitar nuevos miembros a la sala",
-    "Invites": "Invitar",
-    "Invites user with given id to current room": "Invitar a usuario con ID dado a esta sala",
+    "Invites": "Invitaciones",
+    "Invites user with given id to current room": "Invita al usuario con la ID dada a la sala actual",
     "'%(alias)s' is not a valid format for an address": "'%(alias)s' no es un formato válido para una dirección",
-    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' no es un formato válido para un alias",
+    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' no es un formato de alias válido",
     "%(displayName)s is typing": "%(displayName)s está escribiendo",
     "Sign in with": "Quiero iniciar sesión con",
-    "Join Room": "Unirte a la sala",
-    "%(targetName)s joined the room.": "%(targetName)s se ha unido a la sala.",
-    "Joins room with given alias": "Unirse a la sala con el alias dado",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s ha expulsado a %(targetName)s.",
+    "Join Room": "Unirse a la Sala",
+    "%(targetName)s joined the room.": "%(targetName)s se unió a la sala.",
+    "Joins room with given alias": "Se une a la sala con el alias dado",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s expulsó a %(targetName)s.",
     "Kick": "Expulsar",
-    "Kicks user with given id": "Expulsar usuario con ID dado",
+    "Kicks user with given id": "Expulsa al usuario con la ID dada",
     "Labs": "Laboratorios",
-    "Leave room": "Dejar sala",
-    "%(targetName)s left the room.": "%(targetName)s ha dejado la sala.",
+    "Leave room": "Salir de la sala",
+    "%(targetName)s left the room.": "%(targetName)s salió de la sala.",
     "Local addresses for this room:": "Direcciones locales para esta sala:",
     "Logged in as:": "Sesión iniciada como:",
     "Logout": "Cerrar Sesión",
-    "Low priority": "Baja prioridad",
+    "Low priority": "Prioridad baja",
     "Accept": "Aceptar",
     "Add": "Añadir",
     "Admin Tools": "Herramientas de administración",
@@ -176,10 +176,10 @@
     "Default Device": "Dispositivo por defecto",
     "Microphone": "Micrófono",
     "Camera": "Cámara",
-    "Hide removed messages": "Ocultar mensajes borrados",
+    "Hide removed messages": "Ocultar mensajes eliminados",
     "Alias (optional)": "Alias (opcional)",
-    "Anyone": "Cualquiera",
-    "Click here to join the discussion!": "¡Pulse aquí para unirse a la conversación!",
+    "Anyone": "Todos",
+    "Click here to join the discussion!": "¡Haz clic aquí para unirte a la discusión!",
     "Close": "Cerrar",
     "%(count)s new messages|one": "%(count)s mensaje nuevo",
     "%(count)s new messages|other": "%(count)s mensajes nuevos",
@@ -188,80 +188,80 @@
     "Custom level": "Nivel personalizado",
     "Decline": "Rechazar",
     "Device already verified!": "¡El dispositivo ya ha sido verificado!",
-    "Device ID:": "ID del dispositivo:",
-    "device id: ": "id del dispositvo: ",
-    "Disable Notifications": "Desactivar notificaciones",
-    "Email address (optional)": "Dirección e-mail (opcional)",
-    "Enable Notifications": "Activar notificaciones",
+    "Device ID:": "ID de Dispositivo:",
+    "device id: ": "ID de dispositivo: ",
+    "Disable Notifications": "Deshabilitar Notificaciones",
+    "Email address (optional)": "Dirección de correo electrónico (opcional)",
+    "Enable Notifications": "Habilitar Notificaciones",
     "Encrypted by a verified device": "Cifrado por un dispositivo verificado",
     "Encrypted by an unverified device": "Cifrado por un dispositivo sin verificar",
-    "Encryption is enabled in this room": "Cifrado activo en esta sala",
-    "Encryption is not enabled in this room": "Cifrado desactivado en esta sala",
-    "Enter passphrase": "Introduzca contraseña",
-    "Error: Problem communicating with the given homeserver.": "Error: No es posible comunicar con el servidor indicado.",
+    "Encryption is enabled in this room": "El cifrado está habilitado en esta sala",
+    "Encryption is not enabled in this room": "El cifrado no está habilitado en esta sala",
+    "Enter passphrase": "Ingresar frase de contraseña",
+    "Error: Problem communicating with the given homeserver.": "Error: No es posible comunicar con el servidor doméstico indicado.",
     "Export": "Exportar",
     "Failed to fetch avatar URL": "Fallo al obtener la URL del avatar",
-    "Failed to upload profile picture!": "¡Fallo al enviar la foto de perfil!",
+    "Failed to upload profile picture!": "¡No se pudo subir la imagen de perfil!",
     "Home": "Inicio",
     "Import": "Importar",
-    "Incoming call from %(name)s": "Llamada de %(name)s",
-    "Incoming video call from %(name)s": "Video-llamada de %(name)s",
-    "Incoming voice call from %(name)s": "Llamada telefónica de %(name)s",
-    "Incorrect username and/or password.": "Usuario o contraseña incorrectos.",
+    "Incoming call from %(name)s": "Llamada entrante de %(name)s",
+    "Incoming video call from %(name)s": "Llamada de vídeo entrante de %(name)s",
+    "Incoming voice call from %(name)s": "Llamada de voz entrante de %(name)s",
+    "Incorrect username and/or password.": "Nombre de usuario y/o contraseña incorrectos.",
     "Invited": "Invitado",
-    "Jump to first unread message.": "Ir al primer mensaje sin leer.",
+    "Jump to first unread message.": "Ir al primer mensaje no leído.",
     "Last seen": "Visto por última vez",
     "Level:": "Nivel:",
-    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s ha configurado el historial de la sala visible para Todos los miembros de la sala, desde el momento en que son invitados.",
-    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s ha configurado el historial de la sala visible para Todos los miembros de la sala, desde el momento en que se han unido.",
-    "%(senderName)s made future room history visible to all room members.": "%(senderName)s ha configurado el historial de la sala visible para Todos los miembros de la sala.",
-    "%(senderName)s made future room history visible to anyone.": "%(senderName)s ha configurado el historial de la sala visible para nadie.",
-    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s ha configurado el historial de la sala visible para desconocido (%(visibility)s).",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s hizo visible el historial futuro de la sala para todos los miembros de la sala, desde el momento en que son invitados.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s hizo visible el historial futuro de la sala para todos los miembros de la sala, desde el momento en que se unieron.",
+    "%(senderName)s made future room history visible to all room members.": "%(senderName)s hizo visible el historial futuro de la sala para todos los miembros de la sala.",
+    "%(senderName)s made future room history visible to anyone.": "%(senderName)s hizo visible el historial futuro de la sala para cualquier persona.",
+    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s hizo visible el historial futuro de la sala para desconocido (%(visibility)s).",
     "Something went wrong!": "¡Algo ha fallado!",
     "Please select the destination room for this message": "Por favor, seleccione la sala destino para este mensaje",
     "Create new room": "Crear nueva sala",
-    "Start chat": "Comenzar chat",
-    "New Password": "Nueva contraseña",
-    "Analytics": "Analíticas",
+    "Start chat": "Iniciar conversación",
+    "New Password": "Contraseña Nueva",
+    "Analytics": "Análisis de Estadísticas",
     "Options": "Opciones",
     "Passphrases must match": "Las contraseñas deben coincidir",
     "Passphrase must not be empty": "La contraseña no puede estar en blanco",
-    "Export room keys": "Exportar las claves de la sala",
-    "Confirm passphrase": "Confirmar contraseña",
-    "Import room keys": "Importar las claves de la sala",
+    "Export room keys": "Exportar claves de sala",
+    "Confirm passphrase": "Confirmar frase de contraseña",
+    "Import room keys": "Importar claves de sala",
     "File to import": "Fichero a importar",
-    "You must join the room to see its files": "Debe unirse a la sala para ver los ficheros",
+    "You must join the room to see its files": "Debes unirte a la sala para ver sus archivos",
     "Reject all %(invitedRooms)s invites": "Rechazar todas las invitaciones a %(invitedRooms)s",
-    "Start new chat": "Iniciar una nueva conversación",
+    "Start new chat": "Iniciar nueva conversación",
     "Failed to invite": "Fallo en la invitación",
     "Failed to invite user": "No se pudo invitar al usuario",
     "Failed to invite the following users to the %(roomName)s room:": "No se pudo invitar a los siguientes usuarios a la sala %(roomName)s:",
     "Unknown error": "Error desconocido",
     "Incorrect password": "Contraseña incorrecta",
-    "To continue, please enter your password.": "Para continuar, introduzca su contraseña.",
-    "Device name": "Nombre del dispositivo",
-    "Device Name": "Nombre del dispositivo",
-    "Device key": "Clave del dispositivo",
-    "In future this verification process will be more sophisticated.": "En el futuro este proceso de verificación será mejorado.",
-    "Verify device": "Verifique el dispositivo",
-    "I verify that the keys match": "Confirmo que las claves coinciden",
+    "To continue, please enter your password.": "Para continuar, ingresa tu contraseña por favor.",
+    "Device name": "Nombre de dispositivo",
+    "Device Name": "Nombre de Dispositivo",
+    "Device key": "Clave de dispositivo",
+    "In future this verification process will be more sophisticated.": "En el futuro, este proceso de verificación será más sofisticado.",
+    "Verify device": "Verificar dispositivo",
+    "I verify that the keys match": "Verifico que las claves coinciden",
     "Unable to restore session": "No se puede recuperar la sesión",
     "Room Colour": "Color de la sala",
     "Room contains unknown devices": "La sala contiene dispositivos desconocidos",
-    "Room name (optional)": "Nombre de la sala (opcional)",
+    "Room name (optional)": "Nombre de sala (opcional)",
     "%(roomName)s does not exist.": "%(roomName)s no existe.",
     "%(roomName)s is not accessible at this time.": "%(roomName)s no es accesible en este momento.",
     "Rooms": "Salas",
     "Save": "Guardar",
     "Scroll to bottom of page": "Bajar al final de la página",
     "Scroll to unread messages": "Ir al primer mensaje sin leer",
-    "Search": "Búsqueda",
+    "Search": "Buscar",
     "Search failed": "Falló la búsqueda",
     "Seen by %(userName)s at %(dateTime)s": "Visto por %(userName)s el %(dateTime)s",
-    "Send anyway": "Enviar igualmente",
-    "Sender device information": "Información del dispositivo del remitente",
-    "Send Invites": "Enviar invitaciones",
-    "Send Reset Email": "Enviar e-mail de reinicio",
+    "Send anyway": "Enviar de todos modos",
+    "Sender device information": "Información del dispositivo emisor",
+    "Send Invites": "Enviar Invitaciones",
+    "Send Reset Email": "Enviar Correo Electrónico de Restauración",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s envió una imagen.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s invitó a %(targetDisplayName)s a unirse a la sala.",
     "Server error": "Error del servidor",
@@ -269,26 +269,26 @@
     "Server may be unavailable, overloaded, or the file too big": "El servidor podría estar saturado o desconectado, o el fichero ser demasiado grande",
     "Server may be unavailable, overloaded, or you hit a bug.": "El servidor podría estar saturado o desconectado, o encontraste un fallo.",
     "Server unavailable, overloaded, or something else went wrong.": "Servidor saturado, desconectado, o alguien ha roto algo.",
-    "Session ID": "ID de sesión",
-    "%(senderName)s set a profile picture.": "%(senderName)s puso una foto de perfil.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s cambió su nombre a %(displayName)s.",
-    "Settings": "Configuración",
+    "Session ID": "ID de Sesión",
+    "%(senderName)s set a profile picture.": "%(senderName)s estableció una imagen de perfil.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s estableció %(displayName)s como su nombre público.",
+    "Settings": "Ajustes",
     "Show panel": "Mostrar panel",
     "Show Text Formatting Toolbar": "Mostrar la barra de formato de texto",
     "Signed Out": "Desconectado",
     "Sign in": "Conectar",
-    "Sign out": "Desconectar",
+    "Sign out": "Cerrar sesión",
     "%(count)s of your messages have not been sent.|other": "Algunos de sus mensajes no han sido enviados.",
     "Someone": "Alguien",
     "Start a chat": "Iniciar una conversación",
-    "Start authentication": "Comenzar la identificación",
-    "Start Chat": "Comenzar la conversación",
+    "Start authentication": "Iniciar autenticación",
+    "Start Chat": "Iniciar Conversación",
     "Submit": "Enviar",
     "Success": "Éxito",
     "Tagged as: ": "Etiquetado como: ",
     "The default role for new room members is": "El nivel por defecto para los nuevos miembros de esta sala es",
     "The main address for this room is": "La dirección principal de esta sala es",
-    "The phone number entered looks invalid": "El número de teléfono indicado parece erróneo",
+    "The phone number entered looks invalid": "El número telefónico indicado parece erróneo",
     "Active call (%(roomName)s)": "Llamada activa (%(roomName)s)",
     "Add a topic": "Añadir un tema",
     "Missing Media Permissions, click here to request.": "Faltan permisos para el medio, pulse aquí para solicitarlos.",
@@ -296,151 +296,151 @@
     "You may need to manually permit Riot to access your microphone/webcam": "Probablemente necesite dar permisos manualmente a Riot para su micrófono/cámara",
     "Are you sure you want to leave the room '%(roomName)s'?": "¿Está seguro de que desea abandonar la sala '%(roomName)s'?",
     "Are you sure you want to upload the following files?": "¿Está seguro que desea enviar los siguientes archivos?",
-    "Can't connect to homeserver - please check your connectivity, ensure your homeserver's SSL certificate is trusted, and that a browser extension is not blocking requests.": "No se puede conectar al servidor - compruebe su conexión, asegúrese de que el certificado SSL del servidor es de confiaza, y compruebe que no hay extensiones del navegador bloqueando las peticiones.",
-    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s ha quitado el nombre de la sala.",
-    "Device key:": "Clave del dispositivo:",
+    "Can't connect to homeserver - please check your connectivity, ensure your homeserver's SSL certificate is trusted, and that a browser extension is not blocking requests.": "No se puede conectar al servidor doméstico - compruebe su conexión, asegúrese de que el certificado SSL del servidor es de confiaza, y compruebe que no hay extensiones del navegador bloqueando las peticiones.",
+    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s eliminó el nombre de la sala.",
+    "Device key:": "Clave de dispositivo:",
     "Drop File Here": "Deje el fichero aquí",
-    "Guest access is disabled on this Home Server.": "El acceso de invitados está desactivado en este servidor.",
-    "Join as voice or video.": "Conecte con voz o vídeo.",
+    "Guest access is disabled on this Home Server.": "El acceso de invitados está desactivado en este Servidor Doméstico.",
+    "Join as voice or video.": "Unirse con voz o vídeo.",
     "Manage Integrations": "Gestionar integraciones",
-    "Markdown is disabled": "Markdown está desactivado",
+    "Markdown is disabled": "Markdown está deshabilitado",
     "Markdown is enabled": "Markdown está activado",
     "matrix-react-sdk version:": "Versión de matrix-react-sdk:",
     "Message not sent due to unknown devices being present": "Mensaje no enviado debido a la presencia de dispositivos desconocidos",
-    "Missing room_id in request": "Falta el ID de sala en la petición",
-    "Missing user_id in request": "Falta el ID de usuario en la petición",
-    "Mobile phone number": "Número de teléfono móvil",
-    "Mobile phone number (optional)": "Número de teléfono móvil (opcional)",
+    "Missing room_id in request": "Falta el room_id en la solicitud",
+    "Missing user_id in request": "Falta el user_id en la solicitud",
+    "Mobile phone number": "Número telefónico de móvil",
+    "Mobile phone number (optional)": "Número telefónico de móvil (opcional)",
     "Moderator": "Moderador",
     "Mute": "Silenciar",
     "%(serverName)s Matrix ID": "%(serverName)s ID de Matrix",
     "Name": "Nombre",
-    "Never send encrypted messages to unverified devices from this device": "No enviar nunca mensajes cifrados, desde este dispositivo, a dispositivos sin verificar",
-    "Never send encrypted messages to unverified devices in this room from this device": "No enviar nunca mensajes cifrados a dispositivos no verificados, en esta sala, desde este dispositivo",
-    "New address (e.g. #foo:%(localDomain)s)": "Nueva dirección (ej: #foo:%(localDomain)s)",
-    "New password": "Nueva contraseña",
-    "New passwords don't match": "Las nuevas contraseñas no coinciden",
-    "New passwords must match each other.": "Las nuevas contraseñas deben coincidir.",
+    "Never send encrypted messages to unverified devices from this device": "Nunca enviar mensajes cifrados a dispositivos sin verificar desde este dispositivo",
+    "Never send encrypted messages to unverified devices in this room from this device": "Nunca enviar mensajes cifrados a dispositivos sin verificar en esta sala desde este dispositivo",
+    "New address (e.g. #foo:%(localDomain)s)": "Dirección nueva (ej. #foo:%(localDomain)s)",
+    "New password": "Contraseña nueva",
+    "New passwords don't match": "Las contraseñas nuevas no coinciden",
+    "New passwords must match each other.": "Las contraseñas nuevas deben coincidir.",
     "none": "ninguno",
     "not set": "sin configurar",
     "not specified": "sin especificar",
     "Notifications": "Notificaciones",
     "(not supported by this browser)": "(no soportado por este navegador)",
     "": "",
-    "NOT verified": "NO verificado",
+    "NOT verified": "SIN verificar",
     "No devices with registered encryption keys": "No hay dispositivos con claves de cifrado registradas",
-    "No display name": "Sin nombre para mostrar",
+    "No display name": "Sin nombre público",
     "No more results": "No hay más resultados",
-    "No results": "Sin resultados",
+    "No results": "No hay resultados",
     "No users have specific privileges in this room": "Ningún usuario tiene permisos específicos en esta sala",
     "OK": "Correcto",
     "olm version:": "versión de olm:",
-    "Once encryption is enabled for a room it cannot be turned off again (for now)": "Una vez se active el cifrado en esta sala, no podrá ser desactivado (por ahora)",
-    "Only people who have been invited": "Sólo usuarios que han sido invitados",
+    "Once encryption is enabled for a room it cannot be turned off again (for now)": "Una vez que se habilita el cifrado en una sala no se puede volver a desactivar (por ahora)",
+    "Only people who have been invited": "Solo personas que han sido invitadas",
     "Operation failed": "Falló la operación",
     "Password": "Contraseña",
     "Password:": "Contraseña:",
     "Passwords can't be empty": "Las contraseñas no pueden estar en blanco",
-    "People": "Gente",
+    "People": "Personas",
     "Permissions": "Permisos",
     "Phone": "Teléfono",
     "%(senderName)s placed a %(callType)s call.": "%(senderName)s ha hecho una llamada de tipo %(callType)s.",
-    "Please check your email and click on the link it contains. Once this is done, click continue.": "Por favor, compruebe su e-mail y pulse el enlace que contiene. Una vez esté hecho, pulse continuar.",
-    "Power level must be positive integer.": "El nivel debe ser un entero positivo.",
-    "Privacy warning": "Alerta de privacidad",
+    "Please check your email and click on the link it contains. Once this is done, click continue.": "Por favor, consulta tu correo electrónico y haz clic en el enlace que contiene. Una vez hecho esto, haz clic en continuar.",
+    "Power level must be positive integer.": "El nivel de autoridad debe ser un número entero positivo.",
+    "Privacy warning": "Advertencia de privacidad",
     "Private Chat": "Conversación privada",
     "Privileged Users": "Usuarios con privilegios",
     "Profile": "Perfil",
     "Public Chat": "Sala pública",
-    "Reason": "Razón",
-    "Reason: %(reasonText)s": "Razón: %(reasonText)s",
+    "Reason": "Motivo",
+    "Reason: %(reasonText)s": "Motivo: %(reasonText)s",
     "Revoke Moderator": "Eliminar Moderador",
     "Refer a friend to Riot:": "Informar a un amigo sobre Riot:",
-    "Register": "Registro",
-    "%(targetName)s rejected the invitation.": "%(targetName)s ha rechazado la invitación.",
+    "Register": "Registrar",
+    "%(targetName)s rejected the invitation.": "%(targetName)s rechazó la invitación.",
     "Reject invitation": "Rechazar invitación",
     "Rejoin": "Volver a unirse",
-    "Remote addresses for this room:": "Dirección remota de esta sala:",
+    "Remote addresses for this room:": "Direcciones remotas para esta sala:",
     "Remove Contact Information?": "¿Eliminar información del contacto?",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s ha suprimido su nombre para mostar (%(oldDisplayName)s).",
-    "%(senderName)s removed their profile picture.": "%(senderName)s ha eliminado su foto de perfil.",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s eliminó su nombre público (%(oldDisplayName)s).",
+    "%(senderName)s removed their profile picture.": "%(senderName)s eliminó su imagen de perfil.",
     "Remove": "Eliminar",
     "Remove %(threePid)s?": "¿Eliminar %(threePid)s?",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s ha solicitado una conferencia Voz-IP.",
-    "Resetting password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Reiniciar la contraseña también reiniciará las claves de cifrado extremo-a-extremo, haciendo ilegible el historial de las conversaciones, salvo que exporte previamente las claves de sala, y las importe posteriormente. Esto será mejorado en futuras versiones.",
+    "%(senderName)s requested a VoIP conference.": "%(senderName)s solicitó una conferencia de vozIP.",
+    "Resetting password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Reiniciar la contraseña también reiniciará las claves de cifrado de extremo a extremo, haciendo ilegible el historial de las conversaciones, salvo que exporte previamente las claves de sala, y las importe posteriormente. Esto será mejorado en futuras versiones.",
     "Results from DuckDuckGo": "Resultados desde DuckDuckGo",
-    "Return to login screen": "Volver a la pantalla de inicio de sesión",
-    "Riot does not have permission to send you notifications - please check your browser settings": "Riot no tiene permisos para enviarle notificaciones - por favor, revise la configuración del navegador",
+    "Return to login screen": "Regresar a la pantalla de inicio de sesión",
+    "Riot does not have permission to send you notifications - please check your browser settings": "Riot no tiene permisos para enviarle notificaciones - por favor, revisa los ajustes de tu navegador",
     "Riot was not given permission to send notifications - please try again": "Riot no pudo obtener permisos para enviar notificaciones - por favor, inténtelo de nuevo",
-    "riot-web version:": "versión riot-web:",
+    "riot-web version:": "versión de riot-web:",
     "Room %(roomId)s not visible": "La sala %(roomId)s no es visible",
     "Searches DuckDuckGo for results": "Busca en DuckDuckGo",
     "Server may be unavailable or overloaded": "El servidor podría estar saturado o desconectado",
-    "Show timestamps in 12 hour format (e.g. 2:30pm)": "Mostrar el tiempo en formato 12h (am/pm)",
+    "Show timestamps in 12 hour format (e.g. 2:30pm)": "Mostrar marcas temporales en formato de 12 horas (ej. 2:30pm)",
     "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "La clave de firma que usted ha proporcionado coincide con la recibida del dispositivo %(deviceId)s de %(userId)s. Dispositivo verificado.",
-    "This email address is already in use": "Dirección e-mail en uso",
-    "This email address was not found": "Dirección e-mail no encontrada",
-    "The email address linked to your account must be entered.": "Debe introducir el e-mail asociado a su cuenta.",
-    "The file '%(fileName)s' exceeds this home server's size limit for uploads": "El fichero '%(fileName)s' excede el tamaño máximo permitido en este servidor",
-    "The file '%(fileName)s' failed to upload": "Se produjo un fallo al enviar '%(fileName)s'",
-    "The remote side failed to pick up": "El sitio remoto falló al sincronizar",
-    "This Home Server does not support login using email address.": "Este servidor no permite identificarse con direcciones e-mail.",
-    "This invitation was sent to an email address which is not associated with this account:": "Se envió la invitación a un e-mail no asociado con esta cuenta:",
+    "This email address is already in use": "Esta dirección de correo electrónico ya está en uso",
+    "This email address was not found": "No se encontró esta dirección de correo electrónico",
+    "The email address linked to your account must be entered.": "Debes ingresar la dirección de correo electrónico vinculada a tu cuenta.",
+    "The file '%(fileName)s' exceeds this home server's size limit for uploads": "El fichero '%(fileName)s' supera el tamaño máximo permitido en este servidor doméstico",
+    "The file '%(fileName)s' failed to upload": "No se pudo subir '%(fileName)s'",
+    "The remote side failed to pick up": "El lado remoto no contestó",
+    "This Home Server does not support login using email address.": "Este Servidor Doméstico no permite identificarse con direcciones e-mail.",
+    "This invitation was sent to an email address which is not associated with this account:": "Esta invitación fue enviada a una dirección de correo electrónico que no está asociada a esta cuenta:",
     "This room has no local addresses": "Esta sala no tiene direcciones locales",
     "This room is not recognised.": "Esta sala no se reconoce.",
-    "These are experimental features that may break in unexpected ways": "Estas son funcionalidades experimentales, podrían fallar de formas imprevistas",
+    "These are experimental features that may break in unexpected ways": "Estas son funcionalidades experimentales que pueden romperse de maneras inesperadas",
     "The visibility of existing history will be unchanged": "La visibilidad del historial previo no se verá afectada",
     "This doesn't appear to be a valid email address": "Esto no parece un e-mail váido",
-    "This is a preview of this room. Room interactions have been disabled": "Esto es una vista previa de la sala. Las interacciones con la sala están desactivadas",
-    "This phone number is already in use": "Este número de teléfono ya se está usando",
+    "This is a preview of this room. Room interactions have been disabled": "Esta es una vista previa de esta sala. Las interacciones dentro de la sala se han deshabilitado",
+    "This phone number is already in use": "Este número telefónico ya está en uso",
     "This room": "Esta sala",
     "This room is not accessible by remote Matrix servers": "Esta sala no es accesible por otros servidores Matrix",
     "This room's internal ID is": "El ID interno de la sala es",
     "To link to a room it must have an address.": "Para enlazar una sala, debe tener una dirección.",
-    "To reset your password, enter the email address linked to your account": "Para reiniciar su contraseña, introduzca el e-mail asociado a su cuenta",
+    "To reset your password, enter the email address linked to your account": "Para restablecer tu contraseña, ingresa la dirección de correo electrónico vinculada a tu cuenta",
     "Cancel": "Cancelar",
     "Dismiss": "Omitir",
     "powered by Matrix": "con el poder de Matrix",
     "Room directory": "Directorio de salas",
     "Custom Server Options": "Opciones de Servidor Personalizado",
     "unknown error code": "Código de error desconocido",
-    "Start verification": "Comenzar la verificación",
-    "Skip": "Saltar",
+    "Start verification": "Iniciar verificación",
+    "Skip": "Omitir",
     "To return to your account in future you need to set a password": "Para volver a usar su cuenta en el futuro es necesario que establezca una contraseña",
     "Share without verifying": "Compartir sin verificar",
-    "Ignore request": "Ignorar la solicitud",
+    "Ignore request": "Ignorar solicitud",
     "Do you want to set an email address?": "¿Quieres poner una dirección de correo electrónico?",
     "This will allow you to reset your password and receive notifications.": "Esto te permitirá reiniciar tu contraseña y recibir notificaciones.",
-    "Authentication check failed: incorrect password?": "La verificación de la autentificación ha fallado: ¿El password es el correcto?",
+    "Authentication check failed: incorrect password?": "La verificación de autenticación falló: ¿contraseña incorrecta?",
     "Press  to start a chat with someone": "Pulsa  para empezar a charlar con alguien",
     "Add a widget": "Añadir widget",
     "Allow": "Permitir",
     "Changes colour scheme of current room": "Cambia el esquema de colores de esta sala",
     "Delete widget": "Eliminar widget",
-    "Define the power level of a user": "Definir el nivel de poder de los usuarios",
+    "Define the power level of a user": "Define el nivel de autoridad de un usuario",
     "Edit": "Editar",
     "Enable automatic language detection for syntax highlighting": "Activar la detección automática del lenguaje para resaltar la sintaxis",
-    "Hide join/leave messages (invites/kicks/bans unaffected)": "Ocultar mensajes de entrada/salida (no afecta invitaciones/kicks/bans)",
+    "Hide join/leave messages (invites/kicks/bans unaffected)": "Ocultar mensajes de unirse/salir (no afecta a invitaciones/expulsiones/vetos)",
     "Sets the room topic": "Configura el tema de la sala",
     "To get started, please pick a username!": "Para empezar, ¡por favor elija un nombre de usuario!",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Se ha intentado cargar cierto punto en la cronología de esta sala, pero no tiene permiso para ver el mensaje solicitado.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Se ha intentado cargar cierto punto en la cronología de esta sala, pero no se ha podido encontrarlo.",
     "Turn Markdown off": "Desactivar markdown",
     "Turn Markdown on": "Activar markdown",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s ha activado el cifrado de extremo-a-extremo (algorithm %(algorithm)s).",
-    "Unable to add email address": "No se ha podido añadir la dirección de correo electrónico",
-    "Unable to create widget.": "No se ha podido crear el widget.",
+    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s activó el cifrado de extremo a extremo (algoritmo %(algorithm)s).",
+    "Unable to add email address": "No es posible añadir la dirección de correo electrónico",
+    "Unable to create widget.": "No es posible crear el componente.",
     "Unable to remove contact information": "No se ha podido eliminar la información de contacto",
-    "Unable to verify email address.": "No se ha podido verificar la dirección de correo electrónico.",
-    "Unban": "Revocar bloqueo",
-    "Unbans user with given id": "Revoca el bloqueo del usuario con la identificación dada",
+    "Unable to verify email address.": "No es posible verificar la dirección de correo electrónico.",
+    "Unban": "Quitar Veto",
+    "Unbans user with given id": "Quita el veto al usuario con la ID dada",
     "Unable to ascertain that the address this invite was sent to matches one associated with your account.": "No se ha podido asegurar que la dirección a la que se envió esta invitación, coincide con una asociada a su cuenta.",
     "Unable to capture screen": "No se ha podido capturar la pantalla",
     "Unable to enable Notifications": "No se ha podido activar las notificaciones",
     "Unable to load device list": "No se ha podido cargar la lista de dispositivos",
     "Undecryptable": "No se puede descifrar",
     "Unencrypted room": "Sala sin cifrado",
-    "Unencrypted message": "Mensaje no cifrado",
+    "Unencrypted message": "Mensaje sin cifrar",
     "unknown caller": "Persona que llama desconocida",
     "unknown device": "dispositivo desconocido",
     "Unknown room %(roomId)s": "Sala desconocida %(roomId)s",
@@ -448,89 +448,89 @@
     "Unnamed Room": "Sala sin nombre",
     "Unverified": "Sin verificar",
     "Uploading %(filename)s and %(count)s others|zero": "Subiendo %(filename)s",
-    "Uploading %(filename)s and %(count)s others|one": "Subiendo %(filename)s y %(count)s otros",
-    "Uploading %(filename)s and %(count)s others|other": "Subiendo %(filename)s y %(count)s otros",
+    "Uploading %(filename)s and %(count)s others|one": "Subiendo %(filename)s y otros %(count)s",
+    "Uploading %(filename)s and %(count)s others|other": "Subiendo %(filename)s y otros %(count)s",
     "Upload avatar": "Subir avatar",
     "Upload Failed": "Error al subir",
-    "Upload Files": "Subir archivos",
+    "Upload Files": "Subir Archivos",
     "Upload file": "Subir archivo",
     "Upload new:": "Subir nuevo:",
     "Usage": "Uso",
     "Use compact timeline layout": "Usar diseño de cronología compacto",
-    "Use with caution": "Usar con precaución",
-    "User ID": "Identificación de usuario",
-    "User Interface": "Interfaz de usuario",
+    "Use with caution": "Utilizar con precaución",
+    "User ID": "ID de Usuario",
+    "User Interface": "Interfaz de Usuario",
     "User name": "Nombre de usuario",
     "Username invalid: %(errMessage)s": "Nombre de usuario no válido: %(errMessage)s",
     "Users": "Usuarios",
-    "Verification Pending": "Verificación pendiente",
+    "Verification Pending": "Verificación Pendiente",
     "Verification": "Verificación",
     "verified": "verificado",
     "Verified": "Verificado",
     "Verified key": "Clave verificada",
     "Video call": "Llamada de vídeo",
     "Voice call": "Llamada de voz",
-    "VoIP conference finished.": "Conferencia VoIP terminada.",
-    "VoIP conference started.": "Conferencia de VoIP iniciada.",
+    "VoIP conference finished.": "conferencia de vozIP finalizada.",
+    "VoIP conference started.": "conferencia de vozIP iniciada.",
     "VoIP is unsupported": "No hay soporte para VoIP",
     "(could not connect media)": "(no se ha podido conectar medio)",
     "(no answer)": "(sin respuesta)",
     "(unknown failure: %(reason)s)": "(error desconocido: %(reason)s)",
-    "(warning: cannot be disabled again!)": "(aviso: ¡no se puede volver a desactivar!)",
+    "(warning: cannot be disabled again!)": "(advertencia: ¡no se puede volver a deshabilitar!)",
     "Warning!": "¡Advertencia!",
-    "WARNING: Device already verified, but keys do NOT MATCH!": "AVISO: Dispositivo ya verificado, ¡pero las claves NO COINCIDEN!",
+    "WARNING: Device already verified, but keys do NOT MATCH!": "ADVERTENCIA: Dispositivo ya verificado, ¡pero las claves NO COINCIDEN!",
     "Who can access this room?": "¿Quién puede acceder a esta sala?",
     "Who can read history?": "¿Quién puede leer el historial?",
     "Who would you like to add to this room?": "¿A quién quiere añadir a esta sala?",
-    "Who would you like to communicate with?": "¿Con quién quiere comunicar?",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s ha retirado la invitación de %(targetName)s.",
+    "Who would you like to communicate with?": "¿Con quién quiere comunicarse?",
+    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s retiró la invitación de %(targetName)s.",
     "Would you like to accept or decline this invitation?": "¿Quiere aceptar o rechazar esta invitación?",
-    "You already have existing direct chats with this user:": "Ya tiene chats directos con este usuario:",
+    "You already have existing direct chats with this user:": "Ya tiene conversaciones directas con este usuario:",
     "You are already in a call.": "Ya está participando en una llamada.",
-    "You are not in this room.": "Usted no está en esta sala.",
-    "You do not have permission to do that in this room.": "No tiene permiso para hacer esto en esta sala.",
+    "You are not in this room.": "No estás en esta sala.",
+    "You do not have permission to do that in this room.": "No tienes permiso para realizar esa acción en esta sala.",
     "You're not in any rooms yet! Press  to make a room or  to browse the directory": "¡Todavía no participa en ninguna sala! Pulsa  para crear una sala o  para explorar el directorio",
-    "You are trying to access %(roomName)s.": "Está tratando de acceder a %(roomName)s.",
+    "You are trying to access %(roomName)s.": "Estás intentando acceder a %(roomName)s.",
     "You cannot place a call with yourself.": "No puede iniciar una llamada con usted mismo.",
     "Cannot add any more widgets": "no es posible agregar mas widgets",
     "Do you want to load widget from URL:": "desea cargar widget desde URL:",
     "Integrations Error": "error de integracion",
-    "Publish this room to the public in %(domain)s's room directory?": "Desea publicar esta sala al publico en el directorio de sala de %(domain)s?",
+    "Publish this room to the public in %(domain)s's room directory?": "Desea publicar esta sala al publico en el directorio de salas de %(domain)s?",
     "AM": "AM",
     "PM": "PM",
     "NOTE: Apps are not end-to-end encrypted": "NOTA: Las Apps no son cifradas de extremo a extremo",
     "Revoke widget access": "Revocar acceso del widget",
     "The maximum permitted number of widgets have already been added to this room.": "La cantidad máxima de widgets permitida ha sido alcanzada en esta sala.",
     "To use it, just wait for autocomplete results to load and tab through them.": "Para usar, solo espere a que carguen los resultados de auto-completar y navegue entre ellos.",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s levanto la suspensión de %(targetName)s.",
+    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s le quitó el veto a %(targetName)s.",
     "unencrypted": "no cifrado",
-    "Unmute": "desactivar el silencio",
+    "Unmute": "Dejar de silenciar",
     "Unrecognised command:": "comando no reconocido:",
     "Unrecognised room alias:": "alias de sala no reconocido:",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (nivel de permisos %(powerLevelNumber)s)",
-    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "Atención: VERIFICACIÓN DE CLAVE FALLO\" La clave de firma para %(userId)s y el dispositivo %(deviceId)s es \"%(fprint)s\" la cual no concuerda con la clave provista por \"%(fingerprint)s\". Esto puede significar que sus comunicaciones están siendo interceptadas!",
-    "You cannot place VoIP calls in this browser.": "no puede realizar llamadas de voz en este navegador.",
-    "You do not have permission to post to this room": "no tiene permiso para publicar en esta sala",
-    "You have been banned from %(roomName)s by %(userName)s.": "Ha sido expulsado de %(roomName)s por %(userName)s.",
-    "You have been invited to join this room by %(inviterName)s": "Ha sido invitado a entrar a esta sala por %(inviterName)s",
-    "You have been kicked from %(roomName)s by %(userName)s.": "Ha sido removido de %(roomName)s por %(userName)s.",
-    "You have been logged out of all devices and will no longer receive push notifications. To re-enable notifications, sign in again on each device": "Ha sido desconectado de todos los dispositivos y no continuara recibiendo notificaciones. Para volver a habilitar las notificaciones, vuelva a conectarse en cada dispositivo",
+    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "ADVERTENCIA: VERIFICACIÓN DE CLAVE FALLO\" La clave de firma para %(userId)s y el dispositivo %(deviceId)s es \"%(fprint)s\" la cual no concuerda con la clave provista por \"%(fingerprint)s\". Esto puede significar que sus comunicaciones están siendo interceptadas!",
+    "You cannot place VoIP calls in this browser.": "No puede realizar llamadas VoIP en este navegador.",
+    "You do not have permission to post to this room": "No tienes permiso para publicar en esta sala",
+    "You have been banned from %(roomName)s by %(userName)s.": "Has sido vetado de %(roomName)s por %(userName)s.",
+    "You have been invited to join this room by %(inviterName)s": "Ha sido invitado por %(inviterName)s a unirte a esta sala",
+    "You have been kicked from %(roomName)s by %(userName)s.": "Has sido expulsado de %(roomName)s por %(userName)s.",
+    "You have been logged out of all devices and will no longer receive push notifications. To re-enable notifications, sign in again on each device": "Se ha cerrado sesión en todos tus dispositivos y ya no recibirás notificaciones push. Para volver a habilitar las notificaciones, vuelve a iniciar sesión en cada dispositivo",
     "You have disabled URL previews by default.": "Ha deshabilitado la vista previa de URL por defecto.",
     "You have enabled URL previews by default.": "Ha habilitado vista previa de URL por defecto.",
     "You have no visible notifications": "No tiene notificaciones visibles",
-    "You may wish to login with a different account, or add this email to this account.": "Puede ingresar con una cuenta diferente, o agregar este e-mail a esta cuenta.",
+    "You may wish to login with a different account, or add this email to this account.": "Quizás quieras iniciar sesión con otra cuenta, o añadir este correo electrónico a esta cuenta.",
     "You must register to use this functionality": "Usted debe ser un registrar para usar esta funcionalidad",
     "You need to be able to invite users to do that.": "Usted debe ser capaz de invitar usuarios para hacer eso.",
     "You need to be logged in.": "Necesita estar autenticado.",
     "You need to enter a user name.": "Tiene que ingresar un nombre de usuario.",
-    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Su e-mail parece no estar asociado con una Id Matrix en este Homeserver.",
-    "Your password has been reset": "Su contraseña ha sido restablecida",
+    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Su correo electrónico parece no estar asociado con una ID de Matrix en este Servidor Doméstico.",
+    "Your password has been reset": "Tu contraseña fue restablecida",
     "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Su contraseña a sido cambiada exitosamente. No recibirá notificaciones en otros dispositivos hasta que ingrese de nuevo en ellos",
     "You seem to be in a call, are you sure you want to quit?": "Parece estar en medio de una llamada, ¿esta seguro que desea salir?",
     "You seem to be uploading files, are you sure you want to quit?": "Parece estar cargando archivos, ¿esta seguro que desea salir?",
-    "You should not yet trust it to secure data": "No debería confiarle aun para asegurar su información",
-    "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "No podrá revertir este cambio ya que esta promoviendo al usuario para tener el mismo nivel de autoridad que usted.",
-    "Your home server does not support device management.": "Su servidor privado no suporta la gestión de dispositivos.",
+    "You should not yet trust it to secure data": "Aún no deberías confiar en él para proteger tus datos",
+    "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "No podrás deshacer este cambio porque estás promoviendo al usuario para tener el mismo nivel de autoridad que tú.",
+    "Your home server does not support device management.": "Tu servidor doméstico no suporta la gestión de dispositivos.",
     "Sun": "Dom",
     "Mon": "Lun",
     "Tue": "Mar",
@@ -545,7 +545,7 @@
     "May": "May",
     "Jun": "Jun",
     "Jul": "Jul",
-    "Aug": "August",
+    "Aug": "Ago",
     "Add rooms to this community": "Agregar salas a esta comunidad",
     "Call Failed": "La llamada falló",
     "Review Devices": "Revisar Dispositivos",
@@ -559,35 +559,35 @@
     "Dec": "Dic",
     "Warning": "Advertencia",
     "Unpin Message": "Desmarcar Mensaje",
-    "Online": "Conectado",
+    "Online": "En línea",
     "Submit debug logs": "Enviar registros de depuración",
     "The platform you're on": "La plataforma en la que te encuentras",
     "The version of Riot.im": "La versión de Riot.im",
     "Whether or not you're logged in (we don't record your user name)": "Estés identificado o no (no almacenamos tu nombre de usuario)",
     "Your language of choice": "El idioma que has elegido",
-    "Your homeserver's URL": "La URL de tu homeserver",
+    "Your homeserver's URL": "La URL de tu servidor doméstico",
     "Your identity server's URL": "La URL de tu servidor de identidad",
     "The information being sent to us to help make Riot.im better includes:": "La información remitida a nosotros para ayudar a mejorar Riot.im incluye:",
     "Drop here to demote": "Suelta aquí para degradar",
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Estés o no usando el modo Richtext del Editor de Texto Enriquecido",
     "Who would you like to add to this community?": "¿A quién deseas añadir a esta comunidad?",
-    "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Aviso: cualquier persona que añadas a una comunidad será públicamente visible a cualquiera que conozca el ID de la comunidad",
-    "Invite new community members": "Invita nuevos miembros de la comunidad",
+    "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Advertencia: cualquier persona que añadas a una comunidad será públicamente visible a cualquier persona que conozca la ID de la comunidad",
+    "Invite new community members": "Invita nuevos miembros a la comunidad",
     "Name or matrix ID": "Nombre o ID de matrix",
     "Invite to Community": "Invitar a la comunidad",
     "Which rooms would you like to add to this community?": "¿Qué salas deseas añadir a esta comunidad?",
     "Fetching third party location failed": "Falló la obtención de la ubicación de un tercero",
     "A new version of Riot is available.": "Una nueva versión de Riot está disponible.",
     "I understand the risks and wish to continue": "Entiendo los riesgos y deseo continuar",
-    "Couldn't load home page": "No se puede cargar la página principal",
+    "Couldn't load home page": "No se puede cargar la página de inicio",
     "Send Account Data": "Enviar Datos de la Cuenta",
-    "Advanced notification settings": "Configuración avanzada de notificaciones",
+    "Advanced notification settings": "Ajustes avanzados de notificaciones",
     "Uploading report": "Enviando informe",
     "Sunday": "Domingo",
     "Guests can join": "Los invitados se pueden unir",
     "Failed to add tag %(tagName)s to room": "Error al añadir la etiqueta %(tagName)s a la sala",
     "Notification targets": "Objetivos de notificación",
-    "Failed to set direct chat tag": "Error al establecer la etiqueta de chat directo",
+    "Failed to set direct chat tag": "Error al establecer la etiqueta de conversación directa",
     "Today": "Hoy",
     "Files": "Archivos",
     "You are not receiving desktop notifications": "No estás recibiendo notificaciones de escritorio",
@@ -598,15 +598,15 @@
     "Expand panel": "Expandir panel",
     "On": "Encendido",
     "%(count)s Members|other": "%(count)s miembros",
-    "Filter room names": "Filtrar los nombres de las salas",
+    "Filter room names": "Filtrar los nombres de salas",
     "Changelog": "Registro de cambios",
     "Waiting for response from server": "Esperando una respuesta del servidor",
     "Leave": "Salir",
     "Uploaded on %(date)s by %(user)s": "Subido el %(date)s por %(user)s",
     "Send Custom Event": "Enviar Evento Personalizado",
-    "All notifications are currently disabled for all targets.": "Las notificaciones estan desactivadas para todos los objetivos.",
+    "All notifications are currently disabled for all targets.": "Las notificaciones están deshabilitadas para todos los objetivos.",
     "Failed to send logs: ": "Error al enviar registros: ",
-    "delete the alias.": "borrar el alias.",
+    "delete the alias.": "eliminar el alias.",
     "To return to your account in future you need to set a password": "Para regresar a tu cuenta en el futuro debes establecer una contraseña",
     "Forget": "Olvidar",
     "World readable": "Legible por todo el mundo",
@@ -614,16 +614,16 @@
     "You cannot delete this image. (%(code)s)": "No puedes eliminar esta imagen. (%(code)s)",
     "Cancel Sending": "Cancelar envío",
     "This Room": "Esta sala",
-    "The Home Server may be too old to support third party networks": "El Home Server puede ser demasiado antiguo para soportar redes de terceros",
+    "The Home Server may be too old to support third party networks": "El Servidor Doméstico puede ser demasiado antiguo para soportar redes de terceros",
     "Resend": "Reenviar",
     "Room not found": "Sala no encontrada",
-    "Messages containing my display name": "Mensajes que contienen mi nombre",
-    "Messages in one-to-one chats": "Mensajes en chats uno a uno",
+    "Messages containing my display name": "Mensajes que contienen mi nombre público",
+    "Messages in one-to-one chats": "Mensajes en conversaciones uno a uno",
     "Unavailable": "No disponible",
     "View Decrypted Source": "Ver Fuente Descifrada",
     "Failed to update keywords": "Error al actualizar las palabras clave",
     "Notes:": "Notas:",
-    "remove %(name)s from the directory.": "retirar %(name)s del directorio.",
+    "remove %(name)s from the directory.": "eliminar a %(name)s del directorio.",
     "Notifications on the following keywords follow rules which can’t be displayed here:": "Las notificaciones de las siguientes palabras clave siguen reglas que no se pueden mostrar aquí:",
     "Safari and Opera work too.": "Safari y Opera también funcionan.",
     "Please set a password!": "¡Por favor establece una contraseña!",
@@ -636,7 +636,7 @@
     "Members": "Miembros",
     "No update available.": "No hay actualizaciones disponibles.",
     "Noisy": "Ruidoso",
-    "Failed to get protocol list from Home Server": "Error al obtener la lista de protocolos desde el Home Server",
+    "Failed to get protocol list from Home Server": "Error al obtener la lista de protocolos desde el Servidor Doméstico",
     "Collecting app version information": "Recolectando información de la versión de la aplicación",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "¿Borrar el alias de la sala %(alias)s y eliminar %(name)s del directorio?",
     "This will allow you to return to your account after signing out, and sign in on other devices.": "Esto te permitirá regresar a tu cuenta después de cerrar sesión, así como iniciar sesión en otros dispositivos.",
@@ -644,24 +644,24 @@
     "Enable notifications for this account": "Habilitar notificaciones para esta cuenta",
     "Directory": "Directorio",
     "Invite to this community": "Invitar a esta comunidad",
-    "Search for a room": "Buscar sala",
+    "Search for a room": "Buscar una sala",
     "Messages containing keywords": "Mensajes que contienen palabras clave",
     "Error saving email notification preferences": "Error al guardar las preferencias de notificación por email",
     "Tuesday": "Martes",
     "Enter keywords separated by a comma:": "Introduzca palabras clave separadas por una coma:",
     "Search…": "Buscar…",
     "You have successfully set a password and an email address!": "¡Has establecido una nueva contraseña y dirección de correo electrónico!",
-    "Remove %(name)s from the directory?": "¿Retirar %(name)s del directorio?",
+    "Remove %(name)s from the directory?": "¿Eliminar a %(name)s del directorio?",
     "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot usa muchas características avanzadas del navegador, algunas de las cuales no están disponibles en su navegador actual.",
     "Event sent!": "Evento enviado!",
     "Preparing to send logs": "Preparando para enviar registros",
     "Enable desktop notifications": "Habilitar notificaciones de escritorio",
     "Unnamed room": "Sala sin nombre",
     "Explore Account Data": "Explorar Datos de la Cuenta",
-    "Remove from Directory": "Retirar del Directorio",
+    "Remove from Directory": "Eliminar del Directorio",
     "Saturday": "Sábado",
-    "Remember, you can always set an email address in user settings if you change your mind.": "Recuerda que si es necesario puedes establecer una dirección de email en las preferencias de usuario.",
-    "Direct Chat": "Conversación directa",
+    "Remember, you can always set an email address in user settings if you change your mind.": "Recuerda que si es necesario puedes establecer una dirección de email en los ajustes de usuario.",
+    "Direct Chat": "Conversación Directa",
     "The server may be unavailable or overloaded": "El servidor puede estar no disponible o sobrecargado",
     "Reject": "Rechazar",
     "Failed to set Direct Message status of room": "No se pudo establecer el estado de Mensaje Directo de la sala",
@@ -688,15 +688,15 @@
     "Failed to send custom event.": "Ha fallado el envio del evento personalizado.",
     "What's new?": "¿Qué hay de nuevo?",
     "Notify me for anything else": "Notificarme para cualquier otra cosa",
-    "When I'm invited to a room": "Cuando estoy invitado a una sala",
-    "Can't update user notification settings": "No se puede actualizar la configuración de notificaciones del usuario",
+    "When I'm invited to a room": "Cuando soy invitado a una sala",
+    "Can't update user notification settings": "No se puede actualizar los ajustes de notificaciones del usuario",
     "Notify for all other messages/rooms": "Notificar para todos los demás mensajes/salas",
     "Unable to look up room ID from server": "No se puede buscar el ID de la sala desde el servidor",
     "Couldn't find a matching Matrix room": "No se encontró una sala Matrix que coincida",
-    "All Rooms": "Todas las salas",
+    "All Rooms": "Todas las Salas",
     "You cannot delete this message. (%(code)s)": "No puedes eliminar este mensaje. (%(code)s)",
     "Thursday": "Jueves",
-    "Forward Message": "Reenviar mensaje",
+    "Forward Message": "Reenviar Mensaje",
     "Logs sent": "Registros enviados",
     "Back": "Atrás",
     "Reply": "Responder",
@@ -706,26 +706,26 @@
     "Unable to join network": "No se puede unir a la red",
     "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Es posible que los hayas configurado en un cliente que no sea Riot. No puedes ajustarlos en Riot, pero todavía se aplican",
     "Sorry, your browser is not able to run Riot.": "¡Lo sentimos! Su navegador no puede ejecutar Riot.",
-    "Messages in group chats": "Mensajes en chats de grupo",
+    "Messages in group chats": "Mensajes en conversaciones en grupo",
     "Yesterday": "Ayer",
     "Error encountered (%(errorDetail)s).": "Error encontrado (%(errorDetail)s).",
     "Login": "Iniciar sesión",
-    "Low Priority": "Baja Prioridad",
+    "Low Priority": "Prioridad Baja",
     "Riot does not know how to join a room on this network": "Riot no sabe cómo unirse a una sala en esta red",
     "Set Password": "Establecer contraseña",
     "Enable audible notifications in web client": "Habilitar notificaciones audibles en el cliente web",
-    "Off": "Apagado",
+    "Off": "Desactivado",
     "#example": "#ejemplo",
-    "Mentions only": "Sólo menciones",
+    "Mentions only": "Solo menciones",
     "Failed to remove tag %(tagName)s from room": "Error al eliminar la etiqueta %(tagName)s de la sala",
     "Wednesday": "Miércoles",
     "You can now return to your account after signing out, and sign in on other devices.": "Ahora puedes regresar a tu cuenta después de cerrar tu sesión, e iniciar sesión en otros dispositivos.",
     "Enable email notifications": "Habilitar notificaciones por email",
     "Event Type": "Tipo de Evento",
-    "No rooms to show": "Sin salas para mostrar",
+    "No rooms to show": "No hay salas para mostrar",
     "Download this file": "Descargar este archivo",
     "Pin Message": "Marcar Mensaje",
-    "Failed to change settings": "Error al cambiar la configuración",
+    "Failed to change settings": "Error al cambiar los ajustes",
     "View Community": "Ver la comunidad",
     "%(count)s Members|one": "%(count)s miembro",
     "Developer Tools": "Herramientas de Desarrollo",
@@ -736,5 +736,524 @@
     "Collapse panel": "Colapsar panel",
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "En su navegador actual, la apariencia y comportamiento de la aplicación puede ser completamente incorrecta, y algunas de las características podrían no funcionar. Si aún desea probarlo puede continuar, pero ¡no podremos ofrecer soporte por cualquier problema que pudiese tener!",
     "Checking for an update...": "Comprobando actualizaciones...",
-    "There are advanced notifications which are not shown here": "Hay notificaciones avanzadas que no se muestran aquí"
+    "There are advanced notifications which are not shown here": "Hay notificaciones avanzadas que no se muestran aquí",
+    "Every page you use in the app": "Todas las páginas que usas en la aplicación",
+    "Your User Agent": "Tu Agente de Usuario",
+    "Your device resolution": "La resolución de tu dispositivo",
+    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Hay dispositivos desconocidos en esta sala: si procede sin verificarlos, será posible que alguien escuche su llamada.",
+    "Which officially provided instance you are using, if any": "Cuál instancia ofrecida oficialmente está usando, si existe",
+    "e.g. %(exampleValue)s": "ej. %(exampleValue)s",
+    "e.g. ": "e.g. ",
+    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Donde esta página incluye información identificable, como sala, usuario o ID del grupo, esa información se elimina antes de enviarla al servidor.",
+    "A conference call could not be started because the intgrations server is not available": "No se pudo iniciar una llamada de conferencia porque el servidor de integraciones no está disponible",
+    "Call in Progress": "Llamada en Curso",
+    "A call is currently being placed!": "¡Se está realizando una llamada en este momento!",
+    "A call is already in progress!": "¡Ya hay una llamada en curso!",
+    "Permission Required": "Permiso Requerido",
+    "You do not have permission to start a conference call in this room": "No tiene permiso para comenzar una llamada de conferencia en esta sala",
+    "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(time)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s",
+    "Show these rooms to non-members on the community page and room list?": "¿Mostrar estas salas a personas no registradas en la página de la comunidad y la lista de salas?",
+    "Add rooms to the community": "Agregar salas a la comunidad",
+    "Room name or alias": "Nombre o alias de sala",
+    "Add to community": "Agregar a comunidad",
+    "Failed to invite the following users to %(groupId)s:": "No se pudo invitar a los usuarios siguientes a %(groupId)s:",
+    "Failed to invite users to community": "Falló la invitación de usuarios a la comunidad",
+    "Failed to invite users to %(groupId)s": "Falló la invitación de usuarios a %(groupId)s",
+    "Failed to add the following rooms to %(groupId)s:": "Falló la a agregación de las salas siguientes a %(groupId)s:",
+    "Restricted": "Restringido",
+    "Missing roomId.": "Id de sala ausente.",
+    "Ignores a user, hiding their messages from you": "Ignora a un usuario, ocultando sus mensajes",
+    "Ignored user": "Usuario ignorado",
+    "You are now ignoring %(userId)s": "Ahora está ignorando a %(userId)s",
+    "Stops ignoring a user, showing their messages going forward": "Deja de ignorar a un usuario, mostrando en adelante sus mensajes",
+    "Unignored user": "Usuario no ignorado",
+    "You are no longer ignoring %(userId)s": "Ya no está ignorando a %(userId)s",
+    "Opens the Developer Tools dialog": "Abre el diálogo de Herramientas de Desarrollador",
+    "Verifies a user, device, and pubkey tuple": "Verifica a un usuario, dispositivo, y tupla de clave pública",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s cambió su nombre público a %(displayName)s.",
+    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s cambió los mensajes con chincheta en la sala.",
+    "%(widgetName)s widget modified by %(senderName)s": "el widget %(widgetName)s fue modificado por %(senderName)s",
+    "%(widgetName)s widget added by %(senderName)s": "componente %(widgetName)s añadido por %(senderName)s",
+    "%(widgetName)s widget removed by %(senderName)s": "componente %(widgetName)s eliminado por %(senderName)s",
+    "%(names)s and %(count)s others are typing|other": "%(names)s y otros %(count)s están escribiendo",
+    "%(names)s and %(count)s others are typing|one": "%(names)s y otro más están escribiendo",
+    "Your browser does not support the required cryptography extensions": "Su navegador no soporta las extensiones de criptografía requeridas",
+    "Not a valid Riot keyfile": "No es un archivo de claves de Riot válido",
+    "Message Pinning": "Mensajes con chincheta",
+    "Jitsi Conference Calling": "Llamadas de conferencia Jitsi",
+    "Disable Emoji suggestions while typing": "Deshabilitar sugerencias de Emoji mientras escribe",
+    "Hide avatar changes": "Ocultar cambios de avatar",
+    "Hide display name changes": "Ocultar cambios de nombre público",
+    "Always show encryption icons": "Mostrar siempre iconos de cifrado",
+    "Hide avatars in user and room mentions": "Ocultar avatares en las menciones de usuarios y salas",
+    "Disable big emoji in chat": "Deshabilitar emoji grande en la conversación",
+    "Automatically replace plain text Emoji": "Sustituir automáticamente Emojis de texto",
+    "Mirror local video feed": "Clonar transmisión de video local",
+    "Disable Community Filter Panel": "Deshabilitar Panel de Filtro de la Comunidad",
+    "Disable Peer-to-Peer for 1:1 calls": "Deshabilitar pares para llamadas 1:1",
+    "Send analytics data": "Enviar datos de análisis de estadísticas",
+    "Enable inline URL previews by default": "Habilitar vistas previas de URL en línea por defecto",
+    "Enable URL previews for this room (only affects you)": "Activar vista previa de URL en esta sala (sólo le afecta a ud.)",
+    "Enable URL previews by default for participants in this room": "Activar vista previa de URL por defecto para los participantes en esta sala",
+    "Enable widget screenshots on supported widgets": "Activar capturas de pantalla de widget en los widgets soportados",
+    "Show empty room list headings": "Mostrar lista de títulos de salas vacías",
+    "Delete %(count)s devices|other": "Eliminar %(count)s dispositivos",
+    "Delete %(count)s devices|one": "Eliminar dispositivo",
+    "Select devices": "Seleccionar dispositivos",
+    "Drop file here to upload": "Soltar aquí el fichero a subir",
+    " (unsupported)": " (no soportado)",
+    "Ongoing conference call%(supportedText)s.": "Llamada de conferencia en curso%(supportedText)s.",
+    "This event could not be displayed": "No se pudo mostrar este evento",
+    "%(senderName)s sent an image": "%(senderName)s envió una imagen",
+    "%(senderName)s sent a video": "%(senderName)s envió un vídeo",
+    "%(senderName)s uploaded a file": "%(senderName)s subió un fichero",
+    "Your key share request has been sent - please check your other devices for key share requests.": "Se envió su solicitud para compartir la clave - por favor, compruebe sus otros dispositivos para solicitudes de compartir clave.",
+    "Key share requests are sent to your other devices automatically. If you rejected or dismissed the key share request on your other devices, click here to request the keys for this session again.": "Las solicitudes para compartir la clave se envían a sus otros dispositivos automáticamente. Si rechazó o descartó la solicitud en sus otros dispositivos, pulse aquí para solicitar otra vez las claves durante esta sesión.",
+    "If your other devices do not have the key for this message you will not be able to decrypt them.": "Si sus otros dispositivos no tienen la clave para este mensaje no podrá descifrarlos.",
+    "Key request sent.": "Solicitud de clave enviada.",
+    "Re-request encryption keys from your other devices.": "Volver a solicitar las claves de cifrado de tus otros dispositivos.",
+    "Encrypting": "Cifrando",
+    "Encrypted, not sent": "Cifrado, no enviado",
+    "Disinvite this user?": "¿Dejar de invitar a este usuario?",
+    "Kick this user?": "¿Echar a este usuario?",
+    "Unban this user?": "¿Quitarle el veto a este usuario?",
+    "Ban this user?": "¿Vetar a este usuario?",
+    "Demote yourself?": "¿Degradarse a ud mismo?",
+    "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "No podrá deshacer este cambio ya que está degradándose a usted mismo, si es el usuario con menos privilegios de la sala le resultará imposible recuperarlos.",
+    "Demote": "Degradar",
+    "Unignore": "Dejar de ignorar",
+    "Ignore": "Ignorar",
+    "Jump to read receipt": "Saltar a recibo leído",
+    "Mention": "Mencionar",
+    "Invite": "Invitar",
+    "Share Link to User": "Compartir Enlace con Usuario",
+    "User Options": "Opciones de Usuario",
+    "Make Moderator": "Convertir a Moderador",
+    "bold": "negrita",
+    "italic": "cursiva",
+    "deleted": "eliminado",
+    "underlined": "subrayado",
+    "inline-code": "código en línea",
+    "block-quote": "cita extensa",
+    "bulleted-list": "lista con viñetas",
+    "numbered-list": "lista numerada",
+    "At this time it is not possible to reply with a file so this will be sent without being a reply.": "En este momento no es posible responder con un fichero así que esto se enviará sin que sea una respuesta.",
+    "Send an encrypted reply…": "Enviar una respuesta cifrada…",
+    "Send a reply (unencrypted)…": "Enviar una respuesta (sin cifrar)…",
+    "Send an encrypted message…": "Enviar un mensaje cifrado…",
+    "Send a message (unencrypted)…": "Enviar un mensaje (sin cifrar)…",
+    "Unable to reply": "No se pudo responder",
+    "At this time it is not possible to reply with an emote.": "En este momento no es posible responder con un emoticono.",
+    "Jump to message": "Ir a mensaje",
+    "No pinned messages.": "No hay mensajes con chincheta.",
+    "Loading...": "Cargando...",
+    "Pinned Messages": "Mensajes con chincheta",
+    "%(duration)ss": "%(duration)ss",
+    "%(duration)sm": "%(duration)sm",
+    "%(duration)sh": "%(duration)sh",
+    "%(duration)sd": "%(duration)sd",
+    "Online for %(duration)s": "En línea durante %(duration)s",
+    "Idle for %(duration)s": "En reposo durante %(duration)s",
+    "Offline for %(duration)s": "Desconectado durante %(duration)s",
+    "Unknown for %(duration)s": "Desconocido durante %(duration)s",
+    "Idle": "En reposo",
+    "Offline": "Desconectado",
+    "Unknown": "Desconocido",
+    "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Visto por %(displayName)s %(userName)s a las %(dateTime)s",
+    "Replying": "Respondiendo",
+    "(~%(count)s results)|other": "(~%(count)s resultados)",
+    "(~%(count)s results)|one": "(~%(count)s resultado)",
+    "Remove avatar": "Eliminar avatar",
+    "Share room": "Compartir sala",
+    "Drop here to favourite": "Soltar aquí para agregar a favoritos",
+    "Drop here to tag direct chat": "Soltar aquí para etiquetar la conversación directa",
+    "Drop here to restore": "Soltar aquí para restaurar",
+    "Community Invites": "Invitaciones a comunidades",
+    "You have no historical rooms": "No tienes salas históricas",
+    "You have been kicked from this room by %(userName)s.": "Has sido expulsado de esta sala por %(userName)s.",
+    "You have been banned from this room by %(userName)s.": "Has sido vetado de esta sala por %(userName)s.",
+    "You are trying to access a room.": "Estás intentando acceder a una sala.",
+    "To change the room's avatar, you must be a": "Para cambiar el avatar de la sala, debe ser un",
+    "To change the room's name, you must be a": "Para cambiar el nombre de la sala, debe ser un",
+    "To change the room's main address, you must be a": "Para cambiar la dirección principal de la sala, debe ser un",
+    "To change the room's history visibility, you must be a": "Para cambiar la visibilidad del historial de la sala, debe ser un",
+    "To change the permissions in the room, you must be a": "Para cambiar los permisos de la sala, debe ser un",
+    "To change the topic, you must be a": "Para cambiar el tema, debe ser un",
+    "To modify widgets in the room, you must be a": "Para modificar los widgets de la sala, debe ser un",
+    "Banned by %(displayName)s": "Vetado por %(displayName)s",
+    "To send messages, you must be a": "Para cambiar mensajes, debe ser un",
+    "To invite users into the room, you must be a": "Para cambiar usuarios a la sala, debe ser un",
+    "To configure the room, you must be a": "Para configurar la sala, debe ser un",
+    "To kick users, you must be a": "Para echar a usuarios, debe ser un",
+    "To ban users, you must be a": "Para vetar usuarios, debes ser un",
+    "To remove other users' messages, you must be a": "Para eliminar los mensajes de otros usuarios, debe ser un",
+    "To notify everyone in the room, you must be a": "Para notificar a todos en la sala, debe ser un",
+    "%(user)s is a %(userRole)s": "%(user)s es un %(userRole)s",
+    "Muted Users": "Usuarios Silenciados",
+    "To send events of type , you must be a": "Para enviar eventos del tipo , debe ser un",
+    "Members only (since the point in time of selecting this option)": "Solo miembros (desde el momento en que se selecciona esta opción)",
+    "Members only (since they were invited)": "Solo miembros (desde que fueron invitados)",
+    "Members only (since they joined)": "Solo miembros (desde que se unieron)",
+    "You don't currently have any stickerpacks enabled": "Actualmente no tienes ningún paquete de pegatinas habilitado",
+    "Add a stickerpack": "Añadir un paquete de pegatinas",
+    "Stickerpack": "Paquete de pegatinas",
+    "Hide Stickers": "Ocultar Pegatinas",
+    "Show Stickers": "Mostrar Pegatinas",
+    "Addresses": "Direcciones",
+    "Invalid community ID": "ID de comunidad inválida",
+    "'%(groupId)s' is not a valid community ID": "'%(groupId)s' no es una ID de comunidad válida",
+    "Flair": "Insignia",
+    "Showing flair for these communities:": "Mostrar insignias de estas comunidades:",
+    "This room is not showing flair for any communities": "Esta sala no está mostrando insignias para ninguna comunidad",
+    "New community ID (e.g. +foo:%(localDomain)s)": "Nueva ID de comunidad (ej. +foo:%(localDomain)s)",
+    "URL previews are enabled by default for participants in this room.": "La vista previa de URL se activa por defecto en los participantes de esta sala.",
+    "URL previews are disabled by default for participants in this room.": "La vista previa se desactiva por defecto para los participantes de esta sala.",
+    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "En salas cifradas, como ésta, la vista previa de la URL se desactivan por defecto para asegurar que el servidor doméstico (donde se generan) no puede recopilar información de los enlaces que vea en esta sala.",
+    "URL Previews": "Vista previa de URL",
+    "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "Cuando alguien pone una URL en su mensaje, una vista previa se mostrará para ofrecer información sobre el enlace, tal como título, descripción, y una imagen del sitio Web.",
+    "Error decrypting audio": "Error al descifrar el sonido",
+    "Error decrypting image": "Error al descifrar imagen",
+    "Error decrypting video": "Error al descifrar video",
+    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s cambió el avatar para %(roomName)s",
+    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s eliminó el avatar de la sala.",
+    "%(senderDisplayName)s changed the room avatar to ": "%(senderDisplayName)s cambió el avatar de la sala a ",
+    "Copied!": "¡Copiado!",
+    "Failed to copy": "Falló la copia",
+    "Add an Integration": "Añadir una Integración",
+    "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Está a punto de ir a un sitio de terceros de modo que pueda autenticar su cuenta para usarla con %(integrationsUrl)s. ¿Desea continuar?",
+    "Removed or unknown message type": "Tipo de mensaje desconocido o eliminado",
+    "Message removed by %(userId)s": "Mensaje eliminado por %(userId)s",
+    "Message removed": "Mensaje eliminado",
+    "Robot check is currently unavailable on desktop - please use a web browser": "La comprobación de robot no está actualmente disponible en escritorio - por favor, use un navegador Web",
+    "This Home Server would like to make sure you are not a robot": "Este Servidor Doméstico quiere asegurarse de que no eres un robot",
+    "Sign in with CAS": "Ingresar con CAS",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.": "Puede usar las opciones personalizadas del servidor para ingresar en otros servidores de Matrix especificando una URL del Servidor Doméstico diferente.",
+    "This allows you to use this app with an existing Matrix account on a different home server.": "Esto le permite usar esta aplicación con una cuenta de Matrix ya existente en un servidor doméstico diferente.",
+    "You can also set a custom identity server but this will typically prevent interaction with users based on email address.": "Puede también usar un servidor de identidad personalizado, pero esto habitualmente evitará la interacción con usuarios mediante dirección de correo electrónico.",
+    "An email has been sent to %(emailAddress)s": "Se envió un correo electrónico a %(emailAddress)s",
+    "Please check your email to continue registration.": "Por favor consulta tu correo electrónico para continuar con el registro.",
+    "Token incorrect": "Token incorrecto",
+    "A text message has been sent to %(msisdn)s": "Se envió un mensaje de texto a %(msisdn)s",
+    "Please enter the code it contains:": "Por favor introduzca el código que contiene:",
+    "Code": "Código",
+    "The email field must not be blank.": "El campo de correo electrónico no debe estar en blanco.",
+    "The user name field must not be blank.": "El campo de nombre de usuario no debe estar en blanco.",
+    "The phone number field must not be blank.": "El campo de número telefónico no debe estar en blanco.",
+    "The password field must not be blank.": "El campo de contraseña no debe estar en blanco.",
+    "Username on %(hs)s": "Nombre de usuario en %(hs)s",
+    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Si no indica una dirección de correo electrónico, no podrá reiniciar su contraseña. ¿Está seguro?",
+    "You are registering with %(SelectedTeamName)s": "Está registrándose con %(SelectedTeamName)s",
+    "Default server": "Servidor por defecto",
+    "Custom server": "Servidor personalizado",
+    "Home server URL": "URL del servidor doméstico",
+    "Identity server URL": "URL del servidor de identidad",
+    "What does this mean?": "¿Qué significa esto?",
+    "Remove from community": "Eliminar de la comunidad",
+    "Disinvite this user from community?": "¿Quitar como invitado a este usuario de la comunidad?",
+    "Remove this user from community?": "¿Eliminar a este usuario de la comunidad?",
+    "Failed to withdraw invitation": "Falló la retirada de la invitación",
+    "Failed to remove user from community": "Falló la eliminación de este usuario de la comunidad",
+    "Filter community members": "Filtrar miembros de la comunidad",
+    "Flair will appear if enabled in room settings": "La insignia aparecerá si se activa en los ajustes de sala",
+    "Flair will not appear": "La insignia no aparecerá",
+    "Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "¿Seguro que quieres eliminar a '%(roomName)s' de %(groupId)s?",
+    "Removing a room from the community will also remove it from the community page.": "Al eliminar una sala de la comunidad también se eliminará de su página.",
+    "Failed to remove room from community": "Falló la eliminación de la sala de la comunidad",
+    "Failed to remove '%(roomName)s' from %(groupId)s": "Falló la eliminación de '%(roomName)s' de %(groupId)s",
+    "The visibility of '%(roomName)s' in %(groupId)s could not be updated.": "La visibilidad de '%(roomName)s' en %(groupId)s no se pudo actualizar.",
+    "Visibility in Room List": "Visibilidad en la Lista de Salas",
+    "Visible to everyone": "Visible a todo el mundo",
+    "Only visible to community members": "Sólo visible a los miembros de la comunidad",
+    "Filter community rooms": "Filtrar salas de la comunidad",
+    "Something went wrong when trying to get your communities.": "Algo fue mal cuando se intentó obtener sus comunidades.",
+    "Display your community flair in rooms configured to show it.": "Muestra la insignia de su comunidad en las salas configuradas a tal efecto.",
+    "You're not currently a member of any communities.": "Actualmente no es miembro de una comunidad.",
+    "Please help improve Riot.im by sending anonymous usage data. This will use a cookie (please see our Cookie Policy).": "Por favor, ayude a mejorar Riot.im enviando información anónima de uso. Esto usará una cookie (por favor, vea nuestra Política de cookies).",
+    "Please help improve Riot.im by sending anonymous usage data. This will use a cookie.": "Por favor, ayude a mejorar Riot.im enviando información anónima de uso. Esto usará una cookie.",
+    "Yes, I want to help!": "Sí, ¡quiero ayudar!",
+    "Unknown Address": "Dirección desconocida",
+    "Warning: This widget might use cookies.": "Advertencia: Este widget puede usar cookies.",
+    "Delete Widget": "Eliminar Componente",
+    "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Al borrar un widget se elimina para todos usuarios de la sala. ¿Está seguro?",
+    "Failed to remove widget": "Falló la eliminación del widget",
+    "An error ocurred whilst trying to remove the widget from the room": "Ocurrió un error mientras se intentaba eliminar el widget de la sala",
+    "Minimize apps": "Minimizar apps",
+    "Reload widget": "Recargar widget",
+    "Popout widget": "Widget en ventana externa",
+    "Picture": "Fotografía",
+    "Unblacklist": "Dejar de Prohibir",
+    "Blacklist": "Prohibir",
+    "Unverify": "Anular Verificación",
+    "Verify...": "Verificar...",
+    "Communities": "Comunidades",
+    "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
+    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s se unieron %(count)s veces",
+    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s se unieron",
+    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s se unió %(count)s veces",
+    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)s se unió",
+    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)s se fueron %(count)s veces",
+    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)s se fueron",
+    "%(oneUser)sleft %(count)s times|other": "%(oneUser)s se fue %(count)s veces",
+    "%(oneUser)sleft %(count)s times|one": "%(oneUser)s salió",
+    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)s se unieron y fueron %(count)s veces",
+    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)s se unieron y fueron",
+    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s se unió y fue %(count)s veces",
+    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)s se unió y fue",
+    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)s se fueron y volvieron a unirse %(count)s veces",
+    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)s se fueron y volvieron a unirse",
+    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s se fue y volvió a unirse %(count)s veces",
+    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s se fue y volvió a unirse",
+    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s rechazó sus invitaciones %(count)s veces",
+    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s rechazó sus invitaciones",
+    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)s rechazó su invitación %(count)s veces",
+    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)s rechazó su invitación",
+    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "%(severalUsers)s se les retiraron sus invitaciones %(count)s veces",
+    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "%(severalUsers)s se les retiraron sus invitaciones",
+    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "%(oneUser)s se le retiró su invitación %(count)s veces",
+    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "%(oneUser)s se les retiraron sus invitaciones",
+    "were invited %(count)s times|other": "fueron invitados %(count)s veces",
+    "were invited %(count)s times|one": "fueron invitados",
+    "was invited %(count)s times|other": "fue invitado %(count)s veces",
+    "was invited %(count)s times|one": "fue invitado",
+    "were banned %(count)s times|other": "fueron vetados %(count)s veces",
+    "were banned %(count)s times|one": "fueron vetados",
+    "was banned %(count)s times|other": "fue vetado %(count)s veces",
+    "was banned %(count)s times|one": "fue vetado",
+    "were unbanned %(count)s times|other": "les quitaron el veto %(count)s veces",
+    "were unbanned %(count)s times|one": "les quitaron el veto",
+    "was unbanned %(count)s times|other": "se le quitó el veto %(count)s veces",
+    "was unbanned %(count)s times|one": "se le quitó el veto",
+    "were kicked %(count)s times|other": "fueron echados %(count)s veces",
+    "were kicked %(count)s times|one": "fueron echados",
+    "was kicked %(count)s times|other": "fue echado %(count)s veces",
+    "was kicked %(count)s times|one": "fue echado",
+    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)s cambiaron su nombre %(count)s veces",
+    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)s cambiaron su nombre",
+    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)s cambió su nombre %(count)s veces",
+    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)s cambió su nombre",
+    "%(severalUsers)schanged their avatar %(count)s times|other": "%(severalUsers)s cambiaron su avatar %(count)s veces",
+    "%(severalUsers)schanged their avatar %(count)s times|one": "%(severalUsers)s cambiaron su avatar",
+    "%(oneUser)schanged their avatar %(count)s times|other": "%(oneUser)s cambió su avatar %(count)s veces",
+    "%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)s cambió su avatar",
+    "%(items)s and %(count)s others|other": "%(items)s y otros %(count)s",
+    "%(items)s and %(count)s others|one": "%(items)s y otro más",
+    "collapse": "colapsar",
+    "expand": "expandir",
+    "Custom of %(powerLevel)s": "Personalizado de %(powerLevel)s",
+    "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "No se pudo cargar el evento al que se respondió, bien porque no existe o no tiene permiso para verlo.",
+    "In reply to ": "En respuesta a  ",
+    "And %(count)s more...|other": "Y %(count)s más...",
+    "ex. @bob:example.com": "ej. @bob:ejemplo.com",
+    "Add User": "Agregar Usuario",
+    "Matrix ID": "ID de Matrix",
+    "Matrix Room ID": "ID de Sala de Matrix",
+    "email address": "dirección de correo electrónico",
+    "You have entered an invalid address.": "No ha introducido una dirección correcta.",
+    "Try using one of the following valid address types: %(validTypesList)s.": "Intente usar uno de los tipos de direcciones válidos: %(validTypesList)s.",
+    "Riot bugs are tracked on GitHub: create a GitHub issue.": "Los fallos de Riot se rastrean en GitHun: crear un suceso en GitHub.",
+    "Start chatting": "Iniciar conversación",
+    "Click on the button below to start chatting!": "¡Haz clic en el botón a continuación para iniciar una conversación!",
+    "Start Chatting": "Iniciar Conversación",
+    "Confirm Removal": "Confirmar Eliminación",
+    "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "¿Está seguro de querer eliminar (borrar) este evento? Tenga en cuenta que si borra el nombre de una sala o cambia el tema, podría deshacer el cambio.",
+    "Community IDs cannot be empty.": "Las IDs de comunidad no pueden estar vacías.",
+    "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Las IDs de comunidad sólo pueden contener caracteres a-z, 0-9, ó '=_-./'",
+    "Something went wrong whilst creating your community": "Algo fue mal mientras se creaba la comunidad",
+    "Create Community": "Crear Comunidad",
+    "Community Name": "Nombre de Comunidad",
+    "Example": "Ejemplo",
+    "Community ID": "ID de Comunidad",
+    "example": "ejemplo",
+    "Create": "Crear",
+    "Advanced options": "Opciones avanzadas",
+    "Block users on other matrix homeservers from joining this room": "Impedir que usuarios de otros servidores domésticos se unan a esta sala",
+    "This setting cannot be changed later!": "¡Este ajuste no se puede cambiar más tarde!",
+    "Failed to indicate account erasure": "Falló la indicación de eliminado de la cuenta",
+    "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. This action is irreversible.": "Esto hará que tu cuenta quede permanentemente inutilizable. No podrás iniciar sesión, y nadie podrá volver a registrar la misma ID de usuario. Esto hará que tu cuenta salga de todas las salas en las cuales participa, y eliminará los datos de tu cuenta de tu servidor de identidad. Esta acción es irreversible.",
+    "Deactivating your account does not by default cause us to forget messages you have sent. If you would like us to forget your messages, please tick the box below.": "Desactivar tu cuenta no hace que por defecto olvidemos los mensajes que has enviado. Si quieres que olvidemos tus mensajes, por favor marca la casilla a continuación.",
+    "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "La visibilidad de mensajes en Matrix es similar a la del correo electrónico. Que olvidemos tus mensajes implica que los mensajes que hayas enviado no se compartirán con ningún usuario nuevo o no registrado, pero aquellos usuarios registrados que ya tengan acceso a estos mensajes seguirán teniendo acceso a su copia.",
+    "Please forget all messages I have sent when my account is deactivated (Warning: this will cause future users to see an incomplete view of conversations)": "Por favor, olvida todos los mensajes enviados al desactivar mi cuenta. (Advertencia: esto provocará que los usuarios futuros vean conversaciones incompletas)",
+    "To continue, please enter your password:": "Para continuar, ingresa tu contraseña por favor:",
+    "password": "contraseña",
+    "To verify that this device can be trusted, please contact its owner using some other means (e.g. in person or a phone call) and ask them whether the key they see in their User Settings for this device matches the key below:": "Para verificar que este dispositivo es confiable, por favor contacta a su dueño por algún otro medio (ej. cara a cara o por teléfono) y pregúntale si la clave que ve en sus Ajustes de Usuario para este dispositivo coincide con la clave a continuación:",
+    "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this device and you probably want to press the blacklist button instead.": "Si coincide, oprime el botón de verificar a continuación. Si no coincide, entonces alguien más está interceptando este dispositivo y probablemente prefieras oprimir el botón de prohibir.",
+    "You added a new device '%(displayName)s', which is requesting encryption keys.": "Añadiste un nuevo dispositivo '%(displayName)s', que está solicitando claves de cifrado.",
+    "Your unverified device '%(displayName)s' is requesting encryption keys.": "Tu dispositivo sin verificar '%(displayName)s' está solicitando claves de cifrado.",
+    "Loading device info...": "Cargando información del dispositivo...",
+    "Encryption key request": "Solicitud de clave de cifrado",
+    "Log out and remove encryption keys?": "¿Cerrar sesión y eliminar claves de cifrado?",
+    "Clear Storage and Sign Out": "Borrar Almacenamiento y Cerrar Sesión",
+    "Send Logs": "Enviar Registros",
+    "Refresh": "Refrescar",
+    "We encountered an error trying to restore your previous session.": "Encontramos un error al intentar restaurar su sesión anterior.",
+    "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.": "Si ha usado anteriormente una versión más reciente de Riot, su sesión puede ser incompatible con ésta. Cierre la ventana y vuelva a la versión más reciente.",
+    "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Limpiando el almacenamiento del navegador puede arreglar el problema, pero le desconectará y cualquier historial de conversación cifrado se volverá ilegible.",
+    "User names may only contain letters, numbers, dots, hyphens and underscores.": "Los nombres de usuario solo pueden contener letras, números, puntos, guiones y guiones bajos.",
+    "Username not available": "Nombre de usuario no disponible",
+    "An error occurred: %(error_string)s": "Ocurrió un error: %(error_string)s",
+    "Username available": "Nombre de usuario disponible",
+    "This will be your account name on the  homeserver, or you can pick a different server.": "Este será el nombre de su cuenta en el  servidor doméstico, o puede elegir un servidor diferente.",
+    "If you already have a Matrix account you can log in instead.": "Si ya tiene una cuenta de Matrix puede conectarse: log in.",
+    "Share Room": "Compartir Sala",
+    "Link to most recent message": "Enlazar a mensaje más reciente",
+    "Share User": "Compartir Usuario",
+    "Share Community": "Compartir Comunidad",
+    "Share Room Message": "Compartir Mensaje de Sala",
+    "Link to selected message": "Enlazar a mensaje seleccionado",
+    "COPY": "COPIAR",
+    "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "Está actualmente prohibiendo dispositivos sin verificar; para enviar mensajes a los mismos deber verificarlos.",
+    "We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "Le recomendamos que efectúe el proceso de verificación con cada dispositivo para confirmar que pertenecen a su propietario legítimo, pero si lo prefiere puede reenviar el mensaje sin verificar.",
+    "\"%(RoomName)s\" contains devices that you haven't seen before.": "\"%(RoomName)s\" contiene dispositivos que no ha visto antes.",
+    "Unknown devices": "Dispositivos desconocidos",
+    "Unable to reject invite": "No se pudo rechazar la invitación",
+    "Share Message": "Compartir mensaje",
+    "Collapse Reply Thread": "Colapsar Hilo de Respuestas",
+    "Topic": "Tema",
+    "Make this room private": "Hacer privada esta sala",
+    "Share message history with new users": "Compartir historial de mensajes con nuevos usuarios",
+    "Encrypt room": "Cifrar sala",
+    "There are no visible files in this room": "No hay archivos visibles en esta sala",
+    "
    HTML for your community's page
    \n
    \n    Use the long description to introduce new members to the community, or distribute\n    some important links\n
    \n
    \n    You can even use 'img' tags\n
    \n": "HTML para la página de tu comunidad. Usa la descripción larga para su presentación, o distribuir enlaces de interés. Puedes incluso usar etiquetas 'img'\n",
+    "Add rooms to the community summary": "Agregar salas al resumen de la comunidad",
+    "Which rooms would you like to add to this summary?": "¿Cuáles salas desea agregar a este resumen?",
+    "Add to summary": "Agregar a resumen",
+    "Failed to add the following rooms to the summary of %(groupId)s:": "Falló la agregación de las salas siguientes al resumen de %(groupId)s:",
+    "Add a Room": "Agregar una Sala",
+    "Failed to remove the room from the summary of %(groupId)s": "Falló la eliminación de la sala del resumen de %(groupId)s",
+    "The room '%(roomName)s' could not be removed from the summary.": "La sala '%(roomName)s' no se pudo eliminar del resumen.",
+    "Add users to the community summary": "Agregar usuario al resumen de la comunidad",
+    "Who would you like to add to this summary?": "¿A quién le gustaría agregar a este resumen?",
+    "Failed to add the following users to the summary of %(groupId)s:": "Falló la adición de los usuarios siguientes al resumen de %(groupId)s:",
+    "Add a User": "Agregar un usuario",
+    "Failed to remove a user from the summary of %(groupId)s": "Falló la eliminación de un usuario del resumen de %(groupId)s",
+    "The user '%(displayName)s' could not be removed from the summary.": "No se pudo eliminar al usuario '%(displayName)s' del resumen.",
+    "Failed to upload image": "No se pudo cargar la imagen",
+    "Failed to update community": "Falló la actualización de la comunidad",
+    "Unable to accept invite": "No se pudo aceptar la invitación",
+    "Unable to join community": "No se pudo unir a comunidad",
+    "Leave Community": "Salir de la Comunidad",
+    "Leave %(groupName)s?": "¿Salir de %(groupName)s?",
+    "Unable to leave community": "No se pudo abandonar la comunidad",
+    "Community Settings": "Ajustes de Comunidad",
+    "Changes made to your community name and avatar might not be seen by other users for up to 30 minutes.": "Las modificaciones realizadas al nombre y avatar de la comunidad pueden no mostrarse a otros usuarios hasta dentro de 30 minutos.",
+    "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "Estas salas se muestran a los miembros de la comunidad en la página de la misma. Los miembros pueden unirse a las salas pulsando sobre ellas.",
+    "Featured Rooms:": "Salas destacadas:",
+    "Featured Users:": "Usuarios destacados:",
+    "%(inviter)s has invited you to join this community": "%(inviter)s te invitó a unirte a esta comunidad",
+    "Join this community": "Unirse a esta comunidad",
+    "Leave this community": "Salir de esta comunidad",
+    "You are an administrator of this community": "Usted es un administrador de esta comunidad",
+    "You are a member of this community": "Usted es un miembro de esta comunidad",
+    "Who can join this community?": "¿Quién puede unirse a esta comunidad?",
+    "Everyone": "Todo el mundo",
+    "Your community hasn't got a Long Description, a HTML page to show to community members.
    Click here to open settings and give it one!": "Su comunidad no tiene una descripción larga, una página HTML para mostrar a sus miembros.
    Pulse aquí para abrir los ajustes y definirla",
+    "Long Description (HTML)": "Descripción Larga (HTML)",
+    "Description": "Descripción",
+    "Community %(groupId)s not found": "No se encontraron %(groupId)s de la comunidad",
+    "This Home server does not support communities": "Este Servidor Doméstico no soporta comunidades",
+    "Failed to load %(groupId)s": "Falló la carga de %(groupId)s",
+    "This room is not public. You will not be able to rejoin without an invite.": "Esta sala no es pública. No podrá volver a unirse sin una invitación.",
+    "Can't leave Server Notices room": "No puede abandonar la sala Avisos del Servidor",
+    "This room is used for important messages from the Homeserver, so you cannot leave it.": "La sala se usa para mensajes importantes del Servidor Doméstico, así que no puede abandonarla.",
+    "Terms and Conditions": "Términos y condiciones",
+    "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Para continuar usando el servidor doméstico %(homeserverDomain)s debe revisar y estar de acuerdo con nuestros términos y condiciones.",
+    "Review terms and conditions": "Revisar términos y condiciones",
+    "Old cryptography data detected": "Se detectó información de criptografía antigua",
+    "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Se detectó una versión más antigua de Riot. Esto habrá provocado que la criptografía de extremo a extremo funcione incorrectamente en la versión más antigua. Los mensajes cifrados de extremo a extremo intercambiados recientemente mientras usaba la versión más antigua puede que no sean descifrables con esta versión. Esto también puede hacer que  fallen con la más reciente. Si experimenta problemas, desconecte y vuelva a ingresar. Para conservar el historial de mensajes, exporte y vuelva a importar sus claves.",
+    "Your Communities": "Sus Comunidades",
+    "Did you know: you can use communities to filter your Riot.im experience!": "Sabía que: puede usar comunidades para filtrar su experiencia con Riot.im",
+    "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Para configurar un filtro, arrastre un avatar de comunidad sobre el panel de filtro en la parte izquierda de la pantalla. Puede pulsar sobre un avatar en el panel de filtro en cualquier momento para ver solo las salas y personas asociadas con esa comunidad.",
+    "Error whilst fetching joined communities": "Error al recuperar las comunidades a las que estás unido",
+    "Create a new community": "Crear una comunidad nueva",
+    "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Crear una comunidad para agrupar usuarios y salas. Construye una página de inicio personalizada para destacarla.",
+    "Show devices, send anyway or cancel.": "Mostrar dispositivos, enviar de todos modos o cancelar.",
+    "You can't send any messages until you review and agree to our terms and conditions.": "No puede enviar ningún mensaje hasta que revise y esté de acuerdo con nuestros términos y condiciones.",
+    "%(count)s of your messages have not been sent.|one": "No se envió su mensaje.",
+    "%(count)s Resend all or cancel all now. You can also select individual messages to resend or cancel.|other": "Reenviar todo o cancelar todo ahora. También puedes seleccionar mensajes individuales para reenviar o cancelar.",
+    "%(count)s Resend all or cancel all now. You can also select individual messages to resend or cancel.|one": "Reenviar mensaje o cancelar mensaje ahora.",
+    "Connectivity to the server has been lost.": "Se perdió la conexión con el servidor.",
+    "Sent messages will be stored until your connection has returned.": "Los mensajes enviados se almacenarán hasta que vuelva su conexión.",
+    "Active call": "Llamada activa",
+    "There's no one else here! Would you like to invite others or stop warning about the empty room?": "¡No hay nadie aquí! ¿Le gustaría invitar a otros o dejar de advertir sobre la sala vacía?",
+    "Room": "Sala",
+    "Clear filter": "Borrar filtro",
+    "Light theme": "Tema claro",
+    "Dark theme": "Tema oscuro",
+    "Status.im theme": "Tema Status.im",
+    "Autocomplete Delay (ms):": "Retraso del completado automático (en ms):",
+    "Ignored Users": "Usuarios Ignorados",
+    "Debug Logs Submission": "Envío de registros para depuración",
+    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Si has enviado un error a GitHub, estos registros pueden ayudar a localizar el problema. Contienen información de uso de la aplicación, incluido el nombre de usuario, IDs o alias de las salas o grupos visitados y los nombres de otros usuarios. No contienen mensajes.",
+    "Riot collects anonymous analytics to allow us to improve the application.": "Riot recopila análisis de estadísticas anónimas para permitirnos mejorar la aplicación.",
+    "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "La privacidad es importante, por lo que no se recopila información personal o identificable en los análisis de estadísticas.",
+    "Learn more about how we use analytics.": "Más información sobre el uso de los análisis de estadísticas.",
+    "Updates": "Actualizaciones",
+    "Check for update": "Comprobar actualizaciones",
+    "Desktop specific": "Específico del escritorio",
+    "Start automatically after system login": "Iniciar automáticamente después de ingresar en el sistema",
+    "No Audio Outputs detected": "No se detectaron Salidas de Sonido",
+    "Audio Output": "Salida de Sonido",
+    "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "Se envió un correo electrónico a %(emailAddress)s. Una vez hayas seguido el enlace que contiene, haz clic a continuación.",
+    "Please note you are logging into the %(hs)s server, not matrix.org.": "Por favor, tenga en cuenta que está ingresando en el servidor %(hs)s, no en matrix.org.",
+    "This homeserver doesn't offer any login flows which are supported by this client.": "Este servidor doméstico no ofrece flujos de ingreso soportados por este cliente.",
+    "Try the app first": "Probar primero la app",
+    "Sign in to get started": "Ingresar para comenzar",
+    "Set a display name:": "Establece un nombre público:",
+    "Upload an avatar:": "Subir un avatar:",
+    "This server does not support authentication with a phone number.": "Este servidor no soporta autenticación mediante número telefónico.",
+    "Missing password.": "Falta la contraseña.",
+    "Passwords don't match.": "Las contraseñas no coinciden.",
+    "Password too short (min %(MIN_PASSWORD_LENGTH)s).": "Contraseña demasiado corta (mínimo %(MIN_PASSWORD_LENGTH)s).",
+    "This doesn't look like a valid email address.": "Esto no parece ser una dirección de correo electrónico válida.",
+    "This doesn't look like a valid phone number.": "Esto no parece ser un número telefónico válido.",
+    "An unknown error occurred.": "Ocurrió un error desconocido.",
+    "I already have an account": "Ya tengo una cuenta",
+    "Notify the whole room": "Notificar a toda la sala",
+    "Room Notification": "Notificación de Salas",
+    "This process allows you to export the keys for messages you have received in encrypted rooms to a local file. You will then be able to import the file into another Matrix client in the future, so that client will also be able to decrypt these messages.": "Este proceso le permite exportar las claves para los mensajes que haya recibido en salas cifradas a un fichero local. Entonces podrá importar el fichero en otro cliente de Matrix en el futuro, de modo que dicho cliente será capaz de descifrar dichos mensajes.",
+    "The exported file will allow anyone who can read it to decrypt any encrypted messages that you can see, so you should be careful to keep it secure. To help with this, you should enter a passphrase below, which will be used to encrypt the exported data. It will only be possible to import the data by using the same passphrase.": "El fichero exportado permitirá a cualquier persona que pueda leerlo la tarea de descifrar todo mensaje cifrado que usted pueda ver, así que debe ser cuidadoso en mantenerlo seguro. Para ayudarle, debería introducir una contraseña debajo, la cual usará para cifrar la información exportada. Sólo será posible importar dicha información usando la misma contraseña.",
+    "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "Este proceso permite importar claves de cifrado que había exportado previamente desde otro cliente de Matrix. Entonces será capaz de descifrar todos los mensajes que el otro cliente así hacía.",
+    "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "El fichero de exportación se protegerá con una contraseña. Debería introducir aquí la contraseña para descifrar el fichero.",
+    "Internal room ID: ": "ID interno de la sala: ",
+    "Room version number: ": "Número de versión de la sala: ",
+    "There is a known vulnerability affecting this room.": "Hay una vulnerabilidad conocida que afecta a esta sala.",
+    "This room version is vulnerable to malicious modification of room state.": "La versión de esta sala es vulnerable a la modificación maliciosa de su estado.",
+    "Click here to upgrade to the latest room version and ensure room integrity is protected.": "Pulse aquí para actualizar a la última versión de la sala y garantizar que se protege su integridad.",
+    "Only room administrators will see this warning": "Sólo los administradores de la sala verán esta advertencia",
+    "Please contact your service administrator to continue using the service.": "Por favor, contacta al administrador de tu servicio para continuar utilizando el servicio.",
+    "This homeserver has hit its Monthly Active User limit.": "Este servidor doméstico ha alcanzado su límite Mensual de Usuarios Activos.",
+    "This homeserver has exceeded one of its resource limits.": "Este servidor doméstico ha excedido uno de sus límites de recursos.",
+    "Please contact your service administrator to get this limit increased.": "Por favor, contacta al administrador de tu servicio para aumentar este límite.",
+    "This homeserver has hit its Monthly Active User limit so some users will not be able to log in.": "Este servidor doméstico ha alcanzado su límite Mensual de Usuarios Activos, por lo que algunos usuarios no podrán iniciar sesión.",
+    "This homeserver has exceeded one of its resource limits so some users will not be able to log in.": "Este servidor doméstico ha excedido uno de sus límites de recursos, por lo que algunos usuarios no podrán iniciar sesión.",
+    "Upgrade Room Version": "Actualizar Versión de la Sala",
+    "Upgrading this room requires closing down the current instance of the room and creating a new room it its place. To give room members the best possible experience, we will:": "La actualización esta sala requiere cerrar la instancia actual de la misma y crear una nueva en su lugar. Para ofrecer a los miembros de la sala la mejor experiencia posible, haremos:",
+    "Create a new room with the same name, description and avatar": "Crear una sala nueva con el mismo nombre, descripción y avatar",
+    "Update any local room aliases to point to the new room": "Actualizar los alias locales de la sala para que apunten a la nueva",
+    "Stop users from speaking in the old version of the room, and post a message advising users to move to the new room": "Impedir a los usuarios que conversen en la versión antigua de la sala, y publicar un mensaje aconsejándoles que se muden a la nueva",
+    "Put a link back to the old room at the start of the new room so people can see old messages": "Poner un enlace de retorno a la sala antigua al principio de la nueva de modo que se puedan ver los mensajes viejos",
+    "Your message wasn't sent because this homeserver has hit its Monthly Active User Limit. Please contact your service administrator to continue using the service.": "Tu mensaje no se envió porque este servidor doméstico ha alcanzado su Límite Mensual de Usuarios Activos. Por favor, contacta al administrador de tu servicio para continuar utilizando el servicio.",
+    "Your message wasn't sent because this homeserver has exceeded a resource limit. Please contact your service administrator to continue using the service.": "Su mensaje no se envió porque este servidor doméstico ha excedido un límite de recursos. Por favor contacta al administrador de tu servicio para continuar utilizando el servicio.",
+    "Please contact your service administrator to continue using this service.": "Por favor, contacta al administrador de tu servicio para continuar utilizando este servicio.",
+    "Increase performance by only loading room members on first view": "Incrementar el rendimiento cargando sólo los miembros de la sala en la primera vista",
+    "Lazy loading members not supported": "No se admite la carga diferida de miembros",
+    "Lazy loading is not supported by your current homeserver.": "La carga lenta no está soportada por su servidor doméstico actual.",
+    "System Alerts": "Alertas de Sistema",
+    "Forces the current outbound group session in an encrypted room to be discarded": "Obliga a que la sesión de salida grupal actual en una sala cifrada se descarte",
+    "Error Discarding Session": "Error al Descartar la Sesión",
+    "Sorry, your homeserver is too old to participate in this room.": "Lo sentimos, tu servidor doméstico es demasiado antiguo para participar en esta sala.",
+    "Please contact your homeserver administrator.": "Por favor contacta al administrador de tu servidor doméstico.",
+    "This room has been replaced and is no longer active.": "Esta sala ha sido reemplazada y ya no está activa.",
+    "The conversation continues here.": "La conversación continúa aquí.",
+    "Upgrade room to version %(ver)s": "Actualiza la sala a la versión %(ver)s",
+    "This room is a continuation of another conversation.": "Esta sala es una continuación de otra conversación.",
+    "Click here to see older messages.": "Haz clic aquí para ver mensajes más antiguos.",
+    "Failed to upgrade room": "No se pudo actualizar la sala",
+    "The room upgrade could not be completed": "La actualización de la sala no pudo ser completada",
+    "Upgrade this room to version %(version)s": "Actualiza esta sala a la versión %(version)s",
+    "Legal": "Legal",
+    "Unable to connect to Homeserver. Retrying...": "No es posible conectarse al Servidor Doméstico. Volviendo a intentar..."
 }
diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 1abaec65c7..96ea482e08 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -46,7 +46,7 @@
     "New password": "Pasahitz berria",
     "User name": "Erabiltzaile-izena",
     "Email address": "E-mail helbidea",
-    "Email address (optional)": "E-mail helbidea (aukerazkoa)",
+    "Email address (optional)": "E-mail helbidea (aukerakoa)",
     "Confirm your new password": "Berretsi zure pasahitza",
     "This Home Server would like to make sure you are not a robot": "Hasiera zerbitzari honek robot bat ez zarela egiaztatu nahi du",
     "I have verified my email address": "Nire e-mail helbidea baieztatu dut",
@@ -138,7 +138,7 @@
     "Hangup": "Eseki",
     "Homeserver is": "Hasiera zerbitzaria:",
     "Identity Server is": "Identitate zerbitzaria:",
-    "Mobile phone number (optional)": "Mugikor zenbakia (aukerazkoa)",
+    "Mobile phone number (optional)": "Mugikor zenbakia (aukerakoa)",
     "Moderator": "Moderatzailea",
     "Account": "Kontua",
     "Access Token:": "Sarbide tokena:",
@@ -157,7 +157,7 @@
     "Microphone": "Mikrofonoa",
     "Camera": "Kamera",
     "Hide removed messages": "Ezkutatu kendutako mezuak",
-    "Alias (optional)": "Ezizena (aukerazkoa)",
+    "Alias (optional)": "Ezizena (aukerakoa)",
     "%(names)s and %(lastPerson)s are typing": "%(names)s eta %(lastPerson)s idazten ari dira",
     "An error has occurred.": "Errore bat gertatu da.",
     "Are you sure?": "Ziur zaude?",
@@ -359,7 +359,7 @@
     "riot-web version:": "riot-web bertsioa:",
     "Room %(roomId)s not visible": "%(roomId)s gela ez dago ikusgai",
     "Room Colour": "Gelaren kolorea",
-    "Room name (optional)": "Gelaren izena (aukerazkoa)",
+    "Room name (optional)": "Gelaren izena (aukerakoa)",
     "%(roomName)s does not exist.": "Ez dago %(roomName)s izeneko gela.",
     "%(roomName)s is not accessible at this time.": "%(roomName)s ez dago eskuragarri orain.",
     "Scroll to bottom of page": "Korritu orria behera arte",
@@ -566,7 +566,7 @@
     "To continue, please enter your password.": "Jarraitzeko sartu zure pasahitza.",
     "To verify that this device can be trusted, please contact its owner using some other means (e.g. in person or a phone call) and ask them whether the key they see in their User Settings for this device matches the key below:": "Gailu hau fidagarria dela egiaztatzeko, kontaktatu bere jabea beste medio bat erabiliz (adib. aurrez aurre edo telefonoz deituz) eta galdetu beraien erabiltzaile-ezarpenetan bere gailurako ikusten duen gakoa hemen beheko bera den:",
     "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this device and you probably want to press the blacklist button instead.": "Bat badator sakatu egiaztatu botoia. Bat ez badator, beste inor gailu hau atzematen dago eta blokeatu beharko zenuke.",
-    "In future this verification process will be more sophisticated.": "etorkizunean egiaztaketa metodoa hobetuko da.",
+    "In future this verification process will be more sophisticated.": "Etorkizunean egiaztaketa metodo hau hobetuko da.",
     "Unable to restore session": "Ezin izan da saioa berreskuratu",
     "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.": "Aurretik Riot bertsio berriago bat erabili baduzu, zure saioa bertsio honekin bateraezina izan daiteke. Itxi leiho hau eta itzuli bertsio berriagora.",
     "We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "Gailu bakoitzaren egiaztaketa prozesua jarraitzea aholkatzen dizugu, benetako jabeari dagozkiela baieztatzeko, baina mezua egiaztatu gabe birbidali dezakezu ere.",
@@ -952,7 +952,7 @@
     "Your identity server's URL": "Zure identitate zerbitzariaren URL-a",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(fullYear)s(e)ko %(monthName)sk %(day)sa",
     "This room is not public. You will not be able to rejoin without an invite.": "Gela hau ez da publikoa. Ezin izango zara berriro elkartu gonbidapenik gabe.",
-    "Community IDs cannot not be empty.": "Komunitate ID-ak ezin dira hutsik egon.",
+    "Community IDs cannot be empty.": "Komunitate ID-ak ezin dira hutsik egon.",
     "Show devices, send anyway or cancel.": "Erakutsi gailuak, bidali hala ere edo ezeztatu.",
     "In reply to ": "honi erantzunez: ",
     "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s erabiltzaileak bere pantaila izena aldatu du %(displayName)s izatera.",
@@ -1195,5 +1195,87 @@
     "COPY": "KOPIATU",
     "Share Message": "Partekatu mezua",
     "No Audio Outputs detected": "Ez da audio irteerarik antzeman",
-    "Audio Output": "Audio irteera"
+    "Audio Output": "Audio irteera",
+    "Jitsi Conference Calling": "Jitsi konferentzia deia",
+    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "Zifratutako gelatan, honetan esaterako, URL-en aurrebistak lehenetsita desgaituta daude zure hasiera-zerbitzariak gela honetan ikusten dituzun estekei buruzko informaziorik jaso ez dezan, hasiera-zerbitzarian sortzen baitira aurrebistak.",
+    "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "Norbaitek mezu batean URL bat jartzen duenean, URL aurrebista bat erakutsi daiteke estekaren informazio gehiago erakusteko, adibidez webgunearen izenburua, deskripzioa eta irudi bat.",
+    "The email field must not be blank.": "E-mail eremua ezin da hutsik laga.",
+    "The user name field must not be blank.": "Erabiltzaile-izen eremua ezin da hutsik laga.",
+    "The phone number field must not be blank.": "Telefono zenbakia eremua ezin da hutsik laga.",
+    "The password field must not be blank.": "Pasahitza eremua ezin da hutsik laga.",
+    "Call in Progress": "Deia abian",
+    "A call is already in progress!": "Badago dei bat abian!",
+    "You have no historical rooms": "Ez duzu gelen historialik",
+    "You can't send any messages until you review and agree to our terms and conditions.": "Ezin duzu mezurik bidali gure termino eta baldintzak irakurri eta onartu arte.",
+    "Show empty room list headings": "Erakutsi gela hutsen zerrenda-goiburuak",
+    "Demote yourself?": "Jaitsi zure burua mailaz?",
+    "Demote": "Jaitzi mailaz",
+    "A conference call could not be started because the intgrations server is not available": "Ezin izan da konferentzia dei bat hasi integrazio zerbitzaria ez dagoelako eskuragarri",
+    "A call is currently being placed!": "Dei bat ezartzen ari da orain!",
+    "Permission Required": "Baimena beharrezkoa",
+    "You do not have permission to start a conference call in this room": "Ez duzu baimenik konferentzia dei bat hasteko gela honetan",
+    "This event could not be displayed": "Ezin izan da gertakari hau bistaratu",
+    "deleted": "ezabatuta",
+    "underlined": "azpimarratuta",
+    "inline-code": "lineako kodea",
+    "block-quote": "aipamen blokea",
+    "bulleted-list": "buletdun zerrenda",
+    "numbered-list": "zenbakidun zerrenda",
+    "Failed to remove widget": "Huts egin du trepeta kentzean",
+    "An error ocurred whilst trying to remove the widget from the room": "Trepeta gelatik kentzen saiatzean errore bat gertatu da",
+    "This homeserver has hit its Monthly Active User limit. Please contact your service administrator to continue using the service.": "Hasiera zerbitzari honek bere hilabeteko erabiltzaile aktiboen muga jo du. Jarri kontaktuan zerbitzuaren administratzailearekin zerbitzua erabiltzen jarraitzeko.",
+    "Your message wasn’t sent because this homeserver has hit its Monthly Active User Limit. Please contact your service administrator to continue using the service.": "Zure mezua ez da bidali hasiera zerbitzari honek bere hilabeteko erabiltzaile aktiboen muga jo duelako. Jarri kontaktuan zerbitzuaren administratzailearekin zerbitzua erabiltzen jarraitzeko.",
+    "This homeserver has hit its Monthly Active User limit": "Hasiera zerbitzari honek bere hilabeteko erabiltzaile aktiboen muga jo du",
+    "Please contact your service administrator to continue using this service.": "Jarri kontaktuan zerbitzuaren administratzailearekin zerbitzua erabiltzen jarraitzeko.",
+    "System Alerts": "Sistemaren alertak",
+    "Internal room ID: ": "Gelaren barne IDa: ",
+    "Room version number: ": "Gelaren bertsio zenbakia: ",
+    "This homeserver has hit its Monthly Active User limit. Please contact your service administrator to continue using the service.": "Hasiera zerbitzari honek hileko erabiltzaile aktiboen muga jo du. Jarri zerbitzuaren administratzailearekin kontaktuan zerbitzua erabiltzen jarraitzeko.",
+    "This homeserver has hit its Monthly Active User limit so some users will not be able to log in. Please contact your service administrator to get this limit increased.": "Hasiera zerbitzari honek hileko erabiltzaile aktiboen muga jo du eta ezin izango duzu saioa hasi. Jarri zerbitzuaren administratzailearekin kontaktuan muga hau handitu dezan.",
+    "Sorry, your homeserver is too old to participate in this room.": "Zure hasiera-zerbitzaria zaharregia da gela honetan parte hartzeko.",
+    "Please contact your homeserver administrator.": "Jarri zure hasiera-zerbitzariaren administratzailearekin kontaktuan.",
+    "Increase performance by only loading room members on first view": "Hobetu errendimendua gelako kideak lehen ikustaldian  besterik ez kargatuz",
+    "This room has been replaced and is no longer active.": "Gela hau ordeztu da eta ez dago aktibo jada.",
+    "The conversation continues here.": "Elkarrizketak hemen darrai.",
+    "Upgrade room to version %(ver)s": "Eguneratu gela %(ver)s bertsiora",
+    "There is a known vulnerability affecting this room.": "Gela honi eragiten dion ahulezia ezagun bat dago.",
+    "This room version is vulnerable to malicious modification of room state.": "Gela bertsio honek gelaren egoera gaiztoki aldatzea baimentzen duen ahulezia bat du.",
+    "Click here to upgrade to the latest room version and ensure room integrity is protected.": "Sakatu hemen gela azken bertsiora eguneratzeko eta gelaren osotasuna babestuta dagoela egiaztatzeko.",
+    "Only room administrators will see this warning": "Gelaren administratzaileek besterik ez dute abisu hau ikusiko",
+    "This room is a continuation of another conversation.": "Gela hau aurreko elkarrizketa baten jarraipena da.",
+    "Click here to see older messages.": "Egin klik hemen mezu zaharrak ikusteko.",
+    "Please contact your service administrator to continue using the service.": "Jarri kontaktuan zerbitzuaren administratzailearekin zerbitzu hau erabiltzen jarraitzeko.",
+    "This homeserver has hit its Monthly Active User limit.": "Hasiera zerbitzari honek bere hilabeteko erabiltzaile aktiboen muga gainditu du.",
+    "This homeserver has exceeded one of its resource limits.": "Hasiera zerbitzari honek bere baliabide mugetako bat gainditu du.",
+    "Please contact your service administrator to get this limit increased.": "Jarri kontaktuan zerbitzuaren administratzailearekin muga hau areagotzeko.",
+    "This homeserver has hit its Monthly Active User limit so some users will not be able to log in.": "Hasiera zerbitzari honek hilabeteko erabiltzaile aktiboen muga jo du erabiltzaile batzuk ezin izango dute saioa hasi.",
+    "This homeserver has exceeded one of its resource limits so some users will not be able to log in.": "Hasiera zerbitzari honek bere baliabide mugetako bat jo du erabiltzaile batzuk ezin izango dute saioa hasi.",
+    "Failed to upgrade room": "Huts egin du gela eguneratzea",
+    "The room upgrade could not be completed": "Ezin izan da gelaren eguneraketa osatu",
+    "Upgrade this room to version %(version)s": "Eguneratu gela hau %(version)s bertsiora",
+    "Upgrade Room Version": "Eguneratu gelaren bertsioa",
+    "Upgrading this room requires closing down the current instance of the room and creating a new room it its place. To give room members the best possible experience, we will:": "Gela hau eguneratzeak instantzian uneko gela itxi eta berri bat sortzea dakar. Erabiltzaileei ahalik eta esperientzia onena emateko hau egingo dugu:",
+    "Create a new room with the same name, description and avatar": "Izen, deskripzio eta abatar bereko beste gela bat sortu",
+    "Update any local room aliases to point to the new room": "Tokiko gelaren ezizen guztiak gela berrira apuntatu ditzaten eguneratu",
+    "Stop users from speaking in the old version of the room, and post a message advising users to move to the new room": "Erabiltzaileei gelaren bertsio zaharrean hitz egiten jarraitzea eragotzi, eta erabiltzaileei gela berrira mugitzea aholkatzeko mezu bat bidali",
+    "Put a link back to the old room at the start of the new room so people can see old messages": "Gela berriaren hasieran gela zaharrera esteka bat jarri jendeak mezu zaharrak ikus ditzan",
+    "Your message wasn't sent because this homeserver has hit its Monthly Active User Limit. Please contact your service administrator to continue using the service.": "Zure mezua ez da bidali zure hasiera zerbitzariak hilabeteko erabiltzaile aktiboen muga jo duelako. Jarri kontaktuan zerbitzuaren administratzailearekin zerbitzua erabiltzen jarraitzeko.",
+    "Your message wasn't sent because this homeserver has exceeded a resource limit. Please contact your service administrator to continue using the service.": "Zure mezua ez da bidali zure hasiera zerbitzariak baliabide mugaren bat jo duelako. Jarri kontaktuan zerbitzuaren administratzailearekin zerbitzua erabiltzen jarraitzeko.",
+    "Lazy loading members not supported": "Kideen karga alferrerako euskarririk ez",
+    "Lazy loading is not supported by your current homeserver.": "Zure hasiera zerbitzariak ez du onartzen karga alferra.",
+    "Legal": "Legezkoa",
+    "Please contact your service administrator to continue using this service.": "Jarri kontaktuan zerbitzuaren administratzailearekin zerbitzu hau erabiltzen jarraitzeko.",
+    "Forces the current outbound group session in an encrypted room to be discarded": "Uneko irteerako talde saioa zifratutako gela batean baztertzera behartzen du",
+    "Error Discarding Session": "Errorea saioa baztertzean",
+    "Registration Required": "Erregistratzea ezinbestekoa da",
+    "You need to register to do this. Would you like to register now?": "Hau egiteko erregistratu egin behar zara. Orain erregistratu nahi duzu?",
+    "Unable to connect to Homeserver. Retrying...": "Ezin izan da hasiera zerbitzarira konektatu. Berriro saiatzen...",
+    "Unable to query for supported registration methods": "Ezin izan da onartutako erregistratze metodoei buruz itaundu",
+    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|one": "%(senderName)s erabiltzaileak %(addedAddresses)s gehitu du gelako helbide gisa.",
+    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|other": "%(senderName)s erabiltzaileak %(addedAddresses)s helbideak gehitu dizkio gela honi.",
+    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|one": "%(senderName)s erabiltzileak %(removedAddresses)s helbideak kendu ditu gela honetatik.",
+    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|other": "%(senderName)s erabiltzaileak %(removedAddresses)s helbideak kendu ditu gela honetatik.",
+    "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.": "%(senderName)s erabiltzaileak %(addedAddresses)s helbideak gehitu eta %(removedAddresses)s helbideak kendu ditu gela honetatik.",
+    "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s erabiltzileak %(address)s ezarri du gela honetako helbide nagusi gisa.",
+    "%(senderName)s removed the main address for this room.": "%(senderName)s erabiltzaileak gela honen helbide nagusia kendu du."
 }
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 8843ad89ca..947a3227e3 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -857,7 +857,7 @@
     "This Home server does not support communities": "Ce serveur d'accueil ne prend pas en charge les communautés",
     "Failed to load %(groupId)s": "Échec du chargement de %(groupId)s",
     "Your Communities": "Vos communautés",
-    "You're not currently a member of any communities.": "Vous n'ếtes actuellement membre d'aucune communauté.",
+    "You're not currently a member of any communities.": "Vous n'êtes actuellement membre d'aucune communauté.",
     "Error whilst fetching joined communities": "Erreur lors de l'obtention des communautés rejointes",
     "Create a new community": "Créer une nouvelle communauté",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Créez une communauté pour grouper des utilisateurs et des salons ! Construisez une page d'accueil personnalisée pour distinguer votre espace dans l'univers Matrix.",
@@ -883,7 +883,7 @@
     "Show these rooms to non-members on the community page and room list?": "Afficher ces salons aux non-membres sur la page de communauté et la liste des salons ?",
     "Sign in to get started": "Connectez-vous pour commencer",
     "Status.im theme": "Thème Status.im",
-    "Please note you are logging into the %(hs)s server, not matrix.org.": "Veuillez noter que vous vous connecter au serveur %(hs)s, pas à matrix.org.",
+    "Please note you are logging into the %(hs)s server, not matrix.org.": "Veuillez noter que vous vous connectez au serveur %(hs)s, pas à matrix.org.",
     "Username on %(hs)s": "Nom d'utilisateur sur %(hs)s",
     "Restricted": "Restreint",
     "Custom of %(powerLevel)s": "Personnalisé de %(powerLevel)s",
@@ -907,7 +907,7 @@
     "Delete %(count)s devices|other": "Supprimer %(count)s appareils",
     "Select devices": "Sélectionner les appareils",
     "Something went wrong when trying to get your communities.": "Une erreur est survenue lors de l'obtention de vos communautés.",
-    "This homeserver doesn't offer any login flows which are supported by this client.": "Ce serveur d'accueil n'offre aucun flux compatible avec ce client.",
+    "This homeserver doesn't offer any login flows which are supported by this client.": "Ce serveur d'accueil n'offre aucune méthode d'identification compatible avec ce client.",
     "Flair": "Badge",
     "Showing flair for these communities:": "Ce salon affichera les badges pour ces communautés :",
     "This room is not showing flair for any communities": "Ce salon n'affiche de badge pour aucune communauté",
@@ -952,7 +952,7 @@
     "Your identity server's URL": "L'URL de votre serveur d'identité",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s %(day)s %(monthName)s %(fullYear)s",
     "This room is not public. You will not be able to rejoin without an invite.": "Ce salon n'est pas public. Vous ne pourrez pas y revenir sans invitation.",
-    "Community IDs cannot not be empty.": "Les identifiants de communauté ne peuvent pas être vides.",
+    "Community IDs cannot be empty.": "Les identifiants de communauté ne peuvent pas être vides.",
     "Show devices, send anyway or cancel.": "Afficher les appareils, envoyer quand même ou annuler.",
     "In reply to ": "En réponse à ",
     "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s a changé son nom affiché en %(displayName)s.",
@@ -1087,7 +1087,7 @@
     "Downloading update...": "Mise à jour en cours de téléchargement...",
     "State Key": "Clé d'état",
     "Failed to send custom event.": "Échec de l'envoi de l'événement personnalisé.",
-    "What's new?": "Nouveautés ?",
+    "What's new?": "Nouveautés",
     "Notify me for anything else": "Me notifier pour tout le reste",
     "View Source": "Voir la source",
     "Can't update user notification settings": "Impossible de mettre à jour les paramètres de notification de l'utilisateur",
@@ -1158,7 +1158,7 @@
     "Unable to reply": "Impossible de répondre",
     "At this time it is not possible to reply with an emote.": "Pour le moment il n'est pas possible de répondre avec un émoji.",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Impossible de charger l'événement auquel il a été répondu, soit il n'existe pas, soit vous n'avez pas l'autorisation de le voir.",
-    "Collapse Reply Thread": "Dévoiler le fil de réponse",
+    "Collapse Reply Thread": "Masquer le fil de réponse",
     "Enable widget screenshots on supported widgets": "Activer les captures d'écran des widgets pris en charge",
     "Send analytics data": "Envoyer les données analytiques",
     "Muted Users": "Utilisateurs ignorés",
@@ -1175,7 +1175,7 @@
     "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "La visibilité des messages dans Matrix est la même que celle des e-mails. Quand nous oublions vos messages, cela signifie que les messages que vous avez envoyés ne seront partagés avec aucun nouvel utilisateur ou avec les utilisateurs non enregistrés, mais les utilisateurs enregistrés qui ont déjà eu accès à ces messages en conserveront leur propre copie.",
     "Please forget all messages I have sent when my account is deactivated (Warning: this will cause future users to see an incomplete view of conversations)": "Veuillez oublier tous les messages que j'ai envoyé quand mon compte sera désactivé (Avertissement : les futurs utilisateurs verront des conversations incomplètes)",
     "Reload widget": "Recharger le widget",
-    "Please help improve Riot.im by sending anonymous usage data. This will use a cookie (please see our Cookie Policy).": "Veuillez aider Riot.im à s'améliorer en envoyant des données d'utilisation anonymes. Cela utilisear un cookie (veuillez voir notre politique de cookie).",
+    "Please help improve Riot.im by sending anonymous usage data. This will use a cookie (please see our Cookie Policy).": "Veuillez aider Riot.im à s'améliorer en envoyant des données d'utilisation anonymes. Cela utilisera un cookie (veuillez voir notre politique de cookie).",
     "Please help improve Riot.im by sending anonymous usage data. This will use a cookie.": "Veuillez aider Riot.im à s'améliorer en envoyant des données d'utilisation anonymes. Cela utilisera un cookie.",
     "Yes, I want to help!": "Oui, je veux aider !",
     "Can't leave Server Notices room": "Impossible de quitter le salon des Annonces du serveur",
@@ -1195,5 +1195,89 @@
     "Share Room Message": "Partager le message du salon",
     "Link to selected message": "Lien vers le message sélectionné",
     "COPY": "COPIER",
-    "Share Message": "Partager le message"
+    "Share Message": "Partager le message",
+    "Jitsi Conference Calling": "Appel en téléconférence Jitsi",
+    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "Dans les salons chiffrés, comme celui-ci, l'aperçu des liens est désactivé par défaut pour s'assurer que le serveur d'accueil (où sont générés les aperçus) ne puisse pas collecter d'informations sur les liens qui apparaissent dans ce salon.",
+    "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "Quand quelqu'un met un lien dans son message, un aperçu du lien peut être affiché afin de fournir plus d'informations sur ce lien comme le titre, la description et une image du site.",
+    "The email field must not be blank.": "Le champ de l'adresse e-mail ne doit pas être vide.",
+    "The user name field must not be blank.": "Le champ du nom d'utilisateur ne doit pas être vide.",
+    "The phone number field must not be blank.": "Le champ du numéro de téléphone ne doit pas être vide.",
+    "The password field must not be blank.": "Le champ du mot de passe ne doit pas être vide.",
+    "Call in Progress": "Appel en cours",
+    "A call is already in progress!": "Un appel est déjà en cours !",
+    "You have no historical rooms": "Vous n'avez aucun salon historique",
+    "You can't send any messages until you review and agree to our terms and conditions.": "Vous ne pouvez voir aucun message tant que vous ne lisez et n'acceptez pas nos conditions générales.",
+    "Demote yourself?": "Vous rétrograder ?",
+    "Demote": "Rétrograder",
+    "Show empty room list headings": "Afficher les en-têtes de la liste des salons vides",
+    "This event could not be displayed": "Cet événement n'a pas pu être affiché",
+    "deleted": "barré",
+    "underlined": "souligné",
+    "inline-code": "code",
+    "block-quote": "citation",
+    "bulleted-list": "liste à puces",
+    "numbered-list": "liste à numéros",
+    "A conference call could not be started because the intgrations server is not available": "L'appel en téléconférence n'a pas pu aboutir car le serveur d'intégrations n'est pas disponible",
+    "Permission Required": "Permission requise",
+    "You do not have permission to start a conference call in this room": "Vous n'avez pas la permission de lancer un appel en téléconférence dans ce salon",
+    "A call is currently being placed!": "Un appel est en cours !",
+    "Failed to remove widget": "Échec de la suppression du widget",
+    "An error ocurred whilst trying to remove the widget from the room": "Une erreur est survenue lors de la suppression du widget du salon",
+    "This homeserver has hit its Monthly Active User limit": "Ce serveur d'accueil a atteint sa limite mensuelle d'utilisateurs actifs",
+    "Please contact your service administrator to continue using this service.": "Veuillez contacter l'administrateur de votre service pour continuer à l'utiliser.",
+    "Your message wasn’t sent because this homeserver has hit its Monthly Active User Limit. Please contact your service administrator to continue using the service.": "Votre message n'a pas été envoyé car ce serveur d'accueil a atteint sa limite mensuelle d'utilisateurs actifs. Veuillez contacter l'administrateur de votre service pour continuer à l'utiliser.",
+    "This homeserver has hit its Monthly Active User limit. Please contact your service administrator to continue using the service.": "Ce serveur d'accueil a atteint sa limite mensuelle d'utilisateurs actifs. Veuillez contacter l'administrateur de votre service pour continuer à l'utiliser.",
+    "System Alerts": "Alertes système",
+    "This homeserver has hit its Monthly Active User limit. Please contact your service administrator to continue using the service.": "Ce serveur d'accueil a atteint sa limite mensuelle d'utilisateurs actifs. Veuillez contacter l'administrateur de votre service pour continuer à l'utiliser.",
+    "This homeserver has hit its Monthly Active User limit so some users will not be able to log in. Please contact your service administrator to get this limit increased.": "Ce serveur d'accueil a atteint sa limite mensuelle d'utilisateurs actifs donc certains utilisateurs ne pourront pas se connecter. Veuillez contacter l'administrateur de votre service pour augmenter cette limite.",
+    "Internal room ID: ": "Identifiant interne du salon : ",
+    "Room version number: ": "Numéro de version du salon : ",
+    "There is a known vulnerability affecting this room.": "Ce salon est touché par une faille de sécurité connue.",
+    "This room version is vulnerable to malicious modification of room state.": "Ce salon est vulnérable à la modification malveillante de l'état du salon.",
+    "Click here to upgrade to the latest room version and ensure room integrity is protected.": "Cliquer ici pour mettre le salon à niveau vers la dernière version et s'assurer que l'intégrité du salon est protégée.",
+    "Only room administrators will see this warning": "Seuls les administrateurs du salon verront cet avertissement",
+    "Please contact your service administrator to continue using the service.": "Veuillez contacter l'administrateur de votre service pour continuer à l'utiliser.",
+    "This homeserver has hit its Monthly Active User limit.": "Ce serveur d'accueil a atteint sa limite mensuelle d'utilisateurs actifs.",
+    "This homeserver has exceeded one of its resource limits.": "Ce serveur d'accueil a dépassé une de ses limites de ressources.",
+    "Please contact your service administrator to get this limit increased.": "Veuillez contacter l'administrateur de votre service pour augmenter cette limite.",
+    "This homeserver has hit its Monthly Active User limit so some users will not be able to log in.": "Ce serveur d'accueil a atteint sa limite mensuelle d'utilisateurs actifs donc certains utilisateurs ne pourront pas se connecter.",
+    "This homeserver has exceeded one of its resource limits so some users will not be able to log in.": "Ce serveur d'accueil a atteint une de ses limites de ressources donc certains utilisateurs ne pourront pas se connecter.",
+    "Upgrade Room Version": "Mettre à niveau la version du salon",
+    "Upgrading this room requires closing down the current instance of the room and creating a new room it its place. To give room members the best possible experience, we will:": "La mise à niveau de ce salon nécessite la clôture de l'instance en cours du salon et la création d'un nouveau salon à la place. Pour donner la meilleure expérience possible aux participants, nous allons :",
+    "Create a new room with the same name, description and avatar": "Créer un salon avec le même nom, la même description et le même avatar",
+    "Update any local room aliases to point to the new room": "Mettre à jour tous les alias du salon locaux pour qu'ils dirigent vers le nouveau salon",
+    "Stop users from speaking in the old version of the room, and post a message advising users to move to the new room": "Empêcher les utilisateurs de discuter dans l'ancienne version du salon et envoyer un message conseillant aux nouveaux utilisateurs d'aller dans le nouveau salon",
+    "Put a link back to the old room at the start of the new room so people can see old messages": "Fournir un lien vers l'ancien salon au début du nouveau salon pour que l'on puisse voir les vieux messages",
+    "Your message wasn't sent because this homeserver has hit its Monthly Active User Limit. Please contact your service administrator to continue using the service.": "Votre message n'a pas été envoyé car le serveur d'accueil a atteint sa limite mensuelle d'utilisateurs. Veuillez contacter l'administrateur de votre service pour continuer à l'utiliser.",
+    "Your message wasn't sent because this homeserver has exceeded a resource limit. Please contact your service administrator to continue using the service.": "Votre message n'a pas été envoyé car ce serveur d'accueil a dépassé une de ses limites de ressources. Veuillez contacter l'administrateur de votre service pour continuer à l'utiliser.",
+    "Please contact your service administrator to continue using this service.": "Veuillez contacter l'administrateur de votre service pour continuer à l'utiliser.",
+    "Increase performance by only loading room members on first view": "Améliorer les performances en ne chargeant les participants des salons qu'au premier affichage",
+    "Lazy loading members not supported": "La chargement différé des participants n'est pas pris en charge",
+    "Lazy loading is not supported by your current homeserver.": "Le chargement différé n'est pas pris en charge par votre serveur d'accueil actuel.",
+    "Sorry, your homeserver is too old to participate in this room.": "Désolé, votre serveur d'accueil est trop vieux pour participer à ce salon.",
+    "Please contact your homeserver administrator.": "Veuillez contacter l'administrateur de votre serveur d'accueil.",
+    "Legal": "Légal",
+    "This room has been replaced and is no longer active.": "Ce salon a été remplacé et n'est plus actif.",
+    "The conversation continues here.": "La discussion continue ici.",
+    "Upgrade room to version %(ver)s": "Mettre à niveau le salon vers la version %(ver)s",
+    "This room is a continuation of another conversation.": "Ce salon est la suite d'une autre discussion.",
+    "Click here to see older messages.": "Cliquer ici pour voir les vieux messages.",
+    "Failed to upgrade room": "Échec de la mise à niveau du salon",
+    "The room upgrade could not be completed": "La mise à niveau du salon n'a pas pu être effectuée",
+    "Upgrade this room to version %(version)s": "Mettre à niveau ce salon vers la version %(version)s",
+    "Forces the current outbound group session in an encrypted room to be discarded": "Force la session de groupe sortante actuelle dans un salon chiffré à être rejetée",
+    "Error Discarding Session": "Erreur lors du rejet de la session",
+    "Registration Required": "Enregistrement nécessaire",
+    "You need to register to do this. Would you like to register now?": "Vous devez vous enregistrer pour faire cela. Voulez-vous créer un compte maintenant ?",
+    "Unable to query for supported registration methods": "Impossible de demander les méthodes d'enregistrement prises en charge",
+    "Unable to connect to Homeserver. Retrying...": "Impossible de se connecter au serveur d'accueil. Reconnexion...",
+    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|one": "%(senderName)s a ajouté %(addedAddresses)s comme adresse pour ce salon.",
+    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|other": "%(senderName)s a ajouté %(addedAddresses)s comme adresses pour ce salon.",
+    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|one": "%(senderName)s a supprimé %(removedAddresses)s comme adresse pour ce salon.",
+    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|other": "%(senderName)s a supprimé %(removedAddresses)s comme adresses pour ce salon.",
+    "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.": "%(senderName)s a ajouté %(addedAddresses)s et supprimé %(removedAddresses)s comme adresses pour ce salon.",
+    "%(senderName)s set the canonical address for this room to %(address)s.": "%(senderName)s a défini l'adresse canonique de ce salon comme %(address)s.",
+    "%(senderName)s removed the canonical address for this room.": "%(senderName)s a supprimé l'adresse canonique de ce salon.",
+    "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s à défini l'adresse principale pour ce salon comme %(address)s.",
+    "%(senderName)s removed the main address for this room.": "%(senderName)s a supprimé l'adresse principale de ce salon."
 }
diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index 1080e66a26..932ca95ca9 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -168,7 +168,6 @@
     "Authentication check failed: incorrect password?": "Fallou a comprobación de autenticación: contrasinal incorrecto?",
     "Failed to join room": "Non se puido unir a sala",
     "Message Pinning": "Fixando mensaxe",
-    "Tag Panel": "Panel de etiquetas",
     "Disable Emoji suggestions while typing": "Desactivar a suxestión de Emoji mentres escribe",
     "Use compact timeline layout": "Utilizar a disposición compacta da liña temporal",
     "Hide removed messages": "Ocultar mensaxes eliminadas",
@@ -634,7 +633,7 @@
     "Confirm Removal": "Confirme a retirada",
     "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "Está certa de que quere quitar (eliminar) este evento? Saiba que si elimina un nome de sala ou cambia o asunto, podería desfacer o cambio.",
     "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Os ID de comunidade só poden conter caracteres a-z, 0-9, or '=_-./'",
-    "Community IDs cannot not be empty.": "O ID de comunidade non pode quedar baldeiro.",
+    "Community IDs cannot be empty.": "O ID de comunidade non pode quedar baldeiro.",
     "Something went wrong whilst creating your community": "Algo fallou mentres se creaba a súa comunidade",
     "Create Community": "Crear comunidade",
     "Community Name": "Nome da comunidade",
@@ -1196,5 +1195,50 @@
     "Review terms and conditions": "Revise os termos e condicións",
     "No Audio Outputs detected": "Non se detectou unha saída de audio",
     "Audio Output": "Saída de audio",
-    "Try the app first": "Probe a aplicación primeiro"
+    "Try the app first": "Probe a aplicación primeiro",
+    "Jitsi Conference Calling": "Chamada para conferencia con Jitsi",
+    "A conference call could not be started because the intgrations server is not available": "Non se puido comezar a chamada por mor de que o servidor de integración non está activo",
+    "Call in Progress": "Chamada en progreso",
+    "A call is already in progress!": "Xa hai unha chamada en progreso!",
+    "Permission Required": "Precísase de permisos",
+    "You do not have permission to start a conference call in this room": "Non ten permisos para comezar unha chamada de conferencia nesta sala",
+    "Show empty room list headings": "Amosar a cabeceira da lista de salas baleiras",
+    "This event could not be displayed": "Non se puido amosar este evento",
+    "Demote yourself?": "Baixarse a si mesmo de rango?",
+    "Demote": "Baixar de rango",
+    "deleted": "eliminado",
+    "underlined": "subliñado",
+    "inline-code": "código en liña",
+    "block-quote": "bloque de citas",
+    "bulleted-list": "lista de puntos",
+    "numbered-list": "lista numérica",
+    "You have no historical rooms": "Ton ten salas anteriores",
+    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "Nas salas cifradas, como é esta, está desactivado por defecto a previsualización das URL co fin de asegurarse de que o servidor local (que é onde se gardan as previsualizacións) non poida recoller información sobre das ligazóns que se ven nesta sala.",
+    "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "Cando alguén pon unha URL na mensaxe, esta previsualízarase para que así se coñezan xa cousas delas como o título, a descrición ou as imaxes que inclúe ese sitio web.",
+    "The email field must not be blank.": "Este campo de correo non pode quedar en branco.",
+    "The user name field must not be blank.": "O campo de nome de usuario non pode quedar en branco.",
+    "The phone number field must not be blank.": "O número de teléfono non pode quedar en branco.",
+    "The password field must not be blank.": "O campo do contrasinal non pode quedar en branco.",
+    "You can't send any messages until you review and agree to our terms and conditions.": "Non vai poder enviar mensaxes ata que revise e acepte  os nosos termos e condicións.",
+    "A call is currently being placed!": "Xa se estableceu a chamada!",
+    "Sorry, your homeserver is too old to participate in this room.": "Lametámolo, o seu servidor de inicio é vello de máis para participar en esta sala.",
+    "Please contact your homeserver administrator.": "Por favor, contacte coa administración do seu servidor.",
+    "Increase performance by only loading room members on first view": "Aumente o rendemento cargando só membros da sala na vista inicial",
+    "System Alerts": "Alertas do Sistema",
+    "Internal room ID: ": "ID interno da sala: ",
+    "Room version number: ": "Número de versión da sala: ",
+    "Please contact your service administrator to continue using the service.": "Por favor contacte coa administración do servizo para seguir utilizando o servizo.",
+    "This homeserver has hit its Monthly Active User limit.": "Este servidor acadou o límite mensual de usuarias activas.",
+    "This homeserver has exceeded one of its resource limits.": "Este servidor excedeu un dos seus límites de recursos.",
+    "Please contact your service administrator to get this limit increased.": "Por favor contacte coa administración do servizo para incrementar este límite.",
+    "This homeserver has hit its Monthly Active User limit so some users will not be able to log in.": "Este servidor acadou o Límite Mensual de usuarias activas polo que algunhas usuarias non poderán conectar.",
+    "This homeserver has exceeded one of its resource limits so some users will not be able to log in.": "Este servidor excedeu un dos límites de recursos polo que algunhas usuarias no poderán conectar.",
+    "Failed to remove widget": "Fallo ao eliminar o widget",
+    "An error ocurred whilst trying to remove the widget from the room": "Algo fallou mentras se intentaba eliminar o widget da sala",
+    "Your message wasn't sent because this homeserver has hit its Monthly Active User Limit. Please contact your service administrator to continue using the service.": "A súa mensaxe non foi enviada porque este servidor acadou o Límite Mensual de Usuaria Activa. Por favor contacte coa administración do servizo para continuar utilizando o servizo.",
+    "Your message wasn't sent because this homeserver has exceeded a resource limit. Please contact your service administrator to continue using the service.": "A súa mensaxe non foi enviada porque o servidor superou o límite de recursos. Por favor contacte coa administración do servizo para continuar utilizando o servizo.",
+    "Lazy loading members not supported": "A cargar preguiceira de membros non está soportada",
+    "Lazy loading is not supported by your current homeserver.": "A carga preguiceira non está soportada polo servidor actual.",
+    "Legal": "Legal",
+    "Please contact your service administrator to continue using this service.": "Por favor contacte coa administración do servizo para continuar utilizando o servizo."
 }
diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 2aea205a15..0d5dc9f457 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -71,8 +71,8 @@
     "Blacklisted": "Fekete listára téve",
     "Bulk Options": "Tömeges beállítások",
     "Call Timeout": "Hívás időtúllépés",
-    "Can't connect to homeserver - please check your connectivity, ensure your homeserver's SSL certificate is trusted, and that a browser extension is not blocking requests.": "Nem lehet kapcsolódni a saját szerverhez - ellenőrizd a kapcsolatot, biztosítsd, hogy a saját szerver tanúsítványa hiteles legyen, és a böngésző kiterjesztések ne blokkolják a kéréseket.",
-    "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or enable unsafe scripts.": "Nem lehet csatlakozni a saját szerverhez HTTP-n keresztül ha HTTPS van a böngésző címsorában. Vagy használj HTTPS-t vagy engedélyezd a nem biztonságos script-et.",
+    "Can't connect to homeserver - please check your connectivity, ensure your homeserver's SSL certificate is trusted, and that a browser extension is not blocking requests.": "Nem lehet kapcsolódni a Matrix szerverhez - ellenőrizd a kapcsolatot, biztosítsd, hogy a Matrix szerver tanúsítványa hiteles legyen, és a böngésző kiterjesztések ne blokkolják a kéréseket.",
+    "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or enable unsafe scripts.": "Nem lehet csatlakozni a Matrix szerverhez HTTP-n keresztül ha HTTPS van a böngésző címsorában. Vagy használj HTTPS-t vagy engedélyezd a nem biztonságos script-et.",
     "Can't load user settings": "A felhasználói beállítások nem tölthetők be",
     "Change Password": "Jelszó megváltoztatása",
     "%(senderName)s changed their profile picture.": "%(senderName)s megváltoztatta a profil képét.",
@@ -156,7 +156,7 @@
     "Enter Code": "Kód megadása",
     "Enter passphrase": "Jelmondat megadása",
     "Error decrypting attachment": "Csatolmány visszafejtése sikertelen",
-    "Error: Problem communicating with the given homeserver.": "Hiba: Probléma van az saját szerverrel való kommunikációval.",
+    "Error: Problem communicating with the given homeserver.": "Hiba: Probléma van a Matrix szerverrel való kommunikációval.",
     "Event information": "Esemény információ",
     "Existing Call": "Hívás folyamatban",
     "Export": "Mentés",
@@ -191,14 +191,14 @@
     "For security, this session has been signed out. Please sign in again.": "A biztonság érdekében ez a kapcsolat le lesz bontva. Légy szíves jelentkezz be újra.",
     "For security, logging out will delete any end-to-end encryption keys from this browser. If you want to be able to decrypt your conversation history from future Riot sessions, please export your room keys for safe-keeping.": "A biztonság érdekében a kilépéskor a ponttól pontig való (E2E) titkosításhoz szükséges kulcsok törlésre kerülnek a böngészőből. Ha a régi üzeneteket továbbra is el szeretnéd olvasni, kérlek mentsed ki a szobákhoz tartozó kulcsot.",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s : %(fromPowerLevel)s -> %(toPowerLevel)s",
-    "Guest access is disabled on this Home Server.": "Vendég belépés tiltva van a Saját szerveren.",
+    "Guest access is disabled on this Home Server.": "Vendég belépés tiltva van a Matrix szerveren.",
     "Guests cannot join this room even if explicitly invited.": "Vendégek akkor sem csatlakozhatnak ehhez a szobához ha külön meghívók kaptak.",
     "Hangup": "Megszakít",
     "Hide read receipts": "Olvasási visszajelzés elrejtése",
     "Hide Text Formatting Toolbar": "Szövegformázási menü elrejtése",
     "Historical": "Archív",
     "Home": "Kezdőlap",
-    "Homeserver is": "Saját szerver:",
+    "Homeserver is": "Matrix szerver:",
     "Identity Server is": "Azonosítási szerver:",
     "I have verified my email address": "Ellenőriztem az e-mail címemet",
     "Import": "Betöltés",
@@ -359,10 +359,10 @@
     "The email address linked to your account must be entered.": "A fiókodhoz kötött e-mail címet add meg.",
     "Press  to start a chat with someone": "Nyomd meg a  gombot  ha szeretnél csevegni valakivel",
     "Privacy warning": "Adatvédelmi figyelmeztetés",
-    "The file '%(fileName)s' exceeds this home server's size limit for uploads": "'%(fileName)s' fájl túllépte a Saját szerverben beállított feltöltési méret határt",
+    "The file '%(fileName)s' exceeds this home server's size limit for uploads": "'%(fileName)s' fájl túllépte a Matrix szerverben beállított feltöltési méret határt",
     "The file '%(fileName)s' failed to upload": "'%(fileName)s' fájl feltöltése sikertelen",
     "The remote side failed to pick up": "A hívott fél nem vette fel",
-    "This Home Server does not support login using email address.": "A Saját szerver nem támogatja a belépést e-mail címmel.",
+    "This Home Server does not support login using email address.": "A Matrix szerver nem támogatja a belépést e-mail címmel.",
     "This invitation was sent to an email address which is not associated with this account:": "A meghívó olyan e-mail címre lett küldve ami nincs összekötve ezzel a fiókkal:",
     "This room has no local addresses": "Ennek a szobának nincs helyi címe",
     "This room is not recognised.": "Ez a szoba nem ismerős.",
@@ -461,7 +461,7 @@
     "You need to be able to invite users to do that.": "Hogy ezt csinálhasd meg kell tudnod hívni felhasználókat.",
     "You need to be logged in.": "Be kell jelentkezz.",
     "You need to enter a user name.": "Be kell írnod a felhasználói nevet.",
-    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Ez az e-mail cím, úgy néz ki, nincs összekötve a Matrix azonosítóval ezen a saját szerveren.",
+    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Ez az e-mail cím, úgy néz ki, nincs összekötve a Matrix azonosítóval ezen a Matrix szerveren.",
     "Your password has been reset": "A jelszavad visszaállítottuk",
     "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "A jelszavadat sikeresen megváltoztattuk. Nem kapsz \"push\" értesítéseket amíg a többi eszközön vissza nem jelentkezel",
     "Unable to ascertain that the address this invite was sent to matches one associated with your account.": "A címről amire a meghívót elküldtük nem állapítható meg, hogy a fiókoddal összeköttetésben áll-e.",
@@ -469,7 +469,7 @@
     "You seem to be uploading files, are you sure you want to quit?": "Úgy tűnik fájlokat töltesz fel, biztosan kilépsz?",
     "You should not yet trust it to secure data": "Még ne bízz meg a titkosításban",
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Nem leszel képes visszavonni ezt a változtatást mivel a felhasználót ugyanarra a szintre emeled amin te vagy.",
-    "Your home server does not support device management.": "A Saját szervered nem támogatja az eszközök kezelését.",
+    "Your home server does not support device management.": "A Matrix szervered nem támogatja az eszközök kezelését.",
     "Sun": "Vas",
     "Mon": "Hé",
     "Tue": "K",
@@ -564,7 +564,7 @@
     "Verify...": "Ellenőrzés...",
     "ex. @bob:example.com": "pl.: @bob:example.com",
     "Add User": "Felhasználó hozzáadás",
-    "This Home Server would like to make sure you are not a robot": "A Saját szerver meg szeretne győződni arról, hogy nem vagy robot",
+    "This Home Server would like to make sure you are not a robot": "A Matrix szerver meg szeretne győződni arról, hogy nem vagy robot",
     "Sign in with CAS": "Belépés CAS-sal",
     "Please check your email to continue registration.": "Ellenőrizd az e-mailedet a regisztráció folytatásához.",
     "Token incorrect": "Helytelen token",
@@ -572,7 +572,7 @@
     "You are registering with %(SelectedTeamName)s": "%(SelectedTeamName)s névvel regisztrálsz",
     "Default server": "Alapértelmezett szerver",
     "Custom server": "Egyedi szerver",
-    "Home server URL": "Saját szerver URL",
+    "Home server URL": "Matrix szerver URL",
     "Identity server URL": "Azonosítási szerver URL",
     "What does this mean?": "Ez mit jelent?",
     "Error decrypting audio": "Hiba a hang visszafejtésénél",
@@ -614,12 +614,12 @@
     "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.": "Ha egy újabb Riot verziót használtál valószínűleg ez kapcsolat nem lesz kompatibilis vele. Zárd be az ablakot és térj vissza az újabb verzióhoz.",
     "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "Jelenleg fekete listára teszel minden ismeretlen eszközt. Ha üzenetet szeretnél küldeni ezekre az eszközökre először ellenőrizned kell őket.",
     "We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "Azt javasoljuk, hogy menj végig ellenőrző folyamaton minden eszköznél, hogy meg megerősítsd minden eszköz a jogos tulajdonosához tartozik, de újraküldheted az üzenetet ellenőrzés nélkül, ha úgy szeretnéd.",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.": "Használhatod az Otthoni szerver opciót, hogy más Matrix szerverre csatlakozz Saját szerver URL megadásával.",
-    "This allows you to use this app with an existing Matrix account on a different home server.": "Ezzel használhatod ezt az alkalmazást a meglévő Matrix fiókoddal és másik Saját szerveren.",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.": "Használhatod az Matrix szerver opciót, hogy más Matrix szerverre csatlakozz Matrix szerver URL megadásával.",
+    "This allows you to use this app with an existing Matrix account on a different home server.": "Ezzel használhatod ezt az alkalmazást a meglévő Matrix fiókoddal és másik Matrix szerveren.",
     "You can also set a custom identity server but this will typically prevent interaction with users based on email address.": "Beállíthatsz egy egyedi azonosító szervert is de ez tulajdonképpen meggátolja az együttműködést e-mail címmel azonosított felhasználókkal.",
     "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Ha nem állítasz be e-mail címet nem fogod tudni a jelszavadat alaphelyzetbe állítani. Biztos vagy benne?",
     "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Azonosítás céljából egy harmadik félhez leszel irányítva (%(integrationsUrl)s). Folytatod?",
-    "This will be your account name on the  homeserver, or you can pick a different server.": "Ez lesz a felhasználói neved a  saját szerveren, vagy választhatsz egy másik szervert.",
+    "This will be your account name on the  homeserver, or you can pick a different server.": "Ez lesz a felhasználói neved a  Matrix szerveren, vagy választhatsz egy másik szervert.",
     "Disable Peer-to-Peer for 1:1 calls": "Közvetlen kapcsolat tiltása az 1:1 hívásoknál",
     "To return to your account in future you need to set a password": "Ahhoz hogy később visszatérj a fiókodba be kell állítanod egy jelszót",
     "Skip": "Kihagy",
@@ -777,7 +777,7 @@
     "Long Description (HTML)": "Hosszú leírás (HTML)",
     "Community Settings": "Közösségi beállítások",
     "Community %(groupId)s not found": "%(groupId)s közösség nem található",
-    "This Home server does not support communities": "Ez a saját szerver nem támogatja a közösségeket",
+    "This Home server does not support communities": "Ez a Matrix szerver nem támogatja a közösségeket",
     "Error whilst fetching joined communities": "Hiba a csatlakozott közösségek betöltésénél",
     "Create a new community": "Új közösség létrehozása",
     "example": "példa",
@@ -913,7 +913,7 @@
     "Flair will not appear": "Jelvények nem jelennek meg",
     "Something went wrong when trying to get your communities.": "Valami nem sikerült a közösségeid elérésénél.",
     "Display your community flair in rooms configured to show it.": "Közösségi jelvényeid megjelenítése azokban a szobákban ahol ez engedélyezett.",
-    "This homeserver doesn't offer any login flows which are supported by this client.": "Ez a saját szerver egyetlen bejelentkezési metódust sem támogat amit ez a kliens ismer.",
+    "This homeserver doesn't offer any login flows which are supported by this client.": "Ez a Matrix szerver egyetlen bejelentkezési metódust sem támogat amit ez a kliens ismer.",
     "Addresses": "Címek",
     "collapse": "becsuk",
     "expand": "kinyit",
@@ -948,12 +948,12 @@
     "Your language of choice": "A használt nyelv",
     "Which officially provided instance you are using, if any": "Milyen hivatalosan nyújtott verziót használsz",
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Használod-e a Richtext módot a szerkesztőben vagy nem",
-    "Your homeserver's URL": "Az egyedi szerver URL-t",
+    "Your homeserver's URL": "A Matrix szerver URL-t",
     "Your identity server's URL": "Az azonosítási szerver URL-t",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(fullYear)s. %(monthName)s %(day)s, %(weekDayName)s",
     "This room is not public. You will not be able to rejoin without an invite.": "Ez a szoba nem nyilvános. Kilépés után csak újabb meghívóval tudsz újra belépni a szobába.",
     "Show devices, send anyway or cancel.": "Eszközök listája, mindenképpen küld vagy szakítsd meg.",
-    "Community IDs cannot not be empty.": "A közösségi azonosító nem lehet üres.",
+    "Community IDs cannot be empty.": "A közösségi azonosító nem lehet üres.",
     "In reply to ": "Válaszolva neki ",
     "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s megváltoztatta a nevét erre: %(displayName)s.",
     "Failed to set direct chat tag": "Nem sikerült a közvetlen beszélgetés jelzést beállítani",
@@ -1019,7 +1019,7 @@
     "You cannot delete this image. (%(code)s)": "Nem törölheted ezt a képet. (%(code)s)",
     "Cancel Sending": "Küldés megszakítása",
     "This Room": "Ebben a szobában",
-    "The Home Server may be too old to support third party networks": "Lehet, hogy a saját szerver túl régi és nem támogatja a csatlakozást más hálózatokhoz",
+    "The Home Server may be too old to support third party networks": "Lehet, hogy a Matrix szerver túl régi és nem támogatja a csatlakozást más hálózatokhoz",
     "Resend": "Küldés újra",
     "Room not found": "A szoba nem található",
     "Messages containing my display name": "A profilnevemet tartalmazó üzenetek",
@@ -1041,7 +1041,7 @@
     "Members": "Résztvevők",
     "No update available.": "Nincs elérhető frissítés.",
     "Noisy": "Hangos",
-    "Failed to get protocol list from Home Server": "Nem sikerült a protokoll listát lekérni a saját szerverről",
+    "Failed to get protocol list from Home Server": "Nem sikerült a protokoll listát lekérni a Matrix szerverről",
     "Collecting app version information": "Alkalmazás verzió információk összegyűjtése",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Törlöd a szoba nevét (%(alias)s) és eltávolítod a listából ezt: %(name)s?",
     "This will allow you to return to your account after signing out, and sign in on other devices.": "Így kijelentkezés után is vissza tudsz lépni a fiókodba, illetve más készülékekről is be tudsz lépni.",
@@ -1195,5 +1195,89 @@
     "Share Room Message": "Szoba üzenet megosztás",
     "Link to selected message": "Hivatkozás a kijelölt üzenetre",
     "COPY": "Másol",
-    "Share Message": "Üzenet megosztása"
+    "Share Message": "Üzenet megosztása",
+    "Jitsi Conference Calling": "Jitsi konferencia hívás",
+    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "Az olyan titkosított szobákban, mint ez is, az URL előnézet alapértelmezetten ki van kapcsolva, hogy biztosított legyen, hogy a matrix szerver (ahol az előnézet készül) ne tudjon információt gyűjteni arról, hogy milyen linkeket látsz ebben a szobában.",
+    "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "Ha valaki URL linket helyez az üzenetébe, lehetőség van egy előnézet megjelenítésére amivel további információt kaphatunk a linkről, mint cím, leírás és a weboldal képe.",
+    "The email field must not be blank.": "Az e-mail mező nem lehet üres.",
+    "The user name field must not be blank.": "A felhasználói név mező nem lehet üres.",
+    "The phone number field must not be blank.": "A telefonszám mező nem lehet üres.",
+    "The password field must not be blank.": "A jelszó mező nem lehet üres.",
+    "Call in Progress": "Hívás folyamatban",
+    "A call is already in progress!": "A hívás már folyamatban van!",
+    "You have no historical rooms": "Nincsenek archív szobáid",
+    "You can't send any messages until you review and agree to our terms and conditions.": "Nem tudsz üzenetet küldeni amíg nem olvasod el és nem fogadod el a felhasználási feltételeket.",
+    "Demote yourself?": "Lefokozod magad?",
+    "Demote": "Lefokozás",
+    "Show empty room list headings": "Üres szobalista fejléc mutatása",
+    "This event could not be displayed": "Az eseményt nem lehet megjeleníteni",
+    "deleted": "törölt",
+    "underlined": "aláhúzott",
+    "inline-code": "kód",
+    "block-quote": "idézet",
+    "bulleted-list": "rendezetlen lista",
+    "numbered-list": "rendezett lista",
+    "A conference call could not be started because the intgrations server is not available": "A konferencia hívást nem lehet elkezdeni mert az integrációs szerver nem érhető el",
+    "Permission Required": "Engedély szükséges",
+    "You do not have permission to start a conference call in this room": "Nincs jogosultságod konferencia hívást kezdeményezni ebben a szobában",
+    "A call is currently being placed!": "A hívás indítás alatt!",
+    "Failed to remove widget": "A kisalkalmazás törlése sikertelen",
+    "An error ocurred whilst trying to remove the widget from the room": "A kisalkalmazás szobából való törlése közben hiba történt",
+    "System Alerts": "Rendszer figyelmeztetések",
+    "This homeserver has hit its Monthly Active User limit. Please contact your service administrator to continue using the service.": "Ez a matrix szerver elérte a havi aktív felhasználói korlátot. Kérlek vedd fel a kapcsolatot a szolgáltatás adminisztrátorával ha a továbbiakban is igénybe szeretnéd venni a szolgáltatást.",
+    "Your message wasn’t sent because this homeserver has hit its Monthly Active User Limit. Please contact your service administrator to continue using the service.": "Az üzeneted nem lett elküldve mert a Matrix szerver elérte a havi aktív felhasználói korlátot. Kérlek vedd fel a kapcsolatot a szolgáltatás adminisztrátorával ha a továbbiakban is igénybe szeretnéd venni a szolgáltatást.",
+    "This homeserver has hit its Monthly Active User limit": "Ez a Matrix szerver elérte a havi aktív felhasználói korlátot",
+    "Please contact your service administrator to continue using this service.": "Kérlek vedd fel a kapcsolatot a szolgáltatás adminisztrátorával ha a továbbiakban is igénybe szeretnéd venni a szolgáltatást.",
+    "This homeserver has hit its Monthly Active User limit. Please contact your service administrator to continue using the service.": "Ez a Matrix szerver elérte a havi aktív felhasználói korlátot. Kérlek vedd fel a kapcsolatot a szolgáltatás adminisztrátorával a szolgáltatás további használatához.",
+    "This homeserver has hit its Monthly Active User limit so some users will not be able to log in. Please contact your service administrator to get this limit increased.": "Ez a Matrix szerver elérte a havi aktív felhasználói korlátot, így néhány felhasználó nem fog tudni bejelentkezni. Kérlek vedd fel a kapcsolatot a szolgáltatás adminisztrátorával, hogy a korlátot felemeljék.",
+    "Internal room ID: ": "Belső szoba azonosító: ",
+    "Room version number: ": "Szoba verziószáma: ",
+    "There is a known vulnerability affecting this room.": "Ez a szoba ismert sérülékenységgel rendelkezik.",
+    "This room version is vulnerable to malicious modification of room state.": "A szoba ezen verziójában a szoba állapota ártó szándékkal módosítható.",
+    "Click here to upgrade to the latest room version and ensure room integrity is protected.": "Kattints ide a szoba legújabb verziójára való frissítéshez, hogy a szoba integritása védve legyen.",
+    "Only room administrators will see this warning": "Csak a szoba adminisztrátorai látják ezt a figyelmeztetést",
+    "Please contact your service administrator to continue using the service.": "A szolgáltatás további használata érdekében kérlek vedd fel a kapcsolatot a szolgáltatás adminisztrátorával.",
+    "This homeserver has hit its Monthly Active User limit.": "A Matrix szerver elérte a havi aktív felhasználói korlátot.",
+    "This homeserver has exceeded one of its resource limits.": "A Matrix szerver túllépte valamelyik erőforrás korlátját.",
+    "Please contact your service administrator to get this limit increased.": "A korlát emelése érdekében kérlek vedd fel a kapcsolatot a szolgáltatás adminisztrátorával.",
+    "This homeserver has hit its Monthly Active User limit so some users will not be able to log in.": "Ez a Matrix szerver elérte a havi aktív felhasználói korlátját néhány felhasználó nem fog tudni bejelentkezni.",
+    "This homeserver has exceeded one of its resource limits so some users will not be able to log in.": "Ez a Matrix szerver túllépte valamelyik erőforrás korlátját így néhány felhasználó nem tud majd bejelentkezni.",
+    "Upgrade Room Version": "Szoba verziójának frissítése",
+    "Upgrading this room requires closing down the current instance of the room and creating a new room it its place. To give room members the best possible experience, we will:": "A szoba frissítése miatt ezt a szobát be kell zárni és egy új szobát kell nyitni a helyében. Hogy a felhasználóknak ne legyen rossz tapasztalata ezért ezt fogjuk tenni:",
+    "Create a new room with the same name, description and avatar": "Készíts egy új szobát ugyanazzal a névvel, leírással és profilképpel",
+    "Update any local room aliases to point to the new room": "Állíts át minden helyi alternatív nevet erre a szobára",
+    "Stop users from speaking in the old version of the room, and post a message advising users to move to the new room": "A felhasználóknak tiltsd meg, hogy a régi szobában beszélgessenek. Küldj egy üzenetet amiben megkéred a felhasználókat, hogy menjenek át az új szobába",
+    "Put a link back to the old room at the start of the new room so people can see old messages": "Tegyél egy linket az új szoba elejére ami visszamutat a régi szobára, hogy az emberek lássák a régi üzeneteket",
+    "Your message wasn't sent because this homeserver has hit its Monthly Active User Limit. Please contact your service administrator to continue using the service.": "Az üzeneted nincs elküldve, mert ez a Matrix szerver elérte a havi aktív felhasználói korlátot. A szolgáltatás további igénybevétele végett kérlek vedd fel a kapcsolatot a szolgáltatás adminisztrátorával.",
+    "Your message wasn't sent because this homeserver has exceeded a resource limit. Please contact your service administrator to continue using the service.": "Az üzeneted nem került elküldésre mert ez a Matrix szerver túllépte valamelyik erőforrás korlátját. A szolgáltatás további igénybevétele végett kérlek vedd fel a kapcsolatot a szolgáltatás adminisztrátorával.",
+    "Please contact your service administrator to continue using this service.": "A szolgáltatás további használatához kérlek vedd fel a kapcsolatot a szolgáltatás adminisztrátorával.",
+    "Increase performance by only loading room members on first view": "A teljesítmény növelése érdekében a szoba tagsága csak az első megtekintéskor töltődik be",
+    "Lazy loading members not supported": "A tagok késleltetett betöltése nem támogatott",
+    "Lazy loading is not supported by your current homeserver.": "A késleltetett betöltés nem támogatott ennél a Matrix szervernél.",
+    "Sorry, your homeserver is too old to participate in this room.": "Sajnáljuk, a Matrix szervered nem elég friss ahhoz, hogy részt vegyen ebben a szobában.",
+    "Please contact your homeserver administrator.": "Kérlek vedd fel a kapcsolatot a Matrix szerver adminisztrátorával.",
+    "Legal": "Jogi",
+    "This room has been replaced and is no longer active.": "Ezt a szobát lecseréltük és nem aktív többé.",
+    "The conversation continues here.": "A beszélgetés itt folytatódik.",
+    "Upgrade room to version %(ver)s": "A szoba frissítése %(ver)s verzióra",
+    "This room is a continuation of another conversation.": "Ebben a szobában folytatódik egy másik beszélgetés.",
+    "Click here to see older messages.": "Ide kattintva megnézheted a régi üzeneteket.",
+    "Failed to upgrade room": "A szoba frissítése sikertelen",
+    "The room upgrade could not be completed": "A szoba frissítését nem sikerült befejezni",
+    "Upgrade this room to version %(version)s": "A szoba frissítése %(version)s verzióra",
+    "Error Discarding Session": "Hiba a munkamenet törlésénél",
+    "Forces the current outbound group session in an encrypted room to be discarded": "A jelenlegi csoport munkamenet törlését kikényszeríti a titkosított szobában",
+    "Registration Required": "Regisztrációt igényel",
+    "You need to register to do this. Would you like to register now?": "Hogy ezt megtedd regisztrálnod kell. Szeretnél regisztrálni?",
+    "Unable to query for supported registration methods": "A támogatott regisztrációs folyamatok listáját nem sikerült lekérdezni",
+    "Unable to connect to Homeserver. Retrying...": "A matrix szerverrel nem lehet felvenni a kapcsolatot. Újrapróbálkozás...",
+    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|one": "%(senderName)s szoba címnek beállította: %(addedAddresses)s.",
+    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|other": "%(senderName)s szoba címnek hozzáadta: %(addedAddresses)s.",
+    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|one": "%(senderName)s törölte a szoba címek közül: %(removedAddresses)s.",
+    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|other": "%(senderName)s törölte a szoba címek közül: %(removedAddresses)s.",
+    "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.": "%(senderName)s hozzáadta a szoba címekhez: %(addedAddresses)s és törölte a címek közül: %(removedAddresses)s.",
+    "%(senderName)s set the canonical address for this room to %(address)s.": "%(senderName)s olvasható címet allított be a szobához: %(address)s.",
+    "%(senderName)s removed the canonical address for this room.": "%(senderName)s törölte a szoba olvasható címét.",
+    "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s elsődleges szoba címnek beállította: %(address)s.",
+    "%(senderName)s removed the main address for this room.": "A szoba elsődleges címét %(senderName)s törölte."
 }
diff --git a/src/i18n/strings/id.json b/src/i18n/strings/id.json
index 86605c1d41..0d4d1ea1a5 100644
--- a/src/i18n/strings/id.json
+++ b/src/i18n/strings/id.json
@@ -151,7 +151,7 @@
     "Access Token:": "Token Akses:",
     "Active call (%(roomName)s)": "Panggilan aktif (%(roomName)s)",
     "Admin": "Admin",
-    "Admin Tools": "Alat admin",
+    "Admin Tools": "Peralatan Admin",
     "VoIP": "VoIP",
     "Missing Media Permissions, click here to request.": "Tidak ada Izin Media, klik disini untuk meminta.",
     "No Webcams detected": "Tidak ada Webcam terdeteksi",
@@ -341,5 +341,39 @@
     "Collapse panel": "Lipat panel",
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Dengan browser ini, tampilan dari aplikasi mungkin tidak sesuai, dan beberapa atau bahkan semua fitur mungkin tidak berjalan. Jika Anda ingin tetap mencobanya, Anda bisa melanjutkan, tapi Anda tanggung sendiri jika muncul masalah yang terjadi!",
     "Checking for an update...": "Cek pembaruan...",
-    "There are advanced notifications which are not shown here": "Ada notifikasi lanjutan yang tidak ditampilkan di sini"
+    "There are advanced notifications which are not shown here": "Ada notifikasi lanjutan yang tidak ditampilkan di sini",
+    "This email address is already in use": "Alamat email ini telah terpakai",
+    "This phone number is already in use": "Nomor telepon ini telah terpakai",
+    "Failed to verify email address: make sure you clicked the link in the email": "Gagal memverifikasi alamat email: pastikan Anda telah menekan link di dalam email",
+    "The version of Riot.im": "Versi Riot.im",
+    "Your language of choice": "Pilihan bahasamu",
+    "Your homeserver's URL": "URL Homeserver Anda",
+    "Your identity server's URL": "URL Server Identitas Anda",
+    "e.g. %(exampleValue)s": "",
+    "Every page you use in the app": "Setiap halaman yang digunakan di app",
+    "e.g. ": "e.g. ",
+    "Your User Agent": "User Agent Anda",
+    "Your device resolution": "Resolusi perangkat Anda",
+    "Analytics": "Analitik",
+    "The information being sent to us to help make Riot.im better includes:": "Informasi yang dikirim membantu kami memperbaiki Riot.im, termasuk:",
+    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Apabila terdapat informasi yang dapat digunakan untuk pengenalan pada halaman ini, seperti ruang, pengguna, atau ID grup, kami akan menghapusnya sebelum dikirim ke server.",
+    "Call Failed": "Panggilan Gagal",
+    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Ada perangkat yang belum dikenal di ruang ini: apabila Anda melanjutkan tanpa memverifikasi terlebih dahulu, pembicaraan Anda dapat disadap orang yang tidak diinginkan.",
+    "Review Devices": "Telaah Perangkat",
+    "Call Anyway": "Tetap Panggil",
+    "Answer Anyway": "Tetap Jawab",
+    "Call": "Panggilan",
+    "Answer": "Jawab",
+    "Call Timeout": "Masa Berakhir Panggilan",
+    "The remote side failed to pick up": "Gagal jawab oleh pihak lain",
+    "Unable to capture screen": "Tidak dapat menangkap tampilan",
+    "Existing Call": "Panggilan Berlangsung",
+    "VoIP is unsupported": "VoIP tidak didukung",
+    "You cannot place VoIP calls in this browser.": "Anda tidak dapat melakukan panggilan VoIP di browser ini.",
+    "A conference call could not be started because the intgrations server is not available": "Panggilan massal tidak dapat dimulai karena server integrasi tidak tersedia",
+    "Call in Progress": "Panggilan Berlangsung",
+    "A call is currently being placed!": "Sedang melakukan panggilan sekarang!",
+    "A call is already in progress!": "Masih ada panggilan berlangsung!",
+    "Permission Required": "Permisi Dibutuhkan",
+    "You do not have permission to start a conference call in this room": "Anda tidak memiliki permisi untuk memulai panggilan massal di ruang ini"
 }
diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index d3f93acec5..b9523b7a7c 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -13,8 +13,8 @@
     "Cancel": "Annulla",
     "Close": "Chiudi",
     "Create new room": "Crea una nuova stanza",
-    "Custom Server Options": "Opzioni Server Personalizzate",
-    "Dismiss": "Scarta",
+    "Custom Server Options": "Opzioni server personalizzate",
+    "Dismiss": "Chiudi",
     "Error": "Errore",
     "Favourite": "Preferito",
     "OK": "OK",
@@ -210,9 +210,9 @@
     "%(senderName)s made future room history visible to all room members.": "%(senderName)s ha reso visibile la futura cronologia della stanza a tutti i membri della stanza.",
     "%(senderName)s made future room history visible to anyone.": "%(senderName)s ha reso visibile la futura cronologia della stanza a tutti.",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s ha reso visibile la futura cronologia della stanza a (%(visibility)s) sconosciuto.",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s ha attivato la crottografia end-to-end (algoritmo %(algorithm)s).",
+    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s ha attivato la crittografia end-to-end (algoritmo %(algorithm)s).",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s da %(fromPowerLevel)s a %(toPowerLevel)s",
-    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s ha cambiato il messaggio ancorato della stanza.",
+    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s ha cambiato i messaggi ancorati della stanza.",
     "%(widgetName)s widget modified by %(senderName)s": "Widget %(widgetName)s modificato da %(senderName)s",
     "%(widgetName)s widget added by %(senderName)s": "Widget %(widgetName)s aggiunto da %(senderName)s",
     "%(widgetName)s widget removed by %(senderName)s": "Widget %(widgetName)s rimosso da %(senderName)s",
@@ -674,7 +674,7 @@
     "Start Chatting": "Inizia a chattare",
     "Confirm Removal": "Conferma la rimozione",
     "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "Sei sicuro di volere rimuovere (eliminare) questo evento? Nota che se elimini il nome di una stanza o la modifica di un argomento, potrebbe annullare la modifica.",
-    "Community IDs cannot not be empty.": "Gli ID della comunità non possono essere vuoti.",
+    "Community IDs cannot be empty.": "Gli ID della comunità non possono essere vuoti.",
     "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Gli ID della comunità devono contenere solo caratteri a-z, 0-9, or '=_-./'",
     "Something went wrong whilst creating your community": "Qualcosa è andato storto nella creazione della tua comunità",
     "Create Community": "Crea una comunità",
@@ -1111,7 +1111,7 @@
     "Messages in group chats": "Messaggi nelle chat di gruppo",
     "Yesterday": "Ieri",
     "Error encountered (%(errorDetail)s).": "Errore riscontrato (%(errorDetail)s).",
-    "Login": "Entra",
+    "Login": "Accedi",
     "Low Priority": "Priorità bassa",
     "What's New": "Novità",
     "Set Password": "Imposta Password",
@@ -1175,11 +1175,106 @@
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Per continuare a usare l'homeserver %(homeserverDomain)s devi leggere e accettare i nostri termini e condizioni.",
     "Review terms and conditions": "Leggi i termini e condizioni",
     "Muted Users": "Utenti silenziati",
-    "Message Replies": "Risposte",
     "Message Pinning": "Messaggi appuntati",
     "Mirror local video feed": "Feed video dai ripetitori locali",
     "Replying": "Rispondere",
     "Popout widget": "Oggetto a comparsa",
     "Failed to indicate account erasure": "Impossibile indicare la cancellazione dell'account",
-    "Bulk Options": "Opzioni applicate in massa"
+    "Bulk Options": "Opzioni applicate in massa",
+    "Encrypting": "Cifratura...",
+    "Encrypted, not sent": "Cifrato, non inviato",
+    "Share Link to User": "Condividi link con utente",
+    "Share room": "Condividi stanza",
+    "Share Room": "Condividi stanza",
+    "Link to most recent message": "Link al messaggio più recente",
+    "Share User": "Condividi utente",
+    "Share Community": "Condividi comunità",
+    "Share Room Message": "Condividi messaggio stanza",
+    "Link to selected message": "Link al messaggio selezionato",
+    "COPY": "COPIA",
+    "Share Message": "Condividi messaggio",
+    "No Audio Outputs detected": "Nessuna uscita audio rilevata",
+    "Audio Output": "Uscita audio",
+    "Try the app first": "Prova prima l'app",
+    "A conference call could not be started because the intgrations server is not available": "La chiamata di gruppo non può essere iniziata perchè il server di integrazione non è disponibile",
+    "Call in Progress": "Chiamata in corso",
+    "A call is already in progress!": "Una chiamata è già in corso!",
+    "Permission Required": "Permesso richiesto",
+    "You do not have permission to start a conference call in this room": "Non hai il permesso di iniziare una chiamata di gruppo in questa stanza",
+    "Jitsi Conference Calling": "Chiamata di gruppo Jitsi",
+    "Show empty room list headings": "Mostra le intestazioni dell'elenco delle stanze vuote",
+    "This event could not be displayed": "Questo evento non può essere mostrato",
+    "Demote yourself?": "Retrocedi?",
+    "Demote": "Retrocedi",
+    "deleted": "cancellato",
+    "underlined": "sottolineato",
+    "inline-code": "codice in linea",
+    "block-quote": "citazione",
+    "bulleted-list": "lista a punti",
+    "numbered-list": "lista a numeri",
+    "You have no historical rooms": "Non ci sono stanze storiche",
+    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "Nelle stanze criptate, come questa, le anteprime degli URL sono disabilitate di default per garantire che il tuo server di casa (dove vengono generate le anteprime) non possa raccogliere informazioni sui collegamenti che vedi in questa stanza.",
+    "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "Quando qualcuno inserisce un URL nel proprio messaggio, è possibile mostrare un'anteprima dell'URL per fornire maggiori informazioni su quel collegamento, come il titolo, la descrizione e un'immagine dal sito web.",
+    "The email field must not be blank.": "Il campo email non deve essere vuoto.",
+    "The user name field must not be blank.": "Il campo nome utente non deve essere vuoto.",
+    "The phone number field must not be blank.": "Il campo telefono non deve essere vuoto.",
+    "The password field must not be blank.": "Il campo passwordl non deve essere vuoto.",
+    "You can't send any messages until you review and agree to our terms and conditions.": "Non è possibile inviare alcun messaggio fino a quando non si esaminano e si accettano  i nostri termini e condizioni .",
+    "A call is currently being placed!": "Attualmente è in corso una chiamata!",
+    "System Alerts": "Avvisi di sistema",
+    "This homeserver has hit its Monthly Active User limit. Please contact your service administrator to continue using the service.": "L'homeserver ha raggiunto il suo limite di utenti attivi mensili. Contatta l'amministratore del servizio per continuare ad usarlo.",
+    "This homeserver has hit its Monthly Active User limit so some users will not be able to log in. Please contact your service administrator to get this limit increased.": "Questo homeserver ha raggiunto il suo limite di utenti attivi mensili, perciò alcuni utenti non potranno accedere. Contatta l'amministratore del servizio per fare aumentare questo limite.",
+    "Failed to remove widget": "Rimozione del widget fallita",
+    "An error ocurred whilst trying to remove the widget from the room": "Si è verificato un errore tentando di rimuovere il widget dalla stanza",
+    "Your message wasn’t sent because this homeserver has hit its Monthly Active User Limit. Please contact your service administrator to continue using the service.": "Il tuo messaggio non è stato inviato perchè questo homeserver ha raggiunto il suo limite di utenti attivi mensili. Contatta l'amministratore del servizio per continuare ad usarlo.",
+    "This homeserver has hit its Monthly Active User limit": "Questo homeserver ha raggiunto il suo limite di utenti attivi mensili",
+    "Please contact your service administrator to continue using this service.": "Contatta l'amministratore del servizio per continuare ad usarlo.",
+    "Internal room ID: ": "ID interno della stanza: ",
+    "Room version number: ": "Numero di versione della stanza: ",
+    "There is a known vulnerability affecting this room.": "C'è una vulnerabilità nota che affligge questa stanza.",
+    "This room version is vulnerable to malicious modification of room state.": "La versione di questa stanza è vulnerabile a modifiche malevole dello stato della stanza.",
+    "Click here to upgrade to the latest room version and ensure room integrity is protected.": "Clicca qui per aggiornare all'ultima versione ed assicurare che l'integrità della stanza sia protetta.",
+    "Only room administrators will see this warning": "Solo gli amministratori della stanza vedranno questo avviso",
+    "Please contact your service administrator to continue using the service.": "Contatta l'amministratore del servizio per continuare ad usarlo.",
+    "This homeserver has hit its Monthly Active User limit.": "Questo homeserver ha raggiunto il suo limite di utenti attivi mensili.",
+    "This homeserver has exceeded one of its resource limits.": "Questo homeserver ha oltrepassato uno dei suoi limiti di risorse.",
+    "Please contact your service administrator to get this limit increased.": "Contatta l'amministratore del servizio per fare aumentare questo limite.",
+    "This homeserver has hit its Monthly Active User limit so some users will not be able to log in.": "Questo homeserver ha raggiunto il suo limite di utenti attivi mensili, perciò alcuni utenti non potranno accedere.",
+    "This homeserver has exceeded one of its resource limits so some users will not be able to log in.": "Questo homeserver ha oltrepassato uno dei suoi limiti di risorse, perciò alcuni utenti non potranno accedere.",
+    "Upgrade Room Version": "Aggiorna versione stanza",
+    "Upgrading this room requires closing down the current instance of the room and creating a new room it its place. To give room members the best possible experience, we will:": "L'aggiornamento di questa stanza richiede la chiusura dell'istanza attuale e la creazione di una nuova stanza al suo posto. Per offrire la migliore esperienza possibile ai membri della stanza, noi:",
+    "Create a new room with the same name, description and avatar": "Creeremo una nuova stanza con lo stesso nome, descrizione e avatar",
+    "Update any local room aliases to point to the new room": "Aggiorneremo qualsiasi alias di stanza in modo che punti a quella nuova",
+    "Stop users from speaking in the old version of the room, and post a message advising users to move to the new room": "Eviteremo che gli utenti parlino nella vecchia versione della stanza e posteremo un messaggio avvisando gli utenti di spostarsi in quella nuova",
+    "Put a link back to the old room at the start of the new room so people can see old messages": "Inseriremo un link alla vecchia stanza all'inizio della di quella nuova in modo che la gente possa vedere i messaggi precedenti",
+    "Your message wasn't sent because this homeserver has hit its Monthly Active User Limit. Please contact your service administrator to continue using the service.": "Il tuo messaggio non è stato inviato perchè questo homeserver ha raggiunto il suo limite di utenti attivi mensili. Contatta l'amministratore del servizio per continuare ad usarlo.",
+    "Your message wasn't sent because this homeserver has exceeded a resource limit. Please contact your service administrator to continue using the service.": "Il tuo messaggio non è stato inviato perchè questo homeserver ha oltrepassato un limite di risorse. Contatta l'amministratore del servizio per continuare ad usarlo.",
+    "Please contact your service administrator to continue using this service.": "Contatta l'amministratore del servizio per continuare ad usarlo.",
+    "Increase performance by only loading room members on first view": "Aumenta le prestazioni caricando solo i membri della stanza alla prima occhiata",
+    "Sorry, your homeserver is too old to participate in this room.": "Spiacenti, il tuo homeserver è troppo vecchio per partecipare a questa stanza.",
+    "Please contact your homeserver administrator.": "Contatta l'amministratore del tuo homeserver.",
+    "Lazy loading members not supported": "Il caricamento lento dei membri non è supportato",
+    "Lazy loading is not supported by your current homeserver.": "Il caricamento lento non è supportato dal tuo attuale homeserver.",
+    "Legal": "Informazioni legali",
+    "Forces the current outbound group session in an encrypted room to be discarded": "Forza l'eliminazione dell'attuale sessione di gruppo in uscita in una stanza criptata",
+    "Error Discarding Session": "Errore nell'eliminazione della sessione",
+    "This room has been replaced and is no longer active.": "Questa stanza è stata sostituita e non è più attiva.",
+    "The conversation continues here.": "La conversazione continua qui.",
+    "Upgrade room to version %(ver)s": "Aggiorna la stanza alla versione %(ver)s",
+    "This room is a continuation of another conversation.": "Questa stanza è la continuazione di un'altra conversazione.",
+    "Click here to see older messages.": "Clicca qui per vedere i messaggi precedenti.",
+    "Failed to upgrade room": "Aggiornamento stanza fallito",
+    "The room upgrade could not be completed": "Non è stato possibile completare l'aggiornamento della stanza",
+    "Upgrade this room to version %(version)s": "Aggiorna questa stanza alla versione %(version)s",
+    "Registration Required": "Registrazione necessaria",
+    "You need to register to do this. Would you like to register now?": "Devi registrarti per eseguire questa azione. Vuoi registrarti ora?",
+    "Unable to connect to Homeserver. Retrying...": "Impossibile connettersi all'homeserver. Riprovo...",
+    "Unable to query for supported registration methods": "Impossibile richiedere i metodi di registrazione supportati",
+    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|one": "%(senderName)s ha aggiunto %(addedAddresses)s come indirizzo per questa stanza.",
+    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|other": "%(senderName)s ha aggiunto %(addedAddresses)s come indirizzi per questa stanza.",
+    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|one": "%(senderName)s ha rimosso %(removedAddresses)s tra gli indirizzi di questa stanza.",
+    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|other": "%(senderName)s ha rimosso %(removedAddresses)s tra gli indirizzi di questa stanza.",
+    "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.": "%(senderName)s ha aggiunto %(addedAddresses)s e rimosso %(removedAddresses)s tra gli indirizzi di questa stanza.",
+    "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s ha messo %(address)s come indirizzo principale per questa stanza.",
+    "%(senderName)s removed the main address for this room.": "%(senderName)s ha rimosso l'indirizzo principale di questa stanza."
 }
diff --git a/src/i18n/strings/ka.json b/src/i18n/strings/ka.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/src/i18n/strings/ka.json
@@ -0,0 +1 @@
+{}
diff --git a/src/i18n/strings/ko.json b/src/i18n/strings/ko.json
index 23b7efd97d..cad2a0b441 100644
--- a/src/i18n/strings/ko.json
+++ b/src/i18n/strings/ko.json
@@ -5,16 +5,16 @@
     "Custom Server Options": "사용자 지정 서버 설정",
     "Dismiss": "없애기",
     "Error": "오류",
-    "Mute": "알림 끄기",
+    "Mute": "음소거",
     "Notifications": "알림",
-    "powered by Matrix": "매트릭스의 지원을 받고 있어요",
-    "Remove": "지우기",
+    "powered by Matrix": "Matrix의 지원을 받고 있습니다",
+    "Remove": "제거",
     "Room directory": "방 목록",
     "Search": "찾기",
     "Settings": "설정",
-    "Start chat": "이야기하기",
+    "Start chat": "대화하기",
     "unknown error code": "알 수 없는 오류 코드",
-    "OK": "알았어요",
+    "OK": "네",
     "Continue": "게속하기",
     "Accept": "수락",
     "Account": "계정",
@@ -23,303 +23,303 @@
     "Add phone number": "전화번호 추가하기",
     "Admin": "관리자",
     "Admin Tools": "관리 도구",
-    "VoIP": "인터넷전화",
-    "No Microphones detected": "마이크를 찾지 못했어요",
-    "No Webcams detected": "카메라를 찾지 못했어요",
-    "No media permissions": "저장소 권한이 없어요",
-    "Default Device": "기본 장치",
+    "VoIP": "VoIP",
+    "No Microphones detected": "마이크를 찾지 못했습니다.",
+    "No Webcams detected": "카메라를 찾지 못했습니다.",
+    "No media permissions": "미디어 권한이 없습니다.",
+    "Default Device": "기본 기기",
     "Microphone": "마이크",
     "Camera": "카메라",
     "Advanced": "고급",
     "Algorithm": "알고리즘",
-    "Hide removed messages": "지운 메시지 숨기기",
-    "Always show message timestamps": "항상 메시지에 시간을 보이기",
+    "Hide removed messages": "제거된 메시지 숨기기",
+    "Always show message timestamps": "항상 메시지의 시간을 보여주기",
     "Authentication": "인증",
     "Alias (optional)": "별명 (선택)",
     "A new password must be entered.": "새 비밀번호를 입력해주세요.",
-    "An error has occurred.": "오류가 일어났어요.",
+    "An error has occurred.": "오류가 일어났습니다.",
     "Anyone": "누구나",
     "Are you sure?": "정말이세요?",
     "Are you sure you want to leave the room '%(roomName)s'?": "정말로 '%(roomName)s'를 떠나시겠어요?",
     "Attachment": "붙이기",
     "Are you sure you want to upload the following files?": "다음 파일들을 올리시겠어요?",
     "Autoplay GIFs and videos": "GIF와 동영상을 자동으로 재생하기",
-    "Ban": "차단",
-    "Banned users": "차단한 사용자",
-    "Blacklisted": "요주의",
-    "Can't load user settings": "사용사 설정을 불러올 수 없어요",
+    "Ban": "차단하기",
+    "Banned users": "차단된 사용자",
+    "Blacklisted": "블랙리스트에 올려짐",
+    "Can't load user settings": "사용사 설정을 불러올 수 없습니다.",
     "Change Password": "비밀번호 바꾸기",
-    "Changes your display nickname": "보여줄 별명을 바꾸기",
-    "Clear Cache and Reload": "캐시를 지우고 다시 불러오기",
+    "Changes your display nickname": "별명 바꾸기",
+    "Clear Cache and Reload": "캐시 지우고 다시 시작하기",
     "Clear Cache": "캐시 지우기",
     "Confirm password": "비밀번호 확인",
     "Confirm your new password": "새 비밀번호 확인",
     "Create Room": "방 만들기",
     "Create an account": "게정 만들기",
     "Custom": "사용자 지정",
-    "Device ID": "장치 ID",
+    "Device ID": "기기 ID",
     "Default": "기본",
-    "Device already verified!": "장치를 이미 확인했어요!",
-    "device id: ": "장치 id: ",
-    "Devices": "장치",
-    "Direct chats": "직접 여러 명에게 이야기하기",
+    "Device already verified!": "이미 인증한 기기입니다!",
+    "device id: ": "기기 id: ",
+    "Devices": "기기",
+    "Direct chats": "직접 대화하기",
     "Disable Notifications": "알림 끄기",
     "Display name": "별명",
     "Don't send typing notifications": "입력 중이라는 알림 보내지 않기",
     "Email": "이메일",
     "Email address": "이메일 주소",
     "Email, name or matrix ID": "이메일, 이름 혹은 매트릭스 ID",
-    "Failed to forget room %(errCode)s": "방 %(errCode)s를 잊지 못했어요",
+    "Failed to forget room %(errCode)s": "%(errCode)s 방을 지우지 못했습니다.",
     "Favourite": "즐겨찾기",
     "Operation failed": "작업 실패",
-    "Failed to change password. Is your password correct?": "비밀번호를 바꾸지 못했어요. 이 비밀번호가 정말 맞으세요?",
-    "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "+%(msisdn)s로 문자 메시지를 보냈어요. 인증 번호를 입력해주세요",
-    "%(targetName)s accepted an invitation.": "%(targetName)s님이 초대를 수락했어요.",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s님이 %(displayName)s님에게서 초대를 수락했어요.",
+    "Failed to change password. Is your password correct?": "비밀번호를 바꾸지 못했습니다. 이 비밀번호가 맞나요?",
+    "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "+%(msisdn)s로 문자 메시지를 보냈습니다. 인증 번호를 입력해주세요.",
+    "%(targetName)s accepted an invitation.": "%(targetName)s님이 초대를 수락했습니다.",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s님이 %(displayName)s 초대를 수락했습니다.",
     "Access Token:": "접근 토큰:",
-    "Active call (%(roomName)s)": "(%(roomName)s)에서 전화를 걸고 받을 수 있어요",
+    "Active call (%(roomName)s)": "(%(roomName)s)에서 전화를 걸고 받을 수 있습니다.",
     "Add a topic": "주제 추가",
-    "Missing Media Permissions, click here to request.": "저장소 권한을 잃었어요, 여기를 눌러 다시 요청해주세요.",
-    "You may need to manually permit Riot to access your microphone/webcam": "수동으로 라이엇에 마이크와 카메라를 허용해야 할 수도 있어요",
+    "Missing Media Permissions, click here to request.": "미디어 권한이 없습니다. 여기를 눌러 다시 요청해주세요.",
+    "You may need to manually permit Riot to access your microphone/webcam": "수동으로 Riot에 마이크와 카메라를 허용할 수도 있습니다",
     "%(items)s and %(lastItem)s": "%(items)s과 %(lastItem)s",
     "and %(count)s others...|one": "그리고 다른 하나...",
     "and %(count)s others...|other": "그리고 %(count)s...",
     "%(names)s and %(lastPerson)s are typing": "%(names)s님과 %(lastPerson)s님이 입력중",
-    "%(senderName)s answered the call.": "%(senderName)s님이 전화를 받았어요.",
+    "%(senderName)s answered the call.": "%(senderName)s님이 전화를 받았습니다.",
     "Anyone who knows the room's link, apart from guests": "손님을 제외하고, 방의 주소를 아는 누구나",
     "Anyone who knows the room's link, including guests": "손님을 포함하여, 방의 주소를 아는 누구나",
     "Are you sure you want to reject the invitation?": "초대를 거절하시겠어요?",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s님이 %(targetName)s님을 차단하셨어요.",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s님이 %(targetName)s님을 차단했습니다.",
     "Bans user with given id": "받은 ID로 사용자 차단하기",
     "Bulk Options": "대규모 설정",
     "Call Timeout": "전화 대기 시간 초과",
-    "Can't connect to homeserver - please check your connectivity, ensure your homeserver's SSL certificate is trusted, and that a browser extension is not blocking requests.": "홈 서버에 연결할 수 없어요 - 연결을 확인해주시고, 홈 서버의 SSL 인증서가 믿을 수 있는지 확인하시고, 브라우저 확장기능이 요청을 차단하고 있는지 확인해주세요.",
-    "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or enable unsafe scripts.": "주소창에 HTTPS URL이 있을 때는 HTTP로 홈 서버를 연결할 수 없어요. HTTPS를 쓰거나 안전하지 않은 스크립트를 허용해주세요.",
-    "%(senderName)s changed their profile picture.": "%(senderName)s님이 자기 소개 사진을 바꾸셨어요.",
-    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s님이 %(powerLevelDiffText)s의 권한 등급을 바꾸셨어요.",
-    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s님이 방 이름을 %(roomName)s로 바꾸셨어요.",
-    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s님이 방 이름을 지우셨어요.",
-    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s님이 주제를 \"%(topic)s\"로 바꾸셨어요.",
-    "Changes to who can read history will only apply to future messages in this room": "방의 이후 메시지부터 기록을 읽을 수 있는 조건의 변화가 적용되어요",
-    "Changing password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "비밀번호를 바꾸면 현재 모든 장치의 종단간 암호화 키가 다시 설정되고, 먼저 방의 키를 내보내고 나중에 다시 불러오지 않는 한, 암호화한 이야기 기록을 읽을 수 없게 되어요. 앞으로는 이 기능을 더 좋게 만들 거에요.",
+    "Can't connect to homeserver - please check your connectivity, ensure your homeserver's SSL certificate is trusted, and that a browser extension is not blocking requests.": "홈 서버에 연결할 수 없으니 연결을 확인하고, 홈 서버의 SSL 인증서가 믿을 수 있는지 확인하고, 브라우저 확장기능이 요청을 차단하고 있는지 확인해 주세요.",
+    "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or enable unsafe scripts.": "주소창에 HTTPS URL이 있을 때는 HTTP로 홈 서버를 연결할 수 없습니다. HTTPS를 쓰거나 안전하지 않은 스크립트를 허용해주세요.",
+    "%(senderName)s changed their profile picture.": "%(senderName)s님이 프로필 사진을 바꿨습니다.",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s님이 %(powerLevelDiffText)s의 권한 등급을 바꿨습니다.",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s님이 방 이름을 %(roomName)s(으)로 바꿨습니다.",
+    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s님이 방 이름을 제거했습니다.",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s님이 주제를 \"%(topic)s\"로 바꿨습니다.",
+    "Changes to who can read history will only apply to future messages in this room": "이제부터의 메시지에만 이 방에서 누가 기록을 읽을 수 있는지에 대한 변경 내역이 적용됩니다",
+    "Changing password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "비밀번호를 바꾸면 현재 모든 기기의 종단 간 암호화 키가 다시 설정되고, 먼저 방의 키를 내보내고 나중에 다시 불러오지 않는 한, 암호화한 대화 기록을 읽을 수 없게 됩니다. 이 부분은 향상시키겠습니다.",
     "Claimed Ed25519 fingerprint key": "Ed25519 지문 키가 필요",
     "Click here to join the discussion!": "여기를 눌러서 같이 논의해요!",
     "Click here to fix": "해결하려면 여기를 누르세요",
-    "Click to mute audio": "소리를 끄려면 누르세요",
-    "Click to mute video": "동영상 소리를 끄려면 누르세요",
+    "Click to mute audio": "음소거하려면 누르세요",
+    "Click to mute video": "동영상을 음소거하려면 누르세요",
     "click to reveal": "누르면 나타나요",
-    "Click to unmute video": "동영상 소리를 켜려면 누르세요",
-    "Click to unmute audio": "소리를 켜려면 누르세요",
+    "Click to unmute video": "동영상 음소거를 끄려면 누르세요",
+    "Click to unmute audio": "음소거를 끄려면 누르세요",
     "Command error": "명령 오류",
     "Commands": "명령",
-    "Conference call failed.": "전화 회의를 실패했어요.",
-    "Conference calling is in development and may not be reliable.": "전화 회의는 개발 중이며 믿을 수 없어요.",
-    "Conference calls are not supported in encrypted rooms": "암호화한 방에서는 전화 회의를 할 수 없어요",
-    "Conference calls are not supported in this client": "이 클라이언트에서는 전화 회의를 할 수 없어요",
-    "Could not connect to the integration server": "통합 서버에 연결할 수 없어요",
+    "Conference call failed.": "전화 회의를 실패했습니다.",
+    "Conference calling is in development and may not be reliable.": "전화 회의는 개발 중이고, 따라서 신뢰하기 힘들 수 있습니다.",
+    "Conference calls are not supported in encrypted rooms": "암호화된 방에서는 전화 회의가 지원되지 않습니다",
+    "Conference calls are not supported in this client": "이 클라이언트에서는 전화 회의가 지원되지 않습니다",
+    "Could not connect to the integration server": "통합 서버에 연결할 수 없습니다.",
     "%(count)s new messages|one": "%(count)s 새 메시지",
     "%(count)s new messages|other": "%(count)s 새 메시지",
-    "Create a new chat or reuse an existing one": "새 이야기를 시작하거나 기존에 하던 이야기를 이어하세요",
+    "Create a new chat or reuse an existing one": "새 대화를 시작하거나 전에 하던 대화를 계속하세요.",
     "Cryptography": "암호화",
     "Current password": "현재 비밀번호",
     "Curve25519 identity key": "Curve25519 신원 키",
     "Custom level": "사용자 지정 단계",
-    "/ddg is not a command": "/ddg 는 없는 명령이에요",
+    "/ddg is not a command": "/ddg는 없는 명령입니다",
     "Deactivate Account": "계정 정지",
-    "Deactivate my account": "내 계정 정지하기",
+    "Deactivate my account": "계정 정지하기",
     "Decline": "거절",
     "Decrypt %(text)s": "해독 %(text)s",
     "Decryption error": "해독 오류",
     "Delete": "지우기",
     "Deops user with given id": "받은 ID로 사용자의 등급을 낮추기",
-    "Device ID:": "장치 ID:",
-    "Device key:": "장치 키:",
-    "Devices will not yet be able to decrypt history from before they joined the room": "방에 들어가기 전에는 장치에서 기록을 해독할 수 없어요",
+    "Device ID:": "기기 ID:",
+    "Device key:": "기기 열쇠:",
+    "Devices will not yet be able to decrypt history from before they joined the room": "아직 방에 들어가기 전의 기록은 복호화 하지 못 합니다",
     "Disinvite": "초대 취소",
     "Displays action": "활동 보이기",
     "Download %(text)s": "%(text)s 받기",
     "Drop File Here": "여기에 파일을 놓아주세요",
-    "Drop here to tag %(section)s": "%(section)s 지정하려면 여기에 놓아주세요",
+    "Drop here to tag %(section)s": "%(section)s를(을) 태그하려면 여기에 놓아주세요.",
     "Ed25519 fingerprint": "Ed25519 지문",
     "Email address (optional)": "이메일 주소 (선택)",
     "Emoji": "이모지",
-    "Enable encryption": "암호화 켜기",
-    "Enable Notifications": "알림 켜기",
-    "Encrypted by a verified device": "인증한 장치로 암호화했어요",
-    "Encrypted by an unverified device": "인증하지 않은 장치로 암호화했어요",
-    "Encrypted messages will not be visible on clients that do not yet implement encryption": "암호화한 메시지는 아직 암호화를 구현하지 않은 클라이언트에서는 볼 수 없어요",
+    "Enable encryption": "암호화 사용하기",
+    "Enable Notifications": "알림 사용하기",
+    "Encrypted by a verified device": "인증된 기기에서 암호화 됐습니다.",
+    "Encrypted by an unverified device": "인증하지 않은 기기에서 암호화 됐습니다.",
+    "Encrypted messages will not be visible on clients that do not yet implement encryption": "암호화 한 메시지는 아직 암호화를 구현하지 않은 클라이언트에서는 볼 수 없습니다.",
     "Encrypted room": "암호화한 방",
-    "Encryption is enabled in this room": "이 방은 암호화중이에요",
-    "Encryption is not enabled in this room": "이 방은 암호화하고 있지 않아요",
-    "%(senderName)s ended the call.": "%(senderName)s님이 전화를 끊었어요.",
+    "Encryption is enabled in this room": "이 방에서는 암호화 사용 중입니다.",
+    "Encryption is not enabled in this room": "이 방에서는 암호화를 사용하고 있지 않습니다.",
+    "%(senderName)s ended the call.": "%(senderName)s님이 전화를 끊었습니다.",
     "End-to-end encryption information": "종단간 암호화 정보",
-    "End-to-end encryption is in beta and may not be reliable": "종단간 암호화는 시험중이며 믿을 수 없어요",
+    "End-to-end encryption is in beta and may not be reliable": "종단 간 암호화는 베타 테스트 중이며 신뢰하기 힘들 수 있습니다.",
     "Enter Code": "코드를 입력하세요",
     "Enter passphrase": "암호를 입력하세요",
-    "Error decrypting attachment": "첨부 파일 해독중 문제가 일어났어요",
-    "Error: Problem communicating with the given homeserver.": "오류: 지정한 홈 서버와 통신에 문제가 있어요.",
-    "Event information": "사건 정보",
+    "Error decrypting attachment": "첨부 파일 해독중 문제가 일어났습니다",
+    "Error: Problem communicating with the given homeserver.": "오류: 지정한 홈 서버와 통신에 문제가 있습니다.",
+    "Event information": "이벤트 정보",
     "Existing Call": "기존 전화",
     "Export": "내보내기",
-    "Export E2E room keys": "종단간 암호화 방 키 내보내기",
-    "Failed to ban user": "사용자를 차단하지 못했어요",
-    "Failed to change power level": "권한 등급을 바꾸지 못했어요",
-    "Failed to fetch avatar URL": "아바타 URL을 불러오지 못했어요",
-    "Failed to join room": "방에 들어가지 못했어요",
-    "Failed to kick": "내쫓지 못했어요",
-    "Failed to leave room": "방을 떠나지 못했어요",
-    "Failed to load timeline position": "타임라인 위치를 불러오지 못했어요",
-    "Failed to mute user": "사용자의 알림을 끄지 못했어요",
-    "Failed to reject invite": "초대를 거절하지 못했어요",
-    "Failed to reject invitation": "초대를 거절하지 못했어요",
-    "Failed to save settings": "설정을 저장하지 못했어요",
-    "Failed to send email": "이메일을 보내지 못했어요",
-    "Failed to send request.": "요청을 보내지 못했어요.",
-    "Failed to set avatar.": "아바타를 설정하지 못했어요.",
-    "Failed to set display name": "별명을 설정하지 못했어요",
-    "Failed to set up conference call": "전화 회의를 시작하지 못했어요",
-    "Failed to toggle moderator status": "조정자 상태를 설정하지 못했어요",
-    "Failed to unban": "차단을 풀지 못했어요",
-    "Failed to upload file": "파일을 올리지 못했어요",
-    "Failed to upload profile picture!": "자기 소개에 사진을 올리지 못했어요!",
-    "Failed to verify email address: make sure you clicked the link in the email": "이메일 주소를 확인하지 못했어요: 메일의 주소를 눌렀는지 확인해보세요",
-    "Failure to create room": "방을 만들지 못했어요",
+    "Export E2E room keys": "종단 간 암호화 방 열쇠 내보내기",
+    "Failed to ban user": "사용자를 차단하지 못했습니다",
+    "Failed to change power level": "권한 등급을 바꾸지 못했습니다",
+    "Failed to fetch avatar URL": "아바타 URL을 불러오지 못했습니다.",
+    "Failed to join room": "방에 들어가지 못했습니다",
+    "Failed to kick": "추방하지 못했습니다.",
+    "Failed to leave room": "방을 떠나지 못했습니다",
+    "Failed to load timeline position": "타임라인 위치를 불러오지 못했습니다.",
+    "Failed to mute user": "사용자를 음소거하지 못했습니다.",
+    "Failed to reject invite": "초대를 거절하지 못했습니다.",
+    "Failed to reject invitation": "초대를 거절하지 못했습니다",
+    "Failed to save settings": "설정을 저장하지 못했습니다.",
+    "Failed to send email": "이메일을 보내지 못했습니다.",
+    "Failed to send request.": "요청을 보내지 못했습니다.",
+    "Failed to set avatar.": "아바타를 설정하지 못했습니다.",
+    "Failed to set display name": "별명을 설정하지 못했습니다",
+    "Failed to set up conference call": "전화 회의를 시작하지 못했습니다.",
+    "Failed to toggle moderator status": "조정자 상태를 설정하지 못했습니다",
+    "Failed to unban": "차단을 해제하지 못했습니다.",
+    "Failed to upload file": "파일을 올리지 못했습니다.",
+    "Failed to upload profile picture!": "프로필 사진을 올리지 못했어요!",
+    "Failed to verify email address: make sure you clicked the link in the email": "이메일 주소를 인증하지 못했습니다. 메일에 나온 주소를 눌렀는지 확인해 보세요",
+    "Failure to create room": "방을 만들지 못했습니다",
     "Favourites": "즐겨찾기",
     "Fill screen": "화면 채우기",
-    "Filter room members": "방 구성원 거르기",
-    "Forget room": "방 잊기",
+    "Filter room members": "방 구성원 찾기",
+    "Forget room": "방 지우기",
     "Forgot your password?": "비밀번호를 잊어버리셨어요?",
-    "For security, this session has been signed out. Please sign in again.": "보안을 위해서, 이 세션에서 로그아웃했어요. 다시 로그인해주세요.",
-    "For security, logging out will delete any end-to-end encryption keys from this browser. If you want to be able to decrypt your conversation history from future Riot sessions, please export your room keys for safe-keeping.": "보안을 위해서, 로그아웃하면 이 브라우저에서 모든 종단간 암호화 키를 없앨 거에요. 이후 라이엇에서 이야기를 해독하고 싶으시면, 방 키를 내보내서 안전하게 보관하세요.",
+    "For security, this session has been signed out. Please sign in again.": "안전을 위해서 이 세션에서 로그아웃했습니다. 다시 로그인해주세요.",
+    "For security, logging out will delete any end-to-end encryption keys from this browser. If you want to be able to decrypt your conversation history from future Riot sessions, please export your room keys for safe-keeping.": "로그아웃하시면 보안을 위해 이 브라우저에 저장된 모든 종단 간 암호화 열쇠가 삭제됩니다. 다음에 Riot을 사용할 때 대화 기록을 복호화할 수 있길 원한다면, 방 열쇠를 내보내서 안전하게 보관하세요.",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s를 %(fromPowerLevel)s에서 %(toPowerLevel)s로",
-    "Guest access is disabled on this Home Server.": "손님은 이 홈 서버에 접근하실 수 없어요.",
-    "Guests cannot join this room even if explicitly invited.": "손님은 분명하게 초대받았어도 이 방에 들어가실 수 없어요.",
+    "Guest access is disabled on this Home Server.": "이 홈 서버는 손님으로서 접근하실 수 없습니다.",
+    "Guests cannot join this room even if explicitly invited.": "명시적으로 초대 받은 손님이라도 이 방에는 들어가실 수 없습니다.",
     "Hangup": "전화 끊기",
     "Hide read receipts": "읽음 확인 표시 숨기기",
     "Hide Text Formatting Toolbar": "문자 서식 도구 숨기기",
-    "Historical": "보관",
-    "Home": "중심",
-    "Homeserver is": "홈 서버는",
-    "Identity Server is": "ID 서버는",
-    "I have verified my email address": "제 이메일 주소를 확인했어요",
+    "Historical": "보관한 방",
+    "Home": "홈",
+    "Homeserver is": "홈 서버:",
+    "Identity Server is": "ID 서버:",
+    "I have verified my email address": "제 이메일 주소를 확인했습니다.",
     "Import": "불러오기",
-    "Import E2E room keys": "종단간 암호화 방 키 불러오기",
+    "Import E2E room keys": "종단 간 암호화 방 키 불러오기",
     "Import room keys": "방 키 불러오기",
-    "Incoming call from %(name)s": "%(name)s님이 전화를 걸어왔어요",
-    "Incoming video call from %(name)s": "%(name)s님이 영상 통화를 걸어왔어요",
-    "Incoming voice call from %(name)s": "%(name)s님이 음성 통화를 걸어왔어요",
+    "Incoming call from %(name)s": "%(name)s님에게서 전화가 왔습니다.",
+    "Incoming video call from %(name)s": "%(name)s님으로부터 영상 통화가 왔습니다.",
+    "Incoming voice call from %(name)s": "%(name)s님으로부터 음성 통화가 왔습니다.",
     "Incorrect username and/or password.": "사용자 이름 혹은 비밀번호가 맞지 않아요.",
     "Incorrect verification code": "인증 번호가 맞지 않아요",
     "Interface Language": "인터페이스 언어",
-    "Invalid alias format": "가명 형식이 맞지 않아요",
-    "Invalid address format": "주소 형식이 맞지 않아요",
-    "Invalid Email Address": "이메일 주소가 맞지 않아요",
-    "Invalid file%(extra)s": "파일%(extra)s이 맞지 않아요",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s님이 %(targetName)s님을 초대하셨어요.",
+    "Invalid alias format": "잘못된 별칭 형식입니다",
+    "Invalid address format": "잘못된 주소 형식입니다",
+    "Invalid Email Address": "잘못된 이메일 주소입니다",
+    "Invalid file%(extra)s": "잘못된 %(extra)s 파일입니다.",
+    "%(senderName)s invited %(targetName)s.": "%(senderName)s님이 %(targetName)s님을 초대했습니다.",
     "Invite new room members": "새 구성원 초대하기",
     "Invited": "초대받기",
-    "Invites": "초대하기",
+    "Invites": "초대",
     "Invites user with given id to current room": "받은 ID로 사용자를 현재 방에 초대하기",
     "'%(alias)s' is not a valid format for an address": "'%(alias)s'는 주소에 맞는 형식이 아니에요",
     "'%(alias)s' is not a valid format for an alias": "'%(alias)s'는 가명에 맞는 형식이 아니에요",
-    "%(displayName)s is typing": "%(displayName)s님이 입력중",
+    "%(displayName)s is typing": "%(displayName)s님이 입력 중",
     "Sign in with": "로그인",
     "Join as voice or video.": "음성 또는 영상으로 참여하세요.",
     "Join Room": "방에 들어가기",
-    "%(targetName)s joined the room.": "%(targetName)s님이 방에 들어오셨어요.",
-    "Joins room with given alias": "받은 가명으로 방에 들어가기",
-    "Jump to first unread message.": "읽지 않은 첫 메시지로 이동할래요.",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s님이 %(targetName)s을 내쫓았어요.",
-    "Kick": "내쫓기",
-    "Kicks user with given id": "받은 ID로 사용자 내쫓기",
+    "%(targetName)s joined the room.": "%(targetName)s님이 방에 들어왔습니다.",
+    "Joins room with given alias": "받은 별칭으로 방에 들어가기",
+    "Jump to first unread message.": "읽지 않은 첫 메시지로 이동하려면 누르세요.",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s님이 %(targetName)s님을 추방했습니다.",
+    "Kick": "추방",
+    "Kicks user with given id": "받은 ID로 사용자 추방하기",
     "Labs": "실험실",
-    "Last seen": "마지막으로 본 곳",
+    "Last seen": "마지막 위치",
     "Leave room": "방 떠나기",
-    "%(targetName)s left the room.": "%(targetName)s님이 방을 떠나셨어요.",
+    "%(targetName)s left the room.": "%(targetName)s님이 방을 떠났습니다.",
     "Level:": "등급:",
     "Local addresses for this room:": "이 방의 로컬 주소:",
-    "Logged in as:": "로그인:",
+    "Logged in as:": "아이디:",
     "Logout": "로그아웃",
-    "Low priority": "낮은 우선순위",
-    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s님이 이후 방의 기록을 볼 수 있게 하셨어요 방 구성원 모두, 초대받은 시점부터.",
-    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s님이 이후 방의 기록을 볼 수 있게 하셨어요 방 구성원 모두, 방에 들어온 시점부터.",
-    "%(senderName)s made future room history visible to all room members.": "%(senderName)s님이 이후 방의 기록을 볼 수 있게 하셨어요 방 구성원 모두.",
-    "%(senderName)s made future room history visible to anyone.": "%(senderName)s님이 이후 방의 기록을 볼 수 있게 하셨어요 누구나.",
-    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s님이 이후 방의 기록을 볼 수 있게 하셨어요 알 수 없음 (%(visibility)s).",
+    "Low priority": "숨긴 방",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s님이 이후 방 구성원 모두, 초대받은 시점부터 방의 기록을 볼 수 있게 했습니다.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s님이 이후 방 구성원 모두, 들어온 시점부터 방의 기록을 볼 수 있게 했습니다.",
+    "%(senderName)s made future room history visible to all room members.": "%(senderName)s님이 이후 방 구성원 모두 방의 기록을 볼 수 있게 했습니다.",
+    "%(senderName)s made future room history visible to anyone.": "%(senderName)s님이 이후 누구나 방의 기록을 볼 수 있게 했습니다.",
+    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s님이 이후 알 수 없음(%(visibility)s)이 방의 기록을 볼 수 있게 했습니다.",
     "Manage Integrations": "통합 관리",
-    "Markdown is disabled": "마크다운이 꺼져있어요",
-    "Markdown is enabled": "마크다운이 켜져있어요",
+    "Markdown is disabled": "마크다운이 꺼져 있습니다.",
+    "Markdown is enabled": "마크다운이 켜져 있습니다.",
     "matrix-react-sdk version:": "matrix-react-sdk 버전:",
-    "Message not sent due to unknown devices being present": "알 수 없는 장치가 있어 메시지를 보내지 못했어요",
-    "Missing room_id in request": "요청에서 방_id가 빠졌어요",
-    "Missing user_id in request": "요청에서 사용자_id가 빠졌어요",
+    "Message not sent due to unknown devices being present": "알 수 없는 기기가 있어 메시지를 보내지 못했습니다.",
+    "Missing room_id in request": "요청에서 room_id가 빠졌습니다.",
+    "Missing user_id in request": "요청에서 user_id가 빠졌습니다",
     "Mobile phone number": "휴대 전화번호",
     "Mobile phone number (optional)": "휴대 전화번호 (선택)",
     "Moderator": "조정자",
     "Name": "이름",
-    "Never send encrypted messages to unverified devices from this device": "이 장치에서 인증받지 않은 장치로 암호화한 메시지를 보내지 마세요",
-    "Never send encrypted messages to unverified devices in this room from this device": "이 장치에서 이 방의 인증받지 않은 장치로 암호화한 메시지를 보내지 마세요",
+    "Never send encrypted messages to unverified devices from this device": "이 기기에서는 절대 인증받지 않은 기기에게 암호화한 메시지를 보내지 않기",
+    "Never send encrypted messages to unverified devices in this room from this device": "이 기기에서 이 방의 인증받지 않은 기기로 암호화한 메시지를 보내지 마세요",
     "New address (e.g. #foo:%(localDomain)s)": "새 주소 (예. #foo:%(localDomain)s)",
     "New password": "새 비밀번호",
     "New passwords don't match": "새 비밀번호가 맞지 않아요",
     "New passwords must match each other.": "새 비밀번호는 서로 같아야 해요.",
     "none": "없음",
-    "not set": "설정하지 않았어요",
-    "not specified": "지정하지 않았어요",
-    "(not supported by this browser)": "(이 브라우저에서는 지원하지 않아요)",
+    "not set": "설정하지 않았습니다.",
+    "not specified": "지정하지 않았습니다.",
+    "(not supported by this browser)": "(이 브라우저에서 지원하지 않습니다.)",
     "": "<지원하지 않아요>",
     "NOT verified": "확인하지 않음",
-    "No devices with registered encryption keys": "등록한 암호화 키가 있는 장치가 없어요",
-    "No display name": "별명이 없어요",
-    "No more results": "더 이상 결과가 없어요",
+    "No devices with registered encryption keys": "등록된 암호화 열쇠가 있는 기기가 없습니다.",
+    "No display name": "별명이 없습니다.",
+    "No more results": "더 이상 결과가 없습니다.",
     "No results": "결과 없음",
-    "No users have specific privileges in this room": "이 방에 지정한 권한의 사용자가 없어요",
+    "No users have specific privileges in this room": "이 방에 지정한 권한의 사용자가 없습니다.",
     "olm version:": "olm 버전:",
     "Password": "비밀번호",
     "Password:": "비밀번호:",
-    "Passwords can't be empty": "비밀번호는 비울 수 없어요",
+    "Passwords can't be empty": "비밀번호를 입력해 주세요.",
     "Permissions": "권한",
     "People": "사람들",
     "Phone": "전화",
-    "Once encryption is enabled for a room it cannot be turned off again (for now)": "방을 암호화하면 암호화를 도중에 끌 수 없어요. (현재로서는)",
+    "Once encryption is enabled for a room it cannot be turned off again (for now)": "(현재로서는) 방을 암호화하면 되돌릴 수 없습니다",
     "Only people who have been invited": "초대받은 사람만",
-    "%(senderName)s placed a %(callType)s call.": "%(senderName)s님이 %(callType)s 전화를 걸었어요.",
+    "%(senderName)s placed a %(callType)s call.": "%(senderName)s님이 %(callType)s 전화를 걸었습니다.",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "이메일을 확인하시고 그 안에 있는 주소를 누르세요. 이 일을 하고 나서, 계속하기를 누르세요.",
     "Power level must be positive integer.": "권한 등급은 양의 정수여야만 해요.",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (권한 %(powerLevelNumber)s)",
-    "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "사용자를 자신과 같은 권한 등급으로 승급시키면 되돌릴 수 없어요.",
+    "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "사용자를 자신과 같은 권한 등급으로 승급시는 것이기에 되돌릴 수 없습니다.",
     "Privacy warning": "개인정보 경고",
-    "Private Chat": "비공개 이야기",
+    "Private Chat": "비공개 대화",
     "Privileged Users": "권한 있는 사용자",
-    "Profile": "자기 소개",
-    "%(senderName)s removed their profile picture.": "%(senderName)s님이 자기 소개 사진을 지우셨어요.",
-    "%(senderName)s set a profile picture.": "%(senderName)s님이 자기 소개 사진을 설정하셨어요.",
-    "Public Chat": "공개 이야기",
+    "Profile": "프로필",
+    "%(senderName)s removed their profile picture.": "%(senderName)s님이 프로필 사진을 제거했습니다.",
+    "%(senderName)s set a profile picture.": "%(senderName)s님이 프로필 사진을 설정했습니다.",
+    "Public Chat": "공개 대화",
     "Reason": "이유",
     "Reason: %(reasonText)s": "이유: %(reasonText)s",
     "Revoke Moderator": "조정자 철회",
-    "Refer a friend to Riot:": "라이엇을 친구에게 추천해주세요:",
+    "Refer a friend to Riot:": "Riot을 친구에게 추천해주세요:",
     "Register": "등록",
-    "%(targetName)s rejected the invitation.": "%(targetName)s님이 초대를 거절하셨어요.",
+    "%(targetName)s rejected the invitation.": "%(targetName)s님이 초대를 거절했습니다.",
     "Reject invitation": "초대 거절",
     "Rejoin": "다시 들어가기",
     "Remote addresses for this room:": "이 방의 원격 주소:",
-    "Remove Contact Information?": "연락처를 지우시겠어요?",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s님이 별명 (%(oldDisplayName)s)을 지우셨어요.",
-    "Remove %(threePid)s?": "%(threePid)s 지우시겠어요?",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s님이 인터넷전화 회의를 요청하셨어요.",
-    "Resetting password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "비밀번호를 다시 설정하면 현재 모든 장치의 종단간 암호화 키가 다시 설정되고, 먼저 방의 키를 내보내고 나중에 다시 불러오지 않는 한, 암호화한 이야기 기록을 읽을 수 없게 되어요. 앞으로는 이 기능을 더 좋게 만들 거에요.",
+    "Remove Contact Information?": "연락처 정보를 제거하시겠어요?",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s님이 별명(%(oldDisplayName)s)을 제거했습니다.",
+    "Remove %(threePid)s?": "%(threePid)s를(을) 제거하시겠어요?",
+    "%(senderName)s requested a VoIP conference.": "%(senderName)s님이 VoIP 회의를 요청했습니다.",
+    "Resetting password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "비밀번호를 다시 설정하면 현재 모든 기기의 종단 간 암호화 키가 다시 설정되고, 먼저 방의 키를 내보내고 나중에 다시 불러오지 않는 한, 암호화한 대화 기록을 읽을 수 없게 됩니다. 이 부분은 향상시키겠습니다.",
     "Results from DuckDuckGo": "덕덕고에서 검색한 결과",
     "Return to login screen": "로그인 화면으로 돌아가기",
-    "Riot does not have permission to send you notifications - please check your browser settings": "라이엇에게 알릴 권한이 없어요 - 브라우저 설정을 확인해주세요",
-    "Riot was not given permission to send notifications - please try again": "라이엇이 알릴 권한을 받지 못했어요 - 다시 해주세요",
-    "riot-web version:": "라이엇 웹 버전:",
+    "Riot does not have permission to send you notifications - please check your browser settings": "Riot은 알림을 보낼 권한을 가지고 있지 않습니다. 브라우저 설정을 확인해주세요",
+    "Riot was not given permission to send notifications - please try again": "Riot이 알림을 보낼 권한을 받지 못했습니다. 다시 해주세요",
+    "riot-web version:": "Riot 웹 버전:",
     "Room %(roomId)s not visible": "방 %(roomId)s은 보이지 않아요",
-    "Room Colour": "방 색상",
-    "Room contains unknown devices": "방에 알 수 없는 장치가 있어요",
+    "Room Colour": "방 색",
+    "Room contains unknown devices": "방에 알 수 없는 기기가 있습니다.",
     "Room name (optional)": "방 이름 (선택)",
     "%(roomName)s does not exist.": "%(roomName)s은 없는 방이에요.",
-    "%(roomName)s is not accessible at this time.": "현재는 %(roomName)s에 들어갈 수 없어요.",
+    "%(roomName)s is not accessible at this time.": "현재는 %(roomName)s에 들어갈 수 없습니다.",
     "Rooms": "방",
     "Save": "저장",
     "Scroll to bottom of page": "화면 맨 아래로 이동",
@@ -328,90 +328,90 @@
     "Searches DuckDuckGo for results": "덕덕고에서 검색",
     "Seen by %(userName)s at %(dateTime)s": "%(userName)s님이 %(dateTime)s에 확인",
     "Send anyway": "그래도 보내기",
-    "Sender device information": "보낸 장치의 정보",
+    "Sender device information": "보낸 기기의 정보",
     "Send Invites": "초대 보내기",
     "Send Reset Email": "재설정 이메일 보내기",
-    "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s님이 사진을 보냈어요.",
-    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s님이 %(targetDisplayName)s님에게 들어오라는 초대를 보냈어요.",
+    "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s님이 사진을 보냈습니다.",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "방에 들어오라고 %(senderName)s님이 %(targetDisplayName)s님에게 초대를 보냈습니다.",
     "Server error": "서버 오류",
-    "Server may be unavailable or overloaded": "서버를 쓸 수 없거나 과부하일 수 있어요",
+    "Server may be unavailable or overloaded": "서버가 사용 불가하거나 과부하가 걸렸을 수 있습니다.",
     "Server may be unavailable, overloaded, or search timed out :(": "서버를 쓸 수 없거나 과부하거나, 검색 시간을 초과했어요 :(",
     "Server may be unavailable, overloaded, or the file too big": "서버를 쓸 수 없거나 과부하거나, 파일이 너무 커요",
-    "Server may be unavailable, overloaded, or you hit a bug.": "서버를 쓸 수 없거나 과부하거나, 오류에요.",
-    "Server unavailable, overloaded, or something else went wrong.": "서버를 쓸 수 없거나 과부하거나, 다른 문제가 있어요.",
+    "Server may be unavailable, overloaded, or you hit a bug.": "서버를 쓸 수 없거나 과부하거나, 오류입니다.",
+    "Server unavailable, overloaded, or something else went wrong.": "서버를 쓸 수 없거나 과부하거나, 다른 문제가 있습니다.",
     "Session ID": "세션 ID",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s님이 별명을 %(displayName)s로 바꾸셨어요.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s님이 별명을 %(displayName)s로 설정했습니다.",
     "Show panel": "패널 보이기",
     "Show Text Formatting Toolbar": "문자 서식 도구 보이기",
-    "Show timestamps in 12 hour format (e.g. 2:30pm)": "시간을 12시간제로 보이기 (예. 오후 2:30)",
+    "Show timestamps in 12 hour format (e.g. 2:30pm)": "시간을 12시간제로 보여 주기(예. 오후 2:30)",
     "Signed Out": "로그아웃함",
     "Sign in": "로그인",
     "Sign out": "로그아웃",
-    "%(count)s of your messages have not been sent.|other": "일부 메시지는 보내지 못했어요.",
+    "%(count)s of your messages have not been sent.|other": "일부 메시지는 보내지 못했습니다.",
     "Someone": "다른 사람",
-    "Start a chat": "이야기하기",
+    "Start a chat": "대화 시작하기",
     "Start authentication": "인증하기",
-    "Start Chat": "이야기하기",
+    "Start Chat": "대화하기",
     "Submit": "보내기",
     "Success": "성공",
-    "Tagged as: ": "지정함: ",
+    "Tagged as: ": "태그: ",
     "The default role for new room members is": "방 새 구성원의 기본 역할",
     "The main address for this room is": "이 방의 주요 주소",
-    "The phone number entered looks invalid": "입력한 전화번호가 잘못된 거 같아요",
-    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "입력한 서명 키는 %(userId)s님의 장치 %(deviceId)s에서 받은 서명 키와 일치하네요. 인증한 장치로 표시할게요.",
-    "This email address is already in use": "이 이메일 주소는 사용중이에요",
-    "This email address was not found": "이 이메일 주소를 찾지 못했어요",
+    "The phone number entered looks invalid": "입력된 전화번호가 잘못된 것 같습니다",
+    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "입력한 서명 키는 %(userId)s님의 기기 %(deviceId)s에서 받은 서명 키와 일치하네요. 인증한 기기라고 표시했습니다.",
+    "This email address is already in use": "이 이메일 주소는 이미 사용 중입니다",
+    "This email address was not found": "이 이메일 주소를 찾지 못했습니다.",
     "The email address linked to your account must be entered.": "계정에 연결한 이메일 주소를 입력해야 해요.",
-    "The file '%(fileName)s' exceeds this home server's size limit for uploads": "'%(fileName)s' 파일이 홈 서버에 올릴 수 있는 한계 크기를 초과했어요",
-    "The file '%(fileName)s' failed to upload": "'%(fileName)s' 파일을 올리지 못했어요",
-    "The remote side failed to pick up": "원격 측에서 찾지 못했어요",
+    "The file '%(fileName)s' exceeds this home server's size limit for uploads": "'%(fileName)s' 파일이 홈 서버에 올릴 수 있는 한계 크기를 초과했습니다.",
+    "The file '%(fileName)s' failed to upload": "'%(fileName)s' 파일을 올리지 못했습니다.",
+    "The remote side failed to pick up": "상대방이 받지 못했습니다",
     "This Home Server does not support login using email address.": "이 홈 서버는 이메일 주소 로그인을 지원하지 않아요.",
-    "This invitation was sent to an email address which is not associated with this account:": "이 초대는 이 계정과 연결되지 않은 이메일 주소로 보냈어요:",
-    "This room has no local addresses": "이 방은 로컬 주소가 없어요",
+    "This invitation was sent to an email address which is not associated with this account:": "이 초대는 이 계정과 연결되지 않은 이메일 주소로 보냈습니다:",
+    "This room has no local addresses": "이 방은 로컬 주소가 없습니다.",
     "This room is not recognised.": "이 방은 드러나지 않아요.",
-    "These are experimental features that may break in unexpected ways": "예상치 못한 방법으로 망가질 지도 모르는 실험 기능이에요",
-    "The visibility of existing history will be unchanged": "기존 기록은 볼 수 있는 대상이 바뀌지 않아요",
+    "These are experimental features that may break in unexpected ways": "예상치 못하게 망가질 수 있는 실험적인 기능입니다",
+    "The visibility of existing history will be unchanged": "기존 기록은 이전처럼 계속 볼 수 있습니다",
     "This doesn't appear to be a valid email address": "올바르지 않은 이메일 주소로 보여요",
-    "This is a preview of this room. Room interactions have been disabled": "방을 미리보는 거에요. 상호작용은 보이지 않아요",
-    "This phone number is already in use": "이 전화번호는 사용중이에요",
+    "This is a preview of this room. Room interactions have been disabled": "방을 미리 보고 있습니다. 방에 들어가셔야 방 구성원들과 소통하실 수 있습니다.",
+    "This phone number is already in use": "이 전화번호는 이미 사용 중입니다",
     "This room": "이 방",
-    "This room is not accessible by remote Matrix servers": "이 방은 원격 매트릭스 서버에 접근할 수 없어요",
+    "This room is not accessible by remote Matrix servers": "이 방은 원격 매트릭스 서버에 접근할 수 없습니다.",
     "This room's internal ID is": "방의 내부 ID",
     "To link to a room it must have an address.": "방에 연결하려면 주소가 있어야 해요.",
     "To reset your password, enter the email address linked to your account": "비밀번호을 다시 설정하려면, 계정과 연결한 이메일 주소를 입력해주세요",
     "To use it, just wait for autocomplete results to load and tab through them.": "이 기능을 사용하시려면, 자동완성 결과가 나오길 기다리신 뒤에 탭으로 움직여주세요.",
-    "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "이 방의 타임라인에서 특정 시점을 불러오려고 했지만, 문제의 메시지를 볼 수 있는 권한이 없어요.",
-    "Tried to load a specific point in this room's timeline, but was unable to find it.": "이 방의 타임라인에서 특정 시점을 불러오려고 했지만, 찾을 수 없었어요.",
+    "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "이 방의 타임라인에서 특정 시점을 불러오려고 했지만, 문제의 메시지를 볼 수 있는 권한이 없습니다.",
+    "Tried to load a specific point in this room's timeline, but was unable to find it.": "이 방의 타임라인에서 특정 시점을 불러오려고 했지만, 찾을 수 없었습니다.",
     "Turn Markdown off": "마크다운 끄기",
     "Turn Markdown on": "마크다운 켜기",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s님이 종단간 암호화를 켜셨어요 (알고리즘 %(algorithm)s).",
-    "Unable to add email address": "이메일 주소를 추가할 수 없어요",
-    "Unable to remove contact information": "연락처를 지울 수 없어요",
-    "Unable to verify email address.": "이메일 주소를 인증할 수 없어요.",
-    "Unban": "차단풀기",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s님이 %(targetName)s님의 차단을 푸셨어요.",
-    "Unable to ascertain that the address this invite was sent to matches one associated with your account.": "이 이매알 주소가 초대를 받은 계정과 연결된 주소가 맞는지 확인할 수 없어요.",
-    "Unable to capture screen": "화면을 찍을 수 없어요",
-    "Unable to enable Notifications": "알림을 켤 수 없어요",
-    "Unable to load device list": "장치 목록을 불러올 수 없어요",
+    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s님이 종단 간 암호화를 켰습니다(%(algorithm)s 알고리즘).",
+    "Unable to add email address": "이메일 주소를 추가할 수 없습니다.",
+    "Unable to remove contact information": "연락처 정보를 제거할 수 없습니다.",
+    "Unable to verify email address.": "이메일 주소를 인증할 수 없습니다.",
+    "Unban": "차단 해제",
+    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s님이 %(targetName)s님에 대한 차단을 해제했습니다.",
+    "Unable to ascertain that the address this invite was sent to matches one associated with your account.": "이 이매알 주소가 초대를 받은 계정과 연결된 주소가 맞는지 확인할 수 없습니다.",
+    "Unable to capture screen": "화면을 찍을 수 없습니다",
+    "Unable to enable Notifications": "알림을 사용할 수 없습니다.",
+    "Unable to load device list": "기기 목록을 불러올 수 없습니다.",
     "Undecryptable": "해독할 수 없는",
     "Unencrypted room": "암호화하지 않은 방",
     "unencrypted": "암호화하지 않음",
     "Unencrypted message": "암호화하지 않은 메시지",
     "unknown caller": "알 수 없는 발신자",
-    "unknown device": "알 수 없는 장치",
+    "unknown device": "알 수 없는 기기",
     "Unknown room %(roomId)s": "알 수 없는 방 %(roomId)s",
-    "Unknown (user, device) pair:": "알 수 없는 (사용자, 장치) 연결:",
-    "Unmute": "소리 켜기",
+    "Unknown (user, device) pair:": "알 수 없는 (사용자, 기기) 연결:",
+    "Unmute": "음소거 끄기",
     "Unnamed Room": "이름 없는 방",
     "Unrecognised command:": "인식 할 수 없는 명령:",
-    "Unrecognised room alias:": "인식할 수 없는 방 가명:",
+    "Unrecognised room alias:": "인식할 수 없는 방 별칭:",
     "Unverified": "인증하지 않음",
     "Uploading %(filename)s and %(count)s others|zero": "%(filename)s 올리는 중",
     "Uploading %(filename)s and %(count)s others|one": "%(filename)s 외 %(count)s 올리는 중",
     "Uploading %(filename)s and %(count)s others|other": "%(filename)s 외 %(count)s 올리는 중",
     "Upload avatar": "아바타 올리기",
-    "Upload Failed": "파일을 올리지 못했어요",
+    "Upload Failed": "파일을 올리지 못했습니다.",
     "Upload Files": "파일 올리기",
     "Upload file": "파일 올리기",
     "Upload new:": "새로 올리기:",
@@ -421,58 +421,58 @@
     "User ID": "사용자 ID",
     "User Interface": "사용자 인터페이스",
     "User name": "사용자 이름",
-    "Username invalid: %(errMessage)s": "사용자 이름을 인식할 수 없어요: %(errMessage)s",
+    "Username invalid: %(errMessage)s": "잘못된 사용자 이름입니다: %(errMessage)s",
     "Users": "사용자들",
     "Verification Pending": "인증을 기다리는 중",
     "Verification": "인증",
     "verified": "인증함",
     "Verified": "인증함",
-    "Verified key": "인증한 키",
-    "Video call": "영상통화",
-    "Voice call": "음성통화",
-    "VoIP conference finished.": "인터넷전화 회의를 마쳤어요.",
-    "VoIP conference started.": "인터넷전화 회의를 시작했어요.",
-    "VoIP is unsupported": "인터넷전화를 지원하지 않아요",
-    "(could not connect media)": "(미디어에 연결할 수 없어요)",
+    "Verified key": "인증한 열쇠",
+    "Video call": "영상 통화하기",
+    "Voice call": "음성 통화하기",
+    "VoIP conference finished.": "VoIP 회의를 마쳤습니다.",
+    "VoIP conference started.": "VoIP 회의를 시작했습니다.",
+    "VoIP is unsupported": "VoIP는 지원하지 않습니다",
+    "(could not connect media)": "(미디어에 연결할 수 없었습니다.)",
     "(no answer)": "(응답 없음)",
     "(unknown failure: %(reason)s)": "(알 수 없는 오류: %(reason)s)",
     "(warning: cannot be disabled again!)": "(주의: 다시 끌 수 없어요!)",
     "Warning!": "주의!",
-    "WARNING: Device already verified, but keys do NOT MATCH!": "주의: 장치는 이미 인증했지만, 키가 맞지 않아요!",
+    "WARNING: Device already verified, but keys do NOT MATCH!": "주의: 기기는 이미 인증했지만, 열쇠가 맞지 않아요!",
     "Who can access this room?": "누가 이 방에 들어올 수 있나요?",
     "Who can read history?": "누가 기록을 읽을 수 있나요?",
     "Who would you like to add to this room?": "이 방에 누구를 초대하고 싶으세요?",
-    "Who would you like to communicate with?": "누구와 이야기하고 싶으세요?",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s님이 %(targetName)s니의 초대를 취소하셨어요.",
+    "Who would you like to communicate with?": "누구와 대화하고 싶으세요?",
+    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s님이 %(targetName)s님의 초대를 거절했습니다.",
     "Would you like to accept or decline this invitation?": "초대를 받아들이거나 거절하시겠어요?",
-    "You already have existing direct chats with this user:": "이미 이 사용자와 직접 이야기하는 중이에요:",
-    "You are already in a call.": "이미 자신이 통화 중이네요.",
-    "Press  to start a chat with someone": "다른 사람과 이야기하려면 을 누르세요",
-    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "주의: 키 확인 실패! %(userId)s와 장치 %(deviceId)s의 서명 키 \"%(fprint)s\"는 주어진 키 \"%(fingerprint)s\"와 맞지 않아요. 누가 이야기를 가로채는 중일 수도 있어요!",
-    "You're not in any rooms yet! Press  to make a room or  to browse the directory": "어떤 방에도 들어가 있지 않으세요! 을 눌러서 방을 만들거나 를 눌러 목록에서 방을 찾아보세요",
-    "You are trying to access %(roomName)s.": "%(roomName)s에 들어가려고 하는 중이에요.",
-    "You cannot place a call with yourself.": "자신에게 전화를 걸 수는 없어요.",
-    "You cannot place VoIP calls in this browser.": "이 브라우저에서는 인터넷전화를 걸 수 없어요.",
-    "You do not have permission to post to this room": "이 방에서 글을 올릴 권한이 없어요",
-    "You have been banned from %(roomName)s by %(userName)s.": "%(userName)s님이 %(roomName)s에서 차단하셨어요.",
-    "You have been invited to join this room by %(inviterName)s": "%(inviterName)s님이 이 방에 초대하셨어요",
-    "You have been kicked from %(roomName)s by %(userName)s.": "%(userName)s님이 %(roomName)s에서 추방하셨어요.",
-    "You have been logged out of all devices and will no longer receive push notifications. To re-enable notifications, sign in again on each device": "모든 장치에서 로그아웃되었고 더 이상 알림을 받지 않으실 거에요. 다시 알림을 받으시려면, 각 장치에 로그인해주세요",
-    "You have disabled URL previews by default.": "URL 미리보기 쓰지 않기를 기본으로 하셨어요.",
-    "You have enabled URL previews by default.": "URL 미리보기 쓰기를 기본으로 하셨어요.",
-    "You have no visible notifications": "보여드릴 알림이 없어요",
-    "You may wish to login with a different account, or add this email to this account.": "다른 계정으로 로그인하거나, 이 이메일을 이 계정에 추가할 수도 있어요.",
+    "You already have existing direct chats with this user:": "이미 직접 대화 중인 사용자:",
+    "You are already in a call.": "이미 통화하고 계시잖아요.",
+    "Press  to start a chat with someone": "다른 사람과 대화하려면 을 누르세요.",
+    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "주의: 열쇠 확인에 실패했습니다! %(userId)s와 %(deviceId)s 기기의 서명 키 \"%(fprint)s\"는 주어진 키 \"%(fingerprint)s\"와 맞지 않습니다. 누군가 대화를 엿듣는 중일 수도 있습니다!",
+    "You're not in any rooms yet! Press  to make a room or  to browse the directory": "아직 어떤 방에도 들어가 있지 않아요! 을 눌러서 방을 만들거나 을 눌러 목록에서 방을 찾아보세요",
+    "You are trying to access %(roomName)s.": "%(roomName)s에 들어가려고 하는 중입니다.",
+    "You cannot place a call with yourself.": "자기 자신에게는 전화를 걸 수 없습니다.",
+    "You cannot place VoIP calls in this browser.": "이 브라우저에서는 VoIP 전화를 걸 수 없습니다.",
+    "You do not have permission to post to this room": "이 방에서 글을 올릴 권한이 없습니다.",
+    "You have been banned from %(roomName)s by %(userName)s.": "%(userName)s님에 의해 %(roomName)s에서 차단당했습니다.",
+    "You have been invited to join this room by %(inviterName)s": "%(inviterName)s님이 이 방에 초대하셨습니다.",
+    "You have been kicked from %(roomName)s by %(userName)s.": "%(userName)s님에 의해 %(roomName)s에서 추방당했습니다.",
+    "You have been logged out of all devices and will no longer receive push notifications. To re-enable notifications, sign in again on each device": "모든 기기에서 로그아웃되었고 더 이상 알림을 받지 않으실 거에요. 다시 알림을 받으시려면, 각 기기에 로그인해주세요.",
+    "You have disabled URL previews by default.": "기본으로 URL 미리보기를 사용 중지했습니다.",
+    "You have enabled URL previews by default.": "URL 미리보기를 기본으로 사용했습니다.",
+    "You have no visible notifications": "보여줄 수 있는 알림이 없습니다.",
+    "You may wish to login with a different account, or add this email to this account.": "다른 계정으로 로그인하거나, 이 이메일을 이 계정에 추가할 수도 있습니다.",
     "You must register to use this functionality": "이 기능을 쓰시려면 계정을 등록하셔야 해요",
     "You need to be able to invite users to do that.": "그러려면 사용자를 초대하실 수 있어야 해요.",
     "You need to be logged in.": "로그인하셔야 해요.",
     "You need to enter a user name.": "사용자 이름을 입력하셔야 해요.",
-    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "이메일 주소가 이 홈 서버의 매트릭스 ID와 관련이 없어요.",
-    "Your password has been reset": "비밀번호를 다시 설정했어요",
-    "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "비밀번호를 바꾸었어요. 다른 장치에서 다시 로그인할 때까지 알림을 받지 않을 거에요",
+    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "이메일 주소가 이 홈 서버의 매트릭스 ID와 관련이 없는 것 같습니다.",
+    "Your password has been reset": "비밀번호를 다시 설정했습니다.",
+    "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "비밀번호를 바꿨습니다. 다른 기기에서는 다시 로그인할 때까지 푸시 알림을 받지 않을 겁니다",
     "You seem to be in a call, are you sure you want to quit?": "전화 중인데, 끊으시겠어요?",
     "You seem to be uploading files, are you sure you want to quit?": "파일을 올리는 중인데, 그만두시겠어요?",
     "You should not yet trust it to secure data": "안전한 자료를 위해서는 아직 믿으시면 안돼요",
-    "Your home server does not support device management.": "홈 서버가 장치 관리를 지원하지 않아요.",
+    "Your home server does not support device management.": "홈 서버가 기기 관리를 지원하지 않습니다.",
     "Sun": "일",
     "Mon": "월",
     "Tue": "화",
@@ -492,29 +492,29 @@
     "Oct": "10월",
     "Nov": "11월",
     "Dec": "12월",
-    "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s일 %(time)s",
-    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s일 %(fullYear)s년 %(time)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(monthName)s %(day)s일 %(weekDayName)s요일 %(time)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(fullYear)s년 %(monthName)s %(day)s일 %(weekDayName)s요일 %(time)s",
     "%(weekDayName)s %(time)s": "%(weekDayName)s, %(time)s",
-    "Set a display name:": "별명 설정:",
+    "Set a display name:": "별명 설정하기:",
     "Upload an avatar:": "아바타 올리기:",
-    "This server does not support authentication with a phone number.": "이 서버는 전화번호 인증을 지원하지 않아요.",
-    "Missing password.": "비밀번호를 틀렸어요.",
+    "This server does not support authentication with a phone number.": "이 서버는 전화번호 인증을 지원하지 않습니다.",
+    "Missing password.": "비밀번호가 없습니다.",
     "Passwords don't match.": "비밀번호가 맞지 않아요.",
     "Password too short (min %(MIN_PASSWORD_LENGTH)s).": "비밀번호가 너무 짧아요 (min %(MIN_PASSWORD_LENGTH)s).",
     "This doesn't look like a valid email address.": "유효한 이메일 주소가 아니에요.",
     "This doesn't look like a valid phone number.": "유효한 전화번호가 아니에요.",
-    "User names may only contain letters, numbers, dots, hyphens and underscores.": "사용자 이름은 문자, 숫자, 점, -(붙임표), _(밑줄 문자)만 쓸 수 있어요.",
-    "An unknown error occurred.": "알 수 없는 오류가 일어났어요.",
-    "I already have an account": "이미 계정이 있어요",
-    "An error occurred: %(error_string)s": "오류가 일어났어요: %(error_string)s",
+    "User names may only contain letters, numbers, dots, hyphens and underscores.": "사용자 이름은 문자, 숫자, 점, -(붙임표), _(밑줄 문자)만 쓸 수 있습니다.",
+    "An unknown error occurred.": "알 수 없는 오류가 일어났습니다.",
+    "I already have an account": "이미 계정이 있습니다.",
+    "An error occurred: %(error_string)s": "%(error_string)s 오류가 일어났습니다.",
     "Topic": "주제",
     "Make Moderator": "조정자 임명하기",
     "Make this room private": "이 방을 비공개로 만들기",
     "Share message history with new users": "메시지 기록을 새 사용자와 공유하기",
     "Encrypt room": "암호화한 방",
-    "There are no visible files in this room": "이 방에서 보여드릴 파일이 없어요",
+    "There are no visible files in this room": "이 방에는 보여줄 수 있는 파일이 없습니다.",
     "Room": "방",
-    "Connectivity to the server has been lost.": "서버 연결이 끊어졌어요.",
+    "Connectivity to the server has been lost.": "서버 연결이 끊어졌습니다.",
     "Sent messages will be stored until your connection has returned.": "보내신 메시지는 다시 연결될 때까지 저장할 거에요.",
     "(~%(count)s results)|one": "(~%(count)s 결과)",
     "(~%(count)s results)|other": "(~%(count)s 결과)",
@@ -531,61 +531,61 @@
     "New Password": "새 비밀번호",
     "Start automatically after system login": "컴퓨터를 시작할 때 자동으로 실행하기",
     "Desktop specific": "컴퓨터 설정",
-    "Analytics": "정보 수집",
+    "Analytics": "정보 분석",
     "Options": "선택권",
-    "Riot collects anonymous analytics to allow us to improve the application.": "라이엇은 익명의 정보를 수집해 응용 프로그램을 개선한답니다.",
+    "Riot collects anonymous analytics to allow us to improve the application.": "Riot은 이 앱을 발전시키기 위해 익명으로 정보 분석을 수집합니다.",
     "Passphrases must match": "암호가 일치해야 해요",
-    "Passphrase must not be empty": "암호를 비우시면 안돼요",
+    "Passphrase must not be empty": "암호를 입력해 주세요.",
     "Export room keys": "방 키를 내보내기",
     "Confirm passphrase": "암호 확인",
     "File to import": "가져올 파일",
     "You must join the room to see its files": "파일을 보려면 방에 들어가야만 해요",
     "Reject all %(invitedRooms)s invites": "모든 %(invitedRooms)s의 초대를 거절하기",
-    "Start new chat": "새로 이야기하기",
-    "Failed to invite": "초대하지 못했어요",
-    "Failed to invite user": "사용자를 초대하지 못했어요",
-    "Failed to invite the following users to the %(roomName)s room:": "다음 사용자들을 %(roomName)s 방으로 초대하지 못했어요:",
+    "Start new chat": "새로 대화하기",
+    "Failed to invite": "초대하지 못했습니다.",
+    "Failed to invite user": "사용자를 초대하지 못했습니다.",
+    "Failed to invite the following users to the %(roomName)s room:": "다음 사용자들을 %(roomName)s 방으로 초대하지 못했습니다:",
     "Confirm Removal": "삭제 확인",
     "Unknown error": "알 수 없는 오류",
     "Incorrect password": "맞지 않는 비밀번호",
     "To continue, please enter your password.": "계속하시려면, 비밀번호를 입력해주세요.",
-    "This process allows you to export the keys for messages you have received in encrypted rooms to a local file. You will then be able to import the file into another Matrix client in the future, so that client will also be able to decrypt these messages.": "이 과정으로 암호화한 방에서 받은 메시지의 키를 로컬 파일로 내보낼 수 있어요. 너중에 다른 매트릭스 클라이언트로 파일을 불러올 수 있기 때문에, 그 클라이언트에서 메시지를 해독할 수도 있지요.",
-    "The exported file will allow anyone who can read it to decrypt any encrypted messages that you can see, so you should be careful to keep it secure. To help with this, you should enter a passphrase below, which will be used to encrypt the exported data. It will only be possible to import the data by using the same passphrase.": "내보낸 파일은 누구든지 암호화한 메시지를 해독해서 읽을 수 있게 하므로, 보안에 신경 써 주세요. 이를 위해, 내보낸 파일을 암호화하려하니, 아래에 암호를 입력해주세요. 같은 암호를 쓰셔야만 자료를 불러올 수 있어요.",
-    "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "이 과정으로 전에 다른 매트릭스 클라이언트에서 내보낸 암호화 키를 불러올 수 있어요. 그 다음에는 다른 클라이언트에서 해독할 수 있던 어떤 메시지라도 해독할 수 있을 거에요.",
-    "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "내보낸 파일은 암호로 보호하고 있어요. 파일을 해독하려면, 여기에 암호를 입력해주세요.",
-    "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "이 사건을 지우길 (없애길) 원하세요? 방 이름을 지우거나 주제를 바꾸시면, 되돌릴 수 없다는 걸 명심해주세요.",
-    "To verify that this device can be trusted, please contact its owner using some other means (e.g. in person or a phone call) and ask them whether the key they see in their User Settings for this device matches the key below:": "이 장치를 믿을 수 있는지 확인하시려면, 몇 가지 방법(예를 들자면 직접 만나거나 전화를 걸어서)으로 소유자에게 연락하시고 그들이 사용자 설정에서 보는 키와 아래 키가 같은지 물어보세요:",
-    "Device name": "장치 이름",
-    "Device Name": "장치 이름",
-    "Device key": "장치 키",
-    "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this device and you probably want to press the blacklist button instead.": "맞다면, 아래 인증 버튼을 누르세요. 맞지 않다면, 다른 사람이 이 장치를 가로채고 있으니 요주의 버튼을 누르시고 싶으실 거 같네요.",
-    "In future this verification process will be more sophisticated.": "앞으로는 이 확인 과정이 더 정교해질 거에요.",
-    "Verify device": "인증한 장치",
-    "I verify that the keys match": "키가 맞는 걸 확인했어요",
-    "Unable to restore session": "세션을 복구할 수 없어요",
-    "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.": "이전에 더 최근 버전의 라이엇을 쓰셨다면, 이 버전과 맞지 않을 거에요. 창을 닫고 더 최근 버전으로 돌아가세요.",
-    "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "현재 인증하지 않은 장치를 요주의로 지정하셨어요. 이 장치들에 메시지를 보내려면 인증을 해야 해요.",
-    "We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "각 장치가 알맞은 소유자에게 속해 있는지 인증 과정을 거치길 추천하지만, 원하신다면 그러지 않고 메시지를 다시 보내실 수 있어요.",
-    "\"%(RoomName)s\" contains devices that you haven't seen before.": "\"%(RoomName)s\"에 본 적 없는 장치가 있어요.",
-    "Unknown devices": "알 수 없는 장치",
+    "This process allows you to export the keys for messages you have received in encrypted rooms to a local file. You will then be able to import the file into another Matrix client in the future, so that client will also be able to decrypt these messages.": "이 과정으로 암호화한 방에서 받은 메시지의 키를 로컬 파일로 내보낼 수 있습니다. 너중에 다른 매트릭스 클라이언트로 파일을 불러올 수 있기 때문에, 그 클라이언트에서 메시지를 해독할 수도 있죠.",
+    "The exported file will allow anyone who can read it to decrypt any encrypted messages that you can see, so you should be careful to keep it secure. To help with this, you should enter a passphrase below, which will be used to encrypt the exported data. It will only be possible to import the data by using the same passphrase.": "내보낸 파일이 있으면 누구든 암호화한 메시지를 해독해서 읽을 수 있으므로, 보안에 신경 써 주세요. 이런 이유로 인해, 아래에 암호를 입력해 내보낸 파일을 암호화하는 걸 추천합니다. 같은 암호를 사용해야만 자료를 불러올 수 있습니다.",
+    "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "이 과정으로 전에 다른 매트릭스 클라이언트에서 내보낸 암호화 키를 불러올 수 있습니다. 그 다음에는 다른 클라이언트에서 해독할 수 있던 어떤 메시지라도 해독할 수 있습니다.",
+    "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "내보낸 파일은 암호로 보호하고 있습니다. 파일을 해독하려면, 여기에 암호를 입력해주세요.",
+    "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "이 이벤트를 제거(삭제)하길 원하세요? 방 이름을 삭제하거나 주제를 바꾸면, 다시 복귀될 수도 있습니다.",
+    "To verify that this device can be trusted, please contact its owner using some other means (e.g. in person or a phone call) and ask them whether the key they see in their User Settings for this device matches the key below:": "이 기기를 믿을 수 있는지 인증하시려면, 다른 방법(예를 들자면 직접 만나거나 전화를 걸어서)으로 소유자 분에게 연락해, 사용자 설정에 있는 키가 아래 키와 같은지 물어보세요:",
+    "Device name": "기기 이름",
+    "Device Name": "기기 이름",
+    "Device key": "기기 열쇠",
+    "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this device and you probably want to press the blacklist button instead.": "키가 동일하다면, 아래의 인증하기 버튼을 누르세요. 혹시 키가 다르다면, 이 기기가 중간자 공격을 받고 있는 중인 것이므로 블랙리스트에 올려야 합니다.",
+    "In future this verification process will be more sophisticated.": "이 인증 과정은 앞으로 더 정교하게 개선시키겠습니다.",
+    "Verify device": "기기 인증하기",
+    "I verify that the keys match": "열쇠가 맞는지 인증합니다",
+    "Unable to restore session": "세션을 복구할 수 없습니다.",
+    "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.": "이전에 더 최근 버전의 Riot을 쓰셨다면, 이 버전과 맞지 않을 거에요. 창을 닫고 더 최근 버전으로 돌아가세요.",
+    "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "인증되지 않은 기기를 블랙리스트에 올리고 있습니다. 메시지를 보내려면 인증해야 합니다.",
+    "We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "각 기기가 알맞은 소유자에게 속해 있는지 인증 과정을 거치길 추천하지만, 원하신다면 그러지 않고도 메시지를 다시 보내실 수 있습니다.",
+    "\"%(RoomName)s\" contains devices that you haven't seen before.": "\"%(RoomName)s\"에 본 적이 없는 기기가 있습니다.",
+    "Unknown devices": "알 수 없는 기기",
     "Unknown Address": "알 수 없는 주소",
-    "Unblacklist": "요주의 취소",
-    "Blacklist": "요주의",
-    "Unverify": "확인 취소",
-    "Verify...": "확인...",
+    "Unblacklist": "블랙리스트에서 빼기",
+    "Blacklist": "블랙리스트에 올리기",
+    "Unverify": "인증 취소",
+    "Verify...": "인증하기...",
     "ex. @bob:example.com": "예. @bob:example.com",
     "Add User": "사용자 추가",
-    "This Home Server would like to make sure you are not a robot": "이 홈 서버는 당신이 로봇이 아닌지 확인하고 싶다네요",
+    "This Home Server would like to make sure you are not a robot": "이 홈 서버는 당신이 로봇이 아닌지 확인하고 싶다고 합니다.",
     "Sign in with CAS": "CAS로 로그인 하기",
     "Please check your email to continue registration.": "등록하시려면 이메일을 확인해주세요.",
     "Token incorrect": "토큰이 안 맞아요",
     "Please enter the code it contains:": "들어있던 코드를 입력해주세요:",
-    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "이메일 주소를 정하지 않으시면, 비밀번호를 다시 설정하실 수 없어요. 괜찮으신가요?",
+    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "이메일 주소를 정하지 않으면, 비밀번호를 다시 설정할 수 없습니다. 괜찮으신가요?",
     "You are registering with %(SelectedTeamName)s": "%(SelectedTeamName)s로 등록할게요",
     "Default server": "기본 서버",
     "What does this mean?": "무슨 뜻인가요?",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.": "사용자 지정 서버 설정에서 다른 홈 서버 URL을 지정해 다른 매트릭스 서버에 로그인 할 수 있어요.",
-    "This allows you to use this app with an existing Matrix account on a different home server.": "이를 통해 이 앱과 다른 홈 서버의 기존 매트릭스 계정을 함께 쓸 수 있죠.",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.": "사용자 지정 서버 설정에서 다른 홈 서버 URL을 지정해 다른 매트릭스 서버에 로그인 할 수 있습니다.",
+    "This allows you to use this app with an existing Matrix account on a different home server.": "이를 통해 이 앱과 다른 홈 서버의 기존 매트릭스 계정을 함께 쓸 수 있습니다.",
     "You can also set a custom identity server but this will typically prevent interaction with users based on email address.": "사용자 지정 ID 서버를 설정할 수도 있지만 보통 그런 경우엔 이메일 주소를 기반으로 한 사용자와 상호작용이 막힐 거에요.",
     "Custom server": "사용자 지정 서버",
     "Home server URL": "홈 서버 URL",
@@ -594,8 +594,8 @@
     "Error decrypting image": "사진 해독 오류",
     "Error decrypting video": "영상 해독 오류",
     "Add an Integration": "통합 추가",
-    "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "타사 사이트로 이동하는데 %(integrationsUrl)s에서 쓰도록 계정을 인증할 수 있어요. 계속하시겠어요?",
-    "Removed or unknown message type": "지웠거나 알 수 없는 메시지 유형",
+    "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "%(integrationsUrl)s에서 쓸 수 있도록 계정을 인증하려고 다른 사이트로 이동하고 있습니다. 계속하시겠어요?",
+    "Removed or unknown message type": "제거했거나 알 수 없는 메시지 유형",
     "URL Previews": "URL 미리보기",
     "Drop file here to upload": "올릴 파일을 여기에 놓으세요",
     " (unsupported)": " (지원하지 않음)",
@@ -605,167 +605,585 @@
     "Offline": "미접속",
     "Updates": "업데이트",
     "Check for update": "업데이트 확인",
-    "Start chatting": "이야기하기",
-    "Start Chatting": "이야기하기",
-    "Click on the button below to start chatting!": "이야기하려면 아래 버튼을 누르세요!",
-    "%(senderDisplayName)s changed the room avatar to ": "%(senderDisplayName)s님이 방 아바타를 로 바꾸셨어요",
-    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s님이 방 아바타를 지우셨어요.",
-    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s가 %(roomName)s 방의 아바타를 바꾸셨어요",
+    "Start chatting": "대화하기",
+    "Start Chatting": "대화하기",
+    "Click on the button below to start chatting!": "대화하려면 아래 버튼을 누르세요!",
+    "%(senderDisplayName)s changed the room avatar to ": "%(senderDisplayName)s님이 방 아바타를 로 바꿨습니다",
+    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s님이 방 아바타를 제거했습니다.",
+    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s님이 %(roomName)s의 아바타를 바꿨습니다",
     "Username available": "쓸 수 있는 사용자 이름",
     "Username not available": "쓸 수 없는 사용자 이름",
     "Something went wrong!": "문제가 생겼어요!",
     "This will be your account name on the  homeserver, or you can pick a different server.": "이건  홈 서버의 계정 이름이에요, 다른 서버를 고를 수도 있다는 거죠.",
     "If you already have a Matrix account you can log in instead.": "매트릭스 계정을 가지고 계시면 로그인하실 수도 있죠.",
-    "Your browser does not support the required cryptography extensions": "브라우저가 필요한 암호화 확장 기능을 지원하지 않아요",
-    "Not a valid Riot keyfile": "올바른 라이엇 키 파일이 아니에요",
-    "Authentication check failed: incorrect password?": "인증 확인 실패: 비밀번호를 틀리셨나요?",
-    "Disable Peer-to-Peer for 1:1 calls": "1:1 통화는 P2P 끄기",
+    "Your browser does not support the required cryptography extensions": "필요한 암호화 확장 기능을 브라우저가 지원하지 않습니다",
+    "Not a valid Riot keyfile": "올바른 Riot 열쇠 파일이 아닙니다",
+    "Authentication check failed: incorrect password?": "검증 확인 실패: 비밀번호를 틀리셨나요?",
+    "Disable Peer-to-Peer for 1:1 calls": "1:1 통화할 때는 P2P 비활성화하기",
     "Do you want to set an email address?": "이메일 주소를 설정하시겠어요?",
-    "This will allow you to reset your password and receive notifications.": "이렇게 하면 비밀번호를 다시 설정하고 알림을 받으실 수 있어요.",
+    "This will allow you to reset your password and receive notifications.": "이렇게 하면 비밀번호를 다시 설정하고 알림을 받으실 수 있습니다.",
     "To return to your account in future you need to set a password": "나중에 계정으로 돌아가려면 비밀번호를 설정하셔야 해요",
     "Skip": "건너뛰기",
     "Start verification": "인증 시작",
     "Share without verifying": "인증하지 않고 공유하기",
     "Ignore request": "요청 무시하기",
-    "You added a new device '%(displayName)s', which is requesting encryption keys.": "새 장치 '%(displayName)s'를 추가했고 암호화 키를 요청하고 있어요.",
-    "Your unverified device '%(displayName)s' is requesting encryption keys.": "인증하지 않은 장치 '%(displayName)s'가 암호화 키를 요청하고 있어요.",
+    "You added a new device '%(displayName)s', which is requesting encryption keys.": "암호화 열쇠를 요청하고 있는 새 기기 '%(displayName)s'를(을) 추가했습니다.",
+    "Your unverified device '%(displayName)s' is requesting encryption keys.": "인증되지 않은 기기 '%(displayName)s'가(이) 암호화 키를 요청하고 있습니다.",
     "Encryption key request": "암호화 키 요청",
     "Edit": "수정하기",
-    "Fetching third party location failed": "타사 위치를 불러오지 못했어요",
-    "A new version of Riot is available.": "라이엇의 새 버전을 사용하실 수 있어요.",
-    "Couldn't load home page": "중심 화면을 불러올 수 없어요",
-    "All notifications are currently disabled for all targets.": "현재 모든 알림이 모든 상대에게서 꺼졌어요.",
+    "Fetching third party location failed": "타사 위치를 불러오지 못했습니다.",
+    "A new version of Riot is available.": "Riot의 새 버전을 사용하실 수 있습니다.",
+    "Couldn't load home page": "홈 페이지를 불러올 수 없었습니다",
+    "All notifications are currently disabled for all targets.": "현재 모든 알림이 모든 대상에 대해 비활성화 돼 있습니다.",
     "Uploading report": "보고를 올리는 중",
     "Sunday": "일요일",
-    "Guests can join": "손님이 들어올 수 있어요",
-    "Messages sent by bot": "봇이 보낸 메시지",
+    "Guests can join": "손님이 들어올 수 있습니다",
+    "Messages sent by bot": "봇이 보낸 메시지를 받을 때",
     "Notification targets": "알림 대상",
-    "Failed to set direct chat tag": "직접 이야기 지정을 설정하지 못했어요",
+    "Failed to set direct chat tag": "직접 대화 태그를 설정하지 못했습니다.",
     "Today": "오늘",
-    "Failed to get protocol list from Home Server": "홈 서버에서 프로토콜 목록을 얻지 못했어요",
-    "You are not receiving desktop notifications": "컴퓨터 알림을 받지 않고 있어요",
+    "Failed to get protocol list from Home Server": "홈 서버에서 프로토콜 목록을 얻지 못했습니다.",
+    "You are not receiving desktop notifications": "컴퓨터 알림을 받지 않고 있습니다",
     "Friday": "금요일",
     "Update": "업데이트",
     "What's New": "새로운 점",
     "Add an email address above to configure email notifications": "이메일 알림을 설정하기 위해 이메일 주소를 추가해주세요",
     "Expand panel": "확장 패널",
     "On": "켜기",
-    "Filter room names": "방 이름 거르기",
+    "Filter room names": "방 이름 찾기",
     "Changelog": "바뀐 점",
     "Waiting for response from server": "서버에서 응답을 기다리는 중",
     "Leave": "떠나기",
     "Advanced notification settings": "고급 알림 설정",
     "delete the alias.": "가명을 지울게요.",
     "To return to your account in future you need to set a password": "나중에 계정으로 돌아가려면 비밀번호 설정을 해야만 해요",
-    "Forget": "잊기",
+    "Forget": "지우기",
     "World readable": "세계에 보이기",
     "Hide panel": "패널 숨기기",
-    "You cannot delete this image. (%(code)s)": "이 사진을 지우실 수 없어요. (%(code)s)",
+    "You cannot delete this image. (%(code)s)": "이 사진을 삭제하실 수 없습니다. (%(code)s)",
     "Cancel Sending": "보내기 취소",
     "Warning": "주의",
     "This Room": "방",
-    "The Home Server may be too old to support third party networks": "타사 네트워크를 지원하기에는 홈 서버가 너무 오래된 걸 수 있어요",
+    "The Home Server may be too old to support third party networks": "타사 네트워크를 지원하기에는 홈 서버가 너무 오래된 걸 수 있어요.",
     "Resend": "다시 보내기",
-    "Error saving email notification preferences": "이메일 알림을 설정하는데 오류가 일어났어요",
-    "Messages containing my display name": "내 별명이 적힌 메시지",
-    "Messages in one-to-one chats": "1:1 이야기의 메시지",
+    "Error saving email notification preferences": "이메일 알림을 설정하는 중에 오류가 났습니다.",
+    "Messages containing my display name": "내 별명이 포함된 메시지를 받을 때",
+    "Messages in one-to-one chats": "1:1 대화 메시지 받을 때",
     "Unavailable": "이용할 수 없음",
     "View Decrypted Source": "해독된 출처 보기",
     "Send": "보내기",
-    "remove %(name)s from the directory.": "목록에서 %(name)s을 지웠어요.",
-    "Notifications on the following keywords follow rules which can’t be displayed here:": "여기 표시될 수 없는 규칙에 따라 다음 키워드는 알리지 않아요:",
+    "remove %(name)s from the directory.": "목록에서 %(name)s를(을) 제거했습니다.",
+    "Notifications on the following keywords follow rules which can’t be displayed here:": "여기에 표시될 수 없는 규칙에 따르는 다음 키워드에 대한 알림:",
     "Please set a password!": "비밀번호를 설정해주세요!",
-    "You have successfully set a password!": "비밀번호를 설정했어요!",
-    "An error occurred whilst saving your email notification preferences.": "이메일 알림을 설정하다가 오류가 일어났어요.",
+    "You have successfully set a password!": "비밀번호를 설정하셨어요!",
+    "An error occurred whilst saving your email notification preferences.": "이메일 알림 설정을 저장하는 중에 오류가 났습니다.",
     "Source URL": "출처 URL",
-    "Failed to add tag %(tagName)s to room": "방에 %(tagName)s로 지정하지 못했어요",
+    "Failed to add tag %(tagName)s to room": "방에 %(tagName)s 태그를 달지 못했습니다.",
     "Members": "구성원",
-    "No update available.": "업데이트가 없어요.",
+    "No update available.": "업데이트가 없습니다.",
     "Noisy": "소리",
     "Files": "파일",
     "Collecting app version information": "앱 버전 정보를 수집하는 중",
-    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "방 가명 %(alias)s 을 지우고 목록에서 %(name)s를 지우시겠어요?",
-    "This will allow you to return to your account after signing out, and sign in on other devices.": "이런 식으로 로그아웃한 뒤 계정으로 돌아가, 다른 장치에서 로그인하실 수 있어요.",
-    "Enable notifications for this account": "이 계정의 알림 받기",
+    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "방 별칭 %(alias)s를(을) 삭제하고 목록에서 %(name)s를(을) 제거하시겠어요?",
+    "This will allow you to return to your account after signing out, and sign in on other devices.": "이런 식으로 로그아웃한 뒤 계정으로 돌아가, 다른 기기에서 로그인하실 수 있습니다.",
+    "Enable notifications for this account": "이 계정의 알림 사용하기",
     "Directory": "목록",
     "Search for a room": "방에서 찾기",
     "Messages containing keywords": "키워드가 적힌 메시지",
-    "Room not found": "방을 찾지 못했어요",
+    "Room not found": "방을 찾지 못했습니다",
     "Tuesday": "화요일",
     "Enter keywords separated by a comma:": "키워드를 쉼표로 구분해 입력해주세요:",
     "Search…": "찾기…",
-    "Remove %(name)s from the directory?": "목록에서 %(name)s을 지우시겠어요?",
-    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "라이엇은 많은 고급 브라우저 기능을 사용해요. 일부는 현재 브라우저에서 쓸 수 없거나 실험적이에요.",
+    "Remove %(name)s from the directory?": "목록에서 %(name)s를(을) 제거하시겠어요?",
+    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot은 많은 고급 브라우저 기능을 사용해요. 일부는 현재 브라우저에서 쓸 수 없거나 실험적이에요.",
     "Developer Tools": "개발자 도구",
-    "Enable desktop notifications": "컴퓨터에서 알림 받기",
+    "Enable desktop notifications": "컴퓨터에서 알림 사용하기",
     "Unnamed room": "이름없는 방",
-    "Remove from Directory": "목록에서 지우기",
+    "Remove from Directory": "목록에서 제거하기",
     "Saturday": "토요일",
     "Remember, you can always set an email address in user settings if you change your mind.": "잊지마세요, 마음이 바뀌면 언제라도 사용자 설정에서 이메일 주소를 바꾸실 수 있다는 걸요.",
-    "Direct Chat": "직접 이야기하기",
-    "The server may be unavailable or overloaded": "서버를 쓸 수 없거나 과부하일 수 있어요",
+    "Direct Chat": "직접 대화하기",
+    "The server may be unavailable or overloaded": "서버가 사용 불가하거나 과부하가 걸렸을 수 있습니다.",
     "Reject": "거절하기",
-    "Failed to set Direct Message status of room": "방의 쪽지 상태를 설정하지 못했어요",
+    "Failed to set Direct Message status of room": "방의 쪽지 상태를 설정하지 못했습니다.",
     "Monday": "월요일",
     "All messages (noisy)": "모든 메시지 (크게)",
     "Enable them now": "지금 켜기",
     "Forward Message": "메시지 전달",
-    "Messages containing my user name": "내 사용자 이름이 적힌 메시지",
+    "Messages containing my user name": "내 사용자 이름이 적힌 메시지를 받을 때",
     "Toolbox": "도구상자",
     "Collecting logs": "로그 수집 중",
     "more": "더 보기",
     "(HTTP status %(httpStatus)s)": "(HTTP 상태 %(httpStatus)s)",
     "All Rooms": "모든 방",
-    "Failed to get public room list": "공개한 방 목록을 얻지 못했어요",
+    "Failed to get public room list": "공개한 방 목록을 얻지 못했습니다.",
     "Quote": "인용하기",
-    "Failed to update keywords": "키워드를 갱신하지 못했어요",
+    "Failed to update keywords": "키워드를 갱신하지 못했습니다.",
     "Send logs": "로그 보내기",
     "All messages": "모든 메시지",
-    "Call invitation": "전화가 왔어요",
+    "Call invitation": "전화가 올 때",
     "Downloading update...": "업데이트를 받는 중...",
-    "You have successfully set a password and an email address!": "비밀번호와 이메일 주소를 설정했어요!",
+    "You have successfully set a password and an email address!": "비밀번호와 이메일 주소를 설정하셨어요!",
     "What's new?": "새로운 점은?",
     "Notify me for anything else": "모든 걸 알리기",
     "When I'm invited to a room": "방에 초대받았을 때",
     "Keywords": "키워드",
-    "Can't update user notification settings": "사용자 알림 설정을 갱신할 수 없어요",
+    "Can't update user notification settings": "사용자 알림 설정을 갱신할 수 없습니다.",
     "Notify for all other messages/rooms": "다른 모든 메시지/방 알리기",
-    "Unable to look up room ID from server": "서버에서 방 ID를 찾아볼 수 없어요",
-    "Couldn't find a matching Matrix room": "일치하는 매트릭스 방을 찾을 수 없어요",
+    "Unable to look up room ID from server": "서버에서 방 ID를 찾아볼 수 없습니다.",
+    "Couldn't find a matching Matrix room": "일치하는 매트릭스 방을 찾을 수 없었습니다",
     "Invite to this room": "이 방에 초대하기",
-    "You cannot delete this message. (%(code)s)": "이 메시지를 지우실 수 없어요. (%(code)s)",
+    "You cannot delete this message. (%(code)s)": "이 메시지를 삭제하실 수 없습니다. (%(code)s)",
     "Thursday": "목요일",
     "I understand the risks and wish to continue": "위험할 수 있는 걸 알고 계속하기를 바라요",
     "Back": "돌아가기",
-    "Failed to change settings": "설정을 바꾸지 못했어요",
+    "Failed to change settings": "설정을 바꾸지 못했습니다.",
     "Show message in desktop notification": "컴퓨터 알림에서 내용 보이기",
     "Unhide Preview": "미리보기를 숨기지 않기",
-    "Unable to join network": "네트워크에 들어갈 수 없어요",
-    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "라이엇이 아닌 다른 클라이언트에서 구성하셨을 수도 있어요. 라이엇에서 조정할 수는 없지만 여전히 적용되있을 거에요",
-    "Sorry, your browser is not able to run Riot.": "죄송해요. 브라우저에서 라이엇을 켤 수가 없어요.",
+    "Unable to join network": "네트워크에 들어갈 수 없습니다.",
+    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Riot이 아닌 다른 클라이언트에서 설정하셨을 수도 있습니다. Riot에서 바꿀 수는 없지만, 여전히 적용돼 있습니다.",
+    "Sorry, your browser is not able to run Riot.": "죄송합니다. 쓰고 계신 브라우저에서는 Riot를 사용할 수 없습니다.",
     "Uploaded on %(date)s by %(user)s": "by %(user)s가 %(date)s에 올림",
-    "Messages in group chats": "이야기 모임의 메시지",
+    "Messages in group chats": "그룹 대화 메시지를 받을 때",
     "Yesterday": "어제",
-    "Error encountered (%(errorDetail)s).": "오류가 일어났어요 (%(errorDetail)s).",
+    "Error encountered (%(errorDetail)s).": "오류가 일어났습니다 (%(errorDetail)s).",
     "Low Priority": "낮은 우선순위",
-    "Riot does not know how to join a room on this network": "라이엇이 이 네트워크에서 방에 들어가는 법을 알 수 없어요",
+    "Riot does not know how to join a room on this network": "Riot이 이 네트워크에서 방에 들어가는 법을 알 수 없습니다.",
     "Set Password": "비밀번호 설정",
-    "Enable audible notifications in web client": "웹 클라이언트에서 알림 소리 켜기",
+    "Enable audible notifications in web client": "웹 클라이언트에서 알림 소리 사용하기",
     "Off": "끄기",
     "#example": "#예",
     "Mentions only": "답만 하기",
-    "Failed to remove tag %(tagName)s from room": "방에서 %(tagName)s 지정을 지우지 못했어요",
+    "Failed to remove tag %(tagName)s from room": "방에서 %(tagName)s 태그를 제거하지 못했습니다.",
     "Wednesday": "수요일",
-    "You can now return to your account after signing out, and sign in on other devices.": "계정을 로그아웃하신 뒤에 계정으로 돌아가, 다른 장치에서 로그인하실 수 있어요.",
-    "Enable email notifications": "이메일로 알림 받기",
+    "You can now return to your account after signing out, and sign in on other devices.": "이제 계정을 로그아웃하신 뒤에 계정으로 돌아가, 다른 기기에서 로그인할 수 있습니다.",
+    "Enable email notifications": "이메일로 알림 사용하기",
     "Login": "로그인",
-    "No rooms to show": "보여드릴 방이 없어요",
+    "No rooms to show": "보여줄 수 있는 방이 없습니다.",
     "Download this file": "이 파일 받기",
     "Thank you!": "감사합니다!",
     "View Source": "출처 보기",
-    "Unable to fetch notification target list": "알림 대상 목록을 불러올 수 없어요",
+    "Unable to fetch notification target list": "알림 대상 목록을 불러올 수 없습니다.",
     "Collapse panel": "패널 접기",
-    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "현재 브라우저에서는, 응용 프로그램의 모양과 기능이 완벽하게 맞지 않거나, 일부 혹은 모든 기능이 작동하지 않을 수 있어요. 계속할 수는 있지만, 맞닥뜨리는 모든 문제는 직접 해결하셔야해요!",
+    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "현재 쓰고 계신 브라우저에서는, 보고 느끼기에 응용 프로그램이 완전히 맞지 않거나, 일부 혹은 모든 기능이 작동하지 않을 수 있습니다. 어쨋든 사용하고 싶으시다면 계속할 수는 있지만, 부딛치는 모든 문제는 직접 해결하셔야 해요!",
     "Checking for an update...": "업데이트를 확인하는 중...",
-    "There are advanced notifications which are not shown here": "여기 보이지 않는 고급 알림이 있어요"
+    "There are advanced notifications which are not shown here": "여기에는 보여지지 않는 고급 알림이 있습니다.",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s님이 별명을 %(displayName)s(으)로 바꿨습니다.",
+    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s가 방의 고정된 메시지를 바꿨습니다.",
+    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)s님이 이름을 %(count)s번 바꿨습니다",
+    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)s님이 이름을 바꿨습니다",
+    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)s님이 이름을 %(count)s번 바꿨습니다",
+    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)s님이 이름을 바꿨습니다",
+    "%(severalUsers)schanged their avatar %(count)s times|other": "%(severalUsers)s님이 아바타를 %(count)s번 바꿨습니다",
+    "%(severalUsers)schanged their avatar %(count)s times|one": "%(severalUsers)s님이 아바타를 바꿨습니다",
+    "%(oneUser)schanged their avatar %(count)s times|other": "%(oneUser)s님이 아바타를 %(count)s번 바꿨습니다",
+    "%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)s님이 아바타를 바꿨습니다",
+    "This setting cannot be changed later!": "이 설정은 나중에 바꿀 수 없습니다!",
+    "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "이전 버전 Riot의 데이터가 발견됐습니다. 이전 버전에서는 종단 간 암호화에 오작동을 일으켰을 겁니다. 이전 버전을 사용한 최근의 종단 간 암호화된 메시지는 이 버전에서 복호화가 불가능할 수 있습니다. 이 버전과 메시지를 주고받지 못할 수도 있습니다. 문제가 생긴다면 로그아웃하고 다시 로그인 해 보세요. 메시지 기록을 유지하고 싶다면 키를 내보냈다가 다시 불러오세요.",
+    "Hide display name changes": "별명 변경 내역 숨기기",
+    "This event could not be displayed": "이 이벤트는 표시될 수 없었습니다.",
+    "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "%(displayName)s(%(userName)s)님이 %(dateTime)s에 봄",
+    "Banned by %(displayName)s": "%(displayName)s님이 차단함",
+    "Display your community flair in rooms configured to show it.": "커뮤니티 재능이 보이도록 설정된 방에서 커뮤니티 재능을 표시할 수 있습니다.",
+    "The user '%(displayName)s' could not be removed from the summary.": "사용자 %(displayName)s님을 요약에서 제거하지 못했습니다.",
+    "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "이 방들은 커뮤니티 페이지에서 커뮤니티 구성원에게 보여집니다. 커뮤니티 구성원은 방을 클릭해 들어갈 수 있습니다.",
+    "Pinned Messages": "고정된 메시지",
+    "You're not currently a member of any communities.": "지금은 어떤 커뮤니티에도 속해 있지 않습니다.",
+    "Flair": "재능",
+    "Showing flair for these communities:": "이 커뮤니티에 재능을 공개 중:",
+    "This room is not showing flair for any communities": "이 방은 어떤 커뮤니티에도 재능을 보여주지 않습니다",
+    "Flair will appear if enabled in room settings": "방 설정에서 사용하면 재능이 나타날 겁니다.",
+    "Flair will not appear": "재능은 나타나지 않을 겁니다",
+    "The platform you're on": "당신이 사용 중인 플랫폼",
+    "The version of Riot.im": "Riot 버전",
+    "Whether or not you're logged in (we don't record your user name)": "로그인 돼 있는지(사용자 이름을 기록)",
+    "Your language of choice": "선택한 언어",
+    "Which officially provided instance you are using, if any": "(만일 있다면) 사용하고 있는 공식 프로그램",
+    "Whether or not you're using the Richtext mode of the Rich Text Editor": "Rich Text Editor의 Richtext mode를 사용하고 있는지",
+    "Your homeserver's URL": "홈 서버의 URL",
+    "Your identity server's URL": "ID 서버의 URL",
+    "e.g. %(exampleValue)s": "예시: %(exampleValue)s",
+    "Every page you use in the app": "앱에서 이용하는 모든 페이지",
+    "e.g. ": "예시: ",
+    "Your User Agent": "사용자 에이전트",
+    "Your device resolution": "기기 해상도",
+    "The information being sent to us to help make Riot.im better includes:": "Riot을 발전시키기 위해 저희에게 보내는 정보는 다음을 포함합니다:",
+    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "이 페이지에서 방, 사용자, 혹은 그룹 ID와 같은 식별 가능한 정보를 포함하는 부분이 있는 데이터는 서버에 보내지기 전에 제거됩니다.",
+    "Call Failed": "전화할 수 없었습니다",
+    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "이 방에는 모르는 기기가 있습니다. 인증하지 않고 계속하면 전화를 도청할 수도 있을 겁니다.",
+    "Review Devices": "기기 검증하기",
+    "Call Anyway": "그냥 걸기",
+    "Answer Anyway": "그냥 받기",
+    "Call": "전화하기",
+    "Answer": "받기",
+    "Call in Progress": "전화 거는 중",
+    "A call is already in progress!": "이미 전화 걸고 계세요!",
+    "PM": "오후",
+    "AM": "오전",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(fullYear)s년 %(monthName)s %(day)s일 (%(weekDayName)s)",
+    "Who would you like to add to this community?": "이 커뮤니티에 누구를 추가하고 싶으세요?",
+    "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "경고: 커뮤니티에 추가한 사람은 커뮤니티 ID를 아는 누구에게나 공개됩니다",
+    "Invite new community members": "새 커뮤니티 구성원 초대하기",
+    "Name or matrix ID": "이름이나 Matrix ID",
+    "Invite to Community": "커뮤니티에 초대하기",
+    "Which rooms would you like to add to this community?": "어떤 방을 이 커뮤니티에 추가하고 싶으세요?",
+    "Show these rooms to non-members on the community page and room list?": "이 방들을 구성원이 아닌 커뮤니티 페이지와 방 리스트에 공개할까요?",
+    "Add rooms to the community": "커뮤니티에 방 추가하기",
+    "Room name or alias": "방 이름 또는 별칭",
+    "Add to community": "커뮤니티에 추가하기",
+    "Failed to invite the following users to %(groupId)s:": "해당 사용자를 %(groupId)s에 초대하지 못했습니다:",
+    "Failed to invite users to community": "사용자를 커뮤니티에 초대하지 못했습니다",
+    "Failed to invite users to %(groupId)s": "%(groupId)s에 사용자를 초대하지 못했습니다",
+    "Failed to add the following rooms to %(groupId)s:": "%(groupId)s에 해당 방을 추가하지 못했습니다:",
+    "Restricted": "제한됨",
+    "Unable to create widget.": "위젯을 만들지 못합니다.",
+    "Missing roomId.": "roomID가 빠졌습니다.",
+    "You are not in this room.": "이 방의 구성원이 아닙니다.",
+    "You do not have permission to do that in this room.": "이 방에서 그걸 할 수 있는 권한이 없습니다.",
+    "Changes colour scheme of current room": "현재 방의 색 구성 바꾸기",
+    "Sets the room topic": "방 주제 설정하기",
+    "Unbans user with given id": "주어진 ID로 사용자 차단 해제하기",
+    "Ignores a user, hiding their messages from you": "사용자 무시하고, 메시지 보지 말기",
+    "Ignored user": "무시당한 사용자",
+    "You are now ignoring %(userId)s": "%(userId)s님을 이제 무시합니다",
+    "Stops ignoring a user, showing their messages going forward": "사용자를 그만 무시하고 이제부터 메시지 보기",
+    "Unignored user": "무시하지 않게 된 사용자",
+    "You are no longer ignoring %(userId)s": "%(userId)s님을 더 이상 무시하고 있지 않습니다",
+    "Define the power level of a user": "사용자의 권한 등급 정의하기",
+    "Opens the Developer Tools dialog": "개발자 도구 대화 열기",
+    "Verifies a user, device, and pubkey tuple": "사용자, 기기, 그리고 공개키 튜플 인증하기",
+    "%(widgetName)s widget modified by %(senderName)s": "%(senderName)s님이 수정한 %(widgetName)s 위젯",
+    "%(widgetName)s widget added by %(senderName)s": "%(senderName)s님이 추가한 %(widgetName)s 위젯",
+    "%(widgetName)s widget removed by %(senderName)s": "%(senderName)s님이 제거한 %(widgetName)s 위젯",
+    "Remove avatar": "아바타 제거하기",
+    "To remove other users' messages, you must be a": "다른 사용자의 메시지를 제거하기 위해서는, 당신은 -가 돼야 한다",
+    "Message removed by %(userId)s": "%(userId)s님에 의해 제거된 메시지",
+    "Message removed": "메시지가 제거됐습니다",
+    "Remove from community": "커뮤니티에서 제거하기",
+    "Remove this user from community?": "이 사용자를 커뮤니티에서 제거하시겠어요?",
+    "Failed to remove user from community": "유저를 커뮤니티에서 제거하지 못했습니다",
+    "Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "확실히 %(roomName)s를(을) %(groupId)s로부터 제거하고 싶으세요?",
+    "Removing a room from the community will also remove it from the community page.": "방을 커뮤니티로부터 삭제하면 커뮤니티 페이지에서도 제거됩니다.",
+    "Failed to remove room from community": "커뮤니티로부터 방을 제거하지 못했습니다",
+    "Failed to remove '%(roomName)s' from %(groupId)s": "%(roomName)s를(을) %(groupId)s(으)로부터 제거하지 못했습니다.",
+    "%(names)s and %(count)s others are typing|other": "%(names)s님과 %(count)s명 더 입력하는 중",
+    "%(names)s and %(count)s others are typing|one": "%(names)s님 외 1명이 입력하는 중",
+    "Message Pinning": "메시지 고정",
+    "Jitsi Conference Calling": "Jitsi 회의 전화",
+    "Disable Emoji suggestions while typing": "입력 중에는 이모지 추천 비활성화하기",
+    "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "저희는 프라이버시를 중요하게 여기기 때문에, 그 어떤 개인적이거나 특정할 수 있는 정보도 정보 분석을 위해 수집하지 않습니다.",
+    "Send analytics data": "정보 분석 데이터 보내기",
+    "Learn more about how we use analytics.": "저희가 어떻게 정보 분석을 이용하는지 알아보세요.",
+    "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "디버그 로그는 사용자 이름, 방문한 방이나 그룹의 ID나 별칭, 그리고 다른 사용자의 사용자 이름을 포함한 앱 이용 데이터를 포함합니다. 메시지는 포함하지 않습니다.",
+    "Debug Logs Submission": "디버그 로그 제출",
+    "Submit debug logs": "디버그 로그 전송하기",
+    "Select devices": "기기 선택하기",
+    "Enable inline URL previews by default": "기본으로 바로 URL 미리보기 사용하기",
+    "Always show encryption icons": "암호화 아이콘을 언제나 보여주기",
+    "Enable automatic language detection for syntax highlighting": "구문 강조를 위해 자동 언어 감지 사용하기",
+    "Hide avatars in user and room mentions": "사용자와 방 언급할 때 아바타 숨기기",
+    "Disable big emoji in chat": "대화에서 큰 이모지 비활성화하기",
+    "Automatically replace plain text Emoji": "일반 텍스트로 된 이모지 자동으로 변환하기",
+    "Mirror local video feed": "보고 있는 비디오 전송 상태 비추기",
+    "Disable Community Filter Panel": "커뮤니티 필터판 비활성화하기",
+    "Hide avatar changes": "아바타 변경 내역 숨기기",
+    "Changes made to your community name and avatar might not be seen by other users for up to 30 minutes.": "커뮤니티 이름과 아바타 변경 내역은 최장 30분까지 다른 사용자가 보지 못할 수 있습니다.",
+    "Delete %(count)s devices|one": "기기 지우기",
+    "Addresses": "주소",
+    "Invalid community ID": "잘못된 커뮤니티 ID입니다",
+    "'%(groupId)s' is not a valid community ID": "\"%(groupId)s\"는 바른 커뮤니티 ID가 아닙니다",
+    "New community ID (e.g. +foo:%(localDomain)s)": "새 커뮤니티 ID(예시: +foo:%(localDomain)s)",
+    "URL previews are enabled by default for participants in this room.": "이 방에 참여한 분에게는 URL 미리보기가 기본입니다.",
+    "URL previews are disabled by default for participants in this room.": "이 방에 참여한 분에게는 URL 미리보기가 기본으로 비활성화 돼 있습니다.",
+    "Cannot add any more widgets": "더 이상 위젯을 추가할 수 없습니다",
+    "The maximum permitted number of widgets have already been added to this room.": "이미 이 방에는 허용된 최대 수의 위젯이 추가됐습니다.",
+    "Add a widget": "위젯 추가하기",
+    "%(senderName)s sent an image": "%(senderName)s가 이미지를 보냈습니다",
+    "%(senderName)s sent a video": "%(senderName)s가 비디오를 보냈습니다",
+    "%(senderName)s uploaded a file": "%(senderName)s가 파일을 보냈습니다",
+    "Key request sent.": "키 요청을 보냈습니다.",
+    "If your other devices do not have the key for this message you will not be able to decrypt them.": "다른 기기에",
+    "Encrypting": "암호화 중",
+    "Encrypted, not sent": "암호화 됨, 보내지지 않음",
+    "Disinvite this user?": "이 사용자에 대한 초대를 취소할까요?",
+    "Kick this user?": "이 사용자를 추방할까요?",
+    "Unban this user?": "이 사용자를 차단 해제할까요?",
+    "%(duration)ss": "%(duration)s초",
+    "%(duration)sm": "%(duration)s분",
+    "%(duration)sh": "%(duration)s시간",
+    "%(duration)sd": "%(duration)s일",
+    "Online for %(duration)s": "%(duration)s 동안 온라인",
+    "Idle for %(duration)s": "%(duration)s 동안 대기 중",
+    "Offline for %(duration)s": "%(duration)s 동안 오프라인",
+    "Unknown for %(duration)s": "%(duration)s 동안 어떤지 모름",
+    "Unknown": "모름",
+    "Replying": "답장 중",
+    "Loading...": "로딩 중...",
+    "Unpin Message": "메시지 고정 해제하기",
+    "No pinned messages.": "고정된 메시지가 없습니다.",
+    "At this time it is not possible to reply with an emote.": "지금은 이모트로 답장할 수 없습니다.",
+    "Send a message (unencrypted)…": "(암호화 안 된) 메시지를 보내세요…",
+    "Send an encrypted message…": "메시지를 보내세요…",
+    "Unable to reply": "답장할 수 없습니다",
+    "Send an encrypted reply…": "답장을 보내세요…",
+    "Send a reply (unencrypted)…": "(암호화 안 된) 답장을 보내세요…",
+    "User Options": "사용자 옵션",
+    "Share Link to User": "사용자에게 링크 공유하기",
+    "Invite": "초대하기",
+    "Mention": "언급하기",
+    "Ignore": "무시하기",
+    "Unignore": "그만 무시하기",
+    "Ignored Users": "무시된 사용자",
+    "Demote": "강등하기",
+    "Demote yourself?": "자신을 강등하시겠어요?",
+    "Ban this user?": "이 사용자를 차단할까요?",
+    "To ban users, you must be a": "사용자를 차단하기 위해서 필요한 권한:",
+    "were banned %(count)s times|other": "님은 %(count)s번 차단됐습니다",
+    "were banned %(count)s times|one": "님은 차단됐습니다",
+    "was banned %(count)s times|other": "님은 %(count)s번 차단됐습니다",
+    "was banned %(count)s times|one": "님은 차단됐습니다",
+    "were unbanned %(count)s times|other": "님은 %(count)s번 차단 해제됐습니다",
+    "were unbanned %(count)s times|one": "님은 차단 해제됐습니다",
+    "was unbanned %(count)s times|other": "님은 %(count)s번 차단 해제됐습니다",
+    "was unbanned %(count)s times|one": "는 차단 해제됐습니다",
+    "Delete %(count)s devices|other": "%(count)s개 기기 지우기",
+    "Drop here to restore": "복원하려면 여기에 떨어뜨리세요",
+    "Drop here to favourite": "즐겨찾으시려면 여기에 떨어뜨리세요.",
+    "Drop here to tag direct chat": "직접 대화를 태그하려면 여기에 떨어뜨리세요.",
+    "You have entered an invalid address.": "잘못된 주소를 입력했습니다.",
+    "This room is not public. You will not be able to rejoin without an invite.": "이 방은 공개되지 않았습니다. 초대 없이는 다시 들어올 수 없습니다.",
+    "Enable URL previews for this room (only affects you)": "이 방에 대해 URL 미리보기 사용하기",
+    "Enable URL previews by default for participants in this room": "이 방에 참여한 모두에게 기본으로 URL 미리보기 사용하기",
+    "Enable widget screenshots on supported widgets": "지원되는 위젯에 대해 위젯 스크린샷 사용하기",
+    "Hide join/leave messages (invites/kicks/bans unaffected)": "들어오거나 떠나는 메시지 숨기기(초대/추방/차단은 그대로)",
+    "Show empty room list headings": "빈 방 목록 표제 보이게 하기",
+    "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "누군가 메시지에 URL을 넣으면 URL 미리보기가 보여져 웹사이트에서 온 제목, 설명, 그리고 이미지 등 그 링크에 대해 더 알 수 있습니다.",
+    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "지금 이 방처럼, 암호화된 방에서는 홈 서버(미리보기가 만들어지는 곳)에서 이 방에서 보여지는 링크에 대해 알 수 없도록 URL 미리보기가 기본적으로 비활성화돼 있습니다.",
+    "Your key share request has been sent - please check your other devices for key share requests.": "키 공유 요청이 보내졌습니다. 키 공유 요청을 다른 기기에서 받아주세요.",
+    "Key share requests are sent to your other devices automatically. If you rejected or dismissed the key share request on your other devices, click here to request the keys for this session again.": "자동으로 다른 기기에 키 공유 요청을 보냈습니다. 다른 기기에서 키 공유 요청을 거절하거나 묵살하셨으면, 여기를 눌러 이번 세션에 다시 키를 요청하세요.",
+    "Re-request encryption keys from your other devices.": "다른 기기로부터 암호화 키 재요청",
+    "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "자기 자신을 강등시키는 것은 다시 되돌릴 수 없고, 자신이 마지막으로 이 방에서 특권을 가진 사용자라면 다시 특권을 얻는 건 불가능합니다.",
+    "Jump to read receipt": "수신 확인으로 건너뛰기",
+    "At this time it is not possible to reply with a file so this will be sent without being a reply.": "현재로서는 파일을 답장할 수 없으므로 답장이 아닌 파일로 보내질 겁니다.",
+    "Jump to message": "메세지로 건너뛰기",
+    "Share room": "방 공유하기",
+    "Drop here to demote": "강등하려면 여기에 떨어뜨리세요",
+    "Community Invites": "커뮤니티 초대",
+    "You have no historical rooms": "보관하고 있는 방이 없습니다",
+    "You have been kicked from this room by %(userName)s.": "%(userName)s님에 의해 추방당했습니다.",
+    "You have been banned from this room by %(userName)s.": "%(userName)s님에 의해 이 방에서 차단당했습니다.",
+    "You are trying to access a room.": "방에 접근하고 있습니다.",
+    "To change the room's avatar, you must be a": "방의 아바타를 바꾸려면, -여야 합니다",
+    "To change the room's name, you must be a": "방 이름을 바꾸려면, -여야 합니다.",
+    "To change the room's main address, you must be a": "방의 매인 주소를 바꾸려면, -여야 합니다.",
+    "Members only (since they joined)": "구성원만(??한 시점부터)",
+    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s님이 들어왔습니다",
+    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s님이 %(count)s번 들어왔습니다",
+    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s님이 %(count)s번 들어왔습니다",
+    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)s님이 들어왔습니다",
+    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)s님이 %(count)s번 들어왔다가 나갔습니다",
+    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)s님이 들어왔다가 나갔습니다",
+    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)님이 %(count)s번 들어왔다가 나갔습니다",
+    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)s님이 들어왔다가 나갔습니다",
+    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)s님이 나갔다가 다시 들어왔습니다",
+    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s님이 %(count)s번 나갔다가 다시 들어왔습니다",
+    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s님이 나갔다가 다시 들어왔습니다",
+    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)s님이 %(count)s번 나갔습니다",
+    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)s님이 나갔습니다",
+    "%(oneUser)sleft %(count)s times|other": "%(oneUser)s님이 %(count)s번 나갔다가 들어왔습니다",
+    "%(oneUser)sleft %(count)s times|one": "%(oneUser)s님이 나갔습니다",
+    "%(items)s and %(count)s others|one": "%(items)s, 그리고 하나 더.",
+    "A call is currently being placed!": "전화 걸고 있습니다.",
+    "Permission Required": "권한이 필요합니다.",
+    "A conference call could not be started because the intgrations server is not available": "서버가 연결되지 않아 전화 회의를 시작하지 못했습니다.",
+    "You do not have permission to start a conference call in this room": "이 방에서는 전화 회의를 시작할 권한이 없습니다.",
+    "deleted": "삭제됐습니다.",
+    "underlined": "밑줄 쳤습니다.",
+    "
    HTML for your community's page
    \n
    \n    Use the long description to introduce new members to the community, or distribute\n    some important links\n
    \n
    \n    You can even use 'img' tags\n
    \n": "
    커뮤니티 페이지를 위한 HTML
    \n
    \n    커뮤니티에 새 구성원을 소개할 때 길게 설명하거나\n    좀 중요한 링크로 배포할 수 있습니다.\n
    \n
    \n    'img' 태그를 사용할 수도 있습니다.\n
    \n",
+    "Copied!": "복사했습니다!",
+    "Failed to copy": "복사하지 못했습니다.",
+    "Show Stickers": "스티커 보내기",
+    "Hide Stickers": "스티커 숨기기",
+    "Stickerpack": "스티커 팩",
+    "Add a stickerpack": "스티커 팩 추가하기",
+    "You don't currently have any stickerpacks enabled": "사용하고 있는 스티커 팩이 없습니다.",
+    "An email has been sent to %(emailAddress)s": "%(emailAddress)s에 이메일을 보냈습니다.",
+    "Code": "코드",
+    "The email field must not be blank.": "이메일을 써 주십시오.",
+    "The user name field must not be blank.": "사용자 이름을 써 주십시오.",
+    "The phone number field must not be blank.": "전화번호를 써 주십시오.",
+    "The password field must not be blank.": "비밀번호를 써 주십시오.",
+    "Username on %(hs)s": "%(hs)s 사용자 이름",
+    "%(serverName)s Matrix ID": "%(serverName)s의 Matrix ID",
+    "Disinvite this user from community?": "이 사용자에게 보낸 커뮤니티 초대를 취소할까요?",
+    "Failed to withdraw invitation": "초대를 취소하지 못했습니다.",
+    "Filter community members": "커뮤니티 구성원 찾기",
+    "Filter results": "검색 결과",
+    "Filter community rooms": "커뮤니티 방 찾기",
+    "Clear filter": "검색 초기화하기",
+    "Did you know: you can use communities to filter your Riot.im experience!": "모르고 계셨다면: Riot에서의 경험을 커뮤니티 별로 정리할 수 있어요!",
+    "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "필터를 사용하고 싶으시다면, 커뮤니티 아바타를 스크린 왼쪽의 필터판에 끌어다 놓으면 됩니다. 언제든지, 필터판에 있는 아바타를 누르면 그 커뮤니티와 괸련된 방과 사람만 볼 수 있습니다.",
+    "Muted Users": "음소거된 사용자",
+    "Delete Widget": "위젯 지우기",
+    "An error ocurred whilst trying to remove the widget from the room": "방에서 위젯을 제거하는 동안 에러가 났습니다.",
+    "Failed to remove widget": "위젯을 제거하지 못했습니다.",
+    "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "위젯을 삭제하면 이 방의 모든 사용자에게도 제거됩니다. 정말 이 위젯을 삭제하고 싶으세요?",
+    "The room '%(roomName)s' could not be removed from the summary.": "'%(roomName)s' 방을 요약에서 제거하지 못했습니다.",
+    "Failed to remove the room from the summary of %(groupId)s": "방을 %(groupId)s의 요약에서 제거하지 못했습니다.",
+    "Log out and remove encryption keys?": "로그아웃하고 암호화 열쇠를 제거하시겠어요?",
+    "Failed to remove a user from the summary of %(groupId)s": "한 사용자를 %(groupId)s의 요약에서 제거하지 못했습니다.",
+    "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. This action is irreversible.": "계정을 일시적으로 사용할 수 없게 됩니다. 로그인할 수 없고, 누구도 같은 사용자 ID를 다시 등록할 수 없습니다. 들어가 있던 모든 방에서 나오게 되고, ID 서버에서 계정 상세 정보도 제거됩니다. 이 결정은 돌이킬 수 없습니다.",
+    "Yes, I want to help!": "네, 돕고 싶어요!",
+    "NOTE: Apps are not end-to-end encrypted": "참고: 앱은 종단 간 암호화가 돼 있지 않습니다.",
+    "Integrations Error": "통합 에러",
+    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Github를 통해 버그를 신고하셨다면, 디버그 로그가 문제를 해결하는데 도움을 줍니다. 디버그 로그에는 사용자 이름과 방문했던 방이나 그룹의 ID와 별칭, 그리고 다른 사용자의 사용자 이름이 포함됩니다. 대화 내용은 포함되지 않습니다.",
+    "Warning: This widget might use cookies.": "경고: 이 위젯은 쿠키를 사용할 수도 있습니다.",
+    "Delete widget": "위젯 삭제하기",
+    "Minimize apps": "앱 최소화하기",
+    "Reload widget": "위젯 다시 시작하기",
+    "Popout widget": "위젯 팝업",
+    "Picture": "사진",
+    "Communities": "커뮤니티",
+    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s님이 초대를 거절했습니다.",
+    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)s님이 초대를 %(count)s번 거절했습니다.",
+    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)s님이 초대를 거절했습니다.",
+    "were invited %(count)s times|other": "님이 %(count)s번 초대받았습니다.",
+    "were invited %(count)s times|one": "님이 초대받았습니다.",
+    "%(user)s is a %(userRole)s": "%(user)s님은 %(userRole)s입니다.",
+    "To notify everyone in the room, you must be a": "방의 모두에게 알림을 보내기 위한 권한:",
+    "To kick users, you must be a": "사용자를 추방하기 위한 권한:",
+    "To configure the room, you must be a": "방을 설정하기 위한 권한:",
+    "To invite users into the room, you must be a": "사용자를 방에 초대하기 위한 권한:",
+    "To send messages, you must be a": "메시지를 보내기 위한 권한:",
+    "To modify widgets in the room, you must be a": "방의 위젯을 변경하기 위한 권한:",
+    "To change the topic, you must be a": "주제를 바꾸기 위한 권한:",
+    "To change the permissions in the room, you must be a": "방에서의 권한을 바꾸기 위한 권한:",
+    "To change the room's history visibility, you must be a": "방의 기록을 보이게 하기 위한 권한:",
+    "inline-code": "인라인 코드",
+    "block-quote": "인용 블록",
+    "bulleted-list": "글머리 기호 목록",
+    "numbered-list": "숫자 목록",
+    "To send events of type , you must be a": " 종류의 이벤트를 보내기 위한 권한:",
+    "Event Content": "이벤트 내용",
+    "Event Type": "이벤트 종류",
+    "Failed to send custom event.": "맞춤 이벤트를 보내지 못했습니다.",
+    "Event sent!": "이벤트를 보냈어요!",
+    "You must specify an event type!": "이벤트 종류를 명시해야 해요!",
+    "Send Custom Event": "맞춤 이벤트 보내기",
+    "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "답장 온 이벤트를 가져오지 못했습니다. 이벤트가 아예 없거나, 이벤트를 볼 권한이 없으신 것 같습니다.",
+    "Autocomplete Delay (ms):": "자동입력 지연 시간(ms):",
+    "Light theme": "밝은 테마",
+    "Dark theme": "어두운 테마",
+    "Status.im theme": "Status.im식 테마",
+    "A text message has been sent to %(msisdn)s": "%(msisdn)s님에게 문자 메시지를 보냈습니다.",
+    "Something went wrong when trying to get your communities.": "커뮤니티를 받는 중에 뭔가 잘못됐습니다.",
+    "Please help improve Riot.im by sending anonymous usage data. This will use a cookie.": "익명으로 사용 데이터를 보내 Riot의 발전을 도와주세요. 이 과정에서 쿠키를 사용합니다.",
+    "Allow": "허가하기",
+    "Visible to everyone": "모두에게 보여짐",
+    "Only visible to community members": "커뮤니티 구성원에게만 보여짐",
+    "Visibility in Room List": "방 목록에서의 가시성",
+    "The visibility of '%(roomName)s' in %(groupId)s could not be updated.": "%(groupId)s에 있는 %(roomName)s 방에서의 가시성이 업데이트 되지 않았습니다.",
+    "was invited %(count)s times|one": "님이 초대됐습니다.",
+    "was invited %(count)s times|other": "님이 %(count)s번 초대됐습니다.",
+    "collapse": "줄이기",
+    "expand": "늘이기",
+    "Matrix ID": "Matrix ID",
+    "email address": "이메일 주소",
+    "Matrix Room ID": "Matrix 방 ID",
+    "Preparing to send logs": "로그 보내려고 준비 중",
+    "Logs sent": "로그 보냈습니다.",
+    "Failed to send logs: ": "다음 로그를 보내지 못했습니다: ",
+    "GitHub issue link:": "GitHub 이슈 링크:",
+    "Riot bugs are tracked on GitHub: create a GitHub issue.": "Riot의 버그는 Github에서 트랙됩니다. Github 이슈 만들기",
+    "Notes:": "참고:",
+    "Community IDs cannot be empty.": "커뮤니티 ID를 입력해 주세요.",
+    "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "커뮤니티 ID에는 a-z, 0-9, 혹은 '=_-.'만 사용할 수 있습니다.",
+    "Something went wrong whilst creating your community": "커뮤니티를 생성하는 동안 뭔가 잘못됐습니다.",
+    "Create Community": "커뮤니티 만들기",
+    "Community Name": "커뮤니티 이름",
+    "Example": "예시",
+    "Community ID": "커뮤니티 ID",
+    "example": "예시",
+    "Create": "만들기",
+    "Advanced options": "고급 설정",
+    "Block users on other matrix homeservers from joining this room": "다른 Matrix 홈 서버에서 이 방에 들어오려는 사용자 막기",
+    "Failed to indicate account erasure": "계정이 지워졌다는 것을 표시하지 못했습니다.",
+    "Deactivating your account does not by default cause us to forget messages you have sent. If you would like us to forget your messages, please tick the box below.": "계정을 비활성화한다고 해서 보내셨던 메시지가 기본으로 지워지는 건 아닙니다. 저희가 갖고 있는 메시지를 지우시려면 밑의 박스를 눌러주세요.",
+    "There's no one else here! Would you like to invite others or stop warning about the empty room?": "다른 사람이 아무도 없군요! 다른 사람을 초대하거나 방이 비었다는 걸 그만 알려드릴까요?",
+    "To continue, please enter your password:": "계속하려면 비밀번호를 입력해 주세요:",
+    "password": "비밀번호",
+    "Refresh": "새로고침",
+    "To get started, please pick a username!": "시작하시려면, 사용자 이름을 골라주세요!",
+    "Share Room": "방 공유하기",
+    "Share User": "사용자 공유하기",
+    "Share Community": "커뮤니티 공유하기",
+    "Share Room Message": "방 메시지 공유하기",
+    "Link to selected message": "선택한 메시지로 연결하기",
+    "COPY": "복사",
+    "Unable to reject invite": "초대를 거절하지 못했습니다.",
+    "Reply": "답장",
+    "Pin Message": "메시지 고정하기",
+    "Share Message": "메시지 공유하기",
+    "Collapse Reply Thread": "이어지는 답장 줄이기",
+    "View Community": "커뮤니티 보기",
+    "Please install Chrome or Firefox for the best experience.": "크롬이나 파이어폭스를 설치하면 가장 좋은 경험을 하실 수 있습니다.",
+    "Safari and Opera work too.": "사파리나 오페라도 가능합니다.",
+    "Add rooms to the community summary": "커뮤니티 요약에 방 추가하기",
+    "Everyone": "모두",
+    "were kicked %(count)s times|other": "님은 %(count)s번 추방당했습니다.",
+    "were kicked %(count)s times|one": "님은 추방당했습니다.",
+    "was kicked %(count)s times|other": "님은 %(count)s번 추방당했습니다.",
+    "was kicked %(count)s times|one": "님은 추방당했습니다.",
+    "Custom of %(powerLevel)s": "",
+    "And %(count)s more...|other": "%(count)s개 더...",
+    "Add a User": "사용자 추가하기",
+    "Failed to upload image": "이미지를 업로드하지 못했습니다.",
+    "Failed to update community": "커뮤니티를 업데이트하지 못했습니다.",
+    "Unable to accept invite": "초대를 승락하지 못했습니다.",
+    "Unable to join community": "커뮤니티에 들어갈 수 없습니다.",
+    "Leave Community": "커뮤니티 나가기",
+    "Leave %(groupName)s?": "%(groupName)s를(을) 나가시겠어요?",
+    "Unable to leave community": "커뮤니티를 나갈 수 없습니다.",
+    "Community Settings": "커뮤니티 설정",
+    "Add rooms to this community": "이 커뮤니티에 방 추가하기",
+    "Featured Rooms:": "추천하는 방:",
+    "Featured Users:": "추천하는 사용자:",
+    "Join this community": "이 커뮤니티에 들어가기",
+    "Leave this community": "이 커뮤니티에서 나오기",
+    "%(inviter)s has invited you to join this community": "%(inviter)s님이 이 커뮤니티에 초대했습니다.",
+    "You are an administrator of this community": "이 커뮤니티의 관리자이십니다.",
+    "You are a member of this community": "이 커뮤니티의 구성원이십니다.",
+    "Who can join this community?": "누가 이 커뮤니티에 들어올 수 있나요?",
+    "Your community hasn't got a Long Description, a HTML page to show to community members.
    Click here to open settings and give it one!": "커뮤니티에 긴 설명, 즉 커뮤니티 구성원에게 보여줄 HTML 페이지가 없습니다. 
    여기를 눌러 설정을 열고 설명을 부여하세요!",
+    "Long Description (HTML)": "긴 설명(HTML)",
+    "Description": "설명",
+    "Community %(groupId)s not found": "%(groupId)s 커뮤니티를 찾지 못했습니다.",
+    "This Home server does not support communities": "이 홈 서버는 커뮤니티를 지원하지 않습니다.",
+    "Failed to load %(groupId)s": "%(groupId)s를 받지 못했습니다.",
+    "Can't leave Server Notices room": "서버 알림 방을 떠날 수 없습니다.",
+    "This room is used for important messages from the Homeserver, so you cannot leave it.": "이 방은 홈 서버로부터 중요한 메시지를 받는 데 쓰이므로 떠나실 수 없습니다.",
+    "Terms and Conditions": "이용 약관",
+    "Review terms and conditions": "이용 약관 읽기",
+    "Old cryptography data detected": "오래된 암호 데이터를 발견했습니다.",
+    "Your Communities": "속한 커뮤니티",
+    "Create a new community": "새 커뮤니티 만들기",
+    "Error whilst fetching joined communities": "속한 커뮤니티를 받는 중, 에러가 났습니다.",
+    "Room Notification": "방 알림",
+    "Notify the whole room": "방 모두에게 알리기",
+    "Sign in to get started": "시작하시려면 로그인하세요.",
+    "Try the app first": "앱을 먼저 써 보세요.",
+    "This homeserver doesn't offer any login flows which are supported by this client.": "이 홈 서버는 이 클라이언트에서 지원되는 로그인 방식을 지원하지 않습니다.",
+    "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "홈 서버 %(homeserverDomain)s를(을) 계속 사용하기 위해서는 저희 이용 약관을 읽어보시고 동의하셔야 합니다.",
+    "State Key": "상태 키",
+    "Send Account Data": "계정 정보 보내기",
+    "Loading device info...": "기기 정보 받는 중...",
+    "Clear Storage and Sign Out": "저장소 지우고 로그아웃하기",
+    "Send Logs": "로그 보내기",
+    "We encountered an error trying to restore your previous session.": "저번 활동을 복구하던 중 에러가 났습니다.",
+    "Add to summary": "요약에 추가하기",
+    "Which rooms would you like to add to this summary?": "이 요약에 어떤 방을 추가하시겠어요?",
+    "Add a Room": "방 추가하기",
+    "Add users to the community summary": "커뮤니티 요약에 사용자 추가하기",
+    "Who would you like to add to this summary?": "이 요약에 누구를 추가하고 싶으세요?",
+    "Link to most recent message": "가장 최근 메시지로 링크 걸기"
 }
diff --git a/src/i18n/strings/lt.json b/src/i18n/strings/lt.json
index e1525f7af1..db2a8a1f7b 100644
--- a/src/i18n/strings/lt.json
+++ b/src/i18n/strings/lt.json
@@ -13,7 +13,7 @@
     "Analytics": "Statistika",
     "The information being sent to us to help make Riot.im better includes:": "Informacijoje, kuri yra siunčiama Riot.im tobulinimui yra:",
     "Fetching third party location failed": "Nepavyko gauti trečios šalies vietos",
-    "A new version of Riot is available.": "Yra nauja Riot versija.",
+    "A new version of Riot is available.": "Yra prieinama nauja Riot versija.",
     "I understand the risks and wish to continue": "Aš suprantu riziką ir noriu tęsti",
     "Couldn't load home page": "Nepavyksta užkrauti namų puslapio",
     "Send Account Data": "Siųsti paskyros duomenis",
@@ -43,10 +43,10 @@
     "All notifications are currently disabled for all targets.": "Šiuo metu visi pranešimai visiems objektams yra išjungti.",
     "Operation failed": "Operacija nepavyko",
     "delete the alias.": "ištrinti slapyvardį.",
-    "To return to your account in future you need to set a password": "Ateityje norėdami prisijungti prie savo paskyros turite susigalvoti slaptažodį",
+    "To return to your account in future you need to set a password": "Ateityje, norėdami grįžti prie savo paskyros turite nusistatyti slaptažodį",
     "Forget": "Pamiršti",
     "World readable": "Visiems skaitomas",
-    "Mute": "Užtildyti",
+    "Mute": "Nutildyti",
     "Hide panel": "Slėpti skydelį",
     "You cannot delete this image. (%(code)s)": "Jūs negalite ištrinti šio paveikslėlio. (%(code)s)",
     "Cancel Sending": "Atšaukti siuntimą",
@@ -64,7 +64,7 @@
     "Notifications on the following keywords follow rules which can’t be displayed here:": "Pranešimai šiems raktažodžiams yra uždrausti taisyklėmis:",
     "Safari and Opera work too.": "Naudojant Safari ir Opera taip pat gerai veikia.",
     "Please set a password!": "Prašau įrašykite slaptažodį!",
-    "powered by Matrix": "palaikomas Matrix",
+    "powered by Matrix": "veikia su Matrix",
     "You have successfully set a password!": "Jūs sėkmingai įrašėte slaptažodį!",
     "Favourite": "Svarbūs",
     "All Rooms": "Visi pokalbių kambariai",
@@ -97,7 +97,7 @@
     "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot naudoja daug išplėstinių naršyklės funkcionalumų, kai kurie iš jų yra neprieinami ar eksperimentinei Jūsų naršyklėje.",
     "Event sent!": "Įvykis išsiųstas!",
     "Unnamed room": "Kambarys be pavadinimo",
-    "Dismiss": "Nutraukti",
+    "Dismiss": "Atmesti",
     "Explore Account Data": "Peržiūrėti paskyros duomenis",
     "Remove from Directory": "Šalinti iš katalogo",
     "Download this file": "Atsisiųsti šį failą",
@@ -109,7 +109,7 @@
     "Failed to set Direct Message status of room": "Nepavyko nustatyti tiesioginio pranešimo kambario būklės",
     "Monday": "Pirmadienis",
     "All messages (noisy)": "Visos žinutės (triukšmingas)",
-    "Enable them now": "Įgalinti juos dabar",
+    "Enable them now": "Įjungti juos dabar",
     "Enable audible notifications in web client": "Įgalinti garsinius pranešimus internetinėje aplinkoje",
     "Messages containing my user name": "Žinutės, kuriose paminėtas mano naudotojo vardas",
     "Toolbox": "Įrankinė",
@@ -154,7 +154,7 @@
     "Quote": "Citata",
     "Messages in group chats": "Žinutės grupės pokalbiuose",
     "Yesterday": "Vakar",
-    "Error encountered (%(errorDetail)s).": "Gauta klaida (%(errorDetail)s).",
+    "Error encountered (%(errorDetail)s).": "Susidurta su klaida (%(errorDetail)s).",
     "Login": "Prisijungti",
     "Low Priority": "Nesvarbūs",
     "Riot does not know how to join a room on this network": "Riot nežino kaip prisijungti prie kambario šiame tinkle",
@@ -181,11 +181,694 @@
     "%(count)s Members|one": "%(count)s narys",
     "Developer Tools": "Programuotojo įrankiai",
     "Unhide Preview": "Rodyti paržiūrą",
-    "Custom Server Options": "Pasirinktiniai serverio nustatymai",
+    "Custom Server Options": "Tinkinto serverio parametrai",
     "Event Content": "Įvykio turinys",
     "Thank you!": "Ačiū!",
     "Collapse panel": "Suskleisti skydelį",
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Naudojant šią naršyklę aplikacija gali atrodyti ir reaguoti neteisingai. Kai kurios arba visos funkcijos gali neveikti. Jei vis tiek norite pabandyti gali tęsti, tačiau iškilusios problemos yra jūsų pačių reikalas!",
     "Checking for an update...": "Tikrinama ar yra atnaujinimų...",
-    "There are advanced notifications which are not shown here": "Yra išplėstinių pranešimų, kurie nėra čia rodomi"
+    "There are advanced notifications which are not shown here": "Yra išplėstinių pranešimų, kurie nėra čia rodomi",
+    "e.g. %(exampleValue)s": "pvz., %(exampleValue)s",
+    "e.g. ": "pvz., ",
+    "Your device resolution": "Jūsų įrenginio raiška",
+    "Call Failed": "Skambutis nepavyko",
+    "Call Anyway": "Vis tiek skambinti",
+    "Answer Anyway": "Vis tiek atsiliepti",
+    "Call": "Skambinti",
+    "Answer": "Atsiliepti",
+    "Unable to capture screen": "Nepavyko nufotografuoti ekraną",
+    "You are already in a call.": "Jūs jau dalyvaujate skambutyje.",
+    "VoIP is unsupported": "VoIP yra nepalaikoma",
+    "Could not connect to the integration server": "Nepavyko prisijungti prie integracijos serverio",
+    "Permission Required": "Reikalingas leidimas",
+    "The file '%(fileName)s' failed to upload": "Nepavyko įkelti failo \"%(fileName)s\"",
+    "Upload Failed": "Įkėlimas nepavyko",
+    "Sun": "Sek",
+    "Mon": "Pir",
+    "Tue": "Ant",
+    "Wed": "Tre",
+    "Thu": "Ket",
+    "Fri": "Pen",
+    "Sat": "Šeš",
+    "Jan": "Sau",
+    "Feb": "Vas",
+    "Mar": "Kov",
+    "Apr": "Bal",
+    "May": "Geg",
+    "Jun": "Bir",
+    "Jul": "Lie",
+    "Aug": "Rgp",
+    "Sep": "Rgs",
+    "Oct": "Spa",
+    "Nov": "Lap",
+    "Dec": "Gru",
+    "PM": "PM",
+    "AM": "AM",
+    "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(time)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(fullYear)s %(monthName)s %(day)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(fullYear)s %(monthName)s %(day)s %(time)s",
+    "Who would you like to add to this community?": "Ką norėtumėte pridėti į šią bendruomenę?",
+    "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Įspėjimas: bet kuris pridėtas asmuo bus matomas visiems, žinantiems bendruomenės ID",
+    "Name or matrix ID": "Vardas ar matrix ID",
+    "Invite to Community": "Pakviesti į bendruomenę",
+    "Which rooms would you like to add to this community?": "Kuriuos kambarius norėtumėte pridėti į šią bendruomenę?",
+    "Add rooms to the community": "Pridėti kambarius į bendruomenę",
+    "Add to community": "Pridėti į bendruomenę",
+    "Failed to invite the following users to %(groupId)s:": "Nepavyko pakviesti šių naudotojų į %(groupId)s:",
+    "Failed to invite users to community": "Nepavyko pakviesti naudotojus į bendruomenę",
+    "Failed to invite users to %(groupId)s": "Nepavyko pakviesti naudotojų į %(groupId)s",
+    "Failed to add the following rooms to %(groupId)s:": "Nepavyko pridėti šiuos kambarius į %(groupId)s:",
+    "Riot does not have permission to send you notifications - please check your browser settings": "Riot neturi leidimo siųsti jums pranešimus - patikrinkite savo naršyklės nustatymus",
+    "Riot was not given permission to send notifications - please try again": "Riot nebuvo suteiktas leidimas siųsti pranešimus - bandykite dar kartą",
+    "Unable to enable Notifications": "Nepavyko įjungti Pranešimus",
+    "This email address was not found": "Šis el. pašto adresas nebuvo rastas",
+    "Admin": "Administratorius",
+    "Start a chat": "Pradėti pokalbį",
+    "Email, name or matrix ID": "El. paštas, vardas ar matrix ID",
+    "Start Chat": "Pradėti pokalbį",
+    "Who would you like to add to this room?": "Ką norėtumėte pridėti į šį kambarį?",
+    "Send Invites": "Siųsti pakvietimus",
+    "Failed to invite user": "Nepavyko pakviesti naudotojo",
+    "Failed to invite": "Nepavyko pakviesti",
+    "Failed to invite the following users to the %(roomName)s room:": "Nepavyko pakviesti šių naudotojų į kambarį %(roomName)s :",
+    "You need to be logged in.": "Turite būti prisijungę.",
+    "Unable to create widget.": "Nepavyko sukurti valdiklio.",
+    "Failed to send request.": "Nepavyko išsiųsti užklausos.",
+    "This room is not recognised.": "Šis kambarys neatpažintas.",
+    "You are not in this room.": "Jūs nesate šiame kambaryje.",
+    "You do not have permission to do that in this room.": "Jūs neturite leidimo tai atlikti šiame kambaryje.",
+    "Room %(roomId)s not visible": "Kambarys %(roomId)s nematomas",
+    "/ddg is not a command": "/ddg nėra komanda",
+    "Changes your display nickname": "Pakeičia jūsų rodomą slapyvardį",
+    "Sets the room topic": "Nustato kambario temą",
+    "Invites user with given id to current room": "Pakviečia naudotoją su nurodytu id į esamą kambarį",
+    "You are now ignoring %(userId)s": "Dabar nepaisote %(userId)s",
+    "Opens the Developer Tools dialog": "Atveria kūrėjo įrankių dialogą",
+    "Unknown (user, device) pair:": "Nežinoma pora (naudotojas, įrenginys):",
+    "Device already verified!": "Įrenginys jau patvirtintas!",
+    "WARNING: Device already verified, but keys do NOT MATCH!": "ĮSPĖJIMAS: Įrenginys jau patvirtintas, tačiau raktai NESUTAMPA!",
+    "Verified key": "Patvirtintas raktas",
+    "Displays action": "Rodo veiksmą",
+    "Unrecognised command:": "Neatpažinta komanda:",
+    "Reason": "Priežastis",
+    "%(targetName)s accepted an invitation.": "%(targetName)s priėmė pakvietimą.",
+    "%(senderName)s invited %(targetName)s.": "%(senderName)s pakvietė naudotoją %(targetName)s.",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s pasikeitė savo rodomą vardą į %(displayName)s.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s nusistatė savo rodomą vardą į %(displayName)s.",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s pašalino savo rodomą vardą (%(oldDisplayName)s).",
+    "%(senderName)s removed their profile picture.": "%(senderName)s pašalino savo profilio paveikslą.",
+    "%(senderName)s changed their profile picture.": "%(senderName)s pasikeitė savo profilio paveikslą.",
+    "%(senderName)s set a profile picture.": "%(senderName)s nusistatė profilio paveikslą.",
+    "%(targetName)s rejected the invitation.": "%(targetName)s atmetė pakvietimą.",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s pakeitė temą į \"%(topic)s\".",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s pakeitė kambario pavadinimą į %(roomName)s.",
+    "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s išsiuntė paveikslą.",
+    "Someone": "Kažkas",
+    "%(senderName)s answered the call.": "%(senderName)s atsiliepė į skambutį.",
+    "(unknown failure: %(reason)s)": "(nežinoma lemtingoji klaida: %(reason)s)",
+    "%(senderName)s ended the call.": "%(senderName)s užbaigė skambutį.",
+    "%(displayName)s is typing": "%(displayName)s rašo",
+    "%(names)s and %(count)s others are typing|other": "%(names)s ir dar kiti %(count)s rašo",
+    "%(names)s and %(lastPerson)s are typing": "%(names)s ir %(lastPerson)s rašo",
+    "Send anyway": "Vis tiek siųsti",
+    "Unnamed Room": "Kambarys be pavadinimo",
+    "Hide removed messages": "Slėpti pašalintas žinutes",
+    "Hide display name changes": "Slėpti rodomo vardo pakeitimus",
+    "Show timestamps in 12 hour format (e.g. 2:30pm)": "Rodyti laiko žymas 12 valandų formatu (pvz., 2:30pm)",
+    "Always show message timestamps": "Visada rodyti žinučių laiko žymas",
+    "Always show encryption icons": "Visada rodyti šifravimo piktogramas",
+    "Room Colour": "Kambario spalva",
+    "Decline": "Atmesti",
+    "Accept": "Priimti",
+    "Incorrect verification code": "Neteisingas patvirtinimo kodas",
+    "Submit": "Pateikti",
+    "Phone": "Telefonas",
+    "Add phone number": "Pridėti telefono numerį",
+    "Add": "Pridėti",
+    "Failed to upload profile picture!": "Nepavyko įkelti profilio paveikslą!",
+    "Upload new:": "Įkelti naują:",
+    "No display name": "Nėra rodomo vardo",
+    "New passwords don't match": "Nauji slaptažodžiai nesutampa",
+    "Passwords can't be empty": "Slaptažodžiai negali būti tušti",
+    "Warning!": "Įspėjimas!",
+    "Do you want to set an email address?": "Ar norite nustatyti el. pašto adresą?",
+    "Current password": "Dabartinis slaptažodis",
+    "Password": "Slaptažodis",
+    "New Password": "Naujas slaptažodis",
+    "Unable to load device list": "Nepavyko įkelti įrenginių sąrašo",
+    "Delete %(count)s devices|one": "Ištrinti įrenginį",
+    "Device ID": "Įrenginio ID",
+    "Device Name": "Įrenginio pavadinimas",
+    "Failed to set display name": "Nepavyko nustatyti rodomą vardą",
+    "Disable Notifications": "Išjungti pranešimus",
+    "Enable Notifications": "Įjungti pranešimus",
+    "Cannot add any more widgets": "Nepavyksta pridėti daugiau valdiklių",
+    "Add a widget": "Pridėti valdiklį",
+    "Drop File Here": "Vilkite failą čia",
+    "Drop file here to upload": "Norėdami įkelti, vilkite failą čia",
+    " (unsupported)": " (nepalaikoma)",
+    "%(senderName)s sent an image": "%(senderName)s išsiuntė paveikslą",
+    "%(senderName)s sent a video": "%(senderName)s išsiuntė vaizdo įrašą",
+    "%(senderName)s uploaded a file": "%(senderName)s įkėlė failą",
+    "Options": "Parametrai",
+    "Key request sent.": "Rakto užklausa išsiųsta.",
+    "Unencrypted message": "Nešifruota žinutė",
+    "device id: ": "įrenginio id: ",
+    "Failed to mute user": "Nepavyko nutildyti naudotoją",
+    "Are you sure?": "Ar tikrai?",
+    "Devices": "Įrenginiai",
+    "Ignore": "Nepaisyti",
+    "Invite": "Pakviesti",
+    "User Options": "Naudotojo parametrai",
+    "Admin Tools": "Administratoriaus įrankiai",
+    "bold": "pusjuodis",
+    "italic": "kursyvas",
+    "Attachment": "Priedas",
+    "Upload Files": "Įkelti failus",
+    "Are you sure you want to upload the following files?": "Ar tikrai norite įkelti šiuos failus?",
+    "Encrypted room": "Šifruotas kambarys",
+    "Unencrypted room": "Nešifruotas kambarys",
+    "Voice call": "Balso skambutis",
+    "Video call": "Vaizdo skambutis",
+    "Upload file": "Įkelti failą",
+    "Show Text Formatting Toolbar": "Rodyti teksto formatavimo įrankių juostą",
+    "Send an encrypted reply…": "Siųsti šifruotą atsakymą…",
+    "Send a reply (unencrypted)…": "Siųsti atsakymą (nešifruotą)…",
+    "Send an encrypted message…": "Siųsti šifruotą žinutę…",
+    "Send a message (unencrypted)…": "Siųsti žinutę (nešifruotą)…",
+    "Hide Text Formatting Toolbar": "Slėpti teksto formatavimo įrankių juostą",
+    "Server error": "Serverio klaida",
+    "Command error": "Komandos klaida",
+    "Unable to reply": "Nepavyko atsakyti",
+    "Loading...": "Įkeliama...",
+    "Pinned Messages": "Prisegtos žinutės",
+    "Unknown": "Nežinoma",
+    "Save": "Įrašyti",
+    "(~%(count)s results)|other": "(~%(count)s rezultatų(-ai))",
+    "(~%(count)s results)|one": "(~%(count)s rezultatas)",
+    "Upload avatar": "Įkelti avatarą",
+    "Remove avatar": "Šalinti avatarą",
+    "Settings": "Nustatymai",
+    "Show panel": "Rodyti skydelį",
+    "Press  to start a chat with someone": "Norėdami pradėti su kuo nors pokalbį, paspauskite ",
+    "Community Invites": "",
+    "People": "Žmonės",
+    "Reason: %(reasonText)s": "Priežastis: %(reasonText)s",
+    "%(roomName)s does not exist.": "%(roomName)s nėra.",
+    "%(roomName)s is not accessible at this time.": "%(roomName)s šiuo metu nėra pasiekiamas.",
+    "Click here to join the discussion!": "Spustelėkite čia, norėdami prisijungti prie diskusijos!",
+    "To change the topic, you must be a": "Norėdami pakeisti temą, privalote būti",
+    "Enable encryption": "Įjungti šifravimą",
+    "To send messages, you must be a": "Norėdami siųsti žinutes, privalote būti",
+    "To invite users into the room, you must be a": "Norėdami pakviesti naudotojus į kambarį, privalote būti",
+    "To configure the room, you must be a": "Norėdami konfigūruoti kambarį, privalote būti",
+    "To remove other users' messages, you must be a": "Norėdami šalinti kitų naudotojų žinutes, privalote būti",
+    "%(user)s is a %(userRole)s": "%(user)s yra %(userRole)s",
+    "Muted Users": "Nutildyti naudotojai",
+    "Click here to fix": "Spustelėkite čia, norėdami pataisyti",
+    "To send events of type , you must be a": "Norėdami siųsti  tipo įvykius, privalote būti",
+    "Only people who have been invited": "Tik žmonės, kurie buvo pakviesti",
+    "Anyone who knows the room's link, apart from guests": "Bet kas, žinantis kambario nuorodą, išskyrus svečius",
+    "Anyone who knows the room's link, including guests": "Bet kas, žinantis kambario nuorodą, įskaitant svečius",
+    "Anyone": "Bet kas",
+    "Permissions": "Leidimai",
+    "Advanced": "Išplėstiniai",
+    "This room's internal ID is": "Šio kambario vidinis ID yra",
+    "Add a topic": "Pridėti temą",
+    "Invalid address format": "Neteisingas adreso formatas",
+    "Addresses": "Adresai",
+    "The main address for this room is": "Pagrindinis šio kambario adresas yra",
+    "Local addresses for this room:": "Vietiniai šio kambario adresai:",
+    "This room has no local addresses": "Šis kambarys neturi jokių vietinių adresų",
+    "New address (e.g. #foo:%(localDomain)s)": "Naujas adresas (pvz., #betkoks:%(localDomain)s)",
+    "Invalid community ID": "Neteisingas bendruomenės ID",
+    "'%(groupId)s' is not a valid community ID": "\"%(groupId)s\" nėra teisingas bendruomenės ID",
+    "New community ID (e.g. +foo:%(localDomain)s)": "Naujas bendruomenės ID (pvz., +betkoks:%(localDomain)s)",
+    "URL Previews": "URL nuorodų peržiūros",
+    "Error decrypting audio": "Klaida iššifruojant garsą",
+    "Error decrypting attachment": "Klaida iššifruojant priedą",
+    "Decrypt %(text)s": "Iššifruoti %(text)s",
+    "Download %(text)s": "Atsisiųsti %(text)s",
+    "Error decrypting image": "Klaida iššifruojant paveikslą",
+    "Error decrypting video": "Klaida iššifruojant vaizdo įrašą",
+    "Copied!": "Nukopijuota!",
+    "Failed to copy": "Nepavyko nukopijuoti",
+    "Message removed by %(userId)s": "Žinutę pašalino %(userId)s",
+    "Message removed": "Žinutė pašalinta",
+    "To continue, please enter your password.": "Norėdami tęsti, įveskite savo slaptažodį.",
+    "Password:": "Slaptažodis:",
+    "An email has been sent to %(emailAddress)s": "El. laiškas buvo išsiųstas į %(emailAddress)s",
+    "Please check your email to continue registration.": "Norėdami tęsti registraciją, patikrinkite savo el. paštą.",
+    "A text message has been sent to %(msisdn)s": "Tekstinė žinutė buvo išsiųsta į %(msisdn)s",
+    "Please enter the code it contains:": "Įveskite joje esantį kodą:",
+    "Code": "Kodas",
+    "The email field must not be blank.": "El. pašto laukas negali būti tuščias.",
+    "The user name field must not be blank.": "Naudotojo vardo laukas negali būti tuščias.",
+    "The phone number field must not be blank.": "Telefono numerio laukas negali būti tuščias.",
+    "The password field must not be blank.": "Slaptažodžio laukas negali būti tuščias.",
+    "User name": "Naudotojo vardas",
+    "Mobile phone number": "Mobiliojo telefono numeris",
+    "Forgot your password?": "Pamiršote slaptažodį?",
+    "Email address": "El. pašto adresas",
+    "Email address (optional)": "El. pašto adresas (nebūtinas)",
+    "Mobile phone number (optional)": "Mobiliojo telefono numeris (nebūtinas)",
+    "Default server": "Numatytasis serveris",
+    "Custom server": "Tinkintas serveris",
+    "What does this mean?": "Ką tai reiškia?",
+    "Remove from community": "Šalinti iš bendruomenės",
+    "Remove this user from community?": "Šalinti šį naudotoją iš bendruomenės?",
+    "Failed to remove user from community": "Nepavyko pašalinti naudotoją iš bendruomenės",
+    "Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "Ar tikrai norite pašalinti \"%(roomName)s\" iš %(groupId)s?",
+    "Failed to remove room from community": "Nepavyko pašalinti kambarį iš bendruomenės",
+    "Failed to remove '%(roomName)s' from %(groupId)s": "Nepavyko pašalinti \"%(roomName)s\" iš %(groupId)s",
+    "Something went wrong!": "Kažkas nutiko!",
+    "Visibility in Room List": "Matomumas kambarių sąraše",
+    "Visible to everyone": "Matomas visiems",
+    "Yes, I want to help!": "Taip, aš noriu padėti!",
+    "Unknown Address": "Nežinomas adresas",
+    "Warning: This widget might use cookies.": "Įspėjimas: Šis valdiklis gali naudoti slapukus.",
+    "Do you want to load widget from URL:": "Ar norite įkelti valdiklį iš URL:",
+    "Allow": "Leisti",
+    "Delete Widget": "Ištrinti valdiklį",
+    "Delete widget": "Ištrinti valdiklį",
+    "Failed to remove widget": "Nepavyko pašalinti valdiklį",
+    "Scroll to bottom of page": "Slinkti į puslapio apačią",
+    "Show devices, send anyway or cancel.": "Rodyti įrenginius, vis tiek siųsti ar atsisakyti.",
+    "%(count)s of your messages have not been sent.|other": "Kai kurios iš jūsų žinučių nebuvo išsiųstos.",
+    "%(count)s of your messages have not been sent.|one": "Jūsų žinutė nebuvo išsiųsta.",
+    "Connectivity to the server has been lost.": "Jungiamumas su šiuo serveriu buvo prarastas.",
+    "Sent messages will be stored until your connection has returned.": "Išsiųstos žinutės bus saugomos tol, kol atsiras ryšys.",
+    "%(count)s new messages|other": "%(count)s naujų žinučių",
+    "%(count)s new messages|one": "%(count)s nauja žinutė",
+    "Active call": "Aktyvus skambutis",
+    "There's no one else here! Would you like to invite others or stop warning about the empty room?": "Čia daugiau nieko nėra! Ar norėtumėte pakviesti kitus ar išjungti įspėjimą apie tuščią kambarį?",
+    "You seem to be uploading files, are you sure you want to quit?": "Atrodo, kad jūs įkelinėjate failus, ar tikrai norite išeiti?",
+    "You seem to be in a call, are you sure you want to quit?": "Atrodo, kad dalyvaujate skambutyje, ar tikrai norite išeiti?",
+    "Failed to upload file": "Nepavyko įkelti failo",
+    "Server may be unavailable, overloaded, or the file too big": "Gali būti, kad serveris neprieinamas, perkrautas arba failas yra per didelis",
+    "Search failed": "Paieška nepavyko",
+    "Server may be unavailable, overloaded, or search timed out :(": "Gali būti, kad serveris neprieinamas, perkrautas arba pasibaigė paieškai skirtas laikas :(",
+    "No more results": "Daugiau nėra jokių rezultatų",
+    "Unknown room %(roomId)s": "Nežinomas kambarys %(roomId)s",
+    "Room": "Kambarys",
+    "Failed to save settings": "Nepavyko įrašyti nustatymų",
+    "Failed to reject invite": "Nepavyko atmesti pakvietimo",
+    "Fill screen": "Užpildyti ekraną",
+    "Click to unmute video": "Spustelėkite, norėdami įjungti vaizdą",
+    "Click to mute video": "Spustelėkite, norėdami išjungti vaizdą",
+    "Click to unmute audio": "Spustelėkite, norėdami įjungti garsą",
+    "Click to mute audio": "Spustelėkite, norėdami nutildyti garsą",
+    "Clear filter": "Išvalyti filtrą",
+    "Uploading %(filename)s and %(count)s others|other": "Įkeliamas %(filename)s ir dar %(count)s failai",
+    "Uploading %(filename)s and %(count)s others|zero": "Įkeliamas %(filename)s",
+    "Uploading %(filename)s and %(count)s others|one": "Įkeliamas %(filename)s ir dar %(count)s failas",
+    "Light theme": "Šviesi tema",
+    "Dark theme": "Tamsi tema",
+    "Status.im theme": "Status.im tema",
+    "Can't load user settings": "Nepavyksta įkelti naudotojo nustatymų",
+    "Server may be unavailable or overloaded": "Gali būti, kad serveris neprieinamas arba perkrautas",
+    "Success": "Pavyko",
+    "Remove Contact Information?": "Šalinti kontaktinę informaciją?",
+    "Remove %(threePid)s?": "Šalinti %(threePid)s?",
+    "Unable to remove contact information": "Nepavyko pašalinti kontaktinę informaciją",
+    "Interface Language": "Sąsajos kalba",
+    "User Interface": "Naudotojo sąsaja",
+    "": "",
+    "Device ID:": "Įrenginio ID:",
+    "Device key:": "Įrenginio raktas:",
+    "Ignored Users": "Nepaisomi naudotojai",
+    "Debug Logs Submission": "Derinimo žurnalų pateikimas",
+    "These are experimental features that may break in unexpected ways": "Šios yra eksperimentinės ypatybės, kurios veikti netikėtais būdais",
+    "Deactivate my account": "Pasyvinti mano paskyrą",
+    "Clear Cache": "Išvalyti podėlį",
+    "Clear Cache and Reload": "Išvalyti podėlį ir įkelti iš naujo",
+    "Updates": "Atnaujinimai",
+    "Check for update": "Tikrinti, ar yra atnaujinimų",
+    "Reject all %(invitedRooms)s invites": "Atmesti visus %(invitedRooms)s pakvietimus",
+    "Bulk Options": "Masiniai parametrai",
+    "You may need to manually permit Riot to access your microphone/webcam": "Jums gali tekti rankiniu būdu leisti Riot prieigą prie savo mikrofono/kameros",
+    "Missing Media Permissions, click here to request.": "Trūksta medijos leidimų, spustelėkite čia, norėdami užklausti.",
+    "No Audio Outputs detected": "Neaptikta jokių garso išvesčių",
+    "No Microphones detected": "Neaptikta jokių mikrofonų",
+    "No Webcams detected": "Neaptikta jokių kamerų",
+    "Default Device": "Numatytasis įrenginys",
+    "Audio Output": "Garso išvestis",
+    "Microphone": "Mikrofonas",
+    "Camera": "Kamera",
+    "VoIP": "VoIP",
+    "Email": "El. paštas",
+    "Add email address": "Pridėti el. pašto adresą",
+    "Profile": "Profilis",
+    "Account": "Paskyra",
+    "To return to your account in future you need to set a password": "Norėdami ateityje sugrįžti į savo paskyrą, turite nusistatyti slaptažodį",
+    "Logged in as:": "Esate prisijungę kaip:",
+    "click to reveal": "spustelėkite, norėdami atskleisti",
+    "matrix-react-sdk version:": "matrix-react-sdk versija:",
+    "riot-web version:": "riot-web versija:",
+    "olm version:": "olm versija:",
+    "Failed to send email": "Nepavyko išsiųsti el. laiško",
+    "The email address linked to your account must be entered.": "Privalo būti įvestas su jūsų paskyra susietas el. pašto adresas.",
+    "A new password must be entered.": "Privalo būti įvestas naujas slaptažodis.",
+    "New passwords must match each other.": "Nauji slaptažodžiai privalo sutapti.",
+    "I have verified my email address": "Aš patvirtinau savo el. pašto adresą",
+    "Your password has been reset": "Jūsų slaptažodis buvo atstatytas",
+    "Return to login screen": "Grįžti į prisijungimo ekraną",
+    "To reset your password, enter the email address linked to your account": "Norėdami atstatyti slaptažodį, įveskite su jūsų paskyra susietą el. pašto adresą",
+    "New password": "Naujas slaptažodis",
+    "Confirm your new password": "Patvirtinkite savo naują slaptažodį",
+    "Send Reset Email": "Siųsti atstatymo el. laišką",
+    "Create an account": "Sukurti paskyrą",
+    "Incorrect username and/or password.": "Neteisingas naudotojo vardas ir/ar slaptažodis.",
+    "Please note you are logging into the %(hs)s server, not matrix.org.": "Turėkite omenyje, kad jūs prisijungiate prie %(hs)s serverio, o ne matrix.org.",
+    "Sign in to get started": "Norėdami pradėti, prisijunkite",
+    "Failed to fetch avatar URL": "Nepavyko gauti avataro URL",
+    "Missing password.": "Trūksta slaptažodžio.",
+    "Passwords don't match.": "Slaptažodžiai nesutampa.",
+    "Password too short (min %(MIN_PASSWORD_LENGTH)s).": "Slaptažodis per trumpas (mažiausiai, %(MIN_PASSWORD_LENGTH)s).",
+    "This doesn't look like a valid email address.": "Tai nepanašu į teisingą el. pašto adresą.",
+    "This doesn't look like a valid phone number.": "Tai nepanašu į teisingą telefono numerį.",
+    "You need to enter a user name.": "Turite įvesti naudotojo vardą.",
+    "An unknown error occurred.": "Įvyko nežinoma klaida.",
+    "I already have an account": "Aš jau turiu paskyrą",
+    "Commands": "Komandos",
+    "Results from DuckDuckGo": "Rezultatai iš DuckDuckGo",
+    "Notify the whole room": "Pranešti visam kambariui",
+    "Users": "Naudotojai",
+    "unknown device": "nežinomas įrenginys",
+    "Ed25519 fingerprint": "Ed25519 kontrolinis kodas",
+    "User ID": "Naudotojo ID",
+    "Curve25519 identity key": "Curve25519 tapatybės raktas",
+    "none": "nėra",
+    "Algorithm": "Algoritmas",
+    "Decryption error": "Iššifravimo klaida",
+    "Session ID": "Seanso ID",
+    "End-to-end encryption information": "Ištisinio šifravimo informacija",
+    "Event information": "Įvykio informacija",
+    "Sender device information": "Siuntėjo įrenginio informacija",
+    "Passphrases must match": "Slaptafrazės privalo sutapti",
+    "Passphrase must not be empty": "Slaptafrazė negali būti tuščia",
+    "Export room keys": "Eksportuoti kambario raktus",
+    "Enter passphrase": "Įveskite slaptafrazę",
+    "Confirm passphrase": "Patvirtinkite slaptafrazę",
+    "Export": "Eksportuoti",
+    "Import room keys": "Importuoti kambario raktus",
+    "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Eksportavimo failas bus apsaugotas slaptafraze. Norėdami iššifruoti failą, čia turėtumėte įvesti slaptafrazę.",
+    "File to import": "Failas, kurį importuoti",
+    "Import": "Importuoti",
+    "Your User Agent": "Jūsų naudotojo agentas",
+    "Review Devices": "Peržiūrėti įrenginius",
+    "You do not have permission to start a conference call in this room": "Jūs neturite leidimo šiame kambaryje pradėti konferencinį pokalbį",
+    "The file '%(fileName)s' exceeds this home server's size limit for uploads": "Failas \"%(fileName)s\" viršija šio namų serverio įkeliamų failų dydžio apribojimą",
+    "Room name or alias": "Kambario pavadinimas ar slapyvardis",
+    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Neatrodo, kad jūsų el. pašto adresas šiame namų serveryje būtų susietas su Matrix ID.",
+    "Who would you like to communicate with?": "Su kuo norėtumėte susisiekti?",
+    "Missing room_id in request": "Užklausoje trūksta room_id",
+    "Missing user_id in request": "Užklausoje trūksta user_id",
+    "Unrecognised room alias:": "Neatpažintas kambario slapyvardis:",
+    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "ĮSPĖJIMAS: RAKTO PATVIRTINIMAS NEPAVYKO! Pasirašymo raktas, skirtas %(userId)s ir įrenginiui %(deviceId)s yra \"%(fprint)s\", o tai nesutampa su pateiktu raktu \"%(fingerprint)s\". Tai gali reikšti, kad kažkas perima jūsų komunikavimą!",
+    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Jūsų pateiktas pasirašymo raktas sutampa su pasirašymo raktus, kuris gautas iš naudotojo %(userId)s įrenginio %(deviceId)s. Įrenginys pažymėtas kaip patvirtintas.",
+    "VoIP conference started.": "VoIP konferencija pradėta.",
+    "VoIP conference finished.": "VoIP konferencija užbaigta.",
+    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s pašalino kambario pavadinimą.",
+    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s įjungė ištisinį šifravimą (%(algorithm)s algoritmas).",
+    "%(widgetName)s widget modified by %(senderName)s": "%(senderName)s modifikavo %(widgetName)s valdiklį",
+    "%(widgetName)s widget added by %(senderName)s": "%(senderName)s pridėjo %(widgetName)s valdiklį",
+    "%(widgetName)s widget removed by %(senderName)s": "%(senderName)s pašalino %(widgetName)s valdiklį",
+    "Failure to create room": "Nepavyko sukurti kambarį",
+    "Server may be unavailable, overloaded, or you hit a bug.": "Gali būti, kad serveris neprieinamas, perkrautas arba susidūrėte su klaida.",
+    "Use compact timeline layout": "Naudoti kompaktišką laiko juostos išdėstymą",
+    "Autoplay GIFs and videos": "Automatiškai atkurti GIF ir vaizdo įrašus",
+    "Never send encrypted messages to unverified devices from this device": "Niekada nesiųsti iš šio įrenginio šifruotų žinučių į nepatvirtintus įrenginius",
+    "Never send encrypted messages to unverified devices in this room from this device": "Niekada nesiųsti iš šio įrenginio šifruotas žinutes į nepatvirtintus įrenginius šiame kambaryje",
+    "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Tekstinė žinutė išsiųsta į +%(msisdn)s. Įveskite žinutėje esantį patvirtinimo kodą",
+    "Enter Code": "Įvesti kodą",
+    "Your home server does not support device management.": "Jūsų namų serveris nepalaiko įrenginių tvarkymą.",
+    "Delete %(count)s devices|other": "Ištrinti %(count)s įrenginius",
+    "This event could not be displayed": "Nepavyko parodyti šio įvykio",
+    "If your other devices do not have the key for this message you will not be able to decrypt them.": "Jeigu jūsų kituose įrenginiuose nėra rakto šiai žinutei, tuomet jūs negalėsite jos iššifruoti.",
+    "Re-request encryption keys from your other devices.": "Iš naujo užklausti šifravimo raktus iš jūsų kitų įrenginių.",
+    "Undecryptable": "Neiššifruojama",
+    "Encrypted, not sent": "Šifruota, neišsiųsta",
+    "Encrypted by a verified device": "Šifruota patvirtintu įrenginiu",
+    "Encrypted by an unverified device": "Šifruota nepatvirtintu įrenginiu",
+    "Kick": "Išmesti",
+    "Kick this user?": "Išmesti šį naudotoją?",
+    "Failed to kick": "Nepavyko išmesti",
+    "Unban": "Atblokuoti",
+    "Ban": "Užblokuoti",
+    "Unban this user?": "Atblokuoti šį naudotoją?",
+    "Ban this user?": "Užblokuoti šį naudotoją?",
+    "Failed to ban user": "Nepavyko užblokuoti naudotoją",
+    "Failed to toggle moderator status": "Nepavyko perjungti moderatoriaus būseną",
+    "Invited": "Pakviestas",
+    "Filter room members": "Filtruoti kambario dalyvius",
+    "Server unavailable, overloaded, or something else went wrong.": "Serveris neprieinamas, perkrautas arba nutiko kažkas kito.",
+    "%(duration)ss": "%(duration)s sek.",
+    "%(duration)sm": "%(duration)s min.",
+    "%(duration)sh": "%(duration)s val.",
+    "%(duration)sd": "%(duration)s d.",
+    "Seen by %(userName)s at %(dateTime)s": "%(userName)s matė ties %(dateTime)s",
+    "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "%(displayName)s (%(userName)s) matė ties %(dateTime)s",
+    "Show these rooms to non-members on the community page and room list?": "Ar rodyti šiuos kambarius ne dalyviams bendruomenės puslapyje ir kambarių sąraše?",
+    "Invite new room members": "Pakviesti naujus kambario dalyvius",
+    "Changes colour scheme of current room": "Pakeičia esamo kambario spalvų rinkinį",
+    "Kicks user with given id": "Išmeta naudotoją su nurodytu id",
+    "Bans user with given id": "Užblokuoja naudotoja su nurodytu id",
+    "Unbans user with given id": "Atblokuoja naudotoją su nurodytu id",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s užblokavo naudotoją %(targetName)s.",
+    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s atblokavo naudotoją %(targetName)s.",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s išmetė naudotoją %(targetName)s.",
+    "(not supported by this browser)": "(nėra palaikoma šios naršyklės)",
+    "(no answer)": "(nėra atsakymo)",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s padarė kambario ateities istoriją matomą visiems kambario dalyviams nuo to laiko, kai jie buvo pakviesti.",
+    "%(senderName)s made future room history visible to all room members.": "%(senderName)s padarė kambario ateities istoriją matomą visiems kambario dalyviams.",
+    "%(senderName)s made future room history visible to anyone.": "%(senderName)s padarė kambario ateities istoriją matomą bet kam.",
+    "%(names)s and %(count)s others are typing|one": "%(names)s ir dar vienas naudotojas rašo",
+    "Your browser does not support the required cryptography extensions": "Jūsų naršyklė nepalaiko reikalingų kriptografijos plėtinių",
+    "Not a valid Riot keyfile": "Negaliojantis Riot rakto failas",
+    "Authentication check failed: incorrect password?": "Tapatybės nustatymo patikrinimas patyrė nesėkmę: neteisingas slaptažodis?",
+    "Send analytics data": "Siųsti analitinius duomenis",
+    "Incoming voice call from %(name)s": "Gaunamasis balso skambutis nuo %(name)s",
+    "Incoming video call from %(name)s": "Gaunamasis vaizdo skambutis nuo %(name)s",
+    "Incoming call from %(name)s": "Gaunamasis skambutis nuo %(name)s",
+    "Changing password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Šiuo metu slaptažodžio pakeitimas atstatys bet kokius ištisinio šifravimo raktus visuose įrenginiuose ir tokiu būdu pavers šifruotą pokalbių istoriją neperskaitoma, nebent, iš pradžių, savo kambario raktus eksportuosite, o po to, juos importuosite iš naujo. Ateityje tai bus patobulinta.",
+    "Change Password": "Keisti slaptažodį",
+    "Authentication": "Tapatybės nustatymas",
+    "The maximum permitted number of widgets have already been added to this room.": "Į šį kambarį jau yra pridėtas didžiausias leidžiamas valdiklių skaičius.",
+    "Your key share request has been sent - please check your other devices for key share requests.": "Jūsų rakto bendrinimo užklausa išsiųsta - patikrinkite kitus savo įrenginius, ar juose nėra rakto bendrinimo užklausų.",
+    "Key share requests are sent to your other devices automatically. If you rejected or dismissed the key share request on your other devices, click here to request the keys for this session again.": "Rakto bendrinimo užklausos yra išsiunčiamos į jūsų kitus įrenginius automatiškai. Jeigu savo kitame įrenginyje atmetėte ar nepaisėte rakto užklausos, spustelėkite čia, norėdami dar kartą užklausti raktų šiam seansui.",
+    "Please select the destination room for this message": "Pasirinkite šiai žinutei paskirties kambarį",
+    "No devices with registered encryption keys": "Nėra jokių įrenginių su registruotais šifravimo raktais",
+    "Make Moderator": "Padaryti moderatoriumi",
+    "Level:": "Lygis:",
+    "Hangup": "Padėti ragelį",
+    "No pinned messages.": "Nėra jokių prisegtų žinučių.",
+    "Online for %(duration)s": "Prisijungęs %(duration)s",
+    "Idle for %(duration)s": "Neveiklus %(duration)s",
+    "Offline for %(duration)s": "Atsijungęs %(duration)s",
+    "Idle": "Neveiklus",
+    "Offline": "Atsijungęs",
+    "Failed to set avatar.": "Nepavyko nustatyti avataro.",
+    "Forget room": "Pamiršti kambarį",
+    "Share room": "Bendrinti kambarį",
+    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Šiame kambaryje yra nepatvirtintų įrenginių: jeigu tęsite jų nepatvirtinę, tuomet kas nors galės slapta klausytis jūsų skambučio.",
+    "Usage": "Naudojimas",
+    "Searches DuckDuckGo for results": "Atlieka rezultatų paiešką sistemoje DuckDuckGo",
+    "To use it, just wait for autocomplete results to load and tab through them.": "Norėdami tai naudoti, tiesiog, palaukite, kol bus įkelti automatiškai užbaigti rezultatai, o tuomet, pereikite per juos naudodami Tab klavišą.",
+    "%(targetName)s left the room.": "%(targetName)s išėjo iš kambario.",
+    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s pakeitė prisegtas kambario žinutes.",
+    "Sorry, your homeserver is too old to participate in this room.": "Atleiskite, jūsų namų serveris yra per senas dalyvauti šiame kambaryje.",
+    "Please contact your homeserver administrator.": "Prašome susisiekti su savo namų serverio administratoriumi.",
+    "Enable inline URL previews by default": "Įjungti tiesiogines URL nuorodų peržiūras pagal numatymą",
+    "Enable URL previews for this room (only affects you)": "Įjungti URL nuorodų peržiūras šiame kambaryje (įtakoja tik jus)",
+    "Enable URL previews by default for participants in this room": "Įjungti URL nuorodų peržiūras pagal numatymą dalyviams šiame kambaryje",
+    "Confirm password": "Pakartokite slaptažodį",
+    "Demote yourself?": "Pažeminti save?",
+    "Demote": "Pažeminti",
+    "Share Link to User": "Bendrinti nuorodą su naudotoju",
+    "Direct chats": "Tiesioginiai pokalbiai",
+    "The conversation continues here.": "Pokalbis tęsiasi čia.",
+    "Jump to message": "Pereiti prie žinutės",
+    "Drop here to demote": "Vilkite čia, norėdami pažeminti",
+    "Favourites": "Mėgstami",
+    "This invitation was sent to an email address which is not associated with this account:": "Šis pakvietimas buvo išsiųstas į el. pašto adresą, kuris nėra susietas su šia paskyra:",
+    "You may wish to login with a different account, or add this email to this account.": "Jūs galite pageidauti prisijungti, naudojant kitą paskyrą, arba pridėti šį el. paštą į šią paskyrą.",
+    "You have been kicked from %(roomName)s by %(userName)s.": "%(userName)s išmetė jus iš %(roomName)s.",
+    "You have been kicked from this room by %(userName)s.": "%(userName)s išmetė jus iš šio kambario.",
+    "You have been banned from %(roomName)s by %(userName)s.": "%(userName)s užblokavo jus kambaryje %(roomName)s.",
+    "You have been banned from this room by %(userName)s.": "%(userName)s užblokavo jus šiame kambaryje.",
+    "To change the room's name, you must be a": "Norėdami pakeisti kambario pavadinimą, privalote būti",
+    "To change the room's main address, you must be a": "Norėdami pakeisti pagrindinį kambario adresą, privalote būti",
+    "To change the room's history visibility, you must be a": "Norėdami pakeisti kambario istorijos matomumą, privalote būti",
+    "To change the permissions in the room, you must be a": "Norėdami pakeisti leidimus kambaryje, privalote būti",
+    "To modify widgets in the room, you must be a": "Norėdami modifikuoti valdiklius šiame kambaryje, privalote būti",
+    "The visibility of existing history will be unchanged": "Esamos istorijos matomumas išliks nepakeistas",
+    "End-to-end encryption is in beta and may not be reliable": "Ištisinis šifravimas yra beta versijoje ir gali būti nepatikimas",
+    "You should not yet trust it to secure data": "Kol kas neturėtumėte pasitikėti, kad jis apsaugos jūsų duomenis",
+    "Encryption is enabled in this room": "Šifravimas šiame kambaryje yra įjungtas",
+    "Encryption is not enabled in this room": "Šifravimas šiame kambaryje nėra įjungtas",
+    "To kick users, you must be a": "Norėdami išmesti naudotojus, privalote būti",
+    "To ban users, you must be a": "Norėdami užblokuoti naudotojus, privalote būti",
+    "Banned users": "Užblokuoti naudotojai",
+    "This room is not accessible by remote Matrix servers": "Šis kambarys nėra pasiekiamas nuotoliniams Matrix serveriams",
+    "Who can read history?": "Kas gali skaityti istoriją?",
+    "Room version number: ": "Kambario versijos numeris: ",
+    "There is a known vulnerability affecting this room.": "Yra žinomas pažeidžiamumas, kuris paveikia šį kambarį.",
+    "Only room administrators will see this warning": "Šį įspėjimą matys tik kambario administratoriai",
+    "Remote addresses for this room:": "Nuotoliniai šio kambario adresai:",
+    "You have enabled URL previews by default.": "Jūs esate įjungę URL nuorodų peržiūras pagal numatymą.",
+    "You have disabled URL previews by default.": "Jūs esate išjungę URL nuorodų peržiūras pagal numatymą.",
+    "URL previews are enabled by default for participants in this room.": "URL nuorodų peržiūros yra įjungtos pagal numatymą šio kambario dalyviams.",
+    "URL previews are disabled by default for participants in this room.": "URL nuorodų peržiūros yra išjungtos pagal numatymą šio kambario dalyviams.",
+    "Invalid file%(extra)s": "Neteisingas failas %(extra)s",
+    "This room is a continuation of another conversation.": "Šis kambarys yra kito pokalbio pratęsimas.",
+    "Click here to see older messages.": "Spustelėkite čia, norėdami matyti senesnes žinutes.",
+    "This Home Server would like to make sure you are not a robot": "Šis namų serveris norėtų įsitikinti, kad nesate robotas",
+    "Token incorrect": "Neteisingas prieigos raktas",
+    "Sign in with": "Prisijungti naudojant",
+    "Sign in": "Prisijungti",
+    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Jeigu nenurodysite savo el. pašto adreso, negalėsite atstatyti savo slaptažodį. Ar esate tikri?",
+    "Home server URL": "Namų serverio URL",
+    "Identity server URL": "Tapatybės serverio URL",
+    "Please contact your service administrator to continue using the service.": "Norėdami tęsti naudotis paslauga, susisiekite su savo paslaugos administratoriumi.",
+    "Reload widget": "Įkelti valdiklį iš naujo",
+    "Picture": "Paveikslas",
+    "Create new room": "Sukurti naują kambarį",
+    "No results": "Jokių rezultatų",
+    "Delete": "Ištrinti",
+    "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
+    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)s pasikeitė vardą",
+    "%(severalUsers)schanged their avatar %(count)s times|one": "%(severalUsers)s pasikeitė avatarą",
+    "%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)s pasikeitė avatarą",
+    "collapse": "suskleisti",
+    "expand": "išskleisti",
+    "Room directory": "Kambarių katalogas",
+    "Start chat": "Pradėti pokalbį",
+    "ex. @bob:example.com": "pvz., @jonas:example.com",
+    "Add User": "Pridėti naudotoją",
+    "Matrix ID": "Matrix ID",
+    "email address": "el. pašto adresas",
+    "You have entered an invalid address.": "Įvedėte neteisingą adresą.",
+    "Try using one of the following valid address types: %(validTypesList)s.": "Pabandykite naudoti vieną iš šių teisingų adreso tipų: %(validTypesList)s.",
+    "Logs sent": "Žurnalai išsiųsti",
+    "Failed to send logs: ": "Nepavyko išsiųsti žurnalų: ",
+    "Submit debug logs": "Pateikti derinimo žurnalus",
+    "Start new chat": "Pradėti naują pokalbį",
+    "Click on the button below to start chatting!": "Norėdami pradėti bendravimą, paspauskite ant žemiau esančio mygtuko!",
+    "Create Community": "Sukurti bendruomenę",
+    "Community Name": "Bendruomenės pavadinimas",
+    "Example": "Pavyzdys",
+    "Community ID": "Bendruomenės ID",
+    "example": "pavyzdys",
+    "Create": "Sukurti",
+    "Create Room": "Sukurti kambarį",
+    "Room name (optional)": "Kambario pavadinimas (nebūtina)",
+    "Advanced options": "Išplėstiniai parametrai",
+    "This setting cannot be changed later!": "Šio nustatymo vėliau nebeįmanoma bus pakeisti!",
+    "Unknown error": "Nežinoma klaida",
+    "Incorrect password": "Neteisingas slaptažodis",
+    "To continue, please enter your password:": "Norėdami tęsti, įveskite savo slaptažodį:",
+    "password": "slaptažodis",
+    "Device name": "Įrenginio pavadinimas",
+    "Device key": "Įrenginio raktas",
+    "An error has occurred.": "Įvyko klaida.",
+    "Ignore request": "Nepaisyti užklausos",
+    "Loading device info...": "Įkeliama įrenginio informacija...",
+    "Failed to upgrade room": "Nepavyko atnaujinti kambarį",
+    "The room upgrade could not be completed": "Nepavyko užbaigti kambario naujinimo",
+    "Sign out": "Atsijungti",
+    "Log out and remove encryption keys?": "Atsijungti ir pašalinti šifravimo raktus?",
+    "Send Logs": "Siųsti žurnalus",
+    "Refresh": "Įkelti iš naujo",
+    "Unable to restore session": "Nepavyko atkurti seanso",
+    "Invalid Email Address": "Neteisingas el. pašto adresas",
+    "You cannot place VoIP calls in this browser.": "Negalite inicijuoti VoIP skambučių šioje naršyklėje.",
+    "You cannot place a call with yourself.": "Negalite skambinti patys sau.",
+    "Registration Required": "Reikalinga registracija",
+    "You need to register to do this. Would you like to register now?": "Norėdami tai atlikti, turite užsiregistruoti. Ar norėtumėte užsiregistruoti dabar?",
+    "Missing roomId.": "Trūksta kambario ID (roomId).",
+    "Leave room": "Išeiti iš kambario",
+    "(could not connect media)": "(nepavyko prijungti medijos)",
+    "This homeserver has hit its Monthly Active User limit.": "Šis namų serveris pasiekė savo mėnesinį aktyvių naudotojų limitą.",
+    "This homeserver has exceeded one of its resource limits.": "Šis namų serveris viršijo vieno iš savo išteklių limitą.",
+    "Unable to connect to Homeserver. Retrying...": "Nepavyksta prisijungti prie namų serverio. Bandoma iš naujo...",
+    "Hide avatar changes": "Slėpti avatarų pasikeitimus",
+    "Disable Community Filter Panel": "Išjungti bendruomenės filtro skydelį",
+    "Enable widget screenshots on supported widgets": "Palaikomuose valdikliuose įjungti valdiklių ekrano kopijas",
+    "Export E2E room keys": "Eksportuoti E2E kambario raktus",
+    "Select devices": "Pasirinkti įrenginius",
+    "Last seen": "Paskutinį kartą matytas",
+    "Unignore": "Nustoti nepaisyti",
+    "and %(count)s others...|other": "ir %(count)s kitų...",
+    "and %(count)s others...|one": "ir dar vienas...",
+    "Mention": "Paminėti",
+    "At this time it is not possible to reply with a file so this will be sent without being a reply.": "Šiuo metu neįmanoma atsakyti failu, taigi, šis failas bus išsiųstas ne atsakymo pavidalu.",
+    "This room has been replaced and is no longer active.": "Šis kambarys buvo pakeistas ir daugiau nebėra aktyvus.",
+    "You do not have permission to post to this room": "Jūs neturite leidimų rašyti šiame kambaryje",
+    "Turn Markdown on": "Įjungti Markdown",
+    "Turn Markdown off": "Išjungti Markdown",
+    "Markdown is disabled": "Markdown yra išjungta",
+    "Markdown is enabled": "Markdown yra įjungta",
+    "Drop here to favourite": "Vilkite čia, norėdami pridėti į mėgstamus",
+    "Drop here to restore": "Vilkite čia, norėdami atkurti",
+    "System Alerts": "Sistemos įspėjimai",
+    "Would you like to accept or decline this invitation?": "Norėtumėte priimti ar atmesti šį pakvietimą?",
+    "This is a preview of this room. Room interactions have been disabled": "Tai yra kambario peržiūra. Kambario sąveikos yra išjungtos",
+    "To change the room's avatar, you must be a": "Norėdami pakeisti kambario avatarą, privalote būti",
+    "Failed to unban": "Nepavyko atblokuoti",
+    "Privacy warning": "Privatumo įspėjimas",
+    "Encrypted messages will not be visible on clients that do not yet implement encryption": "Šifruotos žinutės nebus matomos kliento programose, kurios kol kas neįgyvendino šifravimo",
+    "Tagged as: ": "Pažymėtas kaip: ",
+    "To link to a room it must have an address.": "Norint susieti kambarį, jis privalo turėti adresą.",
+    "Internal room ID: ": "Vidinis kambario ID: ",
+    "not specified": "nenurodyta",
+    "not set": "nenustatyta",
+    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "Šifruotuose kambariuose, tokiuose kaip šis, URL nuorodų peržiūra pagal numatymą yra išjungta, kad būtų užtikrinta, jog jūsų namų serveris (kuriame yra generuojamos peržiūros) negalės rinkti informacijos apie šiame kambaryje matomas nuorodas.",
+    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s pakeitė %(roomName)s avatarą",
+    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s pašalino kambario avatarą.",
+    "%(senderDisplayName)s changed the room avatar to ": "%(senderDisplayName)s pakeitė kambario avatarą į ",
+    "Removed or unknown message type": "Žinutė pašalinta arba yra nežinomo tipo",
+    "Username on %(hs)s": "Naudotojo vardas ties %(hs)s",
+    "Filter community members": "Filtruoti bendruomenės dalyvius",
+    "Removing a room from the community will also remove it from the community page.": "Pašalinus kambarį iš bendruomenės, taip pat pašalins jį iš bendruomenės puslapio.",
+    "Filter community rooms": "Filtruoti bendruomenės kambarius",
+    "Please help improve Riot.im by sending anonymous usage data. This will use a cookie (please see our Cookie Policy).": "Padėkite patobulinti Riot.im, siųsdami anoniminius naudojimosi duomenis. Tai panaudos slapuką (žiūrėkite mūsų Slapukų politiką).",
+    "Please help improve Riot.im by sending anonymous usage data. This will use a cookie.": "Padėkite patobulinti Riot.im, siųsdami anoniminius naudojimosi duomenis. Tai panaudos slapuką.",
+    "Please contact your service administrator to get this limit increased.": "Norėdami padidinti šį limitą, susisiekite su savo paslaugų administratoriumi.",
+    "This homeserver has hit its Monthly Active User limit so some users will not be able to log in.": "Šis namų serveris pasiekė savo mėnesinį aktyvių naudotojų limitą, taigi, kai kurie naudotojai negalės prisijungti.",
+    "This homeserver has exceeded one of its resource limits so some users will not be able to log in.": "Šis namų serveris viršijo vieno iš savo išteklių limitą, taigi, kai kurie naudotojai negalės prisijungti.",
+    "An error ocurred whilst trying to remove the widget from the room": "Įvyko klaida, bandant pašalinti valdiklį iš kambario",
+    "Blacklist": "Įtraukti į juodąjį sąrašą",
+    "Unblacklist": "Pašalinti iš juodojo sąrašo",
+    "Verify...": "Patvirtinti...",
+    "Communities": "Bendruomenės",
+    "Home": "Pradžia",
+    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)s išėjo %(count)s kartų(-us)",
+    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)s išėjo",
+    "%(oneUser)sleft %(count)s times|other": "%(oneUser)s išėjo %(count)s kartų(-us)",
+    "%(oneUser)sleft %(count)s times|one": "%(oneUser)s išėjo",
+    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)s pasikeitė vardus",
+    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)s pasikeitė vardą %(count)s kartų(-us)",
+    "%(severalUsers)schanged their avatar %(count)s times|other": "%(severalUsers)s pasikeitė avatarą %(count)s kartų(-us)",
+    "%(oneUser)schanged their avatar %(count)s times|other": "%(oneUser)s pasikeitė avatarą %(count)s kartų(-us)",
+    "And %(count)s more...|other": "Ir dar %(count)s...",
+    "Existing Call": "Esamas skambutis",
+    "A call is already in progress!": "Skambutis jau yra inicijuojamas!",
+    "Default": "Numatytasis",
+    "Restricted": "Apribotas",
+    "Moderator": "Moderatorius",
+    "Ignores a user, hiding their messages from you": "Nepaiso naudotojo, paslepiant nuo jūsų jo žinutes",
+    "Stops ignoring a user, showing their messages going forward": "Sustabdo naudotojo nepaisymą, rodant jo tolimesnes žinutes",
+    "Hide avatars in user and room mentions": "Slėpti avatarus naudotojų ir kambarių paminėjimuose",
+    "Revoke Moderator": "Panaikinti moderatorių",
+    "deleted": "perbrauktas",
+    "underlined": "pabrauktas",
+    "inline-code": "įterptas kodas",
+    "block-quote": "citatos blokas",
+    "bulleted-list": "suženklintasis sąrašas",
+    "numbered-list": "sąrašas su numeriais",
+    "Invites": "Pakvietimai",
+    "You have no historical rooms": "Jūs neturite istorinių kambarių",
+    "Historical": "Istoriniai"
 }
diff --git a/src/i18n/strings/lv.json b/src/i18n/strings/lv.json
index 0c6bcb0977..09182ed776 100644
--- a/src/i18n/strings/lv.json
+++ b/src/i18n/strings/lv.json
@@ -862,7 +862,7 @@
     "email address": "e-pasta adrese",
     "Try using one of the following valid address types: %(validTypesList)s.": "Mēģiniet izmantot vienu no sekojošiem pieļautajiem adrešu tipiem: %(validTypesList)s.",
     "You have entered an invalid address.": "Ievadīta nederīga adrese.",
-    "Community IDs cannot not be empty.": "Kopienu IDs nevar būt tukši.",
+    "Community IDs cannot be empty.": "Kopienu IDs nevar būt tukši.",
     "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Kopienas ID var saturēt tikai simbolus a-z, 0-9, or '=_-./'",
     "Something went wrong whilst creating your community": "Radot Tavu kopienu kaut kas nogāja greizi",
     "Create Community": "Radīt kopienu",
diff --git a/src/i18n/strings/nb_NO.json b/src/i18n/strings/nb_NO.json
index 9a2b859854..5641880501 100644
--- a/src/i18n/strings/nb_NO.json
+++ b/src/i18n/strings/nb_NO.json
@@ -112,5 +112,6 @@
     "Quote": "Sitat",
     "Collapse panel": "Skjul panel",
     "Saturday": "Lørdag",
-    "There are advanced notifications which are not shown here": "Det er avanserte varsler som ikke vises her"
+    "There are advanced notifications which are not shown here": "Det er avanserte varsler som ikke vises her",
+    "Dismiss": "Avvis"
 }
diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index 1ba068daa0..cfe67273f0 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -877,7 +877,7 @@
     "Try using one of the following valid address types: %(validTypesList)s.": "Probeer één van de volgende geldige adrestypes: %(validTypesList)s.",
     "You have entered an invalid address.": "Je hebt een ongeldig adres ingevoerd.",
     "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Een gemeenschaps-ID mag alleen de karakters a-z, 0-9, of '=_-./' bevatten.",
-    "Community IDs cannot not be empty.": "Een gemeenschaps-ID kan niet leeg zijn.",
+    "Community IDs cannot be empty.": "Een gemeenschaps-ID kan niet leeg zijn.",
     "Something went wrong whilst creating your community": "Er is iets fout gegaan tijdens het aanmaken van je gemeenschap",
     "Create Community": "Gemeenschap Aanmaken",
     "Community Name": "Gemeenschapsnaam",
@@ -1180,5 +1180,51 @@
     "This room is used for important messages from the Homeserver, so you cannot leave it.": "Deze ruimte wordt gebruikt voor belangrijke berichten van de thuisserver, dus je kan het niet verlaten.",
     "Terms and Conditions": "Voorwaarden",
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Om de %(homeserverDomain)s thuisserver te blijven gebruiken zal je de voorwaarden moeten lezen en ermee akkoord moeten gaan.",
-    "Review terms and conditions": "Voorwaarden lezen"
+    "Review terms and conditions": "Voorwaarden lezen",
+    "A conference call could not be started because the intgrations server is not available": "Een groepsgesprek kon niet worden gestart omdat de integratieserver niet beschikbaar is",
+    "Call in Progress": "Lopend gesprek",
+    "A call is currently being placed!": "Een gesprek wordt gestart!",
+    "A call is already in progress!": "Er loopt al een gesprek!",
+    "Permission Required": "Toestemming benodigd",
+    "You do not have permission to start a conference call in this room": "Je hebt niet de toestemming om in deze ruimte een groepsgesprek te starten",
+    "Show empty room list headings": "Lege koppen in ruimtelijst weergeven",
+    "This event could not be displayed": "Deze gebeurtenis kon niet worden weergegeven",
+    "Encrypting": "Versleutelen",
+    "Encrypted, not sent": "Versleuteld, niet verstuurd",
+    "Demote yourself?": "Jezelf degraderen?",
+    "Demote": "Degraderen",
+    "Share Link to User": "Link met gebruiker delen",
+    "deleted": "verwijderd",
+    "underlined": "onderstreept",
+    "inline-code": "code in de regel",
+    "block-quote": "citaat",
+    "bulleted-list": "lijst met opsommingstekens",
+    "numbered-list": "genummerde lijst",
+    "Share room": "Ruimte delen",
+    "System Alerts": "Systeemmeldingen",
+    "You have no historical rooms": "Je hebt geen historische ruimtes",
+    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "In versleutelde ruimtes, zoals deze, zijn URL-voorvertoningen standaard uitgeschakeld om ervoor te zorgen dat jouw thuisserver (waar de voorvertoningen worden gemaakt) geen informatie kan verzamelen over de links die je in deze ruimte ziet.",
+    "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "Als iemand een URL in zijn of haar bericht zet, kan er een URL-voorvertoning weergegeven worden om meer informatie over de link te geven, zoals de titel, omschrijving en een afbeelding van de website.",
+    "The email field must not be blank.": "Het e-mailveld mag niet leeg zijn.",
+    "The user name field must not be blank.": "Het gebruikersnaamveld mag niet leeg zijn.",
+    "The phone number field must not be blank.": "Het telefoonnummerveld mag niet leeg zijn.",
+    "The password field must not be blank.": "Het wachtwoordveld mag niet leeg zijn.",
+    "This homeserver has hit its Monthly Active User limit. Please contact your service administrator to continue using the service.": "Deze thuisserver heeft zijn maandelijkse gebruikerslimiet bereikt. Neem contact op met de beheerder van je thuisserver om de dienst weer te kunnen gebruiken.",
+    "Failed to remove widget": "Widget kon niet worden verwijderd",
+    "An error ocurred whilst trying to remove the widget from the room": "Er is een fout opgetreden tijdens het verwijderen van de widget uit deze ruimte",
+    "Share Room": "Ruimte delen",
+    "Link to most recent message": "Link naar meest recente bericht",
+    "Share User": "Gebruiker delen",
+    "Share Community": "Gemeenschap delen",
+    "Share Room Message": "Bericht uit ruimte delen",
+    "Link to selected message": "Link naar geselecteerde bericht",
+    "COPY": "KOPIËREN",
+    "Share Message": "Bericht delen",
+    "You can't send any messages until you review and agree to our terms and conditions.": "Je kunt geen berichten sturen totdat je onze algemene voorwaarden hebt gelezen en geaccepteerd.",
+    "Your message wasn’t sent because this homeserver has hit its Monthly Active User Limit. Please contact your service administrator to continue using the service.": "Je bericht is niet verstuurd omdat deze thuisserver zijn maandelijkse gebruikerslimiet heeft bereikt. Neem contact op met de beheerder van je thuisserver om de dienst te kunnen blijven gebruiken.",
+    "No Audio Outputs detected": "Geen geluidsuitgangen gedetecteerd",
+    "Audio Output": "Geluidsuitgang",
+    "This homeserver has hit its Monthly Active User limit": "Deze thuisserver heeft zijn maandelijkse gebruikerslimiet bereikt",
+    "Please contact your service administrator to continue using this service.": "Neem contact op met de beheerder van je thuisserver om de dienst te kunnen blijven gebruiken.",
+    "Try the app first": "De app eerst proberen"
 }
diff --git a/src/i18n/strings/nn.json b/src/i18n/strings/nn.json
new file mode 100644
index 0000000000..2f89ab0d2f
--- /dev/null
+++ b/src/i18n/strings/nn.json
@@ -0,0 +1,1229 @@
+{
+    "This phone number is already in use": "Dette telefonnummeret er allereie i bruk",
+    "The version of Riot.im": "Utgåva av Riot.im",
+    "Whether or not you're logged in (we don't record your user name)": "Om du er logga inn eller ikkje (vi sparer ikkje på brukarnamnet ditt)",
+    "Your homeserver's URL": "Heimtenaren din si nettadresse",
+    "Your device resolution": "Eininga di sin oppløysing",
+    "The information being sent to us to help make Riot.im better includes:": "Informasjonen som vert send til oss for å gjera Riot.im betre er mellom anna:",
+    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Der denne sida inneheld gjenkjenneleg informasjon, slik som ein rom-, brukar- eller gruppeID, vert denne informasjonen sletta før han sendast til tenar.",
+    "Call Failed": "Oppringjing Mislukkast",
+    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Det finst ukjende einingar i dette rommet: viss du gjeng frama utan å godkjenna dei, kan nokon mogelegvis tjuvlytta på samtala.",
+    "Review Devices": "Sjå Over Einingar",
+    "Call Anyway": "Ring Likevel",
+    "Answer Anyway": "Svar Likevel",
+    "Call": "Ring",
+    "Answer": "Svar",
+    "You are already in a call.": "Du er allereie i ei samtale.",
+    "VoIP is unsupported": "VoIP er ikkje støtta",
+    "You cannot place VoIP calls in this browser.": "Du kan ikkje samtala med VoIP i denne nettlesaren.",
+    "You cannot place a call with yourself.": "Du kan ikkje samtala med deg sjølv.",
+    "Could not connect to the integration server": "Kunne ikkje kopla til integreringstenaren",
+    "A conference call could not be started because the intgrations server is not available": "Ei gruppesamtale lét seg ikkje få i gang fordi integreringstenaren ikkje er tilgjengeleg",
+    "Call in Progress": "Ei Samtale er i Gang",
+    "A call is currently being placed!": "Ei samtale held allereie på å starta!",
+    "A call is already in progress!": "Ei samtale er i gang allereie!",
+    "Permission Required": "Tillating er Naudsynt",
+    "You do not have permission to start a conference call in this room": "Du har ikkje tillating til å starta ei gruppesamtale i dette rommet",
+    "The file '%(fileName)s' failed to upload": "Fila '%(fileName)s' vart ikkje lasta opp",
+    "The file '%(fileName)s' exceeds this home server's size limit for uploads": "Fila '%(fileName)s' gjeng denne heimtenaren si storleiksgrense for opplastningar",
+    "Upload Failed": "Opplasting Mislukkast",
+    "Sun": "sø",
+    "Mon": "må",
+    "Tue": "ty",
+    "Wed": "on",
+    "Thu": "to",
+    "Fri": "fr",
+    "Sat": "la",
+    "Jan": "jan",
+    "Feb": "feb",
+    "Mar": "mar",
+    "Apr": "apr",
+    "May": "mai",
+    "Jun": "jun",
+    "Jul": "jul",
+    "Aug": "aug",
+    "Sep": "sep",
+    "Oct": "okt",
+    "Nov": "nov",
+    "Dec": "des",
+    "PM": "PM",
+    "AM": "AM",
+    "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(time)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s",
+    "Who would you like to add to this community?": "Kven vil du leggja til i dette samfunnet?",
+    "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Åtvaring: alle du legg til i eit samfunn vert offentleg synleg til alle som kan samfunns-IDen",
+    "Invite new community members": "Byd nye samfunnsmedlemer inn",
+    "Name or matrix ID": "Namn eller matrix-ID",
+    "Invite to Community": "Byd inn til Samfunn",
+    "Which rooms would you like to add to this community?": "Kva rom vil du leggja til i dette samfunnet?",
+    "Show these rooms to non-members on the community page and room list?": "Vis desse romma til ikkje-medlemer på samfunnssida og romlista?",
+    "Add rooms to the community": "Legg til rom i samfunnet",
+    "Room name or alias": "Romnamn eller alias",
+    "Add to community": "Legg til i samfunn",
+    "Failed to invite the following users to %(groupId)s:": "Fylgjande brukarar lét seg ikkje byda inn i %(groupId)s:",
+    "Failed to invite users to community": "Fekk ikkje til å byda brukarar inn til samfunnet",
+    "Failed to invite users to %(groupId)s": "Fekk ikkje til å byda brukarar inn til %(groupId)s",
+    "Failed to add the following rooms to %(groupId)s:": "Fylgjande rom lét seg ikkje leggja til i %(groupId)s:",
+    "Riot does not have permission to send you notifications - please check your browser settings": "Riot har ikkje tillating til å senda deg varsel - ver venleg og sjekk nettlesarinnstillingane dine",
+    "Riot was not given permission to send notifications - please try again": "Riot fekk ikkje tillating til å senda varsel - ver venleg og prøv igjen",
+    "Unable to enable Notifications": "Klarte ikkje å skru på Varsel",
+    "This email address was not found": "Denne epostadressa var ikkje funnen",
+    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Epostadressa di ser ikkje ut til å vera tilknytta ein Matrix-ID på denne heimtenaren.",
+    "Default": "Utgangspunktinnstilling",
+    "Restricted": "Avgrensa",
+    "Moderator": "Moderator",
+    "Admin": "Administrator",
+    "Start a chat": "Start ei samtale",
+    "Who would you like to communicate with?": "Kven vil du koma i kontakt med?",
+    "Email, name or matrix ID": "Epost, namn eller Matrix-ID",
+    "Start Chat": "Start ei Samtale",
+    "Invite new room members": "Byd nye rommedlemer inn",
+    "Who would you like to add to this room?": "Kven vil du leggja til i rommet?",
+    "Send Invites": "Send Innbydingar",
+    "Failed to invite user": "Fekk ikkje til å byda brukar inn",
+    "Operation failed": "Handling mislukkast",
+    "Failed to invite": "Fekk ikkje til å byda inn",
+    "Failed to invite the following users to the %(roomName)s room:": "Dei fylgjande brukarane lét seg ikkje byda inn til %(roomName)s:",
+    "You need to be logged in.": "Du må vera logga inn.",
+    "You need to be able to invite users to do that.": "Du må kunna byda brukarar inn for å gjera det.",
+    "Unable to create widget.": "Klarte ikkje å laga widget.",
+    "Missing roomId.": "Manglande roomId.",
+    "Failed to send request.": "Fekk ikkje til å senda førespurnad.",
+    "This room is not recognised.": "Rommet er ikkje attkjend.",
+    "Power level must be positive integer.": "Makthøgda må vera eit positivt heiltal.",
+    "You are not in this room.": "Du er ikkje i dette rommet.",
+    "You do not have permission to do that in this room.": "Du har ikkje lov til å gjera det i dette rommet.",
+    "Missing room_id in request": "Manglande room_Id i førespurnad",
+    "Room %(roomId)s not visible": "Rommet %(roomId)s er ikkje synleg",
+    "Missing user_id in request": "Manglande user_id i førespurnad",
+    "Usage": "Bruk",
+    "Searches DuckDuckGo for results": "Røkjer DuckDuckGo etter resultat",
+    "Your language of choice": "Ditt valde mål",
+    "e.g. %(exampleValue)s": "t.d. %(exampleValue)s",
+    "/ddg is not a command": "/ddg er ikkje eit påbod",
+    "Changes your display nickname": "Forandrar kallenamnet ditt",
+    "Changes colour scheme of current room": "Forandrar fargevala i ditt noverande rom",
+    "Sets the room topic": "Set romemnet",
+    "Invites user with given id to current room": "Byd brukarar med den gjevne IDen inn til det noverande rommet",
+    "Joins room with given alias": "Gjeng inn i eit rom med det gjevne aliaset",
+    "Leave room": "Far frå rommet",
+    "Unrecognised room alias:": "Ukjend romalias:",
+    "Kicks user with given id": "Sparkar brukarar med gjeven ID",
+    "Bans user with given id": "Stengjer brukarar med den gjevne IDen ute",
+    "Unbans user with given id": "Slepp utestengde brukarar med den gjevne IDen inn at",
+    "Ignores a user, hiding their messages from you": "Overser ein brukar, slik at meldingane deira ikkje synast for deg",
+    "Ignored user": "Oversedd brukar",
+    "You are now ignoring %(userId)s": "Du overser no %(userId)s",
+    "Stops ignoring a user, showing their messages going forward": "Sluttar å oversjå ein brukar, slik at meldingane deira no kan sjåast",
+    "Unignored user": "Avoversedd brukar",
+    "You are no longer ignoring %(userId)s": "Du overser ikkje %(userId)s no lenger",
+    "Define the power level of a user": "Set ein brukar si makthøgd",
+    "This email address is already in use": "Denne epostadressa er allereie i bruk",
+    "The platform you're on": "Platformen du er på",
+    "Failed to verify email address: make sure you clicked the link in the email": "Fekk ikkje til å stadfesta epostadressa: sjå til at du klikka på den rette lenkja i eposten",
+    "Your identity server's URL": "Din identitetstenar si nettadresse",
+    "Every page you use in the app": "Alle sider du brukar i æppen",
+    "e.g. ": "t.d. ",
+    "Your User Agent": "Din Brukaragent",
+    "Analytics": "Statistikk",
+    "Unable to capture screen": "Kunne ikkje visa skjerm",
+    "Existing Call": "Samtale er i gang",
+    "To use it, just wait for autocomplete results to load and tab through them.": "For å bruka han, vent på at resultata fyller seg ut og tab gjennom dei.",
+    "Deops user with given id": "AvOPar brukarar med den gjevne IDen",
+    "Opens the Developer Tools dialog": "Opnar Utviklarverktøy-tekstboksen",
+    "Verifies a user, device, and pubkey tuple": "Godkjenner ein brukar, eining og offentleg-nykeltuppel",
+    "Unverify": "Fjern godkjenning",
+    "Verify...": "Godkjenn...",
+    "Which officially provided instance you are using, if any": "Kva offisielt gjevne instanse du brukar, viss nokon",
+    "The remote side failed to pick up": "Den andre sida tok ikkje røret",
+    "Unknown (user, device) pair:": "Ukjend (brukar, eining)-par:",
+    "Device already verified!": "Eininga er allereie godkjend!",
+    "WARNING: Device already verified, but keys do NOT MATCH!": "ÅTVARING: Eininga er allereie godkjend, men nyklane SAMSVARER IKKJE!",
+    "Verified key": "Godkjend nykel",
+    "Displays action": "Visar handlingar",
+    "Unrecognised command:": "Ukjend påbod:",
+    "Reason": "Grunnlag",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s sa ja til innbydinga frå %(displayName)s.",
+    "%(targetName)s accepted an invitation.": "%(targetName)s sa ja til ei innbyding.",
+    "%(senderName)s requested a VoIP conference.": "%(senderName)s bad om ei VoIP-gruppesamtale.",
+    "%(senderName)s invited %(targetName)s.": "%(senderName)s baud %(targetName)s inn.",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s stengde %(targetName)s ute.",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s endra visingsnamnet sitt til %(displayName)s.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s sette visingsnamnet sitt som %(displayName)s.",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s fjerna visingsnamnet sitt (%(oldDisplayName)s).",
+    "%(senderName)s removed their profile picture.": "%(senderName)s fjerna profilbiletet sitt.",
+    "%(senderName)s changed their profile picture.": "%(senderName)s endra profilbiletet sitt.",
+    "%(senderName)s set a profile picture.": "%(senderName)s sette seg eit profilbilete.",
+    "VoIP conference started.": "Ei VoIP-gruppesamtale starta.",
+    "%(targetName)s joined the room.": "%(targetName)s kom inn i rommet.",
+    "VoIP conference finished.": "VoIP-gruppesamtale enda.",
+    "%(targetName)s rejected the invitation.": "%(targetName)s sa nei til innbydinga.",
+    "%(targetName)s left the room.": "%(targetName)s fór frå rommet.",
+    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s fjerna utestenginga til %(targetName)s.",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s sparka %(targetName)s ut.",
+    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s tok attende %(targetName)s si innbyding.",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s gjorde emnet om til \"%(topic)s\".",
+    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s fjerna romnamnet.",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s gjorde romnamnet om til %(roomName)s.",
+    "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s sende eit bilete.",
+    "Someone": "Nokon",
+    "(not supported by this browser)": "(ikkje støtta av denne nettlesaren)",
+    "%(senderName)s answered the call.": "%(senderName)s tok røret.",
+    "(could not connect media)": "(klarte ikkje å kopla media saman)",
+    "(no answer)": "(inkje svar)",
+    "(unknown failure: %(reason)s)": "(ukjend mislukking: %(reason)s)",
+    "%(senderName)s ended the call.": "%(senderName)s enda samtala.",
+    "%(senderName)s placed a %(callType)s call.": "%(senderName)s starta ei %(callType)s-samtale.",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s baud %(targetDisplayName)s inn til rommet.",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s gjorde slik at den framtidige romhistoria er tilgjengeleg for alle rommedlemer frå då dei vart innbodne.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s gjorde slik at den framtidige romhistoria er tilgjengeleg for alle rommedlemer frå då dei kom inn.",
+    "%(senderName)s made future room history visible to all room members.": "%(senderName)s gjorde den framtidige romhistoria tilgjengeleg for alle rommedlemer.",
+    "%(senderName)s made future room history visible to anyone.": "%(senderName)s gjorde den framtidige romhistoria tilgjengelg for kven som helst.",
+    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s gjorde den framtidige romhistoria tilgjengeleg til ukjende (%(visibility)s).",
+    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s skrudde ende-til-ende-kryptering på (%(algorithm)s-algoritmen).",
+    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s frå %(fromPowerLevel)s til %(toPowerLevel)s",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s endra makthøgda til %(powerLevelDiffText)s.",
+    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s endra dei festa meldingane i rommet.",
+    "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s-widget endra av %(senderName)s",
+    "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s-widget lagt til av %(senderName)s",
+    "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s widget fjerna av %(senderName)s",
+    "%(displayName)s is typing": "%(displayName)s skriv",
+    "%(names)s and %(count)s others are typing|other": "%(names)s og %(count)s til skriv",
+    "%(names)s and %(count)s others are typing|one": "%(names)s og ein til skriv",
+    "%(names)s and %(lastPerson)s are typing": "%(names)s og %(lastPerson)s skriv",
+    "Failure to create room": "Klarte ikkje å laga rommet",
+    "Server may be unavailable, overloaded, or you hit a bug.": "tenaren er kanskje utilgjengeleg, overlasta elles so traff du ein bøgg.",
+    "Send anyway": "Send likevel",
+    "Send": "Send",
+    "Unnamed Room": "Rom utan Namn",
+    "Your browser does not support the required cryptography extensions": "Nettlesaren din støttar ikkje dei naudsynte kryptografiske utvidingane",
+    "Not a valid Riot keyfile": "Ikkje ei gyldig Riot-nykelfil",
+    "Authentication check failed: incorrect password?": "Godkjenningssjekk mislukkast: urett passord?",
+    "Failed to join room": "Fekk ikkje til å gå inn i rom",
+    "Message Pinning": "Meldingsfesting",
+    "Disable Emoji suggestions while typing": "Skru emojiframlegg av mens ein skriv",
+    "Use compact timeline layout": "Bruk smal tidslinjeutforming",
+    "Hide removed messages": "Gøym fjerna meldingar",
+    "Hide join/leave messages (invites/kicks/bans unaffected)": "Gøym kom inn/fór ut-meldingar (innbydingar, utspark, utestengingar påverkast ikkje)",
+    "Hide avatar changes": "Gøym avatarendringar",
+    "Hide display name changes": "Gøym visingsnamn-endringar",
+    "Show timestamps in 12 hour format (e.g. 2:30pm)": "Vis tidspunkt i 12-timarsform (t.d. 2:30pm)",
+    "Always show message timestamps": "Vis alltid meldingstidspunkt",
+    "Autoplay GIFs and videos": "Spel av GIFar og videoar med ein gong",
+    "Always show encryption icons": "Vis alltid krypteringsikon",
+    "Hide avatars in user and room mentions": "Gøym avatarar i brukar- og romnemningar",
+    "Disable big emoji in chat": "Skru store emojiar i samtaler av",
+    "Don't send typing notifications": "Ikkje send skrivevarsel",
+    "Disable Notifications": "Skru Varsel av",
+    "Enable Notifications": "Skru Varsel på",
+    "Automatically replace plain text Emoji": "Erstatt Emojiar i plaintekst av seg sjølv",
+    "Mirror local video feed": "Spegl den lokale videofeeden",
+    "Disable Community Filter Panel": "Skru Samfunnsfilterpanel av",
+    "Disable Peer-to-Peer for 1:1 calls": "Skru Peer-til-Peer for 1:1-samtaler av",
+    "Send analytics data": "Send statistikkdata",
+    "Never send encrypted messages to unverified devices from this device": "Send aldri krypterte meldingar til ikkje-godkjende einingar frå denne eininga",
+    "Never send encrypted messages to unverified devices in this room from this device": "Send aldri krypterte meldingar til ikkje-godkjende einingar i dette rommet frå denne eininga",
+    "Enable URL previews for this room (only affects you)": "Skru URL-førehandsvisingar på for dette rommet (påverkar deg åleine)",
+    "Enable URL previews by default for participants in this room": "Skru URL-førehandsvisingar på som utgangspunkt for deltakarar i dette rommet",
+    "Room Colour": "Romfarge",
+    "Enable widget screenshots on supported widgets": "Skru widget-skjermbilete på for støtta widgetar",
+    "Collecting app version information": "Samlar æppversjoninfo",
+    "Collecting logs": "Samlar loggar",
+    "Uploading report": "Lastar rapport opp",
+    "Waiting for response from server": "Ventar på svar frå tenaren",
+    "Messages containing my display name": "Meldingar som inneheld visingsnamnet mitt",
+    "Messages containing my user name": "Meldingar som inneheld brukarnamnet mitt",
+    "Messages in one-to-one chats": "Meldingar i ein-til-ein-samtaler",
+    "Messages in group chats": "Meldingar i gruppesamtaler",
+    "When I'm invited to a room": "Når eg er boden inn til eit rom",
+    "Call invitation": "Samtaleinnbydingar",
+    "Messages sent by bot": "Meldingar sendt frå ein bot",
+    "Active call (%(roomName)s)": "Pågåande samtale (%(roomName)s)",
+    "unknown caller": "ukjend ringar",
+    "Incoming voice call from %(name)s": "%(name)s ynskjer ei røystsamtale",
+    "Incoming video call from %(name)s": "%(name)s ynskjer ei videosamtale",
+    "Incoming call from %(name)s": "%(name)s ynskjer ei samtale",
+    "Decline": "Sei nei",
+    "Accept": "Sei ja",
+    "Error": "Noko gjekk gale",
+    "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Ei tekstmelding vart send til +%(msisdn)s. Ver venleg og skriv inn stadfestingskoden ho inneheld",
+    "Incorrect verification code": "Urett stadfestingskode",
+    "Enter Code": "Skriv inn Koden",
+    "Submit": "Send inn",
+    "Phone": "Telefon",
+    "Add phone number": "Legg telefonnummer til",
+    "Add": "Legg til",
+    "Failed to upload profile picture!": "Fekk ikkje til å lasta opp profilbilete!",
+    "Upload new:": "Last opp ny:",
+    "No display name": "Inkje visingsnamn",
+    "New passwords don't match": "Dei nye passorda samsvarar ikkje",
+    "Passwords can't be empty": "Passordsfelta kan ikkje vera tomme",
+    "Warning!": "Åtvaring!",
+    "Continue": "Gå fram",
+    "Do you want to set an email address?": "Vil du setja ei epostadresse?",
+    "Current password": "Noverande passord",
+    "Password": "Passord",
+    "New Password": "Nytt Passord",
+    "Confirm password": "Stadfest passord",
+    "Change Password": "Endra Passord",
+    "Your home server does not support device management.": "Heimtenaren din støttar ikkje einingshandsaming.",
+    "Unable to load device list": "Klarte ikkje å lasta einingslista",
+    "Authentication": "Godkjenning",
+    "Delete %(count)s devices|other": "Slett %(count)s einingar",
+    "Delete %(count)s devices|one": "Slett eining",
+    "Device ID": "EiningsID",
+    "Device Name": "Einingsnamn",
+    "Last seen": "Sist sedd",
+    "Select devices": "Vel einingar",
+    "Failed to set display name": "Fekk ikkje til å setja visingsnamn",
+    "Error saving email notification preferences": "Klarte ikkje å lagra foretrukne epostvarselinnstillingar",
+    "An error occurred whilst saving your email notification preferences.": "Noko gjekk gale med lagringa av dine foretrukne epostvarselinstillingar.",
+    "Keywords": "Nykelord",
+    "Enter keywords separated by a comma:": "Skriv inn nykelord med komma imellom:",
+    "OK": "Greitt",
+    "Failed to change settings": "Klarte ikkje å endra innstillingar",
+    "Can't update user notification settings": "Kan ikkje oppdatera brukarvarselinstillingar",
+    "Failed to update keywords": "Fekk ikkje til å oppdatera nykelord",
+    "Messages containing keywords": "Meldingar som inneheld nykelord",
+    "Notify for all other messages/rooms": "Varsl for alle andre meldingar/rom",
+    "Notify me for anything else": "Varsl meg for kva som helst anna",
+    "Enable notifications for this account": "Skru varsel på for denne brukaren",
+    "All notifications are currently disabled for all targets.": "Alle varsel er for augeblunket skrudd av for alle mål.",
+    "Add an email address above to configure email notifications": "Legg til ein epostadresse i feltet over for å endra epostvarselinnstillingar",
+    "Enable email notifications": "Skru epostvarsel på",
+    "Notifications on the following keywords follow rules which can’t be displayed here:": "Varsel på fylgjande nykelord følgjer reglar som ikkje kan visast her:",
+    "Unable to fetch notification target list": "Klarte ikkje å henta varselmållista",
+    "Notification targets": "Varselmål",
+    "Advanced notification settings": "Omfattande varselinnstillingar",
+    "There are advanced notifications which are not shown here": "Det er omfattande varsel som ikkje er vist her",
+    "Enable desktop notifications": "Skru skrivebordsvarsel på",
+    "Show message in desktop notification": "Vis meldinga i eit skriverbordsvarsel",
+    "Enable audible notifications in web client": "Skru høyrlege varsel i nettklienten på",
+    "Off": "Av",
+    "On": "På",
+    "Noisy": "Bråket",
+    "Cannot add any more widgets": "Kan ikkje leggja fleire widgets til",
+    "Add a widget": "Legg til ein widget",
+    "Drop File Here": "Slepp Fila Her",
+    "Drop file here to upload": "Slipp ein fil her for å lasta opp",
+    " (unsupported)": " (ustøtta)",
+    "Join as voice or video.": "Gå inn som røyst eller video.",
+    "Ongoing conference call%(supportedText)s.": "Ein gruppesamtale er i gang%(supportedText)s.",
+    "This event could not be displayed": "Denne hendingen kunne ikkje visast",
+    "%(senderName)s sent an image": "%(senderName)s sende eit bilete",
+    "%(senderName)s sent a video": "%(senderName)s sende ein video",
+    "%(senderName)s uploaded a file": "%(senderName)s lasta ei fil opp",
+    "Options": "Innstillingar",
+    "Your key share request has been sent - please check your other devices for key share requests.": "Nykeldelingsforespurnaden din vart send - ver venleg og sjekk dei andre einingane dine for nykeldelingsforespurnadar.",
+    "If your other devices do not have the key for this message you will not be able to decrypt them.": "Viss dei andre einingane dine ikkje har nykelen til denne meldinga kan du ikkje dekryptera ho.",
+    "Key request sent.": "Nykelforespurnad er send.",
+    "Re-request encryption keys from your other devices.": "Spør på nytt om krypteringsnyklar frå dei andre einingane dine.",
+    "Undecryptable": "Kan ikkje dekrypterast",
+    "Encrypting": "Krypteringa er i gang",
+    "Encrypted, not sent": "Kryptert, men ikkje sendt",
+    "Encrypted by a verified device": "Kryptert av ei godkjent eining",
+    "Encrypted by an unverified device": "Kryptert av ei ikkje-godkjent eining",
+    "Unencrypted message": "Ikkje-kryptert melding",
+    "Please select the destination room for this message": "Ver venleg og vel målrommet for denne meldinga",
+    "Blacklisted": "Svartelista",
+    "Verified": "Godkjend",
+    "Unverified": "Ikkje-godkjend",
+    "device id: ": "einingsID: ",
+    "Disinvite": "Fjern innbyding",
+    "Kick": "Spark ut",
+    "Disinvite this user?": "Fjern innbydinga til denne brukaren?",
+    "Kick this user?": "Spark denne brukaren ut?",
+    "Failed to kick": "Fekk ikkje til å sparka ut",
+    "Unban": "Slepp inn att",
+    "Ban": "Steng ute",
+    "Unban this user?": "Slepp denne brukaren inn att?",
+    "Ban this user?": "Steng denne brukaren ute?",
+    "Failed to ban user": "Fekk ikkje til å utestenga brukar",
+    "Demote yourself?": "Senk høgda di?",
+    "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "Du kan ikkje gjera om på denne endringa sidan du senkar høgda di. Viss du er den siste opphøgda brukaren i rommet vert det umogeleg å få høgda att.",
+    "Demote": "Senk høgda",
+    "Failed to mute user": "Fekk ikkje til å stilne brukar",
+    "Failed to toggle moderator status": "Fekk ikkje til å veksla moderatorhøgd",
+    "Failed to change power level": "Fekk ikkje til å endra makthøgda",
+    "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Du kjem ikkje til å kunna gjera om på denne endringa sidan du set brukaren si høgd opp til di eiga.",
+    "Are you sure?": "Er du sikker?",
+    "No devices with registered encryption keys": "Ingen einingar med oppskrivne krypteringsnykler",
+    "Devices": "Einingar",
+    "Unignore": "Slutt å oversjå",
+    "Ignore": "Oversjå",
+    "Mention": "Nemn",
+    "Invite": "Byd inn",
+    "Enable inline URL previews by default": "Skru URL-førehandsvisingar i tekstfeltet på",
+    "Share Link to User": "Del Brukarlenkje",
+    "User Options": "Brukarinnstillingar",
+    "Direct chats": "Direktesamtaler",
+    "Unmute": "Fjern stilning",
+    "Mute": "Stiln",
+    "Revoke Moderator": "Fjern Moderatorrett",
+    "Make Moderator": "Gjer til Moderator",
+    "Admin Tools": "Administratorverktøy",
+    "Level:": "Høgd:",
+    "and %(count)s others...|other": "og %(count)s til...",
+    "and %(count)s others...|one": "og ein til...",
+    "Invited": "Innboden",
+    "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (makthøgd %(powerLevelNumber)s)",
+    "bold": "feit",
+    "italic": "skeiv",
+    "deleted": "sletta",
+    "underlined": "understreka",
+    "bulleted-list": "punktliste",
+    "numbered-list": "talliste",
+    "Attachment": "Vedlegg",
+    "At this time it is not possible to reply with a file so this will be sent without being a reply.": "Det er førebels ikkje mogeleg å svara med ei fil, so dette vil verta send utan å vera eit svar.",
+    "Upload Files": "Last opp Filer",
+    "Are you sure you want to upload the following files?": "Er du sikker på at du vil lasta opp dei fylgjande filene?",
+    "Encrypted room": "Kryptert rom",
+    "Unencrypted room": "Ikkje-enkrypert rom",
+    "Hangup": "Legg på",
+    "Voice call": "Røystesamtale",
+    "Video call": "Videosamtale",
+    "Upload file": "Last ei fil opp",
+    "Show Text Formatting Toolbar": "Vis Tekstformverktøylinje",
+    "Send an encrypted reply…": "Send eit kryptert svar…",
+    "Send a reply (unencrypted)…": "Send eit svar (ikkje-kryptert)…",
+    "Send an encrypted message…": "Send ei kryptert melding…",
+    "Send a message (unencrypted)…": "Send ei melding (ikkje-kryptert)…",
+    "You do not have permission to post to this room": "Du har ikkje tillating til å sende meldingar i dette rommet",
+    "Turn Markdown on": "Skru Mardown på",
+    "Turn Markdown off": "Skru Markdown av",
+    "Hide Text Formatting Toolbar": "Gøym Tekstformverktøylinje",
+    "Server error": "Noko gjekk gale med tenaren",
+    "Server unavailable, overloaded, or something else went wrong.": "tenaren var utilgjengeleg, overlasta, elles so gjekk noko anna galt.",
+    "Command error": "Noko gjekk gale med påbodet",
+    "The maximum permitted number of widgets have already been added to this room.": "Det største mogelege talet widgets finst allereie på dette rommet.",
+    "Unable to reply": "Klarte ikkje å svara",
+    "At this time it is not possible to reply with an emote.": "Det er førebels ikkje mogeleg å svara med ein emote.",
+    "Markdown is disabled": "Markdown er skrudd av",
+    "Markdown is enabled": "Markdown er skrudd på",
+    "Unpin Message": "Tak ned festa Melding",
+    "Jump to message": "Hopp til melding",
+    "No pinned messages.": "Inga festa meldingar.",
+    "Loading...": "Lastar...",
+    "Pinned Messages": "Festa Meldingar",
+    "%(duration)ss": "%(duration)ss",
+    "%(duration)sm": "%(duration)sm",
+    "%(duration)sh": "%(duration)st",
+    "%(duration)sd": "%(duration)sd",
+    "Online for %(duration)s": "tilkopla i %(duration)s",
+    "Idle for %(duration)s": "Fråverande i %(duration)s",
+    "Offline for %(duration)s": "Fråkopla i %(duration)s",
+    "Unknown for %(duration)s": "Ukjend i %(duration)s",
+    "Online": "Tilkopla",
+    "Idle": "Fråverande",
+    "Offline": "Fråkopla",
+    "Unknown": "Ukjend",
+    "Seen by %(userName)s at %(dateTime)s": "%(userName)s såg dette %(dateTime)s",
+    "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "%(displayName)s %(userName)s såg dette %(dateTime)s",
+    "Replying": "Svarar",
+    "No rooms to show": "Inkje rom å visa",
+    "Unnamed room": "Rom utan namn",
+    "Guests can join": "Gjester kan koma inn",
+    "Failed to set avatar.": "Fekk ikkje til å setja avatar.",
+    "Save": "Lagr",
+    "(~%(count)s results)|other": "(~%(count)s resultat)",
+    "(~%(count)s results)|one": "(~%(count)s resultat)",
+    "Join Room": "Far inn i Rom",
+    "Upload avatar": "Last avatar opp",
+    "Remove avatar": "Fjern avatar",
+    "Settings": "Innstillingar",
+    "Forget room": "Gløym rom",
+    "Search": "Søk",
+    "Share room": "Del rom",
+    "Drop here to favourite": "Slepp her for å gjera til yndling",
+    "Drop here to restore": "Slepp her for å gjenoppretta",
+    "Drop here to demote": "Slepp her for å senke i høgd",
+    "Press  to start a chat with someone": "Trykk på  for å starta ei samtale med nokon",
+    "You're not in any rooms yet! Press  to make a room or  to browse the directory": "Du er enno ikkje i eit rom! Trykk på  for å laga eit rom eller  for å sjå gjennom utvalet",
+    "Community Invites": "Samfunnsinnbydingar",
+    "Invites": "Innbydingar",
+    "Favourites": "Yndlingar",
+    "People": "Folk",
+    "Rooms": "Rom",
+    "Low priority": "Lågrett",
+    "System Alerts": "Systemvarsel",
+    "You have no historical rooms": "Du har inkje historiske rom",
+    "Historical": "Historiske",
+    "Unable to ascertain that the address this invite was sent to matches one associated with your account.": "Klarte ikkje å forsikra at adressa som denne innbydinga er send til samsvarar med den som er tilknytta brukaren din.",
+    "This invitation was sent to an email address which is not associated with this account:": "Denne invitasjonen er send til ei epostadressa som ikkje er tilknytta denne brukaren:",
+    "You may wish to login with a different account, or add this email to this account.": "Kanskje du ynskjer å logga inn med ein annan brukar, eller leggja til denne eposten til denne brukaren.",
+    "You have been invited to join this room by %(inviterName)s": "Du vart boden inn i dette rommet av %(inviterName)s",
+    "Would you like to accept or decline this invitation?": "Vil du seia ja eller nei til denne innbydinga?",
+    "Reason: %(reasonText)s": "Grunnlag: %(reasonText)s",
+    "Rejoin": "Far inn att",
+    "You have been kicked from %(roomName)s by %(userName)s.": "Du vart sparka ut frå %(roomName)s av %(userName)s.",
+    "You have been kicked from this room by %(userName)s.": "Du vart sparka ut frå dette rommet av %(userName)s.",
+    "You have been banned from %(roomName)s by %(userName)s.": "Du vart stengd ute frå %(roomName)s av %(userName)s.",
+    "You have been banned from this room by %(userName)s.": "Du vart stengd ute frå dette rommet av %(userName)s.",
+    "This room": "Dette rommet",
+    "%(roomName)s does not exist.": "%(roomName)s finst ikkje.",
+    "%(roomName)s is not accessible at this time.": "%(roomName)s er ikkje tilgjengeleg no.",
+    "You are trying to access %(roomName)s.": "Du prøver å gå inn i %(roomName)s.",
+    "You are trying to access a room.": "Du prøver å gå inn i eit rom.",
+    "Click here to join the discussion!": "Klikk her for å verta med i meiningsutvekslinga!",
+    "This is a preview of this room. Room interactions have been disabled": "Dette er ei førehandsvising av dette rommet. Romhandlingar er skrudd av",
+    "To change the room's avatar, you must be a": "For å endra rommet sin avatar må du vera ein",
+    "To change the room's name, you must be a": "For å endra rommet sitt namn må du vera ein",
+    "To change the room's main address, you must be a": "For å endra rommet si hovudadresse må du vera ein",
+    "To change the room's history visibility, you must be a": "For å endra synlegheita på romhistoria må du vera ein",
+    "To change the permissions in the room, you must be a": "For å endra tillatingane i rommet må du vera ein",
+    "To change the topic, you must be a": "For å endra emnet må du vera ein",
+    "To modify widgets in the room, you must be a": "For å endra widgetar i rommet må du vera ein",
+    "Failed to unban": "Fekk ikkje til å lata inn att",
+    "Banned by %(displayName)s": "Stengd ute av %(displayName)s",
+    "Privacy warning": "Personvernsåtvaring",
+    "Changes to who can read history will only apply to future messages in this room": "Endringar i kven som kan lesa historia gjeld berre for framtidige meldingar i dette rommet",
+    "The visibility of existing history will be unchanged": "Synlegheita på den noverande historia vert ikkje endra",
+    "unknown error code": "ukjend errorkode",
+    "Failed to forget room %(errCode)s": "Fekk ikkje til å gløyma rommet %(errCode)s",
+    "End-to-end encryption is in beta and may not be reliable": "Ende-til-ende-kryptering vert betatesta og er kanskje ikkje påliteleg",
+    "You should not yet trust it to secure data": "Du bør førebels ikkje stole på at ho kan sikra data",
+    "Devices will not yet be able to decrypt history from before they joined the room": "Einingar kan førebels ikkje dekryptera historia frå før dei kom inn i rommet",
+    "Once encryption is enabled for a room it cannot be turned off again (for now)": "Når kryptering er skrudd på i eit rom kan ho (førebels) ikkje skruast av att",
+    "Encrypted messages will not be visible on clients that do not yet implement encryption": "Krypterte meldingar visast ikkje hjå klientar som førebels ikkje implementerer kryptering",
+    "Enable encryption": "Skru kryptering på",
+    "(warning: cannot be disabled again!)": "(åtvaring: kan ikkje skruast av att!)",
+    "Encryption is enabled in this room": "Kryptering er skrudd på i dette rommet",
+    "Encryption is not enabled in this room": "Kryptering er ikkje skrudd på i dette rommet",
+    "The default role for new room members is": "Rolla nye medlemer har i utgangspunktet er",
+    "To send messages, you must be a": "For å senda meldingar må du vera ein",
+    "To invite users into the room, you must be a": "For å byda brukarar inn til rommet må du vera ein",
+    "To configure the room, you must be a": "For å stille rommet inn må du vera ein",
+    "To kick users, you must be a": "For å sparka brukarar ut må du vera ein",
+    "To ban users, you must be a": "For å stengja brukarar ute må du vera ein",
+    "To remove other users' messages, you must be a": "For å fjerna andre brukarar sine meldingar må du vera ein",
+    "To notify everyone in the room, you must be a": "For å varsla alle i rommet må du vera ein",
+    "No users have specific privileges in this room": "Ingen brukarar har særeigne rettar i dette rommet",
+    "%(user)s is a %(userRole)s": "%(user)s er %(userRole)s",
+    "Privileged Users": "Brukarar med Særrett",
+    "Muted Users": "Stilna Brukarar",
+    "Banned users": "Utestengde Brukarar",
+    "Favourite": "Yndling",
+    "Tagged as: ": "Merka som: ",
+    "To link to a room it must have an address.": "For å lenkja til eit rom må det ha ei adresse.",
+    "Guests cannot join this room even if explicitly invited.": "Gjester kan ikkje koma inn i dette rommet sjølv viss dei er tydeleg innbodne.",
+    "Click here to fix": "Klikk her for å retta opp i det",
+    "To send events of type , you must be a": "For å senda hendingar av sorten  må du vera ein",
+    "Who can access this room?": "Kven har tilgang til rommet?",
+    "Only people who have been invited": "Berre dei som er bodne inn",
+    "Anyone who knows the room's link, apart from guests": "Dei som kjenner lenkja til rommet, sett vekk frå gjester",
+    "Anyone who knows the room's link, including guests": "Dei som kjenner lenkja til rommet, gjester òg",
+    "Publish this room to the public in %(domain)s's room directory?": "Gjer dette rommet offentleg i %(domain)s sitt romutval?",
+    "Who can read history?": "Kven kan lesa historia?",
+    "Anyone": "Kven som helst",
+    "Members only (since the point in time of selecting this option)": "Berre medlemer (frå då denne innstillinga vert skrudd på)",
+    "Members only (since they were invited)": "Berre medlemmer (frå då dei vart bodne inn)",
+    "Members only (since they joined)": "Berre medlemer (frå då dei kom inn)",
+    "Permissions": "Tillatinger",
+    "Advanced": "Omfattande",
+    "This room's internal ID is": "Dette rommets innvendes ID er",
+    "Add a topic": "Legg eit emne til",
+    "Search…": "Søk…",
+    "This Room": "Dette Rommet",
+    "All Rooms": "Alle Rom",
+    "Cancel": "Bryt av",
+    "You don't currently have any stickerpacks enabled": "Du har for tida ikkje skrudd nokre klistremerkepakkar på",
+    "Add a stickerpack": "Legg ei klistremerkepakke til",
+    "Stickerpack": "Klistremerkepakke",
+    "Hide Stickers": "Gøym Klistremerkar",
+    "Show Stickers": "Vis Klistremerkar",
+    "Scroll to unread messages": "Blad til ulesne meldingar",
+    "Jump to first unread message.": "Hopp til den fyrste ulesne meldinga.",
+    "Close": "Lukk",
+    "Invalid alias format": "Ugangbar aliasform",
+    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' er ikkje ei gangbar aliasform",
+    "Invalid address format": "Ugangbar adresseform",
+    "'%(alias)s' is not a valid format for an address": "'%(alias)s' er ikkje ei gangbar adresseform",
+    "not set": "ikkje sett",
+    "Remote addresses for this room:": "Fjernadresser for dette rommet:",
+    "Addresses": "Adresser",
+    "The main address for this room is": "Hovudadressa for dette rommet er",
+    "Local addresses for this room:": "Lokaladresser for dette rommet:",
+    "This room has no local addresses": "Dette rommer har ingen lokaladresser",
+    "New address (e.g. #foo:%(localDomain)s)": "Ny adresse (t.d. #foo:%(localDomain)s)",
+    "Invalid community ID": "Ugangbar samfunnsID",
+    "'%(groupId)s' is not a valid community ID": "'%(groupId)s' er ikkje ein gangbar samfunnsID",
+    "Flair": "Særpreg",
+    "Showing flair for these communities:": "Viser særpreg for desse samfunna:",
+    "This room is not showing flair for any communities": "Dette rommet viser ikkje særpreg for nokre samfunn",
+    "New community ID (e.g. +foo:%(localDomain)s)": "Ny samfunnsID (t.d. +foo:%(localDomain)s)",
+    "You have enabled URL previews by default.": "Du har skrudd URL-førehandsvisingar på i utgangspunktet.",
+    "You have disabled URL previews by default.": "Du har skrudd URL-førehandsvisingar av i utgangspunktet.",
+    "URL previews are enabled by default for participants in this room.": "URL-førehandsvisingar er skrudd på i utgangspunktet for dette rommet.",
+    "URL previews are disabled by default for participants in this room.": "URL-førehandsvisingar er skrudd av i utgangspunktet for dette rommet.",
+    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "I krypterte rom, slik som denne, er URL-førehandsvisingar skrudd av i utgangspunktet for å forsikra at heimtenaren din (der førehandsvisinger lagast) ikkje kan samla informasjon om lenkjer som du ser i dette rommet.",
+    "URL Previews": "URL-førehandsvisingar",
+    "Sunday": "søndag",
+    "Monday": "måndag",
+    "Tuesday": "tysdag",
+    "Wednesday": "onsdag",
+    "Thursday": "torsdag",
+    "Friday": "fredag",
+    "Saturday": "laurdag",
+    "Today": "i dag",
+    "Yesterday": "i går",
+    "Error decrypting audio": "Noko gjekk gale med ljoddekrypteringa",
+    "Error decrypting attachment": "Noko gjekk gale med vedleggsdekrypteringa",
+    "Decrypt %(text)s": "Dekrypter %(text)s",
+    "Download %(text)s": "Last %(text)s ned",
+    "Invalid file%(extra)s": "Ugangbar fil%(extra)s",
+    "Error decrypting image": "Noko gjekk gale med biletedekrypteringa",
+    "Error decrypting video": "Noko gjekk gale med videodekrypteringa",
+    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s endra avataren til %(roomName)s",
+    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s fjerna romavataren.",
+    "%(senderDisplayName)s changed the room avatar to ": "%(senderDisplayName)s endra romavataren til ",
+    "Copied!": "Kopiert!",
+    "Failed to copy": "Noko gjekk gale med kopieringa",
+    "Removed or unknown message type": "Fjerna eller ukjend meldingssort",
+    "Message removed by %(userId)s": "Meldinga vart fjerna av %(userId)s",
+    "Message removed": "Meldinga vart fjerna",
+    "Robot check is currently unavailable on desktop - please use a web browser": "Robotsjekk er førebels ikkje tilgjengeleg på skrivebordet - ver venleg og bruk ein nettlesar",
+    "This Home Server would like to make sure you are not a robot": "Denne heimtenaren ynskjer å forsikra seg om at du ikkje er ein robot",
+    "Sign in with CAS": "Logg inn med CAS",
+    "This allows you to use this app with an existing Matrix account on a different home server.": "Dette tillèt deg å bruka denne æppen med ein Matrixbrukar som allereie finst på ein annan heimtenar.",
+    "You can also set a custom identity server but this will typically prevent interaction with users based on email address.": "Du kan i tillegg setja ein eigen identitetstenar, men dette hindrar som regel samhandling med brukarar som brukar epostadresse.",
+    "Dismiss": "Avvis",
+    "To continue, please enter your password.": "For å gå fram, ver venleg og skriv passordet ditt inn.",
+    "Password:": "Passord:",
+    "An email has been sent to %(emailAddress)s": "En epost vart send til %(emailAddress)s",
+    "Please check your email to continue registration.": "Ver venleg og sjekk eposten din for å gå vidare med påmeldinga.",
+    "A text message has been sent to %(msisdn)s": "Ei tekstmelding vart send til %(msisdn)s",
+    "Please enter the code it contains:": "Ver venleg og skriv koden den inneheld inn:",
+    "Code": "Kode",
+    "Start authentication": "Byrj godkjenning",
+    "powered by Matrix": "Matrixdriven",
+    "The email field must not be blank.": "Epostfeltet kan ikkje vera tomt.",
+    "The user name field must not be blank.": "Brukarnamnfeltet kan ikkje vera tomt.",
+    "The phone number field must not be blank.": "Telefonnummerfeltet kan ikkje vera tomt.",
+    "The password field must not be blank.": "Passordfeltet kan ikkje vera tomt.",
+    "Username on %(hs)s": "Brukarnamn på %(hs)s",
+    "User name": "Brukarnamn",
+    "Mobile phone number": "Mobiltelefonnummer",
+    "Forgot your password?": "Gløymt passordet ditt?",
+    "%(serverName)s Matrix ID": "%(serverName)s Matrix-ID",
+    "Sign in with": "Logg inn med",
+    "Email address": "Epostadresse",
+    "Sign in": "Logg inn",
+    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Viss du ikkje seier kva epostadresse du vil bruka vil du ikkje kunna attendestille passordet ditt. Er du sikker?",
+    "Email address (optional)": "Epostadresse (valfritt)",
+    "You are registering with %(SelectedTeamName)s": "Du melder deg inn med %(SelectedTeamName)s",
+    "Mobile phone number (optional)": "Mobiltelefonnummer (valfritt)",
+    "Register": "Meld deg inn",
+    "Default server": "Vanleg tenar",
+    "Home server URL": "Heimtenar-URL",
+    "Identity server URL": "Identitetstenar-URL",
+    "What does this mean?": "Kva tyder dette?",
+    "Remove from community": "Fjern frå samfunnet",
+    "Disinvite this user from community?": "Fjern denne brukaren si innbyding til samfunnet?",
+    "Remove this user from community?": "Fjern denne brukaren frå samfunnet?",
+    "Failed to withdraw invitation": "Fekk ikkje til å taka innbydinga att",
+    "Failed to remove user from community": "Fekk ikkje til å fjerna brukaren frå samfunnet",
+    "Flair will appear if enabled in room settings": "Særpreg dukkar opp viss det er skrudd på i rominnstillingar",
+    "Flair will not appear": "Særpreg dukkar ikkje opp",
+    "Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "Er du sikker på at du vil fjerna '%(roomName)s' frå %(groupId)s?",
+    "Removing a room from the community will also remove it from the community page.": "Å fjerna eit rom frå samfunnet fjernar det frå samfunnssida òg.",
+    "Remove": "Fjern",
+    "Failed to remove room from community": "Fekk ikkje til å fjerna rommet frå samfunnet",
+    "Failed to remove '%(roomName)s' from %(groupId)s": "Fekk ikkje til å fjerna '%(roomName)s' frå %(groupId)s",
+    "Something went wrong!": "Noko gjekk gale!",
+    "The visibility of '%(roomName)s' in %(groupId)s could not be updated.": "Kunne ikkje oppdatera synligheita til '%(roomName)s' i %(groupId)s.",
+    "Visibility in Room List": "Synligheit i Romlista",
+    "Visible to everyone": "Synleg for alle",
+    "Only visible to community members": "Berre synleg for samfunnsmedlemer",
+    "Something went wrong when trying to get your communities.": "Noko gjekk gale med framhentinga av samfunna dine.",
+    "Display your community flair in rooms configured to show it.": "Vis samfunnssærpreget ditt i rom som er stilt inn til å visa det.",
+    "You're not currently a member of any communities.": "Du er for augeblunket ikkje medlem i nokre samfunn.",
+    "Yes, I want to help!": "Ja, eg vil vera til nytte!",
+    "You are not receiving desktop notifications": "Du fær ikkje skrivebordsvarsel",
+    "Enable them now": "Skru dei på no",
+    "What's New": "Kva er nytt",
+    "Update": "Oppdatering",
+    "What's new?": "Kva er nytt?",
+    "A new version of Riot is available.": "Ei ny utgåve av Riot er tilgjengeleg.",
+    "To return to your account in future you need to set a password": "For å gå tilbake til brukaren din i framtida må du setja eit passord",
+    "Set Password": "Set Passord",
+    "Error encountered (%(errorDetail)s).": "Noko gjekk gale (%(errorDetail)s).",
+    "Checking for an update...": "Ser etter oppdateringar...",
+    "No update available.": "Inga oppdatering er tilgjengeleg.",
+    "Downloading update...": "Lastar oppdatering ned...",
+    "Warning": "Åtvaring",
+    "Unknown Address": "Ukjend Adresse",
+    "NOTE: Apps are not end-to-end encrypted": "MERK DEG: Æppar er ikkje ende-til-ende-krypterte",
+    "Warning: This widget might use cookies.": "Åtvaring: Denne widgeten brukar kanskje datakaker.",
+    "Do you want to load widget from URL:": "Vil du lasta widgeten frå URL:",
+    "Allow": "Tillat",
+    "Delete Widget": "Slett Widgeten",
+    "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Å sletta ein widget fjernar den for alle brukarane i rommet. Er du sikker på at du vil sletta denne widgeten?",
+    "Delete widget": "Slett widgeten",
+    "Failed to remove widget": "Fekk ikkje til å fjerna widgeten",
+    "An error ocurred whilst trying to remove the widget from the room": "Noko gjekk gale med fjerninga av widgeten frå rommet",
+    "Revoke widget access": "Tak widgeten sin tilgang att",
+    "Reload widget": "Last inn widget på nytt",
+    "Picture": "Bilete",
+    "Edit": "Gjer om",
+    "Create new room": "Lag nytt rom",
+    "Unblacklist": "Fjern frå svartelista",
+    "Blacklist": "Legg til i svartelista",
+    "No results": "Ingen resultat",
+    "Delete": "Slett",
+    "Communities": "Samfunn",
+    "Home": "Heim",
+    "You cannot delete this image. (%(code)s)": "Du kan ikkje sletta dette biletet. (%(code)s)",
+    "Uploaded on %(date)s by %(user)s": "Lasta opp %(date)s av %(user)s",
+    "Download this file": "Last denne fila ned",
+    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s har kome inn %(count)s gonger",
+    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s kom inn",
+    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s har kome inn %(count)s gonger",
+    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)s kom inn",
+    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)s har fare %(count)s gonger",
+    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)s fór",
+    "%(oneUser)sleft %(count)s times|other": "%(oneUser)s har fare %(count)s gonger",
+    "%(oneUser)sleft %(count)s times|one": "%(oneUser)s fór",
+    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)s har kome inn og fare att %(count)s gonger",
+    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)s kom inn og fór",
+    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s har kome inn og fare att %(count)s gonger",
+    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)s kom inn og fór",
+    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)s har fare og kome inn att %(count)s gonger",
+    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)s fór og kom inn att",
+    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s har fare og kome inn att %(count)s gonger",
+    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s fór og kom inn att",
+    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s sa nei til innbydingane %(count)s gonger",
+    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s sa nei til innbydingane",
+    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)s sa nei til innbydinga %(count)s gonger",
+    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)s sa nei til innbydinga",
+    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "%(severalUsers)s fekk innbydingane sine attekne %(count)s gonger",
+    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "%(severalUsers)s fekk innbydinga si attteke",
+    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "%(oneUser)s fekk innbydinga si atteke %(count)s gonger",
+    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "%(oneUser)s fekk innbydinga si atteke",
+    "were invited %(count)s times|other": "vart boden inn %(count)s gonger",
+    "were invited %(count)s times|one": "vart boden inn",
+    "was invited %(count)s times|other": "vart boden inn %(count)s gonger",
+    "was invited %(count)s times|one": "vart boden inn",
+    "were banned %(count)s times|other": "har vore stengd ute %(count)s gonger",
+    "were banned %(count)s times|one": "vart stengd ute",
+    "was banned %(count)s times|other": "har vore stengd ute %(count)s gonger",
+    "was banned %(count)s times|one": "vart stengd ute",
+    "were unbanned %(count)s times|other": "har vorta sloppe inn att %(count)s gonger",
+    "were unbanned %(count)s times|one": "vart sloppe inn att",
+    "was unbanned %(count)s times|other": "har vorte sloppe inn att %(count)s gonger",
+    "was unbanned %(count)s times|one": "vart sloppe inn att",
+    "were kicked %(count)s times|other": "har vorte sparka ut %(count)s gonger",
+    "were kicked %(count)s times|one": "vart sparka ut",
+    "was kicked %(count)s times|other": "har vorte sparka ut %(count)s gonger",
+    "was kicked %(count)s times|one": "vart sparka ut",
+    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)s har endra namna sine %(count)s gonger",
+    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)s endra namna sine",
+    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)s har endra namnet sitt %(count)s gonger",
+    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)s endra namnet sitt",
+    "%(severalUsers)schanged their avatar %(count)s times|other": "%(severalUsers)s har endra avatarane sine %(count)s gonger",
+    "%(severalUsers)schanged their avatar %(count)s times|one": "%(severalUsers)s endra avatarane sine",
+    "%(oneUser)schanged their avatar %(count)s times|other": "%(oneUser)s har endra avataren sin %(count)s gonger",
+    "%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)s endra avataren sin",
+    "%(items)s and %(count)s others|other": "%(items)s og %(count)s til",
+    "%(items)s and %(count)s others|one": "%(items)s og ein til",
+    "%(items)s and %(lastItem)s": "%(items)s og %(lastItem)s",
+    "collapse": "Slå saman",
+    "expand": "Utvid",
+    "In reply to ": "Som svar til ",
+    "Room directory": "Romutval",
+    "Start chat": "Byrj samtale",
+    "And %(count)s more...|other": "Og %(count)s til...",
+    "ex. @bob:example.com": "t.d. @ivar:eksempel.no",
+    "Add User": "Legg Brukar til",
+    "Matrix ID": "Matrix-ID",
+    "Matrix Room ID": "Matrixrom-ID",
+    "email address": "epostadresse",
+    "You have entered an invalid address.": "Du har skrive ei ugangbar adresse inn.",
+    "Try using one of the following valid address types: %(validTypesList)s.": "Prøv å bruka ein av dei fylgjande gangbare adressesortane: %(validTypesList)s.",
+    "Preparing to send logs": "Førebur loggsending",
+    "Logs sent": "Loggar sende",
+    "Thank you!": "Takk skal du ha!",
+    "Failed to send logs: ": "Fekk ikkje til å senda loggar: ",
+    "Submit debug logs": "Send debøgg-loggar inn",
+    "Riot bugs are tracked on GitHub: create a GitHub issue.": "Riot-bøggar fylgjast på GitHub: lag eit GitHub-issue.",
+    "GitHub issue link:": "lenkje til GitHub-issue:",
+    "Notes:": "Saker å merka seg:",
+    "Send logs": "Send loggar inn",
+    "Unavailable": "Utilgjengeleg",
+    "Changelog": "Endringslogg",
+    "Create a new chat or reuse an existing one": "Lag ei ny samtale eller bruk ei gamal opp att",
+    "Start new chat": "Byrj ny samtale",
+    "You already have existing direct chats with this user:": "Du har allereie pågåande direktesamtaler med denne brukaren:",
+    "Start chatting": "Byrj å prata",
+    "Click on the button below to start chatting!": "Klikk på knappen under for å byrja å prata!",
+    "Start Chatting": "Byrj å Prata",
+    "Something went wrong whilst creating your community": "Noko gjekk gale med laginga av samfunnet ditt",
+    "Create Community": "Lag Samfunn",
+    "Community Name": "Samfunnsnamn",
+    "Example": "Døme",
+    "Community ID": "Samfunns-ID",
+    "example": "døme",
+    "Create": "Lag",
+    "Create Room": "Lag eit Rom",
+    "Room name (optional)": "Romnamn (valfritt)",
+    "Advanced options": "Omfattande innstillingar",
+    "World readable": "Kan lesast av alle",
+    "not specified": "Ikkje oppgjeven",
+    "Minimize apps": "Legg æppar ned",
+    "Confirm Removal": "Godkjenn Fjerning",
+    "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "Er du sikker på at du vil fjerna (sletta) denne hendingen? Merk deg at vis du slettar eit romnamn eller ei emneendring kan det gjera om på endringa.",
+    "Community IDs cannot be empty.": "Samfunns-IDfeltet kan ikkje vera tomt.",
+    "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Samfunns-IDar kan berre innehalda teikna a-z, 0-9, eller '=_-./'",
+    "This setting cannot be changed later!": "Denne innstillinga kan ikkje gjerast om på seinare!",
+    "Unknown error": "Noko ukjend gjekk galt",
+    "Incorrect password": "Urett passord",
+    "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. This action is irreversible.": "Dette gjer at brukaren din vert ubrukeleg til evig tid. Du kjem ikkje til å kunna logga inn, og ingen andre kjem til å kunna melde seg inn med den gamle brukar-IDen din. Brukaren din forlét òg alle rom han er i, og brukardetaljane dine vil verta fjerna frå identitetstenaren. Denne handlinga kan ikkje gjerast om.",
+    "Deactivate Account": "Avliv Brukaren",
+    "Deactivating your account does not by default cause us to forget messages you have sent. If you would like us to forget your messages, please tick the box below.": "Å avliva brukaren din gjer i utgangspunktet ikkje at vi gløymer meldingane du har send. Viss du vil at vi skal gløyma meldingane dine, ver venleg og kryss av i firkanten under.",
+    "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "Meldingssynlegheit på Matrix liknar på epost. At vi gløymer meldingane dine tyder at meldingar du har send ikkje vil verta delt med nye, ikkje-innmeldte brukarar, men brukare som er meldt på som allereie har tilgang til desse meldingane vil fortsatt kunne sjå kopien deira.",
+    "Please forget all messages I have sent when my account is deactivated (Warning: this will cause future users to see an incomplete view of conversations)": "Ver venleg og gløym alle meldingane eg har send når brukaren min vert avliven (Åtvaring: dette gjer at framtidige brukarar ikkje fær eit fullstendig oversyn av samtalene)",
+    "To continue, please enter your password:": "For å gå fram, ver venleg og skriv passordet ditt inn:",
+    "password": "passord",
+    "To verify that this device can be trusted, please contact its owner using some other means (e.g. in person or a phone call) and ask them whether the key they see in their User Settings for this device matches the key below:": "For å godkjenna at denne eininga er til å stola på, ver venleg og snakk med eiaren på ei anna måte (t.d. ansikt til ansikt eller på telefon) og spør dei om nykelen dei ser i Brukarinnstillingane for denne eininga samsvarar med nykelen under:",
+    "Device name": "Einingsnamn",
+    "Device key": "Einingsnykel",
+    "In future this verification process will be more sophisticated.": "I framtida kjem denne godkjenningsprosessen til å vera betre utvikla.",
+    "Verify device": "Godkjenn eining",
+    "I verify that the keys match": "Eg stadfestar at nyklane samsvarar",
+    "Back": "Attende",
+    "Event sent!": "Hending send!",
+    "Event Type": "Hendingsort",
+    "Event Content": "Hendingsinnhald",
+    "Send Account Data": "Send Brukardata",
+    "Explore Room State": "Undersøk Romtilstanden",
+    "Explore Account Data": "Undersøk Brukardata",
+    "Toolbox": "Verktøykasse",
+    "Developer Tools": "Utviklarverktøy",
+    "An error has occurred.": "Noko gjekk gale.",
+    "You added a new device '%(displayName)s', which is requesting encryption keys.": "Du la til den nye eininga '%(displayName)s', som spør om krypteringsnyklar.",
+    "Your unverified device '%(displayName)s' is requesting encryption keys.": "Den ikkje-godkjende eininga di '%(displayName)s' spør om krypteringsnyklar.",
+    "Start verification": "Byrj godkjenning",
+    "Share without verifying": "Del utan å godkjenna",
+    "Ignore request": "Oversjå førespurnad",
+    "Loading device info...": "Lastar einingsinfo inn...",
+    "Encryption key request": "Krypteringsnykel-førespurnad",
+    "Sign out": "Logg ut",
+    "Log out and remove encryption keys?": "Logg ut og fjern krypteringsnyklar?",
+    "Clear Storage and Sign Out": "Tøm Lager og Logg Ut",
+    "Send Logs": "Send Loggar",
+    "Refresh": "Hent fram på nytt",
+    "Unable to restore session": "Kunne ikkje henta øykta fram att",
+    "We encountered an error trying to restore your previous session.": "Noko gjekk gale med framhentinga av den førre øykta di.",
+    "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.": "Viss du har bruka ei nyare utgåve av Riot før, kan det henda at øykta di ikkje passar inn i denne utgåva. Lukk dette vindauget og gå attende til den nyare utgåva.",
+    "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Det kan henda at å tømma nettlesarlageret rettar opp i det, men det loggar deg ut og kan gjera den krypterte pratehistoria uleseleg.",
+    "Invalid Email Address": "Ugangbar Epostadresse",
+    "This doesn't appear to be a valid email address": "Det ser ikkje ut til at epostadressa er gangbar",
+    "Verification Pending": "Ventar på Godkjenning",
+    "Please check your email and click on the link it contains. Once this is done, click continue.": "Ver venleg og sjekk eposten din og klikk på lenkja du har fått. Når det er gjort, klikk gå fram.",
+    "Unable to add email address": "Klarte ikkje å leggja epostadressa til",
+    "Unable to verify email address.": "Klarte ikkje å stadfesta epostadressa.",
+    "This will allow you to reset your password and receive notifications.": "Dette tillèt deg å attendestilla passordet ditt og å få varsel.",
+    "Skip": "Hopp over",
+    "User names may only contain letters, numbers, dots, hyphens and underscores.": "Brukarnamn kan berre innehalda bokstavar, tal, prikkar, bindestrek og understrek.",
+    "Username not available": "Brukarnamnet er ikkje tilgjengeleg",
+    "Username invalid: %(errMessage)s": "Brukarnamnet er ugangbart: %(errMessage)s",
+    "An error occurred: %(error_string)s": "Noko gjekk gale: %(error_string)s",
+    "Username available": "Brukarnamnet er tilgjengeleg",
+    "To get started, please pick a username!": "For å koma i gang, ver venleg og vel eit brukarnman!",
+    "This will be your account name on the  homeserver, or you can pick a different server.": "Dette vert brukarnamnet ditt på  heimtenaren, elles so kan du velja ein annan tenar.",
+    "If you already have a Matrix account you can log in instead.": "Viss du har ein Matrixbrukar allereie kan du logga på i staden.",
+    "You have successfully set a password!": "Du sette passordet ditt!",
+    "You have successfully set a password and an email address!": "Du sette passordet og epostadressa di!",
+    "You can now return to your account after signing out, and sign in on other devices.": "Du kan no gå attende til brukaren din etter å ha logga ut, og logga inn på andre einingar.",
+    "Remember, you can always set an email address in user settings if you change your mind.": "Hugs at du alltid kan setja ei epostadresse i brukarinnstillingar viss du skiftar meining.",
+    "Failed to change password. Is your password correct?": "Fekk ikkje til å skifta passord. Er passordet rett?",
+    "(HTTP status %(httpStatus)s)": "(HTTP-tilstand %(httpStatus)s)",
+    "Please set a password!": "Ver venleg og set eit passord!",
+    "This will allow you to return to your account after signing out, and sign in on other devices.": "Dette tillèt deg å fara attende til brukaren din etter å ha logga ut, og å logga inn på andre einingar.",
+    "Share Room": "Del Rom",
+    "Link to most recent message": "Lenk til den nyaste meldinga",
+    "Share User": "Del Brukar",
+    "Share Community": "Del Samfunn",
+    "Share Room Message": "Del Rommelding",
+    "Link to selected message": "Lenk til den valde meldinga",
+    "COPY": "KOPIER",
+    "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "Du set for augeblunket ikkje-godkjende einingar på svartelista; for å senda meldingar til desse einingane må du godkjenna dei.",
+    "We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "Vi tilrår deg å gå gjennom godkjenninga for kvar av einingane for å vera sikker på at dei tilhøyrer sine rettmessige eigarar, men du kan senda meldinga på nytt utan å godkjenna viss du vil.",
+    "Room contains unknown devices": "Rommet inneheld ukjende einingar",
+    "\"%(RoomName)s\" contains devices that you haven't seen before.": "\"%(RoomName)s\" inneheld einingar som du ikkje har sett før.",
+    "Unknown devices": "Ukjende einingar",
+    "Private Chat": "Lukka Samtale",
+    "Public Chat": "Offentleg Samtale",
+    "Alias (optional)": "Alias (valfritt)",
+    "Reject invitation": "Sei nei til innbyding",
+    "Are you sure you want to reject the invitation?": "Er du sikker på at du vil seia nei til innbydinga?",
+    "Unable to reject invite": "Klarte ikkje å seia nei til innbydinga",
+    "Reject": "Sei nei",
+    "You cannot delete this message. (%(code)s)": "Du kan ikkje sletta meldinga. (%(code)s)",
+    "Resend": "Send på nytt",
+    "Cancel Sending": "Bryt Sending av",
+    "Forward Message": "Vidaresend Melding",
+    "Reply": "Svar",
+    "Pin Message": "Fest Meldinga",
+    "View Source": "Sjå Kjelda",
+    "View Decrypted Source": "Sjå den Dekrypterte Kjelda",
+    "Unhide Preview": "Slutt å Gøyma Førehandsvising",
+    "Share Message": "Del Melding",
+    "Quote": "Sitat",
+    "Source URL": "Kjelde-URL",
+    "Collapse Reply Thread": "Slå Svartråden saman",
+    "All messages (noisy)": "Alle meldingar (bråket)",
+    "All messages": "Alle meldingar",
+    "Mentions only": "Berre når eg vert nemnd",
+    "Leave": "Far frå",
+    "Forget": "Gløym",
+    "Low Priority": "Lågrett",
+    "Direct Chat": "Direktesamtale",
+    "View Community": "Sjå Samfunn",
+    "Sorry, your browser is not able to run Riot.": "Orsak, nettlesaren din klarer ikkje å køyra Riot.",
+    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot brukar mange omfattande nettlesarfunksjonar, og nokre av dei er ikkje tilgjengelege eller i utprøving i nettlesaren din.",
+    "Please install Chrome or Firefox for the best experience.": "Ver venleg og legg Chrome eller Firefox inn på datamaskina for den beste opplevinga.",
+    "Safari and Opera work too.": "Safari og Opera verkar òg.",
+    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Med denne nettlesaren, er det mogleg at synet og kjensla av applikasjonen er fullstendig gale, og nokre eller alle funksjonar verkar kanskje ikkje. Viss du vil prøva likevel kan du gå fram, men då du må sjølv handtera alle vanskar du møter på!",
+    "I understand the risks and wish to continue": "Eg forstår farane og vil gå fram",
+    "Name": "Namn",
+    "Topic": "Emne",
+    "Make this room private": "Gjer dette rommet privat",
+    "Share message history with new users": "Del meldingshistoria med nye brukarar",
+    "Encrypt room": "Krypter rommet",
+    "You must register to use this functionality": "Du må melda deg inn for å bruka denne funksjonen",
+    "You must join the room to see its files": "Du må fare inn i rommet for å sjå filene dets",
+    "There are no visible files in this room": "Det er ingen synlege filer i dette rommet",
+    "
    HTML for your community's page
    \n
    \n    Use the long description to introduce new members to the community, or distribute\n    some important links\n
    \n
    \n    You can even use 'img' tags\n
    \n": "
    HTML for samfunnssida di
    \n
    \n    Bruk den Lange Skildringa for å ynskja nye medlemer velkomen, eller gje ut viktige lenkjer\n
    \n
    \n    Du kan til og med bruka 'img'-merkelappar!\n
    \n",
+    "Add rooms to the community summary": "Legg rom til i samfunnsoppsamanfattinga",
+    "Which rooms would you like to add to this summary?": "Kva rom ynskjer du å leggja til i samanfattinga?",
+    "Add to summary": "Legg til i samanfattinga",
+    "Failed to add the following rooms to the summary of %(groupId)s:": "Fekk ikkje til å leggja dei fylgjande romma til i samanfattinga av %(groupId)s:",
+    "Add a Room": "Legg eit Rom til",
+    "Failed to remove the room from the summary of %(groupId)s": "Fekk ikkje til å fjerna rommet frå samanfattinga av %(groupId)s",
+    "The room '%(roomName)s' could not be removed from the summary.": "Rommet '%(roomName)s' lét seg ikkje fjerna frå samanfattinga.",
+    "Add users to the community summary": "Legg brukarar til i samfunnsamanfattinga",
+    "Who would you like to add to this summary?": "Kven vil du leggja til i samanfattinga?",
+    "Failed to add the following users to the summary of %(groupId)s:": "Fekk ikkje til å leggja fylgjande brukarar til i samanfattinga av %(groupId)s:",
+    "Add a User": "Legg ein Brukar til",
+    "Failed to remove a user from the summary of %(groupId)s": "Fekk ikkje til å fjerna brukaren frå samanfattinga av %(groupId)s",
+    "The user '%(displayName)s' could not be removed from the summary.": "Brukaren '%(displayName)s' lét seg ikkje fjerna frå samanfattinga.",
+    "Failed to upload image": "Fekk ikkje til å lasta biletet opp",
+    "Failed to update community": "Fekk ikkje til å oppdatera samfunnet",
+    "Unable to accept invite": "Fekk ikkje til å seia ja til innbydinga",
+    "Unable to join community": "Fekk ikkje til å fara inn i samfunnet",
+    "Leave Community": "Far frå Samfunnet",
+    "Leave %(groupName)s?": "Far frå %(groupName)s?",
+    "Unable to leave community": "Fekk ikkje til å fara frå samfunnet",
+    "Community Settings": "Samfunninnstillingar",
+    "Changes made to your community name and avatar might not be seen by other users for up to 30 minutes.": "Endringar gjort på samfunnsnamnet og samfunnsavataren vert kanskje ikkje synleg forandre før opp til 30 minutt har gått.",
+    "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "Desse romma vert viste for samfunnsmedlemer på samfunnsida. Samfunnsmedlemer kan fara inn i romma ved å klikka på dei.",
+    "Add rooms to this community": "Legg rom til i samfunnet",
+    "Featured Rooms:": "Utvalde Rom:",
+    "Featured Users:": "Utvalde Brukarar:",
+    "%(inviter)s has invited you to join this community": "%(inviter)s baud deg inn til dette samfunnet",
+    "Join this community": "Far inn i samfunnet",
+    "Leave this community": "Far frå samfunnet",
+    "You are an administrator of this community": "Du er administrator i dette samfunnet",
+    "You are a member of this community": "Du er eit medlem av dette samfunnet",
+    "Who can join this community?": "Kven kan verta med i samfunnet?",
+    "Everyone": "Alle",
+    "Your community hasn't got a Long Description, a HTML page to show to community members.
    Click here to open settings and give it one!": "Samfunnet ditt har ikkje ei Lang Skilrding (ei HTML-side for å visa til samfunnsmedlem.) 
    Klikk her for å opna innstillingar og gje det ei!",
+    "Long Description (HTML)": "Lang Skildring (HTML)",
+    "Description": "Skildring",
+    "Community %(groupId)s not found": "Fann ikkje samfunnet %(groupId)s",
+    "This Home server does not support communities": "Denne heimtenaren støttar ikkje støttesamfunn",
+    "Failed to load %(groupId)s": "Fekk ikkje til å lasta %(groupId)s",
+    "Couldn't load home page": "Kunne ikkje lasta heimesida",
+    "Login": "Innlogging",
+    "Failed to reject invitation": "Fekk ikkje til å seia nei til innbyding",
+    "This room is not public. You will not be able to rejoin without an invite.": "Dette rommet er ikkje offentleg. Du kjem ikkje til å kunna koma inn att utan ei innbyding.",
+    "Are you sure you want to leave the room '%(roomName)s'?": "Er du sikker på at du vil fara frå rommet '%(roomName)s'?",
+    "Failed to leave room": "Fekk ikkje til å fara frå rommet",
+    "Can't leave Server Notices room": "Kan ikkje fara frå Tenarvarsel-rommet",
+    "This room is used for important messages from the Homeserver, so you cannot leave it.": "Dette rommet er for viktige meldingar frå Heimtenaren, so du kan ikkje fara frå det.",
+    "Signed Out": "Logga Ut",
+    "For security, this session has been signed out. Please sign in again.": "Av sikkerheitsgrunnar har denne øykta vorte logga ut. Ver venleg og logg inn att.",
+    "Terms and Conditions": "Vilkår og Føresetnader",
+    "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "For å framleis bruka %(homeserverDomain)s sin heimtenar må du sjå over og seia deg einig i våre Vilkår og Føresetnader.",
+    "Review terms and conditions": "Sjå over Vilkår og Føresetnader",
+    "Old cryptography data detected": "Gamal kryptografidata vart oppdagen",
+    "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Data frå ei eldre utgåve av Riot vart oppdagen. I den eldre utgåva hadde dette gjort at ende-til-ende-kryptografi ikkje verkar som det skal. Ende-til-ende-krypterte meldingar som vert utveksla nyleg med den gamle utgåva er det kanskje ikkje mogeleg å dekryptera i denne utgåva. Dette fører kanskje òg til at meldingar som vart utveksla med denne utgåva ikkje verkar. Viss du opplever vansker, logg ut og inn att. For å spara på meldingshistoria, hent nyklane dine ut og inn at.",
+    "Logout": "Loggar ut",
+    "Your Communities": "Dine Samfunn",
+    "Error whilst fetching joined communities": "Noko gjekk gale med innhentinga av samfunna du er i",
+    "Create a new community": "Lag eit nytt samfunn",
+    "You have no visible notifications": "Du har ingen synlege varsel",
+    "Members": "Medlemer",
+    "%(count)s Members|other": "%(count)s Medlemer",
+    "%(count)s Members|one": "%(count)s Medlem",
+    "Invite to this room": "Byd inn til rommet",
+    "Files": "Filer",
+    "Notifications": "Varsel",
+    "Invite to this community": "Byd inn til samfunnet",
+    "Failed to get protocol list from Home Server": "Fekk ikkje til å henta protokollista frå heimtenaren",
+    "The Home Server may be too old to support third party networks": "Heimtenaren er kanskje for gamal til å støtta tredjepartinettverk",
+    "Failed to get public room list": "Fekk ikkje til å henta den offentlege romlista",
+    "The server may be unavailable or overloaded": "Tenaren er kanskje utilgjengeleg eller overlasta",
+    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Slett rommaliaset %(alias)s og fjern %(name)s frå utvalet?",
+    "Remove %(name)s from the directory?": "Fjern %(name)s frå utvalet?",
+    "Remove from Directory": "Fjern frå Utvalet",
+    "remove %(name)s from the directory.": "fjern %(name)s frå utvalet.",
+    "delete the alias.": "slett aliaset.",
+    "Unable to join network": "Klarte ikkje å verta med i nettverket",
+    "Riot does not know how to join a room on this network": "Riot veit ikkje korleis ein fer inn i eit rom på dette nettverket",
+    "Room not found": "Fann ikkje rommet",
+    "Couldn't find a matching Matrix room": "Kunne ikkje finna eit samsvarande Matrixrom",
+    "Fetching third party location failed": "Noko gjekk gale med hentinga tredjepartiplasseringa",
+    "Directory": "Utval",
+    "Search for a room": "Søk etter eit rom",
+    "#example": "#døme",
+    "Scroll to bottom of page": "Blad til botnen",
+    "Message not sent due to unknown devices being present": "Meldinga vart ikkje send fordi ukjende einingar er til stades",
+    "Show devices, send anyway or cancel.": "Vis einingar, Send likevel eller Bryt av.",
+    "You can't send any messages until you review and agree to our terms and conditions.": "Du kan ikkje senda meldingar før du ser over og seier deg einig i våre Vilkår og Føresetnader.",
+    "%(count)s of your messages have not been sent.|other": "Nokre av meldingane dine vart ikkje sende.",
+    "%(count)s of your messages have not been sent.|one": "Meldinga di vart ikkje send.",
+    "%(count)s Resend all or cancel all now. You can also select individual messages to resend or cancel.|other": "Send alle på nytt eller avbryt alle. Du kan ogso velja enkelte meldingar til sending på nytt eller avbryting.",
+    "%(count)s Resend all or cancel all now. You can also select individual messages to resend or cancel.|one": "Send melding på nytt eller bryt av.",
+    "Connectivity to the server has been lost.": "Tilkoplinga til tenaren vart tapt.",
+    "Sent messages will be stored until your connection has returned.": "Sende meldingar lagrast ikkje før tilkoplinga di er attende.",
+    "%(count)s new messages|other": "%(count)s nye meldingar",
+    "%(count)s new messages|one": "%(count)s ny melding",
+    "Active call": "Pågåande samtale",
+    "There's no one else here! Would you like to invite others or stop warning about the empty room?": "Det er ingen andre her! Vil du byda andre inn eller enda åtvaringa om det tomme rommet??",
+    "more": "meir",
+    "You seem to be uploading files, are you sure you want to quit?": "Det ser ut til at du lastar filer opp, er du sikker på at du vil slutta?",
+    "You seem to be in a call, are you sure you want to quit?": "Det ser ut til at du er i ei samtale, er du sikker på at du vil slutta?",
+    "Failed to upload file": "Fekk ikkje til å lasta fila opp",
+    "Server may be unavailable, overloaded, or the file too big": "Tenaren er kanskje utilgjengeleg, overlasta, elles so er fila for stor",
+    "Search failed": "Søket gjekk gale",
+    "No more results": "Ingen fleire resultat",
+    "Unknown room %(roomId)s": "Ukjend rom %(roomId)s",
+    "Room": "Rom",
+    "Failed to save settings": "Fekk ikkje til å lagra innstillingar",
+    "Failed to reject invite": "Fekk ikkje til å seia nei til innbydinga",
+    "Fill screen": "Fyll skjermen",
+    "Click to unmute video": "Klikk for å avstilna videoen",
+    "Click to mute video": "Klikk for å stilna videoen",
+    "Click to unmute audio": "Klikk for å avstilna ljoden",
+    "Click to mute audio": "Klikk for å stilna ljoden",
+    "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Freista å lasta eit gjeve punkt i rommet si tidslinje, men du har ikkje lov til å sjå den sistnemnde meldinga.",
+    "Tried to load a specific point in this room's timeline, but was unable to find it.": "Freista å lasta eit gjeve punkt i rommet si tidslinje, men klarte ikkje å finna det.",
+    "Failed to load timeline position": "Fekk ikkje til å lasta tidslinjestillinga",
+    "Uploading %(filename)s and %(count)s others|other": "Lastar %(filename)s og %(count)s til opp",
+    "Uploading %(filename)s and %(count)s others|zero": "Lastar %(filename)s opp",
+    "Uploading %(filename)s and %(count)s others|one": "Lastar %(filename)s og %(count)s til opp",
+    "Light theme": "Ljost preg",
+    "Dark theme": "Dimt preg",
+    "Status.im theme": "Status.im-preg",
+    "Can't load user settings": "Kan ikkje lasta brukarinnstillingar",
+    "Server may be unavailable or overloaded": "Tenaren er kanskje utilgjengeleg eller overlasta",
+    "Success": "Det gjekk",
+    "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Passordet ditt vert endra. Du får ikkje push-varsel på andre einingar før du loggar inn att på dei",
+    "Remove Contact Information?": "Fjern Kontaktinfo?",
+    "Remove %(threePid)s?": "Fjern %(threePid)s?",
+    "Unable to remove contact information": "Klarte ikkje å fjerna kontaktinfo",
+    "Refer a friend to Riot:": "Vis ein ven til Riot:",
+    "Interface Language": "Grensesnitts-mål",
+    "User Interface": "Brukargrensesnitt",
+    "": "",
+    "Import E2E room keys": "Hent E2E-romnyklar inn",
+    "Cryptography": "Kryptografi",
+    "Device ID:": "Einings-ID:",
+    "Device key:": "Einingsnykel:",
+    "Ignored Users": "Oversedde Brukarar",
+    "Debug Logs Submission": "Innsending av Debøgg-loggar",
+    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Viss du har sendt inn ein bøgg gjennom GitHub, kan debøgg-loggar hjelpa oss med å finna problemet. Debøgg-loggar inneheld data om æpp-bruk, b.a. Brukarnamnet ditt, IDane eller aliasa på romma eller gruppene du har vitja og brukarnamna til andre brukarar. Dei inneheld ikkje meldingar.",
+    "Riot collects anonymous analytics to allow us to improve the application.": "Riot samlar anonym statistikk inn slik at vi kan forbetre æppen.",
+    "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Personvern er viktig for oss, so vi samlar ikkje på personleg eller attkjenneleg data for statistikken vår.",
+    "Learn more about how we use analytics.": "Finn ut meir om korleis vi brukar statistikk.",
+    "Labs": "Labar",
+    "These are experimental features that may break in unexpected ways": "Desse funksjonane er i utprøving og uventa vanskar kan dukka opp",
+    "Use with caution": "Bruk med omhug",
+    "Deactivate my account": "Avliv brukaren min",
+    "Updates": "Oppdateringar",
+    "Check for update": "Sjå etter oppdateringar",
+    "Reject all %(invitedRooms)s invites": "Sei nei til alle innbydingar frå %(invitedRooms)s",
+    "Desktop specific": "Berre for skrivebord",
+    "Start automatically after system login": "Byrj av seg sjølv etter systeminnlogging",
+    "No media permissions": "Ingen mediatilgang",
+    "You may need to manually permit Riot to access your microphone/webcam": "Det kan henda at du må gje Riot tilgang til mikrofonen/nettkameraet for hand",
+    "Missing Media Permissions, click here to request.": "Vantande Mediatilgang, klikk her for å beda om det.",
+    "No Audio Outputs detected": "Ingen ljodavspelingseiningar funne",
+    "No Microphones detected": "Ingen opptakseiningar funne",
+    "No Webcams detected": "Ingen Nettkamera funne",
+    "Default Device": "Eininga som brukast i utgangspunktet",
+    "Audio Output": "Ljodavspeling",
+    "Microphone": "Ljodopptaking",
+    "Camera": "Kamera",
+    "VoIP": "VoIP",
+    "Email": "Epost",
+    "Add email address": "Legg epostadresse til",
+    "Display name": "Visingsnamn",
+    "Account": "Brukar",
+    "To return to your account in future you need to set a password": "For å kunna koma attende til brukaren din i framtida må du setja eit passord",
+    "Logged in as:": "Logga inn som:",
+    "click to reveal": "klikk for å visa",
+    "Homeserver is": "Heimtenaren er",
+    "Identity Server is": "Identitetstenaren er",
+    "matrix-react-sdk version:": "matrix-react-sdk-utgåve:",
+    "riot-web version:": "riot-web-utgåve:",
+    "olm version:": "olm-utgåve:",
+    "Failed to send email": "Fekk ikkje til å senda eposten",
+    "The email address linked to your account must be entered.": "Du må skriva epostadressa som er tilknytta brukaren din inn.",
+    "A new password must be entered.": "Du må skriva eit nytt passord inn.",
+    "New passwords must match each other.": "Dei nye passorda må vera like.",
+    "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "Ein epost vart send til %(emailAddress)s. Når du har far fylgd lenkja i den, klikk under.",
+    "I have verified my email address": "Eg har godkjend epostadressa mi",
+    "Your password has been reset": "Passordet ditt vart attendesett",
+    "You have been logged out of all devices and will no longer receive push notifications. To re-enable notifications, sign in again on each device": "Du vart logga av alle einingar og får ikkje lenger pushvarsel. For å skru varsel på att, logg inn igjen på kvar eining",
+    "Return to login screen": "Gå attende til innlogging",
+    "To reset your password, enter the email address linked to your account": "For å attendestilla passordet ditt, skriv epostadressa som er lenkja til brukaren din inn",
+    "New password": "Nytt passord",
+    "Confirm your new password": "Stadfest det nye passordet ditt",
+    "Send Reset Email": "Send attendestillingsepost",
+    "Create an account": "Lag ein brukar",
+    "This Home Server does not support login using email address.": "Denne Heimtenaren støttar ikkje innlogging med epost.",
+    "Please contact your service administrator to continue using this service.": "Ver venleg og kontakt din tenesteadministrator for å halda fram med å bruka tenesten.",
+    "Incorrect username and/or password.": "Urett brukarnamn og/eller passord.",
+    "Please note you are logging into the %(hs)s server, not matrix.org.": "Merk deg at du loggar inn på %(hs)s-tenaren, ikkje matrix.org.",
+    "Guest access is disabled on this Home Server.": "Gjestetilgang er skrudd av på denne Heimtenaren.",
+    "The phone number entered looks invalid": "Det innskrivne telefonnummeret ser ugangbart ut",
+    "Error: Problem communicating with the given homeserver.": "Noko gjekk gale: fekk ikkje samband med den gjevne heimtenaren.",
+    "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or enable unsafe scripts.": "Kan ikkje kopla til heimtenaren gjennom HTTP når ein HTTPS-URL er i nettlesarsøkjafeltet ditt. Bruk anten HTTPS eller skru utrygge skript på.",
+    "Can't connect to homeserver - please check your connectivity, ensure your homeserver's SSL certificate is trusted, and that a browser extension is not blocking requests.": "Kan ikkje kopla til heimtenaren - ver venleg og sjekk tilkoplinga di, og sjå til at heimtenaren din sitt CCL-sertifikat er stolt på og at ein nettlesarutviding ikkje hindrar førespurnader.",
+    "Try the app first": "Prøv æppen fyrst",
+    "Sign in to get started": "Logg inn for å koma i gang",
+    "Failed to fetch avatar URL": "Klarte ikkje å henta avatar-URLen",
+    "Set a display name:": "Set eit visingsnamn:",
+    "Upload an avatar:": "Last ein avatar opp:",
+    "This server does not support authentication with a phone number.": "Denne tenaren støttar ikkje stadfesting gjennom telefonnummer.",
+    "Missing password.": "Vantande passord.",
+    "Passwords don't match.": "Passorda er ikkje like.",
+    "Password too short (min %(MIN_PASSWORD_LENGTH)s).": "Passordet er for kort (i det minste %(MIN_PASSWORD_LENGTH)s).",
+    "This doesn't look like a valid email address.": "Dette ser ikkje ut som ei gangbar epostadresse.",
+    "This doesn't look like a valid phone number.": "Dette ser ikkje ut som eit gangbart telefonnummer.",
+    "You need to enter a user name.": "Du må skriva eit brukarnamn inn.",
+    "An unknown error occurred.": "Noko ukjend gjekk gale.",
+    "I already have an account": "Eg har ein brukar allereie",
+    "Commands": "Påbod",
+    "Results from DuckDuckGo": "Resultat frå DuckDuckGo",
+    "Emoji": "Emoji",
+    "Notify the whole room": "Varsl heile rommet",
+    "Room Notification": "Romvarsel",
+    "Users": "Brukarar",
+    "unknown device": "ukjend eining",
+    "NOT verified": "IKKJE godkjend",
+    "verified": "godkjend",
+    "Verification": "Godkjenning",
+    "Ed25519 fingerprint": "Ed25519-fingeravtrykk",
+    "User ID": "Brukar-ID",
+    "Curve25519 identity key": "Curve25519-identitetsnykel",
+    "none": "ingen",
+    "Algorithm": "Algoritme",
+    "unencrypted": "ikkje-kryptert",
+    "Decryption error": "Noko gjekk gale med dekrypteringa",
+    "Session ID": "Økt-ID",
+    "End-to-end encryption information": "Ende-til-ende-krypteringsinfo",
+    "Event information": "Hendingsinfo",
+    "Sender device information": "Info om avsendareininga",
+    "Passphrases must match": "Passetningane må vera like",
+    "Passphrase must not be empty": "Passetningsfeltet kan ikkje vera tomt",
+    "Enter passphrase": "Skriv passetning inn",
+    "Confirm passphrase": "Stadfest passetning",
+    "You must specify an event type!": "Du må oppgje ein handlingssort!",
+    "Call Timeout": "Tidsavbrot i Samtala",
+    "Enable automatic language detection for syntax highlighting": "Skru automatisk måloppdaging på for syntax-understreking",
+    "Show empty room list headings": "Vis overskrift på tomme romlister",
+    "Changing password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Å endra passordet ditt attendestiller førebelst alle ende-til-ende-krypteringsnyklar på alle einingar, slik at kryptert pratehistorie vert uleseleg, med mindre du fyrst hentar romnyklane dine ut og hentar dei inn att etterpå. I framtida vil denne prosessen vera betre.",
+    "Export E2E room keys": "Hent E2E-romnyklar ut",
+    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Det kan henda at du stilte dei inn på ein annan klient enn Riot. Du kan ikkje stilla på dei i Riot men dei gjeld framleis",
+    "Key share requests are sent to your other devices automatically. If you rejected or dismissed the key share request on your other devices, click here to request the keys for this session again.": "Nykeldelingsførespurnader vert sende til dei andre einingane dine av seg sjølv. Viss du sa nei til eller avviste førespurnadene på dei andre einingane, klikk her for å beda om nyklane for denne øykta på nytt.",
+    "Jump to read receipt": "Hopp til lest-lappen",
+    "Filter room members": "Filtrer rommedlemer",
+    "inline-code": "kode-i-tekst",
+    "block-quote": "blokk-sitat",
+    "Show panel": "Vis panel",
+    "Drop here to tag direct chat": "Slepp her for å merka ei direktesamtale",
+    "Drop here to tag %(section)s": "Slepp her for å merka %(section)s",
+    "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "Når nokon legg ein URL med i meldinga si, kan ei URL-førehandsvising visast for å gje meir info om lenkja slik som tittelen, skildringa, og eit bilete frå nettsida.",
+    "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Du held på å verta teken til ei tredje-partisside so du kan godkjenna brukaren din til bruk med %(integrationsUrl)s. Vil du gå fram?",
+    "Token incorrect": "Teiknet er gale",
+    "Filter community members": "Filtrer samfunnsmedlemer",
+    "Custom Server Options": "Eigentenar-innstillingar",
+    "Filter community rooms": "Filtrer samfunnsrom",
+    "Please help improve Riot.im by sending anonymous usage data. This will use a cookie (please see our Cookie Policy).": "Ver venleg og hjelp oss å forbetra Riot.im ved å senda anonym brukardata. Dette brukar ei datakake (ver venleg og sjå på Datakakeretningslinene våre).",
+    "Please help improve Riot.im by sending anonymous usage data. This will use a cookie.": "Ver venleg og hjelp oss å forbetra Riot.im ved å senda anonym brukardata. Dette brukar ei datakake.",
+    "Whether or not you're using the Richtext mode of the Rich Text Editor": "Om du brukar Riktekst-innstillinga på Riktekstfeltet",
+    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "ÅTVARING: NOKO GJEKK GALT MED NYKELGODKJENNINGA! Signeringsnykelen til %(userId)s og eininga %(deviceId)s er \"%(fprint)s\", som ikkje er lik den gjevne nykelen \"%(fingerprint)s\". Dette kan tyda at nokon tjuvlyttar på kommuniseringa!",
+    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Signeringsnykelen du oppgav er lik signeringsnykelen du fekk frå %(userId)s si eining %(deviceId)s. Eininga merkast som godkjend.",
+    "This room is not accessible by remote Matrix servers": "Rommet er ikkje tilgjengeleg for andre Matrix-heimtenarar",
+    "Add an Integration": "Legg tillegg til",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.": "Du kan bruka eigentenarinnstillingane for å logga på andre Matrixtenarar gjennom å oppgje ein annan Heimtenar-URL.",
+    "Custom server": "Eigentenar",
+    "This homeserver has hit its Monthly Active User limit. Please contact your service administrator to continue using the service.": "Heimtenaren har truffe den Månadlege Grensa for Aktive Brukarar. Ver venleg og kontakt tenesteadministratoren din for å halda fram med å bruka tenesten.",
+    "Popout widget": "Popp widget ut",
+    "Integrations Error": "Noko gjekk gale med med Tillegga",
+    "Manage Integrations": "Sjå over Innlegg",
+    "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
+    "Custom of %(powerLevel)s": "Sjølvsett namn på %(powerLevel)s",
+    "Custom level": "Sjølvsett høgd",
+    "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Klarte ikkje å lasta handlinga som vert svara til. Anten finst ho ikkje elles har du ikkje tilgang til å sjå ho.",
+    "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Debøgg-loggar inneheld æppbrukdata slik som brukarnamnet ditt, IDane eller aliasane på romma eller gruppene du har vore i og brukarnamna til andre brukarar. Dei inneheld ikkje meldingar.",
+    "Block users on other matrix homeservers from joining this room": "Hindr brukare frå andre matrix-heimtenarar frå å koma inn i rommet",
+    "Failed to indicate account erasure": "Fekk ikkje til å visa brukarsletting",
+    "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this device and you probably want to press the blacklist button instead.": "Vis dei er like, trykk på godkjenn-knappen under. Viss dei ikkje gjer det, tjuvlyttar nokon på eininga og du bør sannsynlegvis trykkja på svartelisting-knappen i staden.",
+    "Send Custom Event": "Send Sjølvsett Hending",
+    "Failed to send custom event.": "Fekk ikkje til å senda sjølvsett hending.",
+    "State Key": "Tilstandsnykel",
+    "Filter results": "Filtrer resultat",
+    "Custom": "Sjølvsett",
+    "Failed to set Direct Message status of room": "Fekk ikkje til å setja Direktemelding-tilstanden til rommet",
+    "Did you know: you can use communities to filter your Riot.im experience!": "Visste du at: du kan bruka samfunn for å filtrera Riot.im-opplevinga di!",
+    "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "For å setja opp eit filter, drag ein samfunnsavatar bort til filterpanelet til venstre på skjermen. Du kan klikka på ein avatar i filterpanelet når som helst for å sjå berre romma og folka tilknytta det samfunnet.",
+    "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Lag eit samfunn for å føra saman brukarar og rom! Bygg di eiga heimeside for å kreva din del av Matrix-verda.",
+    "Hide panel": "Gøym panel",
+    "Unable to look up room ID from server": "Klarte ikkje å henta rom-ID frå tenaren",
+    "Your message wasn’t sent because this homeserver has hit its Monthly Active User Limit. Please contact your service administrator to continue using the service.": "Meldinga di vart ikkje send fordi heimtenaren har truffe si Månadlege Grense for Aktive Brukarar. Ver venleg og tak kontakt med tenesteadministratoren din for å halda frama med å bruka tenesten.",
+    "Server may be unavailable, overloaded, or search timed out :(": "Tenaren er kanskje utilgjengeleg, overlasta, elles so vart søket tidsavbroten :(",
+    "Expand panel": "Utvid panel",
+    "Collapse panel": "Slå panel saman",
+    "Filter room names": "Filtrer romnamn",
+    "Clear filter": "Tøm filter",
+    "Autocomplete Delay (ms):": "Fullfør-av-seg-sjølv-Forseinking (ms):",
+    "Clear Cache": "Tøm Buffar",
+    "Clear Cache and Reload": "Tøm Buffar og Last inn att",
+    "Profile": "Brukar",
+    "Access Token:": "Tilgangs-Teikn:",
+    "Resetting password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Å attendestilla passordet vil førebels attendestilla alle ende-til-ende-krypteringsnyklar på alle einingar, slik at krypterte samtaler vert uleselege, med mindre du fyrst hentar romnyklane ut og hentar dei inn att etterpå. Dette vil forbetrast i framtida.",
+    "This homeserver has hit its Monthly Active User limit": "Heimtenaren har truffe den Månadlege Grensa si for Aktive Brukarar",
+    "This homeserver doesn't offer any login flows which are supported by this client.": "Heimtenaren tilbyd ingen nye innloggingsstraumar som støttast av denne klienten.",
+    "Claimed Ed25519 fingerprint key": "Gjorde krav på Ed25519-fingeravtrykksnykel",
+    "Export room keys": "Hent romnyklar ut",
+    "Bulk Options": "Innverknadsrike Innstillingar",
+    "Export": "Hent ut",
+    "Import room keys": "Hent romnyklar inn",
+    "File to import": "Fil til innhenting",
+    "Import": "Hent inn",
+    "Failed to set direct chat tag": "Fekk ikkje til å setja direktesamtale-merke",
+    "Failed to remove tag %(tagName)s from room": "Fekk ikkje til å fjerna merket %(tagName)s frå rommet",
+    "Failed to add tag %(tagName)s to room": "Fekk ikkje til å leggja merket %(tagName)s til i rommet",
+    "Hide read receipts": "Gøym lest-lappar",
+    "For security, logging out will delete any end-to-end encryption keys from this browser. If you want to be able to decrypt your conversation history from future Riot sessions, please export your room keys for safe-keeping.": "Av sikkerheitsmessige grunnar vil det å logga ut sletta alle ende-til-ende-krypteringsnyklar frå nettlesaren. Viss du vil kunna dekryptera samtalehistoria di på framtidige Riot-øykter, ver venleg og hent ut romnyklande dine og tak vare på dei.",
+    "This process allows you to export the keys for messages you have received in encrypted rooms to a local file. You will then be able to import the file into another Matrix client in the future, so that client will also be able to decrypt these messages.": "Dette tillèt deg å henta nyklane for meldingar du har sendt i krypterte rom ut til ei lokal fil. Då kan du henta fila inn til ein annan Matrix-klient i framtida, slik at den klienten òg kan dekryptera meldingane.",
+    "The exported file will allow anyone who can read it to decrypt any encrypted messages that you can see, so you should be careful to keep it secure. To help with this, you should enter a passphrase below, which will be used to encrypt the exported data. It will only be possible to import the data by using the same passphrase.": "Å henta filen ut tillèt kven som helst som kan lesa ho å dekryptera alle krypterte meldingar du kan sjå, so du bør passa på å halda ho trygg. For å hjelpa til med dette bør du skriva ei passetning inn i feltet under, som vil brukast til å kryptere den uthenta dataen. Det vil berre vera mogeleg å henta dataen inn med den same passetninga.",
+    "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "Dette tillèt deg å henta krypteringsnyklar som du tidlegare henta ut frå ein annan Matrix-klient inn. Du vil so kunna dekryptera alle meldingane som den andre klienten kunne dekryptera.",
+    "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Uthentingsfila vil verta verna med ei passetning. Du bør skriva passetninga inn her for å dekryptera fila.",
+    "Internal room ID: ": "Indre rom-ID: ",
+    "Room version number: ": "Romutgåvenummer: ",
+    "This homeserver has hit its Monthly Active User limit. Please contact your service administrator to continue using the service.": "Heimtenaren har truffe si Månadlege Grense for Aktive Brukarar. Ver venleg og tak kontakt med tenesteadministratoren din for å halda fram med å bruka tenesten.",
+    "This homeserver has hit its Monthly Active User limit so some users will not be able to log in. Please contact your service administrator to get this limit increased.": "Heimtenaren har truffe si Månadlege Grense for Aktive Brukarar, so nokre brukarar vil ikkje kunna logga inn. Ver venleg og  tak kontakt med tenesteadministratoren din  for å auka grensa.",
+    "There is a known vulnerability affecting this room.": "Ein kjend sårbarheit påverkar dette rommet.",
+    "This room version is vulnerable to malicious modification of room state.": "Denne romutgåva er sårbar til vondsinna endring på romtilstanden.",
+    "Only room administrators will see this warning": "Berre romadministratorar vil sjå denne åtvaringa",
+    "Please contact your service administrator to continue using the service.": "Ver venleg og tak kontakt med tenesteadministratoren for å halda fram med å bruka tenesten.",
+    "This homeserver has hit its Monthly Active User limit.": "Heimtenaren har truffe den Månadlege Grensa si for Aktive Brukarar.",
+    "This homeserver has exceeded one of its resource limits.": "Heimtenaren har gått over ei av ressursgrensene sine."
+}
diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index 0088028aed..3bbc9b1d73 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -151,7 +151,7 @@
     "Changes to who can read history will only apply to future messages in this room": "Zmiany w dostępie do historii będą dotyczyć tylko przyszłych wiadomości w tym pokoju",
     "Changes your display nickname": "Zmień swój pseudonim",
     "Changes colour scheme of current room": "Zmień schemat kolorystyczny bieżącego pokoju",
-    "Changing password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Zmiana hasła zresetuje klucze szyfrowania końcówka-do-końcówki na wszystkich urządzeniach, co spowoduje, że nie będzie się dało odczytać zaszyfrowanej historii czatu, chyba że najpierw wyeksportujesz swoje klucze i ponownie je zaimportujesz. W przyszłości będzie to poprawione.",
+    "Changing password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Zmiana hasła zresetuje klucze szyfrowania end-to-end na wszystkich urządzeniach, co spowoduje, że nie będzie się dało odczytać zaszyfrowanej historii czatu, chyba że najpierw wyeksportujesz swoje klucze i ponownie je zaimportujesz. W przyszłości będzie to poprawione.",
     "Claimed Ed25519 fingerprint key": "Zażądano odcisk klucza Ed25519",
     "Clear Cache and Reload": "Wyczyść pamięć podręczną i przeładuj",
     "Clear Cache": "Wyczyść pamięć podręczną",
@@ -215,8 +215,8 @@
     "Encryption is enabled in this room": "Szyfrowanie jest włączone w tym pokoju",
     "Encryption is not enabled in this room": "Szyfrowanie nie jest włączone w tym pokoju",
     "%(senderName)s ended the call.": "%(senderName)s zakończył połączenie.",
-    "End-to-end encryption information": "Informacje o szyfrowaniu końcówka-do-końcówki",
-    "End-to-end encryption is in beta and may not be reliable": "Szyfrowanie końcówka-do-końcówki jest w fazie beta i może nie być dopracowane",
+    "End-to-end encryption information": "Informacje o szyfrowaniu end-to-end",
+    "End-to-end encryption is in beta and may not be reliable": "Szyfrowanie end-to-end jest w fazie beta i może nie być dopracowane",
     "Enter Code": "Wpisz kod",
     "Enter passphrase": "Wpisz frazę",
     "Error decrypting attachment": "Błąd odszyfrowywania załącznika",
@@ -253,7 +253,7 @@
     "Forget room": "Zapomnij pokój",
     "Forgot your password?": "Zapomniałeś hasła?",
     "For security, this session has been signed out. Please sign in again.": "Ze względów bezpieczeństwa ta sesja została wylogowana. Zaloguj się jeszcze raz.",
-    "For security, logging out will delete any end-to-end encryption keys from this browser. If you want to be able to decrypt your conversation history from future Riot sessions, please export your room keys for safe-keeping.": "Ze względów bezpieczeństwa, wylogowanie skasuje z tej przeglądarki wszystkie klucze szyfrowania końcówka-do-końcówki. Jeśli chcesz móc odszyfrować swoje historie konwersacji z przyszłych sesji Riot-a, proszę wyeksportuj swoje klucze pokojów do bezpiecznego miejsca.",
+    "For security, logging out will delete any end-to-end encryption keys from this browser. If you want to be able to decrypt your conversation history from future Riot sessions, please export your room keys for safe-keeping.": "Ze względów bezpieczeństwa, wylogowanie skasuje z tej przeglądarki wszystkie klucze szyfrowania end-to-end. Jeśli chcesz móc odszyfrować swoje historie konwersacji z przyszłych sesji Riot-a, proszę wyeksportuj swoje klucze pokojów do bezpiecznego miejsca.",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s z %(fromPowerLevel)s na %(toPowerLevel)s",
     "Guest access is disabled on this Home Server.": "Dostęp dla gości jest wyłączony na tym serwerze.",
     "Deops user with given id": "Usuwa prawa administratora użytkownikowi o danym ID",
@@ -380,7 +380,7 @@
     "Hide join/leave messages (invites/kicks/bans unaffected)": "Ukryj wiadomości o dołączeniu/opuszczeniu (nie obejmuje zaproszeń/wyrzuceń/banów)",
     "Hide read receipts": "Ukryj potwierdzenia odczytu",
     "Historical": "Historyczne",
-    "Resetting password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Resetowanie hasła zresetuje klucze szyfrowania końcówka-do-końcówki na wszystkich urządzeniach, co spowoduje, że nie będzie się dało odczytać zaszyfrowanej historii czatu, chyba że najpierw wyeksportujesz swoje klucze i ponownie je zaimportujesz. W przyszłości będzie to poprawione.",
+    "Resetting password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Resetowanie hasła zresetuje klucze szyfrowania end-to-end na wszystkich urządzeniach, co spowoduje, że nie będzie się dało odczytać zaszyfrowanej historii czatu, chyba że najpierw wyeksportujesz swoje klucze i ponownie je zaimportujesz. W przyszłości będzie to poprawione.",
     "Riot was not given permission to send notifications - please try again": "Riot nie otrzymał uprawnień do wysyłania powiadomień - proszę spróbuj ponownie",
     "riot-web version:": "wersja riot-web:",
     "Room %(roomId)s not visible": "Pokój %(roomId)s nie jest widoczny",
@@ -650,7 +650,7 @@
     "Automatically replace plain text Emoji": "Automatycznie zastępuj tekstowe emotikony",
     "Failed to upload image": "Przesyłanie obrazka nie powiodło się",
     "%(count)s new messages|one": "%(count)s nowa wiadomość",
-    "%(count)s new messages|other": "%(count)s nowe wiadomości",
+    "%(count)s new messages|other": "%(count)s nowych wiadomości",
     "We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "Zalecamy Ci przejście przez proces weryfikacyjny dla każdego urządzenia aby potwierdzić, że należy ono do ich prawdziwego właściciela. Możesz jednak wysłać tę wiadomość bez potwierdzania.",
     "Unblacklist": "Usuń z czarnej listy",
     "Blacklist": "Dodaj do czarnej listy",
@@ -752,9 +752,9 @@
     "Unnamed room": "Pokój bez nazwy",
     "Guests can join": "Goście mogą dołączyć",
     "Remove avatar": "Usuń awatar",
-    "Drop here to favourite": "Upuść to aby dodać do ulubionych",
-    "Drop here to restore": "Upuść tu aby przywrócić",
-    "Drop here to demote": "Upuść tu aby zdegradować",
+    "Drop here to favourite": "Upuść tutaj aby dodać do ulubionych",
+    "Drop here to restore": "Upuść tutaj aby przywrócić",
+    "Drop here to demote": "Upuść tutaj aby zdegradować",
     "You have been kicked from this room by %(userName)s.": "Zostałeś usunięty z tego pokoju przez %(userName)s.",
     "You have been banned from this room by %(userName)s.": "Zostałeś zbanowany z tego pokoju przez %(userName)s.",
     "You are trying to access a room.": "Próbujesz uzyskać dostęp do pokoju.",
@@ -937,8 +937,8 @@
     "An email has been sent to %(emailAddress)s": "Email został wysłany do %(emailAddress)s",
     "A text message has been sent to %(msisdn)s": "Wysłano wiadomość tekstową do %(msisdn)s",
     "Code": "Kod",
-    "Please help improve Riot.im by sending anonymous usage data. This will use a cookie (please see our Cookie Policy).": "Pomóż nam ulepszyć Riot.im wysyłając anonimowe dane analityczne. Spowoduje to użycie pliku cookie (zobacz naszą Politykę plików cookie).",
-    "Please help improve Riot.im by sending anonymous usage data. This will use a cookie.": "Pomóż nam ulepszyć Riot.im wysyłając anonimowe dane analityczne. Spowoduje to użycie pliku cookie.",
+    "Please help improve Riot.im by sending anonymous usage data. This will use a cookie (please see our Cookie Policy).": "Pomóż nam ulepszyć Riot.im wysyłając anonimowe dane analityczne. Spowoduje to użycie pliku cookie (zobacz naszą Politykę plików cookie).",
+    "Please help improve Riot.im by sending anonymous usage data. This will use a cookie.": "Pomóż nam ulepszyć Riot.im wysyłając anonimowe dane analityczne. Spowoduje to użycie pliku cookie.",
     "Yes, I want to help!": "Tak, chcę pomóc!",
     "Warning: This widget might use cookies.": "Uwaga: Ten widżet może używać ciasteczek.",
     "Delete Widget": "Usuń widżet",
@@ -955,5 +955,196 @@
     "Advanced options": "Opcje zaawansowane",
     "To continue, please enter your password:": "Aby kontynuować, proszę wprowadzić swoje hasło:",
     "password": "hasło",
-    "Refresh": "Odśwież"
+    "Refresh": "Odśwież",
+    "Which officially provided instance you are using, if any": "Jakiej oficjalnej instancji używasz, jeżeli w ogóle",
+    "Every page you use in the app": "Każda strona, której używasz w aplikacji",
+    "e.g. ": "np. ",
+    "Your User Agent": "Identyfikator Twojej przeglądarki",
+    "Your device resolution": "Twoja rozdzielczość ekranu",
+    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Dane identyfikujące, takie jak: pokój, identyfikator użytkownika lub grupy, są usuwane przed wysłaniem na serwer.",
+    "Who would you like to add to this community?": "Kogo chcesz dodać do tej społeczności?",
+    "Missing roomId.": "Brak identyfikatora pokoju (roomId).",
+    "Ignores a user, hiding their messages from you": "Ignoruje użytkownika ukrywając jego wiadomości przed Tobą",
+    "Stops ignoring a user, showing their messages going forward": "Przestaje ignorować użytkownika, zaczynaj pokazywać jego wiadomości od tego momentu",
+    "Opens the Developer Tools dialog": "Otwiera narzędzia deweloperskie",
+    "Encrypting": "Szyfrowanie",
+    "Encrypted, not sent": "Zaszyfrowane, nie wysłane",
+    "Disinvite this user?": "Anulować zaproszenie tego użytkownika?",
+    "Unignore": "Przestań ignorować",
+    "Jump to read receipt": "Przeskocz do potwierdzenia odczytu",
+    "Share Link to User": "Udostępnij link do użytkownika",
+    "At this time it is not possible to reply with a file so this will be sent without being a reply.": "W tej chwili nie można odpowiedzieć plikiem, więc zostanie wysłany nie będąc odpowiedzią.",
+    "Unable to reply": "Nie udało się odpowiedzieć",
+    "At this time it is not possible to reply with an emote.": "W tej chwili nie można odpowiedzieć emotikoną.",
+    "Replying": "Odpowiadanie",
+    "Share room": "Udostępnij pokój",
+    "Drop here to tag direct chat": "Upuść tutaj aby oznaczyć jako rozmowę bezpośrednią",
+    "Community Invites": "Zaproszenia do społeczności",
+    "To change the room's history visibility, you must be a": "Aby zmienić widoczność historii pokoju, musisz być",
+    "To change the permissions in the room, you must be a": "Aby zmienić uprawnienia pokoju, musisz być",
+    "To change the topic, you must be a": "Aby zmienić temat, musisz być",
+    "To modify widgets in the room, you must be a": "Aby modyfikować widżety w tym pokoju, musisz być",
+    "Banned by %(displayName)s": "Zbanowany przez %(displayName)s",
+    "To send messages, you must be a": "Aby wysyłać wiadomości, musisz być",
+    "To invite users into the room, you must be a": "Aby zapraszać użytkowników do pokoju, musisz być",
+    "To configure the room, you must be a": "Aby konfigurować pokój, musisz być",
+    "To kick users, you must be a": "Aby wyrzucać użytkowników, musisz być",
+    "To ban users, you must be a": "Aby blokować użytkowników, musisz być",
+    "To remove other users' messages, you must be a": "Aby usuwać wiadomości innych użytkowników, musisz być",
+    "To notify everyone in the room, you must be a": "Aby powiadamiać wszystkich w pokoju, musisz być",
+    "Muted Users": "Wyciszeni użytkownicy",
+    "To send events of type , you must be a": "Aby wysyłać zdarzenia typu , musisz być",
+    "Addresses": "Adresy",
+    "Invalid community ID": "Błędne ID społeczności",
+    "'%(groupId)s' is not a valid community ID": "'%(groupId)s' nie jest poprawnym ID społeczności",
+    "New community ID (e.g. +foo:%(localDomain)s)": "Nowe ID społeczności (np. +bla:%(localDomain)s)",
+    "URL previews are enabled by default for participants in this room.": "Podglądy linków są domyślnie włączone dla uczestników tego pokoju.",
+    "URL previews are disabled by default for participants in this room.": "Podglądy linków są domyślnie wyłączone dla uczestników tego pokoju.",
+    "Username on %(hs)s": "Nazwa użytkownika na %(hs)s",
+    "Remove from community": "Usuń ze społeczności",
+    "Disinvite this user from community?": "Anulować zaproszenie tego użytkownika ze społeczności?",
+    "Remove this user from community?": "Usunąć tego użytkownika ze społeczności?",
+    "Failed to withdraw invitation": "Nie udało się wycofać zaproszenia",
+    "Failed to remove user from community": "Nie udało się usunąć użytkownika ze społeczności",
+    "Filter community members": "Filtruj członków społeczności",
+    "Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "Czy na pewno chcesz usunąć '%(roomName)s' z %(groupId)s?",
+    "Removing a room from the community will also remove it from the community page.": "Usunięcie pokoju ze społeczności spowoduje także jego usunięcie ze strony społeczności.",
+    "Failed to remove room from community": "Nie udało się usunąć pokoju ze społeczności",
+    "Failed to remove '%(roomName)s' from %(groupId)s": "Nie udało się usunąć '%(roomName)s' z %(groupId)s",
+    "The visibility of '%(roomName)s' in %(groupId)s could not be updated.": "Widoczność '%(roomName)s' w %(groupId)s nie może być zaktualizowana.",
+    "Visibility in Room List": "Widoczność na liście pokojów",
+    "Visible to everyone": "Widoczny dla wszystkich",
+    "Only visible to community members": "Widoczny tylko dla członków społeczności",
+    "Filter community rooms": "Filtruj pokoje społeczności",
+    "Something went wrong when trying to get your communities.": "Coś poszło nie tak podczas pobierania Twoich społeczności.",
+    "You're not currently a member of any communities.": "Nie jesteś obecnie członkiem żadnej społeczności.",
+    "Minimize apps": "Zminimalizuj aplikacje",
+    "Reload widget": "Przeładuj widżet",
+    "Picture": "Zdjęcie",
+    "Matrix Room ID": "ID pokoju Matrix",
+    "You have entered an invalid address.": "Podałeś nieprawidłowy adres.",
+    "Try using one of the following valid address types: %(validTypesList)s.": "Spróbuj użyć jednego z następujących poprawnych typów adresów: %(validTypesList)s.",
+    "Riot bugs are tracked on GitHub: create a GitHub issue.": "Błędy Riot śledzone są na GitHubie: utwórz nowe zgłoszenie.",
+    "Community IDs cannot be empty.": "ID społeczności nie może być puste.",
+    "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "ID społeczności może zawierać tylko znaki a-z, 0-9 lub '=_-./'",
+    "Something went wrong whilst creating your community": "Coś poszło nie tak podczas tworzenia Twojej społeczności",
+    "Create Community": "Utwórz społeczność",
+    "Community Name": "Nazwa społeczności",
+    "Community ID": "ID społeczności",
+    "Block users on other matrix homeservers from joining this room": "Blokuj użytkowników z innych serwerów Matrix przed dołączaniem do tego pokoju",
+    "This setting cannot be changed later!": "Tego ustawienia nie można zmienić później!",
+    "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. This action is irreversible.": "To sprawi, że Twoje konto stanie się na stałe niezdatne do użytku. Nie będziesz mógł się zalogować i nikt nie będzie mógł ponownie zarejestrować tego samego identyfikatora użytkownika. Spowoduje to, że Twoje konto opuści wszystkie pokoje, w których uczestniczy, i usunie dane Twojego konta z serwera tożsamości. Ta czynność jest nieodwracalna.",
+    "Deactivating your account does not by default cause us to forget messages you have sent. If you would like us to forget your messages, please tick the box below.": "Dezaktywacja konta domyślnie nie powoduje, że skasowania wysłanych wiadomości. Jeśli chcesz, abyśmy zapomnieli o Twoich wiadomościach, zaznacz pole poniżej.",
+    "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "Widoczność wiadomości w Matrix jest podobna do wiadomości e-mail. Nasze zapomnienie wiadomości oznacza, że wysłane wiadomości nie będą udostępniane żadnym nowym lub niezarejestrowanym użytkownikom, ale zarejestrowani użytkownicy, którzy już mają dostęp do tych wiadomości, nadal będą mieli dostęp do ich kopii.",
+    "Please forget all messages I have sent when my account is deactivated (Warning: this will cause future users to see an incomplete view of conversations)": "Proszę zapomnieć o wszystkich wiadomościach, które wysłałem, gdy moje konto jest wyłączone (Ostrzeżenie: spowoduje to, że przyszli użytkownicy zobaczą niepełny obraz rozmów)",
+    "Log out and remove encryption keys?": "Wylogować i usunąć klucze szyfrujące?",
+    "Clear Storage and Sign Out": "Wyczyść pamięć i wyloguj się",
+    "Send Logs": "Wyślij dzienniki",
+    "We encountered an error trying to restore your previous session.": "Napotkaliśmy błąd podczas przywracania poprzedniej sesji.",
+    "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Wyczyszczenie pamięci przeglądarki może rozwiązać problem, ale wyloguje Cię i spowoduje, że jakakolwiek zaszyfrowana historia czatu stanie się nieczytelna.",
+    "Share Room": "Udostępnij pokój",
+    "Link to most recent message": "Link do najnowszej wiadomości",
+    "Share User": "Udostępnij użytkownika",
+    "Share Community": "Udostępnij Społeczność",
+    "Share Room Message": "Udostępnij wiadomość w pokoju",
+    "Link to selected message": "Link do zaznaczonej wiadomości",
+    "COPY": "KOPIUJ",
+    "Unable to reject invite": "Nie udało się odrzucić zaproszenia",
+    "Share Message": "Udostępnij wiadomość",
+    "Collapse Reply Thread": "Zwiń wątek odpowiedzi",
+    "
    HTML for your community's page
    \n
    \n    Use the long description to introduce new members to the community, or distribute\n    some important links\n
    \n
    \n    You can even use 'img' tags\n
    \n": "
    Strona HTML dla Twojej Społeczności
    \n
    \n    Skorzystaj z długiego opisu aby wprowadzić nowych członków do Społeczności lub rozpowszechnić ważne linki.\n
    \n
    \n    Możesz nawet używać tagów 'img'.\n
    \n",
+    "Add rooms to the community summary": "Dodaj pokoje do podsumowania Społeczności",
+    "Which rooms would you like to add to this summary?": "Które pokoje chcesz dodać do tego podsumowania?",
+    "Add to summary": "Dodaj do podsumowania",
+    "Failed to add the following rooms to the summary of %(groupId)s:": "Nie udało się dodać następujących pokojów do podsumowania %(groupId)s:",
+    "Add a Room": "Dodaj pokój",
+    "Failed to remove the room from the summary of %(groupId)s": "Nie udało się usunąć pokoju z podsumowania %(groupId)s",
+    "The room '%(roomName)s' could not be removed from the summary.": "Pokój '%(roomName)s' nie mógł być usunięty z podsumowania.",
+    "Add users to the community summary": "Dodaj użytkowników do podsumowania Społeczności",
+    "Who would you like to add to this summary?": "Kogo chcesz dodać do tego podsumowania?",
+    "Failed to add the following users to the summary of %(groupId)s:": "Nie udało się dodać następujących użytkowników do podsumowania %(groupId)s:",
+    "Add a User": "Dodaj użytkownika",
+    "Failed to remove a user from the summary of %(groupId)s": "Nie udało się usunąć użytkownika z podsumowania %(groupId)s",
+    "The user '%(displayName)s' could not be removed from the summary.": "Użytkownik '%(displayName)s' nie mógł być usunięty z podsumowania.",
+    "Failed to update community": "Nie udało się zaktualizować Społeczności",
+    "Unable to accept invite": "Nie udało się zaakceptować zaproszenia",
+    "Unable to join community": "Nie udało się dołączyć do Społeczności",
+    "Leave Community": "Opuść Społeczność",
+    "Leave %(groupName)s?": "Opuścić %(groupName)s?",
+    "Unable to leave community": "Nie udało się opuścić Społeczności",
+    "Community Settings": "Ustawienia Społeczności",
+    "Changes made to your community name and avatar might not be seen by other users for up to 30 minutes.": "Zmiany nazwy oraz awataru Twojej Społeczności mogą nie być widoczne przez innych użytkowników nawet przez 30 minut.",
+    "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "Te pokoje są wyświetlane członkom społeczności na stronie społeczności. Członkowie społeczności mogą dołączyć do pokoi, klikając je.",
+    "%(inviter)s has invited you to join this community": "%(inviter)s zaprosił Cię do przyłączenia się do tej Społeczności",
+    "Join this community": "Dołącz do tej Społeczności",
+    "Leave this community": "Opuść tę Społeczność",
+    "You are an administrator of this community": "Jesteś administratorem tej Społeczności",
+    "You are a member of this community": "Jesteś członkiem tej społeczności",
+    "Who can join this community?": "Kto może dołączyć do tej Społeczności?",
+    "Everyone": "Każdy",
+    "Your community hasn't got a Long Description, a HTML page to show to community members.
    Click here to open settings and give it one!": "Twoja Społeczność nie ma długiego opisu, strony HTML, która będzie wyświetlana członkom społeczności.
    Kliknij tutaj, aby otworzyć ustawienia i nadać jej jakąś!",
+    "Long Description (HTML)": "Długi opis (HTML)",
+    "Description": "Opis",
+    "Community %(groupId)s not found": "Społeczność %(groupId)s nie znaleziona",
+    "This Home server does not support communities": "Ten serwer domowy nie wspiera Społeczności",
+    "Failed to load %(groupId)s": "Nie udało się załadować %(groupId)s",
+    "This room is not public. You will not be able to rejoin without an invite.": "Ten pokój nie jest publiczny. Nie będziesz w stanie do niego dołączyć bez zaproszenia.",
+    "Can't leave Server Notices room": "Nie można opuścić pokoju powiadomień serwera",
+    "This room is used for important messages from the Homeserver, so you cannot leave it.": "Ten pokój jest używany do ważnych wiadomości z serwera domowego, więc nie możesz go opuścić.",
+    "Terms and Conditions": "Warunki użytkowania",
+    "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Aby kontynuować używanie serwera domowego %(homeserverDomain)s musisz przejrzeć i zaakceptować nasze warunki użytkowania.",
+    "Review terms and conditions": "Przejrzyj warunki użytkowania",
+    "Old cryptography data detected": "Wykryto stare dane kryptograficzne",
+    "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Dane ze starszej wersji Riot zostały wykryte. Spowoduje to błędne działanie kryptografii typu end-to-end w starszej wersji. Wiadomości szyfrowane end-to-end wymieniane ostatnio podczas korzystania ze starszej wersji mogą być niemożliwe do odszyfrowywane w tej wersji. Może to również spowodować niepowodzenie wiadomości wymienianych z tą wersją. Jeśli wystąpią problemy, wyloguj się i zaloguj ponownie. Aby zachować historię wiadomości, wyeksportuj i ponownie zaimportuj klucze.",
+    "Your Communities": "Twoje Społeczności",
+    "Did you know: you can use communities to filter your Riot.im experience!": "Czy wiesz, że: możesz używać Społeczności do filtrowania swoich doświadczeń z Riot.im!",
+    "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Aby ustawić filtr, przeciągnij awatar Społeczności do panelu filtra po lewej stronie ekranu. Możesz kliknąć awatar w panelu filtra w dowolnym momencie, aby zobaczyć tylko pokoje i osoby powiązane z tą społecznością.",
+    "Error whilst fetching joined communities": "Błąd podczas pobierania dołączonych społeczności",
+    "Create a new community": "Utwórz nową Społeczność",
+    "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Utwórz Społeczność, aby grupować użytkowników i pokoje! Zbuduj niestandardową stronę główną, aby zaznaczyć swoją przestrzeń we wszechświecie Matrix.",
+    "Show devices, send anyway or cancel.": "Pokaż urządzenia, wyślij mimo to lub anuluj.",
+    "%(count)s of your messages have not been sent.|one": "Twoja wiadomość nie została wysłana.",
+    "There's no one else here! Would you like to invite others or stop warning about the empty room?": "Nikogo tu nie ma! Czy chcesz zaprosić inne osoby lub przestać ostrzegać o pustym pokoju?",
+    "Clear filter": "Wyczyść filtr",
+    "Light theme": "Jasny motyw",
+    "Dark theme": "Ciemny motyw",
+    "Status.im theme": "Motyw Status.im",
+    "Ignored Users": "Ignorowani użytkownicy",
+    "Debug Logs Submission": "Wysyłanie dzienników błędów",
+    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Jeśli zgłosiłeś błąd za pośrednictwem GitHuba, dzienniki błędów mogą nam pomóc wyśledzić problem. Dzienniki błędów zawierają dane o użytkowaniu aplikacji, w tym nazwę użytkownika, identyfikatory lub aliasy odwiedzonych pomieszczeń lub grup oraz nazwy użytkowników innych użytkowników. Nie zawierają wiadomości.",
+    "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Prywatność jest dla nas ważna, dlatego nie gromadzimy żadnych danych osobowych ani danych identyfikujących w naszych analizach.",
+    "Learn more about how we use analytics.": "Dowiedz się więcej co analizujemy.",
+    "No Audio Outputs detected": "Nie wykryto wyjść audio",
+    "Audio Output": "Wyjście audio",
+    "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "E-mail został wysłany na adres %(emailAddress)s. Gdy otworzysz link, który zawiera, kliknij poniżej.",
+    "Please note you are logging into the %(hs)s server, not matrix.org.": "Zauważ proszę, że logujesz się na serwer %(hs)s, nie matrix.org.",
+    "This homeserver doesn't offer any login flows which are supported by this client.": "Ten serwer domowy nie oferuje żadnych trybów logowania wspieranych przez Twojego klienta.",
+    "Try the app first": "Najpierw wypróbuj aplikację",
+    "Sign in to get started": "Zaloguj się, aby rozpocząć",
+    "Notify the whole room": "Powiadom cały pokój",
+    "Room Notification": "Powiadomienia pokoju",
+    "Call Anyway": "Zadzwoń mimo to",
+    "Answer Anyway": "Odpowiedz mimo to",
+    "Demote yourself?": "Zdegradować siebie?",
+    "Demote": "Zdegraduj",
+    "Hide Stickers": "Ukryj Naklejki",
+    "Show Stickers": "Pokaż Naklejki",
+    "The email field must not be blank.": "Pole email nie może być puste.",
+    "The user name field must not be blank.": "Pole nazwy użytkownika nie może być puste.",
+    "The phone number field must not be blank.": "Pole numeru telefonu nie może być puste.",
+    "The password field must not be blank.": "Pole hasła nie może być puste.",
+    "Call Failed": "Nieudane połączenie",
+    "You have no historical rooms": "Nie masz żadnych historycznych pokoi",
+    "Flair": "Wyróżnik społeczności",
+    "Showing flair for these communities:": "Wyświetlanie wyróżników dla tych społeczności:",
+    "This room is not showing flair for any communities": "Ten pokój nie wyświetla wyróżników dla żadnych społeczności",
+    "Flair will appear if enabled in room settings": "Wyróżnik pojawi się, jeśli został włączony w ustawieniach pokoju",
+    "Flair will not appear": "Wyróżnik nie wyświetli się",
+    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)sdołączył",
+    "%(count)s Resend all or cancel all now. You can also select individual messages to resend or cancel.|one": "Wyślij ponownie wiadomość lub anuluj wiadomość.",
+    "was invited %(count)s times|other": "został zaproszony %(count)s razy",
+    "was invited %(count)s times|one": "został zaproszony",
+    "was banned %(count)s times|one": "został zablokowany",
+    "was kicked %(count)s times|one": "został wyrzucony",
+    "Whether or not you're using the Richtext mode of the Rich Text Editor": ""
 }
diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index c583e795cb..08ad8a4bd5 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -873,7 +873,7 @@
     "email address": "endereço de e-mail",
     "Try using one of the following valid address types: %(validTypesList)s.": "Tente usar um dos seguintes tipos de endereço válidos: %(validTypesList)s.",
     "You have entered an invalid address.": "Você entrou com um endereço inválido.",
-    "Community IDs cannot not be empty.": "IDs de comunidades não podem estar em branco.",
+    "Community IDs cannot be empty.": "IDs de comunidades não podem estar em branco.",
     "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "IDs de comunidade podem apenas ter os seguintes caracteres: a-z, 0-9, ou '=_-./'",
     "Something went wrong whilst creating your community": "Algo deu errado ao criar sua comunidade",
     "Create Community": "Criar comunidade",
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index ae889c5677..25e0d0b78d 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -861,7 +861,7 @@
     "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "Сообщение отправлено на %(emailAddress)s. После перехода по ссылке в отправленном вам письме, щелкните ниже.",
     "Room Notification": "Уведомления комнаты",
     "Drop here to tag direct chat": "Перетащите сюда, чтобы пометить как личный чат",
-    "Drop here to restore": "Перетащиет сюда, чтобы вернуть",
+    "Drop here to restore": "Перетащите сюда, чтобы вернуть",
     "Drop here to demote": "Перетащите сюда, чтобы понизить",
     "Community Invites": "Приглашения в сообщества",
     "Notify the whole room": "Уведомить всю комнату",
@@ -953,7 +953,7 @@
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Используете ли вы режим Richtext в редакторе Rich Text Editor",
     "This room is not public. You will not be able to rejoin without an invite.": "Эта комната не является публичной. Вы не сможете войти без приглашения.",
     "Show devices, send anyway or cancel.": "Показать устройства, отправить в любом случае или отменить.",
-    "Community IDs cannot not be empty.": "ID сообществ не могут быть пустыми.",
+    "Community IDs cannot be empty.": "ID сообществ не могут быть пустыми.",
     "In reply to ": "В ответ на ",
     "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s изменил(а) отображаемое имя на %(displayName)s.",
     "Failed to set direct chat tag": "Не удалось установить тег прямого чата",
@@ -1155,7 +1155,7 @@
     "We encountered an error trying to restore your previous session.": "Произошла ошибка при попытке восстановить предыдущий сеанс.",
     "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Очистка хранилища вашего браузера может устранить проблему, но при этом ваша сессия будет завершена и зашифрованная история чата станет нечитаемой.",
     "Unable to reply": "Не удается ответить",
-    "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Не удается загрузить событие, на которое был дан ответ, либо оно не существует, либо у вас нет разрешения на его просмотр.",
+    "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Не удается загрузить событие, на которое был дан ответ. Либо оно не существует, либо у вас нет разрешения на его просмотр.",
     "Enable widget screenshots on supported widgets": "Включить скриншоты виджета в поддерживаемых виджетах",
     "Collapse Reply Thread": "Ответить с цитированием",
     "Send analytics data": "Отправить данные аналитики",
@@ -1191,5 +1191,48 @@
     "Share User": "Поделиться пользователем",
     "Share Community": "Поделиться сообществом",
     "Link to selected message": "Ссылка на выбранное сообщение",
-    "COPY": "КОПИРОВАТЬ"
+    "COPY": "КОПИРОВАТЬ",
+    "Jitsi Conference Calling": "Конференц-связь Jitsi",
+    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "В зашифрованных комнатах, подобных этой, предварительный просмотр URL-адресов отключен по умолчанию, чтобы гарантировать, что ваш сервер (где создаются предварительные просмотры) не может собирать информацию о ссылках, которые вы видите в этой комнате.",
+    "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "Когда кто-то вставляет URL-адрес в свое сообщение, может быть отображен предварительный просмотр URL-адреса, чтобы предоставить дополнительную информацию об этой ссылке, такую как название, описание и изображение с веб-сайта.",
+    "The email field must not be blank.": "Поле email не должно быть пустым.",
+    "The user name field must not be blank.": "Поле имени пользователя не должно быть пустым.",
+    "The phone number field must not be blank.": "Поле номера телефона не должно быть пустым.",
+    "The password field must not be blank.": "Поле пароля не должно быть пустым.",
+    "Call in Progress": "Выполнение вызова",
+    "A call is already in progress!": "Вызов выполняется!",
+    "You have no historical rooms": "У вас нет архивных комнат",
+    "Share Room Message": "Обмен сообщениями в комнате",
+    "Share Message": "Обмен сообщениями",
+    "You can't send any messages until you review and agree to our terms and conditions.": "Вы не можете отправлять сообщения до тех пор, пока вы не примете наши правила и положения.",
+    "Demote": "Понижение",
+    "Demote yourself?": "Понизить самого себя?",
+    "This event could not be displayed": "Это событие отобразить невозможно",
+    "deleted": "удален",
+    "underlined": "подчеркнутый",
+    "A conference call could not be started because the intgrations server is not available": "Запуск конференции невозможен из-за недоступности сервера интеграции",
+    "Permission Required": "Требуется разрешение",
+    "You do not have permission to start a conference call in this room": "У вас нет разрешения на запуск конференции в этой комнате",
+    "A call is currently being placed!": "Есть активный вызов!",
+    "Failed to remove widget": "Не удалось удалить виджет",
+    "An error ocurred whilst trying to remove the widget from the room": "Произошла ошибка при удалении виджета из комнаты",
+    "System Alerts": "Системные оповещения",
+    "Please contact your service administrator to continue using this service.": "Для продолжения использования этого сервиса обратитесь к администратору.",
+    "Room version number: ": "Номер версии комнаты: ",
+    "Internal room ID: ": "Внутренний ID комнаты: ",
+    "There is a known vulnerability affecting this room.": "В этой комнате есть известная уязвимость.",
+    "This room version is vulnerable to malicious modification of room state.": "Эта версия комнаты уязвима для злонамеренной модификации состояния.",
+    "Click here to upgrade to the latest room version and ensure room integrity is protected.": "Нажмите здесь, чтобы перейти к последней версии комнаты и обеспечить ее целостность.",
+    "Only room administrators will see this warning": "Только администраторы комнат увидят это предупреждение",
+    "Please contact your service administrator to continue using the service.": "Пожалуйста, обратитесь к вашему администратору, чтобы продолжить использование сервиса.",
+    "Please contact your service administrator to get this limit increased.": "Пожалуйста, обратитесь к вашему администратору, чтобы увеличить этот лимит.",
+    "Upgrade Room Version": "Обновление версии комнаты",
+    "Upgrading this room requires closing down the current instance of the room and creating a new room it its place. To give room members the best possible experience, we will:": "Обновление этой комнаты требует закрытия текущей комнаты и создания новой. Чтобы предоставить участникам комнаты наилучший опыт, мы:",
+    "Create a new room with the same name, description and avatar": "Создадим новую комнату с тем же именем, описанием и аватаром",
+    "Update any local room aliases to point to the new room": "Обновим локальные псевдонимы комнат",
+    "Stop users from speaking in the old version of the room, and post a message advising users to move to the new room": "Остановим общение пользователей в старой версии комнаты и опубликуем сообщение, в котором пользователям рекомендуется перейти в новую комнату",
+    "Put a link back to the old room at the start of the new room so people can see old messages": "Разместим ссылку на старую комнату, чтобы люди могли видеть старые сообщения",
+    "Please contact your service administrator to continue using this service.": "Пожалуйста, обратитесь к вашему администратору, чтобы продолжить использовать этот сервис.",
+    "Increase performance by only loading room members on first view": "Увеличьте производительность, загрузив только список участников комнаты",
+    "Lazy loading members not supported": "Задержка загрузки элементов не поддерживается"
 }
diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json
index b1f3f4260d..05c102d516 100644
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -60,7 +60,7 @@
     "Riot was not given permission to send notifications - please try again": "Aplikácii Riot neboli udelené oprávnenia potrebné pre posielanie oznámení - prosím, skúste to znovu",
     "Unable to enable Notifications": "Nie je možné povoliť oznámenia",
     "This email address was not found": "Túto emailovú adresu sa nepodarilo nájsť",
-    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Zdá sa, že vaša emailová adresa nie je priradená k žiadnemu Matrix ID na tomto domovskom servery.",
+    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Zdá sa, že vaša emailová adresa nie je priradená k žiadnemu Matrix ID na tomto domovskom serveri.",
     "Default": "Predvolené",
     "Moderator": "Moderátor",
     "Admin": "Správca",
@@ -118,7 +118,7 @@
     "%(targetName)s rejected the invitation.": "%(targetName)s odmietol pozvanie.",
     "%(targetName)s left the room.": "%(targetName)s opustil miestnosť.",
     "%(senderName)s unbanned %(targetName)s.": "%(senderName)s povolil vstup %(targetName)s.",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s vykopol %(targetName)s.",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s vykázal %(targetName)s.",
     "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s stiahol pozvanie %(targetName)s.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s zmenil tému na \"%(topic)s\".",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s odstránil názov miestnosti.",
@@ -219,10 +219,10 @@
     "Unverified": "Neoverené",
     "device id: ": "ID zariadenia: ",
     "Disinvite": "Stiahnuť pozvanie",
-    "Kick": "Vykopnúť",
+    "Kick": "Vykázať",
     "Disinvite this user?": "Stiahnuť pozvanie tohoto používateľa?",
-    "Kick this user?": "Vykopnúť tohoto používateľa?",
-    "Failed to kick": "Nepodarilo sa vykopnúť",
+    "Kick this user?": "Vykázať tohoto používateľa?",
+    "Failed to kick": "Nepodarilo sa vykázať",
     "Unban": "Povoliť vstup",
     "Ban": "Zakázať vstup",
     "Unban this user?": "Povoliť vstúpiť tomuto používateľovi?",
@@ -326,8 +326,8 @@
     "Would you like to accept or decline this invitation?": "Chcete prijať alebo odmietnuť toto pozvanie?",
     "Reason: %(reasonText)s": "Dôvod: %(reasonText)s",
     "Rejoin": "Vstúpiť znovu",
-    "You have been kicked from %(roomName)s by %(userName)s.": "Používateľ %(userName)s vás vykopol z miestnosti %(roomName)s.",
-    "You have been kicked from this room by %(userName)s.": "Používateľ %(userName)s vás vykopol z tejto miestnosti.",
+    "You have been kicked from %(roomName)s by %(userName)s.": "Používateľ %(userName)s vás vykázal z miestnosti %(roomName)s.",
+    "You have been kicked from this room by %(userName)s.": "Používateľ %(userName)s vás vykázal z tejto miestnosti.",
     "You have been banned from %(roomName)s by %(userName)s.": "Používateľ %(userName)s vám zakázal vstúpiť do miestnosti %(roomName)s.",
     "You have been banned from this room by %(userName)s.": "Používateľ %(userName)s vám zakázal vstúpiť do tejto miestnosti.",
     "This room": "Táto miestnosť",
@@ -364,7 +364,7 @@
     "Privileged Users": "Poverení používatelia",
     "No users have specific privileges in this room": "Žiadny používatelia nemajú v tejto miestnosti pridelené konkrétne poverenia",
     "Banned users": "Používatelia, ktorým bol zakázaný vstup",
-    "This room is not accessible by remote Matrix servers": "Táto miestnosť nie je prístupná cez vzdialené Matrix servery",
+    "This room is not accessible by remote Matrix servers": "Táto miestnosť nie je prístupná zo vzdialených Matrix serverov",
     "Leave room": "Opustiť miestnosť",
     "Favourite": "Obľúbená",
     "Tagged as: ": "Označená ako: ",
@@ -375,7 +375,7 @@
     "Only people who have been invited": "Len pozvaní ľudia",
     "Anyone who knows the room's link, apart from guests": "Ktokoľvek, kto pozná odkaz do miestnosti (okrem hostí)",
     "Anyone who knows the room's link, including guests": "Ktokoľvek, kto pozná odkaz do miestnosti (vrátane hostí)",
-    "Publish this room to the public in %(domain)s's room directory?": "Uverejniť túto miestnosť v adresáry miestností na servery %(domain)s?",
+    "Publish this room to the public in %(domain)s's room directory?": "Uverejniť túto miestnosť v adresári miestností na serveri %(domain)s?",
     "Who can read history?": "Kto môže čítať históriu?",
     "Anyone": "Ktokoľvek",
     "Members only (since the point in time of selecting this option)": "Len členovia (odkedy je aktívna táto voľba)",
@@ -387,7 +387,7 @@
     "To send messages, you must be a": "Aby ste mohli posielať správy, musíte byť",
     "To invite users into the room, you must be a": "Aby ste mohli pozývať používateľov do miestnosti, musíte byť",
     "To configure the room, you must be a": "Aby ste mohli nastavovať miestnosť, musíte byť",
-    "To kick users, you must be a": "Aby ste mohli vykopávať používateľov, musíte byť",
+    "To kick users, you must be a": "Aby ste mohli vykazovať používateľov, musíte byť",
     "To ban users, you must be a": "Aby ste používateľom mohli zakazovať vstup, musíte byť",
     "To remove other users' messages, you must be a": "Aby ste mohli odstraňovať správy, ktoré poslali iní používatelia, musíte byť",
     "To send events of type , you must be a": "Aby ste mohli posielať udalosti typu , musíte byť",
@@ -437,7 +437,7 @@
     "Sign in with CAS": "Prihlásiť sa s použitím CAS",
     "Custom Server Options": "Vlastné možnosti servera",
     "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.": "Vlastné nastavenia servera môžete použiť na pripojenie k iným serverom Matrix a to zadaním URL adresy domovského servera.",
-    "This allows you to use this app with an existing Matrix account on a different home server.": "Umožní vám to použiť túto aplikáciu s už existujúcim Matrix účtom na akomkoľvek domovskom servery.",
+    "This allows you to use this app with an existing Matrix account on a different home server.": "Umožní vám to použiť túto aplikáciu s už existujúcim Matrix účtom na akomkoľvek domovskom serveri.",
     "You can also set a custom identity server but this will typically prevent interaction with users based on email address.": "Môžete tiež zadať vlastnú adresu servera totožností, čo však za štandardných okolností znemožní interakcie medzi používateľmi založené emailovou adresou.",
     "Dismiss": "Zamietnuť",
     "To continue, please enter your password.": "Aby ste mohli pokračovať, prosím zadajte svoje heslo.",
@@ -452,7 +452,7 @@
     "User name": "Meno používateľa",
     "Mobile phone number": "Číslo mobilného telefónu",
     "Forgot your password?": "Zabudli ste heslo?",
-    "%(serverName)s Matrix ID": "Matrix ID na servery %(serverName)s",
+    "%(serverName)s Matrix ID": "Matrix ID na serveri %(serverName)s",
     "Sign in with": "Na prihlásenie sa použije",
     "Email address": "Emailová adresa",
     "Sign in": "Prihlásiť sa",
@@ -539,10 +539,10 @@
     "were unbanned %(count)s times|one": "mali povolený vstup",
     "was unbanned %(count)s times|other": "mal %(count)s krát povolený vstup",
     "was unbanned %(count)s times|one": "mal povolený vstup",
-    "were kicked %(count)s times|other": "boli %(count)s krát vykopnutí",
-    "were kicked %(count)s times|one": "boli vykopnutí",
-    "was kicked %(count)s times|other": "bol %(count)s krát vykopnutý",
-    "was kicked %(count)s times|one": "bol vykopnutý",
+    "were kicked %(count)s times|other": "boli %(count)s krát vykázaní",
+    "were kicked %(count)s times|one": "boli vykázaní",
+    "was kicked %(count)s times|other": "bol %(count)s krát vykázaný",
+    "was kicked %(count)s times|one": "bol vykázaný",
     "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)ssi %(count)s krát zmenili meno",
     "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)ssi zmenili meno",
     "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)ssi %(count)s krát zmenil meno",
@@ -621,7 +621,7 @@
     "An error occurred: %(error_string)s": "Vyskytla sa chyba: %(error_string)s",
     "Username available": "Používateľské meno je k dispozícii",
     "To get started, please pick a username!": "Začnite tým, že si zvolíte používateľské meno!",
-    "This will be your account name on the  homeserver, or you can pick a different server.": "Toto bude názov vašeho účtu na domovskom servery , alebo si môžete zvoliť iný server.",
+    "This will be your account name on the  homeserver, or you can pick a different server.": "Toto bude názov vašeho účtu na domovskom serveri , alebo si môžete zvoliť iný server.",
     "If you already have a Matrix account you can log in instead.": "Ak už máte Matrix účet, môžete sa hneď Prihlásiť.",
     "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "Momentálne sa ku všetkym neovereným zariadeniam správate ako by boli na čiernej listine; aby ste na tieto zariadenia mohli posielať správy, mali by ste ich overiť.",
     "We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "Odporúčame vám prejsť procesom overenia pre všetky tieto zariadenia aby ste si potvrdili, že skutočne patria ich pravým vlastníkom, ak si to však želáte, môžete tiež znovu poslať správu bez overovania.",
@@ -725,7 +725,7 @@
     "Don't send typing notifications": "Neposielať oznámenia keď píšete",
     "Always show message timestamps": "Vždy zobrazovať časovú značku správ",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Pri zobrazovaní časových značiek používať 12 hodinový formát (napr. 2:30pm)",
-    "Hide join/leave messages (invites/kicks/bans unaffected)": "Skryť správy o vstupe a opustení miestnosti (netýka sa pozvaní/vykopnutí/zákazov vstupu)",
+    "Hide join/leave messages (invites/kicks/bans unaffected)": "Skryť správy o vstupe a opustení miestnosti (netýka sa pozvaní/vykázaní/zákazov vstupu)",
     "Use compact timeline layout": "Použiť kompaktné rozloženie časovej osy",
     "Hide removed messages": "Skryť odstránené správy",
     "Enable automatic language detection for syntax highlighting": "Povoliť automatickú detegciu jazyka pre zvýrazňovanie syntaxe",
@@ -775,8 +775,8 @@
     "No media permissions": "Žiadne oprávnenia k médiám",
     "You may need to manually permit Riot to access your microphone/webcam": "Mali by ste aplikácii Riot ručne udeliť právo pristupovať k mikrofónu a kamere",
     "Missing Media Permissions, click here to request.": "Kliknutím sem vyžiadate chýbajúce oprávnenia na prístup k mediálnym zariadeniam.",
-    "No Microphones detected": "Neboli nájdené žiadne mikrofóny",
-    "No Webcams detected": "Neboli nájdené žiadne kamery",
+    "No Microphones detected": "Neboli rozpoznané žiadne mikrofóny",
+    "No Webcams detected": "Neboli rozpoznané žiadne kamery",
     "Default Device": "Predvolené zariadenie",
     "Microphone": "Mikrofón",
     "Camera": "Kamera",
@@ -813,7 +813,7 @@
     "Create an account": "Vytvoriť účet",
     "This Home Server does not support login using email address.": "Tento domovský server nepodporuje prihlasovanie sa emailom.",
     "Incorrect username and/or password.": "Nesprávne meno používateľa a / alebo heslo.",
-    "Guest access is disabled on this Home Server.": "Na tomto domovskom servery je zakázaný prístup pre hostí.",
+    "Guest access is disabled on this Home Server.": "Na tomto domovskom serveri je zakázaný prístup pre hostí.",
     "The phone number entered looks invalid": "Zdá sa, že zadané telefónne číslo je neplatné",
     "Error: Problem communicating with the given homeserver.": "Chyba: Nie je možné komunikovať so zadaným domovským serverom.",
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or enable unsafe scripts.": "K domovskému serveru nie je možné pripojiť sa použitím protokolu HTTP keďže v adresnom riadku prehliadača máte HTTPS adresu. Použite protokol HTTPS alebo povolte nezabezpečené skripty.",
@@ -838,7 +838,7 @@
     "Invites user with given id to current room": "Pošle používateľovi so zadaným ID pozvanie do tejto miestnosti",
     "Joins room with given alias": "Vstúpi do miestnosti so zadaným aliasom",
     "Sets the room topic": "Nastaví tému miestnosti",
-    "Kicks user with given id": "Vykopne používateľa so zadaným ID",
+    "Kicks user with given id": "Vykáže používateľa so zadaným ID",
     "Changes your display nickname": "Zmení vaše zobrazované meno",
     "Searches DuckDuckGo for results": "Vyhľadá výsledky na DuckDuckGo",
     "Changes colour scheme of current room": "Zmení farebnú schému aktuálnej miestnosti",
@@ -884,7 +884,7 @@
     "Sign in to get started": "Začnite prihlásením sa",
     "Status.im theme": "Téma status.im",
     "Please note you are logging into the %(hs)s server, not matrix.org.": "Všimnite si: Práve sa prihlasujete na server %(hs)s, nie na server matrix.org.",
-    "Username on %(hs)s": "Meno používateľa na servery %(hs)s",
+    "Username on %(hs)s": "Meno používateľa na serveri %(hs)s",
     "Restricted": "Obmedzené",
     "Hide avatar changes": "Skryť zmeny obrázka v profile",
     "Hide display name changes": "Skryť zmeny zobrazovaného mena",
@@ -957,7 +957,7 @@
     "Failed to remove tag %(tagName)s from room": "Z miestnosti sa nepodarilo odstrániť značku %(tagName)s",
     "Failed to add tag %(tagName)s to room": "Miestnosti sa nepodarilo pridať značku %(tagName)s",
     "In reply to ": "Odpoveď na ",
-    "Community IDs cannot not be empty.": "ID komunity nemôže ostať prázdne.",
+    "Community IDs cannot be empty.": "ID komunity nemôže ostať prázdne.",
     "Show devices, send anyway or cancel.": "Zobraziť zariadenia, napriek tomu odoslať alebo zrušiť.",
     "Disable Community Filter Panel": "Zakázať panel Filter komunity",
     "Your key share request has been sent - please check your other devices for key share requests.": "Žiadosť o zdieľanie kľúčov bola odoslaná - Overte si zobrazenie žiadosti o zdieľanie kľúčov na vašich ostatných zariadeniach.",
@@ -1095,7 +1095,7 @@
     "When I'm invited to a room": "Pozvania vstúpiť do miestnosti",
     "Can't update user notification settings": "Nie je možné aktualizovať používateľské nastavenia oznamovania",
     "Notify for all other messages/rooms": "oznamovať všetky ostatné správy / miestnosti",
-    "Unable to look up room ID from server": "Nie je možné vyhľadať ID miestnosti na servery",
+    "Unable to look up room ID from server": "Nie je možné vyhľadať ID miestnosti na serveri",
     "Couldn't find a matching Matrix room": "Nie je možné nájsť zodpovedajúcu Matrix miestnosť",
     "Invite to this room": "Pozvať do tejto miestnosti",
     "You cannot delete this message. (%(code)s)": "Nemôžete vymazať túto správu. (%(code)s)",
@@ -1180,5 +1180,82 @@
     "Terms and Conditions": "Zmluvné podmienky",
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Ak chcete aj naďalej používať domovský server %(homeserverDomain)s, mali by ste si prečítať a odsúhlasiť naše zmluvné podmienky.",
     "Review terms and conditions": "Prečítať zmluvné podmienky",
-    "To notify everyone in the room, you must be a": "Aby ste mohli upozorňovať všetkých členov v miestnosti, musíte byť"
+    "To notify everyone in the room, you must be a": "Aby ste mohli upozorňovať všetkých členov v miestnosti, musíte byť",
+    "Encrypting": "Šifrovanie",
+    "Encrypted, not sent": "Zašifrované, ale neodoslané",
+    "Share Link to User": "Zdieľať odkaz na používateľa",
+    "Share room": "Zdieľaj miestnosť",
+    "Share Room": "Zdieľať miestnosť",
+    "Link to most recent message": "Odkaz na najnovšiu správu",
+    "Share User": "Zdieľať používateľa",
+    "Share Community": "Zdieľať komunitu",
+    "Link to selected message": "Odkaz na vybratú správu",
+    "COPY": "Kopírovať",
+    "Share Message": "Zdieľaj správu",
+    "No Audio Outputs detected": "Neboli rozpoznané žiadne zvukové výstupy",
+    "Audio Output": "Výstup zvuku",
+    "Try the app first": "Vyskúšať si aplikáciu",
+    "Share Room Message": "Zdieľať správu z miestnosti",
+    "The email field must not be blank.": "Email nemôže ostať prázdny.",
+    "The user name field must not be blank.": "Používateľské meno nemôže ostať prázdne.",
+    "The phone number field must not be blank.": "Telefónne číslo nemôže ostať prázdne.",
+    "The password field must not be blank.": "Heslo nemôže ostať prázdne.",
+    "Jitsi Conference Calling": "Konferenčné hovory Jitsi",
+    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "Náhľady URL adries sú v šifrovaných miestnostiach ako je táto predvolene zakázané, aby ste si mohli byť istí, že obsah odkazov z vašej konverzácii nebude zaznamenaný na vašom domovskom serveri počas ich generovania.",
+    "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "Ak niekto vo svojej správe pošle URL adresu, môže byť zobrazený jej náhľad obsahujúci názov, popis a obrázok z cieľovej web stránky.",
+    "Call in Progress": "Prebiehajúci hovor",
+    "A call is already in progress!": "Jeden hovor už prebieha!",
+    "You have no historical rooms": "Nemáte žiadne historické miestnosti",
+    "A conference call could not be started because the intgrations server is not available": "Nie je možné uskutočniť konferenčný hovor, integračný server nie je k dispozícii",
+    "A call is currently being placed!": "Práve prebieha iný hovor!",
+    "Permission Required": "Vyžaduje sa oprávnenie",
+    "You do not have permission to start a conference call in this room": "V tejto miestnosti nemáte oprávnenie začať konferenčný hovor",
+    "Show empty room list headings": "Zobrazovať nadpisy prázdnych zoznamov miestností",
+    "This event could not be displayed": "Nie je možné zobraziť túto udalosť",
+    "Demote yourself?": "Znížiť vlastnú úroveň moci?",
+    "Demote": "Znížiť",
+    "deleted": "Odstránené",
+    "underlined": "Podčiarknuté",
+    "inline-code": "Vnorený kód",
+    "block-quote": "Citácia",
+    "bulleted-list": "Odrážkový zoznam",
+    "numbered-list": "Číselný zoznam",
+    "Failed to remove widget": "Nepodarilo sa odstrániť widget",
+    "An error ocurred whilst trying to remove the widget from the room": "Pri odstraňovaní widgetu z  miestnosti sa vyskytla chyba",
+    "You can't send any messages until you review and agree to our terms and conditions.": "Nemôžete posielať žiadne správy, kým si neprečítate a neodsúhlasíte naše zmluvné podmienky.",
+    "Sorry, your homeserver is too old to participate in this room.": "Prepáčte, nie je možné prijímať a odosielať do tejto miestnosti, pretože váš domovský server je zastaralý.",
+    "Please contact your homeserver administrator.": "Prosím, kontaktujte správcu domovského servera.",
+    "Increase performance by only loading room members on first view": "Zvýšiť výkon načítaním zoznamu členov pri prvom zobrazení",
+    "System Alerts": "Systémové upozornenia",
+    "Internal room ID: ": "Interné ID miestnosti: ",
+    "Room version number: ": "Číslo verzie miestnosti: ",
+    "Please contact your service administrator to continue using the service.": "Prosím, kontaktujte správcu služieb aby ste službu mohli naďalej používať.",
+    "This homeserver has hit its Monthly Active User limit.": "Bol dosiahnutý mesačný limit počtu aktívnych používateľov tohoto domovského servera.",
+    "This homeserver has exceeded one of its resource limits.": "Bol prekročený limit využitia prostriedkov pre tento domovský server.",
+    "Please contact your service administrator to get this limit increased.": "Prosím, kontaktujte správcu služieb a pokúste sa tento limit navýšiť.",
+    "This homeserver has hit its Monthly Active User limit so some users will not be able to log in.": "Bol dosiahnutý mesačný limit počtu aktívnych používateľov a niektorí používatelia sa nebudú môcť prihlásiť.",
+    "This homeserver has exceeded one of its resource limits so some users will not be able to log in.": "Bol prekročený limit využitia prostriedkov pre tento domovský server a niektorí používatelia sa nebudú môcť prihlásiť.",
+    "Your message wasn't sent because this homeserver has hit its Monthly Active User Limit. Please contact your service administrator to continue using the service.": "Vaša správa nebola odoslaná, pretože bol dosiahnutý mesačný limit počtu aktívnych používateľov tohoto domovského servera. Prosím, kontaktujte správcu služieb aby ste službu mohli naďalej používať.",
+    "Your message wasn't sent because this homeserver has exceeded a resource limit. Please contact your service administrator to continue using the service.": "Vaša správa nebola odoslaná, pretože bol prekročený limit prostriedkov tohoto domovského servera. Prosím, kontaktujte správcu služieb aby ste službu mohli naďalej používať.",
+    "Lazy loading members not supported": "Načítanie zoznamu členov pri prvom zobrazení nie je podporované",
+    "Lazy loading is not supported by your current homeserver.": "Oneskorené načítanie nepodporuje váš domovský server.",
+    "Please contact your service administrator to continue using this service.": "Prosím, kontaktujte správcu služieb aby ste mohli službu ďalej používať.",
+    "This room has been replaced and is no longer active.": "Táto miestnosť bola nahradená a nie je viac aktívna.",
+    "The conversation continues here.": "Konverzácia pokračuje tu.",
+    "Upgrade room to version %(ver)s": "Aktualizácia miestnosti na verziu %(ver)s",
+    "There is a known vulnerability affecting this room.": "Existuje známa zraniteľnosť, ktorú je možné zneužiť v tejto miestnosti.",
+    "This room version is vulnerable to malicious modification of room state.": "Táto verzia miestnosti je zraniteľná proti zlomyseľným zmenám jej stavu.",
+    "Click here to upgrade to the latest room version and ensure room integrity is protected.": "Kliknutím sem aktualizujete miestnosť na najnovšiu verziu a uistíte sa, že jej integrita je bezpečne zachovaná.",
+    "Only room administrators will see this warning": "Toto upozornenie sa zobrazuje len správcom miestnosti",
+    "This room is a continuation of another conversation.": "Táto miestnosť je pokračovaním staršej konverzácii.",
+    "Click here to see older messages.": "Kliknutím sem zobrazíte staršie správy.",
+    "Failed to upgrade room": "Nepodarilo sa aktualizovať miestnosť",
+    "The room upgrade could not be completed": "Nie je možné dokončiť aktualizáciu miestnosti na jej najnovšiu verziu",
+    "Upgrade this room to version %(version)s": "Aktualizácia tejto miestnosti na verziu %(version)s",
+    "Upgrade Room Version": "Aktualizovať verziu miestnosti",
+    "Upgrading this room requires closing down the current instance of the room and creating a new room it its place. To give room members the best possible experience, we will:": "Aktualizácia verzii tejto miestnosti si vyžaduje jej uzatvorenie a vytvorenie novej miestnosti na jej pôvodnom mieste. Aby bol prechod pre členov miestnosti čo najplynulejší, nasledovné kroky sa vykonajú automaticky:",
+    "Create a new room with the same name, description and avatar": "Vznikne nová miestnosť s rovnakým názvom, témou a obrázkom",
+    "Update any local room aliases to point to the new room": "Všetky lokálne aliasy pôvodnej miestnosti sa aktualizujú tak, aby ukazovali na novú miestnosť",
+    "Stop users from speaking in the old version of the room, and post a message advising users to move to the new room": "V pôvodnej miestnosti bude zverejnené odporúčanie prejsť do novej miestnosti a posielanie do pôvodnej miestnosti bude zakázané pre všetkých používateľov",
+    "Put a link back to the old room at the start of the new room so people can see old messages": "História novej miestnosti sa začne odkazom do pôvodnej miestnosti, aby si členovia vedeli zobraziť staršie správy"
 }
diff --git a/src/i18n/strings/sr.json b/src/i18n/strings/sr.json
index 6d217d5349..3f842e4457 100644
--- a/src/i18n/strings/sr.json
+++ b/src/i18n/strings/sr.json
@@ -641,7 +641,7 @@
     "Confirm Removal": "Потврди уклањање",
     "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "Да ли сте сигурни да желите уклонити (обрисати) овај догађај? Знајте да брисање назива собе или мењање теме може опозвати измену.",
     "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "ИБ-јеви заједнице могу садржати само знакове a-z, 0-9, или '=_-./'",
-    "Community IDs cannot not be empty.": "ИБ-јеви заједнице не могу бити празни.",
+    "Community IDs cannot be empty.": "ИБ-јеви заједнице не могу бити празни.",
     "Something went wrong whilst creating your community": "Нешто је пошло наопако приликом стварања ваше заједнице",
     "Create Community": "Направи заједницу",
     "Community Name": "Назив заједнице",
@@ -1177,5 +1177,37 @@
     "Terms and Conditions": "Услови коришћења",
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Да бисте наставили са коришћењем Кућног сервера %(homeserverDomain)s морате погледати и пристати на наше услове коришћења.",
     "Review terms and conditions": "Погледај услове коришћења",
-    "Try the app first": "Пробајте прво апликацију"
+    "Try the app first": "Пробајте прво апликацију",
+    "Jitsi Conference Calling": "Jitsi конференцијско позивање",
+    "Encrypting": "Шифрујем",
+    "Encrypted, not sent": "Шифровано, непослато",
+    "Share Link to User": "Подели везу са корисником",
+    "Share room": "Подели собу",
+    "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. This action is irreversible.": "Ово ће учинити ваш налог трајно неупотребљивим. Нећете моћи да се пријавите и нико се неће моћи поново регистровати са истим корисничким ИБ-јем. Ово ће учинити да ваш налог напусти све собе у којима учествује и уклониће појединости вашег налога са идентитетског сервера. Ова радња се не може опозвати.",
+    "Deactivating your account does not by default cause us to forget messages you have sent. If you would like us to forget your messages, please tick the box below.": "Деактивирањем вашег налога се ваше поруке неће заборавити. Ако желите да заборавимо ваше поруке, штиклирајте кућицу испод.",
+    "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "Видљивост порука у Матриксу је слична мејловима. Оне поруке које заборавимо нећемо делити са новим и нерегистрованим корисницима али постојећи корисници који су имали приступ овим порукама ће и даље моћи да виде своју копију.",
+    "Please forget all messages I have sent when my account is deactivated (Warning: this will cause future users to see an incomplete view of conversations)": "Заборавите све моје поруке које сам послао када се мој налог деактивира (Упозорење: овим ће будући корисници видети непотпуне разговоре)",
+    "Share Room": "Подели собу",
+    "Link to most recent message": "Веза ка најновијој поруци",
+    "Share User": "Подели корисника",
+    "Share Community": "Подели заједницу",
+    "Share Room Message": "Подели поруку у соби",
+    "Link to selected message": "Веза ка изабраној поруци",
+    "COPY": "КОПИРАЈ",
+    "Share Message": "Подели поруку",
+    "No Audio Outputs detected": "Нема уочених излаза звука",
+    "Audio Output": "Излаз звука",
+    "A conference call could not be started because the intgrations server is not available": "Конференцијски позив не може почети зато што интеграцијски сервер није доступан",
+    "Call in Progress": "Позив је у току",
+    "A call is currently being placed!": "Успостављамо позив!",
+    "A call is already in progress!": "Позив је у току!",
+    "Permission Required": "Неопходна је дозвола",
+    "You do not have permission to start a conference call in this room": "Немате дозволу да започињете конференцијски позив у овој соби",
+    "Show empty room list headings": "Прикажи листу наслова празних соба",
+    "This event could not be displayed": "Овај догађај не може бити приказан",
+    "Demote yourself?": "Снизите чин себи?",
+    "Demote": "Снизите чин",
+    "deleted": "обрисано",
+    "underlined": "подвучено",
+    "You have no historical rooms": "Ваша историја соба је празна"
 }
diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index 0e26125c30..4a3c81774a 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -52,13 +52,13 @@
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s tog bort rummets namn.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s bytte rummets ämne till \"%(topic)s\".",
     "Changes to who can read history will only apply to future messages in this room": "Ändringar till vem som kan läsa meddelandehistorik tillämpas endast till framtida meddelanden i det här rummet",
-    "Changes your display nickname": "Byter ditt synliga namn",
+    "Changes your display nickname": "Ändrar ditt visningsnamn",
     "Changing password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Om du byter lösenord kommer för tillfället alla krypteringsnycklar på alla enheter att nollställas, vilket gör all krypterad meddelandehistorik omöjligt att läsa, om du inte först exporterar rumsnycklarna och sedan importerar dem efteråt. I framtiden kommer det här att förbättras.",
     "Claimed Ed25519 fingerprint key": "Påstådd Ed25519-fingeravtrycksnyckel",
     "Clear Cache and Reload": "Töm cache och ladda om",
     "Clear Cache": "Töm cache",
     "Click here to fix": "Klicka här för att fixa",
-    "Click to mute audio": "Klicka för att dämpa ljud",
+    "Click to mute audio": "Klicka för att tysta ljud",
     "Click to mute video": "Klicka för att stänga av video",
     "click to reveal": "klicka för att avslöja",
     "Click to unmute video": "Klicka för att sätta på video",
@@ -96,7 +96,7 @@
     "Devices will not yet be able to decrypt history from before they joined the room": "Enheter kan inte ännu dekryptera meddelandehistorik från före de gick med i rummet",
     "Direct chats": "Direkt-chattar",
     "Disinvite": "Häv inbjudan",
-    "Display name": "Namn",
+    "Display name": "Visningsnamn",
     "Displays action": "Visar åtgärd",
     "Don't send typing notifications": "Skicka inte \"skriver\"-status",
     "Download %(text)s": "Ladda ner %(text)s",
@@ -128,14 +128,14 @@
     "Failed to kick": "Det gick inte att kicka",
     "Failed to leave room": "Det gick inte att lämna rummet",
     "Failed to load timeline position": "Det gick inte att hämta positionen på tidslinjen",
-    "Failed to mute user": "Det gick inte att dämpa användaren",
+    "Failed to mute user": "Det gick inte att tysta användaren",
     "Failed to reject invite": "Det gick inte att avböja inbjudan",
     "Failed to reject invitation": "Det gick inte att avböja inbjudan",
     "Failed to save settings": "Det gick inte att spara inställningarna",
     "Failed to send email": "Det gick inte att skicka epost",
     "Failed to send request.": "Det gick inte att sända begäran.",
     "Failed to set avatar.": "Misslyckades med att ange avatar.",
-    "Failed to set display name": "Det gick inte att sätta namnet",
+    "Failed to set display name": "Det gick inte att ange visningsnamn",
     "Failed to set up conference call": "Det gick inte att starta konferenssamtalet",
     "Failed to toggle moderator status": "Det gick inte att växla moderator-status",
     "Failed to unban": "Det gick inte att avbanna",
@@ -239,7 +239,7 @@
     "Mobile phone number": "Telefonnummer",
     "Mobile phone number (optional)": "Telefonnummer (valfri)",
     "Moderator": "Moderator",
-    "Mute": "Dämpa",
+    "Mute": "Tysta",
     "%(serverName)s Matrix ID": "%(serverName)s Matrix-ID",
     "Name": "Namn",
     "Never send encrypted messages to unverified devices from this device": "Skicka aldrig krypterade meddelanden till overifierade enheter från den här enheten",
@@ -462,7 +462,7 @@
     "The Home Server may be too old to support third party networks": "Hemservern kan vara för gammal för stöda tredje parters nätverk",
     "Noisy": "Högljudd",
     "Room not found": "Rummet hittades inte",
-    "Messages containing my display name": "Meddelanden som innehåller mitt namn",
+    "Messages containing my display name": "Meddelanden som innehåller mitt visningsnamn",
     "Messages in one-to-one chats": "Meddelanden i privata chattar",
     "Unavailable": "Otillgänglig",
     "View Decrypted Source": "Visa dekrypterad källa",
@@ -1003,8 +1003,8 @@
     "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)sbytte namn",
     "%(severalUsers)schanged their avatar %(count)s times|other": "%(severalUsers)sändrade sin avatar %(count)s gånger",
     "%(severalUsers)schanged their avatar %(count)s times|one": "%(severalUsers)sändrade sin avatar",
-    "%(oneUser)schanged their avatar %(count)s times|other": "%(oneUser)ssändrade sin avatar %(count)s gånger",
-    "%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)ssändrade sin avatar",
+    "%(oneUser)schanged their avatar %(count)s times|other": "%(oneUser)sändrade sin avatar %(count)s gånger",
+    "%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)sändrade sin avatar",
     "%(items)s and %(count)s others|other": "%(items)s och %(count)s andra",
     "%(items)s and %(count)s others|one": "%(items)s och en annan",
     "collapse": "fäll ihop",
@@ -1034,7 +1034,7 @@
     "Failed to remove room from community": "Det gick inte att ta bort rum från community",
     "Only visible to community members": "Endast synlig för community-medlemmar",
     "Filter community rooms": "Filtrera community-rum",
-    "Community IDs cannot not be empty.": "Community-ID kan inte vara tomt.",
+    "Community IDs cannot be empty.": "Community-ID kan inte vara tomt.",
     "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Community-ID får endast innehålla tecknen a-z, 0-9 och '=_-./'",
     "Something went wrong whilst creating your community": "Något gick fel när din community skapades",
     "Create Community": "Skapa community",
@@ -1180,5 +1180,92 @@
     "This room is not showing flair for any communities": "Detta rum visar inte emblem för några communityn",
     "Flair will appear if enabled in room settings": "Emblem kommer visas om det är aktiverat i rumsinställningarna",
     "Flair will not appear": "Emblem kommer inte att visas",
-    "Display your community flair in rooms configured to show it.": "Visa ditt community-emblem i rum som är konfigurerade för att visa det."
+    "Display your community flair in rooms configured to show it.": "Visa ditt community-emblem i rum som är konfigurerade för att visa det.",
+    "Jitsi Conference Calling": "Jitsi konferenssamtal",
+    "Encrypting": "Krypterar",
+    "Encrypted, not sent": "Krypterat, inte skickat",
+    "Share Link to User": "Dela länk till användare",
+    "Share room": "Dela rum",
+    "Share Room": "Dela rum",
+    "Link to most recent message": "Länk till senaste meddelandet",
+    "Share User": "Dela användare",
+    "Share Community": "Dela community",
+    "Share Room Message": "Dela rumsmeddelande",
+    "Link to selected message": "Länk till valt meddelande",
+    "COPY": "KOPIERA",
+    "Share Message": "Dela meddelande",
+    "No Audio Outputs detected": "Inga ljudutgångar hittades",
+    "Audio Output": "Ljudutgång",
+    "Try the app first": "Testa appen först",
+    "A conference call could not be started because the intgrations server is not available": "Konferenssamtal kunde inte startas för integrationsservern är otillgänglig",
+    "Call in Progress": "Samtal pågår",
+    "A call is currently being placed!": "Ett samtal håller på att upprättas!",
+    "A call is already in progress!": "Ett samtal pågår redan!",
+    "Permission Required": "Behörighet krävs",
+    "You do not have permission to start a conference call in this room": "Du har inte behörighet att starta ett konferenssamtal i detta rum",
+    "This event could not be displayed": "Den här händelsen kunde inte visas",
+    "deleted": "borttagen",
+    "underlined": "understruken",
+    "inline-code": "kod",
+    "block-quote": "citat",
+    "bulleted-list": "punktlista",
+    "numbered-list": "nummerlista",
+    "You have no historical rooms": "Du har inga historiska rum",
+    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "I krypterade rum, som detta, är URL-förhandsvisning inaktiverad som standard för att säkerställa att din hemserver (där förhandsvisningar genereras) inte kan samla information om länkar du ser i rummet.",
+    "The email field must not be blank.": "Email-fältet får inte vara tomt.",
+    "The user name field must not be blank.": "Användarnamns-fältet får inte vara tomt.",
+    "The phone number field must not be blank.": "Telefonnummer-fältet får inte vara tomt.",
+    "The password field must not be blank.": "Lösenords-fältet får inte vara tomt.",
+    "This homeserver has hit its Monthly Active User limit. Please contact your service administrator to continue using the service.": "Hemservern har nått sin månatliga gräns för användaraktivitet. Kontakta din serviceadministratör för att fortsätta använda servicen.",
+    "Failed to remove widget": "Det gick inte att ta bort widget",
+    "An error ocurred whilst trying to remove the widget from the room": "Ett fel uppstod vid borttagning av widget från rummet",
+    "Demote yourself?": "Sänk egen behörighetsnivå?",
+    "Demote": "Degradera",
+    "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "När någon postar en URL i sitt meddelande, kan URL-förhandsvisning ge mer information om länken, såsom titel, beskrivning, och en bild från webbplatsen.",
+    "You can't send any messages until you review and agree to our terms and conditions.": "Du kan inte skicka några meddelanden innan du granskar och godkänner våra villkor.",
+    "Your message wasn’t sent because this homeserver has hit its Monthly Active User Limit. Please contact your service administrator to continue using the service.": "Ditt meddelande skickades inte för hemservern har nått sin månatliga gräns för användaraktivitet. Kontakta din serviceadministratör för att fortsätta använda servicen.",
+    "This homeserver has hit its Monthly Active User limit": "Hemservern har nått sin månatliga gräns för användaraktivitet",
+    "Please contact your service administrator to continue using this service.": "Kontakta din serviceadministratör för att fortsätta använda servicen.",
+    "Show empty room list headings": "Visa tomma rumsrubriker",
+    "System Alerts": "Systemvarningar",
+    "Sorry, your homeserver is too old to participate in this room.": "Tyvärr, din hemserver är för gammal för att delta i detta rum.",
+    "Please contact your homeserver administrator.": "Vänligen kontakta din hemserver-administratör.",
+    "Increase performance by only loading room members on first view": "Öka prestanda genom att bara ladda rumsdeltagare vid första visning",
+    "Internal room ID: ": "Internt rums-ID: ",
+    "Room version number: ": "Rumsversionsnummer: ",
+    "Please contact your service administrator to continue using the service.": "Kontakta din serviceadministratör för att fortsätta använda tjänsten.",
+    "This homeserver has hit its Monthly Active User limit.": "Hemservern har nått sin månatliga gräns för användaraktivitet.",
+    "This homeserver has exceeded one of its resource limits.": "Hemservern har överskridit en av sina resursgränser.",
+    "Please contact your service administrator to get this limit increased.": "Kontakta din serviceadministratör för att få denna gräns ökad.",
+    "This homeserver has hit its Monthly Active User limit so some users will not be able to log in.": "Hemservern har nått sin månatliga gräns för användaraktivitet så vissa användare kommer inte kunna logga in.",
+    "This homeserver has exceeded one of its resource limits so some users will not be able to log in.": "Hemservern har överskridit en av sina resursgränser så vissa användare kommer inte kunna logga in.",
+    "Your message wasn't sent because this homeserver has hit its Monthly Active User Limit. Please contact your service administrator to continue using the service.": "Ditt meddelande skickades inte för hemservern har nått sin månatliga gräns för användaraktivitet. Kontakta din serviceadministratör för att fortsätta använda servicen.",
+    "Your message wasn't sent because this homeserver has exceeded a resource limit. Please contact your service administrator to continue using the service.": "Ditt meddelande skickades inte för hemservern har överskridit en av sina resursgränser. Kontakta din serviceadministratör för att fortsätta använda servicen.",
+    "Lazy loading members not supported": "Behovsladdning av medlemmar stöds inte",
+    "Lazy loading is not supported by your current homeserver.": "Behovsladdning stöds inte av din nuvarande hemserver.",
+    "Legal": "Juridiskt",
+    "Please contact your service administrator to continue using this service.": "Kontakta din serviceadministratör för att fortsätta använda servicen.",
+    "This room has been replaced and is no longer active.": "Detta rum har ersatts och är inte längre aktivt.",
+    "The conversation continues here.": "Konversationen fortsätter här.",
+    "Upgrade room to version %(ver)s": "Uppgradera rummet till version %(ver)s",
+    "There is a known vulnerability affecting this room.": "Det finns en känd sårbarhet som påverkar detta rum.",
+    "This room version is vulnerable to malicious modification of room state.": "Denna rumsversion är sårbar för skadlig modifiering av rumstillstånd.",
+    "Click here to upgrade to the latest room version and ensure room integrity is protected.": "Klicka här för att uppgradera till senaste rumsversionen och se till att rumsintegriteten är skyddad.",
+    "Only room administrators will see this warning": "Endast rumsadministratörer kommer att se denna varning",
+    "This room is a continuation of another conversation.": "Detta rum är en fortsättning på en annan konversation.",
+    "Click here to see older messages.": "Klicka här för att se äldre meddelanden.",
+    "Failed to upgrade room": "Det gick inte att uppgradera rum",
+    "The room upgrade could not be completed": "Rumsuppgraderingen kunde inte slutföras",
+    "Upgrade this room to version %(version)s": "Uppgradera detta rum till version %(version)s",
+    "Upgrade Room Version": "Uppgradera rumsversion",
+    "Upgrading this room requires closing down the current instance of the room and creating a new room it its place. To give room members the best possible experience, we will:": "Uppgradering av detta rum kräver att nuvarande rumsinstans stängs och ersätts av ett nytt rum. För att ge rumsmedlemmarna bästa möjliga upplevelse, kommer vi att:",
+    "Create a new room with the same name, description and avatar": "Skapa ett nytt rum med samma namn, beskrivning och avatar",
+    "Update any local room aliases to point to the new room": "Uppdatera lokala rumsalias att peka på det nya rummet",
+    "Stop users from speaking in the old version of the room, and post a message advising users to move to the new room": "Hindra användare från att prata i den gamla rumsversionen och posta ett meddelande som rekommenderar användare att flytta till det nya rummet",
+    "Put a link back to the old room at the start of the new room so people can see old messages": "Sätta en länk tillbaka till det gamla rummet i början av det nya rummet så att folk kan se gamla meddelanden",
+    "Registration Required": "Registrering krävs",
+    "You need to register to do this. Would you like to register now?": "Du måste registrera dig för att göra detta. Vill du registrera dig nu?",
+    "Forces the current outbound group session in an encrypted room to be discarded": "Tvingar den aktuella utgående gruppsessionen i ett krypterat rum att överges",
+    "Unable to connect to Homeserver. Retrying...": "Det gick inte att ansluta till hemserver. Försöker igen ...",
+    "Unable to query for supported registration methods": "Det gick inte att hämta stödda registreringsmetoder"
 }
diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index 04f78dc1ee..851d556757 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -574,11 +574,11 @@
     "Add User": "Kullanıcı Ekle",
     "This Home Server would like to make sure you are not a robot": "Bu Ana Sunucu robot olmadığınızdan emin olmak istiyor",
     "Sign in with CAS": "CAS ile oturum açın",
-    "Custom Server Options": "Özel Sunucu Seçenekleri",
+    "Custom Server Options": "Özelleştirilebilir Sunucu Seçenekleri",
     "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.": "Özel Sunucu Seçeneklerini diğer Matrix sunucularına giriş yapmak için farklı bir Ana Sunucu URL'si belirleyerek kullanabilirsiniz.",
     "This allows you to use this app with an existing Matrix account on a different home server.": "Bu,  sizin bu uygulamayı varolan Matrix hesabınızla farklı Ana Sunucularda kullanmanıza izin verir.",
     "You can also set a custom identity server but this will typically prevent interaction with users based on email address.": "Ayrıca özel bir kimlik sunucusu da ayarlayabilirsiniz ancak bu e-posta adresine dayalı olarak kullanıcılarla olan etkileşimi engeller.",
-    "Dismiss": "Uzaklaştır",
+    "Dismiss": "Kapat",
     "Please check your email to continue registration.": "Kayıt işlemine devam etmek için lütfen e-postanızı kontrol edin.",
     "Token incorrect": "Belirteç(Token) hatalı",
     "Please enter the code it contains:": "Lütfen içerdiği kodu girin:",
@@ -751,5 +751,10 @@
     "View Source": "Kaynağı Görüntüle",
     "Collapse panel": "Katlanır panel",
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Geçerli tarayıcınız ile birlikte , uygulamanın görünüş ve kullanım hissi tamamen hatalı olabilir ve bazı ya da tüm özellikler çalışmayabilir. Yine de denemek isterseniz devam edebilirsiniz ancak karşılaşabileceğiniz sorunlar karşısında kendi başınasınız !",
-    "There are advanced notifications which are not shown here": "Burada gösterilmeyen gelişmiş bildirimler var"
+    "There are advanced notifications which are not shown here": "Burada gösterilmeyen gelişmiş bildirimler var",
+    "The platform you're on": "Bulunduğun platform",
+    "The version of Riot.im": "Riot.im'in sürümü",
+    "Whether or not you're logged in (we don't record your user name)": "Ne olursa olsun giriş yaptın (kullanıcı adınızı kaydetmeyiz)",
+    "Your language of choice": "Seçtiginiz diliniz",
+    "Which officially provided instance you are using, if any": ""
 }
diff --git a/src/i18n/strings/uk.json b/src/i18n/strings/uk.json
index 5e7cc75f8a..b36642691c 100644
--- a/src/i18n/strings/uk.json
+++ b/src/i18n/strings/uk.json
@@ -279,5 +279,55 @@
     "Your User Agent": "Ваш користувацький агент",
     "Your device resolution": "Роздільність вашого пристрою",
     "Analytics": "Аналітика",
-    "The information being sent to us to help make Riot.im better includes:": "Надсилана інформація, що допомагає нам покращити Riot.im, вміщує:"
+    "The information being sent to us to help make Riot.im better includes:": "Надсилана інформація, що допомагає нам покращити Riot.im, вміщує:",
+    "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Введіть пароль для захисту експортованого файлу. Щоб розшифрувати файл потрібно буде ввести цей пароль.",
+    "Call Failed": "Виклик не вдався",
+    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "У цій кімнаті є невідомі пристрої: якщо ви продовжите без їхньої перевірки, зважайте на те, що вас можна буде прослуховувати.",
+    "Review Devices": "Перевірити пристрої",
+    "Call Anyway": "Подзвонити все одно",
+    "Answer Anyway": "Відповісти все одно",
+    "Call": "Подзвонити",
+    "Answer": "Відповісти",
+    "The remote side failed to pick up": "На ваш дзвінок не змогли відповісти",
+    "Unable to capture screen": "Не вдалось захопити екран",
+    "Existing Call": "Наявний виклик",
+    "You are already in a call.": "Ви вже розмовляєте.",
+    "VoIP is unsupported": "VoIP не підтримується",
+    "You cannot place VoIP calls in this browser.": "Цей оглядач не підтримує VoIP дзвінки.",
+    "You cannot place a call with yourself.": "Ви не можете подзвонити самим собі.",
+    "Conference calls are not supported in encrypted rooms": "Режим конференції не підтримується у зашифрованих кімнатах",
+    "Conference calls are not supported in this client": "Режим конференції не підтримується у цьому клієнті",
+    "Warning!": "Увага!",
+    "Conference calling is in development and may not be reliable.": "Режим конференції ще знаходиться в стані розробки та може бути ненадійним.",
+    "Failed to set up conference call": "Не вдалось встановити конференцію",
+    "Conference call failed.": "Конференц-виклик зазнав невдачі.",
+    "The file '%(fileName)s' failed to upload": "Не вдалось відвантажити файл '%(fileName)s'",
+    "The file '%(fileName)s' exceeds this home server's size limit for uploads": "Файл '%(fileName)s' перевищує максимальні розміри, дозволені на цьому сервері",
+    "Upload Failed": "Помилка відвантаження",
+    "Sun": "Нд",
+    "Mon": "Пн",
+    "Tue": "Вт",
+    "Wed": "Ср",
+    "Thu": "Чт",
+    "Fri": "Пт",
+    "Sat": "Сб",
+    "Jan": "Січ",
+    "Feb": "Лют",
+    "Mar": "Бер",
+    "Apr": "Квіт",
+    "May": "Трав",
+    "Jun": "Чер",
+    "Jul": "Лип",
+    "Aug": "Сер",
+    "Sep": "Вер",
+    "Oct": "Жов",
+    "Nov": "Лис",
+    "Dec": "Гру",
+    "PM": "PM",
+    "AM": "AM",
+    "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s, %(monthName)s, %(day)s, %(time)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(monthName)s, %(day)s, %(fullYear)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s",
+    "Who would you like to add to this community?": "Кого ви хочете додати до цієї спільноти?"
 }
diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json
index 56d5c1e4dc..6931e8883a 100644
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@@ -35,7 +35,7 @@
     "Event information": "事件信息",
     "Existing Call": "当前通话",
     "Export E2E room keys": "导出聊天室的端到端加密密钥",
-    "Failed to ban user": "封禁用户失败",
+    "Failed to ban user": "封禁失败",
     "Failed to change password. Is your password correct?": "修改密码失败。确认原密码输入正确吗？",
     "Failed to forget room %(errCode)s": "忘记聊天室失败，错误代码： %(errCode)s",
     "Failed to join room": "无法加入聊天室",
@@ -65,7 +65,7 @@
     "For security, this session has been signed out. Please sign in again.": "出于安全考虑，此会话已被注销。请重新登录。.",
     "For security, logging out will delete any end-to-end encryption keys from this browser. If you want to be able to decrypt your conversation history from future Riot sessions, please export your room keys for safe-keeping.": "出于安全考虑，用户注销时会清除浏览器里的端到端加密密钥。如果你想要下次登录 Riot 时能解密过去的聊天记录，请导出你的聊天室密钥。",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s 从 %(fromPowerLevel)s 变为 %(toPowerLevel)s",
-    "Guests cannot join this room even if explicitly invited.": "游客不能加入此聊天室，即使有人主动邀请。.",
+    "Guests cannot join this room even if explicitly invited.": "即使有人主动邀请，游客也不能加入此聊天室。",
     "Hangup": "挂断",
     "Hide read receipts": "隐藏已读回执",
     "Hide Text Formatting Toolbar": "隐藏格式工具栏",
@@ -76,7 +76,7 @@
     "Import E2E room keys": "导入聊天室端到端加密密钥",
     "Incorrect verification code": "验证码错误",
     "Interface Language": "界面语言",
-    "Invalid alias format": "别名格式错误",
+    "Invalid alias format": "别名格式无效",
     "Invalid address format": "地址格式错误",
     "Invalid Email Address": "邮箱地址格式错误",
     "Invalid file%(extra)s": "非法文件%(extra)s",
@@ -84,7 +84,7 @@
     "Return to login screen": "返回登录页面",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riot 没有通知发送权限 - 请检查您的浏览器设置",
     "Riot was not given permission to send notifications - please try again": "Riot 没有通知发送权限 - 请重试",
-    "riot-web version:": "riot-网页版：",
+    "riot-web version:": "riot-web 版本：",
     "Room %(roomId)s not visible": "聊天室 %(roomId)s 已隐藏",
     "Room Colour": "聊天室颜色",
     "Room name (optional)": "聊天室名称 (可选)",
@@ -103,7 +103,7 @@
     "Server may be unavailable or overloaded": "服务器可能不可用或者超载",
     "Server may be unavailable, overloaded, or search timed out :(": "服务器可能不可用、超载，或者搜索超时 :(",
     "Server may be unavailable, overloaded, or the file too big": "服务器可能不可用、超载，或者文件过大",
-    "Server may be unavailable, overloaded, or you hit a bug.": "服务器可能不可用、超载，或者你遇到了一个 bug。",
+    "Server may be unavailable, overloaded, or you hit a bug.": "当前服务器可能处于不可用或过载状态，或者您遇到了一个 bug。",
     "Server unavailable, overloaded, or something else went wrong.": "服务器可能不可用、超载，或者其他东西出错了.",
     "Session ID": "会话 ID",
     "%(senderName)s set a profile picture.": "%(senderName)s 设置了头像。.",
@@ -120,7 +120,7 @@
     "Start Chat": "开始聊天",
     "Submit": "提交",
     "Success": "成功",
-    "The default role for new room members is": "此聊天室新成员的默认角色是",
+    "The default role for new room members is": "新成员默认是",
     "The main address for this room is": "此聊天室的主要地址是",
     "This email address is already in use": "此邮箱地址已被使用",
     "This email address was not found": "未找到此邮箱地址",
@@ -133,15 +133,15 @@
     "Algorithm": "算法",
     "Always show message timestamps": "总是显示消息时间戳",
     "%(names)s and %(lastPerson)s are typing": "%(names)s 和 %(lastPerson)s 正在输入",
-    "A new password must be entered.": "一个新的密码必须被输入。.",
+    "A new password must be entered.": "必须输入新密码。",
     "%(senderName)s answered the call.": "%(senderName)s 接了通话。.",
-    "An error has occurred.": "一个错误出现了。",
+    "An error has occurred.": "发生了一个错误。",
     "Attachment": "附件",
-    "Autoplay GIFs and videos": "自动播放GIF和视频",
+    "Autoplay GIFs and videos": "自动播放 GIF 与视频",
     "%(senderName)s banned %(targetName)s.": "%(senderName)s 封禁了 %(targetName)s.",
     "Ban": "封禁",
     "Banned users": "被封禁的用户",
-    "Click here to fix": "点击这里修复",
+    "Click here to fix": "点击这里以修复",
     "Confirm password": "确认密码",
     "Confirm your new password": "确认你的新密码",
     "Continue": "继续",
@@ -153,7 +153,7 @@
     "%(senderName)s kicked %(targetName)s.": "%(senderName)s 把 %(targetName)s 踢出了聊天室。.",
     "Leave room": "退出聊天室",
     "New password": "新密码",
-    "Add a topic": "添加一个主题",
+    "Add a topic": "添加主题",
     "Admin": "管理员",
     "Admin Tools": "管理工具",
     "VoIP": "IP 电话",
@@ -167,7 +167,7 @@
     "Camera": "摄像头",
     "Hide removed messages": "隐藏被删除的消息",
     "Authentication": "认证",
-    "Alias (optional)": "别名 (可选)",
+    "Alias (optional)": "别名（可选）",
     "%(items)s and %(lastItem)s": "%(items)s 和 %(lastItem)s",
     "and %(count)s others...|other": "和其它 %(count)s 个...",
     "and %(count)s others...|one": "和其它一个...",
@@ -179,8 +179,8 @@
     "Are you sure you want to reject the invitation?": "你确定要拒绝邀请吗？",
     "Are you sure you want to upload the following files?": "你确定要上传这些文件吗？",
     "Bans user with given id": "按照 ID 封禁指定的用户",
-    "Blacklisted": "已列入黑名单",
-    "Bulk Options": "批量操作",
+    "Blacklisted": "已拉黑",
+    "Bulk Options": "批量选项",
     "Call Timeout": "通话超时",
     "Can't connect to homeserver - please check your connectivity, ensure your homeserver's SSL certificate is trusted, and that a browser extension is not blocking requests.": "无法连接主服务器 - 请检查网络连接，确保你的主服务器 SSL 证书被信任，且没有浏览器插件拦截请求。",
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or enable unsafe scripts.": "当浏览器地址栏里有 HTTPS 的 URL 时，不能使用 HTTP 连接主服务器。请使用 HTTPS 或者允许不安全的脚本。",
@@ -192,7 +192,7 @@
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s 将话题修改为 “%(topic)s”。",
     "Changes to who can read history will only apply to future messages in this room": "修改阅读历史的权限仅对此聊天室以后的消息有效",
     "Changes your display nickname": "修改昵称",
-    "Changing password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "目前，修改密码会导致所有设备上的端到端密钥被重置，使得加密的聊天记录不再可读。除非你事先导出聊天室密钥，修改密码后再导入。这个问题未来会改善。",
+    "Changing password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "目前，修改密码会导致所有设备上的端到端密钥被重置，使得加密的聊天记录不再可读。除非事先导出你的密钥，并在密码修改后导入回去。此问题将会在未来得到改善。",
     "Clear Cache and Reload": "清除缓存并刷新",
     "Clear Cache": "清除缓存",
     "Click here to join the discussion!": "点此 加入讨论！",
@@ -214,7 +214,7 @@
     "Custom": "自定义",
     "Custom level": "自定义级别",
     "Decline": "拒绝",
-    "Device already verified!": "设备已经验证！",
+    "Device already verified!": "设备已验证！",
     "Device ID:": "设备 ID:",
     "device id: ": "设备 ID: ",
     "Device key:": "设备密钥 :",
@@ -222,8 +222,8 @@
     "Drop File Here": "把文件拖拽到这里",
     "Email address (optional)": "邮箱地址 (可选)",
     "Enable Notifications": "启用消息通知",
-    "Encrypted by a verified device": "由一个已验证的设备加密",
-    "Encrypted by an unverified device": "由一个未经验证的设备加密",
+    "Encrypted by a verified device": "由已验证设备加密",
+    "Encrypted by an unverified device": "由未验证设备加密",
     "Encryption is enabled in this room": "此聊天室启用了加密",
     "Encryption is not enabled in this room": "此聊天室未启用加密",
     "Enter passphrase": "输入密码",
@@ -231,7 +231,7 @@
     "Export": "导出",
     "Failed to fetch avatar URL": "获取 Avatar URL 失败",
     "Failed to upload profile picture!": "头像上传失败！",
-    "Guest access is disabled on this Home Server.": "此服务器禁用了游客访问。",
+    "Guest access is disabled on this Home Server.": "此服务器已禁止游客访问。",
     "Home": "主页面",
     "Import": "导入",
     "Incoming call from %(name)s": "来自 %(name)s 的通话",
@@ -242,8 +242,8 @@
     "Invited": "已邀请",
     "Invites": "邀请",
     "Invites user with given id to current room": "按照 ID 邀请指定用户加入当前聊天室",
-    "'%(alias)s' is not a valid format for an address": "'%(alias)s' 不是一个合法的邮箱地址格式",
-    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' 不是一个合法的昵称格式",
+    "'%(alias)s' is not a valid format for an address": "'%(alias)s' 不符合电子邮箱地址的格式",
+    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' 不符合别名的格式",
     "%(displayName)s is typing": "%(displayName)s 正在输入",
     "Sign in with": "第三方登录",
     "Message not sent due to unknown devices being present": "消息未发送，因为有未知的设备存在",
@@ -254,7 +254,7 @@
     "Moderator": "协管员",
     "Mute": "静音",
     "Name": "姓名",
-    "Never send encrypted messages to unverified devices from this device": "在此设备上不向未经验证的设备发送消息",
+    "Never send encrypted messages to unverified devices from this device": "在此设备上，从不对未经验证的设备发送消息",
     "New passwords don't match": "两次输入的新密码不符",
     "none": "无",
     "not set": "未设置",
@@ -286,10 +286,10 @@
     "Add": "添加",
     "Allow": "允许",
     "Claimed Ed25519 fingerprint key": "声称的 Ed25519 指纹密钥",
-    "Could not connect to the integration server": "无法连接集成服务器",
+    "Could not connect to the integration server": "无法连接关联的服务器",
     "Curve25519 identity key": "Curve25519 认证密钥",
     "Edit": "编辑",
-    "Joins room with given alias": "以指定的别名加入聊天室",
+    "Joins room with given alias": "通过指定的别名加入聊天室",
     "Labs": "实验室",
     "%(targetName)s left the room.": "%(targetName)s 退出了聊天室。",
     "Logged in as:": "登录为：",
@@ -315,14 +315,14 @@
     "Verified": "已验证",
     "Verified key": "已验证的密钥",
     "Video call": "视频通话",
-    "Voice call": "音频通话",
+    "Voice call": "语音通话",
     "VoIP conference finished.": "VoIP 会议结束。",
     "VoIP conference started.": "VoIP 会议开始。",
     "VoIP is unsupported": "不支持 VoIP",
     "Warning!": "警告！",
-    "You must register to use this functionality": "你必须注册以使用这个功能",
+    "You must register to use this functionality": "你必须 注册 以使用此功能",
     "You need to be logged in.": "你需要登录。",
-    "You need to enter a user name.": "你需要输入一个用户名。",
+    "You need to enter a user name.": "必须输入用户名。",
     "Your password has been reset": "你的密码已被重置",
     "Topic": "主题",
     "Make Moderator": "使成为主持人",
@@ -381,45 +381,45 @@
     "Example": "例子",
     "Create": "创建",
     "Failed to upload image": "上传图像失败",
-    "Add a widget": "添加一个小部件",
+    "Add a widget": "添加小挂件",
     "Accept": "接受",
     "Access Token:": "访问令牌：",
-    "Cannot add any more widgets": "无法添加更多小组件",
-    "Delete widget": "删除小组件",
-    "Define the power level of a user": "定义一个用户的特权级",
+    "Cannot add any more widgets": "无法添加更多小挂件",
+    "Delete widget": "删除小挂件",
+    "Define the power level of a user": "定义一位用户的滥权等级",
     "Drop here to tag %(section)s": "拖拽到这里标记 %(section)s",
-    "Enable automatic language detection for syntax highlighting": "启用自动语言检测用于语法高亮",
-    "Failed to change power level": "修改特权级别失败",
+    "Enable automatic language detection for syntax highlighting": "为语法高亮启用自动检测编程语言",
+    "Failed to change power level": "滥权等级修改失败",
     "Kick": "移除",
     "Kicks user with given id": "按照 ID 移除特定的用户",
     "Last seen": "最近一次上线",
     "Level:": "级别：",
-    "Local addresses for this room:": "这个聊天室的本地地址：",
+    "Local addresses for this room:": "此聊天室的本地地址：",
     "New passwords must match each other.": "新密码必须互相匹配。",
-    "Power level must be positive integer.": "权限级别必须是正整数。",
+    "Power level must be positive integer.": "滥权等级必须是正整数。",
     "Reason: %(reasonText)s": "理由： %(reasonText)s",
     "Revoke Moderator": "撤销主持人",
-    "Revoke widget access": "撤销小部件的访问",
-    "Remote addresses for this room:": "这个聊天室的远程地址：",
+    "Revoke widget access": "撤回小挂件的访问权",
+    "Remote addresses for this room:": "此聊天室的远程地址：",
     "Remove Contact Information?": "移除联系人信息？",
     "Remove %(threePid)s?": "移除 %(threePid)s?",
     "Results from DuckDuckGo": "来自 DuckDuckGo 的结果",
     "Room contains unknown devices": "聊天室包含未知设备",
     "%(roomName)s does not exist.": "%(roomName)s 不存在。",
     "Save": "保存",
-    "Send anyway": "无论任何都发送",
+    "Send anyway": "仍然发送",
     "Sets the room topic": "设置聊天室主题",
-    "Show Text Formatting Toolbar": "显示文字格式工具栏",
-    "This room has no local addresses": "这个聊天室没有本地地址",
-    "This doesn't appear to be a valid email address": "这看起来不是一个合法的邮箱地址",
-    "This is a preview of this room. Room interactions have been disabled": "这是这个聊天室的一个预览。聊天室交互已禁用",
+    "Show Text Formatting Toolbar": "显示文本格式工具栏",
+    "This room has no local addresses": "此聊天室没有本地地址",
+    "This doesn't appear to be a valid email address": "这似乎不是有效的邮箱地址",
+    "This is a preview of this room. Room interactions have been disabled": "这是此聊天室的预览。交互操作已被禁用",
     "This phone number is already in use": "此手机号码已被使用",
-    "This room": "这个聊天室",
-    "This room is not accessible by remote Matrix servers": "这个聊天室无法被远程 Matrix 服务器访问",
-    "This room's internal ID is": "这个聊天室的内部 ID 是",
+    "This room": "此聊天室",
+    "This room is not accessible by remote Matrix servers": "此聊天室无法被远程 Matrix 服务器访问",
+    "This room's internal ID is": "此聊天室的内部 ID 为",
     "Turn Markdown off": "禁用 Markdown",
     "Turn Markdown on": "启用 Markdown",
-    "Unable to create widget.": "无法创建小部件。",
+    "Unable to create widget.": "无法创建小挂件。",
     "Unban": "解除封禁",
     "Unable to capture screen": "无法录制屏幕",
     "Unable to enable Notifications": "无法启用通知",
@@ -427,7 +427,7 @@
     "Undecryptable": "无法解密的",
     "Unencrypted room": "未加密的聊天室",
     "unencrypted": "未加密的",
-    "Unencrypted message": "未加密的消息",
+    "Unencrypted message": "未加密消息",
     "unknown caller": "未知呼叫者",
     "unknown device": "未知设备",
     "Unnamed Room": "未命名的聊天室",
@@ -438,21 +438,21 @@
     "Upload file": "上传文件",
     "Usage": "用法",
     "Who can read history?": "谁可以阅读历史消息？",
-    "You are not in this room.": "你不在这个聊天室。",
-    "You have no visible notifications": "你没有可见的通知",
+    "You are not in this room.": "您不在此聊天室中。",
+    "You have no visible notifications": "没有可见的通知",
     "Missing password.": "缺少密码。",
     "Passwords don't match.": "密码不匹配。",
-    "I already have an account": "我已经有一个帐号",
+    "I already have an account": "我已经有帐号了",
     "Unblacklist": "移出黑名单",
-    "Not a valid Riot keyfile": "不是一个有效的 Riot 密钥文件",
+    "Not a valid Riot keyfile": "不是有效的 Riot 密钥文件",
     "%(targetName)s accepted an invitation.": "%(targetName)s 已接受邀请。",
-    "Do you want to load widget from URL:": "你想从此 URL 加载小组件吗：",
+    "Do you want to load widget from URL:": "你是否要从此 URL 中加载小挂件：",
     "Hide join/leave messages (invites/kicks/bans unaffected)": "隐藏加入/退出消息（邀请/踢出/封禁不受影响）",
     "Integrations Error": "集成错误",
-    "Publish this room to the public in %(domain)s's room directory?": "把这个聊天室发布到 %(domain)s 的聊天室目录吗？",
+    "Publish this room to the public in %(domain)s's room directory?": "是否将此聊天室发布至 %(domain)s 的聊天室目录中？",
     "Manage Integrations": "管理集成",
-    "No users have specific privileges in this room": "没有用户在这个聊天室有特殊权限",
-    "%(senderName)s placed a %(callType)s call.": "%(senderName)s 发起了一个 %(callType)s 通话。",
+    "No users have specific privileges in this room": "此聊天室中没有用户有特殊权限",
+    "%(senderName)s placed a %(callType)s call.": "%(senderName)s 发起了 %(callType)s 通话。",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "请检查你的电子邮箱并点击里面包含的链接。完成时请点击继续。",
     "Press  to start a chat with someone": "按下  来开始和某个人聊天",
     "%(senderName)s removed their profile picture.": "%(senderName)s 移除了他们的头像。",
@@ -462,7 +462,7 @@
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "验证码将发送至 +%(msisdn)s，请输入收到的验证码",
     "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s 接受了 %(displayName)s 的邀请。",
     "Active call (%(roomName)s)": "当前通话 (来自聊天室 %(roomName)s)",
-    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s 将级别调整到%(powerLevelDiffText)s 。",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s 将级别调整至 %(powerLevelDiffText)s 。",
     "Changes colour scheme of current room": "修改了样式",
     "Deops user with given id": "按照 ID 取消特定用户的管理员权限",
     "Join as voice or video.": "通过 语言 或者 视频加入.",
@@ -480,10 +480,10 @@
     "Refer a friend to Riot:": "介绍朋友加入Riot：",
     "%(roomName)s is not accessible at this time.": "%(roomName)s 此时无法访问。",
     "Start authentication": "开始认证",
-    "The maximum permitted number of widgets have already been added to this room.": "小部件的最大允许数量已经添加到这个聊天室了。",
-    "The phone number entered looks invalid": "输入的手机号码看起来无效",
+    "The maximum permitted number of widgets have already been added to this room.": "此聊天室可拥有的小挂件数量已达到上限。",
+    "The phone number entered looks invalid": "此手机号码似乎无效",
     "The remote side failed to pick up": "对方未能接听",
-    "This Home Server does not support login using email address.": "HS不支持使用邮箱地址登陆。",
+    "This Home Server does not support login using email address.": "此主服务器不支持使用邮箱地址登陆。",
     "This invitation was sent to an email address which is not associated with this account:": "此邀请被发送到与此帐户不相关的邮箱地址：",
     "This room is not recognised.": "无法识别此聊天室。",
     "To get started, please pick a username!": "请点击用户名！",
@@ -500,27 +500,27 @@
     "User name": "用户名",
     "(no answer)": "（没有回答）",
     "(warning: cannot be disabled again!)": "（警告：无法再被禁用！）",
-    "WARNING: Device already verified, but keys do NOT MATCH!": "警告：设备已经验证，但密钥不匹配！",
-    "Who can access this room?": "谁可以访问这个聊天室？",
-    "Who would you like to add to this room?": "你想把谁加入这个聊天室？",
+    "WARNING: Device already verified, but keys do NOT MATCH!": "警告：设备已验证，但密钥不匹配！",
+    "Who can access this room?": "谁有权访问此聊天室？",
+    "Who would you like to add to this room?": "你想把谁添加到此聊天室？",
     "Who would you like to communicate with?": "你想和谁交流？",
     "You are already in a call.": "您正在通话。",
-    "You do not have permission to do that in this room.": "你没有权限在这个聊天室里面做那件事。",
+    "You do not have permission to do that in this room.": "您没有进行此操作的权限。",
     "You are trying to access %(roomName)s.": "你正在尝试访问 %(roomName)s.",
-    "You cannot place VoIP calls in this browser.": "你不能在这个浏览器中发起 VoIP 通话。",
-    "You do not have permission to post to this room": "你没有发送到这个聊天室的权限",
-    "You have been invited to join this room by %(inviterName)s": "您已被 %(inviterName)s 邀请加入这个聊天室",
+    "You cannot place VoIP calls in this browser.": "无法在此浏览器中发起 VoIP 通话。",
+    "You do not have permission to post to this room": "您没有在此聊天室发送消息的权限",
+    "You have been invited to join this room by %(inviterName)s": "您已被 %(inviterName)s 邀请加入此聊天室",
     "You seem to be in a call, are you sure you want to quit?": "您似乎正在进行通话，确定要退出吗？",
     "You seem to be uploading files, are you sure you want to quit?": "您似乎正在上传文件，确定要退出吗？",
     "You should not yet trust it to secure data": "你不应该相信它来保护你的数据",
-    "Upload an avatar:": "上传一个头像：",
-    "This doesn't look like a valid email address.": "这看起来不是一个合法的邮箱地址。",
-    "This doesn't look like a valid phone number.": "这看起来不是一个合法的手机号码。",
+    "Upload an avatar:": "上传头像：",
+    "This doesn't look like a valid email address.": "这似乎不是有效的邮箱地址。",
+    "This doesn't look like a valid phone number.": "这似乎不是有效的手机号码。",
     "User names may only contain letters, numbers, dots, hyphens and underscores.": "用户名只可以包含字母、数字、点、连字号和下划线。",
-    "An unknown error occurred.": "一个未知错误出现了。",
-    "An error occurred: %(error_string)s": "一个错误出现了： %(error_string)s",
+    "An unknown error occurred.": "发生了一个未知错误。",
+    "An error occurred: %(error_string)s": "发生了一个错误： %(error_string)s",
     "Encrypt room": "加密聊天室",
-    "There are no visible files in this room": "这个聊天室里面没有可见的文件",
+    "There are no visible files in this room": "此聊天室中没有可见的文件",
     "Active call": "当前通话",
     "Verify...": "验证...",
     "Error decrypting audio": "解密音频时出错",
@@ -531,47 +531,47 @@
     "Check for update": "检查更新",
     "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s 移除了聊天室头像。",
     "Something went wrong!": "出了点问题！",
-    "If you already have a Matrix account you can log in instead.": "如果你已经有一个 Matrix 帐号，你可以登录。",
-    "Do you want to set an email address?": "你要设置一个邮箱地址吗？",
+    "If you already have a Matrix account you can log in instead.": "若您已经拥有 Matrix 帐号，您也可以 登录。",
+    "Do you want to set an email address?": "您想要设置一个邮箱地址吗？",
     "New address (e.g. #foo:%(localDomain)s)": "新的地址（例如 #foo:%(localDomain)s）",
     "Upload new:": "上传新的：",
     "User ID": "用户 ID",
     "Username invalid: %(errMessage)s": "用户名无效： %(errMessage)s",
     "Verification Pending": "验证等待中",
     "(unknown failure: %(reason)s)": "（未知错误：%(reason)s）",
-    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "警告：密钥验证失败！%(userId)s 和 device %(deviceId)s 的签名密钥是 \"%(fprint)s\"，和提供的咪呀 \"%(fingerprint)s\" 不匹配。这可能意味着你的通信正在被窃听！",
+    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "警告：密钥验证失败！%(userId)s 和 device %(deviceId)s 的签名密钥为 \"%(fprint)s\"，与提供的密钥 \"%(fingerprint)s\" 不匹配。这可能意味着你的通信正在被窃听！",
     "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s 收回了 %(targetName)s 的邀请。",
     "Would you like to accept or decline this invitation?": "你想要 接受 还是 拒绝 这个邀请？",
     "You already have existing direct chats with this user:": "你已经有和此用户的直接聊天：",
-    "You're not in any rooms yet! Press  to make a room or  to browse the directory": "你现在还不再任何聊天室！按下  来创建一个聊天室或者  来浏览目录",
-    "You cannot place a call with yourself.": "你不能和你自己发起一个通话。",
+    "You're not in any rooms yet! Press  to make a room or  to browse the directory": "您尚未处于任何聊天室中！按下  创建一个聊天室或  来浏览目录",
+    "You cannot place a call with yourself.": "你怎么寂寞到要和自己打电话，不支持的啦。",
     "You have been kicked from %(roomName)s by %(userName)s.": "您已被 %(userName)s 从聊天室 %(roomName)s 中移除。",
-    "You have been logged out of all devices and will no longer receive push notifications. To re-enable notifications, sign in again on each device": "你已经登出了所有的设备并不再接收推送通知。要重新启用通知，请再在每个设备上登录",
+    "You have been logged out of all devices and will no longer receive push notifications. To re-enable notifications, sign in again on each device": "你已经登出了所有的设备并不再接收推送通知。要重新启用通知，请在每个设备上重新登录",
     "You have disabled URL previews by default.": "你已经默认 禁用 链接预览。",
     "You have enabled URL previews by default.": "你已经默认 启用 链接预览。",
     "Your home server does not support device management.": "你的 home server 不支持设备管理。",
-    "Set a display name:": "设置一个昵称：",
-    "This server does not support authentication with a phone number.": "这个服务器不支持用手机号码认证。",
-    "Password too short (min %(MIN_PASSWORD_LENGTH)s).": "密码过短（最短为 %(MIN_PASSWORD_LENGTH)s）。",
-    "Make this room private": "使这个聊天室私密",
+    "Set a display name:": "设置昵称：",
+    "This server does not support authentication with a phone number.": "此服务器不支持使用手机号码认证。",
+    "Password too short (min %(MIN_PASSWORD_LENGTH)s).": "密码长度过短（至少应为 %(MIN_PASSWORD_LENGTH)s 位）。",
+    "Make this room private": "将此聊天室转为私密聊天室",
     "Share message history with new users": "和新用户共享消息历史",
     "Copied!": "已复制！",
     "Failed to copy": "复制失败",
     "Sent messages will be stored until your connection has returned.": "已发送的消息会被保存直到你的连接回来。",
     "(~%(count)s results)|one": "（~%(count)s 个结果）",
     "(~%(count)s results)|other": "（~%(count)s 个结果）",
-    "Please select the destination room for this message": "请选择这条消息的目标聊天室",
+    "Please select the destination room for this message": "请选择此消息的目标聊天室",
     "Start automatically after system login": "在系统登录后自动启动",
     "Analytics": "统计分析服务",
-    "Reject all %(invitedRooms)s invites": "拒绝所有 %(invitedRooms)s 邀请",
-    "You may wish to login with a different account, or add this email to this account.": "你可能希望用另外一个账户登录，或者添加这个电子邮件到这个账户上。",
-    "Sun": "星期日",
-    "Mon": "星期一",
-    "Tue": "星期二",
-    "Wed": "星期三",
-    "Thu": "星期四",
-    "Fri": "星期五",
-    "Sat": "星期六",
+    "Reject all %(invitedRooms)s invites": "拒绝所有 %(invitedRooms)s 的邀请",
+    "You may wish to login with a different account, or add this email to this account.": "您可能是想要用另一个账户登录，或是将此电子邮件关联至当前账户。",
+    "Sun": "周日",
+    "Mon": "周一",
+    "Tue": "周二",
+    "Wed": "周三",
+    "Thu": "周四",
+    "Fri": "周五",
+    "Sat": "周六",
     "Jan": "一月",
     "Feb": "二月",
     "Mar": "三月",
@@ -584,11 +584,11 @@
     "Oct": "十月",
     "Nov": "十一月",
     "Dec": "十二月",
-    "Desktop specific": "桌面特有的",
+    "Desktop specific": "桌面版特有功能",
     "You must join the room to see its files": "你必须加入聊天室以看到它的文件",
     "Failed to invite the following users to the %(roomName)s room:": "邀请以下用户到 %(roomName)s 聊天室失败：",
     "Confirm Removal": "确认移除",
-    "Verifies a user, device, and pubkey tuple": "验证一个用户、设备和密钥元组",
+    "Verifies a user, device, and pubkey tuple": "验证用户、设备与公钥元组",
     "Unknown devices": "未知设备",
     "Unknown Address": "未知地址",
     "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s 删除了他们的昵称 (%(oldDisplayName)s).",
@@ -597,16 +597,16 @@
     "The visibility of existing history will be unchanged": "现有历史记录的可见性不会改变",
     "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s 打开了端到端加密 (算法 %(algorithm)s).",
     "Unable to remove contact information": "无法移除联系人信息",
-    "Riot collects anonymous analytics to allow us to improve the application.": "Riot 收集匿名的分析数据来允许我们改善这个应用。",
+    "Riot collects anonymous analytics to allow us to improve the application.": "Riot 收集匿名的分析数据以允许我们改善它。",
     "\"%(RoomName)s\" contains devices that you haven't seen before.": "\"%(RoomName)s\" 包含你以前没见过的设备。",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.": "你可以使用自定义的服务器选项来通过指定一个不同的主服务器 URL 来登录其他 Matrix 服务器。",
-    "This allows you to use this app with an existing Matrix account on a different home server.": "这允许你用一个已有在不同主服务器的 Matrix 账户使用这个应用。",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.": "你可以使用自定义服务器选项并指定一个不同的主服务器 URL 来登录其他的 Matrix 服务器。",
+    "This allows you to use this app with an existing Matrix account on a different home server.": "这允许你使用其他主服务器上的 Matrix 帐号。",
     "Please check your email to continue registration.": "请查看你的电子邮件以继续注册。",
-    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "如果你不指定一个邮箱地址，你将不能重置你的密码。你确定吗？",
+    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "如果不指定一个邮箱地址，您将无法重置你的密码。你确定吗？",
     "Home server URL": "主服务器 URL",
     "Identity server URL": "身份认证服务器 URL",
     "What does this mean?": "这是什么意思？",
-    "Add an Integration": "添加一个集成",
+    "Add an Integration": "添加集成",
     "Removed or unknown message type": "被移除或未知的消息类型",
     "Ongoing conference call%(supportedText)s.": "正在进行的会议通话 %(supportedText)s.",
     "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s 修改了 %(roomName)s 的头像",
@@ -615,13 +615,13 @@
     "Authentication check failed: incorrect password?": "身份验证失败：密码错误？",
     "This will allow you to reset your password and receive notifications.": "这将允许你重置你的密码和接收通知。",
     "Share without verifying": "不验证就分享",
-    "You added a new device '%(displayName)s', which is requesting encryption keys.": "你添加了一个新的设备 '%(displayName)s'，它正在请求加密密钥。",
+    "You added a new device '%(displayName)s', which is requesting encryption keys.": "您添加了一个新的设备 '%(displayName)s'，它正在请求加密密钥。",
     "Your unverified device '%(displayName)s' is requesting encryption keys.": "你的未经验证的设备 '%(displayName)s' 正在请求加密密钥。",
     "Encryption key request": "加密密钥请求",
     "Autocomplete Delay (ms):": "自动补全延迟（毫秒）：",
-    "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s 小组建被 %(senderName)s 添加",
-    "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s 小组建被 %(senderName)s 移除",
-    "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s 小组建被 %(senderName)s 修改",
+    "%(widgetName)s widget added by %(senderName)s": "%(senderName)s 添加了 %(widgetName)s 小挂件",
+    "%(widgetName)s widget removed by %(senderName)s": "%(senderName)s 移除了 %(widgetName)s 小挂件",
+    "%(widgetName)s widget modified by %(senderName)s": "%(senderName)s 修改了 %(widgetName)s 小挂件",
     "Unpin Message": "取消置顶消息",
     "Add rooms to this community": "添加聊天室到此社区",
     "Call Failed": "呼叫失败",
@@ -634,15 +634,15 @@
     "Invite new community members": "邀请新社区成员",
     "Invite to Community": "邀请到社区",
     "Room name or alias": "聊天室名称或别名",
-    "Ignored user": "忽视用户",
+    "Ignored user": "已忽略的用户",
     "You are now ignoring %(userId)s": "你正在忽视 %(userId)s",
-    "Unignored user": "接触忽视用户",
+    "Unignored user": "未忽略的用户",
     "You are no longer ignoring %(userId)s": "你不再忽视 %(userId)s",
     "%(senderName)s unbanned %(targetName)s.": "%(senderName)s 解除了 %(targetName)s 的封禁。",
     "(could not connect media)": "（无法连接媒体）",
     "%(senderName)s changed the pinned messages for the room.": "%(senderName)s 更改了聊天室的置顶消息。",
     "%(names)s and %(count)s others are typing|other": "%(names)s 和另外 %(count)s 个人正在输入",
-    "%(names)s and %(count)s others are typing|one": "%(names)s 和另一个人正在输入",
+    "%(names)s and %(count)s others are typing|one": "%(names)s 与另一个人正在输入",
     "Send": "发送",
     "Message Pinning": "消息置顶",
     "Disable Emoji suggestions while typing": "输入时禁用 Emoji 建议",
@@ -650,17 +650,17 @@
     "Hide avatar changes": "隐藏头像修改",
     "Hide display name changes": "隐藏昵称修改",
     "Disable big emoji in chat": "禁用聊天中的大Emoji",
-    "Never send encrypted messages to unverified devices in this room from this device": "在此设备上，在此聊天室中不向未经验证的设备发送加密的消息",
-    "Enable URL previews for this room (only affects you)": "在此聊天室启用链接预览（只影响你）",
-    "Enable URL previews by default for participants in this room": "对这个聊天室的参与者默认启用 链接预览",
+    "Never send encrypted messages to unverified devices in this room from this device": "在此设备上、此聊天室中，从不对未经验证的设备发送加密的消息",
+    "Enable URL previews for this room (only affects you)": "在此聊天室中启用链接预览（仅影响你）",
+    "Enable URL previews by default for participants in this room": "对此聊天室的所有成员默认启用链接预览",
     "Delete %(count)s devices|other": "删除了 %(count)s 个设备",
     "Delete %(count)s devices|one": "删除设备",
     "Select devices": "选择设备",
     "%(senderName)s sent an image": "%(senderName)s 发送了一张图片",
     "%(senderName)s sent a video": "%(senderName)s 发送了一个视频",
     "%(senderName)s uploaded a file": "%(senderName)s 上传了一个文件",
-    "Unignore": "取消忽视",
-    "Ignore": "忽视",
+    "Unignore": "取消忽略",
+    "Ignore": "忽略",
     "Jump to read receipt": "跳到阅读回执",
     "Mention": "提及",
     "Invite": "邀请",
@@ -680,7 +680,7 @@
     "A text message has been sent to %(msisdn)s": "一封短信已发送到 %(msisdn)s",
     "Username on %(hs)s": "在 %(hs)s 上的用户名",
     "Visible to everyone": "对所有人可见",
-    "Delete Widget": "删除小组件",
+    "Delete Widget": "删除小挂件",
     "were invited %(count)s times|other": "被邀请 %(count)s 次",
     "were invited %(count)s times|one": "被邀请",
     "was invited %(count)s times|other": "被邀请 %(count)s 次",
@@ -706,11 +706,11 @@
     "%(oneUser)schanged their avatar %(count)s times|other": "%(oneUser)s 更换了他们的头像 %(count)s 次",
     "%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)s 更换了他们的头像",
     "%(items)s and %(count)s others|other": "%(items)s 和其他 %(count)s 人",
-    "%(items)s and %(count)s others|one": "%(items)s 和另一个人",
+    "%(items)s and %(count)s others|one": "%(items)s 与另一个",
     "collapse": "折叠",
     "expand": "展开",
     "email address": "邮箱地址",
-    "You have entered an invalid address.": "你输入了一个无效地址。",
+    "You have entered an invalid address.": "您输入了无效的地址。",
     "Advanced options": "高级选项",
     "Leave": "退出",
     "Description": "描述",
@@ -718,7 +718,7 @@
     "Light theme": "浅色主题",
     "Dark theme": "深色主题",
     "Status.im theme": "Status.im 主题",
-    "Ignored Users": "忽视用户",
+    "Ignored Users": "已忽略的用户",
     "Room Notification": "聊天室通知",
     "The platform you're on": "您使用的平台是",
     "The version of Riot.im": "Riot.im 的版本是",
@@ -729,25 +729,25 @@
     "Your homeserver's URL": "您的主服务器的链接",
     "Your identity server's URL": "您的身份认证服务器的链接",
     "The information being sent to us to help make Riot.im better includes:": "将要为帮助 Riot.im 发展而发送的信息包含：",
-    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "这个页面中含有可能能用于识别您身份的信息，比如聊天室、用户或群组 ID，在它们发送到服务器上之前，这些数据会被移除。",
+    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "此页面中含有可用于识别您身份的信息，比如聊天室、用户或群组 ID，这些数据会在发送到服务器前被移除。",
     "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
-    "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s，%(monthName)s %(day)s %(time)s",
-    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s，%(monthName)s %(day)s %(fullYear)s",
-    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s，%(monthName)s %(day)s %(fullYear)s %(time)s",
-    "Who would you like to add to this community?": "您想把谁添加到这个社区内？",
+    "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(monthName)s %(day)s %(time)s, %(weekDayName)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(fullYear)s %(monthName)s %(day)s, %(weekDayName)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(fullYear)s %(monthName)s %(day)s %(time)s, %(weekDayName)s",
+    "Who would you like to add to this community?": "您想把谁添加至此社区中？",
     "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "警告：您添加的一切用户都将会对一切知道此社区的 ID 的人公开",
     "Name or matrix ID": "名称或 Matrix ID",
-    "Which rooms would you like to add to this community?": "您想把哪个聊天室添加到这个社区中？",
+    "Which rooms would you like to add to this community?": "您想把哪个聊天室添加至此社区中？",
     "Add rooms to the community": "添加聊天室到社区",
     "Add to community": "添加到社区",
     "Failed to invite users to community": "邀请用户到社区失败",
     "Disable Peer-to-Peer for 1:1 calls": "在一对一通话中禁用 P2P 对等网络",
-    "Enable inline URL previews by default": "默认启用网址预览",
-    "Disinvite this user?": "取消邀请此用户？",
-    "Kick this user?": "移除此用户？",
-    "Unban this user?": "解除此用户的封禁？",
-    "Ban this user?": "封紧此用户？",
-    "Send an encrypted reply…": "发送加密的回复…",
+    "Enable inline URL previews by default": "默认启用链接预览",
+    "Disinvite this user?": "是否不再邀请此用户？",
+    "Kick this user?": "是否移除此用户？",
+    "Unban this user?": "是否解封此用户？",
+    "Ban this user?": "是否封禁此用户？",
+    "Send an encrypted reply…": "发送加密回复…",
     "Send a reply (unencrypted)…": "发送回复（未加密）…",
     "Send an encrypted message…": "发送加密消息…",
     "Send a message (unencrypted)…": "发送消息 （未加密）…",
@@ -755,18 +755,18 @@
     "Community Invites": "社区邀请",
     "You are trying to access a room.": "你正在尝试访问一个聊天室。",
     "To change the topic, you must be a": "要修改主题，你必须是",
-    "To modify widgets in the room, you must be a": "要修改聊天室中的小组件，你必须是",
+    "To modify widgets in the room, you must be a": "要修改聊天室中的小挂件，你必须是",
     "Banned by %(displayName)s": "被 %(displayName)s 封禁",
-    "To send messages, you must be a": "要发送消息，你必须是",
-    "To invite users into the room, you must be a": "要邀请用户到聊天室，你必须是",
-    "To configure the room, you must be a": "要配置聊天室，你必须是",
-    "To kick users, you must be a": "要踢出用户，你必须是",
-    "To ban users, you must be a": "要封禁用户，你必须是",
-    "To remove other users' messages, you must be a": "要删除其他用户的消息，你必须是",
-    "%(user)s is a %(userRole)s": "%(user)s 是一个 %(userRole)s",
-    "To link to a room it must have an address.": "要链接一个聊天室，它必须有一个地址。",
-    "To send events of type , you must be a": "要发送类型为  的事件，你必须是",
-    "Members only (since the point in time of selecting this option)": "只有成员（从选择这个选项的时间开始）",
+    "To send messages, you must be a": "若要发送消息，您至少要是",
+    "To invite users into the room, you must be a": "若要邀请用户至本聊天室，您至少要是",
+    "To configure the room, you must be a": "若要修改聊天室设置，您至少要是",
+    "To kick users, you must be a": "若要移除用户，您至少要是",
+    "To ban users, you must be a": "若要封禁用户，您至少要是",
+    "To remove other users' messages, you must be a": "若要删除其他用户的消息，您至少要是",
+    "%(user)s is a %(userRole)s": "%(user)s 是一位 %(userRole)s",
+    "To link to a room it must have an address.": "若要链接聊天室，它必须有一个 地址。",
+    "To send events of type , you must be a": "要发送类型为  的事件，您的级别至少为",
+    "Members only (since the point in time of selecting this option)": "仅成员（从选中此选项时开始）",
     "Members only (since they were invited)": "只有成员（从他们被邀请开始）",
     "Members only (since they joined)": "只有成员（从他们加入开始）",
     "Invalid community ID": "无效的社区 ID",
@@ -774,15 +774,15 @@
     "Community Name": "社区名",
     "Community ID": "社区 ID",
     "example": "例子",
-    "This setting cannot be changed later!": "此设置在未来将无法修改！",
-    "Add a Room": "添加一个聊天室",
-    "Add a User": "添加一个用户",
+    "This setting cannot be changed later!": "未来此设置将无法修改！",
+    "Add a Room": "添加聊天室",
+    "Add a User": "添加用户",
     "Unable to accept invite": "无法接受邀请",
     "Unable to reject invite": "无法拒绝邀请",
     "Leave Community": "退出社区",
     "Community Settings": "社区设置",
     "Community %(groupId)s not found": "找不到社区 %(groupId)s",
-    "Your Communities": "你的社区",
+    "Your Communities": "我的社区",
     "Failed to set direct chat tag": "无法设定私聊标签",
     "Failed to remove tag %(tagName)s from room": "移除聊天室标签 %(tagName)s 失败",
     "Failed to add tag %(tagName)s to room": "无法为聊天室新增标签 %(tagName)s",
@@ -803,13 +803,13 @@
     "Your key share request has been sent - please check your other devices for key share requests.": "已请求共享密钥 - 请在您的其他设备上进行确认。",
     "Key share requests are sent to your other devices automatically. If you rejected or dismissed the key share request on your other devices, click here to request the keys for this session again.": "密钥共享请求将会自动发送到您的其他设备上。如果您在其他设备上拒绝了请求，请点击此处以再次请求此会话的密钥。",
     "If your other devices do not have the key for this message you will not be able to decrypt them.": "如果您的其他设备上没有此消息的密钥，您将依然无法解密。",
-    "Key request sent.": "已请求共享密钥。",
-    "Re-request encryption keys from your other devices.": "在您的其他设备上 重新请求加密密钥。",
+    "Key request sent.": "已发送密钥共享请求。",
+    "Re-request encryption keys from your other devices.": "从其他设备上 重新请求密钥。",
     "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "如果您是房间中最后一位有权限的用户，在您降低自己的权限等级后将无法撤回此修改，因为你将无法重新获得权限。",
-    "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "你将无法撤回此修改，因为您正在将此用户的权限提升至和你相同的级别。",
+    "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "您将无法撤回此修改，因为您正在将此用户的滥权等级提升至与你相同。",
     "No devices with registered encryption keys": "没有设备有已注册的加密密钥",
     "Unmute": "取消静音",
-    "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s（权限级别 %(powerLevelNumber)s）",
+    "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s（滥权等级 %(powerLevelNumber)s）",
     "Hide Stickers": "隐藏贴图",
     "Show Stickers": "显示贴图",
     "%(duration)ss": "%(duration)s 秒",
@@ -826,7 +826,7 @@
     "Drop here to tag direct chat": "拖动到这里以加入私聊",
     "Drop here to restore": "拖动到这里以还原",
     "Drop here to demote": "拖动到这里以加入低优先级",
-    "Unable to ascertain that the address this invite was sent to matches one associated with your account.": "无法确定此邀请发送给的邮件地址是否和与您的帐户相关的邮件地址相匹配。",
+    "Unable to ascertain that the address this invite was sent to matches one associated with your account.": "无法确定此邀请发送给的邮件地址是否与您帐户所关联的邮件地址相匹配。",
     "You have been kicked from this room by %(userName)s.": "您已被 %(userName)s 从此聊天室中移除。",
     "'%(groupId)s' is not a valid community ID": "“%(groupId)s” 不是有效的社区 ID",
     "Flair": "Flair",
@@ -875,9 +875,9 @@
     "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "%(severalUsers)s 撤回了他们的邀请",
     "%(oneUser)shad their invitation withdrawn %(count)s times|other": "%(oneUser)s 撤回了他们的邀请共 %(count)s 次",
     "%(oneUser)shad their invitation withdrawn %(count)s times|one": "%(oneUser)s 撤回了他们的邀请",
-    "Custom of %(powerLevel)s": "",
+    "Custom of %(powerLevel)s": "%(powerLevel)s 的自定义",
     "In reply to ": "回复给 ",
-    "Community IDs cannot not be empty.": "社区 ID 不能为空。",
+    "Community IDs cannot be empty.": "社区 ID 不能为空。",
     "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "社区 ID 只能包含 a-z、0-9 或 “=_-./” 等字符",
     "Something went wrong whilst creating your community": "创建社区时出现问题",
     "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "您目前默认将未经验证的设备列入黑名单；在发送消息到这些设备上之前，您必须先验证它们。",
@@ -901,10 +901,10 @@
     "Block users on other matrix homeservers from joining this room": "禁止其他 Matrix 主服务器上的用户加入此聊天室",
     "To verify that this device can be trusted, please contact its owner using some other means (e.g. in person or a phone call) and ask them whether the key they see in their User Settings for this device matches the key below:": "为验证此设备是否可信，请通过其他方式（例如面对面交换或拨打电话）与其拥有者联系，并询问他们该设备的用户设置中的密钥是否与以下密钥匹配：",
     "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this device and you probably want to press the blacklist button instead.": "如果匹配，请点击下面的验证按钮。 如果不匹配，那么这可能说明其他人正在盗用此设备，而您应当点击黑名单按钮。",
-    "In future this verification process will be more sophisticated.": "未来，这个验证过程将会变得更加精致、巧妙一些。",
+    "In future this verification process will be more sophisticated.": "未来，此验证过程将更为精致、巧妙一些。",
     "We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "我们建议您对每台设备进行验证以保证它们属于其合法所有者，但是您可以在不验证它们的情况下重新发送消息。",
     "
    HTML for your community's page
    \n
    \n    Use the long description to introduce new members to the community, or distribute\n    some important links\n
    \n
    \n    You can even use 'img' tags\n
    \n": "
    社区页面的 HTML 代码
    \n
    \n    你可以给社区的新成员们写些长长的社区简介来引导他们，或者放置\n    一些重要的链接\n
    \n
    \n    你甚至可以使用  标签\n
    \n",
-    "Add rooms to the community summary": "将聊天室添加到社区简介",
+    "Add rooms to the community summary": "将聊天室添加到社区简介中",
     "Which rooms would you like to add to this summary?": "您想要将哪个聊天室添加到社区简介？",
     "Add to summary": "添加到简介",
     "Failed to add the following rooms to the summary of %(groupId)s:": "添加以下聊天室到 %(groupId)s 的简介时失败：",
@@ -917,8 +917,8 @@
     "Featured Users:": "核心用户：",
     "Join this community": "加入此社区",
     "%(inviter)s has invited you to join this community": "%(inviter)s 邀请您加入此社区",
-    "Failed to add the following users to the summary of %(groupId)s:": "",
-    "Failed to remove a user from the summary of %(groupId)s": "",
+    "Failed to add the following users to the summary of %(groupId)s:": "将下列用户添加至 %(groupId)s 的简介中时失败：",
+    "Failed to remove a user from the summary of %(groupId)s": "从 %(groupId)s 的简介中移除用户时失败",
     "You are an administrator of this community": "你是此社区的管理员",
     "You are a member of this community": "你是此社区的成员",
     "Who can join this community?": "谁可以加入此社区？",
@@ -931,7 +931,7 @@
     "Did you know: you can use communities to filter your Riot.im experience!": "你知道吗：你可以将社区用作过滤器以增强你的 Riot.im 使用体验！",
     "Create a new community": "创建新社区",
     "Error whilst fetching joined communities": "获取已加入社区列表时出现错误",
-    "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "创建社区，将用户与聊天室整合在一起！搭建自定义社区主页以在 Matrix 宇宙之中标记出您的私人空间。",
+    "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "创建社区，将用户与聊天室整合在一起！搭建自定义社区主页以在 Matrix 宇宙之中标出您的私人空间。",
     "Show devices, send anyway or cancel.": "显示未信任的设备 、 不经信任直接发送 或 取消发送。",
     "%(count)s of your messages have not been sent.|one": "您的消息尚未发送。",
     "Uploading %(filename)s and %(count)s others|other": "正在上传 %(filename)s 与其他 %(count)s 个文件",
@@ -939,20 +939,20 @@
     "Uploading %(filename)s and %(count)s others|one": "正在上传 %(filename)s 与其他 %(count)s 个文件",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "隐私对我们而言重要至极，所以我们不会在分析统计服务中收集任何个人信息或者可用于识别身份的数据。",
     "Learn more about how we use analytics.": "进一步了解我们如何使用分析统计服务。",
-    "Please note you are logging into the %(hs)s server, not matrix.org.": "请注意，您正在登录的服务器是 %(hs)s，不是 matrix.org。",
+    "Please note you are logging into the %(hs)s server, not matrix.org.": "请注意，您正在登录 %(hs)s，而非 matrix.org。",
     "This homeserver doesn't offer any login flows which are supported by this client.": "此主服务器不兼容本客户端支持的任何登录方式。",
     "Sign in to get started": "登录以开始使用",
     "Unbans user with given id": "按照 ID 解封特定的用户",
     "Opens the Developer Tools dialog": "打开开发者工具窗口",
     "Notify the whole room": "通知聊天室全体成员",
     "This process allows you to export the keys for messages you have received in encrypted rooms to a local file. You will then be able to import the file into another Matrix client in the future, so that client will also be able to decrypt these messages.": "此操作允许您将加密聊天室中收到的消息的密钥导出为本地文件。您可以将文件导入其他 Matrix 客户端，以便让别的客户端在未收到密钥的情况下解密这些消息。",
-    "The exported file will allow anyone who can read it to decrypt any encrypted messages that you can see, so you should be careful to keep it secure. To help with this, you should enter a passphrase below, which will be used to encrypt the exported data. It will only be possible to import the data by using the same passphrase.": "导出的文件将允许任何可以读取它的人解密任何他们可以看到的加密消息，因此您应该小心以确保其安全。为了解决这个问题，您应该在下面输入一个密码，用于加密导出的数据。只有输入相同的密码才能导入数据。",
+    "The exported file will allow anyone who can read it to decrypt any encrypted messages that you can see, so you should be careful to keep it secure. To help with this, you should enter a passphrase below, which will be used to encrypt the exported data. It will only be possible to import the data by using the same passphrase.": "导出的文件将允许任何可以读取它的人解密任何他们可以看到的加密消息，因此您应该小心以确保其安全。为解决此问题，您应该在下面输入密码以加密导出的数据。只有输入相同的密码才能导入数据。",
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "导出文件有密码保护。你需要在此输入密码以解密此文件。",
     "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "此操作允许您导入之前从另一个 Matrix 客户端中导出的加密密钥文件。导入完成后，您将能够解密那个客户端可以解密的加密消息。",
-    "Ignores a user, hiding their messages from you": "忽略用户，隐藏他们的消息",
+    "Ignores a user, hiding their messages from you": "忽略用户，隐藏他们发送的消息",
     "Stops ignoring a user, showing their messages going forward": "解除忽略用户，显示他们的消息",
-    "To return to your account in future you need to set a password": "如果你想再次使用账号，您得为它设置一个密码",
-    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "如果你在 GitHub 提交了一个 bug，调试日志可以帮助我们追踪这个问题。 调试日志包含应用程序使用数据，这包括您的用户名、您访问的房间或社区的 ID 或名称以及其他用户的用户名，不包扩聊天记录。",
+    "To return to your account in future you need to set a password": "如果您想再次使用此账号，就必须它设置一个密码",
+    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "如果你在 GitHub 提交了一个 bug，调试日志可以帮助我们追踪这个问题。 调试日志包含应用程序使用数据，也就包括您的用户名、您访问的房间或社区的 ID 或别名，以及其他用户的用户名，但不包括聊天记录。",
     "Debug Logs Submission": "发送调试日志",
     "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "密码修改成功。在您在其他设备上重新登录之前，其他设备不会收到推送通知",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "尝试加载此房间的时间线的特定时间点，但是无法找到。",
@@ -960,7 +960,7 @@
     "%(count)s Resend all or cancel all now. You can also select individual messages to resend or cancel.|other": "現在 重新发送消息 或 取消发送 。你也可以单独选择消息以重新发送或取消。",
     "Visibility in Room List": "是否在聊天室目录中可见",
     "Something went wrong when trying to get your communities.": "获取你加入的社区时发生错误。",
-    "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "删除小部件后，此聊天室中的所有用户的这个小部件都会被删除。你确定要删除这个小部件吗？",
+    "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "删除小挂件时将为聊天室中的所有成员删除。您确定要删除此小挂件吗？",
     "Fetching third party location failed": "获取第三方位置失败",
     "A new version of Riot is available.": "Riot 有更新可用。",
     "Couldn't load home page": "不能加载首页",
@@ -974,7 +974,7 @@
     "You are not receiving desktop notifications": "您将不会收到桌面通知",
     "Friday": "星期五",
     "Update": "更新",
-    "What's New": "新鲜事",
+    "What's New": "更新内容",
     "Add an email address above to configure email notifications": "请在上方输入邮箱地址以接收邮件通知",
     "Expand panel": "展开面板",
     "On": "打开",
@@ -990,7 +990,7 @@
     "Forget": "忘记",
     "#example": "#例子",
     "Hide panel": "隐藏面板",
-    "You cannot delete this image. (%(code)s)": "您不能删除这个图片。(%(code)s)",
+    "You cannot delete this image. (%(code)s)": "无法删除此图片。(%(code)s)",
     "Cancel Sending": "取消发送",
     "This Room": "此聊天室",
     "The Home Server may be too old to support third party networks": "主服务器可能太老旧无法支持第三方网络",
@@ -1065,7 +1065,7 @@
     "Downloading update...": "正在下载更新…",
     "State Key": "状态密钥",
     "Failed to send custom event.": "自定义事件发送失败。",
-    "What's new?": "有什么新闻？",
+    "What's new?": "更新了什么？",
     "Notify me for anything else": "通知所有消息",
     "When I'm invited to a room": "当我被邀请进入聊天室",
     "Can't update user notification settings": "不能更新用户通知设置",
@@ -1118,7 +1118,7 @@
     "Missing roomId.": "找不到此聊天室 ID 所对应的聊天室。",
     "You have been banned from %(roomName)s by %(userName)s.": "您已被 %(userName)s 从聊天室 %(roomName)s 中封禁。",
     "You have been banned from this room by %(userName)s.": "您已被 %(userName)s 从此聊天室中封禁。",
-    "Every page you use in the app": "您在 Riot 中使用的每一个页面",
+    "Every page you use in the app": "您在 Riot 中使用的所有页面",
     "e.g. ": "例如：",
     "Your User Agent": "您的 User Agent",
     "Your device resolution": "您设备的分辨率",
@@ -1126,14 +1126,147 @@
     "At this time it is not possible to reply with a file so this will be sent without being a reply.": "目前无法以文件作为回复的内容，所以此文件将不作为回复，独立发送。",
     "Unable to reply": "无法回复",
     "At this time it is not possible to reply with an emote.": "目前无法使用表情符号作为回复内容。",
-    "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "您将被带到一个第三方网站以便验证您的账号以使用 %(integrationsUrl)s 提供的集成。您希望继续吗？",
+    "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "您将被带到一个第三方网站以便验证您的账号来使用 %(integrationsUrl)s 提供的集成。您希望继续吗？",
     "Robot check is currently unavailable on desktop - please use a web browser": "目前机器人检查（CAPTCHA）在桌面端不可用——请使用 浏览器",
     "The visibility of '%(roomName)s' in %(groupId)s could not be updated.": "无法更新聊天室 %(roomName)s 在社区 “%(groupId)s” 中的可见性。",
     "Minimize apps": "最小化小部件",
-    "Popout widget": "在弹出式窗口中打开小部件",
+    "Popout widget": "在弹出式窗口中打开小挂件",
     "Picture": "图片",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "无法加载被回复的事件，它可能不存在，也可能是您没有权限查看它。",
     "And %(count)s more...|other": "和 %(count)s 个其他…",
     "Try using one of the following valid address types: %(validTypesList)s.": "请尝试使用以下的有效邮箱地址格式中的一种：%(validTypesList)s",
-    "Riot bugs are tracked on GitHub: create a GitHub issue.": "Riot 使用 GitHub 追踪 bug：在 GitHub 上创建新 Issue"
+    "Riot bugs are tracked on GitHub: create a GitHub issue.": "Riot 使用 GitHub 追踪 bug：在 GitHub 上创建新 Issue",
+    "e.g. %(exampleValue)s": "例如：%(exampleValue)s",
+    "Call in Progress": "正在通话",
+    "A call is already in progress!": "您已在通话中！",
+    "Jitsi Conference Calling": "Jitsi 电话会议",
+    "Send analytics data": "发送统计数据",
+    "Enable widget screenshots on supported widgets": "对支持的小挂件启用小挂件截图",
+    "Encrypting": "正在加密",
+    "Encrypted, not sent": "已加密，未发送",
+    "Demote yourself?": "是否降低您自己的权限？",
+    "Demote": "降权",
+    "A conference call could not be started because the intgrations server is not available": "关联的会议服务器不可用，无法发起电话会议",
+    "A call is currently being placed!": "已发起一次通话！",
+    "Permission Required": "需要权限",
+    "You do not have permission to start a conference call in this room": "您没有在此聊天室发起通话会议的权限",
+    "Show empty room list headings": "为空的聊天室列表显示 heading",
+    "This event could not be displayed": "无法显示此事件",
+    "Share Link to User": "分享链接给其他用户",
+    "deleted": "删除线",
+    "underlined": "下划线",
+    "inline-code": "代码",
+    "block-quote": "引用",
+    "bulleted-list": "无序列表",
+    "numbered-list": "有序列表",
+    "Share room": "分享聊天室",
+    "You have no historical rooms": "没有历史聊天室",
+    "System Alerts": "系统警告",
+    "To notify everyone in the room, you must be a": "若要通知所有聊天室成员，您至少要是",
+    "Muted Users": "被禁言的用户",
+    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "在启用加密的聊天室中，比如此聊天室，链接预览被默认禁用以确保主服务器（访问链接、生成预览的地方）无法获知聊天室中的链接及其信息。",
+    "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "当有人发送一条带有链接的消息后，可显示链接的预览，链接预览可包含此链接的网页标题、描述以及图片。",
+    "The email field must not be blank.": "必须输入电子邮箱。",
+    "The user name field must not be blank.": "必须输入用户名。",
+    "The phone number field must not be blank.": "必须输入手机号码。",
+    "The password field must not be blank.": "必须输入密码。",
+    "Display your community flair in rooms configured to show it.": "在启用“显示 Flair”的聊天室中显示本社区的 Flair。",
+    "Please help improve Riot.im by sending anonymous usage data. This will use a cookie (please see our Cookie Policy).": "请发送 匿名使用数据 以帮助我们改进 Riot.im。这将用到 Cookie（请看看我们的 Cookie 隐私政策）。",
+    "Please help improve Riot.im by sending anonymous usage data. This will use a cookie.": "请发送 匿名使用数据 以帮助我们改进 Riot.im。这将用到 Cookie。",
+    "Yes, I want to help!": "好啊，我要帮助你们！",
+    "This homeserver has hit its Monthly Active User limit. Please contact your service administrator to continue using the service.": "此主服务器已达到其每月活跃用户数量限制。若要继续使用此服务，请 联系您的服务提供者 。",
+    "This homeserver has hit its Monthly Active User limit so some users will not be able to log in. Please contact your service administrator to get this limit increased.": "此主服务器已达到其每月活跃用户数量限制，所以，一些用户将无法登录。若要提高此数量限制，请 联系您的服务提供者 。",
+    "Warning: This widget might use cookies.": "警告：此小挂件可能会使用 cookies。",
+    "Failed to remove widget": "移除小挂件失败",
+    "An error ocurred whilst trying to remove the widget from the room": "尝试从聊天室中移除小部件时发生了错误",
+    "Reload widget": "刷新小挂件",
+    "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "您确定要移除（删除）此事件吗？注意，如果删除了聊天室名称或话题的变化，就会撤销此更改。",
+    "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. This action is irreversible.": "这将使您的账户永远不再可用。您将不能登录，或使用相同的用户 ID 重新注册。您的账户将退出所有已加入的聊天室，身份服务器上的账户信息也会被删除。此操作是不可逆的。",
+    "Deactivating your account does not by default cause us to forget messages you have sent. If you would like us to forget your messages, please tick the box below.": "停用您的账户不会默认忘记您发送的消息。如果您希望我们忘记您发送的消息，请勾选下面的选择框。",
+    "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "Matrix 中的信息可见性类似于电子邮件。我们忘记您的消息意味着您发送的消息将不会被发至新注册或未注册的用户，但是已收到您的消息的注册用户依旧可以看到他们的副本。",
+    "Please forget all messages I have sent when my account is deactivated (Warning: this will cause future users to see an incomplete view of conversations)": "请在我停用账户的同时忘记我发送的所有消息（警告：这将导致未来的用户看到残缺的对话）",
+    "To continue, please enter your password:": "请输入您的密码以继续：",
+    "password": "密码",
+    "Log out and remove encryption keys?": "是否退出登录并清除加密密钥？",
+    "Clear Storage and Sign Out": "清除数据并退出登录",
+    "Send Logs": "发送日志",
+    "Refresh": "刷新",
+    "Unable to join community": "无法加入社区",
+    "The user '%(displayName)s' could not be removed from the summary.": "无法将用户“%(displayName)s”从简介中移除。",
+    "Who would you like to add to this summary?": "您想将谁添加到简介中？",
+    "Add users to the community summary": "添加用户至社区简介",
+    "Collapse Reply Thread": "收起回复",
+    "Share Message": "分享消息",
+    "COPY": "复制",
+    "Share Room Message": "分享聊天室消息",
+    "Share Community": "分享社区",
+    "Share User": "分享用户",
+    "Share Room": "分享聊天室",
+    "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "清除本页储存在您浏览器上的数据或许能修复此问题，但也会导致您退出登录并无法读取任何已加密的聊天记录。",
+    "We encountered an error trying to restore your previous session.": "我们在尝试恢复您先前的会话时遇到了错误。",
+    "Link to most recent message": "最新消息的链接",
+    "Link to selected message": "选中消息的链接",
+    "Changes made to your community name and avatar might not be seen by other users for up to 30 minutes.": "至多半个小时内，其他用户可能看不到您社区的 名称 与 头像 的变化。",
+    "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "这些聊天室对社区成员可见。社区成员可通过点击来加入它们。",
+    "Your community hasn't got a Long Description, a HTML page to show to community members.
    Click here to open settings and give it one!": "您的社区还没有详细介绍，一个展示给社区成员的 HTML 页面。
    点击这里即可打开设置添加详细介绍！",
+    "Failed to load %(groupId)s": "%(groupId)s 加载失败",
+    "This room is not public. You will not be able to rejoin without an invite.": "此聊天室不是公开的。没有邀请的话，您将无法重新加入。",
+    "Can't leave Server Notices room": "无法退出服务器公告聊天室",
+    "This room is used for important messages from the Homeserver, so you cannot leave it.": "此聊天室是用于发布来自主服务器的重要讯息的，所以您不能退出它。",
+    "Terms and Conditions": "条款与要求",
+    "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "若要继续使用主服务器 %(homeserverDomain)s，您必须浏览并同意我们的条款与要求。",
+    "Review terms and conditions": "浏览条款与要求",
+    "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "若要设置社区过滤器，请将社区头像拖到屏幕最左侧的社区过滤器面板上。单击社区过滤器面板中的社区头像即可过滤出与该社区相关联的房间和人员。",
+    "You can't send any messages until you review and agree to our terms and conditions.": "在您查看并同意 我们的条款与要求 之前，您不能发送任何消息。",
+    "Your message wasn’t sent because this homeserver has hit its Monthly Active User Limit. Please contact your service administrator to continue using the service.": "您的消息未被发出，因为此主服务器已达到其每月活跃用户数量上限。请联系您的服务提供者以继续使用此服务。",
+    "Clear filter": "清除过滤器",
+    "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "尝试加载此聊天室时间轴上的某处，但您没有查看相关消息的权限。",
+    "No Audio Outputs detected": "未检测到可用的音频输出方式",
+    "Audio Output": "音频输出",
+    "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "已向 %(emailAddress)s 发送了一封电子邮件。点开邮件中的链接后，请点击下面。",
+    "This homeserver has hit its Monthly Active User limit": "此主服务器已达到其每月活跃用户数量上限",
+    "Please contact your service administrator to continue using this service.": "请联系您的服务提供者以继续使用此服务。",
+    "Try the app first": "先试试 Riot.im 应用吧",
+    "Registration Required": "需要注册",
+    "You need to register to do this. Would you like to register now?": "您必须注册以继续。您想现在就注册吗？",
+    "Forces the current outbound group session in an encrypted room to be discarded": "强制丢弃加密聊天室中的当前出站群组会话",
+    "Unable to connect to Homeserver. Retrying...": "无法连接至主服务器。正在重试…",
+    "Sorry, your homeserver is too old to participate in this room.": "对不起，您的主服务器的程序版本过旧以至于无法加入此聊天室。",
+    "Increase performance by only loading room members on first view": "仅在首次查看时加载聊天室成员以改善性能",
+    "Mirror local video feed": "镜像本地视频源",
+    "This room has been replaced and is no longer active.": "此聊天室已被取代，且不再活跃。",
+    "The conversation continues here.": "对话在这里继续。",
+    "Upgrade room to version %(ver)s": "将聊天室升级为版本 %(ver)s",
+    "Internal room ID: ": "内部聊天室 ID： ",
+    "Room version number: ": "聊天室版本号： ",
+    "There is a known vulnerability affecting this room.": "一个已知的威胁正在影响此聊天室。",
+    "This room version is vulnerable to malicious modification of room state.": "此版本的聊天室难以抵御对聊天室状态的恶意篡改。",
+    "Click here to upgrade to the latest room version and ensure room integrity is protected.": "点击这里以升级至最新版本的聊天室，并保证聊天室能受到完整的保护。",
+    "Only room administrators will see this warning": "此警告仅聊天室管理员可见",
+    "This room is a continuation of another conversation.": "此聊天室是另一个对话的延续之处。",
+    "Click here to see older messages.": "点击这里以查看更早的消息。",
+    "Failed to indicate account erasure": "无法指示帐户删除",
+    "Failed to upgrade room": "聊天室升级失败",
+    "The room upgrade could not be completed": "聊天室可能没有完整地升级",
+    "Upgrade this room to version %(version)s": "升级此聊天室至版本 %(version)s",
+    "Upgrade Room Version": "更新聊天室版本",
+    "Upgrading this room requires closing down the current instance of the room and creating a new room it its place. To give room members the best possible experience, we will:": "升级此聊天室需要关闭当前聊天室并创建一个新的聊天室。为了给聊天室成员提供最佳切换体验，我们将：",
+    "Create a new room with the same name, description and avatar": "创建一个拥有相同的名称，描述与头像的新聊天室",
+    "Update any local room aliases to point to the new room": "更新所有本地聊天室别名以使其指向新聊天室",
+    "Stop users from speaking in the old version of the room, and post a message advising users to move to the new room": "阻止用户在旧聊天室中发言，并发送消息建议用户迁移至新聊天室",
+    "Put a link back to the old room at the start of the new room so people can see old messages": "在新聊天室的消息开始处发送一条旧聊天室的链接，以便用户查看旧消息",
+    "Lazy loading members not supported": "不支持延迟加载成员",
+    "Lazy loading is not supported by your current homeserver.": "您当前使用的主服务器尚不支持延迟加载。",
+    "Legal": "法律信息",
+    "Unable to query for supported registration methods": "无法请求支持的注册方式",
+    "This homeserver has hit its Monthly Active User limit.": "此主服务器已达到其每月活跃用户限制。",
+    "This homeserver has exceeded one of its resource limits.": "本服务器已达到其使用量限制之一。",
+    "This homeserver has hit its Monthly Active User limit so some users will not be able to log in.": "本服务器已达到其每月活跃用户限制，部分用户将无法登录。",
+    "This homeserver has exceeded one of its resource limits so some users will not be able to log in.": "本主服务器已达到其使用量限制之一，部分用户将无法登录。",
+    "Please contact your service administrator to continue using this service.": "请 联系您的服务管理员 以继续使用本服务。",
+    "Your message wasn't sent because this homeserver has exceeded a resource limit. Please contact your service administrator to continue using the service.": "您的消息未被发送，因为本主服务器已达到其使用量限制之一。请 联系您的服务管理员 以继续使用本服务。",
+    "Your message wasn't sent because this homeserver has hit its Monthly Active User Limit. Please contact your service administrator to continue using the service.": "您的消息未被发送，因为本主服务器已达到其每月活跃用户限制。请 联系您的服务管理员 以继续使用本服务。",
+    "Please contact your service administrator to continue using the service.": "请 联系您的服务管理员 以继续使用本服务。",
+    "Please contact your homeserver administrator.": "请 联系您主服务器的管理员。",
+    "Please contact your service administrator to get this limit increased.": "请 联系您的服务管理员 以增加此限制的额度。"
 }
diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index ebf329b45b..8af87415b3 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -952,7 +952,7 @@
     "Your identity server's URL": "您的驗證伺服器 URL",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s",
     "This room is not public. You will not be able to rejoin without an invite.": "這個聊天室並未公開。您在沒有邀請的情況下將無法重新加入。",
-    "Community IDs cannot not be empty.": "社群 ID 不能為空。",
+    "Community IDs cannot be empty.": "社群 ID 不能為空。",
     "Show devices, send anyway or cancel.": "顯示裝置、無論如何都要傳送或取消。",
     "In reply to ": "回覆給 ",
     "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s 變更了他的顯示名稱為 %(displayName)s 。",
@@ -1195,5 +1195,87 @@
     "Share Room Message": "分享聊天室訊息",
     "Link to selected message": "連結到選定的訊息",
     "COPY": "複製",
-    "Share Message": "分享訊息"
+    "Share Message": "分享訊息",
+    "Jitsi Conference Calling": "Jitsi 會議通話",
+    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "在加密的聊天室中（這個就是），URL 預覽會預設停用以確保您的家伺服器（預覽生成的地方）無法在這個聊天室中收集關於您看到的連結的資訊。",
+    "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "當某人在他們的訊息中放置 URL 時，URL 預覽可以顯示如標題、描述與網頁上的圖片等等來給您更多關於該連結的資訊。",
+    "The email field must not be blank.": "電子郵件欄不能留空。",
+    "The user name field must not be blank.": "使用者名稱欄不能留空。",
+    "The phone number field must not be blank.": "電話號碼欄不能留空。",
+    "The password field must not be blank.": "密碼欄不能留空。",
+    "Call in Progress": "進行中的通話",
+    "A call is already in progress!": "已有一通電話進行中！",
+    "You have no historical rooms": "您沒有過去的聊天室",
+    "You can't send any messages until you review and agree to our terms and conditions.": "您在審閱並同意我們的條款與條件前無法傳送訊息。",
+    "Show empty room list headings": "顯示空聊天室清單標題",
+    "Demote yourself?": "將自己降級？",
+    "Demote": "降級",
+    "A conference call could not be started because the intgrations server is not available": "會議通話無法啟動，因為整合伺服器不可用",
+    "Permission Required": "需要權限",
+    "You do not have permission to start a conference call in this room": "您沒有在此聊天室啟動會議通話的權限",
+    "This event could not be displayed": "此活動無法顯示",
+    "deleted": "刪除線",
+    "underlined": "底線",
+    "inline-code": "內嵌程式碼",
+    "block-quote": "區塊引用",
+    "bulleted-list": "項目符號清單",
+    "numbered-list": "編號清單",
+    "A call is currently being placed!": "目前正在撥打電話！",
+    "Failed to remove widget": "移除小工具失敗",
+    "An error ocurred whilst trying to remove the widget from the room": "嘗試從聊天室移除小工具時發生錯誤",
+    "Your message wasn’t sent because this homeserver has hit its Monthly Active User Limit. Please contact your service administrator to continue using the service.": "您的訊息因為這個家伺服器到達了它的每月活躍使用者限制而沒有傳送出去。請聯絡您的服務管理員以繼續使用服務。",
+    "This homeserver has hit its Monthly Active User limit": "此家伺服器達到了其每月活躍使用者限制",
+    "Please contact your service administrator to continue using this service.": "請聯絡您的服務管理員以繼續使用此服務。",
+    "This homeserver has hit its Monthly Active User limit. Please contact your service administrator to continue using the service.": "您的訊息因為這個家伺服器到達了它的每月活躍使用者限制而沒有傳送出去。請聯絡您的服務管理員以繼續使用服務。",
+    "System Alerts": "系統警告",
+    "Internal room ID: ": "內部聊天室 ID： ",
+    "Room version number: ": "聊天室版本號： ",
+    "This homeserver has hit its Monthly Active User limit. Please contact your service administrator to continue using the service.": "這個家伺服器已經達到了其每月活躍使用者限制。請聯絡您的服務管理員以繼續使用服務。",
+    "This homeserver has hit its Monthly Active User limit so some users will not be able to log in. Please contact your service administrator to get this limit increased.": "此家伺服器已達到其每月活躍使用者限制，所以其部份使用者將會無法登入。請聯絡您的服務管理員以讓此限制增加。",
+    "There is a known vulnerability affecting this room.": "有一個已知的安全性漏洞影響此聊天室。",
+    "This room version is vulnerable to malicious modification of room state.": "此聊天室版本易受惡意修改聊天室狀態的影響。",
+    "Click here to upgrade to the latest room version and ensure room integrity is protected.": "點選這裡以升級到最新的聊天室版本並確保聊天室的完整性已被保護。",
+    "Only room administrators will see this warning": "僅聊天室管理員會看到此警告",
+    "Please contact your service administrator to continue using the service.": "請聯絡您的服務管理員以繼續使用服務。",
+    "This homeserver has hit its Monthly Active User limit.": "這個家伺服器已經到達其每月活躍使用者限制。",
+    "This homeserver has exceeded one of its resource limits.": "此家伺服器已經超過其中一項資源限制。",
+    "Please contact your service administrator to get this limit increased.": "請聯絡您的服務管理員以讓此限制增加。",
+    "This homeserver has hit its Monthly Active User limit so some users will not be able to log in.": "此家伺服器已經達到其每月活躍使用者限制所以某些使用者將會無法登入。",
+    "This homeserver has exceeded one of its resource limits so some users will not be able to log in.": "此家伺服器已超過其中一項資源限制所以某些使用者可能會無法登入。",
+    "Upgrade Room Version": "更新聊天室版本",
+    "Upgrading this room requires closing down the current instance of the room and creating a new room it its place. To give room members the best possible experience, we will:": "更新此聊天室需要關閉目前的聊天室實體並建立一個新的聊天室。為了給予聊天室成員最佳的體驗，我們將會：",
+    "Create a new room with the same name, description and avatar": "使用同樣的名稱、描述與大頭貼建立新聊天室",
+    "Update any local room aliases to point to the new room": "更新任何本地聊天室別名以指向新的聊天室",
+    "Stop users from speaking in the old version of the room, and post a message advising users to move to the new room": "讓使用者在舊版聊天室停止發言，並張貼訊息建議使用者移動到新的聊天室",
+    "Put a link back to the old room at the start of the new room so people can see old messages": "在新聊天室的開始處放置連回舊聊天室的連結，這樣夥伴們就可以看到舊的訊息",
+    "Your message wasn't sent because this homeserver has hit its Monthly Active User Limit. Please contact your service administrator to continue using the service.": "您的訊息未被傳送，因為其家伺服器已經達到了其每月活躍使用者限制。請聯絡您的服務管理員以繼續使用服務。",
+    "Your message wasn't sent because this homeserver has exceeded a resource limit. Please contact your service administrator to continue using the service.": "您的訊息未傳送，因為其家伺服器已超過一項資源限制。請聯絡您的服務管理員以繼序使用服務。",
+    "Please contact your service administrator to continue using this service.": "請聯絡您的服務管理員以繼續使用此服務。",
+    "Increase performance by only loading room members on first view": "透過僅在第一次檢視時載入聊天室成員來增加效能",
+    "Lazy loading members not supported": "不支援延遲載入成員",
+    "Lazy loading is not supported by your current homeserver.": "您目前的家伺服器不支援延遲載入。",
+    "Sorry, your homeserver is too old to participate in this room.": "抱歉，您的家伺服器太舊了，所以無法參與此聊天室。",
+    "Please contact your homeserver administrator.": "請聯絡您的家伺服器的管理員。",
+    "Legal": "法律",
+    "This room has been replaced and is no longer active.": "此已被取代的聊天室已不再活躍。",
+    "The conversation continues here.": "對話在此繼續。",
+    "Upgrade room to version %(ver)s": "將聊天室升級為版本 %(ver)s",
+    "This room is a continuation of another conversation.": "此聊天室是另一個對話的延續。",
+    "Click here to see older messages.": "點選這裡以檢視較舊的訊息。",
+    "Failed to upgrade room": "升級聊天室失敗",
+    "The room upgrade could not be completed": "聊天室升級可能不完整",
+    "Upgrade this room to version %(version)s": "升級此聊天室到版本 %(version)s",
+    "Forces the current outbound group session in an encrypted room to be discarded": "強制目前在已加密的聊天室中的外發群組工作階段丟棄",
+    "Error Discarding Session": "丟棄工作階段錯誤",
+    "Registration Required": "需要註冊",
+    "You need to register to do this. Would you like to register now?": "您必須註冊以繼續。您想要現在註冊嗎？",
+    "Unable to query for supported registration methods": "無法查詢支援的註冊方式",
+    "Unable to connect to Homeserver. Retrying...": "無法連線到家伺服器。正在重試……",
+    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|one": "%(senderName)s 新增了 %(addedAddresses)s 為此聊天室的位置。",
+    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|other": "%(senderName)s 新增了 %(addedAddresses)s 為此聊天室的位置。",
+    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|one": "%(senderName)s 移除了 %(removedAddresses)s 為此聊天室的位置。",
+    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|other": "%(senderName)s 移除了 %(removedAddresses)s 為此聊天室的位置。",
+    "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.": "%(senderName)s 新增了 %(addedAddresses)s 並移除了 %(removedAddresses)s 為此聊天室的位置。",
+    "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s 為此聊天室設定了主要位置 %(address)s。",
+    "%(senderName)s removed the main address for this room.": "%(senderName)s 移除了此聊天室的主要位置。"
 }
diff --git a/src/linkify-matrix.js b/src/linkify-matrix.js
index d72319948a..50d50f219a 100644
--- a/src/linkify-matrix.js
+++ b/src/linkify-matrix.js
@@ -35,12 +35,14 @@ function matrixLinkify(linkify) {
     };
     ROOMALIAS.prototype = new MultiToken();
 
-    const S_HASH = new linkify.parser.State();
+    const S_HASH = S_START.jump(TT.POUND);
     const S_HASH_NAME = new linkify.parser.State();
     const S_HASH_NAME_COLON = new linkify.parser.State();
     const S_HASH_NAME_COLON_DOMAIN = new linkify.parser.State();
     const S_HASH_NAME_COLON_DOMAIN_DOT = new linkify.parser.State();
     const S_ROOMALIAS = new linkify.parser.State(ROOMALIAS);
+    const S_ROOMALIAS_COLON = new linkify.parser.State();
+    const S_ROOMALIAS_COLON_NUM = new linkify.parser.State(ROOMALIAS);
 
     const roomname_tokens = [
         TT.DOT,
@@ -56,8 +58,6 @@ function matrixLinkify(linkify) {
         TT.LOCALHOST,
     ];
 
-    S_START.on(TT.POUND, S_HASH);
-
     S_HASH.on(roomname_tokens, S_HASH_NAME);
     S_HASH_NAME.on(roomname_tokens, S_HASH_NAME);
     S_HASH_NAME.on(TT.DOMAIN, S_HASH_NAME);
@@ -66,10 +66,15 @@ function matrixLinkify(linkify) {
 
     S_HASH_NAME_COLON.on(TT.DOMAIN, S_HASH_NAME_COLON_DOMAIN);
     S_HASH_NAME_COLON.on(TT.LOCALHOST, S_ROOMALIAS); // accept #foo:localhost
+    S_HASH_NAME_COLON.on(TT.TLD, S_ROOMALIAS); // accept #foo:com (mostly for (TLD|DOMAIN)+ mixing)
     S_HASH_NAME_COLON_DOMAIN.on(TT.DOT, S_HASH_NAME_COLON_DOMAIN_DOT);
     S_HASH_NAME_COLON_DOMAIN_DOT.on(TT.DOMAIN, S_HASH_NAME_COLON_DOMAIN);
     S_HASH_NAME_COLON_DOMAIN_DOT.on(TT.TLD, S_ROOMALIAS);
 
+    S_ROOMALIAS.on(TT.DOT, S_HASH_NAME_COLON_DOMAIN_DOT); // accept repeated TLDs (e.g .org.uk)
+    S_ROOMALIAS.on(TT.COLON, S_ROOMALIAS_COLON); // do not accept trailing `:`
+    S_ROOMALIAS_COLON.on(TT.NUM, S_ROOMALIAS_COLON_NUM); // but do accept :NUM (port specifier)
+
 
     const USERID = function(value) {
         MultiToken.call(this, value);
@@ -78,12 +83,14 @@ function matrixLinkify(linkify) {
     };
     USERID.prototype = new MultiToken();
 
-    const S_AT = new linkify.parser.State();
+    const S_AT = S_START.jump(TT.AT);
     const S_AT_NAME = new linkify.parser.State();
     const S_AT_NAME_COLON = new linkify.parser.State();
     const S_AT_NAME_COLON_DOMAIN = new linkify.parser.State();
     const S_AT_NAME_COLON_DOMAIN_DOT = new linkify.parser.State();
     const S_USERID = new linkify.parser.State(USERID);
+    const S_USERID_COLON = new linkify.parser.State();
+    const S_USERID_COLON_NUM = new linkify.parser.State(USERID);
 
     const username_tokens = [
         TT.DOT,
@@ -97,8 +104,6 @@ function matrixLinkify(linkify) {
         TT.LOCALHOST,
     ];
 
-    S_START.on(TT.AT, S_AT);
-
     S_AT.on(username_tokens, S_AT_NAME);
     S_AT_NAME.on(username_tokens, S_AT_NAME);
     S_AT_NAME.on(TT.DOMAIN, S_AT_NAME);
@@ -107,10 +112,15 @@ function matrixLinkify(linkify) {
 
     S_AT_NAME_COLON.on(TT.DOMAIN, S_AT_NAME_COLON_DOMAIN);
     S_AT_NAME_COLON.on(TT.LOCALHOST, S_USERID); // accept @foo:localhost
+    S_AT_NAME_COLON.on(TT.TLD, S_USERID); // accept @foo:com (mostly for (TLD|DOMAIN)+ mixing)
     S_AT_NAME_COLON_DOMAIN.on(TT.DOT, S_AT_NAME_COLON_DOMAIN_DOT);
     S_AT_NAME_COLON_DOMAIN_DOT.on(TT.DOMAIN, S_AT_NAME_COLON_DOMAIN);
     S_AT_NAME_COLON_DOMAIN_DOT.on(TT.TLD, S_USERID);
 
+    S_USERID.on(TT.DOT, S_AT_NAME_COLON_DOMAIN_DOT); // accept repeated TLDs (e.g .org.uk)
+    S_USERID.on(TT.COLON, S_USERID_COLON); // do not accept trailing `:`
+    S_USERID_COLON.on(TT.NUM, S_USERID_COLON_NUM); // but do accept :NUM (port specifier)
+
 
     const GROUPID = function(value) {
         MultiToken.call(this, value);
@@ -119,12 +129,14 @@ function matrixLinkify(linkify) {
     };
     GROUPID.prototype = new MultiToken();
 
-    const S_PLUS = new linkify.parser.State();
+    const S_PLUS = S_START.jump(TT.PLUS);
     const S_PLUS_NAME = new linkify.parser.State();
     const S_PLUS_NAME_COLON = new linkify.parser.State();
     const S_PLUS_NAME_COLON_DOMAIN = new linkify.parser.State();
     const S_PLUS_NAME_COLON_DOMAIN_DOT = new linkify.parser.State();
     const S_GROUPID = new linkify.parser.State(GROUPID);
+    const S_GROUPID_COLON = new linkify.parser.State();
+    const S_GROUPID_COLON_NUM = new linkify.parser.State(GROUPID);
 
     const groupid_tokens = [
         TT.DOT,
@@ -138,8 +150,6 @@ function matrixLinkify(linkify) {
         TT.LOCALHOST,
     ];
 
-    S_START.on(TT.PLUS, S_PLUS);
-
     S_PLUS.on(groupid_tokens, S_PLUS_NAME);
     S_PLUS_NAME.on(groupid_tokens, S_PLUS_NAME);
     S_PLUS_NAME.on(TT.DOMAIN, S_PLUS_NAME);
@@ -148,9 +158,14 @@ function matrixLinkify(linkify) {
 
     S_PLUS_NAME_COLON.on(TT.DOMAIN, S_PLUS_NAME_COLON_DOMAIN);
     S_PLUS_NAME_COLON.on(TT.LOCALHOST, S_GROUPID); // accept +foo:localhost
+    S_PLUS_NAME_COLON.on(TT.TLD, S_GROUPID); // accept +foo:com (mostly for (TLD|DOMAIN)+ mixing)
     S_PLUS_NAME_COLON_DOMAIN.on(TT.DOT, S_PLUS_NAME_COLON_DOMAIN_DOT);
     S_PLUS_NAME_COLON_DOMAIN_DOT.on(TT.DOMAIN, S_PLUS_NAME_COLON_DOMAIN);
     S_PLUS_NAME_COLON_DOMAIN_DOT.on(TT.TLD, S_GROUPID);
+
+    S_GROUPID.on(TT.DOT, S_PLUS_NAME_COLON_DOMAIN_DOT); // accept repeated TLDs (e.g .org.uk)
+    S_GROUPID.on(TT.COLON, S_GROUPID_COLON); // do not accept trailing `:`
+    S_GROUPID_COLON.on(TT.NUM, S_GROUPID_COLON_NUM); // but do accept :NUM (port specifier)
 }
 
 // stubs, overwritten in MatrixChat's componentDidMount
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 9f35b0bfec..0594c63eb9 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -21,7 +21,7 @@ import {
     NotificationBodyEnabledController,
     NotificationsEnabledController,
 } from "./controllers/NotificationControllers";
-
+import LazyLoadingController from "./controllers/LazyLoadingController";
 
 // These are just a bunch of helper arrays to avoid copy/pasting a bunch of times
 const LEVELS_ROOM_SETTINGS = ['device', 'room-device', 'room-account', 'account', 'config'];
@@ -83,10 +83,11 @@ export const SETTINGS = {
         supportedLevels: LEVELS_FEATURE,
         default: false,
     },
-    "feature_jitsi": {
+    "feature_lazyloading": {
         isFeature: true,
-        displayName: _td("Jitsi Conference Calling"),
+        displayName: _td("Increase performance by only loading room members on first view"),
         supportedLevels: LEVELS_FEATURE,
+        controller: new LazyLoadingController(),
         default: false,
     },
     "MessageComposerInput.dontSuggestEmoji": {
@@ -245,6 +246,13 @@ export const SETTINGS = {
         },
         default: true,
     },
+    "urlPreviewsEnabled_e2ee": {
+        supportedLevels: ['room-device', 'room-account'],
+        displayName: {
+            "room-account": _td("Enable URL previews for this room (only affects you)"),
+        },
+        default: false,
+    },
     "roomColor": {
         supportedLevels: LEVELS_ROOM_SETTINGS_WITH_ROOM,
         displayName: _td("Room Colour"),
@@ -277,4 +285,9 @@ export const SETTINGS = {
         supportedLevels: ['room-device'],
         default: false,
     },
+    "RoomSubList.showEmpty": {
+        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
+        displayName: _td('Show empty room list headings'),
+        default: true,
+    },
 };
diff --git a/src/settings/SettingsStore.js b/src/settings/SettingsStore.js
index a1b88fb0c2..cb6d83e884 100644
--- a/src/settings/SettingsStore.js
+++ b/src/settings/SettingsStore.js
@@ -248,7 +248,7 @@ export default class SettingsStore {
         if (actualValue !== undefined && actualValue !== null) return actualValue;
         return calculatedValue;
     }
-
+    /* eslint-disable valid-jsdoc */    //https://github.com/eslint/eslint/issues/7307
     /**
      * Sets the value for a setting. The room ID is optional if the setting is not being
      * set for a particular room, otherwise it should be supplied. The value may be null
@@ -260,7 +260,8 @@ export default class SettingsStore {
      * @param {*} value The new value of the setting, may be null.
      * @return {Promise} Resolves when the setting has been changed.
      */
-    static setValue(settingName, roomId, level, value) {
+    /* eslint-enable valid-jsdoc */
+    static async setValue(settingName, roomId, level, value) {
         // Verify that the setting is actually a setting
         if (!SETTINGS[settingName]) {
             throw new Error("Setting '" + settingName + "' does not appear to be a setting.");
@@ -275,11 +276,12 @@ export default class SettingsStore {
             throw new Error("User cannot set " + settingName + " at " + level + " in " + roomId);
         }
 
-        return handler.setValue(settingName, roomId, value).then(() => {
-            const controller = SETTINGS[settingName].controller;
-            if (!controller) return;
+        await handler.setValue(settingName, roomId, value);
+
+        const controller = SETTINGS[settingName].controller;
+        if (controller) {
             controller.onChange(level, roomId, value);
-        });
+        }
     }
 
     /**
diff --git a/src/settings/controllers/LazyLoadingController.js b/src/settings/controllers/LazyLoadingController.js
new file mode 100644
index 0000000000..90f095c9ca
--- /dev/null
+++ b/src/settings/controllers/LazyLoadingController.js
@@ -0,0 +1,29 @@
+/*
+Copyright 2018 New Vector
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import SettingController from "./SettingController";
+import MatrixClientPeg from "../../MatrixClientPeg";
+import PlatformPeg from "../../PlatformPeg";
+
+export default class LazyLoadingController extends SettingController {
+    async onChange(level, roomId, newValue) {
+        if (!PlatformPeg.get()) return;
+
+        MatrixClientPeg.get().stopClient();
+        await MatrixClientPeg.get().store.deleteAllData();
+        PlatformPeg.get().reload();
+    }
+}
diff --git a/src/settings/handlers/RoomAccountSettingsHandler.js b/src/settings/handlers/RoomAccountSettingsHandler.js
index 74dbf9eed0..d0dadc2de7 100644
--- a/src/settings/handlers/RoomAccountSettingsHandler.js
+++ b/src/settings/handlers/RoomAccountSettingsHandler.js
@@ -74,7 +74,7 @@ export default class RoomAccountSettingsHandler extends SettingsHandler {
         return cli !== undefined && cli !== null;
     }
 
-    _getSettings(roomId, eventType = "im.vector.settings") {
+    _getSettings(roomId, eventType = "im.vector.web.settings") {
         const room = MatrixClientPeg.get().getRoom(roomId);
         if (!room) return null;
 
diff --git a/src/stores/ActiveWidgetStore.js b/src/stores/ActiveWidgetStore.js
new file mode 100644
index 0000000000..89fa6e6936
--- /dev/null
+++ b/src/stores/ActiveWidgetStore.js
@@ -0,0 +1,153 @@
+/*
+Copyright 2018 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import EventEmitter from 'events';
+
+import MatrixClientPeg from '../MatrixClientPeg';
+
+/**
+ * Stores information about the widgets active in the app right now:
+ *  * What widget is set to remain always-on-screen, if any
+ *    Only one widget may be 'always on screen' at any one time.
+ *  * Negotiated capabilities for active apps
+ */
+class ActiveWidgetStore extends EventEmitter {
+    constructor() {
+        super();
+        this._persistentWidgetId = null;
+
+        // A list of negotiated capabilities for each widget, by ID
+        // {
+        //     widgetId: [caps...],
+        // }
+        this._capsByWidgetId = {};
+
+        // A WidgetMessaging instance for each widget ID
+        this._widgetMessagingByWidgetId = {};
+
+        // What room ID each widget is associated with (if it's a room widget)
+        this._roomIdByWidgetId = {};
+
+        this.onRoomStateEvents = this.onRoomStateEvents.bind(this);
+
+        this.dispatcherRef = null;
+    }
+
+    start() {
+        MatrixClientPeg.get().on('RoomState.events', this.onRoomStateEvents);
+    }
+
+    stop() {
+        if (MatrixClientPeg.get()) {
+            MatrixClientPeg.get().removeListener('RoomState.events', this.onRoomStateEvents);
+        }
+        this._capsByWidgetId = {};
+        this._widgetMessagingByWidgetId = {};
+        this._roomIdByWidgetId = {};
+    }
+
+    onRoomStateEvents(ev, state) {
+        // XXX: This listens for state events in order to remove the active widget.
+        // Everything else relies on views listening for events and calling setters
+        // on this class which is terrible. This store should just listen for events
+        // and keep itself up to date.
+        if (ev.getType() !== 'im.vector.modular.widgets') return;
+
+        if (ev.getStateKey() === this._persistentWidgetId) {
+            this.destroyPersistentWidget();
+        }
+    }
+
+    destroyPersistentWidget() {
+        const toDeleteId = this._persistentWidgetId;
+
+        this.setWidgetPersistence(toDeleteId, false);
+        this.delWidgetMessaging(toDeleteId);
+        this.delWidgetCapabilities(toDeleteId);
+        this.delRoomId(toDeleteId);
+    }
+
+    setWidgetPersistence(widgetId, val) {
+        if (this._persistentWidgetId === widgetId && !val) {
+            this._persistentWidgetId = null;
+        } else if (this._persistentWidgetId !== widgetId && val) {
+            this._persistentWidgetId = widgetId;
+        }
+        this.emit('update');
+    }
+
+    getWidgetPersistence(widgetId) {
+        return this._persistentWidgetId === widgetId;
+    }
+
+    getPersistentWidgetId() {
+        return this._persistentWidgetId;
+    }
+
+    setWidgetCapabilities(widgetId, caps) {
+        this._capsByWidgetId[widgetId] = caps;
+        this.emit('update');
+    }
+
+    widgetHasCapability(widgetId, cap) {
+        return this._capsByWidgetId[widgetId] && this._capsByWidgetId[widgetId].includes(cap);
+    }
+
+    delWidgetCapabilities(widgetId) {
+        delete this._capsByWidgetId[widgetId];
+        this.emit('update');
+    }
+
+    setWidgetMessaging(widgetId, wm) {
+        this._widgetMessagingByWidgetId[widgetId] = wm;
+        this.emit('update');
+    }
+
+    getWidgetMessaging(widgetId) {
+        return this._widgetMessagingByWidgetId[widgetId];
+    }
+
+    delWidgetMessaging(widgetId) {
+        if (this._widgetMessagingByWidgetId[widgetId]) {
+            try {
+                this._widgetMessagingByWidgetId[widgetId].stop();
+            } catch (e) {
+                console.error('Failed to stop listening for widgetMessaging events', e.message);
+            }
+            delete this._widgetMessagingByWidgetId[widgetId];
+            this.emit('update');
+        }
+    }
+
+    getRoomId(widgetId) {
+        return this._roomIdByWidgetId[widgetId];
+    }
+
+    setRoomId(widgetId, roomId) {
+        this._roomIdByWidgetId[widgetId] = roomId;
+        this.emit('update');
+    }
+
+    delRoomId(widgetId) {
+        delete this._roomIdByWidgetId[widgetId];
+        this.emit('update');
+    }
+}
+
+if (global.singletonActiveWidgetStore === undefined) {
+    global.singletonActiveWidgetStore = new ActiveWidgetStore();
+}
+export default global.singletonActiveWidgetStore;
diff --git a/src/stores/LifecycleStore.js b/src/stores/LifecycleStore.js
index 0d76f06e72..2ce3be5a33 100644
--- a/src/stores/LifecycleStore.js
+++ b/src/stores/LifecycleStore.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2017 Vector Creations Ltd
+Copyright 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/src/stores/MessageComposerStore.js b/src/stores/MessageComposerStore.js
index d02bcf953f..ab2dbfedec 100644
--- a/src/stores/MessageComposerStore.js
+++ b/src/stores/MessageComposerStore.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2017 Vector Creations Ltd
+Copyright 2017, 2018 Vector Creations Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -13,60 +13,49 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-import dis from '../dispatcher';
-import {Store} from 'flux/utils';
-import {convertToRaw, convertFromRaw} from 'draft-js';
+import { Value } from 'slate';
 
-const INITIAL_STATE = {
-    editorStateMap: localStorage.getItem('content_state') ?
-        JSON.parse(localStorage.getItem('content_state')) : {},
-};
+const localStoragePrefix = 'editor_state_';
 
 /**
- * A class for storing application state to do with the message composer. This is a simple
- * flux store that listens for actions and updates its state accordingly, informing any
- * listeners (views) of state changes.
+ * A class for storing application state to do with the message composer (specifically in-progress message drafts).
+ * It does not worry about cleaning up on log out as this is handled in Lifecycle.js by localStorage.clear()
  */
-class MessageComposerStore extends Store {
+class MessageComposerStore {
     constructor() {
-        super(dis);
-
-        // Initialise state
-        this._state = Object.assign({}, INITIAL_STATE);
+        this.prefix = localStoragePrefix;
     }
 
-    _setState(newState) {
-        this._state = Object.assign(this._state, newState);
-        this.__emitChange();
+    _getKey(roomId: string): string {
+        return this.prefix + roomId;
     }
 
-    __onDispatch(payload) {
-        switch (payload.action) {
-            case 'content_state':
-                this._contentState(payload);
-                break;
-            case 'on_logged_out':
-                this.reset();
-                break;
+    setEditorState(roomId: string, editorState: Value, richText: boolean) {
+        localStorage.setItem(this._getKey(roomId), JSON.stringify({
+            editor_state: editorState.toJSON({
+                preserveSelection: true,
+                // XXX: re-hydrating history is not currently supported by fromJSON
+                // preserveHistory: true,
+                // XXX: this seems like a workaround for selection.isSet being based on anchorKey instead of anchorPath
+                preserveKeys: true,
+            }),
+            rich_text: richText,
+        }));
+    }
+
+    getEditorState(roomId): {editor_state: Value, rich_text: boolean} {
+        const stateStr = localStorage.getItem(this._getKey(roomId));
+
+        let state;
+        if (stateStr) {
+            state = JSON.parse(stateStr);
+
+            // if it does not have the fields we expect then bail
+            if (!state || state.rich_text === undefined || state.editor_state === undefined) return;
+            state.editor_state = Value.fromJSON(state.editor_state);
         }
-    }
 
-    _contentState(payload) {
-        const editorStateMap = this._state.editorStateMap;
-        editorStateMap[payload.room_id] = convertToRaw(payload.content_state);
-        localStorage.setItem('content_state', JSON.stringify(editorStateMap));
-        this._setState({
-            editorStateMap: editorStateMap,
-        });
-    }
-
-    getContentState(roomId) {
-        return this._state.editorStateMap[roomId] ?
-            convertFromRaw(this._state.editorStateMap[roomId]) : null;
-    }
-
-    reset() {
-        this._state = Object.assign({}, INITIAL_STATE);
+        return state;
     }
 }
 
diff --git a/src/stores/RoomListStore.js b/src/stores/RoomListStore.js
index b6d0949dd3..67c0c13be7 100644
--- a/src/stores/RoomListStore.js
+++ b/src/stores/RoomListStore.js
@@ -45,6 +45,7 @@ class RoomListStore extends Store {
         // Initialise state
         this._state = {
             lists: {
+                "m.server_notice": [],
                 "im.vector.fake.invite": [],
                 "m.favourite": [],
                 "im.vector.fake.recent": [],
@@ -119,8 +120,7 @@ class RoomListStore extends Store {
                 this._generateRoomLists();
             }
             break;
-            case 'MatrixActions.RoomMember.membership': {
-                if (!this._matrixClient || payload.member.userId !== this._matrixClient.credentials.userId) break;
+            case 'MatrixActions.Room.myMembership': {
                 this._generateRoomLists();
             }
             break;
@@ -158,6 +158,7 @@ class RoomListStore extends Store {
 
     _generateRoomLists(optimisticRequest) {
         const lists = {
+            "m.server_notice": [],
             "im.vector.fake.invite": [],
             "m.favourite": [],
             "im.vector.fake.recent": [],
@@ -173,13 +174,13 @@ class RoomListStore extends Store {
         if (!this._matrixClient) return;
 
         this._matrixClient.getRooms().forEach((room, index) => {
-            const me = room.getMember(this._matrixClient.credentials.userId);
-            if (!me) return;
+            const myUserId = this._matrixClient.getUserId();
+            const membership = room.getMyMembership();
+            const me = room.getMember(myUserId);
 
-            if (me.membership == "invite") {
+            if (membership == "invite") {
                 lists["im.vector.fake.invite"].push(room);
-            } else if (me.membership == "join" || me.membership === "ban" ||
-                     (me.membership === "leave" && me.events.member.getSender() !== me.events.member.getStateKey())) {
+            } else if (membership == "join" || membership === "ban" || (me && me.isKicked())) {
                 // Used to split rooms via tags
                 let tagNames = Object.keys(room.tags);
 
@@ -194,6 +195,11 @@ class RoomListStore extends Store {
                     }
                 }
 
+                // ignore any m. tag names we don't know about
+                tagNames = tagNames.filter((t) => {
+                    return !t.startsWith('m.') || lists[t] !== undefined;
+                });
+
                 if (tagNames.length) {
                     for (let i = 0; i < tagNames.length; i++) {
                         const tagName = tagNames[i];
@@ -206,10 +212,8 @@ class RoomListStore extends Store {
                 } else {
                     lists["im.vector.fake.recent"].push(room);
                 }
-            } else if (me.membership === "leave") {
+            } else if (membership === "leave") {
                 lists["im.vector.fake.archived"].push(room);
-            } else {
-                console.error("unrecognised membership: " + me.membership + " - this should never happen");
             }
         });
 
@@ -277,8 +281,8 @@ class RoomListStore extends Store {
             if (optimisticRequest && roomB === optimisticRequest.room) metaB = optimisticRequest.metaData;
 
             // Make sure the room tag has an order element, if not set it to be the bottom
-            const a = metaA.order;
-            const b = metaB.order;
+            const a = metaA ? metaA.order : undefined;
+            const b = metaB ? metaB.order : undefined;
 
             // Order undefined room tag orders to the bottom
             if (a === undefined && b !== undefined) {
diff --git a/src/stores/RoomViewStore.js b/src/stores/RoomViewStore.js
index 923c073065..f15925f480 100644
--- a/src/stores/RoomViewStore.js
+++ b/src/stores/RoomViewStore.js
@@ -1,6 +1,6 @@
 /*
 Copyright 2017 Vector Creations Ltd
-Copyright 2017 New Vector Ltd
+Copyright 2017, 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -147,6 +147,8 @@ class RoomViewStore extends Store {
                 joining: payload.joining || false,
                 // Reset replyingToEvent because we don't want cross-room because bad UX
                 replyingToEvent: null,
+                // pull the user out of Room Settings
+                isEditingSettings: false,
             };
 
             if (this._state.forwardingEvent) {
@@ -221,7 +223,13 @@ class RoomViewStore extends Store {
                 action: 'join_room_error',
                 err: err,
             });
-            const msg = err.message ? err.message : JSON.stringify(err);
+            let msg = err.message ? err.message : JSON.stringify(err);
+            if (err.errcode === 'M_INCOMPATIBLE_ROOM_VERSION') {
+                msg = 
    
+                    {_t("Sorry, your homeserver is too old to participate in this room.")}
    
+                    {_t("Please contact your homeserver administrator.")}
+                
    ;
+            }
             const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             Modal.createTrackedDialog('Failed to join room', '', ErrorDialog, {
                 title: _t("Failed to join room"),
diff --git a/src/stores/WidgetEchoStore.js b/src/stores/WidgetEchoStore.js
new file mode 100644
index 0000000000..0d14ed1d60
--- /dev/null
+++ b/src/stores/WidgetEchoStore.js
@@ -0,0 +1,108 @@
+/*
+Copyright 2018 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import EventEmitter from 'events';
+
+/**
+ * Acts as a place to get & set widget state, storing local echo state and
+ * proxying through state from the js-sdk.
+ */
+class WidgetEchoStore extends EventEmitter {
+    constructor() {
+        super();
+
+        this._roomWidgetEcho = {
+            // Map as below. Object is the content of the widget state event,
+            // so for widgets that have been deleted locally, the object is empty.
+            // roomId: {
+            //     widgetId: [object]
+            // }
+        };
+    }
+
+    /**
+     * Gets the widgets for a room, substracting those that are pending deletion.
+     * Widgets that are pending addition are not included, since widgets are
+     * represted as MatrixEvents, so to do this we'd have to create fake MatrixEvents,
+     * and we don't really need the actual widget events anyway since we just want to
+     * show a spinner / prevent widgets being added twice.
+     *
+     * @param {Room} roomId The ID of the room to get widgets for
+     * @param {MatrixEvent[]} currentRoomWidgets Current widgets for the room
+     * @returns {MatrixEvent[]} List of widgets in the room, minus any pending removal
+     */
+    getEchoedRoomWidgets(roomId, currentRoomWidgets) {
+        const echoedWidgets = [];
+
+        const roomEchoState = Object.assign({}, this._roomWidgetEcho[roomId]);
+
+        for (const w of currentRoomWidgets) {
+            const widgetId = w.getStateKey();
+            // If there's no echo, or the echo still has a widget present, show the *old* widget
+            // we don't include widgets that have changed for the same reason we don't include new ones,
+            // ie. we'd need to fake matrix events to do so and therte's currently no need.
+            if (!roomEchoState[widgetId] || Object.keys(roomEchoState[widgetId]).length !== 0) {
+                echoedWidgets.push(w);
+            }
+            delete roomEchoState[widgetId];
+        }
+
+        return echoedWidgets;
+    }
+
+    roomHasPendingWidgetsOfType(roomId, currentRoomWidgets, type) {
+        const roomEchoState = Object.assign({}, this._roomWidgetEcho[roomId]);
+
+        // any widget IDs that are already in the room are not pending, so
+        // echoes for them don't count as pending.
+        for (const w of currentRoomWidgets) {
+            const widgetId = w.getStateKey();
+            delete roomEchoState[widgetId];
+        }
+
+        // if there's anything left then there are pending widgets.
+        if (type === undefined) {
+            return Object.keys(roomEchoState).length > 0;
+        } else {
+            return Object.values(roomEchoState).some((widget) => {
+                return widget.type === type;
+            });
+        }
+    }
+
+    roomHasPendingWidgets(roomId, currentRoomWidgets) {
+        return this.roomHasPendingWidgetsOfType(roomId, currentRoomWidgets);
+    }
+
+    setRoomWidgetEcho(roomId, widgetId, state) {
+        if (this._roomWidgetEcho[roomId] === undefined) this._roomWidgetEcho[roomId] = {};
+
+        this._roomWidgetEcho[roomId][widgetId] = state;
+        this.emit('update');
+    }
+
+    removeRoomWidgetEcho(roomId, widgetId) {
+        delete this._roomWidgetEcho[roomId][widgetId];
+        if (Object.keys(this._roomWidgetEcho[roomId]).length === 0) delete this._roomWidgetEcho[roomId];
+        this.emit('update');
+    }
+}
+
+let singletonWidgetEchoStore = null;
+if (!singletonWidgetEchoStore) {
+    singletonWidgetEchoStore = new WidgetEchoStore();
+}
+module.exports = singletonWidgetEchoStore;
diff --git a/src/stripped-emoji.json b/src/stripped-emoji.json
index f39d76e877..16b772ae51 100644
--- a/src/stripped-emoji.json
+++ b/src/stripped-emoji.json
@@ -1 +1 @@
-[{"name":"hundred points symbol","shortname":":100:","category":"symbols","emoji_order":"2119"},{"name":"input symbol for numbers","shortname":":1234:","category":"symbols","emoji_order":"2122"},{"name":"grinning face","shortname":":grinning:","category":"people","emoji_order":"1"},{"name":"grinning face with smiling eyes","shortname":":grin:","category":"people","emoji_order":"2"},{"name":"face with tears of joy","shortname":":joy:","category":"people","emoji_order":"3","aliases_ascii":[":')",":'-)"]},{"name":"rolling on the floor laughing","shortname":":rofl:","category":"people","emoji_order":"4"},{"name":"smiling face with open mouth","shortname":":smiley:","category":"people","emoji_order":"5","aliases_ascii":[":D",":-D","=D"]},{"name":"smiling face with open mouth and smiling eyes","shortname":":smile:","category":"people","emoji_order":"6"},{"name":"smiling face with open mouth and cold sweat","shortname":":sweat_smile:","category":"people","emoji_order":"7","aliases_ascii":["':)","':-)","'=)","':D","':-D","'=D"]},{"name":"smiling face with open mouth and tightly-closed eyes","shortname":":laughing:","category":"people","emoji_order":"8","aliases_ascii":[">:)",">;)",">:-)",">=)"]},{"name":"winking face","shortname":":wink:","category":"people","emoji_order":"9","aliases_ascii":[";)",";-)","*-)","*)",";-]",";]",";D",";^)"]},{"name":"smiling face with smiling eyes","shortname":":blush:","category":"people","emoji_order":"10"},{"name":"face savouring delicious food","shortname":":yum:","category":"people","emoji_order":"11"},{"name":"smiling face with sunglasses","shortname":":sunglasses:","category":"people","emoji_order":"12","aliases_ascii":["B-)","B)","8)","8-)","B-D","8-D"]},{"name":"smiling face with heart-shaped eyes","shortname":":heart_eyes:","category":"people","emoji_order":"13"},{"name":"face throwing a kiss","shortname":":kissing_heart:","category":"people","emoji_order":"14","aliases_ascii":[":*",":-*","=*",":^*"]},{"name":"kissing face","shortname":":kissing:","category":"people","emoji_order":"15"},{"name":"kissing face with smiling eyes","shortname":":kissing_smiling_eyes:","category":"people","emoji_order":"16"},{"name":"kissing face with closed eyes","shortname":":kissing_closed_eyes:","category":"people","emoji_order":"17"},{"name":"white smiling face","shortname":":relaxed:","category":"people","emoji_order":"18"},{"name":"slightly smiling face","shortname":":slight_smile:","category":"people","emoji_order":"19","aliases_ascii":[":)",":-)","=]","=)",":]"]},{"name":"hugging face","shortname":":hugging:","category":"people","emoji_order":"20"},{"name":"thinking face","shortname":":thinking:","category":"people","emoji_order":"21"},{"name":"neutral face","shortname":":neutral_face:","category":"people","emoji_order":"22"},{"name":"expressionless face","shortname":":expressionless:","category":"people","emoji_order":"23","aliases_ascii":["-_-","-__-","-___-"]},{"name":"face without mouth","shortname":":no_mouth:","category":"people","emoji_order":"24","aliases_ascii":[":-X",":X",":-#",":#","=X","=x",":x",":-x","=#"]},{"name":"face with rolling eyes","shortname":":rolling_eyes:","category":"people","emoji_order":"25"},{"name":"smirking face","shortname":":smirk:","category":"people","emoji_order":"26"},{"name":"persevering face","shortname":":persevere:","category":"people","emoji_order":"27","aliases_ascii":[">.<"]},{"name":"disappointed but relieved face","shortname":":disappointed_relieved:","category":"people","emoji_order":"28"},{"name":"face with open mouth","shortname":":open_mouth:","category":"people","emoji_order":"29","aliases_ascii":[":-O",":O",":-o",":o","O_O",">:O"]},{"name":"zipper-mouth face","shortname":":zipper_mouth:","category":"people","emoji_order":"30"},{"name":"hushed face","shortname":":hushed:","category":"people","emoji_order":"31"},{"name":"sleepy face","shortname":":sleepy:","category":"people","emoji_order":"32"},{"name":"tired face","shortname":":tired_face:","category":"people","emoji_order":"33"},{"name":"sleeping face","shortname":":sleeping:","category":"people","emoji_order":"34"},{"name":"relieved face","shortname":":relieved:","category":"people","emoji_order":"35"},{"name":"nerd face","shortname":":nerd:","category":"people","emoji_order":"36"},{"name":"face with stuck-out tongue","shortname":":stuck_out_tongue:","category":"people","emoji_order":"37","aliases_ascii":[":P",":-P","=P",":-p",":p","=p",":-Þ",":Þ",":þ",":-þ",":-b",":b","d:"]},{"name":"face with stuck-out tongue and winking eye","shortname":":stuck_out_tongue_winking_eye:","category":"people","emoji_order":"38","aliases_ascii":[">:P","X-P","x-p"]},{"name":"face with stuck-out tongue and tightly-closed eyes","shortname":":stuck_out_tongue_closed_eyes:","category":"people","emoji_order":"39"},{"name":"drooling face","shortname":":drooling_face:","category":"people","emoji_order":"40"},{"name":"unamused face","shortname":":unamused:","category":"people","emoji_order":"41"},{"name":"face with cold sweat","shortname":":sweat:","category":"people","emoji_order":"42","aliases_ascii":["':(","':-(","'=("]},{"name":"pensive face","shortname":":pensive:","category":"people","emoji_order":"43"},{"name":"confused face","shortname":":confused:","category":"people","emoji_order":"44","aliases_ascii":[">:\\",">:/",":-/",":-.",":/",":\\","=/","=\\",":L","=L"]},{"name":"upside-down face","shortname":":upside_down:","category":"people","emoji_order":"45"},{"name":"money-mouth face","shortname":":money_mouth:","category":"people","emoji_order":"46"},{"name":"astonished face","shortname":":astonished:","category":"people","emoji_order":"47"},{"name":"white frowning face","shortname":":frowning2:","category":"people","emoji_order":"48"},{"name":"slightly frowning face","shortname":":slight_frown:","category":"people","emoji_order":"49"},{"name":"confounded face","shortname":":confounded:","category":"people","emoji_order":"50"},{"name":"disappointed face","shortname":":disappointed:","category":"people","emoji_order":"51","aliases_ascii":[">:[",":-(",":(",":-[",":[","=("]},{"name":"worried face","shortname":":worried:","category":"people","emoji_order":"52"},{"name":"face with look of triumph","shortname":":triumph:","category":"people","emoji_order":"53"},{"name":"crying face","shortname":":cry:","category":"people","emoji_order":"54","aliases_ascii":[":'(",":'-(",";(",";-("]},{"name":"loudly crying face","shortname":":sob:","category":"people","emoji_order":"55"},{"name":"frowning face with open mouth","shortname":":frowning:","category":"people","emoji_order":"56"},{"name":"anguished face","shortname":":anguished:","category":"people","emoji_order":"57"},{"name":"fearful face","shortname":":fearful:","category":"people","emoji_order":"58","aliases_ascii":["D:"]},{"name":"weary face","shortname":":weary:","category":"people","emoji_order":"59"},{"name":"grimacing face","shortname":":grimacing:","category":"people","emoji_order":"60"},{"name":"face with open mouth and cold sweat","shortname":":cold_sweat:","category":"people","emoji_order":"61"},{"name":"face screaming in fear","shortname":":scream:","category":"people","emoji_order":"62"},{"name":"flushed face","shortname":":flushed:","category":"people","emoji_order":"63","aliases_ascii":[":$","=$"]},{"name":"dizzy face","shortname":":dizzy_face:","category":"people","emoji_order":"64","aliases_ascii":["#-)","#)","%-)","%)","X)","X-)"]},{"name":"pouting face","shortname":":rage:","category":"people","emoji_order":"65"},{"name":"angry face","shortname":":angry:","category":"people","emoji_order":"66","aliases_ascii":[">:(",">:-(",":@"]},{"name":"smiling face with halo","shortname":":innocent:","category":"people","emoji_order":"67","aliases_ascii":["O:-)","0:-3","0:3","0:-)","0:)","0;^)","O:)","O;-)","O=)","0;-)","O:-3","O:3"]},{"name":"face with cowboy hat","shortname":":cowboy:","category":"people","emoji_order":"68"},{"name":"clown face","shortname":":clown:","category":"people","emoji_order":"69"},{"name":"lying face","shortname":":lying_face:","category":"people","emoji_order":"70"},{"name":"face with medical mask","shortname":":mask:","category":"people","emoji_order":"71"},{"name":"face with thermometer","shortname":":thermometer_face:","category":"people","emoji_order":"72"},{"name":"face with head-bandage","shortname":":head_bandage:","category":"people","emoji_order":"73"},{"name":"nauseated face","shortname":":nauseated_face:","category":"people","emoji_order":"74"},{"name":"sneezing face","shortname":":sneezing_face:","category":"people","emoji_order":"75"},{"name":"smiling face with horns","shortname":":smiling_imp:","category":"people","emoji_order":"76"},{"name":"imp","shortname":":imp:","category":"people","emoji_order":"77"},{"name":"japanese ogre","shortname":":japanese_ogre:","category":"people","emoji_order":"78"},{"name":"japanese goblin","shortname":":japanese_goblin:","category":"people","emoji_order":"79"},{"name":"skull","shortname":":skull:","category":"people","emoji_order":"80"},{"name":"skull and crossbones","shortname":":skull_crossbones:","category":"objects","emoji_order":"81"},{"name":"ghost","shortname":":ghost:","category":"people","emoji_order":"82"},{"name":"extraterrestrial alien","shortname":":alien:","category":"people","emoji_order":"83"},{"name":"alien monster","shortname":":space_invader:","category":"activity","emoji_order":"84"},{"name":"robot face","shortname":":robot:","category":"people","emoji_order":"85"},{"name":"pile of poo","shortname":":poop:","category":"people","emoji_order":"86"},{"name":"smiling cat face with open mouth","shortname":":smiley_cat:","category":"people","emoji_order":"87"},{"name":"grinning cat face with smiling eyes","shortname":":smile_cat:","category":"people","emoji_order":"88"},{"name":"cat face with tears of joy","shortname":":joy_cat:","category":"people","emoji_order":"89"},{"name":"smiling cat face with heart-shaped eyes","shortname":":heart_eyes_cat:","category":"people","emoji_order":"90"},{"name":"cat face with wry smile","shortname":":smirk_cat:","category":"people","emoji_order":"91"},{"name":"kissing cat face with closed eyes","shortname":":kissing_cat:","category":"people","emoji_order":"92"},{"name":"weary cat face","shortname":":scream_cat:","category":"people","emoji_order":"93"},{"name":"crying cat face","shortname":":crying_cat_face:","category":"people","emoji_order":"94"},{"name":"pouting cat face","shortname":":pouting_cat:","category":"people","emoji_order":"95"},{"name":"see-no-evil monkey","shortname":":see_no_evil:","category":"nature","emoji_order":"96"},{"name":"hear-no-evil monkey","shortname":":hear_no_evil:","category":"nature","emoji_order":"97"},{"name":"speak-no-evil monkey","shortname":":speak_no_evil:","category":"nature","emoji_order":"98"},{"name":"boy","shortname":":boy:","category":"people","emoji_order":"99"},{"name":"boy tone 1","shortname":":boy_tone1:","category":"people","emoji_order":"100"},{"name":"boy tone 2","shortname":":boy_tone2:","category":"people","emoji_order":"101"},{"name":"boy tone 3","shortname":":boy_tone3:","category":"people","emoji_order":"102"},{"name":"boy tone 4","shortname":":boy_tone4:","category":"people","emoji_order":"103"},{"name":"boy tone 5","shortname":":boy_tone5:","category":"people","emoji_order":"104"},{"name":"girl","shortname":":girl:","category":"people","emoji_order":"105"},{"name":"girl tone 1","shortname":":girl_tone1:","category":"people","emoji_order":"106"},{"name":"girl tone 2","shortname":":girl_tone2:","category":"people","emoji_order":"107"},{"name":"girl tone 3","shortname":":girl_tone3:","category":"people","emoji_order":"108"},{"name":"girl tone 4","shortname":":girl_tone4:","category":"people","emoji_order":"109"},{"name":"girl tone 5","shortname":":girl_tone5:","category":"people","emoji_order":"110"},{"name":"man","shortname":":man:","category":"people","emoji_order":"111"},{"name":"man tone 1","shortname":":man_tone1:","category":"people","emoji_order":"112"},{"name":"man tone 2","shortname":":man_tone2:","category":"people","emoji_order":"113"},{"name":"man tone 3","shortname":":man_tone3:","category":"people","emoji_order":"114"},{"name":"man tone 4","shortname":":man_tone4:","category":"people","emoji_order":"115"},{"name":"man tone 5","shortname":":man_tone5:","category":"people","emoji_order":"116"},{"name":"woman","shortname":":woman:","category":"people","emoji_order":"117"},{"name":"woman tone 1","shortname":":woman_tone1:","category":"people","emoji_order":"118"},{"name":"woman tone 2","shortname":":woman_tone2:","category":"people","emoji_order":"119"},{"name":"woman tone 3","shortname":":woman_tone3:","category":"people","emoji_order":"120"},{"name":"woman tone 4","shortname":":woman_tone4:","category":"people","emoji_order":"121"},{"name":"woman tone 5","shortname":":woman_tone5:","category":"people","emoji_order":"122"},{"name":"older man","shortname":":older_man:","category":"people","emoji_order":"123"},{"name":"older man tone 1","shortname":":older_man_tone1:","category":"people","emoji_order":"124"},{"name":"older man tone 2","shortname":":older_man_tone2:","category":"people","emoji_order":"125"},{"name":"older man tone 3","shortname":":older_man_tone3:","category":"people","emoji_order":"126"},{"name":"older man tone 4","shortname":":older_man_tone4:","category":"people","emoji_order":"127"},{"name":"older man tone 5","shortname":":older_man_tone5:","category":"people","emoji_order":"128"},{"name":"older woman","shortname":":older_woman:","category":"people","emoji_order":"129"},{"name":"older woman tone 1","shortname":":older_woman_tone1:","category":"people","emoji_order":"130"},{"name":"older woman tone 2","shortname":":older_woman_tone2:","category":"people","emoji_order":"131"},{"name":"older woman tone 3","shortname":":older_woman_tone3:","category":"people","emoji_order":"132"},{"name":"older woman tone 4","shortname":":older_woman_tone4:","category":"people","emoji_order":"133"},{"name":"older woman tone 5","shortname":":older_woman_tone5:","category":"people","emoji_order":"134"},{"name":"baby","shortname":":baby:","category":"people","emoji_order":"135"},{"name":"baby tone 1","shortname":":baby_tone1:","category":"people","emoji_order":"136"},{"name":"baby tone 2","shortname":":baby_tone2:","category":"people","emoji_order":"137"},{"name":"baby tone 3","shortname":":baby_tone3:","category":"people","emoji_order":"138"},{"name":"baby tone 4","shortname":":baby_tone4:","category":"people","emoji_order":"139"},{"name":"baby tone 5","shortname":":baby_tone5:","category":"people","emoji_order":"140"},{"name":"baby angel","shortname":":angel:","category":"people","emoji_order":"141"},{"name":"baby angel tone 1","shortname":":angel_tone1:","category":"people","emoji_order":"142"},{"name":"baby angel tone 2","shortname":":angel_tone2:","category":"people","emoji_order":"143"},{"name":"baby angel tone 3","shortname":":angel_tone3:","category":"people","emoji_order":"144"},{"name":"baby angel tone 4","shortname":":angel_tone4:","category":"people","emoji_order":"145"},{"name":"baby angel tone 5","shortname":":angel_tone5:","category":"people","emoji_order":"146"},{"name":"police officer","shortname":":cop:","category":"people","emoji_order":"339"},{"name":"police officer tone 1","shortname":":cop_tone1:","category":"people","emoji_order":"340"},{"name":"police officer tone 2","shortname":":cop_tone2:","category":"people","emoji_order":"341"},{"name":"police officer tone 3","shortname":":cop_tone3:","category":"people","emoji_order":"342"},{"name":"police officer tone 4","shortname":":cop_tone4:","category":"people","emoji_order":"343"},{"name":"police officer tone 5","shortname":":cop_tone5:","category":"people","emoji_order":"344"},{"name":"sleuth or spy","shortname":":spy:","category":"people","emoji_order":"357"},{"name":"sleuth or spy tone 1","shortname":":spy_tone1:","category":"people","emoji_order":"358"},{"name":"sleuth or spy tone 2","shortname":":spy_tone2:","category":"people","emoji_order":"359"},{"name":"sleuth or spy tone 3","shortname":":spy_tone3:","category":"people","emoji_order":"360"},{"name":"sleuth or spy tone 4","shortname":":spy_tone4:","category":"people","emoji_order":"361"},{"name":"sleuth or spy tone 5","shortname":":spy_tone5:","category":"people","emoji_order":"362"},{"name":"guardsman","shortname":":guardsman:","category":"people","emoji_order":"375"},{"name":"guardsman tone 1","shortname":":guardsman_tone1:","category":"people","emoji_order":"376"},{"name":"guardsman tone 2","shortname":":guardsman_tone2:","category":"people","emoji_order":"377"},{"name":"guardsman tone 3","shortname":":guardsman_tone3:","category":"people","emoji_order":"378"},{"name":"guardsman tone 4","shortname":":guardsman_tone4:","category":"people","emoji_order":"379"},{"name":"guardsman tone 5","shortname":":guardsman_tone5:","category":"people","emoji_order":"380"},{"name":"construction worker","shortname":":construction_worker:","category":"people","emoji_order":"393"},{"name":"construction worker tone 1","shortname":":construction_worker_tone1:","category":"people","emoji_order":"394"},{"name":"construction worker tone 2","shortname":":construction_worker_tone2:","category":"people","emoji_order":"395"},{"name":"construction worker tone 3","shortname":":construction_worker_tone3:","category":"people","emoji_order":"396"},{"name":"construction worker tone 4","shortname":":construction_worker_tone4:","category":"people","emoji_order":"397"},{"name":"construction worker tone 5","shortname":":construction_worker_tone5:","category":"people","emoji_order":"398"},{"name":"man with turban","shortname":":man_with_turban:","category":"people","emoji_order":"411"},{"name":"man with turban tone 1","shortname":":man_with_turban_tone1:","category":"people","emoji_order":"412"},{"name":"man with turban tone 2","shortname":":man_with_turban_tone2:","category":"people","emoji_order":"413"},{"name":"man with turban tone 3","shortname":":man_with_turban_tone3:","category":"people","emoji_order":"414"},{"name":"man with turban tone 4","shortname":":man_with_turban_tone4:","category":"people","emoji_order":"415"},{"name":"man with turban tone 5","shortname":":man_with_turban_tone5:","category":"people","emoji_order":"416"},{"name":"person with blond hair","shortname":":person_with_blond_hair:","category":"people","emoji_order":"429"},{"name":"person with blond hair tone 1","shortname":":person_with_blond_hair_tone1:","category":"people","emoji_order":"430"},{"name":"person with blond hair tone 2","shortname":":person_with_blond_hair_tone2:","category":"people","emoji_order":"431"},{"name":"person with blond hair tone 3","shortname":":person_with_blond_hair_tone3:","category":"people","emoji_order":"432"},{"name":"person with blond hair tone 4","shortname":":person_with_blond_hair_tone4:","category":"people","emoji_order":"433"},{"name":"person with blond hair tone 5","shortname":":person_with_blond_hair_tone5:","category":"people","emoji_order":"434"},{"name":"father christmas","shortname":":santa:","category":"people","emoji_order":"447"},{"name":"father christmas tone 1","shortname":":santa_tone1:","category":"people","emoji_order":"448"},{"name":"father christmas tone 2","shortname":":santa_tone2:","category":"people","emoji_order":"449"},{"name":"father christmas tone 3","shortname":":santa_tone3:","category":"people","emoji_order":"450"},{"name":"father christmas tone 4","shortname":":santa_tone4:","category":"people","emoji_order":"451"},{"name":"father christmas tone 5","shortname":":santa_tone5:","category":"people","emoji_order":"452"},{"name":"mother christmas","shortname":":mrs_claus:","category":"people","emoji_order":"453"},{"name":"mother christmas tone 1","shortname":":mrs_claus_tone1:","category":"people","emoji_order":"454"},{"name":"mother christmas tone 2","shortname":":mrs_claus_tone2:","category":"people","emoji_order":"455"},{"name":"mother christmas tone 3","shortname":":mrs_claus_tone3:","category":"people","emoji_order":"456"},{"name":"mother christmas tone 4","shortname":":mrs_claus_tone4:","category":"people","emoji_order":"457"},{"name":"mother christmas tone 5","shortname":":mrs_claus_tone5:","category":"people","emoji_order":"458"},{"name":"princess","shortname":":princess:","category":"people","emoji_order":"459"},{"name":"princess tone 1","shortname":":princess_tone1:","category":"people","emoji_order":"460"},{"name":"princess tone 2","shortname":":princess_tone2:","category":"people","emoji_order":"461"},{"name":"princess tone 3","shortname":":princess_tone3:","category":"people","emoji_order":"462"},{"name":"princess tone 4","shortname":":princess_tone4:","category":"people","emoji_order":"463"},{"name":"princess tone 5","shortname":":princess_tone5:","category":"people","emoji_order":"464"},{"name":"prince","shortname":":prince:","category":"people","emoji_order":"465"},{"name":"prince tone 1","shortname":":prince_tone1:","category":"people","emoji_order":"466"},{"name":"prince tone 2","shortname":":prince_tone2:","category":"people","emoji_order":"467"},{"name":"prince tone 3","shortname":":prince_tone3:","category":"people","emoji_order":"468"},{"name":"prince tone 4","shortname":":prince_tone4:","category":"people","emoji_order":"469"},{"name":"prince tone 5","shortname":":prince_tone5:","category":"people","emoji_order":"470"},{"name":"bride with veil","shortname":":bride_with_veil:","category":"people","emoji_order":"471"},{"name":"bride with veil tone 1","shortname":":bride_with_veil_tone1:","category":"people","emoji_order":"472"},{"name":"bride with veil tone 2","shortname":":bride_with_veil_tone2:","category":"people","emoji_order":"473"},{"name":"bride with veil tone 3","shortname":":bride_with_veil_tone3:","category":"people","emoji_order":"474"},{"name":"bride with veil tone 4","shortname":":bride_with_veil_tone4:","category":"people","emoji_order":"475"},{"name":"bride with veil tone 5","shortname":":bride_with_veil_tone5:","category":"people","emoji_order":"476"},{"name":"man in tuxedo","shortname":":man_in_tuxedo:","category":"people","emoji_order":"477"},{"name":"man in tuxedo tone 1","shortname":":man_in_tuxedo_tone1:","category":"people","emoji_order":"478"},{"name":"man in tuxedo tone 2","shortname":":man_in_tuxedo_tone2:","category":"people","emoji_order":"479"},{"name":"man in tuxedo tone 3","shortname":":man_in_tuxedo_tone3:","category":"people","emoji_order":"480"},{"name":"man in tuxedo tone 4","shortname":":man_in_tuxedo_tone4:","category":"people","emoji_order":"481"},{"name":"man in tuxedo tone 5","shortname":":man_in_tuxedo_tone5:","category":"people","emoji_order":"482"},{"name":"pregnant woman","shortname":":pregnant_woman:","category":"people","emoji_order":"483"},{"name":"pregnant woman tone 1","shortname":":pregnant_woman_tone1:","category":"people","emoji_order":"484"},{"name":"pregnant woman tone 2","shortname":":pregnant_woman_tone2:","category":"people","emoji_order":"485"},{"name":"pregnant woman tone 3","shortname":":pregnant_woman_tone3:","category":"people","emoji_order":"486"},{"name":"pregnant woman tone 4","shortname":":pregnant_woman_tone4:","category":"people","emoji_order":"487"},{"name":"pregnant woman tone 5","shortname":":pregnant_woman_tone5:","category":"people","emoji_order":"488"},{"name":"man with gua pi mao","shortname":":man_with_gua_pi_mao:","category":"people","emoji_order":"489"},{"name":"man with gua pi mao tone 1","shortname":":man_with_gua_pi_mao_tone1:","category":"people","emoji_order":"490"},{"name":"man with gua pi mao tone 2","shortname":":man_with_gua_pi_mao_tone2:","category":"people","emoji_order":"491"},{"name":"man with gua pi mao tone 3","shortname":":man_with_gua_pi_mao_tone3:","category":"people","emoji_order":"492"},{"name":"man with gua pi mao tone 4","shortname":":man_with_gua_pi_mao_tone4:","category":"people","emoji_order":"493"},{"name":"man with gua pi mao tone 5","shortname":":man_with_gua_pi_mao_tone5:","category":"people","emoji_order":"494"},{"name":"person frowning","shortname":":person_frowning:","category":"people","emoji_order":"495"},{"name":"person frowning tone 1","shortname":":person_frowning_tone1:","category":"people","emoji_order":"496"},{"name":"person frowning tone 2","shortname":":person_frowning_tone2:","category":"people","emoji_order":"497"},{"name":"person frowning tone 3","shortname":":person_frowning_tone3:","category":"people","emoji_order":"498"},{"name":"person frowning tone 4","shortname":":person_frowning_tone4:","category":"people","emoji_order":"499"},{"name":"person frowning tone 5","shortname":":person_frowning_tone5:","category":"people","emoji_order":"500"},{"name":"person with pouting face","shortname":":person_with_pouting_face:","category":"people","emoji_order":"513"},{"name":"person with pouting face tone1","shortname":":person_with_pouting_face_tone1:","category":"people","emoji_order":"514"},{"name":"person with pouting face tone2","shortname":":person_with_pouting_face_tone2:","category":"people","emoji_order":"515"},{"name":"person with pouting face tone3","shortname":":person_with_pouting_face_tone3:","category":"people","emoji_order":"516"},{"name":"person with pouting face tone4","shortname":":person_with_pouting_face_tone4:","category":"people","emoji_order":"517"},{"name":"person with pouting face tone5","shortname":":person_with_pouting_face_tone5:","category":"people","emoji_order":"518"},{"name":"face with no good gesture","shortname":":no_good:","category":"people","emoji_order":"531"},{"name":"face with no good gesture tone 1","shortname":":no_good_tone1:","category":"people","emoji_order":"532"},{"name":"face with no good gesture tone 2","shortname":":no_good_tone2:","category":"people","emoji_order":"533"},{"name":"face with no good gesture tone 3","shortname":":no_good_tone3:","category":"people","emoji_order":"534"},{"name":"face with no good gesture tone 4","shortname":":no_good_tone4:","category":"people","emoji_order":"535"},{"name":"face with no good gesture tone 5","shortname":":no_good_tone5:","category":"people","emoji_order":"536"},{"name":"face with ok gesture","shortname":":ok_woman:","category":"people","emoji_order":"549","aliases_ascii":["*\\0/*","\\0/","*\\O/*","\\O/"]},{"name":"face with ok gesture tone1","shortname":":ok_woman_tone1:","category":"people","emoji_order":"550"},{"name":"face with ok gesture tone2","shortname":":ok_woman_tone2:","category":"people","emoji_order":"551"},{"name":"face with ok gesture tone3","shortname":":ok_woman_tone3:","category":"people","emoji_order":"552"},{"name":"face with ok gesture tone4","shortname":":ok_woman_tone4:","category":"people","emoji_order":"553"},{"name":"face with ok gesture tone5","shortname":":ok_woman_tone5:","category":"people","emoji_order":"554"},{"name":"information desk person","shortname":":information_desk_person:","category":"people","emoji_order":"567"},{"name":"information desk person tone 1","shortname":":information_desk_person_tone1:","category":"people","emoji_order":"568"},{"name":"information desk person tone 2","shortname":":information_desk_person_tone2:","category":"people","emoji_order":"569"},{"name":"information desk person tone 3","shortname":":information_desk_person_tone3:","category":"people","emoji_order":"570"},{"name":"information desk person tone 4","shortname":":information_desk_person_tone4:","category":"people","emoji_order":"571"},{"name":"information desk person tone 5","shortname":":information_desk_person_tone5:","category":"people","emoji_order":"572"},{"name":"happy person raising one hand","shortname":":raising_hand:","category":"people","emoji_order":"585"},{"name":"happy person raising one hand tone1","shortname":":raising_hand_tone1:","category":"people","emoji_order":"586"},{"name":"happy person raising one hand tone2","shortname":":raising_hand_tone2:","category":"people","emoji_order":"587"},{"name":"happy person raising one hand tone3","shortname":":raising_hand_tone3:","category":"people","emoji_order":"588"},{"name":"happy person raising one hand tone4","shortname":":raising_hand_tone4:","category":"people","emoji_order":"589"},{"name":"happy person raising one hand tone5","shortname":":raising_hand_tone5:","category":"people","emoji_order":"590"},{"name":"person bowing deeply","shortname":":bow:","category":"people","emoji_order":"603"},{"name":"person bowing deeply tone 1","shortname":":bow_tone1:","category":"people","emoji_order":"604"},{"name":"person bowing deeply tone 2","shortname":":bow_tone2:","category":"people","emoji_order":"605"},{"name":"person bowing deeply tone 3","shortname":":bow_tone3:","category":"people","emoji_order":"606"},{"name":"person bowing deeply tone 4","shortname":":bow_tone4:","category":"people","emoji_order":"607"},{"name":"person bowing deeply tone 5","shortname":":bow_tone5:","category":"people","emoji_order":"608"},{"name":"face palm","shortname":":face_palm:","category":"people","emoji_order":"621"},{"name":"face palm tone 1","shortname":":face_palm_tone1:","category":"people","emoji_order":"622"},{"name":"face palm tone 2","shortname":":face_palm_tone2:","category":"people","emoji_order":"623"},{"name":"face palm tone 3","shortname":":face_palm_tone3:","category":"people","emoji_order":"624"},{"name":"face palm tone 4","shortname":":face_palm_tone4:","category":"people","emoji_order":"625"},{"name":"face palm tone 5","shortname":":face_palm_tone5:","category":"people","emoji_order":"626"},{"name":"shrug","shortname":":shrug:","category":"people","emoji_order":"639"},{"name":"shrug tone 1","shortname":":shrug_tone1:","category":"people","emoji_order":"640"},{"name":"shrug tone 2","shortname":":shrug_tone2:","category":"people","emoji_order":"641"},{"name":"shrug tone 3","shortname":":shrug_tone3:","category":"people","emoji_order":"642"},{"name":"shrug tone 4","shortname":":shrug_tone4:","category":"people","emoji_order":"643"},{"name":"shrug tone 5","shortname":":shrug_tone5:","category":"people","emoji_order":"644"},{"name":"face massage","shortname":":massage:","category":"people","emoji_order":"657"},{"name":"face massage tone 1","shortname":":massage_tone1:","category":"people","emoji_order":"658"},{"name":"face massage tone 2","shortname":":massage_tone2:","category":"people","emoji_order":"659"},{"name":"face massage tone 3","shortname":":massage_tone3:","category":"people","emoji_order":"660"},{"name":"face massage tone 4","shortname":":massage_tone4:","category":"people","emoji_order":"661"},{"name":"face massage tone 5","shortname":":massage_tone5:","category":"people","emoji_order":"662"},{"name":"haircut","shortname":":haircut:","category":"people","emoji_order":"675"},{"name":"haircut tone 1","shortname":":haircut_tone1:","category":"people","emoji_order":"676"},{"name":"haircut tone 2","shortname":":haircut_tone2:","category":"people","emoji_order":"677"},{"name":"haircut tone 3","shortname":":haircut_tone3:","category":"people","emoji_order":"678"},{"name":"haircut tone 4","shortname":":haircut_tone4:","category":"people","emoji_order":"679"},{"name":"haircut tone 5","shortname":":haircut_tone5:","category":"people","emoji_order":"680"},{"name":"pedestrian","shortname":":walking:","category":"people","emoji_order":"693"},{"name":"pedestrian tone 1","shortname":":walking_tone1:","category":"people","emoji_order":"694"},{"name":"pedestrian tone 2","shortname":":walking_tone2:","category":"people","emoji_order":"695"},{"name":"pedestrian tone 3","shortname":":walking_tone3:","category":"people","emoji_order":"696"},{"name":"pedestrian tone 4","shortname":":walking_tone4:","category":"people","emoji_order":"697"},{"name":"pedestrian tone 5","shortname":":walking_tone5:","category":"people","emoji_order":"698"},{"name":"runner","shortname":":runner:","category":"people","emoji_order":"711"},{"name":"runner tone 1","shortname":":runner_tone1:","category":"people","emoji_order":"712"},{"name":"runner tone 2","shortname":":runner_tone2:","category":"people","emoji_order":"713"},{"name":"runner tone 3","shortname":":runner_tone3:","category":"people","emoji_order":"714"},{"name":"runner tone 4","shortname":":runner_tone4:","category":"people","emoji_order":"715"},{"name":"runner tone 5","shortname":":runner_tone5:","category":"people","emoji_order":"716"},{"name":"dancer","shortname":":dancer:","category":"people","emoji_order":"729"},{"name":"dancer tone 1","shortname":":dancer_tone1:","category":"people","emoji_order":"730"},{"name":"dancer tone 2","shortname":":dancer_tone2:","category":"people","emoji_order":"731"},{"name":"dancer tone 3","shortname":":dancer_tone3:","category":"people","emoji_order":"732"},{"name":"dancer tone 4","shortname":":dancer_tone4:","category":"people","emoji_order":"733"},{"name":"dancer tone 5","shortname":":dancer_tone5:","category":"people","emoji_order":"734"},{"name":"man dancing","shortname":":man_dancing:","category":"people","emoji_order":"735"},{"name":"man dancing tone 1","shortname":":man_dancing_tone1:","category":"people","emoji_order":"736"},{"name":"man dancing tone 2","shortname":":man_dancing_tone2:","category":"people","emoji_order":"737"},{"name":"man dancing tone 3","shortname":":man_dancing_tone3:","category":"people","emoji_order":"738"},{"name":"man dancing tone 4","shortname":":man_dancing_tone4:","category":"people","emoji_order":"739"},{"name":"man dancing tone 5","shortname":":man_dancing_tone5:","category":"people","emoji_order":"740"},{"name":"woman with bunny ears","shortname":":dancers:","category":"people","emoji_order":"741"},{"name":"man in business suit levitating","shortname":":levitate:","category":"activity","emoji_order":"759"},{"name":"speaking head in silhouette","shortname":":speaking_head:","category":"people","emoji_order":"765"},{"name":"bust in silhouette","shortname":":bust_in_silhouette:","category":"people","emoji_order":"766"},{"name":"busts in silhouette","shortname":":busts_in_silhouette:","category":"people","emoji_order":"767"},{"name":"fencer","shortname":":fencer:","category":"activity","emoji_order":"768"},{"name":"horse racing","shortname":":horse_racing:","category":"activity","emoji_order":"769"},{"name":"horse racing tone 1","shortname":":horse_racing_tone1:","category":"activity","emoji_order":"770"},{"name":"horse racing tone 2","shortname":":horse_racing_tone2:","category":"activity","emoji_order":"771"},{"name":"horse racing tone 3","shortname":":horse_racing_tone3:","category":"activity","emoji_order":"772"},{"name":"horse racing tone 4","shortname":":horse_racing_tone4:","category":"activity","emoji_order":"773"},{"name":"horse racing tone 5","shortname":":horse_racing_tone5:","category":"activity","emoji_order":"774"},{"name":"skier","shortname":":skier:","category":"activity","emoji_order":"775"},{"name":"snowboarder","shortname":":snowboarder:","category":"activity","emoji_order":"776"},{"name":"golfer","shortname":":golfer:","category":"activity","emoji_order":"782"},{"name":"surfer","shortname":":surfer:","category":"activity","emoji_order":"800"},{"name":"surfer tone 1","shortname":":surfer_tone1:","category":"activity","emoji_order":"801"},{"name":"surfer tone 2","shortname":":surfer_tone2:","category":"activity","emoji_order":"802"},{"name":"surfer tone 3","shortname":":surfer_tone3:","category":"activity","emoji_order":"803"},{"name":"surfer tone 4","shortname":":surfer_tone4:","category":"activity","emoji_order":"804"},{"name":"surfer tone 5","shortname":":surfer_tone5:","category":"activity","emoji_order":"805"},{"name":"rowboat","shortname":":rowboat:","category":"activity","emoji_order":"818"},{"name":"rowboat tone 1","shortname":":rowboat_tone1:","category":"activity","emoji_order":"819"},{"name":"rowboat tone 2","shortname":":rowboat_tone2:","category":"activity","emoji_order":"820"},{"name":"rowboat tone 3","shortname":":rowboat_tone3:","category":"activity","emoji_order":"821"},{"name":"rowboat tone 4","shortname":":rowboat_tone4:","category":"activity","emoji_order":"822"},{"name":"rowboat tone 5","shortname":":rowboat_tone5:","category":"activity","emoji_order":"823"},{"name":"swimmer","shortname":":swimmer:","category":"activity","emoji_order":"836"},{"name":"swimmer tone 1","shortname":":swimmer_tone1:","category":"activity","emoji_order":"837"},{"name":"swimmer tone 2","shortname":":swimmer_tone2:","category":"activity","emoji_order":"838"},{"name":"swimmer tone 3","shortname":":swimmer_tone3:","category":"activity","emoji_order":"839"},{"name":"swimmer tone 4","shortname":":swimmer_tone4:","category":"activity","emoji_order":"840"},{"name":"swimmer tone 5","shortname":":swimmer_tone5:","category":"activity","emoji_order":"841"},{"name":"person with ball","shortname":":basketball_player:","category":"activity","emoji_order":"854"},{"name":"person with ball tone 1","shortname":":basketball_player_tone1:","category":"activity","emoji_order":"855"},{"name":"person with ball tone 2","shortname":":basketball_player_tone2:","category":"activity","emoji_order":"856"},{"name":"person with ball tone 3","shortname":":basketball_player_tone3:","category":"activity","emoji_order":"857"},{"name":"person with ball tone 4","shortname":":basketball_player_tone4:","category":"activity","emoji_order":"858"},{"name":"person with ball tone 5","shortname":":basketball_player_tone5:","category":"activity","emoji_order":"859"},{"name":"weight lifter","shortname":":lifter:","category":"activity","emoji_order":"872"},{"name":"weight lifter tone 1","shortname":":lifter_tone1:","category":"activity","emoji_order":"873"},{"name":"weight lifter tone 2","shortname":":lifter_tone2:","category":"activity","emoji_order":"874"},{"name":"weight lifter tone 3","shortname":":lifter_tone3:","category":"activity","emoji_order":"875"},{"name":"weight lifter tone 4","shortname":":lifter_tone4:","category":"activity","emoji_order":"876"},{"name":"weight lifter tone 5","shortname":":lifter_tone5:","category":"activity","emoji_order":"877"},{"name":"bicyclist","shortname":":bicyclist:","category":"activity","emoji_order":"890"},{"name":"bicyclist tone 1","shortname":":bicyclist_tone1:","category":"activity","emoji_order":"891"},{"name":"bicyclist tone 2","shortname":":bicyclist_tone2:","category":"activity","emoji_order":"892"},{"name":"bicyclist tone 3","shortname":":bicyclist_tone3:","category":"activity","emoji_order":"893"},{"name":"bicyclist tone 4","shortname":":bicyclist_tone4:","category":"activity","emoji_order":"894"},{"name":"bicyclist tone 5","shortname":":bicyclist_tone5:","category":"activity","emoji_order":"895"},{"name":"mountain bicyclist","shortname":":mountain_bicyclist:","category":"activity","emoji_order":"908"},{"name":"mountain bicyclist tone 1","shortname":":mountain_bicyclist_tone1:","category":"activity","emoji_order":"909"},{"name":"mountain bicyclist tone 2","shortname":":mountain_bicyclist_tone2:","category":"activity","emoji_order":"910"},{"name":"mountain bicyclist tone 3","shortname":":mountain_bicyclist_tone3:","category":"activity","emoji_order":"911"},{"name":"mountain bicyclist tone 4","shortname":":mountain_bicyclist_tone4:","category":"activity","emoji_order":"912"},{"name":"mountain bicyclist tone 5","shortname":":mountain_bicyclist_tone5:","category":"activity","emoji_order":"913"},{"name":"racing car","shortname":":race_car:","category":"travel","emoji_order":"926"},{"name":"racing motorcycle","shortname":":motorcycle:","category":"travel","emoji_order":"927"},{"name":"person doing cartwheel","shortname":":cartwheel:","category":"activity","emoji_order":"928"},{"name":"person doing cartwheel tone 1","shortname":":cartwheel_tone1:","category":"activity","emoji_order":"929"},{"name":"person doing cartwheel tone 2","shortname":":cartwheel_tone2:","category":"activity","emoji_order":"930"},{"name":"person doing cartwheel tone 3","shortname":":cartwheel_tone3:","category":"activity","emoji_order":"931"},{"name":"person doing cartwheel tone 4","shortname":":cartwheel_tone4:","category":"activity","emoji_order":"932"},{"name":"person doing cartwheel tone 5","shortname":":cartwheel_tone5:","category":"activity","emoji_order":"933"},{"name":"wrestlers","shortname":":wrestlers:","category":"activity","emoji_order":"946"},{"name":"wrestlers tone 1","shortname":":wrestlers_tone1:","category":"activity","emoji_order":"947"},{"name":"wrestlers tone 2","shortname":":wrestlers_tone2:","category":"activity","emoji_order":"948"},{"name":"wrestlers tone 3","shortname":":wrestlers_tone3:","category":"activity","emoji_order":"949"},{"name":"wrestlers tone 4","shortname":":wrestlers_tone4:","category":"activity","emoji_order":"950"},{"name":"wrestlers tone 5","shortname":":wrestlers_tone5:","category":"activity","emoji_order":"951"},{"name":"water polo","shortname":":water_polo:","category":"activity","emoji_order":"964"},{"name":"water polo tone 1","shortname":":water_polo_tone1:","category":"activity","emoji_order":"965"},{"name":"water polo tone 2","shortname":":water_polo_tone2:","category":"activity","emoji_order":"966"},{"name":"water polo tone 3","shortname":":water_polo_tone3:","category":"activity","emoji_order":"967"},{"name":"water polo tone 4","shortname":":water_polo_tone4:","category":"activity","emoji_order":"968"},{"name":"water polo tone 5","shortname":":water_polo_tone5:","category":"activity","emoji_order":"969"},{"name":"handball","shortname":":handball:","category":"activity","emoji_order":"982"},{"name":"handball tone 1","shortname":":handball_tone1:","category":"activity","emoji_order":"983"},{"name":"handball tone 2","shortname":":handball_tone2:","category":"activity","emoji_order":"984"},{"name":"handball tone 3","shortname":":handball_tone3:","category":"activity","emoji_order":"985"},{"name":"handball tone 4","shortname":":handball_tone4:","category":"activity","emoji_order":"986"},{"name":"handball tone 5","shortname":":handball_tone5:","category":"activity","emoji_order":"987"},{"name":"juggling","shortname":":juggling:","category":"activity","emoji_order":"1000"},{"name":"juggling tone 1","shortname":":juggling_tone1:","category":"activity","emoji_order":"1001"},{"name":"juggling tone 2","shortname":":juggling_tone2:","category":"activity","emoji_order":"1002"},{"name":"juggling tone 3","shortname":":juggling_tone3:","category":"activity","emoji_order":"1003"},{"name":"juggling tone 4","shortname":":juggling_tone4:","category":"activity","emoji_order":"1004"},{"name":"juggling tone 5","shortname":":juggling_tone5:","category":"activity","emoji_order":"1005"},{"name":"man and woman holding hands","shortname":":couple:","category":"people","emoji_order":"1018"},{"name":"two men holding hands","shortname":":two_men_holding_hands:","category":"people","emoji_order":"1024"},{"name":"two women holding hands","shortname":":two_women_holding_hands:","category":"people","emoji_order":"1030"},{"name":"kiss","shortname":":couplekiss:","category":"people","emoji_order":"1036"},{"name":"kiss (man,man)","shortname":":kiss_mm:","category":"people","emoji_order":"1038"},{"name":"kiss (woman,woman)","shortname":":kiss_ww:","category":"people","emoji_order":"1039"},{"name":"couple with heart","shortname":":couple_with_heart:","category":"people","emoji_order":"1040"},{"name":"couple (man,man)","shortname":":couple_mm:","category":"people","emoji_order":"1042"},{"name":"couple (woman,woman)","shortname":":couple_ww:","category":"people","emoji_order":"1043"},{"name":"family","shortname":":family:","category":"people","emoji_order":"1044"},{"name":"family (man,woman,girl)","shortname":":family_mwg:","category":"people","emoji_order":"1051"},{"name":"family (man,woman,girl,boy)","shortname":":family_mwgb:","category":"people","emoji_order":"1052"},{"name":"family (man,woman,boy,boy)","shortname":":family_mwbb:","category":"people","emoji_order":"1053"},{"name":"family (man,woman,girl,girl)","shortname":":family_mwgg:","category":"people","emoji_order":"1054"},{"name":"family (man,man,boy)","shortname":":family_mmb:","category":"people","emoji_order":"1055"},{"name":"family (man,man,girl)","shortname":":family_mmg:","category":"people","emoji_order":"1056"},{"name":"family (man,man,girl,boy)","shortname":":family_mmgb:","category":"people","emoji_order":"1057"},{"name":"family (man,man,boy,boy)","shortname":":family_mmbb:","category":"people","emoji_order":"1058"},{"name":"family (man,man,girl,girl)","shortname":":family_mmgg:","category":"people","emoji_order":"1059"},{"name":"family (woman,woman,boy)","shortname":":family_wwb:","category":"people","emoji_order":"1060"},{"name":"family (woman,woman,girl)","shortname":":family_wwg:","category":"people","emoji_order":"1061"},{"name":"family (woman,woman,girl,boy)","shortname":":family_wwgb:","category":"people","emoji_order":"1062"},{"name":"family (woman,woman,boy,boy)","shortname":":family_wwbb:","category":"people","emoji_order":"1063"},{"name":"family (woman,woman,girl,girl)","shortname":":family_wwgg:","category":"people","emoji_order":"1064"},{"name":"emoji modifier Fitzpatrick type-1-2","shortname":":tone1:","category":"modifier","emoji_order":"1075"},{"name":"emoji modifier Fitzpatrick type-3","shortname":":tone2:","category":"modifier","emoji_order":"1076"},{"name":"emoji modifier Fitzpatrick type-4","shortname":":tone3:","category":"modifier","emoji_order":"1077"},{"name":"emoji modifier Fitzpatrick type-5","shortname":":tone4:","category":"modifier","emoji_order":"1078"},{"name":"emoji modifier Fitzpatrick type-6","shortname":":tone5:","category":"modifier","emoji_order":"1079"},{"name":"flexed biceps","shortname":":muscle:","category":"people","emoji_order":"1080"},{"name":"flexed biceps tone 1","shortname":":muscle_tone1:","category":"people","emoji_order":"1081"},{"name":"flexed biceps tone 2","shortname":":muscle_tone2:","category":"people","emoji_order":"1082"},{"name":"flexed biceps tone 3","shortname":":muscle_tone3:","category":"people","emoji_order":"1083"},{"name":"flexed biceps tone 4","shortname":":muscle_tone4:","category":"people","emoji_order":"1084"},{"name":"flexed biceps tone 5","shortname":":muscle_tone5:","category":"people","emoji_order":"1085"},{"name":"selfie","shortname":":selfie:","category":"people","emoji_order":"1086"},{"name":"selfie tone 1","shortname":":selfie_tone1:","category":"people","emoji_order":"1087"},{"name":"selfie tone 2","shortname":":selfie_tone2:","category":"people","emoji_order":"1088"},{"name":"selfie tone 3","shortname":":selfie_tone3:","category":"people","emoji_order":"1089"},{"name":"selfie tone 4","shortname":":selfie_tone4:","category":"people","emoji_order":"1090"},{"name":"selfie tone 5","shortname":":selfie_tone5:","category":"people","emoji_order":"1091"},{"name":"white left pointing backhand index","shortname":":point_left:","category":"people","emoji_order":"1092"},{"name":"white left pointing backhand index tone 1","shortname":":point_left_tone1:","category":"people","emoji_order":"1093"},{"name":"white left pointing backhand index tone 2","shortname":":point_left_tone2:","category":"people","emoji_order":"1094"},{"name":"white left pointing backhand index tone 3","shortname":":point_left_tone3:","category":"people","emoji_order":"1095"},{"name":"white left pointing backhand index tone 4","shortname":":point_left_tone4:","category":"people","emoji_order":"1096"},{"name":"white left pointing backhand index tone 5","shortname":":point_left_tone5:","category":"people","emoji_order":"1097"},{"name":"white right pointing backhand index","shortname":":point_right:","category":"people","emoji_order":"1098"},{"name":"white right pointing backhand index tone 1","shortname":":point_right_tone1:","category":"people","emoji_order":"1099"},{"name":"white right pointing backhand index tone 2","shortname":":point_right_tone2:","category":"people","emoji_order":"1100"},{"name":"white right pointing backhand index tone 3","shortname":":point_right_tone3:","category":"people","emoji_order":"1101"},{"name":"white right pointing backhand index tone 4","shortname":":point_right_tone4:","category":"people","emoji_order":"1102"},{"name":"white right pointing backhand index tone 5","shortname":":point_right_tone5:","category":"people","emoji_order":"1103"},{"name":"white up pointing index","shortname":":point_up:","category":"people","emoji_order":"1104"},{"name":"white up pointing index tone 1","shortname":":point_up_tone1:","category":"people","emoji_order":"1105"},{"name":"white up pointing index tone 2","shortname":":point_up_tone2:","category":"people","emoji_order":"1106"},{"name":"white up pointing index tone 3","shortname":":point_up_tone3:","category":"people","emoji_order":"1107"},{"name":"white up pointing index tone 4","shortname":":point_up_tone4:","category":"people","emoji_order":"1108"},{"name":"white up pointing index tone 5","shortname":":point_up_tone5:","category":"people","emoji_order":"1109"},{"name":"white up pointing backhand index","shortname":":point_up_2:","category":"people","emoji_order":"1110"},{"name":"white up pointing backhand index tone 1","shortname":":point_up_2_tone1:","category":"people","emoji_order":"1111"},{"name":"white up pointing backhand index tone 2","shortname":":point_up_2_tone2:","category":"people","emoji_order":"1112"},{"name":"white up pointing backhand index tone 3","shortname":":point_up_2_tone3:","category":"people","emoji_order":"1113"},{"name":"white up pointing backhand index tone 4","shortname":":point_up_2_tone4:","category":"people","emoji_order":"1114"},{"name":"white up pointing backhand index tone 5","shortname":":point_up_2_tone5:","category":"people","emoji_order":"1115"},{"name":"reversed hand with middle finger extended","shortname":":middle_finger:","category":"people","emoji_order":"1116"},{"name":"reversed hand with middle finger extended tone 1","shortname":":middle_finger_tone1:","category":"people","emoji_order":"1117"},{"name":"reversed hand with middle finger extended tone 2","shortname":":middle_finger_tone2:","category":"people","emoji_order":"1118"},{"name":"reversed hand with middle finger extended tone 3","shortname":":middle_finger_tone3:","category":"people","emoji_order":"1119"},{"name":"reversed hand with middle finger extended tone 4","shortname":":middle_finger_tone4:","category":"people","emoji_order":"1120"},{"name":"reversed hand with middle finger extended tone 5","shortname":":middle_finger_tone5:","category":"people","emoji_order":"1121"},{"name":"white down pointing backhand index","shortname":":point_down:","category":"people","emoji_order":"1122"},{"name":"white down pointing backhand index tone 1","shortname":":point_down_tone1:","category":"people","emoji_order":"1123"},{"name":"white down pointing backhand index tone 2","shortname":":point_down_tone2:","category":"people","emoji_order":"1124"},{"name":"white down pointing backhand index tone 3","shortname":":point_down_tone3:","category":"people","emoji_order":"1125"},{"name":"white down pointing backhand index tone 4","shortname":":point_down_tone4:","category":"people","emoji_order":"1126"},{"name":"white down pointing backhand index tone 5","shortname":":point_down_tone5:","category":"people","emoji_order":"1127"},{"name":"victory hand","shortname":":v:","category":"people","emoji_order":"1128"},{"name":"victory hand tone 1","shortname":":v_tone1:","category":"people","emoji_order":"1129"},{"name":"victory hand tone 2","shortname":":v_tone2:","category":"people","emoji_order":"1130"},{"name":"victory hand tone 3","shortname":":v_tone3:","category":"people","emoji_order":"1131"},{"name":"victory hand tone 4","shortname":":v_tone4:","category":"people","emoji_order":"1132"},{"name":"victory hand tone 5","shortname":":v_tone5:","category":"people","emoji_order":"1133"},{"name":"hand with first and index finger crossed","shortname":":fingers_crossed:","category":"people","emoji_order":"1134"},{"name":"hand with index and middle fingers crossed tone 1","shortname":":fingers_crossed_tone1:","category":"people","emoji_order":"1135"},{"name":"hand with index and middle fingers crossed tone 2","shortname":":fingers_crossed_tone2:","category":"people","emoji_order":"1136"},{"name":"hand with index and middle fingers crossed tone 3","shortname":":fingers_crossed_tone3:","category":"people","emoji_order":"1137"},{"name":"hand with index and middle fingers crossed tone 4","shortname":":fingers_crossed_tone4:","category":"people","emoji_order":"1138"},{"name":"hand with index and middle fingers crossed tone 5","shortname":":fingers_crossed_tone5:","category":"people","emoji_order":"1139"},{"name":"raised hand with part between middle and ring fingers","shortname":":vulcan:","category":"people","emoji_order":"1140"},{"name":"raised hand with part between middle and ring fingers tone 1","shortname":":vulcan_tone1:","category":"people","emoji_order":"1141"},{"name":"raised hand with part between middle and ring fingers tone 2","shortname":":vulcan_tone2:","category":"people","emoji_order":"1142"},{"name":"raised hand with part between middle and ring fingers tone 3","shortname":":vulcan_tone3:","category":"people","emoji_order":"1143"},{"name":"raised hand with part between middle and ring fingers tone 4","shortname":":vulcan_tone4:","category":"people","emoji_order":"1144"},{"name":"raised hand with part between middle and ring fingers tone 5","shortname":":vulcan_tone5:","category":"people","emoji_order":"1145"},{"name":"sign of the horns","shortname":":metal:","category":"people","emoji_order":"1146"},{"name":"sign of the horns tone 1","shortname":":metal_tone1:","category":"people","emoji_order":"1147"},{"name":"sign of the horns tone 2","shortname":":metal_tone2:","category":"people","emoji_order":"1148"},{"name":"sign of the horns tone 3","shortname":":metal_tone3:","category":"people","emoji_order":"1149"},{"name":"sign of the horns tone 4","shortname":":metal_tone4:","category":"people","emoji_order":"1150"},{"name":"sign of the horns tone 5","shortname":":metal_tone5:","category":"people","emoji_order":"1151"},{"name":"call me hand","shortname":":call_me:","category":"people","emoji_order":"1152"},{"name":"call me hand tone 1","shortname":":call_me_tone1:","category":"people","emoji_order":"1153"},{"name":"call me hand tone 2","shortname":":call_me_tone2:","category":"people","emoji_order":"1154"},{"name":"call me hand tone 3","shortname":":call_me_tone3:","category":"people","emoji_order":"1155"},{"name":"call me hand tone 4","shortname":":call_me_tone4:","category":"people","emoji_order":"1156"},{"name":"call me hand tone 5","shortname":":call_me_tone5:","category":"people","emoji_order":"1157"},{"name":"raised hand with fingers splayed","shortname":":hand_splayed:","category":"people","emoji_order":"1158"},{"name":"raised hand with fingers splayed tone 1","shortname":":hand_splayed_tone1:","category":"people","emoji_order":"1159"},{"name":"raised hand with fingers splayed tone 2","shortname":":hand_splayed_tone2:","category":"people","emoji_order":"1160"},{"name":"raised hand with fingers splayed tone 3","shortname":":hand_splayed_tone3:","category":"people","emoji_order":"1161"},{"name":"raised hand with fingers splayed tone 4","shortname":":hand_splayed_tone4:","category":"people","emoji_order":"1162"},{"name":"raised hand with fingers splayed tone 5","shortname":":hand_splayed_tone5:","category":"people","emoji_order":"1163"},{"name":"raised hand","shortname":":raised_hand:","category":"people","emoji_order":"1164"},{"name":"raised hand tone 1","shortname":":raised_hand_tone1:","category":"people","emoji_order":"1165"},{"name":"raised hand tone 2","shortname":":raised_hand_tone2:","category":"people","emoji_order":"1166"},{"name":"raised hand tone 3","shortname":":raised_hand_tone3:","category":"people","emoji_order":"1167"},{"name":"raised hand tone 4","shortname":":raised_hand_tone4:","category":"people","emoji_order":"1168"},{"name":"raised hand tone 5","shortname":":raised_hand_tone5:","category":"people","emoji_order":"1169"},{"name":"ok hand sign","shortname":":ok_hand:","category":"people","emoji_order":"1170"},{"name":"ok hand sign tone 1","shortname":":ok_hand_tone1:","category":"people","emoji_order":"1171"},{"name":"ok hand sign tone 2","shortname":":ok_hand_tone2:","category":"people","emoji_order":"1172"},{"name":"ok hand sign tone 3","shortname":":ok_hand_tone3:","category":"people","emoji_order":"1173"},{"name":"ok hand sign tone 4","shortname":":ok_hand_tone4:","category":"people","emoji_order":"1174"},{"name":"ok hand sign tone 5","shortname":":ok_hand_tone5:","category":"people","emoji_order":"1175"},{"name":"thumbs up sign","shortname":":thumbsup:","category":"people","emoji_order":"1176"},{"name":"thumbs up sign tone 1","shortname":":thumbsup_tone1:","category":"people","emoji_order":"1177"},{"name":"thumbs up sign tone 2","shortname":":thumbsup_tone2:","category":"people","emoji_order":"1178"},{"name":"thumbs up sign tone 3","shortname":":thumbsup_tone3:","category":"people","emoji_order":"1179"},{"name":"thumbs up sign tone 4","shortname":":thumbsup_tone4:","category":"people","emoji_order":"1180"},{"name":"thumbs up sign tone 5","shortname":":thumbsup_tone5:","category":"people","emoji_order":"1181"},{"name":"thumbs down sign","shortname":":thumbsdown:","category":"people","emoji_order":"1182"},{"name":"thumbs down sign tone 1","shortname":":thumbsdown_tone1:","category":"people","emoji_order":"1183"},{"name":"thumbs down sign tone 2","shortname":":thumbsdown_tone2:","category":"people","emoji_order":"1184"},{"name":"thumbs down sign tone 3","shortname":":thumbsdown_tone3:","category":"people","emoji_order":"1185"},{"name":"thumbs down sign tone 4","shortname":":thumbsdown_tone4:","category":"people","emoji_order":"1186"},{"name":"thumbs down sign tone 5","shortname":":thumbsdown_tone5:","category":"people","emoji_order":"1187"},{"name":"raised fist","shortname":":fist:","category":"people","emoji_order":"1188"},{"name":"raised fist tone 1","shortname":":fist_tone1:","category":"people","emoji_order":"1189"},{"name":"raised fist tone 2","shortname":":fist_tone2:","category":"people","emoji_order":"1190"},{"name":"raised fist tone 3","shortname":":fist_tone3:","category":"people","emoji_order":"1191"},{"name":"raised fist tone 4","shortname":":fist_tone4:","category":"people","emoji_order":"1192"},{"name":"raised fist tone 5","shortname":":fist_tone5:","category":"people","emoji_order":"1193"},{"name":"fisted hand sign","shortname":":punch:","category":"people","emoji_order":"1194"},{"name":"fisted hand sign tone 1","shortname":":punch_tone1:","category":"people","emoji_order":"1195"},{"name":"fisted hand sign tone 2","shortname":":punch_tone2:","category":"people","emoji_order":"1196"},{"name":"fisted hand sign tone 3","shortname":":punch_tone3:","category":"people","emoji_order":"1197"},{"name":"fisted hand sign tone 4","shortname":":punch_tone4:","category":"people","emoji_order":"1198"},{"name":"fisted hand sign tone 5","shortname":":punch_tone5:","category":"people","emoji_order":"1199"},{"name":"left-facing fist","shortname":":left_facing_fist:","category":"people","emoji_order":"1200"},{"name":"left facing fist tone 1","shortname":":left_facing_fist_tone1:","category":"people","emoji_order":"1201"},{"name":"left facing fist tone 2","shortname":":left_facing_fist_tone2:","category":"people","emoji_order":"1202"},{"name":"left facing fist tone 3","shortname":":left_facing_fist_tone3:","category":"people","emoji_order":"1203"},{"name":"left facing fist tone 4","shortname":":left_facing_fist_tone4:","category":"people","emoji_order":"1204"},{"name":"left facing fist tone 5","shortname":":left_facing_fist_tone5:","category":"people","emoji_order":"1205"},{"name":"right-facing fist","shortname":":right_facing_fist:","category":"people","emoji_order":"1206"},{"name":"right facing fist tone 1","shortname":":right_facing_fist_tone1:","category":"people","emoji_order":"1207"},{"name":"right facing fist tone 2","shortname":":right_facing_fist_tone2:","category":"people","emoji_order":"1208"},{"name":"right facing fist tone 3","shortname":":right_facing_fist_tone3:","category":"people","emoji_order":"1209"},{"name":"right facing fist tone 4","shortname":":right_facing_fist_tone4:","category":"people","emoji_order":"1210"},{"name":"right facing fist tone 5","shortname":":right_facing_fist_tone5:","category":"people","emoji_order":"1211"},{"name":"raised back of hand","shortname":":raised_back_of_hand:","category":"people","emoji_order":"1212"},{"name":"raised back of hand tone 1","shortname":":raised_back_of_hand_tone1:","category":"people","emoji_order":"1213"},{"name":"raised back of hand tone 2","shortname":":raised_back_of_hand_tone2:","category":"people","emoji_order":"1214"},{"name":"raised back of hand tone 3","shortname":":raised_back_of_hand_tone3:","category":"people","emoji_order":"1215"},{"name":"raised back of hand tone 4","shortname":":raised_back_of_hand_tone4:","category":"people","emoji_order":"1216"},{"name":"raised back of hand tone 5","shortname":":raised_back_of_hand_tone5:","category":"people","emoji_order":"1217"},{"name":"waving hand sign","shortname":":wave:","category":"people","emoji_order":"1218"},{"name":"waving hand sign tone 1","shortname":":wave_tone1:","category":"people","emoji_order":"1219"},{"name":"waving hand sign tone 2","shortname":":wave_tone2:","category":"people","emoji_order":"1220"},{"name":"waving hand sign tone 3","shortname":":wave_tone3:","category":"people","emoji_order":"1221"},{"name":"waving hand sign tone 4","shortname":":wave_tone4:","category":"people","emoji_order":"1222"},{"name":"waving hand sign tone 5","shortname":":wave_tone5:","category":"people","emoji_order":"1223"},{"name":"clapping hands sign","shortname":":clap:","category":"people","emoji_order":"1224"},{"name":"clapping hands sign tone 1","shortname":":clap_tone1:","category":"people","emoji_order":"1225"},{"name":"clapping hands sign tone 2","shortname":":clap_tone2:","category":"people","emoji_order":"1226"},{"name":"clapping hands sign tone 3","shortname":":clap_tone3:","category":"people","emoji_order":"1227"},{"name":"clapping hands sign tone 4","shortname":":clap_tone4:","category":"people","emoji_order":"1228"},{"name":"clapping hands sign tone 5","shortname":":clap_tone5:","category":"people","emoji_order":"1229"},{"name":"writing hand","shortname":":writing_hand:","category":"people","emoji_order":"1230"},{"name":"writing hand tone 1","shortname":":writing_hand_tone1:","category":"people","emoji_order":"1231"},{"name":"writing hand tone 2","shortname":":writing_hand_tone2:","category":"people","emoji_order":"1232"},{"name":"writing hand tone 3","shortname":":writing_hand_tone3:","category":"people","emoji_order":"1233"},{"name":"writing hand tone 4","shortname":":writing_hand_tone4:","category":"people","emoji_order":"1234"},{"name":"writing hand tone 5","shortname":":writing_hand_tone5:","category":"people","emoji_order":"1235"},{"name":"open hands sign","shortname":":open_hands:","category":"people","emoji_order":"1236"},{"name":"open hands sign tone 1","shortname":":open_hands_tone1:","category":"people","emoji_order":"1237"},{"name":"open hands sign tone 2","shortname":":open_hands_tone2:","category":"people","emoji_order":"1238"},{"name":"open hands sign tone 3","shortname":":open_hands_tone3:","category":"people","emoji_order":"1239"},{"name":"open hands sign tone 4","shortname":":open_hands_tone4:","category":"people","emoji_order":"1240"},{"name":"open hands sign tone 5","shortname":":open_hands_tone5:","category":"people","emoji_order":"1241"},{"name":"person raising both hands in celebration","shortname":":raised_hands:","category":"people","emoji_order":"1242"},{"name":"person raising both hands in celebration tone 1","shortname":":raised_hands_tone1:","category":"people","emoji_order":"1243"},{"name":"person raising both hands in celebration tone 2","shortname":":raised_hands_tone2:","category":"people","emoji_order":"1244"},{"name":"person raising both hands in celebration tone 3","shortname":":raised_hands_tone3:","category":"people","emoji_order":"1245"},{"name":"person raising both hands in celebration tone 4","shortname":":raised_hands_tone4:","category":"people","emoji_order":"1246"},{"name":"person raising both hands in celebration tone 5","shortname":":raised_hands_tone5:","category":"people","emoji_order":"1247"},{"name":"person with folded hands","shortname":":pray:","category":"people","emoji_order":"1248"},{"name":"person with folded hands tone 1","shortname":":pray_tone1:","category":"people","emoji_order":"1249"},{"name":"person with folded hands tone 2","shortname":":pray_tone2:","category":"people","emoji_order":"1250"},{"name":"person with folded hands tone 3","shortname":":pray_tone3:","category":"people","emoji_order":"1251"},{"name":"person with folded hands tone 4","shortname":":pray_tone4:","category":"people","emoji_order":"1252"},{"name":"person with folded hands tone 5","shortname":":pray_tone5:","category":"people","emoji_order":"1253"},{"name":"handshake","shortname":":handshake:","category":"people","emoji_order":"1254"},{"name":"handshake tone 1","shortname":":handshake_tone1:","category":"people","emoji_order":"1255"},{"name":"handshake tone 2","shortname":":handshake_tone2:","category":"people","emoji_order":"1256"},{"name":"handshake tone 3","shortname":":handshake_tone3:","category":"people","emoji_order":"1257"},{"name":"handshake tone 4","shortname":":handshake_tone4:","category":"people","emoji_order":"1258"},{"name":"handshake tone 5","shortname":":handshake_tone5:","category":"people","emoji_order":"1259"},{"name":"nail polish","shortname":":nail_care:","category":"people","emoji_order":"1260"},{"name":"nail polish tone 1","shortname":":nail_care_tone1:","category":"people","emoji_order":"1261"},{"name":"nail polish tone 2","shortname":":nail_care_tone2:","category":"people","emoji_order":"1262"},{"name":"nail polish tone 3","shortname":":nail_care_tone3:","category":"people","emoji_order":"1263"},{"name":"nail polish tone 4","shortname":":nail_care_tone4:","category":"people","emoji_order":"1264"},{"name":"nail polish tone 5","shortname":":nail_care_tone5:","category":"people","emoji_order":"1265"},{"name":"ear","shortname":":ear:","category":"people","emoji_order":"1266"},{"name":"ear tone 1","shortname":":ear_tone1:","category":"people","emoji_order":"1267"},{"name":"ear tone 2","shortname":":ear_tone2:","category":"people","emoji_order":"1268"},{"name":"ear tone 3","shortname":":ear_tone3:","category":"people","emoji_order":"1269"},{"name":"ear tone 4","shortname":":ear_tone4:","category":"people","emoji_order":"1270"},{"name":"ear tone 5","shortname":":ear_tone5:","category":"people","emoji_order":"1271"},{"name":"nose","shortname":":nose:","category":"people","emoji_order":"1272"},{"name":"nose tone 1","shortname":":nose_tone1:","category":"people","emoji_order":"1273"},{"name":"nose tone 2","shortname":":nose_tone2:","category":"people","emoji_order":"1274"},{"name":"nose tone 3","shortname":":nose_tone3:","category":"people","emoji_order":"1275"},{"name":"nose tone 4","shortname":":nose_tone4:","category":"people","emoji_order":"1276"},{"name":"nose tone 5","shortname":":nose_tone5:","category":"people","emoji_order":"1277"},{"name":"footprints","shortname":":footprints:","category":"people","emoji_order":"1278"},{"name":"eyes","shortname":":eyes:","category":"people","emoji_order":"1279"},{"name":"eye","shortname":":eye:","category":"people","emoji_order":"1280"},{"name":"eye in speech bubble","shortname":":eye_in_speech_bubble:","category":"symbols","emoji_order":"1281"},{"name":"tongue","shortname":":tongue:","category":"people","emoji_order":"1282"},{"name":"mouth","shortname":":lips:","category":"people","emoji_order":"1283"},{"name":"kiss mark","shortname":":kiss:","category":"people","emoji_order":"1284"},{"name":"heart with arrow","shortname":":cupid:","category":"symbols","emoji_order":"1285"},{"name":"heavy black heart","shortname":":heart:","category":"symbols","emoji_order":"1286","aliases_ascii":["<3"]},{"name":"beating heart","shortname":":heartbeat:","category":"symbols","emoji_order":"1287"},{"name":"broken heart","shortname":":broken_heart:","category":"symbols","emoji_order":"1288","aliases_ascii":[":)",">;)",">:-)",">=)"]},{"name":"winking face","shortname":":wink:","category":"people","emoji_order":"9","aliases_ascii":[";)",";-)","*-)","*)",";-]",";]",";D",";^)"]},{"name":"smiling face with smiling eyes","shortname":":blush:","category":"people","emoji_order":"10"},{"name":"face savouring delicious food","shortname":":yum:","category":"people","emoji_order":"11"},{"name":"smiling face with sunglasses","shortname":":sunglasses:","category":"people","emoji_order":"12","aliases_ascii":["B-)","B)","8)","8-)","B-D","8-D"]},{"name":"smiling face with heart-shaped eyes","shortname":":heart_eyes:","category":"people","emoji_order":"13"},{"name":"face throwing a kiss","shortname":":kissing_heart:","category":"people","emoji_order":"14","aliases_ascii":[":*",":-*","=*",":^*"]},{"name":"kissing face","shortname":":kissing:","category":"people","emoji_order":"15"},{"name":"kissing face with smiling eyes","shortname":":kissing_smiling_eyes:","category":"people","emoji_order":"16"},{"name":"kissing face with closed eyes","shortname":":kissing_closed_eyes:","category":"people","emoji_order":"17"},{"name":"white smiling face","shortname":":relaxed:","category":"people","emoji_order":"18"},{"name":"slightly smiling face","shortname":":slight_smile:","category":"people","emoji_order":"19","aliases":[":slightly_smiling_face:"],"aliases_ascii":[":)",":-)","=]","=)",":]"]},{"name":"hugging face","shortname":":hugging:","category":"people","emoji_order":"20","aliases":[":hugging_face:"]},{"name":"thinking face","shortname":":thinking:","category":"people","emoji_order":"21","aliases":[":thinking_face:"]},{"name":"neutral face","shortname":":neutral_face:","category":"people","emoji_order":"22"},{"name":"expressionless face","shortname":":expressionless:","category":"people","emoji_order":"23","aliases_ascii":["-_-","-__-","-___-"]},{"name":"face without mouth","shortname":":no_mouth:","category":"people","emoji_order":"24","aliases_ascii":[":-X",":X",":-#",":#","=X","=x",":x",":-x","=#"]},{"name":"face with rolling eyes","shortname":":rolling_eyes:","category":"people","emoji_order":"25","aliases":[":face_with_rolling_eyes:"]},{"name":"smirking face","shortname":":smirk:","category":"people","emoji_order":"26"},{"name":"persevering face","shortname":":persevere:","category":"people","emoji_order":"27","aliases_ascii":[">.<"]},{"name":"disappointed but relieved face","shortname":":disappointed_relieved:","category":"people","emoji_order":"28"},{"name":"face with open mouth","shortname":":open_mouth:","category":"people","emoji_order":"29","aliases_ascii":[":-O",":O",":-o",":o","O_O",">:O"]},{"name":"zipper-mouth face","shortname":":zipper_mouth:","category":"people","emoji_order":"30","aliases":[":zipper_mouth_face:"]},{"name":"hushed face","shortname":":hushed:","category":"people","emoji_order":"31"},{"name":"sleepy face","shortname":":sleepy:","category":"people","emoji_order":"32"},{"name":"tired face","shortname":":tired_face:","category":"people","emoji_order":"33"},{"name":"sleeping face","shortname":":sleeping:","category":"people","emoji_order":"34"},{"name":"relieved face","shortname":":relieved:","category":"people","emoji_order":"35"},{"name":"nerd face","shortname":":nerd:","category":"people","emoji_order":"36","aliases":[":nerd_face:"]},{"name":"face with stuck-out tongue","shortname":":stuck_out_tongue:","category":"people","emoji_order":"37","aliases_ascii":[":P",":-P","=P",":-p",":p","=p",":-Þ",":Þ",":þ",":-þ",":-b",":b","d:"]},{"name":"face with stuck-out tongue and winking eye","shortname":":stuck_out_tongue_winking_eye:","category":"people","emoji_order":"38","aliases_ascii":[">:P","X-P","x-p"]},{"name":"face with stuck-out tongue and tightly-closed eyes","shortname":":stuck_out_tongue_closed_eyes:","category":"people","emoji_order":"39"},{"name":"drooling face","shortname":":drooling_face:","category":"people","emoji_order":"40","aliases":[":drool:"]},{"name":"unamused face","shortname":":unamused:","category":"people","emoji_order":"41"},{"name":"face with cold sweat","shortname":":sweat:","category":"people","emoji_order":"42","aliases_ascii":["':(","':-(","'=("]},{"name":"pensive face","shortname":":pensive:","category":"people","emoji_order":"43"},{"name":"confused face","shortname":":confused:","category":"people","emoji_order":"44","aliases_ascii":[">:\\",">:/",":-/",":-.",":/",":\\","=/","=\\",":L","=L"]},{"name":"upside-down face","shortname":":upside_down:","category":"people","emoji_order":"45","aliases":[":upside_down_face:"]},{"name":"money-mouth face","shortname":":money_mouth:","category":"people","emoji_order":"46","aliases":[":money_mouth_face:"]},{"name":"astonished face","shortname":":astonished:","category":"people","emoji_order":"47"},{"name":"white frowning face","shortname":":frowning2:","category":"people","emoji_order":"48","aliases":[":white_frowning_face:"]},{"name":"slightly frowning face","shortname":":slight_frown:","category":"people","emoji_order":"49","aliases":[":slightly_frowning_face:"]},{"name":"confounded face","shortname":":confounded:","category":"people","emoji_order":"50"},{"name":"disappointed face","shortname":":disappointed:","category":"people","emoji_order":"51","aliases_ascii":[">:[",":-(",":(",":-[",":[","=("]},{"name":"worried face","shortname":":worried:","category":"people","emoji_order":"52"},{"name":"face with look of triumph","shortname":":triumph:","category":"people","emoji_order":"53"},{"name":"crying face","shortname":":cry:","category":"people","emoji_order":"54","aliases_ascii":[":'(",":'-(",";(",";-("]},{"name":"loudly crying face","shortname":":sob:","category":"people","emoji_order":"55"},{"name":"frowning face with open mouth","shortname":":frowning:","category":"people","emoji_order":"56"},{"name":"anguished face","shortname":":anguished:","category":"people","emoji_order":"57"},{"name":"fearful face","shortname":":fearful:","category":"people","emoji_order":"58","aliases_ascii":["D:"]},{"name":"weary face","shortname":":weary:","category":"people","emoji_order":"59"},{"name":"grimacing face","shortname":":grimacing:","category":"people","emoji_order":"60"},{"name":"face with open mouth and cold sweat","shortname":":cold_sweat:","category":"people","emoji_order":"61"},{"name":"face screaming in fear","shortname":":scream:","category":"people","emoji_order":"62"},{"name":"flushed face","shortname":":flushed:","category":"people","emoji_order":"63","aliases_ascii":[":$","=$"]},{"name":"dizzy face","shortname":":dizzy_face:","category":"people","emoji_order":"64","aliases_ascii":["#-)","#)","%-)","%)","X)","X-)"]},{"name":"pouting face","shortname":":rage:","category":"people","emoji_order":"65"},{"name":"angry face","shortname":":angry:","category":"people","emoji_order":"66","aliases_ascii":[">:(",">:-(",":@"]},{"name":"smiling face with halo","shortname":":innocent:","category":"people","emoji_order":"67","aliases_ascii":["O:-)","0:-3","0:3","0:-)","0:)","0;^)","O:)","O;-)","O=)","0;-)","O:-3","O:3"]},{"name":"face with cowboy hat","shortname":":cowboy:","category":"people","emoji_order":"68","aliases":[":face_with_cowboy_hat:"]},{"name":"clown face","shortname":":clown:","category":"people","emoji_order":"69","aliases":[":clown_face:"]},{"name":"lying face","shortname":":lying_face:","category":"people","emoji_order":"70","aliases":[":liar:"]},{"name":"face with medical mask","shortname":":mask:","category":"people","emoji_order":"71"},{"name":"face with thermometer","shortname":":thermometer_face:","category":"people","emoji_order":"72","aliases":[":face_with_thermometer:"]},{"name":"face with head-bandage","shortname":":head_bandage:","category":"people","emoji_order":"73","aliases":[":face_with_head_bandage:"]},{"name":"nauseated face","shortname":":nauseated_face:","category":"people","emoji_order":"74","aliases":[":sick:"]},{"name":"sneezing face","shortname":":sneezing_face:","category":"people","emoji_order":"75","aliases":[":sneeze:"]},{"name":"smiling face with horns","shortname":":smiling_imp:","category":"people","emoji_order":"76"},{"name":"imp","shortname":":imp:","category":"people","emoji_order":"77"},{"name":"japanese ogre","shortname":":japanese_ogre:","category":"people","emoji_order":"78"},{"name":"japanese goblin","shortname":":japanese_goblin:","category":"people","emoji_order":"79"},{"name":"skull","shortname":":skull:","category":"people","emoji_order":"80","aliases":[":skeleton:"]},{"name":"skull and crossbones","shortname":":skull_crossbones:","category":"objects","emoji_order":"81","aliases":[":skull_and_crossbones:"]},{"name":"ghost","shortname":":ghost:","category":"people","emoji_order":"82"},{"name":"extraterrestrial alien","shortname":":alien:","category":"people","emoji_order":"83"},{"name":"alien monster","shortname":":space_invader:","category":"activity","emoji_order":"84"},{"name":"robot face","shortname":":robot:","category":"people","emoji_order":"85","aliases":[":robot_face:"]},{"name":"pile of poo","shortname":":poop:","category":"people","emoji_order":"86","aliases":[":shit:",":hankey:",":poo:"]},{"name":"smiling cat face with open mouth","shortname":":smiley_cat:","category":"people","emoji_order":"87"},{"name":"grinning cat face with smiling eyes","shortname":":smile_cat:","category":"people","emoji_order":"88"},{"name":"cat face with tears of joy","shortname":":joy_cat:","category":"people","emoji_order":"89"},{"name":"smiling cat face with heart-shaped eyes","shortname":":heart_eyes_cat:","category":"people","emoji_order":"90"},{"name":"cat face with wry smile","shortname":":smirk_cat:","category":"people","emoji_order":"91"},{"name":"kissing cat face with closed eyes","shortname":":kissing_cat:","category":"people","emoji_order":"92"},{"name":"weary cat face","shortname":":scream_cat:","category":"people","emoji_order":"93"},{"name":"crying cat face","shortname":":crying_cat_face:","category":"people","emoji_order":"94"},{"name":"pouting cat face","shortname":":pouting_cat:","category":"people","emoji_order":"95"},{"name":"see-no-evil monkey","shortname":":see_no_evil:","category":"nature","emoji_order":"96"},{"name":"hear-no-evil monkey","shortname":":hear_no_evil:","category":"nature","emoji_order":"97"},{"name":"speak-no-evil monkey","shortname":":speak_no_evil:","category":"nature","emoji_order":"98"},{"name":"boy","shortname":":boy:","category":"people","emoji_order":"99"},{"name":"boy tone 1","shortname":":boy_tone1:","category":"people","emoji_order":"100"},{"name":"boy tone 2","shortname":":boy_tone2:","category":"people","emoji_order":"101"},{"name":"boy tone 3","shortname":":boy_tone3:","category":"people","emoji_order":"102"},{"name":"boy tone 4","shortname":":boy_tone4:","category":"people","emoji_order":"103"},{"name":"boy tone 5","shortname":":boy_tone5:","category":"people","emoji_order":"104"},{"name":"girl","shortname":":girl:","category":"people","emoji_order":"105"},{"name":"girl tone 1","shortname":":girl_tone1:","category":"people","emoji_order":"106"},{"name":"girl tone 2","shortname":":girl_tone2:","category":"people","emoji_order":"107"},{"name":"girl tone 3","shortname":":girl_tone3:","category":"people","emoji_order":"108"},{"name":"girl tone 4","shortname":":girl_tone4:","category":"people","emoji_order":"109"},{"name":"girl tone 5","shortname":":girl_tone5:","category":"people","emoji_order":"110"},{"name":"man","shortname":":man:","category":"people","emoji_order":"111"},{"name":"man tone 1","shortname":":man_tone1:","category":"people","emoji_order":"112"},{"name":"man tone 2","shortname":":man_tone2:","category":"people","emoji_order":"113"},{"name":"man tone 3","shortname":":man_tone3:","category":"people","emoji_order":"114"},{"name":"man tone 4","shortname":":man_tone4:","category":"people","emoji_order":"115"},{"name":"man tone 5","shortname":":man_tone5:","category":"people","emoji_order":"116"},{"name":"woman","shortname":":woman:","category":"people","emoji_order":"117"},{"name":"woman tone 1","shortname":":woman_tone1:","category":"people","emoji_order":"118"},{"name":"woman tone 2","shortname":":woman_tone2:","category":"people","emoji_order":"119"},{"name":"woman tone 3","shortname":":woman_tone3:","category":"people","emoji_order":"120"},{"name":"woman tone 4","shortname":":woman_tone4:","category":"people","emoji_order":"121"},{"name":"woman tone 5","shortname":":woman_tone5:","category":"people","emoji_order":"122"},{"name":"older man","shortname":":older_man:","category":"people","emoji_order":"123"},{"name":"older man tone 1","shortname":":older_man_tone1:","category":"people","emoji_order":"124"},{"name":"older man tone 2","shortname":":older_man_tone2:","category":"people","emoji_order":"125"},{"name":"older man tone 3","shortname":":older_man_tone3:","category":"people","emoji_order":"126"},{"name":"older man tone 4","shortname":":older_man_tone4:","category":"people","emoji_order":"127"},{"name":"older man tone 5","shortname":":older_man_tone5:","category":"people","emoji_order":"128"},{"name":"older woman","shortname":":older_woman:","category":"people","emoji_order":"129","aliases":[":grandma:"]},{"name":"older woman tone 1","shortname":":older_woman_tone1:","category":"people","emoji_order":"130","aliases":[":grandma_tone1:"]},{"name":"older woman tone 2","shortname":":older_woman_tone2:","category":"people","emoji_order":"131","aliases":[":grandma_tone2:"]},{"name":"older woman tone 3","shortname":":older_woman_tone3:","category":"people","emoji_order":"132","aliases":[":grandma_tone3:"]},{"name":"older woman tone 4","shortname":":older_woman_tone4:","category":"people","emoji_order":"133","aliases":[":grandma_tone4:"]},{"name":"older woman tone 5","shortname":":older_woman_tone5:","category":"people","emoji_order":"134","aliases":[":grandma_tone5:"]},{"name":"baby","shortname":":baby:","category":"people","emoji_order":"135"},{"name":"baby tone 1","shortname":":baby_tone1:","category":"people","emoji_order":"136"},{"name":"baby tone 2","shortname":":baby_tone2:","category":"people","emoji_order":"137"},{"name":"baby tone 3","shortname":":baby_tone3:","category":"people","emoji_order":"138"},{"name":"baby tone 4","shortname":":baby_tone4:","category":"people","emoji_order":"139"},{"name":"baby tone 5","shortname":":baby_tone5:","category":"people","emoji_order":"140"},{"name":"baby angel","shortname":":angel:","category":"people","emoji_order":"141"},{"name":"baby angel tone 1","shortname":":angel_tone1:","category":"people","emoji_order":"142"},{"name":"baby angel tone 2","shortname":":angel_tone2:","category":"people","emoji_order":"143"},{"name":"baby angel tone 3","shortname":":angel_tone3:","category":"people","emoji_order":"144"},{"name":"baby angel tone 4","shortname":":angel_tone4:","category":"people","emoji_order":"145"},{"name":"baby angel tone 5","shortname":":angel_tone5:","category":"people","emoji_order":"146"},{"name":"police officer","shortname":":cop:","category":"people","emoji_order":"339"},{"name":"police officer tone 1","shortname":":cop_tone1:","category":"people","emoji_order":"340"},{"name":"police officer tone 2","shortname":":cop_tone2:","category":"people","emoji_order":"341"},{"name":"police officer tone 3","shortname":":cop_tone3:","category":"people","emoji_order":"342"},{"name":"police officer tone 4","shortname":":cop_tone4:","category":"people","emoji_order":"343"},{"name":"police officer tone 5","shortname":":cop_tone5:","category":"people","emoji_order":"344"},{"name":"sleuth or spy","shortname":":spy:","category":"people","emoji_order":"357","aliases":[":sleuth_or_spy:"]},{"name":"sleuth or spy tone 1","shortname":":spy_tone1:","category":"people","emoji_order":"358","aliases":[":sleuth_or_spy_tone1:"]},{"name":"sleuth or spy tone 2","shortname":":spy_tone2:","category":"people","emoji_order":"359","aliases":[":sleuth_or_spy_tone2:"]},{"name":"sleuth or spy tone 3","shortname":":spy_tone3:","category":"people","emoji_order":"360","aliases":[":sleuth_or_spy_tone3:"]},{"name":"sleuth or spy tone 4","shortname":":spy_tone4:","category":"people","emoji_order":"361","aliases":[":sleuth_or_spy_tone4:"]},{"name":"sleuth or spy tone 5","shortname":":spy_tone5:","category":"people","emoji_order":"362","aliases":[":sleuth_or_spy_tone5:"]},{"name":"guardsman","shortname":":guardsman:","category":"people","emoji_order":"375"},{"name":"guardsman tone 1","shortname":":guardsman_tone1:","category":"people","emoji_order":"376"},{"name":"guardsman tone 2","shortname":":guardsman_tone2:","category":"people","emoji_order":"377"},{"name":"guardsman tone 3","shortname":":guardsman_tone3:","category":"people","emoji_order":"378"},{"name":"guardsman tone 4","shortname":":guardsman_tone4:","category":"people","emoji_order":"379"},{"name":"guardsman tone 5","shortname":":guardsman_tone5:","category":"people","emoji_order":"380"},{"name":"construction worker","shortname":":construction_worker:","category":"people","emoji_order":"393"},{"name":"construction worker tone 1","shortname":":construction_worker_tone1:","category":"people","emoji_order":"394"},{"name":"construction worker tone 2","shortname":":construction_worker_tone2:","category":"people","emoji_order":"395"},{"name":"construction worker tone 3","shortname":":construction_worker_tone3:","category":"people","emoji_order":"396"},{"name":"construction worker tone 4","shortname":":construction_worker_tone4:","category":"people","emoji_order":"397"},{"name":"construction worker tone 5","shortname":":construction_worker_tone5:","category":"people","emoji_order":"398"},{"name":"man with turban","shortname":":man_with_turban:","category":"people","emoji_order":"411"},{"name":"man with turban tone 1","shortname":":man_with_turban_tone1:","category":"people","emoji_order":"412"},{"name":"man with turban tone 2","shortname":":man_with_turban_tone2:","category":"people","emoji_order":"413"},{"name":"man with turban tone 3","shortname":":man_with_turban_tone3:","category":"people","emoji_order":"414"},{"name":"man with turban tone 4","shortname":":man_with_turban_tone4:","category":"people","emoji_order":"415"},{"name":"man with turban tone 5","shortname":":man_with_turban_tone5:","category":"people","emoji_order":"416"},{"name":"person with blond hair","shortname":":person_with_blond_hair:","category":"people","emoji_order":"429"},{"name":"person with blond hair tone 1","shortname":":person_with_blond_hair_tone1:","category":"people","emoji_order":"430"},{"name":"person with blond hair tone 2","shortname":":person_with_blond_hair_tone2:","category":"people","emoji_order":"431"},{"name":"person with blond hair tone 3","shortname":":person_with_blond_hair_tone3:","category":"people","emoji_order":"432"},{"name":"person with blond hair tone 4","shortname":":person_with_blond_hair_tone4:","category":"people","emoji_order":"433"},{"name":"person with blond hair tone 5","shortname":":person_with_blond_hair_tone5:","category":"people","emoji_order":"434"},{"name":"father christmas","shortname":":santa:","category":"people","emoji_order":"447"},{"name":"father christmas tone 1","shortname":":santa_tone1:","category":"people","emoji_order":"448"},{"name":"father christmas tone 2","shortname":":santa_tone2:","category":"people","emoji_order":"449"},{"name":"father christmas tone 3","shortname":":santa_tone3:","category":"people","emoji_order":"450"},{"name":"father christmas tone 4","shortname":":santa_tone4:","category":"people","emoji_order":"451"},{"name":"father christmas tone 5","shortname":":santa_tone5:","category":"people","emoji_order":"452"},{"name":"mother christmas","shortname":":mrs_claus:","category":"people","emoji_order":"453","aliases":[":mother_christmas:"]},{"name":"mother christmas tone 1","shortname":":mrs_claus_tone1:","category":"people","emoji_order":"454","aliases":[":mother_christmas_tone1:"]},{"name":"mother christmas tone 2","shortname":":mrs_claus_tone2:","category":"people","emoji_order":"455","aliases":[":mother_christmas_tone2:"]},{"name":"mother christmas tone 3","shortname":":mrs_claus_tone3:","category":"people","emoji_order":"456","aliases":[":mother_christmas_tone3:"]},{"name":"mother christmas tone 4","shortname":":mrs_claus_tone4:","category":"people","emoji_order":"457","aliases":[":mother_christmas_tone4:"]},{"name":"mother christmas tone 5","shortname":":mrs_claus_tone5:","category":"people","emoji_order":"458","aliases":[":mother_christmas_tone5:"]},{"name":"princess","shortname":":princess:","category":"people","emoji_order":"459"},{"name":"princess tone 1","shortname":":princess_tone1:","category":"people","emoji_order":"460"},{"name":"princess tone 2","shortname":":princess_tone2:","category":"people","emoji_order":"461"},{"name":"princess tone 3","shortname":":princess_tone3:","category":"people","emoji_order":"462"},{"name":"princess tone 4","shortname":":princess_tone4:","category":"people","emoji_order":"463"},{"name":"princess tone 5","shortname":":princess_tone5:","category":"people","emoji_order":"464"},{"name":"prince","shortname":":prince:","category":"people","emoji_order":"465"},{"name":"prince tone 1","shortname":":prince_tone1:","category":"people","emoji_order":"466"},{"name":"prince tone 2","shortname":":prince_tone2:","category":"people","emoji_order":"467"},{"name":"prince tone 3","shortname":":prince_tone3:","category":"people","emoji_order":"468"},{"name":"prince tone 4","shortname":":prince_tone4:","category":"people","emoji_order":"469"},{"name":"prince tone 5","shortname":":prince_tone5:","category":"people","emoji_order":"470"},{"name":"bride with veil","shortname":":bride_with_veil:","category":"people","emoji_order":"471"},{"name":"bride with veil tone 1","shortname":":bride_with_veil_tone1:","category":"people","emoji_order":"472"},{"name":"bride with veil tone 2","shortname":":bride_with_veil_tone2:","category":"people","emoji_order":"473"},{"name":"bride with veil tone 3","shortname":":bride_with_veil_tone3:","category":"people","emoji_order":"474"},{"name":"bride with veil tone 4","shortname":":bride_with_veil_tone4:","category":"people","emoji_order":"475"},{"name":"bride with veil tone 5","shortname":":bride_with_veil_tone5:","category":"people","emoji_order":"476"},{"name":"man in tuxedo","shortname":":man_in_tuxedo:","category":"people","emoji_order":"477"},{"name":"man in tuxedo tone 1","shortname":":man_in_tuxedo_tone1:","category":"people","emoji_order":"478","aliases":[":tuxedo_tone1:"]},{"name":"man in tuxedo tone 2","shortname":":man_in_tuxedo_tone2:","category":"people","emoji_order":"479","aliases":[":tuxedo_tone2:"]},{"name":"man in tuxedo tone 3","shortname":":man_in_tuxedo_tone3:","category":"people","emoji_order":"480","aliases":[":tuxedo_tone3:"]},{"name":"man in tuxedo tone 4","shortname":":man_in_tuxedo_tone4:","category":"people","emoji_order":"481","aliases":[":tuxedo_tone4:"]},{"name":"man in tuxedo tone 5","shortname":":man_in_tuxedo_tone5:","category":"people","emoji_order":"482","aliases":[":tuxedo_tone5:"]},{"name":"pregnant woman","shortname":":pregnant_woman:","category":"people","emoji_order":"483","aliases":[":expecting_woman:"]},{"name":"pregnant woman tone 1","shortname":":pregnant_woman_tone1:","category":"people","emoji_order":"484","aliases":[":expecting_woman_tone1:"]},{"name":"pregnant woman tone 2","shortname":":pregnant_woman_tone2:","category":"people","emoji_order":"485","aliases":[":expecting_woman_tone2:"]},{"name":"pregnant woman tone 3","shortname":":pregnant_woman_tone3:","category":"people","emoji_order":"486","aliases":[":expecting_woman_tone3:"]},{"name":"pregnant woman tone 4","shortname":":pregnant_woman_tone4:","category":"people","emoji_order":"487","aliases":[":expecting_woman_tone4:"]},{"name":"pregnant woman tone 5","shortname":":pregnant_woman_tone5:","category":"people","emoji_order":"488","aliases":[":expecting_woman_tone5:"]},{"name":"man with gua pi mao","shortname":":man_with_gua_pi_mao:","category":"people","emoji_order":"489"},{"name":"man with gua pi mao tone 1","shortname":":man_with_gua_pi_mao_tone1:","category":"people","emoji_order":"490"},{"name":"man with gua pi mao tone 2","shortname":":man_with_gua_pi_mao_tone2:","category":"people","emoji_order":"491"},{"name":"man with gua pi mao tone 3","shortname":":man_with_gua_pi_mao_tone3:","category":"people","emoji_order":"492"},{"name":"man with gua pi mao tone 4","shortname":":man_with_gua_pi_mao_tone4:","category":"people","emoji_order":"493"},{"name":"man with gua pi mao tone 5","shortname":":man_with_gua_pi_mao_tone5:","category":"people","emoji_order":"494"},{"name":"person frowning","shortname":":person_frowning:","category":"people","emoji_order":"495"},{"name":"person frowning tone 1","shortname":":person_frowning_tone1:","category":"people","emoji_order":"496"},{"name":"person frowning tone 2","shortname":":person_frowning_tone2:","category":"people","emoji_order":"497"},{"name":"person frowning tone 3","shortname":":person_frowning_tone3:","category":"people","emoji_order":"498"},{"name":"person frowning tone 4","shortname":":person_frowning_tone4:","category":"people","emoji_order":"499"},{"name":"person frowning tone 5","shortname":":person_frowning_tone5:","category":"people","emoji_order":"500"},{"name":"person with pouting face","shortname":":person_with_pouting_face:","category":"people","emoji_order":"513"},{"name":"person with pouting face tone1","shortname":":person_with_pouting_face_tone1:","category":"people","emoji_order":"514"},{"name":"person with pouting face tone2","shortname":":person_with_pouting_face_tone2:","category":"people","emoji_order":"515"},{"name":"person with pouting face tone3","shortname":":person_with_pouting_face_tone3:","category":"people","emoji_order":"516"},{"name":"person with pouting face tone4","shortname":":person_with_pouting_face_tone4:","category":"people","emoji_order":"517"},{"name":"person with pouting face tone5","shortname":":person_with_pouting_face_tone5:","category":"people","emoji_order":"518"},{"name":"face with no good gesture","shortname":":no_good:","category":"people","emoji_order":"531"},{"name":"face with no good gesture tone 1","shortname":":no_good_tone1:","category":"people","emoji_order":"532"},{"name":"face with no good gesture tone 2","shortname":":no_good_tone2:","category":"people","emoji_order":"533"},{"name":"face with no good gesture tone 3","shortname":":no_good_tone3:","category":"people","emoji_order":"534"},{"name":"face with no good gesture tone 4","shortname":":no_good_tone4:","category":"people","emoji_order":"535"},{"name":"face with no good gesture tone 5","shortname":":no_good_tone5:","category":"people","emoji_order":"536"},{"name":"face with ok gesture","shortname":":ok_woman:","category":"people","emoji_order":"549","aliases_ascii":["*\\0/*","\\0/","*\\O/*","\\O/"]},{"name":"face with ok gesture tone1","shortname":":ok_woman_tone1:","category":"people","emoji_order":"550"},{"name":"face with ok gesture tone2","shortname":":ok_woman_tone2:","category":"people","emoji_order":"551"},{"name":"face with ok gesture tone3","shortname":":ok_woman_tone3:","category":"people","emoji_order":"552"},{"name":"face with ok gesture tone4","shortname":":ok_woman_tone4:","category":"people","emoji_order":"553"},{"name":"face with ok gesture tone5","shortname":":ok_woman_tone5:","category":"people","emoji_order":"554"},{"name":"information desk person","shortname":":information_desk_person:","category":"people","emoji_order":"567"},{"name":"information desk person tone 1","shortname":":information_desk_person_tone1:","category":"people","emoji_order":"568"},{"name":"information desk person tone 2","shortname":":information_desk_person_tone2:","category":"people","emoji_order":"569"},{"name":"information desk person tone 3","shortname":":information_desk_person_tone3:","category":"people","emoji_order":"570"},{"name":"information desk person tone 4","shortname":":information_desk_person_tone4:","category":"people","emoji_order":"571"},{"name":"information desk person tone 5","shortname":":information_desk_person_tone5:","category":"people","emoji_order":"572"},{"name":"happy person raising one hand","shortname":":raising_hand:","category":"people","emoji_order":"585"},{"name":"happy person raising one hand tone1","shortname":":raising_hand_tone1:","category":"people","emoji_order":"586"},{"name":"happy person raising one hand tone2","shortname":":raising_hand_tone2:","category":"people","emoji_order":"587"},{"name":"happy person raising one hand tone3","shortname":":raising_hand_tone3:","category":"people","emoji_order":"588"},{"name":"happy person raising one hand tone4","shortname":":raising_hand_tone4:","category":"people","emoji_order":"589"},{"name":"happy person raising one hand tone5","shortname":":raising_hand_tone5:","category":"people","emoji_order":"590"},{"name":"person bowing deeply","shortname":":bow:","category":"people","emoji_order":"603"},{"name":"person bowing deeply tone 1","shortname":":bow_tone1:","category":"people","emoji_order":"604"},{"name":"person bowing deeply tone 2","shortname":":bow_tone2:","category":"people","emoji_order":"605"},{"name":"person bowing deeply tone 3","shortname":":bow_tone3:","category":"people","emoji_order":"606"},{"name":"person bowing deeply tone 4","shortname":":bow_tone4:","category":"people","emoji_order":"607"},{"name":"person bowing deeply tone 5","shortname":":bow_tone5:","category":"people","emoji_order":"608"},{"name":"face palm","shortname":":face_palm:","category":"people","emoji_order":"621","aliases":[":facepalm:"]},{"name":"face palm tone 1","shortname":":face_palm_tone1:","category":"people","emoji_order":"622","aliases":[":facepalm_tone1:"]},{"name":"face palm tone 2","shortname":":face_palm_tone2:","category":"people","emoji_order":"623","aliases":[":facepalm_tone2:"]},{"name":"face palm tone 3","shortname":":face_palm_tone3:","category":"people","emoji_order":"624","aliases":[":facepalm_tone3:"]},{"name":"face palm tone 4","shortname":":face_palm_tone4:","category":"people","emoji_order":"625","aliases":[":facepalm_tone4:"]},{"name":"face palm tone 5","shortname":":face_palm_tone5:","category":"people","emoji_order":"626","aliases":[":facepalm_tone5:"]},{"name":"shrug","shortname":":shrug:","category":"people","emoji_order":"639"},{"name":"shrug tone 1","shortname":":shrug_tone1:","category":"people","emoji_order":"640"},{"name":"shrug tone 2","shortname":":shrug_tone2:","category":"people","emoji_order":"641"},{"name":"shrug tone 3","shortname":":shrug_tone3:","category":"people","emoji_order":"642"},{"name":"shrug tone 4","shortname":":shrug_tone4:","category":"people","emoji_order":"643"},{"name":"shrug tone 5","shortname":":shrug_tone5:","category":"people","emoji_order":"644"},{"name":"face massage","shortname":":massage:","category":"people","emoji_order":"657"},{"name":"face massage tone 1","shortname":":massage_tone1:","category":"people","emoji_order":"658"},{"name":"face massage tone 2","shortname":":massage_tone2:","category":"people","emoji_order":"659"},{"name":"face massage tone 3","shortname":":massage_tone3:","category":"people","emoji_order":"660"},{"name":"face massage tone 4","shortname":":massage_tone4:","category":"people","emoji_order":"661"},{"name":"face massage tone 5","shortname":":massage_tone5:","category":"people","emoji_order":"662"},{"name":"haircut","shortname":":haircut:","category":"people","emoji_order":"675"},{"name":"haircut tone 1","shortname":":haircut_tone1:","category":"people","emoji_order":"676"},{"name":"haircut tone 2","shortname":":haircut_tone2:","category":"people","emoji_order":"677"},{"name":"haircut tone 3","shortname":":haircut_tone3:","category":"people","emoji_order":"678"},{"name":"haircut tone 4","shortname":":haircut_tone4:","category":"people","emoji_order":"679"},{"name":"haircut tone 5","shortname":":haircut_tone5:","category":"people","emoji_order":"680"},{"name":"pedestrian","shortname":":walking:","category":"people","emoji_order":"693"},{"name":"pedestrian tone 1","shortname":":walking_tone1:","category":"people","emoji_order":"694"},{"name":"pedestrian tone 2","shortname":":walking_tone2:","category":"people","emoji_order":"695"},{"name":"pedestrian tone 3","shortname":":walking_tone3:","category":"people","emoji_order":"696"},{"name":"pedestrian tone 4","shortname":":walking_tone4:","category":"people","emoji_order":"697"},{"name":"pedestrian tone 5","shortname":":walking_tone5:","category":"people","emoji_order":"698"},{"name":"runner","shortname":":runner:","category":"people","emoji_order":"711"},{"name":"runner tone 1","shortname":":runner_tone1:","category":"people","emoji_order":"712"},{"name":"runner tone 2","shortname":":runner_tone2:","category":"people","emoji_order":"713"},{"name":"runner tone 3","shortname":":runner_tone3:","category":"people","emoji_order":"714"},{"name":"runner tone 4","shortname":":runner_tone4:","category":"people","emoji_order":"715"},{"name":"runner tone 5","shortname":":runner_tone5:","category":"people","emoji_order":"716"},{"name":"dancer","shortname":":dancer:","category":"people","emoji_order":"729"},{"name":"dancer tone 1","shortname":":dancer_tone1:","category":"people","emoji_order":"730"},{"name":"dancer tone 2","shortname":":dancer_tone2:","category":"people","emoji_order":"731"},{"name":"dancer tone 3","shortname":":dancer_tone3:","category":"people","emoji_order":"732"},{"name":"dancer tone 4","shortname":":dancer_tone4:","category":"people","emoji_order":"733"},{"name":"dancer tone 5","shortname":":dancer_tone5:","category":"people","emoji_order":"734"},{"name":"man dancing","shortname":":man_dancing:","category":"people","emoji_order":"735","aliases":[":male_dancer:"]},{"name":"man dancing tone 1","shortname":":man_dancing_tone1:","category":"people","emoji_order":"736","aliases":[":male_dancer_tone1:"]},{"name":"man dancing tone 2","shortname":":man_dancing_tone2:","category":"people","emoji_order":"737","aliases":[":male_dancer_tone2:"]},{"name":"man dancing tone 3","shortname":":man_dancing_tone3:","category":"people","emoji_order":"738","aliases":[":male_dancer_tone3:"]},{"name":"man dancing tone 4","shortname":":man_dancing_tone4:","category":"people","emoji_order":"739","aliases":[":male_dancer_tone4:"]},{"name":"man dancing tone 5","shortname":":man_dancing_tone5:","category":"people","emoji_order":"740","aliases":[":male_dancer_tone5:"]},{"name":"woman with bunny ears","shortname":":dancers:","category":"people","emoji_order":"741"},{"name":"man in business suit levitating","shortname":":levitate:","category":"activity","emoji_order":"759","aliases":[":man_in_business_suit_levitating:"]},{"name":"speaking head in silhouette","shortname":":speaking_head:","category":"people","emoji_order":"765","aliases":[":speaking_head_in_silhouette:"]},{"name":"bust in silhouette","shortname":":bust_in_silhouette:","category":"people","emoji_order":"766"},{"name":"busts in silhouette","shortname":":busts_in_silhouette:","category":"people","emoji_order":"767"},{"name":"fencer","shortname":":fencer:","category":"activity","emoji_order":"768","aliases":[":fencing:"]},{"name":"horse racing","shortname":":horse_racing:","category":"activity","emoji_order":"769"},{"name":"horse racing tone 1","shortname":":horse_racing_tone1:","category":"activity","emoji_order":"770"},{"name":"horse racing tone 2","shortname":":horse_racing_tone2:","category":"activity","emoji_order":"771"},{"name":"horse racing tone 3","shortname":":horse_racing_tone3:","category":"activity","emoji_order":"772"},{"name":"horse racing tone 4","shortname":":horse_racing_tone4:","category":"activity","emoji_order":"773"},{"name":"horse racing tone 5","shortname":":horse_racing_tone5:","category":"activity","emoji_order":"774"},{"name":"skier","shortname":":skier:","category":"activity","emoji_order":"775"},{"name":"snowboarder","shortname":":snowboarder:","category":"activity","emoji_order":"776"},{"name":"golfer","shortname":":golfer:","category":"activity","emoji_order":"782"},{"name":"surfer","shortname":":surfer:","category":"activity","emoji_order":"800"},{"name":"surfer tone 1","shortname":":surfer_tone1:","category":"activity","emoji_order":"801"},{"name":"surfer tone 2","shortname":":surfer_tone2:","category":"activity","emoji_order":"802"},{"name":"surfer tone 3","shortname":":surfer_tone3:","category":"activity","emoji_order":"803"},{"name":"surfer tone 4","shortname":":surfer_tone4:","category":"activity","emoji_order":"804"},{"name":"surfer tone 5","shortname":":surfer_tone5:","category":"activity","emoji_order":"805"},{"name":"rowboat","shortname":":rowboat:","category":"activity","emoji_order":"818"},{"name":"rowboat tone 1","shortname":":rowboat_tone1:","category":"activity","emoji_order":"819"},{"name":"rowboat tone 2","shortname":":rowboat_tone2:","category":"activity","emoji_order":"820"},{"name":"rowboat tone 3","shortname":":rowboat_tone3:","category":"activity","emoji_order":"821"},{"name":"rowboat tone 4","shortname":":rowboat_tone4:","category":"activity","emoji_order":"822"},{"name":"rowboat tone 5","shortname":":rowboat_tone5:","category":"activity","emoji_order":"823"},{"name":"swimmer","shortname":":swimmer:","category":"activity","emoji_order":"836"},{"name":"swimmer tone 1","shortname":":swimmer_tone1:","category":"activity","emoji_order":"837"},{"name":"swimmer tone 2","shortname":":swimmer_tone2:","category":"activity","emoji_order":"838"},{"name":"swimmer tone 3","shortname":":swimmer_tone3:","category":"activity","emoji_order":"839"},{"name":"swimmer tone 4","shortname":":swimmer_tone4:","category":"activity","emoji_order":"840"},{"name":"swimmer tone 5","shortname":":swimmer_tone5:","category":"activity","emoji_order":"841"},{"name":"person with ball","shortname":":basketball_player:","category":"activity","emoji_order":"854","aliases":[":person_with_ball:"]},{"name":"person with ball tone 1","shortname":":basketball_player_tone1:","category":"activity","emoji_order":"855","aliases":[":person_with_ball_tone1:"]},{"name":"person with ball tone 2","shortname":":basketball_player_tone2:","category":"activity","emoji_order":"856","aliases":[":person_with_ball_tone2:"]},{"name":"person with ball tone 3","shortname":":basketball_player_tone3:","category":"activity","emoji_order":"857","aliases":[":person_with_ball_tone3:"]},{"name":"person with ball tone 4","shortname":":basketball_player_tone4:","category":"activity","emoji_order":"858","aliases":[":person_with_ball_tone4:"]},{"name":"person with ball tone 5","shortname":":basketball_player_tone5:","category":"activity","emoji_order":"859","aliases":[":person_with_ball_tone5:"]},{"name":"weight lifter","shortname":":lifter:","category":"activity","emoji_order":"872","aliases":[":weight_lifter:"]},{"name":"weight lifter tone 1","shortname":":lifter_tone1:","category":"activity","emoji_order":"873","aliases":[":weight_lifter_tone1:"]},{"name":"weight lifter tone 2","shortname":":lifter_tone2:","category":"activity","emoji_order":"874","aliases":[":weight_lifter_tone2:"]},{"name":"weight lifter tone 3","shortname":":lifter_tone3:","category":"activity","emoji_order":"875","aliases":[":weight_lifter_tone3:"]},{"name":"weight lifter tone 4","shortname":":lifter_tone4:","category":"activity","emoji_order":"876","aliases":[":weight_lifter_tone4:"]},{"name":"weight lifter tone 5","shortname":":lifter_tone5:","category":"activity","emoji_order":"877","aliases":[":weight_lifter_tone5:"]},{"name":"bicyclist","shortname":":bicyclist:","category":"activity","emoji_order":"890"},{"name":"bicyclist tone 1","shortname":":bicyclist_tone1:","category":"activity","emoji_order":"891"},{"name":"bicyclist tone 2","shortname":":bicyclist_tone2:","category":"activity","emoji_order":"892"},{"name":"bicyclist tone 3","shortname":":bicyclist_tone3:","category":"activity","emoji_order":"893"},{"name":"bicyclist tone 4","shortname":":bicyclist_tone4:","category":"activity","emoji_order":"894"},{"name":"bicyclist tone 5","shortname":":bicyclist_tone5:","category":"activity","emoji_order":"895"},{"name":"mountain bicyclist","shortname":":mountain_bicyclist:","category":"activity","emoji_order":"908"},{"name":"mountain bicyclist tone 1","shortname":":mountain_bicyclist_tone1:","category":"activity","emoji_order":"909"},{"name":"mountain bicyclist tone 2","shortname":":mountain_bicyclist_tone2:","category":"activity","emoji_order":"910"},{"name":"mountain bicyclist tone 3","shortname":":mountain_bicyclist_tone3:","category":"activity","emoji_order":"911"},{"name":"mountain bicyclist tone 4","shortname":":mountain_bicyclist_tone4:","category":"activity","emoji_order":"912"},{"name":"mountain bicyclist tone 5","shortname":":mountain_bicyclist_tone5:","category":"activity","emoji_order":"913"},{"name":"racing car","shortname":":race_car:","category":"travel","emoji_order":"926","aliases":[":racing_car:"]},{"name":"racing motorcycle","shortname":":motorcycle:","category":"travel","emoji_order":"927","aliases":[":racing_motorcycle:"]},{"name":"person doing cartwheel","shortname":":cartwheel:","category":"activity","emoji_order":"928","aliases":[":person_doing_cartwheel:"]},{"name":"person doing cartwheel tone 1","shortname":":cartwheel_tone1:","category":"activity","emoji_order":"929","aliases":[":person_doing_cartwheel_tone1:"]},{"name":"person doing cartwheel tone 2","shortname":":cartwheel_tone2:","category":"activity","emoji_order":"930","aliases":[":person_doing_cartwheel_tone2:"]},{"name":"person doing cartwheel tone 3","shortname":":cartwheel_tone3:","category":"activity","emoji_order":"931","aliases":[":person_doing_cartwheel_tone3:"]},{"name":"person doing cartwheel tone 4","shortname":":cartwheel_tone4:","category":"activity","emoji_order":"932","aliases":[":person_doing_cartwheel_tone4:"]},{"name":"person doing cartwheel tone 5","shortname":":cartwheel_tone5:","category":"activity","emoji_order":"933","aliases":[":person_doing_cartwheel_tone5:"]},{"name":"wrestlers","shortname":":wrestlers:","category":"activity","emoji_order":"946","aliases":[":wrestling:"]},{"name":"wrestlers tone 1","shortname":":wrestlers_tone1:","category":"activity","emoji_order":"947","aliases":[":wrestling_tone1:"]},{"name":"wrestlers tone 2","shortname":":wrestlers_tone2:","category":"activity","emoji_order":"948","aliases":[":wrestling_tone2:"]},{"name":"wrestlers tone 3","shortname":":wrestlers_tone3:","category":"activity","emoji_order":"949","aliases":[":wrestling_tone3:"]},{"name":"wrestlers tone 4","shortname":":wrestlers_tone4:","category":"activity","emoji_order":"950","aliases":[":wrestling_tone4:"]},{"name":"wrestlers tone 5","shortname":":wrestlers_tone5:","category":"activity","emoji_order":"951","aliases":[":wrestling_tone5:"]},{"name":"water polo","shortname":":water_polo:","category":"activity","emoji_order":"964"},{"name":"water polo tone 1","shortname":":water_polo_tone1:","category":"activity","emoji_order":"965"},{"name":"water polo tone 2","shortname":":water_polo_tone2:","category":"activity","emoji_order":"966"},{"name":"water polo tone 3","shortname":":water_polo_tone3:","category":"activity","emoji_order":"967"},{"name":"water polo tone 4","shortname":":water_polo_tone4:","category":"activity","emoji_order":"968"},{"name":"water polo tone 5","shortname":":water_polo_tone5:","category":"activity","emoji_order":"969"},{"name":"handball","shortname":":handball:","category":"activity","emoji_order":"982"},{"name":"handball tone 1","shortname":":handball_tone1:","category":"activity","emoji_order":"983"},{"name":"handball tone 2","shortname":":handball_tone2:","category":"activity","emoji_order":"984"},{"name":"handball tone 3","shortname":":handball_tone3:","category":"activity","emoji_order":"985"},{"name":"handball tone 4","shortname":":handball_tone4:","category":"activity","emoji_order":"986"},{"name":"handball tone 5","shortname":":handball_tone5:","category":"activity","emoji_order":"987"},{"name":"juggling","shortname":":juggling:","category":"activity","emoji_order":"1000","aliases":[":juggler:"]},{"name":"juggling tone 1","shortname":":juggling_tone1:","category":"activity","emoji_order":"1001","aliases":[":juggler_tone1:"]},{"name":"juggling tone 2","shortname":":juggling_tone2:","category":"activity","emoji_order":"1002","aliases":[":juggler_tone2:"]},{"name":"juggling tone 3","shortname":":juggling_tone3:","category":"activity","emoji_order":"1003","aliases":[":juggler_tone3:"]},{"name":"juggling tone 4","shortname":":juggling_tone4:","category":"activity","emoji_order":"1004","aliases":[":juggler_tone4:"]},{"name":"juggling tone 5","shortname":":juggling_tone5:","category":"activity","emoji_order":"1005","aliases":[":juggler_tone5:"]},{"name":"man and woman holding hands","shortname":":couple:","category":"people","emoji_order":"1018"},{"name":"two men holding hands","shortname":":two_men_holding_hands:","category":"people","emoji_order":"1024"},{"name":"two women holding hands","shortname":":two_women_holding_hands:","category":"people","emoji_order":"1030"},{"name":"kiss","shortname":":couplekiss:","category":"people","emoji_order":"1036"},{"name":"kiss (man,man)","shortname":":kiss_mm:","category":"people","emoji_order":"1038","aliases":[":couplekiss_mm:"]},{"name":"kiss (woman,woman)","shortname":":kiss_ww:","category":"people","emoji_order":"1039","aliases":[":couplekiss_ww:"]},{"name":"couple with heart","shortname":":couple_with_heart:","category":"people","emoji_order":"1040"},{"name":"couple (man,man)","shortname":":couple_mm:","category":"people","emoji_order":"1042","aliases":[":couple_with_heart_mm:"]},{"name":"couple (woman,woman)","shortname":":couple_ww:","category":"people","emoji_order":"1043","aliases":[":couple_with_heart_ww:"]},{"name":"family","shortname":":family:","category":"people","emoji_order":"1044"},{"name":"family (man,woman,girl)","shortname":":family_mwg:","category":"people","emoji_order":"1051"},{"name":"family (man,woman,girl,boy)","shortname":":family_mwgb:","category":"people","emoji_order":"1052"},{"name":"family (man,woman,boy,boy)","shortname":":family_mwbb:","category":"people","emoji_order":"1053"},{"name":"family (man,woman,girl,girl)","shortname":":family_mwgg:","category":"people","emoji_order":"1054"},{"name":"family (man,man,boy)","shortname":":family_mmb:","category":"people","emoji_order":"1055"},{"name":"family (man,man,girl)","shortname":":family_mmg:","category":"people","emoji_order":"1056"},{"name":"family (man,man,girl,boy)","shortname":":family_mmgb:","category":"people","emoji_order":"1057"},{"name":"family (man,man,boy,boy)","shortname":":family_mmbb:","category":"people","emoji_order":"1058"},{"name":"family (man,man,girl,girl)","shortname":":family_mmgg:","category":"people","emoji_order":"1059"},{"name":"family (woman,woman,boy)","shortname":":family_wwb:","category":"people","emoji_order":"1060"},{"name":"family (woman,woman,girl)","shortname":":family_wwg:","category":"people","emoji_order":"1061"},{"name":"family (woman,woman,girl,boy)","shortname":":family_wwgb:","category":"people","emoji_order":"1062"},{"name":"family (woman,woman,boy,boy)","shortname":":family_wwbb:","category":"people","emoji_order":"1063"},{"name":"family (woman,woman,girl,girl)","shortname":":family_wwgg:","category":"people","emoji_order":"1064"},{"name":"emoji modifier Fitzpatrick type-1-2","shortname":":tone1:","category":"modifier","emoji_order":"1075"},{"name":"emoji modifier Fitzpatrick type-3","shortname":":tone2:","category":"modifier","emoji_order":"1076"},{"name":"emoji modifier Fitzpatrick type-4","shortname":":tone3:","category":"modifier","emoji_order":"1077"},{"name":"emoji modifier Fitzpatrick type-5","shortname":":tone4:","category":"modifier","emoji_order":"1078"},{"name":"emoji modifier Fitzpatrick type-6","shortname":":tone5:","category":"modifier","emoji_order":"1079"},{"name":"flexed biceps","shortname":":muscle:","category":"people","emoji_order":"1080"},{"name":"flexed biceps tone 1","shortname":":muscle_tone1:","category":"people","emoji_order":"1081"},{"name":"flexed biceps tone 2","shortname":":muscle_tone2:","category":"people","emoji_order":"1082"},{"name":"flexed biceps tone 3","shortname":":muscle_tone3:","category":"people","emoji_order":"1083"},{"name":"flexed biceps tone 4","shortname":":muscle_tone4:","category":"people","emoji_order":"1084"},{"name":"flexed biceps tone 5","shortname":":muscle_tone5:","category":"people","emoji_order":"1085"},{"name":"selfie","shortname":":selfie:","category":"people","emoji_order":"1086"},{"name":"selfie tone 1","shortname":":selfie_tone1:","category":"people","emoji_order":"1087"},{"name":"selfie tone 2","shortname":":selfie_tone2:","category":"people","emoji_order":"1088"},{"name":"selfie tone 3","shortname":":selfie_tone3:","category":"people","emoji_order":"1089"},{"name":"selfie tone 4","shortname":":selfie_tone4:","category":"people","emoji_order":"1090"},{"name":"selfie tone 5","shortname":":selfie_tone5:","category":"people","emoji_order":"1091"},{"name":"white left pointing backhand index","shortname":":point_left:","category":"people","emoji_order":"1092"},{"name":"white left pointing backhand index tone 1","shortname":":point_left_tone1:","category":"people","emoji_order":"1093"},{"name":"white left pointing backhand index tone 2","shortname":":point_left_tone2:","category":"people","emoji_order":"1094"},{"name":"white left pointing backhand index tone 3","shortname":":point_left_tone3:","category":"people","emoji_order":"1095"},{"name":"white left pointing backhand index tone 4","shortname":":point_left_tone4:","category":"people","emoji_order":"1096"},{"name":"white left pointing backhand index tone 5","shortname":":point_left_tone5:","category":"people","emoji_order":"1097"},{"name":"white right pointing backhand index","shortname":":point_right:","category":"people","emoji_order":"1098"},{"name":"white right pointing backhand index tone 1","shortname":":point_right_tone1:","category":"people","emoji_order":"1099"},{"name":"white right pointing backhand index tone 2","shortname":":point_right_tone2:","category":"people","emoji_order":"1100"},{"name":"white right pointing backhand index tone 3","shortname":":point_right_tone3:","category":"people","emoji_order":"1101"},{"name":"white right pointing backhand index tone 4","shortname":":point_right_tone4:","category":"people","emoji_order":"1102"},{"name":"white right pointing backhand index tone 5","shortname":":point_right_tone5:","category":"people","emoji_order":"1103"},{"name":"white up pointing index","shortname":":point_up:","category":"people","emoji_order":"1104"},{"name":"white up pointing index tone 1","shortname":":point_up_tone1:","category":"people","emoji_order":"1105"},{"name":"white up pointing index tone 2","shortname":":point_up_tone2:","category":"people","emoji_order":"1106"},{"name":"white up pointing index tone 3","shortname":":point_up_tone3:","category":"people","emoji_order":"1107"},{"name":"white up pointing index tone 4","shortname":":point_up_tone4:","category":"people","emoji_order":"1108"},{"name":"white up pointing index tone 5","shortname":":point_up_tone5:","category":"people","emoji_order":"1109"},{"name":"white up pointing backhand index","shortname":":point_up_2:","category":"people","emoji_order":"1110"},{"name":"white up pointing backhand index tone 1","shortname":":point_up_2_tone1:","category":"people","emoji_order":"1111"},{"name":"white up pointing backhand index tone 2","shortname":":point_up_2_tone2:","category":"people","emoji_order":"1112"},{"name":"white up pointing backhand index tone 3","shortname":":point_up_2_tone3:","category":"people","emoji_order":"1113"},{"name":"white up pointing backhand index tone 4","shortname":":point_up_2_tone4:","category":"people","emoji_order":"1114"},{"name":"white up pointing backhand index tone 5","shortname":":point_up_2_tone5:","category":"people","emoji_order":"1115"},{"name":"reversed hand with middle finger extended","shortname":":middle_finger:","category":"people","emoji_order":"1116","aliases":[":reversed_hand_with_middle_finger_extended:"]},{"name":"reversed hand with middle finger extended tone 1","shortname":":middle_finger_tone1:","category":"people","emoji_order":"1117","aliases":[":reversed_hand_with_middle_finger_extended_tone1:"]},{"name":"reversed hand with middle finger extended tone 2","shortname":":middle_finger_tone2:","category":"people","emoji_order":"1118","aliases":[":reversed_hand_with_middle_finger_extended_tone2:"]},{"name":"reversed hand with middle finger extended tone 3","shortname":":middle_finger_tone3:","category":"people","emoji_order":"1119","aliases":[":reversed_hand_with_middle_finger_extended_tone3:"]},{"name":"reversed hand with middle finger extended tone 4","shortname":":middle_finger_tone4:","category":"people","emoji_order":"1120","aliases":[":reversed_hand_with_middle_finger_extended_tone4:"]},{"name":"reversed hand with middle finger extended tone 5","shortname":":middle_finger_tone5:","category":"people","emoji_order":"1121","aliases":[":reversed_hand_with_middle_finger_extended_tone5:"]},{"name":"white down pointing backhand index","shortname":":point_down:","category":"people","emoji_order":"1122"},{"name":"white down pointing backhand index tone 1","shortname":":point_down_tone1:","category":"people","emoji_order":"1123"},{"name":"white down pointing backhand index tone 2","shortname":":point_down_tone2:","category":"people","emoji_order":"1124"},{"name":"white down pointing backhand index tone 3","shortname":":point_down_tone3:","category":"people","emoji_order":"1125"},{"name":"white down pointing backhand index tone 4","shortname":":point_down_tone4:","category":"people","emoji_order":"1126"},{"name":"white down pointing backhand index tone 5","shortname":":point_down_tone5:","category":"people","emoji_order":"1127"},{"name":"victory hand","shortname":":v:","category":"people","emoji_order":"1128"},{"name":"victory hand tone 1","shortname":":v_tone1:","category":"people","emoji_order":"1129"},{"name":"victory hand tone 2","shortname":":v_tone2:","category":"people","emoji_order":"1130"},{"name":"victory hand tone 3","shortname":":v_tone3:","category":"people","emoji_order":"1131"},{"name":"victory hand tone 4","shortname":":v_tone4:","category":"people","emoji_order":"1132"},{"name":"victory hand tone 5","shortname":":v_tone5:","category":"people","emoji_order":"1133"},{"name":"hand with first and index finger crossed","shortname":":fingers_crossed:","category":"people","emoji_order":"1134","aliases":[":hand_with_index_and_middle_finger_crossed:"]},{"name":"hand with index and middle fingers crossed tone 1","shortname":":fingers_crossed_tone1:","category":"people","emoji_order":"1135","aliases":[":hand_with_index_and_middle_fingers_crossed_tone1:"]},{"name":"hand with index and middle fingers crossed tone 2","shortname":":fingers_crossed_tone2:","category":"people","emoji_order":"1136","aliases":[":hand_with_index_and_middle_fingers_crossed_tone2:"]},{"name":"hand with index and middle fingers crossed tone 3","shortname":":fingers_crossed_tone3:","category":"people","emoji_order":"1137","aliases":[":hand_with_index_and_middle_fingers_crossed_tone3:"]},{"name":"hand with index and middle fingers crossed tone 4","shortname":":fingers_crossed_tone4:","category":"people","emoji_order":"1138","aliases":[":hand_with_index_and_middle_fingers_crossed_tone4:"]},{"name":"hand with index and middle fingers crossed tone 5","shortname":":fingers_crossed_tone5:","category":"people","emoji_order":"1139","aliases":[":hand_with_index_and_middle_fingers_crossed_tone5:"]},{"name":"raised hand with part between middle and ring fingers","shortname":":vulcan:","category":"people","emoji_order":"1140","aliases":[":raised_hand_with_part_between_middle_and_ring_fingers:"]},{"name":"raised hand with part between middle and ring fingers tone 1","shortname":":vulcan_tone1:","category":"people","emoji_order":"1141","aliases":[":raised_hand_with_part_between_middle_and_ring_fingers_tone1:"]},{"name":"raised hand with part between middle and ring fingers tone 2","shortname":":vulcan_tone2:","category":"people","emoji_order":"1142","aliases":[":raised_hand_with_part_between_middle_and_ring_fingers_tone2:"]},{"name":"raised hand with part between middle and ring fingers tone 3","shortname":":vulcan_tone3:","category":"people","emoji_order":"1143","aliases":[":raised_hand_with_part_between_middle_and_ring_fingers_tone3:"]},{"name":"raised hand with part between middle and ring fingers tone 4","shortname":":vulcan_tone4:","category":"people","emoji_order":"1144","aliases":[":raised_hand_with_part_between_middle_and_ring_fingers_tone4:"]},{"name":"raised hand with part between middle and ring fingers tone 5","shortname":":vulcan_tone5:","category":"people","emoji_order":"1145","aliases":[":raised_hand_with_part_between_middle_and_ring_fingers_tone5:"]},{"name":"sign of the horns","shortname":":metal:","category":"people","emoji_order":"1146","aliases":[":sign_of_the_horns:"]},{"name":"sign of the horns tone 1","shortname":":metal_tone1:","category":"people","emoji_order":"1147","aliases":[":sign_of_the_horns_tone1:"]},{"name":"sign of the horns tone 2","shortname":":metal_tone2:","category":"people","emoji_order":"1148","aliases":[":sign_of_the_horns_tone2:"]},{"name":"sign of the horns tone 3","shortname":":metal_tone3:","category":"people","emoji_order":"1149","aliases":[":sign_of_the_horns_tone3:"]},{"name":"sign of the horns tone 4","shortname":":metal_tone4:","category":"people","emoji_order":"1150","aliases":[":sign_of_the_horns_tone4:"]},{"name":"sign of the horns tone 5","shortname":":metal_tone5:","category":"people","emoji_order":"1151","aliases":[":sign_of_the_horns_tone5:"]},{"name":"call me hand","shortname":":call_me:","category":"people","emoji_order":"1152","aliases":[":call_me_hand:"]},{"name":"call me hand tone 1","shortname":":call_me_tone1:","category":"people","emoji_order":"1153","aliases":[":call_me_hand_tone1:"]},{"name":"call me hand tone 2","shortname":":call_me_tone2:","category":"people","emoji_order":"1154","aliases":[":call_me_hand_tone2:"]},{"name":"call me hand tone 3","shortname":":call_me_tone3:","category":"people","emoji_order":"1155","aliases":[":call_me_hand_tone3:"]},{"name":"call me hand tone 4","shortname":":call_me_tone4:","category":"people","emoji_order":"1156","aliases":[":call_me_hand_tone4:"]},{"name":"call me hand tone 5","shortname":":call_me_tone5:","category":"people","emoji_order":"1157","aliases":[":call_me_hand_tone5:"]},{"name":"raised hand with fingers splayed","shortname":":hand_splayed:","category":"people","emoji_order":"1158","aliases":[":raised_hand_with_fingers_splayed:"]},{"name":"raised hand with fingers splayed tone 1","shortname":":hand_splayed_tone1:","category":"people","emoji_order":"1159","aliases":[":raised_hand_with_fingers_splayed_tone1:"]},{"name":"raised hand with fingers splayed tone 2","shortname":":hand_splayed_tone2:","category":"people","emoji_order":"1160","aliases":[":raised_hand_with_fingers_splayed_tone2:"]},{"name":"raised hand with fingers splayed tone 3","shortname":":hand_splayed_tone3:","category":"people","emoji_order":"1161","aliases":[":raised_hand_with_fingers_splayed_tone3:"]},{"name":"raised hand with fingers splayed tone 4","shortname":":hand_splayed_tone4:","category":"people","emoji_order":"1162","aliases":[":raised_hand_with_fingers_splayed_tone4:"]},{"name":"raised hand with fingers splayed tone 5","shortname":":hand_splayed_tone5:","category":"people","emoji_order":"1163","aliases":[":raised_hand_with_fingers_splayed_tone5:"]},{"name":"raised hand","shortname":":raised_hand:","category":"people","emoji_order":"1164"},{"name":"raised hand tone 1","shortname":":raised_hand_tone1:","category":"people","emoji_order":"1165"},{"name":"raised hand tone 2","shortname":":raised_hand_tone2:","category":"people","emoji_order":"1166"},{"name":"raised hand tone 3","shortname":":raised_hand_tone3:","category":"people","emoji_order":"1167"},{"name":"raised hand tone 4","shortname":":raised_hand_tone4:","category":"people","emoji_order":"1168"},{"name":"raised hand tone 5","shortname":":raised_hand_tone5:","category":"people","emoji_order":"1169"},{"name":"ok hand sign","shortname":":ok_hand:","category":"people","emoji_order":"1170"},{"name":"ok hand sign tone 1","shortname":":ok_hand_tone1:","category":"people","emoji_order":"1171"},{"name":"ok hand sign tone 2","shortname":":ok_hand_tone2:","category":"people","emoji_order":"1172"},{"name":"ok hand sign tone 3","shortname":":ok_hand_tone3:","category":"people","emoji_order":"1173"},{"name":"ok hand sign tone 4","shortname":":ok_hand_tone4:","category":"people","emoji_order":"1174"},{"name":"ok hand sign tone 5","shortname":":ok_hand_tone5:","category":"people","emoji_order":"1175"},{"name":"thumbs up sign","shortname":":thumbsup:","category":"people","emoji_order":"1176","aliases":[":+1:",":thumbup:"]},{"name":"thumbs up sign tone 1","shortname":":thumbsup_tone1:","category":"people","emoji_order":"1177","aliases":[":+1_tone1:",":thumbup_tone1:"]},{"name":"thumbs up sign tone 2","shortname":":thumbsup_tone2:","category":"people","emoji_order":"1178","aliases":[":+1_tone2:",":thumbup_tone2:"]},{"name":"thumbs up sign tone 3","shortname":":thumbsup_tone3:","category":"people","emoji_order":"1179","aliases":[":+1_tone3:",":thumbup_tone3:"]},{"name":"thumbs up sign tone 4","shortname":":thumbsup_tone4:","category":"people","emoji_order":"1180","aliases":[":+1_tone4:",":thumbup_tone4:"]},{"name":"thumbs up sign tone 5","shortname":":thumbsup_tone5:","category":"people","emoji_order":"1181","aliases":[":+1_tone5:",":thumbup_tone5:"]},{"name":"thumbs down sign","shortname":":thumbsdown:","category":"people","emoji_order":"1182","aliases":[":-1:",":thumbdown:"]},{"name":"thumbs down sign tone 1","shortname":":thumbsdown_tone1:","category":"people","emoji_order":"1183","aliases":[":-1_tone1:",":thumbdown_tone1:"]},{"name":"thumbs down sign tone 2","shortname":":thumbsdown_tone2:","category":"people","emoji_order":"1184","aliases":[":-1_tone2:",":thumbdown_tone2:"]},{"name":"thumbs down sign tone 3","shortname":":thumbsdown_tone3:","category":"people","emoji_order":"1185","aliases":[":-1_tone3:",":thumbdown_tone3:"]},{"name":"thumbs down sign tone 4","shortname":":thumbsdown_tone4:","category":"people","emoji_order":"1186","aliases":[":-1_tone4:",":thumbdown_tone4:"]},{"name":"thumbs down sign tone 5","shortname":":thumbsdown_tone5:","category":"people","emoji_order":"1187","aliases":[":-1_tone5:",":thumbdown_tone5:"]},{"name":"raised fist","shortname":":fist:","category":"people","emoji_order":"1188"},{"name":"raised fist tone 1","shortname":":fist_tone1:","category":"people","emoji_order":"1189"},{"name":"raised fist tone 2","shortname":":fist_tone2:","category":"people","emoji_order":"1190"},{"name":"raised fist tone 3","shortname":":fist_tone3:","category":"people","emoji_order":"1191"},{"name":"raised fist tone 4","shortname":":fist_tone4:","category":"people","emoji_order":"1192"},{"name":"raised fist tone 5","shortname":":fist_tone5:","category":"people","emoji_order":"1193"},{"name":"fisted hand sign","shortname":":punch:","category":"people","emoji_order":"1194"},{"name":"fisted hand sign tone 1","shortname":":punch_tone1:","category":"people","emoji_order":"1195"},{"name":"fisted hand sign tone 2","shortname":":punch_tone2:","category":"people","emoji_order":"1196"},{"name":"fisted hand sign tone 3","shortname":":punch_tone3:","category":"people","emoji_order":"1197"},{"name":"fisted hand sign tone 4","shortname":":punch_tone4:","category":"people","emoji_order":"1198"},{"name":"fisted hand sign tone 5","shortname":":punch_tone5:","category":"people","emoji_order":"1199"},{"name":"left-facing fist","shortname":":left_facing_fist:","category":"people","emoji_order":"1200","aliases":[":left_fist:"]},{"name":"left facing fist tone 1","shortname":":left_facing_fist_tone1:","category":"people","emoji_order":"1201","aliases":[":left_fist_tone1:"]},{"name":"left facing fist tone 2","shortname":":left_facing_fist_tone2:","category":"people","emoji_order":"1202","aliases":[":left_fist_tone2:"]},{"name":"left facing fist tone 3","shortname":":left_facing_fist_tone3:","category":"people","emoji_order":"1203","aliases":[":left_fist_tone3:"]},{"name":"left facing fist tone 4","shortname":":left_facing_fist_tone4:","category":"people","emoji_order":"1204","aliases":[":left_fist_tone4:"]},{"name":"left facing fist tone 5","shortname":":left_facing_fist_tone5:","category":"people","emoji_order":"1205","aliases":[":left_fist_tone5:"]},{"name":"right-facing fist","shortname":":right_facing_fist:","category":"people","emoji_order":"1206","aliases":[":right_fist:"]},{"name":"right facing fist tone 1","shortname":":right_facing_fist_tone1:","category":"people","emoji_order":"1207","aliases":[":right_fist_tone1:"]},{"name":"right facing fist tone 2","shortname":":right_facing_fist_tone2:","category":"people","emoji_order":"1208","aliases":[":right_fist_tone2:"]},{"name":"right facing fist tone 3","shortname":":right_facing_fist_tone3:","category":"people","emoji_order":"1209","aliases":[":right_fist_tone3:"]},{"name":"right facing fist tone 4","shortname":":right_facing_fist_tone4:","category":"people","emoji_order":"1210","aliases":[":right_fist_tone4:"]},{"name":"right facing fist tone 5","shortname":":right_facing_fist_tone5:","category":"people","emoji_order":"1211","aliases":[":right_fist_tone5:"]},{"name":"raised back of hand","shortname":":raised_back_of_hand:","category":"people","emoji_order":"1212","aliases":[":back_of_hand:"]},{"name":"raised back of hand tone 1","shortname":":raised_back_of_hand_tone1:","category":"people","emoji_order":"1213","aliases":[":back_of_hand_tone1:"]},{"name":"raised back of hand tone 2","shortname":":raised_back_of_hand_tone2:","category":"people","emoji_order":"1214","aliases":[":back_of_hand_tone2:"]},{"name":"raised back of hand tone 3","shortname":":raised_back_of_hand_tone3:","category":"people","emoji_order":"1215","aliases":[":back_of_hand_tone3:"]},{"name":"raised back of hand tone 4","shortname":":raised_back_of_hand_tone4:","category":"people","emoji_order":"1216","aliases":[":back_of_hand_tone4:"]},{"name":"raised back of hand tone 5","shortname":":raised_back_of_hand_tone5:","category":"people","emoji_order":"1217","aliases":[":back_of_hand_tone5:"]},{"name":"waving hand sign","shortname":":wave:","category":"people","emoji_order":"1218"},{"name":"waving hand sign tone 1","shortname":":wave_tone1:","category":"people","emoji_order":"1219"},{"name":"waving hand sign tone 2","shortname":":wave_tone2:","category":"people","emoji_order":"1220"},{"name":"waving hand sign tone 3","shortname":":wave_tone3:","category":"people","emoji_order":"1221"},{"name":"waving hand sign tone 4","shortname":":wave_tone4:","category":"people","emoji_order":"1222"},{"name":"waving hand sign tone 5","shortname":":wave_tone5:","category":"people","emoji_order":"1223"},{"name":"clapping hands sign","shortname":":clap:","category":"people","emoji_order":"1224"},{"name":"clapping hands sign tone 1","shortname":":clap_tone1:","category":"people","emoji_order":"1225"},{"name":"clapping hands sign tone 2","shortname":":clap_tone2:","category":"people","emoji_order":"1226"},{"name":"clapping hands sign tone 3","shortname":":clap_tone3:","category":"people","emoji_order":"1227"},{"name":"clapping hands sign tone 4","shortname":":clap_tone4:","category":"people","emoji_order":"1228"},{"name":"clapping hands sign tone 5","shortname":":clap_tone5:","category":"people","emoji_order":"1229"},{"name":"writing hand","shortname":":writing_hand:","category":"people","emoji_order":"1230"},{"name":"writing hand tone 1","shortname":":writing_hand_tone1:","category":"people","emoji_order":"1231"},{"name":"writing hand tone 2","shortname":":writing_hand_tone2:","category":"people","emoji_order":"1232"},{"name":"writing hand tone 3","shortname":":writing_hand_tone3:","category":"people","emoji_order":"1233"},{"name":"writing hand tone 4","shortname":":writing_hand_tone4:","category":"people","emoji_order":"1234"},{"name":"writing hand tone 5","shortname":":writing_hand_tone5:","category":"people","emoji_order":"1235"},{"name":"open hands sign","shortname":":open_hands:","category":"people","emoji_order":"1236"},{"name":"open hands sign tone 1","shortname":":open_hands_tone1:","category":"people","emoji_order":"1237"},{"name":"open hands sign tone 2","shortname":":open_hands_tone2:","category":"people","emoji_order":"1238"},{"name":"open hands sign tone 3","shortname":":open_hands_tone3:","category":"people","emoji_order":"1239"},{"name":"open hands sign tone 4","shortname":":open_hands_tone4:","category":"people","emoji_order":"1240"},{"name":"open hands sign tone 5","shortname":":open_hands_tone5:","category":"people","emoji_order":"1241"},{"name":"person raising both hands in celebration","shortname":":raised_hands:","category":"people","emoji_order":"1242"},{"name":"person raising both hands in celebration tone 1","shortname":":raised_hands_tone1:","category":"people","emoji_order":"1243"},{"name":"person raising both hands in celebration tone 2","shortname":":raised_hands_tone2:","category":"people","emoji_order":"1244"},{"name":"person raising both hands in celebration tone 3","shortname":":raised_hands_tone3:","category":"people","emoji_order":"1245"},{"name":"person raising both hands in celebration tone 4","shortname":":raised_hands_tone4:","category":"people","emoji_order":"1246"},{"name":"person raising both hands in celebration tone 5","shortname":":raised_hands_tone5:","category":"people","emoji_order":"1247"},{"name":"person with folded hands","shortname":":pray:","category":"people","emoji_order":"1248"},{"name":"person with folded hands tone 1","shortname":":pray_tone1:","category":"people","emoji_order":"1249"},{"name":"person with folded hands tone 2","shortname":":pray_tone2:","category":"people","emoji_order":"1250"},{"name":"person with folded hands tone 3","shortname":":pray_tone3:","category":"people","emoji_order":"1251"},{"name":"person with folded hands tone 4","shortname":":pray_tone4:","category":"people","emoji_order":"1252"},{"name":"person with folded hands tone 5","shortname":":pray_tone5:","category":"people","emoji_order":"1253"},{"name":"handshake","shortname":":handshake:","category":"people","emoji_order":"1254","aliases":[":shaking_hands:"]},{"name":"handshake tone 1","shortname":":handshake_tone1:","category":"people","emoji_order":"1255","aliases":[":shaking_hands_tone1:"]},{"name":"handshake tone 2","shortname":":handshake_tone2:","category":"people","emoji_order":"1256","aliases":[":shaking_hands_tone2:"]},{"name":"handshake tone 3","shortname":":handshake_tone3:","category":"people","emoji_order":"1257","aliases":[":shaking_hands_tone3:"]},{"name":"handshake tone 4","shortname":":handshake_tone4:","category":"people","emoji_order":"1258","aliases":[":shaking_hands_tone4:"]},{"name":"handshake tone 5","shortname":":handshake_tone5:","category":"people","emoji_order":"1259","aliases":[":shaking_hands_tone5:"]},{"name":"nail polish","shortname":":nail_care:","category":"people","emoji_order":"1260"},{"name":"nail polish tone 1","shortname":":nail_care_tone1:","category":"people","emoji_order":"1261"},{"name":"nail polish tone 2","shortname":":nail_care_tone2:","category":"people","emoji_order":"1262"},{"name":"nail polish tone 3","shortname":":nail_care_tone3:","category":"people","emoji_order":"1263"},{"name":"nail polish tone 4","shortname":":nail_care_tone4:","category":"people","emoji_order":"1264"},{"name":"nail polish tone 5","shortname":":nail_care_tone5:","category":"people","emoji_order":"1265"},{"name":"ear","shortname":":ear:","category":"people","emoji_order":"1266"},{"name":"ear tone 1","shortname":":ear_tone1:","category":"people","emoji_order":"1267"},{"name":"ear tone 2","shortname":":ear_tone2:","category":"people","emoji_order":"1268"},{"name":"ear tone 3","shortname":":ear_tone3:","category":"people","emoji_order":"1269"},{"name":"ear tone 4","shortname":":ear_tone4:","category":"people","emoji_order":"1270"},{"name":"ear tone 5","shortname":":ear_tone5:","category":"people","emoji_order":"1271"},{"name":"nose","shortname":":nose:","category":"people","emoji_order":"1272"},{"name":"nose tone 1","shortname":":nose_tone1:","category":"people","emoji_order":"1273"},{"name":"nose tone 2","shortname":":nose_tone2:","category":"people","emoji_order":"1274"},{"name":"nose tone 3","shortname":":nose_tone3:","category":"people","emoji_order":"1275"},{"name":"nose tone 4","shortname":":nose_tone4:","category":"people","emoji_order":"1276"},{"name":"nose tone 5","shortname":":nose_tone5:","category":"people","emoji_order":"1277"},{"name":"footprints","shortname":":footprints:","category":"people","emoji_order":"1278"},{"name":"eyes","shortname":":eyes:","category":"people","emoji_order":"1279"},{"name":"eye","shortname":":eye:","category":"people","emoji_order":"1280"},{"name":"eye in speech bubble","shortname":":eye_in_speech_bubble:","category":"symbols","emoji_order":"1281"},{"name":"tongue","shortname":":tongue:","category":"people","emoji_order":"1282"},{"name":"mouth","shortname":":lips:","category":"people","emoji_order":"1283"},{"name":"kiss mark","shortname":":kiss:","category":"people","emoji_order":"1284"},{"name":"heart with arrow","shortname":":cupid:","category":"symbols","emoji_order":"1285"},{"name":"heavy black heart","shortname":":heart:","category":"symbols","emoji_order":"1286","aliases_ascii":["<3"]},{"name":"beating heart","shortname":":heartbeat:","category":"symbols","emoji_order":"1287"},{"name":"broken heart","shortname":":broken_heart:","category":"symbols","emoji_order":"1288","aliases_ascii":[" {
+                const room = this.matrixClient.getRoom(roomId);
+                if (room) {
+                    const userId = room.guessDMUserId();
+                    if (userId && userId !== myUserId) {
+                        return {userId, roomId};
+                    }
+                }
+            }).filter((ids) => !!ids);  //filter out
+            // these are actually all legit self-chats
+            // bail out
+            if (!guessedUserIdsThatChanged.length) {
+                return false;
+            }
+            userToRooms[myUserId] = selfRoomIds.filter((roomId) => {
+                return !guessedUserIdsThatChanged
+                    .some((ids) => ids.roomId === roomId);
+            });
+            guessedUserIdsThatChanged.forEach(({userId, roomId}) => {
+                let roomIds = userToRooms[userId];
+                if (!roomIds) {
+                    userToRooms[userId] = [roomId];
+                } else {
+                    roomIds.push(roomId);
+                    userToRooms[userId] = _uniq(roomIds);
+                }
+            });
+            return true;
         }
     }
 
     getDMRoomsForUserId(userId) {
         // Here, we return the empty list if there are no rooms,
         // since the number of conversations you have with this user is zero.
-        return this.userToRooms[userId] || [];
+        return this._getUserToRooms()[userId] || [];
     }
 
     getUserIdForRoomId(roomId) {
@@ -97,22 +138,37 @@ export default class DMRoomMap {
             // no entry? if the room is an invite, look for the is_direct hint.
             const room = this.matrixClient.getRoom(roomId);
             if (room) {
-                const me = room.getMember(this.matrixClient.credentials.userId);
-                if (me.membership == 'invite') {
-                    // The 'direct' hihnt is there, so declare that this is a DM room for
-                    // whoever invited us.
-                    if (me.events.member.getContent().is_direct) {
-                        return me.events.member.getSender();
-                    }
-                }
+                return room.getDMInviter();
             }
         }
         return this.roomToUser[roomId];
     }
 
+    _getUserToRooms() {
+        if (!this.userToRooms) {
+            const userToRooms = this.mDirectEvent;
+            const myUserId = this.matrixClient.getUserId();
+            const selfDMs = userToRooms[myUserId];
+            if (selfDMs && selfDMs.length) {
+                const neededPatching = this._patchUpSelfDMs(userToRooms);
+                // to avoid multiple devices fighting to correct
+                // the account data, only try to send the corrected
+                // version once.
+                console.warn(`Invalid m.direct account data detected ` +
+                    `(self-chats that shouldn't be), patching it up.`);
+                if (neededPatching && !this._hasSentOutPatchDirectAccountDataPatch) {
+                    this._hasSentOutPatchDirectAccountDataPatch = true;
+                    this.matrixClient.setAccountData('m.direct', userToRooms);
+                }
+            }
+            this.userToRooms = userToRooms;
+        }
+        return this.userToRooms;
+    }
+
     _populateRoomToUser() {
         this.roomToUser = {};
-        for (const user of Object.keys(this.userToRooms)) {
+        for (const user of Object.keys(this._getUserToRooms())) {
             for (const roomId of this.userToRooms[user]) {
                 this.roomToUser[roomId] = user;
             }
diff --git a/src/utils/ErrorUtils.js b/src/utils/ErrorUtils.js
new file mode 100644
index 0000000000..4a56d64ef1
--- /dev/null
+++ b/src/utils/ErrorUtils.js
@@ -0,0 +1,78 @@
+/*
+Copyright 2018 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { _t, _td } from '../languageHandler';
+
+/**
+ * Produce a translated error message for a
+ * M_RESOURCE_LIMIT_EXCEEDED error
+ *
+ * @param {string} limitType The limit_type from the error
+ * @param {string} adminContact The admin_contact from the error
+ * @param {Object} strings Translateable string for different
+ *     limit_type. Must include at least the empty string key
+ *     which is the default. Strings may include an 'a' tag
+ *     for the admin contact link.
+ * @param {Object} extraTranslations Extra translation substitution functions
+ *     for any tags in the strings apart from 'a'
+ * @returns {*} Translated string or react component
+ */
+export function messageForResourceLimitError(limitType, adminContact, strings, extraTranslations) {
+    let errString = strings[limitType];
+    if (errString === undefined) errString = strings[''];
+
+    const linkSub = sub => {
+        if (adminContact) {
+            return {sub};
+        } else {
+            return sub;
+        }
+    };
+
+    if (errString.includes('')) {
+        return _t(errString, {}, Object.assign({ 'a': linkSub }, extraTranslations));
+    } else {
+        return _t(errString, {}, extraTranslations);
+    }
+}
+
+export function messageForSyncError(err) {
+    if (err.errcode === 'M_RESOURCE_LIMIT_EXCEEDED') {
+        const limitError = messageForResourceLimitError(
+            err.data.limit_type,
+            err.data.admin_contact,
+            {
+                'monthly_active_user': _td("This homeserver has hit its Monthly Active User limit."),
+                '': _td("This homeserver has exceeded one of its resource limits."),
+            },
+        );
+        const adminContact = messageForResourceLimitError(
+            err.data.limit_type,
+            err.data.admin_contact,
+            {
+                '': _td("Please contact your service administrator to continue using the service."),
+            },
+        );
+        return 
    
+            
    {limitError}
    
+            
    {adminContact}
    
+        
    ;
+    } else {
+        return 
    
+            {_t("Unable to connect to Homeserver. Retrying...")}
+        
    ;
+    }
+}
diff --git a/src/utils/WidgetUtils.js b/src/utils/WidgetUtils.js
new file mode 100644
index 0000000000..b5a2ae31fb
--- /dev/null
+++ b/src/utils/WidgetUtils.js
@@ -0,0 +1,399 @@
+/*
+Copyright 2017 Vector Creations Ltd
+Copyright 2018 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import MatrixClientPeg from '../MatrixClientPeg';
+import SdkConfig from "../SdkConfig";
+import dis from '../dispatcher';
+import * as url from "url";
+import WidgetEchoStore from '../stores/WidgetEchoStore';
+
+// How long we wait for the state event echo to come back from the server
+// before waitFor[Room/User]Widget rejects its promise
+const WIDGET_WAIT_TIME = 20000;
+import SettingsStore from "../settings/SettingsStore";
+
+/**
+ * Encodes a URI according to a set of template variables. Variables will be
+ * passed through encodeURIComponent.
+ * @param {string} pathTemplate The path with template variables e.g. '/foo/$bar'.
+ * @param {Object} variables The key/value pairs to replace the template
+ * variables with. E.g. { '$bar': 'baz' }.
+ * @return {string} The result of replacing all template variables e.g. '/foo/baz'.
+ */
+function encodeUri(pathTemplate, variables) {
+    for (const key in variables) {
+        if (!variables.hasOwnProperty(key)) {
+            continue;
+        }
+        pathTemplate = pathTemplate.replace(
+            key, encodeURIComponent(variables[key]),
+        );
+    }
+    return pathTemplate;
+}
+
+export default class WidgetUtils {
+    /* Returns true if user is able to send state events to modify widgets in this room
+     * (Does not apply to non-room-based / user widgets)
+     * @param roomId -- The ID of the room to check
+     * @return Boolean -- true if the user can modify widgets in this room
+     * @throws Error -- specifies the error reason
+     */
+    static canUserModifyWidgets(roomId) {
+        if (!roomId) {
+            console.warn('No room ID specified');
+            return false;
+        }
+
+        const client = MatrixClientPeg.get();
+        if (!client) {
+            console.warn('User must be be logged in');
+            return false;
+        }
+
+        const room = client.getRoom(roomId);
+        if (!room) {
+            console.warn(`Room ID ${roomId} is not recognised`);
+            return false;
+        }
+
+        const me = client.credentials.userId;
+        if (!me) {
+            console.warn('Failed to get user ID');
+            return false;
+        }
+
+        if (room.getMyMembership() !== "join") {
+            console.warn(`User ${me} is not in room ${roomId}`);
+            return false;
+        }
+
+        return room.currentState.maySendStateEvent('im.vector.modular.widgets', me);
+    }
+
+    /**
+     * Returns true if specified url is a scalar URL, typically https://scalar.vector.im/api
+     * @param  {[type]}  testUrlString URL to check
+     * @return {Boolean} True if specified URL is a scalar URL
+     */
+    static isScalarUrl(testUrlString) {
+        if (!testUrlString) {
+            console.error('Scalar URL check failed. No URL specified');
+            return false;
+        }
+
+        const testUrl = url.parse(testUrlString);
+
+        let scalarUrls = SdkConfig.get().integrations_widgets_urls;
+        if (!scalarUrls || scalarUrls.length === 0) {
+            scalarUrls = [SdkConfig.get().integrations_rest_url];
+        }
+
+        for (let i = 0; i < scalarUrls.length; i++) {
+            const scalarUrl = url.parse(scalarUrls[i]);
+            if (testUrl && scalarUrl) {
+                if (
+                    testUrl.protocol === scalarUrl.protocol &&
+                    testUrl.host === scalarUrl.host &&
+                    testUrl.pathname.startsWith(scalarUrl.pathname)
+                ) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Returns a promise that resolves when a widget with the given
+     * ID has been added as a user widget (ie. the accountData event
+     * arrives) or rejects after a timeout
+     *
+     * @param {string} widgetId The ID of the widget to wait for
+     * @param {boolean} add True to wait for the widget to be added,
+     *     false to wait for it to be deleted.
+     * @returns {Promise} that resolves when the widget is in the
+     *     requested state according to the `add` param
+     */
+    static waitForUserWidget(widgetId, add) {
+        return new Promise((resolve, reject) => {
+            // Tests an account data event, returning true if it's in the state
+            // we're waiting for it to be in
+            function eventInIntendedState(ev) {
+                if (!ev || !ev.getContent()) return false;
+                if (add) {
+                    return ev.getContent()[widgetId] !== undefined;
+                } else {
+                    return ev.getContent()[widgetId] === undefined;
+                }
+            }
+
+            const startingAccountDataEvent = MatrixClientPeg.get().getAccountData('m.widgets');
+            if (eventInIntendedState(startingAccountDataEvent)) {
+                resolve();
+                return;
+            }
+
+            function onAccountData(ev) {
+                const currentAccountDataEvent = MatrixClientPeg.get().getAccountData('m.widgets');
+                if (eventInIntendedState(currentAccountDataEvent)) {
+                    MatrixClientPeg.get().removeListener('accountData', onAccountData);
+                    clearTimeout(timerId);
+                    resolve();
+                }
+            }
+            const timerId = setTimeout(() => {
+                MatrixClientPeg.get().removeListener('accountData', onAccountData);
+                reject(new Error("Timed out waiting for widget ID " + widgetId + " to appear"));
+            }, WIDGET_WAIT_TIME);
+            MatrixClientPeg.get().on('accountData', onAccountData);
+        });
+    }
+
+    /**
+     * Returns a promise that resolves when a widget with the given
+     * ID has been added as a room widget in the given room (ie. the
+     * room state event arrives) or rejects after a timeout
+     *
+     * @param {string} widgetId The ID of the widget to wait for
+     * @param {string} roomId The ID of the room to wait for the widget in
+     * @param {boolean} add True to wait for the widget to be added,
+     *     false to wait for it to be deleted.
+     * @returns {Promise} that resolves when the widget is in the
+     *     requested state according to the `add` param
+     */
+    static waitForRoomWidget(widgetId, roomId, add) {
+        return new Promise((resolve, reject) => {
+            // Tests a list of state events, returning true if it's in the state
+            // we're waiting for it to be in
+            function eventsInIntendedState(evList) {
+                const widgetPresent = evList.some((ev) => {
+                    return ev.getContent() && ev.getContent()['id'] === widgetId;
+                });
+                if (add) {
+                    return widgetPresent;
+                } else {
+                    return !widgetPresent;
+                }
+            }
+
+            const room = MatrixClientPeg.get().getRoom(roomId);
+            const startingWidgetEvents = room.currentState.getStateEvents('im.vector.modular.widgets');
+            if (eventsInIntendedState(startingWidgetEvents)) {
+                resolve();
+                return;
+            }
+
+            function onRoomStateEvents(ev) {
+                if (ev.getRoomId() !== roomId) return;
+
+                const currentWidgetEvents = room.currentState.getStateEvents('im.vector.modular.widgets');
+
+                if (eventsInIntendedState(currentWidgetEvents)) {
+                    MatrixClientPeg.get().removeListener('RoomState.events', onRoomStateEvents);
+                    clearTimeout(timerId);
+                    resolve();
+                }
+            }
+            const timerId = setTimeout(() => {
+                MatrixClientPeg.get().removeListener('RoomState.events', onRoomStateEvents);
+                reject(new Error("Timed out waiting for widget ID " + widgetId + " to appear"));
+            }, WIDGET_WAIT_TIME);
+            MatrixClientPeg.get().on('RoomState.events', onRoomStateEvents);
+        });
+    }
+
+    static setUserWidget(widgetId, widgetType, widgetUrl, widgetName, widgetData) {
+        const content = {
+            type: widgetType,
+            url: widgetUrl,
+            name: widgetName,
+            data: widgetData,
+        };
+
+        const client = MatrixClientPeg.get();
+        const userWidgets = WidgetUtils.getUserWidgets();
+
+        // Delete existing widget with ID
+        try {
+            delete userWidgets[widgetId];
+        } catch (e) {
+            console.error(`$widgetId is non-configurable`);
+        }
+
+        const addingWidget = Boolean(widgetUrl);
+
+        // Add new widget / update
+        if (addingWidget) {
+            userWidgets[widgetId] = {
+                content: content,
+                sender: client.getUserId(),
+                state_key: widgetId,
+                type: 'm.widget',
+                id: widgetId,
+            };
+        }
+
+        // This starts listening for when the echo comes back from the server
+        // since the widget won't appear added until this happens. If we don't
+        // wait for this, the action will complete but if the user is fast enough,
+        // the widget still won't actually be there.
+        return client.setAccountData('m.widgets', userWidgets).then(() => {
+            return WidgetUtils.waitForUserWidget(widgetId, addingWidget);
+        }).then(() => {
+            dis.dispatch({ action: "user_widget_updated" });
+        });
+    }
+
+    static setRoomWidget(roomId, widgetId, widgetType, widgetUrl, widgetName, widgetData) {
+        let content;
+
+        const addingWidget = Boolean(widgetUrl);
+
+        if (addingWidget) {
+            content = {
+                type: widgetType,
+                url: widgetUrl,
+                name: widgetName,
+                data: widgetData,
+            };
+        } else {
+            content = {};
+        }
+
+        WidgetEchoStore.setRoomWidgetEcho(roomId, widgetId, content);
+
+        const client = MatrixClientPeg.get();
+        // TODO - Room widgets need to be moved to 'm.widget' state events
+        // https://docs.google.com/document/d/1uPF7XWY_dXTKVKV7jZQ2KmsI19wn9-kFRgQ1tFQP7wQ/edit?usp=sharing
+        return client.sendStateEvent(roomId, "im.vector.modular.widgets", content, widgetId).then(() => {
+            return WidgetUtils.waitForRoomWidget(widgetId, roomId, addingWidget);
+        }).finally(() => {
+            WidgetEchoStore.removeRoomWidgetEcho(roomId, widgetId);
+        });
+    }
+
+    /**
+     * Get room specific widgets
+     * @param  {object} room The room to get widgets force
+     * @return {[object]} Array containing current / active room widgets
+     */
+    static getRoomWidgets(room) {
+        const appsStateEvents = room.currentState.getStateEvents('im.vector.modular.widgets');
+        if (!appsStateEvents) {
+            return [];
+        }
+
+        return appsStateEvents.filter((ev) => {
+            return ev.getContent().type && ev.getContent().url;
+        });
+    }
+
+    /**
+     * Get user specific widgets (not linked to a specific room)
+     * @return {object} Event content object containing current / active user widgets
+     */
+    static getUserWidgets() {
+        const client = MatrixClientPeg.get();
+        if (!client) {
+            throw new Error('User not logged in');
+        }
+        const userWidgets = client.getAccountData('m.widgets');
+        if (userWidgets && userWidgets.getContent()) {
+            return userWidgets.getContent();
+        }
+        return {};
+    }
+
+    /**
+     * Get user specific widgets (not linked to a specific room) as an array
+     * @return {[object]} Array containing current / active user widgets
+     */
+    static getUserWidgetsArray() {
+        return Object.values(WidgetUtils.getUserWidgets());
+    }
+
+    /**
+     * Get active stickerpicker widgets (stickerpickers are user widgets by nature)
+     * @return {[object]} Array containing current / active stickerpicker widgets
+     */
+    static getStickerpickerWidgets() {
+        const widgets = WidgetUtils.getUserWidgetsArray();
+        return widgets.filter((widget) => widget.content && widget.content.type === "m.stickerpicker");
+    }
+
+    /**
+     * Remove all stickerpicker widgets (stickerpickers are user widgets by nature)
+     * @return {Promise} Resolves on account data updated
+     */
+    static removeStickerpickerWidgets() {
+        const client = MatrixClientPeg.get();
+        if (!client) {
+            throw new Error('User not logged in');
+        }
+        const userWidgets = client.getAccountData('m.widgets').getContent() || {};
+        Object.entries(userWidgets).forEach(([key, widget]) => {
+            if (widget.content && widget.content.type === 'm.stickerpicker') {
+                delete userWidgets[key];
+            }
+        });
+        return client.setAccountData('m.widgets', userWidgets);
+    }
+
+    static makeAppConfig(appId, app, sender, roomId) {
+        const myUserId = MatrixClientPeg.get().credentials.userId;
+        const user = MatrixClientPeg.get().getUser(myUserId);
+        const params = {
+            '$matrix_user_id': myUserId,
+            '$matrix_room_id': roomId,
+            '$matrix_display_name': user ? user.displayName : myUserId,
+            '$matrix_avatar_url': user ? MatrixClientPeg.get().mxcUrlToHttp(user.avatarUrl) : '',
+
+            // TODO: Namespace themes through some standard
+            '$theme': SettingsStore.getValue("theme"),
+        };
+
+        app.id = appId;
+        app.name = app.name || app.type;
+
+        if (app.data) {
+            Object.keys(app.data).forEach((key) => {
+                params['$' + key] = app.data[key];
+            });
+
+            app.waitForIframeLoad = (app.data.waitForIframeLoad === 'false' ? false : true);
+        }
+
+        app.url = encodeUri(app.url, params);
+        app.creatorUserId = (sender && sender.userId) ? sender.userId : null;
+
+        return app;
+    }
+
+    static getCapWhitelistForAppTypeInRoomId(appType, roomId) {
+        const enableScreenshots = SettingsStore.getValue("enableWidgetScreenshots", roomId);
+
+        const capWhitelist = enableScreenshots ? ["m.capability.screenshot"] : [];
+
+        // Obviously anyone that can add a widget can claim it's a jitsi widget,
+        // so this doesn't really offer much over the set of domains we load
+        // widgets from at all, but it probably makes sense for sanity.
+        if (appType == 'jitsi') capWhitelist.push("m.always_on_screen");
+
+        return capWhitelist;
+    }
+}
diff --git a/src/utils/createMatrixClient.js b/src/utils/createMatrixClient.js
index b83e254fad..54312695b6 100644
--- a/src/utils/createMatrixClient.js
+++ b/src/utils/createMatrixClient.js
@@ -48,9 +48,6 @@ export default function createMatrixClient(opts) {
     }
 
     if (indexedDB && localStorage) {
-        // FIXME: bodge to remove old database. Remove this after a few weeks.
-        indexedDB.deleteDatabase("matrix-js-sdk:default");
-
         storeOpts.store = new Matrix.IndexedDBStore({
             indexedDB: indexedDB,
             dbName: "riot-web-sync",
diff --git a/src/utils/widgets.js b/src/utils/widgets.js
deleted file mode 100644
index 338df184e2..0000000000
--- a/src/utils/widgets.js
+++ /dev/null
@@ -1,90 +0,0 @@
-import MatrixClientPeg from '../MatrixClientPeg';
-
-/**
- * Get all widgets (user and room) for the current user
- * @param  {object} room The room to get widgets for
- * @return {[object]} Array containing current / active room and user widget state events
- */
-function getWidgets(room) {
-    const widgets = getRoomWidgets(room);
-    widgets.concat(getUserWidgetsArray());
-    return widgets;
-}
-
-/**
- * Get room specific widgets
- * @param  {object} room The room to get widgets force
- * @return {[object]} Array containing current / active room widgets
- */
-function getRoomWidgets(room) {
-    const appsStateEvents = room.currentState.getStateEvents('im.vector.modular.widgets');
-    if (!appsStateEvents) {
-        return [];
-    }
-
-    return appsStateEvents.filter((ev) => {
-        return ev.getContent().type && ev.getContent().url;
-    });
-}
-
-/**
- * Get user specific widgets (not linked to a specific room)
- * @return {object} Event content object containing current / active user widgets
- */
-function getUserWidgets() {
-    const client = MatrixClientPeg.get();
-    if (!client) {
-        throw new Error('User not logged in');
-    }
-    const userWidgets = client.getAccountData('m.widgets');
-    let userWidgetContent = {};
-    if (userWidgets && userWidgets.getContent()) {
-      userWidgetContent = userWidgets.getContent();
-    }
-    return userWidgetContent;
-}
-
-/**
- * Get user specific widgets (not linked to a specific room) as an array
- * @return {[object]} Array containing current / active user widgets
- */
-function getUserWidgetsArray() {
-  return Object.values(getUserWidgets());
-}
-
-/**
- * Get active stickerpicker widgets (stickerpickers are user widgets by nature)
- * @return {[object]} Array containing current / active stickerpicker widgets
- */
-function getStickerpickerWidgets() {
-    const widgets = getUserWidgetsArray();
-    return widgets.filter((widget) => widget.content && widget.content.type === "m.stickerpicker");
-}
-
-/**
- * Remove all stickerpicker widgets (stickerpickers are user widgets by nature)
- * @return {Promise} Resolves on account data updated
- */
-function removeStickerpickerWidgets() {
-    const client = MatrixClientPeg.get();
-    if (!client) {
-        throw new Error('User not logged in');
-    }
-    const userWidgets = client.getAccountData('m.widgets').getContent() || {};
-    Object.entries(userWidgets).forEach(([key, widget]) => {
-        if (widget.content && widget.content.type === 'm.stickerpicker') {
-            delete userWidgets[key];
-        }
-    });
-    return client.setAccountData('m.widgets', userWidgets);
-}
-
-
-export default {
-    getWidgets,
-    getRoomWidgets,
-    getUserWidgets,
-    getUserWidgetsArray,
-    getStickerpickerWidgets,
-    removeStickerpickerWidgets,
-};
diff --git a/test/DecryptionFailureTracker-test.js b/test/DecryptionFailureTracker-test.js
index c4f3116cba..617c9d5d68 100644
--- a/test/DecryptionFailureTracker-test.js
+++ b/test/DecryptionFailureTracker-test.js
@@ -16,10 +16,18 @@ limitations under the License.
 
 import expect from 'expect';
 
-import DecryptionFailureTracker from '../src/DecryptionFailureTracker';
+import { DecryptionFailure, DecryptionFailureTracker } from '../src/DecryptionFailureTracker';
 
 import { MatrixEvent } from 'matrix-js-sdk';
 
+class MockDecryptionError extends Error {
+    constructor(code) {
+        super();
+
+        this.code = code || 'MOCK_DECRYPTION_ERROR';
+    }
+}
+
 function createFailedDecryptionEvent() {
     const event = new MatrixEvent({
         event_id: "event-id-" + Math.random().toString(16).slice(2),
@@ -33,41 +41,42 @@ function createFailedDecryptionEvent() {
 describe('DecryptionFailureTracker', function() {
     it('tracks a failed decryption', function(done) {
         const failedDecryptionEvent = createFailedDecryptionEvent();
-        let trackedFailure = null;
-        const tracker = new DecryptionFailureTracker((failure) => {
-            trackedFailure = failure;
-        });
 
-        tracker.eventDecrypted(failedDecryptionEvent);
+        let count = 0;
+        const tracker = new DecryptionFailureTracker((total) => count += total);
+
+        const err = new MockDecryptionError();
+        tracker.eventDecrypted(failedDecryptionEvent, err);
 
         // Pretend "now" is Infinity
         tracker.checkFailures(Infinity);
 
-        // Immediately track the newest failure, if there is one
-        tracker.trackFailure();
+        // Immediately track the newest failures
+        tracker.trackFailures();
 
-        expect(trackedFailure).toNotBe(null, 'should track a failure for an event that failed decryption');
+        expect(count).toNotBe(0, 'should track a failure for an event that failed decryption');
 
         done();
     });
 
     it('does not track a failed decryption where the event is subsequently successfully decrypted', (done) => {
         const decryptedEvent = createFailedDecryptionEvent();
-        const tracker = new DecryptionFailureTracker((failure) => {
+        const tracker = new DecryptionFailureTracker((total) => {
             expect(true).toBe(false, 'should not track an event that has since been decrypted correctly');
         });
 
-        tracker.eventDecrypted(decryptedEvent);
+        const err = new MockDecryptionError();
+        tracker.eventDecrypted(decryptedEvent, err);
 
         // Indicate successful decryption: clear data can be anything where the msgtype is not m.bad.encrypted
         decryptedEvent._setClearData({});
-        tracker.eventDecrypted(decryptedEvent);
+        tracker.eventDecrypted(decryptedEvent, null);
 
         // Pretend "now" is Infinity
         tracker.checkFailures(Infinity);
 
-        // Immediately track the newest failure, if there is one
-        tracker.trackFailure();
+        // Immediately track the newest failures
+        tracker.trackFailures();
         done();
     });
 
@@ -76,77 +85,54 @@ describe('DecryptionFailureTracker', function() {
         const decryptedEvent2 = createFailedDecryptionEvent();
 
         let count = 0;
-        const tracker = new DecryptionFailureTracker((failure) => count++);
+        const tracker = new DecryptionFailureTracker((total) => count += total);
 
         // Arbitrary number of failed decryptions for both events
-        tracker.eventDecrypted(decryptedEvent);
-        tracker.eventDecrypted(decryptedEvent);
-        tracker.eventDecrypted(decryptedEvent);
-        tracker.eventDecrypted(decryptedEvent);
-        tracker.eventDecrypted(decryptedEvent);
-        tracker.eventDecrypted(decryptedEvent2);
-        tracker.eventDecrypted(decryptedEvent2);
-        tracker.eventDecrypted(decryptedEvent2);
+        const err = new MockDecryptionError();
+        tracker.eventDecrypted(decryptedEvent, err);
+        tracker.eventDecrypted(decryptedEvent, err);
+        tracker.eventDecrypted(decryptedEvent, err);
+        tracker.eventDecrypted(decryptedEvent, err);
+        tracker.eventDecrypted(decryptedEvent, err);
+        tracker.eventDecrypted(decryptedEvent2, err);
+        tracker.eventDecrypted(decryptedEvent2, err);
+        tracker.eventDecrypted(decryptedEvent2, err);
 
         // Pretend "now" is Infinity
         tracker.checkFailures(Infinity);
 
-        // Simulated polling of `trackFailure`, an arbitrary number ( > 2 ) times
-        tracker.trackFailure();
-        tracker.trackFailure();
-        tracker.trackFailure();
-        tracker.trackFailure();
+        // Simulated polling of `trackFailures`, an arbitrary number ( > 2 ) times
+        tracker.trackFailures();
+        tracker.trackFailures();
+        tracker.trackFailures();
+        tracker.trackFailures();
 
         expect(count).toBe(2, count + ' failures tracked, should only track a single failure per event');
 
         done();
     });
 
-    it('track failures in the order they occured', (done) => {
-        const decryptedEvent = createFailedDecryptionEvent();
-        const decryptedEvent2 = createFailedDecryptionEvent();
-
-        const failures = [];
-        const tracker = new DecryptionFailureTracker((failure) => failures.push(failure));
-
-        // Indicate decryption
-        tracker.eventDecrypted(decryptedEvent);
-        tracker.eventDecrypted(decryptedEvent2);
-
-        // Pretend "now" is Infinity
-        tracker.checkFailures(Infinity);
-
-        // Simulated polling of `trackFailure`, an arbitrary number ( > 2 ) times
-        tracker.trackFailure();
-        tracker.trackFailure();
-
-        expect(failures.length).toBe(2, 'expected 2 failures to be tracked, got ' + failures.length);
-        expect(failures[0].failedEventId).toBe(decryptedEvent.getId(), 'the first failure should be tracked first');
-        expect(failures[1].failedEventId).toBe(decryptedEvent2.getId(), 'the second failure should be tracked second');
-
-        done();
-    });
-
     it('should not track a failure for an event that was tracked previously', (done) => {
         const decryptedEvent = createFailedDecryptionEvent();
 
-        const failures = [];
-        const tracker = new DecryptionFailureTracker((failure) => failures.push(failure));
+        let count = 0;
+        const tracker = new DecryptionFailureTracker((total) => count += total);
 
         // Indicate decryption
-        tracker.eventDecrypted(decryptedEvent);
+        const err = new MockDecryptionError();
+        tracker.eventDecrypted(decryptedEvent, err);
 
         // Pretend "now" is Infinity
         tracker.checkFailures(Infinity);
 
-        tracker.trackFailure();
+        tracker.trackFailures();
 
         // Indicate a second decryption, after having tracked the failure
-        tracker.eventDecrypted(decryptedEvent);
+        tracker.eventDecrypted(decryptedEvent, err);
 
-        tracker.trackFailure();
+        tracker.trackFailures();
 
-        expect(failures.length).toBe(1, 'should only track a single failure per event');
+        expect(count).toBe(1, 'should only track a single failure per event');
 
         done();
     });
@@ -157,29 +143,72 @@ describe('DecryptionFailureTracker', function() {
 
         const decryptedEvent = createFailedDecryptionEvent();
 
-        const failures = [];
-        const tracker = new DecryptionFailureTracker((failure) => failures.push(failure));
+        let count = 0;
+        const tracker = new DecryptionFailureTracker((total) => count += total);
 
         // Indicate decryption
-        tracker.eventDecrypted(decryptedEvent);
+        const err = new MockDecryptionError();
+        tracker.eventDecrypted(decryptedEvent, err);
 
         // Pretend "now" is Infinity
         // NB: This saves to localStorage specific to DFT
         tracker.checkFailures(Infinity);
 
-        tracker.trackFailure();
+        tracker.trackFailures();
 
         // Simulate the browser refreshing by destroying tracker and creating a new tracker
-        const secondTracker = new DecryptionFailureTracker((failure) => failures.push(failure));
+        const secondTracker = new DecryptionFailureTracker((total) => count += total);
 
         //secondTracker.loadTrackedEventHashMap();
 
-        secondTracker.eventDecrypted(decryptedEvent);
+        secondTracker.eventDecrypted(decryptedEvent, err);
         secondTracker.checkFailures(Infinity);
-        secondTracker.trackFailure();
+        secondTracker.trackFailures();
 
-        expect(failures.length).toBe(1, 'should track a single failure per event per session, got ' + failures.length);
+        expect(count).toBe(1, count + ' failures tracked, should only track a single failure per event');
 
         done();
     });
+
+    it('should count different error codes separately for multiple failures with different error codes', () => {
+        const counts = {};
+        const tracker = new DecryptionFailureTracker(
+            (total, errorCode) => counts[errorCode] = (counts[errorCode] || 0) + total,
+        );
+
+        // One failure of ERROR_CODE_1, and effectively two for ERROR_CODE_2
+        tracker.addDecryptionFailure(new DecryptionFailure('$event_id1', 'ERROR_CODE_1'));
+        tracker.addDecryptionFailure(new DecryptionFailure('$event_id2', 'ERROR_CODE_2'));
+        tracker.addDecryptionFailure(new DecryptionFailure('$event_id2', 'ERROR_CODE_2'));
+        tracker.addDecryptionFailure(new DecryptionFailure('$event_id3', 'ERROR_CODE_2'));
+
+        // Pretend "now" is Infinity
+        tracker.checkFailures(Infinity);
+
+        tracker.trackFailures();
+
+        expect(counts['ERROR_CODE_1']).toBe(1, 'should track one ERROR_CODE_1');
+        expect(counts['ERROR_CODE_2']).toBe(2, 'should track two ERROR_CODE_2');
+    });
+
+    it('should map error codes correctly', () => {
+        const counts = {};
+        const tracker = new DecryptionFailureTracker(
+            (total, errorCode) => counts[errorCode] = (counts[errorCode] || 0) + total,
+            (errorCode) => 'MY_NEW_ERROR_CODE',
+        );
+
+        // One failure of ERROR_CODE_1, and effectively two for ERROR_CODE_2
+        tracker.addDecryptionFailure(new DecryptionFailure('$event_id1', 'ERROR_CODE_1'));
+        tracker.addDecryptionFailure(new DecryptionFailure('$event_id2', 'ERROR_CODE_2'));
+        tracker.addDecryptionFailure(new DecryptionFailure('$event_id3', 'ERROR_CODE_3'));
+
+        // Pretend "now" is Infinity
+        tracker.checkFailures(Infinity);
+
+        tracker.trackFailures();
+
+        expect(counts['MY_NEW_ERROR_CODE'])
+            .toBe(3, 'should track three MY_NEW_ERROR_CODE, got ' + counts['MY_NEW_ERROR_CODE']);
+    });
 });
diff --git a/test/components/views/login/RegistrationForm-test.js b/test/components/views/login/RegistrationForm-test.js
index 81db5b487b..14a5d036b4 100644
--- a/test/components/views/login/RegistrationForm-test.js
+++ b/test/components/views/login/RegistrationForm-test.js
@@ -37,6 +37,11 @@ function doInputEmail(inputEmail, onTeamSelected) {
         ,
     );
 
diff --git a/test/components/views/rooms/MessageComposerInput-test.js b/test/components/views/rooms/MessageComposerInput-test.js
index eadd923726..662fbc7104 100644
--- a/test/components/views/rooms/MessageComposerInput-test.js
+++ b/test/components/views/rooms/MessageComposerInput-test.js
@@ -20,7 +20,9 @@ function addTextToDraft(text) {
     }
 }
 
-describe('MessageComposerInput', () => {
+// FIXME: These tests need to be updated from Draft to Slate.
+
+xdescribe('MessageComposerInput', () => {
     let parentDiv = null,
         sandbox = null,
         client = null,
@@ -69,7 +71,7 @@ describe('MessageComposerInput', () => {
                 'mx_MessageComposer_input_markdownIndicator');
             ReactTestUtils.Simulate.click(indicator);
 
-            expect(mci.state.isRichtextEnabled).toEqual(false, 'should have changed mode');
+            expect(mci.state.isRichTextEnabled).toEqual(false, 'should have changed mode');
             done();
         });
     });
@@ -299,4 +301,4 @@ describe('MessageComposerInput', () => {
         expect(spy.args[0][1].body).toEqual('[Click here](https://some.lovely.url)');
         expect(spy.args[0][1].formatted_body).toEqual('Click here');
     });
-});
+});
\ No newline at end of file
diff --git a/test/components/views/rooms/RoomList-test.js b/test/components/views/rooms/RoomList-test.js
index f40a89777b..e512b96ba8 100644
--- a/test/components/views/rooms/RoomList-test.js
+++ b/test/components/views/rooms/RoomList-test.js
@@ -14,21 +14,22 @@ import dis from '../../../../src/dispatcher';
 import DMRoomMap from '../../../../src/utils/DMRoomMap.js';
 import GroupStore from '../../../../src/stores/GroupStore.js';
 
-import { Room, RoomMember } from 'matrix-js-sdk';
+import { MatrixClient, Room, RoomMember } from 'matrix-js-sdk';
 
 function generateRoomId() {
     return '!' + Math.random().toString().slice(2, 10) + ':domain';
 }
 
-function createRoom(opts) {
-    const room = new Room(generateRoomId());
-    if (opts) {
-        Object.assign(room, opts);
-    }
-    return room;
-}
 
 describe('RoomList', () => {
+    function createRoom(opts) {
+        const room = new Room(generateRoomId(), null, client.getUserId());
+        if (opts) {
+            Object.assign(room, opts);
+        }
+        return room;
+    }
+
     let parentDiv = null;
     let sandbox = null;
     let client = null;
@@ -48,6 +49,8 @@ describe('RoomList', () => {
         sandbox = TestUtils.stubClient(sandbox);
         client = MatrixClientPeg.get();
         client.credentials = {userId: myUserId};
+        //revert this to prototype method as the test-utils monkey-patches this to return a hardcoded value
+        client.getUserId = MatrixClient.prototype.getUserId;
 
         clock = lolex.install();
 
@@ -71,6 +74,7 @@ describe('RoomList', () => {
         // Mock joined member
         myMember = new RoomMember(movingRoomId, myUserId);
         myMember.membership = 'join';
+        movingRoom.updateMyMembership('join');
         movingRoom.getMember = (userId) => ({
             [client.credentials.userId]: myMember,
         }[userId]);
@@ -78,6 +82,7 @@ describe('RoomList', () => {
         otherRoom = createRoom({name: 'Other room'});
         myOtherMember = new RoomMember(otherRoom.roomId, myUserId);
         myOtherMember.membership = 'join';
+        otherRoom.updateMyMembership('join');
         otherRoom.getMember = (userId) => ({
             [client.credentials.userId]: myOtherMember,
         }[userId]);
@@ -91,6 +96,7 @@ describe('RoomList', () => {
             createRoom({tags: {'m.lowpriority': {}}, name: 'Some unimportant room'}),
             createRoom({tags: {'custom.tag': {}}, name: 'Some room customly tagged'}),
         ];
+        client.getVisibleRooms = client.getRooms;
 
         const roomMap = {};
         client.getRooms().forEach((r) => {
diff --git a/test/test-utils.js b/test/test-utils.js
index 0e8fb1df79..bc4d29210e 100644
--- a/test/test-utils.js
+++ b/test/test-utils.js
@@ -74,6 +74,7 @@ export function createTestClient() {
         getPushActionsForEvent: sinon.stub(),
         getRoom: sinon.stub().returns(mkStubRoom()),
         getRooms: sinon.stub().returns([]),
+        getVisibleRooms: sinon.stub().returns([]),
         getGroups: sinon.stub().returns([]),
         loginFlows: sinon.stub(),
         on: sinon.stub(),
@@ -255,6 +256,9 @@ export function mkStubRoom(roomId = null) {
         getUnfilteredTimelineSet: () => null,
         getAccountData: () => null,
         hasMembershipState: () => null,
+        getVersion: () => '1',
+        shouldUpgradeToVersion: () => null,
+        getMyMembership: () => "join",
         currentState: {
             getStateEvents: sinon.stub(),
             mayClientSendStateEvent: sinon.stub().returns(true),