From b9e7c0033eb36ab1d24183be95d898f94cc487af Mon Sep 17 00:00:00 2001
From: Pavol Babincak <scroolik@gmail.com>
Date: Sat, 3 Nov 2012 12:59:02 +0100
Subject: Updated Slovak translation

Change-Id: I7927be0ae2a2535b27d60decb8e98bd3efb7c0ed
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 03f1e2c..e99a638 100644
--- a/Swift/Translations/swift_sk.ts
+++ b/Swift/Translations/swift_sk.ts
@@ -5,194 +5,194 @@
 <context>
     <name></name>
     <message>
-        <location filename="../Controllers/Chat/ChatController.cpp" line="56"/>
+        <location filename="../Controllers/Chat/ChatController.cpp" line="59"/>
         <source>Starting chat with %1% in chatroom %2%</source>
         <translation>Začína sa rozhovor s %1% v miestnosti %2%</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatController.cpp" line="59"/>
+        <location filename="../Controllers/Chat/ChatController.cpp" line="62"/>
         <source>Starting chat with %1% - %2%</source>
         <translation>Začína sa rozhovor s %1% - %2%</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatController.cpp" line="188"/>
+        <location filename="../Controllers/Chat/ChatController.cpp" line="202"/>
         <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"/>
+        <location filename="../Controllers/Chat/ChatController.cpp" line="204"/>
         <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/Chat/ChatController.cpp" line="216"/>
         <location filename="../Controllers/FileTransfer/FileTransferController.cpp" line="42"/>
         <source>me</source>
         <translation>ja</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatController.cpp" line="290"/>
+        <location filename="../Controllers/Chat/ChatController.cpp" line="324"/>
         <source>%1% has gone offline</source>
         <translation>%1% je odteraz offline</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatController.cpp" line="294"/>
+        <location filename="../Controllers/Chat/ChatController.cpp" line="328"/>
         <source>%1% has become available</source>
         <translation>%1% je odteraz tu</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatController.cpp" line="296"/>
+        <location filename="../Controllers/Chat/ChatController.cpp" line="330"/>
         <source>%1% has gone away</source>
         <translation>%1% je odteraz preč</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatController.cpp" line="298"/>
+        <location filename="../Controllers/Chat/ChatController.cpp" line="332"/>
         <source>%1% is now busy</source>
         <translation>%1% teraz nemá čas</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="69"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="74"/>
         <source>The day is now %1%</source>
         <translation>Teraz je %1%</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="188"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="209"/>
         <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"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="269"/>
         <source>Error sending message</source>
         <translation>Chyba pri posielaní správy</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="252"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="275"/>
         <source>Bad request</source>
         <translation>Nesprávna požiadavka</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="253"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="276"/>
         <source>Conflict</source>
         <translation>Konflikt</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="254"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="277"/>
         <source>This feature is not implemented</source>
         <translation>Táto vlastnosť nie je implementovaná</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="255"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="278"/>
         <source>Forbidden</source>
         <translation>Zakázané</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="256"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="279"/>
         <source>Recipient can no longer be contacted</source>
         <translation>Príjemcu už nie je možné kontaktovať</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="257"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="280"/>
         <source>Internal server error</source>
         <translation>Vnútorná chyba serveru</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="258"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="281"/>
         <source>Item not found</source>
         <translation>Položka nenájdená</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="259"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="282"/>
         <source>JID Malformed</source>
         <translation>Nesprávne utvorené JID</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="260"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="283"/>
         <source>Message was rejected</source>
         <translation>Správa bola odmietnutá</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="261"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="284"/>
         <source>Not allowed</source>
         <translation>Nepovolené</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="262"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="285"/>
         <source>Not authorized</source>
         <translation>Neautorizované</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="263"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="286"/>
         <source>Payment is required</source>
         <translation>Vyžadovaná platba</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="264"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="287"/>
         <source>Recipient is unavailable</source>
         <translation>Príjemca je nedostupný</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="265"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="288"/>
         <source>Redirect</source>
         <translation>Presmerovanie</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="266"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="289"/>
         <source>Registration required</source>
         <translation>Vyžadovaná registrácia</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="267"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="290"/>
         <source>Recipient&apos;s server not found</source>
         <translation>Server príjemcu nenájdený</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="268"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="291"/>
         <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="269"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="292"/>
         <source>The server is low on resources</source>
         <translation>Server má nedostatok zdrojov</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="270"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="293"/>
         <source>The service is unavailable</source>
         <translation>Služba nie je dostupná</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="271"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="294"/>
         <source>A subscription is required</source>
         <translation>Vyžadované prihlásenie k odberu</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="272"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="295"/>
         <source>Undefined condition</source>
         <translation>Nedefinovaná podmienka</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="273"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="296"/>
         <source>Unexpected request</source>
         <translation>Neočakávaná požiadavka</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="205"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="222"/>
         <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="216"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="233"/>
         <source>Unable to enter this room</source>
         <translation>Nepodarilo sa vstúpiť do miestnosti</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="222"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="239"/>
         <source>Unable to enter this room as %1%, retrying as %2%</source>
         <translation>Nepodarilo sa vstúpiť do miestnosti ako %1%, znovu opakované ako %2%</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="226"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="243"/>
         <source>No nickname specified</source>
         <translation>Nezadaná prezývka</translation>
     </message>
@@ -205,379 +205,384 @@
         <translation type="obsolete">Je vyžadované heslo</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="234"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="251"/>
         <source>Only members may enter</source>
         <translation>Vstúpiť môžu iba členovia</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="238"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="255"/>
         <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="242"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="259"/>
         <source>The room is full</source>
         <translation>Miestosť je plná</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="246"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="263"/>
         <source>The room does not exist</source>
         <translation>Miestosť neexistuje</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="252"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="269"/>
         <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"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="281"/>
         <source>You have entered room %1% as %2%.</source>
         <translation>Vstúpili ste do miestnosti %1% ako %2%.</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="310"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="332"/>
         <source>%1% has entered the room as a %2%.</source>
-        <translation>%1% vstúpil/-a do miestnosti ako %2%.</translation>
+        <translation>%1% vstúpil do miestnosti ako %2%.</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="313"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="335"/>
         <source>%1% has entered the room.</source>
-        <translation>%1% vstúpil/-a do miestnosti.</translation>
+        <translation>%1% vstúpil do miestnosti.</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="362"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="384"/>
         <source>moderator</source>
         <translation>moderátor</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="363"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="385"/>
         <source>participant</source>
         <translation>účastník</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="364"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="386"/>
         <source>visitor</source>
         <translation>návštevník</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="412"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="436"/>
         <source>The room subject is now: %1%</source>
         <translation>Predmet miestnosti je: %1%</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="445"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="470"/>
         <source>%1% is now a %2%</source>
         <translation>%1% je teraz %2%</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="461"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="486"/>
         <source>Moderators</source>
         <translation>Moderátori</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="462"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="487"/>
         <source>Participants</source>
         <translation>Účastníci</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="463"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="488"/>
         <source>Visitors</source>
         <translation>Návštevníci</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="464"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="489"/>
         <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="478"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="503"/>
         <source>Trying to enter room %1%</source>
         <translation>Pokúšam sa vstúpiť do miestnosti %1%</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="519"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="544"/>
         <source>%1% has left the room%2%</source>
-        <translation>%1% opustil/-a miestnosť%2%</translation>
+        <translation>%1% opustil miestnosť%2%</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="523"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="548"/>
         <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="524"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="549"/>
         <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"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="550"/>
         <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"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="551"/>
         <source>The room has been destroyed</source>
         <translation>Miestnosť bola odstránená</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="642"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="667"/>
         <source>%1% has left the room</source>
         <translation>%1% opustil/-a miestnosť</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="528"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="553"/>
         <source>You have left the room</source>
         <translation>Opustili ste miestnosť</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="230"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="247"/>
         <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"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="632"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="696"/>
         <source> and </source>
         <translation> a </translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="631"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="656"/>
         <source>%1% have entered the room</source>
         <translation>%1% vstúpili do miestnosti</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="634"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="659"/>
         <source>%1% has entered the room</source>
         <translation>%1% vstúpil/-a do miestnosti</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="639"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="664"/>
         <source>%1% have left the room</source>
         <translation>%1% opustili miestnosť</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="647"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="672"/>
         <source>%1% have entered then left the room</source>
         <translation>%1% vstúpili a potom opustili miestnosť</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="650"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="675"/>
         <source>%1% has entered then left the room</source>
         <translation>%1% vstúpil/-a a potom opustil/a miestnosť</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="655"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="680"/>
         <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="658"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="683"/>
         <source>%1% has left then returned to the room</source>
         <translation>%1% opustil/-a miestnosť a potom sa vrátil/-a</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="694"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="719"/>
         <source>Room configuration failed: %1%.</source>
         <translation>Nepodarilo sa nastaviť miestnosť: %1%.</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="700"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="725"/>
         <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"/>
