Merge branch 'develop' of https://github.com/vector-im/riot-web into develop
Conflicts: src/i18n/strings/eo.json
This commit is contained in:
commit
a6155c98ec
47 changed files with 261 additions and 131 deletions
|
@ -5,7 +5,7 @@
|
|||
"Add an email address above to configure email notifications": "Engada un enderezo de correo electrónico para configurar as notificacións",
|
||||
"Advanced notification settings": "Axustes avanzados de notificación",
|
||||
"All messages": "Todas as mensaxes",
|
||||
"All messages (loud)": "Todas as mensaxes (alto)",
|
||||
"All messages (noisy)": "Todas as mensaxes (alto)",
|
||||
"All Rooms": "Todas as Salas",
|
||||
"All notifications are currently disabled for all targets.": "Todas as notificacións están deshabilitadas para todos os destinos.",
|
||||
"An error occurred whilst saving your email notification preferences.": "Algo fallou mentras se gardaban as súas preferencias de notificaicón.",
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue