From 84ab5d3499e9dbcb97fed23051a104d9b5e967cc Mon Sep 17 00:00:00 2001
From: Pavol Babincak <scroolik@gmail.com>
Date: Tue, 24 Apr 2012 00:19:58 +0200
Subject: Slovak translation update

License: This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.

diff --git a/Swift/Translations/swift_sk.ts b/Swift/Translations/swift_sk.ts
index 6b03733..bdd199b 100644
--- a/Swift/Translations/swift_sk.ts
+++ b/Swift/Translations/swift_sk.ts
@@ -5,507 +5,593 @@
 <context>
     <name></name>
     <message>
-        <location filename="../Controllers/Chat/ChatController.cpp" line="46"/>
+        <location filename="../Controllers/Chat/ChatController.cpp" line="56"/>
         <source>Starting chat with %1% in chatroom %2%</source>
-        <translation>Začatý rozhovor s %1% v miestnosti %2%</translation>
+        <translation>Začína sa rozhovor s %1% v miestnosti %2%</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatController.cpp" line="49"/>
+        <location filename="../Controllers/Chat/ChatController.cpp" line="59"/>
         <source>Starting chat with %1% - %2%</source>
-        <translation>Začatý rozhovor s %1% - %2%</translation>
+        <translation>Začína sa rozhovor s %1% - %2%</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatController.cpp" line="119"/>
+        <location filename="../Controllers/Chat/ChatController.cpp" line="188"/>
+        <source>This chat doesn&apos;t support delivery receipts.</source>
+        <translation>Tento rozhovor nepodporuje doručenky.</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatController.cpp" line="190"/>
+        <source>This chat may not support delivery receipts. You might not receive delivery receipts for the messages you sent.</source>
+        <translation>Tento rozhovor nemusí podporovať doručenky. Je možné, že k odoslaným správam nedostanete potvrdenie o doručení.</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatController.cpp" line="202"/>
+        <location filename="../Controllers/FileTransfer/FileTransferController.cpp" line="42"/>
         <source>me</source>
         <translation>ja</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatController.cpp" line="160"/>
+        <location filename="../Controllers/Chat/ChatController.cpp" line="290"/>
         <source>%1% has gone offline</source>
-        <translatorcomment>rod</translatorcomment>
-        <translation>%1% je teraz odpojený</translation>
+        <translation>%1% je odteraz offline</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatController.cpp" line="164"/>
+        <location filename="../Controllers/Chat/ChatController.cpp" line="294"/>
         <source>%1% has become available</source>
-        <translation>%1% je teraz tu</translation>
+        <translation>%1% je odteraz tu</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatController.cpp" line="166"/>
+        <location filename="../Controllers/Chat/ChatController.cpp" line="296"/>
         <source>%1% has gone away</source>
-        <translation>%1% je teraz preč</translation>
+        <translation>%1% je odteraz preč</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatController.cpp" line="168"/>
+        <location filename="../Controllers/Chat/ChatController.cpp" line="298"/>
         <source>%1% is now busy</source>
         <translation>%1% teraz nemá čas</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="56"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="69"/>
         <source>The day is now %1%</source>
         <translation>Teraz je %1%</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="191"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="188"/>
+        <source>Couldn&apos;t send message: %1%</source>
+        <translation>Správu sa nepodarilo odoslať: %1%</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="246"/>
         <source>Error sending message</source>
         <translation>Chyba pri posielaní správy</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="197"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="252"/>
         <source>Bad request</source>
         <translation>Nesprávna požiadavka</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="198"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="253"/>
         <source>Conflict</source>
         <translation>Konflikt</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="199"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="254"/>
         <source>This feature is not implemented</source>
-        <translation>Táto vlastnosť nieje implementovaná</translation>
+        <translation>Táto vlastnosť nie je implementovaná</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="200"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="255"/>
         <source>Forbidden</source>
         <translation>Zakázané</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="201"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="256"/>
         <source>Recipient can no longer be contacted</source>
-        <translation>Príjemcu už nieje možné kontaktovať</translation>
+        <translation>Príjemcu už nie je možné kontaktovať</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="202"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="257"/>
         <source>Internal server error</source>
         <translation>Vnútorná chyba serveru</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="203"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="258"/>
         <source>Item not found</source>
         <translation>Položka nenájdená</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="204"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="259"/>
         <source>JID Malformed</source>
         <translation>Nesprávne utvorené JID</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="205"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="260"/>
         <source>Message was rejected</source>
         <translation>Správa bola odmietnutá</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="206"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="261"/>
         <source>Not allowed</source>
         <translation>Nepovolené</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="207"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="262"/>
         <source>Not authorized</source>
         <translation>Neautorizované</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="208"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="263"/>
         <source>Payment is required</source>
         <translation>Vyžadovaná platba</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="209"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="264"/>
         <source>Recipient is unavailable</source>
         <translation>Príjemca je nedostupný</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="210"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="265"/>
         <source>Redirect</source>
         <translation>Presmerovanie</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="211"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="266"/>
         <source>Registration required</source>
         <translation>Vyžadovaná registrácia</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="212"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="267"/>
         <source>Recipient&apos;s server not found</source>
         <translation>Server príjemcu nenájdený</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="213"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="268"/>
         <source>Remote server timeout</source>
         <translatorcomment>správny význam?</translatorcomment>
         <translation>Vypršal čas pre pripojenie k vzdialenému serveru</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="214"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="269"/>
         <source>The server is low on resources</source>
         <translation>Server má nedostatok zdrojov</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="215"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="270"/>
         <source>The service is unavailable</source>
-        <translation>Služba nedostupná</translation>
+        <translation>Služba nie je dostupná</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="216"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="271"/>
         <source>A subscription is required</source>
         <translation>Vyžadované prihlásenie k odberu</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="217"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="272"/>
         <source>Undefined condition</source>
         <translation>Nedefinovaná podmienka</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="218"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="273"/>
         <source>Unexpected request</source>
         <translation>Neočakávaná požiadavka</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="114"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="205"/>
         <source>Room %1% is not responding. This operation may never complete.</source>
         <translation>Miestnosť %1% neodpovedá. Táto operácia nemusí nikdy skončiť.</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="125"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="216"/>
         <source>Unable to enter this room</source>
-        <translation>Nepodarilo sa vojsť do miestnosti</translation>
+        <translation>Nepodarilo sa vstúpiť do miestnosti</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="131"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="222"/>
         <source>Unable to enter this room as %1%, retrying as %2%</source>
-        <translation>Nepodarilo sa vojsť do miestnosti ako %1%, opakujem ako %2%</translation>
+        <translation>Nepodarilo sa vstúpiť do miestnosti ako %1%, znovu opakované ako %2%</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="135"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="226"/>
         <source>No nickname specified</source>
         <translation>Nezadaná prezývka</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="139"/>
         <source>A password needed</source>
-        <translation>Je vyžadované heslo</translation>
+        <translation type="obsolete">Je vyžadované heslo</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="143"/>
+        <source>A password is needed</source>
+        <translation type="obsolete">Je vyžadované heslo</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="234"/>
         <source>Only members may enter</source>
-        <translation>Vojsť môžu iba členovia</translation>
+        <translation>Vstúpiť môžu iba členovia</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="147"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="238"/>
         <source>You are banned from the room</source>
         <translation>Máte zakázané vstúpiť do miestnosti</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="151"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="242"/>
         <source>The room is full</source>
         <translation>Miestosť je plná</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="155"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="246"/>
         <source>The room does not exist</source>
         <translation>Miestosť neexistuje</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="173"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="252"/>
+        <source>Couldn&apos;t join room: %1%.</source>
+        <translation>Nepodarilo sa vstúpiť do miestnosti: %1%.</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="264"/>
         <source>You have entered room %1% as %2%.</source>
-        <translation>Vošli ste do miestnosti %1% ako %2%.</translation>
+        <translation>Vstúpili ste do miestnosti %1% ako %2%.</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="214"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="310"/>
         <source>%1% has entered the room as a %2%.</source>
-        <translatorcomment>rod</translatorcomment>
-        <translation>%1% vošiel do miestnosti ako %2%.</translation>
+        <translation>%1% vstúpil/-a do miestnosti ako %2%.</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="217"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="313"/>
         <source>%1% has entered the room.</source>
