Merge branch 'develop' into matthew/status

config.sample.json

@@ -5,7 +5,10 @@
     "integrations_ui_url": "https://scalar.vector.im/",
     "integrations_rest_url": "https://scalar.vector.im/api",
     "bug_report_endpoint_url": "https://riot.im/bugreports/submit",
-    "enableLabs": true,
+    "features": {
+        "feature_groups": "labs"
+        "feature_pinning": "labs",
+    },
     "default_federate": true,
     "welcomePageUrl": "home.html",
     "default_theme": "light",

package.json

@@ -29,6 +29,7 @@
     "reskindex": "reskindex -h src/header",
     "reskindex:watch": "reskindex -h src/header -w",
     "i18n": "matrix-gen-i18n",
+    "prunei18n": "matrix-prune-i18n",
     "build:res": "node scripts/copy-res.js",
     "build:modernizr": "modernizr -c .modernizr.json -d src/vector/modernizr.js",
     "build:compile": "npm run reskindex && babel --source-maps -d lib src",
@@ -131,7 +132,7 @@
     "minimist": "^1.2.0",
     "mkdirp": "^0.5.1",
     "mocha": "^2.4.5",
-    "parallelshell": "^1.2.0",
+    "parallelshell": "^3.0.2",
     "postcss-extend": "^1.0.5",
     "postcss-import": "^9.0.0",
     "postcss-loader": "^1.2.2",

src/components/views/login/VectorCustomServerDialog.js

