1 files changed, 46 insertions, 302 deletions
diff --git a/Swift/Translations/swift_nl.ts b/Swift/Translations/swift_nl.ts
index aa1b0fa..d7cabc2 100644
--- a/Swift/Translations/swift_nl.ts
+++ b/Swift/Translations/swift_nl.ts
@@ -5,513 +5,406 @@
 <context>
     <name></name>
     <message>
-        <location filename="../Controllers/Chat/ChatController.cpp" line="46"/>
         <source>Starting chat with %1% in chatroom %2%</source>
         <translation>Conversatie begonnen met %1% in kamer %2%</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatController.cpp" line="49"/>
         <source>Starting chat with %1% - %2%</source>
         <translation>Conversatie begonnen met %1% - %2%</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatController.cpp" line="119"/>
         <source>me</source>
         <translation>ik</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatController.cpp" line="160"/>
         <source>%1% has gone offline</source>
         <translation>%1% is offline gegaan</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatController.cpp" line="164"/>
         <source>%1% has become available</source>
         <translation>%1% is nu beschikbaar</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatController.cpp" line="166"/>
         <source>%1% has gone away</source>
         <translation>%1% is nu afwezig</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatController.cpp" line="168"/>
         <source>%1% is now busy</source>
         <translation>%1% is nu bezet</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="56"/>
         <source>The day is now %1%</source>
         <translation>De huidige dag is nu %1%</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="191"/>
         <source>Error sending message</source>
         <translation>Fout tijdens het versturen van bericht</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="197"/>
         <source>Bad request</source>
         <translation>Ongeldig verzoek</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="198"/>
         <source>Conflict</source>
         <translation>Conflict</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="199"/>
         <source>This feature is not implemented</source>
         <translation>Deze functie is niet geïmplementeerd</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="200"/>
         <source>Forbidden</source>
         <translation>Verboden</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="201"/>
         <source>Recipient can no longer be contacted</source>
         <translation>Begunstigde is onbereikbaar</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="202"/>
         <source>Internal server error</source>
         <translation>Interne serverfout</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="203"/>
         <source>Item not found</source>
         <translation>Element niet gevonden</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="204"/>
         <source>JID Malformed</source>
         <translation>JID misvormd</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="205"/>
         <source>Message was rejected</source>
         <translation>Bericht geweigerd</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="206"/>
         <source>Not allowed</source>
         <translation>Niet toegelaten</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="207"/>
         <source>Not authorized</source>
         <translation>Niet toegestaan</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="208"/>
         <source>Payment is required</source>
         <translation>Betaling is vereist</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="209"/>
         <source>Recipient is unavailable</source>
         <translation>Begunstigde is niet beschikbaar</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="210"/>
         <source>Redirect</source>
         <translation>Omleiding</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="211"/>
         <source>Registration required</source>
         <translation>Registratie vereist</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="212"/>
         <source>Recipient&apos;s server not found</source>
         <translation>Server begunstigde niet gevonden</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="213"/>
         <source>Remote server timeout</source>
         <translation>Server time-out</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="214"/>
         <source>The server is low on resources</source>
         <translation>De server heeft een tekort aan bronnen</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="215"/>
         <source>The service is unavailable</source>
         <translation>De server is niet beschikbaar</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="216"/>
         <source>A subscription is required</source>
         <translation>Inschrijving is vereist</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="217"/>
         <source>Undefined condition</source>
         <translation>Onbekende fout</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/ChatControllerBase.cpp" line="218"/>
         <source>Unexpected request</source>
         <translation>Onverwacht verzoek</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="114"/>
         <source>Room %1% is not responding. This operation may never complete.</source>
         <translation>Kamer %1% antwoordt niet. Deze operatie kan mogelijk nooit voltooien.</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="135"/>
         <source>No nickname specified</source>
         <translation>Geen roepnaam gespecifieerd</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="139"/>
         <source>A password needed</source>
         <translation>Wachtwoord vereist</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="147"/>
         <source>You are banned from the room</source>
         <translation>U bent verbannen uit de kamer</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="151"/>
         <source>The room is full</source>
         <translation>De kamer is vol</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="155"/>
         <source>The room does not exist</source>
         <translation>Deze kamer bestaat niet</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="125"/>
         <source>Unable to enter this room</source>
         <translation>Kan deze kamer niet betreden</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="131"/>
         <source>Unable to enter this room as %1%, retrying as %2%</source>
         <translation>Kan deze kamer niet betreden als %1%; als %2% opniew aan het proberen</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="143"/>
         <source>Only members may enter</source>
         <translation>Enkel leden mogen deze kamer betreden</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="214"/>
