Merge pull request #3286 from matrix-org/travis/immutable-dms/basic

Reuse DMs whenever possible instead of asking to reuse them
This commit is contained in:
Travis Ralston 2019-08-08 07:26:17 -06:00 committed by GitHub
commit 07d6fa7fdb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 39 additions and 269 deletions

View file

@ -114,7 +114,7 @@
"Invite new room members": "Invite new room members",
"Who would you like to add to this room?": "Who would you like to add to this room?",
"Send Invites": "Send Invites",
"Failed to invite user": "Failed to invite user",
"Failed to start chat": "Failed to start chat",
"Operation failed": "Operation failed",
"Failed to invite": "Failed to invite",
"Failed to invite users to the room:": "Failed to invite users to the room:",
@ -1124,12 +1124,6 @@
"Unable to load commit detail: %(msg)s": "Unable to load commit detail: %(msg)s",
"Unavailable": "Unavailable",
"Changelog": "Changelog",
"Create a new chat or reuse an existing one": "Create a new chat or reuse an existing one",
"Start new chat": "Start new chat",
"You already have existing direct chats with this user:": "You already have existing direct chats with this user:",
"Start chatting": "Start chatting",
"Click on the button below to start chatting!": "Click on the button below to start chatting!",
"Start Chatting": "Start Chatting",
"You cannot delete this message. (%(code)s)": "You cannot delete this message. (%(code)s)",
"Removing…": "Removing…",
"Confirm Removal": "Confirm Removal",