Merge branch 'develop' of https://github.com/vector-im/riot-web into develop
Conflicts: src/i18n/strings/cs.json src/i18n/strings/fr.json src/i18n/strings/nb_NO.json src/i18n/strings/nl.json src/i18n/strings/pt_BR.json
This commit is contained in:
commit
8216d8999c
48 changed files with 168 additions and 504 deletions
|
@ -7,12 +7,10 @@
|
|||
"Failed to change password. Is your password correct?": "Hi ha hagut un error al canviar la vostra contrasenya. És correcte la vostra contrasenya?",
|
||||
"Continue": "Continua",
|
||||
"All Rooms": "Totes les sales",
|
||||
"Create new room": "Crea una nova sala",
|
||||
"Couldn't find a matching Matrix room": "No s'ha pogut trobar una sala de Matrix que coincideixi",
|
||||
"Failed to add tag %(tagName)s to room": "No s'ha pogut afegir l'etiqueta %(tagName)s a la sala",
|
||||
"Failed to forget room %(errCode)s": "No s'ha pogut oblidar la sala %(errCode)s",
|
||||
"Failed to get public room list": "No s'ha pogut obtenir el llistat de sales públiques",
|
||||
"Failed to join the room": "No s'ha pogut unir a la sala",
|
||||
"Failed to remove tag %(tagName)s from room": "No s'ha pogut esborrar l'etiqueta %(tagName)s de la sala",
|
||||
"Filter room names": "Filtra els noms de les sales",
|
||||
"Couldn't load home page": "No s'ha pogut carregar la pàgina d'inici",
|
||||
|
@ -22,15 +20,12 @@
|
|||
"Direct Chat": "Xat directe",
|
||||
"Directory": "Directori",
|
||||
"Failed to set direct chat tag": "No s'ha pogut establir l'etiqueta del xat directe",
|
||||
"Room directory": "Directori de sales",
|
||||
"Start chat": "Inicia un xat",
|
||||
"Invite to this room": "Convida a aquesta sala",
|
||||
"No rooms to show": "No hi ha sales a mostrar",
|
||||
"Riot does not know how to join a room on this network": "El Riot no sap com unir-se a una sala en aquesta xarxa",
|
||||
"Room not found": "No s'ha trobat la sala",
|
||||
"Unnamed room": "Sala sense nom",
|
||||
"#example": "#exemple",
|
||||
"Settings": "Paràmetres",
|
||||
"Failed to change settings": "No s'han pogut modificar els paràmetres",
|
||||
"Enable audible notifications in web client": "Habilita les notificacions d'àudio al client web",
|
||||
"Enable desktop notifications": "Habilita les notificacions d'escriptori",
|
||||
|
@ -85,7 +80,6 @@
|
|||
"Source URL": "URL origen",
|
||||
"The server may be unavailable or overloaded": "El servidor pot no estar disponible o sobrecarregat",
|
||||
"This Room": "Aquesta sala",
|
||||
" to room": " a la sala",
|
||||
"Unavailable": "No disponible",
|
||||
"Unknown device": "Dispositiu desconegut",
|
||||
"unknown error code": "codi d'error desconegut",
|
||||
|
@ -110,7 +104,6 @@
|
|||
"Checking for an update...": "Comprovant si hi ha actualitzacions...",
|
||||
"No update available.": "No hi ha cap actualització disponible.",
|
||||
"Downloading update...": "Descarregant l'actualització...",
|
||||
"Welcome page": "Pàgina de benvinguda",
|
||||
"Welcome to Riot.im": "Benvingut a Riot.im",
|
||||
"Chat with Riot Bot": "Conversa amb el Bot de Riot",
|
||||
"Back": "Enrere",
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue