Fix merge-conflict

Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
This commit is contained in:
Stefan Parviainen
2017-10-11 20:02:14 +02:00
169 changed files with 2857 additions and 2914 deletions

View File

@@ -274,7 +274,7 @@
"Moderator": "Moderators",
"Must be viewing a room": "Jāapskata istaba",
"Mute": "Apklusināt",
"my Matrix ID": "mans Matrix ID",
"%(serverName)s Matrix ID": "%(serverName)s Matrix ID",
"Name": "Vārds",
"Never send encrypted messages to unverified devices from this device": "Nekad nesūti no šīs ierīces šifrētas ziņas uz neverificētām ierīcēm",
"Never send encrypted messages to unverified devices in this room": "Nekad nesūti šifrētas ziņas uz neverificētām ierīcēm šajā istabā",
@@ -502,20 +502,13 @@
"This room is not accessible by remote Matrix servers": "Šī istaba nav pieejama no attālinātajiem Matrix serveriem",
"This room's internal ID is": "Šīs istabas iekšējais ID ir",
"times": "reizes",
"To ban users": "lai banotu lietotājus",
"to browse the directory": "lai pārlūkotu katalogu",
"To configure the room": "Lai konfigurētu istabu",
"to demote": "lai samazinātu",
"to favourite": "lai pievienotu favorītiem",
"To invite users into the room": "Lai uzaicinātu lietotājus uz istabu",
"To kick users": "Lai \"iespertu\" (kicks) lietotājiem",
"To link to a room it must have <a>an address</a>.": "Lai ieliktu saiti uz istabu, tai ir jābūt piešķirtai <a>adresei</a>.",
"to make a room or": "lai izveidotu istabu vai",
"To remove other users' messages": "Lai dzēstu citu lietotāju ziņas",
"To reset your password, enter the email address linked to your account": "Lai atiestatītu savu paroli, ievadi tavam kontam piesaistīto epasta adresi",
"to restore": "lai atjaunotu",
"To send events of type": "Lai sūtītu sekojošā tipa notikumus",
"To send messages": "Lai nosūtītu ziņas",
"to start a chat with someone": "lai uzstāktu čatu ar kādu",
"to tag direct chat": "lai pieliktu birku tiešajam čatam",
"To use it, just wait for autocomplete results to load and tab through them.": "Lai to izmantotu, vienkārši gaidi, kamēr ielādējas automātiski ieteiktie rezultāti, un pārvietojies caur tiem.",