Merge remote-tracking branch 'origin/develop' into develop

2018-05-22 15:07:09 +00:00
parent e8e847e799 c47c7b8d98
commit f22094dc51
35 changed files with 84 additions and 218 deletions
@@ -268,7 +268,6 @@
    "Once encryption is enabled for a room it cannot be turned off again (for now)": "När kryptering aktiveras i ett rum kan det inte deaktiveras (tills vidare)",
    "Only people who have been invited": "Endast inbjudna",
    "Operation failed": "Handlingen misslyckades",
-    "Otherwise, <a>click here</a> to send a bug report.": "Annars kan du <a>klicka här</a> för att skicka en buggrapport.",
    "Password": "Lösenord",
    "Password:": "Lösenord:",
    "Passwords can't be empty": "Lösenorden kan inte vara tomma",