-        <translatorcomment>rod</translatorcomment>
-        <translation>%1% vošiel do miestnosti.</translation>
+        <translation>%1% vstúpil/-a do miestnosti.</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="243"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="362"/>
         <source>moderator</source>
         <translation>moderátor</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="244"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="363"/>
         <source>participant</source>
         <translation>účastník</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="245"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="364"/>
         <source>visitor</source>
         <translation>návštevník</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="283"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="412"/>
         <source>The room subject is now: %1%</source>
         <translation>Predmet miestnosti je: %1%</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="313"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="445"/>
         <source>%1% is now a %2%</source>
         <translation>%1% je teraz %2%</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="319"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="461"/>
         <source>Moderators</source>
         <translation>Moderátori</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="320"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="462"/>
         <source>Participants</source>
         <translation>Účastníci</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="321"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="463"/>
         <source>Visitors</source>
         <translation>Návštevníci</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="322"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="464"/>
         <source>Occupants</source>
         <translatorcomment>lepšie synonymum k NoRole?</translatorcomment>
         <translation>Ostatní návštevníci</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="336"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="478"/>
         <source>Trying to enter room %1%</source>
-        <translation>Pokúšam sa vojsť do miestnosti %1%</translation>
+        <translation>Pokúšam sa vstúpiť do miestnosti %1%</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="519"/>
+        <source>%1% has left the room%2%</source>
+        <translation>%1% opustil/-a miestnosť%2%</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="523"/>
+        <source>You have been kicked out of the room</source>
+        <translation>Boli ste vyhodení z miestnosti</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="365"/>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="474"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="524"/>
+        <source>You have been banned from the room</source>
+        <translation>Bol vám zakázaný prístup do miestnosti</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="525"/>
+        <source>You are no longer a member of the room and have been removed</source>
+        <translation>Už nieste členom miestnosti a vaše členstvo vám bol odobrané</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="526"/>
+        <source>The room has been destroyed</source>
+        <translation>Miestnosť bola odstránená</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="642"/>
         <source>%1% has left the room</source>
-        <translatorcomment>rod</translatorcomment>
-        <translation>%1% opustil miestnosť</translation>
+        <translation>%1% opustil/-a miestnosť</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="365"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="528"/>
         <source>You have left the room</source>
         <translation>Opustili ste miestnosť</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="439"/>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="503"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="230"/>
+        <source>The correct room password is needed</source>
+        <translation>Je potrebné správne heslo miestnosti</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="607"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="671"/>
         <source> and </source>
         <translation> a </translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="463"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="631"/>
         <source>%1% have entered the room</source>
-        <translation>%1% vošli do miestnosti</translation>
+        <translation>%1% vstúpili do miestnosti</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="466"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="634"/>
         <source>%1% has entered the room</source>
-        <translatorcomment>rod</translatorcomment>
-        <translation>%1% vošiel do miestnosti</translation>
+        <translation>%1% vstúpil/-a do miestnosti</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="471"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="639"/>
         <source>%1% have left the room</source>
-        <translation>%1% opustil miestnosť</translation>
+        <translation>%1% opustili miestnosť</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="479"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="647"/>
         <source>%1% have entered then left the room</source>
-        <translation>%1% vošli a potom opustili miestnosť</translation>
+        <translation>%1% vstúpili a potom opustili miestnosť</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="482"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="650"/>
         <source>%1% has entered then left the room</source>
-        <translatorcomment>rod</translatorcomment>
-        <translation>%1% vošiel a potom opustil miestnosť</translation>
+        <translation>%1% vstúpil/-a a potom opustil/a miestnosť</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="487"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="655"/>
         <source>%1% have left then returned to the room</source>
         <translation>%1% opustili miestnosť a potom sa vrátili</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="490"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="658"/>
         <source>%1% has left then returned to the room</source>
-        <translation>%1% opustil miestnosť a potom sa vrátil</translation>
+        <translation>%1% opustil/-a miestnosť a potom sa vrátil/-a</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="694"/>
+        <source>Room configuration failed: %1%.</source>
+        <translation>Nepodarilo sa nastaviť miestnosť: %1%.</translation>
     </message>
     <message>
-        <location filename="../Controllers/EventNotifier.cpp" line="51"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="700"/>
+        <source>Occupant role change failed: %1%.</source>
+        <translation>Nepodarila sa zmeniť rola pre návštevníka: %1%.</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/EventNotifier.cpp" line="53"/>
         <source>%1% wants to add you to his/her contact list</source>
         <translation>%1% si vás chce pridať do zoznamu kontaktov</translation>
     </message>
     <message>
-        <location filename="../Controllers/EventNotifier.cpp" line="55"/>
+        <location filename="../Controllers/EventNotifier.cpp" line="57"/>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="438"/>
+        <location filename="../Controllers/EventNotifier.cpp" line="61"/>
+        <source>%1% has invited you to enter the %2% room</source>
+        <translation>%1% vás pozval/-a vstúpiť do miestnosti %2%</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="423"/>
+        <source>User address invalid. User address should be of the form &apos;alice@wonderland.lit&apos;</source>
+        <translation>Používateľská adresa je neplatná. Používateľská adresa by mala byť v tvare „alica@krajina-zazrakov.lit.“</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="523"/>
         <source>Unknown Error</source>
         <translation>Neznáma chyba</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="439"/>
+        <location filename="../Controllers/MainController.cpp" line="524"/>
         <source>Unable to find server</source>
         <translation>Nepodarilo sa nájsť server</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="440"/>
+        <location filename="../Controllers/MainController.cpp" line="525"/>
         <source>Error connecting to server</source>
         <translation>Chyba pri pripojení k serveru</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="441"/>
+        <location filename="../Controllers/MainController.cpp" line="526"/>
         <source>Error while receiving server data</source>
         <translation>Chyba pri prijímaní dát zo serveru</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="442"/>
+        <location filename="../Controllers/MainController.cpp" line="527"/>
         <source>Error while sending data to the server</source>
         <translation>Chyba pri posielaní dát na server</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="443"/>
+        <location filename="../Controllers/MainController.cpp" line="528"/>
         <source>Error parsing server data</source>
         <translation>Chyba pri spracovaní dát zo serveru</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="444"/>
+        <location filename="../Controllers/MainController.cpp" line="529"/>
         <source>Login/password invalid</source>
         <translation>Prihlasovacie meno, či heslo je neplatné</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="445"/>
+        <location filename="../Controllers/MainController.cpp" line="530"/>
         <source>Error while compressing stream</source>
         <translation>Chyba pri komprimovaní prúdu</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="446"/>
+        <location filename="../Controllers/MainController.cpp" line="531"/>
         <source>Server verification failed</source>
         <translation>Zlyhalo overenie serveru</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="447"/>
+        <location filename="../Controllers/MainController.cpp" line="532"/>
         <source>Authentication mechanisms not supported</source>
         <translation>Autentizačné mechanizmy niesú podporované</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="448"/>
+        <location filename="../Controllers/MainController.cpp" line="533"/>
         <source>Unexpected response</source>
         <translation>Neočakávaná odpoveď</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="449"/>
+        <location filename="../Controllers/MainController.cpp" line="534"/>
         <source>Error binding resource</source>
         <translation>Chyba pri spájaní zdroju</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="450"/>
+        <location filename="../Controllers/MainController.cpp" line="535"/>
         <source>Error starting session</source>
         <translation>Chyba pri spúštaní sedenia</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="451"/>
+        <location filename="../Controllers/MainController.cpp" line="536"/>
         <source>Stream error</source>
         <translation>Chyba prúdu</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="452"/>
+        <location filename="../Controllers/MainController.cpp" line="537"/>
         <source>Encryption error</source>
         <translation>Chyba šifrovania</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="453"/>
+        <location filename="../Controllers/MainController.cpp" line="538"/>
         <source>Error loading certificate (Invalid password?)</source>
         <translation>Chyba pri načítaní certifikátu (nesprávne heslo?)</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="454"/>
+        <location filename="../Controllers/MainController.cpp" line="539"/>
         <source>Certificate not authorized</source>
         <translation>Neautorizovaný certifikát</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="456"/>
+        <location filename="../Controllers/MainController.cpp" line="540"/>
+        <source>Certificate card removed</source>
+        <translation>Karta so certifikátom odstránená</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="542"/>
         <source>Unknown certificate</source>
         <translation>Neznámy certifikát</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="457"/>
+        <location filename="../Controllers/MainController.cpp" line="543"/>
         <source>Certificate has expired</source>
         <translation>Certifikát expiroval</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="458"/>
+        <location filename="../Controllers/MainController.cpp" line="544"/>
         <source>Certificate is not yet valid</source>
-        <translation>Certifikát zatiaľ nieje platný</translation>
+        <translation>Certifikát zatiaľ nie je platný</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="459"/>
+        <location filename="../Controllers/MainController.cpp" line="545"/>
         <source>Certificate is self-signed</source>
         <translation>Certifikát je podpísaný samým sebou</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="460"/>
+        <location filename="../Controllers/MainController.cpp" line="546"/>
         <source>Certificate has been rejected</source>
         <translation>Certifikát bol odmietnutý</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="461"/>
+        <location filename="../Controllers/MainController.cpp" line="547"/>
         <source>Certificate is not trusted</source>
