From d8656a5578e43facd51444d03c9fc6fa0debb6ce Mon Sep 17 00:00:00 2001
From: kervala <kervala@localhost>
Date: Thu, 22 Sep 2016 11:40:42 +0200
Subject: [PATCH] Merge with develop

---
 .../client/ryzom_installer/src/downloader.cpp |   7 +
 .../ryzom_installer/src/filescleaner.cpp      |   4 +-
 .../ryzom_installer/src/operationdialog.cpp   |   7 +
 .../translations/ryzom_installer_de.ts        | 352 +++++++++---------
 4 files changed, 200 insertions(+), 170 deletions(-)

diff --git a/code/ryzom/tools/client/ryzom_installer/src/downloader.cpp b/code/ryzom/tools/client/ryzom_installer/src/downloader.cpp
index 713dc9b80..e7ef391cd 100644
--- a/code/ryzom/tools/client/ryzom_installer/src/downloader.cpp
+++ b/code/ryzom/tools/client/ryzom_installer/src/downloader.cpp
@@ -323,6 +323,13 @@ void CDownloader::onHeadFinished()
 		}
 	}
 
+	// error when download is not yet ready
+	else if (status == 307)
+	{
+		if (m_listener) m_listener->operationFail(tr("File is not available, please retry later (status code: %1)").arg(status));
+		return;
+	}
+
 	// other status
 	else
 	{
diff --git a/code/ryzom/tools/client/ryzom_installer/src/filescleaner.cpp b/code/ryzom/tools/client/ryzom_installer/src/filescleaner.cpp
index c3830dbc1..0dab15a59 100644
--- a/code/ryzom/tools/client/ryzom_installer/src/filescleaner.cpp
+++ b/code/ryzom/tools/client/ryzom_installer/src/filescleaner.cpp
@@ -51,11 +51,13 @@ bool CFilesCleaner::exec()
 	QStringList filter;
 	filter << "*.string_cache";
 
+	// certificate should be in gamedev.bnp now
+	filter << "*.pem";
+
 	if (dir.exists("packedsheets.bnp"))
 	{
 		filter << "*.packed_sheets";
 		filter << "*.packed";
-		filter << "*.pem";
 	}
 
 	// temporary files
diff --git a/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp b/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp
index 583b3ec03..8d7aa5672 100644
--- a/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp
+++ b/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp
@@ -492,6 +492,13 @@ void COperationDialog::onProgressSuccess(qint64 total)
 void COperationDialog::onProgressFail(const QString &error)
 {
 	QMessageBox::critical(this, tr("Error"), error);
+
+	{
+		QMutexLocker locker(&m_abortingMutex);
+		m_aborting = true;
+	}
+
+	processNextStep();
 }
 
 void COperationDialog::onDone()
diff --git a/code/ryzom/tools/client/ryzom_installer/translations/ryzom_installer_de.ts b/code/ryzom/tools/client/ryzom_installer/translations/ryzom_installer_de.ts
index d5116872a..73b8d51bf 100644
--- a/code/ryzom/tools/client/ryzom_installer/translations/ryzom_installer_de.ts
+++ b/code/ryzom/tools/client/ryzom_installer/translations/ryzom_installer_de.ts
@@ -6,37 +6,37 @@
     <message>
         <location filename="../src/downloader.cpp" line="156"/>
         <source>File is larger (%1B) than expected (%2B)</source>
-        <translation type="unfinished"></translation>
+        <translation>Die Datei ist (%1B) größer als erwartet (%2B)</translation>
     </message>
     <message>
         <location filename="../src/downloader.cpp" line="186"/>
         <source>You only have %1 bytes left on the device, but %2 bytes are needed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Auf dem Gerät sind nur noch %1 Byte Speicherplatz verfügbar, es werden aber %2 Byte benötigt.</translation>
     </message>
     <message>
         <location filename="../src/downloader.cpp" line="192"/>
         <source>Unable to write file</source>
-        <translation type="unfinished"></translation>
+        <translation>Kann Datei nicht schreiben</translation>
     </message>
     <message>
         <location filename="../src/downloader.cpp" line="227"/>
         <source>Timeout</source>
-        <translation type="unfinished"></translation>
+        <translation>Timeout</translation>
     </message>
     <message>
         <location filename="../src/downloader.cpp" line="264"/>
         <source>Redirection URL is not defined</source>
-        <translation type="unfinished"></translation>
+        <translation>Weiterleitungs-URL ist nicht definiert</translation>
     </message>
     <message>
         <location filename="../src/downloader.cpp" line="329"/>
         <source>Incorrect status code: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Falscher Status Code: %1</translation>
     </message>
     <message>
         <location filename="../src/downloader.cpp" line="381"/>
         <source>Network error: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Netzwerk-Fehler: %1</translation>
     </message>
 </context>
 <context>
@@ -44,57 +44,57 @@
     <message>
         <location filename="../src/installdialog.cpp" line="45"/>
         <source>Old installation: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Alte Installation: %1</translation>
     </message>
     <message>
         <location filename="../src/installdialog.cpp" line="70"/>
         <source>Internet (%1 to download)</source>
-        <translation type="unfinished"></translation>
+        <translation>Internet (%1 herunterzuladen)</translation>
     </message>
     <message>
         <location filename="../src/installdialog.cpp" line="71"/>
         <source>Files will be installed to (requires %1):</source>
-        <translation type="unfinished"></translation>
+        <translation>Dateien werden installiert nach (benötigt %1):</translation>
     </message>
     <message>
         <location filename="../src/installdialog.cpp" line="101"/>
         <source>Please choose directory where Ryzom is currently installed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Bitte wähle das Verzeichnis, in dem Ryzom momentan installiert ist.</translation>
     </message>
     <message>
         <location filename="../src/installdialog.cpp" line="107"/>
         <source>Unable to find Ryzom</source>
-        <translation type="unfinished"></translation>
+        <translation>Ryzom konnte nicht gefunden werden</translation>
     </message>
     <message>
         <location filename="../src/installdialog.cpp" line="107"/>
         <source>Unable to find Ryzom in selected directory. Please choose another one or cancel.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ryzom konnte im gewählten Verzeichnis nicht gefunden werden. Wähle bitte ein anderes Verzeichnis oder brich ab.</translation>
     </message>
     <message>
         <location filename="../src/installdialog.cpp" line="120"/>
         <source>Please choose directory to install Ryzom in</source>
-        <translation type="unfinished"></translation>
+        <translation>Bitte wähle ein Verzeichnis, in dem Ryzom installiert werden soll.</translation>
     </message>
     <message>
         <location filename="../src/installdialog.cpp" line="131"/>
         <source>Another location: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Ein anderer Ort: %1</translation>
     </message>
     <message>
         <location filename="../src/installdialog.cpp" line="131"/>
         <source>Undefined</source>
-        <translation type="unfinished"></translation>
+        <translation>Undefiniert</translation>
     </message>
     <message>
         <location filename="../src/installdialog.cpp" line="148"/>
         <source>Not enough free disk space</source>
-        <translation type="unfinished"></translation>
+        <translation>Nicht genügend freier Festplattenspeicher</translation>
     </message>
     <message>
         <location filename="../src/installdialog.cpp" line="148"/>
         <source>You don&apos;t have enough free space on this disk, please make more space or choose a directory on another disk.</source>
-        <translation type="unfinished"></translation>
+        <translation>Auf diesem Laufwerk ist nicht genügend freier Speicher verfügbar, bitte schaffe mehr Platz oder wähle ein Verzeichnis auf einem anderen Laufwerk.</translation>
     </message>
 </context>
 <context>
@@ -102,27 +102,27 @@
     <message>
         <location filename="../src/mainwindow.cpp" line="264"/>
         <source>About %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Über %1</translation>
     </message>
     <message>
         <location filename="../src/mainwindow.cpp" line="266"/>
         <source>Program to install, download and manage Ryzom profiles.</source>
-        <translation type="unfinished"></translation>
+        <translation>Programm um Ryzom-Profile zu installieren, herunterzuladen und zu verwalten.</translation>
     </message>
     <message>
         <location filename="../src/mainwindow.cpp" line="268"/>
         <source>Author: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Author: %1</translation>
     </message>
     <message>
         <location filename="../src/mainwindow.cpp" line="269"/>
         <source>Copyright: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Copyright: %1</translation>
     </message>
     <message>
         <location filename="../src/mainwindow.cpp" line="270"/>
         <source>Support: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Support: %1</translation>
     </message>
 </context>
 <context>
@@ -130,22 +130,22 @@
     <message>
         <location filename="../src/migratedialog.cpp" line="67"/>
         <source>Files will be installed to (requires %1):</source>
-        <translation type="unfinished"></translation>
+        <translation>Dateien werden installiert nach (benötigt %1):</translation>
     </message>
     <message>
         <location filename="../src/migratedialog.cpp" line="94"/>
         <source>Please choose directory to install Ryzom in</source>
-        <translation type="unfinished"></translation>
+        <translation>Bitte wähle ein Verzeichnis, in dem Ryzom installiert werden soll.</translation>
     </message>
     <message>
         <location filename="../src/migratedialog.cpp" line="117"/>
         <source>Not enough free disk space</source>
-        <translation type="unfinished"></translation>
+        <translation>Nicht genügend freier Festplattenspeicher</translation>
     </message>
     <message>
         <location filename="../src/migratedialog.cpp" line="117"/>
         <source>You don&apos;t have enough free space on this disk, please make more space or choose a directory on another disk.</source>
-        <translation type="unfinished"></translation>
+        <translation>Auf diesem Laufwerk ist nicht genügend freier Speicher verfügbar, bitte schaffe mehr Platz oder wähle ein Verzeichnis auf einem anderen Laufwerk.</translation>
     </message>
 </context>
 <context>
@@ -153,103 +153,104 @@
     <message>
         <location filename="../src/operationdialog.cpp" line="256"/>
         <source>Update profiles</source>
-        <translation type="unfinished"></translation>
+        <translation>Profile aktualisieren</translation>
     </message>
     <message>
         <location filename="../src/operationdialog.cpp" line="407"/>
         <source>Confirmation</source>
-        <translation type="unfinished"></translation>
+        <translation>Bestätigung</translation>
     </message>
     <message>
         <location filename="../src/operationdialog.cpp" line="407"/>
         <source>Warning, this server doesn&apos;t support resume! If you stop download now, you won&apos;t be able to resume it later.
 Are you sure to abort download?</source>
-        <translation type="unfinished"></translation>
+        <translation>Warnung, dieser Server unterstützt kein Fortsetzen! Wenn du jetzt den Download abbrichst. wirst du nicht in der Lage sein ihn später wieder fortzusetzen. Willst du den Download wirklich abbrechen?</translation>
     </message>
     <message>
         <location filename="../src/operationdialog.cpp" line="432"/>
         <source>%p% (%v/%m KiB)</source>
-        <translation type="unfinished"></translation>
+        <translation>%p% (%v/%m KiB)</translation>
     </message>
     <message>
         <location filename="../src/operationdialog.cpp" line="492"/>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Fehler</translation>
     </message>
     <message>
         <location filename="../src/operationdialog.cpp" line="506"/>
         <source>Download data required by server %1</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>%1 ist der Servername, also z.B. Atys oder Yubo</translatorcomment>
+        <translation>Lade Daten herunter, die vom Server %1 benötigt werden</translation>
     </message>
     <message>
         <location filename="../src/operationdialog.cpp" line="507"/>
         <location filename="../src/operationdialog.cpp" line="542"/>
         <source>Downloading %1...</source>
-        <translation type="unfinished"></translation>
+        <translation>Lade herunter  %1...</translation>
     </message>
     <message>
         <location filename="../src/operationdialog.cpp" line="518"/>
         <source>Extract data files required by server %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Entpacke Dateien, die vom Server %1 benötigt werden</translation>
     </message>
     <message>
         <location filename="../src/operationdialog.cpp" line="519"/>
         <location filename="../src/operationdialog.cpp" line="554"/>
         <location filename="../src/operationdialog.cpp" line="646"/>
         <source>Extracting %1...</source>
-        <translation type="unfinished"></translation>
+        <translation>Entpacke %1...</translation>
     </message>
     <message>
         <location filename="../src/operationdialog.cpp" line="541"/>
         <source>Download client required by server %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Lade Client herunter, der vom Server %1 benötigt wird</translation>
     </message>
     <message>
         <location filename="../src/operationdialog.cpp" line="553"/>
         <source>Extract client files required by server %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Entpacke Client Dateien, die vom Server %1 benötigt werden</translation>
     </message>
     <message>
         <location filename="../src/operationdialog.cpp" line="577"/>
         <source>Copy data files required by server %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopiere Dateien, die vom Server %1 benötigt werden</translation>
     </message>
     <message>
         <location filename="../src/operationdialog.cpp" line="578"/>
         <location filename="../src/operationdialog.cpp" line="613"/>
         <location filename="../src/operationdialog.cpp" line="708"/>
         <source>Copying %1...</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopiere %1...</translation>
     </message>
     <message>
         <location filename="../src/operationdialog.cpp" line="612"/>
         <source>Copy old profile to new location</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopiere altes Profil an den neuen Ort</translation>
     </message>
     <message>
         <location filename="../src/operationdialog.cpp" line="645"/>
         <source>Extract client to new location</source>
-        <translation type="unfinished"></translation>
+        <translation>Entpacke Client am neuen Ort</translation>
     </message>
     <message>
         <location filename="../src/operationdialog.cpp" line="707"/>
         <source>Copy installer to new location</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopiere Installer an neuen Ort</translation>
     </message>
     <message>
         <location filename="../src/operationdialog.cpp" line="792"/>
         <source>Uninstall old client</source>
-        <translation type="unfinished"></translation>
+        <translation>Deinstalliere alten Client</translation>
     </message>
     <message>
         <location filename="../src/operationdialog.cpp" line="792"/>
         <source>An old version of Ryzom has been detected on this system, would you like to uninstall it to save space disk?</source>
-        <translation type="unfinished"></translation>
+        <translation>Eine ältere Version von Ryzom wurde auf diesem System gefunden, möchtest du sie deinstallieren um Festplattenspeicher zu sparen?</translation>
     </message>
     <message>
         <location filename="../src/operationdialog.cpp" line="827"/>
         <source>Clean obsolete files</source>
-        <translation type="unfinished"></translation>
+        <translation>Lösche alte Dateien</translation>
     </message>
     <message>
         <location filename="../src/operationdialog.cpp" line="828"/>
@@ -257,62 +258,62 @@ Are you sure to abort download?</source>
         <location filename="../src/operationdialog.cpp" line="1131"/>
         <location filename="../src/operationdialog.cpp" line="1174"/>
         <source>Deleting %1...</source>
-        <translation type="unfinished"></translation>
+        <translation>Lösche %1...</translation>
     </message>
     <message>
         <location filename="../src/operationdialog.cpp" line="843"/>
         <source>Create default profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Erstelle Standard-Profil</translation>
     </message>
     <message>
         <location filename="../src/operationdialog.cpp" line="902"/>
         <source>Create shortcuts for profile %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Erstelle Verknüpfungen für Profil %1</translation>
     </message>
     <message>
         <location filename="../src/operationdialog.cpp" line="1006"/>
         <source>Delete client files</source>
-        <translation type="unfinished"></translation>
+        <translation>Lösche Client Dateien</translation>
     </message>
     <message>
         <location filename="../src/operationdialog.cpp" line="1037"/>
         <source>Unable to delete files for client %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Dateien für Client %1 konnten nicht gelöscht werden</translation>
     </message>
     <message>
         <location filename="../src/operationdialog.cpp" line="1064"/>
         <source>Add profiles</source>
-        <translation type="unfinished"></translation>
+        <translation>Füge Profile hinzu</translation>
     </message>
     <message>
         <location filename="../src/operationdialog.cpp" line="1065"/>
         <source>Adding profile %1...</source>
-        <translation type="unfinished"></translation>
+        <translation>Füge Profil %1 hinzu...</translation>
     </message>
     <message>
         <location filename="../src/operationdialog.cpp" line="1079"/>
         <source>Delete profiles</source>
-        <translation type="unfinished"></translation>
+        <translation>Lösche Profile</translation>
     </message>
     <message>
         <location filename="../src/operationdialog.cpp" line="1080"/>
         <source>Deleting profile %1...</source>
-        <translation type="unfinished"></translation>
+        <translation>Lösche Profil %1...</translation>
     </message>
     <message>
         <location filename="../src/operationdialog.cpp" line="1109"/>
         <source>Unable to delete files for profile %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Dateien für Profil %1 konnten nicht gelöscht werden</translation>
     </message>
     <message>
         <location filename="../src/operationdialog.cpp" line="1130"/>
         <source>Delete installer</source>
-        <translation type="unfinished"></translation>
+        <translation>Lösche installer</translation>
     </message>
     <message>
         <location filename="../src/operationdialog.cpp" line="1173"/>
         <source>Delete downloaded files</source>
-        <translation type="unfinished"></translation>
+        <translation>Lösche heruntergeladene Dateien</translation>
     </message>
 </context>
 <context>
@@ -320,23 +321,24 @@ Are you sure to abort download?</source>
     <message>
         <location filename="../src/profilesdialog.cpp" line="70"/>
         <source>Confirmation</source>
-        <translation type="unfinished"></translation>
+        <translation>Bestätigung</translation>
     </message>
     <message>
         <location filename="../src/profilesdialog.cpp" line="70"/>
         <source>You&apos;re going to delete a profile, files won&apos;t be deleted and you&apos;ll have to do that manually.
 Are you sure to delete this profile?</source>
-        <translation type="unfinished"></translation>
+        <translation>Du bist dabei ein Profil zu löschen, es werden keine Dateien gelöscht, das musst du manuell tun.
+Bist du sicher, dass du dieses Profil löschen willst?</translation>
     </message>
     <message>
         <location filename="../src/profilesdialog.cpp" line="271"/>
         <source>Please choose Ryzom client executable to launch</source>
-        <translation type="unfinished"></translation>
+        <translation>Bitte wähle die ausführbare Datei um den Ryzom Client zu starten</translation>
     </message>
     <message>
         <location filename="../src/profilesdialog.cpp" line="271"/>
         <source>Executables (*.exe)</source>
-        <translation type="unfinished"></translation>
+        <translation>Ausführbare Dateien (*.exe)</translation>
     </message>
 </context>
 <context>
@@ -344,7 +346,7 @@ Are you sure to delete this profile?</source>
     <message>
         <location filename="../src/profilesmodel.cpp" line="27"/>
         <source>#%1: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>#%1: %2</translation>
     </message>
 </context>
 <context>
@@ -352,7 +354,7 @@ Are you sure to delete this profile?</source>
     <message>
         <location filename="../src/settingsdialog.cpp" line="68"/>
         <source>Please choose directory to install Ryzom in</source>
-        <translation type="unfinished"></translation>
+        <translation>Bitte wähle ein Verzeichnis, in dem Ryzom installiert werden soll.</translation>
     </message>
 </context>
 <context>
@@ -360,32 +362,32 @@ Are you sure to delete this profile?</source>
     <message>
         <location filename="../src/uninstalldialog.cpp" line="42"/>
         <source>Component</source>
-        <translation type="unfinished"></translation>
+        <translation>Komponente</translation>
     </message>
     <message>
         <location filename="../src/uninstalldialog.cpp" line="43"/>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation>Größe</translation>
     </message>
     <message>
         <location filename="../src/uninstalldialog.cpp" line="58"/>
         <source>Client for %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Client für %1</translation>
     </message>
     <message>
         <location filename="../src/uninstalldialog.cpp" line="73"/>
         <source>Profile #%1: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Profil #%1: %2</translation>
     </message>
     <message>
         <location filename="../src/uninstalldialog.cpp" line="82"/>
         <source>Installer</source>
-        <translation type="unfinished"></translation>
+        <translation>Installationsprogramm</translation>
     </message>
     <message>
         <location filename="../src/uninstalldialog.cpp" line="89"/>
         <source>Downloaded Files</source>
-        <translation type="unfinished"></translation>
+        <translation>Heruntergeladene Dateien</translation>
     </message>
 </context>
 <context>
@@ -393,7 +395,7 @@ Are you sure to delete this profile?</source>
     <message>
         <location filename="../ui/installdialog.ui" line="17"/>
         <source>Ryzom Installer</source>
-        <translation type="unfinished"></translation>
+        <translation>Ryzom Installationsprogramm</translation>
     </message>
     <message>
         <location filename="../ui/installdialog.ui" line="29"/>
@@ -402,63 +404,67 @@ Are you sure to delete this profile?</source>
 This program will allow you to download, install, configure and manage Ryzom on your computer.
 
 Just follow the  different steps and make your choice between the options presented.</source>
-        <translation type="unfinished"></translation>
+        <translation>Willkommen zum Ryzom Installationsprogramm!
+
+Dieses Programm wird es dir ermöglichen Ryzom auf deinen Computer herunterzuladen, zu installieren, zu konfigurieren und zu verwalten.
+
+Folge den verschiedenen Schritten und wähle aus den Optionen die dir angeboten werden.</translation>
     </message>
     <message>
         <location filename="../ui/installdialog.ui" line="64"/>
         <source>Show advanced parameters (expert)</source>
-        <translation type="unfinished"></translation>
+        <translation>Zeige erweiterte Parameter (Experte)</translation>
     </message>
     <message>
         <location filename="../ui/installdialog.ui" line="97"/>
         <source>Files will be installed from:</source>
-        <translation type="unfinished"></translation>
+        <translation>Dateien werden installiert von:</translation>
     </message>
     <message>
         <location filename="../ui/installdialog.ui" line="103"/>
         <source>Old installation: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Alte Installation: %1</translation>
     </message>
     <message>
         <location filename="../ui/installdialog.ui" line="118"/>
         <source>Another location: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Ein anderer Ort: %1</translation>
     </message>
     <message>
         <location filename="../ui/installdialog.ui" line="128"/>
         <location filename="../ui/installdialog.ui" line="160"/>
         <source>Browse...</source>
-        <translation type="unfinished"></translation>
+        <translation>Durchsuchen...</translation>
     </message>
     <message>
         <location filename="../ui/installdialog.ui" line="137"/>
         <source>Internet (%1 to download)</source>
-        <translation type="unfinished"></translation>
+        <translation>Internet (%1 herunterzuladen)</translation>
     </message>
     <message>
         <location filename="../ui/installdialog.ui" line="147"/>
         <source>Files will be installed to (requires 10 GiB):</source>
-        <translation type="unfinished"></translation>
+        <translation>Dateien werden installiert nach (benötigt 10GiB):</translation>
     </message>
     <message>
         <location filename="../ui/installdialog.ui" line="153"/>
         <source>c:\</source>
-        <translation type="unfinished"></translation>
+        <translation>c:\</translation>
     </message>
     <message>
         <location filename="../ui/installdialog.ui" line="170"/>
         <source>Do you prefer to use a 64 or 32 bit client?</source>
-        <translation type="unfinished"></translation>
+        <translation>Möchtest du einen 64 bit oder 32 bit Client verwenden?</translation>
     </message>
     <message>
         <location filename="../ui/installdialog.ui" line="176"/>
         <source>64 bit (recommended)</source>
-        <translation type="unfinished"></translation>
+        <translation>64 bit (empfohlen)</translation>
     </message>
     <message>
         <location filename="../ui/installdialog.ui" line="186"/>
         <source>32 bit</source>
-        <translation type="unfinished"></translation>
+        <translation>32 bit</translation>
     </message>
 </context>
 <context>
@@ -466,7 +472,7 @@ Just follow the  different steps and make your choice between the options presen
     <message>
         <location filename="../ui/mainwindow.ui" line="26"/>
         <source>Ryzom Installer</source>
-        <translation type="unfinished"></translation>
+        <translation>Ryzom Installationsprogramm</translation>
     </message>
     <message>
         <location filename="../ui/mainwindow.ui" line="48"/>
@@ -475,58 +481,62 @@ Just follow the  different steps and make your choice between the options presen
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../ui/mainwindow.ui" line="83"/>
         <source>Atys</source>
-        <translation type="unfinished"></translation>
+        <translation>Atys</translation>
     </message>
     <message>
         <location filename="../ui/mainwindow.ui" line="91"/>
         <source>Play</source>
-        <translation type="unfinished"></translation>
+        <translation>Spielen</translation>
     </message>
     <message>
         <location filename="../ui/mainwindow.ui" line="98"/>
         <source>Configure</source>
-        <translation type="unfinished"></translation>
+        <translation>Konfigurieren</translation>
     </message>
     <message>
         <location filename="../ui/mainwindow.ui" line="118"/>
         <location filename="../ui/mainwindow.ui" line="153"/>
         <source>&amp;Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Einstellungen</translation>
     </message>
     <message>
         <location filename="../ui/mainwindow.ui" line="128"/>
         <source>&amp;Help</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <location filename="../ui/mainwindow.ui" line="138"/>
         <source>About Qt</source>
-        <translation type="unfinished"></translation>
+        <translation>Über Qt</translation>
     </message>
     <message>
         <location filename="../ui/mainwindow.ui" line="143"/>
         <source>About...</source>
-        <translation type="unfinished"></translation>
+        <translation>Über...</translation>
     </message>
     <message>
         <location filename="../ui/mainwindow.ui" line="148"/>
         <source>&amp;Profiles</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Profile</translation>
     </message>
     <message>
         <location filename="../ui/mainwindow.ui" line="158"/>
         <source>&amp;Quit</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Beenden</translation>
     </message>
     <message>
         <location filename="../ui/mainwindow.ui" line="163"/>
         <source>&amp;Uninstall</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Deinstallieren</translation>
     </message>
 </context>
 <context>
@@ -534,7 +544,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../ui/migratedialog.ui" line="17"/>
         <source>Ryzom Installer</source>
-        <translation type="unfinished"></translation>
+        <translation>Ryzom Installationsprogramm</translation>
     </message>
     <message>
         <location filename="../ui/migratedialog.ui" line="26"/>
@@ -543,52 +553,56 @@ p, li { white-space: pre-wrap; }
 This program will migrate Ryzom version 2.1 to 3.0. Your files will be updated, cleaned and moved to a new location.
 
 Just press Continue button and follow the different steps until everything is done.</source>
-        <translation type="unfinished"></translation>
+        <translation>Willkommen zum Ryzom Installationsprogramm!
+
+Dieses Programm wird Ryzom 2.1 zu Ryzom 3.0 migrieren. Deine Dateien werden aktualisiert, gesäubert und an einen neuen Ort verschoben werden.
+
+Drücke Weiter und folge den verschiedenen Schritten bis zum Ende.</translation>
     </message>
     <message>
         <location filename="../ui/migratedialog.ui" line="61"/>
         <source>Show advanced parameters (expert)</source>
-        <translation type="unfinished"></translation>
+        <translation>Zeige erweiterte Parameter (Experte)</translation>
     </message>
     <message>
         <location filename="../ui/migratedialog.ui" line="94"/>
         <source>Files will be installed to (requires 10 GiB):</source>
-        <translation type="unfinished"></translation>
+        <translation>Dateien werden installiert nach (benötigt 10GiB):</translation>
     </message>
     <message>
         <location filename="../ui/migratedialog.ui" line="100"/>
         <source>c:\</source>
-        <translation type="unfinished"></translation>
+        <translation>c:\</translation>
     </message>
     <message>
         <location filename="../ui/migratedialog.ui" line="107"/>
         <source>Browse...</source>
-        <translation type="unfinished"></translation>
+        <translation>Durchsuchen...</translation>
     </message>
     <message>
         <location filename="../ui/migratedialog.ui" line="117"/>
         <source>Do you prefer to use a 64 or 32 bit client?</source>
-        <translation type="unfinished"></translation>
+        <translation>Möchtest du einen 64 bit oder 32 bit Client verwenden?</translation>
     </message>
     <message>
         <location filename="../ui/migratedialog.ui" line="123"/>
         <source>64 bit (recommended)</source>
-        <translation type="unfinished"></translation>
+        <translation>64 bit (empfohlen)</translation>
     </message>
     <message>
         <location filename="../ui/migratedialog.ui" line="133"/>
         <source>32 bit</source>
-        <translation type="unfinished"></translation>
+        <translation>32 bit</translation>
     </message>
     <message>
         <location filename="../ui/migratedialog.ui" line="161"/>
         <source>Continue</source>
-        <translation type="unfinished"></translation>
+        <translation>Weiter</translation>
     </message>
     <message>
         <location filename="../ui/migratedialog.ui" line="168"/>
         <source>Quit</source>
-        <translation type="unfinished"></translation>
+        <translation>Beenden</translation>
     </message>
 </context>
 <context>
@@ -596,17 +610,17 @@ Just press Continue button and follow the different steps until everything is do
     <message>
         <location filename="../ui/operationdialog.ui" line="35"/>
         <source>Ryzom Installer</source>
-        <translation type="unfinished"></translation>
+        <translation>Ryzom Installationsprogramm</translation>
     </message>
     <message>
         <location filename="../ui/operationdialog.ui" line="41"/>
         <source>Operation</source>
-        <translation type="unfinished"></translation>
+        <translation>Vorgang</translation>
     </message>
     <message>
         <location filename="../ui/operationdialog.ui" line="48"/>
         <source>Operation progress</source>
-        <translation type="unfinished"></translation>
+        <translation>Vorgangsfortschritt</translation>
     </message>
 </context>
 <context>
@@ -614,112 +628,112 @@ Just press Continue button and follow the different steps until everything is do
     <message>
         <location filename="../ui/profilesdialog.ui" line="14"/>
         <source>Dialog</source>
-        <translation type="unfinished"></translation>
+        <translation>Dialog</translation>
     </message>
     <message>
         <location filename="../ui/profilesdialog.ui" line="24"/>
         <source>List of profiles:</source>
-        <translation type="unfinished"></translation>
+        <translation>Liste der Profile</translation>
     </message>
     <message>
         <location filename="../ui/profilesdialog.ui" line="52"/>
         <source>Add</source>
-        <translation type="unfinished"></translation>
+        <translation>Hinzufügen</translation>
     </message>
     <message>
         <location filename="../ui/profilesdialog.ui" line="59"/>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>Löschen</translation>
     </message>
     <message>
         <location filename="../ui/profilesdialog.ui" line="72"/>
         <source>Profile:</source>
-        <translation type="unfinished"></translation>
+        <translation>Profil:</translation>
     </message>
     <message>
         <location filename="../ui/profilesdialog.ui" line="79"/>
         <source>0</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">0</translation>
     </message>
     <message>
         <location filename="../ui/profilesdialog.ui" line="86"/>
         <source>Name:</source>
-        <translation type="unfinished"></translation>
+        <translation>Name:</translation>
     </message>
     <message>
         <location filename="../ui/profilesdialog.ui" line="96"/>
         <source>Server:</source>
-        <translation type="unfinished"></translation>
+        <translation>Server:</translation>
     </message>
     <message>
         <location filename="../ui/profilesdialog.ui" line="104"/>
         <source>Atys</source>
-        <translation type="unfinished"></translation>
+        <translation>Atys</translation>
     </message>
     <message>
         <location filename="../ui/profilesdialog.ui" line="109"/>
         <source>Yubo</source>
-        <translation type="unfinished"></translation>
+        <translation>Yubo</translation>
     </message>
     <message>
         <location filename="../ui/profilesdialog.ui" line="117"/>
         <source>Executable:</source>
-        <translation type="unfinished"></translation>
+        <translation>Ausführbare Datei:</translation>
     </message>
     <message>
         <location filename="../ui/profilesdialog.ui" line="126"/>
         <source>ryzom_client_r.exe</source>
-        <translation type="unfinished"></translation>
+        <translation>ryzom_client_r.exe</translation>
     </message>
     <message>
         <location filename="../ui/profilesdialog.ui" line="133"/>
         <source>Default</source>
-        <translation type="unfinished"></translation>
+        <translation>Standard</translation>
     </message>
     <message>
         <location filename="../ui/profilesdialog.ui" line="140"/>
         <source>Browse...</source>
-        <translation type="unfinished"></translation>
+        <translation>Durchsuchen...</translation>
     </message>
     <message>
         <location filename="../ui/profilesdialog.ui" line="149"/>
         <source>Arguments:</source>
-        <translation type="unfinished"></translation>
+        <translation>Argumente:</translation>
     </message>
     <message>
         <location filename="../ui/profilesdialog.ui" line="159"/>
         <source>Comments:</source>
-        <translation type="unfinished"></translation>
+        <translation>Kommentare:</translation>
     </message>
     <message>
         <location filename="../ui/profilesdialog.ui" line="176"/>
         <source>Directory:</source>
-        <translation type="unfinished"></translation>
+        <translation>Verzeichnis:</translation>
     </message>
     <message>
         <location filename="../ui/profilesdialog.ui" line="185"/>
         <source>~/.ryzom/0</source>
-        <translation type="unfinished"></translation>
+        <translation>~/.ryzom/0</translation>
     </message>
     <message>
         <location filename="../ui/profilesdialog.ui" line="192"/>
         <source>Open</source>
-        <translation type="unfinished"></translation>
+        <translation>Öffnen</translation>
     </message>
     <message>
         <location filename="../ui/profilesdialog.ui" line="201"/>
         <source>Create shortcuts:</source>
-        <translation type="unfinished"></translation>
+        <translation>Erstelle Verknüpfungen:</translation>
     </message>
     <message>
         <location filename="../ui/profilesdialog.ui" line="210"/>
         <source>Desktop</source>
-        <translation type="unfinished"></translation>
+        <translation>Desktop</translation>
     </message>
     <message>
         <location filename="../ui/profilesdialog.ui" line="217"/>
         <source>Start Menu</source>
-        <translation type="unfinished"></translation>
+        <translation>Start Menü</translation>
     </message>
 </context>
 <context>
@@ -727,99 +741,99 @@ Just press Continue button and follow the different steps until everything is do
     <message>
         <location filename="../src/main.cpp" line="124"/>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Fehler</translation>
     </message>
     <message>
         <location filename="../src/main.cpp" line="124"/>
         <source>Unable to find ryzom_installer.ini</source>
-        <translation type="unfinished"></translation>
+        <translation>ryzom_installer.ini konnte nicht gefunden werden</translation>
     </message>
     <message>
         <location filename="../src/main.cpp" line="151"/>
         <source>Instalation and launcher tool for Ryzom</source>
-        <translation type="unfinished"></translation>
+        <translation>Installations- und Startprogramm für Ryzom</translation>
     </message>
     <message>
         <location filename="../src/main.cpp" line="156"/>
         <source>Uninstall</source>
-        <translation type="unfinished"></translation>
+        <translation>Deinstallieren</translation>
     </message>
     <message>
         <location filename="../src/main.cpp" line="159"/>
         <source>Silent mode</source>
-        <translation type="unfinished"></translation>
+        <translation>Stiller Modus</translation>
     </message>
     <message>
         <location filename="../src/filesextractor.cpp" line="300"/>
         <location filename="../src/filesextractor.cpp" line="540"/>
         <source>Unable to open %1</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 konnte nicht geöffnet werden</translation>
     </message>
     <message>
         <location filename="../src/filesextractor.cpp" line="415"/>
         <source>Unable to open output file</source>
-        <translation type="unfinished"></translation>
+        <translation>Ausgabe-Datei konnte nicht geöffnet werden</translation>
     </message>
     <message>
         <location filename="../src/filesextractor.cpp" line="424"/>
         <source>Unable to write output file</source>
-        <translation type="unfinished"></translation>
+        <translation>Ausgabe-Datei konnte nicht geschrieben werden</translation>
     </message>
     <message>
         <location filename="../src/filesextractor.cpp" line="459"/>
         <location filename="../src/filesextractor.cpp" line="467"/>
         <source>7zip decoder doesn&apos;t support this archive</source>
-        <translation type="unfinished"></translation>
+        <translation>7zip decoder unterstützt dieses Archiv nicht</translation>
     </message>
     <message>
         <location filename="../src/filesextractor.cpp" line="463"/>
         <source>Unable to allocate memory</source>
-        <translation type="unfinished"></translation>
+        <translation>Speicher konnte nicht zugewiesen werden</translation>
     </message>
     <message>
         <location filename="../src/filesextractor.cpp" line="475"/>
         <source>Error %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Fehler %1</translation>
     </message>
     <message>
         <location filename="../src/filesextractor.cpp" line="502"/>
         <source>Unable to create directory %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Verzeichnis %1 konnte nicht erstellt werden</translation>
     </message>
     <message>
         <location filename="../src/filesextractor.cpp" line="508"/>
         <source>Unable to set permissions of %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Berechtigungen für %1 konnten nicht gesetzt werden</translation>
     </message>
     <message>
         <location filename="../src/filesextractor.cpp" line="617"/>
         <source>disk full</source>
-        <translation type="unfinished"></translation>
+        <translation>Festplatte voll</translation>
     </message>
     <message>
         <location filename="../src/filesextractor.cpp" line="621"/>
         <source>unable to write %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Konnte %1 nicht schreiben</translation>
     </message>
     <message>
         <location filename="../src/filesextractor.cpp" line="625"/>
         <source>unable to read %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Konnte %1 nicht lesen</translation>
     </message>
     <message>
         <location filename="../src/filesextractor.cpp" line="629"/>
         <source>failed (%1)</source>
-        <translation type="unfinished"></translation>
+        <translation>Fehlgeschlagen (%1)</translation>
     </message>
     <message>
         <location filename="../src/filesextractor.cpp" line="632"/>
         <source>Unable to unpack %1 to %2: %3</source>
-        <translation type="unfinished"></translation>
+        <translation>Konnte %1 nicht nach %2 entpacken: %3</translation>
     </message>
     <message>
         <location filename="../src/filescopier.cpp" line="189"/>
         <source>Unable to copy file %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Konnte Datei %1 nicht kopieren</translation>
     </message>
 </context>
 <context>
@@ -827,32 +841,32 @@ Just press Continue button and follow the different steps until everything is do
     <message>
         <location filename="../src/utils.cpp" line="26"/>
         <source>B</source>
-        <translation type="unfinished"></translation>
+        <translation>B</translation>
     </message>
     <message>
         <location filename="../src/utils.cpp" line="27"/>
         <source>KiB</source>
-        <translation type="unfinished"></translation>
+        <translation>KiB</translation>
     </message>
     <message>
         <location filename="../src/utils.cpp" line="28"/>
         <source>MiB</source>
-        <translation type="unfinished"></translation>
+        <translation>MiB</translation>
     </message>
     <message>
         <location filename="../src/utils.cpp" line="29"/>
         <source>GiB</source>
-        <translation type="unfinished"></translation>
+        <translation>GiB</translation>
     </message>
     <message>
         <location filename="../src/utils.cpp" line="30"/>
         <source>TiB</source>
-        <translation type="unfinished"></translation>
+        <translation>TiB</translation>
     </message>
     <message>
         <location filename="../src/utils.cpp" line="31"/>
         <source>PiB</source>
-        <translation type="unfinished"></translation>
+        <translation>PiB</translation>
     </message>
 </context>
 <context>
@@ -860,43 +874,43 @@ Just press Continue button and follow the different steps until everything is do
     <message>
         <location filename="../ui/settingsdialog.ui" line="14"/>
         <source>Dialog</source>
-        <translation type="unfinished"></translation>
+        <translation>Dialog</translation>
     </message>
     <message>
         <location filename="../ui/settingsdialog.ui" line="22"/>
         <source>Use 64 bit client</source>
-        <translation type="unfinished"></translation>
+        <translation>Benutze 64 Client</translation>
     </message>
     <message>
         <location filename="../ui/settingsdialog.ui" line="29"/>
         <source>Base location of Ryzom files:</source>
-        <translation type="unfinished"></translation>
+        <translation>Basisverzeichnis der Ryzom-Dateien:</translation>
     </message>
     <message>
         <location filename="../ui/settingsdialog.ui" line="36"/>
         <source>Language</source>
-        <translation type="unfinished"></translation>
+        <translation>Sprache</translation>
     </message>
     <message>
         <location filename="../ui/settingsdialog.ui" line="43"/>
         <location filename="../ui/settingsdialog.ui" line="50"/>
         <source>Browse...</source>
-        <translation type="unfinished"></translation>
+        <translation>Durchsuchen...</translation>
     </message>
     <message>
         <location filename="../ui/settingsdialog.ui" line="57"/>
         <source>Location of source Ryzom files:</source>
-        <translation type="unfinished"></translation>
+        <translation>Ort der Ryzom Quelldateien:</translation>
     </message>
     <message>
         <location filename="../ui/settingsdialog.ui" line="64"/>
         <source>D:\Ryzom</source>
-        <translation type="unfinished"></translation>
+        <translation>D:\Ryzom</translation>
     </message>
     <message>
         <location filename="../ui/settingsdialog.ui" line="71"/>
         <source>E:\Ryzom</source>
-        <translation type="unfinished"></translation>
+        <translation>E:\Ryzom</translation>
     </message>
 </context>
 <context>
@@ -904,27 +918,27 @@ Just press Continue button and follow the different steps until everything is do
     <message>
         <location filename="../ui/uninstalldialog.ui" line="17"/>
         <source>Ryzom Installer</source>
-        <translation type="unfinished"></translation>
+        <translation>Ryzom Installationsprogramm</translation>
     </message>
     <message>
         <location filename="../ui/uninstalldialog.ui" line="37"/>
         <source>You&apos;re about to uninstall some or all components of Ryzom. Please check each component you want to remove (Warning, it cannot be undone).</source>
-        <translation type="unfinished"></translation>
+        <translation>Du bist dabei einige oder alle Komponenten von Ryzom zu deinstallieren. Bitte überprüfe jede Komponente, die du entfernen möchtest (Warnung: dies kann nicht rückgängig gemacht werden).</translation>
     </message>
     <message>
         <location filename="../ui/uninstalldialog.ui" line="66"/>
         <source>Components to remove</source>
-        <translation type="unfinished"></translation>
+        <translation>Zu entfernende Komponenten</translation>
     </message>
     <message>
         <location filename="../ui/uninstalldialog.ui" line="108"/>
         <source>Uninstall</source>
-        <translation type="unfinished"></translation>
+        <translation>Deinstallieren</translation>
     </message>
     <message>
         <location filename="../ui/uninstalldialog.ui" line="118"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Abbrechen</translation>
     </message>
 </context>
 </TS>