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

2018-06-25 10:50:21 +00:00
parent b38149e74d 553111b6e2
commit fb7c26d21c
8 changed files with 110 additions and 70 deletions
@@ -168,7 +168,6 @@
    "Authentication check failed: incorrect password?": "Fallou a comprobación de autenticación: contrasinal incorrecto?",
    "Failed to join room": "Non se puido unir a sala",
    "Message Pinning": "Fixando mensaxe",
-    "Tag Panel": "Panel de etiquetas",
    "Disable Emoji suggestions while typing": "Desactivar a suxestión de Emoji mentres escribe",
    "Use compact timeline layout": "Utilizar a disposición compacta da liña temporal",
    "Hide removed messages": "Ocultar mensaxes eliminadas",