+        <source>You have entered room %1% as %2%.</source>
+        <translation>U heeft de kamer %1% als %2% betreden.</translation>
+    </message>
+    <message>
         <source>%1% has entered the room as a %2%.</source>
         <translation>%1% heeft de kamer betreden als %2%.</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="217"/>
         <source>%1% has entered the room.</source>
         <translation>%1% heeft de kamer betreden.</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="243"/>
         <source>moderator</source>
         <translation>moderator</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="244"/>
         <source>participant</source>
         <translation>deelnemer</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="245"/>
         <source>visitor</source>
         <translation>bezoeker</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="283"/>
         <source>The room subject is now: %1%</source>
         <translation>Het onderwerp van deze kamer is nu: %1%</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="313"/>
         <source>%1% is now a %2%</source>
         <translation>%1% is nu een %2%</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="319"/>
         <source>Moderators</source>
         <translation>Moderators</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="320"/>
         <source>Participants</source>
         <translation>Deelnemers</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="321"/>
         <source>Visitors</source>
         <translation>Bezoekers</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="322"/>
         <source>Occupants</source>
         <translation>Bewoners</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="336"/>
         <source>Trying to enter room %1%</source>
         <translation>Aan het proberen om de kamer %1% te betreden</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="487"/>
         <source>%1% have left then returned to the room</source>
         <translation>%1% hebben de kamer verlaten en terug betreden</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="490"/>
         <source>%1% has left then returned to the room</source>
         <translation>%1% heeft de kamer verlaten en terug betreden</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="365"/>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="474"/>
         <source>%1% has left the room</source>
         <translation>%1% heeft de kamer verlaten</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="173"/>
-        <source>You have entered room %1% as a %2%.</source>
-        <translation>U heeft de kamer %1% als %2% betreden.</translation>
-    </message>
-    <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="365"/>
         <source>You have left the room</source>
         <translation>U heeft de kamer verlaten</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="439"/>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="503"/>
         <source> and </source>
         <translation> en </translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="463"/>
         <source>%1% have entered the room</source>
         <translation>%1% hebben de kamer betreden</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="466"/>
         <source>%1% has entered the room</source>
         <translation>%1% heeft de kamer betreden</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="479"/>
         <source>%1% have entered then left the room</source>
         <translation>%1% hebben de kamer betreden en terug verlaten</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="482"/>
         <source>%1% has entered then left the room</source>
         <translation>%1% heeft de kamer betreden en terug verlaten</translation>
     </message>
     <message>
-        <location filename="../Controllers/Chat/MUCController.cpp" line="471"/>
         <source>%1% have left the room</source>
         <translation>%1% hebben de kamer verlaten</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="438"/>
         <source>Unknown Error</source>
         <translation>Onbekende fout</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="439"/>
         <source>Unable to find server</source>
         <translation>Kan server niet vinden</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="440"/>
         <source>Error connecting to server</source>
         <translation>Fout tijdens het verbinden met de server</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="441"/>
         <source>Error while receiving server data</source>
         <translation>Fout tijdens het ontvangen van gegevens</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="442"/>
         <source>Error while sending data to the server</source>
         <translation>Fout tijdens het verzenden van gegevens</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="443"/>
         <source>Error parsing server data</source>
         <translation>Fout tijdens het ontleden van gegevens</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="444"/>
         <source>Login/password invalid</source>
         <translation>Gebruikersnaam/wachtwoord ongeldig</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="445"/>
         <source>Error while compressing stream</source>
         <translation>Fout tijdens het comprimeren</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="446"/>
         <source>Server verification failed</source>
         <translation>Serververificatie gefaald</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="447"/>
         <source>Authentication mechanisms not supported</source>
         <translation>Authenticatiemechanismen niet ondersteund</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="448"/>
         <source>Unexpected response</source>
         <translation>Onverwacht antwoord</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="449"/>
         <source>Error binding resource</source>
         <translation>Fout tijdens het binden van de resource</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="450"/>
         <source>Error starting session</source>
         <translation>Fout bij het starten van de sessie</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="451"/>
         <source>Stream error</source>
         <translation>Stroomfout</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="452"/>
         <source>Encryption error</source>
         <translation>Beveiligingsfout</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="453"/>
         <source>Error loading certificate (Invalid password?)</source>
         <translation>Fout bij het laden van het certificaat (Ongeldig wachtwoord?)</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="454"/>
         <source>Certificate not authorized</source>
         <translation>Certificaat heeft geen toestemming</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="456"/>
         <source>Unknown certificate</source>
         <translation>Onbekend certificaat</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="457"/>
         <source>Certificate has expired</source>
         <translation>Certificaat is verstreken</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="458"/>
         <source>Certificate is not yet valid</source>
         <translation>Certificaat is nog niet geldig</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="459"/>
         <source>Certificate is self-signed</source>
         <translation>Certificaat is zelfondertekend</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="460"/>
         <source>Certificate has been rejected</source>
         <translation>Certificaat werd afgewezen</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="461"/>
         <source>Certificate is not trusted</source>
         <translation>Certificaat wordt niet vertrouwd</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="462"/>
         <source>Certificate cannot be used for encrypting your connection</source>
         <translation>Certificaat kan niet gebruikt worden om verbinding te beveiligen</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="463"/>
         <source>Certificate path length constraint exceeded</source>
         <translation>Padlengte certificaat overschreden</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="464"/>
         <source>Invalid certificate signature</source>
         <translation>Certificaat heeft ongeldige handtekening</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="465"/>
         <source>Invalid Certificate Authority</source>
         <translation>Ongeldige certificeringsinstantie</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="466"/>
         <source>Certificate does not match the host identity</source>
         <translation>Certificaat komt niet overeen met identiteit</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="476"/>
         <source>Certificate error</source>
         <translation>Certificaatfout</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="490"/>
         <source>Reconnect to %1% failed: %2%. Will retry in %3% seconds.</source>
         <translation>Herverbinding met %1% mislukt: %2%. Zal opnieuw proberen binnen %3% seconden.</translation>
     </message>
     <message>
