Merge remote-tracking branch 'origin/develop' into travis/sort-i18n-2

This commit is contained in:
Travis Ralston
2018-12-05 13:58:18 -07:00
2 changed files with 6 additions and 0 deletions

View File

@@ -225,6 +225,7 @@
"You do not have permission to invite people to this room.": "You do not have permission to invite people to this room.",
"User %(user_id)s does not exist": "User %(user_id)s does not exist",
"Unknown server error": "Unknown server error",
"There was an error joining the room": "There was an error joining the room",
"Use a few words, avoid common phrases": "Use a few words, avoid common phrases",
"No need for symbols, digits, or uppercase letters": "No need for symbols, digits, or uppercase letters",
"Use a longer keyboard pattern with more turns": "Use a longer keyboard pattern with more turns",