-        <translatorcomment>divná formulácia</translatorcomment>
-        <translation>Certifikát nieje dôverný</translation>
+        <translation>Certifikát nie je dôvernyhodný</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="462"/>
+        <location filename="../Controllers/MainController.cpp" line="548"/>
         <source>Certificate cannot be used for encrypting your connection</source>
         <translation>Certifikát nemôže byť použitý pre šifrovanie vášho spojenia</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="463"/>
+        <location filename="../Controllers/MainController.cpp" line="549"/>
         <source>Certificate path length constraint exceeded</source>
         <translation>Prekročená dĺžka cesty certifikátu</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="464"/>
+        <location filename="../Controllers/MainController.cpp" line="550"/>
         <source>Invalid certificate signature</source>
         <translation>Neplatný podpis certifikátu</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="465"/>
+        <location filename="../Controllers/MainController.cpp" line="551"/>
         <source>Invalid Certificate Authority</source>
         <translation>Neplatná certifikačná autorita</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="466"/>
+        <location filename="../Controllers/MainController.cpp" line="552"/>
         <source>Certificate does not match the host identity</source>
         <translation>Certifikát sa nezhoduje s identitou hostiteľa</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="476"/>
+        <location filename="../Controllers/MainController.cpp" line="553"/>
+        <source>Certificate has been revoked</source>
+        <translation>Certifikát bol odvolaný</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="554"/>
+        <source>Unable to determine certificate revocation state</source>
+        <translation>Nepodarilo sa zistiť stav odvolania certifikátu</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="564"/>
         <source>Certificate error</source>
         <translation>Chyba certifikátu</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="490"/>
+        <location filename="../Controllers/MainController.cpp" line="578"/>
+        <source>Disconnected from %1%: %2%. To reconnect, Sign Out and provide your password again.</source>
+        <translation>Odpojené od %1%: %2. Pre znovu pripojenie sa odhláste a zadajte znovu svoje heslo.</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="584"/>
         <source>Reconnect to %1% failed: %2%. Will retry in %3% seconds.</source>
         <translation>Znovupripojenie ku %1% zlyhalo: %2%. Ďalší pokus o %3% sekúnd.</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="493"/>
+        <location filename="../Controllers/MainController.cpp" line="587"/>
         <source>Disconnected from %1%: %2%.</source>
         <translation>Odpojené od %1%: %2%.</translation>
     </message>
     <message>
-        <location filename="../Controllers/Roster/RosterController.cpp" line="126"/>
-        <location filename="../Controllers/Roster/RosterController.cpp" line="152"/>
-        <location filename="../Controllers/Roster/RosterController.cpp" line="214"/>
+        <location filename="../Controllers/Roster/RosterController.cpp" line="131"/>
+        <location filename="../Controllers/Roster/RosterController.cpp" line="157"/>
+        <location filename="../Controllers/Roster/RosterController.cpp" line="222"/>
         <source>Contacts</source>
         <translation>Kontakty</translation>
     </message>
     <message>
-        <location filename="../Controllers/Roster/RosterController.cpp" line="251"/>
+        <location filename="../Controllers/Roster/RosterController.cpp" line="263"/>
         <source>Server %1% rejected contact list change to item &apos;%2%&apos;</source>
-        <translation>Server %1% odmietol zmenu položky &apos;%2%&apos; zoznamu kontaktov</translation>
+        <translation>Server %1% odmietol zmenu položky „%2%“ zoznamu kontaktov</translation>
     </message>
     <message>
         <location filename="../Controllers/StatusUtil.cpp" line="15"/>
@@ -527,12 +613,37 @@
     <message>
         <location filename="../Controllers/StatusUtil.cpp" line="20"/>
         <source>Offline</source>
-        <translation>Odpojený</translation>
+        <translation>Offline</translation>
     </message>
     <message>
         <location filename="../Controllers/ProfileController.cpp" line="62"/>
         <source>There was an error publishing your profile data</source>
-        <translation>Vyskytla sa chyba pri zverejnení dát profilu</translation>
+        <translation>Vyskytla sa chyba pri zverejnení údajov vášho profilu</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/ChatMessageSummarizer.cpp" line="33"/>
+        <source>%1% (%2%)</source>
+        <translation>%1% (%2%)</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/ChatMessageSummarizer.cpp" line="38"/>
+        <source>%1% and %2% others (%3%)</source>
+        <translation>%1% a %2% ostatní (%3%)</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/ChatMessageSummarizer.cpp" line="41"/>
+        <source>%1%, %2% (%3%)</source>
+        <translation>%1%, %2% (%3%)</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/CAPICertificateSelector.cpp" line="63"/>
+        <source>TLS Client Certificate Selection</source>
+        <translation>Výber TLS klientského certifikátu</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/CAPICertificateSelector.cpp" line="64"/>
+        <source>Select a certificate to use for authentication</source>
+        <translation>Vyberte certifikát, ktorý má byť použitý pre overenie</translation>
     </message>
 </context>
 <context>
@@ -540,7 +651,7 @@
     <message>
         <location filename="../QtUI/QtStrings.h" line="17"/>
         <source>Close Tab</source>
-        <translation>Zatvoriť kartu</translation>
+        <translation>Zavrieť kartu</translation>
     </message>
 </context>
 <context>
@@ -568,7 +679,7 @@
     <message>
         <location filename="../QtUI/QtStrings.h" line="83"/>
         <source>Preferences...</source>
-        <translation>Nastavenia...</translation>
+        <translation>Nastavenia…</translation>
     </message>
     <message>
         <location filename="../QtUI/QtStrings.h" line="84"/>
@@ -666,12 +777,12 @@
     <message>
         <location filename="../QtUI/QtStrings.h" line="76"/>
         <source>Show Details...</source>
-        <translation>Zobraziť detaily...</translation>
+        <translation>Zobraziť detaily…</translation>
     </message>
     <message>
         <location filename="../QtUI/QtStrings.h" line="77"/>
         <source>Hide Details...</source>
-        <translation>Skryť detaily...</translation>
+        <translation>Skryť detaily…</translation>
     </message>
 </context>
 <context>
@@ -679,18 +790,115 @@
     <message>
         <location filename="../QtUI/MUCSearch/MUCSearchEmptyItem.cpp" line="25"/>
         <source>No rooms found</source>
-        <translation>Nenájdené žiadne miestnosti</translation>
+        <translation>Žiadne miestnosti neboli nájdené</translation>
     </message>
     <message>
-        <location filename="../QtUI/EventViewer/QtEvent.cpp" line="63"/>
+        <location filename="../QtUI/EventViewer/QtEvent.cpp" line="68"/>
         <source>%1 would like to add you to their contact list.</source>
         <translation>%1 si vás chce pridať do zoznamu kontaktov.</translation>
     </message>
     <message>
-        <location filename="../QtUI/EventViewer/QtEvent.cpp" line="66"/>
+        <location filename="../QtUI/EventViewer/QtEvent.cpp" line="71"/>
         <source>%1 would like to add you to their contact list, saying &apos;%2&apos;</source>
-        <translatorcomment>divná formulácia</translatorcomment>
-        <translation>%1 si vás chce pridať do zoznamu kontaktov, tvrdiac &apos;%2&apos;</translation>
+        <translation>%1 si vás chce pridať do zoznamu kontaktov: „%2“</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/EventViewer/QtEvent.cpp" line="81"/>
+        <source>%1 has invited you to enter the %2 room.</source>
+        <translation>%1% vás pozval/-a vstúpiť do miestnosti %2%.</translation>
+    </message>
+    <message>
+        <source>Systray</source>
+        <translation type="obsolete">Oznamovacia oblasť</translation>
+    </message>
+    <message>
+        <source>No system tray</source>
+        <translation type="obsolete">Nie v oznamovacej oblasti</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="857"/>
+        <source>You&apos;ve been invited to enter the %1 room.</source>
+        <translation>Boli ste pozvaní vstúpiť do miestnosti %1.</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="859"/>
+        <source>Reason: %1</source>
+        <translation>Dôvod: %1</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="862"/>
+        <source>This person may not have really sent this invitation!</source>
+        <translation>Táto osoba nemusela skutočne poslať túto pozvánku!</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="46"/>
+        <source>Direction</source>
+        <translation>Smer</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="47"/>
+        <source>Other Party</source>
+        <translation>Protistrana</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="48"/>
+        <source>State</source>
+        <translation>Stav</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="49"/>
+        <source>Progress</source>
+        <translation>Priebeh</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="50"/>
+        <source>Size</source>
+        <translation>Veľkosť</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="65"/>
+        <source>Incoming</source>
+        <translation>Prichádzajúci</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="65"/>
+        <source>Outgoing</source>
+        <translation>Odchádzajúci</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="74"/>
+        <source>Waiting for start</source>
+        <translation>Čakanie na spustenie</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="76"/>
+        <source>Waiting for other side to accept</source>
+        <translation>Čakanie na prijatie protistranou</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="78"/>
+        <source>Negotiating</source>
+        <translation>Vyjednávanie</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="80"/>
+        <source>Transferring</source>
+        <translation>Prenášanie</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="82"/>
+        <source>Finished</source>
+        <translation>Dokončené</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="84"/>
+        <source>Failed</source>
+        <translation>Zlyhané</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="86"/>
+        <source>Canceled</source>
+        <translation>Zrušené</translation>
     </message>
 </context>
 <context>