-        <location filename="../Controllers/MainController.cpp" line="493"/>
         <source>Disconnected from %1%: %2%.</source>
         <translation>Verbinding met %1% verbroken: %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"/>
         <source>Contacts</source>
         <translation>Contacten</translation>
     </message>
     <message>
-        <location filename="../Controllers/Roster/RosterController.cpp" line="251"/>
         <source>Server %1% rejected contact list change to item &apos;%2%&apos;</source>
         <translation>Server %1% heeft de aanpassing van contact &apos;%2&apos; geweigerd</translation>
     </message>
     <message>
-        <location filename="../Controllers/StatusUtil.cpp" line="15"/>
-        <location filename="../Controllers/StatusUtil.cpp" line="16"/>
         <source>Available</source>
         <translation>Beschikbaar</translation>
     </message>
     <message>
-        <location filename="../Controllers/StatusUtil.cpp" line="17"/>
-        <location filename="../Controllers/StatusUtil.cpp" line="18"/>
         <source>Away</source>
         <translation>Afwezig</translation>
     </message>
     <message>
-        <location filename="../Controllers/StatusUtil.cpp" line="19"/>
         <source>Busy</source>
         <translation>Bezet</translation>
     </message>
     <message>
-        <location filename="../Controllers/StatusUtil.cpp" line="20"/>
         <source>Offline</source>
         <translation>Offline</translation>
     </message>
     <message>
-        <location filename="../Controllers/EventNotifier.cpp" line="54"/>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
@@ -519,7 +412,6 @@
 <context>
     <name>QApplication</name>
     <message>
-        <location filename="../QtUI/QtStrings.h" line="17"/>
         <source>QT_LAYOUT_DIRECTION</source>
         <comment>Translate this to LTR for left-to-right or RTL for right-to-left languages</comment>
         <translation>LTR</translation>
@@ -528,20 +420,33 @@
 <context>
     <name>QDialogButtonBox</name>
     <message>
-        <location filename="../QtUI/QtStrings.h" line="32"/>
         <source>&amp;Yes</source>
         <translation>&amp;Ja</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtStrings.h" line="33"/>
         <source>&amp;No</source>
         <translation>&amp;Nee</translation>
     </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation>&amp;OK</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <source>&amp;Cancel</source>
+        <translation>&amp;Annuleren</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Annuleren</translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../QtUI/MUCSearch/MUCSearchEmptyItem.cpp" line="25"/>
         <source>No rooms found</source>
         <translation>Geen kamers gevonden</translation>
     </message>
@@ -549,62 +454,50 @@
 <context>
     <name>QWizard</name>
     <message>
-        <location filename="../QtUI/QtStrings.h" line="19"/>
         <source>&lt; &amp;Back</source>
         <translation>&lt; &amp;Terug</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtStrings.h" line="20"/>
         <source>&amp;Finish</source>
         <translation>&amp;Beëindigen</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtStrings.h" line="21"/>
         <source>&amp;Help</source>
         <translation>&amp;Help</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtStrings.h" line="22"/>
         <source>Go Back</source>
         <translation>Terug</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtStrings.h" line="23"/>
         <source>Continue</source>
         <translation>Verder</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtStrings.h" line="24"/>
         <source>Commit</source>
         <translation>Bevestig</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtStrings.h" line="25"/>
         <source>Done</source>
         <translation>Klaar</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtStrings.h" line="26"/>
         <source>Quit</source>
         <translation>Afsluiten</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtStrings.h" line="27"/>
         <source>Help</source>
         <translation>Help</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtStrings.h" line="28"/>
         <source>Cancel</source>
         <translation>Annuleren</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtStrings.h" line="29"/>
         <source>&amp;Next</source>
         <translation>&amp;Volgende</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtStrings.h" line="30"/>
         <source>&amp;Next &gt;</source>
         <translation>&amp;Volgende &gt;</translation>
     </message>
@@ -612,38 +505,26 @@
 <context>
     <name>QtBookmarkDetailWindow</name>
     <message>
-        <location filename="../QtUI/QtBookmarkDetailWindow.ui"/>
-        <location filename="../QtUI/ui_QtBookmarkDetailWindow.h" line="137"/>
         <source>Edit Bookmark Details</source>
         <translation>Bladwijzerdetails aanpassen</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtBookmarkDetailWindow.ui"/>
-        <location filename="../QtUI/ui_QtBookmarkDetailWindow.h" line="138"/>
         <source>Bookmark Name:</source>
         <translation>Naam bladwijzer:</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtBookmarkDetailWindow.ui"/>
-        <location filename="../QtUI/ui_QtBookmarkDetailWindow.h" line="140"/>
         <source>Your Nickname:</source>
         <translation>Uw roepnaam:</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtBookmarkDetailWindow.ui"/>