+        <location filename="../Controllers/EventNotifier.cpp" line="59"/>
         <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="57"/>
+        <location filename="../Controllers/EventNotifier.cpp" line="63"/>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
-        <location filename="../Controllers/EventNotifier.cpp" line="61"/>
+        <location filename="../Controllers/EventNotifier.cpp" line="67"/>
         <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"/>
+        <location filename="../Controllers/MainController.cpp" line="466"/>
         <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>
+        <translation>Adresa osoby je neplatná. Adresa osoby by mala byť v tvare „alica@krajina-zazrakov.lit.“</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="523"/>
+        <location filename="../Controllers/MainController.cpp" line="567"/>
         <source>Unknown Error</source>
         <translation>Neznáma chyba</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="524"/>
+        <location filename="../Controllers/MainController.cpp" line="568"/>
         <source>Unable to find server</source>
         <translation>Nepodarilo sa nájsť server</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="525"/>
+        <location filename="../Controllers/MainController.cpp" line="569"/>
         <source>Error connecting to server</source>
         <translation>Chyba pri pripojení k serveru</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="526"/>
+        <location filename="../Controllers/MainController.cpp" line="570"/>
         <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="527"/>
+        <location filename="../Controllers/MainController.cpp" line="571"/>
         <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="528"/>
+        <location filename="../Controllers/MainController.cpp" line="572"/>
         <source>Error parsing server data</source>
         <translation>Chyba pri spracovaní dát zo serveru</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="529"/>
+        <location filename="../Controllers/MainController.cpp" line="573"/>
         <source>Login/password invalid</source>
-        <translation>Prihlasovacie meno, či heslo je neplatné</translation>
+        <translation>Prihlasovacie meno alebo heslo nie je platné</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="530"/>
+        <location filename="../Controllers/MainController.cpp" line="574"/>
         <source>Error while compressing stream</source>
         <translation>Chyba pri komprimovaní prúdu</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="531"/>
+        <location filename="../Controllers/MainController.cpp" line="575"/>
         <source>Server verification failed</source>
         <translation>Zlyhalo overenie serveru</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="532"/>
+        <location filename="../Controllers/MainController.cpp" line="576"/>
         <source>Authentication mechanisms not supported</source>
-        <translation>Autentizačné mechanizmy niesú podporované</translation>
+        <translation>Overovacie mechanizmy nie sú podporované</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="533"/>
+        <location filename="../Controllers/MainController.cpp" line="577"/>
         <source>Unexpected response</source>
         <translation>Neočakávaná odpoveď</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="534"/>
+        <location filename="../Controllers/MainController.cpp" line="578"/>
         <source>Error binding resource</source>
         <translation>Chyba pri spájaní zdroju</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="535"/>
+        <location filename="../Controllers/MainController.cpp" line="579"/>
         <source>Error starting session</source>
         <translation>Chyba pri spúštaní sedenia</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="536"/>
+        <location filename="../Controllers/MainController.cpp" line="580"/>
         <source>Stream error</source>
         <translation>Chyba prúdu</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="537"/>
+        <location filename="../Controllers/MainController.cpp" line="581"/>
         <source>Encryption error</source>
         <translation>Chyba šifrovania</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="538"/>
+        <location filename="../Controllers/MainController.cpp" line="582"/>
         <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="539"/>
+        <location filename="../Controllers/MainController.cpp" line="583"/>
         <source>Certificate not authorized</source>
         <translation>Neautorizovaný certifikát</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="540"/>
+        <location filename="../Controllers/MainController.cpp" line="584"/>
         <source>Certificate card removed</source>
         <translation>Karta so certifikátom odstránená</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="542"/>
+        <location filename="../Controllers/MainController.cpp" line="586"/>
         <source>Unknown certificate</source>
         <translation>Neznámy certifikát</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="543"/>
+        <location filename="../Controllers/MainController.cpp" line="587"/>
         <source>Certificate has expired</source>
         <translation>Certifikát expiroval</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="544"/>
+        <location filename="../Controllers/MainController.cpp" line="588"/>
         <source>Certificate is not yet valid</source>
         <translation>Certifikát zatiaľ nie je platný</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="545"/>
+        <location filename="../Controllers/MainController.cpp" line="589"/>
         <source>Certificate is self-signed</source>
         <translation>Certifikát je podpísaný samým sebou</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="546"/>
+        <location filename="../Controllers/MainController.cpp" line="590"/>
         <source>Certificate has been rejected</source>
         <translation>Certifikát bol odmietnutý</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="547"/>
+        <location filename="../Controllers/MainController.cpp" line="591"/>
         <source>Certificate is not trusted</source>
-        <translation>Certifikát nie je dôvernyhodný</translation>
+        <translation>Certifikát nie je dôveryhodný</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="548"/>
+        <location filename="../Controllers/MainController.cpp" line="592"/>
         <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="549"/>
+        <location filename="../Controllers/MainController.cpp" line="593"/>
         <source>Certificate path length constraint exceeded</source>
         <translation>Prekročená dĺžka cesty certifikátu</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="550"/>
+        <location filename="../Controllers/MainController.cpp" line="594"/>
         <source>Invalid certificate signature</source>
         <translation>Neplatný podpis certifikátu</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="551"/>
+        <location filename="../Controllers/MainController.cpp" line="595"/>
         <source>Invalid Certificate Authority</source>
         <translation>Neplatná certifikačná autorita</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="552"/>
+        <location filename="../Controllers/MainController.cpp" line="596"/>
         <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="553"/>
+        <location filename="../Controllers/MainController.cpp" line="597"/>
         <source>Certificate has been revoked</source>
         <translation>Certifikát bol odvolaný</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="554"/>
+        <location filename="../Controllers/MainController.cpp" line="598"/>
         <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"/>
+        <location filename="../Controllers/MainController.cpp" line="608"/>
         <source>Certificate error</source>
         <translation>Chyba certifikátu</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="578"/>
+        <location filename="../Controllers/MainController.cpp" line="615"/>
+        <source>Re-enter credentials and retry</source>
+        <translation>Znovu zadajte prístupové údaje a zopakujte akciu</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="628"/>
         <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>
+        <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"/>
+        <location filename="../Controllers/MainController.cpp" line="634"/>
         <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>
+        <translation>Opätovné pripojenie ku %1% zlyhalo: %2%. Ďalší pokus o %3% sekúnd.</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="587"/>
+        <location filename="../Controllers/MainController.cpp" line="637"/>
         <source>Disconnected from %1%: %2%.</source>
         <translation>Odpojené od %1%: %2%.</translation>
     </message>
@@ -591,7 +596,7 @@
     <message>
         <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 „%2%“ zoznamu kontaktov</translation>
+        <translation>Server %1% odmietol zmenu položky „%2%“ v zozname kontaktov</translation>
     </message>
     <message>
         <location filename="../Controllers/StatusUtil.cpp" line="15"/>
@@ -618,7 +623,7 @@
     <message>
         <location filename="../Controllers/ProfileController.cpp" line="62"/>
         <source>There was an error publishing your profile data</source>
-        <translation>Vyskytla sa chyba pri zverejnení údajov vášho profilu</translation>
+        <translation>Pri zverejnení údajov vášho profilu nastala chyba</translation>
     </message>
     <message>
         <location filename="../Controllers/ChatMessageSummarizer.cpp" line="33"/>
@@ -643,7 +648,7 @@
     <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>
+        <translation>Vyberte certifikát, ktorý chcete použiť pre overenie</translation>
     </message>
 </context>
 <context>
@@ -790,7 +795,7 @@
     <message>
         <location filename="../QtUI/MUCSearch/MUCSearchEmptyItem.cpp" line="25"/>
         <source>No rooms found</source>
-        <translation>Žiadne miestnosti neboli nájdené</translation>
+        <translation>Nenašli sa žiadne miestnosti</translation>
     </message>
     <message>
         <location filename="../QtUI/EventViewer/QtEvent.cpp" line="68"/>
@@ -805,7 +810,7 @@
     <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>
+        <translation>%1 vás pozval vstúpiť do miestnosti %2.</translation>
     </message>
     <message>
         <source>Systray</source>