@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2017 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -31,7 +32,13 @@ module.exports = React.createClass({
                     { _t('Custom Server Options') }
                 </div>
                 <div className="mx_Dialog_content">
-                    <span dangerouslySetInnerHTML={{__html: sanitizeHtml(_t('customServer_text'))}} />
+                    <span dangerouslySetInnerHTML={{__html: sanitizeHtml(_t(
+                        "You can use the custom server options to sign into other Matrix "+
+                        "servers by specifying a different Home server URL.<br/>This allows "+
+                        "you to use Riot with an existing Matrix account on a different home "+
+                        "server.<br/><br/>You can also set a custom identity server but you won't "+
+                        "be able to invite users by email address, or be invited by email address yourself.",
+                    ))}} />
                 </div>
                 <div className="mx_Dialog_buttons">
                     <button onClick={this.props.onFinished} autoFocus={true}>

src/i18n/strings/be.json

@@ -59,7 +59,6 @@
     "Permalink": "Пастаянная спасылка",
     "powered by Matrix": "працуе на Matrix",
     "Quote": "Цытата",
-    "Redact": "Адрэдагаваць",
     "Reject": "Адхіліць",
     "Remove %(name)s from the directory?": "Выдаліць %(name)s з каталога?",
     "Remove": "Выдалiць",

src/i18n/strings/cs.json

@@ -201,7 +201,6 @@
     "Filter results": "Filtrovat výsledky",
     "You must specify an event type!": "Musíte určit typ události!",
     "Event sent!": "Událost odeslána!",
-    "Invite to this group": "Pozvat do této místnosti",
     "Failed to send custom event.": "Nepodařilo se odeslat vlastní událost.",
     "Send Custom Event": "Odeslat vlastní událost"
 }

src/i18n/strings/da.json

@@ -2,16 +2,13 @@
     "Add an email address above to configure email notifications": "Tilføj en emailadresse ovenfor for at konfigurere e-mail-underretninger",
     "All notifications are currently disabled for all targets.": "Alle meddelelser er for øjeblikket deaktiveret for alle mål.",
     "An error occurred whilst saving your email notification preferences.": "Der opstod en fejl under opbevaring af dine e-mail-underretningsindstillinger.",
-    "and remove": "Og fjern",
     "Can't update user notification settings": "Kan ikke opdatere brugermeddelelsesindstillinger",
     "Couldn't find a matching Matrix room": "Kunne ikke finde et matchende Matrix-rum",
     "Custom Server Options": "Brugerdefinerede serverindstillinger",
     "delete the alias.": "Slet aliaset.",
-    "Delete the room alias": "Slet room alias",
     "Direct Chat": "Personligt Chat",
     "Directory": "Rum fortegnelse",
     "Dismiss": "Afskedige",
-    "Drop here to": "Drop her til",
     "Enable audible notifications in web client": "Aktivér hørbare underretninger i webklienten",
     "Enable desktop notifications": "Aktivér desktop meddelelser",
     "Enable email notifications": "Aktivér e-mail-underretninger",
@@ -21,19 +18,16 @@
     "Error": "Fejl",
     "Error saving email notification preferences": "Fejl ved at gemme e-mail-underretningsindstillinger",
     "#example": "#eksempel",
-    "Failed to add tag ": "Kunne ikke tilføje tag ",
     "Failed to change settings": "Kunne ikke ændre indstillinger",
     "Failed to update keywords": "Kunne ikke opdatere søgeord",
     "Failed to get protocol list from Home Server": "Kunne ikke få protokolliste fra Home Server",
     "Failed to get public room list": "Kunne ikke få offentlig rumliste",
-    "Failed to remove tag ": "Kunne ikke fjerne tag ",
     "Failed to set Direct Message status of room": "Kunne ikke indstille direkte beskedstatus for rumet",
     "Favourite": "Favorit",
     "Fetching third party location failed": "Hentning af tredjeparts placering mislykkedes",
     "Files": "Filer",
     "Filter room names": "Filtrer rumnavne",
     "Forget": "Glem",
-    "from the directory": "fra fortegnelsen",
     "Guests can join": "Gæster kan deltage",
     "Invite to this room": "Inviter til dette rum",
     "Keywords": "Søgeord",
@@ -53,7 +47,6 @@
     "powered by Matrix": "Drevet af Matrix",
     "Reject": "Afvise",
     "Remove": "Fjerne",
-    "remove": "fjerner",
     "Remove from Directory": "Fjern fra fortegnelse",
     "Riot does not know how to join a room on this network": "Riot ved ikke, hvordan man kan deltage i et rum på dette netværk",
     "Room not found": "Rumet ikke fundet",

src/i18n/strings/de_DE.json

@@ -10,23 +10,19 @@
     "Failed to get protocol list from Home Server": "Fehler beim Abrufen der Protokoll-Liste vom Home-Server",
     "The Home Server may be too old to support third party networks": "Der Home-Server ist eventuell zu alt, um Drittanbieter-Netzwerke zu unterstützen",
     "Directory": "Raum-Verzeichnis",
-    "#example:": "#beispiel:",
     "Search for a room": "Nach einem Raum suchen",
-    "No rooms to show": "Keine Räume gefunden",
+    "No rooms to show": "Keine Räume anzuzeigen",
-    "World readable": "Alle können mitlesen",
+    "World readable": "Lesbar für die Welt",
     "Guests can join": "Gäste können beitreten",
     "You are not receiving desktop notifications": "Du erhältst keine Desktop-Benachrichtigungen",
     "Enable them now": "Aktiviere diese jetzt",
     "Add an email address above to configure email notifications": "Füge oben eine E-Mail-Adresse hinzu, um die E-Mail-Benachrichtigungseinstellungen zu konfigurieren",
     "All notifications are currently disabled for all targets.": "Im Moment sind alle Benachrichtigungen für alle Ziele deaktiviert.",
     "An error occurred whilst saving your email notification preferences.": "Beim Speichern deiner E-Mail-Benachrichtigungseinstellungen ist ein Fehler aufgetreten.",
-    "and remove": "und entfernen",
     "Can't update user notification settings": "Benachrichtigungs-Einstellungen des Benutzers konnten nicht aktualisiert werden",
     "Couldn't find a matching Matrix room": "Konnte keinen entsprechenden Matrix-Raum finden",
     "delete the alias.": "Lösche den Alias.",
-    "Delete the room alias": "Lösche den Raum Alias",
     "Direct Chat": "Direkt-Chat",
-    "Drop here to": "Hier ablegen",
     "Enable audible notifications in web client": "Audio-Benachrichtigungen im Web-Client aktivieren",
     "Enable desktop notifications": "Desktop-Benachrichtigungen aktivieren",
     "Enable email notifications": "E-Mail-Benachrichtigungen aktivieren",
@@ -35,16 +31,13 @@
     "Error": "Fehler",
     "Error saving email notification preferences": "Fehler beim Speichern der E-Mail-Benachrichtigungseinstellungen",
     "#example": "#Beispiel",
-    "Failed to add tag ": "Konnte Tag nicht hinzufügen ",
     "Failed to change settings": "Einstellungen konnten nicht geändert werden",
     "Failed to update keywords": "Schlüsselwörter konnten nicht aktualisiert werden",
     "Failed to get public room list": "Die Liste der öffentlichen Räume konnte nicht geladen werden",
-    "Failed to remove tag ": "Konnte Tag nicht entfernen ",
     "Failed to set Direct Message status of room": "Konnte den direkten Benachrichtigungsstatus nicht setzen",
     "Favourite": "Favorit",
     "Fetching third party location failed": "Das Abrufen des Drittanbieterstandorts ist fehlgeschlagen",
     "Forget": "Entfernen",
-    "from the directory": "aus dem Verzeichnis",
     "Keywords": "Schlüsselwörter",
     "Leave": "Verlassen",
     "Low Priority": "Niedrige Priorität",
@@ -55,7 +48,6 @@
     "Operation failed": "Aktion fehlgeschlagen",
     "Reject": "Ablehnen",
     "Remove": "Entfernen",
-    "remove": "Entferner",
     "Remove from Directory": "Aus dem Raum-Verzeichnis entfernen",
     "Riot does not know how to join a room on this network": "Riot weiß nicht, wie es einem Raum auf diesem Netzwerk beitreten soll",
     "Room not found": "Raum nicht gefunden",
@@ -83,7 +75,6 @@
     "Mute": "Stummschalten",
     "Permalink": "Permanenter Link",
     "Quote": "Zitieren",
-    "Redact": "Löschen",
     "Remove %(name)s from the directory?": "Soll der Raum %(name)s  aus dem Verzeichnis entfernt werden?",
     "remove %(name)s from the directory.": "entferne %(name)s aus dem Verzeichnis.",
     "Resend": "Erneut senden",
@@ -161,7 +152,6 @@
     "Search the room directory": "Raum-Verzeichnis durchsuchen",
     "Chat with Riot Bot": "Mit dem Riot-Bot chatten",
     "Get started with some tips from Riot Bot!": "Lass Dir vom Riot-Bot eine Einführung geben!",
-    "General discussion about Matrix": "Allgemeine Diskussion über Matrix",
     "Discussion of all things Matrix!": "\"Diskussion über alle Dinge\"-Matrix!",
     "Riot/Web & Desktop chat": "Riot/Web & Desktop-Chat",
     "Riot/iOS & matrix-ios-sdk chat": "Riot-iOS & \"matrix-ios-sdk\"-Chat",
@@ -214,7 +204,9 @@
     "Event Type": "Event-Typ",
     "Event Content": "Event-Inhalt",
     "State Key": "Status-Schlüssel",
-    "Invite to this group": "In diese Gruppe einladen",
     "Filter results": "Ergebnisse filtern",
-    "You must specify an event type!": "Du musst einen Event-Typ spezifizieren!"
+    "You must specify an event type!": "Du musst einen Event-Typ spezifizieren!",
+    "Show message in desktop notification": "Nachricht in der Desktop-Benachrichtigung anzeigen",
+    "Pin Message": "Nachricht anheften",
+    "Unpin Message": "Nachricht losheften"
 }

src/i18n/strings/el.json

@@ -62,7 +62,6 @@
     "Notify me for anything else": "Ειδοποίηση  για οτιδήποτε άλλο",
     "Operation failed": "Η λειτουργία απέτυχε",
     "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "Παρακαλούμε περιγράψτε το σφάλμα. Τι κάνατε; Τι περιμένατε να συμβεί; Τι έγινε τελικά;",
-    "Redact": "Ανάκληση",
     "Reject": "Απόρριψη",
     "Remove": "Αφαίρεση",
     "Remove from Directory": "Αφαίρεση από το ευρετήριο",