-        <location filename="../QtUI/ui_QtBookmarkDetailWindow.h" line="141"/>
         <source>Room password:</source>
         <translation>Wachtwoord kamer:</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtBookmarkDetailWindow.ui"/>
-        <location filename="../QtUI/ui_QtBookmarkDetailWindow.h" line="142"/>
         <source>Join automatically</source>
         <translation>Automatisch betreden</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtBookmarkDetailWindow.ui"/>
-        <location filename="../QtUI/ui_QtBookmarkDetailWindow.h" line="139"/>
         <source>Room Address:</source>
         <translation>Adres kamer:</translation>
     </message>
@@ -651,33 +532,22 @@
 <context>
     <name>QtJoinMUCWindow</name>
     <message>
-        <location filename="../QtUI/QtJoinMUCWindow.ui"/>
-        <location filename="../QtUI/ui_QtJoinMUCWindow.h" line="125"/>
         <source>Room:</source>
         <translation>Kamer:</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtJoinMUCWindow.ui"/>
-        <location filename="../QtUI/ui_QtJoinMUCWindow.h" line="126"/>
         <source>Search ...</source>
         <translation>Zoek ...</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtJoinMUCWindow.ui"/>
-        <location filename="../QtUI/ui_QtJoinMUCWindow.h" line="127"/>
         <source>Nickname:</source>
         <translation>Roepnaam:</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtJoinMUCWindow.ui"/>
-        <location filename="../QtUI/ui_QtJoinMUCWindow.h" line="124"/>
-        <location filename="../QtUI/ui_QtJoinMUCWindow.h" line="130"/>
         <source>Enter Room</source>
         <translation>Kamer betreden</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtJoinMUCWindow.ui"/>
-        <location filename="../QtUI/ui_QtJoinMUCWindow.h" line="129"/>
         <source>Enter automatically in future</source>
         <translation>Automatisch betreden</translation>
     </message>
@@ -685,65 +555,45 @@
 <context>
     <name>QtMUCSearchWindow</name>
     <message>
-        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.ui"/>
-        <location filename="../QtUI/MUCSearch/ui_QtMUCSearchWindow.h" line="118"/>
         <source>Search Room</source>
         <translation>Zoek kamer</translation>
     </message>
     <message>
-        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.ui"/>
-        <location filename="../QtUI/MUCSearch/ui_QtMUCSearchWindow.h" line="119"/>
         <source>Service:</source>
         <translation>Dienst:</translation>
     </message>
     <message>
-        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.ui"/>
-        <location filename="../QtUI/MUCSearch/ui_QtMUCSearchWindow.h" line="121"/>
         <source>Cancel</source>
         <translation>Annuleren</translation>
     </message>
     <message>
-        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.ui"/>
-        <location filename="../QtUI/MUCSearch/ui_QtMUCSearchWindow.h" line="122"/>
-        <source>Ok</source>
-        <translation>Ok</translation>
-    </message>
-    <message>
-        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.ui"/>
-        <location filename="../QtUI/MUCSearch/ui_QtMUCSearchWindow.h" line="123"/>
         <source>List rooms</source>
         <translation>Kamers ophalen</translation>
     </message>
+    <message>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
 </context>
 <context>
     <name>QtUserSearchFieldsPage</name>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchFieldsPage.ui"/>
-        <location filename="../QtUI/UserSearch/ui_QtUserSearchFieldsPage.h" line="119"/>
         <source>Nickname:</source>
         <translation>Roepnaam:</translation>
     </message>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchFieldsPage.ui"/>
-        <location filename="../QtUI/UserSearch/ui_QtUserSearchFieldsPage.h" line="120"/>
         <source>First name:</source>
         <translation>Voornaam:</translation>
     </message>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchFieldsPage.ui"/>
-        <location filename="../QtUI/UserSearch/ui_QtUserSearchFieldsPage.h" line="121"/>
         <source>Last name:</source>
         <translation>Familienaam:</translation>
     </message>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchFieldsPage.ui"/>
-        <location filename="../QtUI/UserSearch/ui_QtUserSearchFieldsPage.h" line="122"/>
         <source>E-Mail:</source>
         <translation>E-Mail:</translation>
     </message>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchFieldsPage.ui"/>
-        <location filename="../QtUI/UserSearch/ui_QtUserSearchFieldsPage.h" line="124"/>
         <source>Fetching search fields</source>
         <translation>Gegevens aan het ophalen</translation>
     </message>
@@ -751,32 +601,22 @@
 <context>
     <name>QtUserSearchFirstPage</name>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchFirstPage.ui"/>
-        <location filename="../QtUI/UserSearch/ui_QtUserSearchFirstPage.h" line="121"/>
         <source>Add a user</source>
         <translation>Gebruiker toevoegen</translation>
     </message>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchFirstPage.ui"/>
-        <location filename="../QtUI/UserSearch/ui_QtUserSearchFirstPage.h" line="122"/>
         <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>Voeg een andere gebruiker aan je contactlijst toe. Indien u zijn/haar JID kent kan u hem/haar onmiddelijk toevoegen; anders kan u hem/haar zoeken.</translation>
     </message>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchFirstPage.ui"/>