@@ -816,17 +821,17 @@
         <translation type="obsolete">Nie v oznamovacej oblasti</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtChatWindow.cpp" line="857"/>
+        <location filename="../QtUI/QtChatWindow.cpp" line="980"/>
         <source>You&apos;ve been invited to enter the %1 room.</source>
-        <translation>Boli ste pozvaní vstúpiť do miestnosti %1.</translation>
+        <translation>Dostali ste pozvánku na vstup do miestnosti %1.</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtChatWindow.cpp" line="859"/>
+        <location filename="../QtUI/QtChatWindow.cpp" line="982"/>
         <source>Reason: %1</source>
         <translation>Dôvod: %1</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtChatWindow.cpp" line="862"/>
+        <location filename="../QtUI/QtChatWindow.cpp" line="985"/>
         <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>
@@ -900,6 +905,11 @@
         <source>Canceled</source>
         <translation>Zrušené</translation>
     </message>
+    <message>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="142"/>
+        <source>Connection Options</source>
+        <translation>Možnosti pripojenia</translation>
+    </message>
 </context>
 <context>
     <name>QScrollBar</name>
@@ -1086,93 +1096,97 @@
     <message>
         <location filename="../QtUI/QtStrings.h" line="66"/>
         <source>&amp;Next</source>
-        <translation>&amp;Pokračovať</translation>
+        <translation>Ď&amp;alej</translation>
     </message>
     <message>
         <location filename="../QtUI/QtStrings.h" line="67"/>
         <source>&amp;Next &gt;</source>
-        <translation>&amp;Pokračovať &gt;</translation>
+        <translation>Ď&amp;alej &gt;</translation>
     </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/QtAffiliationEditor.ui" line="14"/>
+        <source>Edit Affiliations</source>
+        <translation>Upraviť členstvo </translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAffiliationEditor.ui" line="28"/>
         <location filename="../QtUI/ui_QtAffiliationEditor.h" line="125"/>
         <source>Affiliation:</source>
         <translation>Členstvo:</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtAffiliationEditor.ui"/>
+        <location filename="../QtUI/QtAffiliationEditor.ui" line="36"/>
         <location filename="../QtUI/ui_QtAffiliationEditor.h" line="128"/>
         <source>Owner</source>
         <translation>Majiteľ</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtAffiliationEditor.ui"/>
+        <location filename="../QtUI/QtAffiliationEditor.ui" line="41"/>
         <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/QtAffiliationEditor.ui" line="46"/>
         <location filename="../QtUI/ui_QtAffiliationEditor.h" line="130"/>
         <source>Member</source>
         <translation>Člen</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtAffiliationEditor.ui"/>
+        <location filename="../QtUI/QtAffiliationEditor.ui" line="51"/>
         <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/QtAffiliationEditor.ui" line="68"/>
         <location filename="../QtUI/ui_QtAffiliationEditor.h" line="133"/>
         <source>Add User</source>
-        <translation>Pridať používateľa</translation>
+        <translation>Pridať osobu</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtAffiliationEditor.ui"/>
+        <location filename="../QtUI/QtAffiliationEditor.ui" line="75"/>
         <location filename="../QtUI/ui_QtAffiliationEditor.h" line="134"/>
         <source>Remove User</source>
-        <translation>Odstrániť používateľa</translation>
+        <translation>Odstrániť osobu</translation>
     </message>
 </context>
 <context>
     <name>QtBookmarkDetailWindow</name>
     <message>
-        <location filename="../QtUI/QtBookmarkDetailWindow.ui"/>
+        <location filename="../QtUI/QtBookmarkDetailWindow.ui" line="20"/>
         <location filename="../QtUI/ui_QtBookmarkDetailWindow.h" line="137"/>
         <source>Edit Bookmark Details</source>
         <translation>Upraviť detaily záložky</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtBookmarkDetailWindow.ui"/>
+        <location filename="../QtUI/QtBookmarkDetailWindow.ui" line="40"/>
         <location filename="../QtUI/ui_QtBookmarkDetailWindow.h" line="138"/>
         <source>Bookmark Name:</source>
         <translation>Názov záložky:</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtBookmarkDetailWindow.ui"/>
+        <location filename="../QtUI/QtBookmarkDetailWindow.ui" line="50"/>
         <location filename="../QtUI/ui_QtBookmarkDetailWindow.h" line="139"/>
         <source>Room Address:</source>
         <translation>Adresa miestnosti:</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtBookmarkDetailWindow.ui"/>
+        <location filename="../QtUI/QtBookmarkDetailWindow.ui" line="60"/>
         <location filename="../QtUI/ui_QtBookmarkDetailWindow.h" line="140"/>
         <source>Your Nickname:</source>
         <translation>Vaša prezývka:</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtBookmarkDetailWindow.ui"/>
+        <location filename="../QtUI/QtBookmarkDetailWindow.ui" line="70"/>
         <location filename="../QtUI/ui_QtBookmarkDetailWindow.h" line="141"/>
         <source>Room password:</source>
         <translation>Heslo pre miestnosť:</translation>
@@ -1182,86 +1196,292 @@
         <translation type="obsolete">Vstúpiť automaticky</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtBookmarkDetailWindow.ui"/>
+        <location filename="../QtUI/QtBookmarkDetailWindow.ui" line="93"/>
         <location filename="../QtUI/ui_QtBookmarkDetailWindow.h" line="142"/>
         <source>Enter automatically</source>
         <translation>Vstúpiť automaticky</translation>
     </message>
 </context>
 <context>
