Skip to content
This repository was archived by the owner on Mar 4, 2023. It is now read-only.

Commit ae13961

Browse files
Skycoder42Skycoder42
committed
translation structure cleanup
1 parent 4e2f6e8 commit ae13961

File tree

7 files changed

+65
-40
lines changed

7 files changed

+65
-40
lines changed

‎src/datasync/datasync.pro‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
TARGET = QtDataSync
22

33
QT = core jsonserializer sql websockets scxml remoteobjects remoteobjects-private
4+
android: QT += androidextras #needed to deploy the android keystore plugin
45

56
HEADERS += \
67
qtdatasync_global.h \
@@ -109,12 +110,21 @@ qpmx_ts_target.path = $$[QT_INSTALL_TRANSLATIONS]
109110
qpmx_ts_target.depends += lrelease
110111
INSTALLS += qpmx_ts_target
111112

113+
# extra cpp files for translations
114+
never_true_lupdate_only {
115+
SOURCES += ../messages/*.h \
116+
../messages/*.cpp \
117+
../imports/datasync/*.h \
118+
../imports/datasync/*.cpp \
119+
../imports/datasync/*.qml
120+
PLUGINS = $$files(../plugins/keystores/*)
121+
for(plugin, PLUGINS): SOURCES += $$plugin/*.h
122+
for(plugin, PLUGINS): SOURCES += $$plugin/*.cpp
123+
}
124+
112125
!ReleaseBuild:!DebugBuild:!system(qpmx -d $$shell_quote($$_PRO_FILE_PWD_) --qmake-run init $$QPMX_EXTRA_OPTIONS $$shell_quote($$QMAKE_QMAKE) $$shell_quote($$OUT_PWD)): error(qpmx initialization failed. Check the compilation log for details.)
113126
else: include($$OUT_PWD/qpmx_generated.pri)
114127

115128
#replace template qm by ts
116129
qpmx_ts_target.files -= $$OUT_PWD/$$QPMX_WORKINGDIR/qtdatasync_template.qm
117130
qpmx_ts_target.files += translations/qtdatasync_template.ts
118-
119-
120-
message($$LIBS $$LIBS_PRIVATE)

‎src/datasync/translations/qtdatasync_de.ts‎

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,28 @@
44
<context>
55
<name>QtDataSync::AccountManager</name>
66
<message>
7-
<location filename="../accountmanager.cpp" line="+149"/>
7+
<location filename="../accountmanager.cpp" line="+157"/>
88
<source>Password must not be empty.</source>
99
<translation>Password darf nicht leer sein.</translation>
1010
</message>
1111
<message>
1212
<location line="+23"/>
13-
<location line="+17"/>
13+
<location line="+22"/>
1414
<source>Already importing. Only one import at a time is possible.</source>
1515
<translation>Es wird bereits importiert. Es kann nur ein Import zur gleichen Zeit ausgeführt werden.</translation>
1616
</message>
1717
</context>
1818
<context>
1919
<name>QtDataSync::AccountManagerPrivate</name>
2020
<message>
21-
<location filename="../accountmanager_p.cpp" line="+81"/>
21+
<location filename="../accountmanager_p.cpp" line="+114"/>
2222
<location line="+26"/>
2323
<source>Failed to generate export data. You must be registered to a server to export data.</source>
2424
<translation>Export-Daten konnten nicht erstellt werden. Sie müssen registriert sein um exportieren zu können.</translation>
2525
</message>
2626
<message>
2727
<location line="-19"/>
28-
<location line="+39"/>
28+
<location line="+37"/>
2929
<source>Password must not be empty.</source>
3030
<translation>Password darf nicht leer sein.</translation>
3131
</message>
@@ -35,7 +35,7 @@
3535
<translation>Daten konnten nicht importiert werden. Daten sind ungültig.</translation>
3636
</message>
3737
<message>
38-
<location line="+29"/>
38+
<location line="+16"/>
3939
<source>Failed to decrypt data. Data invalid or password wrong.</source>
4040
<translation>Daten konnten nicht entschlüsselt werden. Daten sind ungültig oder das Passwort ist falsch.</translation>
4141
</message>
@@ -45,7 +45,7 @@
4545
<message>
4646
<location filename="../changecontroller.cpp" line="+81"/>
4747
<location line="+25"/>
48-
<location line="+103"/>
48+
<location line="+105"/>
4949
<source>Failed to upload changes to server.</source>
5050
<translation>Änderungen konnten nicht hochgeladen werden.</translation>
5151
</message>
@@ -63,15 +63,28 @@
6363
<translation>Daten konnten nicht zum Partner gesendet werden</translation>
6464
</message>
6565
</context>
66+
<context>
67+
<name>QtDataSync::ExchangeEngine</name>
68+
<message>
69+
<location filename="../setup.cpp" line="+424"/>
70+
<source>Password for trusted import must not be empty</source>
71+
<translation>Das Passwort für den Import von vertrauten Daten darf nicht leer sein</translation>
72+
</message>
73+
<message>
74+
<location line="+188"/>
75+
<source>Import data must be a JSON object</source>
76+
<translation>Import-Daten müssen im JSON-Format sein</translation>
77+
</message>
78+
</context>
6679
<context>
6780
<name>QtDataSync::RemoteConnector</name>
6881
<message>
69-
<location filename="../remoteconnector.cpp" line="+736"/>
82+
<location filename="../remoteconnector.cpp" line="+796"/>
7083
<source>Failed to load user identity! Make shure your keystore is available.</source>
7184
<translation>User-Identität konnte nicht geladen werden. Stellen Sie sicher, dass der Schlüsselspeicher verfügbar ist.</translation>
7285
</message>
7386
<message>
74-
<location line="+115"/>
87+
<location line="+116"/>
7588
<source>Server is not compatibel with your application version.</source>
7689
<translation>Server ist nicht kompatibel mir Ihrer Anwendungs-Version.</translation>
7790
</message>
@@ -114,21 +127,21 @@
114127
<context>
115128
<name>QtDataSync::SyncController</name>
116129
<message>
117-
<location filename="../synccontroller.cpp" line="+165"/>
130+
<location filename="../synccontroller.cpp" line="+166"/>
118131
<source>Data downloaded from server is invalid.</source>
119132
<translation>Die vom Server heruntergeladenen Daten sind ungültig.</translation>
120133
</message>
121134
</context>
122135
<context>
123136
<name>QtDataSync::UserExchangeManager</name>
124137
<message>
125-
<location filename="../userexchangemanager.cpp" line="+161"/>
138+
<location filename="../userexchangemanager.cpp" line="+163"/>
126139
<location line="+9"/>
127140
<source>No import data received from passed user.</source>
128141
<translation>Es wurden keine zu importierenden Daten vom angegebenen Nutzer erhalten.</translation>
129142
</message>
130143
<message>
131-
<location line="+76"/>
144+
<location line="+80"/>
132145
<source>&lt;Unnamed&gt;</source>
133146
<translation>&lt;Unbenannt&gt;</translation>
134147
</message>

‎src/datasync/translations/qtdatasync_template.ts‎

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,28 @@
44
<context>
55
<name>QtDataSync::AccountManager</name>
66
<message>
7-
<location filename="../accountmanager.cpp" line="+149"/>
7+
<location filename="../accountmanager.cpp" line="+157"/>
88
<source>Password must not be empty.</source>
99
<translation type="unfinished"></translation>
1010
</message>
1111
<message>
1212
<location line="+23"/>
13-
<location line="+17"/>
13+
<location line="+22"/>
1414
<source>Already importing. Only one import at a time is possible.</source>
1515
<translation type="unfinished"></translation>
1616
</message>
1717
</context>
1818
<context>
1919
<name>QtDataSync::AccountManagerPrivate</name>
2020
<message>
21-
<location filename="../accountmanager_p.cpp" line="+81"/>
21+
<location filename="../accountmanager_p.cpp" line="+114"/>
2222
<location line="+26"/>
2323
<source>Failed to generate export data. You must be registered to a server to export data.</source>
2424
<translation type="unfinished"></translation>
2525
</message>
2626
<message>
2727
<location line="-19"/>
28-
<location line="+39"/>
28+
<location line="+37"/>
2929
<source>Password must not be empty.</source>
3030
<translation type="unfinished"></translation>
3131
</message>
@@ -35,7 +35,7 @@
3535
<translation type="unfinished"></translation>
3636
</message>
3737
<message>
38-
<location line="+29"/>
38+
<location line="+16"/>
3939
<source>Failed to decrypt data. Data invalid or password wrong.</source>
4040
<translation type="unfinished"></translation>
4141
</message>
@@ -45,7 +45,7 @@
4545
<message>
4646
<location filename="../changecontroller.cpp" line="+81"/>
4747
<location line="+25"/>
48-
<location line="+103"/>
48+
<location line="+105"/>
4949
<source>Failed to upload changes to server.</source>
5050
<translation type="unfinished"></translation>
5151
</message>
@@ -63,15 +63,28 @@
6363
<translation type="unfinished"></translation>
6464
</message>
6565
</context>
66+
<context>
67+
<name>QtDataSync::ExchangeEngine</name>
68+
<message>
69+
<location filename="../setup.cpp" line="+424"/>
70+
<source>Password for trusted import must not be empty</source>
71+
<translation type="unfinished"></translation>
72+
</message>
73+
<message>
74+
<location line="+188"/>
75+
<source>Import data must be a JSON object</source>
76+
<translation type="unfinished"></translation>
77+
</message>
78+
</context>
6679
<context>
6780
<name>QtDataSync::RemoteConnector</name>
6881
<message>
69-
<location filename="../remoteconnector.cpp" line="+736"/>
82+
<location filename="../remoteconnector.cpp" line="+796"/>
7083
<source>Failed to load user identity! Make shure your keystore is available.</source>
7184
<translation type="unfinished"></translation>
7285
</message>
7386
<message>
74-
<location line="+115"/>
87+
<location line="+116"/>
7588
<source>Server is not compatibel with your application version.</source>
7689
<translation type="unfinished"></translation>
7790
</message>
@@ -114,21 +127,21 @@
114127
<context>
115128
<name>QtDataSync::SyncController</name>
116129
<message>
117-
<location filename="../synccontroller.cpp" line="+165"/>
130+
<location filename="../synccontroller.cpp" line="+166"/>
118131
<source>Data downloaded from server is invalid.</source>
119132
<translation type="unfinished"></translation>
120133
</message>
121134
</context>
122135
<context>
123136
<name>QtDataSync::UserExchangeManager</name>
124137
<message>
125-
<location filename="../userexchangemanager.cpp" line="+161"/>
138+
<location filename="../userexchangemanager.cpp" line="+163"/>
126139
<location line="+9"/>
127140
<source>No import data received from passed user.</source>
128141
<translation type="unfinished"></translation>
129142
</message>
130143
<message>
131-
<location line="+76"/>
144+
<location line="+80"/>
132145
<source>&lt;Unnamed&gt;</source>
133146
<translation type="unfinished"></translation>
134147
</message>

‎src/imports/imports.pro‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,3 @@ TEMPLATE = subdirs
22

33
SUBDIRS += \
44
datasync
5-
6-
datasync.CONFIG += no_lrelease_target
7-
8-
prepareRecursiveTarget(lrelease)
9-
QMAKE_EXTRA_TARGETS += lrelease

‎src/plugins/keystores/keystores.pro‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,5 @@ win32:!winrt: SUBDIRS += wincred
77
mac|ios: SUBDIRS += keychain
88
android: SUBDIRS += android
99

10-
plain.CONFIG += no_lrelease_target
11-
kwallet.CONFIG += no_lrelease_target
12-
secretservice.CONFIG += no_lrelease_target
13-
wincred.CONFIG += no_lrelease_target
14-
keychain.CONFIG += no_lrelease_target
15-
android.CONFIG += no_lrelease_target
16-
1710
prepareRecursiveTarget(lrelease)
1811
QMAKE_EXTRA_TARGETS += lrelease

‎src/plugins/plugins.pro‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,3 @@ TEMPLATE = subdirs
22

33
QT_FOR_CONFIG += core
44
SUBDIRS += keystores
5-
6-
prepareRecursiveTarget(lrelease)
7-
QMAKE_EXTRA_TARGETS += lrelease

‎src/src.pro‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,9 @@ datasync.depends += messages
1010
plugins.depends += datasync
1111
imports.depends += datasync
1212

13+
imports.CONFIG += no_lrelease_target
14+
plugins.CONFIG += no_lrelease_target
15+
messages.CONFIG += no_lrelease_target
16+
1317
prepareRecursiveTarget(lrelease)
1418
QMAKE_EXTRA_TARGETS += lrelease

0 commit comments

Comments
 (0)