-        <location filename="../QtUI/UserSearch/ui_QtUserSearchFirstPage.h" line="125"/>
         <source>I&apos;d like to search my server</source>
         <translation>Ik wil mijn server doorzoeken</translation>
     </message>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchFirstPage.ui"/>
-        <location filename="../QtUI/UserSearch/ui_QtUserSearchFirstPage.h" line="126"/>
         <source>I&apos;d like to search another server:</source>
         <translation>Ik wil een andere server doorzoeken:</translation>
     </message>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchFirstPage.ui"/>
-        <location filename="../QtUI/UserSearch/ui_QtUserSearchFirstPage.h" line="124"/>
         <source>I know their address:</source>
         <translation>Ik ken het adres:</translation>
     </message>
@@ -784,8 +624,6 @@
 <context>
     <name>QtUserSearchWizard</name>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchWizard.ui"/>
-        <location filename="../QtUI/UserSearch/ui_QtUserSearchWizard.h" line="39"/>
         <source>Find User</source>
         <translation>Zoek gebruiker</translation>
     </message>
@@ -793,7 +631,6 @@
 <context>
     <name>Swift::ChatListModel</name>
     <message>
-        <location filename="../QtUI/ChatList/ChatListModel.cpp" line="15"/>
         <source>Bookmarked Rooms</source>
         <translation>Bladwijzers</translation>
     </message>
@@ -801,27 +638,28 @@
 <context>
     <name>Swift::QtAboutWidget</name>
     <message>
-        <location filename="../QtUI/QtAboutWidget.cpp" line="23"/>
         <source>About %1</source>
         <translation>Over %1</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtAboutWidget.cpp" line="40"/>
         <source>Version %1</source>
         <translation>Versie %1</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtAboutWidget.cpp" line="42"/>
         <source>Built with Qt %1</source>
         <translation>Gebouwd met Qt %1</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtAboutWidget.cpp" line="43"/>
         <source>Running with Qt %1</source>
         <translation>Actief met Qt %1</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtAboutWidget.cpp" line="48"/>
+        <source>Using the English translation by
+%1</source>
+        <translation>Nederlandse vertaling door
+%1</translation>
+    </message>
+    <message>
         <source>View License</source>
         <translation>Bekijk Licentie</translation>
     </message>
@@ -829,38 +667,31 @@
 <context>
     <name>Swift::QtAvatarWidget</name>
     <message>
-        <location filename="../QtUI/QtAvatarWidget.cpp" line="61"/>
         <source>No picture</source>
         <translation>Geen
 afbeelding</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtAvatarWidget.cpp" line="73"/>
         <source>Select picture ...</source>
         <translation>Selecteer afbeelding ...</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtAvatarWidget.cpp" line="76"/>
         <source>Clear picture</source>
         <translation>Verwijder afbeelding</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtAvatarWidget.cpp" line="81"/>
         <source>Select picture</source>
         <translation>Selecteer afbeelding</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtAvatarWidget.cpp" line="81"/>
         <source>Image Files (*.png *.jpg *.gif)</source>
         <translation>Afbeeldingen (*.png *.jpg *.gif)</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtAvatarWidget.cpp" line="95"/>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtAvatarWidget.cpp" line="95"/>
         <source>The selected picture is in an unrecognized format</source>
         <translation>Het formaat van de geselecteerde afbeelding werd niet herkend</translation>
     </message>
@@ -868,12 +699,10 @@ afbeelding</translation>
 <context>
     <name>Swift::QtBookmarkDetailWindow</name>
     <message>
-        <location filename="../QtUI/QtBookmarkDetailWindow.cpp" line="31"/>
         <source>Bookmark not valid</source>
         <translation>Bladwijzer ongeldig</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtBookmarkDetailWindow.cpp" line="31"/>
         <source>You must specify a valid room address (e.g. myroom@chats.example.com).</source>
         <translation>Specifieer een geldige kamer (bv. mijnkamer@kamers.voorbeeld.com).</translation>
     </message>
@@ -881,18 +710,14 @@ afbeelding</translation>
 <context>
     <name>Swift::QtChatListWindow</name>
     <message>
-        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="62"/>
-        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="66"/>
         <source>Add New Bookmark</source>
         <translation>Voeg bladwijzer toe</translation>
     </message>
     <message>
-        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="63"/>
         <source>Edit Bookmark</source>
         <translation>Bewerk bladwijzer</translation>
     </message>
     <message>
-        <location filename="../QtUI/ChatList/QtChatListWindow.cpp" line="64"/>
         <source>Remove Bookmark</source>
         <translation>Verwijder bladwijzer</translation>
     </message>
@@ -900,17 +725,14 @@ afbeelding</translation>
 <context>
     <name>Swift::QtChatView</name>
     <message>
-        <location filename="../QtUI/QtChatView.cpp" line="61"/>
         <source>Clear log</source>
         <translation>Wis inhoud</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtChatView.cpp" line="62"/>
         <source>You are about to clear the contents of your chat log.</source>
         <translation>De inhoud van dit venster zal gewist worden.</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtChatView.cpp" line="63"/>
         <source>Are you sure?</source>
         <translation>Bent u zeker?</translation>
     </message>
