Merge branch 'develop' of https://github.com/vector-im/riot-web into develop

Conflicts:
	src/i18n/strings/eo.json
This commit is contained in:
Weblate
2018-02-01 10:24:21 +00:00
47 changed files with 261 additions and 131 deletions

View File

@@ -5,7 +5,7 @@
"Add an email address above to configure email notifications": "Gehitu e-mail helbide bat goian e-mail bidezko jakinarazpenak konfiguratzeko",
"Advanced notification settings": "Jakinarazpen aurreratuen ezarpenak",
"All messages": "Mezu guztiak",
"All messages (loud)": "Mezu guztiak (ozen)",
"All messages (noisy)": "Mezu guztiak (ozen)",
"All Rooms": "Gela guztiak",
"All notifications are currently disabled for all targets.": "Une honetan jakinarazpen guztiak helburu guztietarako desgaituta daude.",
"An error occurred whilst saving your email notification preferences.": "Errore bat gertatu da zure e-mail bidezko jakinarazpenen hobespenak gordetzean.",