Update locales.

6 files changed, 367 insertions, 342 deletions

diff --git a/locales/de_DE.qm b/locales/de_DE.qm
new file mode 100644
index 0000000..e9444e0
--- /dev/null
+++ b/locales/de_DE.qm
diff --git a/locales/de_DE.ts b/locales/de_DE.ts
index c23ff81..e0fad9a 100644
--- a/locales/de_DE.ts
+++ b/locales/de_DE.ts
@@ -16,47 +16,35 @@
         <translation>Die angegebene Serveradresse enthält einen Fehler!</translation>
     </message>
     <message>
-        <source>This field can&apos;t be empty!</source>
-        <translation type="vanished">Das Feld darf nicht leer sein!</translation>
-    </message>
-    <message>
-        <source>The feature you expected here are not yet implemented.</source>
-        <translation type="vanished">Die Features die Sie erwartet hatten, sind noch nicht implementiert worden.</translation>
-    </message>
-    <message>
         <source>The features you expected here are not yet implemented.</source>
         <translation>Die Features die Sie erwartet hatten, sind noch nicht implementiert worden.</translation>
     </message>
     <message>
         <source>An error occured while adding a new host!</source>
-        <translation type="unfinished"></translation>
+        <translation>Ein Fehler trat auf beim Hinzufügen eines RWA-Servers!</translation>
     </message>
     <message>
         <source>Both textfields can&apos;t be empty!</source>
-        <translation type="unfinished"></translation>
+        <translation>Beide Felder müssen ausgefüllt werden!</translation>
     </message>
     <message>
         <source>The specified host address does not grant access!</source>
-        <translation type="unfinished"></translation>
+        <translation>Der angegebene Server gewährt keinen Zugang!</translation>
     </message>
     <message>
         <source>The specified host address is not supported!</source>
-        <translation type="unfinished"></translation>
+        <translation>Der angegebene Server wird nicht unterstützt!</translation>
+    </message>
+    <message>
+        <source>Can&apos;t connect to underlying session service!</source>
+        <translation>Es kann keine Verbindung zur Sitzungsverwaltung hergestellt werden!</translation>
     </message>
 </context>
 <context>
     <name>MainQMLAdaptor</name>
     <message>
-        <source>Stop remote support session</source>
-        <translation>Stoppe Fernwartungssitzung</translation>
-    </message>
-    <message>
-        <source>Start remote support session</source>
-        <translation>Starte Fernwartungssitzung</translation>
-    </message>
-    <message>
         <source>A host object in the response of D-Bus service lacks a necessary value. (host_url or host_uuid)</source>
-        <translation type="unfinished"></translation>
+        <translation>Ein Serverobject in der D-Bus Serviceantwort beeinhaltet nicht alle erforderlichen werte. (host_url oder host_uuid)</translation>
     </message>
     <message>
         <source>An error occured while adding a new host:</source>
@@ -74,20 +62,104 @@
         <source>The error is not clear. The session service responded with no status type!</source>
         <translation>Der Fehler ist nicht klar. Der Sessionservice hat mit keinem Statustypen geantwortet!</translation>
     </message>
+    <message>
+        <source>No RWA host available!</source>
+        <translation>Kein RWA-Server verfügbar!</translation>
+    </message>
+    <message>
+        <source>Can&apos;t connect to underlying session service!</source>
+        <translation>Es kann keine Verbindung zur Sitzungsverwaltung hergestellt werden!</translation>
+    </message>
+    <message>
+        <source>Removed RWAHost &apos;%0&apos;</source>
+        <translation>RWA-Server &apos;%0&apos; entfernt</translation>
+    </message>
 </context>
 <context>
-    <name>QObject</name>
+    <name>RemoteControlManager</name>
     <message>
-        <source>You already have this app running.</source>
-        <translation type="vanished">Diese Anwendung läuft bereits.</translation>
+        <source>Stop remote support session</source>
+        <translation>Stoppe Fernwartungssitzung</translation>
     </message>
     <message>
-        <source>Only one instance is allowed.</source>
-        <translation type="vanished">Nur eine Instanz ist erlaubt.</translation>
+        <source>Start remote support session</source>
+        <translation>Starte Fernwartungssitzung</translation>
     </message>
     <message>