@@ -837,7 +1045,7 @@
     <message>
         <location filename="../QtUI/QtStrings.h" line="58"/>
         <source>&amp;Help</source>
-        <translation>&amp;Pomoc</translation>
+        <translation>&amp;Pomocník</translation>
     </message>
     <message>
         <location filename="../QtUI/QtStrings.h" line="59"/>
@@ -887,6 +1095,57 @@
     </message>
 </context>
 <context>
+    <name>QtAffiliationEditor</name>
+    <message>
+        <location filename="../QtUI/QtAffiliationEditor.ui"/>
+        <location filename="../QtUI/ui_QtAffiliationEditor.h" line="123"/>
+        <source>Dialog</source>
+        <translation>Dialog</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAffiliationEditor.ui"/>
+        <location filename="../QtUI/ui_QtAffiliationEditor.h" line="125"/>
+        <source>Affiliation:</source>
+        <translation>Členstvo:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAffiliationEditor.ui"/>
+        <location filename="../QtUI/ui_QtAffiliationEditor.h" line="128"/>
+        <source>Owner</source>
+        <translation>Majiteľ</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAffiliationEditor.ui"/>
+        <location filename="../QtUI/ui_QtAffiliationEditor.h" line="129"/>
+        <source>Administrator</source>
+        <translation>Správca</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAffiliationEditor.ui"/>
+        <location filename="../QtUI/ui_QtAffiliationEditor.h" line="130"/>
+        <source>Member</source>
+        <translation>Člen</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAffiliationEditor.ui"/>
+        <location filename="../QtUI/ui_QtAffiliationEditor.h" line="131"/>
+        <source>Outcast (Banned)</source>
+        <translation>Vyvrheľ (zakázaný)</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAffiliationEditor.ui"/>
+        <location filename="../QtUI/ui_QtAffiliationEditor.h" line="133"/>
+        <source>Add User</source>
+        <translation>Pridať používateľa</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAffiliationEditor.ui"/>
+        <location filename="../QtUI/ui_QtAffiliationEditor.h" line="134"/>
+        <source>Remove User</source>
+        <translation>Odstrániť používateľa</translation>
+    </message>
+</context>
+<context>
     <name>QtBookmarkDetailWindow</name>
     <message>
         <location filename="../QtUI/QtBookmarkDetailWindow.ui"/>
@@ -919,44 +1178,60 @@
         <translation>Heslo pre miestnosť:</translation>
     </message>
     <message>
+        <source>Join automatically</source>
+        <translation type="obsolete">Vstúpiť automaticky</translation>
+    </message>
+    <message>
         <location filename="../QtUI/QtBookmarkDetailWindow.ui"/>
         <location filename="../QtUI/ui_QtBookmarkDetailWindow.h" line="142"/>
-        <source>Join automatically</source>
-        <translation>Vojsť automaticky</translation>
+        <source>Enter automatically</source>
+        <translation>Vstúpiť automaticky</translation>
     </message>
 </context>
 <context>
     <name>QtJoinMUCWindow</name>
     <message>
         <location filename="../QtUI/QtJoinMUCWindow.ui"/>
-        <location filename="../QtUI/ui_QtJoinMUCWindow.h" line="124"/>
-        <location filename="../QtUI/ui_QtJoinMUCWindow.h" line="130"/>
+        <location filename="../QtUI/ui_QtJoinMUCWindow.h" line="142"/>
+        <location filename="../QtUI/ui_QtJoinMUCWindow.h" line="150"/>
         <source>Enter Room</source>
-        <translation>Vojsť do miestnosti</translation>
+        <translation>Vstúpiť do miestnosti</translation>
     </message>
     <message>
         <location filename="../QtUI/QtJoinMUCWindow.ui"/>
-        <location filename="../QtUI/ui_QtJoinMUCWindow.h" line="125"/>
+        <location filename="../QtUI/ui_QtJoinMUCWindow.h" line="143"/>
         <source>Room:</source>
         <translation>Miestnosť:</translation>
     </message>
     <message>
         <location filename="../QtUI/QtJoinMUCWindow.ui"/>
-        <location filename="../QtUI/ui_QtJoinMUCWindow.h" line="126"/>
+        <location filename="../QtUI/ui_QtJoinMUCWindow.h" line="144"/>
         <source>Search ...</source>
-        <translation>Vyhľadať ...</translation>
+        <translation>Vyhľadať …</translation>
     </message>
     <message>
         <location filename="../QtUI/QtJoinMUCWindow.ui"/>
-        <location filename="../QtUI/ui_QtJoinMUCWindow.h" line="127"/>
+        <location filename="../QtUI/ui_QtJoinMUCWindow.h" line="145"/>
         <source>Nickname:</source>
         <translation>Prezývka:</translation>
     </message>
     <message>
         <location filename="../QtUI/QtJoinMUCWindow.ui"/>
-        <location filename="../QtUI/ui_QtJoinMUCWindow.h" line="129"/>
+        <location filename="../QtUI/ui_QtJoinMUCWindow.h" line="149"/>
         <source>Enter automatically in future</source>
-        <translation>V budúcnosti vojsť automaticky</translation>
+        <translation>V budúcnosti vstúpiť automaticky</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtJoinMUCWindow.ui"/>
+        <location filename="../QtUI/ui_QtJoinMUCWindow.h" line="147"/>
+        <source>Password:</source>
+        <translation>Heslo:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtJoinMUCWindow.ui"/>
+        <location filename="../QtUI/ui_QtJoinMUCWindow.h" line="148"/>
+        <source>Automatically configure newly created rooms</source>
+        <translation>Nové miestnosti nastaviť automaticky</translation>
     </message>
 </context>
 <context>
@@ -996,33 +1271,33 @@
     <name>QtUserSearchFieldsPage</name>
     <message>
         <location filename="../QtUI/UserSearch/QtUserSearchFieldsPage.ui"/>
-        <location filename="../QtUI/UserSearch/ui_QtUserSearchFieldsPage.h" line="119"/>
+        <location filename="../QtUI/UserSearch/ui_QtUserSearchFieldsPage.h" line="131"/>
         <source>Nickname:</source>
         <translation>Prezývka:</translation>
     </message>
     <message>
         <location filename="../QtUI/UserSearch/QtUserSearchFieldsPage.ui"/>
-        <location filename="../QtUI/UserSearch/ui_QtUserSearchFieldsPage.h" line="120"/>
+        <location filename="../QtUI/UserSearch/ui_QtUserSearchFieldsPage.h" line="132"/>
         <source>First name:</source>
         <translation>Meno:</translation>
     </message>
     <message>
         <location filename="../QtUI/UserSearch/QtUserSearchFieldsPage.ui"/>
-        <location filename="../QtUI/UserSearch/ui_QtUserSearchFieldsPage.h" line="121"/>
+        <location filename="../QtUI/UserSearch/ui_QtUserSearchFieldsPage.h" line="133"/>
         <source>Last name:</source>
         <translation>Priezvisko:</translation>
     </message>
     <message>
         <location filename="../QtUI/UserSearch/QtUserSearchFieldsPage.ui"/>
-        <location filename="../QtUI/UserSearch/ui_QtUserSearchFieldsPage.h" line="122"/>
+        <location filename="../QtUI/UserSearch/ui_QtUserSearchFieldsPage.h" line="134"/>
         <source>E-Mail:</source>
         <translation>E-mail:</translation>
     </message>
     <message>
         <location filename="../QtUI/UserSearch/QtUserSearchFieldsPage.ui"/>
-        <location filename="../QtUI/UserSearch/ui_QtUserSearchFieldsPage.h" line="124"/>
+        <location filename="../QtUI/UserSearch/ui_QtUserSearchFieldsPage.h" line="136"/>
         <source>Fetching search fields</source>
-        <translation>Načítam polia pre vyhľadávanie</translation>
+        <translation>Prebieha načítanie polí pre vyhľadávanie</translation>
     </message>
 </context>
 <context>
@@ -1044,8 +1319,7 @@
         <location filename="../QtUI/UserSearch/QtUserSearchFirstPage.ui"/>
         <location filename="../QtUI/UserSearch/ui_QtUserSearchFirstPage.h" line="124"/>
         <source>I know their address:</source>