+    <name>QtCertificateViewerDialog</name>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.ui" line="14"/>
+        <location filename="../QtUI/ui_QtCertificateViewerDialog.h" line="99"/>
+        <source>Certificate Viewer</source>
+        <translation>Prehliadač certifikátu</translation>
+    </message>
+</context>
+<context>
+    <name>QtConnectionSettings</name>
+    <message>
+        <location filename="../QtUI/ui_QtConnectionSettings.h" line="383"/>
+        <source>Dialog</source>
+        <translation>Dialóg</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="14"/>
+        <source>Connection Options</source>
+        <translation>Možnosti pripojenia</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="22"/>
+        <location filename="../QtUI/ui_QtConnectionSettings.h" line="384"/>
+        <source>Connection Method:</source>
+        <translation>Spôsob pripojenia:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="36"/>
+        <location filename="../QtUI/ui_QtConnectionSettings.h" line="387"/>
+        <source>Automatic</source>
+        <translation>Automatické</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="41"/>
+        <location filename="../QtUI/ui_QtConnectionSettings.h" line="388"/>
+        <source>Manual</source>
+        <translation>Manuálne</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="46"/>
+        <location filename="../QtUI/ui_QtConnectionSettings.h" line="389"/>
+        <source>BOSH</source>
+        <translation>BOSH</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="99"/>
+        <location filename="../QtUI/ui_QtConnectionSettings.h" line="391"/>
+        <source>Secure connection:</source>
+        <translation>Zabezpečenie spojenia:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="107"/>
+        <location filename="../QtUI/ui_QtConnectionSettings.h" line="394"/>
+        <source>Never</source>
+        <translation>Bez zabezpečenia</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="112"/>
+        <location filename="../QtUI/ui_QtConnectionSettings.h" line="395"/>
+        <source>Encrypt when possible</source>
+        <translation>Ak je možné, šifrovať</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="117"/>
+        <location filename="../QtUI/ui_QtConnectionSettings.h" line="396"/>
+        <source>Always encrypt</source>
+        <translation>Vždy šifrovať</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="127"/>
+        <location filename="../QtUI/ui_QtConnectionSettings.h" line="398"/>
+        <source>Allow Compression</source>
+        <translation>Povoliť kompresiu</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="134"/>
+        <location filename="../QtUI/ui_QtConnectionSettings.h" line="399"/>
+        <source>Allow sending password over insecure connection</source>
+        <translation>Povoliť odosielanie hesla cez nezabezpečené spojenie</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="157"/>
+        <location filename="../QtUI/ui_QtConnectionSettings.h" line="400"/>
+        <source>Manually select server</source>
+        <translation>Manuálny výber servera</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="185"/>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="315"/>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="429"/>
+        <location filename="../QtUI/ui_QtConnectionSettings.h" line="401"/>
+        <location filename="../QtUI/ui_QtConnectionSettings.h" line="413"/>
+        <location filename="../QtUI/ui_QtConnectionSettings.h" line="417"/>
+        <source>Hostname:</source>
+        <translation>Názov hostiteľa:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="208"/>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="338"/>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="452"/>
+        <location filename="../QtUI/ui_QtConnectionSettings.h" line="402"/>
+        <location filename="../QtUI/ui_QtConnectionSettings.h" line="414"/>
+        <location filename="../QtUI/ui_QtConnectionSettings.h" line="418"/>
+        <source>Port:</source>
+        <translation>Port:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="230"/>
+        <location filename="../QtUI/ui_QtConnectionSettings.h" line="403"/>
+        <source>Connection Proxy</source>
+        <translation>Proxy server pre spojenie</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="238"/>
+        <location filename="../QtUI/ui_QtConnectionSettings.h" line="404"/>
+        <source>Proxy type:</source>
+        <translation>Typ proxy servera:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="249"/>
+        <location filename="../QtUI/ui_QtConnectionSettings.h" line="407"/>
+        <source>None</source>
+        <translation>Žiadny</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="254"/>
+        <location filename="../QtUI/ui_QtConnectionSettings.h" line="408"/>
+        <source>Use system-configured proxy</source>
+        <translation>Podľa nastavenia systému</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="259"/>
+        <location filename="../QtUI/ui_QtConnectionSettings.h" line="409"/>
+        <source>SOCKS5</source>
+        <translation>SOCKS5</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="264"/>
+        <location filename="../QtUI/ui_QtConnectionSettings.h" line="410"/>
+        <source>HTTP Connect</source>
+        <translation>HTTP Connect</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="287"/>
+        <location filename="../QtUI/ui_QtConnectionSettings.h" line="412"/>
+        <source>Override system-configured proxy</source>
+        <translation>Prepísať systémové nastavenia proxy servera</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="382"/>
+        <location filename="../QtUI/ui_QtConnectionSettings.h" line="415"/>
+        <source>BOSH URI:</source>
+        <translation>BOSH URI:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="401"/>
+        <location filename="../QtUI/ui_QtConnectionSettings.h" line="416"/>
+        <source>Manually select HTTP proxy</source>
+        <translation>Ručné zadanie HTTP proxy servera </translation>
+    </message>
+</context>
+<context>
+    <name>QtHistoryWindow</name>
+    <message>
+        <location filename="../QtUI/ui_QtHistoryWindow.h" line="133"/>
+        <source>Form</source>
+        <translation>Formulár</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtHistoryWindow.ui" line="14"/>
+        <source>History</source>
+        <translation>História</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtHistoryWindow.ui" line="22"/>
+        <location filename="../QtUI/ui_QtHistoryWindow.h" line="134"/>
+        <source>Search:</source>
+        <translation>Vyhľadať:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtHistoryWindow.ui" line="42"/>
+        <location filename="../QtUI/ui_QtHistoryWindow.h" line="135"/>
+        <source>Next</source>
+        <translation>Ďalej</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtHistoryWindow.ui" line="52"/>
+        <location filename="../QtUI/ui_QtHistoryWindow.h" line="136"/>
+        <source>Previous</source>
+        <translation>Naspäť</translation>
+    </message>
+</context>
+<context>
     <name>QtJoinMUCWindow</name>
     <message>
-        <location filename="../QtUI/QtJoinMUCWindow.ui"/>
+        <location filename="../QtUI/QtJoinMUCWindow.ui" line="20"/>
+        <location filename="../QtUI/QtJoinMUCWindow.ui" line="113"/>
         <location filename="../QtUI/ui_QtJoinMUCWindow.h" line="142"/>
         <location filename="../QtUI/ui_QtJoinMUCWindow.h" line="150"/>
         <source>Enter Room</source>
         <translation>Vstúpiť do miestnosti</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtJoinMUCWindow.ui"/>
-        <location filename="../QtUI/ui_QtJoinMUCWindow.h" line="143"/>
         <source>Room:</source>
-        <translation>Miestnosť:</translation>
+        <translation type="obsolete">Miestnosť:</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtJoinMUCWindow.ui"/>
+        <location filename="../QtUI/QtJoinMUCWindow.ui" line="35"/>
         <location filename="../QtUI/ui_QtJoinMUCWindow.h" line="144"/>
         <source>Search ...</source>
         <translation>Vyhľadať…</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtJoinMUCWindow.ui"/>
-        <location filename="../QtUI/ui_QtJoinMUCWindow.h" line="145"/>
         <source>Nickname:</source>
-        <translation>Prezývka:</translation>
+        <translation type="obsolete">Prezývka:</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtJoinMUCWindow.ui"/>
+        <location filename="../QtUI/QtJoinMUCWindow.ui" line="106"/>
         <location filename="../QtUI/ui_QtJoinMUCWindow.h" line="149"/>
         <source>Enter automatically in future</source>
         <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>
+        <translation type="obsolete">Heslo:</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtJoinMUCWindow.ui"/>
+        <location filename="../QtUI/QtJoinMUCWindow.ui" line="71"/>
         <location filename="../QtUI/ui_QtJoinMUCWindow.h" line="148"/>
         <source>Automatically configure newly created rooms</source>
         <translation>Nové miestnosti nastaviť automaticky</translation>
     </message>
+    <message>
+        <location filename="../QtUI/QtJoinMUCWindow.ui" line="28"/>
+        <location filename="../QtUI/ui_QtJoinMUCWindow.h" line="143"/>
+        <source>Room Address:</source>
+        <translation>Adresa miestnosti:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtJoinMUCWindow.ui" line="42"/>
+        <location filename="../QtUI/ui_QtJoinMUCWindow.h" line="145"/>
+        <source>Your Nickname:</source>
+        <translation>Vaša prezývka:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtJoinMUCWindow.ui" line="59"/>
+        <location filename="../QtUI/ui_QtJoinMUCWindow.h" line="147"/>
+        <source>Room Password:</source>
+        <translation>Heslo miestnosti:</translation>
+    </message>
 </context>
 <context>
     <name>QtMUCSearchWindow</name>
     <message>
-        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.ui"/>
+        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.ui" line="14"/>
         <location filename="../QtUI/MUCSearch/ui_QtMUCSearchWindow.h" line="118"/>
         <source>Search Room</source>
         <translation>Vyhľadať miestnosť</translation>
     </message>
     <message>
-        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.ui"/>
+        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.ui" line="20"/>
         <location filename="../QtUI/MUCSearch/ui_QtMUCSearchWindow.h" line="119"/>
         <source>Service:</source>
         <translation>Služba:</translation>
     </message>
     <message>
-        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.ui"/>
+        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.ui" line="74"/>
         <location filename="../QtUI/MUCSearch/ui_QtMUCSearchWindow.h" line="121"/>
         <source>Cancel</source>
         <translation>Zrušiť</translation>
     </message>
     <message>
-        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.ui"/>
+        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.ui" line="84"/>
         <location filename="../QtUI/MUCSearch/ui_QtMUCSearchWindow.h" line="122"/>
         <source>OK</source>
         <translation>Ok</translation>
     </message>
     <message>
-        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.ui"/>
+        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.ui" line="96"/>
         <location filename="../QtUI/MUCSearch/ui_QtMUCSearchWindow.h" line="123"/>
         <source>List rooms</source>
         <translation>Zoznam miestností</translation>
@@ -1270,31 +1490,31 @@
 <context>
     <name>QtUserSearchFieldsPage</name>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchFieldsPage.ui"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchFieldsPage.ui" line="27"/>
         <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/QtUserSearchFieldsPage.ui" line="37"/>
         <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/QtUserSearchFieldsPage.ui" line="47"/>
         <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/QtUserSearchFieldsPage.ui" line="57"/>
         <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/QtUserSearchFieldsPage.ui" line="74"/>
         <location filename="../QtUI/UserSearch/ui_QtUserSearchFieldsPage.h" line="136"/>
         <source>Fetching search fields</source>
         <translation>Prebieha načítanie polí pre vyhľadávanie</translation>
@@ -1303,41 +1523,41 @@
 <context>
     <name>QtUserSearchFirstPage</name>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchFirstPage.ui"/>
-        <location filename="../QtUI/UserSearch/ui_QtUserSearchFirstPage.h" line="121"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchFirstPage.ui" line="17"/>
+        <location filename="../QtUI/UserSearch/ui_QtUserSearchFirstPage.h" line="132"/>
         <source>Add a user</source>
         <translation>Pridať osobu</translation>
     </message>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchFirstPage.ui"/>