@@ -918,17 +740,14 @@ afbeelding</translation>
 <context>
     <name>Swift::QtChatWindow</name>
     <message>
-        <location filename="../QtUI/QtChatWindow.cpp" line="302"/>
         <source>This message has not been received by your server yet.</source>
         <translation>Deze boodschap werd nog niet door uw server ontvangen.</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtChatWindow.cpp" line="304"/>
         <source>This message may not have been transmitted.</source>
         <translation>Dit bericht kan mogelijk niet verzonden zijn.</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtChatWindow.cpp" line="324"/>
         <source>Couldn&apos;t send message: %1</source>
         <translation>Kon boodschap niet verzenden: %1</translation>
     </message>
@@ -936,17 +755,14 @@ afbeelding</translation>
 <context>
     <name>Swift::QtContactEditWidget</name>
     <message>
-        <location filename="../QtUI/QtContactEditWidget.cpp" line="28"/>
         <source>Name:</source>
         <translation>Naam:</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtContactEditWidget.cpp" line="34"/>
         <source>Groups:</source>
         <translation>Groepen:</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtContactEditWidget.cpp" line="56"/>
         <source>New Group:</source>
         <translation>Nieuwe groep:</translation>
     </message>
@@ -954,32 +770,26 @@ afbeelding</translation>
 <context>
     <name>Swift::QtContactEditWindow</name>
     <message>
-        <location filename="../QtUI/QtContactEditWindow.cpp" line="26"/>
         <source>Edit contact</source>
         <translation>Contact bewerken</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtContactEditWindow.cpp" line="41"/>
         <source>Remove contact</source>
         <translation>Contact verwijderen</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtContactEditWindow.cpp" line="44"/>
-        <source>Ok</source>
-        <translation>Ok</translation>
+        <source>OK</source>
+        <translation>OK</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtContactEditWindow.cpp" line="82"/>
         <source>Confirm contact deletion</source>
         <translation>Bevestig verwijderen van contact</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtContactEditWindow.cpp" line="83"/>
         <source>Are you sure you want to delete this contact?</source>
         <translation>Bent u zeker dat u diet contact wil verwijderen?</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtContactEditWindow.cpp" line="84"/>
         <source>This will remove the contact &apos;%1&apos; from all groups they may be in.</source>
         <translation>Dit zal het contact &apos;%1&apos; uit alle groepen verwijderen.</translation>
     </message>
@@ -987,7 +797,6 @@ afbeelding</translation>
 <context>
     <name>Swift::QtEventWindow</name>
     <message>
-        <location filename="../QtUI/EventViewer/QtEventWindow.cpp" line="47"/>
         <source>Display Notice</source>
         <translation>Toon bericht</translation>
     </message>
@@ -995,120 +804,94 @@ afbeelding</translation>
 <context>
     <name>Swift::QtLoginWindow</name>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="81"/>
         <source>User address:</source>
         <translation>Gebruikersadres:</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="86"/>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="87"/>
         <source>User address - looks like someuser@someserver.com</source>
         <translation>Gebruikersadres (van de vorm &apos;iemand@ergens.com&apos;)</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="91"/>
         <source>Example: alice@wonderland.lit</source>
         <translation>Voorbeeld: alice@wonderland.lit</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="97"/>
         <source>Password:</source>
         <translation>Wachtwoord:</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="118"/>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="119"/>
         <source>Click if you have a personal certificate used for login to the service.</source>
         <translation>Klik hier indien u een persoonlijk certificaat gekregen heeft om in te loggen.</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="125"/>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="299"/>
         <source>Connect</source>
         <translation>Verbinden</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="136"/>
         <source>Remember Password?</source>
         <translation>Wachtwoord onthouden?</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="138"/>
         <source>Login Automatically?</source>
         <translation>Automatisch inloggen?</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="150"/>
         <source>&amp;Swift</source>
         <translation>&amp;Swift</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="152"/>
         <source>&amp;General</source>
         <translation>&amp;Algemeen</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="160"/>
         <source>&amp;About %1</source>
         <translation>&amp;Over %1</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="165"/>
         <source>&amp;Show Debug Console</source>
         <translation>Toon &amp;debug console</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="169"/>
         <source>&amp;Play Sounds</source>
         <translation>&amp;Geluid aan</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="175"/>
         <source>Display Pop-up &amp;Notifications</source>
         <translation>Toon &amp;schermboodschappen</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="190"/>
         <source>&amp;Quit</source>
         <translation>&amp;Afsluiten</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="205"/>
         <source>Remove profile</source>
         <translation>Verwijder profiel</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="205"/>
         <source>Remove the profile &apos;%1&apos;?</source>
         <translation>Profiel &apos;%1&apos; verwijderen?</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="299"/>
         <source>Cancel</source>
         <translation>Annuleren</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="320"/>
         <source>Select an authentication certificate</source>
         <translation>Selecteer een authenticatiecertificaat</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="420"/>
         <source>The certificate presented by the server is not valid.</source>
         <translation>Het certificaat aangeboden door de server is ongeldig.</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="421"/>
         <source>Would you like to permanently trust this certificate? This must only be done if you know it is correct.</source>
         <translation>Wilt u dit certificaat permanent vertrouwen? Dit mag enkel gedaan worden als u zeker bent dat het certificaat juist is.</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="423"/>
         <source>Subject: %1</source>
         <translation>Onderwerp: %1</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtLoginWindow.cpp" line="424"/>
         <source>SHA-1 Fingerprint: %1</source>
         <translation>SHA-1 vingerafdruk: %1</translation>
     </message>
