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

This commit is contained in:
David Baker
2018-03-16 15:48:02 +00:00
26 changed files with 2918 additions and 193 deletions
+14 -3
View File
@@ -315,7 +315,7 @@
"Unignore": "Deixa de ignorar",
"Ignore": "Ignora",
"Jump to read receipt": "Vés a l'últim missatge llegit",
"Mention": "Menció",
"Mention": "Menciona",
"Invite": "Convida",
"User Options": "Opcions d'usuari",
"Direct chats": "Xats directes",
@@ -376,7 +376,7 @@
"Idle for %(duration)s": "Inactiu durant %(duration)s",
"Offline for %(duration)s": "Desconnectat durant %(duration)s",
"Unknown for %(duration)s": "Desconegut durant %(duration)s",
"Online": "En línia",
"Online": "Conectat",
"Idle": "Inactiu",
"Offline": "Desconnectat",
"Unknown": "Desconegut",
@@ -864,5 +864,16 @@
"Import": "Importa",
"The version of Riot.im": "La versió de Riot.im",
"Email": "Correu electrònic",
"Add email address": "Afegeix correu electrònic"
"Add email address": "Afegeix correu electrònic",
"I have verified my email address": "He verificat l'adreça de correu electrònic",
"Send Reset Email": "Envia email de reinici",
"Your homeserver's URL": "URL del teu homeserver",
"Your identity server's URL": "URL del teu servidor d'identitat",
"Analytics": "Analítiques",
"%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s ha canviat el seu nom visible a %(displayName)s.",
"Server may be unavailable or overloaded": "El servidor pot estar inaccessible o sobrecarregat",
"Report it": "Informa",
"Found a bug?": "Has trobat un error?",
"Display name": "Nom visible",
"Identity Server is": "El servidor d'identitat es"
}