-        <source>Closing application now with an error.</source>
-        <translation type="vanished">Die Applikation wird nun mit einem Fehler beendet.</translation>
+        <source>Not available yet</source>
+        <translation>Noch nicht verfügbar</translation>
+    </message>
+    <message>
+        <source>Unknown state of service</source>
+        <translation>Unbekannter Status des Dienstes</translation>
+    </message>
+    <message>
+        <source>Remote Support session was stopped ungracefully</source>
+        <translation>Fernwartungssitzung wurde unerwartet beendet</translation>
+    </message>
+    <message>
+        <source>Remote Support session was stopped</source>
+        <translation>Fernwartungssitzung wurde beendet</translation>
+    </message>
+    <message>
+        <source>Your partner is connected to the Remote Support session</source>
+        <translation>Fernwartungspartner ist mit dieser Sitzung verbunden</translation>
+    </message>
+    <message>
+        <source>Remote Support session couldn&apos;t be started!</source>
+        <translation>Fernwartungssitzung konnte nicht gestartet werden!</translation>
+    </message>
+    <message>
+        <source>Session was started on &apos;%0&apos; successfully</source>
+        <translation>Sitzung wurde erfolgreich auf &apos;%0&apos; gestartet</translation>
+    </message>
+    <message>
+        <source>remote support partner could still be connected!</source>
+        <translation>Es ist möglich, dass Ihr Fernwartungspartner noch verbunden ist!</translation>
+    </message>
+    <message>
+        <source>Session could not be stopped!</source>
+        <translation>Sitzung konnte nicht gestoppt werden!</translation>
+    </message>
+    <message>
+        <source>Session status could not be refreshed! Your remote support partner could still be connected!</source>
+        <translation>Sitzungstatus konnte nicht erneuert werden! Es ist möglich, dass der Fernwartungspartner noch verbunden ist!</translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t remove current session out of &apos;_sessions&apos; list.</source>
+        <translation>Konnte aktuelle Sitzung nicht aus der Liste &apos;_sessions&apos; löschen.</translation>
+    </message>
+    <message>
+        <source>currentSessionStartSucceeded(): Current Session is nullptr!</source>
+        <translation>currentSessionStartSucceeded(): Aktuelle Sitzung ist nullptr!</translation>
+    </message>
+    <message>
+        <source>Remote support session was stopped.</source>
+        <translation>Fernwartungssitzung wurde beendet.</translation>
+    </message>
+    <message>
+        <source>Remote Support session successfully started! Waiting for your remote support partner to connect.</source>
+        <translation>Fernwartungssitzung wurde erfolgreich gestartet! Warte auf auf Verbindung vom Fernwartungspartner.</translation>
+    </message>
+    <message>
+        <source>Session stopped successfully.</source>
+        <translation>Fernwartungssitzung wurde erfolgreich beendet.</translation>
+    </message>
+    <message>
+        <source>Creating a new session object.</source>
+        <translation>Erstelle neues Sitzungsobjekt.</translation>
+    </message>
+    <message>
+        <source>Can&apos;t start a remote support session. There is no RWA host is selected!</source>
+        <translation>Kann keine Fernwartungssitzung starten. Es ist kein RWA-Server ausgewählt!</translation>
+    </message>
+    <message>
+        <source>RemoteControlManager::handleConnectButtonClick(): Current Session is nullptr!</source>
+        <translation>RemoteControlManager::handleConnectButtonClick(): Aktuelle Sitzung ist nullptr!</translation>
+    </message>
+    <message>
+        <source>Starting a remote support session on host &apos;%0&apos; using the new session object.</source>
+        <translation type="unfinished">Starte eine Fernwartungssitzung auf Server &apos;%0&apos; mithilfe des neuen Sitzungsobjektes.</translation>
     </message>
 </context>
 <context>
@@ -97,13 +169,7 @@
         <translation>Willkommen!</translation>
     </message>
     <message>
