Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into develop

Conflicts:
	src/i18n/strings/gl.json

src/i18n/strings/eu.json

@@ -140,7 +140,6 @@
     "Identity Server is": "Identitate zerbitzaria:",
     "Mobile phone number (optional)": "Mugikor zenbakia (aukerazkoa)",
     "Moderator": "Moderatzailea",
-    "Must be viewing a room": "Gela bat ikusten egon behar da",
     "Account": "Kontua",
     "Access Token:": "Sarbide tokena:",
     "Active call (%(roomName)s)": "Dei aktiboa (%(roomName)s)",
@@ -243,7 +242,6 @@
     "Failed to kick": "Huts egin du kanporatzean",
     "Failed to leave room": "Huts egin du gelatik ateratzean",
     "Failed to load timeline position": "Huts egin du denbora-lerroko puntua kargatzean",
-    "Failed to lookup current room": "Huts egin du uneko gela bilatzean",
     "Failed to mute user": "Huts egin du erabiltzailea mututzean",
     "Failed to reject invite": "Huts egin du gonbidapena baztertzean",
     "Failed to reject invitation": "Huts egin du gonbidapena baztertzean",
@@ -722,7 +720,6 @@
     "%(names)s and %(count)s others are typing|one": "%(names)s eta beste bat idazten ari dira",
     "Send": "Bidali",
     "Message Pinning": "Mezuak finkatzea",
-    "Tag Panel": "Etiketen panela",
     "Hide avatar changes": "Ezkutatu abatar aldaketak",
     "Hide display name changes": "Ezkutatu pantaila izenen aldaketak",
     "Disable big emoji in chat": "Desgaitu emoji handiak txatean",
@@ -807,7 +804,6 @@
     "Old cryptography data detected": "Kriptografia datu zaharrak atzeman dira",
     "Your Communities": "Zure komunitateak",
     "Create a new community": "Sortu komunitate berria",
-    "Join an existing community": "Elkartu badagoen komunitate batetara",
     "Warning": "Abisua",
     "Please note you are logging into the %(hs)s server, not matrix.org.": "Kontuan izan %(hs)s zerbitzarira elkartu zarela, ez matrix.org.",
     "Sign in to get started": "Hasi saioa hasteko",
@@ -926,7 +922,6 @@
     "Custom of %(powerLevel)s": "%(powerLevel)s pertsonalizatua",
     "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Riot bertsio zahar batek datuak antzeman dira. Honek bertsio zaharrean  muturretik muturrerako zifratzea ez funtzionatzea eragingo du. Azkenaldian bertsio zaharrean bidali edo jasotako zifratutako mezuak agian ezin izango dira deszifratu bertsio honetan. Honek ere Bertsio honekin egindako mezu trukeak huts egitea ekar dezake. Arazoak badituzu, amaitu saioa eta hasi berriro saioa. Mezuen historiala gordetzeko, esportatu eta berriro inportatu zure gakoak.",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Sortu komunitate bat erabiltzaileak eta gelak biltzeko! Sortu zure hasiera orria eta markatu zure espazioa Matrix unibertsoan.",
-    "To join an existing community you'll have to know its community identifier; this will look something like <i>+example:matrix.org</i>.": "Bdagoen komunitate batera elkartzeko, komunitatearen identifikatzailea jakin behar duzu; honen antza izango du <i>+adibidea:matrix.org</i>.",
     "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Ez dago beste inor hemen! <inviteText>Beste batzuk gonbidatu</inviteText> nahi dituzu edo <nowarnText>gela hutsik dagoela abisatzeari utzi</nowarnText>?",
     "Light theme": "Itxura argia",
     "Dark theme": "Itxura iluna",
@@ -937,7 +932,6 @@
     "%(count)s of your messages have not been sent.|one": "Zure mezua ez da bidali.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Birbidali guztiak</resendText> edo <cancelText>baztertu guztiak</cancelText> orain. Mezuak banaka birbidali edo baztertu ditzakezu ere.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Birbidali mezua</resendText> edo <cancelText>baztertu mezua</cancelText> orain.",
-    "Message Replies": "Mezuei erantzunak",
     "Send an encrypted reply…": "Bidali zifratutako erantzun bat…",
     "Send a reply (unencrypted)…": "Bidali erantzun bat (zifratu gabea)…",
     "Send an encrypted message…": "Bidali zifratutako mezu bat…",