src/i18n/strings/en_EN.json

@@ -60,7 +60,7 @@
     "Today": "Today",
     "Yesterday": "Yesterday",
     "Custom Server Options": "Custom Server Options",
-    "customServer_text": "customServer_text",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.",
     "Dismiss": "Dismiss",
     "powered by Matrix": "powered by Matrix",
     "You are not receiving desktop notifications": "You are not receiving desktop notifications",

src/i18n/strings/en_US.json

@@ -187,9 +187,6 @@
     "Warning": "Warning",
     "Pin Message": "Pin Message",
     "Unpin Message": "Unpin Message",
-    "Jump to message": "Jump to message",
-    "No pinned messages.": "No pinned messages.",
-    "Loading...": "Loading...",
     "Checking for an update...": "Checking for an update...",
     "Error encountered (%(errorDetail)s).": "Error encountered (%(errorDetail)s).",
     "No update available.": "No update available.",

src/i18n/strings/eo.json

@@ -94,7 +94,6 @@
     "Operation failed": "La operacio malsukcesis",
     "Permalink": "Konstanta ligilo",
     "Please describe the bug and/or send logs.": "Bonvolu priskribi la cimon kaj/aŭ sendi protokolojn.",
-    "Redact": "Redakti",
     "Remove %(name)s from the directory?": "Forigi %(name)s el la dosierujo?",
     "Remove": "Forigi",
     "remove %(name)s from the directory.": "forigi %(name)s el la dosierujo.",

src/i18n/strings/es.json

@@ -63,7 +63,6 @@
     "Operation failed": "Falló la operación",
     "Permalink": "Enlace permanente",
     "Quote": "Citar",
-    "Redact": "Redactar",
     "Reject": "Rechazar",
     "Remove %(name)s from the directory?": "¿Retirar %(name)s del directorio?",
     "Remove": "Eliminar",

src/i18n/strings/fi.json

@@ -205,6 +205,5 @@
     "Event sent!": "Tapahtuma lähetetty!",
     "Event Type": "Tapahtuman tyyppi",
     "Event Content": "Tapahtuman sisältö",
-    "State Key": "Tila-avain",
+    "State Key": "Tila-avain"
-    "Invite to this group": "Kutsu tähän ryhmään"
 }

src/i18n/strings/fr.json

@@ -36,7 +36,6 @@
     "Operation failed": "L'opération a échoué",
     "powered by Matrix": "propulsé par Matrix",
     "Quote": "Citer",
-    "Redact": "Rédiger",
     "Reject": "Rejeter",
     "Remove %(name)s from the directory?": "Supprimer %(name)s du répertoire ?",
     "Remove": "Supprimer",
@@ -78,7 +77,6 @@
     "Noisy": "Bruyant",
     "Notification targets": "Appareils recevant les notifications",
     "Notifications": "Notifications",
-    "Notifications on the following keywords follow rules which can’t be displayed here": "Les mots-clés suivants suivent des règles de notification qui ne peuvent être affichées ici",
     "Notify for all other messages/rooms": "Me notifier pour tous les autres messages/salons",
     "Notify me for anything else": "Me notifier pour tout le reste",
     "Off": "Désactivé",
@@ -202,7 +200,6 @@
     "You must specify an event type!": "Vous devez spécifier un type d'événement !",
     "Event sent!": "Événement envoyé !",
     "Event Type": "Type d'événement",
-    "Invite to this group": "Inviter à ce groupe",
     "Event Content": "Contenu de l'événement",
     "Failed to send custom event.": "Échec de l'envoi de l'événement personnalisé.",
     "Send Custom Event": "Envoyer l'événement personnalisé",

src/i18n/strings/gl.json

@@ -20,7 +20,6 @@
     "Collapse panel": "Agochar panel",
     "Collecting app version information": "Obtendo información sobre a versión da app",
     "Collecting logs": "Obtendo rexistros",
-    "Create new room": "Crear unha nova sala",
     "Couldn't find a matching Matrix room": "Non coincide con ningunha sala de Matrix",
     "Custom Server Options": "Axustes do servidor personalizado",
     "customServer_text": "Pode utilizar os axustes do servidor personalizado para conectarse a outros servidores Matrix indicando un URL de Inicio do servidor.<br/>Esto permítelle utilizar Riot con unha conta existente de Matrix nun servidor diferente.<br/><br/>Tamén pode establecer un servidor personalizado de identidade mais non poderá invitar a usuarias a través de enderezos de correo ou ser vostede invitada do mesmo xeito.",
@@ -32,7 +31,6 @@
     "Directory": "Directorio",
     "Dismiss": "Desbotar",
     "Download this file": "Descargue este ficheiro",
-    "Drop here %(toAction)s": "Deixe aquí %(toAction)s",
     "Enable audible notifications in web client": "Habilitar notificacións audibles no cliente web",
     "Enable desktop notifications": "Habilitar notificacións de escritorio",
     "Enable email notifications": "Habilitar notificacións de correo",
@@ -43,14 +41,12 @@
     "Error saving email notification preferences": "Fallo ao cargar os axustes de notificacións",
     "#example": "#exemplo",
     "Expand panel": "Expandir panel",
-    "Failed to": "Fallou ao",
     "Failed to add tag %(tagName)s to room": "Fallou ao engadir a etiqueta %(tagName)s a sala",
     "Failed to change settings": "Fallo ao cambiar os axustes",
     "Failed to forget room %(errCode)s": "Fallou ao esquecer a sala %(errCode)s",
     "Failed to update keywords": "Fallo ao actualizar as palabras chave",
     "Failed to get protocol list from Home Server": "Fallo ao obter a lista de protocolo desde o servidor",
     "Failed to get public room list": "Fallo ao obter a lista de salas públicas",
-    "Failed to join the room": "Fallo ao unirse a sala",
     "Failed to remove tag %(tagName)s from room": "Fallo ao eliminar etiqueta %(tagName)s da sala",
     "Failed to send custom event.": "Fallo ao enviar evento personalizado.",
     "Failed to send report: ": "Fallo no envío do informe: ",