-        <source>You need to add and select the remote web app server to which you want to connect. You can see a button to the left in the menu which says &apos;Add RWA-Server&apos;. Follow the steps listed there and you can start your remote support session afterwards using the buttons above &apos;Add RWA-Server&apos;</source>
-        <extracomment>&apos;Add RWA-Server&apos; has to be replaced with the correct translation in file main.qml .</extracomment>
-        <translation type="vanished">Sie müssen zuerst einen RWA-Server hinzufügen und dann auswählen, um sich mit diesem zu verbinden. Auf der linken Seite befindet sich ein Knopf mit der Aufschrift &apos;RWA-Server hinzufügen&apos;. Folgen Sie den Anweisungen dort und Sie können Ihre Fernwartungssitzung rasch starten.</translation>
-    </message>
-    <message>
         <source>You need to add and select the remote web app server to which you want to connect. You can see a button to the left in the menu which says &apos;Add RWA-Server&apos;. Follow the steps listed there and you can start your remote support session afterwards using the buttons above &apos;Add RWA-Server&apos;.</source>
-        <extracomment>&apos;Add RWA-Server&apos; has to be replaced with the correct translation in file main.qml .</extracomment>
         <translation>Sie müssen zuerst einen RWA-Server hinzufügen und dann auswählen, um sich mit diesen zu verbinden. Auf der linken Seite befindet sich ein Knopf mit der Aufschrift &apos;RWA-Server hinzufügen&apos;. Folgen Sie den Anweisungen dort und Sie können Ihre Fernwartungssitzung rasch starten.</translation>
     </message>
 </context>
@@ -114,10 +180,6 @@
         <translation>Das hier ist eine Platzhalter Szene!</translation>
     </message>
     <message>
-        <source>The feature you expected here are not yet implemented.</source>
-        <translation type="vanished">Die Features die Sie erwartet hatten, sind noch nicht implementiert worden.</translation>
-    </message>
-    <message>
         <source>The features you expected here are not yet implemented.</source>
         <translation>Die Features die Sie erwartet hatten, sind noch nicht implementiert worden.</translation>
     </message>
@@ -158,7 +220,7 @@
     </message>
     <message>
         <source>Copied PIN into clipboard!</source>
-        <translation>Zugangspin wurde in die Zwischenablage kopiert!</translation>
+        <translation>Zugangs-PIN wurde in die Zwischenablage kopiert!</translation>
     </message>
     <message>
         <source>Copy the pin into the clipboard</source>
@@ -168,6 +230,14 @@
         <source>Start remote support session</source>
         <translation>Starte Fernwartungssitzung</translation>
     </message>
+    <message>
+        <source>Stop remote support session</source>
+        <translation>Stoppe Fernwartungssitzung</translation>
+    </message>
+    <message>
+        <source>Unknown state of session service.</source>
+        <translation>Unbekannter Status der Sitzungverwaltung.</translation>
+    </message>
 </context>
 <context>
     <name>Scene_remote_view</name>
@@ -219,18 +289,10 @@
 <context>
     <name>Scene_step_1</name>
     <message>
-        <source>Successfully added server address.</source>
-        <translation type="vanished">Erfolgreich Server hinzugefügt.</translation>
-    </message>
-    <message>
         <source>Next Step</source>
         <translation>Nächster Schritt</translation>
     </message>
     <message>
-        <source>Step 1</source>
-        <translation type="vanished">Schritt 1</translation>
-    </message>
-    <message>
         <source>Please input the address for the remote web app server which you want to connect to.
 If you don&apos;t know what this means, ask your local administrator about it please.
 Before you can start any remote sessions you will have to be approved for remote support.</source>
@@ -243,46 +305,20 @@ Bevor Sie eine Fernwartungssitzung starten können, müssen Sie zuerst für das
         <translation></translation>
     </message>
     <message>
-        <source>RWA-server address</source>
-        <translation type="vanished">RWA-Server Adresse</translation>
-    </message>
-    <message>
         <source>Successfully added remote web app host.</source>
         <translation>Erfolgreich Fernwartungsserver hinzugefügt.</translation>
     </message>
     <message>
         <source>RWA host address</source>
-        <translation type="unfinished"></translation>
+        <translation>RWA-Server Adressse</translation>
     </message>
     <message>
         <source>My example host</source>
-        <translation type="unfinished"></translation>
+        <translation>Mein Beispiel Server</translation>
     </message>
     <message>
         <source>RWA host alias</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Scene_step_2</name>
