diff --git a/examples/mvvmcore/SampleCore/SampleCore.pro b/examples/mvvmcore/SampleCore/SampleCore.pro index 2116822..b40ba14 100644 --- a/examples/mvvmcore/SampleCore/SampleCore.pro +++ b/examples/mvvmcore/SampleCore/SampleCore.pro @@ -27,8 +27,7 @@ SOURCES += \ RESOURCES += \ sample_core.qrc -QTMVVM_TS_SETTINGS += settings.xml -_never_true_condition: SOURCES += $$files($$PWD/.ts-dummy/*) +SETTINGS_TRANSLATIONS += settings.xml TRANSLATIONS += samplecore_de.ts DISTFILES += $$TRANSLATIONS diff --git a/examples/mvvmcore/SampleCore/samplecore_de.ts b/examples/mvvmcore/SampleCore/samplecore_de.ts index f96e0de..b07c7e3 100644 --- a/examples/mvvmcore/SampleCore/samplecore_de.ts +++ b/examples/mvvmcore/SampleCore/samplecore_de.ts @@ -104,42 +104,34 @@ - qtmvvm_settings_xml + settings.xml - - - - Select a &mode - - - - - - Variant B + + &Check me - - This is another section + + I am a checkbox! - - Variant C + + property - - https://example.org/test + + bool - - Value C + + Enter a &name - + Enter a nice name @@ -149,181 +141,183 @@ - - Pressing this action will open the system settings + + Sub-Group - - - Current value: %1 + + This is a tooltip - - Current value: %L1 + + Open &system settings - - Value A+B + + Pressing this action will open the system settings - - Value A+B+C + + You can use this to trigger whatever kind of action you need - - bool + + Select a &mode - - Open &system settings + + Variant B - - Value A+C + + Variant A - - &Check me + + Variant C - - - property + + Current value: %1 - + Another Section - - Is set to %n unit(s) + + This is another section - - Enter a &website + + Enter a &value - - Another main category + + The value must be between 0 and 1 - - - Text 2 + + Current value: %L1 - - This is a tooltip + + Value A - - Enter a &value + + Value B - - Choose a &font + + Value C - - Variant A + + Value A+B - - Value A + + Value A+C - - Enter a &name + + Value B+C - - I am a checkbox! + + Value A+B+C + + + + + Another main category - + Enter a &number - - You can use this to trigger whatever kind of action you need + + Is set to %n unit(s) - - Value B + + Text 2 - - The value must be between 0 and 1 + + Text 1 - - &Volume + + Enter a &website - Choose a time + https://example.org/test - Choose a date + Choose a &font - Choose a date and time + &Volume - Choose a color + Choose a time - Non existing type + Choose a date - - Text 1 + + Choose a date and time - - Sub-Group + + Choose a color - - Value B+C + + Non existing type diff --git a/mkspecs/features/qsettingstranslator.prf b/mkspecs/features/qsettingstranslator.prf index 9cddcc5..ce645a6 100644 --- a/mkspecs/features/qsettingstranslator.prf +++ b/mkspecs/features/qsettingstranslator.prf @@ -12,7 +12,7 @@ QSETTINGSTRANSLATOR_DIR = $$QSETTINGSTRANSLATOR_DIR$$SUFFIX !ReleaseBuild: { qsettingstranslator_c.name = qsettingsgenerator --translate ${QMAKE_FILE_IN} qsettingstranslator_c.input = SETTINGS_TRANSLATIONS - qsettingstranslator_c.variable_out = CPP_DUMMIES + qsettingstranslator_c.variable_out = CPP_TS_DUMMIES qsettingstranslator_c.commands = $$QMAKE_QSETTINGSGENERATOR --translate --in ${QMAKE_FILE_IN} --impl ${QMAKE_FILE_OUT} qsettingstranslator_c.output = $$QSETTINGSTRANSLATOR_DIR/${QMAKE_FILE_BASE}.tsdummy$${first(QMAKE_EXT_CPP)} qsettingstranslator_c.CONFIG += no_link @@ -26,8 +26,16 @@ QSETTINGSTRANSLATOR_DIR = $$QSETTINGSTRANSLATOR_DIR$$SUFFIX else: return($$shell_quote($$1)) } + lupdate_trcond_c.name = lupdate condition ${QMAKE_FILE_IN} + lupdate_trcond_c.input = TRANSLATIONS + lupdate_trcond_c.variable_out = TRANSLATIONS_CONDITION + lupdate_trcond_c.commands = echo created > ${QMAKE_FILE_OUT} + lupdate_trcond_c.output = $$QSETTINGSTRANSLATOR_DIR/trcond.cpp + lupdate_trcond_c.CONFIG += combine no_link + QMAKE_EXTRA_COMPILERS += lupdate_trcond_c + lupdate_fakepri_c.name = fakepri ${QMAKE_FILE_IN} - lupdate_fakepri_c.input = CPP_DUMMIES GENERATED_SOURCES + lupdate_fakepri_c.input = TRANSLATIONS_CONDITION CPP_TS_DUMMIES GENERATED_SOURCES lupdate_fakepri_c.variable_out = TS_FAKEPRI_FILES lupdate_fakepri_c.commands = echo $$qmake_escape(BUILD_SOURCES += ${QMAKE_FILE_IN}) > ${QMAKE_FILE_OUT} \ $$escape_expand(\\n\\t)echo $$qmake_escape(for(src, BUILD_SOURCES): SOURCES += $${DBL_DOLLAR}PWD/$${DBL_DOLLAR}src) >> ${QMAKE_FILE_OUT} @@ -45,13 +53,13 @@ QSETTINGSTRANSLATOR_DIR = $$QSETTINGSTRANSLATOR_DIR$$SUFFIX QMAKE_EXTRA_COMPILERS += lupdate_fakepro_c lupdate_c.name = lupdate ${QMAKE_FILE_IN} - lupdate_c.input = TS_FAKEPRO_FILES SOURCES CPP_DUMMIES GENERATED_SOURCES + lupdate_c.input = TS_FAKEPRO_FILES SOURCES CPP_TS_DUMMIES GENERATED_SOURCES lupdate_c.commands = $$QMAKE_LUPDATE -locations relative -pro-out $$shell_quote($$_PRO_FILE_PWD_) -pro $$shell_quote($$_PRO_FILE_PWD_/.tsdummy.pro.dummy) \ $$escape_expand(\\n\\t)echo created > $$QSETTINGSTRANSLATOR_DIR/.lupdate lupdate_c.output = $$QSETTINGSTRANSLATOR_DIR/.lupdate lupdate_c.CONFIG += combine no_link - lupdate_c.depends += $$QMAKE_LUPDATE_EXE !no_auto_lupdate: lupdate_c.CONFIG += target_predeps + lupdate_c.depends += $$QMAKE_LUPDATE_EXE QMAKE_EXTRA_COMPILERS += lupdate_c lupdate_target.target = lupdate diff --git a/src/mvvmdatasyncquick/translations/qtmvvmdatasyncquick_de.ts b/src/mvvmdatasyncquick/translations/qtmvvmdatasyncquick_de.ts index ed470fb..cc04053 100644 --- a/src/mvvmdatasyncquick/translations/qtmvvmdatasyncquick_de.ts +++ b/src/mvvmdatasyncquick/translations/qtmvvmdatasyncquick_de.ts @@ -14,70 +14,12 @@ 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 - %1: %2 - - Key - Schlüssel - - - - Value - Wert - - - - ChangeRemoteView11 - - - Cancel - Abbrechen - - - - Change Remote - Server wechseln - - - - Change - Wechseln - - - Remote url: Server-URL: @@ -154,79 +96,6 @@ 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 - - - - 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 @@ -281,24 +150,6 @@ Passwort: - - ExportSetupView11 - - - Trusted - Vertrauen - - - - Include Server - Server einschließen - - - - Password: - Passwort: - - IdentityEditView @@ -311,24 +162,6 @@ Device Name: Geräte-Name: - - - Device Fingerprint: - Geräte-Fingerabdruck: - - - - IdentityEditView11 - - - Edit Identity - Identität bearbeiten - - - - Device Name: - Geräte-Name: - Device Fingerprint: @@ -338,30 +171,7 @@ NetworkExchangeView - - Network Exchange - Netzwerk-Austausch - - - - Port: - Port: - - - - Name: - Geräte-Name: - - - - Exchange active: - Austausch aktiv: - - - - NetworkExchangeView11 - - + Network Exchange Netzwerk-Austausch diff --git a/src/mvvmdatasyncquick/translations/qtmvvmdatasyncquick_template.ts b/src/mvvmdatasyncquick/translations/qtmvvmdatasyncquick_template.ts index 77c49e0..3411de7 100644 --- a/src/mvvmdatasyncquick/translations/qtmvvmdatasyncquick_template.ts +++ b/src/mvvmdatasyncquick/translations/qtmvvmdatasyncquick_template.ts @@ -14,70 +14,12 @@ - + Change - - - Remote url: - - - - - Access key: - - - - - Keep-Alive timout: - - - - - Keep data - - - - - Extra Headers: - - - - - %1: %2 - - - Key - - - - - Value - - - - - ChangeRemoteView11 - - - Cancel - - - - - Change Remote - - - - - Change - - - - Remote url: @@ -154,79 +96,6 @@ Reset Identity - - - Synchronization enabled - - - - - Other Devices: - - - - - Remove Device - - - - - Add new devices - - - - - Network Exchange - - - - - Export to file - - - - - Import from file - - - - - DataSyncView11 - - - Synchronization - - - - - Synchronize - - - - - Edit Identity - - - - - Update exchange key - - - - - Reload devices list - - - - - Change remote server - - - - - Reset Identity - - Synchronization enabled @@ -281,24 +150,6 @@ - - ExportSetupView11 - - - Trusted - - - - - Include Server - - - - - Password: - - - IdentityEditView @@ -311,24 +162,6 @@ Device Name: - - - Device Fingerprint: - - - - - IdentityEditView11 - - - Edit Identity - - - - - Device Name: - - Device Fingerprint: @@ -338,30 +171,7 @@ NetworkExchangeView - - Network Exchange - - - - - Port: - - - - - Name: - - - - - Exchange active: - - - - - NetworkExchangeView11 - - + Network Exchange diff --git a/src/mvvmquick/translations/qtmvvmquick_de.ts b/src/mvvmquick/translations/qtmvvmquick_de.ts index 04216f7..a813bff 100644 --- a/src/mvvmquick/translations/qtmvvmquick_de.ts +++ b/src/mvvmquick/translations/qtmvvmquick_de.ts @@ -36,7 +36,7 @@ SearchBar - + Search… Suchen… @@ -44,25 +44,7 @@ SettingsView - - Settings - Einstellungen - - - - Search in settings - In Einstellungen suchen - - - - Restore settings - Standards wiederherstellen - - - - SettingsView11 - - + Settings Einstellungen @@ -80,7 +62,7 @@ TimeEdit - + : : diff --git a/src/mvvmquick/translations/qtmvvmquick_template.ts b/src/mvvmquick/translations/qtmvvmquick_template.ts index d1ec9f4..1136a42 100644 --- a/src/mvvmquick/translations/qtmvvmquick_template.ts +++ b/src/mvvmquick/translations/qtmvvmquick_template.ts @@ -36,7 +36,7 @@ SearchBar - + Search… @@ -44,25 +44,7 @@ SettingsView - - Settings - - - - - Search in settings - - - - - Restore settings - - - - - SettingsView11 - - + Settings @@ -80,7 +62,7 @@ TimeEdit - + : diff --git a/tests/auto/mvvmcore/settingsgenerator/settingsgenerator.pro b/tests/auto/mvvmcore/settingsgenerator/settingsgenerator.pro index 6b698fe..532b621 100644 --- a/tests/auto/mvvmcore/settingsgenerator/settingsgenerator.pro +++ b/tests/auto/mvvmcore/settingsgenerator/settingsgenerator.pro @@ -18,6 +18,7 @@ SETTINGS_DEFINITIONS += \ generatortest.xml \ importtest.xml +# CONFIG += no_auto_lupdate SETTINGS_TRANSLATIONS += \ translatortest.xml