@@ -63,9 +59,7 @@
     "Filter room names": "Filtrar nomes de sala",
     "Forget": "Esquecer",
     "Forward Message": "Reenviar mensaxe",
-    " from room": " da sala",
     "Guests can join": "Convidadas pódense unir",
-    "Guest users can't invite users. Please register to invite.": "Usuarias convidadas non poden convidar usuarias. Por favor rexístrese para convidar.",
     "Hide panel": "Agochar panel",
     "(HTTP status %(httpStatus)s)": "(Estado HTTP %(httpStatus)s)",
     "I understand the risks and wish to continue": "Entendos os riscos e desexo continuar",
@@ -100,7 +94,6 @@
     "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "Por favor describa a incidencia. Que estaba a facer? Que tiña que pasar? Que aconteceu en realidade?",
     "Please describe the bug and/or send logs.": "Por favor describa a incidencia e/ou envíe o informe.",
     "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.": "Por favor instale <a href=\"https://www.google.com/chrome\">Chrome</a> ou <a href=\"https://getfirefox.com\">Firefox</a> para ter a mellor experiencia de uso.",
-    "Please Register": "Por favor rexístrese",
     "powered by Matrix": "funcionando grazas a Matrix",
     "Quote": "Cita",
     "Reject": "Rexeitar",
@@ -114,7 +107,6 @@
     "Riot does not know how to join a room on this network": "Riot non sabe cómo conectar con unha sala en esta rede",
     "Riot is not supported on mobile web. Install the app?": "Riot no se pode executar na web móbil. Instalar a app?",
     "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot utiliza características avanzadas do navegador, algunhas das cales non están dispoñibles ou son experimentales no seu navegador actual.",
-    "Room directory": "Directorio de salas",
     "Room not found": "Non se atopou a sala",
     "Search": "Buscar",
     "Search…": "Buscar…",
@@ -124,16 +116,12 @@
     "Send Custom Event": "Enviar evento personalizado",
     "Send Custom State Event": "Enviar evento de estado personalizado",
     "Explore Room State": "Explorar estado da sala",
-    "Settings": "Axustes",
     "Source URL": "URL fonte",
     "Sorry, your browser is <b>not</b> able to run Riot.": "Desculpe, o seu navegador <b>non pode</b> executar Riot.",
-    "Start chat": "Iniciar chat",
     "The Home Server may be too old to support third party networks": "O servidor de inicio podería ser demasiando antigo como para aceptar redes de terceiros",
     "There are advanced notifications which are not shown here": "Existen notificacións avanzadas que non se mostran aquí",
     "The server may be unavailable or overloaded": "O servidor podería non estar dispoñible ou sobrecargado",
     "This Room": "Esta sala",
-    "This room is inaccessible to guests. You may be able to join if you register.": "Esta sala non é accesible para convidados. Podería entrar si se rexistra.",
-    " to room": " a sala",
     "Unable to fetch notification target list": "Non se puido procesar a lista de obxetivo de notificacións",
     "Unable to join network": "Non se puido conectar a rede",
     "Unable to look up room ID from server": "Non se puido atopar o ID da sala do servidor",
@@ -155,7 +143,6 @@
     "You cannot delete this image. (%(code)s)": "Non pode eliminar esta imaxe. (%(code)s)",
     "You cannot delete this message. (%(code)s)": "Non pode eliminar esta mensaxe. (%(code)s)",
     "You are not receiving desktop notifications": "Non está a recibir notificacións de escritorio",
-    "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!": "Está a usar Riot como convidado. <a>Rexístrese</a> ou <a>conéctese</a> para acceder a máis salas e caracteristicas!",
     "You must specify an event type!": "Debe indicar un tipo de evento!",
     "Thank you!": "Grazas!",
     "Sunday": "Domingo",
@@ -178,7 +165,6 @@
     "No update available.": "Sen actualizacións.",
     "Downloading update...": "Descargando actualización...",
     "You need to be using HTTPS to place a screen-sharing call.": "Precisa utilizar HTTPS para establecer unha chamada de pantalla compartida.",
-    "Welcome page": "Páxina de acollemento",
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Co seu navegador actual a apareciencia e uso do aplicativo poderían estar totalmente falseadas, e algunhas características poderían non funcionar. Se quere pode continuar, pero debe ser consciente de que poden haber fallos!",
     "Welcome to Riot.im": "Benvida a Riot.im",
     "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Chat &amp; colaboración descentralizados e cifrados grazas a [matrix]",
@@ -218,7 +204,6 @@
     "To return to your account in future you need to <u>set a password</u>": "Para voltar a súa conta no futuro debe <u>establecer un contrasinal>/u>",
     "Set Password": "Establecer contrasinal",
     "Couldn't load home page": "Non se cargou a páxina de inicio",
-    "Invite to this group": "Convidar a este grupo",
     "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Pode que os configurase nun cliente diferente de Riot. Non pode establecelos desde Riot pero aínda así aplicaranse",
     "Riot/Android &amp; matrix-android-sdk chat": "Chat para Riot/Android &amp; matrix-android-sdk"
 }

src/i18n/strings/he.json

@@ -179,7 +179,6 @@
     "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s באמצעות הדפדפן %(browserName)s על גבי %(osName)s",
     "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "<a href=\"http://apple.com/safari\"> ספארי</a> ו <a href=\"http://opera.com\"> אופרה</a> עובדים גם כן.",
     "Notifications on the following keywords follow rules which can’t be displayed here:": "התראה על מילות המפתח הבאות עוקבת אחר החוקים שאינם יכולים להיות מוצגים כאן:",
-    "Redact": "אדום",
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "באמצעות הדפדפן הנוכחי שלך המראה של האפליקציה יכול להיות שגוי לחלוטין וחלק מהאפשרויות לא תתפקדנה. אם תרצה לנסות בכל זאת תוכל אבל אז הסיכון חל עליך!",
     "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "צ'ט מוצפן &amp; ושת\"פ נעשה ע\"י ה [matrix]"
 }

src/i18n/strings/hu.json

@@ -40,7 +40,7 @@
     "Files": "Fájlok",
     "Filter room names": "Szoba nevek szűrése",
     "Forget": "Elfelejt",