-    <message>
-        <source>Step 2</source>
-        <translation type="vanished">Schritt 2</translation>
-    </message>
-    <message>
-        <source>Next Step</source>
-        <translation type="vanished">Nächster Schritt</translation>
-    </message>
-</context>
-<context>
-    <name>Scene_step_3</name>
-    <message>
-        <source>Step 3</source>
-        <translation type="vanished">Schritt 3</translation>
-    </message>
-    <message>
-        <source>&lt;- First step</source>
-        <translation type="vanished">&lt;- Erster Schritt</translation>
+        <translation>RWA-Server Alias</translation>
     </message>
 </context>
 <context>
@@ -292,99 +328,32 @@ Bevor Sie eine Fernwartungssitzung starten können, müssen Sie zuerst für das
         <translation>Noch nicht verfügbar</translation>
     </message>
     <message>
-        <source>Unknown state of service</source>
-        <translation>Unbekannter Status des Dienstes</translation>
-    </message>
-    <message>
-        <source>Remote Support Session is up and running</source>
-        <translation type="vanished">Fernwartungssitzung läuft</translation>
-    </message>
-    <message>
-        <source>Remote Support Session was stopped ungracefully</source>
-        <translation type="vanished">Fernwartungssitzung wurde unvorhergesehen beendet</translation>
-    </message>
-    <message>
-        <source>Remote Support Session was stopped</source>
-        <translation type="vanished">Fernwartungssitzung wurde beendet</translation>
-    </message>
-    <message>
-        <source>Remote Support for your Desktop</source>
-        <translation type="vanished">Fernwartung für den Desktop</translation>
-    </message>
-    <message>
-        <source>D-Bus response was invalid.
-Function call: &apos;%1&apos;
-Maybe service isn&apos;t listening?</source>
-        <translation type="vanished">D-Bus Antwort auf Funktionsaufruf &apos;%1&apos; war nicht auswertbar
-Ist der Dienst vielleicht nicht an?</translation>
-    </message>
-    <message>
-        <source>Remote Support Session is ready to be connected to</source>
-        <translation type="vanished">Fernwartungssitzung ist bereit um verbunden zu werden</translation>
-    </message>
-    <message>
-        <source>Your partner is connected to the Remote Support Session</source>
-        <translation type="vanished">Fernwartungspartner ist verbunden</translation>
-    </message>
-    <message>
-        <source>Remote Support session is ready to be connected to</source>
-        <translation>Bereit um eine Fernwartungssitzung aufzubauen</translation>
-    </message>
-    <message>
-        <source>Remote Support session was stopped ungracefully</source>
-        <translation>Fernwartungssitzung wurde unerwartet beendet</translation>
-    </message>
-    <message>
-        <source>Remote Support session was stopped</source>
-        <translation>Fernwartungssitzung wurde beendet</translation>
-    </message>
-    <message>
-        <source>Your partner is connected to the Remote Support session</source>
-        <translation>Fernwartungspartner ist mit dieser Sitzung verbunden</translation>
-    </message>
-    <message>
-        <source>Trying to reach session service...</source>
-        <translation>Versuche Sitzungsdienst zu kontaktieren...</translation>
-    </message>
-    <message>
-        <source>Remote Support session couldn&apos;t be started!</source>
-        <translation>Fernwartungssitzung konnte nicht gestartet werden!</translation>
-    </message>
-    <message>
-        <source>An error occured while trying to start a session!</source>
-        <translation>Ein Fehler trat auf bei dem Versuch eine Sitzung zu starten!</translation>
+        <source>An error occured while creating a new session!</source>
+        <translation>Ein Fehler trat auf bei dem Versuch eine Sitzung zu erstellen!</translation>
     </message>
     <message>
-        <source>Remote Support session successfully started!</source>
-        <translation>Fernwartungssitzung erfolgreich gestartet!</translation>
+        <source>The session service is configured to not support multiple sessions and there is already a session running.</source>
+        <translation>Die Sitzungsverwaltung ist so konfiguriert, dass nur eine Sitzung erlaubt ist und es ist bereits eine Sitzung am laufen.</translation>
     </message>
     <message>
