2 files changed, 2461 insertions, 521 deletions
diff --git a/Swift/Translations/swift_ca.ts b/Swift/Translations/swift_ca.ts
index 8f29a30..08bac26 100644
--- a/Swift/Translations/swift_ca.ts
+++ b/Swift/Translations/swift_ca.ts
@@ -5,501 +5,595 @@
 <context>
     <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>
         <translation>%1% està ocupat/da</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>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>
         <translation>Estàs vetat de la sala</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>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>
         <translation>Ocupants</translation>
     </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="567"/>
         <source>Unknown Error</source>
         <translation>Error Desconegut</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="439"/>
+        <location filename="../Controllers/MainController.cpp" line="568"/>
         <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="569"/>
         <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="570"/>
         <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="571"/>
         <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="572"/>
         <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="573"/>
         <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="574"/>
         <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="575"/>
         <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="576"/>
         <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="577"/>
         <source>Unexpected response</source>
         <translation>Resposta inesperada</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="449"/>
+        <location filename="../Controllers/MainController.cpp" line="578"/>
         <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="579"/>
         <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="580"/>
         <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="581"/>
         <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="582"/>
         <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="583"/>
         <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="584"/>
+        <source>Certificate card removed</source>
+        <translation>Targeta de certificat eliminada</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="586"/>
         <source>Unknown certificate</source>
         <translation>Certificat desconegut</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="457"/>
+        <location filename="../Controllers/MainController.cpp" line="587"/>
         <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="588"/>
         <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="589"/>
         <source>Certificate is self-signed</source>
         <translatorcomment>TMPFIX, signatura personal??</translatorcomment>
         <translation>El certificat es auto-signat</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="460"/>
+        <location filename="../Controllers/MainController.cpp" line="590"/>
         <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="591"/>
         <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="592"/>
         <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="593"/>
         <source>Certificate path length constraint exceeded</source>
         <translatorcomment>TMPFIX</translatorcomment>
         <translation>S&apos;ha excedit la restricció de la longitud de camí del certificat</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="464"/>
+        <location filename="../Controllers/MainController.cpp" line="594"/>
         <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="595"/>
         <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="596"/>
         <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="597"/>
+        <source>Certificate has been revoked</source>
+        <translation>El certificat ha estat revocat</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="598"/>
+        <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="608"/>
         <source>Certificate error</source>
         <translation>Error de certificat</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="490"/>
+        <location filename="../Controllers/MainController.cpp" line="615"/>
+        <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="628"/>
+        <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="634"/>
         <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="637"/>
         <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>
     </message>
@@ -530,6 +624,31 @@
         <source>There was an error publishing your profile data</source>
         <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>
     <name>ChatListModel</name>
@@ -685,15 +804,112 @@
         <translation>No s&apos;han trobat sales</translation>
     </message>
     <message>
-        <location filename="../QtUI/EventViewer/QtEvent.cpp" line="63"/>
+        <location filename="../QtUI/EventViewer/QtEvent.cpp" line="68"/>
         <source>%1 would like to add you to their contact list.</source>
         <translation>%1 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="980"/>
+        <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="982"/>
+        <source>Reason: %1</source>
+        <translation>Motiu: %1</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="985"/>
+        <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>
     <name>QScrollBar</name>
@@ -879,7 +1095,7 @@
     <message>
         <location filename="../QtUI/QtStrings.h" line="66"/>
         <source>&amp;Next</source>
-        <translation>&amp;Seguent</translation>
+        <translation>&amp;Següent</translation>
     </message>
     <message>
         <location filename="../QtUI/QtStrings.h" line="67"/>
@@ -917,43 +1133,92 @@
     </message>
 </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>
     <name>QtChatListWindow</name>
@@ -971,6 +1236,128 @@
     </message>
 </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>
         <source>Display Notice</source>
@@ -978,35 +1365,71 @@
     </message>
 </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>
     </message>
@@ -1014,32 +1437,27 @@
 <context>
     <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>
     </message>
@@ -1091,32 +1509,27 @@ Si esculls ajornar aquesta elecció, se&apos;t preguntarà de nou la propera veg
 <context>
     <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>
     </message>