-    "Guests can join": "Vendégek csatlakozhatnak",
+    "Guests can join": "Vendégek is csatlakozhatnak",
     "Invite to this room": "Meghívás a szobába",
     "Keywords": "Kulcsszavak",
     "Leave": "Elhagy",
@@ -54,7 +54,7 @@
     "Messages sent by bot": "Botok által küldött üzenetek",
     "more": "további",
     "Mute": "Elnémít",
-    "No rooms to show": "Nincs megjeleníthető szoba",
+    "No rooms to show": "Nincsenek megjelenítendő szobák",
     "Noisy": "Hangos",
     "Notification targets": "Értesítések célpontja",
     "Notifications": "Értesítések",
@@ -73,7 +73,6 @@
     "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.": "A legjobb élmény érdekében telepíts <a href=\"https://www.google.com/chrome\">Chrome</a>ot vagy <a href=\"https://getfirefox.com\">Firefox</a>ot.",
     "powered by Matrix": "Matrixon alapul",
     "Quote": "Idézet",
-    "Redact": "Szerkeszt",
     "Reject": "Elutasít",
     "Remove %(name)s from the directory?": "Törlöd a %(name)s szobát a listából?",
     "Remove": "Törlés",
@@ -94,12 +93,12 @@
     "Unable to look up room ID from server": "Nem lehet lekérdezni a szoba ID-ját a szervertől",
     "Unhide Preview": "Előkép felfedése",
     "unknown error code": "ismeretlen hiba kód",
-    "Unnamed room": "Név nélküli szoba",
+    "Unnamed room": "Névtelen szoba",
     "Uploaded on %(date)s by %(user)s": "Feltöltés: %(date)s, %(user)s",
     "View Decrypted Source": "Visszafejtett forrás megjelenítése",
     "View Source": "Forrás megjelenítése",
     "When I'm invited to a room": "Amikor meghívtak a szobába",
-    "World readable": "Mindenki olvashatja",
+    "World readable": "Nyilvános",
     "You cannot delete this image. (%(code)s)": "Nem törölheted ezt a képet. (%(code)s)",
     "You cannot delete this message. (%(code)s)": "Nem törölheted ezt az üzenetet. (%(code)s)",
     "You are not receiving desktop notifications": "Nem fogadsz asztali értesítéseket",
@@ -205,7 +204,9 @@
     "Event Type": "Esemény típusa",
     "Event Content": "Esemény tartalma",
     "State Key": "Állapot kulcs",
-    "Invite to this group": "Meghívás ebbe a csoportba",
     "Filter results": "Találatok szűrése",
-    "You must specify an event type!": "Meg kell határoznod az esemény típusát!"
+    "You must specify an event type!": "Meg kell határoznod az esemény típusát!",
+    "Show message in desktop notification": "Üzenetek megmutatása az asztali értesítésekben",
+    "Pin Message": "Üzenet kitűzése",
+    "Unpin Message": "Üzenet levétele"
 }

src/i18n/strings/it.json

@@ -205,6 +205,5 @@
     "Event sent!": "Evento inviato!",
     "Event Type": "Tipo di Evento",
     "Event Content": "Contenuto dell'Evento",
-    "State Key": "Chiave dello Stato",
+    "State Key": "Chiave dello Stato"
-    "Invite to this group": "Invita in questo gruppo"
 }

src/i18n/strings/ko.json

@@ -51,7 +51,6 @@
     "Please describe the bug and/or send logs.": "오류를 적어주시거나 로그를 보내주세요.",
     "powered by Matrix": "매트릭스의 지원을 받고 있어요",
     "Quote": "인용하기",
-    "Redact": "지우기",
     "Reject": "거절하기",
     "Remove %(name)s from the directory?": "목록에서 %(name)s을 지우시겠어요?",
     "Remove": "지우기",

src/i18n/strings/nb_NO.json

@@ -69,7 +69,6 @@
     "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.": "Vennligst installer <a href=\"https://www.google.com/chrome\">Chrome</a> eller <a href=\"https://getfirefox.com\">Firefox</a> for den beste opplevelsen.",
     "powered by Matrix": "benytter seg av Matrix",
     "Quote": "Sitat",
-    "Redact": "Maskere",
     "Reject": "Avvis",
     "Remove %(name)s from the directory?": "Fjern %(name)s fra katalogen?",
     "Remove": "Fjern",

src/i18n/strings/nl.json

@@ -105,7 +105,6 @@
     "Today": "Vandaag",
     "Yesterday": "Gisteren",
     "Failed to set Direct Message status of room": "Het is mislukt om de directe-berichtenstatus van de kamer in te stellen",
-    "Redact": "Redigeren",
     "A new version of Riot is available.": "Er is een nieuwe versie van Riot beschikbaar.",
     "All Rooms": "Alle kamers",
     "Cancel": "Annuleren",
@@ -199,7 +198,6 @@
     "Failed to send custom event.": "Aangepast Event verzenden mislukt.",
     "Send Custom Event": "Verzend aangepast evenement",
     "Send Custom State Event": "Verzend aangepast State Event",
-    "Invite to this group": "Nodig uit voor deze groep",
     "Developer Tools": "Ontwikkelaarsgereedschap",
     "Filter results": "Resultaten filteren",
     "Explore Room State": "Verken Ruimtetoestand",

src/i18n/strings/pl.json

@@ -97,7 +97,6 @@
     "Send logs": "Wyślij logi",
     "Sorry, your browser is <b>not</b> able to run Riot.": "Przepraszamy, Twoja przeglądarka <b>nie jest w stanie</b> uruchomić Riot.",
     "powered by Matrix": "napędzany przez Matrix",
-    "Redact": "Zredaguj",
     "Reject": "Odrzuć",
     "Remove": "Usuń",
     "remove %(name)s from the directory.": "usuń %(name)s z katalogu.",
@@ -206,6 +205,5 @@
     "Event sent!": "Wydarzenie wysłane!",
     "Event Type": "Typ wydarzenia",
     "Event Content": "Zawartość wydarzenia",
-    "State Key": "Klucz stanu",
+    "State Key": "Klucz stanu"
-    "Invite to this group": "Zaproś do tej grupy"
 }