-        <translatorcomment>rod</translatorcomment>
-        <translation>Viem jej adresu:</translation>
+        <translation>Viem jej/jeho adresu:</translation>
     </message>
     <message>
         <location filename="../QtUI/UserSearch/QtUserSearchFirstPage.ui"/>
@@ -1061,6 +1335,15 @@
     </message>
 </context>
 <context>
+    <name>QtUserSearchResultsPage</name>
+    <message>
+        <location filename="../QtUI/UserSearch/QtUserSearchResultsPage.ui"/>
+        <location filename="../QtUI/UserSearch/ui_QtUserSearchResultsPage.h" line="59"/>
+        <source>No results.</source>
+        <translation>Žiadne výsledky.</translation>
+    </message>
+</context>
+<context>
     <name>QtUserSearchWizard</name>
     <message>
         <location filename="../QtUI/UserSearch/QtUserSearchWizard.ui"/>
@@ -1072,10 +1355,22 @@
 <context>
     <name>Swift::ChatListModel</name>
     <message>
-        <location filename="../QtUI/ChatList/ChatListModel.cpp" line="15"/>
+        <location filename="../QtUI/ChatList/ChatListModel.cpp" line="16"/>
         <source>Bookmarked Rooms</source>
         <translatorcomment>kostrbatý preklad</translatorcomment>
-        <translation>Miestnosti označené záložkami</translation>
+        <translation>Záložky miestností</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/ChatList/ChatListModel.cpp" line="17"/>
+        <source>Recent Chats</source>
+        <translation>Nedávne rozhovory</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::FileTransferController</name>
+    <message>
+        <source>me</source>
+        <translation type="obsolete">ja</translation>
     </message>
 </context>
 <context>
@@ -1114,6 +1409,57 @@
     </message>
 </context>
 <context>
+    <name>Swift::QtAdHocCommandWindow</name>
+    <message>
+        <location filename="../QtUI/QtAdHocCommandWindow.cpp" line="37"/>
+        <source>Cancel</source>
+        <translation>Zrušiť</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAdHocCommandWindow.cpp" line="40"/>
+        <source>Back</source>
+        <translation>Naspäť</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAdHocCommandWindow.cpp" line="43"/>
+        <source>Next</source>
+        <translation>Ďalej</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAdHocCommandWindow.cpp" line="46"/>
+        <source>Complete</source>
+        <translation>Hotovo</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAdHocCommandWindow.cpp" line="92"/>
+        <source>Error: %1</source>
+        <translation>Chyba: %1</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAdHocCommandWindow.cpp" line="93"/>
+        <source>Warning: %1</source>
+        <translation>Upozornenie: %1</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAdHocCommandWindow.cpp" line="106"/>
+        <source>Error executing command</source>
+        <translation>Chyba pri vykonávaní príkazu</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtAffiliationEditor</name>
+    <message>
+        <location filename="../QtUI/QtAffiliationEditor.cpp" line="48"/>
+        <source>Add User</source>
+        <translation>Pridať používateľa</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAffiliationEditor.cpp" line="48"/>
+        <source>Added User&apos;s Address:</source>
+        <translation>Používateľova adresa:</translation>
+    </message>
+</context>
+<context>
     <name>Swift::QtAvatarWidget</name>
     <message>
         <location filename="../QtUI/QtAvatarWidget.cpp" line="61"/>
@@ -1123,7 +1469,7 @@
     <message>
         <location filename="../QtUI/QtAvatarWidget.cpp" line="73"/>
         <source>Select picture ...</source>
-        <translation>Vybrať obrázok ...</translation>
+        <translation>Vybrať obrázok …</translation>
     </message>
     <message>
         <location filename="../QtUI/QtAvatarWidget.cpp" line="76"/>
@@ -1137,8 +1483,12 @@
     </message>
     <message>
         <location filename="../QtUI/QtAvatarWidget.cpp" line="81"/>
+        <source>Image Files (*.png *.jpg *.jpeg *.gif)</source>
+        <translation>Súbory s obrázkami (*.png *.jpg *.jpeg *.gif)</translation>
+    </message>
+    <message>
         <source>Image Files (*.png *.jpg *.gif)</source>
-        <translation>Súbory s obrázkami (*.png *.jpg *.gif)</translation>
+        <translation type="obsolete">Súbory s obrázkami (*.png *.jpg *.gif)</translation>
     </message>
     <message>
         <location filename="../QtUI/QtAvatarWidget.cpp" line="95"/>
@@ -1148,7 +1498,7 @@
     <message>
         <location filename="../QtUI/QtAvatarWidget.cpp" line="95"/>
         <source>The selected picture is in an unrecognized format</source>
-        <translation>Nepodaril sa rozpoznať formát vybraného obrázku</translation>
+        <translation>Nepodarilo sa rozpoznať formát vybraného obrázku</translation>
     </message>
 </context>
 <context>
@@ -1171,73 +1521,267 @@
 <context>
     <name>Swift::QtChatListWindow</name>
     <message>
-        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="62"/>
-        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="66"/>
+        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="80"/>
+        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="84"/>
         <source>Add New Bookmark</source>
         <translation>Pridať novú záložku</translation>
     </message>
     <message>
-        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="63"/>
+        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="81"/>
         <source>Edit Bookmark</source>
         <translation>Upraviť záložku</translation>
     </message>
     <message>
-        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="64"/>
+        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="82"/>
         <source>Remove Bookmark</source>
         <translation>Odstrániť záložku</translation>
     </message>
+    <message>
+        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="158"/>
+        <source>Clear recents</source>
+        <translation>Vymazať nedávne</translation>
+    </message>
 </context>
 <context>
     <name>Swift::QtChatView</name>
     <message>
-        <location filename="../QtUI/QtChatView.cpp" line="61"/>
+        <location filename="../QtUI/QtChatView.cpp" line="72"/>
         <source>Clear log</source>
         <translation>Vymazať záznam</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtChatView.cpp" line="62"/>
+        <location filename="../QtUI/QtChatView.cpp" line="73"/>
         <source>You are about to clear the contents of your chat log.</source>
         <translation>Práve idete vymazať záznam vášho rozhovoru.</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtChatView.cpp" line="63"/>
+        <location filename="../QtUI/QtChatView.cpp" line="74"/>
         <source>Are you sure?</source>
-        <translatorcomment>rod</translatorcomment>
         <translation>Ste si istý?</translation>
     </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="178"/>
+        <source>%1 edited</source>
+        <translation>%1 upravené</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="330"/>
+        <source>Waiting for other side to accept the transfer.</source>
+        <translation>Čakanie na prijatie prenosu druhou stranou.</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="331"/>
+        <location filename="../QtUI/QtChatView.cpp" line="336"/>
+        <location filename="../QtUI/QtChatView.cpp" line="347"/>
+        <source>Cancel</source>
+        <translation>Zrušiť</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="335"/>
+        <source>Negotiating...</source>
+        <translation>Vyjednávanie…</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="350"/>
+        <source>Transfer has been canceled!</source>
+        <translation>Prenos bol zrušený!</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="354"/>
+        <source>Transfer completed successfully.</source>
+        <translation>Prenos bol úspešne dokončený.</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="357"/>
+        <source>Transfer failed.</source>
+        <translation>Prenos zlyhal.</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="367"/>
+        <source>Return to room</source>
+        <translation>Vrátiť sa do miestnosti</translation>
+    </message>
 </context>
 <context>
     <name>Swift::QtChatWindow</name>
     <message>
-        <location filename="../QtUI/QtChatWindow.cpp" line="302"/>
+        <location filename="../QtUI/QtChatWindow.cpp" line="481"/>
         <source>This message has not been received by your server yet.</source>
         <translation>Táto správa zatiaľ nebola prijatá vašim serverom.</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtChatWindow.cpp" line="304"/>
+        <location filename="../QtUI/QtChatWindow.cpp" line="488"/>
         <source>This message may not have been transmitted.</source>
         <translation>Táto správa ešte nemusela byť prenesená.</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtChatWindow.cpp" line="324"/>
         <source>Couldn&apos;t send message: %1</source>