@@ -1124,32 +1537,27 @@ Si esculls ajornar aquesta elecció, se&apos;t preguntarà de nou la propera veg
 <context>
     <name>QtUserSearchFirstPage</name>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchFirstPage.ui"/>
-        <location filename="../QtUI/UserSearch/ui_QtUserSearchFirstPage.h" line="121"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchFirstPage.ui" line="17"/>
         <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>
     </message>
@@ -1167,6 +1575,14 @@ Si esculls ajornar aquesta elecció, se&apos;t preguntarà de nou la propera veg
     </message>
 </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>
         <source>Add Contact</source>
@@ -1200,8 +1616,7 @@ Si esculls ajornar aquesta elecció, se&apos;t preguntarà de nou la propera veg
 <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>Buscar Usuari</translation>
     </message>
@@ -1209,11 +1624,21 @@ Si esculls ajornar aquesta elecció, se&apos;t preguntarà de nou la propera veg
 <context>
     <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>
     <name>Swift::QtAboutWidget</name>
@@ -1251,6 +1676,57 @@ Si esculls ajornar aquesta elecció, se&apos;t preguntarà de nou la propera veg
     </message>
 </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>
         <location filename="../QtUI/QtAvatarWidget.cpp" line="61"/>
@@ -1274,8 +1750,12 @@ Si esculls ajornar aquesta elecció, se&apos;t preguntarà de nou la propera veg
     </message>
     <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>
         <location filename="../QtUI/QtAvatarWidget.cpp" line="95"/>
@@ -1306,75 +1786,370 @@ Si esculls ajornar aquesta elecció, se&apos;t preguntarà de nou la propera veg
     </message>
 </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="906"/>
+        <source>Change subject…</source>
+        <translation>Canviar el tema...</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="907"/>
+        <source>Configure room…</source>
+        <translation>Configurar sala...</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="908"/>
+        <source>Edit affiliations…</source>
+        <translation>Editar afiliacions...</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="909"/>
+        <source>Destroy room</source>
+        <translation>Destruir la sala</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="910"/>
+        <source>Invite person to this room…</source>
+        <translation>Convidar a una persona a aquesta sala...</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="920"/>
+        <source>Change room subject</source>
+        <translation>Canviar el tema de la sala</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="920"/>
+        <source>New subject:</source>
+        <translation>Nou tema:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="938"/>
+        <source>Confirm room destruction</source>
+        <translation>Confirmar destrucció de la sala</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="939"/>
+        <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="940"/>
+        <source>This will destroy the room.</source>
+        <translation>Això destruirà la sala.</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="991"/>
+        <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>
 <context>
     <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>
     </message>
@@ -1382,32 +2157,32 @@ Si esculls ajornar aquesta elecció, se&apos;t preguntarà de nou la propera veg
 <context>
     <name>Swift::QtContactEditWindow</name>
     <message>
-        <location filename="../QtUI/QtContactEditWindow.cpp" line="26"/>
+        <location filename="../QtUI/QtContactEditWindow.cpp" line="28"/>
         <source>Edit contact</source>
         <translation>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>
     </message>
@@ -1415,15 +2190,50 @@ Si esculls ajornar aquesta elecció, se&apos;t preguntarà de nou la propera veg
 <context>
     <name>Swift::QtEventWindow</name>
     <message>
-        <location filename="../QtUI/EventViewer/QtEventWindow.cpp" line="47"/>
+        <location filename="../QtUI/EventViewer/QtEventWindow.cpp" line="48"/>
         <source>Display Notice</source>
         <translation>Mostrar Avís</translation>
     </message>
 </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>
     </message>
@@ -1431,123 +2241,145 @@ Si esculls ajornar aquesta elecció, se&apos;t preguntarà de nou la propera veg
 <context>
     <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="355"/>
         <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>
         <translation>&amp;General</translation>
     </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="355"/>
         <source>Cancel</source>
         <translation>Cancel·lar</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="320"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="369"/>
+        <source>Confirm terms of use</source>
+        <translation>Confirmar condicions d&apos;ús</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="412"/>
         <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="525"/>
         <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="526"/>
         <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>
 <context>