-        <location filename="../QtUI/UserSearch/ui_QtUserSearchFirstPage.h" line="122"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchFirstPage.ui" line="20"/>
+        <location filename="../QtUI/UserSearch/ui_QtUserSearchFirstPage.h" line="133"/>
         <source>Add another user to your contact list. If you know their address you can add them directly, or you can search for them.</source>
         <translatorcomment>inak pomenované ako inde</translatorcomment>
         <translation>Pridať ďalšiu osobu do vášho zoznamu kontaktov. Ak viete jej adresu môžete ju pridať priamo, inak ju môžete vyhľadať.</translation>
     </message>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchFirstPage.ui"/>
-        <location filename="../QtUI/UserSearch/ui_QtUserSearchFirstPage.h" line="124"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchFirstPage.ui" line="35"/>
+        <location filename="../QtUI/UserSearch/ui_QtUserSearchFirstPage.h" line="135"/>
         <source>I know their address:</source>
-        <translation>Viem jej/jeho adresu:</translation>
+        <translation>Viem jej adresu:</translation>
     </message>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchFirstPage.ui"/>
-        <location filename="../QtUI/UserSearch/ui_QtUserSearchFirstPage.h" line="125"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchFirstPage.ui" line="49"/>
+        <location filename="../QtUI/UserSearch/ui_QtUserSearchFirstPage.h" line="136"/>
         <source>I&apos;d like to search my server</source>
-        <translation>Chcem prehľadať môj server</translation>
+        <translation>Prehľadať môj server</translation>
     </message>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchFirstPage.ui"/>
-        <location filename="../QtUI/UserSearch/ui_QtUserSearchFirstPage.h" line="126"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchFirstPage.ui" line="73"/>
+        <location filename="../QtUI/UserSearch/ui_QtUserSearchFirstPage.h" line="137"/>
         <source>I&apos;d like to search another server:</source>
-        <translation>Chcem prehľadať iný server:</translation>
+        <translation>Prehľadať iný server:</translation>
     </message>
 </context>
 <context>
     <name>QtUserSearchResultsPage</name>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchResultsPage.ui"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchResultsPage.ui" line="27"/>
         <location filename="../QtUI/UserSearch/ui_QtUserSearchResultsPage.h" line="59"/>
         <source>No results.</source>
         <translation>Žiadne výsledky.</translation>
@@ -1346,7 +1566,7 @@
 <context>
     <name>QtUserSearchWizard</name>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchWizard.ui"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchWizard.ui" line="14"/>
         <location filename="../QtUI/UserSearch/ui_QtUserSearchWizard.h" line="39"/>
         <source>Find User</source>
         <translation>Vyhľadať osobu</translation>
@@ -1355,16 +1575,21 @@
 <context>
     <name>Swift::ChatListModel</name>
     <message>
-        <location filename="../QtUI/ChatList/ChatListModel.cpp" line="16"/>
+        <location filename="../QtUI/ChatList/ChatListModel.cpp" line="17"/>
         <source>Bookmarked Rooms</source>
         <translatorcomment>kostrbatý preklad</translatorcomment>
         <translation>Záložky miestností</translation>
     </message>
     <message>
-        <location filename="../QtUI/ChatList/ChatListModel.cpp" line="17"/>
+        <location filename="../QtUI/ChatList/ChatListModel.cpp" line="18"/>
         <source>Recent Chats</source>
         <translation>Nedávne rozhovory</translation>
     </message>
+    <message>
+        <location filename="../QtUI/ChatList/ChatListModel.cpp" line="20"/>
+        <source>Opened Whiteboards</source>
+        <translation>Otvorené tabule</translation>
+    </message>
 </context>
 <context>
     <name>Swift::FileTransferController</name>
@@ -1411,37 +1636,37 @@
 <context>
     <name>Swift::QtAdHocCommandWindow</name>
     <message>
-        <location filename="../QtUI/QtAdHocCommandWindow.cpp" line="37"/>
+        <location filename="../QtUI/QtAdHocCommandWindow.cpp" line="36"/>
         <source>Cancel</source>
         <translation>Zrušiť</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtAdHocCommandWindow.cpp" line="40"/>
+        <location filename="../QtUI/QtAdHocCommandWindow.cpp" line="39"/>
         <source>Back</source>
         <translation>Naspäť</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtAdHocCommandWindow.cpp" line="43"/>
+        <location filename="../QtUI/QtAdHocCommandWindow.cpp" line="42"/>
         <source>Next</source>
         <translation>Ďalej</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtAdHocCommandWindow.cpp" line="46"/>
+        <location filename="../QtUI/QtAdHocCommandWindow.cpp" line="45"/>
         <source>Complete</source>
         <translation>Hotovo</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtAdHocCommandWindow.cpp" line="92"/>
+        <location filename="../QtUI/QtAdHocCommandWindow.cpp" line="86"/>
         <source>Error: %1</source>
         <translation>Chyba: %1</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtAdHocCommandWindow.cpp" line="93"/>
+        <location filename="../QtUI/QtAdHocCommandWindow.cpp" line="87"/>
         <source>Warning: %1</source>
         <translation>Upozornenie: %1</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtAdHocCommandWindow.cpp" line="106"/>
+        <location filename="../QtUI/QtAdHocCommandWindow.cpp" line="104"/>
         <source>Error executing command</source>
         <translation>Chyba pri vykonávaní príkazu</translation>
     </message>
@@ -1451,12 +1676,12 @@
     <message>
         <location filename="../QtUI/QtAffiliationEditor.cpp" line="48"/>
         <source>Add User</source>
-        <translation>Pridať používateľa</translation>
+        <translation>Pridať osobu</translation>
     </message>
     <message>
         <location filename="../QtUI/QtAffiliationEditor.cpp" line="48"/>
         <source>Added User&apos;s Address:</source>
-        <translation>Používateľova adresa:</translation>
+        <translation>Pridaná adresa osoby:</translation>
     </message>
 </context>
 <context>
@@ -1519,25 +1744,114 @@
     </message>
 </context>
 <context>
+    <name>Swift::QtCertificateViewerDialog</name>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="95"/>
+        <source>General</source>
+        <translation>Všeobecné</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="96"/>
+        <source>Valid From</source>
+        <translation>Platné od</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="97"/>
+        <source>Valid To</source>
+        <translation>Platné do</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="98"/>
+        <source>Serial Number</source>
+        <translation>Sériové číslo</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="99"/>
+        <source>Version</source>
+        <translation>Verzia</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="101"/>
+        <source>Subject</source>
+        <translation>Subjekt</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="102"/>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="124"/>
+        <source>Organization</source>
+        <translation>Organizácia</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="103"/>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="125"/>
+        <source>Common Name</source>
+        <translation>Bežný názov</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="104"/>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="126"/>
+        <source>Locality</source>
+        <translation>Lokalita</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="105"/>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="127"/>
+        <source>Organizational Unit</source>
+        <translation>Organizačná jednotka</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="106"/>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="128"/>
+        <source>Country</source>
+        <translation>Štát</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="107"/>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="129"/>
+        <source>State</source>
+        <translation>Stav</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="110"/>
+        <source>Alternate Subject Names</source>
+        <translation>Alternatívne mená subjektu </translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="115"/>
+        <source>E-mail Address</source>
+        <translation>E-mailová adresa</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="117"/>
+        <source>DNS Name</source>
+        <translation>Meno DNS</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="123"/>
+        <source>Issuer</source>
+        <translation>Vydavateľ</translation>
+    </message>
+</context>
+<context>
     <name>Swift::QtChatListWindow</name>
     <message>
-        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="80"/>
-        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="84"/>
+        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="82"/>
+        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="86"/>
         <source>Add New Bookmark</source>
         <translation>Pridať novú záložku</translation>
     </message>
     <message>
-        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="81"/>
+        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="83"/>
         <source>Edit Bookmark</source>
         <translation>Upraviť záložku</translation>
     </message>
     <message>
-        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="82"/>
+        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="84"/>
         <source>Remove Bookmark</source>
         <translation>Odstrániť záložku</translation>
     </message>
     <message>
-        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="158"/>
+        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="173"/>
         <source>Clear recents</source>
         <translation>Vymazať nedávne</translation>
     </message>
@@ -1545,59 +1859,79 @@
 <context>
     <name>Swift::QtChatView</name>
     <message>
-        <location filename="../QtUI/QtChatView.cpp" line="72"/>
+        <location filename="../QtUI/QtChatView.cpp" line="73"/>
         <source>Clear log</source>
         <translation>Vymazať záznam</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtChatView.cpp" line="73"/>
+        <location filename="../QtUI/QtChatView.cpp" line="74"/>
         <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="74"/>