-        <source>Session was started successfully</source>
-        <translation type="vanished">Sitzung wurde erfolgreich gestartet</translation>
+        <source>Couldn&apos;t connect to host &apos;%0&apos;.</source>
+        <translation>Konnte nicht zu RWA-Server &apos;%0&apos; verbinden.</translation>
     </message>
     <message>
-        <source>Session status could not be refreshed!</source>
-        <translation>Sitzungstatus konnte nicht erneuert werden!</translation>
+        <source>The RWA host &apos;%0&apos; couldn&apos;t be found.</source>
+        <translation>Konnte RWA-Server &apos;%0&apos; nicht finden.</translation>
     </message>
     <message>
-        <source>Session status could not be refreshed, remote support partner could still be connected!</source>
-        <translation type="vanished">Sitzungstatus konnte nicht erneuert werden! Es ist möglich, dass der Fernwartungspartner noch verbunden ist!</translation>
+        <source>The RWA host &apos;%0&apos; doesn&apos;t grant access.</source>
+        <translation>Der RWA-Server &apos;%0&apos; gewährt keinen Zugang.</translation>
     </message>
     <message>
-        <source>Session could not be stopped!</source>
-        <translation>Sitzung konnte nicht gestoppt werden!</translation>
+        <source>The RWA host &apos;%0&apos; is not supported.</source>
+        <translation>Der RWA-Server &apos;%0&apos; wird nicht unterstützt.</translation>
     </message>
     <message>
-        <source>Session could not be stopped, remote support partner could still be connected!</source>
-        <translation type="vanished">Sitzung konnte nicht gestoppt werden! Es ist möglich, dass der Fernwartungspartner noch verbunden ist!</translation>
-    </message>
-    <message>
-        <source>remote support partner could still be connected!</source>
-        <translation>Es ist möglich, dass Ihr Partner noch verbunden ist!</translation>
-    </message>
-    <message>
-        <source>Session was started on &apos;%0&apos; successfully</source>
-        <translation>Sitzung wurde erfolgreich auf &apos;%0&apos; gestartet</translation>
+        <source>Can&apos;t connect to underlying session service! Is the session service started?</source>
+        <translation>Es kann keine Verbindung zur Sitzungsverwaltung hergestellt werden! Ist die Sitzungsverwaltung eingeschaltet?</translation>
     </message>
 </context>
 <context>
@@ -394,30 +363,10 @@ Ist der Dienst vielleicht nicht an?</translation>
         <translation>Fernwartung für den Desktop</translation>
     </message>
     <message>
-        <source>Allow remote desktop support</source>
-        <translation type="vanished">Fernwartungssitzung starten</translation>
-    </message>
-    <message>
-        <source>Unknown state of service</source>
-        <translation type="vanished">Unbekannter Status des Dienstes</translation>
-    </message>
-    <message>
-        <source>Remote Support URL</source>
-        <translation type="vanished">Fernwartungs-URL</translation>
-    </message>
-    <message>
-        <source>Access pin to this computer</source>
-        <translation type="vanished">Zugangspin zu diesem Computer</translation>
-    </message>
-    <message>
         <source>Allow Remote Control</source>
         <translation>Fernwartungssitzung erlauben</translation>
     </message>
     <message>
-        <source>Please tell your partner your PIN and the Support URL to connect to this computer</source>
-        <translation type="vanished">Bitte gebe deinem Fernwartungspartner die Zugangspin und die Fernwartungs-URL um sich mit diesem Computer verbinden zu können</translation>
-    </message>
-    <message>
         <source>Remote Control</source>
         <translation>Fernwartung</translation>
     </message>
@@ -435,74 +384,10 @@ This is a bug.</source>
         <translation>Diese Nachricht sollte nie gesehen werden. Das ist ein Bug.</translation>
     </message>
     <message>