@@ -1562,68 +2394,103 @@ Si esculls ajornar aquesta elecció, se&apos;t preguntarà de nou la propera veg
 <context>
     <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>
         <translation>C&amp;onverses</translation>
     </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"/>
+        <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="89"/>
+        <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="92"/>
+        <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="133"/>
         <source>&amp;Add Contact…</source>
         <translation>&amp;Afegir Contacte…</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="95"/>
+        <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"/>
+        <location filename="../QtUI/QtMainWindow.cpp" line="140"/>
         <source>Start &amp;Chat…</source>
-        <translation>Començar &amp;Conversa</translation>
+        <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>
         <translation type="obsolete">avisos2</translation>
@@ -1632,27 +2499,65 @@ Si esculls ajornar aquesta elecció, se&apos;t preguntarà de nou la propera veg
 <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>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>
     </message>
 </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>
         <location filename="../QtUI/QtProfileWindow.cpp" line="24"/>
@@ -1671,6 +2576,58 @@ Si esculls ajornar aquesta elecció, se&apos;t preguntarà de nou la propera veg
     </message>
 </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>
         <location filename="../QtUI/QtStatusWidget.cpp" line="231"/>
@@ -1678,7 +2635,7 @@ Si esculls ajornar aquesta elecció, se&apos;t preguntarà de nou la propera veg
         <translation>Connectant</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtStatusWidget.cpp" line="263"/>
+        <location filename="../QtUI/QtStatusWidget.cpp" line="261"/>
         <source>(No message)</source>
         <translation>(Sense missatge)</translation>
     </message>
@@ -1700,7 +2657,7 @@ Si esculls ajornar aquesta elecció, se&apos;t preguntarà de nou la propera veg
         <location filename="../QtUI/QtSubscriptionRequestWindow.cpp" line="24"/>
         <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>
         <location filename="../QtUI/QtSubscriptionRequestWindow.cpp" line="25"/>
@@ -1713,12 +2670,12 @@ Si esculls ajornar aquesta elecció, se&apos;t preguntarà de nou la propera veg
         <translation>Si</translation>
     </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>
         <translation>Ajornar</translation>
@@ -1727,29 +2684,24 @@ Si esculls ajornar aquesta elecció, se&apos;t preguntarà de nou la propera veg
 <context>
     <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>
         <source>New name for %1</source>
@@ -1759,7 +2711,7 @@ Si esculls ajornar aquesta elecció, se&apos;t preguntarà de nou la propera veg
 <context>
     <name>Swift::QtUserSearchDetailsPage</name>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchDetailsPage.cpp" line="17"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchDetailsPage.cpp" line="22"/>
         <source>Please choose a name for the contact, and select the groups you want to add the contact to.</source>
         <translatorcomment>Somewhat free translation. TMPFIX?</translatorcomment>
         <translation>Si us plau, escull el nom que li vols donar al contacte, i sel·lecciona els grups als quals vols afegir-ho.</translation>
@@ -1786,37 +2738,37 @@ Si esculls ajornar aquesta elecció, se&apos;t preguntarà de nou la propera veg
 <context>
     <name>Swift::QtUserSearchWindow</name>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="32"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="35"/>
         <source>Add Contact</source>
         <translation>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>
     </message>
@@ -1824,10 +2776,28 @@ Si esculls ajornar aquesta elecció, se&apos;t preguntarà de nou la propera veg
 <context>
     <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>
     <name>Swift::QtXMLConsoleWidget</name>
@@ -1852,12 +2822,12 @@ Si esculls ajornar aquesta elecció, se&apos;t preguntarà de nou la propera veg
         <translation>Consola de Depuració</translation>
     </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>
     </message>
@@ -1868,7 +2838,7 @@ Si esculls ajornar aquesta elecció, se&apos;t preguntarà de nou la propera veg
         <location filename="../QtUI/QtAboutWidget.cpp" line="49"/>
         <location filename="../QtUI/QtAboutWidget.cpp" line="50"/>
         <source>TRANSLATION_AUTHOR</source>
