updated translations

deploy.json

@@ -0,0 +1,20 @@
+{
+	"title": "QtMvvm",
+	"description": "A mvvm oriented library for Qt, to create Projects for Widgets and Quick in parallel.",
+	"modules": [
+		"QtMvvmCore",
+		"QtMvvmWidgets",
+		"QtMvvmQuick",
+		"QtMvvmDataSyncCore",
+		"QtMvvmDataSyncWidgets",
+		"QtMvvmDataSyncQuick"
+	],
+	"dependencies": [
+		".skycoder42.datasync"
+	],
+	"excludes": [ "static" ],
+	"license": {
+		"name": "BSD-3-Clause",
+		"path": "LICENSE"
+	}
+}

examples/mvvmcore/SampleCore/samplecore_de.ts

@@ -81,32 +81,32 @@
 <context>
     <name>qtmvvm_settings_xml</name>
     <message>
-        <location filename=".ts-dummy/settings.tsdummy.cpp" line="+4"/>
+        <location filename=".ts-dummy/settings.tsdummy.cpp" line="+29"/>
         <source>property</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-22"/>
         <source>Text 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+12"/>
         <source>Value C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+12"/>
         <source>Value A</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-20"/>
         <source>Another Section</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+23"/>
         <source>Value B</source>
         <translation type="unfinished"></translation>
     </message>
@@ -116,127 +116,132 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-8"/>
         <source>Value B+C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+6"/>
         <source>Variant A</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-23"/>
         <source>This is a tooltip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+7"/>
         <source>Variant C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-1"/>
         <source>Value A+B</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="-8"/>
+        <source>Non existing type</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>Sub-Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+4"/>
         <source>&amp;Check me</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+23"/>
         <source>Enter a &amp;value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-21"/>
         <source>The value must be between 0 and 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-9"/>
         <source>Open &amp;system settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+18"/>
         <source>Another main category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-20"/>
         <source>Value A+C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+19"/>
         <source>Variant B</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+5"/>
         <source>Choose a &amp;font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-7"/>
         <source>This is another section</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+4"/>
         <source>bool</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+5"/>
         <source>Select a &amp;mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-12"/>
         <source>I am a checkbox!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-6"/>
         <source>Value A+B+C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+20"/>
         <source>Enter a &amp;number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-12"/>
         <source>You can use this to trigger whatever kind of action you need</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+6"/>
         <source>Text 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-12"/>
         <source>Enter a &amp;website</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-9"/>
         <source>Enter a &amp;name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+17"/>
         <source>https://example.org/test</source>
         <translation type="unfinished"></translation>
     </message>

src/mvvmcore/coreapp.cpp

@@ -152,10 +152,6 @@ void CoreApp::showImp(const QMetaObject *metaObject, const QVariantHash &params)
 bool CoreAppPrivate::bootEnabled = true;
 QPointer<CoreApp> CoreAppPrivate::instance = nullptr;
 
-CoreAppPrivate::CoreAppPrivate() :
-	presenter(nullptr)
-{}
-
 QScopedPointer<CoreAppPrivate> &CoreAppPrivate::dInstance()
 {
 	return instance->d;

src/mvvmcore/coreapp_p.h

@@ -24,12 +24,10 @@ public Q_SLOTS:
 	void showDialog(const QtMvvm::MessageConfig &config, QtMvvm::MessageResult *result);
 
 private:
-	CoreAppPrivate();
-
 	static bool bootEnabled;
 	static QPointer<CoreApp> instance;
 
-	IPresenter *presenter;
+	IPresenter *presenter = nullptr;
 };
 
 }

src/mvvmcore/message.cpp

@@ -287,16 +287,6 @@ QtMvvm::MessageConfigPrivate::MessageConfigPrivate(const QtMvvm::MessageConfigPr
 	editProperties(other.editProperties)
 {}
 
-
-
-MessageResultPrivate::MessageResultPrivate() :
-	closeObject(nullptr),
-	closeMethod(),
-	closeRequested(false),
-	result(),
-	autoDelete(true)
-{}
-
 // ------------- Namespace methods implementation -------------
 
 MessageResult *QtMvvm::information(const QString &title, const QString &text, const QString &okText)

src/mvvmcore/message_p.h

@@ -29,13 +29,11 @@ public:
 class MessageResultPrivate
 {
 public:
-	MessageResultPrivate();
-
 	QPointer<QObject> closeObject;
 	QMetaMethod closeMethod;
-	bool closeRequested;
+	bool closeRequested = false;
 	QVariant result;
-	bool autoDelete;
+	bool autoDelete = true;
 };
 
 }

src/mvvmcore/serviceregistry.cpp

@@ -58,11 +58,6 @@ QObject *ServiceRegistry::serviceObj(const QByteArray &iid)
 
 // ------------- Private Implementation -------------
 