@@ -1116,8 +899,6 @@ afbeelding</translation>
 <context>
     <name>Swift::QtMUCSearchWindow</name>
     <message>
-        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.cpp" line="49"/>
-        <location filename="../QtUI/MUCSearch/QtMUCSearchWindow.cpp" line="51"/>
         <source>Searching</source>
         <translation>Aan het zoeken</translation>
     </message>
@@ -1125,67 +906,54 @@ afbeelding</translation>
 <context>
     <name>Swift::QtMainWindow</name>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="64"/>
         <source>&amp;Contacts</source>
         <translation>&amp;Contacten</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="71"/>
         <source>&amp;Notices</source>
         <translation>&amp;Berichten</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="72"/>
         <source>C&amp;hats</source>
         <translation>C&amp;onversaties</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="76"/>
         <source>&amp;View</source>
         <translation>&amp;Beeld</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="84"/>
         <source>&amp;Actions</source>
         <translation>&amp;Acties</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="78"/>
         <source>&amp;Show offline contacts</source>
         <translation>&amp;Toon offline contacten</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="86"/>
         <source>&amp;Edit Profile</source>
         <translation>&amp;Bewerk profiel</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="89"/>
         <source>&amp;Enter Room</source>
         <translation>&amp;Kamer betreden</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="92"/>
         <source>&amp;Add Contact</source>
         <translation>Contact &amp;toevoegen</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="95"/>
         <source>&amp;Edit Selected Contact</source>
         <translation>Geselecteerde Contact &amp;Bewerken</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="99"/>
         <source>Start &amp;Chat</source>
         <translation>&amp;Conversatie starten</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="103"/>
         <source>&amp;Sign Out</source>
         <translation>&amp;Afmelden</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtMainWindow.cpp" line="137"/>
         <source>Notices</source>
         <translation>Berichten</translation>
     </message>
@@ -1193,22 +961,18 @@ afbeelding</translation>
 <context>
     <name>Swift::QtNameWidget</name>
     <message>
-        <location filename="../QtUI/QtNameWidget.cpp" line="47"/>
         <source>(No Nickname Set)</source>
         <translation>(Geen roepnaam ingesteld)</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtNameWidget.cpp" line="47"/>
         <source>Show Nickname</source>
         <translation>Toon roepnaam</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtNameWidget.cpp" line="55"/>
         <source>Show Address</source>
         <translation>Toon gebruikersadres</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtNameWidget.cpp" line="62"/>
         <source>Edit Profile</source>
         <translation>Bewerk profiel</translation>
     </message>
@@ -1216,17 +980,14 @@ afbeelding</translation>
 <context>
     <name>Swift::QtProfileWindow</name>
     <message>
-        <location filename="../QtUI/QtProfileWindow.cpp" line="24"/>
         <source>Edit Profile</source>
         <translation>Bewerk profiel</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtProfileWindow.cpp" line="43"/>
         <source>Nickname:</source>
         <translation>Roepnaam:</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtProfileWindow.cpp" line="67"/>
         <source>Save</source>
         <translation>Bewaar</translation>
     </message>
@@ -1234,12 +995,10 @@ afbeelding</translation>
 <context>
     <name>Swift::QtStatusWidget</name>
     <message>
-        <location filename="../QtUI/QtStatusWidget.cpp" line="231"/>
         <source>Connecting</source>
         <translation>Aan het verbinden</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtStatusWidget.cpp" line="263"/>
         <source>(No message)</source>
         <translation>(Geen boodschap)</translation>
     </message>
@@ -1247,27 +1006,22 @@ afbeelding</translation>
 <context>
     <name>Swift::QtSubscriptionRequestWindow</name>
     <message>
-        <location filename="../QtUI/QtSubscriptionRequestWindow.cpp" line="24"/>
         <source>You have already replied to this request</source>
         <translation>Dit verzoek is reeds beantwoord</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtSubscriptionRequestWindow.cpp" line="25"/>
-        <source>Ok</source>
-        <translation>Ok</translation>
+        <source>OK</source>
+        <translation>OK</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtSubscriptionRequestWindow.cpp" line="30"/>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtSubscriptionRequestWindow.cpp" line="32"/>
         <source>No</source>
         <translation>Neen</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtSubscriptionRequestWindow.cpp" line="34"/>
         <source>Defer</source>
         <translation>Uitstellen</translation>
     </message>
@@ -1275,27 +1029,22 @@ afbeelding</translation>
 <context>
     <name>Swift::QtTreeWidget</name>
     <message>