-        <source>Start remote support session</source>
-        <translation type="vanished">Starte Fernwartungssitzung</translation>
-    </message>
-    <message>
-        <source>Copy the URL into the clipboard</source>
-        <translation type="vanished">Kopiere URL in die Zwischenablage</translation>
-    </message>
-    <message>
-        <source>Copy the pin into the clipboard</source>
-        <translation type="vanished">Kopiere Zugangspin in die Zwischenablage</translation>
-    </message>
-    <message>
-        <source>Copied URL into clipboard!</source>
-        <translation type="vanished">URL in die Zwischenablage kopiert!</translation>
-    </message>
-    <message>
-        <source>Copied PIN into clipboard!</source>
-        <translation type="vanished">Zugangspin wurde in die Zwischenablage kopiert!</translation>
-    </message>
-    <message>
-        <source>Please tell your remote support partner your personal access address and your access-PIN to let your partner connect to this computer.</source>
-        <translation type="vanished">Bitte teile deinem Fernwartungspartner deine persönliche Zugangsadresse und deine Zugangs-PIN  mit, um sich mit diesem Computer verbinden zu können.</translation>
-    </message>
-    <message>
-        <source>Remote Support Address</source>
-        <translation type="vanished">Zugangsadresse für Fernwartung</translation>
-    </message>
-    <message>
-        <source>Personal Access-PIN</source>
-        <translation type="vanished">Persönliche Zugangs-PIN</translation>
-    </message>
-    <message>
-        <source>Title %1</source>
-        <translation type="vanished">Titel %1</translation>
-    </message>
-    <message>
         <source>Dark theme</source>
         <translation>Dunkelmodus</translation>
     </message>
     <message>
-        <source>Access-PIN</source>
-        <translation type="vanished">Zugangs-PIN</translation>
-    </message>
-    <message>
-        <source>Please tell your remote support partner your access address and your access-PIN to let your partner connect to this computer.</source>
-        <translation type="vanished">Bitte teile deinem Fernwartungspartner deine Zugangsadresse und deine Zugangs-PIN  mit, um sich mit diesem Computer verbinden zu können.</translation>
-    </message>
-    <message>
-        <source>Copied access address into clipboard!</source>
-        <translation type="vanished">Zugangsadresse wurde in die Zwischenablage kopiert!</translation>
-    </message>
-    <message>
-        <source>Copy the access address into the clipboard</source>
-        <translation type="vanished">Kopiere Zugangsadresse in die Zwischenablage</translation>
-    </message>
-    <message>
-        <source>Session-ID</source>
-        <translation type="vanished">Sitzungs-ID</translation>
-    </message>
-    <message>
-        <source>Copied session-ID into clipboard!</source>
-        <translation type="vanished">Sitzungs-ID wurde in die Zwischenablage kopiert!</translation>
-    </message>
-    <message>
-        <source>Copy the session-ID into the clipboard</source>
-        <translation type="vanished">Kopiere Sitzungs-ID in die Zwischenablage</translation>
-    </message>
-    <message>
         <source>Allow remote control</source>
         <translation>Fernwartungssitzung erlauben</translation>
     </message>
diff --git a/locales/es_ES.qm b/locales/es_ES.qm
new file mode 100644
index 0000000..2d4045c
--- /dev/null
+++ b/locales/es_ES.qm
diff --git a/locales/es_ES.ts b/locales/es_ES.ts
index b767dfe..844b883 100644
--- a/locales/es_ES.ts
+++ b/locales/es_ES.ts
@@ -35,35 +35,130 @@
         <source>The specified host address is not supported!</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Can&apos;t connect to underlying session service!</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainQMLAdaptor</name>
     <message>
+        <source>A host object in the response of D-Bus service lacks a necessary value. (host_url or host_uuid)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>An error occured while adding a new host:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Successfully added new RWAHost &apos;%0&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The error is not clear. The session service responded with status type &apos;%0&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The error is not clear. The session service responded with no status type!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No RWA host available!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t connect to underlying session service!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removed RWAHost &apos;%0&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>RemoteControlManager</name>
+    <message>
         <source>Stop remote support session</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start remote support session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>A host object in the response of D-Bus service lacks a necessary value. (host_url or host_uuid)</source>