-        <translation>Správu sa nepodarilo odoslať: %1</translation>
+        <translation type="obsolete">Správu sa nepodarilo odoslať: %1</translation>
+    </message>
+    <message>
+        <source>Actions</source>
+        <translation type="obsolete">Akcie</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="144"/>
+        <source>Correcting</source>
+        <translation>Prebieha opravovanie</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="241"/>
+        <source>This chat may not support message correction. If you send a correction anyway, it may appear as a duplicate message</source>
+        <translation>Tento rozhovor nemusí podporovať opravu správ. Keď aj tak pošlete opravu, môže vyzerať ako duplicitná správa</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="243"/>
+        <source>This chat does not support message correction.  If you send a correction anyway, it will appear as a duplicate message</source>
+        <translation>Tento rozhovor nepodporuje opravu správ. Keď aj tak pošlete opravu, bude vyzerať ako duplicitná správa</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="497"/>
+        <source>The receipt for this message has been received.</source>
+        <translation>Pre túto správu bola prijatá doručenka.</translation>
+    </message>
+    <message>
+        <source>The receipt for this message has not yet been received. The receipient(s) might not have received this message.</source>
+        <translation type="obsolete">Doručenka pre túto správu zatiaľ neprišla. Príjemca nemusel prijať túto správu.</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="500"/>
+        <source>The receipt for this message has not yet been received. The recipient(s) might not have received this message.</source>
+        <translation>Doručenka pre túto správu zatiaľ neprišla. Príjemca nemusel/-a obdržať túto správu.</translation>
+    </message>
+    <message>
+        <source>Send file)</source>
+        <translation type="obsolete">Odoslať súbor</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="540"/>
+        <source>Send file</source>
+        <translation>Odoslať súbor</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="542"/>
+        <location filename="../QtUI/QtChatWindow.cpp" line="550"/>
+        <source>Cancel</source>
+        <translation>Zrušiť</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="543"/>
+        <source>Set Description</source>
+        <translation>Nastaviť popis</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="544"/>
+        <source>Send</source>
+        <translation>Odoslať</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="548"/>
+        <source>Receiving file</source>
+        <translation>Prijímanie súboru</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="551"/>
+        <source>Accept</source>
+        <translation>Prijať</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="590"/>
+        <source>File transfer description</source>
+        <translation>Popis prenosu súboru</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="591"/>
+        <source>Description:</source>
+        <translation>Popis:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="605"/>
+        <source>Save File</source>
+        <translation>Uložiť súbor</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="782"/>
+        <source>Change subject</source>
+        <translation>Zmeniť predmet</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="783"/>
+        <source>Configure room</source>
+        <translation>Nastaviť miestnosť</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="784"/>
+        <source>Edit affiliations</source>
+        <translation>Upraviť členstvo</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="785"/>
+        <source>Destroy room</source>
+        <translatorcomment>Nájsť vhodnejšie slovo k odstrániť – zničiť?</translatorcomment>
+        <translation>Odstrániť miestnosť</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="786"/>
+        <source>Invite person to this room</source>
+        <translation>Pozvať osobu do tejto mietnosti</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="793"/>
+        <source>Change room subject</source>
+        <translation>Zmeniť predmet miestnosti</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="793"/>
+        <source>New subject:</source>
+        <translation>Nový predmet:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="811"/>
+        <source>Confirm room destruction</source>
+        <translation>Potvrdenie odstránenia miestnosti</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="812"/>
+        <source>Are you sure you want to destroy the room?</source>
+        <translation>Chcete odstrániť miestnosť?</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="813"/>
+        <source>This will destroy the room.</source>
+        <translation>Týmto odstrániťe miestnosť.</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="822"/>
+        <source>Enter person&apos;s address</source>
+        <translation>Zadajte adresu osoby</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="822"/>
+        <source>Address:</source>
+        <translation>Adresa:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="868"/>
+        <source>Accept Invite</source>
+        <translation>Prijať pozvánku</translation>
     </message>
 </context>
 <context>
     <name>Swift::QtContactEditWidget</name>
     <message>
-        <location filename="../QtUI/QtContactEditWidget.cpp" line="28"/>
+        <location filename="../QtUI/QtContactEditWidget.cpp" line="121"/>
         <source>Name:</source>
         <translation>Meno:</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtContactEditWidget.cpp" line="34"/>
+        <location filename="../QtUI/QtContactEditWidget.cpp" line="42"/>
         <source>Groups:</source>
         <translation>Skupiny:</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtContactEditWidget.cpp" line="56"/>
+        <location filename="../QtUI/QtContactEditWidget.cpp" line="64"/>
         <source>New Group:</source>
         <translation>Nová skupina:</translation>
     </message>
@@ -1245,48 +1789,61 @@
 <context>
     <name>Swift::QtContactEditWindow</name>
     <message>
-        <location filename="../QtUI/QtContactEditWindow.cpp" line="26"/>
+        <location filename="../QtUI/QtContactEditWindow.cpp" line="28"/>
         <source>Edit contact</source>
         <translation>Upraviť kontakt</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtContactEditWindow.cpp" line="41"/>
+        <location filename="../QtUI/QtContactEditWindow.cpp" line="43"/>
         <source>Remove contact</source>
         <translation>Odstrániť kontakt</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtContactEditWindow.cpp" line="44"/>
+        <location filename="../QtUI/QtContactEditWindow.cpp" line="46"/>
         <source>OK</source>
         <translation>Ok</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtContactEditWindow.cpp" line="82"/>
+        <location filename="../QtUI/QtContactEditWindow.cpp" line="94"/>
         <source>Confirm contact deletion</source>
         <translation>Potvrdenie odstránenia kontaktu</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtContactEditWindow.cpp" line="83"/>
+        <location filename="../QtUI/QtContactEditWindow.cpp" line="95"/>
         <source>Are you sure you want to delete this contact?</source>
-        <translation>Naozaj chcete zmazať tento kontakt?</translation>
+        <translation>Naozaj chcete odstrániť tento kontakt?</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtContactEditWindow.cpp" line="84"/>
+        <location filename="../QtUI/QtContactEditWindow.cpp" line="96"/>
         <source>This will remove the contact &apos;%1&apos; from all groups they may be in.</source>
-        <translation>Týmto odstránite kontakt &apos;%1&apos; zo všetkých skupín v ktorých sa môže nachádzať.</translation>
+        <translation>Kontakt „%1“ bude odstránený zo všetkých skupín, v ktorých sa nachádza.</translation>
     </message>
 </context>
 <context>
     <name>Swift::QtEventWindow</name>
     <message>
-        <location filename="../QtUI/EventViewer/QtEventWindow.cpp" line="47"/>
+        <location filename="../QtUI/EventViewer/QtEventWindow.cpp" line="48"/>
         <source>Display Notice</source>
         <translation>Zobraziť udalosť</translation>
     </message>
 </context>
 <context>
+    <name>Swift::QtFileTransferListWidget</name>
+    <message>
+        <location filename="../QtUI/QtFileTransferListWidget.cpp" line="39"/>
+        <source>Clear Finished Transfers</source>
+        <translation>Vymazať dokončené prenosy</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListWidget.cpp" line="44"/>
+        <source>File Transfer List</source>
+        <translation>Zoznam prenosu súborov</translation>
+    </message>
+</context>
+<context>
     <name>Swift::QtJoinMUCWindow</name>
     <message>
-        <location filename="../QtUI/QtJoinMUCWindow.cpp" line="15"/>
+        <location filename="../QtUI/QtJoinMUCWindow.cpp" line="19"/>
         <source>someroom@rooms.example.com</source>
         <translation>miestnost@miestnosti.priklad.sk</translation>
     </message>
@@ -1294,126 +1851,149 @@
 <context>
     <name>Swift::QtLoginWindow</name>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="81"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="91"/>
         <source>User address:</source>
         <translation>Adresa používateľa:</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="86"/>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="87"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="96"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="97"/>
         <source>User address - looks like someuser@someserver.com</source>
         <translation>Adresa používateľa - vyzerá ako nejakypouzivatel@nejakyserver.sk</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="91"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="101"/>
         <source>Example: alice@wonderland.lit</source>
         <translatorcomment>lepsi priklad</translatorcomment>
-        <translation>Príklad: alica@krajinazazrakov.lit</translation>
+        <translation>Príklad: alica@krajina-zazrakov.lit</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="97"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="107"/>
         <source>Password:</source>
         <translation>Heslo:</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="118"/>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="119"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="128"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="129"/>
         <source>Click if you have a personal certificate used for login to the service.</source>
         <translation>Kliknite ak máte osobný certifikát použiteľný pre prihlásenie k službe.</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="125"/>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="299"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="135"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="327"/>
         <source>Connect</source>
         <translation>Prihlásiť</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="136"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="146"/>
         <source>Remember Password?</source>
         <translation>Zapamätať si heslo</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="138"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="148"/>
         <source>Login Automatically?</source>
         <translation>Prihlásiť automaticky</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="150"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="160"/>
         <source>&amp;Swift</source>
         <translation>&amp;Swift</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="152"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="162"/>
         <source>&amp;General</source>
         <translation>&amp;Všeobecné</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="160"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="170"/>
         <source>&amp;About %1</source>
         <translation>O programe &amp;%1</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="165"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="175"/>
         <source>&amp;Show Debug Console</source>
         <translation>&amp;Zobraziť ladiacu konzolu</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="169"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="185"/>
         <source>&amp;Play Sounds</source>
         <translation>&amp;Prehrávať zvuky</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="175"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="191"/>
         <source>Display Pop-up &amp;Notifications</source>
         <translatorcomment>notifikácia sa lepšie hodí</translatorcomment>
         <translation>Zobrazovať &amp;oznámenia</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="190"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="203"/>
         <source>&amp;Quit</source>
         <translation>&amp;Ukončiť</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="205"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="237"/>
         <source>Remove profile</source>
         <translation>Odstrániť profil</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="205"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="237"/>
         <source>Remove the profile &apos;%1&apos;?</source>
