nikrozman/element-web
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix merge-conflict

Browse Source 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
This commit is contained in:
Stefan Parviainen
2017-10-11 20:02:14 +02:00
parent 581abcb4b7 09b53d9f85
commit f694fb24ff
169 changed files with 2857 additions and 2914 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/i18n/strings/eu.json
View File

@@ -346,7 +346,6 @@
"Missing room_id in request": "Gelaren ID-a falta da eskaeran",
"Missing user_id in request": "Erabiltzailearen ID-a falta da eskaeran",
"Mobile phone number": "Mugikorraren telefono zenbakia",
"my Matrix ID": "Nire Matrix ID-a",
"Never send encrypted messages to unverified devices in this room": "Ez bidali inoiz zifratutako mezuak egiaztatu gabeko gailuetara gela honetan",
"Never send encrypted messages to unverified devices in this room from this device": "Ez bidali inoiz zifratutako mezuak egiaztatu gabeko gailuetara gela honetan gailu honetatik",
"New address (e.g. #foo:%(localDomain)s)": "Helbide berria (adib. #foo:%(localDomain)s)",
@@ -464,20 +463,13 @@
"This room is not accessible by remote Matrix servers": "Gela hau ez dago eskuragarri urruneko zerbitzarietan",
"This room's internal ID is": "Gela honen barne ID-a:",
"times": "aldi",
"To ban users": "Erabiltzaileak debekatzea",
"to browse the directory": "direktorioa arakatzea",
"To configure the room": "Gela konfiguratzea",
"to demote": "mailaz jaistea",
"to favourite": "gogoko egitea",
"To invite users into the room": "Erabiltzaileak gela honetara gonbidatzea",
"To kick users": "Erabiltzaileak kaleratzea",
"To link to a room it must have <a>an address</a>.": "Gelara estekatzeko honek <a>helbide bat</a> izan behar du.",
"to make a room or": "gela bat egitea edo",
"To remove other users' messages": "Beste erabiltzaileen mezuak kentzea",
"To reset your password, enter the email address linked to your account": "Zure pasahitza berrezartzeko, sartu zure kontuarekin lotutako e-mail helbidea",
"to restore": "berreskuratzea",
"To send events of type": "Mota honetako gertaerak bidaltzea:",
"To send messages": "Mezuak bidaltzea",
"to start a chat with someone": "norbaitekin txat bat hastea",
"to tag direct chat": "txat zuzena etiketatzea",
"To use it, just wait for autocomplete results to load and tab through them.": "Erabiltzeko, itxaron osatze automatikoaren emaitzak kargatu arte eta gero tabuladorearekin hautatu.",