Merge branch 'develop' into t3chguy/devtools

This commit is contained in:
Michael Telatynski 2017-08-31 17:11:53 +01:00 committed by GitHub
commit 3aa12246ea
7 changed files with 32 additions and 9 deletions

View file

@ -10,6 +10,7 @@
"All notifications are currently disabled for all targets.": "All notifications are currently disabled for all targets.",
"An error occurred whilst saving your email notification preferences.": "An error occurred whilst saving your email notification preferences.",
"Back": "Back",
"Bug report sent": "Bug report sent",
"Call invitation": "Call invitation",
"Cancel": "Cancel",
"Cancel Sending": "Cancel Sending",
@ -155,6 +156,7 @@
"You are not receiving desktop notifications": "You are not receiving desktop notifications",
"You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!": "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!",
"You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply",
"Thank you!": "Thank you!",
"Sunday": "Sunday",
"Monday": "Monday",
"Tuesday": "Tuesday",