+        <location filename="../QtUI/QtChatView.cpp" line="75"/>
         <source>Are you sure?</source>
         <translation>Ste si istý?</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtChatView.cpp" line="178"/>
+        <location filename="../QtUI/QtChatView.cpp" line="219"/>
         <source>%1 edited</source>
         <translation>%1 upravené</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtChatView.cpp" line="330"/>
+        <location filename="../QtUI/QtChatView.cpp" line="400"/>
         <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"/>
+        <location filename="../QtUI/QtChatView.cpp" line="401"/>
+        <location filename="../QtUI/QtChatView.cpp" line="406"/>
+        <location filename="../QtUI/QtChatView.cpp" line="417"/>
         <source>Cancel</source>
         <translation>Zrušiť</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtChatView.cpp" line="335"/>
+        <location filename="../QtUI/QtChatView.cpp" line="405"/>
         <source>Negotiating...</source>
         <translation>Vyjednávanie…</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtChatView.cpp" line="350"/>
+        <location filename="../QtUI/QtChatView.cpp" line="420"/>
         <source>Transfer has been canceled!</source>
         <translation>Prenos bol zrušený!</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtChatView.cpp" line="354"/>
+        <location filename="../QtUI/QtChatView.cpp" line="424"/>
         <source>Transfer completed successfully.</source>
         <translation>Prenos bol úspešne dokončený.</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtChatView.cpp" line="357"/>
+        <location filename="../QtUI/QtChatView.cpp" line="427"/>
         <source>Transfer failed.</source>
         <translation>Prenos zlyhal.</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtChatView.cpp" line="367"/>
+        <location filename="../QtUI/QtChatView.cpp" line="437"/>
+        <source>Started whiteboard chat</source>
+        <translation>Spustený rozhovor s využitím tabule</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="438"/>
+        <source>Show whiteboard</source>
+        <translation>Zobraziť tabuľu</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="440"/>
+        <source>Whiteboard chat has been canceled</source>
+        <translation>Rozhovor s využitím tabule bol zrušený</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="442"/>
+        <source>Whiteboard chat request has been rejected</source>
+        <translation>Požiadavka na rozhovor s využitím tabule bola odmietnutá</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="451"/>
         <source>Return to room</source>
         <translation>Vrátiť sa do miestnosti</translation>
     </message>
@@ -1605,12 +1939,12 @@
 <context>
     <name>Swift::QtChatWindow</name>
     <message>
-        <location filename="../QtUI/QtChatWindow.cpp" line="481"/>
+        <location filename="../QtUI/QtChatWindow.cpp" line="546"/>
         <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="488"/>
+        <location filename="../QtUI/QtChatWindow.cpp" line="553"/>
         <source>This message may not have been transmitted.</source>
         <translation>Táto správa ešte nemusela byť prenesená.</translation>
     </message>
@@ -1623,22 +1957,22 @@
         <translation type="obsolete">Akcie</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtChatWindow.cpp" line="144"/>
+        <location filename="../QtUI/QtChatWindow.cpp" line="157"/>
         <source>Correcting</source>
         <translation>Prebieha opravovanie</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtChatWindow.cpp" line="241"/>
+        <location filename="../QtUI/QtChatWindow.cpp" line="269"/>
         <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"/>
+        <location filename="../QtUI/QtChatWindow.cpp" line="271"/>
         <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"/>
+        <location filename="../QtUI/QtChatWindow.cpp" line="562"/>
         <source>The receipt for this message has been received.</source>
         <translation>Pre túto správu bola prijatá doručenka.</translation>
     </message>
@@ -1647,123 +1981,154 @@
         <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"/>
+        <location filename="../QtUI/QtChatWindow.cpp" line="565"/>
         <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>
+        <translation>Doručenka pre túto správu zatiaľ neprišla. Príjemca nemusel 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"/>
+        <location filename="../QtUI/QtChatWindow.cpp" line="613"/>
         <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"/>
+        <location filename="../QtUI/QtChatWindow.cpp" line="615"/>
+        <location filename="../QtUI/QtChatWindow.cpp" line="623"/>
+        <location filename="../QtUI/QtChatWindow.cpp" line="660"/>
+        <location filename="../QtUI/QtChatWindow.cpp" line="664"/>
         <source>Cancel</source>
         <translation>Zrušiť</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtChatWindow.cpp" line="543"/>
+        <location filename="../QtUI/QtChatWindow.cpp" line="616"/>
         <source>Set Description</source>
         <translation>Nastaviť popis</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtChatWindow.cpp" line="544"/>
+        <location filename="../QtUI/QtChatWindow.cpp" line="617"/>
         <source>Send</source>
         <translation>Odoslať</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtChatWindow.cpp" line="548"/>
+        <location filename="../QtUI/QtChatWindow.cpp" line="621"/>
         <source>Receiving file</source>
         <translation>Prijímanie súboru</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtChatWindow.cpp" line="551"/>
+        <location filename="../QtUI/QtChatWindow.cpp" line="624"/>
+        <location filename="../QtUI/QtChatWindow.cpp" line="665"/>
         <source>Accept</source>
         <translation>Prijať</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtChatWindow.cpp" line="590"/>
+        <location filename="../QtUI/QtChatWindow.cpp" line="659"/>
+        <source>Starting whiteboard chat</source>
+        <translation>Prebieha spúšťanie rozhovoru s využitím tabule</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="663"/>
+        <source>%1 would like to start a whiteboard chat</source>
+        <translation>%1 chce začať rozhovor s využitím tabule</translation>
+    </message>
+    <message>
+        <source> would like to start whiteboard chat</source>
+        <translation type="obsolete"> chce začať rozhovor s využitím tabule</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="700"/>
         <source>File transfer description</source>
         <translation>Popis prenosu súboru</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtChatWindow.cpp" line="591"/>
+        <location filename="../QtUI/QtChatWindow.cpp" line="701"/>
         <source>Description:</source>
         <translation>Popis:</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtChatWindow.cpp" line="605"/>
+        <location filename="../QtUI/QtChatWindow.cpp" line="715"/>
         <source>Save File</source>
         <translation>Uložiť súbor</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtChatWindow.cpp" line="782"/>
+        <location filename="../QtUI/QtChatWindow.cpp" line="906"/>
+        <source>Change subject…</source>
+        <translation>Zmeniť predmet…</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="907"/>
+        <source>Configure room…</source>
+        <translation>Nastaviť miestnosť…</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="908"/>
+        <source>Edit affiliations…</source>
+        <translation>Upraviť členstvo…</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="910"/>
+        <source>Invite person to this room…</source>
+        <translation>Pozvať používateľa do tejto miestnosti…</translation>
+    </message>
+    <message>
         <source>Change subject</source>
-        <translation>Zmeniť predmet</translation>
+        <translation type="obsolete">Zmeniť predmet</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtChatWindow.cpp" line="783"/>
         <source>Configure room</source>
-        <translation>Nastaviť miestnosť</translation>
+        <translation type="obsolete">Nastaviť miestnosť</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtChatWindow.cpp" line="784"/>
         <source>Edit affiliations</source>
-        <translation>Upraviť členstvo</translation>
+        <translation type="obsolete">Upraviť členstvo</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtChatWindow.cpp" line="785"/>
+        <location filename="../QtUI/QtChatWindow.cpp" line="909"/>
         <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>
+        <translation type="obsolete">Pozvať osobu do tejto mietnosti</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtChatWindow.cpp" line="793"/>
+        <location filename="../QtUI/QtChatWindow.cpp" line="920"/>
         <source>Change room subject</source>
         <translation>Zmeniť predmet miestnosti</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtChatWindow.cpp" line="793"/>
+        <location filename="../QtUI/QtChatWindow.cpp" line="920"/>
         <source>New subject:</source>
         <translation>Nový predmet:</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtChatWindow.cpp" line="811"/>
+        <location filename="../QtUI/QtChatWindow.cpp" line="938"/>
         <source>Confirm room destruction</source>
         <translation>Potvrdenie odstránenia miestnosti</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtChatWindow.cpp" line="812"/>
+        <location filename="../QtUI/QtChatWindow.cpp" line="939"/>
         <source>Are you sure you want to destroy the room?</source>
-        <translation>Chcete odstrániť miestnosť?</translation>
+        <translation>Naozaj chcete odstrániť miestnosť?</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtChatWindow.cpp" line="813"/>
+        <location filename="../QtUI/QtChatWindow.cpp" line="940"/>
         <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>
+        <translation type="obsolete">Zadajte adresu osoby</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtChatWindow.cpp" line="822"/>
         <source>Address:</source>