-        <translation>Jan Kusanagi</translation>
+        <translation>JanKusanagi</translation>
     </message>
     <message>
         <location filename="../QtUI/QtAboutWidget.cpp" line="52"/>
diff --git a/Swift/Translations/swift_es.ts b/Swift/Translations/swift_es.ts
index 8d7805f..bc1d4f6 100644
--- a/Swift/Translations/swift_es.ts
+++ b/Swift/Translations/swift_es.ts
@@ -5,501 +5,595 @@
 <context>
     <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>
         <translation>%1% está ocupado/a</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>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>
         <translation>Estás vetado de la sala</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>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>
         <translation>Ocupantes</translation>
     </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="567"/>
         <source>Unknown Error</source>
         <translation>Error Desconocido</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="439"/>
+        <location filename="../Controllers/MainController.cpp" line="568"/>
         <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="569"/>
         <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="570"/>
         <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="571"/>
         <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="572"/>
         <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="573"/>
         <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="574"/>
         <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="575"/>
         <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="576"/>
         <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="577"/>
         <source>Unexpected response</source>
         <translation>Respuesta inesperada</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="449"/>
+        <location filename="../Controllers/MainController.cpp" line="578"/>
         <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="579"/>
         <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="580"/>
         <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="581"/>
         <source>Encryption error</source>
         <translation>Error de cifrado</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="453"/>
+        <location filename="../Controllers/MainController.cpp" line="582"/>
         <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="583"/>
         <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="584"/>
+        <source>Certificate card removed</source>
+        <translation>Tarjeta de certificado eliminada</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="586"/>
         <source>Unknown certificate</source>
         <translation>Certificado desconocido</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="457"/>
+        <location filename="../Controllers/MainController.cpp" line="587"/>
         <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="588"/>
         <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="589"/>
         <source>Certificate is self-signed</source>
         <translatorcomment>TMPFIX, firma personal?</translatorcomment>
         <translation>El certificado es auto-firmado</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="460"/>
+        <location filename="../Controllers/MainController.cpp" line="590"/>
         <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="591"/>
         <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="592"/>
         <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="593"/>
         <source>Certificate path length constraint exceeded</source>
         <translatorcomment>TMPFIX</translatorcomment>
         <translation>Se ha excedido la restricción de longitud de ruta del certificado</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="464"/>
+        <location filename="../Controllers/MainController.cpp" line="594"/>
         <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="595"/>
         <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="596"/>
         <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="597"/>
+        <source>Certificate has been revoked</source>
+        <translation>El certificado ha sido revocado</translation>
+    </message>
+    <message>
+        <location filename="../Controllers/MainController.cpp" line="598"/>
+        <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="608"/>
         <source>Certificate error</source>
         <translation>Error de certificado</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="490"/>
+        <location filename="../Controllers/MainController.cpp" line="615"/>
+        <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="628"/>
+        <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="634"/>
         <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="637"/>
         <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>
     </message>
@@ -530,6 +624,31 @@
         <source>There was an error publishing your profile data</source>
         <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>
     <name>ChatListModel</name>
@@ -685,15 +804,112 @@
         <translation>No se han encontrado salas</translation>
     </message>
     <message>
-        <location filename="../QtUI/EventViewer/QtEvent.cpp" line="63"/>
+        <location filename="../QtUI/EventViewer/QtEvent.cpp" line="68"/>
         <source>%1 would like to add you to their contact list.</source>
         <translation>%1 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="980"/>
+        <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="982"/>
+        <source>Reason: %1</source>
+        <translation>Motivo: %1</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="985"/>
+        <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>
     <name>QScrollBar</name>
@@ -917,43 +1133,92 @@
     </message>
 </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>
     <name>QtChatListWindow</name>
@@ -971,6 +1236,128 @@
     </message>
 </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>
         <source>Display Notice</source>
@@ -978,35 +1365,71 @@
     </message>
 </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>
     </message>
@@ -1014,32 +1437,27 @@
 <context>
     <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>
     </message>
@@ -1091,32 +1509,27 @@ Si escoges posponer esta elección, se te preguntará de nuevo la próxima vez q
 <context>
     <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>
     </message>