-        <translation>Odstrániť profil &apos;%1&apos;?</translation>
+        <translation>Odstrániť profil „%1“?</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="299"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="327"/>
         <source>Cancel</source>
         <translation>Zrušiť</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="320"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="341"/>
+        <source>Confirm terms of use</source>
+        <translation>Potvrdenie podmienok použitia</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="384"/>
         <source>Select an authentication certificate</source>
         <translation>Vyberte overovací certifikát</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="420"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="494"/>
         <source>The certificate presented by the server is not valid.</source>
         <translatorcomment>správny význam?</translatorcomment>
-        <translation>Certifikát predstavený serveru nieje platný.</translation>
+        <translation>Certifikát predstavený serverom nie je platný.</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="421"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="495"/>
         <source>Would you like to permanently trust this certificate? This must only be done if you know it is correct.</source>
-        <translation>Chcete nastálo dôverovať tomuto certifikátu? Toto stačí spraviť iba raz, ak viete, že je to správne.</translation>
+        <translation>Chcete nastálo dôverovať tomuto certifikátu? Toto stačí spraviť iba raz, ak viete, že je správny.</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="423"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="497"/>
         <source>Subject: %1</source>
         <translation>Predmet: %1</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="424"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="498"/>
         <source>SHA-1 Fingerprint: %1</source>
         <translation>Odtlačok SHA-1: %1</translation>
     </message>
+    <message>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="180"/>
+        <source>Show &amp;File Transfer Overview</source>
+        <translation>Zobraziť prehľad prenosu &amp;súborov</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtMUCConfigurationWindow</name>
+    <message>
+        <location filename="../QtUI/QtMUCConfigurationWindow.cpp" line="34"/>
+        <source>Cancel</source>
+        <translation>Zrušiť</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMUCConfigurationWindow.cpp" line="37"/>
+        <source>OK</source>
+        <translation>Ok</translation>
+    </message>
 </context>
 <context>
     <name>Swift::QtMUCSearchWindow</name>
@@ -1421,69 +2001,73 @@
         <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.cpp" line="49"/>
         <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.cpp" line="51"/>
         <source>Searching</source>
-        <translation>Vyhľadávam</translation>
+        <translation>Prebieha vyhľadávanie</translation>
     </message>
 </context>
 <context>
     <name>Swift::QtMainWindow</name>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="64"/>
+        <location filename="../QtUI/QtMainWindow.cpp" line="68"/>
         <source>&amp;Contacts</source>
         <translation>&amp;Kontakty</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="71"/>
-        <location filename="../QtUI/QtMainWindow.cpp" line="137"/>
+        <location filename="../QtUI/QtMainWindow.cpp" line="77"/>
+        <location filename="../QtUI/QtMainWindow.cpp" line="174"/>
         <source>&amp;Notices</source>
         <translation>&amp;Udalosti</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="72"/>
+        <location filename="../QtUI/QtMainWindow.cpp" line="76"/>
         <source>C&amp;hats</source>
         <translation>&amp;Rozhovory</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="76"/>
+        <location filename="../QtUI/QtMainWindow.cpp" line="85"/>
         <source>&amp;View</source>
         <translation>&amp;Zobraziť</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="78"/>
+        <location filename="../QtUI/QtMainWindow.cpp" line="87"/>
         <source>&amp;Show offline contacts</source>
-        <translation>Zobraziť &amp;odpojené kontakty</translation>
+        <translation>Zobraziť &amp;offline kontakty</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="84"/>
+        <source>&amp;Compact Roster</source>
+        <translation type="obsolete">&amp;Kompaktný zoznam kontaktov</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="100"/>
         <source>&amp;Actions</source>
         <translation>&amp;Akcie</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="86"/>
+        <location filename="../QtUI/QtMainWindow.cpp" line="102"/>
         <source>Edit &amp;Profile</source>
         <translation>Upraviť &amp;profil</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="89"/>
+        <location filename="../QtUI/QtMainWindow.cpp" line="105"/>
         <source>Enter &amp;Room</source>
-        <translation>Vojsť do &amp;miestnosti</translation>
+        <translation>Vstúpiť do &amp;miestnosti</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="92"/>
+        <location filename="../QtUI/QtMainWindow.cpp" line="108"/>
         <source>&amp;Add Contact</source>
         <translation>Pridať &amp;kontakt</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="95"/>
+        <location filename="../QtUI/QtMainWindow.cpp" line="111"/>
         <source>&amp;Edit Selected Contact</source>
         <translation>&amp;Upraviť vybraný kontakt</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="99"/>
+        <location filename="../QtUI/QtMainWindow.cpp" line="115"/>
         <source>Start &amp;Chat</source>
         <translation>Začať &amp;rozhovor</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="103"/>
+        <location filename="../QtUI/QtMainWindow.cpp" line="121"/>
         <source>&amp;Sign Out</source>
         <translation>&amp;Odhlásiť sa</translation>
     </message>
@@ -1491,31 +2075,94 @@
         <source>Notices</source>
         <translation type="obsolete">&amp;Udalosti</translation>
     </message>
+    <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="118"/>
+        <source>Run Server Command</source>
+        <translation>Spustiť príkaz na serveri</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="125"/>
+        <source>&amp;Request Delivery Receipts</source>
+        <translation>Vyžadovať &amp;doručenky</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="134"/>
+        <source>Collecting commands...</source>
+        <translation>Získavanie príkazov…</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="185"/>
+        <source>&amp;Chats</source>
+        <translation>&amp;Rozhovory</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="278"/>
+        <source>No Available Commands</source>
+        <translation>Nie sú dostupné žiadne príkazy</translation>
+    </message>
 </context>
 <context>
     <name>Swift::QtNameWidget</name>
     <message>
-        <location filename="../QtUI/QtNameWidget.cpp" line="47"/>
+        <location filename="../QtUI/QtNameWidget.cpp" line="48"/>
         <source>Show Nickname</source>
         <translation>Zobraziť prezývku</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtNameWidget.cpp" line="47"/>
+        <location filename="../QtUI/QtNameWidget.cpp" line="48"/>
         <source>(No Nickname Set)</source>
         <translation>(Prezývka nenastavená)</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtNameWidget.cpp" line="55"/>
+        <location filename="../QtUI/QtNameWidget.cpp" line="56"/>
         <source>Show Address</source>
         <translation>Zobraziť adresu</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtNameWidget.cpp" line="62"/>
+        <location filename="../QtUI/QtNameWidget.cpp" line="63"/>
         <source>Edit Profile</source>
         <translation>Upraviť profil</translation>
     </message>
 </context>
 <context>
+    <name>Swift::QtOccupantListWidget</name>
+    <message>
+        <location filename="../QtUI/Roster/QtOccupantListWidget.cpp" line="46"/>
+        <source>No actions for this user</source>
+        <translation>Pre používateľa nie sú dostupné žiadne akcie</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtOccupantListWidget.cpp" line="55"/>
+        <source>Kick user</source>
+        <translation>Vykopnúť používateľa</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtOccupantListWidget.cpp" line="56"/>
+        <source>Kick and ban user</source>
+        <translation>Vykopnúť používateľa a zakázať prístup</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtOccupantListWidget.cpp" line="57"/>
+        <source>Make moderator</source>
+        <translation>Spraviť moderátora</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtOccupantListWidget.cpp" line="58"/>
+        <source>Make participant</source>
+        <translation>Spraviť účastníka</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtOccupantListWidget.cpp" line="59"/>
+        <source>Remove voice</source>
+        <translation>Odstrániť hlas</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtOccupantListWidget.cpp" line="60"/>
+        <source>Add contact</source>
+        <translation>Pridať kontakt</translation>
+    </message>
+</context>
+<context>
     <name>Swift::QtProfileWindow</name>
     <message>
         <location filename="../QtUI/QtProfileWindow.cpp" line="24"/>
@@ -1534,6 +2181,45 @@
     </message>
 </context>
 <context>
