Merge in upstream changes

2017-06-13 11:44:23 +01:00 · 2017-06-13 11:44:23 +01:00 · 876899948f
commit 876899948f
parent 2da30137ec aef0a8025c
126 changed files with 6421 additions and 1378 deletions
--- a/.eslintignore.errorfiles
+++ b/.eslintignore.errorfiles
@ -0,0 +1,187 @@
+# autogenerated file: run scripts/generate-eslint-error-ignore-file to update.
+
+src/AddThreepid.js
+src/async-components/views/dialogs/EncryptedEventDialog.js
+src/autocomplete/AutocompleteProvider.js
+src/autocomplete/Autocompleter.js
+src/autocomplete/Components.js
+src/autocomplete/DuckDuckGoProvider.js
+src/autocomplete/EmojiProvider.js
+src/autocomplete/RoomProvider.js
+src/autocomplete/UserProvider.js
+src/Avatar.js
+src/BasePlatform.js
+src/CallHandler.js
+src/component-index.js
+src/components/structures/ContextualMenu.js
+src/components/structures/CreateRoom.js
+src/components/structures/FilePanel.js
+src/components/structures/InteractiveAuth.js
+src/components/structures/LoggedInView.js
+src/components/structures/login/ForgotPassword.js
+src/components/structures/login/Login.js
+src/components/structures/login/PostRegistration.js
+src/components/structures/login/Registration.js
+src/components/structures/MatrixChat.js
+src/components/structures/MessagePanel.js
+src/components/structures/NotificationPanel.js
+src/components/structures/RoomStatusBar.js
+src/components/structures/RoomView.js
+src/components/structures/ScrollPanel.js
+src/components/structures/TimelinePanel.js
+src/components/structures/UploadBar.js
+src/components/structures/UserSettings.js
+src/components/views/avatars/BaseAvatar.js
+src/components/views/avatars/MemberAvatar.js
+src/components/views/avatars/RoomAvatar.js
+src/components/views/create_room/CreateRoomButton.js
+src/components/views/create_room/Presets.js
+src/components/views/create_room/RoomAlias.js
+src/components/views/dialogs/ChatCreateOrReuseDialog.js
+src/components/views/dialogs/ChatInviteDialog.js
+src/components/views/dialogs/DeactivateAccountDialog.js
+src/components/views/dialogs/InteractiveAuthDialog.js
+src/components/views/dialogs/SetMxIdDialog.js
+src/components/views/dialogs/UnknownDeviceDialog.js
+src/components/views/elements/AccessibleButton.js
+src/components/views/elements/ActionButton.js
+src/components/views/elements/AddressSelector.js
+src/components/views/elements/AddressTile.js
+src/components/views/elements/CreateRoomButton.js
+src/components/views/elements/DeviceVerifyButtons.js
+src/components/views/elements/DirectorySearchBox.js
+src/components/views/elements/Dropdown.js
+src/components/views/elements/EditableText.js
+src/components/views/elements/EditableTextContainer.js
+src/components/views/elements/HomeButton.js
+src/components/views/elements/LanguageDropdown.js
+src/components/views/elements/MemberEventListSummary.js
+src/components/views/elements/PowerSelector.js
+src/components/views/elements/ProgressBar.js
+src/components/views/elements/RoomDirectoryButton.js
+src/components/views/elements/SettingsButton.js
+src/components/views/elements/StartChatButton.js
+src/components/views/elements/TintableSvg.js
+src/components/views/elements/TruncatedList.js
+src/components/views/elements/UserSelector.js
+src/components/views/login/CaptchaForm.js
+src/components/views/login/CasLogin.js
+src/components/views/login/CountryDropdown.js
+src/components/views/login/CustomServerDialog.js
+src/components/views/login/InteractiveAuthEntryComponents.js
+src/components/views/login/LoginHeader.js
+src/components/views/login/PasswordLogin.js
+src/components/views/login/RegistrationForm.js
+src/components/views/login/ServerConfig.js
+src/components/views/messages/MAudioBody.js
+src/components/views/messages/MessageEvent.js
+src/components/views/messages/MFileBody.js
+src/components/views/messages/MImageBody.js
+src/components/views/messages/MVideoBody.js
+src/components/views/messages/RoomAvatarEvent.js
+src/components/views/messages/TextualBody.js
+src/components/views/messages/TextualEvent.js
+src/components/views/room_settings/AliasSettings.js
+src/components/views/room_settings/ColorSettings.js
+src/components/views/room_settings/UrlPreviewSettings.js
+src/components/views/rooms/Autocomplete.js
+src/components/views/rooms/AuxPanel.js
+src/components/views/rooms/EntityTile.js
+src/components/views/rooms/EventTile.js
+src/components/views/rooms/LinkPreviewWidget.js
+src/components/views/rooms/MemberDeviceInfo.js
+src/components/views/rooms/MemberInfo.js
+src/components/views/rooms/MemberList.js
+src/components/views/rooms/MemberTile.js
+src/components/views/rooms/MessageComposer.js
+src/components/views/rooms/MessageComposerInput.js
+src/components/views/rooms/MessageComposerInputOld.js
+src/components/views/rooms/PresenceLabel.js
+src/components/views/rooms/ReadReceiptMarker.js
+src/components/views/rooms/RoomHeader.js
+src/components/views/rooms/RoomList.js
+src/components/views/rooms/RoomNameEditor.js
+src/components/views/rooms/RoomPreviewBar.js
+src/components/views/rooms/RoomSettings.js
+src/components/views/rooms/RoomTile.js
+src/components/views/rooms/RoomTopicEditor.js
+src/components/views/rooms/SearchableEntityList.js
+src/components/views/rooms/SearchResultTile.js
+src/components/views/rooms/TabCompleteBar.js
+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/DevicesPanelEntry.js
+src/components/views/settings/EnableNotificationsButton.js
+src/components/views/voip/CallView.js
+src/components/views/voip/IncomingCallBox.js
+src/components/views/voip/VideoFeed.js
+src/components/views/voip/VideoView.js
+src/ContentMessages.js
+src/createRoom.js
+src/DateUtils.js
+src/email.js
+src/Entities.js
+src/extend.js
+src/HtmlUtils.js
+src/ImageUtils.js
+src/Invite.js
+src/languageHandler.js
+src/linkify-matrix.js
+src/Login.js
+src/Markdown.js
+src/MatrixClientPeg.js
+src/Modal.js
+src/Notifier.js
+src/ObjectUtils.js
+src/PasswordReset.js
+src/PlatformPeg.js
+src/Presence.js
+src/ratelimitedfunc.js
+src/Resend.js
+src/RichText.js
+src/Roles.js
+src/RoomListSorter.js
+src/RoomNotifs.js
+src/Rooms.js
+src/RtsClient.js
+src/ScalarAuthClient.js
+src/ScalarMessaging.js
+src/SdkConfig.js
+src/Skinner.js
+src/SlashCommands.js
+src/stores/LifecycleStore.js
+src/TabComplete.js
+src/TabCompleteEntries.js
+src/TextForEvent.js
+src/Tinter.js
+src/UiEffects.js
+src/Unread.js
+src/UserActivity.js
+src/utils/DecryptFile.js
+src/utils/DMRoomMap.js
+src/utils/FormattingUtils.js
+src/utils/MultiInviter.js
+src/utils/Receipt.js
+src/Velociraptor.js
+src/VelocityBounce.js
+src/WhoIsTyping.js
+src/wrappers/WithMatrixClient.js
+test/all-tests.js
+test/components/structures/login/Registration-test.js
+test/components/structures/MessagePanel-test.js
+test/components/structures/ScrollPanel-test.js
+test/components/structures/TimelinePanel-test.js
+test/components/stub-component.js
+test/components/views/dialogs/InteractiveAuthDialog-test.js
+test/components/views/elements/MemberEventListSummary-test.js
+test/components/views/login/RegistrationForm-test.js
+test/components/views/rooms/MessageComposerInput-test.js
+test/mock-clock.js
+test/skinned-sdk.js
+test/stores/RoomViewStore-test.js
+test/test-utils.js
--- a/.gitignore
+++ b/.gitignore
@ -12,3 +12,5 @@ npm-debug.log

 /.idea
 /src/component-index.js
+
+.DS_Store
--- a/.travis.yml
+++ b/.travis.yml
@ -5,6 +5,4 @@ install:
    - npm install
    - (cd node_modules/matrix-js-sdk && npm install)
 script:
-    # don't run the riot tests unless the react-sdk tests pass, otherwise
-    # the output is confusing.
-    - npm run test && ./.travis-test-riot.sh
+    ./scripts/travis.sh
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,3 +1,167 @@
+Changes in [0.9.3](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.9.3) (2017-06-12)
+===================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.9.3-rc.2...v0.9.3)
+
+ * Add more translations & fix some existing ones
+
+Changes in [0.9.3-rc.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.9.3-rc.2) (2017-06-09)
+=============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.9.3-rc.1...v0.9.3-rc.2)
+
+ * Fix flux dependency
+ * Fix translations on conference call bar
+
+Changes in [0.9.3-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.9.3-rc.1) (2017-06-09)
+=============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.9.2...v0.9.3-rc.1)
+
+ * When ChatCreateOrReuseDialog is cancelled by a guest, go home
+   [\#1069](https://github.com/matrix-org/matrix-react-sdk/pull/1069)
+ * Update from Weblate.
+   [\#1065](https://github.com/matrix-org/matrix-react-sdk/pull/1065)
+ * Goto /home when forgetting the last room
+   [\#1067](https://github.com/matrix-org/matrix-react-sdk/pull/1067)
+ * Default to home page when settings is closed
+   [\#1066](https://github.com/matrix-org/matrix-react-sdk/pull/1066)
+ * Update from Weblate.
+   [\#1063](https://github.com/matrix-org/matrix-react-sdk/pull/1063)
+ * When joining, use a roomAlias if we have it
+   [\#1062](https://github.com/matrix-org/matrix-react-sdk/pull/1062)
+ * Control currently viewed event via RoomViewStore
+   [\#1058](https://github.com/matrix-org/matrix-react-sdk/pull/1058)
+ * Better error messages for login
+   [\#1060](https://github.com/matrix-org/matrix-react-sdk/pull/1060)
+ * Add remaining translations
+   [\#1056](https://github.com/matrix-org/matrix-react-sdk/pull/1056)
+ * Added button that copies code to clipboard
+   [\#1040](https://github.com/matrix-org/matrix-react-sdk/pull/1040)
+ * de-lint MegolmExportEncryption + test
+   [\#1059](https://github.com/matrix-org/matrix-react-sdk/pull/1059)
+ * Better RTL support
+   [\#1021](https://github.com/matrix-org/matrix-react-sdk/pull/1021)
+ * make mels emoji capable
+   [\#1057](https://github.com/matrix-org/matrix-react-sdk/pull/1057)
+ * Make travis check for lint on files which are clean to start with
+   [\#1055](https://github.com/matrix-org/matrix-react-sdk/pull/1055)
+ * Update from Weblate.
+   [\#1053](https://github.com/matrix-org/matrix-react-sdk/pull/1053)
+ * Add some logging around switching rooms
+   [\#1054](https://github.com/matrix-org/matrix-react-sdk/pull/1054)
+ * Update from Weblate.
+   [\#1052](https://github.com/matrix-org/matrix-react-sdk/pull/1052)
+ * Use user_directory endpoint to populate ChatInviteDialog
+   [\#1050](https://github.com/matrix-org/matrix-react-sdk/pull/1050)
+ * Various Analytics changes/fixes/improvements
+   [\#1046](https://github.com/matrix-org/matrix-react-sdk/pull/1046)
+ * Use an arrow function to allow `this`
+   [\#1051](https://github.com/matrix-org/matrix-react-sdk/pull/1051)
+ * New guest access
+   [\#937](https://github.com/matrix-org/matrix-react-sdk/pull/937)
+ * Translate src/components/structures
+   [\#1048](https://github.com/matrix-org/matrix-react-sdk/pull/1048)
+ * Cancel 'join room' action if 'log in' is clicked
+   [\#1049](https://github.com/matrix-org/matrix-react-sdk/pull/1049)
+ * fix copy and paste derp and rip out unused imports
+   [\#1015](https://github.com/matrix-org/matrix-react-sdk/pull/1015)
+ * Update from Weblate.
+   [\#1042](https://github.com/matrix-org/matrix-react-sdk/pull/1042)
+ * Reset 'first sync' flag / promise on log in
+   [\#1041](https://github.com/matrix-org/matrix-react-sdk/pull/1041)
+ * Remove DM-guessing code (again)
+   [\#1036](https://github.com/matrix-org/matrix-react-sdk/pull/1036)
+ * Cancel deferred actions
+   [\#1039](https://github.com/matrix-org/matrix-react-sdk/pull/1039)
+ * Merge develop, add i18n for SetMxIdDialog
+   [\#1034](https://github.com/matrix-org/matrix-react-sdk/pull/1034)
+ * Defer an intention for creating a room
+   [\#1038](https://github.com/matrix-org/matrix-react-sdk/pull/1038)
+ * Fix 'create room' button
+   [\#1037](https://github.com/matrix-org/matrix-react-sdk/pull/1037)
+ * Always show the spinner during the first sync
+   [\#1033](https://github.com/matrix-org/matrix-react-sdk/pull/1033)
+ * Only view welcome user if we are not looking at a room
+   [\#1032](https://github.com/matrix-org/matrix-react-sdk/pull/1032)
+ * Update from Weblate.
+   [\#1030](https://github.com/matrix-org/matrix-react-sdk/pull/1030)
+ * Keep deferred actions for view_user_settings and view_create_chat
+   [\#1031](https://github.com/matrix-org/matrix-react-sdk/pull/1031)
+ * Don't do a deferred start chat if user is welcome user
+   [\#1029](https://github.com/matrix-org/matrix-react-sdk/pull/1029)
+ * Introduce state `peekLoading` to avoid collision with `roomLoading`
+   [\#1028](https://github.com/matrix-org/matrix-react-sdk/pull/1028)
+ * Update from Weblate.
+   [\#1016](https://github.com/matrix-org/matrix-react-sdk/pull/1016)
+ * Fix accepting a 3pid invite
+   [\#1013](https://github.com/matrix-org/matrix-react-sdk/pull/1013)
+ * Propagate room join errors to the UI
+   [\#1007](https://github.com/matrix-org/matrix-react-sdk/pull/1007)
+ * Implement /user/@userid:domain?action=chat
+   [\#1006](https://github.com/matrix-org/matrix-react-sdk/pull/1006)
+ * Show People/Rooms emptySubListTip even when total rooms !== 0
+   [\#967](https://github.com/matrix-org/matrix-react-sdk/pull/967)
+ * Fix to show the correct room
+   [\#995](https://github.com/matrix-org/matrix-react-sdk/pull/995)
+ * Remove cachedPassword from localStorage on_logged_out
+   [\#977](https://github.com/matrix-org/matrix-react-sdk/pull/977)
+ * Add /start to show the setMxId above HomePage
+   [\#964](https://github.com/matrix-org/matrix-react-sdk/pull/964)
+ * Allow pressing Enter to submit setMxId
+   [\#961](https://github.com/matrix-org/matrix-react-sdk/pull/961)
+ * add login link to SetMxIdDialog
+   [\#954](https://github.com/matrix-org/matrix-react-sdk/pull/954)
+ * Block user settings with view_set_mxid
+   [\#936](https://github.com/matrix-org/matrix-react-sdk/pull/936)
+ * Show "Something went wrong!" when errcode undefined
+   [\#935](https://github.com/matrix-org/matrix-react-sdk/pull/935)
+ * Reset store state when logging out
+   [\#930](https://github.com/matrix-org/matrix-react-sdk/pull/930)
+ * Set the displayname to the mxid once PWLU
+   [\#933](https://github.com/matrix-org/matrix-react-sdk/pull/933)
+ * Fix view_next_room, view_previous_room and view_indexed_room
+   [\#929](https://github.com/matrix-org/matrix-react-sdk/pull/929)
+ * Use RVS to indicate "joining" when setting a mxid
+   [\#928](https://github.com/matrix-org/matrix-react-sdk/pull/928)
+ * Don't show notif nag bar if guest
+   [\#932](https://github.com/matrix-org/matrix-react-sdk/pull/932)
+ * Show "Password" instead of "New Password"
+   [\#927](https://github.com/matrix-org/matrix-react-sdk/pull/927)
+ * Remove warm-fuzzy after setting mxid
+   [\#926](https://github.com/matrix-org/matrix-react-sdk/pull/926)
+ * Allow teamServerConfig to be missing
+   [\#925](https://github.com/matrix-org/matrix-react-sdk/pull/925)
+ * Remove GuestWarningBar
+   [\#923](https://github.com/matrix-org/matrix-react-sdk/pull/923)
+ * Make left panel better for new users (mk III)
+   [\#924](https://github.com/matrix-org/matrix-react-sdk/pull/924)
+ * Implement default welcome page and allow custom URL /w config
+   [\#922](https://github.com/matrix-org/matrix-react-sdk/pull/922)
+ * Implement a store for RoomView
+   [\#921](https://github.com/matrix-org/matrix-react-sdk/pull/921)
+ * Add prop to toggle whether new password input is autoFocused
+   [\#915](https://github.com/matrix-org/matrix-react-sdk/pull/915)
+ * Implement warm-fuzzy success dialog for SetMxIdDialog
+   [\#905](https://github.com/matrix-org/matrix-react-sdk/pull/905)
+ * Write some tests for the RTS UI
+   [\#893](https://github.com/matrix-org/matrix-react-sdk/pull/893)
+ * Make confirmation optional on ChangePassword
+   [\#890](https://github.com/matrix-org/matrix-react-sdk/pull/890)
+ * Remove "Current Password" input if mx_pass exists
+   [\#881](https://github.com/matrix-org/matrix-react-sdk/pull/881)
+ * Replace NeedToRegisterDialog /w SetMxIdDialog
+   [\#889](https://github.com/matrix-org/matrix-react-sdk/pull/889)
+ * Invite the welcome user after registration if configured
+   [\#882](https://github.com/matrix-org/matrix-react-sdk/pull/882)
+ * Prevent ROUs from creating new chats/new rooms
+   [\#879](https://github.com/matrix-org/matrix-react-sdk/pull/879)
+ * Redesign mxID chooser, add availability checking
+   [\#877](https://github.com/matrix-org/matrix-react-sdk/pull/877)
+ * Show password nag bar when user is PWLU
+   [\#864](https://github.com/matrix-org/matrix-react-sdk/pull/864)
+ * fix typo
+   [\#858](https://github.com/matrix-org/matrix-react-sdk/pull/858)
+ * Initial implementation: SetDisplayName -> SetMxIdDialog
+   [\#849](https://github.com/matrix-org/matrix-react-sdk/pull/849)
+
 Changes in [0.9.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.9.2) (2017-06-06)
 ===================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.9.1...v0.9.2)
--- a/jenkins.sh
+++ b/jenkins.sh
@ -21,6 +21,11 @@ npm run test
 # run eslint
 npm run lintall -- -f checkstyle -o eslint.xml || true

+# re-run the linter, excluding any files known to have errors or warnings.
+./node_modules/.bin/eslint --max-warnings 0 \
+    --ignore-path .eslintignore.errorfiles \
+    src test
+
 # delete the old tarball, if it exists
 rm -f matrix-react-sdk-*.tgz

--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "matrix-react-sdk",
-  "version": "0.9.2",
+  "version": "0.9.3",
  "description": "SDK for matrix.org using React",
  "author": "matrix.org",
  "repository": {
@ -57,15 +57,16 @@
    "emojione": "2.2.3",
    "file-saver": "^1.3.3",
    "filesize": "3.5.6",
-    "flux": "^2.0.3",
+    "flux": "2.1.1",
    "fuse.js": "^2.2.0",
    "glob": "^5.0.14",
    "highlight.js": "^8.9.1",
    "isomorphic-fetch": "^2.2.1",
    "linkifyjs": "^2.1.3",
    "lodash": "^4.13.1",
-    "matrix-js-sdk": "0.7.10",
+    "matrix-js-sdk": "0.7.11",
    "optimist": "^0.6.1",
+    "prop-types": "^15.5.8",
    "q": "^1.4.1",
    "react": "^15.4.0",
    "react-addons-css-transition-group": "15.3.2",
--- a/scripts/fix-i18n.pl
+++ b/scripts/fix-i18n.pl
@ -61,6 +61,16 @@ You are already in a call.
 You cannot place VoIP calls in this browser.
 You cannot place a call with yourself.
 Your email address does not appear to be associated with a Matrix ID on this Homeserver.
+Guest users can't upload files. Please register to upload.
+Some of your messages have not been sent.
+This room is private or inaccessible to guests. You may be able to join if you register.
+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.
+This action cannot be performed by a guest user. Please register to be able to do this.
+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.
+You are trying to access %(roomName)s.
+You will not be able to undo this change as you are promoting the user to have the same power level as yourself.
 EOT
 )];
 }
@ -84,7 +94,7 @@ if ($_ =~ m/^(\s+)"(.*?)"(: *)"(.*?)"(,?)$/) {
            $sub = 1;
        }

-        if ($src eq $fixup && $dst !~ /\.$/) {
+        if ($ARGV !~ /(zh_Hans|zh_Hant|th)\.json$/ && $src eq $fixup && $dst !~ /\.$/) {
            print STDERR "fixing up dst: $dst\n";
            $dst .= '.';
            $sub = 1;            
--- a/scripts/generate-eslint-error-ignore-file
+++ b/scripts/generate-eslint-error-ignore-file
@ -0,0 +1,21 @@
+#!/bin/sh
+#
+# generates .eslintignore.errorfiles to list the files which have errors in,
+# so that they can be ignored in future automated linting.
+
+out=.eslintignore.errorfiles
+
+cd `dirname $0`/..
+
+echo "generating $out"
+
+{
+    cat <<EOF
+# autogenerated file: run scripts/generate-eslint-error-ignore-file to update.
+
+EOF
+    
+    ./node_modules/.bin/eslint --no-ignore -f json src test |
+        jq -r '.[] | select((.errorCount + .warningCount) > 0) | .filePath' |
+        sed -e 's/.*matrix-react-sdk\///';
+} > "$out"
--- a/scripts/travis.sh
+++ b/scripts/travis.sh
@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -ex
+
+npm run test
+./.travis-test-riot.sh
+
+# run the linter, but exclude any files known to have errors or warnings.
+./node_modules/.bin/eslint --max-warnings 0 \
+    --ignore-path .eslintignore.errorfiles \
+    src test
--- a/src/Analytics.js
+++ b/src/Analytics.js
@ -19,8 +19,10 @@ import MatrixClientPeg from './MatrixClientPeg';
 import PlatformPeg from './PlatformPeg';
 import SdkConfig from './SdkConfig';

-function redact(str) {
-    return str.replace(/#\/(room|user)\/(.+)/, "#/$1/<redacted>");
+function getRedactedUrl() {
+    const redactedHash = window.location.hash.replace(/#\/(room|user)\/(.+)/, "#/$1/<redacted>");
+    // hardcoded url to make piwik happy
+    return 'https://riot.im/app/' + redactedHash;
 }

 const customVariables = {
@ -28,6 +30,7 @@ const customVariables = {
    'App Version': 2,
    'User Type': 3,
    'Chosen Language': 4,
+    'Instance': 5,
 };


@ -53,6 +56,7 @@ class Analytics {
     * but this is second best, Piwik should not pull anything implicitly.
     */
    disable() {
+        this.trackEvent('Analytics', 'opt-out');
        this.disabled = true;
    }

@ -84,6 +88,10 @@ class Analytics {

        this._setVisitVariable('Chosen Language', getCurrentLanguage());

+        if (window.location.hostname === 'riot.im') {
+            this._setVisitVariable('Instance', window.location.pathname);
+        }
+
        (function() {
            const g = document.createElement('script');
            const s = document.getElementsByTagName('script')[0];
@ -108,7 +116,7 @@ class Analytics {
            this.firstPage = false;
            return;
        }
-        this._paq.push(['setCustomUrl', redact(window.location.href)]);
+        this._paq.push(['setCustomUrl', getRedactedUrl()]);
        this._paq.push(['trackPageView']);
    }

--- a/src/CallMediaHandler.js
+++ b/src/CallMediaHandler.js
@ -16,7 +16,6 @@

 import UserSettingsStore from './UserSettingsStore';
 import * as Matrix from 'matrix-js-sdk';
-import q from 'q';

 export default {
    getDevices: function() {
--- a/src/HtmlUtils.js
+++ b/src/HtmlUtils.js
@ -345,6 +345,7 @@ export function bodyToHtml(content, highlights, opts) {
        }
        safeBody = sanitizeHtml(body, sanitizeHtmlParams);
        safeBody = unicodeToImage(safeBody);
+        safeBody = addCodeCopyButton(safeBody);
    }
    finally {
        delete sanitizeHtmlParams.textFilter;
@ -363,6 +364,23 @@ export function bodyToHtml(content, highlights, opts) {
    return <span className={className} dangerouslySetInnerHTML={{ __html: safeBody }} dir="auto" />;
 }

+function addCodeCopyButton(safeBody) {
+    // Adds 'copy' buttons to pre blocks
+    // Note that this only manipulates the markup to add the buttons:
+    // we need to add the event handlers once the nodes are in the DOM
+    // since we can't save functions in the markup.
+    // This is done in TextualBody
+    const el = document.createElement("div");
+    el.innerHTML = safeBody;
+    const codeBlocks = Array.from(el.getElementsByTagName("pre"));
+    codeBlocks.forEach(p => {
+        const button = document.createElement("span");
+        button.className = "mx_EventTile_copyButton";
+        p.appendChild(button);
+    });
+    return el.innerHTML;
+}
+
 export function emojifyText(text) {
    return {
        __html: unicodeToImage(escape(text)),
--- a/src/KeyCode.js
+++ b/src/KeyCode.js
@ -32,4 +32,5 @@ module.exports = {
    DELETE: 46,
    KEY_D: 68,
    KEY_E: 69,
+    KEY_M: 77,
 };
--- a/src/Lifecycle.js
+++ b/src/Lifecycle.js
@ -187,6 +187,14 @@ function _registerAsGuest(hsUrl, isUrl, defaultDeviceDisplayName) {

 // returns a promise which resolves to true if a session is found in
 // localstorage
+//
+// N.B. Lifecycle.js should not maintain any further localStorage state, we
+//      are moving towards using SessionStore to keep track of state related
+//      to the current session (which is typically backed by localStorage).
+//
+//      The plan is to gradually move the localStorage access done here into
+//      SessionStore to avoid bugs where the view becomes out-of-sync with
+//      localStorage (e.g. teamToken, isGuest etc.)
 function _restoreFromLocalStorage() {
    if (!localStorage) {
        return q(false);
@ -314,6 +322,16 @@ export function setLoggedIn(credentials) {
                localStorage.setItem("mx_device_id", credentials.deviceId);
            }

+            // The user registered as a PWLU (PassWord-Less User), the generated password
+            // is cached here such that the user can change it at a later time.
+            if (credentials.password) {
+                // Update SessionStore
+                dis.dispatch({
+                    action: 'cached_password',
+                    cachedPassword: credentials.password,
+                });
+            }
+
            console.log("Session persisted for %s", credentials.userId);
        } catch (e) {
            console.warn("Error using local storage: can't persist session!", e);
--- a/src/Login.js
+++ b/src/Login.js
@ -97,11 +97,6 @@ export default class Login {
                guest: true
            };
        }, (error) => {
-            if (error.httpStatus === 403) {
-                error.friendlyText = _t("Guest access is disabled on this Home Server.");
-            } else {
-                error.friendlyText = _t("Failed to register as guest:") + ' ' + error.data;
-            }
            throw error;
        });
    }
@ -157,15 +152,7 @@ export default class Login {
                accessToken: data.access_token
            });
        }, function(error) {
-            if (error.httpStatus == 400 && loginParams.medium) {
-                error.friendlyText = (
-                    _t('This Home Server does not support login using email address.')
-                );
-            }
-            else if (error.httpStatus === 403) {
-                error.friendlyText = (
-                    _t('Incorrect username and/or password.')
-                );
+            if (error.httpStatus === 403) {
                if (self._fallbackHsUrl) {
                    var fbClient = Matrix.createClient({
                        baseUrl: self._fallbackHsUrl,
@ -186,11 +173,6 @@ export default class Login {
                    });
                }
            }
-            else {
-                error.friendlyText = (
-                    _t("There was a problem logging in.") + ' (HTTP ' + error.httpStatus + ")"
-                );
-            }
            throw error;
        });
    }
--- a/src/MatrixClientPeg.js
+++ b/src/MatrixClientPeg.js
@ -16,7 +16,6 @@ limitations under the License.

 'use strict';

-import q from "q";
 import Matrix from 'matrix-js-sdk';
 import utils from 'matrix-js-sdk/lib/utils';
 import EventTimeline from 'matrix-js-sdk/lib/models/event-timeline';
--- a/src/Rooms.js
+++ b/src/Rooms.js
@ -15,7 +15,6 @@ limitations under the License.
 */

 import MatrixClientPeg from './MatrixClientPeg';
-import DMRoomMap from './utils/DMRoomMap';
 import q from 'q';

 /**
--- a/src/ScalarMessaging.js
+++ b/src/ScalarMessaging.js
@ -94,6 +94,22 @@ Example:
    }
 }

+get_membership_count
+--------------------
+Get the number of joined users in the room.
+
+Request:
+ - room_id is the room to get the count in.
+Response:
+78
+Example:
+{
+    action: "get_membership_count",
+    room_id: "!foo:bar",
+    response: 78
+}
+
+
 membership_state AND bot_options
 --------------------------------
 Get the content of the "m.room.member" or "m.room.bot.options" state event respectively.
@ -256,6 +272,21 @@ function botOptions(event, roomId, userId) {
    returnStateEvent(event, roomId, "m.room.bot.options", "_" + userId);
 }

+function getMembershipCount(event, roomId) {
+    const client = MatrixClientPeg.get();
+    if (!client) {
+        sendError(event, _t('You need to be logged in.'));
+        return;
+    }
+    const room = client.getRoom(roomId);
+    if (!room) {
+        sendError(event, _t('This room is not recognised.'));
+        return;
+    }
+    const count = room.getJoinedMembers().length;
+    sendResponse(event, count);
+}
+
 function returnStateEvent(event, roomId, eventType, stateKey) {
    const client = MatrixClientPeg.get();
    if (!client) {
@ -343,6 +374,9 @@ const onMessage = function(event) {
        } else if (event.data.action === "set_plumbing_state") {
            setPlumbingState(event, roomId, event.data.status);
            return;
+        } else if (event.data.action === "get_membership_count") {
+            getMembershipCount(event, roomId);
+            return;
        }

        if (!userId) {
--- a/src/async-components/views/dialogs/ExportE2eKeysDialog.js
+++ b/src/async-components/views/dialogs/ExportE2eKeysDialog.js
@ -120,7 +120,7 @@ export default React.createClass({
                                '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.'
+                                'decrypt these messages.',
                            ) }
                        </p>
                        <p>
@ -130,7 +130,7 @@ export default React.createClass({
                                '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.'
+                                'same passphrase.',
                            ) }
                        </p>
                        <div className='error'>
--- a/src/async-components/views/dialogs/ImportE2eKeysDialog.js
+++ b/src/async-components/views/dialogs/ImportE2eKeysDialog.js
@ -122,13 +122,13 @@ export default React.createClass({
                                '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.'
+                                'messages that the other client could decrypt.',
                            ) }
                        </p>
                        <p>
                            { _t(
                                'The export file will be protected with a passphrase. ' +
-                                'You should enter the passphrase here, to decrypt the file.'
+                                'You should enter the passphrase here, to decrypt the file.',
                            ) }
                        </p>
                        <div className='error'>
--- a/src/autocomplete/Components.js
+++ b/src/autocomplete/Components.js
@ -15,7 +15,6 @@ limitations under the License.
 */

 import React from 'react';
-import ReactDOM from 'react-dom';
 import classNames from 'classnames';

 /* These were earlier stateless functional components but had to be converted
--- a/src/autocomplete/UserProvider.js
+++ b/src/autocomplete/UserProvider.js
@ -18,7 +18,6 @@ limitations under the License.
 import React from 'react';
 import { _t } from '../languageHandler';
 import AutocompleteProvider from './AutocompleteProvider';
-import Q from 'q';
 import Fuse from 'fuse.js';
 import {PillCompletion} from './Components';
 import sdk from '../index';
--- a/src/components/structures/CreateRoom.js
+++ b/src/components/structures/CreateRoom.js
@ -17,7 +17,6 @@ limitations under the License.
 'use strict';

 import React from 'react';
-import q from 'q';
 import { _t } from '../../languageHandler';
 import sdk from '../../index';
 import MatrixClientPeg from '../../MatrixClientPeg';
@ -232,7 +231,7 @@ module.exports = React.createClass({
            if (curr_phase == this.phases.ERROR) {
                error_box = (
                    <div className="mx_Error">
-                        {_t('An error occured: %(error_string)s', {error_string: this.state.error_string})}
+                        {_t('An error occurred: %(error_string)s', {error_string: this.state.error_string})}
                    </div>
                );
            }
@ -247,7 +246,7 @@ module.exports = React.createClass({

            return (
            <div className="mx_CreateRoom">
-                <SimpleRoomHeader title="CreateRoom" collapsedRhs={ this.props.collapsedRhs }/>
+                <SimpleRoomHeader title={_t("Create Room")} collapsedRhs={ this.props.collapsedRhs }/>
                <div className="mx_CreateRoom_body">
                    <input type="text" ref="room_name" value={this.state.room_name} onChange={this.onNameChange} placeholder={_t('Name')}/> <br />
                    <textarea className="mx_CreateRoom_description" ref="topic" value={this.state.topic} onChange={this.onTopicChange} placeholder={_t('Topic')}/> <br />
--- a/src/components/structures/FilePanel.js
+++ b/src/components/structures/FilePanel.js
@ -19,7 +19,7 @@ import React from 'react';
 import Matrix from 'matrix-js-sdk';
 import sdk from '../../index';
 import MatrixClientPeg from '../../MatrixClientPeg';
-import { _t } from '../../languageHandler';
+import { _t, _tJsx } from '../../languageHandler';

 /*
 * Component which shows the filtered file using a TimelinePanel
@ -91,7 +91,9 @@ var FilePanel = React.createClass({
    render: function() {
        if (MatrixClientPeg.get().isGuest()) {
            return <div className="mx_FilePanel mx_RoomView_messageListWrapper">
-                <div className="mx_RoomView_empty">You must <a href="#/register">register</a> to use this functionality</div>
+                <div className="mx_RoomView_empty">
+                {_tJsx("You must <a>register</a> to use this functionality", /<a>(.*?)<\/a>/, (sub) => <a href="#/register" key="sub">{sub}</a>)}
+                </div>
            </div>;
        } else if (this.noRoom) {
            return <div className="mx_FilePanel mx_RoomView_messageListWrapper">
--- a/src/components/structures/InteractiveAuth.js
+++ b/src/components/structures/InteractiveAuth.js
@ -19,8 +19,6 @@ const InteractiveAuth = Matrix.InteractiveAuth;

 import React from 'react';

-import sdk from '../../index';
-
 import {getEntryComponentForLoginType} from '../views/login/InteractiveAuthEntryComponents';

 export default React.createClass({
--- a/src/components/structures/LoggedInView.js
+++ b/src/components/structures/LoggedInView.js
@ -25,6 +25,8 @@ import PageTypes from '../../PageTypes';
 import CallMediaHandler from '../../CallMediaHandler';
 import sdk from '../../index';
 import dis from '../../dispatcher';
+import sessionStore from '../../stores/SessionStore';
+import MatrixClientPeg from '../../MatrixClientPeg';

 /**
 * This is what our MatrixChat shows when we are logged in. The precise view is
@ -41,10 +43,13 @@ export default React.createClass({
    propTypes: {
        matrixClient: React.PropTypes.instanceOf(Matrix.MatrixClient).isRequired,
        page_type: React.PropTypes.string.isRequired,
-        onRoomIdResolved: React.PropTypes.func,
        onRoomCreated: React.PropTypes.func,
        onUserSettingsClose: React.PropTypes.func,

+        // Called with the credentials of a registered user (if they were a ROU that
+        // transitioned to PWLU)
+        onRegistered: React.PropTypes.func,
+
        teamToken: React.PropTypes.string,

        // and lots and lots of other stuff.
@ -83,12 +88,32 @@ export default React.createClass({
        CallMediaHandler.loadDevices();

        document.addEventListener('keydown', this._onKeyDown);
+
+        this._sessionStore = sessionStore;
+        this._sessionStoreToken = this._sessionStore.addListener(
+            this._setStateFromSessionStore,
+        );
+        this._setStateFromSessionStore();
+
        this._matrixClient.on("accountData", this.onAccountData);
    },

    componentWillUnmount: function() {
        document.removeEventListener('keydown', this._onKeyDown);
        this._matrixClient.removeListener("accountData", this.onAccountData);
+        if (this._sessionStoreToken) {
+            this._sessionStoreToken.remove();
+        }
+    },
+
+    // Child components assume that the client peg will not be null, so give them some
+    // sort of assurance here by only allowing a re-render if the client is truthy.
+    //
+    // This is required because `LoggedInView` maintains its own state and if this state
+    // updates after the client peg has been made null (during logout), then it will
+    // attempt to re-render and the children will throw errors.
+    shouldComponentUpdate: function() {
+        return Boolean(MatrixClientPeg.get());
    },

    getScrollStateForRoom: function(roomId) {
@ -102,10 +127,16 @@ export default React.createClass({
        return this.refs.roomView.canResetTimeline();
    },

+    _setStateFromSessionStore() {
+        this.setState({
+            userHasGeneratedPassword: Boolean(this._sessionStore.getCachedPassword()),
+        });
+    },
+
    onAccountData: function(event) {
        if (event.getType() === "im.vector.web.settings") {
            this.setState({
-                useCompactLayout: event.getContent().useCompactLayout
+                useCompactLayout: event.getContent().useCompactLayout,
            });
        }
    },
@ -180,8 +211,8 @@ export default React.createClass({
        const RoomDirectory = sdk.getComponent('structures.RoomDirectory');
        const HomePage = sdk.getComponent('structures.HomePage');
        const MatrixToolbar = sdk.getComponent('globals.MatrixToolbar');
-        const GuestWarningBar = sdk.getComponent('globals.GuestWarningBar');
        const NewVersionBar = sdk.getComponent('globals.NewVersionBar');
+        const PasswordNagBar = sdk.getComponent('globals.PasswordNagBar');

        let page_element;
        let right_panel = '';
@ -190,15 +221,12 @@ export default React.createClass({
            case PageTypes.RoomView:
                page_element = <RoomView
                        ref='roomView'
-                        roomAddress={this.props.currentRoomAlias || this.props.currentRoomId}
                        autoJoin={this.props.autoJoin}
-                        onRoomIdResolved={this.props.onRoomIdResolved}
-                        eventId={this.props.initialEventId}
+                        onRegistered={this.props.onRegistered}
                        thirdPartyInvite={this.props.thirdPartyInvite}
                        oobData={this.props.roomOobData}
-                        highlightedEventId={this.props.highlightedEventId}
                        eventPixelOffset={this.props.initialEventPixelOffset}
-                        key={this.props.currentRoomAlias || this.props.currentRoomId}
+                        key={this.props.currentRoomId || 'roomview'}
                        opacity={this.props.middleOpacity}
                        collapsedRhs={this.props.collapse_rhs}
                        ConferenceHandler={this.props.ConferenceHandler}
@ -235,12 +263,18 @@ export default React.createClass({
                break;

            case PageTypes.HomePage:
+                // If team server config is present, pass the teamServerURL. props.teamToken
+                // must also be set for the team page to be displayed, otherwise the
+                // welcomePageUrl is used (which might be undefined).
+                const teamServerUrl = this.props.config.teamServerConfig ?
+                    this.props.config.teamServerConfig.teamServerURL : null;
+
                page_element = <HomePage
                    collapsedRhs={this.props.collapse_rhs}
-                    teamServerUrl={this.props.config.teamServerConfig.teamServerURL}
+                    teamServerUrl={teamServerUrl}
                    teamToken={this.props.teamToken}
-                />
-                if (!this.props.collapse_rhs) right_panel = <RightPanel opacity={this.props.rightOpacity}/>
+                    homePageUrl={this.props.config.welcomePageUrl}
+                />;
                break;

            case PageTypes.UserView:
@ -249,16 +283,15 @@ export default React.createClass({
                break;
        }

+        const isGuest = this.props.matrixClient.isGuest();
        var topBar;
        if (this.props.hasNewVersion) {
            topBar = <NewVersionBar version={this.props.version} newVersion={this.props.newVersion}
                releaseNotes={this.props.newVersionReleaseNotes}
            />;
-        }
-        else if (this.props.matrixClient.isGuest()) {
-            topBar = <GuestWarningBar />;
-        }
-        else if (Notifier.supportsDesktopNotifications() && !Notifier.isEnabled() && !Notifier.isToolbarHidden()) {
+        } else if (this.state.userHasGeneratedPassword) {
+            topBar = <PasswordNagBar />;
+        } else if (!isGuest && Notifier.supportsDesktopNotifications() && !Notifier.isEnabled() && !Notifier.isToolbarHidden()) {
            topBar = <MatrixToolbar />;
        }

@ -278,7 +311,6 @@ export default React.createClass({
                        selectedRoom={this.props.currentRoomId}
                        collapsed={this.props.collapse_lhs || false}
                        opacity={this.props.leftOpacity}
-                        teamToken={this.props.teamToken}
                    />
                    <main className='mx_MatrixChat_middlePanel'>
                        {page_element}
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@ -34,6 +34,9 @@ import sdk from '../../index';
 import * as Rooms from '../../Rooms';
 import linkifyMatrix from "../../linkify-matrix";
 import * as Lifecycle from '../../Lifecycle';
+// LifecycleStore is not used but does listen to and dispatch actions
+import LifecycleStore from '../../stores/LifecycleStore';
+import RoomViewStore from '../../stores/RoomViewStore';
 import PageTypes from '../../PageTypes';

 import createRoom from "../../createRoom";
@ -102,9 +105,6 @@ module.exports = React.createClass({
            // What the LoggedInView would be showing if visible
            page_type: null,

-            // If we are viewing a room by alias, this contains the alias
-            currentRoomAlias: null,
-
            // The ID of the room we're viewing. This is either populated directly
            // in the case where we view a room by ID or by RoomView when it resolves
            // what ID an alias points at.
@ -191,6 +191,9 @@ module.exports = React.createClass({
    componentWillMount: function() {
        SdkConfig.put(this.props.config);

+        RoomViewStore.addListener(this._onRoomViewStoreUpdated);
+        this._onRoomViewStoreUpdated();
+
        if (!UserSettingsStore.getLocalSetting('analyticsOptOut', false)) Analytics.enable();

        // Used by _viewRoom before getting state from sync
@ -322,7 +325,6 @@ module.exports = React.createClass({
    onAction: function(payload) {
        const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
        const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
-        const TextInputDialog = sdk.getComponent("dialogs.TextInputDialog");

        switch (payload.action) {
            case 'logout':
@ -374,6 +376,11 @@ module.exports = React.createClass({
                });
                this.notifyNewScreen('forgot_password');
                break;
+            case 'start_chat':
+                createRoom({
+                    dmUserId: payload.user_id,
+                });
+                break;
            case 'leave_room':
                this._leaveRoom(payload.room_id);
                break;
@ -434,37 +441,36 @@ module.exports = React.createClass({
                this._viewIndexedRoom(payload.roomIndex);
                break;
            case 'view_user_settings':
+                if (MatrixClientPeg.get().isGuest()) {
+                    dis.dispatch({
+                        action: 'do_after_sync_prepared',
+                        deferred_action: {
+                            action: 'view_user_settings',
+                        },
+                    });
+                    dis.dispatch({action: 'view_set_mxid'});
+                    break;
+                }
                this._setPage(PageTypes.UserSettings);
                this.notifyNewScreen('settings');
                break;
            case 'view_create_room':
-                //this._setPage(PageTypes.CreateRoom);
-                //this.notifyNewScreen('new');
-                Modal.createDialog(TextInputDialog, {
-                    title: _t('Create Room'),
-                    description: _t('Room name (optional)'),
-                    button: _t('Create Room'),
-                    onFinished: (shouldCreate, name) => {
-                        if (shouldCreate) {
-                            const createOpts = {};
-                            if (name) createOpts.name = name;
-                            createRoom({createOpts}).done();
-                        }
-                    },
-                });
+                this._createRoom();
                break;
            case 'view_room_directory':
                this._setPage(PageTypes.RoomDirectory);
                this.notifyNewScreen('directory');
                break;
            case 'view_home_page':
-                if (!this._teamToken) {
-                    dis.dispatch({action: 'view_room_directory'});
-                    return;
-                }
                this._setPage(PageTypes.HomePage);
                this.notifyNewScreen('home');
                break;
+            case 'view_set_mxid':
+                this._setMxId(payload);
+                break;
+            case 'view_start_chat_or_reuse':
+                this._chatCreateOrReuse(payload.user_id);
+                break;
            case 'view_create_chat':
                this._createChat();
                break;
@ -506,7 +512,11 @@ module.exports = React.createClass({
                this._onSetTheme(payload.value);
                break;
            case 'on_logging_in':
-                this.setState({loggingIn: true});
+                // We are now logging in, so set the state to reflect that
+                // and also that we're not ready (we'll be marked as logged
+                // in once the login completes, then ready once the sync
+                // completes).
+                this.setState({loggingIn: true, ready: false});
                break;
            case 'on_logged_in':
                this._onLoggedIn(payload.teamToken);
@ -529,6 +539,10 @@ module.exports = React.createClass({
        }
    },

+    _onRoomViewStoreUpdated: function() {
+        this.setState({ currentRoomId: RoomViewStore.getRoomId() });
+    },
+
    _setPage: function(pageType) {
        this.setState({
            page_type: pageType,
@ -551,10 +565,20 @@ module.exports = React.createClass({
        this.notifyNewScreen('register');
    },

+    // TODO: Move to RoomViewStore
    _viewNextRoom: function(roomIndexDelta) {
        const allRooms = RoomListSorter.mostRecentActivityFirst(
            MatrixClientPeg.get().getRooms(),
        );
+        // If there are 0 rooms or 1 room, view the home page because otherwise
+        // if there are 0, we end up trying to index into an empty array, and
+        // if there is 1, we end up viewing the same room.
+        if (allRooms.length < 2) {
+            dis.dispatch({
+                action: 'view_home_page',
+            });
+            return;
+        }
        let roomIndex = -1;
        for (let i = 0; i < allRooms.length; ++i) {
            if (allRooms[i].roomId == this.state.currentRoomId) {
@ -564,15 +588,22 @@ module.exports = React.createClass({
        }
        roomIndex = (roomIndex + roomIndexDelta) % allRooms.length;
        if (roomIndex < 0) roomIndex = allRooms.length - 1;
-        this._viewRoom({ room_id: allRooms[roomIndex].roomId });
+        dis.dispatch({
+            action: 'view_room',
+            room_id: allRooms[roomIndex].roomId,
+        });
    },

+    // TODO: Move to RoomViewStore
    _viewIndexedRoom: function(roomIndex) {
        const allRooms = RoomListSorter.mostRecentActivityFirst(
            MatrixClientPeg.get().getRooms(),
        );
        if (allRooms[roomIndex]) {
-            this._viewRoom({ room_id: allRooms[roomIndex].roomId });
+            dis.dispatch({
+                action: 'view_room',
+                room_id: allRooms[roomIndex].roomId,
+            });
        }
    },

@ -585,6 +616,8 @@ module.exports = React.createClass({
    // @param {boolean=} roomInfo.show_settings Makes RoomView show the room settings dialog.
    // @param {string=} roomInfo.event_id ID of the event in this room to show: this will cause a switch to the
    //                                    context of that particular event.
+    // @param {boolean=} roomInfo.highlighted If true, add event_id to the hash of the URL
+    //                                        and alter the EventTile to appear highlighted.
    // @param {Object=} roomInfo.third_party_invite Object containing data about the third party
    //                                    we received to join the room, if any.
    // @param {string=} roomInfo.third_party_invite.inviteSignUrl 3pid invite sign URL
@ -596,30 +629,21 @@ module.exports = React.createClass({
        this.focusComposer = true;

        const newState = {
-            initialEventId: roomInfo.event_id,
-            highlightedEventId: roomInfo.event_id,
-            initialEventPixelOffset: undefined,
            page_type: PageTypes.RoomView,
            thirdPartyInvite: roomInfo.third_party_invite,
            roomOobData: roomInfo.oob_data,
-            currentRoomAlias: roomInfo.room_alias,
            autoJoin: roomInfo.auto_join,
        };

-        if (!roomInfo.room_alias) {
-            newState.currentRoomId = roomInfo.room_id;
-        }
-
-        // if we aren't given an explicit event id, look for one in the
-        // scrollStateMap.
-        //
-        // TODO: do this in RoomView rather than here
-        if (!roomInfo.event_id && this.refs.loggedInView) {
-            const scrollState = this.refs.loggedInView.getScrollStateForRoom(roomInfo.room_id);
-            if (scrollState) {
-                newState.initialEventId = scrollState.focussedEvent;
-                newState.initialEventPixelOffset = scrollState.pixelOffset;
-            }
+        if (roomInfo.room_alias) {
+            console.log(
+                `Switching to room alias ${roomInfo.room_alias} at event ` +
+                roomInfo.event_id,
+            );
+        } else {
+            console.log(`Switching to room id ${roomInfo.room_id} at event ` +
+                roomInfo.event_id,
+            );
        }

        // Wait for the first sync to complete so that if a room does have an alias,
@ -647,7 +671,7 @@ module.exports = React.createClass({
                }
            }

-            if (roomInfo.event_id) {
+            if (roomInfo.event_id && roomInfo.highlighted) {
                presentedId += "/" + roomInfo.event_id;
            }
            this.notifyNewScreen('room/' + presentedId);
@ -656,7 +680,46 @@ module.exports = React.createClass({
        });
    },

+    _setMxId: function(payload) {
+        const SetMxIdDialog = sdk.getComponent('views.dialogs.SetMxIdDialog');
+        const close = Modal.createDialog(SetMxIdDialog, {
+            homeserverUrl: MatrixClientPeg.get().getHomeserverUrl(),
+            onFinished: (submitted, credentials) => {
+                if (!submitted) {
+                    dis.dispatch({
+                        action: 'cancel_after_sync_prepared',
+                    });
+                    if (payload.go_home_on_cancel) {
+                        dis.dispatch({
+                            action: 'view_home_page',
+                        });
+                    }
+                    return;
+                }
+                this.onRegistered(credentials);
+            },
+            onDifferentServerClicked: (ev) => {
+                dis.dispatch({action: 'start_registration'});
+                close();
+            },
+            onLoginClick: (ev) => {
+                dis.dispatch({action: 'start_login'});
+                close();
+            },
+        }).close;
+    },
+
    _createChat: function() {
+        if (MatrixClientPeg.get().isGuest()) {
+            dis.dispatch({
+                action: 'do_after_sync_prepared',
+                deferred_action: {
+                    action: 'view_create_chat',
+                },
+            });
+            dis.dispatch({action: 'view_set_mxid'});
+            return;
+        }
        const ChatInviteDialog = sdk.getComponent("dialogs.ChatInviteDialog");
        Modal.createDialog(ChatInviteDialog, {
            title: _t('Start a chat'),
@ -666,6 +729,86 @@ module.exports = React.createClass({
        });
    },

+    _createRoom: function() {
+        if (MatrixClientPeg.get().isGuest()) {
+            dis.dispatch({
+                action: 'do_after_sync_prepared',
+                deferred_action: {
+                    action: 'view_create_room',
+                },
+            });
+            dis.dispatch({action: 'view_set_mxid'});
+            return;
+        }
+        const TextInputDialog = sdk.getComponent("dialogs.TextInputDialog");
+        Modal.createDialog(TextInputDialog, {
+            title: _t('Create Room'),
+            description: _t('Room name (optional)'),
+            button: _t('Create Room'),
+            onFinished: (should_create, name) => {
+                if (should_create) {
+                    const createOpts = {};
+                    if (name) createOpts.name = name;
+                    createRoom({createOpts}).done();
+                }
+            },
+        });
+    },
+
+    _chatCreateOrReuse: function(userId) {
+        const ChatCreateOrReuseDialog = sdk.getComponent(
+            'views.dialogs.ChatCreateOrReuseDialog',
+        );
+        // Use a deferred action to reshow the dialog once the user has registered
+        if (MatrixClientPeg.get().isGuest()) {
+            // No point in making 2 DMs with welcome bot. This assumes view_set_mxid will
+            // result in a new DM with the welcome user.
+            if (userId !== this.props.config.welcomeUserId) {
+                dis.dispatch({
+                    action: 'do_after_sync_prepared',
+                    deferred_action: {
+                        action: 'view_start_chat_or_reuse',
+                        user_id: userId,
+                    },
+                });
+            }
+            dis.dispatch({
+                action: 'view_set_mxid',
+                // 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
+                // `_chatCreateOrReuse` again)
+                go_home_on_cancel: true,
+            });
+            return;
+        }
+
+        const close = Modal.createDialog(ChatCreateOrReuseDialog, {
+            userId: userId,
+            onFinished: (success) => {
+                if (!success) {
+                    // Dialog cancelled, default to home
+                    dis.dispatch({ action: 'view_home_page' });
+                }
+            },
+            onNewDMClick: () => {
+                dis.dispatch({
+                    action: 'start_chat',
+                    user_id: userId,
+                });
+                // Close the dialog, indicate success (calls onFinished(true))
+                close(true);
+            },
+            onExistingRoomSelected: (roomId) => {
+                dis.dispatch({
+                    action: 'view_room',
+                    room_id: roomId,
+                });
+                close(true);
+            },
+        }).close;
+    },
+
    _invite: function(roomId) {
        const ChatInviteDialog = sdk.getComponent("dialogs.ChatInviteDialog");
        Modal.createDialog(ChatInviteDialog, {
@ -699,7 +842,7 @@ module.exports = React.createClass({

                    d.then(() => {
                        modal.close();
-                        if (this.currentRoomId === roomId) {
+                        if (this.state.currentRoomId === roomId) {
                            dis.dispatch({action: 'view_next_room'});
                        }
                    }, (err) => {
@ -794,12 +937,27 @@ module.exports = React.createClass({
            this._teamToken = teamToken;
            dis.dispatch({action: 'view_home_page'});
        } else if (this._is_registered) {
+            this._is_registered = false;
+            // reset the 'have completed first sync' flag,
+            // since we've just logged in and will be about to sync
+            this.firstSyncComplete = false;
+            this.firstSyncPromise = q.defer();
+
+            // Set the display name = user ID localpart
+            MatrixClientPeg.get().setDisplayName(
+                MatrixClientPeg.get().getUserIdLocalpart(),
+            );
+
            if (this.props.config.welcomeUserId && getCurrentLanguage().startsWith("en")) {
-                createRoom({dmUserId: this.props.config.welcomeUserId});
+                createRoom({
+                    dmUserId: this.props.config.welcomeUserId,
+                    // Only view the welcome user if we're NOT looking at a room
+                    andView: !this.state.currentRoomId,
+                });
                return;
            }
            // The user has just logged in after registering
-            dis.dispatch({action: 'view_room_directory'});
+            dis.dispatch({action: 'view_home_page'});
        } else {
            this._showScreenAfterLogin();
        }
@ -821,12 +979,8 @@ module.exports = React.createClass({
                action: 'view_room',
                room_id: localStorage.getItem('mx_last_room_id'),
            });
-        } else if (this._teamToken) {
-            // Team token might be set if we're a guest.
-            // Guests do not call _onLoggedIn with a teamToken
-            dis.dispatch({action: 'view_home_page'});
        } else {
-            dis.dispatch({action: 'view_room_directory'});
+            dis.dispatch({action: 'view_home_page'});
        }
    },

@ -840,7 +994,6 @@ module.exports = React.createClass({
            ready: false,
            collapse_lhs: false,
            collapse_rhs: false,
-            currentRoomAlias: null,
            currentRoomId: null,
            page_type: PageTypes.RoomDirectory,
        });
@ -878,6 +1031,12 @@ module.exports = React.createClass({
        });

        cli.on('sync', function(state, prevState) {
+            // 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});
            self.updateStatusIndicator(state, prevState);
            if (state === "SYNCING" && prevState === "SYNCING") {
                return;
@ -947,6 +1106,11 @@ module.exports = React.createClass({
            dis.dispatch({
                action: 'view_home_page',
            });
+        } else if (screen == 'start') {
+            this.showScreen('home');
+            dis.dispatch({
+                action: 'view_set_mxid',
+            });
        } else if (screen == 'directory') {
            dis.dispatch({
                action: 'view_room_directory',
@ -974,6 +1138,10 @@ module.exports = React.createClass({
            const payload = {
                action: 'view_room',
                event_id: eventId,
+                // If an event ID is given in the URL hash, notify RoomViewStore to mark
+                // it as highlighted, which will propagate to RoomView and highlight the
+                // associated EventTile.
+                highlighted: Boolean(eventId),
                third_party_invite: thirdPartyInvite,
                oob_data: oobData,
            };
@ -990,6 +1158,12 @@ module.exports = React.createClass({
            }
        } else if (screen.indexOf('user/') == 0) {
            const userId = screen.substring(5);
+
+            if (params.action === 'chat') {
+                this._chatCreateOrReuse(userId);
+                return;
+            }
+
            this.setState({ viewUserId: userId });
            this._setPage(PageTypes.UserView);
            this.notifyNewScreen('user/' + userId);
@ -1086,6 +1260,8 @@ module.exports = React.createClass({
    },

    onRegistered: function(credentials, teamToken) {
+        // XXX: These both should be in state or ideally store(s) because we risk not
+        //      rendering the most up-to-date view of state otherwise.
        // teamToken may not be truthy
        this._teamToken = teamToken;
        this._is_registered = true;
@ -1129,7 +1305,15 @@ module.exports = React.createClass({
            PlatformPeg.get().setNotificationCount(notifCount);
        }

-        document.title = `Riot ${state === "ERROR" ? " [offline]" : ""}${notifCount > 0 ? ` [${notifCount}]` : ""}`;
+        let title = "Riot ";
+        if (state === "ERROR") {
+            title += `[${_t("Offline")}] `;
+        }
+        if (notifCount > 0) {
+            title += `[${notifCount}]`;
+        }
+
+        document.title = title;
    },

    onUserSettingsClose: function() {
@ -1142,18 +1326,11 @@ module.exports = React.createClass({
            });
        } else {
            dis.dispatch({
-                action: 'view_room_directory',
+                action: 'view_home_page',
            });
        }
    },

-    onRoomIdResolved: function(roomId) {
-        // It's the RoomView's resposibility to look up room aliases, but we need the
-        // ID to pass into things like the Member List, so the Room View tells us when
-        // its done that resolution so we can display things that take a room ID.
-        this.setState({currentRoomId: roomId});
-    },
-
    _makeRegistrationUrl: function(params) {
        if (this.props.startingFragmentQueryParams.referrer) {
            params.referrer = this.props.startingFragmentQueryParams.referrer;
@ -1195,9 +1372,10 @@ module.exports = React.createClass({
            const LoggedInView = sdk.getComponent('structures.LoggedInView');
            return (
               <LoggedInView ref="loggedInView" matrixClient={MatrixClientPeg.get()}
-                    onRoomIdResolved={this.onRoomIdResolved}
                    onRoomCreated={this.onRoomCreated}
                    onUserSettingsClose={this.onUserSettingsClose}
+                    onRegistered={this.onRegistered}
+                    currentRoomId={this.state.currentRoomId}
                    teamToken={this._teamToken}
                    {...this.props}
                    {...this.state}
--- a/src/components/structures/RoomStatusBar.js
+++ b/src/components/structures/RoomStatusBar.js
@ -15,9 +15,8 @@ limitations under the License.
 */

 import React from 'react';
-import { _t } from '../../languageHandler';
+import { _t, _tJsx } from '../../languageHandler';
 import sdk from '../../index';
-import dis from '../../dispatcher';
 import WhoIsTyping from '../../WhoIsTyping';
 import MatrixClientPeg from '../../MatrixClientPeg';
 import MemberAvatar from '../views/avatars/MemberAvatar';
@ -282,14 +281,13 @@ module.exports = React.createClass({
                        { this.props.unsentMessageError }
                    </div>
                    <div className="mx_RoomStatusBar_connectionLostBar_desc">
-                        <a className="mx_RoomStatusBar_resend_link"
-                          onClick={ this.props.onResendAllClick }>
-                            {_t('Resend all')}
-                        </a> {_t('or')} <a
-                          className="mx_RoomStatusBar_resend_link"
-                          onClick={ this.props.onCancelAllClick }>
-                            {_t('cancel all')}
-                        </a> {_t('now. You can also select individual messages to resend or cancel.')}
+                    {_tJsx("<a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.",
+                        [/<a>(.*?)<\/a>/, /<a>(.*?)<\/a>/],
+                        [
+                            (sub) => <a className="mx_RoomStatusBar_resend_link" key="resend" onClick={ this.props.onResendAllClick }>{sub}</a>,
+                            (sub) => <a className="mx_RoomStatusBar_resend_link" key="cancel" onClick={ this.props.onCancelAllClick }>{sub}</a>,
+                        ]
+                    )}
                    </div>
                </div>
            );
@ -298,8 +296,8 @@ module.exports = React.createClass({
        // unread count trumps who is typing since the unread count is only
        // set when you've scrolled up
        if (this.props.numUnreadMessages) {
-            var unreadMsgs = this.props.numUnreadMessages + " new message" +
-                (this.props.numUnreadMessages > 1 ? "s" : "");
+            // MUST use var name "count" for pluralization to kick in
+            var unreadMsgs = _t("%(count)s new messages", {count: this.props.numUnreadMessages});

            return (
                <div className="mx_RoomStatusBar_unreadMessagesBar"
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@ -45,7 +45,9 @@ import KeyCode from '../../KeyCode';

 import UserProvider from '../../autocomplete/UserProvider';

-const DEBUG = false;
+import RoomViewStore from '../../stores/RoomViewStore';
+
+var DEBUG = false;

 if (DEBUG) {
    // using bind means that we get to keep useful line numbers in the console
@ -59,16 +61,9 @@ module.exports = React.createClass({
    propTypes: {
        ConferenceHandler: React.PropTypes.any,

-        // Either a room ID or room alias for the room to display.
-        // If the room is being displayed as a result of the user clicking
-        // on a room alias, the alias should be supplied. Otherwise, a room
-        // ID should be supplied.
-        roomAddress: React.PropTypes.string.isRequired,
-
-        // If a room alias is passed to roomAddress, a function can be
-        // provided here that will be called with the ID of the room
-        // once it has been resolved.
-        onRoomIdResolved: React.PropTypes.func,
+        // Called with the credentials of a registered user (if they were a ROU that
+        // transitioned to PWLU)
+        onRegistered: React.PropTypes.func,

        // An object representing a third party invite to join this room
        // Fields:
@ -88,36 +83,8 @@ module.exports = React.createClass({
        //  *                      invited us tovthe room
        oobData: React.PropTypes.object,

-        // id of an event to jump to. If not given, will go to the end of the
-        // live timeline.
-        eventId: React.PropTypes.string,
-
-        // where to position the event given by eventId, in pixels from the
-        // bottom of the viewport. If not given, will try to put the event
-        // 1/3 of the way down the viewport.
-        eventPixelOffset: React.PropTypes.number,
-
-        // ID of an event to highlight. If undefined, no event will be highlighted.
-        // Typically this will either be the same as 'eventId', or undefined.
-        highlightedEventId: React.PropTypes.string,
-
        // is the RightPanel collapsed?
        collapsedRhs: React.PropTypes.bool,
-
-        // a map from room id to scroll state, which will be updated on unmount.
-        //
-        // If there is no special scroll state (ie, we are following the live
-        // timeline), the scroll state is null. Otherwise, it is an object with
-        // the following properties:
-        //
-        //    focussedEvent: the ID of the 'focussed' event. Typically this is
-        //        the last event fully visible in the viewport, though if we
-        //        have done an explicit scroll to an explicit event, it will be
-        //        that event.
-        //
-        //    pixelOffset: the number of pixels the window is scrolled down
-        //        from the focussedEvent.
-        scrollStateMap: React.PropTypes.object,
    },

    getInitialState: function() {
@ -126,6 +93,14 @@ module.exports = React.createClass({
            roomId: null,
            userId: null,
            roomLoading: true,
+            peekLoading: false,
+
+            // The event to be scrolled to initially
+            initialEventId: null,
+            // The offset in pixels from the event with which to scroll vertically
+            initialEventPixelOffset: null,
+            // Whether to highlight the event scrolled to
+            isInitialEventHighlighted: null,

            forwardingEvent: null,
            editingRoomSettings: false,
@ -177,39 +152,44 @@ module.exports = React.createClass({
            },
        });

-        if (this.props.roomAddress[0] == '#') {
-            // we always look up the alias from the directory server:
-            // we want the room that the given alias is pointing to
-            // right now. We may have joined that alias before but there's
-            // no guarantee the alias hasn't subsequently been remapped.
-            MatrixClientPeg.get().getRoomIdForAlias(this.props.roomAddress).done((result) => {
-                if (this.props.onRoomIdResolved) {
-                    this.props.onRoomIdResolved(result.room_id);
-                }
-                var room = MatrixClientPeg.get().getRoom(result.room_id);
-                this.setState({
-                    room: room,
-                    roomId: result.room_id,
-                    userId: MatrixClientPeg.get().credentials.userId,
-                    roomLoading: !room,
-                    unsentMessageError: this._getUnsentMessageError(room),
-                }, this._onHaveRoom);
-            }, (err) => {
-                this.setState({
-                    roomLoading: false,
-                    roomLoadError: err,
-                });
-            });
-        } else {
-            var room = MatrixClientPeg.get().getRoom(this.props.roomAddress);
-            this.setState({
-                roomId: this.props.roomAddress,
-                userId: MatrixClientPeg.get().credentials.userId,
-                room: room,
-                roomLoading: !room,
-                unsentMessageError: this._getUnsentMessageError(room),
-            }, this._onHaveRoom);
+        // Start listening for RoomViewStore updates
+        this._roomStoreToken = RoomViewStore.addListener(this._onRoomViewStoreUpdate);
+        this._onRoomViewStoreUpdate(true);
+    },
+
+    _onRoomViewStoreUpdate: function(initial) {
+        if (this.unmounted) {
+            return;
        }
+        const newState = {
+            roomId: RoomViewStore.getRoomId(),
+            roomAlias: RoomViewStore.getRoomAlias(),
+            roomLoading: RoomViewStore.isRoomLoading(),
+            roomLoadError: RoomViewStore.getRoomLoadError(),
+            joining: RoomViewStore.isJoining(),
+            initialEventId: RoomViewStore.getInitialEventId(),
+            initialEventPixelOffset: RoomViewStore.getInitialEventPixelOffset(),
+            isInitialEventHighlighted: RoomViewStore.isInitialEventHighlighted(),
+        };
+
+        // Clear the search results when clicking a search result (which changes the
+        // currently scrolled to event, this.state.initialEventId).
+        if (this.state.initialEventId !== newState.initialEventId) {
+            newState.searchResults = null;
+        }
+
+        // Store the scroll state for the previous room so that we can return to this
+        // position when viewing this room in future.
+        if (this.state.roomId !== newState.roomId) {
+            this._updateScrollMap(this.state.roomId);
+        }
+
+        this.setState(newState, () => {
+            // At this point, this.state.roomId could be null (e.g. the alias might not
+            // have been resolved yet) so anything called here must handle this case.
+            this._onHaveRoom();
+            this.onRoom(MatrixClientPeg.get().getRoom(this.state.roomId));
+        });
    },

    _onHaveRoom: function() {
@ -227,26 +207,29 @@ module.exports = React.createClass({
        // NB. We peek if we are not in the room, although if we try to peek into
        // a room in which we have a member event (ie. we've left) synapse will just
        // send us the same data as we get in the sync (ie. the last events we saw).
-        var user_is_in_room = null;
-        if (this.state.room) {
-            user_is_in_room = this.state.room.hasMembershipState(
-                MatrixClientPeg.get().credentials.userId, 'join'
+        const room = MatrixClientPeg.get().getRoom(this.state.roomId);
+        let isUserJoined = null;
+        if (room) {
+            isUserJoined = room.hasMembershipState(
+                MatrixClientPeg.get().credentials.userId, 'join',
            );

-            this._updateAutoComplete();
-            this.tabComplete.loadEntries(this.state.room);
+            this._updateAutoComplete(room);
+            this.tabComplete.loadEntries(room);
        }
-
-        if (!user_is_in_room && this.state.roomId) {
+        if (!isUserJoined && !this.state.joining && this.state.roomId) {
            if (this.props.autoJoin) {
                this.onJoinButtonClicked();
            } else if (this.state.roomId) {
                console.log("Attempting to peek into room %s", this.state.roomId);

+                this.setState({
+                    peekLoading: true,
+                });
                MatrixClientPeg.get().peekInRoom(this.state.roomId).then((room) => {
                    this.setState({
                        room: room,
-                        roomLoading: false,
+                        peekLoading: false,
                    });
                    this._onRoomLoaded(room);
                }, (err) => {
@ -256,16 +239,19 @@ module.exports = React.createClass({
                    if (err.errcode == "M_GUEST_ACCESS_FORBIDDEN") {
                        // This is fine: the room just isn't peekable (we assume).
                        this.setState({
-                            roomLoading: false,
+                            peekLoading: false,
                        });
                    } else {
                        throw err;
                    }
                }).done();
            }
-        } else if (user_is_in_room) {
+        } else if (isUserJoined) {
            MatrixClientPeg.get().stopPeeking();
-            this._onRoomLoaded(this.state.room);
+            this.setState({
+                unsentMessageError: this._getUnsentMessageError(room),
+            });
+            this._onRoomLoaded(room);
        }
    },

@ -301,17 +287,6 @@ module.exports = React.createClass({
        }
    },

-    componentWillReceiveProps: function(newProps) {
-        if (newProps.roomAddress != this.props.roomAddress) {
-            throw new Error(_t("changing room on a RoomView is not supported"));
-        }
-
-        if (newProps.eventId != this.props.eventId) {
-            // when we change focussed event id, hide the search results.
-            this.setState({searchResults: null});
-        }
-    },
-
    shouldComponentUpdate: function(nextProps, nextState) {
        return (!ObjectUtils.shallowEqual(this.props, nextProps) ||
                !ObjectUtils.shallowEqual(this.state, nextState));
@ -337,7 +312,7 @@ module.exports = React.createClass({
        this.unmounted = true;

        // update the scroll map before we get unmounted
-        this._updateScrollMap();
+        this._updateScrollMap(this.state.roomId);

        if (this.refs.roomView) {
            // disconnect the D&D event listeners from the room view. This
@ -366,6 +341,11 @@ module.exports = React.createClass({

        document.removeEventListener("keydown", this.onKeyDown);

+        // Remove RoomStore listener
+        if (this._roomStoreToken) {
+            this._roomStoreToken.remove();
+        }
+
        // cancel any pending calls to the rate_limited_funcs
        this._updateRoomMembers.cancelPendingCall();

@ -536,7 +516,7 @@ module.exports = React.createClass({
        this._updatePreviewUrlVisibility(room);
    },

-    _warnAboutEncryption: function (room) {
+    _warnAboutEncryption: function(room) {
        if (!MatrixClientPeg.get().isRoomEncrypted(room.roomId)) {
            return;
        }
@ -616,21 +596,27 @@ module.exports = React.createClass({
        });
    },

-    onRoom: function(room) {
-        // This event is fired when the room is 'stored' by the JS SDK, which
-        // means it's now a fully-fledged room object ready to be used, so
-        // set it in our state and start using it (ie. init the timeline)
-        // This will happen if we start off viewing a room we're not joined,
-        // then join it whilst RoomView is looking at that room.
-        if (!this.state.room && room.roomId == this._joiningRoomId) {
-            this._joiningRoomId = undefined;
-            this.setState({
-                room: room,
-                joining: false,
-            });
-
-            this._onRoomLoaded(room);
+    _updateScrollMap(roomId) {
+        // No point updating scroll state if the room ID hasn't been resolved yet
+        if (!roomId) {
+            return;
        }
+        dis.dispatch({
+            action: 'update_scroll_state',
+            room_id: roomId,
+            scroll_state: this._getScrollState(),
+        });
+    },
+
+    onRoom: function(room) {
+        if (!room || room.roomId !== this.state.roomId) {
+            return;
+        }
+        this.setState({
+            room: room,
+        }, () => {
+            this._onRoomLoaded(room);
+        });
    },

    updateTint: function() {
@ -696,7 +682,7 @@ module.exports = React.createClass({

        // refresh the tab complete list
        this.tabComplete.loadEntries(this.state.room);
-        this._updateAutoComplete();
+        this._updateAutoComplete(this.state.room);

        // if we are now a member of the room, where we were not before, that
        // means we have finished joining a room we were previously peeking
@ -713,10 +699,6 @@ module.exports = React.createClass({
                // compatability workaround, let's not bother.
                Rooms.setDMRoom(this.state.room.roomId, me.events.member.getSender()).done();
            }
-
-            this.setState({
-                joining: false
-            });
        }
    }, 500),

@ -725,7 +707,7 @@ module.exports = React.createClass({
        if (!unsentMessages.length) return "";
        for (const event of unsentMessages) {
            if (!event.error || event.error.name !== "UnknownDeviceError") {
-                return _t("Some of your messages have not been sent") + ".";
+                return _t("Some of your messages have not been sent.");
            }
        }
        return _t("Message not sent due to unknown devices being present");
@ -791,41 +773,62 @@ module.exports = React.createClass({
    },

    onJoinButtonClicked: function(ev) {
-        var self = this;
+        const cli = MatrixClientPeg.get();

-        var cli = MatrixClientPeg.get();
-        var display_name_promise = q();
-        // if this is the first room we're joining, check the user has a display name
-        // and if they don't, prompt them to set one.
-        // NB. This unfortunately does not re-use the ChangeDisplayName component because
-        // it doesn't behave quite as desired here (we want an input field here rather than
-        // content-editable, and we want a default).
-        if (cli.getRooms().filter((r) => {
-            return r.hasMembershipState(cli.credentials.userId, "join");
-        })) {
-            display_name_promise = cli.getProfileInfo(cli.credentials.userId).then((result) => {
-                if (!result.displayname) {
-                    var SetDisplayNameDialog = sdk.getComponent('views.dialogs.SetDisplayNameDialog');
-                    var dialog_defer = q.defer();
-                    Modal.createDialog(SetDisplayNameDialog, {
-                        currentDisplayName: result.displayname,
-                        onFinished: (submitted, newDisplayName) => {
-                            if (submitted) {
-                                cli.setDisplayName(newDisplayName).done(() => {
-                                    dialog_defer.resolve();
-                                });
-                            }
-                            else {
-                                dialog_defer.reject();
-                            }
-                        }
-                    });
-                    return dialog_defer.promise;
-                }
+        // If the user is a ROU, allow them to transition to a PWLU
+        if (cli && cli.isGuest()) {
+            // Join this room once the user has registered and logged in
+            const signUrl = this.props.thirdPartyInvite ?
+                this.props.thirdPartyInvite.inviteSignUrl : undefined;
+            dis.dispatch({
+                action: 'do_after_sync_prepared',
+                deferred_action: {
+                    action: 'join_room',
+                    opts: { inviteSignUrl: signUrl },
+                },
            });
+
+            // Don't peek whilst registering otherwise getPendingEventList complains
+            // Do this by indicating our intention to join
+            dis.dispatch({
+                action: 'will_join',
+            });
+
+            const SetMxIdDialog = sdk.getComponent('views.dialogs.SetMxIdDialog');
+            const close = Modal.createDialog(SetMxIdDialog, {
+                homeserverUrl: cli.getHomeserverUrl(),
+                onFinished: (submitted, credentials) => {
+                    if (submitted) {
+                        this.props.onRegistered(credentials);
+                    } else {
+                        dis.dispatch({
+                            action: 'cancel_after_sync_prepared',
+                        });
+                        dis.dispatch({
+                            action: 'cancel_join',
+                        });
+                    }
+                },
+                onDifferentServerClicked: (ev) => {
+                    dis.dispatch({action: 'start_registration'});
+                    close();
+                },
+                onLoginClick: (ev) => {
+                    dis.dispatch({action: 'start_login'});
+                    close();
+                },
+            }).close;
+            return;
        }

-        display_name_promise.then(() => {
+        q().then(() => {
+            const signUrl = this.props.thirdPartyInvite ?
+                this.props.thirdPartyInvite.inviteSignUrl : undefined;
+            dis.dispatch({
+                action: 'join_room',
+                opts: { inviteSignUrl: signUrl },
+            });
+
            // if this is an invite and has the 'direct' hint set, mark it as a DM room now.
            if (this.state.room) {
                const me = this.state.room.getMember(MatrixClientPeg.get().credentials.userId);
@ -837,72 +840,7 @@ module.exports = React.createClass({
                    }
                }
            }
-
            return q();
-        }).then(() => {
-            var sign_url = this.props.thirdPartyInvite ? this.props.thirdPartyInvite.inviteSignUrl : undefined;
-            return MatrixClientPeg.get().joinRoom(this.props.roomAddress,
-                                                  { inviteSignUrl: sign_url } );
-        }).then(function(resp) {
-            var roomId = resp.roomId;
-
-            // It is possible that there is no Room yet if state hasn't come down
-            // from /sync - joinRoom will resolve when the HTTP request to join succeeds,
-            // NOT when it comes down /sync. If there is no room, we'll keep the
-            // joining flag set until we see it.
-
-            // We'll need to initialise the timeline when joining, but due to
-            // the above, we can't do it here: we do it in onRoom instead,
-            // once we have a useable room object.
-            var room = MatrixClientPeg.get().getRoom(roomId);
-            if (!room) {
-                // wait for the room to turn up in onRoom.
-                self._joiningRoomId = roomId;
-            } else {
-                // we've got a valid room, but that might also just mean that
-                // it was peekable (so we had one before anyway).  If we are
-                // not yet a member of the room, we will need to wait for that
-                // to happen, in onRoomStateMember.
-                var me = MatrixClientPeg.get().credentials.userId;
-                self.setState({
-                    joining: !room.hasMembershipState(me, "join"),
-                    room: room
-                });
-            }
-        }).catch(function(error) {
-            self.setState({
-                joining: false,
-                joinError: error
-            });
-
-            if (!error) return;
-
-            // https://matrix.org/jira/browse/SYN-659
-            // Need specific error message if joining a room is refused because the user is a guest and guest access is not allowed
-            if (
-                error.errcode == 'M_GUEST_ACCESS_FORBIDDEN' ||
-                (
-                    error.errcode == 'M_FORBIDDEN' &&
-                    MatrixClientPeg.get().isGuest()
-                )
-            ) {
-                var NeedToRegisterDialog = sdk.getComponent("dialogs.NeedToRegisterDialog");
-                Modal.createDialog(NeedToRegisterDialog, {
-                    title: _t("Failed to join the room"),
-                    description: _t("This room is private or inaccessible to guests. You may be able to join if you register") + "."
-                });
-            } else {
-                var msg = error.message ? error.message : JSON.stringify(error);
-                var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-                Modal.createDialog(ErrorDialog, {
-                    title: _t("Failed to join room"),
-                    description: msg,
-                });
-            }
-        }).done();
-
-        this.setState({
-            joining: true
        });
    },

@ -954,11 +892,7 @@ module.exports = React.createClass({

    uploadFile: function(file) {
        if (MatrixClientPeg.get().isGuest()) {
-            var NeedToRegisterDialog = sdk.getComponent("dialogs.NeedToRegisterDialog");
-            Modal.createDialog(NeedToRegisterDialog, {
-                title: _t("Please Register"),
-                description: _t("Guest users can't upload files. Please register to upload") + "."
-            });
+            dis.dispatch({action: 'view_set_mxid'});
            return;
        }

@ -1316,21 +1250,6 @@ module.exports = React.createClass({
        }
    },

-    // update scrollStateMap on unmount
-    _updateScrollMap: function() {
-        if (!this.state.room) {
-            // we were instantiated on a room alias and haven't yet joined the room.
-            return;
-        }
-        if (!this.props.scrollStateMap) return;
-
-        var roomId = this.state.room.roomId;
-
-        var state = this._getScrollState();
-        this.props.scrollStateMap[roomId] = state;
-    },
-
-
    // get the current scroll position of the room, so that it can be
    // restored when we switch back to it.
    //
@ -1483,9 +1402,9 @@ module.exports = React.createClass({
        }
    },

-    _updateAutoComplete: function() {
+    _updateAutoComplete: function(room) {
        const myUserId = MatrixClientPeg.get().credentials.userId;
-        const members = this.state.room.getJoinedMembers().filter(function(member) {
+        const members = room.getJoinedMembers().filter(function(member) {
            if (member.userId !== myUserId) return true;
        });
        UserProvider.getInstance().setUserList(members);
@ -1505,7 +1424,7 @@ module.exports = React.createClass({
        const TimelinePanel = sdk.getComponent("structures.TimelinePanel");

        if (!this.state.room) {
-            if (this.state.roomLoading) {
+            if (this.state.roomLoading || this.state.peekLoading) {
                return (
                    <div className="mx_RoomView">
                        <Loader />
@ -1523,7 +1442,7 @@ module.exports = React.createClass({

                // We have no room object for this room, only the ID.
                // We've got to this room by following a link, possibly a third party invite.
-                var room_alias = this.props.roomAddress[0] == '#' ? this.props.roomAddress : null;
+                var room_alias = this.state.room_alias;
                return (
                    <div className="mx_RoomView">
                        <RoomHeader ref="header"
@ -1761,6 +1680,14 @@ module.exports = React.createClass({
            hideMessagePanel = true;
        }

+        const shouldHighlight = this.state.isInitialEventHighlighted;
+        let highlightedEventId = null;
+        if (this.state.forwardingEvent) {
+            highlightedEventId = this.state.forwardingEvent.getId();
+        } else if (shouldHighlight) {
+            highlightedEventId = this.state.initialEventId;
+        }
+
        // console.log("ShowUrlPreview for %s is %s", this.state.room.roomId, this.state.showUrlPreview);
        var messagePanel = (
            <TimelinePanel ref={this._gatherTimelinePanelRef}
@ -1768,9 +1695,9 @@ module.exports = React.createClass({
                manageReadReceipts={!UserSettingsStore.getSyncedSetting('hideReadReceipts', false)}
                manageReadMarkers={true}
                hidden={hideMessagePanel}
-                highlightedEventId={this.state.forwardingEvent ? this.state.forwardingEvent.getId() : this.props.highlightedEventId}
-                eventId={this.props.eventId}
-                eventPixelOffset={this.props.eventPixelOffset}
+                highlightedEventId={highlightedEventId}
+                eventId={this.state.initialEventId}
+                eventPixelOffset={this.state.initialEventPixelOffset}
                onScroll={ this.onMessageListScroll }
                onReadMarkerUpdated={ this._updateTopUnreadMessagesBar }
                showUrlPreview = { this.state.showUrlPreview }
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@ -902,6 +902,9 @@ var TimelinePanel = React.createClass({

        var onError = (error) => {
            this.setState({timelineLoading: false});
+            console.error(
+                `Error loading timeline panel at ${eventId}: ${error}`,
+            );
            var msg = error.message ? error.message : JSON.stringify(error);
            var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");

@ -921,8 +924,8 @@ var TimelinePanel = React.createClass({
                };
            }
            var message = (error.errcode == 'M_FORBIDDEN')
-            	? _t("Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question") + "."
-                : _t("Tried to load a specific point in this room's timeline, but was unable to find it") + ".";
+            	? _t("Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.")
+                : _t("Tried to load a specific point in this room's timeline, but was unable to find it.");
            Modal.createDialog(ErrorDialog, {
                title: _t("Failed to load timeline position"),
                description: message,
--- a/src/components/structures/UploadBar.js
+++ b/src/components/structures/UploadBar.js
@ -18,6 +18,7 @@ var React = require('react');
 var ContentMessages = require('../../ContentMessages');
 var dis = require('../../dispatcher');
 var filesize = require('filesize');
+import { _t } from '../../languageHandler';

 module.exports = React.createClass({displayName: 'UploadBar',
    propTypes: {
@ -81,10 +82,8 @@ module.exports = React.createClass({displayName: 'UploadBar',
            uploadedSize = uploadedSize.replace(/ .*/, '');
        }

-        var others;
-        if (uploads.length > 1) {
-            others = ' and ' + (uploads.length - 1) + ' other' + (uploads.length > 2 ? 's' : '');
-        }
+        // MUST use var name 'count' for pluralization to kick in
+        var uploadText = _t("Uploading %(filename)s and %(count)s others", {filename: upload.fileName, count: (uploads.length - 1)});

        return (
            <div className="mx_UploadBar">
@ -98,7 +97,7 @@ module.exports = React.createClass({displayName: 'UploadBar',
                <div className="mx_UploadBar_uploadBytes">
                    { uploadedSize } / { totalSize }
                </div>
-                <div className="mx_UploadBar_uploadFilename">Uploading {upload.fileName}{others}</div>
+                <div className="mx_UploadBar_uploadFilename">{uploadText}</div>
            </div>
        );
    }
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@ -88,6 +88,10 @@ const SETTINGS_LABELS = [
        id: 'hideRedactions',
        label: 'Hide removed messages',
    },
+    {
+        id: 'disableMarkdown',
+        label: 'Disable markdown formatting',
+    },
 /*
    {
        id: 'useFixedWidthFont',
@ -307,11 +311,7 @@ module.exports = React.createClass({

    onAvatarPickerClick: function(ev) {
        if (MatrixClientPeg.get().isGuest()) {
-            const NeedToRegisterDialog = sdk.getComponent("dialogs.NeedToRegisterDialog");
-            Modal.createDialog(NeedToRegisterDialog, {
-                title: _t("Please Register"),
-                description: _t("Guests can't set avatars. Please register."),
-            });
+            dis.dispatch({action: 'view_set_mxid'});
            return;
        }

@ -391,6 +391,7 @@ module.exports = React.createClass({
            title: _t("Success"),
            description: _t("Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them") + ".",
        });
+        dis.dispatch({action: 'password_changed'});
    },

    onUpgradeClicked: function() {
@ -753,7 +754,7 @@ module.exports = React.createClass({
        const DevicesPanel = sdk.getComponent('settings.DevicesPanel');
        return (
            <div>
-                <h3>Devices</h3>
+                <h3>{_t("Devices")}</h3>
                <DevicesPanel className="mx_UserSettings_section"/>
            </div>
        );
@ -803,11 +804,7 @@ module.exports = React.createClass({
                    onChange={(e) => {
                        if (MatrixClientPeg.get().isGuest()) {
                            e.target.checked = false;
-                            const NeedToRegisterDialog = sdk.getComponent("dialogs.NeedToRegisterDialog");
-                            Modal.createDialog(NeedToRegisterDialog, {
-                                title: _t("Please Register"),
-                                description: _t("Guests can't use labs features. Please register."),
-                            });
+                            dis.dispatch({action: 'view_set_mxid'});
                            return;
                        }

@ -1098,7 +1095,7 @@ module.exports = React.createClass({
                            onValueChanged={ this._onAddEmailEditFinished } />
                    </div>
                    <div className="mx_UserSettings_threepidButton mx_filterFlipColor">
-                         <img src="img/plus.svg" width="14" height="14" alt="Add" onClick={this._addEmail} />
+                         <img src="img/plus.svg" width="14" height="14" alt={_t("Add")} onClick={this._addEmail} />
                    </div>
                </div>
            );
--- a/src/components/structures/login/Login.js
+++ b/src/components/structures/login/Login.js
@ -19,7 +19,6 @@ limitations under the License.

 import React from 'react';
 import { _t, _tJsx } from '../../../languageHandler';
-import ReactDOM from 'react-dom';
 import sdk from '../../../index';
 import Login from '../../../Login';

@ -88,7 +87,27 @@ module.exports = React.createClass({
        ).then((data) => {
            this.props.onLoggedIn(data);
        }, (error) => {
-            this._setStateFromError(error, true);
+            let errorText;
+
+            // Some error strings only apply for logging in
+            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.httpStatus === 401 || error.httpStatus === 403) {
+                errorText = _t('Incorrect username and/or password.');
+            } else {
+                // other errors, not specific to doing a password login
+                errorText = this._errorTextFromError(error);
+            }
+
+            this.setState({
+                errorText: errorText,
+                // 401 would be the sensible status code for 'incorrect password'
+                // but the login API gives a 403 https://matrix.org/jira/browse/SYN-744
+                // mentions this (although the bug is for UI auth which is not this)
+                // We treat both as an incorrect password
+                loginIncorrect: error.httpStatus === 401 || error.httpStatus == 403,
+            });
        }).finally(() => {
            this.setState({
                busy: false
@ -111,7 +130,16 @@ module.exports = React.createClass({
        this._loginLogic.loginAsGuest().then(function(data) {
            self.props.onLoggedIn(data);
        }, function(error) {
-            self._setStateFromError(error, true);
+            let errorText;
+            if (error.httpStatus === 403) {
+                errorText = _t("Guest access is disabled on this Home Server.");
+            } else {
+                errorText = self._errorTextFromError(error);
+            }
+            self.setState({
+                errorText: errorText,
+                loginIncorrect: false,
+            });
        }).finally(function() {
            self.setState({
                busy: false
@ -130,7 +158,7 @@ module.exports = React.createClass({
    onPhoneNumberChanged: function(phoneNumber) {
        // Validate the phone number entered
        if (!PHONE_NUMBER_REGEX.test(phoneNumber)) {
-            this.setState({ errorText: 'The phone number entered looks invalid' });
+            this.setState({ errorText: _t('The phone number entered looks invalid') });
            return;
        }

@ -184,44 +212,35 @@ module.exports = React.createClass({
                currentFlow: self._getCurrentFlowStep(),
            });
        }, function(err) {
-            self._setStateFromError(err, false);
+            self.setState({
+                errorText: self._errorTextFromError(err),
+                loginIncorrect: false,
+            });
        }).finally(function() {
            self.setState({
                busy: false,
            });
-        });
+        }).done();
    },

    _getCurrentFlowStep: function() {
        return this._loginLogic ? this._loginLogic.getCurrentFlowStep() : null;
    },

-    _setStateFromError: function(err, isLoginAttempt) {
-        this.setState({
-            errorText: this._errorTextFromError(err),
-            // https://matrix.org/jira/browse/SYN-744
-            loginIncorrect: isLoginAttempt && (err.httpStatus == 401 || err.httpStatus == 403)
-        });
-    },
-
    _errorTextFromError(err) {
-        if (err.friendlyText) {
-            return err.friendlyText;
-        }
-
        let errCode = err.errcode;
        if (!errCode && err.httpStatus) {
            errCode = "HTTP " + err.httpStatus;
        }

-        let errorText = "Error: Problem communicating with the given homeserver " +
-                (errCode ? "(" + errCode + ")" : "");
+        let errorText = _t("Error: Problem communicating with the given homeserver.") +
+                (errCode ? " (" + errCode + ")" : "");

        if (err.cors === 'rejected') {
            if (window.location.protocol === 'https:' &&
                (this.state.enteredHomeserverUrl.startsWith("http:") ||
-                 !this.state.enteredHomeserverUrl.startsWith("http")))
-            {
+                 !this.state.enteredHomeserverUrl.startsWith("http"))
+            ) {
                errorText = <span>
                    { _tJsx("Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. " +
                            "Either use HTTPS or <a>enable unsafe scripts</a>.",
@ -229,10 +248,9 @@ module.exports = React.createClass({
                      (sub) => { return <a href="https://www.google.com/search?&q=enable%20unsafe%20scripts">{ sub }</a>; }
                    )}
                </span>;
-            }
-            else {
+            } else {
                errorText = <span>
-                    { _tJsx("Can't connect to homeserver - please check your connectivity and ensure your <a>homeserver's SSL certificate</a> is trusted.",
+                    { _tJsx("Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.",
                      /<a>(.*?)<\/a>/,
                      (sub) => { return <a href={this.state.enteredHomeserverUrl}>{ sub }</a>; }
                    )}
--- a/src/components/structures/login/PostRegistration.js
+++ b/src/components/structures/login/PostRegistration.js
@ -50,7 +50,7 @@ module.exports = React.createClass({
            });
        }, function(error) {
            self.setState({
-                errorString: "Failed to fetch avatar URL",
+                errorString: _t("Failed to fetch avatar URL"),
                busy: false
            });
        });
--- a/src/components/structures/login/Registration.js
+++ b/src/components/structures/login/Registration.js
@ -21,11 +21,9 @@ import q from 'q';
 import React from 'react';

 import sdk from '../../../index';
-import dis from '../../../dispatcher';
 import ServerConfig from '../../views/login/ServerConfig';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import RegistrationForm from '../../views/login/RegistrationForm';
-import CaptchaForm from '../../views/login/CaptchaForm';
 import RtsClient from '../../../RtsClient';
 import { _t } from '../../../languageHandler';

@ -99,7 +97,7 @@ module.exports = React.createClass({
            this.props.teamServerConfig.teamServerURL &&
            !this._rtsClient
        ) {
-            this._rtsClient = new RtsClient(this.props.teamServerConfig.teamServerURL);
+            this._rtsClient = this.props.rtsClient || new RtsClient(this.props.teamServerConfig.teamServerURL);

            this.setState({
                teamServerBusy: true,
@ -222,7 +220,6 @@ module.exports = React.createClass({
        }

        trackPromise.then((teamToken) => {
-            console.info('Team token promise',teamToken);
            this.props.onLoggedIn({
                userId: response.user_id,
                deviceId: response.device_id,
--- a/src/components/views/avatars/BaseAvatar.js
+++ b/src/components/views/avatars/BaseAvatar.js
@ -32,6 +32,7 @@ module.exports = React.createClass({
        urls: React.PropTypes.array, // [highest_priority, ... , lowest_priority]
        width: React.PropTypes.number,
        height: React.PropTypes.number,
+        // XXX resizeMethod not actually used.
        resizeMethod: React.PropTypes.string,
        defaultToInitialLetter: React.PropTypes.bool // true to add default url
    },
--- a/src/components/views/create_room/Presets.js
+++ b/src/components/views/create_room/Presets.js
@ -17,6 +17,7 @@ limitations under the License.
 'use strict';

 var React = require('react');
+import { _t } from '../../../languageHandler';

 var Presets = {
    PrivateChat: "private_chat",
@ -46,9 +47,9 @@ module.exports = React.createClass({
    render: function() {
        return (
            <select className="mx_Presets" onChange={this.onValueChanged} value={this.props.preset}>
-                <option value={this.Presets.PrivateChat}>Private Chat</option>
-                <option value={this.Presets.PublicChat}>Public Chat</option>
-                <option value={this.Presets.Custom}>Custom</option>
+                <option value={this.Presets.PrivateChat}>{_t("Private Chat")}</option>
+                <option value={this.Presets.PublicChat}>{_t("Public Chat")}</option>
+                <option value={this.Presets.Custom}>{_t("Custom")}</option>
            </select>
        );
    }
--- a/src/components/views/create_room/RoomAlias.js
+++ b/src/components/views/create_room/RoomAlias.js
@ -15,6 +15,7 @@ limitations under the License.
 */

 var React = require('react');
+import { _t } from '../../../languageHandler';

 module.exports = React.createClass({
    displayName: 'RoomAlias',
@ -94,7 +95,7 @@ module.exports = React.createClass({

    render: function() {
        return (
-            <input type="text" className="mx_RoomAlias" placeholder="Alias (optional)"
+            <input type="text" className="mx_RoomAlias" placeholder={_t("Alias (optional)")}
                onChange={this.onValueChanged} onFocus={this.onFocus} onBlur={this.onBlur}
                value={this.props.alias}/>
        );
--- a/src/components/views/dialogs/ChatCreateOrReuseDialog.js
+++ b/src/components/views/dialogs/ChatCreateOrReuseDialog.js
@ -16,37 +16,30 @@ limitations under the License.

 import React from 'react';
 import sdk from '../../../index';
-import dis from '../../../dispatcher';
 import { _t } from '../../../languageHandler';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import DMRoomMap from '../../../utils/DMRoomMap';
 import AccessibleButton from '../elements/AccessibleButton';
 import Unread from '../../../Unread';
 import classNames from 'classnames';
-import createRoom from '../../../createRoom';

 export default class ChatCreateOrReuseDialog extends React.Component {

    constructor(props) {
        super(props);
-        this.onNewDMClick = this.onNewDMClick.bind(this);
        this.onRoomTileClick = this.onRoomTileClick.bind(this);
+
+        this.state = {
+            tiles: [],
+            profile: {
+                displayName: null,
+                avatarUrl: null,
+            },
+            profileError: null,
+        };
    }

-    onNewDMClick() {
-        createRoom({dmUserId: this.props.userId});
-        this.props.onFinished(true);
-    }
-
-    onRoomTileClick(roomId) {
-        dis.dispatch({
-            action: 'view_room',
-            room_id: roomId,
-        });
-        this.props.onFinished(true);
-    }
-
-    render() {
+    componentWillMount() {
        const client = MatrixClientPeg.get();

        const dmRoomMap = new DMRoomMap(client);
@ -71,40 +64,123 @@ export default class ChatCreateOrReuseDialog extends React.Component {
                        highlight={highlight}
                        isInvite={me.membership == "invite"}
                        onClick={this.onRoomTileClick}
-                    />
+                    />,
                );
            }
        }

-        const labelClasses = classNames({
-            mx_MemberInfo_createRoom_label: true,
-            mx_RoomTile_name: true,
+        this.setState({
+            tiles: tiles,
        });
-        const startNewChat = <AccessibleButton
-            className="mx_MemberInfo_createRoom"
-            onClick={this.onNewDMClick}
-        >
-            <div className="mx_RoomTile_avatar">
-                <img src="img/create-big.svg" width="26" height="26" />
-            </div>
-            <div className={labelClasses}><i>{_t("Start new chat")}</i></div>
-        </AccessibleButton>;
+
+        if (tiles.length === 0) {
+            this.setState({
+                busyProfile: true,
+            });
+            MatrixClientPeg.get().getProfileInfo(this.props.userId).done((resp) => {
+                const profile = {
+                    displayName: resp.displayname,
+                    avatarUrl: null,
+                };
+                if (resp.avatar_url) {
+                    profile.avatarUrl = MatrixClientPeg.get().mxcUrlToHttp(
+                        resp.avatar_url, 48, 48, "crop",
+                    );
+                }
+                this.setState({
+                    busyProfile: false,
+                    profile: profile,
+                });
+            }, (err) => {
+                console.error(
+                    'Unable to get profile for user ' + this.props.userId + ':',
+                    err,
+                );
+                this.setState({
+                    busyProfile: false,
+                    profileError: err,
+                });
+            });
+        }
+    }
+
+    onRoomTileClick(roomId) {
+        this.props.onExistingRoomSelected(roomId);
+    }
+
+    render() {
+        let title = '';
+        let content = null;
+        if (this.state.tiles.length > 0) {
+            // Show the existing rooms with a "+" to add a new dm
+            title = _t('Create a new chat or reuse an existing one');
+            const labelClasses = classNames({
+                mx_MemberInfo_createRoom_label: true,
+                mx_RoomTile_name: true,
+            });
+            const startNewChat = <AccessibleButton
+                className="mx_MemberInfo_createRoom"
+                onClick={this.props.onNewDMClick}
+            >
+                <div className="mx_RoomTile_avatar">
+                    <img src="img/create-big.svg" width="26" height="26" />
+                </div>
+                <div className={labelClasses}><i>{ _t("Start new chat") }</i></div>
+            </AccessibleButton>;
+            content = <div className="mx_Dialog_content">
+                { _t('You already have existing direct chats with this user:') }
+                <div className="mx_ChatCreateOrReuseDialog_tiles">
+                    { this.state.tiles }
+                    { startNewChat }
+                </div>
+            </div>;
+        } else {
+            // Show the avatar, name and a button to confirm that a new chat is requested
+            const BaseAvatar = sdk.getComponent('avatars.BaseAvatar');
+            const Spinner = sdk.getComponent('elements.Spinner');
+            title = _t('Start chatting');
+
+            let profile = null;
+            if (this.state.busyProfile) {
+                profile = <Spinner />;
+            } else if (this.state.profileError) {
+                profile = <div className="error">
+                    Unable to load profile information for { this.props.userId }
+                </div>;
+            } else {
+                profile = <div className="mx_ChatCreateOrReuseDialog_profile">
+                    <BaseAvatar
+                        name={this.state.profile.displayName || this.props.userId}
+                        url={this.state.profile.avatarUrl}
+                        width={48} height={48}
+                    />
+                    <div className="mx_ChatCreateOrReuseDialog_profile_name">
+                        {this.state.profile.displayName || this.props.userId}
+                    </div>
+                </div>;
+            }
+            content = <div>
+                <div className="mx_Dialog_content">
+                    <p>
+                        { _t('Click on the button below to start chatting!') }
+                    </p>
+                    { profile }
+                </div>
+                <div className="mx_Dialog_buttons">
+                    <button className="mx_Dialog_primary" onClick={this.props.onNewDMClick}>
+                        { _t('Start Chatting') }
+                    </button>
+                </div>
+            </div>;
+        }

        const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
        return (
            <BaseDialog className='mx_ChatCreateOrReuseDialog'
-                onFinished={() => {
-                    this.props.onFinished(false)
-                }}
-                title='Create a new chat or reuse an existing one'
+                onFinished={ this.props.onFinished.bind(false) }
+                title={title}
            >
-                <div className="mx_Dialog_content">
-                    You already have existing direct chats with this user:
-                    <div className="mx_ChatCreateOrReuseDialog_tiles">
-                        {tiles}
-                        {startNewChat}
-                    </div>
-                </div>
+                { content }
            </BaseDialog>
        );
    }
@ -112,5 +188,8 @@ export default class ChatCreateOrReuseDialog extends React.Component {

 ChatCreateOrReuseDialog.propTyps = {
    userId: React.PropTypes.string.isRequired,
+    // Called when clicking outside of the dialog
    onFinished: React.PropTypes.func.isRequired,
+    onNewDMClick: React.PropTypes.func.isRequired,
+    onExistingRoomSelected: React.PropTypes.func.isRequired,
 };
--- a/src/components/views/dialogs/ChatInviteDialog.js
+++ b/src/components/views/dialogs/ChatInviteDialog.js
@ -15,20 +15,18 @@ limitations under the License.
 */

 import React from 'react';
-import classNames from 'classnames';
 import { _t } from '../../../languageHandler';
 import sdk from '../../../index';
 import { getAddressType, inviteMultipleToRoom } from '../../../Invite';
 import createRoom from '../../../createRoom';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import DMRoomMap from '../../../utils/DMRoomMap';
-import rate_limited_func from '../../../ratelimitedfunc';
-import dis from '../../../dispatcher';
 import Modal from '../../../Modal';
 import AccessibleButton from '../elements/AccessibleButton';
 import q from 'q';

 const TRUNCATE_QUERY_LIST = 40;
+const QUERY_USER_DIRECTORY_DEBOUNCE_MS = 200;

 module.exports = React.createClass({
    displayName: "ChatInviteDialog",
@ -43,13 +41,13 @@ module.exports = React.createClass({
        roomId: React.PropTypes.string,
        button: React.PropTypes.string,
        focus: React.PropTypes.bool,
-        onFinished: React.PropTypes.func.isRequired
+        onFinished: React.PropTypes.func.isRequired,
    },

    getDefaultProps: function() {
        return {
            value: "",
-            focus: true
+            focus: true,
        };
    },

@ -57,12 +55,20 @@ module.exports = React.createClass({
        return {
            error: false,

-            // List of AddressTile.InviteAddressType objects represeting
+            // List of AddressTile.InviteAddressType objects representing
            // the list of addresses we're going to invite
            inviteList: [],

-            // List of AddressTile.InviteAddressType objects represeting
-            // the set of autocompletion results for the current search
+            // Whether a search is ongoing
+            busy: false,
+            // An error message generated during the user directory search
+            searchError: null,
+            // Whether the server supports the user_directory API
+            serverSupportsUserDirectory: true,
+            // The query being searched for
+            query: "",
+            // List of AddressTile.InviteAddressType objects representing
+            // the set of auto-completion results for the current search
            // query.
            queryList: [],
        };
@ -73,7 +79,6 @@ module.exports = React.createClass({
            // Set the cursor at the end of the text input
            this.refs.textinput.value = this.props.value;
        }
-        this._updateUserList();
    },

    onButtonClick: function() {
@ -95,16 +100,25 @@ module.exports = React.createClass({
                    // A Direct Message room already exists for this user, so select a
                    // room from a list that is similar to the one in MemberInfo panel
                    const ChatCreateOrReuseDialog = sdk.getComponent(
-                        "views.dialogs.ChatCreateOrReuseDialog"
+                        "views.dialogs.ChatCreateOrReuseDialog",
                    );
                    Modal.createDialog(ChatCreateOrReuseDialog, {
                        userId: userId,
                        onFinished: (success) => {
-                            if (success) {
-                                this.props.onFinished(true, inviteList[0]);
-                            }
-                            // else show this ChatInviteDialog again
-                        }
+                            this.props.onFinished(success);
+                        },
+                        onNewDMClick: () => {
+                            dis.dispatch({
+                                action: 'start_chat',
+                                user_id: userId,
+                            });
+                        },
+                        onExistingRoomSelected: (roomId) => {
+                            dis.dispatch({
+                                action: 'view_room',
+                                user_id: roomId,
+                            });
+                        },
                    });
                } else {
                    this._startChat(inviteList);
@ -131,15 +145,15 @@ module.exports = React.createClass({
        } else if (e.keyCode === 38) { // up arrow
            e.stopPropagation();
            e.preventDefault();
-            this.addressSelector.moveSelectionUp();
+            if (this.addressSelector) this.addressSelector.moveSelectionUp();
        } else if (e.keyCode === 40) { // down arrow
            e.stopPropagation();
            e.preventDefault();
-            this.addressSelector.moveSelectionDown();
+            if (this.addressSelector) this.addressSelector.moveSelectionDown();
        } else if (this.state.queryList.length > 0 && (e.keyCode === 188 || e.keyCode === 13 || e.keyCode === 9)) { // comma or enter or tab
            e.stopPropagation();
            e.preventDefault();
-            this.addressSelector.chooseSelection();
+            if (this.addressSelector) this.addressSelector.chooseSelection();
        } else if (this.refs.textinput.value.length === 0 && this.state.inviteList.length && e.keyCode === 8) { // backspace
            e.stopPropagation();
            e.preventDefault();
@ -162,74 +176,36 @@ module.exports = React.createClass({

    onQueryChanged: function(ev) {
        const query = ev.target.value.toLowerCase();
-        let queryList = [];
-
-        if (query.length < 2) {
-            return;
-        }
-
        if (this.queryChangedDebouncer) {
            clearTimeout(this.queryChangedDebouncer);
        }
-        this.queryChangedDebouncer = setTimeout(() => {
-            // Only do search if there is something to search
-            if (query.length > 0 && query != '@') {
-                this._userList.forEach((user) => {
-                    if (user.userId.toLowerCase().indexOf(query) === -1 &&
-                        user.displayName.toLowerCase().indexOf(query) === -1
-                    ) {
-                        return;
-                    }
-
-                    // Return objects, structure of which is defined
-                    // by InviteAddressType
-                    queryList.push({
-                        addressType: 'mx',
-                        address: user.userId,
-                        displayName: user.displayName,
-                        avatarMxc: user.avatarUrl,
-                        isKnown: true,
-                        order: user.getLastActiveTs(),
-                    });
-                });
-
-                queryList = queryList.sort((a,b) => {
-                    return a.order < b.order;
-                });
-
-                // If the query is a valid address, add an entry for that
-                // This is important, otherwise there's no way to invite
-                // a perfectly valid address if there are close matches.
-                const addrType = getAddressType(query);
-                if (addrType !== null) {
-                    queryList.unshift({
-                        addressType: addrType,
-                        address: query,
-                        isKnown: false,
-                    });
-                    if (this._cancelThreepidLookup) this._cancelThreepidLookup();
-                    if (addrType == 'email') {
-                        this._lookupThreepid(addrType, query).done();
-                    }
+        // Only do search if there is something to search
+        if (query.length > 0 && query != '@' && query.length >= 2) {
+            this.queryChangedDebouncer = setTimeout(() => {
+                if (this.state.serverSupportsUserDirectory) {
+                    this._doUserDirectorySearch(query);
+                } else {
+                    this._doLocalSearch(query);
                }
-            }
+            }, QUERY_USER_DIRECTORY_DEBOUNCE_MS);
+        } else {
            this.setState({
-                queryList: queryList,
-                error: false,
-            }, () => {
-                this.addressSelector.moveSelectionTop();
+                queryList: [],
+                query: "",
+                searchError: null,
            });
-        }, 200);
+        }
    },

    onDismissed: function(index) {
        var self = this;
-        return function() {
+        return () => {
            var inviteList = self.state.inviteList.slice();
            inviteList.splice(index, 1);
            self.setState({
                inviteList: inviteList,
                queryList: [],
+                query: "",
            });
            if (this._cancelThreepidLookup) this._cancelThreepidLookup();
        };
@ -248,10 +224,103 @@ module.exports = React.createClass({
        this.setState({
            inviteList: inviteList,
            queryList: [],
+            query: "",
        });
        if (this._cancelThreepidLookup) this._cancelThreepidLookup();
    },

+    _doUserDirectorySearch: function(query) {
+        this.setState({
+            busy: true,
+            query,
+            searchError: null,
+        });
+        MatrixClientPeg.get().searchUserDirectory({
+            term: query,
+        }).then((resp) => {
+            this._processResults(resp.results, query);
+        }).catch((err) => {
+            console.error('Error whilst searching user directory: ', err);
+            this.setState({
+                searchError: err.errcode ? err.message : _t('Something went wrong!'),
+            });
+            if (err.errcode === 'M_UNRECOGNIZED') {
+                this.setState({
+                    serverSupportsUserDirectory: false,
+                });
+                // Do a local search immediately
+                this._doLocalSearch(query);
+            }
+        }).done(() => {
+            this.setState({
+                busy: false,
+            });
+        });
+    },
+
+    _doLocalSearch: function(query) {
+        this.setState({
+            query,
+            searchError: null,
+        });
+        const results = [];
+        MatrixClientPeg.get().getUsers().forEach((user) => {
+            if (user.userId.toLowerCase().indexOf(query) === -1 &&
+                user.displayName.toLowerCase().indexOf(query) === -1
+            ) {
+                return;
+            }
+
+            // Put results in the format of the new API
+            results.push({
+                user_id: user.userId,
+                display_name: user.displayName,
+                avatar_url: user.avatarUrl,
+            });
+        });
+        this._processResults(results, query);
+    },
+
+    _processResults: function(results, query) {
+        const queryList = [];
+        results.forEach((user) => {
+            if (user.user_id === MatrixClientPeg.get().credentials.userId) {
+                return;
+            }
+            // Return objects, structure of which is defined
+            // by InviteAddressType
+            queryList.push({
+                addressType: 'mx',
+                address: user.user_id,
+                displayName: user.display_name,
+                avatarMxc: user.avatar_url,
+                isKnown: true,
+            });
+        });
+
+        // If the query is a valid address, add an entry for that
+        // This is important, otherwise there's no way to invite
+        // a perfectly valid address if there are close matches.
+        const addrType = getAddressType(query);
+        if (addrType !== null) {
+            queryList.unshift({
+                addressType: addrType,
+                address: query,
+                isKnown: false,
+            });
+            if (this._cancelThreepidLookup) this._cancelThreepidLookup();
+            if (addrType == 'email') {
+                this._lookupThreepid(addrType, query).done();
+            }
+        }
+        this.setState({
+            queryList,
+            error: false,
+        }, () => {
+            if (this.addressSelector) this.addressSelector.moveSelectionTop();
+        });
+    },
+
    _getDirectMessageRooms: function(addr) {
        const dmRoomMap = new DMRoomMap(MatrixClientPeg.get());
        const dmRooms = dmRoomMap.getDMRoomsForUserId(addr);
@ -270,11 +339,7 @@ module.exports = React.createClass({

    _startChat: function(addrs) {
        if (MatrixClientPeg.get().isGuest()) {
-            var NeedToRegisterDialog = sdk.getComponent("dialogs.NeedToRegisterDialog");
-            Modal.createDialog(NeedToRegisterDialog, {
-                title: _t("Please Register"),
-                description: _t("Guest users can't invite users. Please register."),
-            });
+            dis.dispatch({action: 'view_set_mxid'});
            return;
        }

@ -340,16 +405,6 @@ module.exports = React.createClass({
        this.props.onFinished(true, addrTexts);
    },

-    _updateUserList: function() {
-        // Get all the users
-        this._userList = MatrixClientPeg.get().getUsers();
-        // Remove current user
-        const meIx = this._userList.findIndex((u) => {
-            return u.userId === MatrixClientPeg.get().credentials.userId;
-        });
-        this._userList.splice(meIx, 1);
-    },
-
    _isOnInviteList: function(uid) {
        for (let i = 0; i < this.state.inviteList.length; i++) {
            if (
@ -417,6 +472,7 @@ module.exports = React.createClass({
        this.setState({
            inviteList: inviteList,
            queryList: [],
+            query: "",
        });
        if (this._cancelThreepidLookup) this._cancelThreepidLookup();
        return inviteList;
@ -452,7 +508,7 @@ module.exports = React.createClass({
                    displayName: res.displayname,
                    avatarMxc: res.avatar_url,
                    isKnown: true,
-                }]
+                }],
            });
        });
    },
@ -484,23 +540,27 @@ module.exports = React.createClass({
                placeholder={this.props.placeholder}
                defaultValue={this.props.value}
                autoFocus={this.props.focus}>
-            </textarea>
+            </textarea>,
        );

-        var error;
-        var addressSelector;
+        let error;
+        let addressSelector;
        if (this.state.error) {
            error = <div className="mx_ChatInviteDialog_error">{_t("You have entered an invalid contact. Try using their Matrix ID or email address.")}</div>;
+        } else if (this.state.searchError) {
+            error = <div className="mx_ChatInviteDialog_error">{this.state.searchError}</div>;
+        } else if (
+            this.state.query.length > 0 &&
+            this.state.queryList.length === 0 &&
+            !this.state.busy
+        ) {
+            error = <div className="mx_ChatInviteDialog_error">{_t("No results")}</div>;
        } else {
-            const addressSelectorHeader = <div className="mx_ChatInviteDialog_addressSelectHeader">
-                Searching known users
-            </div>;
            addressSelector = (
                <AddressSelector ref={(ref) => {this.addressSelector = ref;}}
                    addressList={ this.state.queryList }
                    onSelected={ this.onSelected }
                    truncateAt={ TRUNCATE_QUERY_LIST }
-                    header={ addressSelectorHeader }
                />
            );
        }
--- a/src/components/views/dialogs/DeactivateAccountDialog.js
+++ b/src/components/views/dialogs/DeactivateAccountDialog.js
@ -86,7 +86,7 @@ export default class DeactivateAccountDialog extends React.Component {
            passwordBoxClass = 'error';
        }

-        const okLabel = this.state.busy ? <Loader /> : 'Deactivate Account';
+        const okLabel = this.state.busy ? <Loader /> : _t('Deactivate Account');
        const okEnabled = this.state.confirmButtonEnabled && !this.state.busy;

        let cancelButton = null;
--- a/src/components/views/dialogs/InteractiveAuthDialog.js
+++ b/src/components/views/dialogs/InteractiveAuthDialog.js
@ -15,8 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-import Matrix from 'matrix-js-sdk';
-
 import React from 'react';

 import sdk from '../../../index';
@ -80,7 +78,7 @@ export default React.createClass({
                    <AccessibleButton onClick={this._onDismissClick}
                        className="mx_UserSettings_button"
                    >
-                        Dismiss
+                        {_t("Dismiss")}
                    </AccessibleButton>
                </div>
            );
--- a/src/components/views/dialogs/SessionRestoreErrorDialog.js
+++ b/src/components/views/dialogs/SessionRestoreErrorDialog.js
@ -18,7 +18,7 @@ import React from 'react';
 import sdk from '../../../index';
 import SdkConfig from '../../../SdkConfig';
 import Modal from '../../../Modal';
-import { _t } from '../../../languageHandler';
+import { _t, _tJsx } from '../../../languageHandler';


 export default React.createClass({
@ -44,8 +44,11 @@ export default React.createClass({

        if (SdkConfig.get().bug_report_endpoint_url) {
            bugreport = (
-                <p>Otherwise, <a onClick={this._sendBugReport} href='#'>
-                   click here</a> to send a bug report.
+                <p>
+                {_tJsx(
+                    "Otherwise, <a>click here</a> to send a bug report.",
+                    /<a>(.*?)<\/a>/, (sub) => <a onClick={this._sendBugReport} key="bugreport" href='#'>{sub}</a>,
+                )}
                </p>
            );
        }
--- a/src/components/views/dialogs/SetDisplayNameDialog.js
+++ b/src/components/views/dialogs/SetDisplayNameDialog.js
@ -1,89 +0,0 @@
-/*
-Copyright 2016 OpenMarket 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 sdk from '../../../index';
-import MatrixClientPeg from '../../../MatrixClientPeg';
-
-import { _t } from '../../../languageHandler';
-
-/**
- * Prompt the user to set a display name.
- *
- * On success, `onFinished(true, newDisplayName)` is called.
- */
-export default React.createClass({
-    displayName: 'SetDisplayNameDialog',
-    propTypes: {
-        onFinished: React.PropTypes.func.isRequired,
-        currentDisplayName: React.PropTypes.string,
-    },
-
-    getInitialState: function() {
-        if (this.props.currentDisplayName) {
-            return { value: this.props.currentDisplayName };
-        }
-
-        if (MatrixClientPeg.get().isGuest()) {
-            return { value : "Guest " + MatrixClientPeg.get().getUserIdLocalpart() };
-        }
-        else {
-            return { value : MatrixClientPeg.get().getUserIdLocalpart() };
-        }
-    },
-
-    componentDidMount: function() {
-        this.refs.input_value.select();
-    },
-
-    onValueChange: function(ev) {
-        this.setState({
-            value: ev.target.value
-        });
-    },
-
-    onFormSubmit: function(ev) {
-        ev.preventDefault();
-        this.props.onFinished(true, this.state.value);
-        return false;
-    },
-
-    render: function() {
-        const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
-        return (
-            <BaseDialog className="mx_SetDisplayNameDialog"
-                onFinished={this.props.onFinished}
-                title={_t("Set a Display Name")}
-            >
-                <div className="mx_Dialog_content">
-                    {_t("Your display name is how you'll appear to others when you speak in rooms. " +
-                    "What would you like it to be?")}
-                </div>
-                <form onSubmit={this.onFormSubmit}>
-                    <div className="mx_Dialog_content">
-                        <input type="text" ref="input_value" value={this.state.value}
-                            autoFocus={true} onChange={this.onValueChange} size="30"
-                            className="mx_SetDisplayNameDialog_input"
-                        />
-                    </div>
-                    <div className="mx_Dialog_buttons">
-                        <input className="mx_Dialog_primary" type="submit" value="Set" />
-                    </div>
-                </form>
-            </BaseDialog>
-        );
-    },
-});
--- a/src/components/views/dialogs/SetMxIdDialog.js
+++ b/src/components/views/dialogs/SetMxIdDialog.js
@ -0,0 +1,294 @@
+/*
+Copyright 2016 OpenMarket Ltd
+Copyright 2017 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.
+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 q from 'q';
+import React from 'react';
+import sdk from '../../../index';
+import MatrixClientPeg from '../../../MatrixClientPeg';
+import classnames from 'classnames';
+import KeyCode from '../../../KeyCode';
+import { _t, _tJsx } from '../../../languageHandler';
+
+// The amount of time to wait for further changes to the input username before
+// sending a request to the server
+const USERNAME_CHECK_DEBOUNCE_MS = 250;
+
+/**
+ * Prompt the user to set a display name.
+ *
+ * On success, `onFinished(true, newDisplayName)` is called.
+ */
+export default React.createClass({
+    displayName: 'SetMxIdDialog',
+    propTypes: {
+        onFinished: React.PropTypes.func.isRequired,
+        // Called when the user requests to register with a different homeserver
+        onDifferentServerClicked: React.PropTypes.func.isRequired,
+        // Called if the user wants to switch to login instead
+        onLoginClick: React.PropTypes.func.isRequired,
+    },
+
+    getInitialState: function() {
+        return {
+            // The entered username
+            username: '',
+            // Indicate ongoing work on the username
+            usernameBusy: false,
+            // Indicate error with username
+            usernameError: '',
+            // Assume the homeserver supports username checking until "M_UNRECOGNIZED"
+            usernameCheckSupport: true,
+
+            // Whether the auth UI is currently being used
+            doingUIAuth: false,
+            // Indicate error with auth
+            authError: '',
+        };
+    },
+
+    componentDidMount: function() {
+        this.refs.input_value.select();
+
+        this._matrixClient = MatrixClientPeg.get();
+    },
+
+    onValueChange: function(ev) {
+        this.setState({
+            username: ev.target.value,
+            usernameBusy: true,
+            usernameError: '',
+        }, () => {
+            if (!this.state.username || !this.state.usernameCheckSupport) {
+                this.setState({
+                    usernameBusy: false,
+                });
+                return;
+            }
+
+            // Debounce the username check to limit number of requests sent
+            if (this._usernameCheckTimeout) {
+                clearTimeout(this._usernameCheckTimeout);
+            }
+            this._usernameCheckTimeout = setTimeout(() => {
+                this._doUsernameCheck().finally(() => {
+                    this.setState({
+                        usernameBusy: false,
+                    });
+                });
+            }, USERNAME_CHECK_DEBOUNCE_MS);
+        });
+    },
+
+    onKeyUp: function(ev) {
+        if (ev.keyCode === KeyCode.ENTER) {
+            this.onSubmit();
+        }
+    },
+
+    onSubmit: function(ev) {
+        this.setState({
+            doingUIAuth: true,
+        });
+    },
+
+    _doUsernameCheck: function() {
+        // Check if username is available
+        return this._matrixClient.isUsernameAvailable(this.state.username).then(
+            (isAvailable) => {
+                if (isAvailable) {
+                    this.setState({usernameError: ''});
+                }
+            },
+            (err) => {
+                // Indicate whether the homeserver supports username checking
+                const newState = {
+                    usernameCheckSupport: err.errcode !== "M_UNRECOGNIZED",
+                };
+                console.error('Error whilst checking username availability: ', err);
+                switch (err.errcode) {
+                    case "M_USER_IN_USE":
+                        newState.usernameError = _t('Username not available');
+                        break;
+                    case "M_INVALID_USERNAME":
+                        newState.usernameError = _t(
+                            'Username invalid: %(errMessage)s',
+                            { errMessage: err.message},
+                        );
+                        break;
+                    case "M_UNRECOGNIZED":
+                        // This homeserver doesn't support username checking, assume it's
+                        // fine and rely on the error appearing in registration step.
+                        newState.usernameError = '';
+                        break;
+                    case undefined:
+                        newState.usernameError = _t('Something went wrong!');
+                        break;
+                    default:
+                        newState.usernameError = _t(
+                            'An error occurred: %(error_string)s',
+                            { error_string: err.message },
+                        );
+                        break;
+                }
+                this.setState(newState);
+            },
+        );
+    },
+
+    _generatePassword: function() {
+        return Math.random().toString(36).slice(2);
+    },
+
+    _makeRegisterRequest: function(auth) {
+        // Not upgrading - changing mxids
+        const guestAccessToken = null;
+        if (!this._generatedPassword) {
+            this._generatedPassword = this._generatePassword();
+        }
+        return this._matrixClient.register(
+            this.state.username,
+            this._generatedPassword,
+            undefined, // session id: included in the auth dict already
+            auth,
+            {},
+            guestAccessToken,
+        );
+    },
+
+    _onUIAuthFinished: function(success, response) {
+        this.setState({
+            doingUIAuth: false,
+        });
+
+        if (!success) {
+            this.setState({ authError: response.message });
+            return;
+        }
+
+        // XXX Implement RTS /register here
+        const teamToken = null;
+
+        this.props.onFinished(true, {
+            userId: response.user_id,
+            deviceId: response.device_id,
+            homeserverUrl: this._matrixClient.getHomeserverUrl(),
+            identityServerUrl: this._matrixClient.getIdentityServerUrl(),
+            accessToken: response.access_token,
+            password: this._generatedPassword,
+            teamToken: teamToken,
+        });
+    },
+
+    render: function() {
+        const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
+        const InteractiveAuth = sdk.getComponent('structures.InteractiveAuth');
+        const Spinner = sdk.getComponent('elements.Spinner');
+
+        let auth;
+        if (this.state.doingUIAuth) {
+            auth = <InteractiveAuth
+                matrixClient={this._matrixClient}
+                makeRequest={this._makeRegisterRequest}
+                onAuthFinished={this._onUIAuthFinished}
+                inputs={{}}
+                poll={true}
+            />;
+        }
+        const inputClasses = classnames({
+            "mx_SetMxIdDialog_input": true,
+            "error": Boolean(this.state.usernameError),
+        });
+
+        let usernameIndicator = null;
+        let usernameBusyIndicator = null;
+        if (this.state.usernameBusy) {
+            usernameBusyIndicator = <Spinner w="24" h="24"/>;
+        } else {
+            const usernameAvailable = this.state.username &&
+                this.state.usernameCheckSupport && !this.state.usernameError;
+            const usernameIndicatorClasses = classnames({
+                "error": Boolean(this.state.usernameError),
+                "success": usernameAvailable,
+            });
+            usernameIndicator = <div className={usernameIndicatorClasses}>
+                { usernameAvailable ? _t('Username available') : this.state.usernameError }
+            </div>;
+        }
+
+        let authErrorIndicator = null;
+        if (this.state.authError) {
+            authErrorIndicator = <div className="error">
+                { this.state.authError }
+            </div>;
+        }
+        const canContinue = this.state.username &&
+            !this.state.usernameError &&
+            !this.state.usernameBusy;
+
+        return (
+            <BaseDialog className="mx_SetMxIdDialog"
+                onFinished={this.props.onFinished}
+                title="To get started, please pick a username!"
+            >
+                <div className="mx_Dialog_content">
+                    <div className="mx_SetMxIdDialog_input_group">
+                        <input type="text" ref="input_value" value={this.state.username}
+                            autoFocus={true}
+                            onChange={this.onValueChange}
+                            onKeyUp={this.onKeyUp}
+                            size="30"
+                            className={inputClasses}
+                        />
+                        { usernameBusyIndicator }
+                    </div>
+                    { usernameIndicator }
+                    <p>
+                        { _tJsx(
+                            'This will be your account name on the <span></span> ' +
+                            'homeserver, or you can pick a <a>different server</a>.',
+                            [
+                                /<span><\/span>/,
+                                /<a>(.*?)<\/a>/,
+                            ],
+                            [
+                                (sub) => <span>{this.props.homeserverUrl}</span>,
+                                (sub) => <a href="#" onClick={this.props.onDifferentServerClicked}>{sub}</a>,
+                            ],
+                        )}
+                    </p>
+                    <p>
+                        { _tJsx(
+                            'If you already have a Matrix account you can <a>log in</a> instead.',
+                            /<a>(.*?)<\/a>/,
+                            [(sub) => <a href="#" onClick={this.props.onLoginClick}>{sub}</a>],
+                        )}
+                    </p>
+                    { auth }
+                    { authErrorIndicator }
+                </div>
+                <div className="mx_Dialog_buttons">
+                    <input className="mx_Dialog_primary"
+                        type="submit"
+                        value={_t("Continue")}
+                        onClick={this.onSubmit}
+                        disabled={!canContinue}
+                    />
+                </div>
+            </BaseDialog>
+        );
+    },
+});
--- a/src/components/views/dialogs/UnknownDeviceDialog.js
+++ b/src/components/views/dialogs/UnknownDeviceDialog.js
@ -16,7 +16,6 @@ limitations under the License.

 import React from 'react';
 import sdk from '../../../index';
-import dis from '../../../dispatcher';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import GeminiScrollbar from 'react-gemini-scrollbar';
 import Resend from '../../../Resend';
@ -146,7 +145,7 @@ export default React.createClass({
                            console.log("UnknownDeviceDialog closed by escape");
                            this.props.onFinished();
                }}
-                title='Room contains unknown devices'
+                title={_t('Room contains unknown devices')}
            >
                <GeminiScrollbar autoshow={false} className="mx_Dialog_content">
                    <h4>
@ -163,7 +162,7 @@ export default React.createClass({
                                this.props.onFinished();
                                Resend.resendUnsentEvents(this.props.room);
                            }}>
-                        Send anyway
+                        {_t("Send anyway")}
                    </button>
                    <button className="mx_Dialog_primary" autoFocus={ true }
                            onClick={() => {
--- a/src/components/views/elements/ActionButton.js
+++ b/src/components/views/elements/ActionButton.js
@ -0,0 +1,84 @@
+/*
+Copyright 2017 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.
+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 AccessibleButton from './AccessibleButton';
+import dis from '../../../dispatcher';
+import sdk from '../../../index';
+
+export default React.createClass({
+    displayName: 'RoleButton',
+
+    propTypes: {
+        size: PropTypes.string,
+        tooltip: PropTypes.bool,
+        action: PropTypes.string.isRequired,
+        mouseOverAction: PropTypes.string,
+        label: PropTypes.string.isRequired,
+        iconPath: PropTypes.string.isRequired,
+    },
+
+    getDefaultProps: function() {
+        return {
+            size: "25",
+            tooltip: false,
+        };
+    },
+
+    getInitialState: function() {
+        return {
+            showTooltip: false,
+        };
+    },
+
+    _onClick: function(ev) {
+        ev.stopPropagation();
+        dis.dispatch({action: this.props.action});
+    },
+
+    _onMouseEnter: function() {
+        if (this.props.tooltip) this.setState({showTooltip: true});
+        if (this.props.mouseOverAction) {
+            dis.dispatch({action: this.props.mouseOverAction});
+        }
+    },
+
+    _onMouseLeave: function() {
+        this.setState({showTooltip: false});
+    },
+
+    render: function() {
+        const TintableSvg = sdk.getComponent("elements.TintableSvg");
+
+        let tooltip;
+        if (this.state.showTooltip) {
+            const RoomTooltip = sdk.getComponent("rooms.RoomTooltip");
+            tooltip = <RoomTooltip className="mx_RoleButton_tooltip" label={this.props.label} />;
+        }
+
+        return (
+            <AccessibleButton className="mx_RoleButton"
+                onClick={this._onClick}
+                onMouseEnter={this._onMouseEnter}
+                onMouseLeave={this._onMouseLeave}
+            >
+                <TintableSvg src={this.props.iconPath} width={this.props.size} height={this.props.size} />
+                {tooltip}
+            </AccessibleButton>
+        );
+    }
+});
--- a/src/components/views/elements/AddressTile.js
+++ b/src/components/views/elements/AddressTile.js
@ -19,9 +19,7 @@ limitations under the License.
 import React from 'react';
 import classNames from 'classnames';
 import sdk from "../../../index";
-import Invite from "../../../Invite";
 import MatrixClientPeg from "../../../MatrixClientPeg";
-import Avatar from '../../../Avatar';
 import { _t } from '../../../languageHandler';

 // React PropType definition for an object describing
--- a/src/components/views/elements/CreateRoomButton.js
+++ b/src/components/views/elements/CreateRoomButton.js
@ -0,0 +1,40 @@
+/*
+Copyright 2017 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.
+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 sdk from '../../../index';
+import PropTypes from 'prop-types';
+import { _t } from '../../../languageHandler';
+
+const CreateRoomButton = function(props) {
+    const ActionButton = sdk.getComponent('elements.ActionButton');
+    return (
+        <ActionButton action="view_create_room"
+            mouseOverAction={props.callout ? "callout_create_room" : null}
+            label={ _t("Create new room") }
+            iconPath="img/icons-create-room.svg"
+            size={props.size}
+            tooltip={props.tooltip}
+        />
+    );
+};
+
+CreateRoomButton.propTypes = {
+    size: PropTypes.string,
+    tooltip: PropTypes.bool,
+};
+
+export default CreateRoomButton;
--- a/src/components/views/elements/HomeButton.js
+++ b/src/components/views/elements/HomeButton.js
@ -0,0 +1,39 @@
+/*
+Copyright 2017 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.
+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 sdk from '../../../index';
+import PropTypes from 'prop-types';
+import { _t } from '../../../languageHandler';
+
+const HomeButton = function(props) {
+    const ActionButton = sdk.getComponent('elements.ActionButton');
+    return (
+        <ActionButton action="view_home_page"
+            label={ _t("Home") }
+            iconPath="img/icons-home.svg"
+            size={props.size}
+            tooltip={props.tooltip}
+        />
+    );
+};
+
+HomeButton.propTypes = {
+    size: PropTypes.string,
+    tooltip: PropTypes.bool,
+};
+
+export default HomeButton;
--- a/src/components/views/elements/LanguageDropdown.js
+++ b/src/components/views/elements/LanguageDropdown.js
@ -19,7 +19,6 @@ import React from 'react';

 import sdk from '../../../index';
 import UserSettingsStore from '../../../UserSettingsStore';
-import { _t } from '../../../languageHandler';
 import * as languageHandler from '../../../languageHandler';

 function languageMatchesSearchQuery(query, language) {
--- a/src/components/views/elements/MemberEventListSummary.js
+++ b/src/components/views/elements/MemberEventListSummary.js
@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 import React from 'react';
+import sdk from '../../../index';
 const MemberAvatar = require('../avatars/MemberAvatar.js');
 import { _t } from '../../../languageHandler';

@ -111,9 +112,13 @@ module.exports = React.createClass({
            return null;
        }

+        const EmojiText = sdk.getComponent('elements.EmojiText');
+
        return (
            <span className="mx_TextualEvent mx_MemberEventListSummary_summary">
-                {summaries.join(", ")}
+                <EmojiText>
+                    {summaries.join(", ")}
+                </EmojiText>
            </span>
        );
    },
@ -222,8 +227,7 @@ module.exports = React.createClass({
                        ? _t("%(severalUsers)sjoined", { severalUsers: "" })
                        : _t("%(oneUser)sjoined", { oneUser: "" });
                }
-
-            break;
+                break;
            case "left":
                if (repeats > 1) {
                    res = (plural)
@ -233,7 +237,8 @@ module.exports = React.createClass({
                    res = (plural)
                        ? _t("%(severalUsers)sleft", { severalUsers: "" })
                        : _t("%(oneUser)sleft", { oneUser: "" });
-                }            break;
+                }
+               break;
            case "joined_and_left":
                if (repeats > 1) {
                    res = (plural)
@ -244,7 +249,7 @@ module.exports = React.createClass({
                        ? _t("%(severalUsers)sjoined and left", { severalUsers: "" })
                        : _t("%(oneUser)sjoined and left", { oneUser: "" });
                }
-            break;
+                break;
            case "left_and_joined":
                if (repeats > 1) {
                    res = (plural)
@ -254,8 +259,8 @@ module.exports = React.createClass({
                    res = (plural)
                        ? _t("%(severalUsers)sleft and rejoined", { severalUsers: "" })
                        : _t("%(oneUser)sleft and rejoined", { oneUser: "" });
-                }            break;
-            break;
+                }
+                break;
            case "invite_reject":
                if (repeats > 1) {
                    res = (plural)
@ -266,7 +271,7 @@ module.exports = React.createClass({
                        ? _t("%(severalUsers)srejected their invitations", { severalUsers: "" })
                        : _t("%(oneUser)srejected their invitation", { oneUser: "" });
                }
-            break;
+                break;
            case "invite_withdrawal":
                if (repeats > 1) {
                    res = (plural)
@ -277,7 +282,7 @@ module.exports = React.createClass({
                        ? _t("%(severalUsers)shad their invitations withdrawn", { severalUsers: "" })
                        : _t("%(oneUser)shad their invitation withdrawn", { oneUser: "" });
                }
-            break;
+                break;
            case "invited":
                if (repeats > 1) {
                    res = (plural)
@ -288,7 +293,7 @@ module.exports = React.createClass({
                        ? _t("were invited")
                        : _t("was invited");
                }
-            break;
+                break;
            case "banned":
                if (repeats > 1) {
                    res = (plural)
@ -299,7 +304,7 @@ module.exports = React.createClass({
                        ? _t("were banned")
                        : _t("was banned");
                }
-            break;
+                break;
            case "unbanned":
                if (repeats > 1) {
                    res = (plural)
@ -310,7 +315,7 @@ module.exports = React.createClass({
                        ? _t("were unbanned")
                        : _t("was unbanned");
                }
-            break;
+                break;
            case "kicked":
                if (repeats > 1) {
                    res = (plural)
@ -321,7 +326,7 @@ module.exports = React.createClass({
                        ? _t("were kicked")
                        : _t("was kicked");
                }
-            break;
+                break;
            case "changed_name":
                if (repeats > 1) {
                    res = (plural)
@ -332,7 +337,7 @@ module.exports = React.createClass({
                        ? _t("%(severalUsers)schanged their name", { severalUsers: "" })
                        : _t("%(oneUser)schanged their name", { oneUser: "" });
                }
-            break;
+                break;
            case "changed_avatar":
                if (repeats > 1) {
                    res = (plural)
@ -343,7 +348,7 @@ module.exports = React.createClass({
                        ? _t("%(severalUsers)schanged their avatar", { severalUsers: "" })
                        : _t("%(oneUser)schanged their avatar", { oneUser: "" });
                }
-            break;
+                break;
        }

        return res;
--- a/src/components/views/elements/RoomDirectoryButton.js
+++ b/src/components/views/elements/RoomDirectoryButton.js
@ -0,0 +1,40 @@
+/*
+Copyright 2017 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.
+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 sdk from '../../../index';
+import PropTypes from 'prop-types';
+import { _t } from '../../../languageHandler';
+
+const RoomDirectoryButton = function(props) {
+    const ActionButton = sdk.getComponent('elements.ActionButton');
+    return (
+        <ActionButton action="view_room_directory"
+            mouseOverAction={props.callout ? "callout_room_directory" : null}
+            label={ _t("Room directory") }
+            iconPath="img/icons-directory.svg"
+            size={props.size}
+            tooltip={props.tooltip}
+        />
+    );
+};
+
+RoomDirectoryButton.propTypes = {
+    size: PropTypes.string,
+    tooltip: PropTypes.bool,
+};
+
+export default RoomDirectoryButton;
--- a/src/components/views/elements/SettingsButton.js
+++ b/src/components/views/elements/SettingsButton.js
@ -0,0 +1,39 @@
+/*
+Copyright 2017 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.
+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 sdk from '../../../index';
+import PropTypes from 'prop-types';
+import { _t } from '../../../languageHandler';
+
+const SettingsButton = function(props) {
+    const ActionButton = sdk.getComponent('elements.ActionButton');
+    return (
+        <ActionButton action="view_user_settings"
+            label={ _t("Settings") }
+            iconPath="img/icons-settings.svg"
+            size={props.size}
+            tooltip={props.tooltip}
+        />
+    );
+};
+
+SettingsButton.propTypes = {
+    size: PropTypes.string,
+    tooltip: PropTypes.bool,
+};
+
+export default SettingsButton;
--- a/src/components/views/elements/StartChatButton.js
+++ b/src/components/views/elements/StartChatButton.js
@ -0,0 +1,40 @@
+/*
+Copyright 2017 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.
+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 sdk from '../../../index';
+import PropTypes from 'prop-types';
+import { _t } from '../../../languageHandler';
+
+const StartChatButton = function(props) {
+    const ActionButton = sdk.getComponent('elements.ActionButton');
+    return (
+        <ActionButton action="view_create_chat"
+            mouseOverAction={props.callout ? "callout_start_chat" : null}
+            label={ _t("Start chat") }
+            iconPath="img/icons-people.svg"
+            size={props.size}
+            tooltip={props.tooltip}
+        />
+    );
+};
+
+StartChatButton.propTypes = {
+    size: PropTypes.string,
+    tooltip: PropTypes.bool,
+};
+
+export default StartChatButton;
--- a/src/components/views/elements/TruncatedList.js
+++ b/src/components/views/elements/TruncatedList.js
@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 var React = require('react');
+import { _t } from '../../../languageHandler';

 module.exports = React.createClass({
    displayName: 'TruncatedList',
@ -33,7 +34,7 @@ module.exports = React.createClass({
            truncateAt: 2,
            createOverflowElement: function(overflowCount, totalCount) {
                return (
-                    <div>And {overflowCount} more...</div>
+                    <div>{_t("And %(count)s more...", {count: overflowCount})}</div>
                );
            }
        };
--- a/src/components/views/login/InteractiveAuthEntryComponents.js
+++ b/src/components/views/login/InteractiveAuthEntryComponents.js
@ -440,7 +440,7 @@ export const FallbackAuthEntry = React.createClass({
    render: function() {
        return (
            <div>
-                <a onClick={this._onShowFallbackClick}>Start authentication</a>
+                <a onClick={this._onShowFallbackClick}>{_t("Start authentication")}</a>
                <div className="error">
                    {this.props.errorText}
                </div>
--- a/src/components/views/login/LoginFooter.js
+++ b/src/components/views/login/LoginFooter.js
@ -16,6 +16,7 @@ limitations under the License.

 'use strict';

+import { _t } from '../../../languageHandler';
 import React from 'react';

 module.exports = React.createClass({
@ -27,5 +28,5 @@ module.exports = React.createClass({
                <a href="https://matrix.org">{_t("powered by Matrix")}</a>
            </div>
        );
-    }
+    },
 });
--- a/src/components/views/login/PasswordLogin.js
+++ b/src/components/views/login/PasswordLogin.js
@ -16,7 +16,6 @@ limitations under the License.
 */

 import React from 'react';
-import ReactDOM from 'react-dom';
 import classNames from 'classnames';
 import sdk from '../../../index';
 import { _t } from '../../../languageHandler';
--- a/src/components/views/login/RegistrationForm.js
+++ b/src/components/views/login/RegistrationForm.js
@ -101,7 +101,7 @@ module.exports = React.createClass({
            if (this.refs.email.value == '') {
                var QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
                Modal.createDialog(QuestionDialog, {
-                    title: "Warning!",
+                    title: _t("Warning!"),
                    description:
                        <div>
                            {_t("If you don't specify an email address, you won't be able to reset your password. " +
@ -110,18 +110,17 @@ module.exports = React.createClass({
                    button: _t("Continue"),
                    onFinished: function(confirmed) {
                        if (confirmed) {
-                            self._doSubmit();
+                            self._doSubmit(ev);
                        }
                    },
                });
-            }
-            else {
-                self._doSubmit();
+            } else {
+                self._doSubmit(ev);
            }
        }
    },

-    _doSubmit: function() {
+    _doSubmit: function(ev) {
        let email = this.refs.email.value.trim();
        var promise = this.props.onRegisterClick({
            username: this.refs.username.value.trim() || this.props.guestUsername,
@ -336,7 +335,7 @@ module.exports = React.createClass({
        );

        const registerButton = (
-            <input className="mx_Login_submit" type="submit" value="Register" />
+            <input className="mx_Login_submit" type="submit" value={_t("Register")} />
        );

        let placeholderUserName = _t("User name");
--- a/src/components/views/messages/MAudioBody.js
+++ b/src/components/views/messages/MAudioBody.js
@ -20,7 +20,6 @@ import React from 'react';
 import MFileBody from './MFileBody';

 import MatrixClientPeg from '../../../MatrixClientPeg';
-import sdk from '../../../index';
 import { decryptFile, readBlobAsDataUri } from '../../../utils/DecryptFile';
 import { _t } from '../../../languageHandler';

--- a/src/components/views/messages/MFileBody.js
+++ b/src/components/views/messages/MFileBody.js
@ -24,7 +24,6 @@ import { _t } from '../../../languageHandler';
 import {decryptFile} from '../../../utils/DecryptFile';
 import Tinter from '../../../Tinter';
 import request from 'browser-request';
-import q from 'q';
 import Modal from '../../../Modal';


--- a/src/components/views/messages/MVideoBody.js
+++ b/src/components/views/messages/MVideoBody.js
@ -19,8 +19,6 @@ limitations under the License.
 import React from 'react';
 import MFileBody from './MFileBody';
 import MatrixClientPeg from '../../../MatrixClientPeg';
-import Model from '../../../Modal';
-import sdk from '../../../index';
 import { decryptFile, readBlobAsDataUri } from '../../../utils/DecryptFile';
 import q from 'q';
 import UserSettingsStore from '../../../UserSettingsStore';
--- a/src/components/views/messages/SenderProfile.js
+++ b/src/components/views/messages/SenderProfile.js
@ -30,7 +30,7 @@ export default function SenderProfile(props) {
    }

    return (
-        <EmojiText className="mx_SenderProfile"
+        <EmojiText className="mx_SenderProfile" dir="auto"
              onClick={props.onClick}>{`${name || ''} ${props.aux || ''}`}</EmojiText>
    );
 }
--- a/src/components/views/messages/TextualBody.js
+++ b/src/components/views/messages/TextualBody.js
@ -63,6 +63,19 @@ module.exports = React.createClass({
        };
    },

+    copyToClipboard: function(text) {
+        const textArea = document.createElement("textarea");
+        textArea.value = text;
+        document.body.appendChild(textArea);
+        textArea.select();
+        try {
+            const successful = document.execCommand('copy');
+        } catch (err) {
+            console.log('Unable to copy');
+        }
+        document.body.removeChild(textArea);
+    },
+
    componentDidMount: function() {
        this._unmounted = false;

@ -81,6 +94,14 @@ module.exports = React.createClass({
                    }
                }, 10);
            }
+            // add event handlers to the 'copy code' buttons
+            const buttons = ReactDOM.findDOMNode(this).getElementsByClassName("mx_EventTile_copyButton");
+            for (let i = 0; i < buttons.length; i++) {
+                buttons[i].onclick = (e) => {
+                    const copyCode = buttons[i].parentNode.getElementsByTagName("code")[0];
+                    this.copyToClipboard(copyCode.textContent);
+                };
+            }
        }
    },

--- a/src/components/views/room_settings/ColorSettings.js
+++ b/src/components/views/room_settings/ColorSettings.js
@ -21,6 +21,8 @@ var Tinter = require('../../../Tinter');
 var MatrixClientPeg = require("../../../MatrixClientPeg");
 var Modal = require("../../../Modal");

+import dis from '../../../dispatcher';
+
 var ROOM_COLORS = [
    // magic room default values courtesy of Ribot
    ["#76cfa6", "#eaf5f0"],
@ -86,11 +88,7 @@ module.exports = React.createClass({
                }
            ).catch(function(err) {
                if (err.errcode == 'M_GUEST_ACCESS_FORBIDDEN') {
-                    var NeedToRegisterDialog = sdk.getComponent("dialogs.NeedToRegisterDialog");
-                    Modal.createDialog(NeedToRegisterDialog, {
-                        title: "Please Register",
-                        description: "Saving room color settings is only available to registered users"
-                    });
+                    dis.dispatch({action: 'view_set_mxid'});
                }
            });
        }
--- a/src/components/views/rooms/Autocomplete.js
+++ b/src/components/views/rooms/Autocomplete.js
@ -4,7 +4,7 @@ import classNames from 'classnames';
 import flatMap from 'lodash/flatMap';
 import isEqual from 'lodash/isEqual';
 import sdk from '../../../index';
-import type {Completion, SelectionRange} from '../../../autocomplete/Autocompleter';
+import type {Completion} from '../../../autocomplete/Autocompleter';
 import Q from 'q';

 import {getCompletions} from '../../../autocomplete/Autocompleter';
--- a/src/components/views/rooms/AuxPanel.js
+++ b/src/components/views/rooms/AuxPanel.js
@ -20,7 +20,7 @@ import sdk from '../../../index';
 import dis from "../../../dispatcher";
 import ObjectUtils from '../../../ObjectUtils';
 import AppsDrawer from './AppsDrawer';
-import  { _t } from '../../../languageHandler';
+import  { _t, _tJsx} from '../../../languageHandler';

 module.exports = React.createClass({
    displayName: 'AuxPanel',
@ -78,7 +78,7 @@ module.exports = React.createClass({
            fileDropTarget = (
                <div className="mx_RoomView_fileDropTarget">
                    <div className="mx_RoomView_fileDropTargetLabel"
-                      title="Drop File Here">
+                      title={_t("Drop File Here")}>
                        <TintableSvg src="img/upload-big.svg" width="45" height="59"/>
                        <br/>
                        {_t("Drop file here to upload")}
@ -89,20 +89,29 @@ module.exports = React.createClass({

        let conferenceCallNotification = null;
        if (this.props.displayConfCallNotification) {
-            let supportedText;
-            let joinText;
+            let supportedText = '';
+            let joinNode;
            if (!MatrixClientPeg.get().supportsVoip()) {
                supportedText = _t(" (unsupported)");
            } else {
-                joinText = (<span>
-                    Join as <a onClick={(event)=>{ this.onConferenceNotificationClick(event, 'voice');}}
-                               href="#">voice</a> or <a onClick={(event)=>{ this.onConferenceNotificationClick(event, 'video'); }}
-                               href="#">video</a>.
+                joinNode = (<span>
+                    {_tJsx(
+                        "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.",
+                        [/<voiceText>(.*?)<\/voiceText>/, /<videoText>(.*?)<\/videoText>/],
+                        [
+                            (sub) => <a onClick={(event)=>{ this.onConferenceNotificationClick(event, 'voice');}} href="#">{sub}</a>,
+                            (sub) => <a onClick={(event)=>{ this.onConferenceNotificationClick(event, 'video');}} href="#">{sub}</a>,
+                        ]
+                    )}
                </span>);
            }
+            // XXX: the translation here isn't great: appending ' (unsupported)' is likely to not make sense in many languages,
+            // but there are translations for this in the languages we do have so I'm leaving it for now.
            conferenceCallNotification = (
                <div className="mx_RoomView_ongoingConfCallNotification">
-                    {_t("Ongoing conference call%(supportedText)s. %(joinText)s", {supportedText: supportedText, joinText: joinText})}
+                    {_t("Ongoing conference call%(supportedText)s.", {supportedText: supportedText})}
+                    &nbsp;
+                    {joinNode}
                </div>
            );
        }
--- a/src/components/views/rooms/EntityTile.js
+++ b/src/components/views/rooms/EntityTile.js
@ -21,6 +21,7 @@ var React = require('react');
 var MatrixClientPeg = require('../../../MatrixClientPeg');
 var sdk = require('../../../index');
 import AccessibleButton from '../elements/AccessibleButton';
+import { _t } from '../../../languageHandler';


 var PRESENCE_CLASS = {
@ -115,7 +116,7 @@ module.exports = React.createClass({
            nameEl = (
                <div className="mx_EntityTile_details">
                    <img className="mx_EntityTile_chevron" src="img/member_chevron.png" width="8" height="12"/>
-                    <EmojiText element="div" className="mx_EntityTile_name_hover">{name}</EmojiText>
+                    <EmojiText element="div" className="mx_EntityTile_name_hover" dir="auto">{name}</EmojiText>
                    <PresenceLabel activeAgo={ activeAgo }
                        currentlyActive={this.props.presenceCurrentlyActive}
                        presenceState={this.props.presenceState} />
@ -124,7 +125,7 @@ module.exports = React.createClass({
        }
        else {
            nameEl = (
-                <EmojiText element="div" className="mx_EntityTile_name">{name}</EmojiText>
+                <EmojiText element="div" className="mx_EntityTile_name" dir="auto">{name}</EmojiText>
            );
        }

@ -140,10 +141,10 @@ module.exports = React.createClass({
        var power;
        var powerLevel = this.props.powerLevel;
        if (powerLevel >= 50 && powerLevel < 99) {
-            power = <img src="img/mod.svg" className="mx_EntityTile_power" width="16" height="17" alt="Mod"/>;
+            power = <img src="img/mod.svg" className="mx_EntityTile_power" width="16" height="17" alt={_t("Moderator")}/>;
        }
        if (powerLevel >= 99) {
-            power = <img src="img/admin.svg" className="mx_EntityTile_power" width="16" height="17" alt="Admin"/>;
+            power = <img src="img/admin.svg" className="mx_EntityTile_power" width="16" height="17" alt={_t("Admin")}/>;
        }


--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@ -381,6 +381,7 @@ module.exports = WithMatrixClient(React.createClass({
        dis.dispatch({
            action: 'view_room',
            event_id: this.props.mxEvent.getId(),
+            highlighted: true,
            room_id: this.props.mxEvent.getRoomId(),
        });
    },
@ -487,22 +488,22 @@ module.exports = WithMatrixClient(React.createClass({
        let e2e;
        // cosmetic padlocks:
        if ((e2eEnabled && this.props.eventSendStatus) || this.props.mxEvent.getType() === 'm.room.encryption') {
-            e2e = <img style={{ cursor: 'initial', marginLeft: '-1px' }} className="mx_EventTile_e2eIcon" alt="Encrypted by verified device" src="img/e2e-verified.svg" width="10" height="12" />;
+            e2e = <img style={{ cursor: 'initial', marginLeft: '-1px' }} className="mx_EventTile_e2eIcon" alt={_t("Encrypted by a verified device")} src="img/e2e-verified.svg" width="10" height="12" />;
        }
        // real padlocks
        else if (this.props.mxEvent.isEncrypted() || (e2eEnabled && this.props.eventSendStatus)) {
            if (this.props.mxEvent.getContent().msgtype === 'm.bad.encrypted') {
-                e2e = <img onClick={ this.onCryptoClicked } className="mx_EventTile_e2eIcon" alt="Undecryptable" src="img/e2e-blocked.svg" width="12" height="12" style={{ marginLeft: "-1px" }} />;
+                e2e = <img onClick={ this.onCryptoClicked } className="mx_EventTile_e2eIcon" alt={_t("Undecryptable")} src="img/e2e-blocked.svg" width="12" height="12" style={{ marginLeft: "-1px" }} />;
            }
            else if (this.state.verified == true || (e2eEnabled && this.props.eventSendStatus)) {
-                e2e = <img onClick={ this.onCryptoClicked } className="mx_EventTile_e2eIcon" alt="Encrypted by verified device" src="img/e2e-verified.svg" width="10" height="12"/>;
+                e2e = <img onClick={ this.onCryptoClicked } className="mx_EventTile_e2eIcon" alt={_t("Encrypted by a verified device")} src="img/e2e-verified.svg" width="10" height="12"/>;
            }
            else {
-                e2e = <img onClick={ this.onCryptoClicked } className="mx_EventTile_e2eIcon" alt="Encrypted by unverified device" src="img/e2e-warning.svg" width="15" height="12" style={{ marginLeft: "-2px" }}/>;
+                e2e = <img onClick={ this.onCryptoClicked } className="mx_EventTile_e2eIcon" alt={_t("Encrypted by an unverified device")} src="img/e2e-warning.svg" width="15" height="12" style={{ marginLeft: "-2px" }}/>;
            }
        }
        else if (e2eEnabled) {
-            e2e = <img onClick={ this.onCryptoClicked } className="mx_EventTile_e2eIcon" alt="Unencrypted message" src="img/e2e-unencrypted.svg" width="12" height="12"/>;
+            e2e = <img onClick={ this.onCryptoClicked } className="mx_EventTile_e2eIcon" alt={_t("Unencrypted message")} src="img/e2e-unencrypted.svg" width="12" height="12"/>;
        }
        const timestamp = this.props.mxEvent.getTs() ?
            <MessageTimestamp showTwelveHour={this.props.isTwelveHour} ts={this.props.mxEvent.getTs()} /> : null;
--- a/src/components/views/rooms/MemberDeviceInfo.js
+++ b/src/components/views/rooms/MemberDeviceInfo.js
@ -26,19 +26,19 @@ export default class MemberDeviceInfo extends React.Component {
        if (this.props.device.isBlocked()) {
            indicator = (
                    <div className="mx_MemberDeviceInfo_blacklisted">
-                    <img src="img/e2e-blocked.svg" width="12" height="12" style={{ marginLeft: "-1px" }} alt="Blacklisted"/>
+                    <img src="img/e2e-blocked.svg" width="12" height="12" style={{ marginLeft: "-1px" }} alt={_t("Blacklisted")}/>
                    </div>
            );
        } else if (this.props.device.isVerified()) {
            indicator = (
                    <div className="mx_MemberDeviceInfo_verified">
-                    <img src="img/e2e-verified.svg" width="10" height="12" alt="Verified"/>
+                    <img src="img/e2e-verified.svg" width="10" height="12" alt={_t("Verified")}/>
                    </div>
            );
        } else {
            indicator = (
                    <div className="mx_MemberDeviceInfo_unverified">
-                    <img src="img/e2e-warning.svg" width="15" height="12" style={{ marginLeft: "-2px" }} alt="Unverified"/>
+                    <img src="img/e2e-warning.svg" width="15" height="12" style={{ marginLeft: "-2px" }} alt={_t("Unverified")}/>
                    </div>
            );
        }
--- a/src/components/views/rooms/MemberInfo.js
+++ b/src/components/views/rooms/MemberInfo.js
@ -38,6 +38,8 @@ import Unread from '../../../Unread';
 import { findReadReceiptFromUserId } from '../../../utils/Receipt';
 import WithMatrixClient from '../../../wrappers/WithMatrixClient';
 import AccessibleButton from '../elements/AccessibleButton';
+import GeminiScrollbar from 'react-gemini-scrollbar';
+

 module.exports = WithMatrixClient(React.createClass({
    displayName: 'MemberInfo',
@ -375,11 +377,7 @@ module.exports = WithMatrixClient(React.createClass({
                console.log("Mod toggle success");
            }, function(err) {
                if (err.errcode == 'M_GUEST_ACCESS_FORBIDDEN') {
-                    var NeedToRegisterDialog = sdk.getComponent("dialogs.NeedToRegisterDialog");
-                    Modal.createDialog(NeedToRegisterDialog, {
-                        title: _t("Please Register"),
-                        description: _t("This action cannot be performed by a guest user. Please register to be able to do this") + ".",
-                    });
+                    dis.dispatch({action: 'view_set_mxid'});
                } else {
                    console.error("Toggle moderator error:" + err);
                    Modal.createDialog(ErrorDialog, {
@ -436,7 +434,7 @@ module.exports = WithMatrixClient(React.createClass({
                    title: _t("Warning!"),
                    description:
                        <div>
-                            { _t("You will not be able to undo this change as you are promoting the user to have the same power level as yourself") }.<br/>
+                            { _t("You will not be able to undo this change as you are promoting the user to have the same power level as yourself.") }<br/>
                            { _t("Are you sure?") }
                        </div>,
                    button: _t("Continue"),
@ -705,7 +703,7 @@ module.exports = WithMatrixClient(React.createClass({
        if (kickButton || banButton || muteButton || giveModButton) {
            adminTools =
                <div>
-                    <h3>Admin tools</h3>
+                    <h3>{_t("Admin tools")}</h3>

                    <div className="mx_MemberInfo_buttons">
                        {muteButton}
@ -731,34 +729,36 @@ module.exports = WithMatrixClient(React.createClass({
        const EmojiText = sdk.getComponent('elements.EmojiText');
        return (
            <div className="mx_MemberInfo">
-                <AccessibleButton className="mx_MemberInfo_cancel" onClick={this.onCancel}> <img src="img/cancel.svg" width="18" height="18"/></AccessibleButton>
-                <div className="mx_MemberInfo_avatar">
-                    <MemberAvatar onClick={this.onMemberAvatarClick} member={this.props.member} width={48} height={48} />
-                </div>
-
-                <EmojiText element="h2">{memberName}</EmojiText>
-
-                <div className="mx_MemberInfo_profile">
-                    <div className="mx_MemberInfo_profileField">
-                        { this.props.member.userId }
+                <GeminiScrollbar autoshow={true}>
+                    <AccessibleButton className="mx_MemberInfo_cancel" onClick={this.onCancel}> <img src="img/cancel.svg" width="18" height="18"/></AccessibleButton>
+                    <div className="mx_MemberInfo_avatar">
+                        <MemberAvatar onClick={this.onMemberAvatarClick} member={this.props.member} width={48} height={48} />
                    </div>
-                    <div className="mx_MemberInfo_profileField">
-                        { _t("Level") }: <b><PowerSelector controlled={true} value={ parseInt(this.props.member.powerLevel) } disabled={ !this.state.can.modifyLevel } onChange={ this.onPowerChange }/></b>
+
+                    <EmojiText element="h2">{memberName}</EmojiText>
+
+                    <div className="mx_MemberInfo_profile">
+                        <div className="mx_MemberInfo_profileField">
+                            { this.props.member.userId }
+                        </div>
+                        <div className="mx_MemberInfo_profileField">
+                            { _t("Level:") } <b><PowerSelector controlled={true} value={ parseInt(this.props.member.powerLevel) } disabled={ !this.state.can.modifyLevel } onChange={ this.onPowerChange }/></b>
+                        </div>
+                        <div className="mx_MemberInfo_profileField">
+                            <PresenceLabel activeAgo={ presenceLastActiveAgo }
+                                currentlyActive={ presenceCurrentlyActive }
+                                presenceState={ presenceState } />
+                        </div>
                    </div>
-                    <div className="mx_MemberInfo_profileField">
-                        <PresenceLabel activeAgo={ presenceLastActiveAgo }
-                            currentlyActive={ presenceCurrentlyActive }
-                            presenceState={ presenceState } />
-                    </div>
-                </div>

-                { adminTools }
+                    { adminTools }

-                { startChat }
+                    { startChat }

-                { this._renderDevices() }
+                    { this._renderDevices() }

-                { spinner }
+                    { spinner }
+                </GeminiScrollbar>
            </div>
        );
    }
--- a/src/components/views/rooms/MemberTile.js
+++ b/src/components/views/rooms/MemberTile.js
@ -22,6 +22,7 @@ var MatrixClientPeg = require('../../../MatrixClientPeg');
 var sdk = require('../../../index');
 var dis = require('../../../dispatcher');
 var Modal = require("../../../Modal");
+import { _t } from '../../../languageHandler';

 module.exports = React.createClass({
    displayName: 'MemberTile',
@ -63,7 +64,7 @@ module.exports = React.createClass({
    },

    getPowerLabel: function() {
-        return this.props.member.userId + " (power " + this.props.member.powerLevel + ")";
+        return _t("%(userName)s (power %(powerLevelNumber)s)", {userName: this.props.member.userId, powerLevelNumber: this.props.member.powerLevel});
    },

    render: function() {
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@ -91,11 +91,7 @@ export default class MessageComposer extends React.Component {

    onUploadClick(ev) {
        if (MatrixClientPeg.get().isGuest()) {
-            const NeedToRegisterDialog = sdk.getComponent("dialogs.NeedToRegisterDialog");
-            Modal.createDialog(NeedToRegisterDialog, {
-                title: _t('Please Register'),
-                description: _t('Guest users can\'t upload files. Please register to upload') + '.',
-            });
+            dis.dispatch({action: 'view_set_mxid'});
            return;
        }

@ -113,7 +109,7 @@ export default class MessageComposer extends React.Component {
        let fileList = [];
        for (let i=0; i<files.length; i++) {
            fileList.push(<li key={i}>
-                <TintableSvg key={i} src="img/files.svg" width="16" height="16" /> {files[i].name || 'Attachment'}
+                <TintableSvg key={i} src="img/files.svg" width="16" height="16" /> {files[i].name || _t('Attachment')}
            </li>);
        }

@ -318,7 +314,7 @@ export default class MessageComposer extends React.Component {

            const formattingButton = (
                <img className="mx_MessageComposer_formatting"
-                     title="Show Text Formatting Toolbar"
+                     title={_t("Show Text Formatting Toolbar")}
                     src="img/button-text-formatting.svg"
                     onClick={this.onToggleFormattingClicked}
                     style={{visibility: this.state.showFormatting ||
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@ -28,12 +28,12 @@ import Q from 'q';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import type {MatrixClient} from 'matrix-js-sdk/lib/matrix';
 import SlashCommands from '../../../SlashCommands';
+import KeyCode from '../../../KeyCode';
 import Modal from '../../../Modal';
 import sdk from '../../../index';
 import { _t } from '../../../languageHandler';

 import dis from '../../../dispatcher';
-import KeyCode from '../../../KeyCode';
 import UserSettingsStore from '../../../UserSettingsStore';

 import * as RichText from '../../../RichText';
@ -45,8 +45,6 @@ import {onSendMessageFailed} from './MessageComposerInputOld';

 const TYPING_USER_TIMEOUT = 10000, TYPING_SERVER_TIMEOUT = 30000;

-const KEY_M = 77;
-
 const ZWS_CODE = 8203;
 const ZWS = String.fromCharCode(ZWS_CODE); // zero width space
 function stateToMarkdown(state) {
@ -62,7 +60,7 @@ function stateToMarkdown(state) {
 export default class MessageComposerInput extends React.Component {
    static getKeyBinding(e: SyntheticKeyboardEvent): string {
        // C-m => Toggles between rich text and markdown modes
-        if (e.keyCode === KEY_M && KeyBindingUtil.isCtrlKeyCommand(e)) {
+        if (e.keyCode === KeyCode.KEY_M && KeyBindingUtil.isCtrlKeyCommand(e)) {
            return 'toggle-mode';
        }

@ -723,6 +721,7 @@ export default class MessageComposerInput extends React.Component {
                         title={ this.state.isRichtextEnabled ? _t("Markdown is disabled") : _t("Markdown is enabled")}
                         src={`img/button-md-${!this.state.isRichtextEnabled}.png`} />
                    <Editor ref="editor"
+                            dir="auto"
                            placeholder={this.props.placeholder}
                            editorState={this.state.editorState}
                            onChange={this.onEditorContentChanged}
--- a/src/components/views/rooms/MessageComposerInputOld.js
+++ b/src/components/views/rooms/MessageComposerInputOld.js
@ -29,7 +29,6 @@ var Markdown = require("../../../Markdown");

 var TYPING_USER_TIMEOUT = 10000;
 var TYPING_SERVER_TIMEOUT = 30000;
-var MARKDOWN_ENABLED = true;

 export function onSendMessageFailed(err, room) {
    // XXX: temporary logging to try to diagnose
@ -77,7 +76,8 @@ export default React.createClass({

    componentWillMount: function() {
        this.oldScrollHeight = 0;
-        this.markdownEnabled = MARKDOWN_ENABLED;
+        this.markdownEnabled = !UserSettingsStore.getSyncedSetting('disableMarkdown', false);
+
        var self = this;
        this.sentHistory = {
            // The list of typed messages. Index 0 is more recent
@ -461,7 +461,7 @@ export default React.createClass({
    render: function() {
        return (
            <div className="mx_MessageComposer_input" onClick={ this.onInputClick }>
-                <textarea autoFocus ref="textarea" rows="1" onKeyDown={this.onKeyDown} onKeyUp={this.onKeyUp} placeholder={this.props.placeholder}
+                <textarea dir="auto" autoFocus ref="textarea" rows="1" onKeyDown={this.onKeyDown} onKeyUp={this.onKeyUp} placeholder={this.props.placeholder}
                    onPaste={this._onPaste}
                />
            </div>
--- a/src/components/views/rooms/PresenceLabel.js
+++ b/src/components/views/rooms/PresenceLabel.js
@ -18,8 +18,6 @@ limitations under the License.

 import React from 'react';

-import MatrixClientPeg from '../../../MatrixClientPeg';
-import sdk from '../../../index';
 import { _t } from '../../../languageHandler';


--- a/src/components/views/rooms/ReadReceiptMarker.js
+++ b/src/components/views/rooms/ReadReceiptMarker.js
@ -23,6 +23,7 @@ var sdk = require('../../../index');

 var Velociraptor = require('../../../Velociraptor');
 require('../../../VelocityBounce');
+import { _t } from '../../../languageHandler';

 import DateUtils from '../../../DateUtils';

@ -169,8 +170,10 @@ module.exports = React.createClass({

        let title;
        if (this.props.timestamp) {
-            title = "Seen by " + this.props.member.userId + " at " + 
-                    DateUtils.formatDate(new Date(this.props.timestamp));
+            title = _t(
+                "Seen by %(userName)s at %(dateTime)s",
+                {userName: this.props.member.userId, dateTime: DateUtils.formatDate(new Date(this.props.timestamp))}
+            );
        }

        return (
--- a/src/components/views/rooms/RoomHeader.js
+++ b/src/components/views/rooms/RoomHeader.js
@ -213,7 +213,7 @@ module.exports = React.createClass({
            // don't display the search count until the search completes and
            // gives us a valid (possibly zero) searchCount.
            if (this.props.searchInfo && this.props.searchInfo.searchCount !== undefined && this.props.searchInfo.searchCount !== null) {
-                searchStatus = <div className="mx_RoomHeader_searchStatus">&nbsp;{ _t("(~%(searchCount)s results)", { searchCount: this.props.searchInfo.searchCount }) }</div>;
+                searchStatus = <div className="mx_RoomHeader_searchStatus">&nbsp;{ _t("(~%(count)s results)", { count: this.props.searchInfo.searchCount }) }</div>;
            }

            // XXX: this is a bit inefficient - we could just compare room.name for 'Empty room'...
@ -238,7 +238,7 @@ module.exports = React.createClass({
            const emojiTextClasses = classNames('mx_RoomHeader_nametext', { mx_RoomHeader_settingsHint: settingsHint });
            name =
                <div className="mx_RoomHeader_name" onClick={this.props.onSettingsClick}>
-                    <EmojiText element="div" className={emojiTextClasses} title={roomName}>{ roomName }</EmojiText>
+                    <EmojiText dir="auto" element="div" className={emojiTextClasses} title={roomName}>{ roomName }</EmojiText>
                    { searchStatus }
                </div>;
        }
@ -255,7 +255,7 @@ module.exports = React.createClass({
                }
            }
            if (topic) {
-                topic_el = <div className="mx_RoomHeader_topic" ref="topic" title={ topic }>{ topic }</div>;
+                topic_el = <div className="mx_RoomHeader_topic" ref="topic" title={ topic } dir="auto">{ topic }</div>;
            }
        }

@ -288,7 +288,7 @@ module.exports = React.createClass({
        var settings_button;
        if (this.props.onSettingsClick) {
            settings_button =
-                <AccessibleButton className="mx_RoomHeader_button" onClick={this.props.onSettingsClick} title="Settings">
+                <AccessibleButton className="mx_RoomHeader_button" onClick={this.props.onSettingsClick} title={_t("Settings")}>
                    <TintableSvg src="img/icons-settings-room.svg" width="16" height="16"/>
                </AccessibleButton>;
        }
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2017 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.
@ -30,7 +31,14 @@ var Rooms = require('../../../Rooms');
 import DMRoomMap from '../../../utils/DMRoomMap';
 var Receipt = require('../../../utils/Receipt');

-var HIDE_CONFERENCE_CHANS = true;
+const HIDE_CONFERENCE_CHANS = true;
+
+const VERBS = {
+    'm.favourite': 'favourite',
+    'im.vector.fake.direct': 'tag direct chat',
+    'im.vector.fake.recent': 'restore',
+    'm.lowpriority': 'demote',
+};

 module.exports = React.createClass({
    displayName: 'RoomList',
@ -45,6 +53,7 @@ module.exports = React.createClass({
    getInitialState: function() {
        return {
            isLoadingLeftRooms: false,
+            totalRoomCount: null,
            lists: {},
            incomingCall: null,
        };
@ -64,8 +73,14 @@ module.exports = React.createClass({
        cli.on("RoomMember.name", this.onRoomMemberName);
        cli.on("accountData", this.onAccountData);

-        var s = this.getRoomLists();
-        this.setState(s);
+        this.refreshRoomList();
+
+        // order of the sublists
+        //this.listOrder = [];
+
+        // loop count to stop a stack overflow if the user keeps waggling the
+        // mouse for >30s in a row, or if running under mocha
+        this._delayedRefreshRoomListLoopCount = 0
    },

    componentDidMount: function() {
@ -203,31 +218,33 @@ module.exports = React.createClass({
    }, 500),

    refreshRoomList: function() {
-        // console.log("DEBUG: Refresh room list delta=%s ms",
-        //     (!this._lastRefreshRoomListTs ? "-" : (Date.now() - this._lastRefreshRoomListTs))
-        // );
-
-        // TODO: rather than bluntly regenerating and re-sorting everything
-        // every time we see any kind of room change from the JS SDK
-        // we could do incremental updates on our copy of the state
-        // based on the room which has actually changed.  This would stop
-        // us re-rendering all the sublists every time anything changes anywhere
-        // in the state of the client.
-        this.setState(this.getRoomLists());
+        // TODO: ideally we'd calculate this once at start, and then maintain
+        // any changes to it incrementally, updating the appropriate sublists
+        // as needed.
+        // Alternatively we'd do something magical with Immutable.js or similar.
+        const lists = this.getRoomLists();
+        let totalRooms = 0;
+        for (const l of Object.values(lists)) {
+            totalRooms += l.length;
+        }
+        this.setState({
+            lists: this.getRoomLists(),
+            totalRoomCount: totalRooms,
+        });

        // this._lastRefreshRoomListTs = Date.now();
    },

    getRoomLists: function() {
        var self = this;
-        var s = { lists: {} };
+        const lists = {};

-        s.lists["im.vector.fake.invite"] = [];
-        s.lists["m.favourite"] = [];
-        s.lists["im.vector.fake.recent"] = [];
-        s.lists["im.vector.fake.direct"] = [];
-        s.lists["m.lowpriority"] = [];
-        s.lists["im.vector.fake.archived"] = [];
+        lists["im.vector.fake.invite"] = [];
+        lists["m.favourite"] = [];
+        lists["im.vector.fake.recent"] = [];
+        lists["im.vector.fake.direct"] = [];
+        lists["m.lowpriority"] = [];
+        lists["im.vector.fake.archived"] = [];

        const dmRoomMap = new DMRoomMap(MatrixClientPeg.get());

@ -241,7 +258,7 @@ module.exports = React.createClass({
            //             ", prevMembership = " + me.events.member.getPrevContent().membership);

            if (me.membership == "invite") {
-                s.lists["im.vector.fake.invite"].push(room);
+                lists["im.vector.fake.invite"].push(room);
            }
            else if (HIDE_CONFERENCE_CHANS && Rooms.isConfCallRoom(room, me, self.props.ConferenceHandler)) {
                // skip past this room & don't put it in any lists
@ -255,66 +272,44 @@ module.exports = React.createClass({
                if (tagNames.length) {
                    for (var i = 0; i < tagNames.length; i++) {
                        var tagName = tagNames[i];
-                        s.lists[tagName] = s.lists[tagName] || [];
-                        s.lists[tagNames[i]].push(room);
+                        lists[tagName] = lists[tagName] || [];
+                        lists[tagName].push(room);
                    }
                }
                else if (dmRoomMap.getUserIdForRoomId(room.roomId)) {
                    // "Direct Message" rooms (that we're still in and that aren't otherwise tagged)
-                    s.lists["im.vector.fake.direct"].push(room);
+                    lists["im.vector.fake.direct"].push(room);
                }
                else {
-                    s.lists["im.vector.fake.recent"].push(room);
+                    lists["im.vector.fake.recent"].push(room);
                }
            }
            else if (me.membership === "leave") {
-                s.lists["im.vector.fake.archived"].push(room);
+                lists["im.vector.fake.archived"].push(room);
            }
            else {
                console.error("unrecognised membership: " + me.membership + " - this should never happen");
            }
        });

-        if (s.lists["im.vector.fake.direct"].length == 0 &&
-            MatrixClientPeg.get().getAccountData('m.direct') === undefined &&
-            !MatrixClientPeg.get().isGuest())
-        {
-            // scan through the 'recents' list for any rooms which look like DM rooms
-            // and make them DM rooms
-            const oldRecents = s.lists["im.vector.fake.recent"];
-            s.lists["im.vector.fake.recent"] = [];
-
-            for (const room of oldRecents) {
-                const me = room.getMember(MatrixClientPeg.get().credentials.userId);
-
-                if (me && Rooms.looksLikeDirectMessageRoom(room, me)) {
-                    s.lists["im.vector.fake.direct"].push(room);
-                } else {
-                    s.lists["im.vector.fake.recent"].push(room);
-                }
-            }
-
-            // save these new guessed DM rooms into the account data
-            const newMDirectEvent = {};
-            for (const room of s.lists["im.vector.fake.direct"]) {
-                const me = room.getMember(MatrixClientPeg.get().credentials.userId);
-                const otherPerson = Rooms.getOnlyOtherMember(room, me);
-                if (!otherPerson) continue;
-
-                const roomList = newMDirectEvent[otherPerson.userId] || [];
-                roomList.push(room.roomId);
-                newMDirectEvent[otherPerson.userId] = roomList;
-            }
-
-            // if this fails, fine, we'll just do the same thing next time we get the room lists
-            MatrixClientPeg.get().setAccountData('m.direct', newMDirectEvent).done();
-        }
-
-        //console.log("calculated new roomLists; im.vector.fake.recent = " + s.lists["im.vector.fake.recent"]);
-
        // we actually apply the sorting to this when receiving the prop in RoomSubLists.

-        return s;
+        // we'll need this when we get to iterating through lists programatically - e.g. ctrl-shift-up/down
+/*
+        this.listOrder = [
+            "im.vector.fake.invite",
+            "m.favourite",
+            "im.vector.fake.recent",
+            "im.vector.fake.direct",
+            Object.keys(otherTagNames).filter(tagName=>{
+                return (!tagName.match(/^m\.(favourite|lowpriority)$/));
+            }).sort(),
+            "m.lowpriority",
+            "im.vector.fake.archived"
+        ];
+*/
+
+        return lists;
    },

    _getScrollNode: function() {
@ -468,6 +463,62 @@ module.exports = React.createClass({
        this.refs.gemscroll.forceUpdate();
    },

+    _getEmptyContent: function(section) {
+        const RoomDropTarget = sdk.getComponent('rooms.RoomDropTarget');
+
+        if (this.props.collapsed) {
+            return <RoomDropTarget label="" />;
+        }
+
+        const StartChatButton = sdk.getComponent('elements.StartChatButton');
+        const RoomDirectoryButton = sdk.getComponent('elements.RoomDirectoryButton');
+        const CreateRoomButton = sdk.getComponent('elements.CreateRoomButton');
+
+        const TintableSvg = sdk.getComponent('elements.TintableSvg');
+        switch (section) {
+            case 'im.vector.fake.direct':
+                return <div className="mx_RoomList_emptySubListTip">
+                    Press
+                    <StartChatButton size="16" callout={true}/>
+                    to start a chat with someone
+                </div>;
+            case 'im.vector.fake.recent':
+                return <div className="mx_RoomList_emptySubListTip">
+                    You're not in any rooms yet! Press
+                    <CreateRoomButton size="16" callout={true}/>
+                    to make a room or
+                    <RoomDirectoryButton size="16" callout={true}/>
+                    to browse the directory
+                </div>;
+        }
+
+        // We don't want to display drop targets if there are no room tiles to drag'n'drop
+        if (this.state.totalRoomCount === 0) {
+            return null;
+        }
+
+        const labelText = 'Drop here to ' + (VERBS[section] || 'tag ' + section);
+
+        return <RoomDropTarget label={labelText} />;
+    },
+
+    _getHeaderItems: function(section) {
+        const StartChatButton = sdk.getComponent('elements.StartChatButton');
+        const RoomDirectoryButton = sdk.getComponent('elements.RoomDirectoryButton');
+        const CreateRoomButton = sdk.getComponent('elements.CreateRoomButton');
+        switch (section) {
+            case 'im.vector.fake.direct':
+                return <span className="mx_RoomList_headerButtons">
+                    <StartChatButton size="16" />
+                </span>;
+            case 'im.vector.fake.recent':
+                return <span className="mx_RoomList_headerButtons">
+                    <RoomDirectoryButton size="16" />
+                    <CreateRoomButton size="16" />
+                </span>;
+        }
+    },
+
    render: function() {
        var RoomSubList = sdk.getComponent('structures.RoomSubList');
        var self = this;
@ -489,7 +540,7 @@ module.exports = React.createClass({
                <RoomSubList list={ self.state.lists['m.favourite'] }
                             label={ _t('Favourites') }
                             tagName="m.favourite"
-                             verb={ _t('to favourite') }
+                             emptyContent={this._getEmptyContent('m.favourite')}
                             editable={ true }
                             order="manual"
                             selectedRoom={ self.props.selectedRoom }
@ -502,7 +553,8 @@ module.exports = React.createClass({
                <RoomSubList list={ self.state.lists['im.vector.fake.direct'] }
                             label={ _t('People') }
                             tagName="im.vector.fake.direct"
-                             verb={ _t('to tag direct chat') }
+                             emptyContent={this._getEmptyContent('im.vector.fake.direct')}
+                             headerItems={this._getHeaderItems('im.vector.fake.direct')}
                             editable={ true }
                             order="recent"
                             selectedRoom={ self.props.selectedRoom }
@ -516,7 +568,8 @@ module.exports = React.createClass({
                <RoomSubList list={ self.state.lists['im.vector.fake.recent'] }
                             label={ _t('Rooms') }
                             editable={ true }
-                             verb={ _t('to restore') }
+                             emptyContent={this._getEmptyContent('im.vector.fake.recent')}
+                             headerItems={this._getHeaderItems('im.vector.fake.recent')}
                             order="recent"
                             selectedRoom={ self.props.selectedRoom }
                             incomingCall={ self.state.incomingCall }
@ -525,13 +578,13 @@ module.exports = React.createClass({
                             onHeaderClick={ self.onSubListHeaderClick }
                             onShowMoreRooms={ self.onShowMoreRooms } />

-                { Object.keys(self.state.lists).map(function(tagName) {
+                { Object.keys(self.state.lists).map((tagName) => {
                    if (!tagName.match(/^(m\.(favourite|lowpriority)|im\.vector\.fake\.(invite|recent|direct|archived))$/)) {
                        return <RoomSubList list={ self.state.lists[tagName] }
                             key={ tagName }
                             label={ tagName }
                             tagName={ tagName }
-                             verb={ _t('to tag as %(tagName)s', {tagName: tagName}) }
+                             emptyContent={this._getEmptyContent(tagName)}
                             editable={ true }
                             order="manual"
                             selectedRoom={ self.props.selectedRoom }
@ -547,7 +600,7 @@ module.exports = React.createClass({
                <RoomSubList list={ self.state.lists['m.lowpriority'] }
                             label={ _t('Low priority') }
                             tagName="m.lowpriority"
-                             verb={ _t('to demote') }
+                             emptyContent={this._getEmptyContent('m.lowpriority')}
                             editable={ true }
                             order="recent"
                             selectedRoom={ self.props.selectedRoom }
--- a/src/components/views/rooms/RoomNameEditor.js
+++ b/src/components/views/rooms/RoomNameEditor.js
@ -19,6 +19,7 @@ limitations under the License.
 var React = require('react');
 var sdk = require('../../../index');
 var MatrixClientPeg = require('../../../MatrixClientPeg');
+import { _t } from '../../../languageHandler';

 module.exports = React.createClass({
    displayName: 'RoomNameEditor',
@ -35,8 +36,8 @@ module.exports = React.createClass({

        this._initialName = name ? name.getContent().name : '';

-        this._placeholderName = "Unnamed Room";
-        if (defaultName && defaultName !== 'Empty room') {
+        this._placeholderName = _t("Unnamed Room");
+        if (defaultName && defaultName !== 'Empty room') { // default name from JS SDK, needs no translation as we don't ever show it.
            this._placeholderName += " (" + defaultName + ")";
        }
    },
@ -55,9 +56,9 @@ module.exports = React.createClass({
                         placeholderClassName="mx_RoomHeader_placeholder"
                         placeholder={ this._placeholderName }
                         blurToCancel={ false }
-                         initialValue={ this._initialName }/>
+                         initialValue={ this._initialName }
+                         dir="auto" />
                </div>
        );
    },
 });
-
--- a/src/components/views/rooms/RoomPreviewBar.js
+++ b/src/components/views/rooms/RoomPreviewBar.js
@ -21,7 +21,7 @@ var React = require('react');
 var sdk = require('../../../index');
 var MatrixClientPeg = require('../../../MatrixClientPeg');

-import { _t } from '../../../languageHandler';
+import { _t, _tJsx } from '../../../languageHandler';

 module.exports = React.createClass({
    displayName: 'RoomPreviewBar',
@ -84,7 +84,7 @@ module.exports = React.createClass({
    },

    _roomNameElement: function(fallback) {
-        fallback = fallback || 'a room';
+        fallback = fallback || _t('a room');
        const name = this.props.room ? this.props.room.name : (this.props.room_alias || "");
        return name ? name : fallback;
    },
@ -114,8 +114,7 @@ module.exports = React.createClass({
            if (this.props.invitedEmail) {
                if (this.state.threePidFetchError) {
                    emailMatchBlock = <div className="error">
-                        Unable to ascertain that the address this invite was
-                        sent to matches one associated with your account.
+                        {_t("Unable to ascertain that the address this invite was sent to matches one associated with your account.")}
                    </div>;
                } else if (this.state.invitedEmailMxid != MatrixClientPeg.get().credentials.userId) {
                    emailMatchBlock =
@ -124,28 +123,35 @@ module.exports = React.createClass({
                                <img src="img/warning.svg" width="24" height="23" title= "/!\\" alt="/!\\" />
                            </div>
                            <div className="mx_RoomPreviewBar_warningText">
-                                This invitation was sent to <b><span className="email">{this.props.invitedEmail}</span></b>, which is not associated with this account.<br/>
-                                You may wish to login with a different account, or add this email to this account.
+                                {_t("This invitation was sent to an email address which is not associated with this account:")}
+                                <b><span className="email">{this.props.invitedEmail}</span></b>
+                                <br/>
+                                {_t("You may wish to login with a different account, or add this email to this account.")}
                            </div>
                        </div>;
                }
            }
-            // TODO: find a way to respect HTML in counterpart!
            joinBlock = (
                <div>
                    <div className="mx_RoomPreviewBar_invite_text">
                        { _t('You have been invited to join this room by %(inviterName)s', {inviterName: this.props.inviterName}) }
                    </div>
                    <div className="mx_RoomPreviewBar_join_text">
-                        { _t('Would you like to') } <a onClick={ this.props.onJoinClick }>{ _t('accept') }</a> { _t('or') } <a onClick={ this.props.onRejectClick }>{ _t('decline') }</a> { _t('this invitation?') }
+                        { _tJsx(
+                            'Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?',
+                            [/<acceptText>(.*?)<\/acceptText>/, /<declineText>(.*?)<\/declineText>/],
+                            [
+                                (sub) => <a onClick={ this.props.onJoinClick }>{sub}</a>,
+                                (sub) => <a onClick={ this.props.onRejectClick }>{sub}</a>
+                            ]
+                        )}
                    </div>
                    {emailMatchBlock}
                </div>
            );

        } else if (kicked || banned) {
-            const verb = kicked ? 'kicked' : 'banned';
-            const roomName = this._roomNameElement('this room');
+            const roomName = this._roomNameElement(_t('This room'));
            const kickerMember = this.props.room.currentState.getMember(
                myMember.events.member.getSender()
            );
@ -153,29 +159,39 @@ module.exports = React.createClass({
                kickerMember.name : myMember.events.member.getSender();
            let reason;
            if (myMember.events.member.getContent().reason) {
-                reason = <div>Reason: {myMember.events.member.getContent().reason}</div>
+                reason = <div>{_t("Reason: %(reasonText)s", {reasonText: myMember.events.member.getContent().reason})}</div>
            }
            let rejoinBlock;
            if (!banned) {
-                rejoinBlock = <div><a onClick={ this.props.onJoinClick }><b>Rejoin</b></a></div>;
+                rejoinBlock = <div><a onClick={ this.props.onJoinClick }><b>{_t("Rejoin")}</b></a></div>;
            }
+
+            let actionText;
+            if (kicked) {
+                actionText = _t("You have been kicked from %(roomName)s by %(userName)s.", {roomName: roomName, userName: kickerName});
+            }
+            else if (banned) {
+                actionText = _t("You have been banned from %(roomName)s by %(userName)s.", {roomName: roomName, userName: kickerName});
+            } // no other options possible due to the kicked || banned check above.
+
            joinBlock = (
                <div>
                    <div className="mx_RoomPreviewBar_join_text">
-                        You have been {verb} from {roomName} by {kickerName}.<br />
+                        {actionText}
+                        <br />
                        {reason}
                        {rejoinBlock}
-                        <a onClick={ this.props.onForgetClick }><b>Forget</b></a>
+                        <a onClick={ this.props.onForgetClick }><b>{_t("Forget room")}</b></a>
                    </div>
                </div>
            );
        } else if (this.props.error) {
-            var name = this.props.roomAlias || "This room";
+            var name = this.props.roomAlias || _t("This room");
            var error;
            if (this.props.error.errcode == 'M_NOT_FOUND') {
-                error = name + " does not exist";
+                error = _t("%(roomName)s does not exist.", {roomName: name});
            } else {
-                error = name + " is not accessible at this time";
+                error = _t("%(roomName)s is not accessible at this time.", {roomName: name});
            }
            joinBlock = (
                <div>
@ -189,8 +205,12 @@ module.exports = React.createClass({
            joinBlock = (
                <div>
                    <div className="mx_RoomPreviewBar_join_text">
-                        { _t('You are trying to access %(roomName)s', {roomName: name}) }.<br/>
-                        <a onClick={ this.props.onJoinClick }><b>{ _t('Click here') }</b></a> { _t('to join the discussion') }!
+                        { _t('You are trying to access %(roomName)s.', {roomName: name}) }
+                        <br/>
+                        { _tJsx("<a>Click here</a> to join the discussion!",
+                            /<a>(.*?)<\/a>/,
+                            (sub) => <a onClick={ this.props.onJoinClick }><b>{sub}</b></a>
+                        )}
                    </div>
                </div>
            );
--- a/src/components/views/rooms/RoomSettings.js
+++ b/src/components/views/rooms/RoomSettings.js
@ -17,7 +17,7 @@ limitations under the License.

 import q from 'q';
 import React from 'react';
-import { _t } from '../../../languageHandler';
+import { _t, _tJsx } from '../../../languageHandler';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import SdkConfig from '../../../SdkConfig';
 import sdk from '../../../index';
@ -46,7 +46,7 @@ const BannedUser = React.createClass({
        const ConfirmUserActionDialog = sdk.getComponent("dialogs.ConfirmUserActionDialog");
        Modal.createDialog(ConfirmUserActionDialog, {
            member: this.props.member,
-            action: 'Unban',
+            action: _t('Unban'),
            danger: false,
            onFinished: (proceed) => {
                if (!proceed) return;
@ -597,7 +597,7 @@ module.exports = React.createClass({
                      ? <img className="mx_RoomSettings_e2eIcon" src="img/e2e-verified.svg" width="10" height="12" />
                      : <img className="mx_RoomSettings_e2eIcon" src="img/e2e-unencrypted.svg" width="12" height="12" />
                    }
-                    { isEncrypted ? "Encryption is enabled in this room" : "Encryption is not enabled in this room" }.
+                    { isEncrypted ? _t("Encryption is enabled in this room") : _t("Encryption is not enabled in this room") }.
                    </label>
                    { settings }
                </div>
@ -653,7 +653,7 @@ module.exports = React.createClass({
                        {Object.keys(user_levels).map(function(user, i) {
                            return (
                                <li className="mx_RoomSettings_userLevel" key={user}>
-                                    { user } { _t('is a') } <PowerSelector value={ user_levels[user] } disabled={true}/>
+                                    { _t("%(user)s is a", {user: user}) } <PowerSelector value={ user_levels[user] } disabled={true}/>
                                </li>
                            );
                        })}
@ -754,7 +754,11 @@ module.exports = React.createClass({
        if (this.state.join_rule === "public" && aliasCount == 0) {
            addressWarning =
                <div className="mx_RoomSettings_warning">
-                		{ _t('To link to a room it must have') } <a href="#addresses"> { _t('an address') }</a>.
+                        { _tJsx(
+                            'To link to a room it must have <a>an address</a>.',
+                            /<a>(.*?)<\/a>/,
+                            (sub) => <a href="#addresses">{sub}</a>
+                        )}
                </div>;
        }

--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@ -224,13 +224,13 @@ module.exports = React.createClass({
            if (this.props.selected) {
                let nameSelected = <EmojiText>{name}</EmojiText>;

-                label = <div title={ name } className={ nameClasses }>{ nameSelected }</div>;
+                label = <div title={ name } className={ nameClasses } dir="auto">{ nameSelected }</div>;
            } else {
-                label = <EmojiText element="div" title={ name } className={ nameClasses }>{name}</EmojiText>;
+                label = <EmojiText element="div" title={ name } className={ nameClasses } dir="auto">{name}</EmojiText>;
            }
        } else if (this.state.hover) {
            var RoomTooltip = sdk.getComponent("rooms.RoomTooltip");
-            tooltip = <RoomTooltip className="mx_RoomTile_tooltip" room={this.props.room} />;
+            tooltip = <RoomTooltip className="mx_RoomTile_tooltip" room={this.props.room} dir="auto" />;
        }

        //var incomingCallBox;
--- a/src/components/views/rooms/RoomTopicEditor.js
+++ b/src/components/views/rooms/RoomTopicEditor.js
@ -46,7 +46,8 @@ module.exports = React.createClass({
                     placeholderClassName="mx_RoomHeader_placeholder"
                     placeholder={_t("Add a topic")}
                     blurToCancel={ false }
-                     initialValue={ this._initialTopic }/>
+                     initialValue={ this._initialTopic }
+                     dir="auto" />
        );
    },
 });
--- a/src/components/views/rooms/SimpleRoomHeader.js
+++ b/src/components/views/rooms/SimpleRoomHeader.js
@ -20,6 +20,7 @@ import React from 'react';
 import dis from '../../../dispatcher';
 import AccessibleButton from '../elements/AccessibleButton';
 import sdk from '../../../index';
+import { _t } from '../../../languageHandler';

 // cancel button which is shared between room header and simple room header
 export function CancelButton(props) {
@ -28,7 +29,7 @@ export function CancelButton(props) {
    return (
        <AccessibleButton className='mx_RoomHeader_cancelButton' onClick={onClick}>
            <img src="img/cancel.svg" className='mx_filterFlipColor'
-                width="18" height="18" alt="Cancel"/>
+                width="18" height="18" alt={_t("Cancel")}/>
        </AccessibleButton>
    );
 }
--- a/src/components/views/rooms/TopUnreadMessagesBar.js
+++ b/src/components/views/rooms/TopUnreadMessagesBar.js
@ -41,7 +41,7 @@ module.exports = React.createClass({
                </div>
                <img className="mx_TopUnreadMessagesBar_close mx_filterFlipColor"
                    src="img/cancel.svg" width="18" height="18"
-                    alt="Close" title="Close"
+                    alt={_t("Close")} title={_t("Close")}
                    onClick={this.props.onCloseClick} />
            </div>
        );
--- a/src/components/views/settings/AddPhoneNumber.js
+++ b/src/components/views/settings/AddPhoneNumber.js
@ -165,7 +165,7 @@ export default WithMatrixClient(React.createClass({
                    </div>
                </div>
                <div className="mx_UserSettings_threepidButton mx_filterFlipColor">
-                     <input type="image" value="Add" src="img/plus.svg" width="14" height="14" />
+                     <input type="image" value={_t("Add")} src="img/plus.svg" width="14" height="14" />
                </div>
            </form>
        );
--- a/src/components/views/settings/ChangeAvatar.js
+++ b/src/components/views/settings/ChangeAvatar.js
@ -17,6 +17,7 @@ limitations under the License.
 var React = require('react');
 var MatrixClientPeg = require("../../../MatrixClientPeg");
 var sdk = require('../../../index');
+import { _t } from '../../../languageHandler';

 module.exports = React.createClass({
    displayName: 'ChangeAvatar',
@ -105,7 +106,7 @@ module.exports = React.createClass({

    onError: function(error) {
        this.setState({
-            errorText: "Failed to upload profile picture!"
+            errorText: _t("Failed to upload profile picture!")
        });
    },

@ -127,7 +128,7 @@ module.exports = React.createClass({
        if (this.props.showUploadSection) {
            uploadSection = (
                <div className={this.props.className}>
-                    Upload new:
+                    {_t("Upload new:")}
                    <input type="file" accept="image/*" onChange={this.onFileSelected}/>
                    {this.state.errorText}
                </div>
--- a/src/components/views/settings/ChangeDisplayName.js
+++ b/src/components/views/settings/ChangeDisplayName.js
@ -18,6 +18,7 @@ limitations under the License.
 var React = require('react');
 var sdk = require('../../../index');
 var MatrixClientPeg = require("../../../MatrixClientPeg");
+import { _t } from '../../../languageHandler';

 module.exports = React.createClass({
    displayName: 'ChangeDisplayName',
@ -52,7 +53,7 @@ module.exports = React.createClass({
        return (
            <EditableTextContainer
                getInitialValue={this._getDisplayName}
-                placeholder="No display name"
+                placeholder={_t("No display name")}
                blurToSubmit={true}
                onSubmit={this._changeDisplayName} />
        );
--- a/src/components/views/settings/ChangePassword.js
+++ b/src/components/views/settings/ChangePassword.js
@ -23,6 +23,8 @@ var sdk = require("../../../index");
 import AccessibleButton from '../elements/AccessibleButton';
 import { _t } from '../../../languageHandler';

+import sessionStore from '../../../stores/SessionStore';
+
 module.exports = React.createClass({
    displayName: 'ChangePassword',
    propTypes: {
@ -32,7 +34,10 @@ module.exports = React.createClass({
        rowClassName: React.PropTypes.string,
        rowLabelClassName: React.PropTypes.string,
        rowInputClassName: React.PropTypes.string,
-        buttonClassName: React.PropTypes.string
+        buttonClassName: React.PropTypes.string,
+        confirm: React.PropTypes.bool,
+        // Whether to autoFocus the new password input
+        autoFocusNewPasswordInput: React.PropTypes.bool,
    },

    Phases: {
@ -48,27 +53,55 @@ module.exports = React.createClass({
            onCheckPassword: function(oldPass, newPass, confirmPass) {
                if (newPass !== confirmPass) {
                    return {
-                        error: _t("New passwords don't match") + "."
+                        error: _t("New passwords don't match")
                    };
                } else if (!newPass || newPass.length === 0) {
                    return {
                        error: _t("Passwords can't be empty")
                    };
                }
-            }
+            },
+            confirm: true,
        };
    },

    getInitialState: function() {
        return {
-            phase: this.Phases.Edit
+            phase: this.Phases.Edit,
+            cachedPassword: null,
        };
    },

-    changePassword: function(old_password, new_password) {
-        var cli = MatrixClientPeg.get();
+    componentWillMount: function() {
+        this._sessionStore = sessionStore;
+        this._sessionStoreToken = this._sessionStore.addListener(
+            this._setStateFromSessionStore,
+        );

-        var QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
+        this._setStateFromSessionStore();
+    },
+
+    componentWillUnmount: function() {
+        if (this._sessionStoreToken) {
+            this._sessionStoreToken.remove();
+        }
+    },
+
+    _setStateFromSessionStore: function() {
+        this.setState({
+            cachedPassword: this._sessionStore.getCachedPassword(),
+        });
+    },
+
+    changePassword: function(oldPassword, newPassword) {
+        const cli = MatrixClientPeg.get();
+
+        if (!this.props.confirm) {
+            this._changePassword(cli, oldPassword, newPassword);
+            return;
+        }
+
+        const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
        Modal.createDialog(QuestionDialog, {
            title: _t("Warning!"),
            description:
@ -89,31 +122,34 @@ module.exports = React.createClass({
            ],
            onFinished: (confirmed) => {
                if (confirmed) {
-                    var authDict = {
-                        type: 'm.login.password',
-                        user: cli.credentials.userId,
-                        password: old_password
-                    };
-
-                    this.setState({
-                        phase: this.Phases.Uploading
-                    });
-
-                    var self = this;
-                    cli.setPassword(authDict, new_password).then(function() {
-                        self.props.onFinished();
-                    }, function(err) {
-                        self.props.onError(err);
-                    }).finally(function() {
-                        self.setState({
-                            phase: self.Phases.Edit
-                        });
-                    }).done();
+                    this._changePassword(cli, oldPassword, newPassword);
                }
            },
        });
    },

+    _changePassword: function(cli, oldPassword, newPassword) {
+        const authDict = {
+            type: 'm.login.password',
+            user: cli.credentials.userId,
+            password: oldPassword,
+        };
+
+        this.setState({
+            phase: this.Phases.Uploading,
+        });
+
+        cli.setPassword(authDict, newPassword).then(() => {
+            this.props.onFinished();
+        }, (err) => {
+            this.props.onError(err);
+        }).finally(() => {
+            this.setState({
+                phase: this.Phases.Edit,
+            });
+        }).done();
+    },
+
    _onExportE2eKeysClicked: function() {
        Modal.createDialogAsync(
            (cb) => {
@ -124,47 +160,53 @@ module.exports = React.createClass({
                matrixClient: MatrixClientPeg.get(),
            }
        );
-    },    
+    },

    onClickChange: function() {
-        var old_password = this.refs.old_input.value;
-        var new_password = this.refs.new_input.value;
-        var confirm_password = this.refs.confirm_input.value;
-        var err = this.props.onCheckPassword(
-            old_password, new_password, confirm_password
+        const oldPassword = this.state.cachedPassword || this.refs.old_input.value;
+        const newPassword = this.refs.new_input.value;
+        const confirmPassword = this.refs.confirm_input.value;
+        const err = this.props.onCheckPassword(
+            oldPassword, newPassword, confirmPassword,
        );
        if (err) {
            this.props.onError(err);
-        }
-        else {
-            this.changePassword(old_password, new_password);
+        } else {
+            this.changePassword(oldPassword, newPassword);
        }
    },

    render: function() {
-        var rowClassName = this.props.rowClassName;
-        var rowLabelClassName = this.props.rowLabelClassName;
-        var rowInputClassName = this.props.rowInputClassName;
-        var buttonClassName = this.props.buttonClassName;
+        const rowClassName = this.props.rowClassName;
+        const rowLabelClassName = this.props.rowLabelClassName;
+        const rowInputClassName = this.props.rowInputClassName;
+        const buttonClassName = this.props.buttonClassName;
+
+        let currentPassword = null;
+        if (!this.state.cachedPassword) {
+            currentPassword = <div className={rowClassName}>
+                <div className={rowLabelClassName}>
+                    <label htmlFor="passwordold">Current password</label>
+                </div>
+                <div className={rowInputClassName}>
+                    <input id="passwordold" type="password" ref="old_input" />
+                </div>
+            </div>;
+        }

        switch (this.state.phase) {
            case this.Phases.Edit:
+                const passwordLabel = this.state.cachedPassword ?
+                    _t('Password') : _t('New Password');
                return (
                    <div className={this.props.className}>
+                        { currentPassword }
                        <div className={rowClassName}>
                            <div className={rowLabelClassName}>
-                                <label htmlFor="passwordold">{ _t('Current password') }</label>
+                                <label htmlFor="password1">{ passwordLabel }</label>
                            </div>
                            <div className={rowInputClassName}>
-                                <input id="passwordold" type="password" ref="old_input" />
-                            </div>
-                        </div>
-                        <div className={rowClassName}>
-                            <div className={rowLabelClassName}>
-                                <label htmlFor="password1">{ _t('New password') }</label>
-                            </div>
-                            <div className={rowInputClassName}>
-                                <input id="password1" type="password" ref="new_input" />
+                                <input id="password1" type="password" ref="new_input" autoFocus={this.props.autoFocusNewPasswordInput} />
                            </div>
                        </div>
                        <div className={rowClassName}>
@ -176,7 +218,8 @@ module.exports = React.createClass({
                            </div>
                        </div>
                        <AccessibleButton className={buttonClassName}
-                                onClick={this.onClickChange}>
+                                onClick={this.onClickChange}
+                                element="button">
                            { _t('Change Password') }
                        </AccessibleButton>
                    </div>
--- a/src/components/views/settings/DevicesPanel.js
+++ b/src/components/views/settings/DevicesPanel.js
@ -19,6 +19,7 @@ import classNames from 'classnames';

 import sdk from '../../../index';
 import MatrixClientPeg from '../../../MatrixClientPeg';
+import { _t } from '../../../languageHandler';


 export default class DevicesPanel extends React.Component {
@ -54,10 +55,10 @@ export default class DevicesPanel extends React.Component {
                var errtxt;
                if (error.httpStatus == 404) {
                    // 404 probably means the HS doesn't yet support the API.
-                    errtxt = "Your home server does not support device management.";
+                    errtxt = _t("Your home server does not support device management.");
                } else {
                    console.error("Error loading devices:", error);
-                    errtxt = "Unable to load device list.";
+                    errtxt = _t("Unable to load device list");
                }
                this.setState({deviceLoadError: errtxt});
            }
@ -127,9 +128,9 @@ export default class DevicesPanel extends React.Component {
        return (
            <div className={classes}>
                <div className="mx_DevicesPanel_header">
-                    <div className="mx_DevicesPanel_deviceId">ID</div>
-                    <div className="mx_DevicesPanel_deviceName">Name</div>
-                    <div className="mx_DevicesPanel_deviceLastSeen">Last seen</div>
+                    <div className="mx_DevicesPanel_deviceId">{_t("Device ID")}</div>
+                    <div className="mx_DevicesPanel_deviceName">{_t("Device Name")}</div>
+                    <div className="mx_DevicesPanel_deviceLastSeen">{_t("Last seen")}</div>
                    <div className="mx_DevicesPanel_deviceButtons"></div>
                </div>
                {devices.map(this._renderDevice)}
--- a/src/components/views/settings/EnableNotificationsButton.js
+++ b/src/components/views/settings/EnableNotificationsButton.js
@ -18,6 +18,7 @@ limitations under the License.
 var React = require("react");
 var Notifier = require("../../../Notifier");
 var dis = require("../../../dispatcher");
+import { _t } from '../../../languageHandler';

 module.exports = React.createClass({
    displayName: 'EnableNotificationsButton',
@ -60,13 +61,13 @@ module.exports = React.createClass({
        if (this.enabled()) {
            return (
                <button className="mx_EnableNotificationsButton" onClick={this.onClick}>
-                    Disable Notifications
+                    {_t("Disable Notifications")}
                </button>
            );
        } else {
            return (
                <button className="mx_EnableNotificationsButton" onClick={this.onClick}>
-                    Enable Notifications
+                    {_t("Enable Notifications")}
                </button>
            );
        }
--- a/src/components/views/voip/CallView.js
+++ b/src/components/views/voip/CallView.js
@ -18,6 +18,7 @@ var dis = require("../../../dispatcher");
 var CallHandler = require("../../../CallHandler");
 var sdk = require('../../../index');
 var MatrixClientPeg = require("../../../MatrixClientPeg");
+import { _t } from '../../../languageHandler';

 module.exports = React.createClass({
    displayName: 'CallView',
@ -130,7 +131,11 @@ module.exports = React.createClass({
        var voice;
        if (this.state.call && this.state.call.type === "voice" && this.props.showVoice) {
            var callRoom = MatrixClientPeg.get().getRoom(this.state.call.roomId);
-            voice = <div className="mx_CallView_voice" onClick={ this.props.onClick }>Active call ({ callRoom.name })</div>;
+            voice = (
+                <div className="mx_CallView_voice" onClick={ this.props.onClick }>
+                {_t("Active call (%(roomName)s)", {roomName: callRoom.name})}
+                </div>
+            );
        }

        return (
--- a/src/components/views/voip/IncomingCallBox.js
+++ b/src/components/views/voip/IncomingCallBox.js
@ -17,6 +17,7 @@ var React = require('react');
 var MatrixClientPeg = require('../../../MatrixClientPeg');
 var dis = require("../../../dispatcher");
 var CallHandler = require("../../../CallHandler");
+import { _t } from '../../../languageHandler';

 module.exports = React.createClass({
    displayName: 'IncomingCallBox',
@ -45,23 +46,36 @@ module.exports = React.createClass({
            room = MatrixClientPeg.get().getRoom(this.props.incomingCall.roomId);
        }

-        var caller = room ? room.name : "unknown";
+        var caller = room ? room.name : _t("unknown caller");
+
+        let incomingCallText = null;
+        if (this.props.incomingCall) {
+            if (this.props.incomingCall.type === "voice") {
+                incomingCallText = _t("Incoming voice call from %(name)s", {name: caller});
+            }
+            else if (this.props.incomingCall.type === "video") {
+                incomingCallText = _t("Incoming video call from %(name)s", {name: caller});
+            }
+            else {
+                incomingCallText = _t("Incoming call from %(name)s", {name: caller});
+            }
+        }

        return (
            <div className="mx_IncomingCallBox" id="incomingCallBox">
                <img className="mx_IncomingCallBox_chevron" src="img/chevron-left.png" width="9" height="16" />
                <div className="mx_IncomingCallBox_title">
-                    Incoming { this.props.incomingCall ? this.props.incomingCall.type : '' } call from { caller }
+                    {incomingCallText}
                </div>
                <div className="mx_IncomingCallBox_buttons">
                    <div className="mx_IncomingCallBox_buttons_cell">
                        <div className="mx_IncomingCallBox_buttons_decline" onClick={this.onRejectClick}>
-                            Decline
+                            {_t("Decline")}
                        </div>
                    </div>
                    <div className="mx_IncomingCallBox_buttons_cell">
                        <div className="mx_IncomingCallBox_buttons_accept" onClick={this.onAnswerClick}>
-                            Accept
+                            {_t("Accept")}
                        </div>
                    </div>
                </div>
--- a/src/createRoom.js
+++ b/src/createRoom.js
@ -37,17 +37,11 @@ function createRoom(opts) {
    opts = opts || {};

    const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-    const NeedToRegisterDialog = sdk.getComponent("dialogs.NeedToRegisterDialog");
    const Loader = sdk.getComponent("elements.Spinner");

    const client = MatrixClientPeg.get();
    if (client.isGuest()) {
-        setTimeout(()=>{
-            Modal.createDialog(NeedToRegisterDialog, {
-                title: _t('Please Register'),
-                description: _t('Guest users can\'t create new rooms. Please register to create room and start a chat.')
-            });
-        }, 0);
+        dis.dispatch({action: 'view_set_mxid'});
        return q(null);
    }

@ -64,6 +58,11 @@ function createRoom(opts) {
        createOpts.is_direct = true;
    }

+    // By default, view the room after creating it
+    if (opts.andView === undefined) {
+        opts.andView = true;
+    }
+
    // Allow guests by default since the room is private and they'd
    // need an invite. This means clicking on a 3pid invite email can
    // actually drop you right in to a chat.
@ -97,10 +96,12 @@ function createRoom(opts) {
        // room has been created, so we race here with the client knowing that
        // the room exists, causing things like
        // https://github.com/vector-im/vector-web/issues/1813
-        dis.dispatch({
-            action: 'view_room',
-            room_id: roomId
-        });
+        if (opts.andView) {
+            dis.dispatch({
+                action: 'view_room',
+                room_id: roomId,
+            });
+        }
        return roomId;
    }, function(err) {
        console.error("Failed to create room " + roomId + " " + err);
--- a/src/i18n/strings/ar.json
+++ b/src/i18n/strings/ar.json
@ -0,0 +1,7 @@
+{
+    "ar-iq": "العربية",
+    "Continue": "استمر",
+    "Username available": "اسم المستخدم متاح",
+    "Username not available": "الإسم المستخدم غير موجود",
+    "Something went wrong!": "هناك خطأ ما!"
+}
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@ -1,12 +1,12 @@
 {
-    "Filter room members": "Raum Benutzer filtern",
+    "Filter room members": "Raum-Mitglieder filtern",
    "You have no visible notifications": "Du hast keine sichtbaren Benachrichtigungen",
    "Invites": "Einladungen",
    "Favourites": "Favoriten",
    "People": "Direkt-Chats",
    "Rooms": "Räume",
    "Low priority": "Niedrige Priorität",
-    "Historical": "Historisch",
+    "Historical": "Archiv",
    "New passwords must match each other.": "Die neuen Passwörter müssen identisch sein.",
    "A new password must be entered.": "Es muss ein neues Passwort eingegeben werden.",
    "The email address linked to your account must be entered.": "Es muss die Email-Adresse eingeben werden, welche zum Account gehört.",
@ -42,12 +42,12 @@
    "Commands": "Kommandos",
    "Emoji": "Emoji",
    "Sorry, this homeserver is using a login which is not recognised ": "Entschuldigung, dieser Homeserver nutzt eine Anmeldetechnik, die nicht bekannt ist ",
-    "Login as guest": "Anmelden als Gast",
+    "Login as guest": "Als Gast anmelden",
    "Return to app": "Zurück zur Anwendung",
    "Sign in": "Anmelden",
    "Create a new account": "Erstelle einen neuen Benutzer",
-    "Send an encrypted message": "Eine verschlüsselte Nachricht senden",
-    "Send a message (unencrypted)": "Sende eine Nachricht (unverschlüsselt)",
+    "Send an encrypted message": "Verschlüsselte Nachricht senden",
+    "Send a message (unencrypted)": "Nachricht senden (unverschlüsselt)",
    "Warning!": "Warnung!",
    "Direct Chat": "Privater Chat",
    "Error": "Fehler",
@ -56,7 +56,7 @@
    "accepted the invitation for": "Akzeptierte die Einladung für",
    "Add email address": "E-Mail-Adresse hinzufügen",
    "Advanced": "Erweitert",
-    "all room members, from the point they joined": "Alle Raum-Mitglieder - seitdem sie beigetreten sind",
+    "all room members, from the point they joined": "Alle Raum-Mitglieder, ab dem Zeitpunkt, an dem sie beigetreten sind",
    "and": "und",
    "An email has been sent to": "Eine E-Mail wurde gesendet an",
    "anyone": "Jeder",
@ -73,22 +73,22 @@
    "changed their profile picture": "änderte sein Profilbild",
    "changed the room name to": "änderte den Raumnamen zu",
    "changed the topic to": "änderte das Thema zu",
-    "Changes to who can read history will only apply to future messages in this room": "Änderungen bzgl. wer die Historie lesen kann betrifft nur zukünftige Nachrichten in diesem Raum",
-    "Clear Cache and Reload": "Leere Cache und lade neu",
-    "Click here": "Klicke hier",
+    "Changes to who can read history will only apply to future messages in this room": "Änderungen, die bestimmen, wer den Chatverlauf lesen kann, gelten nur für zukünftige Nachrichten in diesem Raum",
+    "Clear Cache and Reload": "Cache leeren und neu laden",
+    "Click here": "Hier klicken,",
    "Confirm your new password": "Neues Passwort bestätigen",
    "Continue": "Fortfahren",
    "Create an account": "Erstelle einen Account",
    "Create Room": "Raum erstellen",
-    "Cryptography": "Kryptografie",
+    "Cryptography": "Verschlüsselung",
    "Deactivate Account": "Account deaktivieren",
-    "Deactivate my account": "Deaktiviere meinen Account",
+    "Deactivate my account": "Meinen Account deaktivieren",
    "decline": "Ablehnen",
    "Devices will not yet be able to decrypt history from before they joined the room": "Geräte werden nicht in der Lage sein, den Chatverlauf vor dem Betreten des Raumes zu entschlüsseln",
    "Display name": "Anzeigename",
    "Email Address": "E-Mail-Adresse",
    "Email, name or matrix ID": "E-Mail, Name oder Matrix-ID",
-    "Encrypted messages will not be visible on clients that do not yet implement encryption": "Verschlüsselte Nachrichten werden an Clients nicht sichtbar sein, die Verschlüsselung noch nicht implementiert haben",
+    "Encrypted messages will not be visible on clients that do not yet implement encryption": "Verschlüsselte Nachrichten werden nicht in Matrix-Clients sichtbar sein, die die Verschlüsselung noch nicht implementiert haben",
    "Encrypted room": "Verschlüsselter Raum",
    "Encryption is enabled in this room": "Verschlüsselung ist in diesem Raum aktiviert",
    "Encryption is not enabled in this room": "Verschlüsselung ist in diesem Raum nicht aktiviert",
@ -96,7 +96,7 @@
    "End-to-end encryption is in beta and may not be reliable": "Die Ende-zu-Ende-Verschlüsselung befindet sich aktuell im Beta-Stadium und ist eventuell noch nicht hundertprozentig zuverlässig",
    "Failed to send email": "Fehler beim Senden der E-Mail",
    "Account": "Konto",
-    "Add phone number": "Füge Telefonnummer hinzu",
+    "Add phone number": "Telefonnummer hinzufügen",
    "an address": "an Adresse",
    "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Dein Passwort wurde erfolgreich geändert. Du wirst erst Benachrichtigungen auf anderen Geräten empfangen können, wenn du dich dort erneut anmeldest",
    "all room members": "Alle Raum-Mitglieder",
@ -109,25 +109,25 @@
    "Click here to fix": "Zum reparieren hier klicken",
    "*️⃣ Commands": "*️⃣ Befehle",
    "Default": "Standard",
-    "demote": "Zum zurückstufen",
+    "demote": "Berechtigungslevel herabstufen",
    "Export E2E room keys": "E2E-Raum-Schlüssel exportieren",
-    "Failed to change password. Is your password correct?": "Passwort-Änderung schlug fehl. Ist dein Passwort korrekt?",
+    "Failed to change password. Is your password correct?": "Passwortänderung fehlgeschlagen. Ist dein Passwort richtig?",
    "Failed to forget room": "Vergessen des Raums schlug fehl",
    "Failed to leave room": "Verlassen des Raums fehlgeschlagen",
-    "Failed to reject invitation": "Fehler beim Abweisen der Einladung",
-    "Failed to set avatar.": "Fehler beim Setzen des Avatars.",
+    "Failed to reject invitation": "Einladung konnte nicht abgelehnt werden",
+    "Failed to set avatar.": "Fehler beim Setzen des Profilbilds.",
    "Failed to unban": "Entbannen fehlgeschlagen",
    "Failed to upload file": "Datei-Upload fehlgeschlagen",
    "Favourite": "Favorit",
-    "favourite": "Favoriten",
+    "favourite": "Als Favorit setzen",
    "Forget room": "Raum vergessen",
    "Forgot your password?": "Passwort vergessen?",
    "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.": "Aus Sicherheitsgründen werden beim Ausloggen alle Ende-zu-Ende-Verschlüsselungs-Schlüssel in diesem Browser gelöscht. Wenn du in späteren Riot-Sitzungen den bisherigen Chatverlauf entschlüsseln möchtest, exportiere bitte deine Schlüssel zur sicheren Aufbewahrung.",
    "For security, this session has been signed out. Please sign in again.": "Aus Sicherheitsgründen wurde diese Sitzung beendet. Bitte melde dich erneut an.",
    "Found a bug?": "Fehler gefunden?",
    "Guests cannot join this room even if explicitly invited.": "Gäste können diesem Raum nicht beitreten, auch wenn sie explizit eingeladen wurden.",
-    "Guests can't set avatars. Please register.": "Gäste können keine Avatare setzen. Bitte registriere dich.",
-    "Guest users can't upload files. Please register to upload.": "Gäste können keine Dateien hochladen. Bitte registrieren um hochzuladen.",
+    "Guests can't set avatars. Please register.": "Gäste können kein Profilbild setzen. Bitte registrieren.",
+    "Guest users can't upload files. Please register to upload.": "Gäste können keine Dateien hochladen. Bitte zunächst registrieren.",
    "had": "hatte",
    "Hangup": "Auflegen",
    "Homeserver is": "Der Homeserver ist",
@ -140,12 +140,12 @@
    "is a": "ist ein",
    "is trusted": "wird vertraut",
    "Sign in with": "Ich möchte mich anmelden mit",
-    "joined and left": "trat bei und ging",
-    "joined": "trat bei",
+    "joined and left": "hat den Raum betreten und wieder verlassen",
+    "joined": "hat den Raum betreten",
    "joined the room": "trat dem Raum bei",
    "Leave room": "Verlasse Raum",
    "left and rejoined": "ging(en) und trat(en) erneut bei",
-    "left": "ging",
+    "left": "hat den Raum verlassen",
    "left the room": "verließ den Raum",
    "Logged in as": "Angemeldet als",
    "Logout": "Abmelden",
@ -182,7 +182,7 @@
    "Once you&#39;ve followed the link it contains, click below": "Nachdem du dem darin enthaltenen Link gefolgt bist, klicke unten",
    "rejected the invitation.": "lehnte die Einladung ab.",
    "Reject invitation": "Einladung ablehnen",
-    "Remove Contact Information?": "Kontakt-Informationen löschen?",
+    "Remove Contact Information?": "Kontakt-Informationen entfernen?",
    "removed their display name": "löschte den eigenen Anzeigenamen",
    "Remove": "Entfernen",
    "requested a VoIP conference": "hat eine VoIP-Konferenz angefordert",
@ -191,20 +191,20 @@
    "Return to login screen": "Zur Anmeldemaske zurückkehren",
    "Room Colour": "Raumfarbe",
    "Room name (optional)": "Raumname (optional)",
-    "Scroll to unread messages": "Scrolle zu ungelesenen Nachrichten",
+    "Scroll to unread messages": "Zu den ungelesenen Nachrichten scrollen",
    "Send Invites": "Einladungen senden",
-    "Send Reset Email": "E-Mail für das Zurücksetzen senden",
-    "sent an image": "sandte ein Bild",
+    "Send Reset Email": "E-Mail zum Zurücksetzen senden",
+    "sent an image": "hat ein Bild gesendet",
    "sent an invitation to": "sandte eine Einladung an",
-    "sent a video": "sandte ein Video",
+    "sent a video": "hat ein Video gesendet",
    "Server may be unavailable or overloaded": "Server ist eventuell nicht verfügbar oder überlastet",
    "set a profile picture": "setzte ein Profilbild",
    "set their display name to": "setzte den Anzeigenamen auf",
    "Settings": "Einstellungen",
    "Signed Out": "Abgemeldet",
    "Sign out": "Abmelden",
-    "since the point in time of selecting this option": "seitdem diese Option gewählt wird",
-    "since they joined": "seitdem sie beitraten",
+    "since the point in time of selecting this option": "ab dem Zeitpunkt, an dem diese Option gewählt wird",
+    "since they joined": "ab dem Zeitpunkt, an dem sie beigetreten sind",
    "since they were invited": "seitdem sie eingeladen wurden",
    "Someone": "Jemand",
    "Start a chat": "Starte einen Chat",
@ -219,7 +219,7 @@
    "This doesn't appear to be a valid email address": "Dies scheint keine gültige E-Mail-Adresse zu sein",
    "this invitation?": "diese Einladung?",
    "This is a preview of this room. Room interactions have been disabled": "Dies ist eine Vorschau dieses Raumes. Raum-Interaktionen wurden deaktiviert",
-    "This room is not accessible by remote Matrix servers": "Dieser Raum ist über entfernte Matrix-Server nicht zugreifbar",
+    "This room is not accessible by remote Matrix servers": "Andere Matrix-Server können auf diesen Raum nicht zugreifen",
    "This room's internal ID is": "Die interne ID dieses Raumes ist",
    "To ban users": "Zum Nutzer bannen",
    "To configure the room": "Um den Raum zu konfigurieren",
@ -227,7 +227,7 @@
    "to join the discussion": "um an der Diskussion teilzunehmen",
    "To kick users": "Um Nutzer zu entfernen",
    "Admin": "Administrator",
-    "Server may be unavailable, overloaded, or you hit a bug": "Server könnte nicht verfügbar oder überlastet sein oder du bist auf einen Fehler gestoßen",
+    "Server may be unavailable, overloaded, or you hit a bug.": "Server ist nicht verfügbar, überlastet oder du bist auf einen Fehler gestoßen.",
    "Could not connect to the integration server": "Konnte keine Verbindung zum Integrations-Server herstellen",
    "Disable inline URL previews by default": "URL-Vorschau im Chat standardmäßig deaktivieren",
    "Guests can't use labs features. Please register.": "Gäste können keine Labor-Funktionen nutzen. Bitte registrieren.",
@ -246,7 +246,7 @@
    "Unencrypted room": "Unverschlüsselter Raum",
    "unknown error code": "Unbekannter Fehlercode",
    "unknown": "unbekannt",
-    "Upload avatar": "Avatar hochladen",
+    "Upload avatar": "Profilbild hochladen",
    "uploaded a file": "lud eine Datei hoch",
    "Upload Files": "Dateien hochladen",
    "Upload file": "Datei hochladen",
@ -255,7 +255,7 @@
    "Users": "Nutzer",
    "User": "Nutzer",
    "Verification Pending": "Verifizierung ausstehend",
-    "Video call": "Videoanruf",
+    "Video call": "Video-Anruf",
    "Voice call": "Sprachanruf",
    "VoIP conference finished.": "VoIP-Konferenz wurde beendet.",
    "VoIP conference started.": "VoIP-Konferenz gestartet.",
@ -270,8 +270,8 @@
    "Who would you like to add to this room?": "Wen möchtest du zu diesem Raum hinzufügen?",
    "Who would you like to communicate with?": "Mit wem möchtest du kommunizieren?",
    "Would you like to": "Möchtest du",
-    "You do not have permission to post to this room": "Du hast keine Berechtigung an diesen Raum etwas zu senden",
-    "You have been invited to join this room by %(inviterName)s": "Du wurdest von %(inviterName)s in diesen Raum eingeladen",
+    "You do not have permission to post to this room": "Du hast keine Berechtigung, in diesem Raum etwas zu senden",
+    "You have been invited to join this room by %(inviterName)s": "%(inviterName)s hat dich in diesen Raum eingeladen",
    "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 wurdest auf allen Geräten abgemeldet und wirst keine Push-Benachrichtigungen mehr erhalten. Um die Benachrichtigungen zu reaktivieren, musst du dich auf jedem Gerät neu anmelden",
    "you must be a": "nötige Rolle",
    "Your password has been reset": "Dein Passwort wurde zurückgesetzt",
@ -280,19 +280,19 @@
    "times": "mal",
    "Bulk Options": "Bulk-Optionen",
    "Call Timeout": "Anruf-Timeout",
-    "Conference call failed": "Konferenzgespräch fehlgeschlagen",
-    "Conference calling is in development and may not be reliable": "Konferenzgespräche sind in Entwicklung und evtl. nicht zuverlässig",
-    "Conference calls are not supported in encrypted rooms": "Konferenzgespräche sind in verschlüsselten Räumen nicht unterstützt",
-    "Conference calls are not supported in this client": "Konferenzgespräche sind in diesem Client nicht unterstützt",
+    "Conference call failed.": "Konferenzgespräch fehlgeschlagen.",
+    "Conference calling is in development and may not be reliable.": "Konferenzgespräche befinden sich noch in der Entwicklungsphase und sind möglicherweise nicht zuverlässig nutzbar.",
+    "Conference calls are not supported in encrypted rooms": "Konferenzgespräche werden in verschlüsselten Räumen nicht unterstützt",
+    "Conference calls are not supported in this client": "Konferenzgespräche werden von diesem Client nicht unterstützt",
    "Existing Call": "Bereits bestehender Anruf",
    "Failed to set up conference call": "Konferenzgespräch konnte nicht gestartet werden",
    "Failed to verify email address: make sure you clicked the link in the email": "Verifizierung der E-Mail-Adresse fehlgeschlagen: Bitte stelle sicher, dass du den Link in der E-Mail angeklickt hast",
    "Failure to create room": "Raumerstellung fehlgeschlagen",
-    "Guest users can't create new rooms. Please register to create room and start a chat": "Gäste können keine neuen Räume erstellen. Bitte registrieren um einen Raum zu erstellen und einen Chat zu starten",
+    "Guest users can't create new rooms. Please register to create room and start a chat.": "Gastnutzer können keine neuen Räume erstellen. Bitte registriere dich um Räume zu erstellen und Chats zu starten.",
    "Riot does not have permission to send you notifications - please check your browser settings": "Riot hat keine Berechtigung Benachrichtigungen zu senden - bitte prüfe deine Browser-Einstellungen",
    "Riot was not given permission to send notifications - please try again": "Riot hat das Recht nicht bekommen Benachrichtigungen zu senden. Bitte erneut probieren",
    "This email address is already in use": "Diese E-Mail-Adresse wird bereits verwendet",
-    "This email address was not found": "Diese E-Mail-Adresse wurde nicht gefunden",
+    "This email address was not found": "Diese E-Mail-Adresse konnte nicht gefunden werden",
    "The file '%(fileName)s' exceeds this home server's size limit for uploads": "Die Datei '%(fileName)s' überschreitet das Größen-Limit für Uploads auf diesem Homeserver",
    "The file '%(fileName)s' failed to upload": "Das Hochladen der Datei '%(fileName)s' schlug fehl",
    "The remote side failed to pick up": "Die Gegenstelle konnte nicht abheben",
@ -302,11 +302,11 @@
    "Unable to enable Notifications": "Benachrichtigungen konnten nicht aktiviert werden",
    "Upload Failed": "Upload fehlgeschlagen",
    "VoIP is unsupported": "VoIP wird nicht unterstützt",
-    "You are already in a call": "Du bist bereits bei einem Anruf",
-    "You cannot place a call with yourself": "Du kannst keinen Anruf mit dir selbst starten",
-    "You cannot place VoIP calls in this browser": "Du kannst kein VoIP-Gespräch in diesem Browser starten",
+    "You are already in a call.": "Du bist bereits in einem Gespräch.",
+    "You cannot place a call with yourself.": "Du kannst keinen Anruf mit dir selbst starten.",
+    "You cannot place VoIP calls in this browser.": "Du kannst keine VoIP-Gespräche in diesem Browser starten.",
    "You need to log back in to generate end-to-end encryption keys for this device and submit the public key to your homeserver. This is a once off; sorry for the inconvenience.": "Du musst dich erneut anmelden, um Ende-zu-Ende-Verschlüsselungs-Schlüssel für dieses Gerät zu generieren und um den öffentlichen Schlüssel auf deinem Homeserver zu hinterlegen. Dies muss nur einmal durchgeführt werden, bitte entschuldige die Unannehmlichkeiten.",
-    "Your email address does not appear to be associated with a Matrix ID on this Homeserver": "Deine E-Mail-Adresse scheint nicht mit einer Matrix-ID auf diesem Homeserver verknüpft zu sein",
+    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Deine E-Mail-Adresse scheint nicht mit einer Matrix-ID auf diesem Heimserver verbunden zu sein.",
    "Sun": "So",
    "Mon": "Mo",
    "Tue": "Di",
@ -336,23 +336,23 @@
    "Password too short (min %(MIN_PASSWORD_LENGTH)s).": "Passwort zu kurz (min. %(MIN_PASSWORD_LENGTH)s).",
    "This doesn't look like a valid email address.": "Dies scheint keine gültige E-Mail-Adresse zu sein.",
    "This doesn't look like a valid phone number.": "Dies scheint keine gültige Telefonnummer zu sein.",
-    "User names may only contain letters, numbers, dots, hyphens and underscores.": "Benutzernamen sollen nur Buchstaben, Nummern, Binde- und Unterstriche enthalten.",
-    "An unknown error occurred.": "Ein unbekannter Fehler trat auf.",
+    "User names may only contain letters, numbers, dots, hyphens and underscores.": "Benutzernamen dürfen nur Buchstaben, Nummern, Punkte, Binde- und Unterstriche enthalten.",
+    "An unknown error occurred.": "Ein unbekannter Fehler ist aufgetreten.",
    "I already have an account": "Ich habe bereits einen Account",
-    "An error occured: %(error_string)s": "Ein Fehler trat auf: %(error_string)s",
+    "An error occurred: %(error_string)s": "Ein Fehler trat auf: %(error_string)s",
    "Topic": "Thema",
    "Make this room private": "Mache diesen Raum privat",
-    "Share message history with new users": "Nachrichtenhistorie mit neuen Nutzern teilen",
+    "Share message history with new users": "Bisherigen Chatverlauf mit neuen Nutzern teilen",
    "Encrypt room": "Raum verschlüsseln",
    "To send events of type": "Zum Senden von Ereignissen mit Typ",
    "%(names)s and %(lastPerson)s are typing": "%(names)s und %(lastPerson)s schreiben",
    "%(targetName)s accepted an invitation.": "%(targetName)s hat eine Einladung angenommen.",
    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s akzeptierte die Einladung für %(displayName)s.",
    "%(names)s and one other are typing": "%(names)s und eine weitere Person tippen",
-    "%(names)s and %(count)s others are typing": "%(names)s und %(count)s weitere Personen tippen",
-    "%(senderName)s answered the call.": "%(senderName)s beantwortete den Anruf.",
+    "%(names)s and %(count)s others are typing": "%(names)s und %(count)s weitere Personen schreiben",
+    "%(senderName)s answered the call.": "%(senderName)s hat den Anruf angenommen.",
    "%(senderName)s banned %(targetName)s.": "%(senderName)s hat %(targetName)s aus dem Raum verbannt.",
-    "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s.": "%(senderName)s hat den Anzeigenamen von %(oldDisplayName)s auf %(displayName)s geändert.",
+    "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s.": "%(senderName)s hat den Anzeigenamen von \"%(oldDisplayName)s\" auf \"%(displayName)s\" geändert.",
    "%(senderName)s changed their profile picture.": "%(senderName)s hat das Profilbild geändert.",
    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s hat das Berechtigungslevel von %(powerLevelDiffText)s geändert.",
    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s änderte den Raumnamen zu %(roomName)s.",
@ -364,7 +364,7 @@
    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s von %(fromPowerLevel)s zu %(toPowerLevel)s",
    "%(senderName)s invited %(targetName)s.": "%(senderName)s hat %(targetName)s eingeladen.",
    "%(displayName)s is typing": "%(displayName)s schreibt",
-    "%(targetName)s joined the room.": "%(targetName)s trat dem Raum bei.",
+    "%(targetName)s joined the room.": "%(targetName)s hat den Raum betreten.",
    "%(senderName)s kicked %(targetName)s.": "%(senderName)s kickte %(targetName)s.",
    "%(targetName)s left the room.": "%(targetName)s hat den Raum verlassen.",
    "%(senderName)s made future room history visible to": "%(senderName)s machte die zukünftige Raumhistorie sichtbar für",
@ -377,13 +377,13 @@
    "Power level must be positive integer.": "Berechtigungslevel muss eine positive ganze Zahl sein.",
    "Reason": "Grund",
    "%(targetName)s rejected the invitation.": "%(targetName)s hat die Einladung abgelehnt.",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s löschte den Anzeigenamen (%(oldDisplayName)s).",
-    "%(senderName)s removed their profile picture.": "%(senderName)s löschte das Profilbild.",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s hat den Anzeigenamen entfernt (%(oldDisplayName)s).",
+    "%(senderName)s removed their profile picture.": "%(senderName)s hat das Profilbild gelöscht.",
    "%(senderName)s requested a VoIP conference.": "%(senderName)s möchte eine VoIP-Konferenz beginnen.",
    "Room %(roomId)s not visible": "Raum %(roomId)s ist nicht sichtbar",
    "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s hat ein Bild gesendet.",
    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s hat %(targetDisplayName)s in diesen Raum eingeladen.",
-    "%(senderName)s set a profile picture.": "%(senderName)s setzte ein Profilbild.",
+    "%(senderName)s set a profile picture.": "%(senderName)s hat ein Profilbild gesetzt.",
    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s hat den Anzeigenamen geändert in %(displayName)s.",
    "This room is not recognised.": "Dieser Raum wurde nicht erkannt.",
    "These are experimental features that may break in unexpected ways": "Dies sind experimentelle Funktionen, die in unerwarteter Weise Fehler verursachen können",
@ -392,13 +392,13 @@
    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s zog Bann für %(targetName)s zurück.",
    "Usage": "Verwendung",
    "Use with caution": "Mit Vorsicht zu verwenden",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s zog die Einladung für %(targetName)s zurück.",
+    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s hat die Einladung für %(targetName)s zurückgezogen.",
    "You need to be able to invite users to do that.": "Du musst die Berechtigung haben, Nutzer einzuladen, um diese Aktion ausführen zu können.",
    "You need to be logged in.": "Du musst angemeldet sein.",
    "There are no visible files in this room": "Es gibt keine sichtbaren Dateien in diesem Raum",
    "Error changing language": "Fehler beim Ändern der Sprache",
    "Riot was unable to find the correct Data for the selected Language.": "Riot war nicht in der Lage die korrekten Daten für die ausgewählte Sprache zu finden.",
-    "Connectivity to the server has been lost.": "Verbindung zum Server untergebrochen.",
+    "Connectivity to the server has been lost.": "Verbindung zum Server wurde unterbrochen.",
    "Sent messages will be stored until your connection has returned.": "Gesendete Nachrichten werden gespeichert, bis die Internetverbindung wiederhergestellt wurde.",
    "Auto-complete": "Autovervollständigung",
    "Resend all": "Alle erneut senden",
@ -418,7 +418,7 @@
    "Press": "Drücke",
    "tag as %(tagName)s": "als %(tagName)s taggen",
    "to browse the directory": "um das Raum-Verzeichnis zu durchsuchen",
-    "to demote": "um die Priorität herabzusetzen",
+    "to demote": "um das Berechtigungslevel herabzusetzen",
    "to favourite": "zum Favorisieren",
    "to make a room or": "um einen Raum zu erstellen, oder",
    "to restore": "zum wiederherstellen",
@ -427,7 +427,7 @@
    "You're not in any rooms yet! Press": "Du bist noch keinem Raum beigetreten! Drücke",
    "click to reveal": "Klicke zum anzeigen",
    "To remove other users' messages": "Um Nachrichten anderer Nutzer zu verbergen",
-    "You are trying to access %(roomName)s": "Du versuchst auf %(roomName)s zuzugreifen",
+    "You are trying to access %(roomName)s.": "Du versuchst, auf den Raum \"%(roomName)s\" zuzugreifen.",
    "af": "Afrikaans",
    "ar-ae": "Arabisch (VAE)",
    "ar-bh": "Arabisch (Bahrain)",
@ -558,13 +558,13 @@
    "Are you sure?": "Bist du sicher?",
    "Attachment": "Anhang",
    "Ban": "Verbannen",
-    "Can't connect to homeserver - please check your connectivity and ensure your <a>homeserver's SSL certificate</a> is trusted.": "Kann nicht zum Heimserver verbinden - bitte checke eine Verbindung und stelle sicher, dass dem <a>SSL-Zertifikat deines Heimservers</a> vertraut wird.",
+    "Can't connect to homeserver - please check your connectivity and ensure your <a>homeserver's SSL certificate</a> is trusted.": "Verbindungsaufbau zum Heimserver nicht möglich - bitte Internetverbindung überprüfen und sicherstellen, ob das <a>SSL-Zertifikat des Heimservers</a> vertrauenswürdig ist.",
    "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Kann nicht zum Heimserver via HTTP verbinden, wenn eine HTTPS-Url in deiner Adresszeile steht. Nutzer HTTPS oder <a>aktiviere unsichere Skripte</a>.",
    "changing room on a RoomView is not supported": "Das Ändern eines Raumes in einer RaumAnsicht wird nicht unterstützt",
    "Click to mute audio": "Klicke um den Ton stumm zu stellen",
    "Click to mute video": "Klicken, um das Video stummzuschalten",
    "Command error": "Befehlsfehler",
-    "Decrypt %(text)s": "Entschlüssele %(text)s",
+    "Decrypt %(text)s": "%(text)s entschlüsseln",
    "Delete": "Löschen",
    "Devices": "Geräte",
    "Direct chats": "Direkte Chats",
@ -576,21 +576,20 @@
    "Failed to delete device": "Löschen des Geräts fehlgeschlagen",
    "Failed to join room": "Betreten des Raumes ist fehlgeschlagen",
    "Failed to kick": "Kicken fehlgeschlagen",
-    "Failed to mute user": "Nutzer lautlos zu stellen fehlgeschlagen",
+    "Failed to mute user": "Stummschalten des Nutzers fehlgeschlagen",
    "Failed to reject invite": "Ablehnen der Einladung ist fehlgeschlagen",
    "Failed to save settings": "Einstellungen konnten nicht gespeichert werden",
    "Failed to set display name": "Anzeigename konnte nicht gesetzt werden",
    "Fill screen": "Fülle Bildschirm",
-    "Guest users can't upload files. Please register to upload": "Gäste können keine Dateien hochladen. Bitte zunächst registrieren",
    "Hide Text Formatting Toolbar": "Verberge Text-Formatierungs-Toolbar",
    "Incorrect verification code": "Falscher Verifizierungscode",
    "Invalid alias format": "Ungültiges Alias-Format",
    "Invalid address format": "Ungültiges Adressformat",
    "'%(alias)s' is not a valid format for an address": "'%(alias)s' ist kein gültiges Adressformat",
-    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' hat kein valides Aliasformat",
+    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' ist kein gültiges Alias-Format",
    "Join Room": "Dem Raum beitreten",
    "Kick": "Kicke",
-    "Level": "Level",
+    "Level": "Berechtigungslevel",
    "Local addresses for this room:": "Lokale Adressen dieses Raumes:",
    "Markdown is disabled": "Markdown ist deaktiviert",
    "Markdown is enabled": "Markdown ist aktiviert",
@ -603,22 +602,22 @@
    "No results": "Keine Ergebnisse",
    "OK": "OK",
    "Revoke Moderator": "Moderator zurückziehen",
-    "Search": "Suche",
-    "Search failed": "Suche fehlgeschlagen",
+    "Search": "Suchen",
+    "Search failed": "Suche ist fehlgeschlagen",
    "Server error": "Server-Fehler",
    "Server may be unavailable, overloaded, or search timed out :(": "Der Server ist entweder nicht verfügbar, überlastet oder die Suche wurde wegen Zeitüberschreitung abgebrochen :(",
    "Server may be unavailable, overloaded, or the file too big": "Server ist entweder nicht verfügbar, überlastet oder die Datei ist zu groß",
-    "Server unavailable, overloaded, or something else went wrong": "Der Server ist entweder nicht verfügbar, überlastet oder es liegt ein anderweitiger Fehler vor",
-    "Some of your messages have not been sent": "Einige deiner Nachrichten wurden noch nicht gesendet",
+    "Server unavailable, overloaded, or something else went wrong.": "Server ist nicht verfügbar, überlastet oder ein anderer Fehler ist aufgetreten.",
+    "Some of your messages have not been sent.": "Einige deiner Nachrichten wurden nicht gesendet.",
    "Submit": "Absenden",
    "The main address for this room is: %(canonical_alias_section)s": "Die Hauptadresse für diesen Raum ist: %(canonical_alias_section)s",
-    "This action cannot be performed by a guest user. Please register to be able to do this": "Diese Aktion kann nicht von einem Gast ausgeführt werden. Bitte registriere dich um dies zu tun",
+    "This action cannot be performed by a guest user. Please register to be able to do this.": "Diese Aktion kann nicht von einem Gast ausgeführt werden. Bitte registriere dich um dies zu tun.",
    "%(actionVerb)s this person?": "Diese Person %(actionVerb)s?",
    "This room has no local addresses": "Dieser Raum hat keine lokale Adresse",
    "This room is private or inaccessible to guests. You may be able to join if you register": "Dieser Raum ist privat oder für Gäste nicht zugänglich. Du kannst jedoch eventuell beitreten, wenn du dich registrierst",
-    "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question": "Versuchte einen spezifischen Punkt in der Raum-Chronik zu laden, aber du hast keine Berechtigung die angeforderte Nachricht anzuzeigen",
-    "Tried to load a specific point in this room's timeline, but was unable to find it": "Der Versuch, einen spezifischen Punkt im Chatverlauf zu laden, ist fehlgeschlagen. Der Punkt konnte nicht gefunden werden",
-    "Turn Markdown off": "Markdown abschalten",
+    "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Versuchte einen spezifischen Punkt in der Raum-Chronik zu laden, aber du hast keine Berechtigung die angeforderte Nachricht anzuzeigen.",
+    "Tried to load a specific point in this room's timeline, but was unable to find it.": "Der Versuch, einen spezifischen Punkt im Chatverlauf zu laden, ist fehlgeschlagen. Der Punkt konnte nicht gefunden werden.",
+    "Turn Markdown off": "Markdown deaktiveren",
    "Turn Markdown on": "Markdown einschalten",
    "Unable to load device list": "Geräteliste konnte nicht geladen werden",
    "Unknown command": "Unbekannter Befehl",
@ -626,8 +625,8 @@
    "Usage: /markdown on|off": "Verwendung: /markdown on|off",
    "You seem to be in a call, are you sure you want to quit?": "Du scheinst in einem Anruf zu sein. Bist du sicher schließen zu wollen?",
    "You seem to be uploading files, are you sure you want to quit?": "Du scheinst Dateien hochzuladen. Bist du sicher schließen zu wollen?",
-    "You will not be able to undo this change as you are promoting the user to have the same power level as yourself": "Du wirst diese Änderung nicht rückgängig machen können, da der Nutzer dasselbe Berechtigungslevel wie du selbst erhalten wird",
-    "Make Moderator": "Zum Moderator machen",
+    "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Du wirst diese Änderung nicht rückgängig machen können, da der Nutzer dasselbe Berechtigungslevel wie du selbst erhalten wird.",
+    "Make Moderator": "Zum Moderator ernennen",
    "Room": "Raum",
    "(~%(searchCount)s results)": "(~%(searchCount)s Ergebnisse)",
    "Cancel": "Abbrechen",
@ -653,29 +652,29 @@
    "%(items)s and one other": "%(items)s und ein(e) weitere(r)",
    "%(items)s and %(lastItem)s": "%(items)s und %(lastItem)s",
    "%(severalUsers)sjoined %(repeats)s times": "%(severalUsers)ssind dem Raum %(repeats)s mal beigetreten",
-    "%(oneUser)sjoined %(repeats)s times": "%(oneUser)strat %(repeats)s mal bei",
-    "%(severalUsers)sjoined": "%(severalUsers)straten bei",
-    "%(oneUser)sjoined": "%(oneUser)strat bei",
-    "%(severalUsers)sleft %(repeats)s times": "%(severalUsers)sverließen %(repeats)s mal den Raum",
+    "%(oneUser)sjoined %(repeats)s times": "%(oneUser)shat den Raum %(repeats)s mal betreten",
+    "%(severalUsers)sjoined": "%(severalUsers)shaben den Raum betreten",
+    "%(oneUser)sjoined": "%(oneUser)shat den Raum betreten",
+    "%(severalUsers)sleft %(repeats)s times": "%(severalUsers)shaben %(repeats)s mal den Raum verlassen",
    "%(oneUser)sleft %(repeats)s times": "%(oneUser)sging %(repeats)s mal",
    "%(severalUsers)sleft": "%(severalUsers)shaben den Raum verlassen",
    "%(oneUser)sleft": "%(oneUser)sging",
-    "%(severalUsers)sjoined and left %(repeats)s times": "%(severalUsers)straten bei und gingen %(repeats)s mal",
-    "%(oneUser)sjoined and left %(repeats)s times": "%(oneUser)strat bei und ging %(repeats)s mal",
-    "%(severalUsers)sjoined and left": "%(severalUsers)straten bei und gingen",
-    "%(oneUser)sjoined and left": "%(oneUser)strat bei und ging",
+    "%(severalUsers)sjoined and left %(repeats)s times": "%(severalUsers)shaben den Raum %(repeats)s mal betreten und wieder verlassen",
+    "%(oneUser)sjoined and left %(repeats)s times": "%(oneUser)shat den Raum %(repeats)s mal betreten und wieder verlassen",
+    "%(severalUsers)sjoined and left": "%(severalUsers)shaben den Raum betreten und wieder verlassen",
+    "%(oneUser)sjoined and left": "%(oneUser)shat den Raum betreten und wieder verlassen",
    "%(severalUsers)sleft and rejoined %(repeats)s times": "%(severalUsers)shaben den Raum verlassen und %(repeats)s mal neu betreten",
-    "%(oneUser)sleft and rejoined %(repeats)s times": "%(oneUser)sging und trat %(repeats)s mal erneut bei",
-    "%(severalUsers)sleft and rejoined": "%(severalUsers)s gingen und traten erneut bei",
+    "%(oneUser)sleft and rejoined %(repeats)s times": "%(oneUser)shat den Raum %(repeats)s mal verlassen und wieder neu betreten",
+    "%(severalUsers)sleft and rejoined": "%(severalUsers)shaben den Raum verlassen und wieder neu betreten",
    "%(oneUser)sleft left and rejoined": "%(oneUser)sging und trat erneut bei",
-    "%(severalUsers)srejected their invitations %(repeats)s times": "%(severalUsers)s lehnten %(repeats)s mal ihre Einladung ab",
+    "%(severalUsers)srejected their invitations %(repeats)s times": "%(severalUsers)shaben ihre Einladung %(repeats)s mal abgelehnt",
    "%(oneUser)srejected their invitation %(repeats)s times": "%(oneUser)shat die Einladung %(repeats)s mal abgelehnt",
-    "%(severalUsers)srejected their invitations": "%(severalUsers)slehnten ihre Einladung ab",
-    "%(oneUser)srejected their invitation": "%(oneUser)slehnte seine/ihre Einladung ab",
+    "%(severalUsers)srejected their invitations": "%(severalUsers)shaben ihre Einladung abgelehnt",
+    "%(oneUser)srejected their invitation": "%(oneUser)shat die Einladung abgelehnt",
    "%(severalUsers)shad their invitations withdrawn %(repeats)s times": "%(severalUsers)szogen ihre Einladungen %(repeats)s mal zurück",
    "%(oneUser)shad their invitation withdrawn %(repeats)s times": "%(oneUser)szog seine/ihre Einladung %(repeats)s mal zurück",
    "%(severalUsers)shad their invitations withdrawn": "%(severalUsers)szogen ihre Einladungen zurück",
-    "%(oneUser)shad their invitation withdrawn": "%(oneUser)szog seine/ihre Einladung zurück",
+    "%(oneUser)shad their invitation withdrawn": "%(oneUser)swurde die ursprüngliche Einladung wieder entzogen",
    "were invited %(repeats)s times": "wurden %(repeats)s mal eingeladen",
    "was invited %(repeats)s times": "wurde %(repeats)s mal eingeladen",
    "were invited": "wurden eingeladen",
@ -687,17 +686,17 @@
    "were unbanned": "wurden entbannt",
    "were kicked %(repeats)s times": "wurden %(repeats)s mal gekickt",
    "was kicked %(repeats)s times": "wurde %(repeats)s mal gekickt",
-    "were kicked": "wurden gekickt",
-    "%(severalUsers)schanged their name %(repeats)s times": "%(severalUsers)sänderten %(repeats)s mal ihre Namen",
-    "%(oneUser)schanged their name %(repeats)s times": "%(oneUser)sänderte %(repeats)s mal seinen/ihren Namen",
-    "%(severalUsers)schanged their name": "%(severalUsers)sänderten ihre Namen",
-    "%(oneUser)schanged their name": "%(oneUser)sänderte seinen/ihren Namen",
-    "%(severalUsers)schanged their avatar %(repeats)s times": "%(severalUsers)shaben %(repeats)s mal ihren Avatar geändert",
-    "%(oneUser)schanged their avatar %(repeats)s times": "%(oneUser)sänderte %(repeats)s mal seinen/ihren Avatar",
-    "%(severalUsers)schanged their avatar": "%(severalUsers)sänderten ihre Avatare",
+    "were kicked": "wurden aus dem Raum entfernt",
+    "%(severalUsers)schanged their name %(repeats)s times": "%(severalUsers)shaben ihren Namen %(repeats)s mal geändert",
+    "%(oneUser)schanged their name %(repeats)s times": "%(oneUser)shat den Namen %(repeats)s mal geändert",
+    "%(severalUsers)schanged their name": "%(severalUsers)shaben ihre Namen geändert",
+    "%(oneUser)schanged their name": "%(oneUser)shat den Namen geändert",
+    "%(severalUsers)schanged their avatar %(repeats)s times": "%(severalUsers)shaben %(repeats)s mal ihr Profilbild geändert",
+    "%(oneUser)schanged their avatar %(repeats)s times": "%(oneUser)shat %(repeats)s mal das Profilbild geändert",
+    "%(severalUsers)schanged their avatar": "%(severalUsers)shaben ihr Profilbild geändert",
    "%(oneUser)schanged their avatar": "%(oneUser)shat das Profilbild geändert",
    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(day)s. %(monthName)s %(fullYear)s %(time)s",
-    "%(oneUser)sleft and rejoined": "%(oneUser)sverließ den Raum und trat erneut bei",
+    "%(oneUser)sleft and rejoined": "%(oneUser)shat den Raum verlassen und wieder neu betreten",
    "A registered account is required for this action": "Für diese Aktion ist ein registrierter Account notwendig",
    "Access Token:": "Zugangs-Token:",
    "Always show message timestamps": "Nachrichten-Zeitstempel immer anzeigen",
@ -726,9 +725,9 @@
    "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.": "Eine Änderung des Passworts setzt derzeit alle Schlüssel für die E2E-Verschlüsselung auf allen verwendeten Geräten zurück. Bereits verschlüsselte Chat-Inhalte sind somit nur noch lesbar, wenn du zunächst alle Schlüssel exportierst und später wieder importierst. Wir arbeiten an einer Verbesserung dieser momentan noch notwendigen Vorgehensweise.",
    "Unmute": "Stummschalten aufheben",
    "Invalid file%(extra)s": "Ungültige Datei%(extra)s",
-    "Remove %(threePid)s?": "Entferne %(threePid)s?",
+    "Remove %(threePid)s?": "%(threePid)s entfernen?",
    "Please select the destination room for this message": "Bitte den Raum auswählen, an den diese Nachricht gesendet werden soll",
-    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s löschte den Raumnamen.",
+    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s hat den Raum-Namen gelöscht.",
    "Passphrases must match": "Passphrase muss übereinstimmen",
    "Passphrase must not be empty": "Passphrase darf nicht leer sein",
    "Export room keys": "Raum-Schlüssel exportieren",
@ -736,9 +735,8 @@
    "Confirm passphrase": "Bestätige Passphrase",
    "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Die Export-Datei wird mit einer Passphrase geschützt sein. Du solltest die Passphrase hier eingeben um die Datei zu entschlüsseln.",
    "You must join the room to see its files": "Du musst dem Raum beitreten, um die Raum-Dateien sehen zu können",
-    "Server may be unavailable, overloaded, or you hit a bug.": "Server ist nicht verfügbar, überlastet oder du bist auf einen Fehler gestoßen.",
    "Reject all %(invitedRooms)s invites": "Alle %(invitedRooms)s Einladungen ablehnen",
-    "Start new chat": "Starte neuen Chat",
+    "Start new Chat": "Starte neuen Chat",
    "Guest users can't invite users. Please register.": "Gäste können keine Nutzer einladen. Bitte registrieren.",
    "Failed to invite": "Einladen fehlgeschlagen",
    "Failed to invite user": "Einladen des Nutzers fehlgeschlagen",
@ -753,10 +751,10 @@
    "Verify device": "Gerät verifizieren",
    "I verify that the keys match": "Ich bestätige, dass die Schlüssel passen",
    "Unable to restore session": "Sitzungswiederherstellung fehlgeschlagen",
-    "Continue anyway": "Fahre trotzdem fort",
-    "Your display name is how you'll appear to others when you speak in rooms. What would you like it to be?": "Dein Anzeigename ist der Name, der anderen Nutzern angezeigt wird, wenn du in Räumen sprichst. Welchen Anzeigenamen möchtest du wählen?",
+    "Continue anyway": "Trotzdem fortfahren",
+    "Your display name is how you'll appear to others when you speak in rooms. What would you like it to be?": "Dein Anzeigename ist der Name, der anderen Nutzern angezeigt wird, wenn du in Räumen kommunizierst. Welchen Anzeigenamen möchtest du wählen?",
    "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "Do blockst aktuell unverifizierte Geräte. Um Nachrichten an diese Geräte zu senden musst du sie verifizieren.",
-    "\"%(RoomName)s\" contains devices that you haven't seen before.": "\"%(RoomName)s\" enthält Geräte die du noch nicht gesehen hast.",
+    "\"%(RoomName)s\" contains devices that you haven't seen before.": "\"%(RoomName)s\" enthält Geräte, die du bislang noch nicht gesehen hast.",
    "Unknown devices": "Unbekannte Geräte",
    "Unknown Address": "Unbekannte Adresse",
    "Verify...": "Verifizieren...",
@ -770,7 +768,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-Mail um mit der Registrierung fortzufahren.",
    "Token incorrect": "Token inkorrekt",
-    "A text message has been sent to": "Eine Textnachricht wurde gesandt an",
+    "A text message has been sent to": "Eine Textnachricht wurde gesendet an",
    "Please enter the code it contains:": "Bitte gebe den Code ein, den sie enthält:",
    "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?",
@ -786,13 +784,13 @@
    "This image cannot be displayed.": "Dieses Bild kann nicht angezeigt werden.",
    "Error decrypting video": "Video-Entschlüsselung fehlgeschlagen",
    "Import room keys": "Importiere Raum-Schlüssel",
-    "File to import": "Datei zum Importieren",
+    "File to import": "Zu importierende Datei",
    "Failed to invite the following users to the %(roomName)s room:": "Das Einladen der folgenden Nutzer in den Raum \"%(roomName)s\" ist fehlgeschlagen:",
-    "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.": "Bist du sicher, dass du dieses Ereignis löschen willst? Wenn du einen Raum-Namen- oder Themen-Änderung löscht, kann dies die Änderung rückgängig machen.",
+    "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.": "Bist du sicher, dass du dieses Ereignis entfernen (löschen) möchtest? Wenn du die Änderung eines Raum-Namens oder eines Raum-Themas löscht, kann dies dazu führen, dass die ursprüngliche Änderung rückgängig gemacht wird.",
    "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.": "Dieser Prozess erlaubt es dir, die Schlüssel für in verschlüsselten Räumen empfangene Nachrichten in eine lokale Datei zu exportieren. In Zukunft wird es möglich sein, diese Datei in einen anderen Matrix-Client zu importieren, sodass dieser Client ebenfalls diese Nachrichten entschlüsseln kann.",
    "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.": "Die exportierte Datei erlaubt jedem, der diese lesen kann, jede verschlüsselte Nachricht zu entschlüsseln die du sehen kannst. Du solltest sie also sicher verwahren. Um dabei zu helfen, solltest du unten eine Passphrase eingeben, die dazu verwendet wird, die exportierten Daten zu verschlüsseln. Anschließend ist es nur möglich die Daten zu lesen, wenn dieselbe Passphrase verwendet wird.",
-    "Analytics": "Analyse",
-    "Opt out of analytics": "Zustimmung zur Übermittlung von Analysedaten verweigern",
+    "Analytics": "Anonymisierte Analysedaten",
+    "Opt out of analytics": "Zustimmung zur Übermittlung von anonymisierten Analysedaten verweigern",
    "Riot collects anonymous analytics to allow us to improve the application.": "Riot sammelt anonymisierte Analysedaten, um die Anwendung kontinuierlich verbessern zu können.",
    "Add an Integration": "Eine Integration hinzufügen",
    "Removed or unknown message type": "Gelöschte oder unbekannter Nachrichten-Typ",
@ -811,14 +809,14 @@
    "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.": "Wenn du zuvor eine aktuellere Version von Riot verwendet hast, ist deine Sitzung eventuell inkompatibel mit dieser Version. Bitte schließe dieses Fenster und kehre zur aktuelleren Version zurück.",
    "Blacklist": "Blockieren",
    "Unblacklist": "Entblockieren",
-    "Unverify": "Entverifizieren",
+    "Unverify": "Verifizierung widerrufen",
    "This Home Server would like to make sure you are not a robot": "Dieser Heimserver möchte sicherstellen, dass du kein Roboter bist",
    "Drop file here to upload": "Datei hier loslassen zum hochladen",
    "Idle": "Untätig",
    "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.": "Wir empfehlen dir für jedes Gerät durch den Verifizierungsprozess zu gehen um zu bestätigen, dass sie ihrem legitimierten Besitzer gehören, aber du kannst die Nachrichten ohne Verifizierung erneut senden, wenn du es vorziehst.",
-    "Ongoing conference call%(supportedText)s. %(joinText)s": "Laufendes Konferenzgespräch%(supportedText)s. %(joinText)s",
+    "Ongoing conference call%(supportedText)s.": "Laufendes Konferenzgespräch%(supportedText)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?": "Du wirst jetzt auf die Website eines Drittanbieters weitergeleitet, damit du dein Konto  für die Verwendung von %(integrationsUrl)s authentifizieren kannst. Möchtest du fortfahren?",
-    "Disable URL previews for this room (affects only you)": "Deaktiviere die URL-Vorschau für diesen Raum (betrifft nur dich)",
+    "Disable URL previews for this room (affects only you)": "URL-Vorschau für diesen Raum deaktivieren (betrifft nur dich)",
    "Start automatically after system login": "Starte automatisch nach System-Login",
    "Desktop specific": "Desktopspezifisch",
    "Jump to first unread message.": "Zur ersten ungelesenen Nachricht springen.",
@ -828,32 +826,28 @@
    "Invited": "Eingeladen",
    "Set a Display Name": "Setze einen Anzeigenamen",
    "for %(amount)ss": "für %(amount)ss",
-    "for %(amount)sm": "für %(amount)sm",
+    "for %(amount)sm": "seit %(amount)smin",
    "for %(amount)sh": "für %(amount)sh",
    "for %(amount)sd": "für %(amount)sd",
-    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s entfernte Raum-Bild.",
+    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s hat das Raum-Bild entfernt.",
    "VoIP": "VoIP",
    "No Webcams detected": "Keine Webcam erkannt",
-    "Missing Media Permissions, click here to request.": "Fehlende Medienberechtigungen. Klicke hier um anzufragen.",
-    "No Microphones detected": "Keine Mikrophone erkannt",
+    "Missing Media Permissions, click here to request.": "Fehlende Medienberechtigungen. Hier klicken, um Berechtigungen zu beantragen.",
+    "No Microphones detected": "Keine Mikrofone erkannt",
    "No media permissions": "Keine Medienberechtigungen",
-    "You may need to manually permit Riot to access your microphone/webcam": "Du musst anscheinend Riot manuell den Zugriff zu deinem Mikrophon/Webcam gewähren",
+    "You may need to manually permit Riot to access your microphone/webcam": "Gegebenenfalls kann es notwendig sein, dass du Riot manuell den Zugriff auf dein Mikrofon bzw. deine Webcam gewähren musst",
    "Default Device": "Standard-Gerät",
-    "Microphone": "Mikrophone",
+    "Microphone": "Mikrofon",
    "Camera": "Kamera",
-    "Conference call failed.": "Konferenzgespräch fehlgeschlagen.",
-    "Conference calling is in development and may not be reliable.": "Konferenzgespräche sind in der Entwicklung und möglicherweise nicht zuverlässig.",
    "Device already verified!": "Gerät bereits verifiziert!",
    "Export": "Export",
-    "Failed to register as guest:": "Registrieren als Gast schlug fehl:",
+    "Failed to register as guest:": "Die Registrierung als Gast ist fehlgeschlagen:",
    "Guest access is disabled on this Home Server.": "Gastzugang ist auf diesem Heimserver deaktivert.",
-    "Guest users can't create new rooms. Please register to create room and start a chat.": "Gastnutzer können keine neuen Räume erstellen. Bitte registriere dich um Räume zu erstellen und Chats zu starten.",
    "Import": "Import",
    "Incorrect username and/or password.": "Inkorrekter Nutzername und/oder Passwort.",
    "Results from DuckDuckGo": "Ergebnisse von DuckDuckGo",
-    "Server unavailable, overloaded, or something else went wrong.": "Server nicht verfügbar, überlastet oder etwas anderes lief falsch.",
    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Den Signaturschlüssel den du bereitstellst stimmt mit dem Schlüssel den du von %(userId)s's Gerät %(deviceId)s empfangen hast überein. Gerät als verifiziert markiert.",
-    "Add a topic": "Füge Thema hinzu",
+    "Add a topic": "Thema hinzufügen",
    "Anyone": "Jeder",
    "Are you sure you want to leave the room '%(roomName)s'?": "Bist du sicher, dass du den Raum '%(roomName)s' verlassen willst?",
    "Custom level": "Benutzerdefiniertes Berechtigungslevel",
@ -862,13 +856,13 @@
    "device id: ": "Geräte-ID: ",
    "Device key:": "Geräte-Schlüssel:",
    "Email address (optional)": "E-Mail-Adresse (optional)",
-    "List this room in %(domain)s's room directory?": "Liste diesen Raum in %(domain)s's Raumverzeichnis?",
-    "Mobile phone number (optional)": "Handynummer (optional)",
+    "List this room in %(domain)s's room directory?": "Diesen Raum zum Raum-Verzeichnis von %(domain)s hinzufügen?",
+    "Mobile phone number (optional)": "Mobilfunknummer (optional)",
    "Password:": "Passwort:",
    "Register": "Registrieren",
    "Save": "Speichern",
-    "Setting a user name will create a fresh account": "Einen Nutzernamen zu setzen wird ein neues Konto erzeugen",
-    "Tagged as: ": "Getaggt als: ",
+    "Setting a user name will create a fresh account": "Die Eingabe eines Benutzernamens wird ein neues Konto erzeugen",
+    "Tagged as: ": "Markiert als: ",
    "This Home Server does not support login using email address.": "Dieser Heimserver unterstützt den Login mittels E-Mail-Adresse nicht.",
    "There was a problem logging in.": "Es gab ein Problem beim anmelden.",
    "Unknown (user, device) pair:": "Unbekanntes (Nutzer-/Gerät-)Paar:",
@ -876,17 +870,105 @@
    "Unrecognised command:": "Unbekannter Befehl:",
    "Unrecognised room alias:": "Unbekannter Raum-Alias:",
    "Use compact timeline layout": "Nutze kompaktes Zeitstrahl-Layout",
-    "Verified key": "Bestätigter Schlüssel",
+    "Verified key": "Verifizierter Schlüssel",
    "WARNING: Device already verified, but keys do NOT MATCH!": "WARNUNG: Gerät bereits verifiziert, aber Schlüssel sind NICHT GLEICH!",
    "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!": "WARNUNG: SCHLÜSSEL-VERIFIZIERUNG FEHLGESCHLAGEN! Der Signatur-Schlüssel für %(userId)s und Gerät %(deviceId)s ist \"%(fprint)s\" welche nicht dem bereitgestellten Schlüssel \"%(fingerprint)s\" übereinstimmen. Dies kann bedeuten, dass deine Kommunikation abgefangen wird!",
-    "You are already in a call.": "Du bist bereits in einem Gespräch.",
-    "You cannot place a call with yourself.": "Du kannst keinen Anruf mit dir selbst starten.",
-    "You cannot place VoIP calls in this browser.": "Du kannst keine VoIP-Gespräche in diesem Browser starten.",
    "You have <a>disabled</a> URL previews by default.": "Du hast die URL-Vorschau standardmäßig <a>deaktiviert</a>.",
    "You have <a>enabled</a> URL previews by default.": "Du hast die URL-Vorschau standardmäßig <a>aktiviert</a>.",
-    "You have entered an invalid contact. Try using their Matrix ID or email address.": "Du hast einen invaliden Kontakt eingegeben. Versuche es mit der Matrix-ID oder E-Mail-Adresse.",
-    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Deine E-Mail-Adresse scheint nicht mit einer Matrix-ID auf diesem Heimserver verbunden zu sein.",
-    "$senderDisplayName changed the room avatar to <img/>": "$senderDisplayName änderte das Raum-Bild zu <img/>",
-    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s änderte das Bild für %(roomName)s",
-    "Hide removed messages": "Verberge gelöschte Nachrichten"
+    "You have entered an invalid contact. Try using their Matrix ID or email address.": "Du hast einen ungültigen Kontakt eingegeben. Versuche es mit der Matrix-ID oder der E-Mail-Adresse.",
+    "$senderDisplayName changed the room avatar to <img/>": "$senderDisplayName hat das Raum-Bild geändert zu <img/>",
+    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s hat das Raum-Bild für %(roomName)s geändert",
+    "Hide removed messages": "Gelöschte Nachrichten verbergen",
+    "Start new chat": "Neuen Chat starten",
+    "Disable markdown formatting": "Markdown-Formatierung deaktivieren",
+    "Add": "Hinzufügen",
+    "%(count)s new messages.one": "%(count)s neue Nachricht",
+    "%(count)s new messages.other": "%(count)s neue Nachrichten",
+    "Error: Problem communicating with the given homeserver.": "Fehler: Problem beim kommunizieren mit dem angegebenen Heimserver.",
+    "Failed to fetch avatar URL": "Abrufen der Avatar-URL fehlgeschlagen",
+    "The phone number entered looks invalid": "Die eingegebene Telefonnummer scheint ungültig zu sein",
+    "This room is private or inaccessible to guests. You may be able to join if you register.": "Dieser Raum ist privat oder für Gäste nicht betretbar. Du kannst evtl. beitreten wenn du dich registrierst.",
+    "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Es wurde versucht, einen bestimmten Punkt im Chatverlauf dieses Raumes zu laden. Dir fehlt jedoch die Berechtigung, die betreffende Nachricht zu sehen.",
+    "Tried to load a specific point in this room's timeline, but was unable to find it.": "Es wurde versucht, einen bestimmten Punkt im Chatverlauf dieses Raumes zu laden, der Punkt konnte jedoch nicht gefunden werden.",
+    "Uploading %(filename)s and %(count)s others.zero": "%(filename)s wird hochgeladen",
+    "Uploading %(filename)s and %(count)s others.one": "%(filename)s und %(count)s weitere Dateien werden hochgeladen",
+    "Uploading %(filename)s and %(count)s others.other": "%(filename)s und %(count)s weitere Dateien werden hochgeladen",
+    "You must <a>register</a> to use this functionality": "Du musst dich <a>registrieren</a>, um diese Funktionalität nutzen zu können",
+    "<a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.": "<a>Alle erneut senden</a> oder <a>alle verwerfen</a>. Du kannst auch einzelne Nachrichten erneut senden oder verwerfen.",
+    "Create new room": "Neuen Raum erstellen",
+    "Welcome page": "Willkommensseite",
+    "Room directory": "Raum-Verzeichnis",
+    "Start chat": "Chat starten",
+    "New Password": "Neues Passwort",
+    "Start chatting": "Chat beginnen",
+    "Start Chatting": "Starte Gespräche",
+    "Click on the button below to start chatting!": "Unten auf den Button klicken, um einen Chat zu beginnen!",
+    "Create a new chat or reuse an existing one": "Neuen Chat erstellen oder einen vorhandenen Chat fortsetzen",
+    "You already have existing direct chats with this user:": "Du hast bereits direkte Chats mit diesem Nutzer:",
+    "Username available": "Benutzername ist verfügbar",
+    "Username not available": "Benutzername ist nicht verfügbar",
+    "Something went wrong!": "Etwas ging schief!",
+    "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Dies wird dein zukünftiger Benutzername auf dem <span></span> Heimserver. Alternativ kannst du auch einen <a>anderen Server</a> auswählen.",
+    "If you already have a Matrix account you can <a>log in</a> instead.": "Wenn du bereits ein Matrix-Benutzerkonto hast, kannst du dich stattdessen auch direkt <a>anmelden</a>.",
+    "Home": "Start",
+    "Username invalid: %(errMessage)s": "Ungültiger Benutzername: %(errMessage)s",
+    "a room": "einen Raum",
+    "Accept": "Akzeptieren",
+    "Active call (%(roomName)s)": "Aktiver Anruf (%(roomName)s)",
+    "Admin tools": "Admin-Werkzeuge",
+    "And %(count)s more...": "Und %(count)s weitere...",
+    "Alias (optional)": "Alias (optional)",
+    "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Verbindung zum Heimserver fehlgeschlagen - bitte prüfe deine Verbindung, stelle sicher, dass dem <a>SSL-Zertifikat deines Heimservers</a> vertraut wird und keine Browser-Erweiterung Anfragen blockiert.",
+    "<a>Click here</a> to join the discussion!": "<a>Klicke hier</a> um der Diskussion beizuwohnen!",
+    "Close": "Schließen",
+    "Custom": "Erweitert",
+    "Decline": "Ablehnen",
+    "Disable Notifications": "Benachrichtigungen deaktivieren",
+    "Drop File Here": "Lasse Datei hier los",
+    "Enable Notifications": "Benachrichtigungen aktivieren",
+    "Encrypted by a verified device": "Von einem vertrauten Gerät verschlüsselt",
+    "Encrypted by an unverified device": "Von einem nicht vertrauten Gerät verschlüsselt",
+    "Failed to upload profile picture!": "Hochladen des Profilbild's fehlgeschlagen!",
+    "Incoming call from %(name)s": "Eingehender Anruf von %(name)s",
+    "Incoming video call from %(name)s": "Eingehender Video-Anruf von %(name)s",
+    "Incoming voice call from %(name)s": "Eingehender Sprach-Anruf von %(name)s",
+    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Mit <voiceText>Sprache</voiceText> oder <videoText>Video</videoText> beitreten.",
+    "Last seen": "Zuletzt gesehen",
+    "Level:": "Level:",
+    "No display name": "Kein Anzeigename",
+    "Otherwise, <a>click here</a> to send a bug report.": "Ansonsten <a>klicke hier</a> um einen Fehlerbericht zu senden.",
+    "Private Chat": "Privater Chat",
+    "Public Chat": "Öffentlicher Chat",
+    "Reason: %(reasonText)s": "Grund: %(reasonText)s",
+    "Rejoin": "Erneut beitreten",
+    "Room contains unknown devices": "Raum enthält unbekannte Geräte",
+    "%(roomName)s does not exist.": "%(roomName)s existert nicht.",
+    "%(roomName)s is not accessible at this time.": "%(roomName)s ist aktuell nicht zugreifbar.",
+    "Searching known users": "Suche nach bekannten Nutzern",
+    "Seen by %(userName)s at %(dateTime)s": "Gesehen von %(userName)s um %(dateTime)s",
+    "Send anyway": "Trotzdem senden",
+    "Set": "Setze",
+    "Start authentication": "Starte Authentifizierung",
+    "Show Text Formatting Toolbar": "Zeige text-formatierende Werkzeugleiste",
+    "This invitation was sent to an email address which is not associated with this account:": "Diese Einledung wurde an eine E-Mail-Adresse gesendet, die nicht mit diesem Konto verknüpft ist:",
+    "This room": "Dieser Raum",
+    "To link to a room it must have <a>an address</a>.": "Um einen Raum zu verlinken, muss er <a>eine Adresse</a> haben.",
+    "Undecryptable": "Nicht entschlüsselbar",
+    "Unable to ascertain that the address this invite was sent to matches one associated with your account.": "Kann nicht feststellen, ob die Adresse an die diese Einladung gesendet wurde mit einer übereinstimmt, die zu deinem Konto gehört.",
+    "Unencrypted message": "Nicht verschlüsselbare Nachricht",
+    "unknown caller": "Unbekannter Anrufer",
+    "Unnamed Room": "Unbenannter Raum",
+    "Unverified": "Nicht verifiziert",
+    "Upload new:": "Neue(s) hochladen:",
+    "%(user)s is a": "%(user)s ist ein",
+    "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (Berechtigungslevel %(powerLevelNumber)s)",
+    "Verified": "Verifiziert",
+    "Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?": "Möchtest du diese Einladung <acceptText>akzeptieren</acceptText> oder <declineText>ablehnen</declineText>?",
+    "You have been banned from %(roomName)s by %(userName)s.": "Du wurdest von %(userName)s aus dem Raum %(roomName)s ausgeschlossen.",
+    "You have been kicked from %(roomName)s by %(userName)s.": "Du wurdest von %(userName)s aus dem Raum %(roomName)s gekickt.",
+    "You may wish to login with a different account, or add this email to this account.": "Du möchtest dich evtl. mit einem anderen Konto anmelden oder diese E-Mail-Adresse diesem Konto hinzufügen.",
+    "Your home server does not support device management.": "Dein Heimserver unterstützt kein Geräte-Management.",
+    "(~%(count)s results).one": "(~%(count)s Ergebnis)",
+    "(~%(count)s results).other": "(~%(count)s Ergebnis)",
+    "Device Name": "Geräte-Name"
 }
--- a/src/i18n/strings/el.json
+++ b/src/i18n/strings/el.json
@ -0,0 +1,391 @@
+{
+    "af": "Αφρικάνικα",
+    "Error": "Σφάλμα",
+    "Failed to forget room %(errCode)s": "Δεν ήταν δυνατή η διαγραφή του δωματίου (%(errCode)s)",
+    "Failed to join the room": "Δεν ήταν δυνατή η σύνδεση στο δωμάτιο",
+    "Mute": "Σίγαση",
+    "Notifications": "Ειδοποιήσεις",
+    "Operation failed": "Η λειτουργία απέτυχε",
+    "Please Register": "Παρακαλούμε εγγραφείτε",
+    "Remove": "Αφαίρεση",
+    "Search": "Αναζήτηση",
+    "Settings": "Ρυθμίσεις",
+    "unknown error code": "άγνωστος κωδικός σφάλματος",
+    "Sunday": "Κυριακή",
+    "ar-ae": "Αραβικά (Η.Α.Ε)",
+    "ar-bh": "Αραβικά (Μπαχρέιν)",
+    "ar-dz": "Αραβικά (Αλγερία)",
+    "ar-eg": "Αραβικά (Αίγυπτος)",
+    "ar-iq": "Αραβικά (Ιράκ)",
+    "ar-jo": "Αραβικά (Ιορδανία)",
+    "ar-kw": "Αραβικά (Κουβέιτ)",
+    "ar-lb": "Αραβικά (Λίβανος)",
+    "ar-ly": "Αραβικά (Λιβύη)",
+    "ar-ma": "Αραβικά (Μαρόκο)",
+    "ar-om": "Αραβικά (Ομάν)",
+    "ar-qa": "Αραβικά (Κατάρ)",
+    "ar-sa": "Αραβικά (Σαουδική Αραβία)",
+    "ar-sy": "Αραβικά (Συρία)",
+    "ar-tn": "Αραβικά (Τυνισία)",
+    "ar-ye": "Αραβικά (Υεμένη)",
+    "accept": "αποδοχή",
+    "%(targetName)s accepted an invitation.": "%(targetName)s δέχτηκε την πρόσκληση.",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s δέχτηκες την πρόσκληση για %(displayName)s.",
+    "Account": "Λογαριασμός",
+    "Add a topic": "Πρόσθεσε μια περιγραφή",
+    "Add email address": "Πρόσθεσε ένα email",
+    "Add phone number": "Πρόσθεσε έναν αριθμό τηλεφώνου",
+    "Admin": "Διαχειριστής",
+    "VoIP": "VoIP",
+    "No Microphones detected": "Δεν εντοπίστηκε μικρόφωνο",
+    "No Webcams detected": "Δεν εντοπίστηκε κάμερα",
+    "Default Device": "Προεπιλεγμένη Συσκευή",
+    "Microphone": "Μικρόφωνο",
+    "Camera": "Κάμερα",
+    "Advanced": "Προχωρημένα",
+    "Algorithm": "Αλγόριθμος",
+    "Hide removed messages": "Κρύψε διαγραμμένα μηνύματα",
+    "Authentication": "Πιστοποίηση",
+    "and": "και",
+    "An email has been sent to": "Ένα email στάλθηκε σε",
+    "A new password must be entered.": "Ο νέος κωδικός πρέπει να εισαχθεί.",
+    "%(senderName)s answered the call.": "Ο χρήστης %(senderName)s απάντησε.",
+    "An error has occurred.": "Ένα σφάλμα προέκυψε",
+    "Anyone": "Oποιοσδήποτε",
+    "Are you sure?": "Είσαι σίγουρος;",
+    "Are you sure you want to leave the room '%(roomName)s'?": "Είσαι σίγουρος οτι θές να φύγεις από το δωμάτιο '%(roomName)s';",
+    "Are you sure you want to reject the invitation?": "Είσαι σίγουρος οτι θες να απορρίψεις την πρόσκληση;",
+    "Are you sure you want to upload the following files?": "Είσαι σίγουρος οτι θές να ανεβάσεις τα ακόλουθα αρχεία;",
+    "Attachment": "Επισύναψη",
+    "%(senderName)s banned %(targetName)s.": "Ο χρήστης %(senderName)s έδιωξε τον χρήστη %(targetName)s.",
+    "Autoplay GIFs and videos": "Αυτόματη αναπαραγωγή GIFs και βίντεο",
+    "Bug Report": "Αναφορά Σφάλματος",
+    "anyone": "οποιοσδήποτε",
+    "Anyone who knows the room's link, apart from guests": "Oποιοσδήποτε",
+    "all room members, from the point they joined": "όλα τα μέλη του δωματίου, από τη στιγμή που συνδέθηκαν",
+    "%(items)s and %(lastItem)s": "%(items)s  %(lastItem)s",
+    "be": "Λευκορώσικα",
+    "bg": "Βουλγάρικα",
+    "ca": "Καταλανικά",
+    "cs": "Τσέχικα",
+    "da": "Δανέζικα",
+    "de-at": "Γερμανικά (Αυστρία)",
+    "de-ch": "Γερμανικά (Ελβετία)",
+    "de": "Γερμανικά",
+    "de-li": "Γερμανικά (Λιχτενστάιν)",
+    "de-lu": "Γερμανικά (Λουξεμβούργο)",
+    "el": "Ελληνικά",
+    "en-au": "Αγγλικά (Αυστραλία)",
+    "en-bz": "Αγγλικά (Μπελίζε)",
+    "en-ca": "Αγγλικά (Καναδάς)",
+    "en": "Αγγλικά",
+    "en-gb": "Αγγλικά (Ηνωμένο Βασίλειο)",
+    "en-ie": "Αγγλικά (Ιρλανδία)",
+    "en-jm": "Αγγλικά (Τζαμάικα)",
+    "en-nz": "Αγγλικά (Νέα Ζηλανδία)",
+    "en-tt": "Αγγλικά (Τρινιντάντ)",
+    "en-us": "Αγγλικά (Ηνωμένες Πολιτείες)",
+    "en-za": "Αγγλικά (Νότια Αφρική)",
+    "es-ar": "Ισπανικά (Αργεντινή)",
+    "es-bo": "Ισπανικά (Βολιβία)",
+    "es-cl": "Ισπανικά (Χιλή)",
+    "es-co": "Ισπανικά (Κολομβία)",
+    "es-cr": "Ισπανικά (Κόστα Ρίκα)",
+    "es-do": "Ισπανικά (Δομινικανή Δημοκρατία)",
+    "es-ec": "Ισπανικά (Ισημερινός)",
+    "es-gt": "Ισπανικά (Γουατεμάλα)",
+    "es-hn": "Ισπανικά (Ονδούρα)",
+    "es-mx": "Ισπανικά (Μεξικό)",
+    "es-ni": "Ισπανικά (Νικαράγουα)",
+    "es-pa": "Ισπανικά (Παναμάς)",
+    "es-pe": "Ισπανικά (Περού)",
+    "es-pr": "Ισπανικά (Πουέρτο Ρίκο)",
+    "es-py": "Ισπανικά (Παραγουάη)",
+    "es": "Ισπανικά (Ισπανία)",
+    "es-sv": "Ισπανικά (Ελ Σαλβαδόρ)",
+    "es-uy": "Ισπανικά (Ουρουγουάη)",
+    "es-ve": "Ισπανικά (Βενεζουέλα)",
+    "et": "Εσθονικά",
+    "eu": "Βασκική (βασκική)",
+    "fa": "Φάρσι",
+    "fi": "Φινλανδικά",
+    "fo": "Φαρόε",
+    "fr-be": "Γαλλικά (Βέλγιο)",
+    "fr-ca": "Γαλλικά (Καναδάς)",
+    "fr-ch": "Γαλλικά (Ελβετία)",
+    "fr": "Γαλλικά",
+    "fr-lu": "Γαλλικά (Λουξεμβούργο)",
+    "ga": "Ιρλανδικά",
+    "gd": "Γαελική (Σκωτία)",
+    "he": "Εβραϊκά",
+    "hi": "Χίντι",
+    "hr": "Κροατικά",
+    "hu": "Ουγγρικά",
+    "is": "Ισλανδικά",
+    "it-ch": "Ιταλικά (Ελβετία)",
+    "it": "Ιταλικά",
+    "ja": "Ιαπωνικά",
+    "ji": "Γίντις",
+    "ko": "Κορεάτικα",
+    "lt": "Λιθουανικά",
+    "mk": "Μακεδονική (ΠΓΔΜ)",
+    "ms": "Μαλαισίας",
+    "mt": "Μαλτέζικα",
+    "nl-be": "Ολλανδικά (Βέλγιο)",
+    "nl": "Ολλανδικά",
+    "no": "Νορβηγικά",
+    "pl": "Πολωνέζικα",
+    "pt-br": "Πορτογαλικά Βραζιλίας",
+    "pt": "Πορτογαλικά",
+    "rm": "Ραιτορωμαϊκά",
+    "ro-mo": "Ρουμάνικα (Δημοκρατία της Μολδαβίας)",
+    "ro": "Ρουμάνικα",
+    "ru-mo": "Ρώσικα (Δημοκρατία της Μολδαβίας)",
+    "ru": "Ρώσικα",
+    "sb": "Σορβικά",
+    "sk": "Σλοβάκικα",
+    "sl": "Σλοβενικά",
+    "sq": "Αλβανικά",
+    "sr": "Σερβικά",
+    "sv-fi": "Σουηδικά (Φινλανδία)",
+    "sv": "Σουηδικά",
+    "sx": "Σούτου",
+    "sz": "Σάμη (Λαπωνικά)",
+    "th": "Ταϊλανδέζικα",
+    "tn": "Τσουάνα",
+    "tr": "Τουρκικά",
+    "ts": "Τσονγκά",
+    "uk": "Ουκρανικά",
+    "ur": "Ουρντού",
+    "ve": "Venda",
+    "vi": "Βιετναμέζικα",
+    "xh": "Xhosa",
+    "zh-cn": "Κινέζικα (ΛΔΚ)",
+    "zh-hk": "Κινέζικα (ΕΔΠ Χονγκ Κονγκ)",
+    "zh-sg": "Κινέζικα (Σιγκαπούρη)",
+    "zh-tw": "Κινέζικα (Ταϊβάν)",
+    "zu": "Ζουλού",
+    "id": "Ινδονησιακά",
+    "lv": "Λετονικά",
+    "A registered account is required for this action": "Ένας εγγεγραμμένος λογαριασμός απαιτείται για αυτή την ενέργεια",
+    "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Ένα μήνυμα στάλθηκε στο +%(msisdn)s. Παρακαλώ γράψε τον κωδικό επαλήθευσης που περιέχει",
+    "Access Token:": "Κωδικός Πρόσβασης:",
+    "Always show message timestamps": "Δείχνε πάντα ένδειξη ώρας στα μηνύματα",
+    "all room members": "όλα τα μέλη του δωματίου",
+    "all room members, from the point they are invited": "όλα τα μέλη του δωματίου, από τη στιγμή που προσκλήθηκαν",
+    "an address": "μία διεύθηνση",
+    "%(items)s and %(remaining)s others": "%(items)s και %(remaining)s ακόμα",
+    "%(items)s and one other": "%(items)s και ένας ακόμα",
+    "and %(overflowCount)s others...": "και %(overflowCount)s άλλοι...",
+    "and one other...": "και ένας ακόμα...",
+    "%(names)s and %(lastPerson)s are typing": "%(names)s και %(lastPerson)s γράφουν",
+    "%(names)s and one other are typing": "%(names)s και ένας ακόμα γράφουν",
+    "%(names)s and %(count)s others are typing": "%(names)s και %(count)s άλλοι γράφουν",
+    "Anyone who knows the room's link, including guests": "Οποιοσδήποτε γνωρίζει τον σύνδεδμο του δωματίου, συμπεριλαμβάνωντας τους επισκέπτες",
+    "Blacklisted": "Στη μαύρη λίστα",
+    "Can't load user settings": "Δεν είναι δυνατή η φόρτωση των ρυθμίσεων χρήστη",
+    "Change Password": "Αλλαγή Κωδικού",
+    "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s.": "ο χρήστης %(senderName)s άλλαξε το όνομά του από %(oldDisplayName)s σε %(displayName)s.",
+    "%(senderName)s changed their profile picture.": "ο χρήστης %(senderName)s άλλαξε τη φωτογραφία του προφίλ του.",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "Ο χρήστης %(senderDisplayName)s άλλαξε το όνομα του δωματίου σε %(roomName)s.",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "Ο χρήστης %(senderDisplayName)s άλλαξε το θέμα σε \"%(topic)s\".",
+    "Clear Cache and Reload": "Καθάρισε την μνήμη και Ανανέωσε",
+    "Clear Cache": "Καθάρισε την μνήμη",
+    "Bans user with given id": "Διώχνει τον χρήστη με το συγκεκριμένο id",
+    "%(senderDisplayName)s removed the room name.": "Ο χρήστης %(senderDisplayName)s διέγραψε το όνομα του δωματίου.",
+    "Changes your display nickname": "Αλλάζει το όνομα χρήστη",
+    "Click here": "Κάνε κλικ εδώ",
+    "Drop here %(toAction)s": "Απόθεση εδώ %(toAction)s",
+    "Conference call failed.": "Η κλήση συνδιάσκεψης απέτυχε.",
+    "powered by Matrix": "βασισμένο στο πρωτόκολλο Matrix",
+    "Confirm password": "Επιβεβαίωση κωδικού",
+    "Confirm your new password": "Επιβεβαίωση του νέου κωδικού",
+    "Continue": "Συνέχεια",
+    "Create an account": "Δημιουργία λογαριασμού",
+    "Create Room": "Δημιουργία Δωματίου",
+    "Cryptography": "Κρυπτογραφία",
+    "Current password": "Τωρινός κωδικός",
+    "Curve25519 identity key": "Κλειδί ταυτότητας Curve25519",
+    "Custom level": "Προσαρμοσμένο επίπεδο",
+    "/ddg is not a command": "/ddg δεν αναγνωρίζεται ως εντολή",
+    "Deactivate Account": "Απενεργοποίηση Λογαριασμού",
+    "Deactivate my account": "Απενεργοποίηση του λογαριασμού μου",
+    "decline": "απόρριψη",
+    "Decrypt %(text)s": "Αποκρυπτογράφησε %(text)s",
+    "Decryption error": "Σφάλμα αποκρυπτογράφησης",
+    "(default: %(userName)s)": "(προεπιλογή: %(userName)s)",
+    "Delete": "Διαγραφή",
+    "Default": "Προεπιλογή",
+    "Device already verified!": "Η συσκευή έχει ήδη επαληθευτεί!",
+    "Device ID": "ID Συσκευής",
+    "Device ID:": "ID Συσκευής:",
+    "device id: ": "id συσκευής: ",
+    "Device key:": "Κλειδί Συσκευής:",
+    "Devices": "Συσκευές",
+    "Direct Chat": "Απευθείας συνομιλία",
+    "Direct chats": "Απευθείας συνομιλίες",
+    "disabled": "ανενεργό",
+    "Disinvite": "Ανακάλεσε πρόσκληση",
+    "Display name": "Όνομα χρήστη",
+    "Download %(text)s": "Κατέβασε %(text)s",
+    "Ed25519 fingerprint": "Αποτύπωμα Ed25519",
+    "Email": "Ηλ. Αλληλογραφία",
+    "Email address": "Διεύθυνση email",
+    "Email address (optional)": "Διεύθυνση email (προαιρετικό)",
+    "Email, name or matrix ID": "Email, όνομα ή matrix ID",
+    "Emoji": "Εικονίδια",
+    "enabled": "ενεργό",
+    "Encrypted messages will not be visible on clients that do not yet implement encryption": "Τα κρυπτογραφημένα μηνύματα δεν θα είναι ορατά σε εφαρμογές που δεν παρέχουν τη δυνατότητα κρυπτογράφησης",
+    "Encrypted room": "Κρυπτογραφημένο δωμάτιο",
+    "%(senderName)s ended the call.": "%(senderName)s τερμάτισε την κλήση.",
+    "End-to-end encryption information": "Πληροφορίες σχετικά με τη κρυπτογράφηση από άκρο σε άκρο (End-to-end encryption)",
+    "Error decrypting attachment": "Σφάλμα κατά την αποκρυπτογράφηση της επισύναψης",
+    "Event information": "Πληροφορίες μηνύματος",
+    "Existing Call": "Υπάρχουσα Κλήση",
+    "Export": "Εξαγωγή",
+    "Export E2E room keys": "Εξαγωγή κλειδιών κρυπτογραφίας για το δωμάτιο",
+    "Failed to change password. Is your password correct?": "Δεν ήταν δυνατή η αλλαγή του κωδικού πρόσβασης. Είναι σωστός ο κωδικός πρόσβασης;",
+    "Failed to delete device": "Δεν ήταν δυνατή η διαγραφή της συσκευής",
+    "Failed to join room": "Δεν ήταν δυνατή η σύνδεση στο δωμάτιο",
+    "Failed to leave room": "Δεν ήταν δυνατή η αποχώρηση από το δωμάτιο",
+    "Failed to mute user": "Δεν ήταν δυνατή η σίγαση του χρήστη",
+    "Failed to register as guest:": "Δεν ήταν δυνατή η εγγραφή ως επισκέπτης:",
+    "Failed to reject invite": "Δεν ήταν δυνατή η απόρριψη της πρόσκλησης",
+    "Failed to reject invitation": "Δεν ήταν δυνατή η απόρριψη της πρόσκλησης",
+    "Failed to save settings": "Δεν ήταν δυνατή η αποθήκευση των ρυθμίσεων",
+    "Failed to send email": "Δεν ήταν δυνατή η απστολή email",
+    "Failed to verify email address: make sure you clicked the link in the email": "Δεν ήταν δυνατή η επαλήθευση του email: βεβαιωθείτε οτι κάνατε κλικ στον σύνδεσμο που σας στάλθηκε",
+    "Favourite": "Αγαπημένο",
+    "favourite": "αγαπημένο",
+    "Favourites": "Αγαπημένα",
+    "Fill screen": "Γέμισε την οθόνη",
+    "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.": "Για λόγους ασφαλείας, τα κλειδιά κρυπτογράφησης θα διαγράφονται από τον φυλλομετρητή κατά την αποσύνδεση σας. Εάν επιθυμείτε να αποκρυπτογραφήσετε τις συνομιλίες σας στο μέλλον, εξάγετε τα κλειδιά σας και κρατήστε τα ασφαλή.",
+    "Found a bug?": "Βρήκατε κάποιο πρόβλημα;",
+    "Guest users can't upload files. Please register to upload.": "Οι επισκέπτες δεν μπορούν να ανεβάσουν αρχεία. Παρακαλώ εγγραφείτε πρώτα.",
+    "had": "είχε",
+    "Hangup": "Κλείσε",
+    "Historical": "Ιστορικό",
+    "Homeserver is": "Ο διακομιστής είναι",
+    "Identity Server is": "Διακομιστής Ταυτοποίησης",
+    "I have verified my email address": "Έχω επαληθεύσει το email μου",
+    "Import": "Εισαγωγή",
+    "Import E2E room keys": "Εισαγωγή κλειδιών κρυπτογράφησης",
+    "Incorrect username and/or password.": "Λανθασμένο όνομα χρήστη και/ή κωδικός.",
+    "Incorrect verification code": "Λανθασμένος κωδικός επαλήθευσης",
+    "Interface Language": "Γλώσσα Διεπαφής",
+    "Invalid Email Address": "Μη έγκυρο email",
+    "Invite new room members": "Προσκάλεσε νέα μέλη",
+    "Invited": "Προσκλήθηκε",
+    "Invites": "Προσκλήσεις",
+    "is a": "είναι ένα",
+    "%(displayName)s is typing": "ο χρήστης %(displayName)s γράφει",
+    "Sign in with": "Συνδέσου με",
+    "joined and left": "μπήκε και βγήκε",
+    "joined": "μπήκε",
+    "%(targetName)s joined the room.": "ο χρήστης %(targetName)s συνδέθηκε στο δωμάτιο.",
+    "Jump to first unread message.": "Πήγαινε στο πρώτο μη αναγνωσμένο μήνυμα.",
+    "%(senderName)s kicked %(targetName)s.": "Ο χρήστης %(senderName)s έδιωξε τον χρήστη %(targetName)s.",
+    "Kick": "Διώξε",
+    "Kicks user with given id": "Διώχνει χρήστες με το συγκεκριμένο id",
+    "Labs": "Πειραματικά",
+    "Leave room": "Φύγε από το δωμάτιο",
+    "left and rejoined": "έφυγε και ξανασυνδέθηκε",
+    "left": "έφυγε",
+    "%(targetName)s left the room.": "Ο χρήστης %(targetName)s έφυγε από το δωμάτιο.",
+    "Level": "Επίπεδο",
+    "List this room in %(domain)s's room directory?": "Να εμφανίζεται το δωμάτιο στο γενικό ευρετήριο του διακομιστή %(domain)s;",
+    "Local addresses for this room:": "Τοπική διεύθυνση για το δωμάτιο:",
+    "Logged in as:": "Συνδέθηκες ως:",
+    "Login as guest": "Συνδέσου ως επισκέπτης",
+    "Logout": "Αποσύνδεση",
+    "Low priority": "Χαμηλής προτεραιότητας",
+    "matrix-react-sdk version:": "έκδοση matrix-react-sdk:",
+    "Members only": "Μέλη μόνο",
+    "Message not sent due to unknown devices being present": "Το μήνυμα δεν στάλθηκε γιατί υπάρχουν άγνωστες συσκευές",
+    "Mobile phone number": "Αριθμός κινητού τηλεφώνου",
+    "Click here to fix": "Κάνε κλικ εδώ για διόρθωση",
+    "Command error": "Σφάλμα εντολής",
+    "Commands": "Εντολές",
+    "Conference calls are not supported in encrypted rooms": "Οι κλήσεις συνδιάσκεψης δεν είναι υποστηρίζονται σε κρυπτογραφημένα δωμάτια",
+    "Conference calls are not supported in this client": "Οι κλήσεις συνδιάσκεψης δεν είναι υποστηρίζονται από την εφαρμογή",
+    "Enable encryption": "Ενεργοποίηση κρυπτογραφίας",
+    "Enter Code": "Κωδικός",
+    "Failed to send request.": "Δεν ήταν δυνατή η αποστολή αιτήματος.",
+    "Failed to upload file": "Δεν ήταν δυνατό το ανέβασμα αρχείου",
+    "Failure to create room": "Δεν ήταν δυνατή η δημιουργία δωματίου",
+    "Join Room": "Συνδέσου",
+    "Moderator": "Συντονιστής",
+    "my Matrix ID": "το Matrix ID μου",
+    "Name": "Όνομα",
+    "New address (e.g. #foo:%(localDomain)s)": "Νέα διεύθυνση (e.g. #όνομα:%(localDomain)s)",
+    "New password": "Νέος κωδικός",
+    "New passwords don't match": "Οι νέοι κωδικοί είναι διαφορετικοί",
+    "New passwords must match each other.": "Οι νέοι κωδικόι πρέπει να ταιριάζουν.",
+    "none": "κανένα",
+    "(not supported by this browser)": "(δεν υποστηρίζεται από τον browser)",
+    "<not supported>": "<δεν υποστηρίζεται>",
+    "No more results": "Δεν υπάρχουν άλλα αποτελέσματα",
+    "No results": "Κανένα αποτέλεσμα",
+    "OK": "Εντάξει",
+    "olm version:": "έκδοση olm:",
+    "Password": "Κωδικός",
+    "Password:": "Κωδικός:",
+    "Passwords can't be empty": "",
+    "People": "Άτομα",
+    "Phone": "Τηλέφωνο",
+    "Register": "Εγγραφή",
+    "riot-web version:": "έκδοση riot-web:",
+    "Room Colour": "Χρώμα Δωματίου",
+    "Room name (optional)": "Όνομα Δωματίου (προαιρετικό)",
+    "Rooms": "Δωμάτια",
+    "Save": "Αποθήκευση",
+    "Search failed": "Η αναζήτηση απέτυχε",
+    "Send an encrypted message": "Στείλε ένα κρυπτογραφημένο μήνυμα",
+    "Send a message (unencrypted)": "Στείλε ένα μήνυμα (απλό)",
+    "sent an image": "έστειλε μια εικόνα",
+    "sent a video": "έστειλε ένα βίντεο",
+    "Server error": "Σφάλμα διακομιστή",
+    "Signed Out": "Αποσυνδέθηκες",
+    "Sign in": "Συνδέση",
+    "Sign out": "Αποσύνδεση",
+    "since they joined": "από τη στιγμή που συνδέθηκαν",
+    "since they were invited": "από τη στιγμή που προσκλήθηκαν",
+    "Someone": "Κάποιος",
+    "Start a chat": "Ξεκίνα μια συνομιλία",
+    "This email address is already in use": "Το email χρησιμοποιείται",
+    "This email address was not found": "Η διεύθηνση email δεν βρέθηκε",
+    "Success": "Επιτυχία",
+    "Start Chat": "Συνομιλία",
+    "Cancel": "Ακύρωση",
+    "cancel all": "ακύρωση όλων",
+    "or": "ή",
+    "Custom Server Options": "Προσαρμοσμένες ρυθμίσεις διακομιστή",
+    "Dismiss": "Απόρριψη",
+    "Monday": "Δευτέρα",
+    "Tuesday": "Τρίτη",
+    "Wednesday": "Τετάρτη",
+    "Thursday": "Πέμπτη",
+    "Friday": "Παρασκευή",
+    "Saturday": "Σάββατο",
+    "bold": "έντονα",
+    "italic": "πλάγια",
+    "underline": "υπογράμμιση",
+    "code": "κώδικας",
+    "quote": "αναφορά",
+    "%(oneUser)sleft %(repeats)s times": "%(oneUser)s έφυγε %(repeats)s φορές",
+    "%(severalUsers)sleft": "%(severalUsers)s έφυγαν",
+    "%(oneUser)sleft": "%(oneUser)s έφυγε",
+    "%(severalUsers)sjoined and left %(repeats)s times": "%(severalUsers)s συνδέθηκαν και έφυγαν %(repeats)s φορές",
+    "%(oneUser)sjoined and left %(repeats)s times": "%(oneUser)s συνδέθηκε και έφυγε %(repeats)s φορές",
+    "%(severalUsers)sjoined and left": "%(severalUsers)s συνδέθηκαν και έφυγαν",
+    "%(oneUser)sjoined and left": "%(oneUser)s συνδέθηκε και έφυγε",
+    "Close": "Κλείσιμο",
+    "Create new room": "Δημιουργία νέου δωματίου",
+    "Room directory": "Ευρετήριο",
+    "Start chat": "Έναρξη συνομιλίας",
+    "Welcome page": "Αρχική σελίδα"
+}
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@ -120,16 +120,21 @@
  "zh-tw":"Chinese (Taiwan)",
  "zu":"Zulu",
  "A registered account is required for this action": "A registered account is required for this action",
+  "a room": "a room",
  "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains",
-  "accept": "accept",
+  "Accept": "Accept",
  "%(targetName)s accepted an invitation.": "%(targetName)s accepted an invitation.",
  "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s accepted the invitation for %(displayName)s.",
  "Account": "Account",
  "Access Token:": "Access Token:",
+  "Active call (%(roomName)s)": "Active call (%(roomName)s)",
+  "Add": "Add",
  "Add a topic": "Add a topic",
  "Add email address": "Add email address",
  "Add phone number": "Add phone number",
  "Admin": "Admin",
+  "Admin tools": "Admin tools",
+  "And %(count)s more...": "And %(count)s more...",
  "VoIP": "VoIP",
  "Missing Media Permissions, click here to request.": "Missing Media Permissions, click here to request.",
  "No Microphones detected": "No Microphones detected",
@ -144,10 +149,10 @@
  "Hide removed messages": "Hide removed messages",
  "Always show message timestamps": "Always show message timestamps",
  "Authentication": "Authentication",
+  "Alias (optional)": "Alias (optional)",
  "all room members": "all room members",
  "all room members, from the point they are invited": "all room members, from the point they are invited",
  "all room members, from the point they joined": "all room members, from the point they joined",
-  "an address": "an address",
  "and": "and",
  "%(items)s and %(remaining)s others": "%(items)s and %(remaining)s others",
  "%(items)s and one other": "%(items)s and one other",
@ -179,7 +184,7 @@
  "Bug Report": "Bug Report",
  "Bulk Options": "Bulk Options",
  "Call Timeout": "Call Timeout",
-  "Can't connect to homeserver - please check your connectivity and ensure your <a>homeserver's SSL certificate</a> is trusted.": "Can't connect to homeserver - please check your connectivity and ensure your <a>homeserver's SSL certificate</a> is trusted.",
+  "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.",
  "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.",
  "Can't load user settings": "Can't load user settings",
  "Change Password": "Change Password",
@ -196,13 +201,14 @@
  "Claimed Ed25519 fingerprint key": "Claimed Ed25519 fingerprint key",
  "Clear Cache and Reload": "Clear Cache and Reload",
  "Clear Cache": "Clear Cache",
-  "Click here": "Click here",
+  "<a>Click here</a> to join the discussion!": "<a>Click here</a> to join the discussion!",
  "Click here to fix": "Click here to fix",
  "Click to mute audio": "Click to mute audio",
  "Click to mute video": "Click to mute video",
  "click to reveal": "click to reveal",
  "Click to unmute video": "Click to unmute video",
  "Click to unmute audio": "Click to unmute audio",
+  "Close": "Close",
  "Command error": "Command error",
  "Commands": "Commands",
  "Conference call failed.": "Conference call failed.",
@ -213,16 +219,22 @@
  "Confirm your new password": "Confirm your new password",
  "Continue": "Continue",
  "Could not connect to the integration server": "Could not connect to the integration server",
+  "%(count)s new messages": {
+    "one": "%(count)s new message",
+    "other": "%(count)s new messages"
+  },
+  "Create a new chat or reuse an existing one": "Create a new chat or reuse an existing one",
  "Create an account": "Create an account",
  "Create Room": "Create Room",
  "Cryptography": "Cryptography",
  "Current password": "Current password",
  "Curve25519 identity key": "Curve25519 identity key",
+  "Custom": "Custom",
  "Custom level": "Custom level",
  "/ddg is not a command": "/ddg is not a command",
  "Deactivate Account": "Deactivate Account",
  "Deactivate my account": "Deactivate my account",
-  "decline": "decline",
+  "Decline": "Decline",
  "Decrypt %(text)s": "Decrypt %(text)s",
  "Decryption error": "Decryption error",
  "(default: %(userName)s)": "(default: %(userName)s)",
@ -239,13 +251,16 @@
  "Devices will not yet be able to decrypt history from before they joined the room": "Devices will not yet be able to decrypt history from before they joined the room",
  "Direct Chat": "Direct Chat",
  "Direct chats": "Direct chats",
+  "Disable Notifications": "Disable Notifications",
  "disabled": "disabled",
  "Disable inline URL previews by default": "Disable inline URL previews by default",
+  "Disable markdown formatting": "Disable markdown formatting",
  "Disinvite": "Disinvite",
  "Display name": "Display name",
  "Displays action": "Displays action",
  "Don't send typing notifications": "Don't send typing notifications",
  "Download %(text)s": "Download %(text)s",
+  "Drop File Here": "Drop File Here",
  "Drop here %(toAction)s": "Drop here %(toAction)s",
  "Drop here to tag %(section)s": "Drop here to tag %(section)s",
  "Ed25519 fingerprint": "Ed25519 fingerprint",
@ -255,15 +270,22 @@
  "Email, name or matrix ID": "Email, name or matrix ID",
  "Emoji": "Emoji",
  "Enable encryption": "Enable encryption",
+  "Enable Notifications": "Enable Notifications",
  "enabled": "enabled",
+  "Encrypted by a verified device": "Encrypted by a verified device",
+  "Encrypted by an unverified device": "Encrypted by an unverified device",
  "Encrypted messages will not be visible on clients that do not yet implement encryption": "Encrypted messages will not be visible on clients that do not yet implement encryption",
  "Encrypted room": "Encrypted room",
+  "Encryption is enabled in this room": "Encryption is enabled in this room",
+  "Encryption is not enabled in this room": "Encryption is not enabled in this room",
  "%(senderName)s ended the call.": "%(senderName)s ended the call.",
  "End-to-end encryption information": "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 Code",
+  "Enter passphrase": "Enter passphrase",
  "Error": "Error",
  "Error decrypting attachment": "Error decrypting attachment",
+  "Error: Problem communicating with the given homeserver.": "Error: Problem communicating with the given homeserver.",
  "Event information": "Event information",
  "Existing Call": "Existing Call",
  "Export": "Export",
@ -272,6 +294,7 @@
  "Failed to change password. Is your password correct?": "Failed to change password. Is your password correct?",
  "Failed to change power level": "Failed to change power level",
  "Failed to delete device": "Failed to delete device",
+  "Failed to fetch avatar URL": "Failed to fetch avatar URL",
  "Failed to forget room %(errCode)s": "Failed to forget room %(errCode)s",
  "Failed to join room": "Failed to join room",
  "Failed to join the room": "Failed to join the room",
@ -292,6 +315,7 @@
  "Failed to toggle moderator status": "Failed to toggle moderator status",
  "Failed to unban": "Failed to unban",
  "Failed to upload file": "Failed to upload file",
+  "Failed to upload profile picture!": "Failed to upload profile picture!",
  "Failed to verify email address: make sure you clicked the link in the email": "Failed to verify email address: make sure you clicked the link in the email",
  "Failure to create room": "Failure to create room",
  "Favourite": "Favourite",
@ -308,7 +332,7 @@
  "Guest access is disabled on this Home Server.": "Guest access is disabled on this Home Server.",
  "Guests can't set avatars. Please register.": "Guests can't set avatars. Please register.",
  "Guest users can't create new rooms. Please register to create room and start a chat.": "Guest users can't create new rooms. Please register to create room and start a chat.",
-  "Guest users can't upload files. Please register to upload": "Guest users can't upload files. Please register to upload",
+  "Guest users can't upload files. Please register to upload.": "Guest users can't upload files. Please register to upload.",
  "Guests can't use labs features. Please register.": "Guests can't use labs features. Please register.",
  "Guests cannot join this room even if explicitly invited.": "Guests cannot join this room even if explicitly invited.",
  "had": "had",
@ -316,11 +340,15 @@
  "Hide read receipts": "Hide read receipts",
  "Hide Text Formatting Toolbar": "Hide Text Formatting Toolbar",
  "Historical": "Historical",
+  "Home": "Home",
  "Homeserver is": "Homeserver is",
  "Identity Server is": "Identity Server is",
  "I have verified my email address": "I have verified my email address",
  "Import": "Import",
  "Import E2E room keys": "Import E2E room keys",
+  "Incoming call from %(name)s": "Incoming call from %(name)s",
+  "Incoming video call from %(name)s": "Incoming video call from %(name)s",
+  "Incoming voice call from %(name)s": "Incoming voice call from %(name)s",
  "Incorrect username and/or password.": "Incorrect username and/or password.",
  "Incorrect verification code": "Incorrect verification code",
  "Interface Language": "Interface Language",
@ -333,11 +361,11 @@
  "Invited": "Invited",
  "Invites": "Invites",
  "Invites user with given id to current room": "Invites user with given id to current room",
-  "is a": "is a",
  "'%(alias)s' is not a valid format for an address": "'%(alias)s' is not a valid format for an address",
  "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias",
  "%(displayName)s is typing": "%(displayName)s is typing",
  "Sign in with": "Sign in with",
+  "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.",
  "Join Room": "Join Room",
  "joined and left": "joined and left",
  "joined": "joined",
@ -348,11 +376,12 @@
  "Kick": "Kick",
  "Kicks user with given id": "Kicks user with given id",
  "Labs": "Labs",
+  "Last seen": "Last seen",
  "Leave room": "Leave room",
  "left and rejoined": "left and rejoined",
  "left": "left",
  "%(targetName)s left the room.": "%(targetName)s left the room.",
-  "Level": "Level",
+  "Level:": "Level:",
  "List this room in %(domain)s's room directory?": "List this room in %(domain)s's room directory?",
  "Local addresses for this room:": "Local addresses for this room:",
  "Logged in as:": "Logged in as:",
@ -391,6 +420,7 @@
  "<not supported>": "<not supported>",
  "NOT verified": "NOT verified",
  "No devices with registered encryption keys": "No devices with registered encryption keys",
+  "No display name": "No display name",
  "No more results": "No more results",
  "No results": "No results",
  "No users have specific privileges in this room": "No users have specific privileges in this room",
@ -400,6 +430,7 @@
  "Once you&#39;ve followed the link it contains, click below": "Once you&#39;ve followed the link it contains, click below",
  "Only people who have been invited": "Only people who have been invited",
  "Operation failed": "Operation failed",
+  "Otherwise, <a>click here</a> to send a bug report.": "Otherwise, <a>click here</a> to send a bug report.",
  "Password": "Password",
  "Password:": "Password:",
  "Passwords can't be empty": "Passwords can't be empty",
@ -412,9 +443,12 @@
  "Power level must be positive integer.": "Power level must be positive integer.",
  "Press": "Press",
  "Privacy warning": "Privacy warning",
+  "Private Chat": "Private Chat",
  "Privileged Users": "Privileged Users",
  "Profile": "Profile",
+  "Public Chat": "Public Chat",
  "Reason": "Reason",
+  "Reason: %(reasonText)s": "Reason: %(reasonText)s",
  "Revoke Moderator": "Revoke Moderator",
  "Refer a friend to Riot:": "Refer a friend to Riot:",
  "Register": "Register",
@ -422,6 +456,7 @@
  "rejected": "rejected",
  "%(targetName)s rejected the invitation.": "%(targetName)s rejected the invitation.",
  "Reject invitation": "Reject invitation",
+  "Rejoin": "Rejoin",
  "Remote addresses for this room:": "Remote addresses for this room:",
  "Remove Contact Information?": "Remove Contact Information?",
  "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s removed their display name (%(oldDisplayName)s).",
@ -440,7 +475,10 @@
  "riot-web version:": "riot-web version:",
  "Room %(roomId)s not visible": "Room %(roomId)s not visible",
  "Room Colour": "Room Colour",
+  "Room contains unknown devices": "Room contains unknown devices",
  "Room name (optional)": "Room name (optional)",
+  "%(roomName)s does not exist.": "%(roomName)s does not exist.",
+  "%(roomName)s is not accessible at this time.": "%(roomName)s is not accessible at this time.",
  "Rooms": "Rooms",
  "Save": "Save",
  "Scroll to bottom of page": "Scroll to bottom of page",
@ -448,8 +486,11 @@
  "Search": "Search",
  "Search failed": "Search failed",
  "Searches DuckDuckGo for results": "Searches DuckDuckGo for results",
+  "Searching known users": "Searching known users",
+  "Seen by %(userName)s at %(dateTime)s": "Seen by %(userName)s at %(dateTime)s",
  "Send a message (unencrypted)": "Send a message (unencrypted)",
  "Send an encrypted message": "Send an encrypted message",
+  "Send anyway": "Send anyway",
  "Sender device information": "Sender device information",
  "Send Invites": "Send Invites",
  "Send Reset Email": "Send Reset Email",
@ -466,9 +507,11 @@
  "Session ID": "Session ID",
  "%(senderName)s set a profile picture.": "%(senderName)s set a profile picture.",
  "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s set their display name to %(displayName)s.",
+  "Set": "Set",
  "Setting a user name will create a fresh account": "Setting a user name will create a fresh account",
  "Settings": "Settings",
  "Show panel": "Show panel",
+  "Show Text Formatting Toolbar": "Show Text Formatting Toolbar",
  "Show timestamps in 12 hour format (e.g. 2:30pm)": "Show timestamps in 12 hour format (e.g. 2:30pm)",
  "Signed Out": "Signed Out",
  "Sign in": "Sign in",
@ -476,10 +519,11 @@
  "since the point in time of selecting this option": "since the point in time of selecting this option",
  "since they joined": "since they joined",
  "since they were invited": "since they were invited",
-  "Some of your messages have not been sent": "Some of your messages have not been sent",
+  "Some of your messages have not been sent.": "Some of your messages have not been sent.",
  "Someone": "Someone",
  "Sorry, this homeserver is using a login which is not recognised ": "Sorry, this homeserver is using a login which is not recognised ",
  "Start a chat": "Start a chat",
+  "Start authentication": "Start authentication",
  "Start Chat": "Start Chat",
  "Submit": "Submit",
  "Success": "Success",
@ -488,8 +532,9 @@
  "Tagged as: ": "Tagged as: ",
  "The default role for new room members is": "The default role for new room members is",
  "The main address for this room is": "The main address for this room is",
+  "The phone number entered looks invalid": "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.": "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.",
-  "This action cannot be performed by a guest user. Please register to be able to do this": "This action cannot be performed by a guest user. Please register to be able to do this",
+  "This action cannot be performed by a guest user. Please register to be able to do this.": "This action cannot be performed by a guest user. Please register to be able to do this.",
  "This email address is already in use": "This email address is already in use",
  "This email address was not found": "This email address was not found",
  "%(actionVerb)s this person?": "%(actionVerb)s this person?",
@ -498,16 +543,16 @@
  "The file '%(fileName)s' failed to upload": "The file '%(fileName)s' failed to upload",
  "The remote side failed to pick up": "The remote side failed to pick up",
  "This Home Server does not support login using email address.": "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 invitation was sent to an email address which is not associated with this account:",
  "There was a problem logging in.": "There was a problem logging in.",
  "This room has no local addresses": "This room has no local addresses",
  "This room is not recognised.": "This room is not recognised.",
-  "This room is private or inaccessible to guests. You may be able to join if you register": "This room is private or inaccessible to guests. You may be able to join if you register",
  "These are experimental features that may break in unexpected ways": "These are experimental features that may break in unexpected ways",
  "The visibility of existing history will be unchanged": "The visibility of existing history will be unchanged",
  "This doesn't appear to be a valid email address": "This doesn't appear to be a valid email address",
-  "this invitation?": "this invitation?",
  "This is a preview of this room. Room interactions have been disabled": "This is a preview of this room. Room interactions have been disabled",
  "This phone number is already in use": "This phone number is already in use",
+  "This room": "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": "This room's internal ID is",
  "times": "times",
@ -517,9 +562,8 @@
  "to demote": "to demote",
  "to favourite": "to favourite",
  "To invite users into the room": "To invite users into the room",
-  "to join the discussion": "to join the discussion",
  "To kick users": "To kick users",
-  "To link to a room it must have": "To link to a room it must have",
+  "To link to a room it must have <a>an address</a>.": "To link to a room it must have <a>an address</a>.",
  "to make a room or": "to make a room or",
  "To remove other users' messages": "To remove other users' messages",
  "To reset your password, enter the email address linked to your account": "To reset your password, enter the email address linked to your account",
@ -530,8 +574,8 @@
  "to tag as %(tagName)s": "to tag as %(tagName)s",
  "to tag direct chat": "to tag direct chat",
  "To use it, just wait for autocomplete results to load and tab through them.": "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 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 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 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 was unable to find it.",
  "Turn Markdown off": "Turn Markdown off",
  "Turn Markdown on": "Turn Markdown on",
  "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).",
@ -541,11 +585,15 @@
  "Unable to verify email address.": "Unable to verify email address.",
  "Unban": "Unban",
  "%(senderName)s unbanned %(targetName)s.": "%(senderName)s unbanned %(targetName)s.",
+  "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.",
  "Unable to capture screen": "Unable to capture screen",
  "Unable to enable Notifications": "Unable to enable Notifications",
  "Unable to load device list": "Unable to load device list",
+  "Undecryptable": "Undecryptable",
  "Unencrypted room": "Unencrypted room",
  "unencrypted": "unencrypted",
+  "Unencrypted message": "Unencrypted message",
+  "unknown caller": "unknown caller",
  "Unknown command": "Unknown command",
  "unknown device": "unknown device",
  "unknown error code": "unknown error code",
@ -553,24 +601,36 @@
  "Unknown (user, device) pair:": "Unknown (user, device) pair:",
  "unknown": "unknown",
  "Unmute": "Unmute",
+  "Unnamed Room": "Unnamed Room",
  "Unrecognised command:": "Unrecognised command:",
  "Unrecognised room alias:": "Unrecognised room alias:",
+  "Unverified": "Unverified",
+  "Uploading %(filename)s and %(count)s others": {
+    "zero": "Uploading %(filename)s",
+    "one": "Uploading %(filename)s and %(count)s other",
+    "other": "Uploading %(filename)s and %(count)s others"
+  },
  "uploaded a file": "uploaded a file",
  "Upload avatar": "Upload avatar",
  "Upload Failed": "Upload Failed",
  "Upload Files": "Upload Files",
  "Upload file": "Upload file",
+  "Upload new:": "Upload new:",
  "Usage": "Usage",
  "Use compact timeline layout": "Use compact timeline layout",
  "Use with caution": "Use with caution",
  "User ID": "User ID",
  "User Interface": "User Interface",
+  "%(user)s is a": "%(user)s is a",
  "User name": "User name",
+  "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (power %(powerLevelNumber)s)",
+  "Username invalid: %(errMessage)s": "Username invalid: %(errMessage)s",
  "Users": "Users",
  "User": "User",
  "Verification Pending": "Verification Pending",
  "Verification": "Verification",
  "verified": "verified",
+  "Verified": "Verified",
  "Verified key": "Verified key",
  "Video call": "Video call",
  "Voice call": "Voice call",
@ -586,20 +646,25 @@
  "Who would you like to add to this room?": "Who would you like to add to this room?",
  "Who would you like to communicate with?": "Who would you like to communicate with?",
  "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s withdrew %(targetName)s's invitation.",
-  "Would you like to": "Would you like to",
+  "Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?": "Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?",
+  "You already have existing direct chats with this user:": "You already have existing direct chats with this user:",
  "You are already in a call.": "You are already in a call.",
  "You're not in any rooms yet! Press": "You're not in any rooms yet! Press",
-  "You are trying to access %(roomName)s": "You are trying to access %(roomName)s",
+  "You are trying to access %(roomName)s.": "You are trying to access %(roomName)s.",
  "You cannot place a call with yourself.": "You cannot place a call with yourself.",
  "You cannot place VoIP calls in this browser.": "You cannot place VoIP calls in this browser.",
  "You do not have permission to post to this room": "You do not have permission to post to this room",
+  "You have been banned from %(roomName)s by %(userName)s.": "You have been banned from %(roomName)s by %(userName)s.",
  "You have been invited to join this room by %(inviterName)s": "You have been invited to join this room by %(inviterName)s",
+  "You have been kicked from %(roomName)s by %(userName)s.": "You have been kicked from %(roomName)s by %(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": "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 <a>disabled</a> URL previews by default.": "You have <a>disabled</a> URL previews by default.",
  "You have <a>enabled</a> URL previews by default.": "You have <a>enabled</a> URL previews by default.",
  "You have entered an invalid contact. Try using their Matrix ID or email address.": "You have entered an invalid contact. Try using their Matrix ID or email address.",
  "You have no visible notifications": "You have no visible notifications",
+  "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.",
  "you must be a": "you must be a",
+  "You must <a>register</a> to use this functionality": "You must <a>register</a> to use this functionality",
  "You need to be able to invite users to do that.": "You need to be able to invite users to do that.",
  "You need to be logged in.": "You need to be logged in.",
  "You need to enter a user name.": "You need to enter a user name.",
@ -610,7 +675,8 @@
  "You seem to be in a call, are you sure you want to quit?": "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 seem to be uploading files, are you sure you want to quit?",
  "You should not yet trust it to secure data": "You should not yet trust it to secure data",
-  "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",
+  "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.",
+  "Your home server does not support device management.": "Your home server does not support device management.",
  "Sun": "Sun",
  "Mon": "Mon",
  "Tue": "Tue",
@ -645,7 +711,7 @@
  "User names may only contain letters, numbers, dots, hyphens and underscores.": "User names may only contain letters, numbers, dots, hyphens and underscores.",
  "An unknown error occurred.": "An unknown error occurred.",
  "I already have an account": "I already have an account",
-  "An error occured: %(error_string)s": "An error occured: %(error_string)s",
+  "An error occurred: %(error_string)s": "An error occurred: %(error_string)s",
  "Topic": "Topic",
  "Make Moderator": "Make Moderator",
  "Make this room private": "Make this room private",
@ -656,12 +722,13 @@
  "Connectivity to the server has been lost.": "Connectivity to the server has been lost.",
  "Sent messages will be stored until your connection has returned.": "Sent messages will be stored until your connection has returned.",
  "Auto-complete": "Auto-complete",
-  "Resend all": "Resend all",
-  "(~%(searchCount)s results)": "(~%(searchCount)s results)",
+  "<a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.": "<a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.",
+  "(~%(count)s results)": {
+    "one": "(~%(count)s result)",
+    "other": "(~%(count)s results)"
+  },
  "Cancel": "Cancel",
-  "cancel all": "cancel all",
  "or": "or",
-  "now. You can also select individual messages to resend or cancel.": "now. You can also select individual messages to resend or cancel.",
  "Active call": "Active call",
  "Monday": "Monday",
  "Tuesday": "Tuesday",
@ -727,6 +794,11 @@
  "%(severalUsers)schanged their avatar": "%(severalUsers)schanged their avatar",
  "%(oneUser)schanged their avatar": "%(oneUser)schanged their avatar",
  "Please select the destination room for this message": "Please select the destination room for this message",
+  "Create new room": "Create new room",
+  "Welcome page": "Welcome page",
+  "Room directory": "Room directory",
+  "Start chat": "Start chat",
+  "New Password": "New Password",
  "Start automatically after system login": "Start automatically after system login",
  "Desktop specific": "Desktop specific",
  "Analytics": "Analytics",
@ -736,7 +808,6 @@
  "Passphrases must match": "Passphrases must match",
  "Passphrase must not be empty": "Passphrase must not be empty",
  "Export room keys": "Export room keys",
-  "Enter passphrase": "Enter passphrase",
  "Confirm passphrase": "Confirm passphrase",
  "Import room keys": "Import room keys",
  "File to import": "File to import",
@ -760,6 +831,7 @@
  "To continue, please enter your password.": "To continue, please enter your password.",
  "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:": "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 Name": "Device Name",
  "Device key": "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.": "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.",
@ -809,12 +881,13 @@
  "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?": "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?",
  "Removed or unknown message type": "Removed or unknown message type",
  "Disable URL previews by default for participants in this room": "Disable URL previews by default for participants in this room",
+  "Disable URL previews for this room (affects only you)": "Disable URL previews for this room (affects only you)",
  "URL previews are %(globalDisableUrlPreview)s by default for participants in this room.": "URL previews are %(globalDisableUrlPreview)s by default for participants in this room.",
  "URL Previews": "URL Previews",
  "Enable URL previews for this room (affects only you)": "Enable URL previews for this room (affects only you)",
  "Drop file here to upload": "Drop file here to upload",
  " (unsupported)": " (unsupported)",
-  "Ongoing conference call%(supportedText)s. %(joinText)s": "Ongoing conference call%(supportedText)s. %(joinText)s",
+  "Ongoing conference call%(supportedText)s.": "Ongoing conference call%(supportedText)s.",
  "for %(amount)ss": "for %(amount)ss",
  "for %(amount)sm": "for %(amount)sm",
  "for %(amount)sh": "for %(amount)sh",
@ -822,8 +895,15 @@
  "Online": "Online",
  "Idle": "Idle",
  "Offline": "Offline",
-  "Disable URL previews for this room (affects only you)": "Disable URL previews for this room (affects only you)",
+  "Start chatting": "Start chatting",
+  "Start Chatting": "Start Chatting",
+  "Click on the button below to start chatting!": "Click on the button below to start chatting!",
  "$senderDisplayName changed the room avatar to <img/>": "$senderDisplayName changed the room avatar to <img/>",
  "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s removed the room avatar.",
-  "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s changed the avatar for %(roomName)s"
+  "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s changed the avatar for %(roomName)s",
+  "Username available": "Username available",
+  "Username not available": "Username not available",
+  "Something went wrong!": "Something went wrong!",
+  "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.",
+  "If you already have a Matrix account you can <a>log in</a> instead.": "If you already have a Matrix account you can <a>log in</a> instead."
 }
--- a/Show more
+++ b/Show more