src/i18n/strings/pt.json

@@ -23,14 +23,12 @@
     "Enter keywords separated by a comma:": "Insira palavras-chave separadas por vírgula:",
     "Error": "Erro",
     "Error saving email notification preferences": "Erro ao guardar as preferências de notificação por e-mail",
-    "#example:": "#exemplo",
     "Failed to add tag %(tagName)s to room": "Falha ao adicionar %(tagName)s à sala",
     "Failed to change settings": "Falha ao alterar as configurações",
     "Failed to forget room %(errCode)s": "Falha ao esquecer a sala %(errCode)s",
     "Failed to update keywords": "Falha ao atualizar as palavras-chave",
     "Failed to get protocol list from Home Server": "Falha ao obter a lista de protocolos do servidor padrão",
     "Failed to get public room list": "Falha ao obter a lista de salas públicas",
-    "Failed to remove tag %(tag)s from room": "Falha ao remover a palavra-chave %(tag)s da sala",
     "Failed to set direct chat tag": "Falha ao definir conversa como pessoal",
     "Failed to set Direct Message status of room": "Falha em definir a mensagem de status da sala",
     "Favourite": "Favorito",
@@ -66,7 +64,6 @@
     "Permalink": "Link permanente",
     "powered by Matrix": "rodando a partir do Matrix",
     "Quote": "Citar",
-    "Redact": "Remover",
     "Reject": "Rejeitar",
     "Remove": "Remover",
     "Remove %(name)s from the directory?": "Remover %(name)s da lista pública de salas?",
@@ -207,7 +204,6 @@
     "To return to your account in future you need to <u>set a password</u>": "Para voltar à sua conta no futuro, necessita de <u>definir uma palavra-passe</u>",
     "Set Password": "Definir palavra-passe",
     "Couldn't load home page": "Não foi possível carregar a página inicial",
-    "Invite to this group": "Convidar para este grupo",
     "Filter results": "Filtrar resultados",
     "You must specify an event type!": "Tem que especificar um tipo de evento!"
 }

src/i18n/strings/pt_BR.json

@@ -23,14 +23,12 @@
     "Enter keywords separated by a comma:": "Coloque cada palavras-chave separada por vírgula:",
     "Error": "Erro",
     "Error saving email notification preferences": "Erro ao salvar as preferências de notificação por email",
-    "#example:": "#exemplo",
     "Failed to add tag %(tagName)s to room": "Falha ao adicionar %(tagName)s à sala",
     "Failed to change settings": "Falhou ao mudar as preferências",
     "Failed to forget room %(errCode)s": "Falhou ao esquecer a sala %(errCode)s",
     "Failed to update keywords": "Falha ao alterar as palavras-chave",
     "Failed to get protocol list from Home Server": "Falha em acessar a lista de protocolos do servidor padrão",
     "Failed to get public room list": "Falha ao acessar a lista pública de salas",
-    "Failed to remove tag %(tag)s from room": "Falha ao remover a palavra-chave %(tag)s da sala",
     "Failed to set direct chat tag": "Falha ao definir conversa como pessoal",
     "Failed to set Direct Message status of room": "Falha em definir a mensagem de status da sala",
     "Favourite": "Favorito",
@@ -66,7 +64,6 @@
     "Permalink": "Link permanente",
     "powered by Matrix": "rodando a partir do Matrix",
     "Quote": "Citar",
-    "Redact": "Remover",
     "Reject": "Rejeitar",
     "Remove": "Remover",
     "Remove %(name)s from the directory?": "Remover %(name)s da lista pública de salas?",
@@ -151,7 +148,6 @@
     "You need to be using HTTPS to place a screen-sharing call.": "Você precisa estar usando HTTPS para poder iniciar uma chamada com compartilhamento de tela.",
     "Login": "Fazer login",
     "Welcome to Riot.im": "Seja bem-vinda(o) a Riot.im",
-    "Decentralised, encrypted chat & collaboration powered by": "Colaboração descentralizada e criptografada impulsada por",
     "Search the room directory": "Buscar na lista pública de salas",
     "Chat with Riot Bot": "Conversar com o Bot do Riot",
     "Get started with some tips from Riot Bot!": "Comece com algumas dicas do Bot do Riot!",
@@ -209,6 +205,5 @@
     "Event sent!": "Evento enviado!",
     "Event Type": "Tipo do Evento",
     "Event Content": "Conteúdo do Evento",
-    "State Key": "Chave do Estado",
+    "State Key": "Chave do Estado"
-    "Invite to this group": "Convide para este grupo"
 }

src/i18n/strings/ru.json

@@ -2,16 +2,13 @@
     "Add an email address above to configure email notifications": "Добавьте email адрес для оповещений",
     "All notifications are currently disabled for all targets.": "Все оповещения для всех устройств отключены.",
     "An error occurred whilst saving your email notification preferences.": "Возникла ошибка при сохранении настроек оповещения по email.",
-    "and remove": "и удалить",
     "Can't update user notification settings": "Не удается обновить пользовательские настройки оповещения",
     "Couldn't find a matching Matrix room": "Не удалось найти подходящую комнату Matrix",
     "Custom Server Options": "Настраиваемые параметры сервера",
     "delete the alias.": "удалить псевдоним.",
-    "Delete the room alias": "Удалить привязку комнаты",
     "Direct Chat": "Прямой чат",
     "Directory": "Каталог",
     "Dismiss": "Отказ",
-    "Drop here to": "Перетащите сюда",
     "Enable audible notifications in web client": "Включить звуковые уведомления в веб клиенте",
     "Enable desktop notifications": "Включить оповещения на рабочем столе",
     "Enable email notifications": "Включить уведомления по email",
@@ -21,19 +18,16 @@
     "Error": "Ошибка",
     "Error saving email notification preferences": "Ошибка при сохранении настроек уведомлений по email",
     "#example": "#пример",
-    "Failed to add tag ": "Не удалось добавить тег ",
     "Failed to change settings": "Не удалось изменить настройки",
     "Failed to update keywords": "Не удалось обновить ключевые слова",
     "Failed to get protocol list from Home Server": "Не удалось получить список протоколов с домашнего сервера",
     "Failed to get public room list": "Не удалось получить список общедоступных комнат",