+        <source>Not available yet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>An error occured while adding a new host:</source>
+        <source>Unknown state of service</source>
+        <translation>Estado de servicio desconocido</translation>
+    </message>
+    <message>
+        <source>Remote Support session was stopped ungracefully</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Successfully added new RWAHost &apos;%0&apos;</source>
+        <source>Remote Support session was stopped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The error is not clear. The session service responded with status type &apos;%0&apos;</source>
+        <source>Your partner is connected to the Remote Support session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The error is not clear. The session service responded with no status type!</source>
+        <source>Remote Support session couldn&apos;t be started!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Session was started on &apos;%0&apos; successfully</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>remote support partner could still be connected!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Session could not be stopped!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Session status could not be refreshed! Your remote support partner could still be connected!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t remove current session out of &apos;_sessions&apos; list.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>currentSessionStartSucceeded(): Current Session is nullptr!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remote support session was stopped.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remote Support session successfully started! Waiting for your remote support partner to connect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Session stopped successfully.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Creating a new session object.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t start a remote support session. There is no RWA host is selected!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RemoteControlManager::handleConnectButtonClick(): Current Session is nullptr!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Starting a remote support session on host &apos;%0&apos; using the new session object.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -75,7 +170,6 @@
     </message>
     <message>
         <source>You need to add and select the remote web app server to which you want to connect. You can see a button to the left in the menu which says &apos;Add RWA-Server&apos;. Follow the steps listed there and you can start your remote support session afterwards using the buttons above &apos;Add RWA-Server&apos;.</source>
-        <extracomment>&apos;Add RWA-Server&apos; has to be replaced with the correct translation in file main.qml .</extracomment>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -93,10 +187,6 @@
 <context>
     <name>Scene_remote_control</name>
     <message>
-        <source>Please tell your remote support partner your access address and your access-PIN to let your partner connect to this computer.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Remote Support Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -136,6 +226,18 @@
         <source>Start remote support session</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Stop remote support session</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please tell your remote support partner your access address and your access-PIN to let your partner connect to this computer.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown state of session service.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Scene_remote_view</name>
@@ -220,63 +322,35 @@ Before you can start any remote sessions you will have to be approved for remote
 <context>
     <name>Session</name>
     <message>
-        <source>Unknown state of service</source>
-        <translation>Estado de servicio desconocido</translation>
-    </message>
-    <message>
-        <source>Remote Support for your Desktop</source>
-        <translation type="obsolete">Soporte remoto para su escritorio</translation>
-    </message>
-    <message>
         <source>Not available yet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remote Support session is ready to be connected to</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remote Support session was stopped ungracefully</source>
+        <source>An error occured while creating a new session!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remote Support session was stopped</source>
+        <source>The session service is configured to not support multiple sessions and there is already a session running.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Your partner is connected to the Remote Support session</source>
+        <source>Couldn&apos;t connect to host &apos;%0&apos;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Trying to reach session service...</source>
+        <source>The RWA host &apos;%0&apos; couldn&apos;t be found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remote Support session couldn&apos;t be started!</source>
+        <source>The RWA host &apos;%0&apos; doesn&apos;t grant access.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>An error occured while trying to start a session!</source>
+        <source>The RWA host &apos;%0&apos; is not supported.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remote Support session successfully started!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Session status could not be refreshed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>remote support partner could still be connected!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Session could not be stopped!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Session was started on &apos;%0&apos; successfully</source>
+        <source>Can&apos;t connect to underlying session service! Is the session service started?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -287,18 +361,6 @@ Before you can start any remote sessions you will have to be approved for remote
         <translation>Soporte remoto para su escritorio</translation>
     </message>
     <message>
-        <source>Unknown state of service</source>
-        <translation type="vanished">Estado de servicio desconocido</translation>
-    </message>
-    <message>
-        <source>Allow remote desktop support</source>
-        <translation type="vanished">Permitir soporte de escritorio remoto</translation>
-    </message>
-    <message>
-        <source>Access pin to this computer</source>
-        <translation type="vanished">Pin de acceso a esta computadora</translation>
-    </message>
-    <message>
         <source>You are not supposed to see this message.
 This is a bug.</source>
         <translation type="unfinished"></translation>
diff --git a/locales/main_en.qm b/locales/main_en.qm
new file mode 100644
index 0000000..a0de2c8
--- /dev/null
+++ b/locales/main_en.qm
diff --git a/locales/main_en.ts b/locales/main_en.ts
index 0e3ac88..35aafff 100644
--- a/locales/main_en.ts
+++ b/locales/main_en.ts
@@ -35,35 +35,130 @@
         <source>The specified host address is not supported!</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Can&apos;t connect to underlying session service!</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainQMLAdaptor</name>
     <message>
