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

Commit 0fa06ff

Browse files
committed
fix translations
1 parent b92c15e commit 0fa06ff

File tree

15 files changed

+98
-96
lines changed

15 files changed

+98
-96
lines changed

.qmake.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
load(qt_build_config)
22

33
CONFIG += warning_clean exceptions c++14
4-
!win32: CONFIG += samples_in_build # TODO fix on win
4+
!win32: CONFIG += samples_in_build #TODO fix on win
55
win32:cross_compile: CONFIG += winrt
66
DEFINES += QT_DEPRECATED_WARNINGS QT_ASCII_CAST_WARNINGS
77

examples/mvvmcore/SampleCore/samplecore_de.ts

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -81,32 +81,32 @@
8181
<context>
8282
<name>qtmvvm_settings_xml</name>
8383
<message>
84-
<location filename=".ts-dummy/settings.tsdummy.cpp" line="+4"/>
84+
<location filename=".ts-dummy/settings.tsdummy.cpp" line="+6"/>
8585
<source>Select a &amp;mode</source>
8686
<translation type="unfinished"></translation>
8787
</message>
8888
<message>
89-
<location line="+1"/>
89+
<location line="+15"/>
9090
<source>Variant B</source>
9191
<translation type="unfinished"></translation>
9292
</message>
9393
<message>
94-
<location line="+1"/>
94+
<location line="-7"/>
9595
<source>This is another section</source>
9696
<translation type="unfinished"></translation>
9797
</message>
9898
<message>
99-
<location line="+1"/>
99+
<location line="+20"/>
100100
<source>Variant C</source>
101101
<translation type="unfinished"></translation>
102102
</message>
103103
<message>
104-
<location line="+1"/>
104+
<location line="-23"/>
105105
<source>https://example.org/test</source>
106106
<translation type="unfinished"></translation>
107107
</message>
108108
<message>
109-
<location line="+1"/>
109+
<location line="+13"/>
110110
<source>Value C</source>
111111
<translation type="unfinished"></translation>
112112
</message>
@@ -116,27 +116,27 @@
116116
<translation type="unfinished"></translation>
117117
</message>
118118
<message>
119-
<location line="+1"/>
119+
<location line="-16"/>
120120
<source>Value A+B</source>
121121
<translation type="unfinished"></translation>
122122
</message>
123123
<message>
124-
<location line="+1"/>
124+
<location line="+14"/>
125125
<source>Value A+B+C</source>
126126
<translation type="unfinished"></translation>
127127
</message>
128128
<message>
129-
<location line="+1"/>
129+
<location line="+12"/>
130130
<source>bool</source>
131131
<translation type="unfinished"></translation>
132132
</message>
133133
<message>
134-
<location line="+1"/>
134+
<location line="-8"/>
135135
<source>Open &amp;system settings</source>
136136
<translation type="unfinished"></translation>
137137
</message>
138138
<message>
139-
<location line="+1"/>
139+
<location line="-23"/>
140140
<source>Value A+C</source>
141141
<translation type="unfinished"></translation>
142142
</message>
@@ -146,102 +146,102 @@
146146
<translation type="unfinished"></translation>
147147
</message>
148148
<message>
149-
<location line="+1"/>
149+
<location line="+25"/>
150150
<source>property</source>
151151
<translation type="unfinished"></translation>
152152
</message>
153153
<message>
154-
<location line="+1"/>
154+
<location line="-20"/>
155155
<source>Another Section</source>
156156
<translation type="unfinished"></translation>
157157
</message>
158158
<message>
159-
<location line="+1"/>
159+
<location line="+18"/>
160160
<source>Enter a &amp;website</source>
161161
<translation type="unfinished"></translation>
162162
</message>
163163
<message>
164-
<location line="+1"/>
164+
<location line="-9"/>
165165
<source>Another main category</source>
166166
<translation type="unfinished"></translation>
167167
</message>
168168
<message>
169-
<location line="+1"/>
169+
<location line="+17"/>
170170
<source>Text 2</source>
171171
<translation type="unfinished"></translation>
172172
</message>
173173
<message>
174-
<location line="+1"/>
174+
<location line="-4"/>
175175
<source>This is a tooltip</source>
176176
<translation type="unfinished"></translation>
177177
</message>
178178
<message>
179-
<location line="+1"/>
179+
<location line="-3"/>
180180
<source>Enter a &amp;value</source>
181181
<translation type="unfinished"></translation>
182182
</message>
183183
<message>
184-
<location line="+1"/>
184+
<location line="+4"/>
185185
<source>Choose a &amp;font</source>
186186
<translation type="unfinished"></translation>
187187
</message>
188188
<message>
189-
<location line="+1"/>
189+
<location line="-20"/>
190190
<source>Variant A</source>
191191
<translation type="unfinished"></translation>
192192
</message>
193193
<message>
194-
<location line="+1"/>
194+
<location line="+5"/>
195195
<source>Value A</source>
196196
<translation type="unfinished"></translation>
197197
</message>
198198
<message>
199-
<location line="+1"/>
199+
<location line="+4"/>
200200
<source>Enter a &amp;name</source>
201201
<translation type="unfinished"></translation>
202202
</message>
203203
<message>
204-
<location line="+1"/>
204+
<location line="-2"/>
205205
<source>I am a checkbox!</source>
206206
<translation type="unfinished"></translation>
207207
</message>
208208
<message>
209-
<location line="+1"/>
209+
<location line="-4"/>
210210
<source>Enter a &amp;number</source>
211211
<translation type="unfinished"></translation>
212212
</message>
213213
<message>
214-
<location line="+1"/>
214+
<location line="+15"/>
215215
<source>You can use this to trigger whatever kind of action you need</source>
216216
<translation type="unfinished"></translation>
217217
</message>
218218
<message>
219-
<location line="+1"/>
219+
<location line="-23"/>
220220
<source>Value B</source>
221221
<translation type="unfinished"></translation>
222222
</message>
223223
<message>
224-
<location line="+1"/>
224+
<location line="+4"/>
225225
<source>The value must be between 0 and 1</source>
226226
<translation type="unfinished"></translation>
227227
</message>
228228
<message>
229-
<location line="+1"/>
229+
<location line="+5"/>
230230
<source>Non existing type</source>
231231
<translation type="unfinished"></translation>
232232
</message>
233233
<message>
234-
<location line="+1"/>
234+
<location line="+9"/>
235235
<source>Text 1</source>
236236
<translation type="unfinished"></translation>
237237
</message>
238238
<message>
239-
<location line="+1"/>
239+
<location line="-11"/>
240240
<source>Sub-Group</source>
241241
<translation type="unfinished"></translation>
242242
</message>
243243
<message>
244-
<location line="+1"/>
244+
<location line="-8"/>
245245
<source>Value B+C</source>
246246
<translation type="unfinished"></translation>
247247
</message>