-    "Failed to remove tag ": "Не удалось удалить тег ",
     "Failed to set Direct Message status of room": "Не удалось установить статус прямого сообщения в комнате",
     "Favourite": "Избранное",
     "Fetching third party location failed": "Не удалось извлечь местоположение третьей стороны",
     "Files": "Файлы",
     "Filter room names": "Фильтр по названию комнат",
     "Forget": "Забыть",
-    "from the directory": "из каталога",
     "Guests can join": "Гости могут присоединиться",
     "Invite to this room": "Пригласить в комнату",
     "Keywords": "Ключевые слова",
@@ -53,7 +47,6 @@
     "powered by Matrix": "Основано на Matrix",
     "Reject": "Отклонить",
     "Remove": "Удалить",
-    "remove": "удалить",
     "Remove from Directory": "Удалить из каталога",
     "Riot does not know how to join a room on this network": "Riot не знает, как присоединиться к комнате, принадлежащей к этой сети",
     "Room not found": "Комната не найдена",
@@ -98,7 +91,6 @@
     "Mute": "Беззвучный",
     "Permalink": "Постоянная ссылка",
     "Quote": "Цитата",
-    "Redact": "Удалить",
     "Remove %(name)s from the directory?": "Удалить %(name)s из каталога?",
     "remove %(name)s from the directory.": "удалить %(name)s из каталога.",
     "Resend": "Переотправить",
@@ -212,7 +204,9 @@
     "Event Type": "Тип мероприятия",
     "Event Content": "Содержание мероприятия",
     "State Key": "Ключ состояния",
-    "Invite to this group": "Пригласить в эту группу",
     "Filter results": "Фильтрация результатов",
-    "You must specify an event type!": "Необходимо указать тип мероприятия!"
+    "You must specify an event type!": "Необходимо указать тип мероприятия!",
+    "Show message in desktop notification": "Показывать сообщение в уведомлении на рабочем столе",
+    "Pin Message": "Закрепить сообщение",
+    "Unpin Message": "Открепить сообщение"
 }

src/i18n/strings/sv.json

@@ -82,7 +82,6 @@
     "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.": "Installera <a href=\"https://www.google.com/chrome\">Chrome</a> eller <a href=\"https://getfirefox.com\">Firefox</a> för den bästa upplevelsen.",
     "powered by Matrix": "drivs av Matrix",
     "Quote": "Citera",
-    "Redact": "Dra tillbaka",
     "Reject": "Avvisa",
     "Remove %(name)s from the directory?": "Ta bort %(name)s från katalogen?",
     "Remove": "Ta bort",
@@ -197,6 +196,5 @@
     "Thank you!": "Tack!",
     "Back": "Tillbaka",
     "Filter results": "Filtrera resultaten",
-    "Explore Room State": "Utforska rumläget",
+    "Explore Room State": "Utforska rumläget"
-    "Invite to this group": "Bjud in till denna grupp"
 }

src/i18n/strings/th.json

@@ -33,7 +33,6 @@
     "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "กรุณาอธิบายจุดบกพร่อง คุณทำอะไร? ควรจะเกิดอะไรขึ้น? แล้วอะไรคือสิ่งที่เกิดขึ้นจริง?",
     "Please describe the bug and/or send logs.": "กรุณาอธิบายจุดบกพร่อง และ/หรือ ส่งล็อก",
     "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.": "กรุณาติดตั้ง <a href=\"https://www.google.com/chrome\">Chrome</a> หรือ <a href=\"https://getfirefox.com\">Firefox</a> เพื่อประสบการณ์ที่ดีที่สุด",
-    "Redact": "ลบ",
     "Reject": "ปฏิเสธ",
     "Remove": "ลบ",
     "Messages containing <span>keywords</span>": "ข้อความที่มี<span>คีย์เวิร์ด</span>",
@@ -152,7 +151,6 @@
     "Search the room directory": "ค้นหาในไดเรกทอรีห้อง",
     "Chat with Riot Bot": "แชทกับบอท Riot",
     "Get started with some tips from Riot Bot!": "มาเริ่มกันด้วยเคล็ดลับเล็กน้อยจากบอท Riot!",
-    "General discussion about Matrix": "พูดคุยเรื่องทั่วไปเกี่ยวกับ Matrix",
     "Discussion of all things Matrix!": "พูดคุยทุกเรื่อง เรื่อง Matrix!",
     "Riot/Web &amp; Desktop chat": "แชทเกี่ยวกับ Riot บนเว็บและเดสก์ทอป",
     "Riot/iOS &amp; matrix-ios-sdk chat": "แชทเกี่ยวกับ Riot บน iOS และ matrix-ios-sdk",

src/i18n/strings/tr.json

@@ -91,7 +91,6 @@
     "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.": "Lütfen <a href=\"https://www.google.com/chrome\"> Chrome </a> ya da <a href=\"https://getfirefox.com\"> Firefox </a> 'u en iyi deneyim için yükleyin.",
     "powered by Matrix": "Matrix tarafından desteklenmektedir",
     "Quote": "Alıntı",
-    "Redact": "Yazıya Dökme",
     "Reject": "Reddet",
     "Remove %(name)s from the directory?": "%(name)s'i dizinden kaldırılsın mı ?",
     "Remove": "Kaldır",

src/i18n/strings/uk.json

@@ -84,7 +84,6 @@
     "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.": "Для більшої зручності у використанні встановіть, будь ласка, <a href=\"https://www.google.com/chrome\">Chrome</a> або <a href=\"https://getfirefox.com\">Firefox</a>.",
     "powered by Matrix": "працює на Matrix",
     "Quote": "Цитувати",
-    "Redact": "Видалити",
     "Reject": "Відмовитись",
     "Remove %(name)s from the directory?": "Прибрати %(name)s з каталогу?",
     "Remove": "Прибрати",
@@ -206,6 +205,5 @@
     "Event sent!": "Захід відправлено!",
     "Event Type": "Тип західу",
     "Event Content": "Зміст заходу",
