diff --git a/.qmake.conf b/.qmake.conf index 6cf6b00..05a1908 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,7 +1,7 @@ load(qt_build_config) CONFIG += warning_clean exceptions c++14 -!win32: CONFIG += samples_in_build # TODO fix on win +!win32: CONFIG += samples_in_build #TODO fix on win win32:cross_compile: CONFIG += winrt DEFINES += QT_DEPRECATED_WARNINGS QT_ASCII_CAST_WARNINGS diff --git a/examples/mvvmcore/SampleCore/samplecore_de.ts b/examples/mvvmcore/SampleCore/samplecore_de.ts index a282cf2..b23752a 100644 --- a/examples/mvvmcore/SampleCore/samplecore_de.ts +++ b/examples/mvvmcore/SampleCore/samplecore_de.ts @@ -81,32 +81,32 @@ qtmvvm_settings_xml - + Select a &mode - + Variant B - + This is another section - + Variant C - + https://example.org/test - + Value C @@ -116,27 +116,27 @@ - + Value A+B - + Value A+B+C - + bool - + Open &system settings - + Value A+C @@ -146,102 +146,102 @@ - + property - + Another Section - + Enter a &website - + Another main category - + Text 2 - + This is a tooltip - + Enter a &value - + Choose a &font - + Variant A - + Value A - + Enter a &name - + I am a checkbox! - + Enter a &number - + You can use this to trigger whatever kind of action you need - + Value B - + The value must be between 0 and 1 - + Non existing type - + Text 1 - + Sub-Group - + Value B+C diff --git a/src/mvvmcore/translations/qtmvvmcore_de.ts b/src/mvvmcore/translations/qtmvvmcore_de.ts index 4a4ebab..f785943 100644 --- a/src/mvvmcore/translations/qtmvvmcore_de.ts +++ b/src/mvvmcore/translations/qtmvvmcore_de.ts @@ -4,7 +4,7 @@ MessageConfig - + %1 — Version %2 %1 — Version %2 diff --git a/src/mvvmcore/translations/qtmvvmcore_template.ts b/src/mvvmcore/translations/qtmvvmcore_template.ts index 54c6864..4b2fab2 100644 --- a/src/mvvmcore/translations/qtmvvmcore_template.ts +++ b/src/mvvmcore/translations/qtmvvmcore_template.ts @@ -4,7 +4,7 @@ MessageConfig - + %1 — Version %2 diff --git a/src/mvvmdatasynccore/translations/qtmvvmdatasynccore_de.ts b/src/mvvmdatasynccore/translations/qtmvvmdatasynccore_de.ts index 3ce2bbe..f554f86 100644 --- a/src/mvvmdatasynccore/translations/qtmvvmdatasynccore_de.ts +++ b/src/mvvmdatasynccore/translations/qtmvvmdatasynccore_de.ts @@ -4,7 +4,7 @@ QtMvvm::AccountModel - + Name Name @@ -31,7 +31,7 @@ QtMvvm::DataSyncViewModel - + Connecting… Verbinde… @@ -61,26 +61,26 @@ Verbindung getrennt - + Export account data to file: Account-Daten in Datei exportieren: - + - - + + Import failed Import fehlgeschlagen - - + + Unsupported URL Scheme: %1 Nicht unterstütztes URL-Schema: %1 - + Import account data @@ -121,7 +121,7 @@ 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! - + Login requested! Login angefordert! @@ -131,7 +131,7 @@ <p>Ein Gerät möchte zugriff auf Ihre Account:</p><p>Name: %1<br/>Fingerabdruck: %2</p><p>Möchten Sie die Anfrage akzeptieren?</p> - + Import accepted Import akzeptiert @@ -151,15 +151,15 @@ <p>Der Account-Zugriff wurde gewährt für das Gerät:</p><p>Name: %1<br/>Fingerabdruck: %2</p> - + Export failed Export fehlgeschlagen - - + + Failed to open URL "%1" with error: %2 URL \"%1\" konnte nicht göffnet werden. Fehlermeldung: %2 @@ -194,7 +194,7 @@ QtMvvm::ExchangeDevicesModel - + Name Name @@ -223,35 +223,35 @@ QtMvvm::NetworkExchangeViewModel - + Export accont data to device "%1" with address "%1": Daten werden exportiert zu Gerät "%1" mit Addresse "%1": - + Network exchange error Netzwerk-Austausch fehlgeschlagen - + Import account data Account-Daten importieren - + Enter the password to decrypt the account data received from "%1" with address "%2". Then choose whether you want to keep you local data or not: Geben Sie das Passwort zum Entschlüsseln der Account-Daten, welchen vom Gerät "%1" mit der Adresse "%2" empfangen wurden, ein. Danach wählen Sie, ob Sie Ihre aktuellen Daten behalten möchten, oder nicht: - + Reset data Daten zurücksetzen - - + + Keep data Daten behalten diff --git a/src/mvvmdatasynccore/translations/qtmvvmdatasynccore_template.ts b/src/mvvmdatasynccore/translations/qtmvvmdatasynccore_template.ts index e1046cf..28c341f 100644 --- a/src/mvvmdatasynccore/translations/qtmvvmdatasynccore_template.ts +++ b/src/mvvmdatasynccore/translations/qtmvvmdatasynccore_template.ts @@ -4,7 +4,7 @@ QtMvvm::AccountModel - + Name @@ -31,7 +31,7 @@ QtMvvm::DataSyncViewModel - + Connecting… @@ -61,26 +61,26 @@ - + Export account data to file: - + - - + + Import failed - - + + Unsupported URL Scheme: %1 - + Import account data @@ -121,7 +121,7 @@ - + Login requested! @@ -131,7 +131,7 @@ - + Import accepted @@ -151,15 +151,15 @@ - + Export failed - - + + Failed to open URL "%1" with error: %2 @@ -194,7 +194,7 @@ QtMvvm::ExchangeDevicesModel - + Name @@ -223,35 +223,35 @@ QtMvvm::NetworkExchangeViewModel - + Export accont data to device "%1" with address "%1": - + Network exchange error - + Import account data - + Enter the password to decrypt the account data received from "%1" with address "%2". Then choose whether you want to keep you local data or not: - + Reset data - - + + Keep data diff --git a/src/mvvmdatasyncquick/translations/qtmvvmdatasyncquick_de.ts b/src/mvvmdatasyncquick/translations/qtmvvmdatasyncquick_de.ts index 13cb31a..a2cf508 100644 --- a/src/mvvmdatasyncquick/translations/qtmvvmdatasyncquick_de.ts +++ b/src/mvvmdatasyncquick/translations/qtmvvmdatasyncquick_de.ts @@ -62,7 +62,7 @@ DataSyncView - + Synchronization Synchronisation @@ -72,7 +72,7 @@ Synchronisieren - + Edit Identity Identität bearbeiten @@ -112,7 +112,7 @@ Gerät entfernen - + Add new devices Neue Geräte hinzufügen @@ -171,7 +171,7 @@ NetworkExchangeView - + Network Exchange Netzwerk-Austausch diff --git a/src/mvvmdatasyncquick/translations/qtmvvmdatasyncquick_template.ts b/src/mvvmdatasyncquick/translations/qtmvvmdatasyncquick_template.ts index f0d4c22..bbb71da 100644 --- a/src/mvvmdatasyncquick/translations/qtmvvmdatasyncquick_template.ts +++ b/src/mvvmdatasyncquick/translations/qtmvvmdatasyncquick_template.ts @@ -62,7 +62,7 @@ DataSyncView - + Synchronization @@ -72,7 +72,7 @@ - + Edit Identity @@ -112,7 +112,7 @@ - + Add new devices @@ -171,7 +171,7 @@ NetworkExchangeView - + Network Exchange diff --git a/src/mvvmdatasyncwidgets/translations/qtmvvmdatasyncwidgets_de.ts b/src/mvvmdatasyncwidgets/translations/qtmvvmdatasyncwidgets_de.ts index edc73a5..373cee3 100644 --- a/src/mvvmdatasyncwidgets/translations/qtmvvmdatasyncwidgets_de.ts +++ b/src/mvvmdatasyncwidgets/translations/qtmvvmdatasyncwidgets_de.ts @@ -97,7 +97,7 @@ &Synchronisieren - + Account &actions Account-A&ktionen diff --git a/src/mvvmdatasyncwidgets/translations/qtmvvmdatasyncwidgets_template.ts b/src/mvvmdatasyncwidgets/translations/qtmvvmdatasyncwidgets_template.ts index 3bf1b2b..43885de 100644 --- a/src/mvvmdatasyncwidgets/translations/qtmvvmdatasyncwidgets_template.ts +++ b/src/mvvmdatasyncwidgets/translations/qtmvvmdatasyncwidgets_template.ts @@ -97,7 +97,7 @@ - + Account &actions diff --git a/src/mvvmquick/translations/qtmvvmquick_de.ts b/src/mvvmquick/translations/qtmvvmquick_de.ts index a9a8392..396a0e6 100644 --- a/src/mvvmquick/translations/qtmvvmquick_de.ts +++ b/src/mvvmquick/translations/qtmvvmquick_de.ts @@ -20,7 +20,7 @@ MenuButton - + More… Mehr… @@ -28,7 +28,7 @@ QtMvvm::SettingsUiBuilder - + : : @@ -36,7 +36,7 @@ SettingsView - + Settings Einstellungen diff --git a/src/mvvmquick/translations/qtmvvmquick_template.ts b/src/mvvmquick/translations/qtmvvmquick_template.ts index 832d50a..f3e50c1 100644 --- a/src/mvvmquick/translations/qtmvvmquick_template.ts +++ b/src/mvvmquick/translations/qtmvvmquick_template.ts @@ -20,7 +20,7 @@ MenuButton - + More… @@ -28,7 +28,7 @@ QtMvvm::SettingsUiBuilder - + : @@ -36,7 +36,7 @@ SettingsView - + Settings diff --git a/src/mvvmwidgets/translations/qtmvvmwidgets_de.ts b/src/mvvmwidgets/translations/qtmvvmwidgets_de.ts index 74be77e..78479bd 100644 --- a/src/mvvmwidgets/translations/qtmvvmwidgets_de.ts +++ b/src/mvvmwidgets/translations/qtmvvmwidgets_de.ts @@ -17,7 +17,7 @@ QtMvvm::WidgetsPresenter - + About Über diff --git a/src/mvvmwidgets/translations/qtmvvmwidgets_template.ts b/src/mvvmwidgets/translations/qtmvvmwidgets_template.ts index a20ff80..3016007 100644 --- a/src/mvvmwidgets/translations/qtmvvmwidgets_template.ts +++ b/src/mvvmwidgets/translations/qtmvvmwidgets_template.ts @@ -17,7 +17,7 @@ QtMvvm::WidgetsPresenter - + About diff --git a/src/src.pro b/src/src.pro index a90a46d..908c2ba 100644 --- a/src/src.pro +++ b/src/src.pro @@ -13,5 +13,7 @@ qtHaveModule(datasync) { SUBDIRS += imports +imports.CONFIG += no_lrelease_target + prepareRecursiveTarget(lrelease) QMAKE_EXTRA_TARGETS += lrelease