-        <translation>Adresa:</translation>
+        <translation type="obsolete">Adresa:</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtChatWindow.cpp" line="868"/>
+        <location filename="../QtUI/QtChatWindow.cpp" line="991"/>
         <source>Accept Invite</source>
         <translation>Prijať pozvánku</translation>
     </message>
@@ -1771,7 +2136,7 @@
 <context>
     <name>Swift::QtContactEditWidget</name>
     <message>
-        <location filename="../QtUI/QtContactEditWidget.cpp" line="121"/>
+        <location filename="../QtUI/QtContactEditWidget.cpp" line="122"/>
         <source>Name:</source>
         <translation>Meno:</translation>
     </message>
@@ -1781,7 +2146,7 @@
         <translation>Skupiny:</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtContactEditWidget.cpp" line="64"/>
+        <location filename="../QtUI/QtContactEditWidget.cpp" line="65"/>
         <source>New Group:</source>
         <translation>Nová skupina:</translation>
     </message>
@@ -1841,6 +2206,27 @@
     </message>
 </context>
 <context>
+    <name>Swift::QtHistoryWindow</name>
+    <message>
+        <location filename="../QtUI/QtHistoryWindow.cpp" line="57"/>
+        <source>History</source>
+        <translation>História</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtInviteToChatWindow</name>
+    <message>
+        <location filename="../QtUI/QtInviteToChatWindow.cpp" line="25"/>
+        <source>Users to invite to this chat (one per line):</source>
+        <translation>Zoznam osôb, ktoré chcete pozvať do tohto rozhovoru (po jednej na riadku):</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtInviteToChatWindow.cpp" line="31"/>
+        <source>If you want to provide a reason for the invitation, enter it here</source>
+        <translation>Ak chcete zadať dôvod pre pozvánku, napíšte ho sem</translation>
+    </message>
+</context>
+<context>
     <name>Swift::QtJoinMUCWindow</name>
     <message>
         <location filename="../QtUI/QtJoinMUCWindow.cpp" line="19"/>
@@ -1851,133 +2237,136 @@
 <context>
     <name>Swift::QtLoginWindow</name>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="91"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="92"/>
         <source>User address:</source>
-        <translation>Adresa používateľa:</translation>
+        <translation>Adresa osoby:</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="96"/>
         <location filename="../QtUI/QtLoginWindow.cpp" line="97"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="98"/>
         <source>User address - looks like someuser@someserver.com</source>
-        <translation>Adresa používateľa - vyzerá ako nejakypouzivatel@nejakyserver.sk</translation>
+        <translation>Adresa osoby - vyzerá ako niekto@nejakyserver.sk</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="101"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="102"/>
         <source>Example: alice@wonderland.lit</source>
         <translatorcomment>lepsi priklad</translatorcomment>
         <translation>Príklad: alica@krajina-zazrakov.lit</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="107"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="108"/>
         <source>Password:</source>
         <translation>Heslo:</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="128"/>
         <location filename="../QtUI/QtLoginWindow.cpp" line="129"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="130"/>
         <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="135"/>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="327"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="136"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="355"/>
         <source>Connect</source>
         <translation>Prihlásiť</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="146"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="154"/>
         <source>Remember Password?</source>
         <translation>Zapamätať si heslo</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="148"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="156"/>
         <source>Login Automatically?</source>
         <translation>Prihlásiť automaticky</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="160"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="168"/>
         <source>&amp;Swift</source>
         <translation>&amp;Swift</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="162"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="170"/>
         <source>&amp;General</source>
         <translation>&amp;Všeobecné</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="170"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="178"/>
         <source>&amp;About %1</source>
         <translation>O &amp;programe %1</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="175"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="183"/>
         <source>&amp;Show Debug Console</source>
         <translation>&amp;Zobraziť ladiacu konzolu</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="185"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="193"/>
         <source>&amp;Play Sounds</source>
         <translation>&amp;Prehrávať zvuky</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="191"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="199"/>
         <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="203"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="211"/>
         <source>&amp;Quit</source>
         <translation>U&amp;končiť</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="237"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="253"/>
         <source>Remove profile</source>
         <translation>Odstrániť profil</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="237"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="253"/>
         <source>Remove the profile &apos;%1&apos;?</source>
         <translation>Odstrániť profil „%1“?</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="327"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="355"/>
         <source>Cancel</source>
         <translation>Zrušiť</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="341"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="369"/>
         <source>Confirm terms of use</source>
         <translation>Potvrdenie podmienok použitia</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="384"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="412"/>
         <source>Select an authentication certificate</source>
-        <translation>Vyberte overovací certifikát</translation>
+        <translation>Vyberte certifikát pre overenie</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="494"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="412"/>
+        <source>P12 files (*.cert *.p12 *.pfx);;All files (*.*)</source>
+        <translation>Súbory P12 (*.cert *.p12 *.pfx);;Všetky súbory (*.*)</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="525"/>
         <source>The certificate presented by the server is not valid.</source>
         <translatorcomment>správny význam?</translatorcomment>
-        <translation>Certifikát predstavený serverom nie je platný.</translation>
+        <translation>Certifikát, ktorý poskytol server nie je platný.</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="495"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="526"/>
         <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 správny.</translation>
+        <translation>Chcete natrvalo 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="497"/>
         <source>Subject: %1</source>
-        <translation>Predmet: %1</translation>
+        <translation type="obsolete">Predmet: %1</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="498"/>
         <source>SHA-1 Fingerprint: %1</source>
-        <translation>Odtlačok SHA-1: %1</translation>
+        <translation type="obsolete">Odtlačok SHA-1: %1</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="180"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="188"/>
         <source>Show &amp;File Transfer Overview</source>
         <translation>Zobraziť prehľad prenosu &amp;súborov</translation>
     </message>
@@ -2007,28 +2396,28 @@
 <context>
     <name>Swift::QtMainWindow</name>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="68"/>
+        <location filename="../QtUI/QtMainWindow.cpp" line="79"/>
         <source>&amp;Contacts</source>
         <translation>&amp;Kontakty</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="77"/>
-        <location filename="../QtUI/QtMainWindow.cpp" line="174"/>
+        <location filename="../QtUI/QtMainWindow.cpp" line="88"/>
+        <location filename="../QtUI/QtMainWindow.cpp" line="205"/>
         <source>&amp;Notices</source>
         <translation>&amp;Udalosti</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="76"/>
+        <location filename="../QtUI/QtMainWindow.cpp" line="87"/>
         <source>C&amp;hats</source>
         <translation>&amp;Rozhovory</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="85"/>
+        <location filename="../QtUI/QtMainWindow.cpp" line="96"/>
         <source>&amp;View</source>
         <translation>&amp;Zobraziť</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="87"/>
+        <location filename="../QtUI/QtMainWindow.cpp" line="98"/>
         <source>&amp;Show offline contacts</source>
         <translation>Zobraziť &amp;offline kontakty</translation>
     </message>
@@ -2037,37 +2426,47 @@
         <translation type="obsolete">&amp;Kompaktný zoznam kontaktov</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="100"/>
+        <location filename="../QtUI/QtMainWindow.cpp" line="106"/>
+        <source>&amp;Show Emoticons</source>
+        <translation>&amp;Zobraziť emotikony</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="120"/>
         <source>&amp;Actions</source>
         <translation>&amp;Akcie</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="102"/>
+        <location filename="../QtUI/QtMainWindow.cpp" line="122"/>
         <source>Edit &amp;Profile…</source>
         <translation>Upraviť &amp;profil…</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="105"/>
+        <location filename="../QtUI/QtMainWindow.cpp" line="125"/>
         <source>Enter &amp;Room…</source>
         <translation>Vstúpiť do &amp;miestnosti…</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="108"/>
+        <location filename="../QtUI/QtMainWindow.cpp" line="129"/>
+        <source>&amp;View History…</source>
+        <translation>&amp;Zobraziť históriu…</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="133"/>
         <source>&amp;Add Contact…</source>
         <translation>Pridať &amp;kontakt…</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="111"/>
+        <location filename="../QtUI/QtMainWindow.cpp" line="136"/>
         <source>&amp;Edit Selected Contact…</source>
         <translation>&amp;Upraviť vybraný kontakt…</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="115"/>
+        <location filename="../QtUI/QtMainWindow.cpp" line="140"/>
         <source>Start &amp;Chat…</source>
         <translation>Začať &amp;rozhovor…</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="121"/>