-        <source>Stop remote support session</source>
+        <source>A host object in the response of D-Bus service lacks a necessary value. (host_url or host_uuid)</source>
         <translation></translation>
     </message>
     <message>
+        <source>An error occured while adding a new host:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Successfully added new RWAHost &apos;%0&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The error is not clear. The session service responded with status type &apos;%0&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The error is not clear. The session service responded with no status type!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No RWA host available!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t connect to underlying session service!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removed RWAHost &apos;%0&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>RemoteControlManager</name>
+    <message>
+        <source>Stop remote support session</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Start remote support session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>A host object in the response of D-Bus service lacks a necessary value. (host_url or host_uuid)</source>
+        <source>Not available yet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>An error occured while adding a new host:</source>
+        <source>Unknown state of service</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Successfully added new RWAHost &apos;%0&apos;</source>
+        <source>Remote Support session was stopped ungracefully</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The error is not clear. The session service responded with status type &apos;%0&apos;</source>
+        <source>Remote Support session was stopped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The error is not clear. The session service responded with no status type!</source>
+        <source>Your partner is connected to the Remote Support session</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remote Support session couldn&apos;t be started!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Session was started on &apos;%0&apos; successfully</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>remote support partner could still be connected!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Session could not be stopped!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Session status could not be refreshed! Your remote support partner could still be connected!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t remove current session out of &apos;_sessions&apos; list.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>currentSessionStartSucceeded(): Current Session is nullptr!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remote support session was stopped.</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Remote Support session successfully started! Waiting for your remote support partner to connect.</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Session stopped successfully.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Creating a new session object.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t start a remote support session. There is no RWA host is selected!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RemoteControlManager::handleConnectButtonClick(): Current Session is nullptr!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Starting a remote support session on host &apos;%0&apos; using the new session object.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -75,7 +170,6 @@
     </message>
     <message>
         <source>You need to add and select the remote web app server to which you want to connect. You can see a button to the left in the menu which says &apos;Add RWA-Server&apos;. Follow the steps listed there and you can start your remote support session afterwards using the buttons above &apos;Add RWA-Server&apos;.</source>
-        <extracomment>&apos;Add RWA-Server&apos; has to be replaced with the correct translation in file main.qml .</extracomment>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -93,10 +187,6 @@
 <context>
     <name>Scene_remote_control</name>
     <message>
-        <source>Please tell your remote support partner your access address and your access-PIN to let your partner connect to this computer.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Remote Support Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -136,6 +226,18 @@
         <source>Start remote support session</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Stop remote support session</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please tell your remote support partner your access address and your access-PIN to let your partner connect to this computer.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown state of session service.</source>
+        <translation></translation>
+    </message>
 </context>
 <context>
     <name>Scene_remote_view</name>
@@ -206,7 +308,7 @@ Before you can start any remote sessions you will have to be approved for remote
     </message>
     <message>
         <source>RWA host address</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <source>My example host</source>
@@ -224,55 +326,31 @@ Before you can start any remote sessions you will have to be approved for remote
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unknown state of service</source>
+        <source>An error occured while creating a new session!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remote Support session is ready to be connected to</source>
+        <source>The session service is configured to not support multiple sessions and there is already a session running.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remote Support session was stopped ungracefully</source>
+        <source>Couldn&apos;t connect to host &apos;%0&apos;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remote Support session was stopped</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Your partner is connected to the Remote Support session</source>
+        <source>The RWA host &apos;%0&apos; couldn&apos;t be found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Trying to reach session service...</source>
+        <source>The RWA host &apos;%0&apos; doesn&apos;t grant access.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remote Support session couldn&apos;t be started!</source>
+        <source>The RWA host &apos;%0&apos; is not supported.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>An error occured while trying to start a session!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remote Support session successfully started!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Session status could not be refreshed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>remote support partner could still be connected!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Session could not be stopped!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Session was started on &apos;%0&apos; successfully</source>
+        <source>Can&apos;t connect to underlying session service! Is the session service started?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>