src/mvvmcore/translations/qtmvvmcore_de.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<context>
55
<name>MessageConfig</name>
66
<message>
7-
<location filename="../message.cpp" line="+404"/>
7+
<location filename="../message.cpp" line="+411"/>
88
<source>%1 — Version %2</source>
99
<translation>%1 — Version %2</translation>
1010
</message>

src/mvvmcore/translations/qtmvvmcore_template.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<context>
55
<name>MessageConfig</name>
66
<message>
7-
<location filename="../message.cpp" line="+404"/>
7+
<location filename="../message.cpp" line="+411"/>
88
<source>%1 — Version %2</source>
99
<translation type="unfinished"></translation>
1010
</message>

src/mvvmdatasynccore/translations/qtmvvmdatasynccore_de.ts

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<context>
55
<name>QtMvvm::AccountModel</name>
66
<message>
7-
<location filename="../accountmodel.cpp" line="+57"/>
7+
<location filename="../accountmodel.cpp" line="+63"/>
88
<source>Name</source>
99
<translation>Name</translation>
1010
</message>
@@ -31,7 +31,7 @@
3131
<context>
3232
<name>QtMvvm::DataSyncViewModel</name>
3333
<message>
34-
<location filename="../datasyncviewmodel.cpp" line="+82"/>
34+
<location filename="../datasyncviewmodel.cpp" line="+88"/>
3535
<source>Connecting…</source>
3636
<translation>Verbinde…</translation>
3737
</message>
@@ -61,26 +61,26 @@
6161
<translation>Verbindung getrennt</translation>
6262
</message>
6363
<message>
64-
<location line="+39"/>
64+
<location line="+47"/>
6565
<source>Export account data to file:</source>
6666
<translation>Account-Daten in Datei exportieren:</translation>
6767
</message>
6868
<message>
69-
<location line="+17"/>
69+
<location line="+19"/>
7070
<location line="+5"/>
71-
<location line="+296"/>
72-
<location filename="../networkexchangeviewmodel.cpp" line="+166"/>
71+
<location line="+315"/>
72+
<location filename="../networkexchangeviewmodel.cpp" line="+189"/>
7373
<source>Import failed</source>
7474
<translation>Import fehlgeschlagen</translation>
7575
</message>
7676
<message>
77-
<location line="-301"/>
78-
<location line="+254"/>
77+
<location line="-320"/>
78+
<location line="+273"/>
7979
<source>Unsupported URL Scheme: %1</source>
8080
<translation>Nicht unterstütztes URL-Schema: %1</translation>
8181
</message>
8282
<message>
83-
<location line="-238"/>
83+
<location line="-257"/>
8484
<location line="+24"/>
8585
<location line="+20"/>
8686
<source>Import account data</source>
@@ -121,7 +121,7 @@
121121
<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>
122122
</message>
123123
<message>
124-
<location line="+57"/>
124+
<location line="+68"/>
125125
<source>Login requested!</source>
126126
<translation>Login angefordert!</translation>
127127
</message>
@@ -131,7 +131,7 @@
131131
<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>
132132
</message>
133133
<message>
134-
<location line="+19"/>
134+
<location line="+20"/>
135135
<source>Import accepted</source>
136136
<translation>Import akzeptiert</translation>
137137
</message>
@@ -151,15 +151,15 @@
151151
<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>
152152
</message>
153153
<message>
154-
<location line="+92"/>
154+
<location line="+99"/>
155155
<location line="+6"/>
156156
<location line="+19"/>
157157
<source>Export failed</source>
158158
<translation>Export fehlgeschlagen</translation>
159159
</message>
160160
<message>
161-
<location line="-272"/>
162-
<location line="+254"/>
161+
<location line="-291"/>
162+
<location line="+273"/>
163163
<source>Failed to open URL &quot;%1&quot; with error: %2</source>
164164
<translation>URL \&quot;%1\&quot; konnte nicht göffnet werden. Fehlermeldung: %2</translation>
165165
</message>
@@ -194,7 +194,7 @@
194194
<context>
195195
<name>QtMvvm::ExchangeDevicesModel</name>
196196
<message>
197-
<location filename="../exchangedevicesmodel.cpp" line="+41"/>
197+
<location filename="../exchangedevicesmodel.cpp" line="+62"/>
198198
<source>Name</source>
199199
<translation>Name</translation>
200200
</message>
@@ -223,35 +223,35 @@
223223
<context>
224224
<name>QtMvvm::NetworkExchangeViewModel</name>
225225
<message>
226-
<location filename="../networkexchangeviewmodel.cpp" line="-90"/>
226+
<location filename="../networkexchangeviewmodel.cpp" line="-94"/>
227227
<source>Export accont data to device &quot;%1&quot; with address &quot;%1&quot;:</source>
228228
<translation>Daten werden exportiert zu Gerät &quot;%1&quot; mit Addresse &quot;%1&quot;:</translation>
229229
</message>
230230
<message>
231-
<location line="+79"/>
231+
<location line="+83"/>
232232
<source>Network exchange error</source>
233233
<translation>Netzwerk-Austausch fehlgeschlagen</translation>
234234
</message>
235235
<message>
236236
<location line="+18"/>
237-
<location line="+26"/>
237+
<location line="+28"/>
238238
<source>Import account data</source>
239239
<translation>Account-Daten importieren</translation>
240240
</message>
241241
<message>
242-
<location line="-25"/>
242+
<location line="-27"/>
243243
<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>
244244
<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>
245245
</message>
246246
<message>
247247
<location line="+5"/>
248-
<location line="+26"/>
248+
<location line="+28"/>
249249
<source>Reset data</source>
250250
<translation>Daten zurücksetzen</translation>
251251
</message>
252252
<message>
253-
<location line="-25"/>
254-
<location line="+26"/>
253+
<location line="-27"/>
254+
<location line="+28"/>
255255
<source>Keep data</source>
256256
<translation>Daten behalten</translation>
257257
</message>

0 commit comments

Comments
 (0)