-ServiceRegistryPrivate::ServiceRegistryPrivate() :
-	serviceMutex(),
-	services()
-{}
-
 bool ServiceRegistryPrivate::serviceBlocked(const QByteArray &iid) const
 {
 	auto svc = services.value(iid);

src/mvvmcore/serviceregistry_p.h

@@ -54,8 +54,6 @@ public:
 	QMutex serviceMutex;
 	QHash<QByteArray, QSharedPointer<ServiceInfo>> services;
 
-	ServiceRegistryPrivate();
-
 	bool serviceBlocked(const QByteArray &iid) const;
 	static QObject *constructInjected(const QMetaObject *metaObject);
 	QObject *constructInjectedLocked(const QMetaObject *metaObject);

src/mvvmcore/translations/qtmvvmcore_de.ts

@@ -4,39 +4,39 @@
 <context>
     <name>MessageConfig</name>
     <message>
-        <location filename="../message.cpp" line="+414"/>
+        <location filename="../message.cpp" line="+404"/>
         <source>%1 — Version %2</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 — Version %2</translation>
     </message>
     <message>
         <location line="+14"/>
         <source> (Built with %1)</source>
-        <translation type="unfinished"></translation>
+        <translation> (Erstellt mit %1)</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Qt-Version: &lt;a href=&quot;https://www.qt.io/&quot;&gt;%1&lt;/a&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>Qt-Version: &lt;a href=&quot;https://www.qt.io/&quot;&gt;%1&lt;/a&gt;</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Developed by: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Entwickelt von: %1</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Project Website: &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>Projekt Website: &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt;</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>License: &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>Lizenz: &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt;</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>License: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Lizenz: %1</translation>
     </message>
 </context>
 <context>
@@ -44,17 +44,17 @@
     <message>
         <location filename="../coreapp.cpp" line="+107"/>
         <source>Help</source>
-        <translation type="unfinished"></translation>
+        <translation>Hilfe</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Application Version</source>
-        <translation type="unfinished"></translation>
+        <translation>Anwendungs-Version</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Invalid Arguments</source>
-        <translation type="unfinished"></translation>
+        <translation>Ungültige Argumente</translation>
     </message>
 </context>
 <context>
@@ -62,12 +62,12 @@
     <message>
         <location filename="../settingssetuploader.cpp" line="+275"/>
         <source>General Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Allgemeine Einstellungen</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>General</source>
-        <translation type="unfinished"></translation>
+        <translation>Allgemein</translation>
     </message>
 </context>
 <context>
@@ -75,12 +75,12 @@
     <message>
         <location filename="../settingsviewmodel.cpp" line="+35"/>
         <source>Restore Defaults?</source>
-        <translation type="unfinished"></translation>
+        <translation>Standards wiederherstellen?</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>All custom changes will be deleted and the defaults restored. &lt;i&gt;This cannot be undone!&lt;/i&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>Alle angepassten Einstellungen werde gelöscht und auf ihre Standardwerte zurückgesetzt. &lt;i&gt;Dies kann nicht rückgängig gemacht werden!&lt;/i&gt;</translation>
     </message>
 </context>
 </TS>

src/mvvmcore/translations/qtmvvmcore_template.ts

@@ -4,7 +4,7 @@
 <context>
     <name>MessageConfig</name>
     <message>
-        <location filename="../message.cpp" line="+414"/>
+        <location filename="../message.cpp" line="+404"/>
         <source>%1 — Version %2</source>
         <translation type="unfinished"></translation>
     </message>

src/mvvmdatasynccore/accountmodel.cpp

@@ -166,12 +166,3 @@ void AccountModel::update(SyncManager::SyncState state)
 		reload();
 	}
 }
-
-// ------------- Private Implementation -------------
-
-AccountModelPrivate::AccountModelPrivate() :
-	accountManager(nullptr),
-	syncManager(nullptr),
-	devices(),
-	reloaded(true)
-{}

src/mvvmdatasynccore/accountmodel_p.h

@@ -9,12 +9,10 @@ namespace QtMvvm {
 class AccountModelPrivate
 {
 public:
-	AccountModelPrivate();
-
-	QtDataSync::AccountManager *accountManager;
-	QtDataSync::SyncManager *syncManager;
+	QtDataSync::AccountManager *accountManager = nullptr;
+	QtDataSync::SyncManager *syncManager = nullptr;
 	QList<QtDataSync::DeviceInfo> devices;
-	bool reloaded;
+	bool reloaded = true;
 };
 
 }

src/mvvmdatasynccore/datasyncviewmodel.cpp

