diff --git a/examples/mvvmcore/SampleCore/samplecore_de.ts b/examples/mvvmcore/SampleCore/samplecore_de.ts index 245d0f9..f96e0de 100644 --- a/examples/mvvmcore/SampleCore/samplecore_de.ts +++ b/examples/mvvmcore/SampleCore/samplecore_de.ts @@ -4,7 +4,7 @@ DrawerViewModel - + Main Sample @@ -13,6 +13,11 @@ Tab Sample + + + View Container Sample + + Settings @@ -22,7 +27,7 @@ SampleViewModel - + Random input @@ -37,7 +42,27 @@ - + + Select a color: + + + + + Some ongoing operation + + + + + Doing some operation long running job… + + + + + <i>Canceling, please wait…</i> + + + + Clear Eventlist @@ -81,45 +106,66 @@ qtmvvm_settings_xml - - - + + + Select a &mode - + Variant B - + This is another section - + Variant C - + https://example.org/test - + Value C - + Enter a nice name - + + Your current name: %1 + + + + + Pressing this action will open the system settings + + + + + + Current value: %1 + + + + + Current value: %L1 + + + + Value A+B @@ -129,22 +175,22 @@ - + bool - + Open &system settings - + Value A+C - + &Check me @@ -155,53 +201,58 @@ - + Another Section - + + Is set to %n unit(s) + + + + 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 @@ -211,42 +262,67 @@ - + 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 - + + &Volume + + + + + Choose a time + + + + + Choose a date + + + + + Choose a date and time + + + + + Choose a color + + + + Non existing type - + Text 1 - + Sub-Group - + Value B+C diff --git a/src/imports/mvvmquick/.gitignore b/src/imports/mvvmquick/.gitignore new file mode 100644 index 0000000..f3595af --- /dev/null +++ b/src/imports/mvvmquick/.gitignore @@ -0,0 +1 @@ +/qtmvvmquick_plugin_qmlcache.qrc diff --git a/src/mvvmcore/translations/qtmvvmcore_de.ts b/src/mvvmcore/translations/qtmvvmcore_de.ts index f785943..3731eeb 100644 --- a/src/mvvmcore/translations/qtmvvmcore_de.ts +++ b/src/mvvmcore/translations/qtmvvmcore_de.ts @@ -4,12 +4,12 @@ MessageConfig - + %1 — Version %2 %1 — Version %2 - + (Built with %1) (Erstellt mit %1) @@ -29,12 +29,12 @@ Projekt Website: <a href="%1">%2</a> - + License: <a href="%1">%2</a> Lizenz: <a href="%1">%2</a> - + License: %1 Lizenz: %1 @@ -42,7 +42,7 @@ QtMvvm::CoreApp - + Help Hilfe @@ -58,14 +58,14 @@ - QtMvvm::SettingsSetupLoader + QtMvvm::SettingsConfigLoader - + General Settings Allgemeine Einstellungen - + General Allgemein @@ -73,7 +73,7 @@ QtMvvm::SettingsViewModel - + Restore Defaults? Standards wiederherstellen? diff --git a/src/mvvmcore/translations/qtmvvmcore_template.ts b/src/mvvmcore/translations/qtmvvmcore_template.ts index 4b2fab2..c9f9c88 100644 --- a/src/mvvmcore/translations/qtmvvmcore_template.ts +++ b/src/mvvmcore/translations/qtmvvmcore_template.ts @@ -4,12 +4,12 @@ MessageConfig - + %1 — Version %2 - + (Built with %1) @@ -29,12 +29,12 @@ - + License: <a href="%1">%2</a> - + License: %1 @@ -42,7 +42,7 @@ QtMvvm::CoreApp - + Help @@ -58,14 +58,14 @@ - QtMvvm::SettingsSetupLoader + QtMvvm::SettingsConfigLoader - + General Settings - + General @@ -73,7 +73,7 @@ QtMvvm::SettingsViewModel - + Restore Defaults? diff --git a/src/mvvmdatasynccore/translations/qtmvvmdatasynccore_de.ts b/src/mvvmdatasynccore/translations/qtmvvmdatasynccore_de.ts index f554f86..459e9a9 100644 --- a/src/mvvmdatasynccore/translations/qtmvvmdatasynccore_de.ts +++ b/src/mvvmdatasynccore/translations/qtmvvmdatasynccore_de.ts @@ -18,7 +18,7 @@ QtMvvm::ChangeRemoteViewModel - + Key Schlüssel @@ -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 @@ -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,20 +151,20 @@ <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 - + Export completed Export abgeschlossen @@ -194,7 +194,7 @@ QtMvvm::ExchangeDevicesModel - + Name Name @@ -215,7 +215,7 @@ Adresse - + %1:%2 %1:%2 @@ -223,40 +223,40 @@ 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 - + Do you want to import data received from "%1" with address "%2"? Keep the local data after changing the account? Möchten Sie die Account-Daten, welchen vom Gerät "%1" mit der Adresse "%2" empfangen wurden, importieren? Wählen Sie, ob Sie Ihre aktuellen Daten behalten möchten, oder nicht? diff --git a/src/mvvmdatasynccore/translations/qtmvvmdatasynccore_template.ts b/src/mvvmdatasynccore/translations/qtmvvmdatasynccore_template.ts index 28c341f..b774cb6 100644 --- a/src/mvvmdatasynccore/translations/qtmvvmdatasynccore_template.ts +++ b/src/mvvmdatasynccore/translations/qtmvvmdatasynccore_template.ts @@ -18,7 +18,7 @@ QtMvvm::ChangeRemoteViewModel - + Key @@ -61,26 +61,26 @@ - + Export account data to file: - - + + Import failed - - + + Unsupported URL Scheme: %1 - + Import account data @@ -131,7 +131,7 @@ - + Import accepted @@ -151,20 +151,20 @@ - + - + Export failed - - + + Failed to open URL "%1" with error: %2 - + Export completed @@ -194,7 +194,7 @@ QtMvvm::ExchangeDevicesModel - + Name @@ -215,7 +215,7 @@ - + %1:%2 @@ -223,40 +223,40 @@ 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 - + Do you want to import data received from "%1" with address "%2"? Keep the local data after changing the account? diff --git a/src/mvvmdatasyncquick/translations/qtmvvmdatasyncquick_de.ts b/src/mvvmdatasyncquick/translations/qtmvvmdatasyncquick_de.ts index a2cf508..ed470fb 100644 --- a/src/mvvmdatasyncquick/translations/qtmvvmdatasyncquick_de.ts +++ b/src/mvvmdatasyncquick/translations/qtmvvmdatasyncquick_de.ts @@ -4,7 +4,7 @@ ChangeRemoteView - + Cancel Abbrechen @@ -43,6 +43,64 @@ Extra Headers: Zusätzliche Header: + + + %1: %2 + %1: %2 + + + + Key + Schlüssel + + + + Value + Wert + + + + ChangeRemoteView11 + + + Cancel + Abbrechen + + + + Change Remote + Server wechseln + + + + Change + Wechseln + + + + Remote url: + Server-URL: + + + + Access key: + Zugriffsschlüssel: + + + + Keep-Alive timout: + Keep-Alive Timout: + + + + Keep data + Daten behalten + + + + Extra Headers: + Zusätzliche Header: + %1: %2 @@ -107,12 +165,12 @@ Andere Geräte: - + Remove Device Gerät entfernen - + Add new devices Neue Geräte hinzufügen @@ -132,6 +190,79 @@ Von Datei importieren + + DataSyncView11 + + + Synchronization + Synchronisation + + + + Synchronize + Synchronisieren + + + + Edit Identity + Identität bearbeiten + + + + Update exchange key + Daten-Schlüssel aktualisieren + + + + Reload devices list + Geräte-Liste aktualisieren + + + + Change remote server + Server wechseln + + + + Reset Identity + Identität zurücksetzen + + + + Synchronization enabled + Synchronisation aktiv + + + + Other Devices: + Andere Geräte: + + + + Remove Device + Gerät entfernen + + + + Add new devices + Neue Geräte hinzufügen + + + + Network Exchange + Netzwerk-Austausch + + + + Export to file + In Datei exportieren + + + + Import from file + Von Datei importieren + + ExportSetupView @@ -150,6 +281,24 @@ Passwort: + + ExportSetupView11 + + + Trusted + Vertrauen + + + + Include Server + Server einschließen + + + + Password: + Passwort: + + IdentityEditView @@ -168,6 +317,24 @@ Geräte-Fingerabdruck: + + IdentityEditView11 + + + Edit Identity + Identität bearbeiten + + + + Device Name: + Geräte-Name: + + + + Device Fingerprint: + Geräte-Fingerabdruck: + + NetworkExchangeView @@ -191,4 +358,27 @@ Austausch aktiv: + + NetworkExchangeView11 + + + Network Exchange + Netzwerk-Austausch + + + + Port: + Port: + + + + Name: + Geräte-Name: + + + + Exchange active: + Austausch aktiv: + + diff --git a/src/mvvmdatasyncquick/translations/qtmvvmdatasyncquick_template.ts b/src/mvvmdatasyncquick/translations/qtmvvmdatasyncquick_template.ts index bbb71da..77c49e0 100644 --- a/src/mvvmdatasyncquick/translations/qtmvvmdatasyncquick_template.ts +++ b/src/mvvmdatasyncquick/translations/qtmvvmdatasyncquick_template.ts @@ -4,7 +4,7 @@ ChangeRemoteView - + Cancel @@ -43,6 +43,64 @@ Extra Headers: + + + %1: %2 + + + + + Key + + + + + Value + + + + + ChangeRemoteView11 + + + Cancel + + + + + Change Remote + + + + + Change + + + + + Remote url: + + + + + Access key: + + + + + Keep-Alive timout: + + + + + Keep data + + + + + Extra Headers: + + %1: %2 @@ -107,12 +165,12 @@ - + Remove Device - + Add new devices @@ -132,6 +190,79 @@ + + DataSyncView11 + + + Synchronization + + + + + Synchronize + + + + + Edit Identity + + + + + Update exchange key + + + + + Reload devices list + + + + + Change remote server + + + + + Reset Identity + + + + + Synchronization enabled + + + + + Other Devices: + + + + + Remove Device + + + + + Add new devices + + + + + Network Exchange + + + + + Export to file + + + + + Import from file + + + ExportSetupView @@ -150,6 +281,24 @@ + + ExportSetupView11 + + + Trusted + + + + + Include Server + + + + + Password: + + + IdentityEditView @@ -168,6 +317,24 @@ + + IdentityEditView11 + + + Edit Identity + + + + + Device Name: + + + + + Device Fingerprint: + + + NetworkExchangeView @@ -191,4 +358,27 @@ + + NetworkExchangeView11 + + + Network Exchange + + + + + Port: + + + + + Name: + + + + + Exchange active: + + + diff --git a/src/mvvmdatasyncwidgets/translations/qtmvvmdatasyncwidgets_de.ts b/src/mvvmdatasyncwidgets/translations/qtmvvmdatasyncwidgets_de.ts index 373cee3..cabf862 100644 --- a/src/mvvmdatasyncwidgets/translations/qtmvvmdatasyncwidgets_de.ts +++ b/src/mvvmdatasyncwidgets/translations/qtmvvmdatasyncwidgets_de.ts @@ -70,8 +70,13 @@ - &Remove Selected Header - Ausgewählten Header &entfernen + &Remove Header + Header &entfernen + + + + Remove selected Header + Ausgewählten Header entfernen diff --git a/src/mvvmdatasyncwidgets/translations/qtmvvmdatasyncwidgets_template.ts b/src/mvvmdatasyncwidgets/translations/qtmvvmdatasyncwidgets_template.ts index 43885de..f8ff42f 100644 --- a/src/mvvmdatasyncwidgets/translations/qtmvvmdatasyncwidgets_template.ts +++ b/src/mvvmdatasyncwidgets/translations/qtmvvmdatasyncwidgets_template.ts @@ -70,7 +70,12 @@ - &Remove Selected Header + &Remove Header + + + + + Remove selected Header diff --git a/src/mvvmquick/translations/qtmvvmquick_de.ts b/src/mvvmquick/translations/qtmvvmquick_de.ts index 396a0e6..04216f7 100644 --- a/src/mvvmquick/translations/qtmvvmquick_de.ts +++ b/src/mvvmquick/translations/qtmvvmquick_de.ts @@ -12,7 +12,7 @@ ListSection - + : : @@ -28,15 +28,23 @@ QtMvvm::SettingsUiBuilder - + : : + + SearchBar + + + Search… + Suchen… + + SettingsView - + Settings Einstellungen @@ -51,4 +59,31 @@ Standards wiederherstellen + + SettingsView11 + + + Settings + Einstellungen + + + + Search in settings + In Einstellungen suchen + + + + Restore settings + Standards wiederherstellen + + + + TimeEdit + + + + : + : + + diff --git a/src/mvvmquick/translations/qtmvvmquick_template.ts b/src/mvvmquick/translations/qtmvvmquick_template.ts index f3e50c1..d1ec9f4 100644 --- a/src/mvvmquick/translations/qtmvvmquick_template.ts +++ b/src/mvvmquick/translations/qtmvvmquick_template.ts @@ -12,7 +12,7 @@ ListSection - + : @@ -28,15 +28,23 @@ QtMvvm::SettingsUiBuilder - + : + + SearchBar + + + Search… + + + SettingsView - + Settings @@ -51,4 +59,31 @@ + + SettingsView11 + + + Settings + + + + + Search in settings + + + + + Restore settings + + + + + TimeEdit + + + + : + + + diff --git a/src/mvvmwidgets/translations/qtmvvmwidgets_de.ts b/src/mvvmwidgets/translations/qtmvvmwidgets_de.ts index 78479bd..0611436 100644 --- a/src/mvvmwidgets/translations/qtmvvmwidgets_de.ts +++ b/src/mvvmwidgets/translations/qtmvvmwidgets_de.ts @@ -1,10 +1,18 @@ + + QtMvvm::ColorEdit + + + Select a color + Farbe auswählen + + QtMvvm::SettingsDialogPrivate - + <i>Failed to load edit view!<i> <i>Bearbeitungsansicht konnte nicht geladen werden!</i> @@ -17,7 +25,7 @@ QtMvvm::WidgetsPresenter - + About Über diff --git a/src/mvvmwidgets/translations/qtmvvmwidgets_template.ts b/src/mvvmwidgets/translations/qtmvvmwidgets_template.ts index 3016007..5d56ec9 100644 --- a/src/mvvmwidgets/translations/qtmvvmwidgets_template.ts +++ b/src/mvvmwidgets/translations/qtmvvmwidgets_template.ts @@ -1,10 +1,18 @@ + + QtMvvm::ColorEdit + + + Select a color + + + QtMvvm::SettingsDialogPrivate - + <i>Failed to load edit view!<i> @@ -17,7 +25,7 @@ QtMvvm::WidgetsPresenter - + About diff --git a/tests/auto/mvvmcore/settingsgenerator/test_de.ts b/tests/auto/mvvmcore/settingsgenerator/test_de.ts index 2303444..8f6b9d9 100644 --- a/tests/auto/mvvmcore/settingsgenerator/test_de.ts +++ b/tests/auto/mvvmcore/settingsgenerator/test_de.ts @@ -9,44 +9,4 @@ - - generatortest.xml - - - translate me - - - - - import_config.xml - - - 42 - - - - - import_normal.xml - - - false - - - - - some_context - - - Hello World - - - - - translatortest.xml - - - dummy - - -