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

2018-06-12 13:27:26 +00:00
parent 848052bb80 e858cf3bcb
commit f073178a1f
35 changed files with 36 additions and 35 deletions
@@ -224,7 +224,6 @@
    "Level:": "Nivå:",
    "Local addresses for this room:": "Lokala adresser för rummet:",
    "Logged in as:": "Inloggad som:",
-    "Login as guest": "Logga in som gäst",
    "Logout": "Logga ut",
    "Low priority": "Låg prioritet",
    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s gjorde framtida rumshistorik synligt för alla rumsmedlemmar från att de bjöds in.",