-    "State Key": "Ключ стану",
+    "State Key": "Ключ стану"
-    "Invite to this group": "Запросити в цю групу"
 }

src/i18n/strings/zh_Hans.json

@@ -203,6 +203,5 @@
     "Event sent!": "事件已发出！",
     "Event Type": "事件类型",
     "Event Content": "事件内容",
-    "State Key": "状态密钥",
+    "State Key": "状态密钥"
-    "Invite to this group": "邀请到这个群组"
 }

src/i18n/strings/zh_Hant.json

@@ -121,7 +121,6 @@
     "Notify me for anything else": "所有消息都通知我",
     "Permalink": "永久連結",
     "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.": "諘安裝 <a href=\"https://www.google.com/chrome\">Chrome</a> 或 <a href=\"https://getfirefox.com\">Firefox</a> 來取得最佳體驗。",
-    "Redact": "纂輯\t",
     "Reject": "拒絕",
     "Remove %(name)s from the directory?": "自目錄中移除 %(name)s？",
     "remove %(name)s from the directory.": "自目錄中移除 %(name)s。",
@@ -205,7 +204,9 @@
     "Event Type": "事件類型",
     "Event Content": "事件內容",
     "State Key": "狀態金鑰",
-    "Invite to this group": "邀請進入此群組",
     "Filter results": "過濾結果",
-    "You must specify an event type!": "您必須指定事件類型！"
+    "You must specify an event type!": "您必須指定事件類型！",
+    "Show message in desktop notification": "在桌面通知中顯示訊息",
+    "Pin Message": "釘選訊息",
+    "Unpin Message": "取消釘選訊息"
 }

src/skins/vector/css/matrix-react-sdk/structures/_MyGroups.scss

@@ -24,14 +24,38 @@ limitations under the License.
     margin-left: 0px;
 }
 
-.mx_MyGroups_joinCreateBox {
+.mx_MyGroups_header {
-    display: table;
+    /* Keep mid-point of create button aligned with icon in page header */
-    margin-bottom: 30px;
+    margin-left: 2px;
+    display: flex;
+    flex-wrap: wrap;
 }
 
-.mx_MyGroups_createBox, .mx_MyGroups_joinBox {
+.mx_MyGroups_headerCard {
-    display: table-cell;
+    flex: 1 0 50%;
-    width: 40%;
+    margin-bottom: 30px;
+    min-width: 400px;
+    display: flex;
+    align-items: center;
+}
+
+.mx_MyGroups_headerCard .mx_MyGroups_headerCard_button {
+    margin-right: 13px;
+    height: 50px;
+}
+
+.mx_MyGroups_headerCard_button object {
+    /* Otherwise the SVG object absorbs clicks and the button doesn't work */
+    pointer-events: none;
+}
+
+.mx_MyGroups_headerCard_header {
+    font-weight: bold;
+    margin-bottom: 10px;
+}
+
+.mx_MyGroups_headerCard_content {
+    padding-right: 15px;
 }
 
 /* Until the button is wired up */
@@ -39,23 +63,16 @@ limitations under the License.
     visibility: hidden;
 }
 
-.mx_MyGroups_joinCreateHeader {
-    font-weight: bold;
-    margin-bottom: 10px;
-}
-
-.mx_MyGroups_joinCreateButton {
-    float: left;
-    margin: 10px;
-}
-
-.mx_MyGroups_joinCreateButton object {
-    /* Otherwise the SVG object absorbs clicks and the button doesn't work */
-    pointer-events: none;
-}
-
 .mx_MyGroups_content {
-    clear: left;
+    margin-left: 2px;
+}
+
+.mx_MyGroups_placeholder {
+    background-color: $group-my-groups-placeholder-bg;
+    color: $group-my-groups-placeholder-fg;
+    line-height: 400px;
+    border-radius: 10px;
+    text-align: center;
 }
 
 .mx_MyGroups_joinedGroups {
@@ -66,7 +83,8 @@ limitations under the License.
 }
 
 .mx_MyGroups_joinedGroups .mx_GroupTile {
-    width: 300px;
+    min-width: 300px;
+    flex: 1 0 25%;
     height: 75px;
     margin-bottom: 15px;
     margin-right: 10px;

src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss

@@ -67,8 +67,9 @@ limitations under the License.
 }
 
 .mx_EventTile .mx_SenderProfile .mx_Flair img {
-    vertical-align: -3px;
+    vertical-align: -2px;
     margin-right: 2px;
+    border-radius: 8px;
 }
 
 .mx_EventTile .mx_MessageTimestamp {

src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomHeader.scss

@@ -137,8 +137,8 @@ limitations under the License.
 
 .mx_RoomHeader_avatarPicker_remove {
     position: absolute;
-    top: 10px;
+    top: -11px;
-    left: 45px;
+    right: -9px;
 }
 
 .mx_RoomHeader_name:hover div:not(.mx_RoomHeader_editable) {
@@ -186,8 +186,12 @@ limitations under the License.
     object-fit: cover;
 }
 
+.mx_RoomHeader_avatarPicker {
+    margin-top: 23px;
+    position: relative;
+}
+
 .mx_RoomHeader_avatarPicker_edit {
-    position: absolute;
     margin-left: 16px;
     margin-top: 4px;
 }

src/skins/vector/css/themes/_base.scss

@@ -28,7 +28,10 @@ $warning-color: #ff0064;
 $mention-user-pill-bg-color: #ff0064;
 $other-user-pill-bg-color: rgba(0, 0, 0, 0.1);
 
+// groups
 $group-alert-color: #774f7e;
+$group-my-groups-placeholder-bg: #f7f7f7;
+$group-my-groups-placeholder-fg: #888;
 
 $preview-bar-bg-color: #f7f7f7;
 

src/skins/vector/css/themes/_dark.scss

@@ -20,6 +20,9 @@ $focus-brightness: 200%;
 // red warning colour
 $warning-color: #ff0064;
 
+// groups
+$group-my-groups-placeholder-bg: #454545;
+
 $other-user-pill-bg-color: rgba(255, 255, 255, 0.1);
 
 $preview-bar-bg-color: #333;