+    <name>Swift::QtRosterWidget</name>
+    <message>
+        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="57"/>
+        <source>Edit</source>
+        <translation>Upraviť</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="58"/>
+        <source>Remove</source>
+        <translation>Odstrániť</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="62"/>
+        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="76"/>
+        <source>Send File</source>
+        <translation>Odoslať súbor</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="76"/>
+        <source>All Files (*);;</source>
+        <translation>Všetky súbory (*);;</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="84"/>
+        <source>Rename</source>
+        <translation>Premenovať</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="94"/>
+        <source>Rename group</source>
+        <translation>Premenovať skupinu</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="94"/>
+        <source>Enter a new name for group &apos;%1&apos;:</source>
+        <translation>Zadajte nové meno pre skupinu „%1“:</translation>
+    </message>
+</context>
+<context>
     <name>Swift::QtStatusWidget</name>
     <message>
         <location filename="../QtUI/QtStatusWidget.cpp" line="231"/>
@@ -1541,7 +2227,7 @@
         <translation>Pripájam</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtStatusWidget.cpp" line="263"/>
+        <location filename="../QtUI/QtStatusWidget.cpp" line="261"/>
         <source>(No message)</source>
         <translation>(bez správy)</translation>
     </message>
@@ -1564,12 +2250,12 @@
         <translation>Áno</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtSubscriptionRequestWindow.cpp" line="32"/>
+        <location filename="../QtUI/QtSubscriptionRequestWindow.cpp" line="33"/>
         <source>No</source>
         <translation>Nie</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtSubscriptionRequestWindow.cpp" line="34"/>
+        <location filename="../QtUI/QtSubscriptionRequestWindow.cpp" line="35"/>
         <source>Defer</source>
         <translation>Odložiť</translation>
     </message>
@@ -1579,39 +2265,45 @@
  Would you like to add them to your contact list and share your status when you&apos;re online? 
 
 If you choose to defer this choice, you will be asked again when you next login.</source>
-        <translatorcomment>rod, formulácia</translatorcomment>
+        <translatorcomment>formulácia</translatorcomment>
         <translation>%1 si vás chce pridať do zoznamu kontaktov.
- Chcete si ho pridať do vášho zoznamu kontaktov a zdielať stav, keď budete pripojení?
+ Chcete si ju/ho pridať do vášho zoznamu kontaktov a zdielať stav, keď budete pripojení?
 
 Keď sa rozhodnete odložiť výber, môžete sa znovu rozhodnúť po nasledujúcom prihlásení.</translation>
     </message>
 </context>
 <context>
+    <name>Swift::QtSwift</name>
+    <message>
+        <source>Confirm terms of use</source>
+        <translation type="obsolete">Potvrdenie podmienok použitia</translation>
+    </message>
+    <message>
+        <source>Do you agree to the terms of use?</source>
+        <translation type="obsolete">Súhlasiťe s podmienkami použitia?</translation>
+    </message>
+</context>
+<context>
     <name>Swift::QtTreeWidget</name>
     <message>
-        <location filename="../QtUI/Roster/QtTreeWidget.cpp" line="144"/>
         <source>Edit</source>
-        <translation>Upraviť</translation>
+        <translation type="obsolete">Upraviť</translation>
     </message>
     <message>
-        <location filename="../QtUI/Roster/QtTreeWidget.cpp" line="145"/>
         <source>Remove</source>
-        <translation>Odstrániť</translation>
+        <translation type="obsolete">Odstrániť</translation>
     </message>
     <message>
-        <location filename="../QtUI/Roster/QtTreeWidget.cpp" line="157"/>
         <source>Rename</source>
-        <translation>Premenovať</translation>
+        <translation type="obsolete">Premenovať</translation>
     </message>
     <message>
-        <location filename="../QtUI/Roster/QtTreeWidget.cpp" line="167"/>
         <source>Rename group</source>
-        <translation>Premenovať skupinu</translation>
+        <translation type="obsolete">Premenovať skupinu</translation>
     </message>
     <message>
-        <location filename="../QtUI/Roster/QtTreeWidget.cpp" line="167"/>
         <source>Enter a new name for group &apos;%1&apos;:</source>
-        <translation>Zadajte nové meno pre skupinu &apos;%1&apos;:</translation>
+        <translation type="obsolete">Zadajte nové meno pre skupinu „%1“:</translation>
     </message>
     <message>
         <source>New name for %1</source>
@@ -1621,7 +2313,7 @@ Keď sa rozhodnete odložiť výber, môžete sa znovu rozhodnúť po nasledujú
 <context>
     <name>Swift::QtUserSearchDetailsPage</name>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchDetailsPage.cpp" line="17"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchDetailsPage.cpp" line="22"/>
         <source>Please choose a name for the contact, and select the groups you want to add the contact to.</source>
         <translation>Zvoľte prosím meno pre kontakt a vyberte skupiny do ktorých kontakt chcete zaradiť.</translation>
     </message>
@@ -1631,14 +2323,12 @@ Keď sa rozhodnete odložiť výber, môžete sa znovu rozhodnúť po nasledujú
     <message>
         <location filename="../QtUI/UserSearch/QtUserSearchFirstPage.cpp" line="16"/>
         <source>%1. If you know their address you can enter it directly, or you can search for them.</source>
-        <translatorcomment>rod</translatorcomment>
-        <translation>%1. Keď viete jeho adresu, môžete ju zadať priamo, inak ho môžete vyhľadať.</translation>
+        <translation>%1. Keď viete jej/jeho adresu, môžete ju zadať priamo, alebo ju/ho môžete vyhľadať.</translation>
     </message>
     <message>
         <location filename="../QtUI/UserSearch/QtUserSearchFirstPage.cpp" line="16"/>
         <source>Add another user to your contact list</source>
-        <translatorcomment>rod</translatorcomment>
-        <translation>Pridať iného používateľa do zoznamu kontaktov</translation>
+        <translation>Nižšie môžete pridať iného používateľa/používateľku do zoznamu kontaktov</translation>
     </message>
     <message>
         <location filename="../QtUI/UserSearch/QtUserSearchFirstPage.cpp" line="16"/>
@@ -1649,38 +2339,38 @@ Keď sa rozhodnete odložiť výber, môžete sa znovu rozhodnúť po nasledujú
 <context>
     <name>Swift::QtUserSearchWindow</name>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="32"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="35"/>
         <source>Add Contact</source>
         <translation>Pridať kontakt</translation>
     </message>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="32"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="35"/>
         <source>Chat to User</source>
         <translation>Rozhovor s osobou</translation>
     </message>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="43"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="45"/>
         <source>alice@wonderland.lit</source>
-        <translation>alica@krajinazazrakov.lit</translation>
+        <translation>alica@krajina-zazrakov.lit</translation>
     </message>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="223"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="293"/>
         <source>How would you like to find the user to add?</source>
         <translatorcomment>kostrbaté</translatorcomment>
         <translation>Ako chcete vyhľadať osobu, ktorú chcete pridať?</translation>
     </message>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="226"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="296"/>
         <source>How would you like to find the user to chat to?</source>
         <translation>Ako chcete nájsť osobu s ktorou chcete začať rozhovor?</translation>
     </message>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="251"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="323"/>
         <source>Error while searching</source>
         <translation>Chyba pri hľadaní</translation>
     </message>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="257"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="329"/>
         <source>This server doesn&apos;t support searching for users.</source>
         <translation>Tento server nepodporuje vyhľadávanie osôb.</translation>
     </message>
@@ -1688,10 +2378,20 @@ Keď sa rozhodnete odložiť výber, môžete sa znovu rozhodnúť po nasledujú
 <context>
     <name>Swift::QtWebView</name>
     <message>
-        <location filename="../QtUI/QtWebView.cpp" line="61"/>
+        <location filename="../QtUI/QtWebView.cpp" line="66"/>
         <source>Clear</source>
         <translation>Vymazať</translation>
     </message>
+    <message>
+        <location filename="../QtUI/QtWebView.cpp" line="67"/>
+        <source>Increase font size</source>
+        <translation>Zväčšiť písmo</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtWebView.cpp" line="68"/>
+        <source>Decrease font size</source>
+        <translation>Zmenšiť písmo</translation>
+    </message>
 </context>
 <context>
     <name>Swift::QtXMLConsoleWidget</name>
@@ -1716,12 +2416,12 @@ Keď sa rozhodnete odložiť výber, môžete sa znovu rozhodnúť po nasledujú
         <translation>Ladiaca konzola</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtXMLConsoleWidget.cpp" line="75"/>
+        <location filename="../QtUI/QtXMLConsoleWidget.cpp" line="78"/>
         <source>&lt;!-- IN --&gt;</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../QtUI/QtXMLConsoleWidget.cpp" line="79"/>
+        <location filename="../QtUI/QtXMLConsoleWidget.cpp" line="82"/>
         <source>&lt;!-- OUT --&gt;</source>
         <translation></translation>
     </message>
-- 
cgit v0.10.2-6-g49f6