13 files changed, 11281 insertions, 1239 deletions
diff --git a/Swift/Translations/swift_ca.ts b/Swift/Translations/swift_ca.ts
index 85d2c0c..a512f1f 100644
--- a/Swift/Translations/swift_ca.ts
+++ b/Swift/Translations/swift_ca.ts
@@ -6,35 +6,46 @@
     <name></name>
     <message>
-        <location filename="../Controllers/Chat/ChatController.cpp" line="46"/>
+        <location filename="../Controllers/Chat/ChatController.cpp" line="59"/>
         <source>Starting chat with %1% in chatroom %2%</source>
         <translation>Començant conversa amb %1% a la sala %2%</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatController.cpp" line="49"/>
+        <location filename="../Controllers/Chat/ChatController.cpp" line="62"/>
         <source>Starting chat with %1% - %2%</source>
         <translation>Començant conversa amb %1% - %2%</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatController.cpp" line="119"/>
+        <location filename="../Controllers/Chat/ChatController.cpp" line="202"/>
+        <source>This chat doesn&apos;t support delivery receipts.</source>
+        <translation>Aquesta conversa no és compatible amb confirmacions de lliurament.</translation>
+    </message>
+    <message>
+        <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>Aquesta conversa potser no sigui compatible amb confirmacions de lliurament. Potser no rebis les confirmacions de lliurament dels missatges que enviïs.</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatController.cpp" line="216"/>
+        <location filename="../Controllers/FileTransfer/FileTransferController.cpp" line="42"/>
         <source>me</source>
         <translation>Jo</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatController.cpp" line="160"/>
+        <location filename="../Controllers/Chat/ChatController.cpp" line="324"/>
         <source>%1% has gone offline</source>
         <translation>%1% s&apos;ha desconnectat</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatController.cpp" line="164"/>
+        <location filename="../Controllers/Chat/ChatController.cpp" line="328"/>
         <source>%1% has become available</source>
         <translation>%1% es troba disponible</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatController.cpp" line="166"/>
+        <location filename="../Controllers/Chat/ChatController.cpp" line="330"/>
         <source>%1% has gone away</source>
         <translation>%1% s&apos;ha absentat</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatController.cpp" line="168"/>
+        <location filename="../Controllers/Chat/ChatController.cpp" line="332"/>
         <source>%1% is now busy</source>
         <translatorcomment>TMPFIX genero: o/a? sinonimo? masculino?</translatorcomment>
@@ -42,155 +53,159 @@
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="56"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="74"/>
         <source>The day is now %1%</source>
         <translation>El día es ara %1%</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="191"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="209"/>
+        <source>Couldn&apos;t send message: %1%</source>
+        <translation>No s&apos;ha pogut enviar el missatge: %1%</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="269"/>
         <source>Error sending message</source>
         <translation>Error enviant missatge</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="197"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="275"/>
         <source>Bad request</source>
         <translation>Sol·licitud incorrecta</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="198"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="276"/>
         <source>Conflict</source>
         <translation>Conflicte</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="199"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="277"/>
         <source>This feature is not implemented</source>
         <translation>Aquesta característica no es troba implementada</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="200"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="278"/>
         <source>Forbidden</source>
         <translation>Prohibit</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="201"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="279"/>
         <source>Recipient can no longer be contacted</source>
         <translation>Ja no et pot contactar amb el destinatari</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="202"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="280"/>
         <source>Internal server error</source>
         <translation>Error intern del servidor</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="203"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="281"/>
         <source>Item not found</source>
         <translation>Element no trobat</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="204"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="282"/>
         <source>JID Malformed</source>
         <translation>JID Malformat</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="205"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="283"/>
         <source>Message was rejected</source>
         <translation>El missatge ha sigut rebutjat</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="206"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="284"/>
         <source>Not allowed</source>
         <translation>No permès</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="207"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="285"/>
         <source>Not authorized</source>
         <translation>No autoritzat</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="208"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="286"/>
         <source>Payment is required</source>
         <translation>Pagament requerit</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="209"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="287"/>
         <source>Recipient is unavailable</source>
         <translation>Destinatari no disponible</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="210"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="288"/>
         <source>Redirect</source>
         <translation>Redirecció</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="211"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="289"/>
         <source>Registration required</source>
         <translation>Registre requerit</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="212"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="290"/>
         <source>Recipient&apos;s server not found</source>
         <translation>No s&apos;ha trobat el servidor del destinatari</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="213"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="291"/>
         <source>Remote server timeout</source>
         <translation>Temps d&apos;espera del servidor remot esgotat</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="214"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="292"/>
         <source>The server is low on resources</source>
         <translation>El servidor te pocs recursos disponibles</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="215"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="293"/>
         <source>The service is unavailable</source>
         <translation>El servei no es troba disponible</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="216"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="294"/>
         <source>A subscription is required</source>
         <translation>Es requereix una subscripció</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="217"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="295"/>
         <source>Undefined condition</source>
         <translation>Condició no definida</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="218"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="296"/>
         <source>Unexpected request</source>
         <translation>Sol·licitud inesperada</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="114"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="222"/>
         <source>Room %1% is not responding. This operation may never complete.</source>
-        <translation>La sala %1% no respon. Es possible que aquesta operació no es completi mai.</translation>
+        <translation>La sala %1% no respon. És possible que aquesta operació no es completi mai.</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="125"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="233"/>
         <source>Unable to enter this room</source>
         <translation>No es pot entrar a aquesta sala</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="131"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="239"/>
         <source>Unable to enter this room as %1%, retrying as %2%</source>
         <translation>No es pot entrar a aquesta sala com a %1%, provant de nou com a %2%</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="135"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="243"/>
         <source>No nickname specified</source>
         <translation>No s&apos;ha especificat un nick</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="139"/>
         <source>A password needed</source>
-        <translation>Es necessita contrasenya</translation>
+        <translation type="obsolete">Es necessita contrasenya</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="143"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="251"/>
         <source>Only members may enter</source>
         <translation>Només els membres poden entrar</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="147"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="255"/>
         <source>You are banned from the room</source>
         <translatorcomment>bloquejat?</translatorcomment>
@@ -198,70 +213,75 @@
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="151"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="259"/>
         <source>The room is full</source>
         <translation>La sala es troba plena</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="155"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="263"/>
         <source>The room does not exist</source>
         <translation>La sala no existeix</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="173"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="269"/>
+        <source>Couldn&apos;t join room: %1%.</source>
+        <translation>No s&apos;ha pogut entrar a la sala: %1%.</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="281"/>
         <source>You have entered room %1% as %2%.</source>
         <translation>Has entrat a la sala %1% com a %2%.</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="214"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="332"/>
         <source>%1% has entered the room as a %2%.</source>
         <translation>%1% ha entrat a la sala com a %2%.</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="217"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="335"/>
         <source>%1% has entered the room.</source>
         <translation>%1% ha entrat a la sala.</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="243"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="384"/>
         <source>moderator</source>
         <translation>moderador</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="244"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="385"/>
         <source>participant</source>
         <translation>participant</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="245"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="386"/>
         <source>visitor</source>
         <translation>visitant</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="283"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="436"/>
         <source>The room subject is now: %1%</source>
         <translation>El tema de la sala és ara: %1%</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="313"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="470"/>
         <source>%1% is now a %2%</source>
         <translation>%1% ara es un %2%</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="319"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="486"/>
         <source>Moderators</source>
         <translation>Moderadors</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="320"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="487"/>
         <source>Participants</source>
         <translation>Participants</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="321"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="488"/>
         <source>Visitors</source>
         <translation>Visitants</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="322"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="489"/>
         <source>Occupants</source>
         <translatorcomment>TMPFIX, used where?</translatorcomment>
@@ -269,172 +289,226 @@
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="336"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="503"/>
         <source>Trying to enter room %1%</source>
         <translation>Intentant entrar a la sala %1%</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="365"/>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="474"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="544"/>
+        <source>%1% has left the room%2%</source>
+        <translation>%1% ha sortit de la sala %2%</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="548"/>
+        <source>You have been kicked out of the room</source>
+        <translation>Has sigut expulsat de la sala</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="549"/>
+        <source>You have been banned from the room</source>
+        <translation>Has sigut vetat de la sala</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="550"/>
+        <source>You are no longer a member of the room and have been removed</source>
+        <translation>Ja no ets un membre de la sala i has sigut expulsat</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="551"/>
+        <source>The room has been destroyed</source>
+        <translation>La sala ha estat destruïda</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="667"/>
         <source>%1% has left the room</source>
         <translation>%1% ha sortit de la sala</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="365"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="719"/>
+        <source>Room configuration failed: %1%.</source>
+        <translation>La configuració de la sala ha fallat: %1%.</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="725"/>
+        <source>Occupant role change failed: %1%.</source>
+        <translation>El canvi de rol de l&apos;ocupant ha fallat: %1%.</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="553"/>
         <source>You have left the room</source>
         <translation>Has sortit de la sala</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="439"/>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="503"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="247"/>
+        <source>The correct room password is needed</source>
+        <translation>Es necessita la contrasenya de sala correcta</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="632"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="696"/>
         <source> and </source>
         <translation> i </translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="463"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="656"/>
         <source>%1% have entered the room</source>
         <translation>%1% han entrat a la sala</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="466"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="659"/>
         <source>%1% has entered the room</source>
         <translation>%1% ha entrat a la sala</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="471"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="664"/>
         <source>%1% have left the room</source>
         <translation>%1% han sortit de la sala</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="479"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="672"/>
         <source>%1% have entered then left the room</source>
         <translation>%1% han entrat i sortit de la sala</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="482"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="675"/>
         <source>%1% has entered then left the room</source>
         <translation>%1% ha entrat i sortit de la sala</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="487"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="680"/>
         <source>%1% have left then returned to the room</source>
         <translation>%1% han sortit i tornat a la sala</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="490"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="683"/>
         <source>%1% has left then returned to the room</source>
         <translation>%1% ha sortit i tornat a la sala</translation>
     </message>
     <message>
-        <location filename="../Controllers/EventNotifier.cpp" line="51"/>
+        <location filename="../Controllers/EventNotifier.cpp" line="59"/>
         <source>%1% wants to add you to his/her contact list</source>
         <translation>%1% vol afegir-te a la seva llista de contactes</translation>
     </message>
     <message>
-        <location filename="../Controllers/EventNotifier.cpp" line="55"/>
+        <location filename="../Controllers/EventNotifier.cpp" line="63"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="438"/>
+        <location filename="../Controllers/EventNotifier.cpp" line="67"/>
+        <source>%1% has invited you to enter the %2% room</source>
+        <translation>%1% t&apos;ha convidat a entrar a la sala %2%</translation>
+    </message>
+    <message>
+        <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>Adreça d&apos;usuari no vàlida. L&apos;adreça d&apos;usuari ha de ser de la forma &apos;alicia@paismeravelles.lit&apos;</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="568"/>
         <source>Unknown Error</source>
         <translation>Error Desconegut</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="439"/>
+        <location filename="../Controllers/MainController.cpp" line="569"/>
         <source>Unable to find server</source>
         <translation>No es pot trobar el servidor</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="440"/>
+        <location filename="../Controllers/MainController.cpp" line="570"/>
         <source>Error connecting to server</source>
         <translation>Error connectant al servidor</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="441"/>
+        <location filename="../Controllers/MainController.cpp" line="571"/>
         <source>Error while receiving server data</source>
         <translation>Error al rebre dades del servidor</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="442"/>
+        <location filename="../Controllers/MainController.cpp" line="572"/>
         <source>Error while sending data to the server</source>
         <translation>Error enviant dades al servidor</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="443"/>
+        <location filename="../Controllers/MainController.cpp" line="573"/>
         <source>Error parsing server data</source>
         <translation>Error analitzant dades del servidor</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="444"/>
+        <location filename="../Controllers/MainController.cpp" line="574"/>
         <source>Login/password invalid</source>
         <translation>Usuari/contrasenya no vàlids</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="445"/>
+        <location filename="../Controllers/MainController.cpp" line="575"/>
         <source>Error while compressing stream</source>
         <translation>Error comprimint flux de dades</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="446"/>
+        <location filename="../Controllers/MainController.cpp" line="576"/>
         <source>Server verification failed</source>
         <translation>La verificació del servidor ha fallat</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="447"/>
+        <location filename="../Controllers/MainController.cpp" line="577"/>
         <source>Authentication mechanisms not supported</source>
         <translation>Mecanisme d&apos;autenticació no soportat</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="448"/>
+        <location filename="../Controllers/MainController.cpp" line="578"/>
         <source>Unexpected response</source>
         <translation>Resposta inesperada</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="449"/>
+        <location filename="../Controllers/MainController.cpp" line="579"/>
         <source>Error binding resource</source>
         <translation>Error vinculant recurs</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="450"/>
+        <location filename="../Controllers/MainController.cpp" line="580"/>
         <source>Error starting session</source>
         <translation>Error iniciant sessió</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="451"/>
+        <location filename="../Controllers/MainController.cpp" line="581"/>
         <source>Stream error</source>
         <translation>Error de flux de dades</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="452"/>
+        <location filename="../Controllers/MainController.cpp" line="582"/>
         <source>Encryption error</source>
         <translation>Error d&apos;encriptatge</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="453"/>
+        <location filename="../Controllers/MainController.cpp" line="583"/>
         <source>Error loading certificate (Invalid password?)</source>
         <translation>Error carregant certificat (Contrasenya no vàlida?)</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="454"/>
+        <location filename="../Controllers/MainController.cpp" line="584"/>
         <source>Certificate not authorized</source>
         <translation>Certificat no autoritzat</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="456"/>
+        <location filename="../Controllers/MainController.cpp" line="585"/>
+        <source>Certificate card removed</source>
+        <translation>Targeta de certificat eliminada</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="587"/>
         <source>Unknown certificate</source>
         <translation>Certificat desconegut</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="457"/>
+        <location filename="../Controllers/MainController.cpp" line="588"/>
         <source>Certificate has expired</source>
         <translation>El certificat ha caducat</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="458"/>
+        <location filename="../Controllers/MainController.cpp" line="589"/>
         <source>Certificate is not yet valid</source>
         <translation>El certificat encara no es vàlid</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="459"/>
+        <location filename="../Controllers/MainController.cpp" line="590"/>
         <source>Certificate is self-signed</source>
         <translatorcomment>TMPFIX, signatura personal??</translatorcomment>
@@ -442,20 +516,20 @@
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="460"/>
+        <location filename="../Controllers/MainController.cpp" line="591"/>
         <source>Certificate has been rejected</source>
         <translation>El certificat ha sigut rebutjat</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="461"/>
+        <location filename="../Controllers/MainController.cpp" line="592"/>
         <source>Certificate is not trusted</source>
         <translation>El certificat no es de confiança</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="462"/>
+        <location filename="../Controllers/MainController.cpp" line="593"/>
         <source>Certificate cannot be used for encrypting your connection</source>
         <translation>El certificat no put set utilitzat per encriptar la teva connexió</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="463"/>
+        <location filename="../Controllers/MainController.cpp" line="594"/>
         <source>Certificate path length constraint exceeded</source>
         <translatorcomment>TMPFIX</translatorcomment>
@@ -463,42 +537,62 @@
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="464"/>
+        <location filename="../Controllers/MainController.cpp" line="595"/>
         <source>Invalid certificate signature</source>
         <translation>Signatura de certificat no vàlida</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="465"/>
+        <location filename="../Controllers/MainController.cpp" line="596"/>
         <source>Invalid Certificate Authority</source>
         <translation>Entitat Certificadora no Vàlida</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="466"/>
+        <location filename="../Controllers/MainController.cpp" line="597"/>
         <source>Certificate does not match the host identity</source>
         <translation>El certificat no coincideix amb la identitat del servidor</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="476"/>
+        <location filename="../Controllers/MainController.cpp" line="598"/>
+        <source>Certificate has been revoked</source>
+        <translation>El certificat ha estat revocat</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="599"/>
+        <source>Unable to determine certificate revocation state</source>
+        <translation>No es pot determinar l&apos;estat de revocació del certificat</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="609"/>
         <source>Certificate error</source>
         <translation>Error de certificat</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="490"/>
+        <location filename="../Controllers/MainController.cpp" line="616"/>
+        <source>Re-enter credentials and retry</source>
+        <translation>Torna a introduir les credencials i prova de nou</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="629"/>
+        <source>Disconnected from %1%: %2%. To reconnect, Sign Out and provide your password again.</source>
+        <translation>Desconnectat de %1%: %2%. Per tornar a connectar, desconnecta&apos;t i proporciona la teva contrasenya de nou.</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="635"/>
         <source>Reconnect to %1% failed: %2%. Will retry in %3% seconds.</source>
         <translation>La reconnexió a %1% ha fallat: %2%. S&apos;intentarà de nou d&apos;aquí a %3% segons.</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="493"/>
+        <location filename="../Controllers/MainController.cpp" line="638"/>
         <source>Disconnected from %1%: %2%.</source>
         <translation>Desconnectat de %1%: %2%.</translation>
     </message>
     <message>
-        <location filename="../Controllers/Roster/RosterController.cpp" line="126"/>
-        <location filename="../Controllers/Roster/RosterController.cpp" line="152"/>
-        <location filename="../Controllers/Roster/RosterController.cpp" line="214"/>
+        <location filename="../Controllers/Roster/RosterController.cpp" line="131"/>
+        <location filename="../Controllers/Roster/RosterController.cpp" line="157"/>
+        <location filename="../Controllers/Roster/RosterController.cpp" line="222"/>
         <source>Contacts</source>
         <translation>Contactes</translation>
     </message>
     <message>
-        <location filename="../Controllers/Roster/RosterController.cpp" line="251"/>
+        <location filename="../Controllers/Roster/RosterController.cpp" line="263"/>
         <source>Server %1% rejected contact list change to item &apos;%2%&apos;</source>
         <translation>El servidor %1% ha rebutjat el canvi a l&apos;element &apos;%2%&apos; de la llista de contactes</translation>
@@ -531,4 +625,29 @@
         <translation>Hi ha hagut un error publicant les dades del teu perfil</translation>
     </message>
+    <message>
+        <location filename="../Controllers/ChatMessageSummarizer.cpp" line="33"/>
+        <source>%1% (%2%)</source>
+        <translation>%1% (%2%)</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/ChatMessageSummarizer.cpp" line="38"/>
+        <source>%1% and %2% others (%3%)</source>
+        <translation>%1% i %2% més (%3%)</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/ChatMessageSummarizer.cpp" line="41"/>
+        <source>%1%, %2% (%3%)</source>
+        <translation>%1%, %2% (%3%)</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/CAPICertificateSelector.cpp" line="63"/>
+        <source>TLS Client Certificate Selection</source>
+        <translation>Selecció de certificat de client TLS</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/CAPICertificateSelector.cpp" line="64"/>
+        <source>Select a certificate to use for authentication</source>
+        <translation>Selecciona un certificat per utilitzar com a autenticació</translation>
+    </message>
 </context>
 <context>
@@ -686,13 +805,110 @@
     </message>
     <message>
-        <location filename="../QtUI/EventViewer/QtEvent.cpp" line="63"/>
+        <location filename="../QtUI/EventViewer/QtEvent.cpp" line="68"/>
         <source>%1 would like to add you to their contact list.</source>
         <translation>%1 vol afegir-te a la seva llista de contactes.</translation>
     </message>
     <message>
-        <location filename="../QtUI/EventViewer/QtEvent.cpp" line="66"/>
+        <location filename="../QtUI/EventViewer/QtEvent.cpp" line="71"/>
         <source>%1 would like to add you to their contact list, saying &apos;%2&apos;</source>
         <translation>%1 vol afegir-te a la seva llista de contactes, dient &apos;%2&apos;</translation>
     </message>
+    <message>
+        <location filename="../QtUI/EventViewer/QtEvent.cpp" line="81"/>
+        <source>%1 has invited you to enter the %2 room.</source>
+        <translation>%1 t&apos;ha convidat a entrar a la sala %2.</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="982"/>
+        <source>You&apos;ve been invited to enter the %1 room.</source>
+        <translation>T&apos;han convidat a entrar a la sala %1.</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="984"/>
+        <source>Reason: %1</source>
+        <translation>Motiu: %1</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="987"/>
+        <source>This person may not have really sent this invitation!</source>
+        <translation>És possible que aquesta persona no hagi enviat realment aquesta invitació!</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="46"/>
+        <source>Direction</source>
+        <translatorcomment>Sentit?</translatorcomment>
+        <translation>Direcció</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="47"/>
+        <source>Other Party</source>
+        <translatorcomment>Sounds weird... &quot;El teu contacte&quot; o similar?</translatorcomment>
+        <translation type="unfinished">L&apos;altra part</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="48"/>
+        <source>State</source>
+        <translation>Estat</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="49"/>
+        <source>Progress</source>
+        <translation>Progrés</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="50"/>
+        <source>Size</source>
+        <translation>Mida</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="65"/>
+        <source>Incoming</source>
+        <translation>Entrant</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="65"/>
+        <source>Outgoing</source>
+        <translation>Sortint</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="74"/>
+        <source>Waiting for start</source>
+        <translation>Esperant que comenci</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="76"/>
+        <source>Waiting for other side to accept</source>
+        <translation>Esperant a que l&apos;altra banda accepti</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="78"/>
+        <source>Negotiating</source>
+        <translation>Negociant</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="80"/>
+        <source>Transferring</source>
+        <translation>Transferint</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="82"/>
+        <source>Finished</source>
+        <translation>Finalitzat</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="84"/>
+        <source>Failed</source>
+        <translation>Fallit</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="86"/>
+        <source>Canceled</source>
+        <translation>Cancel·lat</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="142"/>
+        <source>Connection Options</source>
+        <translation>Opcions de connexió</translation>
+    </message>
 </context>
 <context>
@@ -880,5 +1096,5 @@
         <location filename="../QtUI/QtStrings.h" line="66"/>
         <source>&amp;Next</source>
-        <translation>&amp;Seguent</translation>
+        <translation>&amp;Següent</translation>
     </message>
     <message>
@@ -918,41 +1134,90 @@
 </context>
 <context>
+    <name>QtAffiliationEditor</name>
+    <message>
+        <location filename="../QtUI/QtAffiliationEditor.ui" line="14"/>
+        <source>Edit Affiliations</source>
+        <translation>Editar afiliacions</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAffiliationEditor.ui" line="28"/>
+        <source>Affiliation:</source>
+        <translation>Afiliació:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAffiliationEditor.ui" line="36"/>
+        <source>Owner</source>
+        <translation>Propietari</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAffiliationEditor.ui" line="41"/>
+        <source>Administrator</source>
+        <translation>Administrador</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAffiliationEditor.ui" line="46"/>
+        <source>Member</source>
+        <translation>Membre</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAffiliationEditor.ui" line="51"/>
+        <source>Outcast (Banned)</source>
+        <translation>Marginat (Vetat)</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAffiliationEditor.ui" line="68"/>
+        <source>Add User</source>
+        <translation>Afegir usuari</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAffiliationEditor.ui" line="75"/>
+        <source>Remove User</source>
+        <translation>Eliminar usuari</translation>
+    </message>
+</context>
+<context>
     <name>QtBookmarkDetailWindow</name>
     <message>
-        <location filename="../QtUI/QtBookmarkDetailWindow.ui"/>
-        <location filename="../QtUI/ui_QtBookmarkDetailWindow.h" line="137"/>
+        <location filename="../QtUI/QtBookmarkDetailWindow.ui" line="20"/>
         <source>Edit Bookmark Details</source>
         <translation>Editar Detalls de Marcador</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtBookmarkDetailWindow.ui"/>
-        <location filename="../QtUI/ui_QtBookmarkDetailWindow.h" line="138"/>
+        <location filename="../QtUI/QtBookmarkDetailWindow.ui" line="40"/>
         <source>Bookmark Name:</source>
         <translation>Nom del Marcador:</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtBookmarkDetailWindow.ui"/>
-        <location filename="../QtUI/ui_QtBookmarkDetailWindow.h" line="139"/>
+        <location filename="../QtUI/QtBookmarkDetailWindow.ui" line="50"/>
         <source>Room Address:</source>
         <translation>Adreça de la sala:</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtBookmarkDetailWindow.ui"/>
-        <location filename="../QtUI/ui_QtBookmarkDetailWindow.h" line="140"/>
+        <location filename="../QtUI/QtBookmarkDetailWindow.ui" line="60"/>
         <source>Your Nickname:</source>
         <translation>El teu nick:</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtBookmarkDetailWindow.ui"/>
-        <location filename="../QtUI/ui_QtBookmarkDetailWindow.h" line="141"/>
+        <location filename="../QtUI/QtBookmarkDetailWindow.ui" line="70"/>
         <source>Room password:</source>
         <translation>Contrasenya de la sala:</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtBookmarkDetailWindow.ui"/>
-        <location filename="../QtUI/ui_QtBookmarkDetailWindow.h" line="142"/>
-        <source>Join automatically</source>
+        <location filename="../QtUI/QtBookmarkDetailWindow.ui" line="93"/>
+        <source>Enter automatically</source>
         <translation>Entrar automàticament</translation>
     </message>
+    <message>
+        <source>Join automatically</source>
+        <translation type="obsolete">Entrar automàticament</translation>
+    </message>
+</context>
+<context>
+    <name>QtCertificateViewerDialog</name>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.ui" line="14"/>
+        <source>Certificate Viewer</source>
+        <translation>Visualitzador de certificats</translation>
+    </message>
 </context>
 <context>
@@ -972,4 +1237,126 @@
 </context>
 <context>
+    <name>QtConnectionSettings</name>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="14"/>
+        <source>Connection Options</source>
+        <translation>Opcions de connexió</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="22"/>
+        <source>Connection Method:</source>
+        <translation>Mètode de connexió:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="36"/>
+        <source>Automatic</source>
+        <translation>Automàtic</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="41"/>
+        <source>Manual</source>
+        <translation>Manual</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="46"/>
+        <source>BOSH</source>
+        <translation>BOSH</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="99"/>
+        <source>Secure connection:</source>
+        <translation>Connexió segura:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="107"/>
+        <source>Never</source>
+        <translation>Mai</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="112"/>
+        <source>Encrypt when possible</source>
+        <translation>Encriptar quan sigui possible</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="117"/>
+        <source>Always encrypt</source>
+        <translation>Encriptar sempre</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="127"/>
+        <source>Allow Compression</source>
+        <translation>Permetre compressió</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="134"/>
+        <source>Allow sending password over insecure connection</source>
+        <translation>Permetre enviar contrasenya sobre connexió insegura</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="157"/>
+        <source>Manually select server</source>
+        <translation>Seleccionar servidor manualment</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="185"/>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="315"/>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="429"/>
+        <source>Hostname:</source>
+        <translation>Nom de servidor:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="208"/>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="338"/>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="452"/>
+        <source>Port:</source>
+        <translation>Port:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="230"/>
+        <source>Connection Proxy</source>
+        <translation>Proxy de connexió</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="238"/>
+        <source>Proxy type:</source>
+        <translation>Tipus de proxy:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="249"/>
+        <source>None</source>
+        <translation>Cap</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="254"/>
+        <source>Use system-configured proxy</source>
+        <translation>Utilitzar el proxy del sistema</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="259"/>
+        <source>SOCKS5</source>
+        <translation>SOCKS5</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="264"/>
+        <source>HTTP Connect</source>
+        <translation>HTTP Connect</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="287"/>
+        <source>Override system-configured proxy</source>
+        <translation>Substituir el proxy del sistema</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="382"/>
+        <source>BOSH URI:</source>
+        <translation>URI de BOSH:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="401"/>
+        <source>Manually select HTTP proxy</source>
+        <translation>Seleccionar proxy HTTP manualment</translation>
+    </message>
+</context>
+<context>
     <name>QtEventWindow</name>
     <message>
@@ -979,33 +1366,69 @@
 </context>
 <context>
+    <name>QtHistoryWindow</name>
+    <message>
+        <location filename="../QtUI/QtHistoryWindow.ui" line="14"/>
+        <source>History</source>
+        <translation>Historial</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtHistoryWindow.ui" line="22"/>
+        <source>Search:</source>
+        <translation>Cercar:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtHistoryWindow.ui" line="42"/>
+        <source>Next</source>
+        <translation>Següent</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtHistoryWindow.ui" line="52"/>
+        <source>Previous</source>
+        <translation>Anterior</translation>
+    </message>
+</context>
+<context>
     <name>QtJoinMUCWindow</name>
     <message>
-        <location filename="../QtUI/QtJoinMUCWindow.ui"/>
-        <location filename="../QtUI/ui_QtJoinMUCWindow.h" line="124"/>
-        <location filename="../QtUI/ui_QtJoinMUCWindow.h" line="130"/>
+        <location filename="../QtUI/QtJoinMUCWindow.ui" line="20"/>
+        <location filename="../QtUI/QtJoinMUCWindow.ui" line="113"/>
         <source>Enter Room</source>
         <translation>Entrar a la sala</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtJoinMUCWindow.ui"/>
-        <location filename="../QtUI/ui_QtJoinMUCWindow.h" line="125"/>
+        <location filename="../QtUI/QtJoinMUCWindow.ui" line="28"/>
+        <source>Room Address:</source>
+        <translation>Adreça de la sala:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtJoinMUCWindow.ui" line="42"/>
+        <source>Your Nickname:</source>
+        <translation>El teu nick:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtJoinMUCWindow.ui" line="59"/>
+        <source>Room Password:</source>
+        <translation>Contrasenya de la sala:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtJoinMUCWindow.ui" line="71"/>
+        <source>Automatically configure newly created rooms</source>
+        <translation>Configurar automàticament sales de nova creació</translation>
+    </message>
+    <message>
         <source>Room:</source>
-        <translation>Sala:</translation>
+        <translation type="obsolete">Sala:</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtJoinMUCWindow.ui"/>
-        <location filename="../QtUI/ui_QtJoinMUCWindow.h" line="126"/>
+        <location filename="../QtUI/QtJoinMUCWindow.ui" line="35"/>
         <source>Search ...</source>
         <translation>Cercar ...</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtJoinMUCWindow.ui"/>
-        <location filename="../QtUI/ui_QtJoinMUCWindow.h" line="127"/>
         <source>Nickname:</source>
-        <translation>Nick:</translation>
+        <translation type="obsolete">Nick:</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtJoinMUCWindow.ui"/>
-        <location filename="../QtUI/ui_QtJoinMUCWindow.h" line="129"/>
+        <location filename="../QtUI/QtJoinMUCWindow.ui" line="106"/>
         <source>Enter automatically in future</source>
         <translation>Entrar automàticament en el futur</translation>
@@ -1015,30 +1438,25 @@
     <name>QtMUCSearchWindow</name>
     <message>
-        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.ui"/>
-        <location filename="../QtUI/MUCSearch/ui_QtMUCSearchWindow.h" line="118"/>
+        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.ui" line="14"/>
         <source>Search Room</source>
         <translation>Cercar Sala</translation>
     </message>
     <message>
-        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.ui"/>
-        <location filename="../QtUI/MUCSearch/ui_QtMUCSearchWindow.h" line="119"/>
+        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.ui" line="20"/>
         <source>Service:</source>
         <translation>Servei:</translation>
     </message>
     <message>
-        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.ui"/>
-        <location filename="../QtUI/MUCSearch/ui_QtMUCSearchWindow.h" line="121"/>
+        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.ui" line="74"/>
         <source>Cancel</source>
         <translation>Cancel·lar</translation>
     </message>
     <message>
-        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.ui"/>
-        <location filename="../QtUI/MUCSearch/ui_QtMUCSearchWindow.h" line="122"/>
+        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.ui" line="84"/>
         <source>OK</source>
         <translation>D&apos;acord</translation>
     </message>
     <message>
-        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.ui"/>
-        <location filename="../QtUI/MUCSearch/ui_QtMUCSearchWindow.h" line="123"/>
+        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.ui" line="96"/>
         <source>List rooms</source>
         <translation>Llistar sales</translation>
@@ -1092,30 +1510,25 @@ Si esculls ajornar aquesta elecció, se&apos;t preguntarà de nou la propera veg
     <name>QtUserSearchFieldsPage</name>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchFieldsPage.ui"/>
-        <location filename="../QtUI/UserSearch/ui_QtUserSearchFieldsPage.h" line="119"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchFieldsPage.ui" line="27"/>
         <source>Nickname:</source>
         <translation>Nick:</translation>
     </message>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchFieldsPage.ui"/>
-        <location filename="../QtUI/UserSearch/ui_QtUserSearchFieldsPage.h" line="120"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchFieldsPage.ui" line="37"/>
         <source>First name:</source>
         <translation>Nom:</translation>
     </message>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchFieldsPage.ui"/>
-        <location filename="../QtUI/UserSearch/ui_QtUserSearchFieldsPage.h" line="121"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchFieldsPage.ui" line="47"/>
         <source>Last name:</source>
         <translation>Cognom:</translation>
     </message>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchFieldsPage.ui"/>
-        <location filename="../QtUI/UserSearch/ui_QtUserSearchFieldsPage.h" line="122"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchFieldsPage.ui" line="57"/>
         <source>E-Mail:</source>
         <translation>Correu electrònic:</translation>
     </message>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchFieldsPage.ui"/>
-        <location filename="../QtUI/UserSearch/ui_QtUserSearchFieldsPage.h" line="124"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchFieldsPage.ui" line="74"/>
         <source>Fetching search fields</source>
         <translation>Obtenint camps de cerca</translation>
@@ -1125,30 +1538,25 @@ Si esculls ajornar aquesta elecció, se&apos;t preguntarà de nou la propera veg
     <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"/>
         <source>Add a user</source>
         <translation>Afegir un usuari</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"/>
         <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>
         <translation>Afegir a un altre usuari a la teva llista de contactes. Si coneixes la seva adreça, pots introduir-la directament, o pots buscar a l&apos;usuari.</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"/>
         <source>I know their address:</source>
         <translation>Conec la seva adreça:</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"/>
         <source>I&apos;d like to search my server</source>
         <translation>Vull buscar al meu servidor</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"/>
         <source>I&apos;d like to search another server:</source>
         <translation>Vull buscar a un altre servidor:</translation>
@@ -1168,4 +1576,12 @@ Si esculls ajornar aquesta elecció, se&apos;t preguntarà de nou la propera veg
 </context>
 <context>
+    <name>QtUserSearchResultsPage</name>
+    <message>
+        <location filename="../QtUI/UserSearch/QtUserSearchResultsPage.ui" line="27"/>
+        <source>No results.</source>
+        <translation>No hi ha resultats.</translation>
+    </message>
+</context>
+<context>
     <name>QtUserSearchWindow</name>
     <message>
@@ -1201,6 +1617,5 @@ Si esculls ajornar aquesta elecció, se&apos;t preguntarà de nou la propera veg
     <name>QtUserSearchWizard</name>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchWizard.ui"/>
-        <location filename="../QtUI/UserSearch/ui_QtUserSearchWizard.h" line="39"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchWizard.ui" line="14"/>
         <source>Find User</source>
         <translation>Buscar Usuari</translation>
@@ -1210,9 +1625,19 @@ Si esculls ajornar aquesta elecció, se&apos;t preguntarà de nou la propera veg
     <name>Swift::ChatListModel</name>
     <message>
-        <location filename="../QtUI/ChatList/ChatListModel.cpp" line="15"/>
+        <location filename="../QtUI/ChatList/ChatListModel.cpp" line="17"/>
         <source>Bookmarked Rooms</source>
         <translatorcomment>TMPFIX?</translatorcomment>
         <translation>Sales en Marcadors</translation>
     </message>
+    <message>
+        <location filename="../QtUI/ChatList/ChatListModel.cpp" line="18"/>
+        <source>Recent Chats</source>
+        <translation>Converses recents</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/ChatList/ChatListModel.cpp" line="20"/>
+        <source>Opened Whiteboards</source>
+        <translation>Pissarres obertes</translation>
+    </message>
 </context>
 <context>
@@ -1252,4 +1677,55 @@ Si esculls ajornar aquesta elecció, se&apos;t preguntarà de nou la propera veg
 </context>
 <context>
+    <name>Swift::QtAdHocCommandWindow</name>
+    <message>
+        <location filename="../QtUI/QtAdHocCommandWindow.cpp" line="36"/>
+        <source>Cancel</source>
+        <translation>Cancel·lar</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAdHocCommandWindow.cpp" line="39"/>
+        <source>Back</source>
+        <translation>Retrocedir</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAdHocCommandWindow.cpp" line="42"/>
+        <source>Next</source>
+        <translation>Següent</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAdHocCommandWindow.cpp" line="45"/>
+        <source>Complete</source>
+        <translation>Complet</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAdHocCommandWindow.cpp" line="86"/>
+        <source>Error: %1</source>
+        <translation>Error: %1</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAdHocCommandWindow.cpp" line="87"/>
+        <source>Warning: %1</source>
+        <translation>Avís: %1</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAdHocCommandWindow.cpp" line="104"/>
+        <source>Error executing command</source>
+        <translation>Error executant l&apos;ordre</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtAffiliationEditor</name>
+    <message>
+        <location filename="../QtUI/QtAffiliationEditor.cpp" line="48"/>
+        <source>Add User</source>
+        <translation>Afegir usuari</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAffiliationEditor.cpp" line="48"/>
+        <source>Added User&apos;s Address:</source>
+        <translation>Adreça de l&apos;usuari afegit:</translation>
+    </message>
+</context>
+<context>
     <name>Swift::QtAvatarWidget</name>
     <message>
@@ -1275,6 +1751,10 @@ Si esculls ajornar aquesta elecció, se&apos;t preguntarà de nou la propera veg
     <message>
         <location filename="../QtUI/QtAvatarWidget.cpp" line="81"/>
+        <source>Image Files (*.png *.jpg *.jpeg *.gif)</source>
+        <translation>Fitxers d&apos;imatge (*.png *.jpg *.jpeg *.gif)</translation>
+    </message>
+    <message>
         <source>Image Files (*.png *.jpg *.gif)</source>
-        <translation>Arxius d&apos;imatge (*.png *.jpg *.gif)</translation>
+        <translation type="obsolete">Arxius d&apos;imatge (*.png *.jpg *.gif)</translation>
     </message>
     <message>
@@ -1307,57 +1787,352 @@ Si esculls ajornar aquesta elecció, se&apos;t preguntarà de nou la propera veg
 </context>
 <context>
+    <name>Swift::QtCertificateViewerDialog</name>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="95"/>
+        <source>General</source>
+        <translation>General</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="96"/>
+        <source>Valid From</source>
+        <translation>Vàlid des de</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="97"/>
+        <source>Valid To</source>
+        <translation>Vàlid fins a</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="98"/>
+        <source>Serial Number</source>
+        <translation>Número de sèrie</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="99"/>
+        <source>Version</source>
+        <translation>Versió</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="101"/>
+        <source>Subject</source>
+        <translation>Subjecte</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="102"/>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="124"/>
+        <source>Organization</source>
+        <translation>Organització</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="103"/>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="125"/>
+        <source>Common Name</source>
+        <translation>Nom comú</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="104"/>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="126"/>
+        <source>Locality</source>
+        <translation>Localitat</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="105"/>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="127"/>
+        <source>Organizational Unit</source>
+        <translation>Unitat organitzativa</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="106"/>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="128"/>
+        <source>Country</source>
+        <translation>País</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="107"/>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="129"/>
+        <source>State</source>
+        <translation>Estat</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="110"/>
+        <source>Alternate Subject Names</source>
+        <translation>Noms de subjecte alternatius</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="115"/>
+        <source>E-mail Address</source>
+        <translation>Adreça de correu electrònic</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="117"/>
+        <source>DNS Name</source>
+        <translation>Nom DNS</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="123"/>
+        <source>Issuer</source>
+        <translation>Emissor</translation>
+    </message>
+</context>
+<context>
     <name>Swift::QtChatListWindow</name>
     <message>
-        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="62"/>
-        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="66"/>
+        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="82"/>
+        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="86"/>
         <source>Add New Bookmark</source>
         <translation>Afegir Nou Marcador</translation>
     </message>
     <message>
-        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="63"/>
+        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="83"/>
         <source>Edit Bookmark</source>
         <translation>Editar Marcador</translation>
     </message>
     <message>
-        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="64"/>
+        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="84"/>
         <source>Remove Bookmark</source>
         <translation>Eliminar Marcador</translation>
     </message>
+    <message>
+        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="173"/>
+        <source>Clear recents</source>
+        <translation>Esborrar recents</translation>
+    </message>
 </context>
 <context>
     <name>Swift::QtChatView</name>
     <message>
-        <location filename="../QtUI/QtChatView.cpp" line="61"/>
+        <location filename="../QtUI/QtChatView.cpp" line="73"/>
         <source>Clear log</source>
         <translation>Esborrar text</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtChatView.cpp" line="62"/>
+        <location filename="../QtUI/QtChatView.cpp" line="74"/>
         <source>You are about to clear the contents of your chat log.</source>
         <translation>Estas a punt d&apos;esborrar el contingut d&apos;aquesta conversa.</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtChatView.cpp" line="63"/>
+        <location filename="../QtUI/QtChatView.cpp" line="75"/>
         <source>Are you sure?</source>
         <translatorcomment>TMPFIX, genero?</translatorcomment>
         <translation>Estas segur?</translation>
     </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="219"/>
+        <source>%1 edited</source>
+        <translation>%1 editat</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="400"/>
+        <source>Waiting for other side to accept the transfer.</source>
+        <translation>Esperant a que l&apos;altra banda accepti la transferència.</translation>
+    </message>
+    <message>
+        <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>Cancel·lar</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="405"/>
+        <source>Negotiating...</source>
+        <translation>Negociant...</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="420"/>
+        <source>Transfer has been canceled!</source>
+        <translation>La transferència ha estat cancel·lada!</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="424"/>
+        <source>Transfer completed successfully.</source>
+        <translation>La transferència s&apos;ha completat amb èxit.</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="427"/>
+        <source>Transfer failed.</source>
+        <translation>La transferència ha fallat.</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="437"/>
+        <source>Started whiteboard chat</source>
+        <translation>S&apos;ha començat una conversa de pissarra</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="438"/>
+        <source>Show whiteboard</source>
+        <translation>Mostrar pissarra</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="440"/>
+        <source>Whiteboard chat has been canceled</source>
+        <translation>La conversa de pissarra ha estat cancel·lada</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="442"/>
+        <source>Whiteboard chat request has been rejected</source>
+        <translation>La sol·licitud de conversa de pissarra ha estat rebutjada</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="451"/>
+        <source>Return to room</source>
+        <translation>Tornar a la sala</translation>
+    </message>
 </context>
 <context>
     <name>Swift::QtChatWindow</name>
     <message>
-        <location filename="../QtUI/QtChatWindow.cpp" line="302"/>
+        <location filename="../QtUI/QtChatWindow.cpp" line="157"/>
+        <source>Correcting</source>
+        <translation>Corregint</translation>
+    </message>
+    <message>
+        <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>Aquesta conversa potser no sigui compatible amb la correcció de missatges. Si envies una correcció de tota manera, és possible que aparegui com un missatge duplicat</translation>
+    </message>
+    <message>
+        <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>Aquesta conversa no es compatible amb la correcció de missatges. Si envies una correcció de tota manera, es mostrarà com un missatge duplicat</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="546"/>
         <source>This message has not been received by your server yet.</source>
         <translation>Aquest missatge no ha sigut rebut pel teu servidor encara.</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtChatWindow.cpp" line="304"/>
+        <location filename="../QtUI/QtChatWindow.cpp" line="553"/>
         <source>This message may not have been transmitted.</source>
         <translation>Es possible que aquest missatge no s&apos;hagi transmès.</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtChatWindow.cpp" line="324"/>
+        <location filename="../QtUI/QtChatWindow.cpp" line="562"/>
+        <source>The receipt for this message has been received.</source>
+        <translation>S&apos;ha rebut la confirmació per aquest missatge.</translation>
+    </message>
+    <message>
+        <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>
+        <translatorcomment>Plural pain</translatorcomment>
+        <translation>Encara no s&apos;ha rebut la confirmació per aquest missatge. És possible que els destinataris no l&apos;hagin rebut.</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="613"/>
+        <source>Send file</source>
+        <translation>Enviar fitxer</translation>
+    </message>
+    <message>
+        <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>Cancel·lar</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="616"/>
+        <source>Set Description</source>
+        <translation>Establir descripció</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="617"/>
+        <source>Send</source>
+        <translation>Enviar</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="621"/>
+        <source>Receiving file</source>
+        <translation>Rebent fitxer</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="624"/>
+        <location filename="../QtUI/QtChatWindow.cpp" line="665"/>
+        <source>Accept</source>
+        <translation>Acceptar</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="659"/>
+        <source>Starting whiteboard chat</source>
+        <translation>Començant conversa de pissarra</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="663"/>
+        <source>%1 would like to start a whiteboard chat</source>
+        <translation>%1 vol començar una conversa de pissarra</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="700"/>
+        <source>File transfer description</source>
+        <translation>Descripció de la transferència de fitxer</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="701"/>
+        <source>Description:</source>
+        <translation>Descripció:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="715"/>
+        <source>Save File</source>
+        <translation>Guardar fitxer</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="908"/>
+        <source>Change subject…</source>
+        <translation>Canviar el tema...</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="909"/>
+        <source>Configure room…</source>
+        <translation>Configurar sala...</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="910"/>
+        <source>Edit affiliations…</source>
+        <translation>Editar afiliacions...</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="911"/>
+        <source>Destroy room</source>
+        <translation>Destruir la sala</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="912"/>
+        <source>Invite person to this room…</source>
+        <translation>Convidar a una persona a aquesta sala...</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="922"/>
+        <source>Change room subject</source>
+        <translation>Canviar el tema de la sala</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="922"/>
+        <source>New subject:</source>
+        <translation>Nou tema:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="940"/>
+        <source>Confirm room destruction</source>
+        <translation>Confirmar destrucció de la sala</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="941"/>
+        <source>Are you sure you want to destroy the room?</source>
+        <translation>Estàs segur de que vols destruir la sala?</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="942"/>
+        <source>This will destroy the room.</source>
+        <translation>Això destruirà la sala.</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="993"/>
+        <source>Accept Invite</source>
+        <translation>Acceptar invitació</translation>
+    </message>
+    <message>
         <source>Couldn&apos;t send message: %1</source>
-        <translation>No s&apos;ha pogut enviar el missatge: %1</translation>
+        <translation type="obsolete">No s&apos;ha pogut enviar el missatge: %1</translation>
     </message>
 </context>
@@ -1365,15 +2140,15 @@ Si esculls ajornar aquesta elecció, se&apos;t preguntarà de nou la propera veg
     <name>Swift::QtContactEditWidget</name>
     <message>
-        <location filename="../QtUI/QtContactEditWidget.cpp" line="28"/>
+        <location filename="../QtUI/QtContactEditWidget.cpp" line="122"/>
         <source>Name:</source>
         <translation>Nom:</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtContactEditWidget.cpp" line="34"/>
+        <location filename="../QtUI/QtContactEditWidget.cpp" line="42"/>
         <source>Groups:</source>
         <translation>Grups:</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtContactEditWidget.cpp" line="56"/>
+        <location filename="../QtUI/QtContactEditWidget.cpp" line="65"/>
         <source>New Group:</source>
         <translation>Nou Grup:</translation>
@@ -1383,30 +2158,30 @@ Si esculls ajornar aquesta elecció, se&apos;t preguntarà de nou la propera veg
     <name>Swift::QtContactEditWindow</name>
     <message>
-        <location filename="../QtUI/QtContactEditWindow.cpp" line="26"/>
+        <location filename="../QtUI/QtContactEditWindow.cpp" line="28"/>
         <source>Edit contact</source>
         <translation>Editar contacte</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtContactEditWindow.cpp" line="41"/>
+        <location filename="../QtUI/QtContactEditWindow.cpp" line="43"/>
         <source>Remove contact</source>
         <translation>Eliminar contacte</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtContactEditWindow.cpp" line="44"/>
+        <location filename="../QtUI/QtContactEditWindow.cpp" line="46"/>
         <source>OK</source>
         <translation>D&apos;acord</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtContactEditWindow.cpp" line="82"/>
+        <location filename="../QtUI/QtContactEditWindow.cpp" line="94"/>
         <source>Confirm contact deletion</source>
         <translation>Confirmar eliminació del contacte</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtContactEditWindow.cpp" line="83"/>
+        <location filename="../QtUI/QtContactEditWindow.cpp" line="95"/>
         <source>Are you sure you want to delete this contact?</source>
         <translation>Segur que vols eliminar aquest contacte?</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtContactEditWindow.cpp" line="84"/>
+        <location filename="../QtUI/QtContactEditWindow.cpp" line="96"/>
         <source>This will remove the contact &apos;%1&apos; from all groups they may be in.</source>
         <translation>Això eliminarà el contacte &apos;%1&apos; de tots els grups als que estigui.</translation>
@@ -1416,5 +2191,5 @@ Si esculls ajornar aquesta elecció, se&apos;t preguntarà de nou la propera veg
     <name>Swift::QtEventWindow</name>
     <message>
-        <location filename="../QtUI/EventViewer/QtEventWindow.cpp" line="47"/>
+        <location filename="../QtUI/EventViewer/QtEventWindow.cpp" line="48"/>
         <source>Display Notice</source>
         <translation>Mostrar Avís</translation>
@@ -1422,7 +2197,42 @@ Si esculls ajornar aquesta elecció, se&apos;t preguntarà de nou la propera veg
 </context>
 <context>
+    <name>Swift::QtFileTransferListWidget</name>
+    <message>
+        <location filename="../QtUI/QtFileTransferListWidget.cpp" line="39"/>
+        <source>Clear Finished Transfers</source>
+        <translation>Esborrar transferències finalitzades</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListWidget.cpp" line="44"/>
+        <source>File Transfer List</source>
+        <translation>Llista de transferència de fitxers</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtHistoryWindow</name>
+    <message>
+        <location filename="../QtUI/QtHistoryWindow.cpp" line="57"/>
+        <source>History</source>
+        <translation>Historial</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>
+        <translatorcomment>conversa o sala?</translatorcomment>
+        <translation>Usuaris per convidar a aquesta conversa (un per línia):</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>Si vols proporcionar un motiu per la invitació, el pots introduir aquí</translation>
+    </message>
+</context>
+<context>
     <name>Swift::QtJoinMUCWindow</name>
     <message>
-        <location filename="../QtUI/QtJoinMUCWindow.cpp" line="15"/>
+        <location filename="../QtUI/QtJoinMUCWindow.cpp" line="19"/>
         <source>someroom@rooms.example.com</source>
         <translation>algunasala@sales.exemple.com</translation>
@@ -1432,53 +2242,53 @@ Si esculls ajornar aquesta elecció, se&apos;t preguntarà de nou la propera veg
     <name>Swift::QtLoginWindow</name>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="81"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="92"/>
         <source>User address:</source>
         <translation>Adreça d&apos;usuari:</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="86"/>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="87"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="97"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="98"/>
         <source>User address - looks like someuser@someserver.com</source>
         <translation>Adreça d&apos;usuari - Semblant a usuari@algunservidor.com</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="91"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="102"/>
         <source>Example: alice@wonderland.lit</source>
         <translation>Exemple: alicia@paismeravelles.lit</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="97"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="108"/>
         <source>Password:</source>
         <translation>Contrasenya:</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="118"/>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="119"/>
+        <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>Fes click si tens un certificat personal per connectar al servei.</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="125"/>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="299"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="136"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="353"/>
         <source>Connect</source>
         <translation>Connectar</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="136"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="154"/>
         <source>Remember Password?</source>
         <translation>Recordar Contrasenya?</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="138"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="156"/>
         <source>Login Automatically?</source>
         <translation>Connectar Automàticament?</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="150"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="168"/>
         <source>&amp;Swift</source>
         <translation>&amp;Swift</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="152"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="170"/>
         <source>&amp;General</source>
         <translatorcomment>TMPFIX, used where?</translatorcomment>
@@ -1486,67 +2296,94 @@ Si esculls ajornar aquesta elecció, se&apos;t preguntarà de nou la propera veg
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="160"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="178"/>
         <source>&amp;About %1</source>
         <translation>&amp;Sobre %1</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="165"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="183"/>
         <source>&amp;Show Debug Console</source>
         <translation>&amp;Mostrar Consola de Depuració</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="169"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="188"/>
+        <source>Show &amp;File Transfer Overview</source>
+        <translatorcomment>VERY long. Alternative &quot;Mostrar llista de transferències&quot;</translatorcomment>
+        <translation>Mostrar vista general de transferència de &amp;fitxers</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="193"/>
         <source>&amp;Play Sounds</source>
         <translation>&amp;Reproduir Sons</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="175"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="199"/>
         <source>Display Pop-up &amp;Notifications</source>
         <translation>Mostrar &amp;Notificacions Emergents</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="190"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="211"/>
         <source>&amp;Quit</source>
         <translation>&amp;Sortir</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="205"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="253"/>
         <source>Remove profile</source>
         <translation>Eliminar perfil</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="205"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="253"/>
         <source>Remove the profile &apos;%1&apos;?</source>
         <translation>Eliminar el perfil &apos;%1&apos;?</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="299"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="353"/>
         <source>Cancel</source>
         <translation>Cancel·lar</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="320"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="367"/>
+        <source>Confirm terms of use</source>
+        <translation>Confirmar condicions d&apos;ús</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="410"/>
         <source>Select an authentication certificate</source>
         <translation>Selecciona un certificat d&apos;autenticació</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="420"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="410"/>
+        <source>P12 files (*.cert *.p12 *.pfx);;All files (*.*)</source>
+        <translation>Fitxers P12 (*.cert *.p12 *.pfx);;Tots els fitxers (*.*)</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="523"/>
         <source>The certificate presented by the server is not valid.</source>
         <translation>El certificat presentat pel servidor no es vàlid.</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="421"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="524"/>
         <source>Would you like to permanently trust this certificate? This must only be done if you know it is correct.</source>
         <translation>Vols confiar en aquest certificat de forma permanent? Això s&apos;ha de fer només si saps que es correcte.</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="423"/>
         <source>Subject: %1</source>
-        <translation>Subjecte: %1</translation>
+        <translation type="obsolete">Subjecte: %1</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="424"/>
         <source>SHA-1 Fingerprint: %1</source>
-        <translation>Empremta digital SHA-1: %1</translation>
+        <translation type="obsolete">Empremta digital SHA-1: %1</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtMUCConfigurationWindow</name>
+    <message>
+        <location filename="../QtUI/QtMUCConfigurationWindow.cpp" line="34"/>
+        <source>Cancel</source>
+        <translation>Cancel·lar</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMUCConfigurationWindow.cpp" line="37"/>
+        <source>OK</source>
+        <translation>D&apos;acord</translation>
     </message>
 </context>
@@ -1563,16 +2400,16 @@ Si esculls ajornar aquesta elecció, se&apos;t preguntarà de nou la propera veg
     <name>Swift::QtMainWindow</name>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="64"/>
+        <location filename="../QtUI/QtMainWindow.cpp" line="79"/>
         <source>&amp;Contacts</source>
         <translation>&amp;Contactes</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="71"/>
-        <location filename="../QtUI/QtMainWindow.cpp" line="137"/>
+        <location filename="../QtUI/QtMainWindow.cpp" line="88"/>
+        <location filename="../QtUI/QtMainWindow.cpp" line="205"/>
         <source>&amp;Notices</source>
         <translation>Av&amp;isos</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="72"/>
+        <location filename="../QtUI/QtMainWindow.cpp" line="87"/>
         <source>C&amp;hats</source>
         <translatorcomment>TMPFIX? Kev said &quot;conversations&quot; context</translatorcomment>
@@ -1580,49 +2417,84 @@ Si esculls ajornar aquesta elecció, se&apos;t preguntarà de nou la propera veg
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="76"/>
+        <location filename="../QtUI/QtMainWindow.cpp" line="96"/>
         <source>&amp;View</source>
         <translation>&amp;Veure</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="78"/>
+        <location filename="../QtUI/QtMainWindow.cpp" line="98"/>
         <source>&amp;Show offline contacts</source>
         <translation>&amp;Mostrar contactes desconnectats</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="84"/>
+        <location filename="../QtUI/QtMainWindow.cpp" line="106"/>
+        <source>&amp;Show Emoticons</source>
+        <translation>&amp;Mostrar emoticones</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="120"/>
         <source>&amp;Actions</source>
         <translation>&amp;Accions</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="86"/>
-        <source>Edit &amp;Profile</source>
-        <translation>Editar &amp;Perfil</translation>
+        <location filename="../QtUI/QtMainWindow.cpp" line="122"/>
+        <source>Edit &amp;Profile…</source>
+        <translation>Editar &amp;Perfil…</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="125"/>
+        <source>Enter &amp;Room…</source>
+        <translation>Entrar a &amp;Sala…</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="89"/>
-        <source>Enter &amp;Room</source>
-        <translation>Entrar a &amp;Sala</translation>
+        <location filename="../QtUI/QtMainWindow.cpp" line="129"/>
+        <source>&amp;View History…</source>
+        <translation>&amp;Veure historial...</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="92"/>
-        <source>&amp;Add Contact</source>
-        <translation>&amp;Afegir Contacte</translation>
+        <location filename="../QtUI/QtMainWindow.cpp" line="133"/>
+        <source>&amp;Add Contact…</source>
+        <translation>&amp;Afegir Contacte…</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="95"/>
-        <source>&amp;Edit Selected Contact</source>
-        <translation>&amp;Editar Contacte Sel·leccionat</translation>
+        <location filename="../QtUI/QtMainWindow.cpp" line="136"/>
+        <source>&amp;Edit Selected Contact…</source>
+        <translation>&amp;Editar Contacte Sel·leccionat…</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="99"/>
-        <source>Start &amp;Chat</source>
-        <translation>Començar &amp;Conversa</translation>
+        <location filename="../QtUI/QtMainWindow.cpp" line="140"/>
+        <source>Start &amp;Chat…</source>
+        <translation>Començar &amp;Conversa...</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="103"/>
+        <location filename="../QtUI/QtMainWindow.cpp" line="143"/>
+        <source>Run Server Command</source>
+        <translation>Executar ordre de servidor</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="146"/>
         <source>&amp;Sign Out</source>
         <translation>&amp;Desconnectar</translation>
     </message>
     <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="150"/>
+        <source>&amp;Request Delivery Receipts</source>
+        <translation>&amp;Demanar confirmació de lliurament</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="161"/>
+        <source>Collecting commands...</source>
+        <translation>Recopilant ordres...</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="216"/>
+        <source>&amp;Chats</source>
+        <translation>C&amp;onverses</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="339"/>
+        <source>No Available Commands</source>
+        <translation>No hi ha ordres disponibles</translation>
+    </message>
+    <message>
         <source>Notices</source>
         <translatorcomment>TMPFIX, used?</translatorcomment>
@@ -1633,20 +2505,20 @@ Si esculls ajornar aquesta elecció, se&apos;t preguntarà de nou la propera veg
     <name>Swift::QtNameWidget</name>
     <message>
-        <location filename="../QtUI/QtNameWidget.cpp" line="47"/>
+        <location filename="../QtUI/QtNameWidget.cpp" line="48"/>
         <source>Show Nickname</source>
         <translation>Mostrar Nick</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtNameWidget.cpp" line="47"/>
+        <location filename="../QtUI/QtNameWidget.cpp" line="48"/>
         <source>(No Nickname Set)</source>
         <translation>(Sense Nick Definit)</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtNameWidget.cpp" line="55"/>
+        <location filename="../QtUI/QtNameWidget.cpp" line="56"/>
         <source>Show Address</source>
         <translation>Mostrar Adreça</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtNameWidget.cpp" line="62"/>
+        <location filename="../QtUI/QtNameWidget.cpp" line="63"/>
         <source>Edit Profile</source>
         <translation>Editar Perfil</translation>
@@ -1654,4 +2526,42 @@ Si esculls ajornar aquesta elecció, se&apos;t preguntarà de nou la propera veg
 </context>
 <context>
+    <name>Swift::QtOccupantListWidget</name>
+    <message>
+        <location filename="../QtUI/Roster/QtOccupantListWidget.cpp" line="46"/>
+        <source>No actions for this user</source>
+        <translation>No hi ha accions per aquest usuari</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtOccupantListWidget.cpp" line="55"/>
+        <source>Kick user</source>
+        <translation>Expulsar usuari</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtOccupantListWidget.cpp" line="56"/>
+        <source>Kick and ban user</source>
+        <translation>Expulsar i vetar usuari</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtOccupantListWidget.cpp" line="57"/>
+        <source>Make moderator</source>
+        <translation>Fer moderador</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtOccupantListWidget.cpp" line="58"/>
+        <source>Make participant</source>
+        <translation>Fer participant</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtOccupantListWidget.cpp" line="59"/>
+        <source>Remove voice</source>
+        <translation>Treure la veu</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtOccupantListWidget.cpp" line="60"/>
+        <source>Add to contacts</source>
+        <translation>Afegir a contactes</translation>
+    </message>
+</context>
+<context>
     <name>Swift::QtProfileWindow</name>
     <message>
@@ -1672,4 +2582,56 @@ Si esculls ajornar aquesta elecció, se&apos;t preguntarà de nou la propera veg
 </context>
 <context>
+    <name>Swift::QtRosterHeader</name>
+    <message>
+        <location filename="../QtUI/QtRosterHeader.cpp" line="59"/>
+        <source>Connection is secured</source>
+        <translation>La connexió és segura</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtRosterWidget</name>
+    <message>
+        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="58"/>
+        <source>Edit…</source>
+        <translation>Editar...</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="59"/>
+        <source>Remove</source>
+        <translation>Eliminar</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="63"/>
+        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="83"/>
+        <source>Send File</source>
+        <translation>Enviar fitxer</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="69"/>
+        <source>Start Whiteboard Chat</source>
+        <translation>Començar conversa de pissarra</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="83"/>
+        <source>All Files (*);;</source>
+        <translation>Tots els fitxers (*);;</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="96"/>
+        <source>Rename</source>
+        <translation>Canviar el nom</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="106"/>
+        <source>Rename group</source>
+        <translation>Canviar el nom al grup</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="106"/>
+        <source>Enter a new name for group &apos;%1&apos;:</source>
+        <translation>Introdueix un nom nou pel grup &apos;%1&apos;:</translation>
+    </message>
+</context>
+<context>
     <name>Swift::QtStatusWidget</name>
     <message>
@@ -1679,5 +2641,5 @@ Si esculls ajornar aquesta elecció, se&apos;t preguntarà de nou la propera veg
     </message>
     <message>
-        <location filename="../QtUI/QtStatusWidget.cpp" line="263"/>
+        <location filename="../QtUI/QtStatusWidget.cpp" line="261"/>
         <source>(No message)</source>
         <translation>(Sense missatge)</translation>
@@ -1701,5 +2663,5 @@ Si esculls ajornar aquesta elecció, se&apos;t preguntarà de nou la propera veg
         <source>You have already replied to this request</source>
         <translatorcomment>TMPFIX, used where?</translatorcomment>
-        <translation>Ja has respost a aquesta petició</translation>
+        <translation>Ja has respost a aquesta sol·licitud</translation>
     </message>
     <message>
@@ -1714,10 +2676,10 @@ Si esculls ajornar aquesta elecció, se&apos;t preguntarà de nou la propera veg
     </message>
     <message>
-        <location filename="../QtUI/QtSubscriptionRequestWindow.cpp" line="32"/>
+        <location filename="../QtUI/QtSubscriptionRequestWindow.cpp" line="33"/>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtSubscriptionRequestWindow.cpp" line="34"/>
+        <location filename="../QtUI/QtSubscriptionRequestWindow.cpp" line="35"/>
         <source>Defer</source>
         <translatorcomment>TMPFIX: deixar per despres?</translatorcomment>
@@ -1728,27 +2690,22 @@ Si esculls ajornar aquesta elecció, se&apos;t preguntarà de nou la propera veg
     <name>Swift::QtTreeWidget</name>
     <message>
-        <location filename="../QtUI/Roster/QtTreeWidget.cpp" line="144"/>
         <source>Edit</source>
-        <translation>Editar</translation>
+        <translation type="obsolete">Editar</translation>
     </message>
     <message>
-        <location filename="../QtUI/Roster/QtTreeWidget.cpp" line="145"/>
         <source>Remove</source>
-        <translation>Eliminar</translation>
+        <translation type="obsolete">Eliminar</translation>
     </message>
     <message>
-        <location filename="../QtUI/Roster/QtTreeWidget.cpp" line="157"/>
         <source>Rename</source>
-        <translation>Renombrar</translation>
+        <translation type="obsolete">Renombrar</translation>
     </message>
     <message>
-        <location filename="../QtUI/Roster/QtTreeWidget.cpp" line="167"/>
         <source>Rename group</source>
-        <translation>Renombrar grup</translation>
+        <translation type="obsolete">Renombrar grup</translation>
     </message>
     <message>
-        <location filename="../QtUI/Roster/QtTreeWidget.cpp" line="167"/>
         <source>Enter a new name for group &apos;%1&apos;:</source>
-        <translation>Introdueix un nom nou pel grup %1:</translation>
+        <translation type="obsolete">Introdueix un nom nou pel grup %1:</translation>
     </message>
     <message>
@@ -1760,5 +2717,5 @@ Si esculls ajornar aquesta elecció, se&apos;t preguntarà de nou la propera veg
     <name>Swift::QtUserSearchDetailsPage</name>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchDetailsPage.cpp" line="17"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchDetailsPage.cpp" line="22"/>
         <source>Please choose a name for the contact, and select the groups you want to add the contact to.</source>
         <translatorcomment>Somewhat free translation. TMPFIX?</translatorcomment>
@@ -1787,35 +2744,35 @@ Si esculls ajornar aquesta elecció, se&apos;t preguntarà de nou la propera veg
     <name>Swift::QtUserSearchWindow</name>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="32"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="35"/>
         <source>Add Contact</source>
         <translation>Afegir Contacte</translation>
     </message>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="32"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="35"/>
         <source>Chat to User</source>
         <translation>Conversar amb Usuari</translation>
     </message>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="43"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="45"/>
         <source>alice@wonderland.lit</source>
         <translation>alicia@paismeravelles.lit</translation>
     </message>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="223"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="296"/>
         <source>How would you like to find the user to add?</source>
         <translation>Com vols buscar a l&apos;usuari al que afegir?</translation>
     </message>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="226"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="299"/>
         <source>How would you like to find the user to chat to?</source>
         <translation>Com vols buscar a l&apos;usuari amb el qual conversar?</translation>
     </message>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="251"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="326"/>
         <source>Error while searching</source>
         <translation>Error durant la cerca</translation>
     </message>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="257"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="332"/>
         <source>This server doesn&apos;t support searching for users.</source>
         <translation>Aquest servidor no suporta cerca d&apos;usuaris.</translation>
@@ -1825,8 +2782,26 @@ Si esculls ajornar aquesta elecció, se&apos;t preguntarà de nou la propera veg
     <name>Swift::QtWebView</name>
     <message>
-        <location filename="../QtUI/QtWebView.cpp" line="61"/>
+        <location filename="../QtUI/QtWebView.cpp" line="66"/>
         <source>Clear</source>
         <translation>Esborrar text</translation>
     </message>
+    <message>
+        <location filename="../QtUI/QtWebView.cpp" line="67"/>
+        <source>Increase font size</source>
+        <translation>Augmentar la mida de la lletra</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtWebView.cpp" line="68"/>
+        <source>Decrease font size</source>
+        <translation>Reduir la mida de la lletra</translation>
+    </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>Tancar la finestra es equivalent a tancar la sessió. Estàs segur de que vols fer això?</translation>
+    </message>
 </context>
 <context>
@@ -1853,10 +2828,10 @@ Si esculls ajornar aquesta elecció, se&apos;t preguntarà de nou la propera veg
     </message>
     <message>
-        <location filename="../QtUI/QtXMLConsoleWidget.cpp" line="75"/>
+        <location filename="../QtUI/QtXMLConsoleWidget.cpp" line="78"/>
         <source>&lt;!-- IN --&gt;</source>
         <translation>&lt;!-- ENTRANT --&gt;</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtXMLConsoleWidget.cpp" line="79"/>
+        <location filename="../QtUI/QtXMLConsoleWidget.cpp" line="82"/>
         <source>&lt;!-- OUT --&gt;</source>
         <translation>&lt;!-- SORTINT --&gt;</translation>
diff --git a/Swift/Translations/swift_cs.ts b/Swift/Translations/swift_cs.ts
new file mode 100644
index 0000000..314cd60
--- /dev/null
+++ b/Swift/Translations/swift_cs.ts
@@ -0,0 +1,2867 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="cs_CZ">
+<defaultcodec>UTF-8</defaultcodec>
+<context>
+    <name></name>
+    <message>
+        <location filename="../Controllers/Chat/ChatController.cpp" line="59"/>
+        <source>Starting chat with %1% in chatroom %2%</source>
+        <translation>Začíná chat s %1% v místnosti %2%</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatController.cpp" line="62"/>
+        <source>Starting chat with %1% - %2%</source>
+        <translation>Začíná chat s %1% - %2%</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatController.cpp" line="202"/>
+        <source>This chat doesn&apos;t support delivery receipts.</source>
+        <translation>Tento chat nepodporuje doručenky.</translation>
+    </message>
+    <message>
+        <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 chat nemusí podporovat doručenky. Je možné, že k odeslaným zprávam nedostanete potvrzení o doručení.</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatController.cpp" line="216"/>
+        <location filename="../Controllers/FileTransfer/FileTransferController.cpp" line="42"/>
+        <source>me</source>
+        <translation>já</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatController.cpp" line="324"/>
+        <source>%1% has gone offline</source>
+        <translation>%1% je odteď offline</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatController.cpp" line="328"/>
+        <source>%1% has become available</source>
+        <translation>%1% je odteď online</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatController.cpp" line="330"/>
+        <source>%1% has gone away</source>
+        <translation>%1% je odteď pryč</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatController.cpp" line="332"/>
+        <source>%1% is now busy</source>
+        <translation>%1% odteď nemá čas</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="74"/>
+        <source>The day is now %1%</source>
+        <translation>Nyní je %1%</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="209"/>
+        <source>Couldn&apos;t send message: %1%</source>
+        <translation>Zprávu sa nepodařilo odeslat: %1%</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="269"/>
+        <source>Error sending message</source>
+        <translation>Chyba při posílání zprávy</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="275"/>
+        <source>Bad request</source>
+        <translation>Nesprávný požadavek</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="276"/>
+        <source>Conflict</source>
+        <translation>Konflikt</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="277"/>
+        <source>This feature is not implemented</source>
+        <translation>Tato vlastnost není implementovaná</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="278"/>
+        <source>Forbidden</source>
+        <translation>Zakázané</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="279"/>
+        <source>Recipient can no longer be contacted</source>
+        <translation>Příjemce už není možné kontaktovat</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="280"/>
+        <source>Internal server error</source>
+        <translation>Vnitřní chyba serveru</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="281"/>
+        <source>Item not found</source>
+        <translation>Položka nebyla nalezena</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="282"/>
+        <source>JID Malformed</source>
+        <translation>Nesprávný tvar JID</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="283"/>
+        <source>Message was rejected</source>
+        <translation>Zpráva byla odmítnuta</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="284"/>
+        <source>Not allowed</source>
+        <translation>Nepovolené</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="285"/>
+        <source>Not authorized</source>
+        <translation>Neautorizované</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="286"/>
+        <source>Payment is required</source>
+        <translation>Vyžadována platba</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="287"/>
+        <source>Recipient is unavailable</source>
+        <translation>Příjemce je nedostupný</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="288"/>
+        <source>Redirect</source>
+        <translation>Přesměrování</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="289"/>
+        <source>Registration required</source>
+        <translation>Vyžadována registrace</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="290"/>
+        <source>Recipient&apos;s server not found</source>
+        <translation>Server příjemce nenalezen</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="291"/>
+        <source>Remote server timeout</source>
+        <translatorcomment>správny význam?</translatorcomment>
+        <translation>Vypršel čas pro připojení ke vzdálenému serveru</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="292"/>
+        <source>The server is low on resources</source>
+        <translation>Server má nedostatek zdrojů</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="293"/>
+        <source>The service is unavailable</source>
+        <translation>Služba není dostupná</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="294"/>
+        <source>A subscription is required</source>
+        <translation>Vyžadováno přihlášení k odběru</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="295"/>
+        <source>Undefined condition</source>
+        <translation>Nedefinovaná podmínka</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="296"/>
+        <source>Unexpected request</source>
+        <translation>Neočekávaný požadavek</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="222"/>
+        <source>Room %1% is not responding. This operation may never complete.</source>
+        <translation>Místnost %1% neodpovídá. Tato operace nemusí nikdy skončit.</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="233"/>
+        <source>Unable to enter this room</source>
+        <translation>Nepodařilo sa vstoupit do místnosti</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="239"/>
+        <source>Unable to enter this room as %1%, retrying as %2%</source>
+        <translation>Nepodařilo se vstoupit do místnosti jako %1%, znovu opakováno jako %2%</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="243"/>
+        <source>No nickname specified</source>
+        <translation>Nezadána přezdívka</translation>
+    </message>
+    <message>
+        <source>A password needed</source>
+        <translation type="obsolete">Je vyžadováno heslo</translation>
+    </message>
+    <message>
+        <source>A password is needed</source>
+        <translation type="obsolete">Je vyžadováno heslo</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="251"/>
+        <source>Only members may enter</source>
+        <translation>Vstoupit mohou pouze členové</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="255"/>
+        <source>You are banned from the room</source>
+        <translation>Máte zakázáno vstoupit do místnosti</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="259"/>
+        <source>The room is full</source>
+        <translation>Místnost je plná</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="263"/>
+        <source>The room does not exist</source>
+        <translation>Místnost neexistuje</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="269"/>
+        <source>Couldn&apos;t join room: %1%.</source>
+        <translation>Nepodařilo se vstoupit do místnosti: %1%.</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="281"/>
+        <source>You have entered room %1% as %2%.</source>
+        <translation>Vstoupil jste do místnosti %1% jako %2%.</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="332"/>
+        <source>%1% has entered the room as a %2%.</source>
+        <translation>%1% vstoupil do místnosti jako %2%.</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="335"/>
+        <source>%1% has entered the room.</source>
+        <translation>%1% vstoupil do místnosti.</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="384"/>
+        <source>moderator</source>
+        <translation>moderátor</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="385"/>
+        <source>participant</source>
+        <translation>účastník</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="386"/>
+        <source>visitor</source>
+        <translation>návštěvník</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="436"/>
+        <source>The room subject is now: %1%</source>
+        <translation>Předmět místnosti je: %1%</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="470"/>
+        <source>%1% is now a %2%</source>
+        <translation>%1% je nyní %2%</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="486"/>
+        <source>Moderators</source>
+        <translation>Moderátoři</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="487"/>
+        <source>Participants</source>
+        <translation>Účastníci</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="488"/>
+        <source>Visitors</source>
+        <translation>Návštěvníci</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="489"/>
+        <source>Occupants</source>
+        <translation>Ostatní uživatelé</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="503"/>
+        <source>Trying to enter room %1%</source>
+        <translation>Vstupování do místnonsti %1%</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="544"/>
+        <source>%1% has left the room %2%</source>
+        <translation>%1% opustil místnost %2%</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="548"/>
+        <source>You have been kicked out of the room</source>
+        <translation>Byl jste vyhozen z místnosti</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="549"/>
+        <source>You have been banned from the room</source>
+        <translation>Byl vám zakázán vstup do místnosti</translation>
+    </message>
+    <message>
+        <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ž nejste členem místnosti a vaše členství bylo odebráno</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="551"/>
+        <source>The room has been destroyed</source>
+        <translation>Místnost byla odstraněna</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="667"/>
+        <source>%1% has left the room</source>
+        <translation>%1% opustil místnost</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="553"/>
+        <source>You have left the room</source>
+        <translation>Opustili jste místnost</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="247"/>
+        <source>The correct room password is needed</source>
+        <translation>Je požadováno heslo pro přístup do místnosti</translation>
+    </message>
+    <message>
+        <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="656"/>
+        <source>%1% have entered the room</source>
+        <translation>%1% vstoupil do místnosti</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="659"/>
+        <source>%1% has entered the room</source>
+        <translation>%1% vstoupil do místnosti</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="664"/>
+        <source>%1% have left the room</source>
+        <translation>%1% opustil místnost</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="672"/>
+        <source>%1% have entered then left the room</source>
+        <translation>%1% vstoupil a potom opustil místnost</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="675"/>
+        <source>%1% has entered then left the room</source>
+        <translation>%1% vstoupil a potom opustil místnost</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="680"/>
+        <source>%1% have left then returned to the room</source>
+        <translation>%1% opustil místnost a potom se vrátil</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="683"/>
+        <source>%1% has left then returned to the room</source>
+        <translation>%1% opustil  místnost a potom se vrátil</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="719"/>
+        <source>Room configuration failed: %1%.</source>
+        <translation>Nepodařilo se nastavit místnost: %1%.</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="725"/>
+        <source>Occupant role change failed: %1%.</source>
+        <translation>Nepodařilo se změnit roli pro uživatele: %1%.</translation>
+    </message>
+    <message>
+        <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 přidat do seznamu kontaktů</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/EventNotifier.cpp" line="63"/>
+        <source>Error</source>
+        <translation>Chyba</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/EventNotifier.cpp" line="67"/>
+        <source>%1% has invited you to enter the %2% room</source>
+        <translation>%1% vás pozval do místnosti %2%</translation>
+    </message>
+    <message>
+        <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>Adresa uživatele je neplatná. Adresa uživatele by měla být ve tvaru &apos;alice@wonderland.lit&apos;</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="567"/>
+        <source>Unknown Error</source>
+        <translation>Neznámá chyba</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="568"/>
+        <source>Unable to find server</source>
+        <translation>Nepodařilo se najít server</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="569"/>
+        <source>Error connecting to server</source>
+        <translation>Chyba při připojení k serveru</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="570"/>
+        <source>Error while receiving server data</source>
+        <translation>Chyba při přijímání dat ze serveru</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="571"/>
+        <source>Error while sending data to the server</source>
+        <translation>Chyba při odesílání dat na server</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="572"/>
+        <source>Error parsing server data</source>
+        <translation>Chyba při zpracování dat ze serveru</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="573"/>
+        <source>Login/password invalid</source>
+        <translation>Přihlašovací jméno nebo heslo je neplatné</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="574"/>
+        <source>Error while compressing stream</source>
+        <translation>Chyba při kompresi dat</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="575"/>
+        <source>Server verification failed</source>
+        <translation>Ověření serveru selhalo</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="576"/>
+        <source>Authentication mechanisms not supported</source>
+        <translation>Ověřovací mechanismus není podporován</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="577"/>
+        <source>Unexpected response</source>
+        <translation>Neočekávaná odpověď</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="578"/>
+        <source>Error binding resource</source>
+        <translation>Chyba při napojení zdroje</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="579"/>
+        <source>Error starting session</source>
+        <translation>Chyba při zahajování sezení</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="580"/>
+        <source>Stream error</source>
+        <translation>Chyba dat</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="581"/>
+        <source>Encryption error</source>
+        <translation>Chyba šifrování</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="582"/>
+        <source>Error loading certificate (Invalid password?)</source>
+        <translation>Chyba při načítání certifikátu (nesprávné heslo?)</translation>
+    </message>
+    <message>
+        <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="584"/>
+        <source>Certificate card removed</source>
+        <translation>Karta s certifikátem odstraněna</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="586"/>
+        <source>Unknown certificate</source>
+        <translation>Neznámý certifikát</translation>
+    </message>
+    <message>
+        <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="588"/>
+        <source>Certificate is not yet valid</source>
+        <translation>Certifikát ještě není platný</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="589"/>
+        <source>Certificate is self-signed</source>
+        <translation>Certifikát je podepsaný sám sebou</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="590"/>
+        <source>Certificate has been rejected</source>
+        <translation>Certifikát byl odmítnut</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="591"/>
+        <source>Certificate is not trusted</source>
+        <translation>Certifikát není důvěryhodný</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="592"/>
+        <source>Certificate cannot be used for encrypting your connection</source>
+        <translation>Certifikát nemůže být použit pro šifrování spojení</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="593"/>
+        <source>Certificate path length constraint exceeded</source>
+        <translation>Překročena délka cesty certifikátu</translation>
+    </message>
+    <message>
+        <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="595"/>
+        <source>Invalid Certificate Authority</source>
+        <translation>Neplatná certifikační autorita</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="596"/>
+        <source>Certificate does not match the host identity</source>
+        <translation>Certifikát sa neshoduje s identitou hostitele</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="597"/>
+        <source>Certificate has been revoked</source>
+        <translation>Certifikát byl odvolán</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="598"/>
+        <source>Unable to determine certificate revocation state</source>
+        <translation>Nepodařilo se zjistit stav odvolání certifikátu</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="608"/>
+        <source>Certificate error</source>
+        <translation>Chyba certifikátu</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="615"/>
+        <source>Re-enter credentials and retry</source>
+        <translation>Zadejte znovu přihlašovací údaje a akci opakujte</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>Odpojeno od %1%: %2%. Pro znovu připojení se odhlašte a zadejte znovu vaše heslo.</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="634"/>
+        <source>Reconnect to %1% failed: %2%. Will retry in %3% seconds.</source>
+        <translation>Opětovné přihlášení k %1% selhalo: %2%. Další pokus za %3% sekund.</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="637"/>
+        <source>Disconnected from %1%: %2%.</source>
+        <translation>Odpojeno od %1%: %2%.</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Roster/RosterController.cpp" line="131"/>
+        <location filename="../Controllers/Roster/RosterController.cpp" line="157"/>
+        <location filename="../Controllers/Roster/RosterController.cpp" line="222"/>
+        <source>Contacts</source>
+        <translation>Kontakty</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Roster/RosterController.cpp" line="263"/>
+        <source>Server %1% rejected contact list change to item &apos;%2%&apos;</source>
+        <translation>Server %1% odmítnul změnu položky &apos;%2%&apos; v seznamu kontaktů</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/StatusUtil.cpp" line="15"/>
+        <location filename="../Controllers/StatusUtil.cpp" line="16"/>
+        <source>Available</source>
+        <translation>Jsem tu</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/StatusUtil.cpp" line="17"/>
+        <location filename="../Controllers/StatusUtil.cpp" line="18"/>
+        <source>Away</source>
+        <translation>Jsem pryč</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/StatusUtil.cpp" line="19"/>
+        <source>Busy</source>
+        <translation>Nemám čas</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/StatusUtil.cpp" line="20"/>
+        <source>Offline</source>
+        <translation>Offline</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/ProfileController.cpp" line="62"/>
+        <source>There was an error publishing your profile data</source>
+        <translation>Při zveřejňování údajů vašeho profilu nastala chyba</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/ChatMessageSummarizer.cpp" line="33"/>
+        <source>%1% (%2%)</source>
+        <translation>%1% (%2%)</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/ChatMessageSummarizer.cpp" line="38"/>
+        <source>%1% and %2% others (%3%)</source>
+        <translation>%1% a %2% ostatní (%3%)</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/ChatMessageSummarizer.cpp" line="41"/>
+        <source>%1%, %2% (%3%)</source>
+        <translation>%1%, %2% (%3%)</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/CAPICertificateSelector.cpp" line="63"/>
+        <source>TLS Client Certificate Selection</source>
+        <translation>Výběr TLS klientského certifikátu</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/CAPICertificateSelector.cpp" line="64"/>
+        <source>Select a certificate to use for authentication</source>
+        <translation>Vyberte certifikát, který chcete použít pro ověření</translation>
+    </message>
+</context>
+<context>
+    <name>CloseButton</name>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="17"/>
+        <source>Close Tab</source>
+        <translation>Zavřít kartu</translation>
+    </message>
+</context>
+<context>
+    <name>MAC_APPLICATION_MENU</name>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="79"/>
+        <source>Services</source>
+        <translation>Služby</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="80"/>
+        <source>Hide %1</source>
+        <translation>Skrýt %1</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="81"/>
+        <source>Hide Others</source>
+        <translation>Skrýt ostatní</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="82"/>
+        <source>Show All</source>
+        <translation>Zobrazit všechny</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="83"/>
+        <source>Preferences...</source>
+        <translation>Nastavení...</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="84"/>
+        <source>Quit %1</source>
+        <translation>Ukončit %1</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="85"/>
+        <source>About %1</source>
+        <translation>O programu %1</translation>
+    </message>
+</context>
+<context>
+    <name>QApplication</name>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="19"/>
+        <source>QT_LAYOUT_DIRECTION</source>
+        <comment>Translate this to LTR for left-to-right or RTL for right-to-left languages</comment>
+        <translation>LTR</translation>
+    </message>
+</context>
+<context>
+    <name>QDialogButtonBox</name>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="69"/>
+        <source>&amp;Yes</source>
+        <translation>An&amp;o</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="70"/>
+        <source>&amp;No</source>
+        <translation>&amp;Ne</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="71"/>
+        <source>&amp;OK</source>
+        <translation>&amp;Ok</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="72"/>
+        <source>OK</source>
+        <translation>Ok</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="73"/>
+        <source>&amp;Cancel</source>
+        <translation>&amp;Storno</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="74"/>
+        <source>Cancel</source>
+        <translation>Storno</translation>
+    </message>
+</context>
+<context>
+    <name>QLineEdit</name>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="21"/>
+        <source>Select All</source>
+        <translation>Vybrat vše</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="22"/>
+        <source>&amp;Undo</source>
+        <translation>&amp;Zpět</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="23"/>
+        <source>&amp;Redo</source>
+        <translation>&amp;Opakovat</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="24"/>
+        <source>Cu&amp;t</source>
+        <translation>Vyjmou&amp;t</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="25"/>
+        <source>&amp;Copy</source>
+        <translation>&amp;Kopírovat</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="26"/>
+        <source>&amp;Paste</source>
+        <translation>&amp;Vložit</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="27"/>
+        <source>Delete</source>
+        <translation>Smazat</translation>
+    </message>
+</context>
+<context>
+    <name>QMessageBox</name>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="76"/>
+        <source>Show Details...</source>
+        <translation>Zobrazit detaily...</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="77"/>
+        <source>Hide Details...</source>
+        <translation>Skrýt detaily...</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <location filename="../QtUI/MUCSearch/MUCSearchEmptyItem.cpp" line="25"/>
+        <source>No rooms found</source>
+        <translation>Žádné místnosti nenalezeny</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/EventViewer/QtEvent.cpp" line="68"/>
+        <source>%1 would like to add you to their contact list.</source>
+        <translation>%1 si vás chce přidat do seznamu kontaktů.</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/EventViewer/QtEvent.cpp" line="71"/>
+        <source>%1 would like to add you to their contact list, saying &apos;%2&apos;</source>
+        <translation>%1 si vás chce přidat do seznamu kontaktů: &apos;%2&apos;</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/EventViewer/QtEvent.cpp" line="81"/>
+        <source>%1 has invited you to enter the %2 room.</source>
+        <translation>%1 vás pozval do místnosti %2.</translation>
+    </message>
+    <message>
+        <source>Systray</source>
+        <translation type="obsolete">Oznamovací oblast</translation>
+    </message>
+    <message>
+        <source>No system tray</source>
+        <translation type="obsolete">Žádná oznamovací oblast</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="980"/>
+        <source>You&apos;ve been invited to enter the %1 room.</source>
+        <translation>Dostali jste pozvánku do místnosti %1.</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="982"/>
+        <source>Reason: %1</source>
+        <translation>Důvod: %1</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="985"/>
+        <source>This person may not have really sent this invitation!</source>
+        <translation>Tento uživatel nemusel doopravdy odeslat tuto pozvánku!</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="46"/>
+        <source>Direction</source>
+        <translation>Směr</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="47"/>
+        <source>Other Party</source>
+        <translation>Protistrana</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="48"/>
+        <source>State</source>
+        <translation>Stav</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="49"/>
+        <source>Progress</source>
+        <translation>Průběh</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="50"/>
+        <source>Size</source>
+        <translation>Velikost</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="65"/>
+        <source>Incoming</source>
+        <translation>Přicházející</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="65"/>
+        <source>Outgoing</source>
+        <translation>Odcházející</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="74"/>
+        <source>Waiting for start</source>
+        <translation>Čekání na spuštění</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="76"/>
+        <source>Waiting for other side to accept</source>
+        <translation>Čekání na přijetí protistranou</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="78"/>
+        <source>Negotiating</source>
+        <translation>Vyjednávání</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="80"/>
+        <source>Transferring</source>
+        <translation>Přenášení</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="82"/>
+        <source>Finished</source>
+        <translation>Dokončeno</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="84"/>
+        <source>Failed</source>
+        <translation>Chyba</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="86"/>
+        <source>Canceled</source>
+        <translation>Zrušeno</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="142"/>
+        <source>Connection Options</source>
+        <translation>Možnosti připojení</translation>
+    </message>
+</context>
+<context>
+    <name>QScrollBar</name>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="29"/>
+        <source>Scroll here</source>
+        <translation>Posunout sem</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="30"/>
+        <source>Top</source>
+        <translation>Nahoru</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="31"/>
+        <source>Bottom</source>
+        <translation>Dolů</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="32"/>
+        <source>Page up</source>
+        <translation>O stránku výše</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="33"/>
+        <source>Page down</source>
+        <translation>O stránku níže</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="34"/>
+        <source>Scroll up</source>
+        <translation>Posunout nahoru</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="35"/>
+        <source>Scroll down</source>
+        <translation>Posunout dolu</translation>
+    </message>
+</context>
+<context>
+    <name>QTextControl</name>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="37"/>
+        <source>Select All</source>
+        <translation>Vybrat vše</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="38"/>
+        <source>&amp;Copy</source>
+        <translation>&amp;Kopírovat</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="39"/>
+        <source>&amp;Undo</source>
+        <translation>&amp;Zpět</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="40"/>
+        <source>&amp;Redo</source>
+        <translation>&amp;Vpřed</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="41"/>
+        <source>Cu&amp;t</source>
+        <translation>Vyjmou&amp;t</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="42"/>
+        <source>&amp;Paste</source>
+        <translation>&amp;Vložit</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="43"/>
+        <source>Delete</source>
+        <translation>Smazat</translation>
+    </message>
+</context>
+<context>
+    <name>QWebPage</name>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="45"/>
+        <source>Copy Link</source>
+        <translation>Kopírovat odkaz</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="46"/>
+        <source>Copy</source>
+        <translation>Kopírovat</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="47"/>
+        <source>Copy Image</source>
+        <translation>Kopírovat obrázek</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="48"/>
+        <source>Scroll here</source>
+        <translation>Posunout sem</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="49"/>
+        <source>Top</source>
+        <translation>Nahoru</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="50"/>
+        <source>Bottom</source>
+        <translation>Dolů</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="51"/>
+        <source>Page up</source>
+        <translation>O stránku výše</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="52"/>
+        <source>Page down</source>
+        <translation>O stránku níže</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="53"/>
+        <source>Scroll up</source>
+        <translation>Posunout nahoru</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="54"/>
+        <source>Scroll down</source>
+        <translation>Posunout dolů</translation>
+    </message>
+</context>
+<context>
+    <name>QWizard</name>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="56"/>
+        <source>&lt; &amp;Back</source>
+        <translation>&lt; &amp;Zpět</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="57"/>
+        <source>&amp;Finish</source>
+        <translation>&amp;Dokončit</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="58"/>
+        <source>&amp;Help</source>
+        <translation>&amp;Nápověda</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="59"/>
+        <source>Go Back</source>
+        <translation>Přejít zpět</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="60"/>
+        <source>Continue</source>
+        <translation>Pokračovat</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="61"/>
+        <source>Commit</source>
+        <translation>Dokončit</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="62"/>
+        <source>Done</source>
+        <translation>Hotovo</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="63"/>
+        <source>Quit</source>
+        <translation>Ukončit</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="64"/>
+        <source>Help</source>
+        <translation>Nápověda</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="65"/>
+        <source>Cancel</source>
+        <translation>Zrušit</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="66"/>
+        <source>&amp;Next</source>
+        <translation>D&amp;alší</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="67"/>
+        <source>&amp;Next &gt;</source>
+        <translation>D&amp;lší &gt;</translation>
+    </message>
+</context>
+<context>
+    <name>QtAffiliationEditor</name>
+    <message>
+        <location filename="../QtUI/ui_QtAffiliationEditor.h" line="123"/>
+        <source>Dialog</source>
+        <translation>Dialog</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAffiliationEditor.ui" line="14"/>
+        <source>Edit Affiliations</source>
+        <translation>Upravit členství</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAffiliationEditor.ui" line="28"/>
+        <location filename="../QtUI/ui_QtAffiliationEditor.h" line="125"/>
+        <source>Affiliation:</source>
+        <translation>Členství:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAffiliationEditor.ui" line="36"/>
+        <location filename="../QtUI/ui_QtAffiliationEditor.h" line="128"/>
+        <source>Owner</source>
+        <translation>Majitel</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAffiliationEditor.ui" line="41"/>
+        <location filename="../QtUI/ui_QtAffiliationEditor.h" line="129"/>
+        <source>Administrator</source>
+        <translation>Správce</translation>
+    </message>
+    <message>
+        <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" line="51"/>
+        <location filename="../QtUI/ui_QtAffiliationEditor.h" line="131"/>
+        <source>Outcast (Banned)</source>
+        <translation>Vyvrhel (zakázaný)</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAffiliationEditor.ui" line="68"/>
+        <location filename="../QtUI/ui_QtAffiliationEditor.h" line="133"/>
+        <source>Add User</source>
+        <translation>Přidat uživatele</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAffiliationEditor.ui" line="75"/>
+        <location filename="../QtUI/ui_QtAffiliationEditor.h" line="134"/>
+        <source>Remove User</source>
+        <translation>Odstranit uživatele</translation>
+    </message>
+</context>
+<context>
+    <name>QtBookmarkDetailWindow</name>
+    <message>
+        <location filename="../QtUI/QtBookmarkDetailWindow.ui" line="20"/>
+        <location filename="../QtUI/ui_QtBookmarkDetailWindow.h" line="137"/>
+        <source>Edit Bookmark Details</source>
+        <translation>Upravit detail záložky</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtBookmarkDetailWindow.ui" line="40"/>
+        <location filename="../QtUI/ui_QtBookmarkDetailWindow.h" line="138"/>
+        <source>Bookmark Name:</source>
+        <translation>Název záložky:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtBookmarkDetailWindow.ui" line="50"/>
+        <location filename="../QtUI/ui_QtBookmarkDetailWindow.h" line="139"/>
+        <source>Room Address:</source>
+        <translation>Adresa místnosti:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtBookmarkDetailWindow.ui" line="60"/>
+        <location filename="../QtUI/ui_QtBookmarkDetailWindow.h" line="140"/>
+        <source>Your Nickname:</source>
+        <translation>Vaše přezdívka:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtBookmarkDetailWindow.ui" line="70"/>
+        <location filename="../QtUI/ui_QtBookmarkDetailWindow.h" line="141"/>
+        <source>Room password:</source>
+        <translation>Heslo pro místnost:</translation>
+    </message>
+    <message>
+        <source>Join automatically</source>
+        <translation type="obsolete">Vstoupit automaticky</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtBookmarkDetailWindow.ui" line="93"/>
+        <location filename="../QtUI/ui_QtBookmarkDetailWindow.h" line="142"/>
+        <source>Enter automatically</source>
+        <translation>Vstoupit 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>Prohlížeč certifikátu</translation>
+    </message>
+</context>
+<context>
+    <name>QtConnectionSettings</name>
+    <message>
+        <location filename="../QtUI/ui_QtConnectionSettings.h" line="383"/>
+        <source>Dialog</source>
+        <translation>Dialog</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="14"/>
+        <source>Connection Options</source>
+        <translation>Možnosti připojení</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="22"/>
+        <location filename="../QtUI/ui_QtConnectionSettings.h" line="384"/>
+        <source>Connection Method:</source>
+        <translation>Způsob připojeni:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="36"/>
+        <location filename="../QtUI/ui_QtConnectionSettings.h" line="387"/>
+        <source>Automatic</source>
+        <translation>Automaticky</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="41"/>
+        <location filename="../QtUI/ui_QtConnectionSettings.h" line="388"/>
+        <source>Manual</source>
+        <translation>Manuálně</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čení spojení:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="107"/>
+        <location filename="../QtUI/ui_QtConnectionSettings.h" line="394"/>
+        <source>Never</source>
+        <translation>Bez zabezpečení</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="112"/>
+        <location filename="../QtUI/ui_QtConnectionSettings.h" line="395"/>
+        <source>Encrypt when possible</source>
+        <translation>Šifrovat pokud je to možné</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 šifrovat</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="127"/>
+        <location filename="../QtUI/ui_QtConnectionSettings.h" line="398"/>
+        <source>Allow Compression</source>
+        <translation>Povolit kompresi</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>Povolit odesílání hesla přes nezabezpeřené spojení</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álně vybrat server</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ázev serveru:</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</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 serveru:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="249"/>
+        <location filename="../QtUI/ui_QtConnectionSettings.h" line="407"/>
+        <source>None</source>
+        <translation>Žádný</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>Podle nastavení 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>Přepsat systémové nastavení serveru</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ě zadat adresu HTTP proxy</translation>
+    </message>
+</context>
+<context>
+    <name>QtHistoryWindow</name>
+    <message>
+        <location filename="../QtUI/ui_QtHistoryWindow.h" line="133"/>
+        <source>Form</source>
+        <translation>Formulář</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtHistoryWindow.ui" line="14"/>
+        <source>History</source>
+        <translation>Historie</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtHistoryWindow.ui" line="22"/>
+        <location filename="../QtUI/ui_QtHistoryWindow.h" line="134"/>
+        <source>Search:</source>
+        <translation>Hledat:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtHistoryWindow.ui" line="42"/>
+        <location filename="../QtUI/ui_QtHistoryWindow.h" line="135"/>
+        <source>Next</source>
+        <translation>Další</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtHistoryWindow.ui" line="52"/>
+        <location filename="../QtUI/ui_QtHistoryWindow.h" line="136"/>
+        <source>Previous</source>
+        <translation>Zpět</translation>
+    </message>
+</context>
+<context>
+    <name>QtJoinMUCWindow</name>
+    <message>
+        <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>Vstoupit do místnosti</translation>
+    </message>
+    <message>
+        <source>Room:</source>
+        <translation type="obsolete">Místnost:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtJoinMUCWindow.ui" line="35"/>
+        <location filename="../QtUI/ui_QtJoinMUCWindow.h" line="144"/>
+        <source>Search ...</source>
+        <translation>Hledat ...</translation>
+    </message>
+    <message>
+        <source>Nickname:</source>
+        <translation type="obsolete">Přezdívka:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtJoinMUCWindow.ui" line="106"/>
+        <location filename="../QtUI/ui_QtJoinMUCWindow.h" line="149"/>
+        <source>Enter automatically in future</source>
+        <translation>Příště vstoupit automaticky</translation>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation type="obsolete">Heslo:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtJoinMUCWindow.ui" line="71"/>
+        <location filename="../QtUI/ui_QtJoinMUCWindow.h" line="148"/>
+        <source>Automatically configure newly created rooms</source>
+        <translation>Nové místnosti nastavit 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 místnosti:</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 přezdí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 místnosti:</translation>
+    </message>
+</context>
+<context>
+    <name>QtMUCSearchWindow</name>
+    <message>
+        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.ui" line="14"/>
+        <location filename="../QtUI/MUCSearch/ui_QtMUCSearchWindow.h" line="118"/>
+        <source>Search Room</source>
+        <translation>Vyhledat místnost</translation>
+    </message>
+    <message>
+        <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" line="74"/>
+        <location filename="../QtUI/MUCSearch/ui_QtMUCSearchWindow.h" line="121"/>
+        <source>Cancel</source>
+        <translation>Zrušit</translation>
+    </message>
+    <message>
+        <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" line="96"/>
+        <location filename="../QtUI/MUCSearch/ui_QtMUCSearchWindow.h" line="123"/>
+        <source>List rooms</source>
+        <translation>Seznam místností</translation>
+    </message>
+</context>
+<context>
+    <name>QtUserSearchFieldsPage</name>
+    <message>
+        <location filename="../QtUI/UserSearch/QtUserSearchFieldsPage.ui" line="27"/>
+        <location filename="../QtUI/UserSearch/ui_QtUserSearchFieldsPage.h" line="131"/>
+        <source>Nickname:</source>
+        <translation>Přezdívka:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/UserSearch/QtUserSearchFieldsPage.ui" line="37"/>
+        <location filename="../QtUI/UserSearch/ui_QtUserSearchFieldsPage.h" line="132"/>
+        <source>First name:</source>
+        <translation>Jméno:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/UserSearch/QtUserSearchFieldsPage.ui" line="47"/>
+        <location filename="../QtUI/UserSearch/ui_QtUserSearchFieldsPage.h" line="133"/>
+        <source>Last name:</source>
+        <translation>Příjmení:</translation>
+    </message>
+    <message>
+        <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" line="74"/>
+        <location filename="../QtUI/UserSearch/ui_QtUserSearchFieldsPage.h" line="136"/>
+        <source>Fetching search fields</source>
+        <translation>Probíhá načítání polí pro vyhledávání</translation>
+    </message>
+</context>
+<context>
+    <name>QtUserSearchFirstPage</name>
+    <message>
+        <location filename="../QtUI/UserSearch/QtUserSearchFirstPage.ui" line="17"/>
+        <location filename="../QtUI/UserSearch/ui_QtUserSearchFirstPage.h" line="132"/>
+        <source>Add a user</source>
+        <translation>Přidat uživatele</translation>
+    </message>
+    <message>
+        <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>
+        <translation>Přidat dalšího uživatele do seznamu kontaktů. Pokud znáte jeho adresu, můžete ho zadat přímo nebo jej můžete vyhledat.</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/UserSearch/QtUserSearchFirstPage.ui" line="35"/>
+        <location filename="../QtUI/UserSearch/ui_QtUserSearchFirstPage.h" line="135"/>
+        <source>I know their address:</source>
+        <translation>Znám jejich adresu:</translation>
+    </message>
+    <message>
+        <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>Prohledat můj server</translation>
+    </message>
+    <message>
+        <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>Prohledat jiný server:</translation>
+    </message>
+</context>
+<context>
+    <name>QtUserSearchResultsPage</name>
+    <message>
+        <location filename="../QtUI/UserSearch/QtUserSearchResultsPage.ui" line="27"/>
+        <location filename="../QtUI/UserSearch/ui_QtUserSearchResultsPage.h" line="59"/>
+        <source>No results.</source>
+        <translation>Žádné výsledky.</translation>
+    </message>
+</context>
+<context>
+    <name>QtUserSearchWizard</name>
+    <message>
+        <location filename="../QtUI/UserSearch/QtUserSearchWizard.ui" line="14"/>
+        <location filename="../QtUI/UserSearch/ui_QtUserSearchWizard.h" line="39"/>
+        <source>Find User</source>
+        <translation>Hledat uživatele</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::ChatListModel</name>
+    <message>
+        <location filename="../QtUI/ChatList/ChatListModel.cpp" line="17"/>
+        <source>Bookmarked Rooms</source>
+        <translation>Zapamatované místnosti</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/ChatList/ChatListModel.cpp" line="18"/>
+        <source>Recent Chats</source>
+        <translation>Poslední zprávy</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/ChatList/ChatListModel.cpp" line="20"/>
+        <source>Opened Whiteboards</source>
+        <translation>Otevřené whiteboard chat sezení</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::FileTransferController</name>
+    <message>
+        <source>me</source>
+        <translation type="obsolete">já</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtAboutWidget</name>
+    <message>
+        <location filename="../QtUI/QtAboutWidget.cpp" line="23"/>
+        <source>About %1</source>
+        <translation>O programu %1</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAboutWidget.cpp" line="40"/>
+        <source>Version %1</source>
+        <translation>Verze %1</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAboutWidget.cpp" line="43"/>
+        <source>Built with Qt %1</source>
+        <translation>Sestavené pomocí Qt %1</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAboutWidget.cpp" line="44"/>
+        <source>Running with Qt %1</source>
+        <translation>Beží na Qt %1</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAboutWidget.cpp" line="50"/>
+        <source>Using the English translation by
+%1</source>
+        <translation>Do češtiny přeložil
+%1</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAboutWidget.cpp" line="54"/>
+        <source>View License</source>
+        <translation>Zobrazit licenci</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtAdHocCommandWindow</name>
+    <message>
+        <location filename="../QtUI/QtAdHocCommandWindow.cpp" line="36"/>
+        <source>Cancel</source>
+        <translation>Zrušit</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAdHocCommandWindow.cpp" line="39"/>
+        <source>Back</source>
+        <translation>Zpět</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAdHocCommandWindow.cpp" line="42"/>
+        <source>Next</source>
+        <translation>Další</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAdHocCommandWindow.cpp" line="45"/>
+        <source>Complete</source>
+        <translation>Hotovo</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAdHocCommandWindow.cpp" line="86"/>
+        <source>Error: %1</source>
+        <translation>Chyba: %1</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAdHocCommandWindow.cpp" line="87"/>
+        <source>Warning: %1</source>
+        <translation>Upozornění: %1</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAdHocCommandWindow.cpp" line="104"/>
+        <source>Error executing command</source>
+        <translation>Chyba při vykonávání příkazu</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtAffiliationEditor</name>
+    <message>
+        <location filename="../QtUI/QtAffiliationEditor.cpp" line="48"/>
+        <source>Add User</source>
+        <translation>Přidat uživatele</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAffiliationEditor.cpp" line="48"/>
+        <source>Added User&apos;s Address:</source>
+        <translation>Přidána adresa uživatele:</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtAvatarWidget</name>
+    <message>
+        <location filename="../QtUI/QtAvatarWidget.cpp" line="61"/>
+        <source>No picture</source>
+        <translation>Bez obrázku</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAvatarWidget.cpp" line="73"/>
+        <source>Select picture ...</source>
+        <translation>Vybrat obrázek ...</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAvatarWidget.cpp" line="76"/>
+        <source>Clear picture</source>
+        <translation>Vymazat obrázek</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAvatarWidget.cpp" line="81"/>
+        <source>Select picture</source>
+        <translation>Vybrat obrázek</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAvatarWidget.cpp" line="81"/>
+        <source>Image Files (*.png *.jpg *.jpeg *.gif)</source>
+        <translation>Obrázkové soubory (*.png *.jpg *.jpeg *.gif)</translation>
+    </message>
+    <message>
+        <source>Image Files (*.png *.jpg *.gif)</source>
+        <translation type="obsolete">Obrázkové soubory (*.png *.jpg *.gif)</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAvatarWidget.cpp" line="95"/>
+        <source>Error</source>
+        <translation>Chyba</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAvatarWidget.cpp" line="95"/>
+        <source>The selected picture is in an unrecognized format</source>
+        <translation>Nepodařilo se rozpoznat formát vybraného obrázku</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtBookmarkDetailWindow</name>
+    <message>
+        <location filename="../QtUI/QtBookmarkDetailWindow.cpp" line="31"/>
+        <source>Bookmark not valid</source>
+        <translation>Neplatná záložka</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtBookmarkDetailWindow.cpp" line="31"/>
+        <source>You must specify a valid room address (e.g. someroom@rooms.example.com).</source>
+        <translation>Musíte uvést platnou adresu místnosti (například someroom@rooms.example.com).</translation>
+    </message>
+    <message>
+        <source>You must specify a valid room address (e.g. myroom@chats.example.com).</source>
+        <translation type="obsolete">Musíte uvést platnou adresu místnosti (například myroom@chats.example.com).</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtCertificateViewerDialog</name>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="95"/>
+        <source>General</source>
+        <translation>Obecné</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>Verze</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="101"/>
+        <source>Subject</source>
+        <translation>Předmět</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="102"/>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="124"/>
+        <source>Organization</source>
+        <translation>Organizace</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="103"/>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="125"/>
+        <source>Common Name</source>
+        <translation>Běžný název</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>Stá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>Altenativní názvy 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>DNS název</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="123"/>
+        <source>Issuer</source>
+        <translation>Vydavatel</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtChatListWindow</name>
+    <message>
+        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="82"/>
+        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="86"/>
+        <source>Add New Bookmark</source>
+        <translation>Přidat novou záložku</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="83"/>
+        <source>Edit Bookmark</source>
+        <translation>Upravit záložku</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="84"/>
+        <source>Remove Bookmark</source>
+        <translation>Odstranit záložku</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="173"/>
+        <source>Clear recents</source>
+        <translation>Vymazat nedávné</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtChatView</name>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="73"/>
+        <source>Clear log</source>
+        <translation>Vymazat log</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="74"/>
+        <source>You are about to clear the contents of your chat log.</source>
+        <translation>Chystáte se smazat historii zpráv.</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="75"/>
+        <source>Are you sure?</source>
+        <translation>Jste si jist?</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="219"/>
+        <source>%1 edited</source>
+        <translation>%1 upraveno</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="400"/>
+        <source>Waiting for other side to accept the transfer.</source>
+        <translation>Čekání na příjetí přenosu druhou stranou.</translation>
+    </message>
+    <message>
+        <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šit</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="405"/>
+        <source>Negotiating...</source>
+        <translation>Spojování...</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="420"/>
+        <source>Transfer has been canceled!</source>
+        <translation>Přenost byl přerušen!</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="424"/>
+        <source>Transfer completed successfully.</source>
+        <translation>Přenos byl úspěšně dokončen.</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="427"/>
+        <source>Transfer failed.</source>
+        <translation>Přenos selhal.</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="437"/>
+        <source>Started whiteboard chat</source>
+        <translation>Spuštěn whiteboard chat</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="438"/>
+        <source>Show whiteboard</source>
+        <translation>Zobrazit whiteboard</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="440"/>
+        <source>Whiteboard chat has been canceled</source>
+        <translation>Whiteboard chat byl přerušen</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="442"/>
+        <source>Whiteboard chat request has been rejected</source>
+        <translation>Požadavek na whiteboard chat byl odmítnut</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="451"/>
+        <source>Return to room</source>
+        <translation>Vrátit se do místnosti</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtChatWindow</name>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="546"/>
+        <source>This message has not been received by your server yet.</source>
+        <translation>Tato zpráva zatím nebyla přijata vaším serverem.</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="553"/>
+        <source>This message may not have been transmitted.</source>
+        <translation>Táto zpráva ještě nemusela být přenesena.</translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t send message: %1</source>
+        <translation type="obsolete">Zpráu se nepodařilo odeslat: %1</translation>
+    </message>
+    <message>
+        <source>Actions</source>
+        <translation type="obsolete">Akce</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="157"/>
+        <source>Correcting</source>
+        <translation>Opravování</translation>
+    </message>
+    <message>
+        <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 chat nemusí podporovat opravu zpráv. Pokud pošlete opravu, může se zpráva zobrazit jako duplicitní</translation>
+    </message>
+    <message>
+        <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 chat nemusí podporovat opravu zpráv. Pokud pošlete opravu, může se zpráva zobrazit jako duplicitní</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="562"/>
+        <source>The receipt for this message has been received.</source>
+        <translation>Pro tuto zprávu byla přijata doručenka.</translation>
+    </message>
+    <message>
+        <source>The receipt for this message has not yet been received. The receipient(s) might not have received this message.</source>
+        <translation type="obsolete">Doručenka pro tuto zprávu zatím nedorazila. Příjemce nemusel tuto zprávu přijmout.</translation>
+    </message>
+    <message>
+        <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 pro tuto zprávu zatím nedorazila. Příjemce nemusel tuto zprávu přijmout.</translation>
+    </message>
+    <message>
+        <source>Send file</source>
+        <translation type="obsolete">Odeslat soubor</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="613"/>
+        <source>Send file</source>
+        <translation>Odeslat soubor</translation>
+    </message>
+    <message>
+        <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šit</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="616"/>
+        <source>Set Description</source>
+        <translation>Nastavit popis</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="617"/>
+        <source>Send</source>
+        <translation>Odoslat</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="621"/>
+        <source>Receiving file</source>
+        <translation>Přijímání souboru</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="624"/>
+        <location filename="../QtUI/QtChatWindow.cpp" line="665"/>
+        <source>Accept</source>
+        <translation>Přijmout</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="659"/>
+        <source>Starting whiteboard chat</source>
+        <translation>Zahajuje se whiteboard chat</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="663"/>
+        <source>%1 would like to start a whiteboard chat</source>
+        <translation>%1 chce zahájit whiteboard chat</translation>
+    </message>
+    <message>
+        <source> would like to start whiteboard chat</source>
+        <translation type="obsolete"> chce zahájit whiteboard chat</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="700"/>
+        <source>File transfer description</source>
+        <translation>Popis přeneseného souboru</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="701"/>
+        <source>Description:</source>
+        <translation>Popis:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="715"/>
+        <source>Save File</source>
+        <translation>Uložit soubor</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="906"/>
+        <source>Change subject…</source>
+        <translation>Změnit předmět…</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="907"/>
+        <source>Configure room…</source>
+        <translation>Nastavit místnost…</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="908"/>
+        <source>Edit affiliations…</source>
+        <translation>Upravit členství…</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="910"/>
+        <source>Invite person to this room…</source>
+        <translation>Pozvat uživatele do této místnosti…</translation>
+    </message>
+    <message>
+        <source>Change subject</source>
+        <translation type="obsolete">Zmenit předmět</translation>
+    </message>
+    <message>
+        <source>Configure room</source>
+        <translation type="obsolete">Nastavit místnost</translation>
+    </message>
+    <message>
+        <source>Edit affiliations</source>
+        <translation type="obsolete">Upravit členství</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="909"/>
+        <source>Destroy room</source>
+        <translation>Zrušit místnost</translation>
+    </message>
+    <message>
+        <source>Invite person to this room</source>
+        <translation type="obsolete">Pozvat uživatele do této místnosti</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="920"/>
+        <source>Change room subject</source>
+        <translation>Změnit předmět místnosti</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="920"/>
+        <source>New subject:</source>
+        <translation>Nový předmět:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="938"/>
+        <source>Confirm room destruction</source>
+        <translation>Potvrdit zrušení místnosti</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="939"/>
+        <source>Are you sure you want to destroy the room?</source>
+        <translation>Opravdu chcete zrušit tuto místnost?</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="940"/>
+        <source>This will destroy the room.</source>
+        <translation>Tímto místnost zrušíte.</translation>
+    </message>
+    <message>
+        <source>Enter person&apos;s address</source>
+        <translation type="obsolete">Zadajte adresu uživatele</translation>
+    </message>
+    <message>
+        <source>Address:</source>
+        <translation type="obsolete">Adresa:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="991"/>
+        <source>Accept Invite</source>
+        <translation>Přijmout pozvánku</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtContactEditWidget</name>
+    <message>
+        <location filename="../QtUI/QtContactEditWidget.cpp" line="122"/>
+        <source>Name:</source>
+        <translation>Jméno:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtContactEditWidget.cpp" line="42"/>
+        <source>Groups:</source>
+        <translation>Skupiny:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtContactEditWidget.cpp" line="65"/>
+        <source>New Group:</source>
+        <translation>Nová skupina:</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtContactEditWindow</name>
+    <message>
+        <location filename="../QtUI/QtContactEditWindow.cpp" line="28"/>
+        <source>Edit contact</source>
+        <translation>Upravit kontakt</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtContactEditWindow.cpp" line="43"/>
+        <source>Remove contact</source>
+        <translation>Odstranit kontakt</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtContactEditWindow.cpp" line="46"/>
+        <source>OK</source>
+        <translation>Ok</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtContactEditWindow.cpp" line="94"/>
+        <source>Confirm contact deletion</source>
+        <translation>Potvrzení odstranění kontaktu</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtContactEditWindow.cpp" line="95"/>
+        <source>Are you sure you want to delete this contact?</source>
+        <translation>Opravdu chcete tento kontakt odstranit?</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtContactEditWindow.cpp" line="96"/>
+        <source>This will remove the contact &apos;%1&apos; from all groups they may be in.</source>
+        <translation>Kontakt &apos;%1&apos; bude odstraněný ze všech jeho skupin.</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtEventWindow</name>
+    <message>
+        <location filename="../QtUI/EventViewer/QtEventWindow.cpp" line="48"/>
+        <source>Display Notice</source>
+        <translation>Zobrazit oznámení</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtFileTransferListWidget</name>
+    <message>
+        <location filename="../QtUI/QtFileTransferListWidget.cpp" line="39"/>
+        <source>Clear Finished Transfers</source>
+        <translation>Vymazat dokončené přenosy</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListWidget.cpp" line="44"/>
+        <source>File Transfer List</source>
+        <translation>Seznam přenesených souborů</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtHistoryWindow</name>
+    <message>
+        <location filename="../QtUI/QtHistoryWindow.cpp" line="57"/>
+        <source>History</source>
+        <translation>Historie</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>Seznam uživatelů, které chcete pozvat do tohoto sezení (jeden na řádek):</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>Pokud chcete zadat důvod pro odeslání pozvánky, napište ho sem</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtJoinMUCWindow</name>
+    <message>
+        <location filename="../QtUI/QtJoinMUCWindow.cpp" line="19"/>
+        <source>someroom@rooms.example.com</source>
+        <translation>someroom@rooms.example.com</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtLoginWindow</name>
+    <message>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="92"/>
+        <source>User address:</source>
+        <translation>Adresa uživatele:</translation>
+    </message>
+    <message>
+        <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 uživatele - vypadá jako someuser@someserver.com</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="102"/>
+        <source>Example: alice@wonderland.lit</source>
+        <translation>Příklad: alice@wonderland.lit</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="108"/>
+        <source>Password:</source>
+        <translation>Heslo:</translation>
+    </message>
+    <message>
+        <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>Klikněte pokud máte certifikát pro přihlášení ke službě.</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="136"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="355"/>
+        <source>Connect</source>
+        <translation>Přihlásit</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="154"/>
+        <source>Remember Password?</source>
+        <translation>Zapamatovat heslo?</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="156"/>
+        <source>Login Automatically?</source>
+        <translation>Přihlásit automaticky?</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="168"/>
+        <source>&amp;Swift</source>
+        <translation>&amp;Swift</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="170"/>
+        <source>&amp;General</source>
+        <translation>&amp;Obecné</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="178"/>
+        <source>&amp;About %1</source>
+        <translation>O &amp;programu %1</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="183"/>
+        <source>&amp;Show Debug Console</source>
+        <translation>&amp;Zobrazit ladící konzoli</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="193"/>
+        <source>&amp;Play Sounds</source>
+        <translation>&amp;Přehrávat zvuky</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="199"/>
+        <source>Display Pop-up &amp;Notifications</source>
+        <translation>Zobrazovat &amp;oznámení</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="211"/>
+        <source>&amp;Quit</source>
+        <translation>U&amp;končit</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="253"/>
+        <source>Remove profile</source>
+        <translation>Odstranit profil</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="253"/>
+        <source>Remove the profile &apos;%1&apos;?</source>
+        <translation>Odstranit profil &apos;%1&apos;?</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="355"/>
+        <source>Cancel</source>
+        <translation>Zrušit</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="369"/>
+        <source>Confirm terms of use</source>
+        <translation>Potvrzení podmínek užití</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="412"/>
+        <source>Select an authentication certificate</source>
+        <translation>Vyberte certifikát pro ověření</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="412"/>
+        <source>P12 files (*.cert *.p12 *.pfx);;All files (*.*)</source>
+        <translation>Soubory P12 (*.cert *.p12 *.pfx);;Všechny soubory (*.*)</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="525"/>
+        <source>The certificate presented by the server is not valid.</source>
+        <translation>Certifikát, který odeslal server je neplatný.</translation>
+    </message>
+    <message>
+        <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 natrvalo důvěřovat tomuto certifikátu? Toto musí být uděláno pouze pokud víte, že je to správně.</translation>
+    </message>
+    <message>
+        <source>Subject: %1</source>
+        <translation type="obsolete">Předmět: %1</translation>
+    </message>
+    <message>
+        <source>SHA-1 Fingerprint: %1</source>
+        <translation type="obsolete">Otisk SHA-1: %1</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="188"/>
+        <source>Show &amp;File Transfer Overview</source>
+        <translation>Zobrazit přehled přenosu &amp;souborů</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtMUCConfigurationWindow</name>
+    <message>
+        <location filename="../QtUI/QtMUCConfigurationWindow.cpp" line="34"/>
+        <source>Cancel</source>
+        <translation>Zrušit</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMUCConfigurationWindow.cpp" line="37"/>
+        <source>OK</source>
+        <translation>Ok</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtMUCSearchWindow</name>
+    <message>
+        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.cpp" line="49"/>
+        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.cpp" line="51"/>
+        <source>Searching</source>
+        <translation>Hledání</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtMainWindow</name>
+    <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="79"/>
+        <source>&amp;Contacts</source>
+        <translation>&amp;Kontakty</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="88"/>
+        <location filename="../QtUI/QtMainWindow.cpp" line="205"/>
+        <source>&amp;Notices</source>
+        <translation>&amp;Oznámení</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="87"/>
+        <source>C&amp;hats</source>
+        <translation>&amp;Zprávy</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="96"/>
+        <source>&amp;View</source>
+        <translation>&amp;Zobrazit</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="98"/>
+        <source>&amp;Show offline contacts</source>
+        <translation>Zobrazit &amp;offline kontakty</translation>
+    </message>
+    <message>
+        <source>&amp;Compact Roster</source>
+        <translation type="obsolete">&amp;Kompaktní seznam kontaktů</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="106"/>
+        <source>&amp;Show Emoticons</source>
+        <translation>&amp;Zobrazit smajlíky</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="120"/>
+        <source>&amp;Actions</source>
+        <translation>&amp;Akce</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="122"/>
+        <source>Edit &amp;Profile…</source>
+        <translation>Upravit &amp;profil</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="125"/>
+        <source>Enter &amp;Room…</source>
+        <translation>Vztoupit do &amp;místnosti…</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="129"/>
+        <source>&amp;View History…</source>
+        <translation>&amp;Zobrazit historii…</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="133"/>
+        <source>&amp;Add Contact…</source>
+        <translation>Přidat &amp;kontakt…</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="136"/>
+        <source>&amp;Edit Selected Contact…</source>
+        <translation>&amp;Upravit vybraný kontakt…</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="140"/>
+        <source>Start &amp;Chat…</source>
+        <translation>Zahájit &amp;chat…</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="146"/>
+        <source>&amp;Sign Out</source>
+        <translation>&amp;Odhlásit se</translation>
+    </message>
+    <message>
+        <source>Notices</source>
+        <translation type="obsolete">&amp;Oznámení</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="143"/>
+        <source>Run Server Command</source>
+        <translation>Spustit příkaz na serveru</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="150"/>
+        <source>&amp;Request Delivery Receipts</source>
+        <translation>Vyžadovat &amp;doručenky</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="161"/>
+        <source>Collecting commands...</source>
+        <translation>Získávání příkazů…</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="216"/>
+        <source>&amp;Chats</source>
+        <translation>&amp;Zprávy</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="339"/>
+        <source>No Available Commands</source>
+        <translation>Není dostupný žádný příkaz</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtNameWidget</name>
+    <message>
+        <location filename="../QtUI/QtNameWidget.cpp" line="48"/>
+        <source>Show Nickname</source>
+        <translation>Zobrazit přezdívku</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtNameWidget.cpp" line="48"/>
+        <source>(No Nickname Set)</source>
+        <translation>(Žádná přezdívka)</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtNameWidget.cpp" line="56"/>
+        <source>Show Address</source>
+        <translation>Zobrazit adresu</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtNameWidget.cpp" line="63"/>
+        <source>Edit Profile</source>
+        <translation>Upravit profil</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtOccupantListWidget</name>
+    <message>
+        <location filename="../QtUI/Roster/QtOccupantListWidget.cpp" line="46"/>
+        <source>No actions for this user</source>
+        <translation>Pro tohoto uživatele nejsou dostupné žádné akce</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtOccupantListWidget.cpp" line="55"/>
+        <source>Kick user</source>
+        <translation>Vykopnout uživatele</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtOccupantListWidget.cpp" line="56"/>
+        <source>Kick and ban user</source>
+        <translation>Vykopnout uživatele a zakázat mu přístup</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtOccupantListWidget.cpp" line="57"/>
+        <source>Make moderator</source>
+        <translation>Nastavit jako moderátora</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtOccupantListWidget.cpp" line="58"/>
+        <source>Make participant</source>
+        <translation>Nastavit jako účastníka</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtOccupantListWidget.cpp" line="59"/>
+        <source>Remove voice</source>
+        <translation>Odstranit hlas</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtOccupantListWidget.cpp" line="60"/>
+        <source>Add to contacts</source>
+        <translation>Přidat do kontaktů</translation>
+    </message>
+    <message>
+        <source>Add contact</source>
+        <translation type="obsolete">Přidat kontakt</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtProfileWindow</name>
+    <message>
+        <location filename="../QtUI/QtProfileWindow.cpp" line="24"/>
+        <source>Edit Profile</source>
+        <translation>Upravit profil</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtProfileWindow.cpp" line="43"/>
+        <source>Nickname:</source>
+        <translation>Přezdívka:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtProfileWindow.cpp" line="67"/>
+        <source>Save</source>
+        <translation>Uložit</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtRosterHeader</name>
+    <message>
+        <location filename="../QtUI/QtRosterHeader.cpp" line="59"/>
+        <source>Connection is secured</source>
+        <translation>Spojení je zabezpečené</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtRosterWidget</name>
+    <message>
+        <source>Edit</source>
+        <translation type="obsolete">Upravit</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="58"/>
+        <source>Edit…</source>
+        <translation>Upravit…</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="59"/>
+        <source>Remove</source>
+        <translation>Odstranit</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="63"/>
+        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="83"/>
+        <source>Send File</source>
+        <translation>Odoslat soubor</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="69"/>
+        <source>Start Whiteboard Chat</source>
+        <translation>Zahájit whiteboard chat</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="83"/>
+        <source>All Files (*);;</source>
+        <translation>Všechny soubory (*);;</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="96"/>
+        <source>Rename</source>
+        <translation>Přejmenovat</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="106"/>
+        <source>Rename group</source>
+        <translation>Přejmenovat skupinu</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="106"/>
+        <source>Enter a new name for group &apos;%1&apos;:</source>
+        <translation>Zadajte nové jméno pro skupinu &apos;%1&apos;:</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtStatusWidget</name>
+    <message>
+        <location filename="../QtUI/QtStatusWidget.cpp" line="231"/>
+        <source>Connecting</source>
+        <translation>Připojování</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStatusWidget.cpp" line="261"/>
+        <source>(No message)</source>
+        <translation>(Bez zprávy)</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtSubscriptionRequestWindow</name>
+    <message>
+        <location filename="../QtUI/QtSubscriptionRequestWindow.cpp" line="24"/>
+        <source>You have already replied to this request</source>
+        <translation>Na tuto žádost jste už reagovali</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtSubscriptionRequestWindow.cpp" line="25"/>
+        <source>OK</source>
+        <translation>Ok</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtSubscriptionRequestWindow.cpp" line="30"/>
+        <source>Yes</source>
+        <translation>Ano</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtSubscriptionRequestWindow.cpp" line="33"/>
+        <source>No</source>
+        <translation>Ne</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtSubscriptionRequestWindow.cpp" line="35"/>
+        <source>Defer</source>
+        <translation>Odložit</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtSubscriptionRequestWindow.cpp" line="18"/>
+        <source>%1 would like to add you to their contact list.
+ Would you like to add them to your contact list and share your status when you&apos;re online? 
+
+If you choose to defer this choice, you will be asked again when you next login.</source>
+        <translation>%1 si vás chce přidat do seznamu kontaktů.
+ Chcete si ho přidat do vašeho seznamu kontaktů a když budete připojeni, sdílet s ním stav?
+
+Když se rozhodnete odložit výběr, při dalším přihlášení budete znovu vyzváni.</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtSwift</name>
+    <message>
+        <source>Confirm terms of use</source>
+        <translation type="obsolete">Potvrzení podmínek užití</translation>
+    </message>
+    <message>
+        <source>Do you agree to the terms of use?</source>
+        <translation type="obsolete">Souhlasíte s podmínkami užití?</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtTreeWidget</name>
+    <message>
+        <source>Edit</source>
+        <translation type="obsolete">Upravit</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="obsolete">Odstranit</translation>
+    </message>
+    <message>
+        <source>Rename</source>
+        <translation type="obsolete">Přejmenovat</translation>
+    </message>
+    <message>
+        <source>Rename group</source>
+        <translation type="obsolete">Přejmenovat skupinu</translation>
+    </message>
+    <message>
+        <source>Enter a new name for group &apos;%1&apos;:</source>
+        <translation type="obsolete">Zadejte nové jméno pro skupinu &apos;%1&apos;:</translation>
+    </message>
+    <message>
+        <source>New name for %1</source>
+        <translation type="obsolete">Nové jméno pro %1</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtUserSearchDetailsPage</name>
+    <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>Zvolte jméno pro kontakt a vyberte skupiny, do kterých ho chcete vložit.</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtUserSearchFirstPage</name>
+    <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. Pokud znáte jeho adresu, můžete jí zadat přímo, nebo ho můžete vyhledat.</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/UserSearch/QtUserSearchFirstPage.cpp" line="16"/>
+        <source>Add another user to your contact list</source>
+        <translation>Přidat uživatele do vašeho seznamu kontaktů</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/UserSearch/QtUserSearchFirstPage.cpp" line="16"/>
+        <source>Chat to another user</source>
+        <translation>Chat s dalším uživatelem</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtUserSearchWindow</name>
+    <message>
+        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="35"/>
+        <source>Add Contact</source>
+        <translation>Přidat kontakt</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="35"/>
+        <source>Chat to User</source>
+        <translation>Chat s uživatelem</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="45"/>
+        <source>alice@wonderland.lit</source>
+        <translation>alice@wonderland.lit</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="296"/>
+        <source>How would you like to find the user to add?</source>
+        <translation>Jak chcete vyhledat uživatele pro přidání?</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="299"/>
+        <source>How would you like to find the user to chat to?</source>
+        <translation>Jak chcete vyhledat uživatele pro chat?</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="326"/>
+        <source>Error while searching</source>
+        <translation>Chyba při hledání</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="332"/>
+        <source>This server doesn&apos;t support searching for users.</source>
+        <translation>Tento server nepodporuje vyhledávání uživatelů.</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtWebView</name>
+    <message>
+        <location filename="../QtUI/QtWebView.cpp" line="66"/>
+        <source>Clear</source>
+        <translation>Vymazat</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtWebView.cpp" line="67"/>
+        <source>Increase font size</source>
+        <translation>Zvětšit písmo</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtWebView.cpp" line="68"/>
+        <source>Decrease font size</source>
+        <translation>Změnšit písmo</translation>
+    </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>Zavřením okna ukončíte chat. Chcete opravdu pokračovat?</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtXMLConsoleWidget</name>
+    <message>
+        <location filename="../QtUI/QtXMLConsoleWidget.cpp" line="22"/>
+        <source>Console</source>
+        <translation>Konzole</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtXMLConsoleWidget.cpp" line="40"/>
+        <source>Trace input/output</source>
+        <translation>Sledovat vstup a výstup</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtXMLConsoleWidget.cpp" line="46"/>
+        <source>Clear</source>
+        <translation>Vymazat</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtXMLConsoleWidget.cpp" line="50"/>
+        <source>Debug Console</source>
+        <translation>Ladící konzole</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtXMLConsoleWidget.cpp" line="78"/>
+        <source>&lt;!-- IN --&gt;</source>
+        <translation>&lt;!-- IN --&gt;</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtXMLConsoleWidget.cpp" line="82"/>
+        <source>&lt;!-- OUT --&gt;</source>
+        <translation>&lt;!-- OUT --&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>TRANSLATION_INFO</name>
+    <message>
+        <location filename="../QtUI/QtAboutWidget.cpp" line="49"/>
+        <location filename="../QtUI/QtAboutWidget.cpp" line="50"/>
+        <source>TRANSLATION_AUTHOR</source>
+        <translation>Roman Štefko</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAboutWidget.cpp" line="52"/>
+        <source>TRANSLATION_LICENSE</source>
+        <comment>This string contains the license under which this translation is licensed. We ask you to license the translation under the BSD license. Please read http://www.opensource.org/licenses/bsd-license.php, and if you agree to release your translation under this license, use the following (untranslated) text: &apos;This translation is licensed under the BSD License. See http://www.opensource.org/licenses/bsd-license.php&apos;</comment>
+        <translation>This translation is licensed under the BSD License. See http://www.opensource.org/licenses/bsd-license.php</translation>
+    </message>
+    <message>
+        <source>TRANSLATION_LICENSE</source>
+        <comment>Should be the following (untranslated) text: &apos;This translation is licensed under the BSD License. See http://www.opensource.org/licenses/bsd-license.php&apos;</comment>
+        <translation type="obsolete">This translation is licensed under the BSD License. See http://www.opensource.org/licenses/bsd-license.php</translation>
+    </message>
+</context>
+</TS>
diff --git a/Swift/Translations/swift_de.ts b/Swift/Translations/swift_de.ts
index 6183099..0fee815 100644
--- a/Swift/Translations/swift_de.ts
+++ b/Swift/Translations/swift_de.ts
@@ -1533,25 +1533,25 @@
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="95"/>
-        <source>Edit &amp;Profile</source>
-        <translation>&amp;Profil editieren</translation>
+        <source>Edit &amp;Profile…</source>
+        <translation>&amp;Profil editieren…</translation>
     </message>
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="98"/>
-        <source>Enter &amp;Room</source>
-        <translation>Chat&amp;raum betreten</translation>
+        <source>Enter &amp;Room…</source>
+        <translation>Chat&amp;raum betreten…</translation>
     </message>
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="101"/>
-        <source>&amp;Add Contact</source>
-        <translation>Kont&amp;akt hinzufügen</translation>
+        <source>&amp;Add Contact…</source>
+        <translation>Kont&amp;akt hinzufügen…</translation>
     </message>
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="104"/>
-        <source>&amp;Edit Selected Contact</source>
-        <translation>Ausgewählten Kontakt &amp;editieren</translation>
+        <source>&amp;Edit Selected Contact…</source>
+        <translation>Ausgewählten Kontakt &amp;editieren…</translation>
     </message>
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="108"/>
-        <source>Start &amp;Chat</source>
+        <source>Start &amp;Chat…</source>
         <translation>Gesprä&amp;ch beginnen</translation>
     </message>
diff --git a/Swift/Translations/swift_es.ts b/Swift/Translations/swift_es.ts
index 2231ecf..384c411 100644
--- a/Swift/Translations/swift_es.ts
+++ b/Swift/Translations/swift_es.ts
@@ -6,35 +6,46 @@
     <name></name>
     <message>
-        <location filename="../Controllers/Chat/ChatController.cpp" line="46"/>
+        <location filename="../Controllers/Chat/ChatController.cpp" line="59"/>
         <source>Starting chat with %1% in chatroom %2%</source>
         <translation>Comenzando conversación con %1% en la sala %2%</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatController.cpp" line="49"/>
+        <location filename="../Controllers/Chat/ChatController.cpp" line="62"/>
         <source>Starting chat with %1% - %2%</source>
         <translation>Comenzando conversación con %1% - %2%</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatController.cpp" line="119"/>
+        <location filename="../Controllers/Chat/ChatController.cpp" line="202"/>
+        <source>This chat doesn&apos;t support delivery receipts.</source>
+        <translation>Esta conversación no es compatible con confirmaciones de entrega.</translation>
+    </message>
+    <message>
+        <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>Esta conversación quizá no sea compatible con confirmaciones de entrega. Tal vez no recibas las confirmaciones de entrega de los mensajes que envies.</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatController.cpp" line="216"/>
+        <location filename="../Controllers/FileTransfer/FileTransferController.cpp" line="42"/>
         <source>me</source>
         <translation>Yo</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatController.cpp" line="160"/>
+        <location filename="../Controllers/Chat/ChatController.cpp" line="324"/>
         <source>%1% has gone offline</source>
         <translation>%1% se ha desconectado</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatController.cpp" line="164"/>
+        <location filename="../Controllers/Chat/ChatController.cpp" line="328"/>
         <source>%1% has become available</source>
         <translation>%1% se encuentra disponible</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatController.cpp" line="166"/>
+        <location filename="../Controllers/Chat/ChatController.cpp" line="330"/>
         <source>%1% has gone away</source>
         <translation>%1% se ha ausentado</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatController.cpp" line="168"/>
+        <location filename="../Controllers/Chat/ChatController.cpp" line="332"/>
         <source>%1% is now busy</source>
         <translatorcomment>TMPFIX genero: o/a? sinonimo? masculino?</translatorcomment>
@@ -42,155 +53,159 @@
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="56"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="74"/>
         <source>The day is now %1%</source>
         <translation>El día es ahora %1%</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="191"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="209"/>
+        <source>Couldn&apos;t send message: %1%</source>
+        <translation>No se ha podido enviar el mensaje: %1%</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="269"/>
         <source>Error sending message</source>
         <translation>Error enviando mensaje</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="197"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="275"/>
         <source>Bad request</source>
         <translation>Solicitud incorrecta</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="198"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="276"/>
         <source>Conflict</source>
         <translation>Conflicto</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="199"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="277"/>
         <source>This feature is not implemented</source>
         <translation>Esta característica no está implementada</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="200"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="278"/>
         <source>Forbidden</source>
         <translation>Prohibido</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="201"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="279"/>
         <source>Recipient can no longer be contacted</source>
         <translation>El destinatario ya no puede ser contactado</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="202"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="280"/>
         <source>Internal server error</source>
         <translation>Error interno del servidor</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="203"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="281"/>
         <source>Item not found</source>
         <translation>Elemento no encontrado</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="204"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="282"/>
         <source>JID Malformed</source>
         <translation>JID Malformado</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="205"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="283"/>
         <source>Message was rejected</source>
         <translation>El mensaje ha sido rechazado</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="206"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="284"/>
         <source>Not allowed</source>
         <translation>No permitido</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="207"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="285"/>
         <source>Not authorized</source>
         <translation>No autorizado</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="208"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="286"/>
         <source>Payment is required</source>
         <translation>Pago requerido</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="209"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="287"/>
         <source>Recipient is unavailable</source>
         <translation>Destinatario no disponible</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="210"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="288"/>
         <source>Redirect</source>
         <translation>Redirección</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="211"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="289"/>
         <source>Registration required</source>
         <translation>Registro requerido</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="212"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="290"/>
         <source>Recipient&apos;s server not found</source>
         <translation>No se ha encontrado el servidor del destinatario</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="213"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="291"/>
         <source>Remote server timeout</source>
         <translation>Tiempo de espera del servidor remoto agotado</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="214"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="292"/>
         <source>The server is low on resources</source>
         <translation>El servidor tiene pocos recursos disponibles</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="215"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="293"/>
         <source>The service is unavailable</source>
         <translation>El servicio no está disponible</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="216"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="294"/>
         <source>A subscription is required</source>
         <translation>Se requiere una suscripción</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="217"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="295"/>
         <source>Undefined condition</source>
         <translation>Condición no definida</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="218"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="296"/>
         <source>Unexpected request</source>
         <translation>Solicitud inesperada</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="114"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="222"/>
         <source>Room %1% is not responding. This operation may never complete.</source>
         <translation>La sala %1% no responde. Es posible que esta operación no se complete nunca.</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="125"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="233"/>
         <source>Unable to enter this room</source>
         <translation>No se puede entrar en esta sala</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="131"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="239"/>
         <source>Unable to enter this room as %1%, retrying as %2%</source>
         <translation>No se puede entrar en esta sala como %1%, reintentando como %2%</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="135"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="243"/>
         <source>No nickname specified</source>
         <translation>No se ha especificado nick</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="139"/>
         <source>A password needed</source>
-        <translation>Se necesita contraseña</translation>
+        <translation type="obsolete">Se necesita contraseña</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="143"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="251"/>
         <source>Only members may enter</source>
         <translation>Solo los miembros pueden entrar</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="147"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="255"/>
         <source>You are banned from the room</source>
         <translatorcomment>bloqueado?</translatorcomment>
@@ -198,70 +213,75 @@
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="151"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="259"/>
         <source>The room is full</source>
-        <translation>La sala esta llena</translation>
+        <translation>La sala está llena</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="155"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="263"/>
         <source>The room does not exist</source>
         <translation>La sala no existe</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="173"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="269"/>
+        <source>Couldn&apos;t join room: %1%.</source>
+        <translation>No se ha podido entrar a la sala: %1%.</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="281"/>
         <source>You have entered room %1% as %2%.</source>
         <translation>Has entrado a la sala %1% como %2%.</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="214"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="332"/>
         <source>%1% has entered the room as a %2%.</source>
         <translation>%1% ha entrado en la sala como %2%.</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="217"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="335"/>
         <source>%1% has entered the room.</source>
         <translation>%1% ha entrado a la sala.</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="243"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="384"/>
         <source>moderator</source>
         <translation>moderador</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="244"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="385"/>
         <source>participant</source>
         <translation>participante</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="245"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="386"/>
         <source>visitor</source>
         <translation>visitante</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="283"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="436"/>
         <source>The room subject is now: %1%</source>
         <translation>El tema de la sala es ahora: %1%</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="313"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="470"/>
         <source>%1% is now a %2%</source>
         <translation>%1% ahora es un %2%</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="319"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="486"/>
         <source>Moderators</source>
         <translation>Moderadores</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="320"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="487"/>
         <source>Participants</source>
         <translation>Participantes</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="321"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="488"/>
         <source>Visitors</source>
         <translation>Visitantes</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="322"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="489"/>
         <source>Occupants</source>
         <translatorcomment>TMPFIX, used where?</translatorcomment>
@@ -269,172 +289,226 @@
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="336"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="503"/>
         <source>Trying to enter room %1%</source>
         <translation>Intentando entrar a la sala %1%</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="365"/>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="474"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="544"/>
+        <source>%1% has left the room%2%</source>
+        <translation>%1% ha salido de la sala %2%</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="548"/>
+        <source>You have been kicked out of the room</source>
+        <translation>Has sido expulsado de la sala</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="549"/>
+        <source>You have been banned from the room</source>
+        <translation>Has sido vetado de la sala</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="550"/>
+        <source>You are no longer a member of the room and have been removed</source>
+        <translation>Ya no eres un miembro de la sala y has sido expulsado</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="551"/>
+        <source>The room has been destroyed</source>
+        <translation>La sala ha sido destruida</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="667"/>
         <source>%1% has left the room</source>
         <translation>%1% ha salido de la sala</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="365"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="719"/>
+        <source>Room configuration failed: %1%.</source>
+        <translation>La configuración de la sala ha fallado: %1%.</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="725"/>
+        <source>Occupant role change failed: %1%.</source>
+        <translation>El cambio de rol del ocupante ha fallado: %1%.</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="553"/>
         <source>You have left the room</source>
         <translation>Has salido de la sala</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="439"/>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="503"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="247"/>
+        <source>The correct room password is needed</source>
+        <translation>Se necesita la contraseña de sala correcta</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="632"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="696"/>
         <source> and </source>
         <translation> y </translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="463"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="656"/>
         <source>%1% have entered the room</source>
         <translation>%1% han entrado a la sala</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="466"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="659"/>
         <source>%1% has entered the room</source>
         <translation>%1% ha entrado a la sala</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="471"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="664"/>
         <source>%1% have left the room</source>
         <translation>%1% han salido de la sala</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="479"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="672"/>
         <source>%1% have entered then left the room</source>
         <translation>%1% han entrado y salido de la sala</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="482"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="675"/>
         <source>%1% has entered then left the room</source>
         <translation>%1% ha entrado y salido de la sala</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="487"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="680"/>
         <source>%1% have left then returned to the room</source>
         <translation>%1% han salido y vuelto a la sala</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="490"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="683"/>
         <source>%1% has left then returned to the room</source>
         <translation>%1% ha salido y vuelto a la sala</translation>
     </message>
     <message>
-        <location filename="../Controllers/EventNotifier.cpp" line="51"/>
+        <location filename="../Controllers/EventNotifier.cpp" line="59"/>
         <source>%1% wants to add you to his/her contact list</source>
         <translation>%1% quiere añadirte a su lista de contactos</translation>
     </message>
     <message>
-        <location filename="../Controllers/EventNotifier.cpp" line="55"/>
+        <location filename="../Controllers/EventNotifier.cpp" line="63"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="438"/>
+        <location filename="../Controllers/EventNotifier.cpp" line="67"/>
+        <source>%1% has invited you to enter the %2% room</source>
+        <translation>%1% te ha invitado a entrar a la sala %2%</translation>
+    </message>
+    <message>
+        <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>Dirección de usuario no válida. La dirección de usuario ha de ser de la forma &apos;alicia@paismaravillas.lit&apos;</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="568"/>
         <source>Unknown Error</source>
         <translation>Error Desconocido</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="439"/>
+        <location filename="../Controllers/MainController.cpp" line="569"/>
         <source>Unable to find server</source>
         <translation>No se puede encontrar el servidor</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="440"/>
+        <location filename="../Controllers/MainController.cpp" line="570"/>
         <source>Error connecting to server</source>
         <translation>Error conectando al servidor</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="441"/>
+        <location filename="../Controllers/MainController.cpp" line="571"/>
         <source>Error while receiving server data</source>
         <translation>Error al recibir datos del servidor</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="442"/>
+        <location filename="../Controllers/MainController.cpp" line="572"/>
         <source>Error while sending data to the server</source>
         <translation>Error al enviar datos al servidor</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="443"/>
+        <location filename="../Controllers/MainController.cpp" line="573"/>
         <source>Error parsing server data</source>
         <translation>Error analizando datos del servidor</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="444"/>
+        <location filename="../Controllers/MainController.cpp" line="574"/>
         <source>Login/password invalid</source>
         <translation>Usuario/contraseña no válidos</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="445"/>
+        <location filename="../Controllers/MainController.cpp" line="575"/>
         <source>Error while compressing stream</source>
         <translation>Error comprimiendo flujo de datos</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="446"/>
+        <location filename="../Controllers/MainController.cpp" line="576"/>
         <source>Server verification failed</source>
         <translation>La verificación del servidor ha fallado</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="447"/>
+        <location filename="../Controllers/MainController.cpp" line="577"/>
         <source>Authentication mechanisms not supported</source>
         <translation>Mecanismo de autenticación no soportado</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="448"/>
+        <location filename="../Controllers/MainController.cpp" line="578"/>
         <source>Unexpected response</source>
         <translation>Respuesta inesperada</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="449"/>
+        <location filename="../Controllers/MainController.cpp" line="579"/>
         <source>Error binding resource</source>
         <translation>Error vinculando recurso</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="450"/>
+        <location filename="../Controllers/MainController.cpp" line="580"/>
         <source>Error starting session</source>
         <translation>Error iniciando sesión</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="451"/>
+        <location filename="../Controllers/MainController.cpp" line="581"/>
         <source>Stream error</source>
         <translation>Error de flujo de datos</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="452"/>
+        <location filename="../Controllers/MainController.cpp" line="582"/>
         <source>Encryption error</source>
         <translation>Error de cifrado</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="453"/>
+        <location filename="../Controllers/MainController.cpp" line="583"/>
         <source>Error loading certificate (Invalid password?)</source>
         <translation>Error cargando certificado (¿Contraseña no válida?)</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="454"/>
+        <location filename="../Controllers/MainController.cpp" line="584"/>
         <source>Certificate not authorized</source>
         <translation>Certificado no autorizado</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="456"/>
+        <location filename="../Controllers/MainController.cpp" line="585"/>
+        <source>Certificate card removed</source>
+        <translation>Tarjeta de certificado eliminada</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="587"/>
         <source>Unknown certificate</source>
         <translation>Certificado desconocido</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="457"/>
+        <location filename="../Controllers/MainController.cpp" line="588"/>
         <source>Certificate has expired</source>
         <translation>El certificado ha caducado</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="458"/>
+        <location filename="../Controllers/MainController.cpp" line="589"/>
         <source>Certificate is not yet valid</source>
         <translation>El certificado aún no es válido</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="459"/>
+        <location filename="../Controllers/MainController.cpp" line="590"/>
         <source>Certificate is self-signed</source>
         <translatorcomment>TMPFIX, firma personal?</translatorcomment>
@@ -442,20 +516,20 @@
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="460"/>
+        <location filename="../Controllers/MainController.cpp" line="591"/>
         <source>Certificate has been rejected</source>
         <translation>El certificado ha sido rechazado</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="461"/>
+        <location filename="../Controllers/MainController.cpp" line="592"/>
         <source>Certificate is not trusted</source>
         <translation>El certificado no es de confianza</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="462"/>
+        <location filename="../Controllers/MainController.cpp" line="593"/>
         <source>Certificate cannot be used for encrypting your connection</source>
         <translation>El certificado no puede usarse para cifrar tu conexión</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="463"/>
+        <location filename="../Controllers/MainController.cpp" line="594"/>
         <source>Certificate path length constraint exceeded</source>
         <translatorcomment>TMPFIX</translatorcomment>
@@ -463,42 +537,62 @@
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="464"/>
+        <location filename="../Controllers/MainController.cpp" line="595"/>
         <source>Invalid certificate signature</source>
         <translation>Firma de certificado no válida</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="465"/>
+        <location filename="../Controllers/MainController.cpp" line="596"/>
         <source>Invalid Certificate Authority</source>
         <translation>Entidad Certificadora no Válida</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="466"/>
+        <location filename="../Controllers/MainController.cpp" line="597"/>
         <source>Certificate does not match the host identity</source>
         <translation>El certificado no coincide con la identidad del servidor</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="476"/>
+        <location filename="../Controllers/MainController.cpp" line="598"/>
+        <source>Certificate has been revoked</source>
+        <translation>El certificado ha sido revocado</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="599"/>
+        <source>Unable to determine certificate revocation state</source>
+        <translation>No se puede determinar el estado de revocación del certificado</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="609"/>
         <source>Certificate error</source>
         <translation>Error de certificado</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="490"/>
+        <location filename="../Controllers/MainController.cpp" line="616"/>
+        <source>Re-enter credentials and retry</source>
+        <translation>Vuelve a introducir las credenciales y prueba de nuevo</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="629"/>
+        <source>Disconnected from %1%: %2%. To reconnect, Sign Out and provide your password again.</source>
+        <translation>Desconectado de %1%: %2%. Para reconectar, desconéctate y proporciona tu contraseña de nuevo.</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="635"/>
         <source>Reconnect to %1% failed: %2%. Will retry in %3% seconds.</source>
         <translation>La reconexión a %1% ha fallado: %2%. Se intentará de nuevo en %3% segundos.</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="493"/>
+        <location filename="../Controllers/MainController.cpp" line="638"/>
         <source>Disconnected from %1%: %2%.</source>
         <translation>Desconectado de %1%: %2%.</translation>
     </message>
     <message>
-        <location filename="../Controllers/Roster/RosterController.cpp" line="126"/>
-        <location filename="../Controllers/Roster/RosterController.cpp" line="152"/>
-        <location filename="../Controllers/Roster/RosterController.cpp" line="214"/>
+        <location filename="../Controllers/Roster/RosterController.cpp" line="131"/>
+        <location filename="../Controllers/Roster/RosterController.cpp" line="157"/>
+        <location filename="../Controllers/Roster/RosterController.cpp" line="222"/>
         <source>Contacts</source>
         <translation>Contactos</translation>
     </message>
     <message>
-        <location filename="../Controllers/Roster/RosterController.cpp" line="251"/>
+        <location filename="../Controllers/Roster/RosterController.cpp" line="263"/>
         <source>Server %1% rejected contact list change to item &apos;%2%&apos;</source>
         <translation>El servidor %1% ha rechazado el cambio al elemento &apos;%2%&apos; de la lista de contactos</translation>
@@ -531,4 +625,29 @@
         <translation>Ha habido un error publicando los datos de tu perfil</translation>
     </message>
+    <message>
+        <location filename="../Controllers/ChatMessageSummarizer.cpp" line="33"/>
+        <source>%1% (%2%)</source>
+        <translation>%1% (%2%)</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/ChatMessageSummarizer.cpp" line="38"/>
+        <source>%1% and %2% others (%3%)</source>
+        <translation>%1% y %2% más (%3%)</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/ChatMessageSummarizer.cpp" line="41"/>
+        <source>%1%, %2% (%3%)</source>
+        <translation>%1%, %2% (%3%)</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/CAPICertificateSelector.cpp" line="63"/>
+        <source>TLS Client Certificate Selection</source>
+        <translation>Selección de certificado de cliente TLS</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/CAPICertificateSelector.cpp" line="64"/>
+        <source>Select a certificate to use for authentication</source>
+        <translation>Selecciona un certificado para usar como autenticación</translation>
+    </message>
 </context>
 <context>
@@ -686,13 +805,110 @@
     </message>
     <message>
-        <location filename="../QtUI/EventViewer/QtEvent.cpp" line="63"/>
+        <location filename="../QtUI/EventViewer/QtEvent.cpp" line="68"/>
         <source>%1 would like to add you to their contact list.</source>
         <translation>%1 quiere añadirte a su lista de contactos.</translation>
     </message>
     <message>
-        <location filename="../QtUI/EventViewer/QtEvent.cpp" line="66"/>
+        <location filename="../QtUI/EventViewer/QtEvent.cpp" line="71"/>
         <source>%1 would like to add you to their contact list, saying &apos;%2&apos;</source>
         <translation>%1 quiere añadirte a su lista de contactos, diciendo &apos;%2&apos;</translation>
     </message>
+    <message>
+        <location filename="../QtUI/EventViewer/QtEvent.cpp" line="81"/>
+        <source>%1 has invited you to enter the %2 room.</source>
+        <translation>%1 te ha invitado a entrar a la sala %2.</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="982"/>
+        <source>You&apos;ve been invited to enter the %1 room.</source>
+        <translation>Te han invitado a entrar a la sala %1.</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="984"/>
+        <source>Reason: %1</source>
+        <translation>Motivo: %1</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="987"/>
+        <source>This person may not have really sent this invitation!</source>
+        <translation>¡Es posible que esta persona no haya enviado realmente esta invitación!</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="46"/>
+        <source>Direction</source>
+        <translatorcomment>Sentido?</translatorcomment>
+        <translation>Dirección</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="47"/>
+        <source>Other Party</source>
+        <translatorcomment>Sounds weird... &quot;Tu contacto&quot; o similar?</translatorcomment>
+        <translation type="unfinished">La otra parte</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="48"/>
+        <source>State</source>
+        <translation>Estado</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="49"/>
+        <source>Progress</source>
+        <translation>Progreso</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="50"/>
+        <source>Size</source>
+        <translation>Tamaño</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="65"/>
+        <source>Incoming</source>
+        <translation>Entrante</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="65"/>
+        <source>Outgoing</source>
+        <translation>Saliente</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="74"/>
+        <source>Waiting for start</source>
+        <translation>Esperando que comience</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="76"/>
+        <source>Waiting for other side to accept</source>
+        <translation>Esperando a que el otro lado acepte</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="78"/>
+        <source>Negotiating</source>
+        <translation>Negociando</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="80"/>
+        <source>Transferring</source>
+        <translation>Transfiriendo</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="82"/>
+        <source>Finished</source>
+        <translation>Finalizado</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="84"/>
+        <source>Failed</source>
+        <translation>Fallido</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="86"/>
+        <source>Canceled</source>
+        <translation>Cancelado</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="142"/>
+        <source>Connection Options</source>
+        <translation>Opciones de conexión</translation>
+    </message>
 </context>
 <context>
@@ -918,41 +1134,90 @@
 </context>
 <context>
+    <name>QtAffiliationEditor</name>
+    <message>
+        <location filename="../QtUI/QtAffiliationEditor.ui" line="14"/>
+        <source>Edit Affiliations</source>
+        <translation>Editar afiliaciones</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAffiliationEditor.ui" line="28"/>
+        <source>Affiliation:</source>
+        <translation>Afiliación:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAffiliationEditor.ui" line="36"/>
+        <source>Owner</source>
+        <translation>Propietario</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAffiliationEditor.ui" line="41"/>
+        <source>Administrator</source>
+        <translation>Administrador</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAffiliationEditor.ui" line="46"/>
+        <source>Member</source>
+        <translation>Miembro</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAffiliationEditor.ui" line="51"/>
+        <source>Outcast (Banned)</source>
+        <translation>Marginado (Vetado)</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAffiliationEditor.ui" line="68"/>
+        <source>Add User</source>
+        <translation>Añadir usuario</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAffiliationEditor.ui" line="75"/>
+        <source>Remove User</source>
+        <translation>Eliminar usuario</translation>
+    </message>
+</context>
+<context>
     <name>QtBookmarkDetailWindow</name>
     <message>
-        <location filename="../QtUI/QtBookmarkDetailWindow.ui"/>
-        <location filename="../QtUI/ui_QtBookmarkDetailWindow.h" line="137"/>
+        <location filename="../QtUI/QtBookmarkDetailWindow.ui" line="20"/>
         <source>Edit Bookmark Details</source>
         <translation>Editar Detalles de Marcador</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtBookmarkDetailWindow.ui"/>
-        <location filename="../QtUI/ui_QtBookmarkDetailWindow.h" line="138"/>
+        <location filename="../QtUI/QtBookmarkDetailWindow.ui" line="40"/>
         <source>Bookmark Name:</source>
         <translation>Nombre del Marcador:</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtBookmarkDetailWindow.ui"/>
-        <location filename="../QtUI/ui_QtBookmarkDetailWindow.h" line="139"/>
+        <location filename="../QtUI/QtBookmarkDetailWindow.ui" line="50"/>
         <source>Room Address:</source>
         <translation>Dirección de la sala:</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtBookmarkDetailWindow.ui"/>
-        <location filename="../QtUI/ui_QtBookmarkDetailWindow.h" line="140"/>
+        <location filename="../QtUI/QtBookmarkDetailWindow.ui" line="60"/>
         <source>Your Nickname:</source>
         <translation>Tu nick:</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtBookmarkDetailWindow.ui"/>
-        <location filename="../QtUI/ui_QtBookmarkDetailWindow.h" line="141"/>
+        <location filename="../QtUI/QtBookmarkDetailWindow.ui" line="70"/>
         <source>Room password:</source>
         <translation>Contraseña de la sala:</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtBookmarkDetailWindow.ui"/>
-        <location filename="../QtUI/ui_QtBookmarkDetailWindow.h" line="142"/>
-        <source>Join automatically</source>
+        <location filename="../QtUI/QtBookmarkDetailWindow.ui" line="93"/>
+        <source>Enter automatically</source>
         <translation>Entrar automáticamente</translation>
     </message>
+    <message>
+        <source>Join automatically</source>
+        <translation type="obsolete">Entrar automáticamente</translation>
+    </message>
+</context>
+<context>
+    <name>QtCertificateViewerDialog</name>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.ui" line="14"/>
+        <source>Certificate Viewer</source>
+        <translation>Visor de certificados</translation>
+    </message>
 </context>
 <context>
@@ -972,4 +1237,126 @@
 </context>
 <context>
+    <name>QtConnectionSettings</name>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="14"/>
+        <source>Connection Options</source>
+        <translation>Opciones de conexión</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="22"/>
+        <source>Connection Method:</source>
+        <translation>Método de conexión:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="36"/>
+        <source>Automatic</source>
+        <translation>Automático</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="41"/>
+        <source>Manual</source>
+        <translation>Manual</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="46"/>
+        <source>BOSH</source>
+        <translation>BOSH</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="99"/>
+        <source>Secure connection:</source>
+        <translation>Conexión segura:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="107"/>
+        <source>Never</source>
+        <translation>Nunca</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="112"/>
+        <source>Encrypt when possible</source>
+        <translation>Cifrar cuando sea posible</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="117"/>
+        <source>Always encrypt</source>
+        <translation>Cifrar siempre</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="127"/>
+        <source>Allow Compression</source>
+        <translation>Permitir compresión</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="134"/>
+        <source>Allow sending password over insecure connection</source>
+        <translation>Permitir enviar contraseña sobre conexión insegura</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="157"/>
+        <source>Manually select server</source>
+        <translation>Seleccionar servidor manualmente</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="185"/>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="315"/>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="429"/>
+        <source>Hostname:</source>
+        <translation>Nombre de servidor:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="208"/>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="338"/>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="452"/>
+        <source>Port:</source>
+        <translation>Puerto:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="230"/>
+        <source>Connection Proxy</source>
+        <translation>Proxy de conexión</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="238"/>
+        <source>Proxy type:</source>
+        <translation>Tipo de proxy:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="249"/>
+        <source>None</source>
+        <translation>Ninguno</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="254"/>
+        <source>Use system-configured proxy</source>
+        <translation>Usar el proxy del sistema</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="259"/>
+        <source>SOCKS5</source>
+        <translation>SOCKS5</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="264"/>
+        <source>HTTP Connect</source>
+        <translation>HTTP Connect</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="287"/>
+        <source>Override system-configured proxy</source>
+        <translation>Reemplazar el proxy del sistema</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="382"/>
+        <source>BOSH URI:</source>
+        <translation>URI de BOSH:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="401"/>
+        <source>Manually select HTTP proxy</source>
+        <translation>Seleccionar proxy HTTP manualmente</translation>
+    </message>
+</context>
+<context>
     <name>QtEventWindow</name>
     <message>
@@ -979,33 +1366,69 @@
 </context>
 <context>
+    <name>QtHistoryWindow</name>
+    <message>
+        <location filename="../QtUI/QtHistoryWindow.ui" line="14"/>
+        <source>History</source>
+        <translation>Historial</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtHistoryWindow.ui" line="22"/>
+        <source>Search:</source>
+        <translation>Buscar:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtHistoryWindow.ui" line="42"/>
+        <source>Next</source>
+        <translation>Siguiente</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtHistoryWindow.ui" line="52"/>
+        <source>Previous</source>
+        <translation>Anterior</translation>
+    </message>
+</context>
+<context>
     <name>QtJoinMUCWindow</name>
     <message>
-        <location filename="../QtUI/QtJoinMUCWindow.ui"/>
-        <location filename="../QtUI/ui_QtJoinMUCWindow.h" line="124"/>
-        <location filename="../QtUI/ui_QtJoinMUCWindow.h" line="130"/>
+        <location filename="../QtUI/QtJoinMUCWindow.ui" line="20"/>
+        <location filename="../QtUI/QtJoinMUCWindow.ui" line="113"/>
         <source>Enter Room</source>
         <translation>Entrar a la sala</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtJoinMUCWindow.ui"/>
-        <location filename="../QtUI/ui_QtJoinMUCWindow.h" line="125"/>
+        <location filename="../QtUI/QtJoinMUCWindow.ui" line="28"/>
+        <source>Room Address:</source>
+        <translation>Dirección de la sala:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtJoinMUCWindow.ui" line="42"/>
+        <source>Your Nickname:</source>
+        <translation>Tu nick:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtJoinMUCWindow.ui" line="59"/>
+        <source>Room Password:</source>
+        <translation>Contraseña de la sala:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtJoinMUCWindow.ui" line="71"/>
+        <source>Automatically configure newly created rooms</source>
+        <translation>Configurar automáticamente salas de nueva creación</translation>
+    </message>
+    <message>
         <source>Room:</source>
-        <translation>Sala:</translation>
+        <translation type="obsolete">Sala:</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtJoinMUCWindow.ui"/>
-        <location filename="../QtUI/ui_QtJoinMUCWindow.h" line="126"/>
+        <location filename="../QtUI/QtJoinMUCWindow.ui" line="35"/>
         <source>Search ...</source>
         <translation>Buscar ...</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtJoinMUCWindow.ui"/>
-        <location filename="../QtUI/ui_QtJoinMUCWindow.h" line="127"/>
         <source>Nickname:</source>
-        <translation>Nick:</translation>
+        <translation type="obsolete">Nick:</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtJoinMUCWindow.ui"/>
-        <location filename="../QtUI/ui_QtJoinMUCWindow.h" line="129"/>
+        <location filename="../QtUI/QtJoinMUCWindow.ui" line="106"/>
         <source>Enter automatically in future</source>
         <translation>Entrar automáticamente en el futuro</translation>
@@ -1015,30 +1438,25 @@
     <name>QtMUCSearchWindow</name>
     <message>
-        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.ui"/>
-        <location filename="../QtUI/MUCSearch/ui_QtMUCSearchWindow.h" line="118"/>
+        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.ui" line="14"/>
         <source>Search Room</source>
         <translation>Buscar Sala</translation>
     </message>
     <message>
-        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.ui"/>
-        <location filename="../QtUI/MUCSearch/ui_QtMUCSearchWindow.h" line="119"/>
+        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.ui" line="20"/>
         <source>Service:</source>
         <translation>Servicio:</translation>
     </message>
     <message>
-        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.ui"/>
-        <location filename="../QtUI/MUCSearch/ui_QtMUCSearchWindow.h" line="121"/>
+        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.ui" line="74"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.ui"/>
-        <location filename="../QtUI/MUCSearch/ui_QtMUCSearchWindow.h" line="122"/>
+        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.ui" line="84"/>
         <source>OK</source>
         <translation>Aceptar</translation>
     </message>
     <message>
-        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.ui"/>
-        <location filename="../QtUI/MUCSearch/ui_QtMUCSearchWindow.h" line="123"/>
+        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.ui" line="96"/>
         <source>List rooms</source>
         <translation>Listar salas</translation>
@@ -1092,30 +1510,25 @@ Si escoges posponer esta elección, se te preguntará de nuevo la próxima vez q
     <name>QtUserSearchFieldsPage</name>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchFieldsPage.ui"/>
-        <location filename="../QtUI/UserSearch/ui_QtUserSearchFieldsPage.h" line="119"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchFieldsPage.ui" line="27"/>
         <source>Nickname:</source>
         <translation>Nick:</translation>
     </message>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchFieldsPage.ui"/>
-        <location filename="../QtUI/UserSearch/ui_QtUserSearchFieldsPage.h" line="120"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchFieldsPage.ui" line="37"/>
         <source>First name:</source>
         <translation>Nombre:</translation>
     </message>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchFieldsPage.ui"/>
-        <location filename="../QtUI/UserSearch/ui_QtUserSearchFieldsPage.h" line="121"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchFieldsPage.ui" line="47"/>
         <source>Last name:</source>
         <translation>Apellido:</translation>
     </message>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchFieldsPage.ui"/>
-        <location filename="../QtUI/UserSearch/ui_QtUserSearchFieldsPage.h" line="122"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchFieldsPage.ui" line="57"/>
         <source>E-Mail:</source>
         <translation>Correo electrónico:</translation>
     </message>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchFieldsPage.ui"/>
-        <location filename="../QtUI/UserSearch/ui_QtUserSearchFieldsPage.h" line="124"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchFieldsPage.ui" line="74"/>
         <source>Fetching search fields</source>
         <translation>Obteniendo campos de búsqueda</translation>
@@ -1125,30 +1538,25 @@ Si escoges posponer esta elección, se te preguntará de nuevo la próxima vez q
     <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"/>
         <source>Add a user</source>
         <translation>Añadir un usuario</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"/>
         <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>
         <translation>Añadir a otro usuario a tu lista de contactos. Si conoces su dirección, puedes introducirla directamente, o puedes buscar al usuario.</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"/>
         <source>I know their address:</source>
         <translation>Conozco su dirección:</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"/>
         <source>I&apos;d like to search my server</source>
         <translation>Quiero buscar en mi servidor</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"/>
         <source>I&apos;d like to search another server:</source>
         <translation>Quiero buscar en otro servidor:</translation>
@@ -1168,4 +1576,12 @@ Si escoges posponer esta elección, se te preguntará de nuevo la próxima vez q
 </context>
 <context>
+    <name>QtUserSearchResultsPage</name>
+    <message>
+        <location filename="../QtUI/UserSearch/QtUserSearchResultsPage.ui" line="27"/>
+        <source>No results.</source>
+        <translation>No hay resultados.</translation>
+    </message>
+</context>
+<context>
     <name>QtUserSearchWindow</name>
     <message>
@@ -1201,6 +1617,5 @@ Si escoges posponer esta elección, se te preguntará de nuevo la próxima vez q
     <name>QtUserSearchWizard</name>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchWizard.ui"/>
-        <location filename="../QtUI/UserSearch/ui_QtUserSearchWizard.h" line="39"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchWizard.ui" line="14"/>
         <source>Find User</source>
         <translation>Buscar Usuario</translation>
@@ -1210,9 +1625,19 @@ Si escoges posponer esta elección, se te preguntará de nuevo la próxima vez q
     <name>Swift::ChatListModel</name>
     <message>
-        <location filename="../QtUI/ChatList/ChatListModel.cpp" line="15"/>
+        <location filename="../QtUI/ChatList/ChatListModel.cpp" line="17"/>
         <source>Bookmarked Rooms</source>
         <translatorcomment>TMPFIX? &quot;de marcadores&quot;?</translatorcomment>
         <translation>Salas en Marcadores</translation>
     </message>
+    <message>
+        <location filename="../QtUI/ChatList/ChatListModel.cpp" line="18"/>
+        <source>Recent Chats</source>
+        <translation>Conversaciones recientes</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/ChatList/ChatListModel.cpp" line="20"/>
+        <source>Opened Whiteboards</source>
+        <translation>Pizarras abiertas</translation>
+    </message>
 </context>
 <context>
@@ -1252,4 +1677,55 @@ Si escoges posponer esta elección, se te preguntará de nuevo la próxima vez q
 </context>
 <context>
+    <name>Swift::QtAdHocCommandWindow</name>
+    <message>
+        <location filename="../QtUI/QtAdHocCommandWindow.cpp" line="36"/>
+        <source>Cancel</source>
+        <translation>Cancelar</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAdHocCommandWindow.cpp" line="39"/>
+        <source>Back</source>
+        <translation>Retroceder</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAdHocCommandWindow.cpp" line="42"/>
+        <source>Next</source>
+        <translation>Siguiente</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAdHocCommandWindow.cpp" line="45"/>
+        <source>Complete</source>
+        <translation>Completado</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAdHocCommandWindow.cpp" line="86"/>
+        <source>Error: %1</source>
+        <translation>Error: %1</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAdHocCommandWindow.cpp" line="87"/>
+        <source>Warning: %1</source>
+        <translation>Advertencia: %1</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAdHocCommandWindow.cpp" line="104"/>
+        <source>Error executing command</source>
+        <translation>Error ejecutando el comando</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtAffiliationEditor</name>
+    <message>
+        <location filename="../QtUI/QtAffiliationEditor.cpp" line="48"/>
+        <source>Add User</source>
+        <translation>Añadir usuario</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAffiliationEditor.cpp" line="48"/>
+        <source>Added User&apos;s Address:</source>
+        <translation>Dirección del usuario añadido:</translation>
+    </message>
+</context>
+<context>
     <name>Swift::QtAvatarWidget</name>
     <message>
@@ -1275,6 +1751,10 @@ Si escoges posponer esta elección, se te preguntará de nuevo la próxima vez q
     <message>
         <location filename="../QtUI/QtAvatarWidget.cpp" line="81"/>
+        <source>Image Files (*.png *.jpg *.jpeg *.gif)</source>
+        <translation>Archivos de imagen (*.png *.jpg *.jpeg *.gif)</translation>
+    </message>
+    <message>
         <source>Image Files (*.png *.jpg *.gif)</source>
-        <translation>Archivos de imagen (*.png *.jpg *.gif)</translation>
+        <translation type="obsolete">Archivos de imagen (*.png *.jpg *.gif)</translation>
     </message>
     <message>
@@ -1307,57 +1787,352 @@ Si escoges posponer esta elección, se te preguntará de nuevo la próxima vez q
 </context>
 <context>
+    <name>Swift::QtCertificateViewerDialog</name>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="95"/>
+        <source>General</source>
+        <translation>General</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="96"/>
+        <source>Valid From</source>
+        <translation>Válido desde</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="97"/>
+        <source>Valid To</source>
+        <translation>Válido hasta</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="98"/>
+        <source>Serial Number</source>
+        <translation>Número de serie</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="99"/>
+        <source>Version</source>
+        <translation>Versión</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="101"/>
+        <source>Subject</source>
+        <translation>Sujeto</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="102"/>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="124"/>
+        <source>Organization</source>
+        <translation>Organización</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="103"/>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="125"/>
+        <source>Common Name</source>
+        <translation>Nombre común</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="104"/>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="126"/>
+        <source>Locality</source>
+        <translation>Localidad</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="105"/>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="127"/>
+        <source>Organizational Unit</source>
+        <translation>Unidad organizativa</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="106"/>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="128"/>
+        <source>Country</source>
+        <translation>País</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="107"/>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="129"/>
+        <source>State</source>
+        <translation>Estado</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="110"/>
+        <source>Alternate Subject Names</source>
+        <translation>Nombres de sujeto alternativos</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="115"/>
+        <source>E-mail Address</source>
+        <translation>Dirección de correo electrónico</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="117"/>
+        <source>DNS Name</source>
+        <translation>Nombre DNS</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="123"/>
+        <source>Issuer</source>
+        <translation>Emisor</translation>
+    </message>
+</context>
+<context>
     <name>Swift::QtChatListWindow</name>
     <message>
-        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="62"/>
-        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="66"/>
+        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="82"/>
+        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="86"/>
         <source>Add New Bookmark</source>
         <translation>Añadir Nuevo Marcador</translation>
     </message>
     <message>
-        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="63"/>
+        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="83"/>
         <source>Edit Bookmark</source>
         <translation>Editar Marcador</translation>
     </message>
     <message>
-        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="64"/>
+        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="84"/>
         <source>Remove Bookmark</source>
         <translation>Eliminar Marcador</translation>
     </message>
+    <message>
+        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="173"/>
+        <source>Clear recents</source>
+        <translation>Borrar recientes</translation>
+    </message>
 </context>
 <context>
     <name>Swift::QtChatView</name>
     <message>
-        <location filename="../QtUI/QtChatView.cpp" line="61"/>
+        <location filename="../QtUI/QtChatView.cpp" line="73"/>
         <source>Clear log</source>
         <translation>Borrar texto</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtChatView.cpp" line="62"/>
+        <location filename="../QtUI/QtChatView.cpp" line="74"/>
         <source>You are about to clear the contents of your chat log.</source>
         <translation>Estás a punto de borrar el contenido de esta conversación.</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtChatView.cpp" line="63"/>
+        <location filename="../QtUI/QtChatView.cpp" line="75"/>
         <source>Are you sure?</source>
         <translatorcomment>TMPFIX, genero?</translatorcomment>
         <translation>¿Estás seguro?</translation>
     </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="219"/>
+        <source>%1 edited</source>
+        <translation>%1 editado</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="400"/>
+        <source>Waiting for other side to accept the transfer.</source>
+        <translation>Esperando a que el otro lado acepte la transferencia.</translation>
+    </message>
+    <message>
+        <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>Cancelar</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="405"/>
+        <source>Negotiating...</source>
+        <translation>Negociando...</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="420"/>
+        <source>Transfer has been canceled!</source>
+        <translation>¡La transferencia ha sido cancelada!</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="424"/>
+        <source>Transfer completed successfully.</source>
+        <translation>La transferencia se ha completado con éxito.</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="427"/>
+        <source>Transfer failed.</source>
+        <translation>La transferencia ha fallado.</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="437"/>
+        <source>Started whiteboard chat</source>
+        <translation>Se ha comenzado una conversación de pizarra</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="438"/>
+        <source>Show whiteboard</source>
+        <translation>Mostrar pizarra</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="440"/>
+        <source>Whiteboard chat has been canceled</source>
+        <translation>La conversación de pizarra ha sido cancelada</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="442"/>
+        <source>Whiteboard chat request has been rejected</source>
+        <translation>La solicitud de conversación de pizarra ha sido rechazada</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="451"/>
+        <source>Return to room</source>
+        <translation>Volver a la sala</translation>
+    </message>
 </context>
 <context>
     <name>Swift::QtChatWindow</name>
     <message>
-        <location filename="../QtUI/QtChatWindow.cpp" line="302"/>
+        <location filename="../QtUI/QtChatWindow.cpp" line="157"/>
+        <source>Correcting</source>
+        <translation>Corrigiendo</translation>
+    </message>
+    <message>
+        <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>Esta conversación quizá no sea compatible con la corrección de mensajes. Si envías una corrección de todos modos, es posbile que aparezca como un mensaje duplicado</translation>
+    </message>
+    <message>
+        <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>Esta conversación no es compatible con la corrección de mensajes. Si envías una corrección de todos modos, aparecerá como un mensaje duplicado</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="546"/>
         <source>This message has not been received by your server yet.</source>
         <translation>Este mensaje no ha sido recibido por tu servidor todavía.</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtChatWindow.cpp" line="304"/>
+        <location filename="../QtUI/QtChatWindow.cpp" line="553"/>
         <source>This message may not have been transmitted.</source>
         <translation>Es posible que este mensaje no se haya transmitido.</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtChatWindow.cpp" line="324"/>
+        <location filename="../QtUI/QtChatWindow.cpp" line="562"/>
+        <source>The receipt for this message has been received.</source>
+        <translation>Se ha recibido la confirmación para este mensaje.</translation>
+    </message>
+    <message>
+        <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>
+        <translatorcomment>Plural pain</translatorcomment>
+        <translation>Aún no se ha recibido la confirmación para este mensaje. Es posible que los destinatarios no lo hayan recibido.</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="613"/>
+        <source>Send file</source>
+        <translation>Enviar archivo</translation>
+    </message>
+    <message>
+        <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>Cancelar</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="616"/>
+        <source>Set Description</source>
+        <translation>Establecer descripción</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="617"/>
+        <source>Send</source>
+        <translation>Enviar</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="621"/>
+        <source>Receiving file</source>
+        <translation>Recibiendo archivo</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="624"/>
+        <location filename="../QtUI/QtChatWindow.cpp" line="665"/>
+        <source>Accept</source>
+        <translation>Aceptar</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="659"/>
+        <source>Starting whiteboard chat</source>
+        <translation>Comenzando conversación de pizarra</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="663"/>
+        <source>%1 would like to start a whiteboard chat</source>
+        <translation>%1 quiere comenzar una conversación de pizarra</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="700"/>
+        <source>File transfer description</source>
+        <translation>Descripción de la transferencia de archivo</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="701"/>
+        <source>Description:</source>
+        <translation>Descripción:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="715"/>
+        <source>Save File</source>
+        <translation>Guardar archivo</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="908"/>
+        <source>Change subject…</source>
+        <translation>Cambiar el tema...</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="909"/>
+        <source>Configure room…</source>
+        <translation>Configurar sala...</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="910"/>
+        <source>Edit affiliations…</source>
+        <translation>Editar afiliaciones...</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="911"/>
+        <source>Destroy room</source>
+        <translation>Destruir la sala</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="912"/>
+        <source>Invite person to this room…</source>
+        <translation>Invitar a una persona a esta sala...</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="922"/>
+        <source>Change room subject</source>
+        <translation>Cambiar el tema de la sala</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="922"/>
+        <source>New subject:</source>
+        <translation>Nuevo tema:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="940"/>
+        <source>Confirm room destruction</source>
+        <translation>Confirmar destrucción de la sala</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="941"/>
+        <source>Are you sure you want to destroy the room?</source>
+        <translation>¿Estás seguro de que quieres destruir la sala?</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="942"/>
+        <source>This will destroy the room.</source>
+        <translation>Esto destruirá la sala.</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="993"/>
+        <source>Accept Invite</source>
+        <translation>Aceptar invitación</translation>
+    </message>
+    <message>
         <source>Couldn&apos;t send message: %1</source>
-        <translation>No se ha podido enviar el mensaje: %1</translation>
+        <translation type="obsolete">No se ha podido enviar el mensaje: %1</translation>
     </message>
 </context>
@@ -1365,15 +2140,15 @@ Si escoges posponer esta elección, se te preguntará de nuevo la próxima vez q
     <name>Swift::QtContactEditWidget</name>
     <message>
-        <location filename="../QtUI/QtContactEditWidget.cpp" line="28"/>
+        <location filename="../QtUI/QtContactEditWidget.cpp" line="122"/>
         <source>Name:</source>
         <translation>Nombre:</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtContactEditWidget.cpp" line="34"/>
+        <location filename="../QtUI/QtContactEditWidget.cpp" line="42"/>
         <source>Groups:</source>
         <translation>Grupos:</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtContactEditWidget.cpp" line="56"/>
+        <location filename="../QtUI/QtContactEditWidget.cpp" line="65"/>
         <source>New Group:</source>
         <translation>Nuevo Grupo:</translation>
@@ -1383,30 +2158,30 @@ Si escoges posponer esta elección, se te preguntará de nuevo la próxima vez q
     <name>Swift::QtContactEditWindow</name>
     <message>
-        <location filename="../QtUI/QtContactEditWindow.cpp" line="26"/>
+        <location filename="../QtUI/QtContactEditWindow.cpp" line="28"/>
         <source>Edit contact</source>
         <translation>Editar contacto</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtContactEditWindow.cpp" line="41"/>
+        <location filename="../QtUI/QtContactEditWindow.cpp" line="43"/>
         <source>Remove contact</source>
         <translation>Eliminar contacto</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtContactEditWindow.cpp" line="44"/>
+        <location filename="../QtUI/QtContactEditWindow.cpp" line="46"/>
         <source>OK</source>
         <translation>Aceptar</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtContactEditWindow.cpp" line="82"/>
+        <location filename="../QtUI/QtContactEditWindow.cpp" line="94"/>
         <source>Confirm contact deletion</source>
         <translation>Confirmar eliminación del contacto</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtContactEditWindow.cpp" line="83"/>
+        <location filename="../QtUI/QtContactEditWindow.cpp" line="95"/>
         <source>Are you sure you want to delete this contact?</source>
         <translation>¿Seguro que quieres eliminar este contacto?</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtContactEditWindow.cpp" line="84"/>
+        <location filename="../QtUI/QtContactEditWindow.cpp" line="96"/>
         <source>This will remove the contact &apos;%1&apos; from all groups they may be in.</source>
         <translation>Esto eliminará el contacto &apos;%1&apos; de todos los grupos en los que esté.</translation>
@@ -1416,5 +2191,5 @@ Si escoges posponer esta elección, se te preguntará de nuevo la próxima vez q
     <name>Swift::QtEventWindow</name>
     <message>
-        <location filename="../QtUI/EventViewer/QtEventWindow.cpp" line="47"/>
+        <location filename="../QtUI/EventViewer/QtEventWindow.cpp" line="48"/>
         <source>Display Notice</source>
         <translation>Mostrar Aviso</translation>
@@ -1422,7 +2197,42 @@ Si escoges posponer esta elección, se te preguntará de nuevo la próxima vez q
 </context>
 <context>
+    <name>Swift::QtFileTransferListWidget</name>
+    <message>
+        <location filename="../QtUI/QtFileTransferListWidget.cpp" line="39"/>
+        <source>Clear Finished Transfers</source>
+        <translation>Borrar transferencias finalizadas</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListWidget.cpp" line="44"/>
+        <source>File Transfer List</source>
+        <translation>Lista de transferencia de archivos</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtHistoryWindow</name>
+    <message>
+        <location filename="../QtUI/QtHistoryWindow.cpp" line="57"/>
+        <source>History</source>
+        <translation>Historial</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>
+        <translatorcomment>conversación o sala?</translatorcomment>
+        <translation>Usuarios a invitar a esta conversación (uno por línea):</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>Si quieres proporcionar un motivo para la invitación, introdúcelo aquí</translation>
+    </message>
+</context>
+<context>
     <name>Swift::QtJoinMUCWindow</name>
     <message>
-        <location filename="../QtUI/QtJoinMUCWindow.cpp" line="15"/>
+        <location filename="../QtUI/QtJoinMUCWindow.cpp" line="19"/>
         <source>someroom@rooms.example.com</source>
         <translation>algunasala@salas.ejemplo.com</translation>
@@ -1432,53 +2242,53 @@ Si escoges posponer esta elección, se te preguntará de nuevo la próxima vez q
     <name>Swift::QtLoginWindow</name>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="81"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="92"/>
         <source>User address:</source>
         <translation>Dirección de usuario:</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="86"/>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="87"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="97"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="98"/>
         <source>User address - looks like someuser@someserver.com</source>
         <translation>Dirección de usuario - Similar a usuario@algunservidor.com</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="91"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="102"/>
         <source>Example: alice@wonderland.lit</source>
         <translation>Ejemplo: alicia@paismaravillas.lit</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="97"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="108"/>
         <source>Password:</source>
         <translation>Contraseña:</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="118"/>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="119"/>
+        <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>Haz click si tienes un certificado personal para conectar al servicio.</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="125"/>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="299"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="136"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="353"/>
         <source>Connect</source>
         <translation>Conectar</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="136"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="154"/>
         <source>Remember Password?</source>
         <translation>¿Recordar Contraseña?</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="138"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="156"/>
         <source>Login Automatically?</source>
         <translation>¿Conectar Automáticamente?</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="150"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="168"/>
         <source>&amp;Swift</source>
         <translation>&amp;Swift</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="152"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="170"/>
         <source>&amp;General</source>
         <translatorcomment>TMPFIX, used where?</translatorcomment>
@@ -1486,67 +2296,94 @@ Si escoges posponer esta elección, se te preguntará de nuevo la próxima vez q
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="160"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="178"/>
         <source>&amp;About %1</source>
         <translation>&amp;Acerca de %1</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="165"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="183"/>
         <source>&amp;Show Debug Console</source>
         <translation>&amp;Mostrar Consola de Depuración</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="169"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="188"/>
+        <source>Show &amp;File Transfer Overview</source>
+        <translatorcomment>VERY long. Alternative &quot;Mostrar lista de transferencias&quot;</translatorcomment>
+        <translation>Mostrar vista general de transferencia de &amp;archivos</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="193"/>
         <source>&amp;Play Sounds</source>
         <translation>&amp;Reproducir Sonidos</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="175"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="199"/>
         <source>Display Pop-up &amp;Notifications</source>
         <translation>Mostrar &amp;Notificaciones Emergentes</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="190"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="211"/>
         <source>&amp;Quit</source>
         <translation>&amp;Salir</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="205"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="253"/>
         <source>Remove profile</source>
         <translation>Eliminar perfil</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="205"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="253"/>
         <source>Remove the profile &apos;%1&apos;?</source>
         <translation>¿Eliminar el perfil &apos;%1&apos;?</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="299"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="353"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="320"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="367"/>
+        <source>Confirm terms of use</source>
+        <translation>Confirmar condiciones de uso</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="410"/>
         <source>Select an authentication certificate</source>
         <translation>Selecciona un certificado de autenticación</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="420"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="410"/>
+        <source>P12 files (*.cert *.p12 *.pfx);;All files (*.*)</source>
+        <translation>Archivos P12 (*.cert *.p12 *.pfx);;Todos los archivos (*.*)</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="523"/>
         <source>The certificate presented by the server is not valid.</source>
         <translation>El certificado presentado por el servidor no es válido.</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="421"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="524"/>
         <source>Would you like to permanently trust this certificate? This must only be done if you know it is correct.</source>
         <translation>¿Quieres confiar en este certificado de forma permanente? Esto solo debe hacerse si sabes que es correcto.</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="423"/>
         <source>Subject: %1</source>
-        <translation>Sujeto: %1</translation>
+        <translation type="obsolete">Sujeto: %1</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="424"/>
         <source>SHA-1 Fingerprint: %1</source>
-        <translation>Huella digital SHA-1: %1</translation>
+        <translation type="obsolete">Huella digital SHA-1: %1</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtMUCConfigurationWindow</name>
+    <message>
+        <location filename="../QtUI/QtMUCConfigurationWindow.cpp" line="34"/>
+        <source>Cancel</source>
+        <translation>Cancelar</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMUCConfigurationWindow.cpp" line="37"/>
+        <source>OK</source>
+        <translation>Aceptar</translation>
     </message>
 </context>
@@ -1563,16 +2400,16 @@ Si escoges posponer esta elección, se te preguntará de nuevo la próxima vez q
     <name>Swift::QtMainWindow</name>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="64"/>
+        <location filename="../QtUI/QtMainWindow.cpp" line="79"/>
         <source>&amp;Contacts</source>
         <translation>&amp;Contactos</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="71"/>
-        <location filename="../QtUI/QtMainWindow.cpp" line="137"/>
+        <location filename="../QtUI/QtMainWindow.cpp" line="88"/>
+        <location filename="../QtUI/QtMainWindow.cpp" line="205"/>
         <source>&amp;Notices</source>
         <translation>Av&amp;isos</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="72"/>
+        <location filename="../QtUI/QtMainWindow.cpp" line="87"/>
         <source>C&amp;hats</source>
         <translatorcomment>TMPFIX? Kev said &quot;conversations&quot; context</translatorcomment>
@@ -1580,49 +2417,84 @@ Si escoges posponer esta elección, se te preguntará de nuevo la próxima vez q
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="76"/>
+        <location filename="../QtUI/QtMainWindow.cpp" line="96"/>
         <source>&amp;View</source>
         <translation>&amp;Ver</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="78"/>
+        <location filename="../QtUI/QtMainWindow.cpp" line="98"/>
         <source>&amp;Show offline contacts</source>
         <translation>&amp;Mostrar contactos desconectados</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="84"/>
+        <location filename="../QtUI/QtMainWindow.cpp" line="106"/>
+        <source>&amp;Show Emoticons</source>
+        <translation>&amp;Mostrar emoticonos</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="120"/>
         <source>&amp;Actions</source>
         <translation>&amp;Acciones</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="86"/>
-        <source>Edit &amp;Profile</source>
-        <translation>Editar &amp;Perfil</translation>
+        <location filename="../QtUI/QtMainWindow.cpp" line="122"/>
+        <source>Edit &amp;Profile…</source>
+        <translation>Editar &amp;Perfil…</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="125"/>
+        <source>Enter &amp;Room…</source>
+        <translation>Entrar a &amp;Sala…</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="89"/>
-        <source>Enter &amp;Room</source>
-        <translation>Entrar a &amp;Sala</translation>
+        <location filename="../QtUI/QtMainWindow.cpp" line="129"/>
+        <source>&amp;View History…</source>
+        <translation>&amp;Ver historial...</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="92"/>
-        <source>&amp;Add Contact</source>
-        <translation>&amp;Añadir Contacto</translation>
+        <location filename="../QtUI/QtMainWindow.cpp" line="133"/>
+        <source>&amp;Add Contact…</source>
+        <translation>&amp;Añadir Contacto…</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="95"/>
-        <source>&amp;Edit Selected Contact</source>
-        <translation>&amp;Editar Contacto Seleccionado</translation>
+        <location filename="../QtUI/QtMainWindow.cpp" line="136"/>
+        <source>&amp;Edit Selected Contact…</source>
+        <translation>&amp;Editar Contacto Seleccionado…</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="99"/>
-        <source>Start &amp;Chat</source>
-        <translation>Comenzar &amp;Conversación</translation>
+        <location filename="../QtUI/QtMainWindow.cpp" line="140"/>
+        <source>Start &amp;Chat…</source>
+        <translation>Comenzar &amp;Conversación...</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="103"/>
+        <location filename="../QtUI/QtMainWindow.cpp" line="143"/>
+        <source>Run Server Command</source>
+        <translation>Ejecutar comando de servidor</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="146"/>
         <source>&amp;Sign Out</source>
         <translation>&amp;Desconectar</translation>
     </message>
     <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="150"/>
+        <source>&amp;Request Delivery Receipts</source>
+        <translation>&amp;Pedir confirmación de entrega</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="161"/>
+        <source>Collecting commands...</source>
+        <translation>Recopilando comandos...</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="216"/>
+        <source>&amp;Chats</source>
+        <translation>C&amp;onversaciones</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="339"/>
+        <source>No Available Commands</source>
+        <translation>No hay comandos disponibles</translation>
+    </message>
+    <message>
         <source>Notices</source>
         <translatorcomment>TMPFIX, used?</translatorcomment>
@@ -1633,20 +2505,20 @@ Si escoges posponer esta elección, se te preguntará de nuevo la próxima vez q
     <name>Swift::QtNameWidget</name>
     <message>
-        <location filename="../QtUI/QtNameWidget.cpp" line="47"/>
+        <location filename="../QtUI/QtNameWidget.cpp" line="48"/>
         <source>Show Nickname</source>
         <translation>Mostrar Nick</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtNameWidget.cpp" line="47"/>
+        <location filename="../QtUI/QtNameWidget.cpp" line="48"/>
         <source>(No Nickname Set)</source>
         <translation>(Sin Nick Definido)</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtNameWidget.cpp" line="55"/>
+        <location filename="../QtUI/QtNameWidget.cpp" line="56"/>
         <source>Show Address</source>
         <translation>Mostrar Dirección</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtNameWidget.cpp" line="62"/>
+        <location filename="../QtUI/QtNameWidget.cpp" line="63"/>
         <source>Edit Profile</source>
         <translation>Editar Perfil</translation>
@@ -1654,4 +2526,42 @@ Si escoges posponer esta elección, se te preguntará de nuevo la próxima vez q
 </context>
 <context>
+    <name>Swift::QtOccupantListWidget</name>
+    <message>
+        <location filename="../QtUI/Roster/QtOccupantListWidget.cpp" line="46"/>
+        <source>No actions for this user</source>
+        <translation>No hay acciones para este usuario</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtOccupantListWidget.cpp" line="55"/>
+        <source>Kick user</source>
+        <translation>Expulsar usuario</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtOccupantListWidget.cpp" line="56"/>
+        <source>Kick and ban user</source>
+        <translation>Expulsar y vetar usuario</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtOccupantListWidget.cpp" line="57"/>
+        <source>Make moderator</source>
+        <translation>Hacer moderador</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtOccupantListWidget.cpp" line="58"/>
+        <source>Make participant</source>
+        <translation>Hacer participante</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtOccupantListWidget.cpp" line="59"/>
+        <source>Remove voice</source>
+        <translation>Quitar la voz</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtOccupantListWidget.cpp" line="60"/>
+        <source>Add to contacts</source>
+        <translation>Añadir a contactos</translation>
+    </message>
+</context>
+<context>
     <name>Swift::QtProfileWindow</name>
     <message>
@@ -1672,4 +2582,56 @@ Si escoges posponer esta elección, se te preguntará de nuevo la próxima vez q
 </context>
 <context>
+    <name>Swift::QtRosterHeader</name>
+    <message>
+        <location filename="../QtUI/QtRosterHeader.cpp" line="59"/>
+        <source>Connection is secured</source>
+        <translation>La conexión es segura</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtRosterWidget</name>
+    <message>
+        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="58"/>
+        <source>Edit…</source>
+        <translation>Editar...</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="59"/>
+        <source>Remove</source>
+        <translation>Eliminar</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="63"/>
+        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="83"/>
+        <source>Send File</source>
+        <translation>Enviar archivo</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="69"/>
+        <source>Start Whiteboard Chat</source>
+        <translation>Comenzar conversación de pizarra</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="83"/>
+        <source>All Files (*);;</source>
+        <translation>Todos los archivos (*);;</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="96"/>
+        <source>Rename</source>
+        <translation>Renombrar</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="106"/>
+        <source>Rename group</source>
+        <translation>Renombrar grupo</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="106"/>
+        <source>Enter a new name for group &apos;%1&apos;:</source>
+        <translation>Introduce un nombre nuevo para el grupo &apos;%1&apos;:</translation>
+    </message>
+</context>
+<context>
     <name>Swift::QtStatusWidget</name>
     <message>
@@ -1679,5 +2641,5 @@ Si escoges posponer esta elección, se te preguntará de nuevo la próxima vez q
     </message>
     <message>
-        <location filename="../QtUI/QtStatusWidget.cpp" line="263"/>
+        <location filename="../QtUI/QtStatusWidget.cpp" line="261"/>
         <source>(No message)</source>
         <translation>(Sin mensaje)</translation>
@@ -1701,5 +2663,5 @@ Si escoges posponer esta elección, se te preguntará de nuevo la próxima vez q
         <source>You have already replied to this request</source>
         <translatorcomment>TMPFIX, used where?</translatorcomment>
-        <translation>Ya has respondido a esta petición</translation>
+        <translation>Ya has respondido a esta solicitud</translation>
     </message>
     <message>
@@ -1714,10 +2676,10 @@ Si escoges posponer esta elección, se te preguntará de nuevo la próxima vez q
     </message>
     <message>
-        <location filename="../QtUI/QtSubscriptionRequestWindow.cpp" line="32"/>
+        <location filename="../QtUI/QtSubscriptionRequestWindow.cpp" line="33"/>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtSubscriptionRequestWindow.cpp" line="34"/>
+        <location filename="../QtUI/QtSubscriptionRequestWindow.cpp" line="35"/>
         <source>Defer</source>
         <translation>Posponer</translation>
@@ -1727,27 +2689,22 @@ Si escoges posponer esta elección, se te preguntará de nuevo la próxima vez q
     <name>Swift::QtTreeWidget</name>
     <message>
-        <location filename="../QtUI/Roster/QtTreeWidget.cpp" line="144"/>
         <source>Edit</source>
-        <translation>Editar</translation>
+        <translation type="obsolete">Editar</translation>
     </message>
     <message>
-        <location filename="../QtUI/Roster/QtTreeWidget.cpp" line="145"/>
         <source>Remove</source>
-        <translation>Eliminar</translation>
+        <translation type="obsolete">Eliminar</translation>
     </message>
     <message>
-        <location filename="../QtUI/Roster/QtTreeWidget.cpp" line="157"/>
         <source>Rename</source>
-        <translation>Renombrar</translation>
+        <translation type="obsolete">Renombrar</translation>
     </message>
     <message>
-        <location filename="../QtUI/Roster/QtTreeWidget.cpp" line="167"/>
         <source>Rename group</source>
-        <translation>Renombrar grupo</translation>
+        <translation type="obsolete">Renombrar grupo</translation>
     </message>
     <message>
-        <location filename="../QtUI/Roster/QtTreeWidget.cpp" line="167"/>
         <source>Enter a new name for group &apos;%1&apos;:</source>
-        <translation>Introduce un nombre nuevo para el grupo %1:</translation>
+        <translation type="obsolete">Introduce un nombre nuevo para el grupo %1:</translation>
     </message>
     <message>
@@ -1759,5 +2716,5 @@ Si escoges posponer esta elección, se te preguntará de nuevo la próxima vez q
     <name>Swift::QtUserSearchDetailsPage</name>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchDetailsPage.cpp" line="17"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchDetailsPage.cpp" line="22"/>
         <source>Please choose a name for the contact, and select the groups you want to add the contact to.</source>
         <translatorcomment>Somewhat free translation. TMPFIX?</translatorcomment>
@@ -1786,35 +2743,35 @@ Si escoges posponer esta elección, se te preguntará de nuevo la próxima vez q
     <name>Swift::QtUserSearchWindow</name>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="32"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="35"/>
         <source>Add Contact</source>
         <translation>Añadir Contacto</translation>
     </message>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="32"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="35"/>
         <source>Chat to User</source>
         <translation>Conversar con Usuario</translation>
     </message>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="43"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="45"/>
         <source>alice@wonderland.lit</source>
         <translation>alicia@paismaravillas.lit</translation>
     </message>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="223"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="296"/>
         <source>How would you like to find the user to add?</source>
         <translation>¿Cómo quieres buscar al usuario a añadir?</translation>
     </message>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="226"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="299"/>
         <source>How would you like to find the user to chat to?</source>
         <translation>¿Cómo quieres buscar al usuario con el que conversar?</translation>
     </message>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="251"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="326"/>
         <source>Error while searching</source>
         <translation>Error durante la búsqueda</translation>
     </message>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="257"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="332"/>
         <source>This server doesn&apos;t support searching for users.</source>
         <translation>Este servidor no soporta búsqueda de usuarios.</translation>
@@ -1824,8 +2781,26 @@ Si escoges posponer esta elección, se te preguntará de nuevo la próxima vez q
     <name>Swift::QtWebView</name>
     <message>
-        <location filename="../QtUI/QtWebView.cpp" line="61"/>
+        <location filename="../QtUI/QtWebView.cpp" line="66"/>
         <source>Clear</source>
         <translation>Borrar texto</translation>
     </message>
+    <message>
+        <location filename="../QtUI/QtWebView.cpp" line="67"/>
+        <source>Increase font size</source>
+        <translation>Incrementar el tamaño de la letra</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtWebView.cpp" line="68"/>
+        <source>Decrease font size</source>
+        <translation>Reducir el tamaño de la letra</translation>
+    </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>Cerrar la ventana es equivalente a cerrar la sesión. ¿Estás seguro de que quieres hacer esto?</translation>
+    </message>
 </context>
 <context>
@@ -1852,10 +2827,10 @@ Si escoges posponer esta elección, se te preguntará de nuevo la próxima vez q
     </message>
     <message>
-        <location filename="../QtUI/QtXMLConsoleWidget.cpp" line="75"/>
+        <location filename="../QtUI/QtXMLConsoleWidget.cpp" line="78"/>
         <source>&lt;!-- IN --&gt;</source>
         <translation>&lt;!-- ENTRANTE --&gt;</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtXMLConsoleWidget.cpp" line="79"/>
+        <location filename="../QtUI/QtXMLConsoleWidget.cpp" line="82"/>
         <source>&lt;!-- OUT --&gt;</source>
         <translation>&lt;!-- SALIENTE --&gt;</translation>
diff --git a/Swift/Translations/swift_fr.ts b/Swift/Translations/swift_fr.ts
index 44bb980..b95c0d1 100644
--- a/Swift/Translations/swift_fr.ts
+++ b/Swift/Translations/swift_fr.ts
@@ -1438,25 +1438,25 @@
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="86"/>
-        <source>Edit &amp;Profile</source>
-        <translation>Editer le &amp;Profil</translation>
+        <source>Edit &amp;Profile…</source>
+        <translation>Editer le &amp;Profil…</translation>
     </message>
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="89"/>
-        <source>Enter &amp;Room</source>
-        <translation>Joindre un &amp;Salon</translation>
+        <source>Enter &amp;Room…</source>
+        <translation>Joindre un &amp;Salon…</translation>
     </message>
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="92"/>
-        <source>&amp;Add Contact</source>
-        <translation>&amp;Ajouter un Contact</translation>
+        <source>&amp;Add Contact…</source>
+        <translation>&amp;Ajouter un Contact…</translation>
     </message>
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="95"/>
-        <source>&amp;Edit Selected Contact</source>
-        <translation>&amp;Editer le Contact Sélectionné</translation>
+        <source>&amp;Edit Selected Contact…</source>
+        <translation>&amp;Editer le Contact Sélectionné…</translation>
     </message>
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="99"/>
-        <source>Start &amp;Chat</source>
+        <source>Start &amp;Chat…</source>
         <translation>Démarrer une &amp;Discussion</translation>
     </message>
diff --git a/Swift/Translations/swift_gl.ts b/Swift/Translations/swift_gl.ts
index 00540a3..c189a1d 100644
--- a/Swift/Translations/swift_gl.ts
+++ b/Swift/Translations/swift_gl.ts
@@ -1442,25 +1442,25 @@
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="86"/>
-        <source>Edit &amp;Profile</source>
-        <translation>Editar &amp;perfil</translation>
+        <source>Edit &amp;Profile…</source>
+        <translation>Editar &amp;perfil…</translation>
     </message>
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="89"/>
-        <source>Enter &amp;Room</source>
-        <translation>Entrar á &amp;sala</translation>
+        <source>Enter &amp;Room…</source>
+        <translation>Entrar á &amp;sala…</translation>
     </message>
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="92"/>
-        <source>&amp;Add Contact</source>
-        <translation>&amp;Engadir contacto</translation>
+        <source>&amp;Add Contact…</source>
+        <translation>&amp;Engadir contacto…</translation>
     </message>
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="95"/>
-        <source>&amp;Edit Selected Contact</source>
-        <translation>&amp;Editar contacto seleccionado</translation>
+        <source>&amp;Edit Selected Contact…</source>
+        <translation>&amp;Editar contacto seleccionado…</translation>
     </message>
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="99"/>
-        <source>Start &amp;Chat</source>
+        <source>Start &amp;Chat…</source>
         <translation>Comezar &amp;conversa</translation>
     </message>
diff --git a/Swift/Translations/swift_he.ts b/Swift/Translations/swift_he.ts
new file mode 100644
index 0000000..4a810f8
--- /dev/null
+++ b/Swift/Translations/swift_he.ts
@@ -0,0 +1,2717 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="he_IL">
+<defaultcodec>UTF-8</defaultcodec>
+<context>
+    <name></name>
+    <message>
+        <location filename="../Controllers/Chat/ChatController.cpp" line="59"/>
+        <source>Starting chat with %1% in chatroom %2%</source>
+        <translation>מתחיל כעת שיחה עם %1% בתוך חדר שיחה %2%</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatController.cpp" line="62"/>
+        <source>Starting chat with %1% - %2%</source>
+        <translation>מתחיל כעת שיחה עם %1% - %2%</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatController.cpp" line="202"/>
+        <source>This chat doesn&apos;t support delivery receipts.</source>
+        <translation>שיחה זו לא תומכת קבלות משלוח.</translation>
+    </message>
+    <message>
+        <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>ייתכן כי שיחה זו לא תומכת בקבלות משלוח. אתה עשוי שלא לקבל קבלות משלוח עבור ההודעות אשר נשלחות מן הקצה שלך.</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatController.cpp" line="216"/>
+        <location filename="../Controllers/FileTransfer/FileTransferController.cpp" line="42"/>
+        <source>me</source>
+        <translation>אני</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatController.cpp" line="324"/>
+        <source>%1% has gone offline</source>
+        <translation>%1% במצב לא מקוון כעת</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatController.cpp" line="328"/>
+        <source>%1% has become available</source>
+        <translation>%1% במצב זמין כעת</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatController.cpp" line="330"/>
+        <source>%1% has gone away</source>
+        <translation>%1% במצב נעדר כעת</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatController.cpp" line="332"/>
+        <source>%1% is now busy</source>
+        <translation>%1% עסוק/ה כעת</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="74"/>
+        <source>The day is now %1%</source>
+        <translation>היום כעת הוא %1%</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="209"/>
+        <source>Couldn&apos;t send message: %1%</source>
+        <translation>לא היתה אפשרות לשלוח הודעה: %1%</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="269"/>
+        <source>Error sending message</source>
+        <translation>שגיאה בשליחת הודעה</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="275"/>
+        <source>Bad request</source>
+        <translation>בקשה רעה</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="276"/>
+        <source>Conflict</source>
+        <translation>התנגשות</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="277"/>
+        <source>This feature is not implemented</source>
+        <translation>תכונה זו אינה מיושמת</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="278"/>
+        <source>Forbidden</source>
+        <translation>אסור</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="279"/>
+        <source>Recipient can no longer be contacted</source>
+        <translation>אין אפשרות לתקשר עוד עם נמען</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="280"/>
+        <source>Internal server error</source>
+        <translation>שגיאת שרת פנימית</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="281"/>
+        <source>Item not found</source>
+        <translation>פריט לא נמצא</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="282"/>
+        <source>JID Malformed</source>
+        <translation>כתובת JID פגומה</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="283"/>
+        <source>Message was rejected</source>
+        <translation>הודעה נדחתה</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="284"/>
+        <source>Not allowed</source>
+        <translation>לא מותר</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="285"/>
+        <source>Not authorized</source>
+        <translation>לא מורשה</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="286"/>
+        <source>Payment is required</source>
+        <translation>נדרש תשלום</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="287"/>
+        <source>Recipient is unavailable</source>
+        <translation>נמען אינו זמין</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="288"/>
+        <source>Redirect</source>
+        <translation>הכוונה חוזרת</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="289"/>
+        <source>Registration required</source>
+        <translation>נדרשת הרשמה</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="290"/>
+        <source>Recipient&apos;s server not found</source>
+        <translation>שרת נמען לא נמצא</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="291"/>
+        <source>Remote server timeout</source>
+        <translation>תם זמן שרת מרוחק</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="292"/>
+        <source>The server is low on resources</source>
+        <translatorcomment>רדוד</translatorcomment>
+        <translation>השרת הינו דל במשאבים</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="293"/>
+        <source>The service is unavailable</source>
+        <translation>השירות אינו זמין</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="294"/>
+        <source>A subscription is required</source>
+        <translatorcomment>נדרש מינוי</translatorcomment>
+        <translation>נדרשת הרשמה</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="295"/>
+        <source>Undefined condition</source>
+        <translatorcomment>תנאי</translatorcomment>
+        <translation>מצב לא מוגדר</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="296"/>
+        <source>Unexpected request</source>
+        <translation>בקשה לא צפויה</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="222"/>
+        <source>Room %1% is not responding. This operation may never complete.</source>
+        <translation>חדר %1% אינו מגיב. פעולה זו עשויה שלא להסתיים.</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="233"/>
+        <source>Unable to enter this room</source>
+        <translation>אין אפשרות להיכנס אל חדר זה</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="239"/>
+        <source>Unable to enter this room as %1%, retrying as %2%</source>
+        <translation>אין אפשרות להיכנס אל חדר זה תחת השם %1%, מנסה כעת להיכנס בתור %2%</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="243"/>
+        <source>No nickname specified</source>
+        <translation>לא צוין שם כינוי</translation>
+    </message>
+    <message>
+        <source>A password needed</source>
+        <translation type="obsolete">נדרשת מילת מעבר</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="251"/>
+        <source>Only members may enter</source>
+        <translation>רק חברים מורשים להיכנס</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="255"/>
+        <source>You are banned from the room</source>
+        <translation>נאסרת מן חדר זה</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="259"/>
+        <source>The room is full</source>
+        <translation>החדר מלא</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="263"/>
+        <source>The room does not exist</source>
+        <translation>החדר לא קיים</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="269"/>
+        <source>Couldn&apos;t join room: %1%.</source>
+        <translation>לא היה ניתן להצטרף אל חדר: %1%.</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="281"/>
+        <source>You have entered room %1% as %2%.</source>
+        <translation>נכנסת אל החדר %1% בכינוי %2%.</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="332"/>
+        <source>%1% has entered the room as a %2%.</source>
+        <translation>%1% נכנס/ה אל החדר בתפקיד %2%.</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="335"/>
+        <source>%1% has entered the room.</source>
+        <translation>%1% נכנס/ה אל החדר.</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="384"/>
+        <source>moderator</source>
+        <translation>אחראי</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="385"/>
+        <source>participant</source>
+        <translation>משתתף</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="386"/>
+        <source>visitor</source>
+        <translation>מבקר</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="436"/>
+        <source>The room subject is now: %1%</source>
+        <translation>נושא החדר כעת הוא: %1%</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="470"/>
+        <source>%1% is now a %2%</source>
+        <translation>%1% מצוי/ה כעת במצב %2%</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="486"/>
+        <source>Moderators</source>
+        <translation>אחראים</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="487"/>
+        <source>Participants</source>
+        <translation>משתתפים</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="488"/>
+        <source>Visitors</source>
+        <translation>מבקרים</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="489"/>
+        <source>Occupants</source>
+        <translation>נוכחים</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="503"/>
+        <source>Trying to enter room %1%</source>
+        <translation>מנסה כעת להיכנס אל חדר %1%</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="544"/>
+        <source>%1% has left the room%2%</source>
+        <translation>%1% עזב/ה את החדר%2%</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="548"/>
+        <source>You have been kicked out of the room</source>
+        <translation>נבעטת החוצה מן החדר</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="549"/>
+        <source>You have been banned from the room</source>
+        <translation>נאסרת מן החדר</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="550"/>
+        <source>You are no longer a member of the room and have been removed</source>
+        <translation>אינך עוד במעמד של חבר בחדר זה והוסרת</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="551"/>
+        <source>The room has been destroyed</source>
+        <translation>החדר הוחרב</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="667"/>
+        <source>%1% has left the room</source>
+        <translation>%1% עזב/ה את החדר</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="719"/>
+        <source>Room configuration failed: %1%.</source>
+        <translation>תצורת חדר נכשלה: %1%.</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="725"/>
+        <source>Occupant role change failed: %1%.</source>
+        <translation>שינוי תפקיד נוכח נכשל: %1%.</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="553"/>
+        <source>You have left the room</source>
+        <translation>עזבת את החדר</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="247"/>
+        <source>The correct room password is needed</source>
+        <translation>סיסמת חדר מדויקת הינה נחוצה</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="632"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="696"/>
+        <source> and </source>
+        <translation> וגם </translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="656"/>
+        <source>%1% have entered the room</source>
+        <translation>%1% נכנסו אל החדר</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="659"/>
+        <source>%1% has entered the room</source>
+        <translation>%1% נכנס/ה אל החדר</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="664"/>
+        <source>%1% have left the room</source>
+        <translation>%1% עזבו את החדר</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="672"/>
+        <source>%1% have entered then left the room</source>
+        <translation>%1% נכנסו ואז עזבו את החדר</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="675"/>
+        <source>%1% has entered then left the room</source>
+        <translation>%1% נכנס/ה ואז עזב/ה את החדר</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="680"/>
+        <source>%1% have left then returned to the room</source>
+        <translation>%1% עזבו ואז חזרו אל החדר</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="683"/>
+        <source>%1% has left then returned to the room</source>
+        <translation>%1% עזב/ה ואז חזר/ה אל החדר</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/EventNotifier.cpp" line="59"/>
+        <source>%1% wants to add you to his/her contact list</source>
+        <translation>%1% רוצה להוסיף אותך אל רשימת הקשרים שלו/שלה</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/EventNotifier.cpp" line="63"/>
+        <source>Error</source>
+        <translation>שגיאה</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/EventNotifier.cpp" line="67"/>
+        <source>%1% has invited you to enter the %2% room</source>
+        <translation>%1% הזמינך להיכנס אל החדר %2%</translation>
+    </message>
+    <message>
+        <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>כתובת משתמש שגויה. על כתובת משתמש להיות בצורה זו &apos;alice@wonderland.lit&apos;</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="567"/>
+        <source>Unknown Error</source>
+        <translation>שגיאה לא מוכרת</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="568"/>
+        <source>Unable to find server</source>
+        <translation>אין אפשרות למצוא שרת</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="569"/>
+        <source>Error connecting to server</source>
+        <translation>שגיאה בעת התחברות אל שרת</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="570"/>
+        <source>Error while receiving server data</source>
+        <translation>שגיאה במהלך קבלת נתוני שרת</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="571"/>
+        <source>Error while sending data to the server</source>
+        <translation>שגיאה במהלך שליחת נתונים אל השרת</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="572"/>
+        <source>Error parsing server data</source>
+        <translation>שגיאה בניתוח נתוני שרת</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="573"/>
+        <source>Login/password invalid</source>
+        <translatorcomment>credentials</translatorcomment>
+        <translation>התחברות/סיסמה שגויים</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="574"/>
+        <source>Error while compressing stream</source>
+        <translation>שגיאה במהלך דחיסת זרם</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="575"/>
+        <source>Server verification failed</source>
+        <translation>אימות שרת נכשל</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="576"/>
+        <source>Authentication mechanisms not supported</source>
+        <translation>מנגנון אימות לא נתמך</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="577"/>
+        <source>Unexpected response</source>
+        <translation>מענה לא צפוי</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="578"/>
+        <source>Error binding resource</source>
+        <translation>שגיאה בכריכת משאב</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="579"/>
+        <source>Error starting session</source>
+        <translation>שגיאה בהתחלת סשן</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="580"/>
+        <source>Stream error</source>
+        <translation>שגיאת זרם</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="581"/>
+        <source>Encryption error</source>
+        <translation>שגיאת הצפנה</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="582"/>
+        <source>Error loading certificate (Invalid password?)</source>
+        <translation>שגיאה בטעינת תעודה (סיסמה שגויה?)</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="583"/>
+        <source>Certificate not authorized</source>
+        <translation>תעודה לא מורשית</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="584"/>
+        <source>Certificate card removed</source>
+        <translation>כרטיס תעודה הוסר</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="586"/>
+        <source>Unknown certificate</source>
+        <translation>תעודה לא מוכרת</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="587"/>
+        <source>Certificate has expired</source>
+        <translation>תעודה פקעה</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="588"/>
+        <source>Certificate is not yet valid</source>
+        <translation>תעודה אינה תקפה עדיין</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="589"/>
+        <source>Certificate is self-signed</source>
+        <translation>התעודה הינה חתומה באופן עצמי</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="590"/>
+        <source>Certificate has been rejected</source>
+        <translation>תעודה נדחתה</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="591"/>
+        <source>Certificate is not trusted</source>
+        <translation>התעודה אינה מהימנה</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="592"/>
+        <source>Certificate cannot be used for encrypting your connection</source>
+        <translation>תעודה לא שמישה עבור הצפנת החיבור שלך</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="593"/>
+        <source>Certificate path length constraint exceeded</source>
+        <translation>הגבלת אורך נתיב תעודה נחצתה</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="594"/>
+        <source>Invalid certificate signature</source>
+        <translation>חתימת תעודה שגויה</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="595"/>
+        <source>Invalid Certificate Authority</source>
+        <translation>רשות תעודה שגויה</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="596"/>
+        <source>Certificate does not match the host identity</source>
+        <translation>תעודה לא תואמת את זהות המארח</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="597"/>
+        <source>Certificate has been revoked</source>
+        <translatorcomment>נשללה</translatorcomment>
+        <translation>תעודה נפסלה</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="598"/>
+        <source>Unable to determine certificate revocation state</source>
+        <translation>אין אפשרות לקבוע מצב פסילות של תעודה</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="608"/>
+        <source>Certificate error</source>
+        <translation>שגיאת תעודה</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="615"/>
+        <source>Re-enter credentials and retry</source>
+        <translation>הזן נתוני התחברות מחדש ונסה שוב</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>מנותק מן %1%: ‏%2%. כדי להתחבר שוב, התנתק וספק את הסיסמה שלך פעם נוספת.</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="634"/>
+        <source>Reconnect to %1% failed: %2%. Will retry in %3% seconds.</source>
+        <translation>מתחבר מחדש כעת אל %1% נכשל: %2%. ניסיון נוסף יערך בעוד %3% שניות.</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="637"/>
+        <source>Disconnected from %1%: %2%.</source>
+        <translation>מנותק מן %1%: ‏%2%.</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Roster/RosterController.cpp" line="131"/>
+        <location filename="../Controllers/Roster/RosterController.cpp" line="157"/>
+        <location filename="../Controllers/Roster/RosterController.cpp" line="222"/>
+        <source>Contacts</source>
+        <translation>קשרים</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Roster/RosterController.cpp" line="263"/>
+        <source>Server %1% rejected contact list change to item &apos;%2%&apos;</source>
+        <translation>שרת %1% דחה שינוי רשימת קשרים לפריט &apos;%2%&apos;</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/StatusUtil.cpp" line="15"/>
+        <location filename="../Controllers/StatusUtil.cpp" line="16"/>
+        <source>Available</source>
+        <translation>זמין</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/StatusUtil.cpp" line="17"/>
+        <location filename="../Controllers/StatusUtil.cpp" line="18"/>
+        <source>Away</source>
+        <translation>נעדר</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/StatusUtil.cpp" line="19"/>
+        <source>Busy</source>
+        <translation>עסוק</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/StatusUtil.cpp" line="20"/>
+        <source>Offline</source>
+        <translation>לא מקוון</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/ProfileController.cpp" line="62"/>
+        <source>There was an error publishing your profile data</source>
+        <translation>אירעה שגיאה בפרסום נתוני הדיוקן שלך</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/ChatMessageSummarizer.cpp" line="33"/>
+        <source>%1% (%2%)</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../Controllers/ChatMessageSummarizer.cpp" line="38"/>
+        <source>%1% and %2% others (%3%)</source>
+        <translation>%1% וגם %2% אחרים (%3%)</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/ChatMessageSummarizer.cpp" line="41"/>
+        <source>%1%, %2% (%3%)</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../QtUI/CAPICertificateSelector.cpp" line="63"/>
+        <source>TLS Client Certificate Selection</source>
+        <translation>מבחר תעודת לקוח TLS</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/CAPICertificateSelector.cpp" line="64"/>
+        <source>Select a certificate to use for authentication</source>
+        <translation>בחר תעודה לשימוש עבור אימות</translation>
+    </message>
+</context>
+<context>
+    <name>CloseButton</name>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="17"/>
+        <source>Close Tab</source>
+        <translation>סגור כרטיסייה</translation>
+    </message>
+</context>
+<context>
+    <name>MAC_APPLICATION_MENU</name>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="79"/>
+        <source>Services</source>
+        <translation>שירותים</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="80"/>
+        <source>Hide %1</source>
+        <translation>הסתר %1</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="81"/>
+        <source>Hide Others</source>
+        <translation>הסתר אחרים</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="82"/>
+        <source>Show All</source>
+        <translation>הצג הכל</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="83"/>
+        <source>Preferences...</source>
+        <translation>העדפות...</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="84"/>
+        <source>Quit %1</source>
+        <translation>צא מתוך %1</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="85"/>
+        <source>About %1</source>
+        <translation>אודות %1</translation>
+    </message>
+</context>
+<context>
+    <name>QApplication</name>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="19"/>
+        <source>QT_LAYOUT_DIRECTION</source>
+        <comment>Translate this to LTR for left-to-right or RTL for right-to-left languages</comment>
+        <translation>RTL</translation>
+    </message>
+</context>
+<context>
+    <name>QDialogButtonBox</name>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="69"/>
+        <source>&amp;Yes</source>
+        <translation>&amp;כן</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="70"/>
+        <source>&amp;No</source>
+        <translation>&amp;לא</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="71"/>
+        <source>&amp;OK</source>
+        <translation>&amp;אישור</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="72"/>
+        <source>OK</source>
+        <translation>אישור</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="73"/>
+        <source>&amp;Cancel</source>
+        <translation>&amp;ביטול</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="74"/>
+        <source>Cancel</source>
+        <translation>ביטול</translation>
+    </message>
+</context>
+<context>
+    <name>QLineEdit</name>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="21"/>
+        <source>Select All</source>
+        <translation>בחר הכל</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="22"/>
+        <source>&amp;Undo</source>
+        <translation>&amp;בטל</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="23"/>
+        <source>&amp;Redo</source>
+        <translation>בצע &amp;שוב</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="24"/>
+        <source>Cu&amp;t</source>
+        <translation>&amp;גזור</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="25"/>
+        <source>&amp;Copy</source>
+        <translation>הע&amp;תק</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="26"/>
+        <source>&amp;Paste</source>
+        <translation>ה&amp;דבק</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="27"/>
+        <source>Delete</source>
+        <translation>מחק</translation>
+    </message>
+</context>
+<context>
+    <name>QMessageBox</name>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="76"/>
+        <source>Show Details...</source>
+        <translation>הצגת פרטים...</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="77"/>
+        <source>Hide Details...</source>
+        <translation>הסתרת פרטים...</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <location filename="../QtUI/MUCSearch/MUCSearchEmptyItem.cpp" line="25"/>
+        <source>No rooms found</source>
+        <translation>לא נמצאו חדרים</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/EventViewer/QtEvent.cpp" line="68"/>
+        <source>%1 would like to add you to their contact list.</source>
+        <translation>%1 רוצה להוסיפך אל רשימת הקשרים שלהם.</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/EventViewer/QtEvent.cpp" line="71"/>
+        <source>%1 would like to add you to their contact list, saying &apos;%2&apos;</source>
+        <translation>%1 רוצה להוסיפך אל רשימת הקשרים שלהם, באומרם &apos;%2&apos;</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/EventViewer/QtEvent.cpp" line="81"/>
+        <source>%1 has invited you to enter the %2 room.</source>
+        <translation>%1 הזמינך להיכנס אל החדר %2.</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="980"/>
+        <source>You&apos;ve been invited to enter the %1 room.</source>
+        <translation>הוזמנת להיכנס אל החדר %1.</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="982"/>
+        <source>Reason: %1</source>
+        <translation>סיבה: %1</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="985"/>
+        <source>This person may not have really sent this invitation!</source>
+        <translation>אפשרי כי אישיות זו לא באמת שלחה את הזמנה זו!</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="46"/>
+        <source>Direction</source>
+        <translation>כיוון</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="47"/>
+        <source>Other Party</source>
+        <translation>צד אחר</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="48"/>
+        <source>State</source>
+        <translation>מצב</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="49"/>
+        <source>Progress</source>
+        <translation>התקדמות</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="50"/>
+        <source>Size</source>
+        <translation>גודל</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="65"/>
+        <source>Incoming</source>
+        <translation>נכנסת</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="65"/>
+        <source>Outgoing</source>
+        <translation>יוצאת</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="74"/>
+        <source>Waiting for start</source>
+        <translation>ממתין כעת להתחלה</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="76"/>
+        <source>Waiting for other side to accept</source>
+        <translation>ממתין כעת לצד השני לקבל</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="78"/>
+        <source>Negotiating</source>
+        <translation>מסדיר כעת</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="80"/>
+        <source>Transferring</source>
+        <translation>מעביר כעת</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="82"/>
+        <source>Finished</source>
+        <translation>הוגמרה</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="84"/>
+        <source>Failed</source>
+        <translation>נכשלה</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="86"/>
+        <source>Canceled</source>
+        <translation>בוטלה</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="142"/>
+        <source>Connection Options</source>
+        <translation>אפשרויות חיבור</translation>
+    </message>
+</context>
+<context>
+    <name>QScrollBar</name>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="29"/>
+        <source>Scroll here</source>
+        <translation>גלול לכאן</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="30"/>
+        <source>Top</source>
+        <translation>למעלה</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="31"/>
+        <source>Bottom</source>
+        <translation>למטה</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="32"/>
+        <source>Page up</source>
+        <translation>עמוד מעלה</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="33"/>
+        <source>Page down</source>
+        <translation>עמוד מטה</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="34"/>
+        <source>Scroll up</source>
+        <translation>גלול מעלה</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="35"/>
+        <source>Scroll down</source>
+        <translation>גלול מטה</translation>
+    </message>
+</context>
+<context>
+    <name>QTextControl</name>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="37"/>
+        <source>Select All</source>
+        <translation>בחר הכל</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="38"/>
+        <source>&amp;Copy</source>
+        <translation>הע&amp;תק</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="39"/>
+        <source>&amp;Undo</source>
+        <translation>&amp;בטל</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="40"/>
+        <source>&amp;Redo</source>
+        <translation>בצע &amp;שוב</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="41"/>
+        <source>Cu&amp;t</source>
+        <translation>&amp;גזור</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="42"/>
+        <source>&amp;Paste</source>
+        <translation>ה&amp;דבק</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="43"/>
+        <source>Delete</source>
+        <translation>מחק</translation>
+    </message>
+</context>
+<context>
+    <name>QWebPage</name>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="45"/>
+        <source>Copy Link</source>
+        <translation>העתק קישור</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="46"/>
+        <source>Copy</source>
+        <translation>העתק</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="47"/>
+        <source>Copy Image</source>
+        <translation>העתק תמונה</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="48"/>
+        <source>Scroll here</source>
+        <translation>גלול לכאן</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="49"/>
+        <source>Top</source>
+        <translation>למעלה</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="50"/>
+        <source>Bottom</source>
+        <translation>למטה</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="51"/>
+        <source>Page up</source>
+        <translation>עמוד מעלה</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="52"/>
+        <source>Page down</source>
+        <translation>עמוד מטה</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="53"/>
+        <source>Scroll up</source>
+        <translation>גלול מעלה</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="54"/>
+        <source>Scroll down</source>
+        <translation>גלול מטה</translation>
+    </message>
+</context>
+<context>
+    <name>QWizard</name>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="56"/>
+        <source>&lt; &amp;Back</source>
+        <translation>&lt; &amp;אחורה</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="57"/>
+        <source>&amp;Finish</source>
+        <translation>&amp;סיום</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="58"/>
+        <source>&amp;Help</source>
+        <translation>&amp;עזרה</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="59"/>
+        <source>Go Back</source>
+        <translation>חזור</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="60"/>
+        <source>Continue</source>
+        <translation>המשך</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="61"/>
+        <source>Commit</source>
+        <translation>בצע</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="62"/>
+        <source>Done</source>
+        <translation>סיים</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="63"/>
+        <source>Quit</source>
+        <translation>יציאה</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="64"/>
+        <source>Help</source>
+        <translation>עזרה</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="65"/>
+        <source>Cancel</source>
+        <translation>ביטול</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="66"/>
+        <source>&amp;Next</source>
+        <translation>&amp;קדימה</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStrings.h" line="67"/>
+        <source>&amp;Next &gt;</source>
+        <translation>&amp;קדימה &gt;</translation>
+    </message>
+</context>
+<context>
+    <name>QtAffiliationEditor</name>
+    <message>
+        <location filename="../QtUI/QtAffiliationEditor.ui" line="14"/>
+        <source>Edit Affiliations</source>
+        <translation>עריכת שיוכים</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAffiliationEditor.ui" line="28"/>
+        <source>Affiliation:</source>
+        <translation>שיוך:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAffiliationEditor.ui" line="36"/>
+        <source>Owner</source>
+        <translation>בעלים</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAffiliationEditor.ui" line="41"/>
+        <source>Administrator</source>
+        <translation>מנהל</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAffiliationEditor.ui" line="46"/>
+        <source>Member</source>
+        <translation>חבר</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAffiliationEditor.ui" line="51"/>
+        <source>Outcast (Banned)</source>
+        <translation>מוחרם (נאסר)</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAffiliationEditor.ui" line="68"/>
+        <source>Add User</source>
+        <translation>הוספת משתמש</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAffiliationEditor.ui" line="75"/>
+        <source>Remove User</source>
+        <translation>הסרת משתמש</translation>
+    </message>
+</context>
+<context>
+    <name>QtBookmarkDetailWindow</name>
+    <message>
+        <location filename="../QtUI/QtBookmarkDetailWindow.ui" line="20"/>
+        <source>Edit Bookmark Details</source>
+        <translation>עריכת פרטי סימנייה</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtBookmarkDetailWindow.ui" line="40"/>
+        <source>Bookmark Name:</source>
+        <translation>שם סימנייה:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtBookmarkDetailWindow.ui" line="50"/>
+        <source>Room Address:</source>
+        <translation>כתובת חדר:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtBookmarkDetailWindow.ui" line="60"/>
+        <source>Your Nickname:</source>
+        <translation>שם כינוי:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtBookmarkDetailWindow.ui" line="70"/>
+        <source>Room password:</source>
+        <translation>סיסמת חדר:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtBookmarkDetailWindow.ui" line="93"/>
+        <source>Enter automatically</source>
+        <translation>כנס אוטומטית</translation>
+    </message>
+    <message>
+        <source>Join automatically</source>
+        <translation type="obsolete">הצטרף אוטומטית</translation>
+    </message>
+</context>
+<context>
+    <name>QtCertificateViewerDialog</name>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.ui" line="14"/>
+        <source>Certificate Viewer</source>
+        <translation>מציג תעודה</translation>
+    </message>
+</context>
+<context>
+    <name>QtConnectionSettings</name>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="14"/>
+        <source>Connection Options</source>
+        <translation>אפשרויות חיבור</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="22"/>
+        <source>Connection Method:</source>
+        <translation>שיטת חיבור:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="36"/>
+        <source>Automatic</source>
+        <translation>אטומטי</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="41"/>
+        <source>Manual</source>
+        <translation>ידנית</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="46"/>
+        <source>BOSH</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="99"/>
+        <source>Secure connection:</source>
+        <translation>חיבור מאובטח:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="107"/>
+        <source>Never</source>
+        <translation>כלל לא</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="112"/>
+        <source>Encrypt when possible</source>
+        <translatorcomment>הצפן במידת האפשר</translatorcomment>
+        <translation>הצפן כאשר אפשר</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="117"/>
+        <source>Always encrypt</source>
+        <translation>הצפן תמיד</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="127"/>
+        <source>Allow Compression</source>
+        <translation>התר דחיסה</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="134"/>
+        <source>Allow sending password over insecure connection</source>
+        <translation>התר שליחת סיסמה על פני חיבור לא מאובטח</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="157"/>
+        <source>Manually select server</source>
+        <translation>בחר שרת באופן ידני</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="185"/>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="315"/>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="429"/>
+        <source>Hostname:</source>
+        <translation>שם מארח:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="208"/>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="338"/>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="452"/>
+        <source>Port:</source>
+        <translation>פורט:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="230"/>
+        <source>Connection Proxy</source>
+        <translation>חיבור פרוקסי</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="238"/>
+        <source>Proxy type:</source>
+        <translation>טיפוס פרוקסי:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="249"/>
+        <source>None</source>
+        <translation>ללא</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="254"/>
+        <source>Use system-configured proxy</source>
+        <translation>השתמש בהגדרות פרוקסי מערכת</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="259"/>
+        <source>SOCKS5</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="264"/>
+        <source>HTTP Connect</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="287"/>
+        <source>Override system-configured proxy</source>
+        <translation>עקוף הגדרות פרוקסי מערכת</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="382"/>
+        <source>BOSH URI:</source>
+        <translation>כתובת BOSH:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="401"/>
+        <source>Manually select HTTP proxy</source>
+        <translatorcomment>באופן ידני</translatorcomment>
+        <translation>בחר ידנית פרוקסי HTTP</translation>
+    </message>
+</context>
+<context>
+    <name>QtHistoryWindow</name>
+    <message>
+        <location filename="../QtUI/QtHistoryWindow.ui" line="14"/>
+        <source>History</source>
+        <translation>היסטוריה</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtHistoryWindow.ui" line="22"/>
+        <source>Search:</source>
+        <translation>חיפוש:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtHistoryWindow.ui" line="42"/>
+        <source>Next</source>
+        <translation>קדימה</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtHistoryWindow.ui" line="52"/>
+        <source>Previous</source>
+        <translation>אחורה</translation>
+    </message>
+</context>
+<context>
+    <name>QtJoinMUCWindow</name>
+    <message>
+        <location filename="../QtUI/QtJoinMUCWindow.ui" line="20"/>
+        <location filename="../QtUI/QtJoinMUCWindow.ui" line="113"/>
+        <source>Enter Room</source>
+        <translation>כניסה אל חדר</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtJoinMUCWindow.ui" line="28"/>
+        <source>Room Address:</source>
+        <translation>כתובת חדר:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtJoinMUCWindow.ui" line="42"/>
+        <source>Your Nickname:</source>
+        <translation>שם כינוי:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtJoinMUCWindow.ui" line="59"/>
+        <source>Room Password:</source>
+        <translation>סיסמת חדר:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtJoinMUCWindow.ui" line="71"/>
+        <source>Automatically configure newly created rooms</source>
+        <translation>הגדר אוטומטית חדרים חדשים אשר נוצרים</translation>
+    </message>
+    <message>
+        <source>Room:</source>
+        <translation type="obsolete">חדר:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtJoinMUCWindow.ui" line="35"/>
+        <source>Search ...</source>
+        <translation>חיפוש ...</translation>
+    </message>
+    <message>
+        <source>Nickname:</source>
+        <translation type="obsolete">שם כינוי:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtJoinMUCWindow.ui" line="106"/>
+        <source>Enter automatically in future</source>
+        <translation>כנס אוטומטית בעתיד</translation>
+    </message>
+</context>
+<context>
+    <name>QtMUCSearchWindow</name>
+    <message>
+        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.ui" line="14"/>
+        <source>Search Room</source>
+        <translation>חיפוש חדר</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.ui" line="20"/>
+        <source>Service:</source>
+        <translation>שירות:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.ui" line="74"/>
+        <source>Cancel</source>
+        <translation>ביטול</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.ui" line="84"/>
+        <source>OK</source>
+        <translation>אישור</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.ui" line="96"/>
+        <source>List rooms</source>
+        <translatorcomment>מנה חדרים</translatorcomment>
+        <translation>רשימת חדרים</translation>
+    </message>
+</context>
+<context>
+    <name>QtUserSearchFieldsPage</name>
+    <message>
+        <location filename="../QtUI/UserSearch/QtUserSearchFieldsPage.ui" line="27"/>
+        <source>Nickname:</source>
+        <translation>שם כינוי:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/UserSearch/QtUserSearchFieldsPage.ui" line="37"/>
+        <source>First name:</source>
+        <translation>שם פרטי:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/UserSearch/QtUserSearchFieldsPage.ui" line="47"/>
+        <source>Last name:</source>
+        <translation>שם משפחה:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/UserSearch/QtUserSearchFieldsPage.ui" line="57"/>
+        <source>E-Mail:</source>
+        <translation>דוא״ל:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/UserSearch/QtUserSearchFieldsPage.ui" line="74"/>
+        <source>Fetching search fields</source>
+        <translation>מאחזר כעת שדות חיפוש</translation>
+    </message>
+</context>
+<context>
+    <name>QtUserSearchFirstPage</name>
+    <message>
+        <location filename="../QtUI/UserSearch/QtUserSearchFirstPage.ui" line="17"/>
+        <source>Add a user</source>
+        <translation>הוספת משתמש</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/UserSearch/QtUserSearchFirstPage.ui" line="20"/>
+        <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>
+        <translation>הוסף משתמש אחר אל רשימת הקשרים שלך. אם כתובתם ידועה לך באפשרותך להוסיפה ישירות, לחלופין באפשרותך לחפש עבורם.</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/UserSearch/QtUserSearchFirstPage.ui" line="35"/>
+        <source>I know their address:</source>
+        <translation>כתובתם ידועה לי:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/UserSearch/QtUserSearchFirstPage.ui" line="49"/>
+        <source>I&apos;d like to search my server</source>
+        <translation>ברצוני לחפש בשרת שלי</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/UserSearch/QtUserSearchFirstPage.ui" line="73"/>
+        <source>I&apos;d like to search another server:</source>
+        <translation>ברצוני לחפש בשרת אחר:</translation>
+    </message>
+</context>
+<context>
+    <name>QtUserSearchResultsPage</name>
+    <message>
+        <location filename="../QtUI/UserSearch/QtUserSearchResultsPage.ui" line="27"/>
+        <source>No results.</source>
+        <translation>אין תוצאות.</translation>
+    </message>
+</context>
+<context>
+    <name>QtUserSearchWizard</name>
+    <message>
+        <location filename="../QtUI/UserSearch/QtUserSearchWizard.ui" line="14"/>
+        <source>Find User</source>
+        <translation>מציאת משתמש</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::ChatListModel</name>
+    <message>
+        <location filename="../QtUI/ChatList/ChatListModel.cpp" line="17"/>
+        <source>Bookmarked Rooms</source>
+        <translation>חדרים מסומנים</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/ChatList/ChatListModel.cpp" line="18"/>
+        <source>Recent Chats</source>
+        <translation>שיחות אחרונות</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/ChatList/ChatListModel.cpp" line="20"/>
+        <source>Opened Whiteboards</source>
+        <translation>לוחות לבנים פתוחים</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtAboutWidget</name>
+    <message>
+        <location filename="../QtUI/QtAboutWidget.cpp" line="23"/>
+        <source>About %1</source>
+        <translation>אודות %1</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAboutWidget.cpp" line="40"/>
+        <source>Version %1</source>
+        <translation>גרסא %1</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAboutWidget.cpp" line="43"/>
+        <source>Built with Qt %1</source>
+        <translation>הודר בעזרת Qt %1</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAboutWidget.cpp" line="44"/>
+        <source>Running with Qt %1</source>
+        <translation>מורץ בעזרת Qt %1</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAboutWidget.cpp" line="50"/>
+        <source>Using the English translation by
+%1</source>
+        <translation>ממשק זה תורגם לשפה העברית באדיבות
+%1</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAboutWidget.cpp" line="54"/>
+        <source>View License</source>
+        <translation>הצג רישיון</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtAdHocCommandWindow</name>
+    <message>
+        <location filename="../QtUI/QtAdHocCommandWindow.cpp" line="36"/>
+        <source>Cancel</source>
+        <translation>ביטול</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAdHocCommandWindow.cpp" line="39"/>
+        <source>Back</source>
+        <translation>אחורה</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAdHocCommandWindow.cpp" line="42"/>
+        <source>Next</source>
+        <translation>קדימה</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAdHocCommandWindow.cpp" line="45"/>
+        <source>Complete</source>
+        <translation>השלם</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAdHocCommandWindow.cpp" line="86"/>
+        <source>Error: %1</source>
+        <translation>שגיאה: %1</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAdHocCommandWindow.cpp" line="87"/>
+        <source>Warning: %1</source>
+        <translation>אזהרה: %1</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAdHocCommandWindow.cpp" line="104"/>
+        <source>Error executing command</source>
+        <translation>שגיאה בהרצת פקודה</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtAffiliationEditor</name>
+    <message>
+        <location filename="../QtUI/QtAffiliationEditor.cpp" line="48"/>
+        <source>Add User</source>
+        <translation>הוספת משתמש</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAffiliationEditor.cpp" line="48"/>
+        <source>Added User&apos;s Address:</source>
+        <translation>כתובת משתמש שהוספה:</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtAvatarWidget</name>
+    <message>
+        <location filename="../QtUI/QtAvatarWidget.cpp" line="61"/>
+        <source>No picture</source>
+        <translation>אין תמונה</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAvatarWidget.cpp" line="73"/>
+        <source>Select picture ...</source>
+        <translation>בחירת תמונה ...</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAvatarWidget.cpp" line="76"/>
+        <source>Clear picture</source>
+        <translation>טהר תמונה</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAvatarWidget.cpp" line="81"/>
+        <source>Select picture</source>
+        <translation>בחר תמונה</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAvatarWidget.cpp" line="81"/>
+        <source>Image Files (*.png *.jpg *.jpeg *.gif)</source>
+        <translation>קבצי תמונה (‎*.png *.jpg *.jpeg *.gif)</translation>
+    </message>
+    <message>
+        <source>Image Files (*.png *.jpg *.gif)</source>
+        <translation type="obsolete">קבצי תמונה (‎*.png *.jpg *.gif)</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAvatarWidget.cpp" line="95"/>
+        <source>Error</source>
+        <translation>שגיאה</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAvatarWidget.cpp" line="95"/>
+        <source>The selected picture is in an unrecognized format</source>
+        <translatorcomment>התמונה הנבחרת מצויה בתוך פורמט לא מוכר</translatorcomment>
+        <translation>הפורמט של התמונה הנבחרת אינו מוכר</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtBookmarkDetailWindow</name>
+    <message>
+        <location filename="../QtUI/QtBookmarkDetailWindow.cpp" line="31"/>
+        <source>Bookmark not valid</source>
+        <translation>סימנייה לא תקפה</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtBookmarkDetailWindow.cpp" line="31"/>
+        <source>You must specify a valid room address (e.g. someroom@rooms.example.com).</source>
+        <translation>עליך לציין כתובת חדר תקפה (למשל myroom@chats.example.com).</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtCertificateViewerDialog</name>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="95"/>
+        <source>General</source>
+        <translation>כללי</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="96"/>
+        <source>Valid From</source>
+        <translation>בתוקף מן</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="97"/>
+        <source>Valid To</source>
+        <translation>בתוקף עד</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="98"/>
+        <source>Serial Number</source>
+        <translation>מספר סידורי</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="99"/>
+        <source>Version</source>
+        <translation>גרסא</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="101"/>
+        <source>Subject</source>
+        <translation>נושא</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="102"/>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="124"/>
+        <source>Organization</source>
+        <translation>ארגון</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="103"/>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="125"/>
+        <source>Common Name</source>
+        <translation>שם כללי</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="104"/>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="126"/>
+        <source>Locality</source>
+        <translation>מקומיות</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="105"/>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="127"/>
+        <source>Organizational Unit</source>
+        <translation>יחידה ארגונית</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="106"/>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="128"/>
+        <source>Country</source>
+        <translation>ארץ</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="107"/>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="129"/>
+        <source>State</source>
+        <translation>מחוז</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="110"/>
+        <source>Alternate Subject Names</source>
+        <translation>שמות נושא חילופיים</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="115"/>
+        <source>E-mail Address</source>
+        <translation>כתובת דוא״ל</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="117"/>
+        <source>DNS Name</source>
+        <translation>שם DNS</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="123"/>
+        <source>Issuer</source>
+        <translation>מנפיק</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtChatListWindow</name>
+    <message>
+        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="82"/>
+        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="86"/>
+        <source>Add New Bookmark</source>
+        <translation>הוסף סימנייה חדשה</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="83"/>
+        <source>Edit Bookmark</source>
+        <translation>ערוך סימנייה</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="84"/>
+        <source>Remove Bookmark</source>
+        <translation>הסר סימנייה</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="173"/>
+        <source>Clear recents</source>
+        <translation>טהר אחרונות</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtChatView</name>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="73"/>
+        <source>Clear log</source>
+        <translation>טהר רשומת יומן</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="74"/>
+        <source>You are about to clear the contents of your chat log.</source>
+        <translation>בחרת לטהר את התכנים של יומן השיחה שלך.</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="75"/>
+        <source>Are you sure?</source>
+        <translation>האם דעתך גמורה?</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="219"/>
+        <source>%1 edited</source>
+        <translatorcomment>ערוכה</translatorcomment>
+        <translation type="unfinished">%1 ערוך</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="400"/>
+        <source>Waiting for other side to accept the transfer.</source>
+        <translation>ממתין כעת לקצה האחר לקבל את ההעברה.</translation>
+    </message>
+    <message>
+        <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>ביטול</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="405"/>
+        <source>Negotiating...</source>
+        <translation>מסדיר כעת...</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="420"/>
+        <source>Transfer has been canceled!</source>
+        <translation>העברה בוטלה!</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="424"/>
+        <source>Transfer completed successfully.</source>
+        <translation>העברה הושלמה בהצלחה.</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="427"/>
+        <source>Transfer failed.</source>
+        <translation>העברה נכשלה.</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="437"/>
+        <source>Started whiteboard chat</source>
+        <translation>שיחת לוח לבן הותחלה</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="438"/>
+        <source>Show whiteboard</source>
+        <translation>הצג לוח לבן</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="440"/>
+        <source>Whiteboard chat has been canceled</source>
+        <translation>שיחת לוח לבן בוטלה</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="442"/>
+        <source>Whiteboard chat request has been rejected</source>
+        <translation>בקשה לשיחת לוח לבן נדחתה</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="451"/>
+        <source>Return to room</source>
+        <translation>חזור אל חדר</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtChatWindow</name>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="157"/>
+        <source>Correcting</source>
+        <translation>תיקון</translation>
+    </message>
+    <message>
+        <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>
+        <translatorcomment>שיחה זו עשויה ש</translatorcomment>
+        <translation>אפשרי כי שיחה זו לא תומכת בתיקון הודעות. אם תשלח תיקון בכל זאת, זה עשוי להופיע בתור הודעה כפולה</translation>
+    </message>
+    <message>
+        <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>שיחה זו לא תומכת בתיקון הודעות.  אם תשלח תיקון בכל זאת, זו תופיע בתור הודעה כפולה</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="546"/>
+        <source>This message has not been received by your server yet.</source>
+        <translation>הודעה זו טרם התקבלה על ידי השרת שלך.</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="553"/>
+        <source>This message may not have been transmitted.</source>
+        <translation>אפשרי כי הודעה זו לא שודרה.</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="562"/>
+        <source>The receipt for this message has been received.</source>
+        <translation>הקבלה עבור הודעה זו התקבלה.</translation>
+    </message>
+    <message>
+        <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>הקבלה עבור הודעה זו טרם התקבלה. ייתכן כי הקצה המרוחק לא קיבל את הודעה זו.</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="613"/>
+        <source>Send file</source>
+        <translation>שלח קובץ</translation>
+    </message>
+    <message>
+        <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>ביטול</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="616"/>
+        <source>Set Description</source>
+        <translation>הגדר תיאור</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="617"/>
+        <source>Send</source>
+        <translation>שלח</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="621"/>
+        <source>Receiving file</source>
+        <translation>מקבל כעת קובץ</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="624"/>
+        <location filename="../QtUI/QtChatWindow.cpp" line="665"/>
+        <source>Accept</source>
+        <translatorcomment>הסכם</translatorcomment>
+        <translation>קבל</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="659"/>
+        <source>Starting whiteboard chat</source>
+        <translation>מתחיל כעת שיחת לוח לבן</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="663"/>
+        <source>%1 would like to start a whiteboard chat</source>
+        <translation>%1 רוצה להתחיל שיחת לוח לבן</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="700"/>
+        <source>File transfer description</source>
+        <translation>תיאור העברת קובץ</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="701"/>
+        <source>Description:</source>
+        <translation>תיאור:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="715"/>
+        <source>Save File</source>
+        <translation>שמור קובץ</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="906"/>
+        <source>Change subject…</source>
+        <translation>שינוי נושא…</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="907"/>
+        <source>Configure room…</source>
+        <translation>הגדרת חדר…</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="908"/>
+        <source>Edit affiliations…</source>
+        <translation>עריכת שיוכים…</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="909"/>
+        <source>Destroy room</source>
+        <translation>החרב חדר</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="910"/>
+        <source>Invite person to this room…</source>
+        <translation>הזמנת אישיות אל חדר זה…</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="920"/>
+        <source>Change room subject</source>
+        <translation>שינוי נושא חדר</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="920"/>
+        <source>New subject:</source>
+        <translation>נושא חדש:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="938"/>
+        <source>Confirm room destruction</source>
+        <translation>אמת החרבת חדר</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="939"/>
+        <source>Are you sure you want to destroy the room?</source>
+        <translation>האם אתה בטוח כי ברצונך להרוס את חדר זה?</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="940"/>
+        <source>This will destroy the room.</source>
+        <translation>פעולה זו תחריב את החדר.</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="991"/>
+        <source>Accept Invite</source>
+        <translation>הסכם להזמנה</translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t send message: %1</source>
+        <translation type="obsolete">לא היתה אפשרות לשלוח הודעה: %1</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtContactEditWidget</name>
+    <message>
+        <location filename="../QtUI/QtContactEditWidget.cpp" line="122"/>
+        <source>Name:</source>
+        <translation>שם:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtContactEditWidget.cpp" line="42"/>
+        <source>Groups:</source>
+        <translation>קבוצות:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtContactEditWidget.cpp" line="65"/>
+        <source>New Group:</source>
+        <translation>קבוצה חדשה:</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtContactEditWindow</name>
+    <message>
+        <location filename="../QtUI/QtContactEditWindow.cpp" line="28"/>
+        <source>Edit contact</source>
+        <translation>עריכת קשר</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtContactEditWindow.cpp" line="43"/>
+        <source>Remove contact</source>
+        <translation>הסרת קשר</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtContactEditWindow.cpp" line="46"/>
+        <source>OK</source>
+        <translation>אישור</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtContactEditWindow.cpp" line="94"/>
+        <source>Confirm contact deletion</source>
+        <translation>ודא מחיקת קשר</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtContactEditWindow.cpp" line="95"/>
+        <source>Are you sure you want to delete this contact?</source>
+        <translation>האם אתה בטוח כי ברצונך למחוק את קשר זה?</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtContactEditWindow.cpp" line="96"/>
+        <source>This will remove the contact &apos;%1&apos; from all groups they may be in.</source>
+        <translation>פעולה זו תסיר את הקשר &apos;%1&apos; מן כל הקבוצות בהן הם עשויים להיות.</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtEventWindow</name>
+    <message>
+        <location filename="../QtUI/EventViewer/QtEventWindow.cpp" line="48"/>
+        <source>Display Notice</source>
+        <translation>הצג התראה</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtFileTransferListWidget</name>
+    <message>
+        <location filename="../QtUI/QtFileTransferListWidget.cpp" line="39"/>
+        <source>Clear Finished Transfers</source>
+        <translation>טהר העברות גמורות</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListWidget.cpp" line="44"/>
+        <source>File Transfer List</source>
+        <translation>רשימת העברת קובץ</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtHistoryWindow</name>
+    <message>
+        <location filename="../QtUI/QtHistoryWindow.cpp" line="57"/>
+        <source>History</source>
+        <translation>היסטוריה</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>משתמשים להזמנה אל שיחה זו (אחד בכל שורה):</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>אם ברצונך לספק סיבה עבור ההזמנה, הזן אותה כאן</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtJoinMUCWindow</name>
+    <message>
+        <location filename="../QtUI/QtJoinMUCWindow.cpp" line="19"/>
+        <source>someroom@rooms.example.com</source>
+        <translation></translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtLoginWindow</name>
+    <message>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="92"/>
+        <source>User address:</source>
+        <translation>כתובת משתמש:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="97"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="98"/>
+        <source>User address - looks like someuser@someserver.com</source>
+        <translation>כתובת משתמש - נראית כמו someuser@someserver.com</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="102"/>
+        <source>Example: alice@wonderland.lit</source>
+        <translation>דוגמא: alice@wonderland.lit</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="108"/>
+        <source>Password:</source>
+        <translation>סיסמה:</translation>
+    </message>
+    <message>
+        <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>ברשותי תעודה אישית לשימוש עבור התחברותי אל השירות.</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="136"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="355"/>
+        <source>Connect</source>
+        <translation>התחבר</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="154"/>
+        <source>Remember Password?</source>
+        <translation>זכור סיסמה?</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="156"/>
+        <source>Login Automatically?</source>
+        <translation>התחבר אוטומטית?</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="168"/>
+        <source>&amp;Swift</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="170"/>
+        <source>&amp;General</source>
+        <translation>&amp;כללי</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="178"/>
+        <source>&amp;About %1</source>
+        <translation>&amp;אודות %1</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="183"/>
+        <source>&amp;Show Debug Console</source>
+        <translation>&amp;הצג מסוף ניפוי שגיאות</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="188"/>
+        <source>Show &amp;File Transfer Overview</source>
+        <translation>הצג סקירת העברת ק&amp;ובץ</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="193"/>
+        <source>&amp;Play Sounds</source>
+        <translation>&amp;נגן צלילים</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="199"/>
+        <source>Display Pop-up &amp;Notifications</source>
+        <translation>הצג התראות &amp;קופצות</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="211"/>
+        <source>&amp;Quit</source>
+        <translation>י&amp;ציאה</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="253"/>
+        <source>Remove profile</source>
+        <translation>הסר דיוקן</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="253"/>
+        <source>Remove the profile &apos;%1&apos;?</source>
+        <translation>להסיר את הדיוקן &apos;%1&apos;?</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="355"/>
+        <source>Cancel</source>
+        <translation>ביטול</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="369"/>
+        <source>Confirm terms of use</source>
+        <translation>אשר תנאי שימוש</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="412"/>
+        <source>Select an authentication certificate</source>
+        <translation>בחר תעודת אימות</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="412"/>
+        <source>P12 files (*.cert *.p12 *.pfx);;All files (*.*)</source>
+        <translation>קבצי P12 ‏(‎*.cert *.p12 *.pfx);;כל הקבצים (*.*)</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="525"/>
+        <source>The certificate presented by the server is not valid.</source>
+        <translation>התעודה אשר מוצגת על ידי השרת אינה תקפה.</translation>
+    </message>
+    <message>
+        <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>
+        <translatorcomment>you know for certain it</translatorcomment>
+        <translation>האם ברצונך לסמוך על תעודה זו לצמיתות? על פעולה זו להיעשות אך ורק אם ידוע לך בוודאות כי תעודה זו הינה מדויקת.</translation>
+    </message>
+    <message>
+        <source>Subject: %1</source>
+        <translation type="obsolete">נושא: %1</translation>
+    </message>
+    <message>
+        <source>SHA-1 Fingerprint: %1</source>
+        <translation type="obsolete">טביעת אצבע SHA-1: ‏%1</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtMUCConfigurationWindow</name>
+    <message>
+        <location filename="../QtUI/QtMUCConfigurationWindow.cpp" line="34"/>
+        <source>Cancel</source>
+        <translation>ביטול</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMUCConfigurationWindow.cpp" line="37"/>
+        <source>OK</source>
+        <translation>אישור</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtMUCSearchWindow</name>
+    <message>
+        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.cpp" line="49"/>
+        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.cpp" line="51"/>
+        <source>Searching</source>
+        <translation>חיפוש</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtMainWindow</name>
+    <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="79"/>
+        <source>&amp;Contacts</source>
+        <translation>&amp;קשרים</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="88"/>
+        <location filename="../QtUI/QtMainWindow.cpp" line="205"/>
+        <source>&amp;Notices</source>
+        <translation>ה&amp;תראות</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="87"/>
+        <source>C&amp;hats</source>
+        <translation>&amp;שיחות</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="96"/>
+        <source>&amp;View</source>
+        <translation>&amp;תצוגה</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="98"/>
+        <source>&amp;Show offline contacts</source>
+        <translation>הצג קשרים &amp;לא מקוונים</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="106"/>
+        <source>&amp;Show Emoticons</source>
+        <translation>הצג &amp;רגשונים</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="120"/>
+        <source>&amp;Actions</source>
+        <translation>&amp;פעולות</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="122"/>
+        <source>Edit &amp;Profile…</source>
+        <translation>עריכת &amp;דיוקן…</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="125"/>
+        <source>Enter &amp;Room…</source>
+        <translation>כניסה אל &amp;חדר…</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="129"/>
+        <source>&amp;View History…</source>
+        <translation>&amp;הצגת היסטוריה…</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="133"/>
+        <source>&amp;Add Contact…</source>
+        <translation>הוספת &amp;קשר…</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="136"/>
+        <source>&amp;Edit Selected Contact…</source>
+        <translation>&amp;עריכת קשר נבחר…</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="140"/>
+        <source>Start &amp;Chat…</source>
+        <translation>התחלת &amp;שיחה…</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="143"/>
+        <source>Run Server Command</source>
+        <translation>הרץ פקודת שרת</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="150"/>
+        <source>&amp;Request Delivery Receipts</source>
+        <translatorcomment>משלוח</translatorcomment>
+        <translation>&amp;בקש קבלות מסירה</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="161"/>
+        <source>Collecting commands...</source>
+        <translation>אוסף כעת פקודות...</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="216"/>
+        <source>&amp;Chats</source>
+        <translation>&amp;שיחות</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="339"/>
+        <source>No Available Commands</source>
+        <translation>אין פקודות זמינות</translation>
+    </message>
+    <message>
+        <source>Edit &amp;Profile</source>
+        <translation type="obsolete">ערוך &amp;דיוקן</translation>
+    </message>
+    <message>
+        <source>Enter &amp;Room</source>
+        <translation type="obsolete">כנס אל &amp;חדר</translation>
+    </message>
+    <message>
+        <source>&amp;Add Contact</source>
+        <translation type="obsolete">&amp;הוסף קשר</translation>
+    </message>
+    <message>
+        <source>&amp;Edit Selected Contact</source>
+        <translation type="obsolete">&amp;ערוך קשר נוכחי</translation>
+    </message>
+    <message>
+        <source>Start &amp;Chat</source>
+        <translation type="obsolete">התחל &amp;שיחה</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="146"/>
+        <source>&amp;Sign Out</source>
+        <translation>&amp;התנתק</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtNameWidget</name>
+    <message>
+        <location filename="../QtUI/QtNameWidget.cpp" line="48"/>
+        <source>Show Nickname</source>
+        <translation>הצג שם כינוי</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtNameWidget.cpp" line="48"/>
+        <source>(No Nickname Set)</source>
+        <translation>(לא נקבע שם כינוי)</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtNameWidget.cpp" line="56"/>
+        <source>Show Address</source>
+        <translation>הצג כתובת</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtNameWidget.cpp" line="63"/>
+        <source>Edit Profile</source>
+        <translation>ערוך דיוקן</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtOccupantListWidget</name>
+    <message>
+        <location filename="../QtUI/Roster/QtOccupantListWidget.cpp" line="46"/>
+        <source>No actions for this user</source>
+        <translatorcomment>לא קיימות</translatorcomment>
+        <translation>אין פעולות עבור משתמש זה</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtOccupantListWidget.cpp" line="55"/>
+        <source>Kick user</source>
+        <translation>בעט משתמש</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtOccupantListWidget.cpp" line="56"/>
+        <source>Kick and ban user</source>
+        <translation>בעט ואסור משתמש</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtOccupantListWidget.cpp" line="57"/>
+        <source>Make moderator</source>
+        <translation>הפוך לאחראי</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtOccupantListWidget.cpp" line="58"/>
+        <source>Make participant</source>
+        <translation>הפוך למשתתף</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtOccupantListWidget.cpp" line="59"/>
+        <source>Remove voice</source>
+        <translation>שלול ביטוי</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtOccupantListWidget.cpp" line="60"/>
+        <source>Add to contacts</source>
+        <translation>הוסף אל קשרים</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtProfileWindow</name>
+    <message>
+        <location filename="../QtUI/QtProfileWindow.cpp" line="24"/>
+        <source>Edit Profile</source>
+        <translation>ערוך דיוקן</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtProfileWindow.cpp" line="43"/>
+        <source>Nickname:</source>
+        <translation>שם כינוי:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtProfileWindow.cpp" line="67"/>
+        <source>Save</source>
+        <translation>שמור</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtRosterHeader</name>
+    <message>
+        <location filename="../QtUI/QtRosterHeader.cpp" line="59"/>
+        <source>Connection is secured</source>
+        <translation>חיבור הינו מאובטח</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtRosterWidget</name>
+    <message>
+        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="58"/>
+        <source>Edit…</source>
+        <translation>עריכה…</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="59"/>
+        <source>Remove</source>
+        <translation>הסר</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="63"/>
+        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="83"/>
+        <source>Send File</source>
+        <translation>שליחת קובץ</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="69"/>
+        <source>Start Whiteboard Chat</source>
+        <translation>התחל שיחת לוח לבן</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="83"/>
+        <source>All Files (*);;</source>
+        <translation>כל הקבצים (*);;</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="96"/>
+        <source>Rename</source>
+        <translation>שינוי שם</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="106"/>
+        <source>Rename group</source>
+        <translation>שינוי שם קבוצה</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="106"/>
+        <source>Enter a new name for group &apos;%1&apos;:</source>
+        <translation>הזן שם חדש עבור קבוצה &apos;%1&apos;:</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtStatusWidget</name>
+    <message>
+        <location filename="../QtUI/QtStatusWidget.cpp" line="231"/>
+        <source>Connecting</source>
+        <translation>מתחבר כעת</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtStatusWidget.cpp" line="261"/>
+        <source>(No message)</source>
+        <translation>(אין הודעה)</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtSubscriptionRequestWindow</name>
+    <message>
+        <location filename="../QtUI/QtSubscriptionRequestWindow.cpp" line="18"/>
+        <source>%1 would like to add you to their contact list.
+ Would you like to add them to your contact list and share your status when you&apos;re online? 
+
+If you choose to defer this choice, you will be asked again when you next login.</source>
+        <translation>%1 רוצה להוסיפך אל רשימת הקשרים שלהם.
+ האם ברצונך להוסיפם אל רשימת הקשרים שלך ולשתף את מצב החיבור שלך כאשר מצב זה הינו מקוון? 
+
+במידה ותיבחר האפשרות לדחות, אני אתשאל אותך שוב בהתחברותך הבאה.</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtSubscriptionRequestWindow.cpp" line="24"/>
+        <source>You have already replied to this request</source>
+        <translation>כבר השבת לבקשה זו</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtSubscriptionRequestWindow.cpp" line="25"/>
+        <source>OK</source>
+        <translation>אישור</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtSubscriptionRequestWindow.cpp" line="30"/>
+        <source>Yes</source>
+        <translation>כן</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtSubscriptionRequestWindow.cpp" line="33"/>
+        <source>No</source>
+        <translation>לא</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtSubscriptionRequestWindow.cpp" line="35"/>
+        <source>Defer</source>
+        <translation>עכב</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtTreeWidget</name>
+    <message>
+        <source>Edit</source>
+        <translation type="obsolete">עריכה</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="obsolete">הסרה</translation>
+    </message>
+    <message>
+        <source>Rename</source>
+        <translation type="obsolete">שינוי שם</translation>
+    </message>
+    <message>
+        <source>Rename group</source>
+        <translation type="obsolete">שינוי שם קבוצה</translation>
+    </message>
+    <message>
+        <source>Enter a new name for group &apos;%1&apos;:</source>
+        <translation type="obsolete">הזן שם חדש עבור הקבוצה &apos;%1&apos;:</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtUserSearchDetailsPage</name>
+    <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>אנא בחר שם עבור הקשר, ובחר את הקבוצות אליהן ברצונך להוסיף את הקשר.</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtUserSearchFirstPage</name>
+    <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. אם כתובתם ידועה לך באפשרותך להזינה ישירות, לחלופין באפשרותך לחפש עבורם.</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/UserSearch/QtUserSearchFirstPage.cpp" line="16"/>
+        <source>Add another user to your contact list</source>
+        <translation>הוסף משתמש אחר אל רשימת הקשרים שלך</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/UserSearch/QtUserSearchFirstPage.cpp" line="16"/>
+        <source>Chat to another user</source>
+        <translation>שוחח עם משתמש אחר</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtUserSearchWindow</name>
+    <message>
+        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="35"/>
+        <source>Add Contact</source>
+        <translation>הוספת קשר</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="35"/>
+        <source>Chat to User</source>
+        <translatorcomment>שיח</translatorcomment>
+        <translation>שוחח עם משתמש</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="45"/>
+        <source>alice@wonderland.lit</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="296"/>
+        <source>How would you like to find the user to add?</source>
+        <translation>כיצד ברצונך למצוא את המשתמש להוספה?</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="299"/>
+        <source>How would you like to find the user to chat to?</source>
+        <translation>כיצד ברצונך למצוא את המשתמש לשיחה?</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="326"/>
+        <source>Error while searching</source>
+        <translation>שגיאה במהלך חיפוש</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="332"/>
+        <source>This server doesn&apos;t support searching for users.</source>
+        <translation>שרת זה לא תומך בחיפוש עבור משתמשים.</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtWebView</name>
+    <message>
+        <location filename="../QtUI/QtWebView.cpp" line="66"/>
+        <source>Clear</source>
+        <translation>טהר</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtWebView.cpp" line="67"/>
+        <source>Increase font size</source>
+        <translation>הגדל מידת גופן</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtWebView.cpp" line="68"/>
+        <source>Decrease font size</source>
+        <translation>הקטן מידת גופן</translation>
+    </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>סגירת חלון הינה שקולה לסגירת סשן זה. האם אתה בטוח כי ברצונך לעשות זאת?</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtXMLConsoleWidget</name>
+    <message>
+        <location filename="../QtUI/QtXMLConsoleWidget.cpp" line="22"/>
+        <source>Console</source>
+        <translation>מסוף</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtXMLConsoleWidget.cpp" line="40"/>
+        <source>Trace input/output</source>
+        <translation>חקור קלט/פלט</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtXMLConsoleWidget.cpp" line="46"/>
+        <source>Clear</source>
+        <translation>טהר</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtXMLConsoleWidget.cpp" line="50"/>
+        <source>Debug Console</source>
+        <translation>מסוף ניפוי שגיאות</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtXMLConsoleWidget.cpp" line="78"/>
+        <source>&lt;!-- IN --&gt;</source>
+        <translation>&lt;!-- נכנסת --&gt;</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtXMLConsoleWidget.cpp" line="82"/>
+        <source>&lt;!-- OUT --&gt;</source>
+        <translation>&lt;!-- יוצאת --&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>TRANSLATION_INFO</name>
+    <message>
+        <location filename="../QtUI/QtAboutWidget.cpp" line="49"/>
+        <location filename="../QtUI/QtAboutWidget.cpp" line="50"/>
+        <source>TRANSLATION_AUTHOR</source>
+        <translation>Isratine Citizen</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAboutWidget.cpp" line="52"/>
+        <source>TRANSLATION_LICENSE</source>
+        <comment>This string contains the license under which this translation is licensed. We ask you to license the translation under the BSD license. Please read http://www.opensource.org/licenses/bsd-license.php, and if you agree to release your translation under this license, use the following (untranslated) text: &apos;This translation is licensed under the BSD License. See http://www.opensource.org/licenses/bsd-license.php&apos;</comment>
+        <translatorcomment>&apos;תרגום זה הינו רשוי תחת הרשיון BSD. למידע נוסף ראה http://www.opensource.org/licenses/bsd-license.php&apos;</translatorcomment>
+        <translation>&apos;This translation is licensed under the BSD License. See http://www.opensource.org/licenses/bsd-license.php&apos;</translation>
+    </message>
+</context>
+</TS>
diff --git a/Swift/Translations/swift_hu.ts b/Swift/Translations/swift_hu.ts
index 30f98ec..54167e2 100644
--- a/Swift/Translations/swift_hu.ts
+++ b/Swift/Translations/swift_hu.ts
@@ -1137,21 +1137,21 @@
     </message>
     <message>
-        <source>Edit &amp;Profile</source>
-        <translation>&amp;Profil szerkesztése</translation>
+        <source>Edit &amp;Profile…</source>
+        <translation>&amp;Profil szerkesztése…</translation>
     </message>
     <message>
-        <source>Enter &amp;Room</source>
-        <translation>Belépés &amp;szobába</translation>
+        <source>Enter &amp;Room…</source>
+        <translation>Belépés &amp;szobába…</translation>
     </message>
     <message>
-        <source>&amp;Add Contact</source>
-        <translation>&amp;Partner felvétele</translation>
+        <source>&amp;Add Contact…</source>
+        <translation>&amp;Partner felvétele…</translation>
     </message>
     <message>
-        <source>&amp;Edit Selected Contact</source>
-        <translation>&amp;Kiválasztott partner szerkesztése</translation>
+        <source>&amp;Edit Selected Contact…</source>
+        <translation>&amp;Kiválasztott partner szerkesztése…</translation>
     </message>
     <message>
-        <source>Start &amp;Chat</source>
+        <source>Start &amp;Chat…</source>
         <translation>Bes&amp;zélgetés kezdeményezése</translation>
     </message>
diff --git a/Swift/Translations/swift_nl.ts b/Swift/Translations/swift_nl.ts
index 7e8bfbd..20a03ef 100644
--- a/Swift/Translations/swift_nl.ts
+++ b/Swift/Translations/swift_nl.ts
@@ -139,5 +139,5 @@
     <message>
         <source>A password needed</source>
-        <translation>Wachtwoord vereist</translation>
+        <translation type="obsolete">Wachtwoord vereist</translation>
     </message>
     <message>
@@ -159,5 +159,5 @@
     <message>
         <source>Unable to enter this room as %1%, retrying as %2%</source>
-        <translation>Kan deze kamer niet betreden als %1%; als %2% opniew aan het proberen</translation>
+        <translation>Kan deze kamer niet betreden als %1%; als %2% opnieuw aan het proberen</translation>
     </message>
     <message>
@@ -433,4 +433,84 @@
         <translation>Gebruikersadres ongeldig. Gebruikersadres moet van de vorm &apos;alice@wonderland.lit&apos; zijn</translation>
     </message>
+    <message>
+        <source>This chat doesn&apos;t support delivery receipts.</source>
+        <translation>Deze conversatie ondersteunt geen ontvangstbevestigingen.</translation>
+    </message>
+    <message>
+        <source>This chat may not support delivery receipts. You might not receive delivery receipts for the messages you sent.</source>
+        <translation>Deze conversatie ondersteunt mogelijks geen ontvangstbevestigingen.</translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t send message: %1%</source>
+        <translation>Kon boodschap niet verzenden: %1%</translation>
+    </message>
+    <message>
+        <source>The correct room password is needed</source>
+        <translation>Het correcte wachtwoord voor de kamer is vereist</translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t join room: %1%.</source>
+        <translation>Kon kamer niet betreden: %1%.</translation>
+    </message>
+    <message>
+        <source>%1% has left the room%2%</source>
+        <translation>%1% heeft de kamer %2% verlaten</translation>
+    </message>
+    <message>
+        <source>You have been kicked out of the room</source>
+        <translation>U bent uit de kamer geschopt</translation>
+    </message>
+    <message>
+        <source>You have been banned from the room</source>
+        <translation>U bent uit de kamer verbannen</translation>
+    </message>
+    <message>
+        <source>You are no longer a member of the room and have been removed</source>
+        <translation>U bent niet langer een lid van de kamer, en werd uit de kamer verwijderd</translation>
+    </message>
+    <message>
+        <source>The room has been destroyed</source>
+        <translation>De kamer werd vernietigd</translation>
+    </message>
+    <message>
+        <source>Room configuration failed: %1%.</source>
+        <translation>Configuratie van kamer gefaald: %1%.</translation>
+    </message>
+    <message>
+        <source>Occupant role change failed: %1%.</source>
+        <translation>Deelnemersrol veranderd: %1%.</translation>
+    </message>
+    <message>
+        <source>%1% has invited you to enter the %2% room</source>
+        <translation>%1% heeft U uitgenodigd om de kamer %2% te betreden</translation>
+    </message>
+    <message>
+        <source>Certificate card removed</source>
+        <translation>Certificaatskaart verwijderd</translation>
+    </message>
+    <message>
+        <source>Certificate has been revoked</source>
+        <translation>Certificaat werd ingetrokken</translation>
+    </message>
+    <message>
+        <source>Unable to determine certificate revocation state</source>
+        <translation>Kan ingetrokken toestand van certificaat niet conttroleren  </translation>
+    </message>
+    <message>
+        <source>Re-enter credentials and retry</source>
+        <translation>Voer gebruikersinformatie terug in en probeer opnieuw</translation>
+    </message>
+    <message>
+        <source>Disconnected from %1%: %2%. To reconnect, Sign Out and provide your password again.</source>
+        <translation>Verbinding met %1% verbroken: %2%. Om opnieuw te verbinden, meld terug af en voer het wachtwoord opnieuw in.</translation>
+    </message>
+    <message>
+        <source>TLS Client Certificate Selection</source>
+        <translation>Keuze TLS Klantcertificaat </translation>
+    </message>
+    <message>
+        <source>Select a certificate to use for authentication</source>
+        <translation>Kies een certificaat om te gebruiken voor authenticatie</translation>
+    </message>
 </context>
 <context>
@@ -523,5 +603,5 @@
     <message>
         <source>&amp;Redo</source>
-        <translation>&amp;Opniew</translation>
+        <translation>&amp;Opnieuw</translation>
     </message>
     <message>
@@ -563,4 +643,80 @@
         <translation>%1 wil u aan zijn contactenlijst toevoegen, met als boodschap &apos;%2&apos;</translation>
     </message>
+    <message>
+        <source>%1 has invited you to enter the %2 room.</source>
+        <translation>%1 heeft U uitgenodigd om de kamer %2 te betreden.</translation>
+    </message>
+    <message>
+        <source>You&apos;ve been invited to enter the %1 room.</source>
+        <translation>U bent uitgenodigd om de kamer %1 te betreden.</translation>
+    </message>
+    <message>
+        <source>Reason: %1</source>
+        <translation>Reden: %1</translation>
+    </message>
+    <message>
+        <source>This person may not have really sent this invitation!</source>
+        <translation>Deze persoon heeft mogelijks deze uitnodiging niet echt verstuurd!</translation>
+    </message>
+    <message>
+        <source>Direction</source>
+        <translation>Richting</translation>
+    </message>
+    <message>
+        <source>Other Party</source>
+        <translation>Andere Partij</translation>
+    </message>
+    <message>
+        <source>State</source>
+        <translation>Toestand</translation>
+    </message>
+    <message>
+        <source>Progress</source>
+        <translation>Voortgang</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation>Grootte</translation>
+    </message>
+    <message>
+        <source>Incoming</source>
+        <translation>Inkomend</translation>
+    </message>
+    <message>
+        <source>Outgoing</source>
+        <translation>Uitgaand</translation>
+    </message>
+    <message>
+        <source>Waiting for start</source>
+        <translation>Aan het wachten om te starten</translation>
+    </message>
+    <message>
+        <source>Waiting for other side to accept</source>
+        <translation>Aan het wachten op de andere kant om te aanvaarden</translation>
+    </message>
+    <message>
+        <source>Negotiating</source>
+        <translation>Aan het onderhandelen</translation>
+    </message>
+    <message>
+        <source>Transferring</source>
+        <translation>Aan het overbrengen</translation>
+    </message>
+    <message>
+        <source>Finished</source>
+        <translation>Voltooid</translation>
+    </message>
+    <message>
+        <source>Failed</source>
+        <translation>Gefaald</translation>
+    </message>
+    <message>
+        <source>Canceled</source>
+        <translation>Geannuleerd</translation>
+    </message>
+    <message>
+        <source>Connection Options</source>
+        <translation>Verbindingsopties</translation>
+    </message>
 </context>
 <context>
@@ -611,5 +767,5 @@
     <message>
         <source>&amp;Redo</source>
-        <translation>&amp;Opniew</translation>
+        <translation>&amp;Opnieuw</translation>
     </message>
     <message>
@@ -721,4 +877,39 @@
 </context>
 <context>
+    <name>QtAffiliationEditor</name>
+    <message>
+        <source>Affiliation:</source>
+        <translation>Lidmaatschap:</translation>
+    </message>
+    <message>
+        <source>Owner</source>
+        <translation>Eigenaar</translation>
+    </message>
+    <message>
+        <source>Administrator</source>
+        <translation>Beheerder</translation>
+    </message>
+    <message>
+        <source>Member</source>
+        <translation>Lid</translation>
+    </message>
+    <message>
+        <source>Outcast (Banned)</source>
+        <translation>Verstoteling</translation>
+    </message>
+    <message>
+        <source>Add User</source>
+        <translation>Voeg gebruiker toe</translation>
+    </message>
+    <message>
+        <source>Remove User</source>
+        <translation>Verwijder gebruiker</translation>
+    </message>
+    <message>
+        <source>Edit Affiliations</source>
+        <translation>Editeer Lidmaatschappen</translation>
+    </message>
+</context>
+<context>
     <name>QtBookmarkDetailWindow</name>
     <message>
@@ -740,5 +931,5 @@
     <message>
         <source>Join automatically</source>
-        <translation>Automatisch betreden</translation>
+        <translation type="obsolete">Automatisch betreden</translation>
     </message>
     <message>
@@ -746,4 +937,129 @@
         <translation>Adres kamer:</translation>
     </message>
+    <message>
+        <source>Enter automatically</source>
+        <translation>Automatisch betreden</translation>
+    </message>
+</context>
+<context>
+    <name>QtCertificateViewerDialog</name>
+    <message>
+        <source>Certificate Viewer</source>
+        <translation>Certificaat</translation>
+    </message>
+</context>
+<context>
+    <name>QtConnectionSettings</name>
+    <message>
+        <source>Connection Method:</source>
+        <translation>Verbindingsmethode:</translation>
+    </message>
+    <message>
+        <source>Automatic</source>
+        <translation>Automatisch</translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <translation>Manueel</translation>
+    </message>
+    <message>
+        <source>BOSH</source>
+        <translation>BOSH</translation>
+    </message>
+    <message>
+        <source>Secure connection:</source>
+        <translation>Beveilig verbinding:</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation>Nooit</translation>
+    </message>
+    <message>
+        <source>Encrypt when possible</source>
+        <translation>Beveilig wanneer mogelijk</translation>
+    </message>
+    <message>
+        <source>Always encrypt</source>
+        <translation>Altijd beveiligen</translation>
+    </message>
+    <message>
+        <source>Allow Compression</source>
+        <translation>Comprimeer wanneer mogelijk</translation>
+    </message>
+    <message>
+        <source>Allow sending password over insecure connection</source>
+        <translation>Sta toe om  paswoord over onbeveiligde verbinding te sturen</translation>
+    </message>
+    <message>
+        <source>Manually select server</source>
+        <translation>Manuele serverselectie</translation>
+    </message>
+    <message>
+        <source>Hostname:</source>
+        <translation>Hostnaam:</translation>
+    </message>
+    <message>
+        <source>Port:</source>
+        <translation>Poort:</translation>
+    </message>
+    <message>
+        <source>Connection Proxy</source>
+        <translation>Verbindingsproxy</translation>
+    </message>
+    <message>
+        <source>Proxy type:</source>
+        <translation>Proxy type:</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation>Geen</translation>
+    </message>
+    <message>
+        <source>Use system-configured proxy</source>
+        <translation>Gebruik systeemgeconfigureerde proxy</translation>
+    </message>
+    <message>
+        <source>SOCKS5</source>
+        <translation>SOCKS5</translation>
+    </message>
+    <message>
+        <source>HTTP Connect</source>
+        <translation>HTTP Connect</translation>
+    </message>
+    <message>
+        <source>Override system-configured proxy</source>
+        <translation>Override systemgeconfigureerde proxy</translation>
+    </message>
+    <message>
+        <source>BOSH URI:</source>
+        <translation>BOSH URI:</translation>
+    </message>
+    <message>
+        <source>Manually select HTTP proxy</source>
+        <translation>Selecteer HTTP proxy manueel</translation>
+    </message>
+    <message>
+        <source>Connection Options</source>
+        <translation>Verbindingsopties</translation>
+    </message>
+</context>
+<context>
+    <name>QtHistoryWindow</name>
+    <message>
+        <source>Search:</source>
+        <translation>Zoek:</translation>
+    </message>
+    <message>
+        <source>Next</source>
+        <translation>Volgende</translation>
+    </message>
+    <message>
+        <source>Previous</source>
+        <translation>Vorige</translation>
+    </message>
+    <message>
+        <source>History</source>
+        <translation>Geschiedenis</translation>
+    </message>
 </context>
 <context>
@@ -751,5 +1067,5 @@
     <message>
         <source>Room:</source>
-        <translation>Kamer:</translation>
+        <translation type="obsolete">Kamer:</translation>
     </message>
     <message>
@@ -759,5 +1075,5 @@
     <message>
         <source>Nickname:</source>
-        <translation>Roepnaam:</translation>
+        <translation type="obsolete">Roepnaam:</translation>
     </message>
     <message>
@@ -769,4 +1085,20 @@
         <translation>Automatisch betreden</translation>
     </message>
+    <message>
+        <source>Room Address:</source>
+        <translation>Adres kamer:</translation>
+    </message>
+    <message>
+        <source>Your Nickname:</source>
+        <translation>Uw roepnaam:</translation>
+    </message>
+    <message>
+        <source>Room Password:</source>
+        <translation>Wachtwoord kamer:</translation>
+    </message>
+    <message>
+        <source>Automatically configure newly created rooms</source>
+        <translation>Configureer nieuwe kamer automatisch</translation>
+    </message>
 </context>
 <context>
@@ -794,4 +1126,15 @@
 </context>
 <context>
+    <name>QtProfileWindow</name>
+    <message>
+        <source>Edit Profile</source>
+        <translation>Bewerk profiel</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>Bewaar</translation>
+    </message>
+</context>
+<context>
     <name>QtUserSearchFieldsPage</name>
     <message>
@@ -840,4 +1183,11 @@
 </context>
 <context>
+    <name>QtUserSearchResultsPage</name>
+    <message>
+        <source>No results.</source>
+        <translation>Geen resultaten.</translation>
+    </message>
+</context>
+<context>
     <name>QtUserSearchWizard</name>
     <message>
@@ -847,4 +1197,50 @@
 </context>
 <context>
+    <name>QtVCardPhotoAndNameFields</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Formatted Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nickname</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Prefix</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Given Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Middle Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Last Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Suffix</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QtVCardWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Field</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>Swift::ChatListModel</name>
     <message>
@@ -856,4 +1252,8 @@
         <translation>Recente conversaties</translation>
     </message>
+    <message>
+        <source>Opened Whiteboards</source>
+        <translation>Geopenede tekentafels</translation>
+    </message>
 </context>
 <context>
@@ -918,4 +1318,15 @@
 </context>
 <context>
+    <name>Swift::QtAffiliationEditor</name>
+    <message>
+        <source>Add User</source>
+        <translation>Voeg gebruiker toe</translation>
+    </message>
+    <message>
+        <source>Added User&apos;s Address:</source>
+        <translation>Adres toegevoegde gebruiker:</translation>
+    </message>
+</context>
+<context>
     <name>Swift::QtAvatarWidget</name>
     <message>
@@ -938,5 +1349,5 @@ afbeelding</translation>
     <message>
         <source>Image Files (*.png *.jpg *.gif)</source>
-        <translation>Afbeeldingen (*.png *.jpg *.gif)</translation>
+        <translation type="obsolete">Afbeeldingen (*.png *.jpg *.gif)</translation>
     </message>
     <message>
@@ -948,4 +1359,8 @@ afbeelding</translation>
         <translation>Het formaat van de geselecteerde afbeelding werd niet herkend</translation>
     </message>
+    <message>
+        <source>Image Files (*.png *.jpg *.jpeg *.gif)</source>
+        <translation>Beeldbestanden (*.png *.jpg *.jpeg *.gif)</translation>
+    </message>
 </context>
 <context>
@@ -961,4 +1376,71 @@ afbeelding</translation>
 </context>
 <context>
+    <name>Swift::QtCertificateViewerDialog</name>
+    <message>
+        <source>General</source>
+        <translation>Algemeen</translation>
+    </message>
+    <message>
+        <source>Valid From</source>
+        <translation>Geldig van</translation>
+    </message>
+    <message>
+        <source>Valid To</source>
+        <translation>Geldig tot</translation>
+    </message>
+    <message>
+        <source>Serial Number</source>
+        <translation>Serienummer</translation>
+    </message>
+    <message>
+        <source>Version</source>
+        <translation>Versie</translation>
+    </message>
+    <message>
+        <source>Subject</source>
+        <translation>Onderwerp</translation>
+    </message>
+    <message>
+        <source>Organization</source>
+        <translation>Organisatie</translation>
+    </message>
+    <message>
+        <source>Common Name</source>
+        <translation>Naam</translation>
+    </message>
+    <message>
+        <source>Locality</source>
+        <translation>Localiteit</translation>
+    </message>
+    <message>
+        <source>Organizational Unit</source>
+        <translation>Organisatie-eenheid</translation>
+    </message>
+    <message>
+        <source>Country</source>
+        <translation>Land</translation>
+    </message>
+    <message>
+        <source>State</source>
+        <translation>Staat</translation>
+    </message>
+    <message>
+        <source>Alternate Subject Names</source>
+        <translation>Alternatieve onderwerpsnaam</translation>
+    </message>
+    <message>
+        <source>E-mail Address</source>
+        <translation>E-mail adres</translation>
+    </message>
+    <message>
+        <source>DNS Name</source>
+        <translation>DNS naam</translation>
+    </message>
+    <message>
+        <source>Issuer</source>
+        <translation>Verstrekker</translation>
+    </message>
+</context>
+<context>
     <name>Swift::QtChatListWindow</name>
     <message>
@@ -974,4 +1456,8 @@ afbeelding</translation>
         <translation>Verwijder bladwijzer</translation>
     </message>
+    <message>
+        <source>Clear recents</source>
+        <translation>Wis recente conversaties</translation>
+    </message>
 </context>
 <context>
@@ -989,4 +1475,52 @@ afbeelding</translation>
         <translation>Bent u zeker?</translation>
     </message>
+    <message>
+        <source>%1 edited</source>
+        <translation>%1 geëditeerd</translation>
+    </message>
+    <message>
+        <source>Waiting for other side to accept the transfer.</source>
+        <translation>Aan het wachten op de andere kant om te aanvaarden.</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Annuleren</translation>
+    </message>
+    <message>
+        <source>Negotiating...</source>
+        <translation>Aan het onderhandelen...</translation>
+    </message>
+    <message>
+        <source>Transfer has been canceled!</source>
+        <translation>Overdracht geannuleerd!</translation>
+    </message>
+    <message>
+        <source>Transfer completed successfully.</source>
+        <translation>Overdracht succesvol beëindigd.</translation>
+    </message>
+    <message>
+        <source>Transfer failed.</source>
+        <translation>Overdracht gefaald.</translation>
+    </message>
+    <message>
+        <source>Started whiteboard chat</source>
+        <translation>Tekentafel gestart</translation>
+    </message>
+    <message>
+        <source>Show whiteboard</source>
+        <translation>Toon tekentafel</translation>
+    </message>
+    <message>
+        <source>Whiteboard chat has been canceled</source>
+        <translation>Tekentafel werd geannuleerd</translation>
+    </message>
+    <message>
+        <source>Whiteboard chat request has been rejected</source>
+        <translation>Tekentafeverzoekl werd verworpen</translation>
+    </message>
+    <message>
+        <source>Return to room</source>
+        <translation>Keer terug naar kamer</translation>
+    </message>
 </context>
 <context>
@@ -1002,5 +1536,113 @@ afbeelding</translation>
     <message>
         <source>Couldn&apos;t send message: %1</source>
-        <translation>Kon boodschap niet verzenden: %1</translation>
+        <translation type="obsolete">Kon boodschap niet verzenden: %1</translation>
+    </message>
+    <message>
+        <source>Correcting</source>
+        <translation>Corrigeren</translation>
+    </message>
+    <message>
+        <source>This chat may not support message correction. If you send a correction anyway, it may appear as a duplicate message</source>
+        <translation>Deze conversatie ondersteunt mogelijks geen verbeteringen. Verbeteringen kunnen als duplicate boodschappen aankomen</translation>
+    </message>
+    <message>
+        <source>This chat does not support message correction.  If you send a correction anyway, it will appear as a duplicate message</source>
+        <translation>Deze conversatie ondersteunt geen verbeteringen. Verbeteringen zullen als duplicate boodschappen aankomen</translation>
+    </message>
+    <message>
+        <source>The receipt for this message has been received.</source>
+        <translation>Bevestiging ontvangen.</translation>
+    </message>
+    <message>
+        <source>The receipt for this message has not yet been received. The recipient(s) might not have received this message.</source>
+        <translation>Bevestiging nog niet ontvangen. De ontvanger kan mogelijks dit bericht nog niet ontvangen hebben.</translation>
+    </message>
+    <message>
+        <source>Send file</source>
+        <translation>Verzend bestand</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Annuleren</translation>
+    </message>
+    <message>
+        <source>Set Description</source>
+        <translation>Verander beschrijving</translation>
+    </message>
+    <message>
+        <source>Send</source>
+        <translation>Verzenden</translation>
+    </message>
+    <message>
+        <source>Receiving file</source>
+        <translation>Bestand aan het ontvangen</translation>
+    </message>
+    <message>
+        <source>Accept</source>
+        <translation>Accepteren</translation>
+    </message>
+    <message>
+        <source>Starting whiteboard chat</source>
+        <translation>Tekentafel aan het starten</translation>
+    </message>
+    <message>
+        <source>File transfer description</source>
+        <translation>Beschrijving bestand</translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation>Beschrijving:</translation>
+    </message>
+    <message>
+        <source>Save File</source>
+        <translation>Bestand opslaan</translation>
+    </message>
+    <message>
+        <source>Change subject…</source>
+        <translation>Verander onderwerp...</translation>
+    </message>
+    <message>
+        <source>Configure room…</source>
+        <translation>Configureer kamer...</translation>
+    </message>
+    <message>
+        <source>Edit affiliations…</source>
+        <translation>Verander lidmaatschap...</translation>
+    </message>
+    <message>
+        <source>Destroy room</source>
+        <translation>Vernietig kamer</translation>
+    </message>
+    <message>
+        <source>Invite person to this room…</source>
+        <translation>Nodig persoon uit voor deze kamer...</translation>
+    </message>
+    <message>
+        <source>Change room subject</source>
+        <translation>Verander onderwerp</translation>
+    </message>
+    <message>
+        <source>New subject:</source>
+        <translation>Niew onderwerp:</translation>
+    </message>
+    <message>
+        <source>Confirm room destruction</source>
+        <translation>Bevestig vernietiging kamer</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to destroy the room?</source>
+        <translation>Bent U zeker dat U deze kamer wil vernietigen?</translation>
+    </message>
+    <message>
+        <source>This will destroy the room.</source>
+        <translation>Dit zal de kamer vernietigeng.</translation>
+    </message>
+    <message>
+        <source>Accept Invite</source>
+        <translation>Accepteer uitnodiging</translation>
+    </message>
+    <message>
+        <source>%1 would like to start a whiteboard chat</source>
+        <translation>%1 wil een tekentafel starten</translation>
     </message>
 </context>
@@ -1055,4 +1697,33 @@ afbeelding</translation>
 </context>
 <context>
+    <name>Swift::QtFileTransferListWidget</name>
+    <message>
+        <source>Clear Finished Transfers</source>
+        <translation>Wis voltooide overdrachten</translation>
+    </message>
+    <message>
+        <source>File Transfer List</source>
+        <translation>Lijst Bestandsoverdrachten</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtHistoryWindow</name>
+    <message>
+        <source>History</source>
+        <translation>Geschiedenis</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtInviteToChatWindow</name>
+    <message>
+        <source>Users to invite to this chat (one per line):</source>
+        <translation>Uit te nodigen gebruikers (één per lijn):</translation>
+    </message>
+    <message>
+        <source>If you want to provide a reason for the invitation, enter it here</source>
+        <translation>Uitnodigingsreden (Optioneel)</translation>
+    </message>
+</context>
+<context>
     <name>Swift::QtJoinMUCWindow</name>
     <message>
@@ -1149,9 +1820,28 @@ afbeelding</translation>
     <message>
         <source>Subject: %1</source>
-        <translation>Onderwerp: %1</translation>
+        <translation type="obsolete">Onderwerp: %1</translation>
     </message>
     <message>
         <source>SHA-1 Fingerprint: %1</source>
-        <translation>SHA-1 vingerafdruk: %1</translation>
+        <translation type="obsolete">SHA-1 vingerafdruk: %1</translation>
+    </message>
+    <message>
+        <source>Show &amp;File Transfer Overview</source>
+        <translation>Toon overzicht &amp;Bestandsoverdrachten</translation>
+    </message>
+    <message>
+        <source>Confirm terms of use</source>
+        <translation>Bevestig gebruikersovereenkomst</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtMUCConfigurationWindow</name>
+    <message>
+        <source>Cancel</source>
+        <translation>Annuleren</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation>OK</translation>
     </message>
 </context>
@@ -1190,14 +1880,14 @@ afbeelding</translation>
     </message>
     <message>
-        <source>&amp;Add Contact</source>
-        <translation>Contact &amp;toevoegen</translation>
+        <source>&amp;Add Contact…</source>
+        <translation>Contact &amp;toevoegen…</translation>
     </message>
     <message>
-        <source>&amp;Edit Selected Contact</source>
-        <translation>Geselecteerde contact &amp;bewerken</translation>
+        <source>&amp;Edit Selected Contact…</source>
+        <translation>Geselecteerde contact &amp;bewerken…</translation>
     </message>
     <message>
-        <source>Start &amp;Chat</source>
-        <translation>&amp;Conversatie starten</translation>
+        <source>Start &amp;Chat…</source>
+        <translation>&amp;Conversatie starten...</translation>
     </message>
     <message>
@@ -1206,10 +1896,10 @@ afbeelding</translation>
     </message>
     <message>
-        <source>Edit &amp;Profile</source>
-        <translation>Bewerk &amp;profiel</translation>
+        <source>Edit &amp;Profile…</source>
+        <translation>Bewerk &amp;profiel…</translation>
     </message>
     <message>
-        <source>Enter &amp;Room</source>
-        <translation>&amp;Kamer betreden</translation>
+        <source>Enter &amp;Room…</source>
+        <translation>&amp;Kamer betreden…</translation>
     </message>
     <message>
@@ -1225,4 +1915,20 @@ afbeelding</translation>
         <translation>Geen beschikbare opdrachten</translation>
     </message>
+    <message>
+        <source>&amp;Show Emoticons</source>
+        <translation>&amp;Toon emoticons</translation>
+    </message>
+    <message>
+        <source>&amp;View History…</source>
+        <translation>Toon &amp;Geschiedenis...</translation>
+    </message>
+    <message>
+        <source>&amp;Request Delivery Receipts</source>
+        <translation>Vraag &amp;ontvangstbevestigingen</translation>
+    </message>
+    <message>
+        <source>&amp;Chats</source>
+        <translation>&amp;Conversaties</translation>
+    </message>
 </context>
 <context>
@@ -1246,4 +1952,35 @@ afbeelding</translation>
 </context>
 <context>
+    <name>Swift::QtOccupantListWidget</name>
+    <message>
+        <source>No actions for this user</source>
+        <translation>Geen acties voor deze gebruiker</translation>
+    </message>
+    <message>
+        <source>Kick user</source>
+        <translation>Schop gebruiker</translation>
+    </message>
+    <message>
+        <source>Kick and ban user</source>
+        <translation>Schop en verban gebruiker</translation>
+    </message>
+    <message>
+        <source>Make moderator</source>
+        <translation>Maak moderator</translation>
+    </message>
+    <message>
+        <source>Make participant</source>
+        <translation>Maak deelnemer</translation>
+    </message>
+    <message>
+        <source>Remove voice</source>
+        <translation>Verwijder stem</translation>
+    </message>
+    <message>
+        <source>Add to contacts</source>
+        <translation>Voeg toe aan contacten</translation>
+    </message>
+</context>
+<context>
     <name>Swift::QtProfileWindow</name>
     <message>
@@ -1261,4 +1998,46 @@ afbeelding</translation>
 </context>
 <context>
+    <name>Swift::QtRosterHeader</name>
+    <message>
+        <source>Connection is secured</source>
+        <translation>Verbinding is beveiligd</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtRosterWidget</name>
+    <message>
+        <source>Edit…</source>
+        <translation>Bewerk...</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Verwijder</translation>
+    </message>
+    <message>
+        <source>Send File</source>
+        <translation>Verzend bestand</translation>
+    </message>
+    <message>
+        <source>Start Whiteboard Chat</source>
+        <translation>Start tekentafel</translation>
+    </message>
+    <message>
+        <source>All Files (*);;</source>
+        <translation>Alle bestanden (*);;</translation>
+    </message>
+    <message>
+        <source>Rename</source>
+        <translation>Naam wijzigen</translation>
+    </message>
+    <message>
+        <source>Rename group</source>
+        <translation>Groepsnaam wijzigen</translation>
+    </message>
+    <message>
+        <source>Enter a new name for group &apos;%1&apos;:</source>
+        <translation>Geef een nieuwe naam voor groep &apos;%1&apos;:</translation>
+    </message>
+</context>
+<context>
     <name>Swift::QtStatusWidget</name>
     <message>
@@ -1308,21 +2087,21 @@ Als u deze keuze uitstelt, zal deze vraag opnieuw gesteld worden wanneer u zich
     <message>
         <source>Edit</source>
-        <translation>Bewerk</translation>
+        <translation type="obsolete">Bewerk</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation>Verwijder</translation>
+        <translation type="obsolete">Verwijder</translation>
     </message>
     <message>
         <source>Rename</source>
-        <translation>Naam wijzigen</translation>
+        <translation type="obsolete">Naam wijzigen</translation>
     </message>
     <message>
         <source>Rename group</source>
-        <translation>Groepsnaam wijzigen</translation>
+        <translation type="obsolete">Groepsnaam wijzigen</translation>
     </message>
     <message>
         <source>Enter a new name for group &apos;%1&apos;:</source>
-        <translation>Geef een niewe naam voor groep &apos;%1&apos;:</translation>
+        <translation type="obsolete">Geef een nieuwe naam voor groep &apos;%1&apos;:</translation>
     </message>
 </context>
@@ -1381,4 +2160,309 @@ Als u deze keuze uitstelt, zal deze vraag opnieuw gesteld worden wanneer u zich
 </context>
 <context>
+    <name>Swift::QtVCardAddressField</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Street</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Region</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Country</source>
+        <translation type="unfinished">Land</translation>
+    </message>
+    <message>
+        <source>Postal Code</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>City</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address Extension</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PO Box</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preferred</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Work</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Postal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Parcel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Domestic Delivery</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>International Delivery</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delivery Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtVCardAddressLabelField</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address Label</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preferred</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Work</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Postal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Parcel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Domestic Delivery</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>International Delivery</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delivery Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtVCardBirthdayField</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Birthday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>dd.MM.yyyy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>X</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtVCardDescriptionField</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtVCardEMailField</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Internet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>X.400</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>E-Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preferred</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Work</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtVCardJIDField</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>JID</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtVCardOrganisationField</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Organisation Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove Unit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Unit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Organisation Units</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtVCardRoleField</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Role</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtVCardTelephoneField</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Telephone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preferred</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Work</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Voice</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cell</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ISDN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Voice Messaging Service</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fax</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Personal Communication Service</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bulletin Board System</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtVCardTitleField</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtVCardURLField</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>Swift::QtWebView</name>
     <message>
@@ -1386,4 +2470,19 @@ Als u deze keuze uitstelt, zal deze vraag opnieuw gesteld worden wanneer u zich
         <translation>Wissen</translation>
     </message>
+    <message>
+        <source>Increase font size</source>
+        <translation>Vergroot lettertype</translation>
+    </message>
+    <message>
+        <source>Decrease font size</source>
+        <translation>Verklein lettertype</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtWhiteboardWindow</name>
+    <message>
+        <source>Closing window is equivalent closing the session. Are you sure you want to do this?</source>
+        <translation>Het venster sluiten zal deze sessie beëindigen. Bent U zeker dat U dit wil doen?</translation>
+    </message>
 </context>
 <context>
diff --git a/Swift/Translations/swift_pl.ts b/Swift/Translations/swift_pl.ts
index f471f4a..cc461a1 100644
--- a/Swift/Translations/swift_pl.ts
+++ b/Swift/Translations/swift_pl.ts
@@ -1438,25 +1438,25 @@
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="86"/>
-        <source>Edit &amp;Profile</source>
-        <translation>Edytuj &amp;profil</translation>
+        <source>Edit &amp;Profile…</source>
+        <translation>Edytuj &amp;profil…</translation>
     </message>
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="89"/>
-        <source>Enter &amp;Room</source>
-        <translation>&amp;Wejdź do pokoju</translation>
+        <source>Enter &amp;Room…</source>
+        <translation>&amp;Wejdź do pokoju…</translation>
     </message>
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="92"/>
-        <source>&amp;Add Contact</source>
-        <translation>&amp;Dodaj kontakt</translation>
+        <source>&amp;Add Contact…</source>
+        <translation>&amp;Dodaj kontakt…</translation>
     </message>
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="95"/>
-        <source>&amp;Edit Selected Contact</source>
-        <translation>&amp;Edytuj wybrany kontakt</translation>
+        <source>&amp;Edit Selected Contact…</source>
+        <translation>&amp;Edytuj wybrany kontakt…</translation>
     </message>
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="99"/>
-        <source>Start &amp;Chat</source>
+        <source>Start &amp;Chat…</source>
         <translation>&amp;Rozpocznij rozmowę</translation>
     </message>
diff --git a/Swift/Translations/swift_ru.ts b/Swift/Translations/swift_ru.ts
index c1a9a6c..56069a5 100644
--- a/Swift/Translations/swift_ru.ts
+++ b/Swift/Translations/swift_ru.ts
@@ -6,70 +6,86 @@
     <name></name>
     <message>
-        <location filename="../Controllers/Chat/ChatController.cpp" line="46"/>
+        <location filename="../Controllers/Chat/ChatController.cpp" line="59"/>
         <source>Starting chat with %1% in chatroom %2%</source>
         <translation>Начат чат с %1% в комнате %2%</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatController.cpp" line="49"/>
+        <location filename="../Controllers/Chat/ChatController.cpp" line="62"/>
         <source>Starting chat with %1% - %2%</source>
         <translation>Начат чат с %1% - %2%</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatController.cpp" line="119"/>
+        <location filename="../Controllers/Chat/ChatController.cpp" line="202"/>
+        <source>This chat doesn&apos;t support delivery receipts.</source>
+        <translation>Этот чат не поддерживает отчёты о доставке.</translation>
+    </message>
+    <message>
+        <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>Этот чат не поддерживает отчёты о доставке. Вы не будете получать уведомления о доставке отправленных Вами сообщений.</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatController.cpp" line="216"/>
+        <location filename="../Controllers/FileTransfer/FileTransferController.cpp" line="42"/>
         <source>me</source>
         <translation>я</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatController.cpp" line="160"/>
+        <location filename="../Controllers/Chat/ChatController.cpp" line="324"/>
         <source>%1% has gone offline</source>
         <translation>%1% теперь отключён</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatController.cpp" line="164"/>
+        <location filename="../Controllers/Chat/ChatController.cpp" line="328"/>
         <source>%1% has become available</source>
         <translation>%1% снова доступен</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatController.cpp" line="166"/>
+        <location filename="../Controllers/Chat/ChatController.cpp" line="330"/>
         <source>%1% has gone away</source>
         <translation>%1% теперь &apos;отсутствую&apos;</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatController.cpp" line="168"/>
+        <location filename="../Controllers/Chat/ChatController.cpp" line="332"/>
         <source>%1% is now busy</source>
         <translation>%1% теперь &apos;не беспокоить&apos;</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="56"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="74"/>
         <source>The day is now %1%</source>
         <translation>Сегодня %1%</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="191"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="209"/>
+        <source>Couldn&apos;t send message: %1%</source>
+        <translation>Ошибка отправки сообщения: %1%</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="269"/>
         <source>Error sending message</source>
         <translation>Ошибка отправки сообщения</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="197"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="275"/>
         <source>Bad request</source>
         <translation>Неверный запрос</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="198"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="276"/>
         <source>Conflict</source>
         <translation>Конфликт</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="199"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="277"/>
         <source>This feature is not implemented</source>
         <translation>Эта функция не реализована</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="200"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="278"/>
         <source>Forbidden</source>
         <translation>Запрещено</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="201"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="279"/>
         <source>Recipient can no longer be contacted</source>
         <translatorcomment>wtf</translatorcomment>
@@ -77,190 +93,194 @@
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="202"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="280"/>
         <source>Internal server error</source>
         <translation>Внутренняя ошибка сервера</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="203"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="281"/>
         <source>Item not found</source>
         <translation>Элемент не найден</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="204"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="282"/>
         <source>JID Malformed</source>
         <translation>Некорректный JID</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="205"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="283"/>
         <source>Message was rejected</source>
         <translation>Сообщение отклонено</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="206"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="284"/>
         <source>Not allowed</source>
         <translation>Не разрешено</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="207"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="285"/>
         <source>Not authorized</source>
         <translation>Не авторизован</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="208"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="286"/>
         <source>Payment is required</source>
         <translation>Требуется оплата</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="209"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="287"/>
         <source>Recipient is unavailable</source>
         <translation>Получатель недоступен</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="210"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="288"/>
         <source>Redirect</source>
         <translation>Перенаправление</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="211"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="289"/>
         <source>Registration required</source>
         <translation>Требуется регистрация</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="212"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="290"/>
         <source>Recipient&apos;s server not found</source>
         <translation>Сервер получателя не найден</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="213"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="291"/>
         <source>Remote server timeout</source>
         <translation>Таймаут сервера</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="214"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="292"/>
         <source>The server is low on resources</source>
         <translation>Серверу не хватает ресурсов</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="215"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="293"/>
         <source>The service is unavailable</source>
         <translation>Сервис недоступен</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="216"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="294"/>
         <source>A subscription is required</source>
         <translation>Требуется подписка</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="217"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="295"/>
         <source>Undefined condition</source>
         <translation>Неопределённое условие</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="218"/>
+        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="296"/>
         <source>Unexpected request</source>
         <translation>Неожиданный запрос</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="114"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="222"/>
         <source>Room %1% is not responding. This operation may never complete.</source>
         <translation>Комната %1% не отвечает. Эта операция может не завершиться.</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="125"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="233"/>
         <source>Unable to enter this room</source>
         <translation>Не удалось войти в комнату</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="131"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="239"/>
         <source>Unable to enter this room as %1%, retrying as %2%</source>
         <translation>Не удалось войти в комнату как %1%, попытка войти как %2%</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="135"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="243"/>
         <source>No nickname specified</source>
         <translation>Ник не указан</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="139"/>
         <source>A password needed</source>
-        <translation>Нужен пароль</translation>
+        <translation type="obsolete">Нужен пароль</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="143"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="251"/>
         <source>Only members may enter</source>
         <translation>Вход только для зарегистрированных участников</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="147"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="255"/>
         <source>You are banned from the room</source>
         <translation>Вы забанены в этой комнате</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="151"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="259"/>
         <source>The room is full</source>
         <translation>Комната полная</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="155"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="263"/>
         <source>The room does not exist</source>
         <translation>Комната не существует</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="173"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="269"/>
+        <source>Couldn&apos;t join room: %1%.</source>
+        <translation>Ошибка входа в комнату: %1%.</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="281"/>
         <source>You have entered room %1% as %2%.</source>
         <translation>Вы вошли в комнату %1% как %2%.</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="214"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="332"/>
         <source>%1% has entered the room as a %2%.</source>
         <translation>%1% входит как %2%.</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="217"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="335"/>
         <source>%1% has entered the room.</source>
         <translation>%1% входит.</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="243"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="384"/>
         <source>moderator</source>
         <translation>модератор</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="244"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="385"/>
         <source>participant</source>
         <translation>участник</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="245"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="386"/>
         <source>visitor</source>
         <translation>гость</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="283"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="436"/>
         <source>The room subject is now: %1%</source>
         <translation>Тема конференции: %1%</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="313"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="470"/>
         <source>%1% is now a %2%</source>
         <translation>%1% теперь %2%</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="319"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="486"/>
         <source>Moderators</source>
         <translation>Модераторы</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="320"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="487"/>
         <source>Participants</source>
         <translation>Участники</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="321"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="488"/>
         <source>Visitors</source>
         <translation>Гости</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="322"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="489"/>
         <source>Occupants</source>
         <translatorcomment>wtf</translatorcomment>
@@ -268,234 +288,308 @@
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="336"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="503"/>
         <source>Trying to enter room %1%</source>
         <translation>Попытка войти в комнату %1%</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="365"/>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="474"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="544"/>
+        <source>%1% has left the room%2%</source>
+        <translation>%1% вышел из комнаты%2%</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="548"/>
+        <source>You have been kicked out of the room</source>
+        <translation>Вас выгнали из комнаты</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="549"/>
+        <source>You have been banned from the room</source>
+        <translation>Вас забанили в этой комнате</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="550"/>
+        <source>You are no longer a member of the room and have been removed</source>
+        <translation>Вы больше не зарегистрированный пользователь комнаты и были удалены</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="551"/>
+        <source>The room has been destroyed</source>
+        <translation>Комната была уничтожена</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="667"/>
         <source>%1% has left the room</source>
         <translation>%1% вышел</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="365"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="719"/>
+        <source>Room configuration failed: %1%.</source>
+        <translation>Ошибка настройки комнаты: %1%.</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="725"/>
+        <source>Occupant role change failed: %1%.</source>
+        <translation>Ошибка изменения роли: %1%.</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="553"/>
         <source>You have left the room</source>
         <translation>Вы вышли из комнаты</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="439"/>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="503"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="247"/>
+        <source>The correct room password is needed</source>
+        <translation>Необходим правильный пароль к комнате</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="632"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="696"/>
         <source> and </source>
         <translation> и </translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="463"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="656"/>
         <source>%1% have entered the room</source>
         <translation>%1% вошли в комнату</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="466"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="659"/>
         <source>%1% has entered the room</source>
         <translation>%1% вошёл в комнату</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="471"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="664"/>
         <source>%1% have left the room</source>
         <translation>%1% вышли из комнаты</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="479"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="672"/>
         <source>%1% have entered then left the room</source>
         <translation>%1% вошли и вышли</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="482"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="675"/>
         <source>%1% has entered then left the room</source>
         <translation>%1% вошёл и вышел</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="487"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="680"/>
         <source>%1% have left then returned to the room</source>
         <translation>%1% вышли, затем вернулись</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="490"/>
+        <location filename="../Controllers/Chat/MUCController.cpp" line="683"/>
         <source>%1% has left then returned to the room</source>
         <translation>%1% вышел, затем вернулся</translation>
     </message>
     <message>
-        <location filename="../Controllers/EventNotifier.cpp" line="51"/>
+        <location filename="../Controllers/EventNotifier.cpp" line="59"/>
         <source>%1% wants to add you to his/her contact list</source>
         <translation>%1% хочет добавить Вас в свой список контактов</translation>
     </message>
     <message>
-        <location filename="../Controllers/EventNotifier.cpp" line="55"/>
+        <location filename="../Controllers/EventNotifier.cpp" line="63"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="438"/>
+        <location filename="../Controllers/EventNotifier.cpp" line="67"/>
+        <source>%1% has invited you to enter the %2% room</source>
+        <translation>%1 приглашает Вас войти в конференцию %2</translation>
+    </message>
+    <message>
+        <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>Адрес пользователя недействителен. Он должен иметь вид&quot;vasya@pup.kin&quot;</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="568"/>
         <source>Unknown Error</source>
         <translation>Неизвестная ошибка</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="439"/>
+        <location filename="../Controllers/MainController.cpp" line="569"/>
         <source>Unable to find server</source>
         <translation>Не удаётся найти сервер</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="440"/>
+        <location filename="../Controllers/MainController.cpp" line="570"/>
         <source>Error connecting to server</source>
         <translation>Ошибка подключения к серверу</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="441"/>
+        <location filename="../Controllers/MainController.cpp" line="571"/>
         <source>Error while receiving server data</source>
         <translation>Ошибка получения данных</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="442"/>
+        <location filename="../Controllers/MainController.cpp" line="572"/>
         <source>Error while sending data to the server</source>
         <translation>Ошибка отправки данных на сервер</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="443"/>
+        <location filename="../Controllers/MainController.cpp" line="573"/>
         <source>Error parsing server data</source>
         <translation>Ошибка обработки данных от сервера</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="444"/>
+        <location filename="../Controllers/MainController.cpp" line="574"/>
         <source>Login/password invalid</source>
         <translation>Неверный логин/пароль</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="445"/>
+        <location filename="../Controllers/MainController.cpp" line="575"/>
         <source>Error while compressing stream</source>
         <translation>Ошибка сжатия потока</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="446"/>
+        <location filename="../Controllers/MainController.cpp" line="576"/>
         <source>Server verification failed</source>
         <translation>Проверка сервера не удалась</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="447"/>
+        <location filename="../Controllers/MainController.cpp" line="577"/>
         <source>Authentication mechanisms not supported</source>
         <translation>Механизм авторизации не поддерживается</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="448"/>
+        <location filename="../Controllers/MainController.cpp" line="578"/>
         <source>Unexpected response</source>
         <translation>Неожиданный ответ</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="449"/>
+        <location filename="../Controllers/MainController.cpp" line="579"/>
         <source>Error binding resource</source>
         <translation>Ошибка назначения ресурса</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="450"/>
+        <location filename="../Controllers/MainController.cpp" line="580"/>
         <source>Error starting session</source>
         <translation>Ошибка при запуске сессии</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="451"/>
+        <location filename="../Controllers/MainController.cpp" line="581"/>
         <source>Stream error</source>
         <translation>Ошибка потока</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="452"/>
+        <location filename="../Controllers/MainController.cpp" line="582"/>
         <source>Encryption error</source>
         <translation>Ошибка шифрования</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="453"/>
+        <location filename="../Controllers/MainController.cpp" line="583"/>
         <source>Error loading certificate (Invalid password?)</source>
         <translation>Ошибка загрузки сертификата (неверный пароль?)</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="454"/>
+        <location filename="../Controllers/MainController.cpp" line="584"/>
         <source>Certificate not authorized</source>
         <translation>Сертификат не авторизован</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="456"/>
+        <location filename="../Controllers/MainController.cpp" line="585"/>
+        <source>Certificate card removed</source>
+        <translation>Сертификат удалён</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="587"/>
         <source>Unknown certificate</source>
         <translation>Неизвестный сертификат</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="457"/>
+        <location filename="../Controllers/MainController.cpp" line="588"/>
         <source>Certificate has expired</source>
         <translation>Срок действия сертификата истек</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="458"/>
+        <location filename="../Controllers/MainController.cpp" line="589"/>
         <source>Certificate is not yet valid</source>
         <translation>Сертификат ещё не действителен</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="459"/>
+        <location filename="../Controllers/MainController.cpp" line="590"/>
         <source>Certificate is self-signed</source>
         <translation>Сертификат самоподписанный</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="460"/>
+        <location filename="../Controllers/MainController.cpp" line="591"/>
         <source>Certificate has been rejected</source>
         <translation>Сертификат отклонён</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="461"/>
+        <location filename="../Controllers/MainController.cpp" line="592"/>
         <source>Certificate is not trusted</source>
         <translation>Сертификат не является доверенным</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="462"/>
+        <location filename="../Controllers/MainController.cpp" line="593"/>
         <source>Certificate cannot be used for encrypting your connection</source>
         <translation>Сертификат не может быть использован для шифрования Вашего соединения</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="463"/>
+        <location filename="../Controllers/MainController.cpp" line="594"/>
         <source>Certificate path length constraint exceeded</source>
         <translation>Превышена длина пути сертификата</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="464"/>
+        <location filename="../Controllers/MainController.cpp" line="595"/>
         <source>Invalid certificate signature</source>
         <translation>Подпись сертификата недействительна</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="465"/>
+        <location filename="../Controllers/MainController.cpp" line="596"/>
         <source>Invalid Certificate Authority</source>
         <translation>Центр сертификации недействителен</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="466"/>
+        <location filename="../Controllers/MainController.cpp" line="597"/>
         <source>Certificate does not match the host identity</source>
         <translation>Сертификат не соответствует серверу</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="476"/>
+        <location filename="../Controllers/MainController.cpp" line="598"/>
+        <source>Certificate has been revoked</source>
+        <translation>Сертификат отозван</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="599"/>
+        <source>Unable to determine certificate revocation state</source>
+        <translation>Невозможно проверить состояние отзыва сертификата</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="609"/>
         <source>Certificate error</source>
         <translation>Ошибка сертификата</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="490"/>
+        <location filename="../Controllers/MainController.cpp" line="616"/>
+        <source>Re-enter credentials and retry</source>
+        <translation>Повторно введите учётные данные и повторите</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="629"/>
+        <source>Disconnected from %1%: %2%. To reconnect, Sign Out and provide your password again.</source>
+        <translation>Разорвано соединение с %1%: %2%. Чтобы восстановить связь, отключитесь и введите пароль ещё раз.</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="635"/>
         <source>Reconnect to %1% failed: %2%. Will retry in %3% seconds.</source>
         <translation>Переподключение к %1% не удалось: %2%. Повтор через %3% секунд.</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="493"/>
+        <location filename="../Controllers/MainController.cpp" line="638"/>
         <source>Disconnected from %1%: %2%.</source>
         <translation>Отключение от %1%: %2%.</translation>
     </message>
     <message>
-        <location filename="../Controllers/Roster/RosterController.cpp" line="126"/>
-        <location filename="../Controllers/Roster/RosterController.cpp" line="152"/>
-        <location filename="../Controllers/Roster/RosterController.cpp" line="214"/>
+        <location filename="../Controllers/Roster/RosterController.cpp" line="131"/>
+        <location filename="../Controllers/Roster/RosterController.cpp" line="157"/>
+        <location filename="../Controllers/Roster/RosterController.cpp" line="222"/>
         <source>Contacts</source>
         <translation>Контакты</translation>
     </message>
     <message>
-        <location filename="../Controllers/Roster/RosterController.cpp" line="251"/>
+        <location filename="../Controllers/Roster/RosterController.cpp" line="263"/>
         <source>Server %1% rejected contact list change to item &apos;%2%&apos;</source>
         <translation>Сервер %1% отклонил изменение списка контактов с элементом &apos;%2%&apos;</translation>
@@ -528,4 +622,30 @@
         <translation>Ошибка публикации данных Вашего профиля</translation>
     </message>
+    <message>
+        <location filename="../Controllers/ChatMessageSummarizer.cpp" line="33"/>
+        <source>%1% (%2%)</source>
+        <translation>%1% (%2%)</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/ChatMessageSummarizer.cpp" line="38"/>
+        <source>%1% and %2% others (%3%)</source>
+        <translatorcomment>xzxz</translatorcomment>
+        <translation>%1% и %2% другие (%3%)</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/ChatMessageSummarizer.cpp" line="41"/>
+        <source>%1%, %2% (%3%)</source>
+        <translation>%1%, %2% (%3%)</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/CAPICertificateSelector.cpp" line="63"/>
+        <source>TLS Client Certificate Selection</source>
+        <translation>Выбор клиентского сертификата TLS</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/CAPICertificateSelector.cpp" line="64"/>
+        <source>Select a certificate to use for authentication</source>
+        <translation>Выбрать сертификат для аутентификации</translation>
+    </message>
 </context>
 <context>
@@ -676,13 +796,110 @@
     </message>
     <message>
-        <location filename="../QtUI/EventViewer/QtEvent.cpp" line="63"/>
+        <location filename="../QtUI/EventViewer/QtEvent.cpp" line="68"/>
         <source>%1 would like to add you to their contact list.</source>
         <translation>%1 хочет добавить Вас в свой список контактов.</translation>
     </message>
     <message>
-        <location filename="../QtUI/EventViewer/QtEvent.cpp" line="66"/>
+        <location filename="../QtUI/EventViewer/QtEvent.cpp" line="71"/>
         <source>%1 would like to add you to their contact list, saying &apos;%2&apos;</source>
         <translation>%1 хочет добавить Вас в свой список контактов, говоря &apos;%2&apos;</translation>
     </message>
+    <message>
+        <location filename="../QtUI/EventViewer/QtEvent.cpp" line="81"/>
+        <source>%1 has invited you to enter the %2 room.</source>
+        <translation>%1 приглашает Вас войти в конференцию %2.</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="982"/>
+        <source>You&apos;ve been invited to enter the %1 room.</source>
+        <translation>Вас пригласили войти в конференцию %1.</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="984"/>
+        <source>Reason: %1</source>
+        <translation>Причина: %1</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="987"/>
+        <source>This person may not have really sent this invitation!</source>
+        <translation>Этот человек, возможно, не посылал это приглашение!</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="46"/>
+        <source>Direction</source>
+        <translatorcomment>xzxz</translatorcomment>
+        <translation>Направление</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="47"/>
+        <source>Other Party</source>
+        <translation>Другая сторона</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="48"/>
+        <source>State</source>
+        <translation>Регион</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="49"/>
+        <source>Progress</source>
+        <translation>Прогресс</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="50"/>
+        <source>Size</source>
+        <translation>Размер</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="65"/>
+        <source>Incoming</source>
+        <translation>Входящий</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="65"/>
+        <source>Outgoing</source>
+        <translation>Исходящий</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="74"/>
+        <source>Waiting for start</source>
+        <translation>Ожидание старта</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="76"/>
+        <source>Waiting for other side to accept</source>
+        <translation>Ожидание принятия на другой стороне</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="78"/>
+        <source>Negotiating</source>
+        <translation>Переговоры</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="80"/>
+        <source>Transferring</source>
+        <translation>Передача</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="82"/>
+        <source>Finished</source>
+        <translatorcomment>xzxz</translatorcomment>
+        <translation>Завершено</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="84"/>
+        <source>Failed</source>
+        <translation>Не удалось</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListItemModel.cpp" line="86"/>
+        <source>Canceled</source>
+        <translation>Отменено</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="142"/>
+        <source>Connection Options</source>
+        <translation>Параметры подключения</translation>
+    </message>
 </context>
 <context>
@@ -944,72 +1161,280 @@
 </context>
 <context>
+    <name>QtAffiliationEditor</name>
+    <message>
+        <location filename="../QtUI/QtAffiliationEditor.ui" line="14"/>
+        <source>Edit Affiliations</source>
+        <translation>Редактирование рангов</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAffiliationEditor.ui" line="28"/>
+        <source>Affiliation:</source>
+        <translation>Ранг:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAffiliationEditor.ui" line="36"/>
+        <source>Owner</source>
+        <translation>Владелец</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAffiliationEditor.ui" line="41"/>
+        <source>Administrator</source>
+        <translation>Администратор</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAffiliationEditor.ui" line="46"/>
+        <source>Member</source>
+        <translation>Зарегистрированный пользователь</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAffiliationEditor.ui" line="51"/>
+        <source>Outcast (Banned)</source>
+        <translation>Заблокированный</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAffiliationEditor.ui" line="68"/>
+        <source>Add User</source>
+        <translation>Добавить пользователя</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAffiliationEditor.ui" line="75"/>
+        <source>Remove User</source>
+        <translation>Удалить пользователя</translation>
+    </message>
+</context>
+<context>
     <name>QtBookmarkDetailWindow</name>
     <message>
-        <location filename="../QtUI/QtBookmarkDetailWindow.ui"/>
-        <location filename="../QtUI/ui_QtBookmarkDetailWindow.h" line="137"/>
+        <location filename="../QtUI/QtBookmarkDetailWindow.ui" line="20"/>
         <source>Edit Bookmark Details</source>
         <translation>Редактирование закладки</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtBookmarkDetailWindow.ui"/>
-        <location filename="../QtUI/ui_QtBookmarkDetailWindow.h" line="138"/>
+        <location filename="../QtUI/QtBookmarkDetailWindow.ui" line="40"/>
         <source>Bookmark Name:</source>
         <translation>Название закладки:</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtBookmarkDetailWindow.ui"/>
-        <location filename="../QtUI/ui_QtBookmarkDetailWindow.h" line="139"/>
+        <location filename="../QtUI/QtBookmarkDetailWindow.ui" line="50"/>
         <source>Room Address:</source>
         <translation>Адрес комнаты:</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtBookmarkDetailWindow.ui"/>
-        <location filename="../QtUI/ui_QtBookmarkDetailWindow.h" line="140"/>
+        <location filename="../QtUI/QtBookmarkDetailWindow.ui" line="60"/>
         <source>Your Nickname:</source>
         <translation>Ваш ник:</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtBookmarkDetailWindow.ui"/>
-        <location filename="../QtUI/ui_QtBookmarkDetailWindow.h" line="141"/>
+        <location filename="../QtUI/QtBookmarkDetailWindow.ui" line="70"/>
         <source>Room password:</source>
         <translation>Пароль комнаты:</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtBookmarkDetailWindow.ui"/>
-        <location filename="../QtUI/ui_QtBookmarkDetailWindow.h" line="142"/>
-        <source>Join automatically</source>
+        <location filename="../QtUI/QtBookmarkDetailWindow.ui" line="93"/>
+        <source>Enter automatically</source>
         <translation>Входить автоматически</translation>
     </message>
+    <message>
+        <source>Join automatically</source>
+        <translation type="obsolete">Входить автоматически</translation>
+    </message>
+</context>
+<context>
+    <name>QtCertificateViewerDialog</name>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.ui" line="14"/>
+        <source>Certificate Viewer</source>
+        <translation>Просмотр сертификата</translation>
+    </message>
+</context>
+<context>
+    <name>QtConnectionSettings</name>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="14"/>
+        <source>Connection Options</source>
+        <translation>Параметры подключения</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="22"/>
+        <source>Connection Method:</source>
+        <translation>Метод подключения:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="36"/>
+        <source>Automatic</source>
+        <translation>Автоматически</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="41"/>
+        <source>Manual</source>
+        <translation>Вручную</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="46"/>
+        <source>BOSH</source>
+        <translation>BOSH</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="99"/>
+        <source>Secure connection:</source>
+        <translation>Безопасное подключение:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="107"/>
+        <source>Never</source>
+        <translation>Никогда</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="112"/>
+        <source>Encrypt when possible</source>
+        <translation>Шифровать соединение если возможно</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="117"/>
+        <source>Always encrypt</source>
+        <translation>Всегда шифровать</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="127"/>
+        <source>Allow Compression</source>
+        <translation>Разрешить сжатие</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="134"/>
+        <source>Allow sending password over insecure connection</source>
+        <translation>Разрешить отправку пароля через незащищённое соединение</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="157"/>
+        <source>Manually select server</source>
+        <translation>Вручную выбрать сервер</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="185"/>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="315"/>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="429"/>
+        <source>Hostname:</source>
+        <translation>Сервер:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="208"/>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="338"/>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="452"/>
+        <source>Port:</source>
+        <translation>Порт:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="230"/>
+        <source>Connection Proxy</source>
+        <translation>Прокси для подключения</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="238"/>
+        <source>Proxy type:</source>
+        <translation>Тип прокси:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="249"/>
+        <source>None</source>
+        <translation>Отсутствует</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="254"/>
+        <source>Use system-configured proxy</source>
+        <translation>Использовать системные настройки прокси</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="259"/>
+        <source>SOCKS5</source>
+        <translation>SOCKS5</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="264"/>
+        <source>HTTP Connect</source>
+        <translation>HTTP Connect</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="287"/>
+        <source>Override system-configured proxy</source>
+        <translation>Перезаписать системные настройки прокси</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="382"/>
+        <source>BOSH URI:</source>
+        <translation>BOSH URI:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtConnectionSettings.ui" line="401"/>
+        <source>Manually select HTTP proxy</source>
+        <translation>Вручную выбрать HTTP прокси</translation>
+    </message>
+</context>
+<context>
+    <name>QtHistoryWindow</name>
+    <message>
+        <location filename="../QtUI/QtHistoryWindow.ui" line="14"/>
+        <source>History</source>
+        <translation>История</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtHistoryWindow.ui" line="22"/>
+        <source>Search:</source>
+        <translation>Поиск:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtHistoryWindow.ui" line="42"/>
+        <source>Next</source>
+        <translatorcomment>xzxz</translatorcomment>
+        <translation>Следующий</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtHistoryWindow.ui" line="52"/>
+        <source>Previous</source>
+        <translation>Предыдущий</translation>
+    </message>
 </context>
 <context>
     <name>QtJoinMUCWindow</name>
     <message>
-        <location filename="../QtUI/QtJoinMUCWindow.ui"/>
-        <location filename="../QtUI/ui_QtJoinMUCWindow.h" line="124"/>
-        <location filename="../QtUI/ui_QtJoinMUCWindow.h" line="130"/>
+        <location filename="../QtUI/QtJoinMUCWindow.ui" line="20"/>
+        <location filename="../QtUI/QtJoinMUCWindow.ui" line="113"/>
         <source>Enter Room</source>
         <translation>Войти в комнату</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtJoinMUCWindow.ui"/>
-        <location filename="../QtUI/ui_QtJoinMUCWindow.h" line="125"/>
+        <location filename="../QtUI/QtJoinMUCWindow.ui" line="28"/>
+        <source>Room Address:</source>
+        <translation>Адрес комнаты:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtJoinMUCWindow.ui" line="42"/>
+        <source>Your Nickname:</source>
+        <translation>Ваш ник:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtJoinMUCWindow.ui" line="59"/>
+        <source>Room Password:</source>
+        <translation>Пароль комнаты:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtJoinMUCWindow.ui" line="71"/>
+        <source>Automatically configure newly created rooms</source>
+        <translation>Автоматически откывать окно конфигурации комнаты при её создании</translation>
+    </message>
+    <message>
         <source>Room:</source>
-        <translation>Комната:</translation>
+        <translation type="obsolete">Комната:</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtJoinMUCWindow.ui"/>
-        <location filename="../QtUI/ui_QtJoinMUCWindow.h" line="126"/>
+        <location filename="../QtUI/QtJoinMUCWindow.ui" line="35"/>
         <source>Search ...</source>
         <translation>Поиск ...</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtJoinMUCWindow.ui"/>
-        <location filename="../QtUI/ui_QtJoinMUCWindow.h" line="127"/>
         <source>Nickname:</source>
-        <translation>Ник:</translation>
+        <translation type="obsolete">Ник:</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtJoinMUCWindow.ui"/>
-        <location filename="../QtUI/ui_QtJoinMUCWindow.h" line="129"/>
+        <location filename="../QtUI/QtJoinMUCWindow.ui" line="106"/>
         <source>Enter automatically in future</source>
         <translation>Входить автоматически в будущем</translation>
@@ -1019,30 +1444,25 @@
     <name>QtMUCSearchWindow</name>
     <message>
-        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.ui"/>
-        <location filename="../QtUI/MUCSearch/ui_QtMUCSearchWindow.h" line="118"/>
+        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.ui" line="14"/>
         <source>Search Room</source>
         <translation>Поик комнаты</translation>
     </message>
     <message>
-        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.ui"/>
-        <location filename="../QtUI/MUCSearch/ui_QtMUCSearchWindow.h" line="119"/>
+        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.ui" line="20"/>
         <source>Service:</source>
         <translation>Сервис:</translation>
     </message>
     <message>
-        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.ui"/>
-        <location filename="../QtUI/MUCSearch/ui_QtMUCSearchWindow.h" line="121"/>
+        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.ui" line="74"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
-        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.ui"/>
-        <location filename="../QtUI/MUCSearch/ui_QtMUCSearchWindow.h" line="122"/>
+        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.ui" line="84"/>
         <source>OK</source>
         <translation>ОК</translation>
     </message>
     <message>
-        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.ui"/>
-        <location filename="../QtUI/MUCSearch/ui_QtMUCSearchWindow.h" line="123"/>
+        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.ui" line="96"/>
         <source>List rooms</source>
         <translation>Список комнат</translation>
@@ -1052,30 +1472,25 @@
     <name>QtUserSearchFieldsPage</name>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchFieldsPage.ui"/>
-        <location filename="../QtUI/UserSearch/ui_QtUserSearchFieldsPage.h" line="119"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchFieldsPage.ui" line="27"/>
         <source>Nickname:</source>
         <translation>Ник:</translation>
     </message>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchFieldsPage.ui"/>
-        <location filename="../QtUI/UserSearch/ui_QtUserSearchFieldsPage.h" line="120"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchFieldsPage.ui" line="37"/>
         <source>First name:</source>
         <translation>Имя:</translation>
     </message>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchFieldsPage.ui"/>
-        <location filename="../QtUI/UserSearch/ui_QtUserSearchFieldsPage.h" line="121"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchFieldsPage.ui" line="47"/>
         <source>Last name:</source>
         <translation>Фамилия:</translation>
     </message>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchFieldsPage.ui"/>
-        <location filename="../QtUI/UserSearch/ui_QtUserSearchFieldsPage.h" line="122"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchFieldsPage.ui" line="57"/>
         <source>E-Mail:</source>
         <translation>E-Mail:</translation>
     </message>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchFieldsPage.ui"/>
-        <location filename="../QtUI/UserSearch/ui_QtUserSearchFieldsPage.h" line="124"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchFieldsPage.ui" line="74"/>
         <source>Fetching search fields</source>
         <translation>Получение полей поиска</translation>
@@ -1085,30 +1500,25 @@
     <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"/>
         <source>Add a user</source>
         <translation>Добавить пользователя</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"/>
         <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>
         <translation>Добавить пользователя в список контактов. Вы можете ввести его адрес или воспользоваться поиском.</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"/>
         <source>I know their address:</source>
         <translation>Я знаю его адрес:</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"/>
         <source>I&apos;d like to search my server</source>
         <translation>Я хочу искать на моём сервере</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"/>
         <source>I&apos;d like to search another server:</source>
         <translation>Я хочу искать на другом сервере:</translation>
@@ -1116,8 +1526,15 @@
 </context>
 <context>
+    <name>QtUserSearchResultsPage</name>
+    <message>
+        <location filename="../QtUI/UserSearch/QtUserSearchResultsPage.ui" line="27"/>
+        <source>No results.</source>
+        <translation>Нет результатов.</translation>
+    </message>
+</context>
+<context>
     <name>QtUserSearchWizard</name>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchWizard.ui"/>
-        <location filename="../QtUI/UserSearch/ui_QtUserSearchWizard.h" line="39"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchWizard.ui" line="14"/>
         <source>Find User</source>
         <translation>Поиск пользователя</translation>
@@ -1127,8 +1544,18 @@
     <name>Swift::ChatListModel</name>
     <message>
-        <location filename="../QtUI/ChatList/ChatListModel.cpp" line="15"/>
+        <location filename="../QtUI/ChatList/ChatListModel.cpp" line="17"/>
         <source>Bookmarked Rooms</source>
         <translation>Закладки комнат</translation>
     </message>
+    <message>
+        <location filename="../QtUI/ChatList/ChatListModel.cpp" line="18"/>
+        <source>Recent Chats</source>
+        <translation>Последние чаты</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/ChatList/ChatListModel.cpp" line="20"/>
+        <source>Opened Whiteboards</source>
+        <translation>Открытые доски</translation>
+    </message>
 </context>
 <context>
@@ -1168,4 +1595,57 @@
 </context>
 <context>
+    <name>Swift::QtAdHocCommandWindow</name>
+    <message>
+        <location filename="../QtUI/QtAdHocCommandWindow.cpp" line="36"/>
+        <source>Cancel</source>
+        <translation>Отмена</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAdHocCommandWindow.cpp" line="39"/>
+        <source>Back</source>
+        <translation>Назад</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAdHocCommandWindow.cpp" line="42"/>
+        <source>Next</source>
+        <translatorcomment>xzxz следующий</translatorcomment>
+        <translation>Далее</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAdHocCommandWindow.cpp" line="45"/>
+        <source>Complete</source>
+        <translatorcomment>xzxz ejabberd buggy ad-hoc</translatorcomment>
+        <translation>Выполнено</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAdHocCommandWindow.cpp" line="86"/>
+        <source>Error: %1</source>
+        <translation>Ошибка: %1</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAdHocCommandWindow.cpp" line="87"/>
+        <source>Warning: %1</source>
+        <translation>Предупреждение: %1</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAdHocCommandWindow.cpp" line="104"/>
+        <source>Error executing command</source>
+        <translation>Ошибка выполнения команды</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtAffiliationEditor</name>
+    <message>
+        <location filename="../QtUI/QtAffiliationEditor.cpp" line="48"/>
+        <source>Add User</source>
+        <translation>Добавить пользователя</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtAffiliationEditor.cpp" line="48"/>
+        <source>Added User&apos;s Address:</source>
+        <translation>Введите адрес пользователя:</translation>
+    </message>
+</context>
+<context>
     <name>Swift::QtAvatarWidget</name>
     <message>
@@ -1191,6 +1671,10 @@
     <message>
         <location filename="../QtUI/QtAvatarWidget.cpp" line="81"/>
+        <source>Image Files (*.png *.jpg *.jpeg *.gif)</source>
+        <translation>Изображения (*.png *.jpg *.jpeg *.gif)</translation>
+    </message>
+    <message>
         <source>Image Files (*.png *.jpg *.gif)</source>
-        <translation>Изображения (*.png *.jpg *.gif)</translation>
+        <translation type="obsolete">Изображения (*.png *.jpg *.gif)</translation>
     </message>
     <message>
@@ -1219,56 +1703,350 @@
 </context>
 <context>
+    <name>Swift::QtCertificateViewerDialog</name>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="95"/>
+        <source>General</source>
+        <translation>Общее</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="96"/>
+        <source>Valid From</source>
+        <translation>Действует с</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="97"/>
+        <source>Valid To</source>
+        <translation>Действителен до</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="98"/>
+        <source>Serial Number</source>
+        <translation>Серийный номер</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="99"/>
+        <source>Version</source>
+        <translation>Версия</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="101"/>
+        <source>Subject</source>
+        <translation>Тема</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="102"/>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="124"/>
+        <source>Organization</source>
+        <translation>Организация</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="103"/>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="125"/>
+        <source>Common Name</source>
+        <translation>Полное имя</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="104"/>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="126"/>
+        <source>Locality</source>
+        <translation>Местонахождение</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="105"/>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="127"/>
+        <source>Organizational Unit</source>
+        <translation>Подразделение</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="106"/>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="128"/>
+        <source>Country</source>
+        <translation>Страна</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="107"/>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="129"/>
+        <source>State</source>
+        <translation>Регион</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="110"/>
+        <source>Alternate Subject Names</source>
+        <translation>Альтернативные имена субъекта</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="115"/>
+        <source>E-mail Address</source>
+        <translation>E-Mail адрес</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="117"/>
+        <source>DNS Name</source>
+        <translation>DNS имя</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtCertificateViewerDialog.cpp" line="123"/>
+        <source>Issuer</source>
+        <translation>Издатель</translation>
+    </message>
+</context>
+<context>
     <name>Swift::QtChatListWindow</name>
     <message>
-        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="62"/>
-        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="66"/>
+        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="82"/>
+        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="86"/>
         <source>Add New Bookmark</source>
         <translation>Добавить закладку</translation>
     </message>
     <message>
-        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="63"/>
+        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="83"/>
         <source>Edit Bookmark</source>
         <translation>Редактировать закладку</translation>
     </message>
     <message>
-        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="64"/>
+        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="84"/>
         <source>Remove Bookmark</source>
         <translation>Удалить закладку</translation>
     </message>
+    <message>
+        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="173"/>
+        <source>Clear recents</source>
+        <translation>Удалить последние</translation>
+    </message>
 </context>
 <context>
     <name>Swift::QtChatView</name>
     <message>
-        <location filename="../QtUI/QtChatView.cpp" line="61"/>
+        <location filename="../QtUI/QtChatView.cpp" line="73"/>
         <source>Clear log</source>
         <translation>Очистить лог</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtChatView.cpp" line="62"/>
+        <location filename="../QtUI/QtChatView.cpp" line="74"/>
         <source>You are about to clear the contents of your chat log.</source>
         <translation>Вы собираетесь очистить содержимое Вашего чата.</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtChatView.cpp" line="63"/>
+        <location filename="../QtUI/QtChatView.cpp" line="75"/>
         <source>Are you sure?</source>
         <translation>Вы уверены?</translation>
     </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="219"/>
+        <source>%1 edited</source>
+        <translation>%1 отредактировано</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="400"/>
+        <source>Waiting for other side to accept the transfer.</source>
+        <translation>Ожидание принятия на другой стороне.</translation>
+    </message>
+    <message>
+        <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>Отмена</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="405"/>
+        <source>Negotiating...</source>
+        <translation>Переговоры...</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="420"/>
+        <source>Transfer has been canceled!</source>
+        <translation>Передача была отменена!</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="424"/>
+        <source>Transfer completed successfully.</source>
+        <translation>Передача успешно завершена.</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="427"/>
+        <source>Transfer failed.</source>
+        <translation>Передача не удалась.</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="437"/>
+        <source>Started whiteboard chat</source>
+        <translation>Открыта доска для рисования</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="438"/>
+        <source>Show whiteboard</source>
+        <translation>Показать доску для рисования</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="440"/>
+        <source>Whiteboard chat has been canceled</source>
+        <translation>Доска для рисования была отменена</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="442"/>
+        <source>Whiteboard chat request has been rejected</source>
+        <translation>Запрос порисовать был отклонён</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatView.cpp" line="451"/>
+        <source>Return to room</source>
+        <translation>Вернуться в комнату</translation>
+    </message>
 </context>
 <context>
     <name>Swift::QtChatWindow</name>
     <message>
-        <location filename="../QtUI/QtChatWindow.cpp" line="302"/>
+        <location filename="../QtUI/QtChatWindow.cpp" line="157"/>
+        <source>Correcting</source>
+        <translation>Исправление</translation>
+    </message>
+    <message>
+        <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>Этот чат, возможно, не поддерживает исправление сообщений. Если Вы отправляете исправление, это может выглядеть как дубликат сообщения</translation>
+    </message>
+    <message>
+        <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>Этот чат не поддерживает исправление сообщений. Если Вы отправляете исправление, это будет выглядеть как дубликат сообщения</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="546"/>
         <source>This message has not been received by your server yet.</source>
         <translation>Это сообщение не может быть получено.</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtChatWindow.cpp" line="304"/>
+        <location filename="../QtUI/QtChatWindow.cpp" line="553"/>
         <source>This message may not have been transmitted.</source>
         <translation>Это сообщение не может быть передано.</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtChatWindow.cpp" line="324"/>
+        <location filename="../QtUI/QtChatWindow.cpp" line="562"/>
+        <source>The receipt for this message has been received.</source>
+        <translation>Отчёт о доставке этого сообщения был получен.</translation>
+    </message>
+    <message>
+        <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>Отчёт о доставке этого сообщения пока не получен. Получатель, возможно, не получил это сообщение.</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="613"/>
+        <source>Send file</source>
+        <translation>Отправить файл</translation>
+    </message>
+    <message>
+        <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>Отмена</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="616"/>
+        <source>Set Description</source>
+        <translation>Установка описания</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="617"/>
+        <source>Send</source>
+        <translation>Отправка</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="621"/>
+        <source>Receiving file</source>
+        <translation>Получить файл</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="624"/>
+        <location filename="../QtUI/QtChatWindow.cpp" line="665"/>
+        <source>Accept</source>
+        <translation>Принять</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="659"/>
+        <source>Starting whiteboard chat</source>
+        <translation>Открывается доска для рисования</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="663"/>
+        <source>%1 would like to start a whiteboard chat</source>
+        <translation>%1 хочет порисовать</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="700"/>
+        <source>File transfer description</source>
+        <translation>Описание передачи файлов</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="701"/>
+        <source>Description:</source>
+        <translation>Описание:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="715"/>
+        <source>Save File</source>
+        <translation>Сохранить файл</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="908"/>
+        <source>Change subject…</source>
+        <translation>Изменить тему…</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="909"/>
+        <source>Configure room…</source>
+        <translation>Настроить комнату…</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="910"/>
+        <source>Edit affiliations…</source>
+        <translation>Редактировать ранги…</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="911"/>
+        <source>Destroy room</source>
+        <translation>Уничтожить комнату</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="912"/>
+        <source>Invite person to this room…</source>
+        <translation>Пригласить в эту комнату…</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="922"/>
+        <source>Change room subject</source>
+        <translation>Изменение темы конференции</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="922"/>
+        <source>New subject:</source>
+        <translation>Новая тема:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="940"/>
+        <source>Confirm room destruction</source>
+        <translation>Подтверждение удаления комнаты</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="941"/>
+        <source>Are you sure you want to destroy the room?</source>
+        <translation>Вы уверены, что хотите удалить комнату?</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="942"/>
+        <source>This will destroy the room.</source>
+        <translation>Комната будет уничтожена.</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="993"/>
+        <source>Accept Invite</source>
+        <translation>Принять приглашение</translation>
+    </message>
+    <message>
         <source>Couldn&apos;t send message: %1</source>
-        <translation>Ошибка отправки: %1</translation>
+        <translation type="obsolete">Ошибка отправки: %1</translation>
     </message>
 </context>
@@ -1276,15 +2054,15 @@
     <name>Swift::QtContactEditWidget</name>
     <message>
-        <location filename="../QtUI/QtContactEditWidget.cpp" line="28"/>
+        <location filename="../QtUI/QtContactEditWidget.cpp" line="122"/>
         <source>Name:</source>
         <translation>Имя:</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtContactEditWidget.cpp" line="34"/>
+        <location filename="../QtUI/QtContactEditWidget.cpp" line="42"/>
         <source>Groups:</source>
         <translation>Группы:</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtContactEditWidget.cpp" line="56"/>
+        <location filename="../QtUI/QtContactEditWidget.cpp" line="65"/>
         <source>New Group:</source>
         <translation>Новая группа:</translation>
@@ -1294,30 +2072,30 @@
     <name>Swift::QtContactEditWindow</name>
     <message>
-        <location filename="../QtUI/QtContactEditWindow.cpp" line="26"/>
+        <location filename="../QtUI/QtContactEditWindow.cpp" line="28"/>
         <source>Edit contact</source>
         <translation>Редактировать контакт</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtContactEditWindow.cpp" line="41"/>
+        <location filename="../QtUI/QtContactEditWindow.cpp" line="43"/>
         <source>Remove contact</source>
         <translation>Удалить контакт</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtContactEditWindow.cpp" line="44"/>
+        <location filename="../QtUI/QtContactEditWindow.cpp" line="46"/>
         <source>OK</source>
         <translation>ОК</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtContactEditWindow.cpp" line="82"/>
+        <location filename="../QtUI/QtContactEditWindow.cpp" line="94"/>
         <source>Confirm contact deletion</source>
         <translation>Подтверждение удаления</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtContactEditWindow.cpp" line="83"/>
+        <location filename="../QtUI/QtContactEditWindow.cpp" line="95"/>
         <source>Are you sure you want to delete this contact?</source>
         <translation>Вы уверены, что хотите удалить этот контакт?</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtContactEditWindow.cpp" line="84"/>
+        <location filename="../QtUI/QtContactEditWindow.cpp" line="96"/>
         <source>This will remove the contact &apos;%1&apos; from all groups they may be in.</source>
         <translation>Это позволит удалить контакт &apos;%1&apos; из всех групп, где он может быть</translation>
@@ -1327,7 +2105,41 @@
     <name>Swift::QtEventWindow</name>
     <message>
-        <location filename="../QtUI/EventViewer/QtEventWindow.cpp" line="47"/>
+        <location filename="../QtUI/EventViewer/QtEventWindow.cpp" line="48"/>
         <source>Display Notice</source>
-        <translation>Показать уведомления</translation>
+        <translation>Показать уведомление</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtFileTransferListWidget</name>
+    <message>
+        <location filename="../QtUI/QtFileTransferListWidget.cpp" line="39"/>
+        <source>Clear Finished Transfers</source>
+        <translation>Очистить завершённые передачи</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtFileTransferListWidget.cpp" line="44"/>
+        <source>File Transfer List</source>
+        <translation>Список передачи файлов</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtHistoryWindow</name>
+    <message>
+        <location filename="../QtUI/QtHistoryWindow.cpp" line="57"/>
+        <source>History</source>
+        <translation>История</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>Пользователи для приглашения в этот чат (один на строку):</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>Если Вы хотите указать причину для приглашения, введите её здесь</translation>
     </message>
 </context>
@@ -1335,5 +2147,5 @@
     <name>Swift::QtJoinMUCWindow</name>
     <message>
-        <location filename="../QtUI/QtJoinMUCWindow.cpp" line="15"/>
+        <location filename="../QtUI/QtJoinMUCWindow.cpp" line="19"/>
         <source>someroom@rooms.example.com</source>
         <translation>someroom@rooms.example.com</translation>
@@ -1343,120 +2155,151 @@
     <name>Swift::QtLoginWindow</name>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="81"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="92"/>
         <source>User address:</source>
         <translation>Адрес пользователя:</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="86"/>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="87"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="97"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="98"/>
         <source>User address - looks like someuser@someserver.com</source>
         <translation>Например, вася@jabber.ru/стриж</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="91"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="102"/>
         <source>Example: alice@wonderland.lit</source>
         <translation>Например, ivan@jabber.ru</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="97"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="108"/>
         <source>Password:</source>
         <translation>Пароль:</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="118"/>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="119"/>
+        <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>Нажмите, если у Вас есть личный сертификат, используемый для входа.</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="125"/>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="299"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="136"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="353"/>
         <source>Connect</source>
         <translation>Подключиться</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="136"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="154"/>
         <source>Remember Password?</source>
-        <translation>Запомнить пароль?</translation>
+        <translation>Запомнить пароль</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="138"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="156"/>
         <source>Login Automatically?</source>
-        <translation>Подключаться автоматически?</translation>
+        <translation>Подключаться автоматически</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="150"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="168"/>
         <source>&amp;Swift</source>
         <translation>&amp;Swift</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="152"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="170"/>
         <source>&amp;General</source>
         <translation>&amp;Общие</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="160"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="178"/>
         <source>&amp;About %1</source>
         <translation>&amp;О %1</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="165"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="183"/>
         <source>&amp;Show Debug Console</source>
         <translation>&amp;Показать консоль отладки</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="169"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="188"/>
+        <source>Show &amp;File Transfer Overview</source>
+        <translation>Показать окно передачи &amp;файлов</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="193"/>
         <source>&amp;Play Sounds</source>
-        <translation>&amp;Играть звуки</translation>
+        <translation>&amp;Воспроизводить звуки</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="175"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="199"/>
         <source>Display Pop-up &amp;Notifications</source>
         <translation>Показывать всплывающие &amp;уведомления</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="190"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="211"/>
         <source>&amp;Quit</source>
-        <translation>&amp;Выход</translation>
+        <translation>В&amp;ыход</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="205"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="253"/>
         <source>Remove profile</source>
         <translation>Удалить профиль</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="205"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="253"/>
         <source>Remove the profile &apos;%1&apos;?</source>
         <translation>Удалить профиль &apos;%1&apos;?</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="299"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="353"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="320"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="367"/>
+        <source>Confirm terms of use</source>
+        <translation>Подтверждение условий использования</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="410"/>
         <source>Select an authentication certificate</source>
         <translation>Выберите сертификат проверки подлинности</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="420"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="410"/>
+        <source>P12 files (*.cert *.p12 *.pfx);;All files (*.*)</source>
+        <translation>P12 файлы (*.cert *.p12 *.pfx);;Все файлы (*.*)</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="523"/>
         <source>The certificate presented by the server is not valid.</source>
         <translation>Сертификат, предоставленный сервером, является недопустимым.</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="421"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="524"/>
         <source>Would you like to permanently trust this certificate? This must only be done if you know it is correct.</source>
         <translation>Хотели бы Вы доверять этому сертификату?</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="423"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="526"/>
+        <source>Show Certificate</source>
+        <translation>Просмотр сертификата</translation>
+    </message>
+    <message>
         <source>Subject: %1</source>
-        <translation>Тема: %1</translation>
+        <translation type="obsolete">Тема: %1</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="424"/>
         <source>SHA-1 Fingerprint: %1</source>
-        <translation>Отпечаток SHA-1: %1</translation>
+        <translation type="obsolete">Отпечаток SHA-1: %1</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtMUCConfigurationWindow</name>
+    <message>
+        <location filename="../QtUI/QtMUCConfigurationWindow.cpp" line="34"/>
+        <source>Cancel</source>
+        <translation>Отмена</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMUCConfigurationWindow.cpp" line="37"/>
+        <source>OK</source>
+        <translation>ОК</translation>
     </message>
 </context>
@@ -1473,84 +2316,119 @@
     <name>Swift::QtMainWindow</name>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="64"/>
+        <location filename="../QtUI/QtMainWindow.cpp" line="79"/>
         <source>&amp;Contacts</source>
         <translation>&amp;Контакты</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="71"/>
-        <location filename="../QtUI/QtMainWindow.cpp" line="137"/>
+        <location filename="../QtUI/QtMainWindow.cpp" line="88"/>
+        <location filename="../QtUI/QtMainWindow.cpp" line="205"/>
         <source>&amp;Notices</source>
         <translation>&amp;Уведомления</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="72"/>
+        <location filename="../QtUI/QtMainWindow.cpp" line="87"/>
         <source>C&amp;hats</source>
-        <translation>&amp;Чаты</translation>
+        <translation>Ч&amp;аты</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="76"/>
+        <location filename="../QtUI/QtMainWindow.cpp" line="96"/>
         <source>&amp;View</source>
         <translation>&amp;Вид</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="78"/>
+        <location filename="../QtUI/QtMainWindow.cpp" line="98"/>
         <source>&amp;Show offline contacts</source>
         <translation>&amp;Показывать отключённых</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="84"/>
+        <location filename="../QtUI/QtMainWindow.cpp" line="106"/>
+        <source>&amp;Show Emoticons</source>
+        <translation>Показывать &amp;смайлы</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="120"/>
         <source>&amp;Actions</source>
         <translation>&amp;Действия</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="86"/>
-        <source>Edit &amp;Profile</source>
-        <translation>Редактировать &amp;профиль</translation>
+        <location filename="../QtUI/QtMainWindow.cpp" line="122"/>
+        <source>Edit &amp;Profile…</source>
+        <translation>Редактировать &amp;профиль…</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="89"/>
-        <source>Enter &amp;Room</source>
-        <translation>&amp;Войти в комнату</translation>
+        <location filename="../QtUI/QtMainWindow.cpp" line="125"/>
+        <source>Enter &amp;Room…</source>
+        <translation>&amp;Войти в комнату…</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="92"/>
-        <source>&amp;Add Contact</source>
-        <translation>&amp;Добавить контакт</translation>
+        <location filename="../QtUI/QtMainWindow.cpp" line="129"/>
+        <source>&amp;View History…</source>
+        <translation>Просмотр &amp;истории…</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="95"/>
-        <source>&amp;Edit Selected Contact</source>
-        <translation>&amp;Редактировать выделенный контакт</translation>
+        <location filename="../QtUI/QtMainWindow.cpp" line="133"/>
+        <source>&amp;Add Contact…</source>
+        <translation>До&amp;бавить контакт…</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="99"/>
-        <source>Start &amp;Chat</source>
-        <translation>Начать &amp;чат</translation>
+        <location filename="../QtUI/QtMainWindow.cpp" line="136"/>
+        <source>&amp;Edit Selected Contact…</source>
+        <translation>&amp;Редактировать выделенный контакт…</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="103"/>
+        <location filename="../QtUI/QtMainWindow.cpp" line="140"/>
+        <source>Start &amp;Chat…</source>
+        <translation>Нач&amp;ать чат…</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="143"/>
+        <source>Run Server Command</source>
+        <translation>Выполнить серверную команду</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="146"/>
         <source>&amp;Sign Out</source>
         <translation>&amp;Отключиться</translation>
     </message>
+    <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="150"/>
+        <source>&amp;Request Delivery Receipts</source>
+        <translation>&amp;Запрашивать уведомления о доставке</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="161"/>
+        <source>Collecting commands...</source>
+        <translation>Сбор команд...</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="216"/>
+        <source>&amp;Chats</source>
+        <translation>&amp;Чаты</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtMainWindow.cpp" line="339"/>
+        <source>No Available Commands</source>
+        <translation>Нет доступных комманд</translation>
+    </message>
 </context>
 <context>
     <name>Swift::QtNameWidget</name>
     <message>
-        <location filename="../QtUI/QtNameWidget.cpp" line="47"/>
+        <location filename="../QtUI/QtNameWidget.cpp" line="48"/>
         <source>Show Nickname</source>
         <translation>Показывать ник</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtNameWidget.cpp" line="47"/>
+        <location filename="../QtUI/QtNameWidget.cpp" line="48"/>
         <source>(No Nickname Set)</source>
         <translation>(ник не установлен)</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtNameWidget.cpp" line="55"/>
+        <location filename="../QtUI/QtNameWidget.cpp" line="56"/>
         <source>Show Address</source>
         <translation>Показывать адрес</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtNameWidget.cpp" line="62"/>
+        <location filename="../QtUI/QtNameWidget.cpp" line="63"/>
         <source>Edit Profile</source>
         <translation>Редактировать профиль</translation>
@@ -1558,4 +2436,42 @@
 </context>
 <context>
+    <name>Swift::QtOccupantListWidget</name>
+    <message>
+        <location filename="../QtUI/Roster/QtOccupantListWidget.cpp" line="46"/>
+        <source>No actions for this user</source>
+        <translation>Нет действий для данного пользователя</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtOccupantListWidget.cpp" line="55"/>
+        <source>Kick user</source>
+        <translation>Выгнать</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtOccupantListWidget.cpp" line="56"/>
+        <source>Kick and ban user</source>
+        <translation>Выгнать и забанить</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtOccupantListWidget.cpp" line="57"/>
+        <source>Make moderator</source>
+        <translation>Сделать модератором</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtOccupantListWidget.cpp" line="58"/>
+        <source>Make participant</source>
+        <translation>Сделать участником</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtOccupantListWidget.cpp" line="59"/>
+        <source>Remove voice</source>
+        <translation>Лишить голоса</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtOccupantListWidget.cpp" line="60"/>
+        <source>Add to contacts</source>
+        <translation>Добавить в контакты</translation>
+    </message>
+</context>
+<context>
     <name>Swift::QtProfileWindow</name>
     <message>
@@ -1576,4 +2492,56 @@
 </context>
 <context>
+    <name>Swift::QtRosterHeader</name>
+    <message>
+        <location filename="../QtUI/QtRosterHeader.cpp" line="59"/>
+        <source>Connection is secured</source>
+        <translation>Подключение защищено</translation>
+    </message>
+</context>
+<context>
+    <name>Swift::QtRosterWidget</name>
+    <message>
+        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="58"/>
+        <source>Edit…</source>
+        <translation>Редактировать…</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="59"/>
+        <source>Remove</source>
+        <translation>Удалить</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="63"/>
+        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="83"/>
+        <source>Send File</source>
+        <translation>Отправить файл</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="69"/>
+        <source>Start Whiteboard Chat</source>
+        <translation>Открыть доску для рисования</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="83"/>
+        <source>All Files (*);;</source>
+        <translation>Все файлы (*);;</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="96"/>
+        <source>Rename</source>
+        <translation>Переименовать</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="106"/>
+        <source>Rename group</source>
+        <translation>Переименовать группу</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/Roster/QtRosterWidget.cpp" line="106"/>
+        <source>Enter a new name for group &apos;%1&apos;:</source>
+        <translation>Введите новое название группы &apos;%1&apos;:</translation>
+    </message>
+</context>
+<context>
     <name>Swift::QtStatusWidget</name>
     <message>
@@ -1583,5 +2551,5 @@
     </message>
     <message>
-        <location filename="../QtUI/QtStatusWidget.cpp" line="263"/>
+        <location filename="../QtUI/QtStatusWidget.cpp" line="261"/>
         <source>(No message)</source>
         <translation>(нет сообщения)</translation>
@@ -1597,5 +2565,5 @@
 If you choose to defer this choice, you will be asked again when you next login.</source>
         <translation>%1 хочет добавить Вас в свой список контактов.
-Вы хотите добавить его в список контактов и обмениваться статусами, когда вы в сети?
+Вы хотите добавить его в список контактов и обмениваться статусами, когда Вы в сети?
 
 Если Вы решили отложить выбор, то запрос придёт снова при следующем подключении.</translation>
@@ -1617,10 +2585,10 @@ If you choose to defer this choice, you will be asked again when you next login.
     </message>
     <message>
-        <location filename="../QtUI/QtSubscriptionRequestWindow.cpp" line="32"/>
+        <location filename="../QtUI/QtSubscriptionRequestWindow.cpp" line="33"/>
         <source>No</source>
         <translation>Нет</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtSubscriptionRequestWindow.cpp" line="34"/>
+        <location filename="../QtUI/QtSubscriptionRequestWindow.cpp" line="35"/>
         <source>Defer</source>
         <translation>Отложить</translation>
@@ -1630,27 +2598,22 @@ If you choose to defer this choice, you will be asked again when you next login.
     <name>Swift::QtTreeWidget</name>
     <message>
-        <location filename="../QtUI/Roster/QtTreeWidget.cpp" line="144"/>
         <source>Edit</source>
-        <translation>Редактировать</translation>
+        <translation type="obsolete">Редактировать</translation>
     </message>
     <message>
-        <location filename="../QtUI/Roster/QtTreeWidget.cpp" line="145"/>
         <source>Remove</source>
-        <translation>Удалить</translation>
+        <translation type="obsolete">Удалить</translation>
     </message>
     <message>
-        <location filename="../QtUI/Roster/QtTreeWidget.cpp" line="157"/>
         <source>Rename</source>
-        <translation>Переименовать</translation>
+        <translation type="obsolete">Переименовать</translation>
     </message>
     <message>
-        <location filename="../QtUI/Roster/QtTreeWidget.cpp" line="167"/>
         <source>Rename group</source>
-        <translation>Переименовать группу</translation>
+        <translation type="obsolete">Переименовать группу</translation>
     </message>
     <message>
-        <location filename="../QtUI/Roster/QtTreeWidget.cpp" line="167"/>
         <source>Enter a new name for group &apos;%1&apos;:</source>
-        <translation>Введите новое название группы &apos;%1&apos;:</translation>
+        <translation type="obsolete">Введите новое название группы &apos;%1&apos;:</translation>
     </message>
 </context>
@@ -1658,5 +2621,5 @@ If you choose to defer this choice, you will be asked again when you next login.
     <name>Swift::QtUserSearchDetailsPage</name>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchDetailsPage.cpp" line="17"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchDetailsPage.cpp" line="22"/>
         <source>Please choose a name for the contact, and select the groups you want to add the contact to.</source>
         <translation>Пожалуйста, выберите имя контакта и выберите группы, в которые Вы хотите добавить контакт.</translation>
@@ -1684,35 +2647,35 @@ If you choose to defer this choice, you will be asked again when you next login.
     <name>Swift::QtUserSearchWindow</name>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="32"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="35"/>
         <source>Add Contact</source>
         <translation>Добавить контакт</translation>
     </message>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="32"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="35"/>
         <source>Chat to User</source>
         <translation>Чат с пользователем</translation>
     </message>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="43"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="45"/>
         <source>alice@wonderland.lit</source>
         <translation>alice@wonderland.lit</translation>
     </message>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="223"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="296"/>
         <source>How would you like to find the user to add?</source>
         <translation>Вы хотите найти пользователя чтобы его добавить?</translation>
     </message>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="226"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="299"/>
         <source>How would you like to find the user to chat to?</source>
         <translation>Вы хотите найти пользователя чтобы начать с ним чат?</translation>
     </message>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="251"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="326"/>
         <source>Error while searching</source>
         <translation>Ошибка поиска</translation>
     </message>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="257"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="332"/>
         <source>This server doesn&apos;t support searching for users.</source>
         <translation>Этот сервер не поддерживает поиск пользователей.</translation>
@@ -1722,8 +2685,26 @@ If you choose to defer this choice, you will be asked again when you next login.
     <name>Swift::QtWebView</name>
     <message>
-        <location filename="../QtUI/QtWebView.cpp" line="61"/>
+        <location filename="../QtUI/QtWebView.cpp" line="66"/>
         <source>Clear</source>
         <translation>Очистить</translation>
     </message>
+    <message>
+        <location filename="../QtUI/QtWebView.cpp" line="67"/>
+        <source>Increase font size</source>
+        <translation>Увеличить размер шрифта</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtWebView.cpp" line="68"/>
+        <source>Decrease font size</source>
+        <translation>Уменьшить размер шрифта</translation>
+    </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>Закрытие окна эквивалентно закрытию сессии. Вы уверены, что хотите это сделать?</translation>
+    </message>
 </context>
 <context>
@@ -1750,10 +2731,10 @@ If you choose to defer this choice, you will be asked again when you next login.
     </message>
     <message>
-        <location filename="../QtUI/QtXMLConsoleWidget.cpp" line="75"/>
+        <location filename="../QtUI/QtXMLConsoleWidget.cpp" line="78"/>
         <source>&lt;!-- IN --&gt;</source>
         <translation>&lt;!-- IN --&gt;</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtXMLConsoleWidget.cpp" line="79"/>
+        <location filename="../QtUI/QtXMLConsoleWidget.cpp" line="82"/>
         <source>&lt;!-- OUT --&gt;</source>
         <translation>&lt;!-- OUT --&gt;</translation>
diff --git a/Swift/Translations/swift_sk.ts b/Swift/Translations/swift_sk.ts
index bdd199b..e99a638 100644
--- a/Swift/Translations/swift_sk.ts
+++ b/Swift/Translations/swift_sk.ts
@@ -6,25 +6,25 @@
     <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>
@@ -32,120 +32,120 @@
     </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>
@@ -153,45 +153,45 @@
     </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>
@@ -206,85 +206,85 @@
     </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>
@@ -292,291 +292,296 @@
     </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>
@@ -592,5 +597,5 @@
         <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>
@@ -619,5 +624,5 @@
         <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>
@@ -644,5 +649,5 @@
         <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>
@@ -791,5 +796,5 @@
         <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>
@@ -806,5 +811,5 @@
         <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>
@@ -817,15 +822,15 @@
     </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>
@@ -901,4 +906,9 @@
         <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>
@@ -1087,10 +1097,10 @@
         <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>
@@ -1098,5 +1108,4 @@
     <name>QtAffiliationEditor</name>
     <message>
-        <location filename="../QtUI/QtAffiliationEditor.ui"/>
         <location filename="../QtUI/ui_QtAffiliationEditor.h" line="123"/>
         <source>Dialog</source>
@@ -1104,5 +1113,10 @@
     </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>
@@ -1110,5 +1124,5 @@
     </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>
@@ -1116,5 +1130,5 @@
     </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>
@@ -1122,5 +1136,5 @@
     </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>
@@ -1128,5 +1142,5 @@
     </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>
@@ -1134,14 +1148,14 @@
     </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>
@@ -1149,5 +1163,5 @@
     <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>
@@ -1155,5 +1169,5 @@
     </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>
@@ -1161,5 +1175,5 @@
     </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>
@@ -1167,5 +1181,5 @@
     </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>
@@ -1173,5 +1187,5 @@
     </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>
@@ -1183,5 +1197,5 @@
     </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>
@@ -1190,7 +1204,201 @@
 </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"/>
@@ -1199,11 +1407,9 @@
     </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>
@@ -1211,11 +1417,9 @@
     </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>
@@ -1223,20 +1427,36 @@
     </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>
@@ -1244,5 +1464,5 @@
     </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>
@@ -1250,5 +1470,5 @@
     </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>
@@ -1256,5 +1476,5 @@
     </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>
@@ -1262,5 +1482,5 @@
     </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>
@@ -1271,5 +1491,5 @@
     <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>
@@ -1277,5 +1497,5 @@
     </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>
@@ -1283,5 +1503,5 @@
     </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>
@@ -1289,5 +1509,5 @@
     </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>
@@ -1295,5 +1515,5 @@
     </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>
@@ -1304,12 +1524,12 @@
     <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>
@@ -1317,20 +1537,20 @@
     </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>
@@ -1338,5 +1558,5 @@
     <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>
@@ -1347,5 +1567,5 @@
     <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>
@@ -1356,5 +1576,5 @@
     <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>
@@ -1362,8 +1582,13 @@
     </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>
@@ -1412,35 +1637,35 @@
     <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>
@@ -1452,10 +1677,10 @@
         <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>
@@ -1520,23 +1745,112 @@
 </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>
@@ -1546,57 +1860,77 @@
     <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>
@@ -1606,10 +1940,10 @@
     <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>
@@ -1624,20 +1958,20 @@
     </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>
@@ -1648,7 +1982,7 @@
     </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>
@@ -1657,66 +1991,100 @@
     </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>
@@ -1724,45 +2092,42 @@
     </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>
@@ -1772,5 +2137,5 @@
     <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>
@@ -1782,5 +2147,5 @@
     </message>
     <message>
-        <location filename="../QtUI/QtContactEditWidget.cpp" line="64"/>
+        <location filename="../QtUI/QtContactEditWidget.cpp" line="65"/>
         <source>New Group:</source>
         <translation>Nová skupina:</translation>
@@ -1842,4 +2207,25 @@
 </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>
@@ -1852,16 +2238,16 @@
     <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>
@@ -1869,57 +2255,57 @@
     </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 programe &amp;%1</translation>
+        <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>
@@ -1927,56 +2313,59 @@
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="203"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="211"/>
         <source>&amp;Quit</source>
-        <translation>&amp;Ukončiť</translation>
+        <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>
@@ -2008,26 +2397,26 @@
     <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>
@@ -2038,35 +2427,45 @@
     </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"/>
-        <source>Edit &amp;Profile</source>
-        <translation>Upraviť &amp;profil</translation>
+        <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="125"/>
+        <source>Enter &amp;Room…</source>
+        <translation>Vstúpiť do &amp;miestnosti…</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="105"/>
-        <source>Enter &amp;Room</source>
-        <translation>Vstúpiť do &amp;miestnosti</translation>
+        <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="108"/>
-        <source>&amp;Add Contact</source>
-        <translation>Pridať &amp;kontakt</translation>
+        <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"/>
-        <source>&amp;Edit Selected Contact</source>
-        <translation>&amp;Upraviť vybraný kontakt</translation>
+        <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"/>
-        <source>Start &amp;Chat</source>
-        <translation>Začať &amp;rozhovor</translation>
+        <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>
@@ -2077,25 +2476,25 @@
     </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>
@@ -2130,15 +2529,15 @@
         <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>
@@ -2159,6 +2558,10 @@
     <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>
@@ -2182,38 +2585,55 @@
 </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>
@@ -2225,5 +2645,5 @@
         <location filename="../QtUI/QtStatusWidget.cpp" line="231"/>
         <source>Connecting</source>
-        <translation>Pripájam</translation>
+        <translation>Prebieha pripájanie</translation>
     </message>
     <message>
@@ -2238,5 +2658,5 @@
         <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>
@@ -2268,7 +2688,7 @@ If you choose to defer this choice, you will be asked again when you next login.
         <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>
@@ -2316,5 +2736,5 @@ Keď sa rozhodnete odložiť výber, môžete sa znovu rozhodnúť po nasledujú
         <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>
@@ -2324,15 +2744,15 @@ Keď sa rozhodnete odložiť výber, môžete sa znovu rozhodnúť po nasledujú
         <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>
@@ -2355,21 +2775,21 @@ Keď sa rozhodnete odložiť výber, môžete sa znovu rozhodnúť po nasledujú
     </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>
@@ -2395,4 +2815,12 @@ Keď sa rozhodnete odložiť výber, môžete sa znovu rozhodnúť po nasledujú
 </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>
@@ -2404,5 +2832,5 @@ Keď sa rozhodnete odložiť výber, môžete sa znovu rozhodnúť po nasledujú
         <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>
diff --git a/Swift/Translations/swift_sv.ts b/Swift/Translations/swift_sv.ts
index fdd0c98..b979dab 100644
--- a/Swift/Translations/swift_sv.ts
+++ b/Swift/Translations/swift_sv.ts
@@ -1446,25 +1446,25 @@
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="86"/>
-        <source>Edit &amp;Profile</source>
-        <translation>&amp;Redigera profil</translation>
+        <source>Edit &amp;Profile…</source>
+        <translation>&amp;Redigera profil…</translation>
     </message>
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="89"/>
-        <source>Enter &amp;Room</source>
-        <translation>&amp;Anslut till rum</translation>
+        <source>Enter &amp;Room…</source>
+        <translation>&amp;Anslut till rum…</translation>
     </message>
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="92"/>
-        <source>&amp;Add Contact</source>
-        <translation>&amp;Lägg till kontakt</translation>
+        <source>&amp;Add Contact…</source>
+        <translation>&amp;Lägg till kontakt…</translation>
     </message>
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="95"/>
-        <source>&amp;Edit Selected Contact</source>
-        <translation>&amp;Redigera markerad kontakt</translation>
+        <source>&amp;Edit Selected Contact…</source>
+        <translation>&amp;Redigera markerad kontakt…</translation>
     </message>
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="99"/>
-        <source>Start &amp;Chat</source>
+        <source>Start &amp;Chat…</source>
         <translation>Starta &amp;chat</translation>
     </message>