-        <location filename="../QtUI/Roster/QtTreeWidget.cpp" line="144"/>
         <source>Edit</source>
         <translation>Bewerk</translation>
     </message>
     <message>
-        <location filename="../QtUI/Roster/QtTreeWidget.cpp" line="145"/>
         <source>Remove</source>
         <translation>Verwijder</translation>
     </message>
     <message>
-        <location filename="../QtUI/Roster/QtTreeWidget.cpp" line="157"/>
         <source>Rename</source>
         <translation>Naam wijzigen</translation>
     </message>
     <message>
-        <location filename="../QtUI/Roster/QtTreeWidget.cpp" line="167"/>
         <source>Rename group</source>
         <translation>Groepsnaam wijzigen</translation>
     </message>
     <message>
-        <location filename="../QtUI/Roster/QtTreeWidget.cpp" line="167"/>
         <source>New name for %1</source>
         <translation>Niewe naam voor %1</translation>
     </message>
@@ -1303,7 +1052,6 @@ afbeelding</translation>
 <context>
     <name>Swift::QtUserSearchDetailsPage</name>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchDetailsPage.cpp" line="17"/>
         <source>Please choose a name for the contact, and select the groups you want to add the contact to.</source>
         <translation>Kies een naam voor het contact, en selecteer de groepen waar het contact moet toegevoegd worden.</translation>
     </message>
@@ -1311,17 +1059,14 @@ afbeelding</translation>
 <context>
     <name>Swift::QtUserSearchFirstPage</name>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchFirstPage.cpp" line="16"/>
         <source>Chat to another user</source>
         <translation>Start conversatie met andere gebruiker</translation>
     </message>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchFirstPage.cpp" line="16"/>
         <source>%1. If you know their address you can enter it directly, or you can search for them.</source>
         <translation>%1. Indien u het adres kent kan u dit rechtstreeks invoeren, anders kan u het adres opzoeken.</translation>
     </message>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchFirstPage.cpp" line="16"/>
         <source>Add another user to your contact list</source>
         <translation>Voeg een andere gebruiker toe aan uw contactenlijst</translation>
     </message>
@@ -1329,32 +1074,26 @@ afbeelding</translation>
 <context>
     <name>Swift::QtUserSearchWindow</name>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="32"/>
         <source>Add Contact</source>
         <translation>Contact toevoegen</translation>
     </message>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="32"/>
         <source>Chat to User</source>
         <translation>Start conversatie met gebruiker</translation>
     </message>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="223"/>
         <source>How would you like to find the user to add?</source>
         <translation>Hoe wilt u de gebruiker toevoegen?</translation>
     </message>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="226"/>
         <source>How would you like to find the user to chat to?</source>
         <translation>Hoe wilt u de gebruiker contacteren?</translation>
     </message>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="251"/>
         <source>Error while searching</source>
         <translation>Fout tijdens zoeken</translation>
     </message>
     <message>
-        <location filename="../QtUI/UserSearch/QtUserSearchWindow.cpp" line="257"/>
         <source>This server doesn&apos;t support searching for users.</source>
         <translation>Deze server ondersteunt het zoeken van gebruikers niet.</translation>
     </message>
@@ -1362,7 +1101,6 @@ afbeelding</translation>
 <context>
     <name>Swift::QtWebView</name>
     <message>
-        <location filename="../QtUI/QtWebView.cpp" line="61"/>
         <source>Clear</source>
         <translation>Wissen</translation>
     </message>
@@ -1370,34 +1108,40 @@ afbeelding</translation>
 <context>
     <name>Swift::QtXMLConsoleWidget</name>
     <message>
-        <location filename="../QtUI/QtXMLConsoleWidget.cpp" line="22"/>
         <source>Console</source>
         <translation>Console</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtXMLConsoleWidget.cpp" line="40"/>
         <source>Trace input/output</source>
         <translation>Toon invoer/uitvoer</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtXMLConsoleWidget.cpp" line="46"/>
         <source>Clear</source>
         <translation>Wissen</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtXMLConsoleWidget.cpp" line="50"/>
         <source>Debug Console</source>
         <translation>Debug console</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtXMLConsoleWidget.cpp" line="75"/>
         <source>&lt;!-- IN --&gt;</source>
         <translation>&lt;!-- IN --&gt;</translation>
     </message>
     <message>
-        <location filename="../QtUI/QtXMLConsoleWidget.cpp" line="79"/>
         <source>&lt;!-- OUT --&gt;</source>
         <translation>&lt;!-- UIT --&gt;</translation>
     </message>
 </context>
+<context>
+    <name>TRANSLATION_INFO</name>
+    <message>
+        <source>TRANSLATION_AUTHOR</source>
+        <translation>Remko Tronçon</translation>
+    </message>
+    <message>
+        <source>TRANSLATION_LICENSE</source>
+        <comment>Should be the following (untranslated) text: &apos;This translation is licensed under the BSD License. See http://www.opensource.org/licenses/bsd-license.php&apos;</comment>
+        <translation>This translation is licensed under the GNU General Public License v3. See Documentation/Licenses/GPLv3.txt for more information</translation>
+    </message>
+</context>
 </TS>