@@ -1124,32 +1537,27 @@ Si escoges posponer esta elección, se te preguntará de nuevo la próxima vez q
 <context>
     <name>QtUserSearchFirstPage</name>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchFirstPage.ui"/>
-        <location filename="../QtUI/UserSearch/ui_QtUserSearchFirstPage.h" line="121"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchFirstPage.ui" line="17"/>
         <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>
     </message>
@@ -1167,6 +1575,14 @@ Si escoges posponer esta elección, se te preguntará de nuevo la próxima vez q
     </message>
 </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>
         <source>Add Contact</source>
@@ -1200,8 +1616,7 @@ Si escoges posponer esta elección, se te preguntará de nuevo la próxima vez q
 <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>Buscar Usuario</translation>
     </message>
@@ -1209,11 +1624,21 @@ Si escoges posponer esta elección, se te preguntará de nuevo la próxima vez q
 <context>
     <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>
     <name>Swift::QtAboutWidget</name>
@@ -1251,6 +1676,57 @@ Si escoges posponer esta elección, se te preguntará de nuevo la próxima vez q
     </message>
 </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>
         <location filename="../QtUI/QtAvatarWidget.cpp" line="61"/>
@@ -1274,8 +1750,12 @@ Si escoges posponer esta elección, se te preguntará de nuevo la próxima vez q
     </message>
     <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>
         <location filename="../QtUI/QtAvatarWidget.cpp" line="95"/>
@@ -1306,75 +1786,370 @@ Si escoges posponer esta elección, se te preguntará de nuevo la próxima vez q
     </message>
 </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="906"/>
+        <source>Change subject…</source>
+        <translation>Cambiar el tema...</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="907"/>
+        <source>Configure room…</source>
+        <translation>Configurar sala...</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="908"/>
+        <source>Edit affiliations…</source>
+        <translation>Editar afiliaciones...</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="909"/>
+        <source>Destroy room</source>
+        <translation>Destruir la sala</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="910"/>
+        <source>Invite person to this room…</source>
+        <translation>Invitar a una persona a esta sala...</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="920"/>
+        <source>Change room subject</source>
+        <translation>Cambiar el tema de la sala</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="920"/>
+        <source>New subject:</source>
+        <translation>Nuevo tema:</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="938"/>
+        <source>Confirm room destruction</source>
+        <translation>Confirmar destrucción de la sala</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="939"/>
+        <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="940"/>
+        <source>This will destroy the room.</source>
+        <translation>Esto destruirá la sala.</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtChatWindow.cpp" line="991"/>
+        <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>
 <context>
     <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>
     </message>
@@ -1382,32 +2157,32 @@ Si escoges posponer esta elección, se te preguntará de nuevo la próxima vez q
 <context>
     <name>Swift::QtContactEditWindow</name>
     <message>
-        <location filename="../QtUI/QtContactEditWindow.cpp" line="26"/>
+        <location filename="../QtUI/QtContactEditWindow.cpp" line="28"/>
         <source>Edit contact</source>
         <translation>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>
     </message>
@@ -1415,15 +2190,50 @@ Si escoges posponer esta elección, se te preguntará de nuevo la próxima vez q
 <context>
     <name>Swift::QtEventWindow</name>
     <message>
-        <location filename="../QtUI/EventViewer/QtEventWindow.cpp" line="47"/>
+        <location filename="../QtUI/EventViewer/QtEventWindow.cpp" line="48"/>
         <source>Display Notice</source>
         <translation>Mostrar Aviso</translation>
     </message>
 </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>
     </message>
@@ -1431,123 +2241,145 @@ Si escoges posponer esta elección, se te preguntará de nuevo la próxima vez q
 <context>
     <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="355"/>
         <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>
         <translation>&amp;General</translation>
     </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="355"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="320"/>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="369"/>
+        <source>Confirm terms of use</source>
+        <translation>Confirmar condiciones de uso</translation>
+    </message>
+    <message>
+        <location filename="../QtUI/QtLoginWindow.cpp" line="412"/>
         <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="525"/>
         <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="526"/>
         <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>
 <context>