@@ -151,7 +151,7 @@ void DataSyncViewModel::startImport()
 
 			if(!device->open(QIODevice::ReadOnly | QIODevice::Text)) {
 				critical(tr("Import failed"),
-						 tr("Failed to open URL \"%1\" with error: %1")
+						 tr("Failed to open URL \"%1\" with error: %2")
 						 .arg(url.toString())
 						 .arg(device->errorString()));
 				return;
@@ -405,7 +405,7 @@ void DataSyncViewModelPrivate::performExport(bool trusted, bool includeServer, c
 
 			if(!device->open(QIODevice::WriteOnly | QIODevice::Text)) {
 				critical(DataSyncViewModel::tr("Export failed"),
-						 DataSyncViewModel::tr("Failed to open URL \"%1\" with error: %1")
+						 DataSyncViewModel::tr("Failed to open URL \"%1\" with error: %2")
 						 .arg(url.toString())
 						 .arg(device->errorString()));
 				return;

src/mvvmdatasynccore/translations/qtmvvmdatasynccore_de.ts

@@ -4,170 +4,261 @@
 <context>
     <name>QtMvvm::AccountModel</name>
     <message>
-        <location filename="../accountmodel.cpp" line="+50"/>
+        <location filename="../accountmodel.cpp" line="+57"/>
         <source>Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Name</translation>
     </message>
     <message>
         <location line="+2"/>
         <location line="+7"/>
         <source>Fingerprint</source>
-        <translation type="unfinished"></translation>
+        <translation>Fingerabdruck</translation>
+    </message>
+</context>
+<context>
+    <name>QtMvvm::ChangeRemoteViewModel</name>
+    <message>
+        <location filename="../changeremoteviewmodel.cpp" line="+20"/>
+        <source>Key</source>
+        <translation>Schlüssel</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Value</source>
+        <translation>Wert</translation>
     </message>
 </context>
 <context>
     <name>QtMvvm::DataSyncViewModel</name>
     <message>
-        <location filename="../datasyncviewmodel.cpp" line="+75"/>
+        <location filename="../datasyncviewmodel.cpp" line="+82"/>
         <source>Connecting…</source>
-        <translation type="unfinished"></translation>
+        <translation>Verbinde…</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Downloading…</source>
-        <translation type="unfinished"></translation>
+        <translation>Lade herunter…</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Uploading…</source>
-        <translation type="unfinished"></translation>
+        <translation>Lade hoch…</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Synchronized</source>
-        <translation type="unfinished"></translation>
+        <translation>Synchronisiert</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Error!</source>
-        <translation type="unfinished"></translation>
+        <translation>Fehler!</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Disconnected</source>
-        <translation type="unfinished"></translation>
+        <translation>Verbindung getrennt</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+39"/>
+        <source>Export account data to file:</source>
+        <translation>Account-Daten in Datei exportieren:</translation>
+    </message>
+    <message>
+        <location line="+17"/>
         <location line="+5"/>
-        <location line="+286"/>
+        <location line="+296"/>
+        <location filename="../networkexchangeviewmodel.cpp" line="+166"/>
         <source>Import failed</source>
-        <translation type="unfinished"></translation>
+        <translation>Import fehlgeschlagen</translation>
     </message>
     <message>
-        <location line="-291"/>
-        <location line="+244"/>
+        <location line="-301"/>
+        <location line="+254"/>
         <source>Unsupported URL Scheme: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Nicht unterstütztes URL-Schema: %1</translation>
     </message>
     <message>
         <location line="-238"/>
-        <location line="+244"/>
-        <source>Failed to open URL &quot;%1&quot; with error: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-234"/>
         <location line="+24"/>
         <location line="+20"/>
         <source>Import account data</source>
-        <translation type="unfinished"></translation>
+        <translation>Account-Daten-Import fehlgeschlagen</translation>
     </message>
     <message>
         <location line="-43"/>
         <source>Enter the password to decrypt the account data. Then choose whether you want to keep you local data or not:</source>
-        <translation type="unfinished"></translation>
+        <translation>Geben Sie das Passwort zum Entschlüsseln der Daten ein. Danach wählen Sie, ob Sie Ihre aktuellen Daten behalten möchten, oder nicht:</translation>
     </message>
     <message>
         <location line="+3"/>
         <location line="+23"/>
         <location line="+31"/>
         <source>Reset data</source>
-        <translation type="unfinished"></translation>
+        <translation>Daten zurücksetzen</translation>
     </message>
     <message>
         <location line="-53"/>
         <location line="+23"/>
         <location line="+31"/>
         <source>Keep data</source>
-        <translation type="unfinished"></translation>
+        <translation>Daten behalten</translation>
     </message>
     <message>
         <location line="-34"/>
         <source>Keep the local data after changing the account?</source>
-        <translation type="unfinished"></translation>
+        <translation>Lokale Daten nach Account-Wechsel behalten?</translation>
     </message>
     <message>
         <location line="+27"/>
         <source>Reset Account?</source>
-        <translation type="unfinished"></translation>
+        <translation>Account zurücksetzen?</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Do you want to reset your account? You will loose the connection to all other devices and get a new identity. You can either keep your data or reset it as well. This cannot be undone!</source>
-        <translation type="unfinished"></translation>
+        <translation>Möchten Sie Ihren Account zurücksetzen? Alle Verbindungen zu anderen Geräten werden gelöscht und Sie erhalten eine neue Identität. Sie können dabei entweder Ihre Daten behalten oder diese ebenfalls zurücksetzen. Dies kann nicht rückgängig gemacht werden!</translation>
     </message>
     <message>
         <location line="+57"/>
         <source>Login requested!</source>
-        <translation type="unfinished"></translation>
+        <translation>Login angefordert!</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>&lt;p&gt;A device wants to log into your account:&lt;/p&gt;&lt;p&gt;Name: %1&lt;br/&gt;Fingerprint: %2&lt;/p&gt;&lt;p&gt;Do you want accept the request?&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Ein Gerät möchte zugriff auf Ihre Account:&lt;/p&gt;&lt;p&gt;Name: %1&lt;br/&gt;Fingerabdruck: %2&lt;/p&gt;&lt;p&gt;Möchten Sie die Anfrage akzeptieren?&lt;/p&gt;</translation>
     </message>
     <message>
         <location line="+19"/>
         <source>Import accepted</source>
-        <translation type="unfinished"></translation>
+        <translation>Import akzeptiert</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>The partner has accepted the import. You are now logged in.</source>
-        <translation type="unfinished"></translation>
+        <translation>Der Partner hat den Import akzeptiert. Sie sind nun eingeloggt.</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Account access granted</source>
-        <translation type="unfinished"></translation>
+        <translation>Zugriff auf Account gewährt</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>&lt;p&gt;Account access has been granted to device:&lt;/p&gt;&lt;p&gt;Name: %1&lt;br/&gt;Fingerprint: %2&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Der Account-Zugriff wurde gewährt für das Gerät:&lt;/p&gt;&lt;p&gt;Name: %1&lt;br/&gt;Fingerabdruck: %2&lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+92"/>
         <location line="+6"/>
         <location line="+19"/>
         <source>Export failed</source>
-        <translation type="unfinished"></translation>
+        <translation>Export fehlgeschlagen</translation>
     </message>
     <message>
-        <location line="-6"/>
+        <location line="-272"/>
+        <location line="+254"/>
+        <source>Failed to open URL &quot;%1&quot; with error: %2</source>
+        <translation>URL \&quot;%1\&quot; konnte nicht göffnet werden. Fehlermeldung: %2</translation>
+    </message>
+    <message>
+        <location line="+12"/>
         <source>Export completed</source>
-        <translation type="unfinished"></translation>
+        <translation>Export abgeschlossen</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Data was successfully exported.</source>
-        <translation type="unfinished"></translation>
+        <translation>Daten wurden erfolgreich exportiert.</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Export account data</source>
-        <translation type="unfinished"></translation>
+        <translation>Account-Daten exportieren</translation>
     </message>
     <message>
         <location line="+12"/>
+        <location filename="../networkexchangeviewmodel.cpp" line="-3"/>
         <source>Import completed</source>
-        <translation type="unfinished"></translation>
+        <translation>Import abgeschlossen</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../networkexchangeviewmodel.cpp" line="+1"/>
         <source>Data was successfully imported.</source>
-        <translation type="unfinished"></translation>
+        <translation>Daten wurden erfolgreich importiert.</translation>
+    </message>
+</context>
+<context>
+    <name>QtMvvm::ExchangeDevicesModel</name>
+    <message>
+        <location filename="../exchangedevicesmodel.cpp" line="+41"/>
+        <source>Name</source>
+        <translation>Name</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Host</source>
+        <translation>Host</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Port</source>
+        <translation>Port</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+7"/>
+        <source>Address</source>
+        <translation>Adresse</translation>
+    </message>
+    <message>
+        <location line="+68"/>
+        <source>%1:%2</source>
+        <translation>%1:%2</translation>
+    </message>
+</context>
+<context>
+    <name>QtMvvm::NetworkExchangeViewModel</name>
+    <message>
+        <location filename="../networkexchangeviewmodel.cpp" line="-90"/>
+        <source>Export accont data to device &quot;%1&quot; with address &quot;%1&quot;:</source>
+        <translation>Daten werden exportiert zu Gerät &quot;%1&quot; mit Addresse &quot;%1&quot;:</translation>
+    </message>
+    <message>
+        <location line="+79"/>
+        <source>Network exchange error</source>
+        <translation>Netzwerk-Austausch fehlgeschlagen</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <location line="+26"/>
+        <source>Import account data</source>
+        <translation>Account-Daten importieren</translation>
+    </message>
+    <message>
+        <location line="-25"/>
+        <source>Enter the password to decrypt the account data received from &quot;%1&quot; with address &quot;%2&quot;. Then choose whether you want to keep you local data or not:</source>
+        <translation>Geben Sie das Passwort zum Entschlüsseln der Account-Daten, welchen vom Gerät &quot;%1&quot; mit der Adresse &quot;%2&quot; empfangen wurden, ein. Danach wählen Sie, ob Sie Ihre aktuellen Daten behalten möchten, oder nicht:</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location line="+26"/>
+        <source>Reset data</source>
+        <translation>Daten zurücksetzen</translation>
+    </message>
+    <message>
+        <location line="-25"/>
+        <location line="+26"/>
+        <source>Keep data</source>
+        <translation>Daten behalten</translation>
+    </message>
+    <message>
+        <location line="-6"/>
+        <source>Do you want to import data received from &quot;%1&quot; with address &quot;%2&quot;? Keep the local data after changing the account?</source>
+        <translation>Möchten Sie die Account-Daten, welchen vom Gerät &quot;%1&quot; mit der Adresse &quot;%2&quot; empfangen wurden, importieren? Wählen Sie, ob Sie Ihre aktuellen Daten behalten möchten, oder nicht?</translation>
     </message>
 </context>
 </TS>

src/mvvmdatasynccore/translations/qtmvvmdatasynccore_template.ts

@@ -4,7 +4,7 @@
 <context>
     <name>QtMvvm::AccountModel</name>
     <message>
-        <location filename="../accountmodel.cpp" line="+50"/>
+        <location filename="../accountmodel.cpp" line="+57"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15,10 +15,23 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>QtMvvm::ChangeRemoteViewModel</name>
+    <message>
+        <location filename="../changeremoteviewmodel.cpp" line="+20"/>
+        <source>Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Value</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>QtMvvm::DataSyncViewModel</name>
     <message>
-        <location filename="../datasyncviewmodel.cpp" line="+75"/>
+        <location filename="../datasyncviewmodel.cpp" line="+82"/>
         <source>Connecting…</source>
         <translation type="unfinished"></translation>
     </message>
@@ -48,26 +61,26 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+39"/>
+        <source>Export account data to file:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
         <location line="+5"/>
-        <location line="+286"/>
+        <location line="+296"/>
+        <location filename="../networkexchangeviewmodel.cpp" line="+166"/>
         <source>Import failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-291"/>
-        <location line="+244"/>
+        <location line="-301"/>
+        <location line="+254"/>
         <source>Unsupported URL Scheme: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-238"/>
-        <location line="+244"/>
-        <source>Failed to open URL &quot;%1&quot; with error: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-234"/>
         <location line="+24"/>
         <location line="+20"/>
         <source>Import account data</source>
@@ -138,14 +151,20 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+92"/>
         <location line="+6"/>
         <location line="+19"/>
         <source>Export failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-6"/>
+        <location line="-272"/>
+        <location line="+254"/>
+        <source>Failed to open URL &quot;%1&quot; with error: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
         <source>Export completed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -161,13 +180,85 @@
     </message>
     <message>
         <location line="+12"/>
+        <location filename="../networkexchangeviewmodel.cpp" line="-3"/>
         <source>Import completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../networkexchangeviewmodel.cpp" line="+1"/>
         <source>Data was successfully imported.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>QtMvvm::ExchangeDevicesModel</name>
+    <message>
+        <location filename="../exchangedevicesmodel.cpp" line="+41"/>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Host</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+7"/>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+68"/>
+        <source>%1:%2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QtMvvm::NetworkExchangeViewModel</name>
+    <message>
+        <location filename="../networkexchangeviewmodel.cpp" line="-90"/>
+        <source>Export accont data to device &quot;%1&quot; with address &quot;%1&quot;:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+79"/>
+        <source>Network exchange error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <location line="+26"/>
+        <source>Import account data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-25"/>
+        <source>Enter the password to decrypt the account data received from &quot;%1&quot; with address &quot;%2&quot;. Then choose whether you want to keep you local data or not:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location line="+26"/>
+        <source>Reset data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-25"/>
+        <location line="+26"/>
+        <source>Keep data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-6"/>
+        <source>Do you want to import data received from &quot;%1&quot; with address &quot;%2&quot;? Keep the local data after changing the account?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>

src/mvvmdatasyncquick/translations/qtmvvmdatasyncquick_de.ts

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="de_DE">
+</TS>

src/mvvmdatasyncquick/translations/qtmvvmdatasyncquick_template.ts

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
+</TS>

src/mvvmdatasyncwidgets/changeremotedialog.ui

@@ -209,7 +209,7 @@
     <string>A&amp;dd Header</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+Ins</string>
+    <string notr="true">Ctrl+Ins</string>
    </property>
   </action>
   <action name="action_Remove_Header">
@@ -221,7 +221,7 @@
     <string>&amp;Remove Selected Header</string>
    </property>
    <property name="shortcut">
-    <string>Del</string>
+    <string notr="true">Del</string>
    </property>
   </action>
  </widget>

src/mvvmdatasyncwidgets/datasyncwindow.ui

@@ -249,7 +249,7 @@
     <string>&amp;Import from file</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+I</string>
+    <string notr="true">Ctrl+I</string>
    </property>
   </action>
   <action name="action_Export_to_file">
@@ -261,7 +261,7 @@
     <string>&amp;Export to file</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+E</string>
+    <string notr="true">Ctrl+E</string>
    </property>
   </action>
   <action name="action_Network_exchange">
@@ -273,7 +273,7 @@
     <string>&amp;Network exchange</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+N</string>
+    <string notr="true">Ctrl+N</string>
    </property>
   </action>
   <action name="action_Reset_Identity">
@@ -284,6 +284,9 @@
    <property name="text">
     <string>Rese&amp;t identity</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="action_Change_Remote_Server">
    <property name="icon">
@@ -293,6 +296,9 @@
    <property name="text">
     <string>&amp;Change remote server</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="action_Remove_Device">
    <property name="icon">
@@ -303,7 +309,7 @@
     <string>&amp;Remove selected device</string>
    </property>
    <property name="shortcut">
-    <string>Del</string>
+    <string notr="true">Del</string>
    </property>
   </action>
   <action name="actionEdit_Identity">
@@ -315,7 +321,7 @@
     <string>&amp;Identity</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+U</string>
+    <string notr="true">Ctrl+U</string>
    </property>
   </action>
   <action name="actionUpdate_Exchange_Key">
@@ -326,6 +332,9 @@
    <property name="text">
     <string>Update exchange &amp;key</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="actionRe_load_Device_List">
    <property name="icon">
@@ -336,7 +345,7 @@
     <string>Re&amp;load device list</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+R</string>
+    <string notr="true">Ctrl+R</string>
    </property>
   </action>
  </widget>

src/mvvmdatasyncwidgets/translations/qtmvvmdatasyncwidgets_de.ts

@@ -1,125 +1,214 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
 <TS version="2.1" language="de_DE">
+<context>
+    <name>ChangeRemoteDialog</name>
+    <message>
+        <location filename="../changeremotedialog.ui" line="+14"/>
+        <source>Change Remote</source>
+        <translation>Server wechseln</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>&amp;Url:</source>
+        <translation>&amp;Url:</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>wss://example.org/qdsapp/</source>
+        <translation>wss://example.org/qdsapp/</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&amp;Access Key:</source>
+        <translation>&amp;Zugangschlüssel:</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Optional access secret</source>
+        <translation>Optionaler Zugangschlüssel</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Keep-&amp;Alive Timeout:</source>
+        <translation>Keep-&amp;Alive Timeout:</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source> min</source>
+        <translation> min</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&amp;Keep data:</source>
+        <translation>Daten &amp;behalten:</translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>Extra &amp;Headers:</source>
+        <translation>Zusätzliche &amp;Header:</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Header Key</source>
+        <translation>Header Schlüssel</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Header Value</source>
+        <translation>Header Wert</translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>A&amp;dd Header</source>
+        <translation>Header h&amp;inzufügen</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>&amp;Remove Selected Header</source>
+        <translation>Ausgewählten Header &amp;entfernen</translation>
+    </message>
+</context>
 <context>
     <name>DataSyncWindow</name>
     <message>
         <location filename="../datasyncwindow.ui" line="+14"/>
         <source>Synchronization</source>
-        <translation type="unfinished"></translation>
+        <translation>Synchronisation</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Synchronization &amp;enabled</source>
-        <translation type="unfinished"></translation>
+        <translation>Synchronisation &amp;aktiv</translation>
     </message>
     <message>
         <location line="+29"/>
         <source>&amp;Synchronize</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Synchronisieren</translation>
     </message>
     <message>
-        <location line="+153"/>
+        <location line="+177"/>
         <source>Account &amp;actions</source>
-        <translation type="unfinished"></translation>
+        <translation>Account-A&amp;ktionen</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>&amp;Import from file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Ctrl+I</source>
-        <translation type="unfinished"></translation>
+        <translation>Von Datei &amp;importieren</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+12"/>
         <source>&amp;Export to file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Ctrl+E</source>
-        <translation type="unfinished"></translation>
+        <translation>In Datei &amp;exportieren</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+12"/>
         <source>&amp;Network exchange</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Netzwerk-Austausch</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Ctrl+N</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+9"/>
+        <location line="+12"/>
         <source>Rese&amp;t identity</source>
-        <translation type="unfinished"></translation>
+        <translation>Identität &amp;zurücksetzen</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+12"/>
         <source>&amp;Change remote server</source>
-        <translation type="unfinished"></translation>
+        <translation>Server &amp;wechseln</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+12"/>
         <source>&amp;Remove selected device</source>
-        <translation type="unfinished"></translation>
+        <translation>Ausgewählten Gerät ent&amp;fernen</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Del</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+9"/>
+        <location line="+12"/>
         <source>&amp;Identity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Ctrl+U</source>
-        <translation type="unfinished"></translation>
+        <translation>I&amp;dentität</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+12"/>
         <source>Update exchange &amp;key</source>
-        <translation type="unfinished"></translation>
+        <translation>Daten-Schlüssel akt&amp;ualisieren</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+12"/>
         <source>Re&amp;load device list</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Ctrl+R</source>
-        <translation type="unfinished"></translation>
+        <translation>Geräte-List neu &amp;laden</translation>
     </message>
 </context>
 <context>
     <name>ExportSetupDialog</name>
     <message>
         <location filename="../exportsetupdialog.ui" line="+14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"></translation>
+        <source>Configure Export</source>
+        <translation>Export konfigurieren</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>&amp;Trusted:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Vertraut:</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Include &amp;Server:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Server einschließen:</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>&amp;Password</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Passwort</translation>
+    </message>
+</context>
+<context>
+    <name>IdentityEditDialog</name>
+    <message>
+        <location filename="../identityeditdialog.ui" line="+14"/>
+        <source>Edit Identity</source>
+        <translation>Identität bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Device &amp;Name:</source>
+        <translation>Geräte-&amp;Name:</translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>Device Fingerprint:</source>
+        <translation>Geräte-Fingerabdruck:</translation>
+    </message>
+</context>
+<context>
+    <name>NetworkExchangeWindow</name>
+    <message>
+        <location filename="../networkexchangewindow.ui" line="+14"/>
+        <source>Network Exchange</source>
+        <translation>Netzwerk-Austausch</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Exchange &amp;Port:</source>
+        <translation>Service-&amp;Port:</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Random</source>
+        <translation>Zufällig</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Device &amp;Name:</source>
+        <translation>Geräte-&amp;Name:</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Name shown to other devices</source>
+        <translation>Wird anderen Teilnehmern angezeigt</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>&amp;Exchange active:</source>
+        <translation>&amp;Austausch aktiv:</translation>
     </message>
 </context>
 </TS>

src/mvvmdatasyncwidgets/translations/qtmvvmdatasyncwidgets_template.ts

@@ -1,6 +1,74 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
 <TS version="2.1">
+<context>
+    <name>ChangeRemoteDialog</name>
+    <message>
+        <location filename="../changeremotedialog.ui" line="+14"/>
+        <source>Change Remote</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>&amp;Url:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>wss://example.org/qdsapp/</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&amp;Access Key:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Optional access secret</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Keep-&amp;Alive Timeout:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source> min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&amp;Keep data:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>Extra &amp;Headers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Header Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Header Value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>A&amp;dd Header</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>&amp;Remove Selected Header</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>DataSyncWindow</name>
     <message>
@@ -19,7 +87,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+153"/>
+        <location line="+177"/>
         <source>Account &amp;actions</source>
         <translation type="unfinished"></translation>
     </message>
@@ -29,96 +97,117 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Ctrl+I</source>
+        <location line="+12"/>
+        <source>&amp;Export to file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>&amp;Export to file</source>
+        <location line="+12"/>
+        <source>&amp;Network exchange</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Ctrl+E</source>
+        <location line="+12"/>
+        <source>Rese&amp;t identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>&amp;Network exchange</source>
+        <location line="+12"/>
+        <source>&amp;Change remote server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Ctrl+N</source>
+        <location line="+12"/>
+        <source>&amp;Remove selected device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>Rese&amp;t identity</source>
+        <location line="+12"/>
+        <source>&amp;Identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>&amp;Change remote server</source>
+        <location line="+12"/>
+        <source>Update exchange &amp;key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>&amp;Remove selected device</source>
+        <location line="+12"/>
+        <source>Re&amp;load device list</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>ExportSetupDialog</name>
     <message>
-        <location line="+3"/>
-        <source>Del</source>
+        <location filename="../exportsetupdialog.ui" line="+14"/>
+        <source>Configure Export</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>&amp;Identity</source>
+        <location line="+12"/>
+        <source>&amp;Trusted:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Include &amp;Server:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Ctrl+U</source>
+        <location line="+16"/>
+        <source>&amp;Password</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>IdentityEditDialog</name>
     <message>
-        <location line="+9"/>
-        <source>Update exchange &amp;key</source>
+        <location filename="../identityeditdialog.ui" line="+14"/>
+        <source>Edit Identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>Re&amp;load device list</source>
+        <location line="+12"/>
+        <source>Device &amp;Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Ctrl+R</source>
+        <location line="+42"/>
+        <source>Device Fingerprint:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>ExportSetupDialog</name>
+    <name>NetworkExchangeWindow</name>
     <message>
-        <location filename="../exportsetupdialog.ui" line="+14"/>
-        <source>Dialog</source>
+        <location filename="../networkexchangewindow.ui" line="+14"/>
+        <source>Network Exchange</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
-        <source>&amp;Trusted:</source>
+        <location line="+6"/>
+        <source>Exchange &amp;Port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
-        <source>Include &amp;Server:</source>
+        <location line="+10"/>
+        <source>Random</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
-        <source>&amp;Password</source>
+        <location line="+19"/>
+        <source>Device &amp;Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Name shown to other devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>&amp;Exchange active:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>

src/mvvmquick/inputviewfactory.cpp

@@ -91,13 +91,3 @@ void InputViewFactory::addDelegateAlias(const QByteArray &alias, const QByteArra
 {
 	d->delegateAliases.insert(alias, targetType);
 }
-
-// ------------- Private Implementation -------------
-
-InputViewFactoryPrivate::InputViewFactoryPrivate() :
-	simpleInputs(),
-	simpleDelegates(),
-	inputAliases(),
-	delegateAliases()
-{}
-

src/mvvmquick/inputviewfactory_p.h

@@ -9,8 +9,6 @@ namespace QtMvvm {
 class InputViewFactoryPrivate
 {
 public:
-	InputViewFactoryPrivate();
-
 	QHash<QByteArray, QUrl> simpleInputs;
 	QHash<QByteArray, QUrl> simpleDelegates;
 	QHash<QByteArray, QByteArray> inputAliases;

src/mvvmquick/translations/qtmvvmquick_de.ts

@@ -1,4 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
 <TS version="2.1" language="de_DE">
+<context>
+    <name>ErrorLabel</name>
+    <message>
+        <location filename="../ErrorLabel.qml" line="+5"/>
+        <source>&lt;i&gt;Failed to load edit view!&lt;i&gt;</source>
+        <translation>&lt;i&gt;Bearbeitungsansicht konnte nicht geladen werden!&lt;/i&gt;</translation>
+    </message>
+</context>
 </TS>

src/mvvmquick/translations/qtmvvmquick_template.ts

@@ -1,4 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
 <TS version="2.1">
+<context>
+    <name>ErrorLabel</name>
+    <message>
+        <location filename="../ErrorLabel.qml" line="+5"/>
+        <source>&lt;i&gt;Failed to load edit view!&lt;i&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>

src/mvvmwidgets/inputwidgetfactory.cpp

@@ -85,10 +85,3 @@ void InputWidgetFactory::addAlias(const QByteArray &alias, const QByteArray &tar
 {
 	d->aliases.insert(alias, targetType);
 }
-
-// ------------- Private Implementation -------------
-
-InputWidgetFactoryPrivate::InputWidgetFactoryPrivate() :
-	simpleWidgets(),
-	aliases()
-{}

src/mvvmwidgets/inputwidgetfactory_p.h

@@ -9,8 +9,6 @@ namespace QtMvvm {
 class InputWidgetFactoryPrivate
 {
 public:
-	InputWidgetFactoryPrivate();
-
 	QHash<QByteArray, std::function<QWidget*(QWidget*)>> simpleWidgets;
 	QHash<QByteArray, QByteArray> aliases;
 };

src/mvvmwidgets/translations/qtmvvmwidgets_de.ts

@@ -4,22 +4,27 @@
 <context>
     <name>QtMvvm::SettingsDialogPrivate</name>
     <message>
-        <location filename="../settingsdialog.cpp" line="+208"/>
+        <location filename="../settingsdialog.cpp" line="+206"/>
+        <source>&lt;i&gt;Failed to load edit view!&lt;i&gt;</source>
+        <translation>&lt;i&gt;Bearbeitungsansicht konnte nicht geladen werden!&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>:</source>
-        <translation type="unfinished"></translation>
+        <translation>:</translation>
     </message>
 </context>
 <context>
     <name>QtMvvm::WidgetsPresenter</name>
     <message>
-        <location filename="../widgetspresenter.cpp" line="+246"/>
+        <location filename="../widgetspresenter.cpp" line="+247"/>
         <source>About</source>
-        <translation type="unfinished"></translation>
+        <translation>Über</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>About &amp;Qt</source>
-        <translation type="unfinished"></translation>
+        <translation>Über &amp;Qt</translation>
     </message>
 </context>
 <context>
@@ -27,12 +32,12 @@
     <message>
         <location filename="../settingsdialog.ui" line="+14"/>
         <source>Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Einstellungen</translation>
     </message>
     <message>
         <location line="+157"/>
         <source>Search in settings…</source>
-        <translation type="unfinished"></translation>
+        <translation>In Einstellungen suchen…</translation>
     </message>
 </context>
 </TS>

src/mvvmwidgets/translations/qtmvvmwidgets_template.ts

@@ -4,7 +4,12 @@
 <context>
     <name>QtMvvm::SettingsDialogPrivate</name>
     <message>
-        <location filename="../settingsdialog.cpp" line="+208"/>
+        <location filename="../settingsdialog.cpp" line="+206"/>
+        <source>&lt;i&gt;Failed to load edit view!&lt;i&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12,7 +17,7 @@
 <context>
     <name>QtMvvm::WidgetsPresenter</name>
     <message>
-        <location filename="../widgetspresenter.cpp" line="+246"/>
+        <location filename="../widgetspresenter.cpp" line="+247"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>