+        <location filename="../QtUI/QtMainWindow.cpp" line="146"/>
         <source>&amp;Sign Out</source>
         <translation>&amp;Odhlásiť sa</translation>
     </message>
@@ -2076,27 +2475,27 @@
         <translation type="obsolete">&amp;Udalosti</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="118"/>
+        <location filename="../QtUI/QtMainWindow.cpp" line="143"/>
         <source>Run Server Command</source>
         <translation>Spustiť príkaz na serveri</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="125"/>
+        <location filename="../QtUI/QtMainWindow.cpp" line="150"/>
         <source>&amp;Request Delivery Receipts</source>
         <translation>Vyžadovať &amp;doručenky</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="134"/>
+        <location filename="../QtUI/QtMainWindow.cpp" line="161"/>
         <source>Collecting commands...</source>
-        <translation>Získavanie príkazov…</translation>
+        <translation>Prebieha získavanie príkazov…</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="185"/>
+        <location filename="../QtUI/QtMainWindow.cpp" line="216"/>
         <source>&amp;Chats</source>
         <translation>&amp;Rozhovory</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="278"/>
+        <location filename="../QtUI/QtMainWindow.cpp" line="339"/>
         <source>No Available Commands</source>
         <translation>Nie sú dostupné žiadne príkazy</translation>
     </message>
@@ -2129,17 +2528,17 @@
     <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>
+        <translation>Pre osobu 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>
+        <translation>Vykopnúť osobu</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>
+        <translation>Vykopnúť osobu a zakázať prístup</translation>
     </message>
     <message>
         <location filename="../QtUI/Roster/QtOccupantListWidget.cpp" line="57"/>
@@ -2158,8 +2557,12 @@
     </message>
     <message>
         <location filename="../QtUI/Roster/QtOccupantListWidget.cpp" line="60"/>
+        <source>Add to contacts</source>
+        <translation>Pridať do kontaktov</translation>
+    </message>
+    <message>
         <source>Add contact</source>
-        <translation>Pridať kontakt</translation>
+        <translation type="obsolete">Pridať kontakt</translation>
     </message>
 </context>
 <context>
@@ -2181,40 +2584,57 @@
     </message>
 </context>
 <context>
+    <name>Swift::QtRosterHeader</name>
+    <message>
+        <location filename="../QtUI/QtRosterHeader.cpp" line="59"/>
+        <source>Connection is secured</source>
+        <translation>Spojenie je zabezpečené</translation>
+    </message>
+</context>
+<context>
     <name>Swift::QtRosterWidget</name>
     <message>
-        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="57"/>
         <source>Edit</source>
-        <translation>Upraviť</translation>
+        <translation type="obsolete">Upraviť</translation>
     </message>
     <message>
         <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="58"/>
+        <source>Edit…</source>
+        <translation>Upraviť…</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="59"/>
         <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"/>
+        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="63"/>
+        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="83"/>
         <source>Send File</source>
         <translation>Odoslať súbor</translation>
     </message>
     <message>
-        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="76"/>
+        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="69"/>
+        <source>Start Whiteboard Chat</source>
+        <translation>Začať rozhovor s využitím tabule</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="83"/>
         <source>All Files (*);;</source>
         <translation>Všetky súbory (*);;</translation>
     </message>
     <message>
-        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="84"/>
+        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="96"/>
         <source>Rename</source>
         <translation>Premenovať</translation>
     </message>
     <message>
-        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="94"/>
+        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="106"/>
         <source>Rename group</source>
         <translation>Premenovať skupinu</translation>
     </message>
     <message>
-        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="94"/>
+        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="106"/>
         <source>Enter a new name for group &apos;%1&apos;:</source>
         <translation>Zadajte nové meno pre skupinu „%1“:</translation>
     </message>
@@ -2224,7 +2644,7 @@
     <message>
         <location filename="../QtUI/QtStatusWidget.cpp" line="231"/>
         <source>Connecting</source>
-        <translation>Pripájam</translation>
+        <translation>Prebieha pripájanie</translation>
     </message>
     <message>
         <location filename="../QtUI/QtStatusWidget.cpp" line="261"/>
@@ -2237,7 +2657,7 @@
     <message>
         <location filename="../QtUI/QtSubscriptionRequestWindow.cpp" line="24"/>
         <source>You have already replied to this request</source>
-        <translation>Už ste reagovali na túto žiadosť</translation>
+        <translation>Na túto žiadosť ste už reagovali</translation>
     </message>
     <message>
         <location filename="../QtUI/QtSubscriptionRequestWindow.cpp" line="25"/>
@@ -2267,9 +2687,9 @@
 If you choose to defer this choice, you will be asked again when you next login.</source>
         <translatorcomment>formulácia</translatorcomment>
         <translation>%1 si vás chce pridať do zoznamu kontaktov.
- Chcete si ju/ho pridať do vášho zoznamu kontaktov a zdielať stav, keď budete pripojení?
+ Chcete si ho pridať do vášho zoznamu kontaktov a keď budete pripojení, zdielať s ním stav?
 
-Keď sa rozhodnete odložiť výber, môžete sa znovu rozhodnúť po nasledujúcom prihlásení.</translation>
+Keď sa rozhodnete odložiť výber, po nasledujúcom prihlásení sa môžete znovu rozhodnúť.</translation>
     </message>
 </context>
 <context>
@@ -2315,7 +2735,7 @@ Keď sa rozhodnete odložiť výber, môžete sa znovu rozhodnúť po nasledujú
     <message>
         <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>
+        <translation>Zvoľte meno pre kontakt a vyberte skupiny do ktorých chcete kontakt zaradiť.</translation>
     </message>
 </context>
 <context>
@@ -2323,17 +2743,17 @@ 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>
-        <translation>%1. Keď viete jej/jeho adresu, môžete ju zadať priamo, alebo ju/ho môžete vyhľadať.</translation>
+        <translation>%1. Keď viete jeho adresu, môžete ju zadať priamo, alebo 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>
-        <translation>Nižšie môžete pridať iného používateľa/používateľku do zoznamu kontaktov</translation>
+        <translation>Pridať osobu do vášho zoznamu kontaktov</translation>
     </message>
     <message>
         <location filename="../QtUI/UserSearch/QtUserSearchFirstPage.cpp" line="16"/>
         <source>Chat to another user</source>
-        <translation>Rozhovor s inou osobou</translation>
+        <translation>Rozhovor s ďalšou osobou</translation>
     </message>
 </context>
 <context>
@@ -2354,23 +2774,23 @@ Keď sa rozhodnete odložiť výber, môžete sa znovu rozhodnúť po nasledujú
         <translation>alica@krajina-zazrakov.lit</translation>
     </message>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="293"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="296"/>
         <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>
+        <translation>Ako vyhľadať osobu, ktorú pridať:</translation>
     </message>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="296"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="299"/>
         <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>
+        <translation>Ako vyhľadať osobu s ktorou začať rozhovor:</translation>
     </message>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="323"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="326"/>
         <source>Error while searching</source>
-        <translation>Chyba pri hľadaní</translation>
+        <translation>Chyba pri vyhľadávaní</translation>
     </message>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="329"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="332"/>
         <source>This server doesn&apos;t support searching for users.</source>
         <translation>Tento server nepodporuje vyhľadávanie osôb.</translation>
     </message>
@@ -2394,6 +2814,14 @@ Keď sa rozhodnete odložiť výber, môžete sa znovu rozhodnúť po nasledujú
     </message>
 </context>
 <context>
+    <name>Swift::QtWhiteboardWindow</name>
+    <message>
+        <location filename="../QtUI/Whiteboard/QtWhiteboardWindow.cpp" line="380"/>
+        <source>Closing window is equivalent closing the session. Are you sure you want to do this?</source>
+        <translation>Zatvorením okna ukončíte sedenie. Naozaj chcete toto spraviť?</translation>
+    </message>
+</context>
+<context>
     <name>Swift::QtXMLConsoleWidget</name>
     <message>
         <location filename="../QtUI/QtXMLConsoleWidget.cpp" line="22"/>
@@ -2403,7 +2831,7 @@ Keď sa rozhodnete odložiť výber, môžete sa znovu rozhodnúť po nasledujú
     <message>
         <location filename="../QtUI/QtXMLConsoleWidget.cpp" line="40"/>
         <source>Trace input/output</source>
-        <translation>Sledovať vstup/výstup</translation>
+        <translation>Sledovať vstup a výstup</translation>
     </message>
     <message>
         <location filename="../QtUI/QtXMLConsoleWidget.cpp" line="46"/>
-- 
cgit v0.10.2-6-g49f6