@@ -1562,68 +2394,103 @@ Si escoges posponer esta elección, se te preguntará de nuevo la próxima vez q
 <context>
     <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>
         <translation>C&amp;onversaciones</translation>
     </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"/>
+        <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="89"/>
+        <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="92"/>
+        <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="133"/>
         <source>&amp;Add Contact…</source>
         <translation>&amp;Añadir Contacto…</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="95"/>
+        <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"/>
+        <location filename="../QtUI/QtMainWindow.cpp" line="140"/>
         <source>Start &amp;Chat…</source>
-        <translation>Comenzar &amp;Conversación</translation>
+        <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>
         <translation type="obsolete">avisos2</translation>
@@ -1632,27 +2499,65 @@ Si escoges posponer esta elección, se te preguntará de nuevo la próxima vez q
 <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>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>
     </message>
 </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>
         <location filename="../QtUI/QtProfileWindow.cpp" line="24"/>
@@ -1671,6 +2576,58 @@ Si escoges posponer esta elección, se te preguntará de nuevo la próxima vez q
     </message>
 </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>
         <location filename="../QtUI/QtStatusWidget.cpp" line="231"/>
@@ -1678,7 +2635,7 @@ Si escoges posponer esta elección, se te preguntará de nuevo la próxima vez q
         <translation>Conectando</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtStatusWidget.cpp" line="263"/>
+        <location filename="../QtUI/QtStatusWidget.cpp" line="261"/>
         <source>(No message)</source>
         <translation>(Sin mensaje)</translation>
     </message>
@@ -1700,7 +2657,7 @@ Si escoges posponer esta elección, se te preguntará de nuevo la próxima vez q
         <location filename="../QtUI/QtSubscriptionRequestWindow.cpp" line="24"/>
         <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>
         <location filename="../QtUI/QtSubscriptionRequestWindow.cpp" line="25"/>
@@ -1713,12 +2670,12 @@ Si escoges posponer esta elección, se te preguntará de nuevo la próxima vez q
         <translation>Sí</translation>
     </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>
     </message>
@@ -1726,29 +2683,24 @@ Si escoges posponer esta elección, se te preguntará de nuevo la próxima vez q
 <context>
     <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>
         <source>New name for %1</source>
@@ -1758,7 +2710,7 @@ Si escoges posponer esta elección, se te preguntará de nuevo la próxima vez q
 <context>
     <name>Swift::QtUserSearchDetailsPage</name>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchDetailsPage.cpp" line="17"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchDetailsPage.cpp" line="22"/>
         <source>Please choose a name for the contact, and select the groups you want to add the contact to.</source>
         <translatorcomment>Somewhat free translation. TMPFIX?</translatorcomment>
         <translation>Por favor, escoge el nombre que le quieres dar al contacto, y selecciona los grupos a los que quieres añadirlo.</translation>
@@ -1785,37 +2737,37 @@ Si escoges posponer esta elección, se te preguntará de nuevo la próxima vez q
 <context>
     <name>Swift::QtUserSearchWindow</name>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="32"/>
+        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="35"/>
         <source>Add Contact</source>
         <translation>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>
     </message>
@@ -1823,10 +2775,28 @@ Si escoges posponer esta elección, se te preguntará de nuevo la próxima vez q
 <context>
     <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>
     <name>Swift::QtXMLConsoleWidget</name>
@@ -1851,12 +2821,12 @@ Si escoges posponer esta elección, se te preguntará de nuevo la próxima vez q
         <translation>Consola de Depuración</translation>
     </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>
     </message>
@@ -1867,7 +2837,7 @@ Si escoges posponer esta elección, se te preguntará de nuevo la próxima vez q
         <location filename="../QtUI/QtAboutWidget.cpp" line="49"/>
         <location filename="../QtUI/QtAboutWidget.cpp" line="50"/>
         <source>TRANSLATION_AUTHOR</source>
-        <translation>Jan Kusanagi</translation>
+        <translation>JanKusanagi</translation>
     </message>
     <message>
         <location filename="../QtUI/QtAboutWidget.cpp" line="52"/>