Skip to content

Commit a9981fa

Browse files
foldynlfoldynl
committed
Merge branch 'kyleboyle_653' into testing_0.44
2 parents c2cbf64 + 69abcae commit a9981fa

9 files changed

+177
-136
lines changed

‎i18n/qlog_cs.ts

+25-25
Original file line numberDiff line numberDiff line change
@@ -7073,7 +7073,7 @@
70737073
<location filename="../ui/MapWebChannelHandler.cpp" line="61"/>
70747074
<location filename="../ui/MapWebChannelHandler.cpp" line="93"/>
70757075
<location filename="../ui/MapWebChannelHandler.cpp" line="164"/>
7076-
<source>Paths</source>
7076+
<source>Path</source>
70777077
<translation>Cesta</translation>
70787078
</message>
70797079
</context>
@@ -7238,7 +7238,7 @@
72387238
<translation>Člen:</translation>
72397239
</message>
72407240
<message>
7241-
<location filename="../ui/NewContactWidget.cpp" line="3818"/>
7241+
<location filename="../ui/NewContactWidget.cpp" line="3820"/>
72427242
<source>World Wide Flora &amp; Fauna</source>
72437243
<translation>World Wide Flora &amp; Fauna</translation>
72447244
</message>
@@ -7276,7 +7276,7 @@
72767276
<translation>QSL odeslat přes</translation>
72777277
</message>
72787278
<message>
7279-
<location filename="../ui/NewContactWidget.cpp" line="3866"/>
7279+
<location filename="../ui/NewContactWidget.cpp" line="3868"/>
72807280
<source>Blank</source>
72817281
<translation>Nevyplněno</translation>
72827282
</message>
@@ -7301,7 +7301,7 @@
73017301
<translation>Stanice</translation>
73027302
</message>
73037303
<message>
7304-
<location filename="../ui/NewContactWidget.cpp" line="3798"/>
7304+
<location filename="../ui/NewContactWidget.cpp" line="3800"/>
73057305
<source>the contacted station&apos;s DARC DOK (District Location Code) (ex. A01)</source>
73067306
<translation>DARC DOK (kód uzemí) (např A01)</translation>
73077307
</message>
@@ -7326,7 +7326,7 @@
73267326
<translation>Rig</translation>
73277327
</message>
73287328
<message>
7329-
<location filename="../ui/NewContactWidget.cpp" line="3867"/>
7329+
<location filename="../ui/NewContactWidget.cpp" line="3869"/>
73307330
<source> W</source>
73317331
<translation> W</translation>
73327332
</message>
@@ -7441,47 +7441,47 @@
74417441
<translation>Potvrzeno</translation>
74427442
</message>
74437443
<message>
7444-
<location filename="../ui/NewContactWidget.cpp" line="2960"/>
7444+
<location filename="../ui/NewContactWidget.cpp" line="2962"/>
74457445
<source>GE</source>
74467446
<translation>GE</translation>
74477447
</message>
74487448
<message>
7449-
<location filename="../ui/NewContactWidget.cpp" line="2970"/>
7449+
<location filename="../ui/NewContactWidget.cpp" line="2972"/>
74507450
<source>GM</source>
74517451
<translation>GM</translation>
74527452
</message>
74537453
<message>
7454-
<location filename="../ui/NewContactWidget.cpp" line="2976"/>
7454+
<location filename="../ui/NewContactWidget.cpp" line="2978"/>
74557455
<source>GA</source>
74567456
<translation>GA</translation>
74577457
</message>
74587458
<message>
7459-
<location filename="../ui/NewContactWidget.cpp" line="3287"/>
7459+
<location filename="../ui/NewContactWidget.cpp" line="3289"/>
74607460
<source> m</source>
74617461
<translation> m</translation>
74627462
</message>
74637463
<message>
7464-
<location filename="../ui/NewContactWidget.cpp" line="3629"/>
7464+
<location filename="../ui/NewContactWidget.cpp" line="3631"/>
74657465
<source>Callbook search is active</source>
74667466
<translation>Hledání v Callbooku je aktivní</translation>
74677467
</message>
74687468
<message>
7469-
<location filename="../ui/NewContactWidget.cpp" line="3702"/>
7469+
<location filename="../ui/NewContactWidget.cpp" line="3704"/>
74707470
<source>Contest ID must be filled in to activate</source>
74717471
<translation>Pro aktivaci je nutné vyplnit Contest ID</translation>
74727472
</message>
74737473
<message>
7474-
<location filename="../ui/NewContactWidget.cpp" line="3854"/>
7474+
<location filename="../ui/NewContactWidget.cpp" line="3856"/>
74757475
<source>It is not the name of the contest but it is an assigned&lt;br&gt;Contest ID (ex. CQ-WW-CW for CQ WW DX Contest (CW)) </source>
74767476
<translation>Není to jméno Contestu ale jeho přiřazené Contest ID (např. CQ-WW-CW pro CQ WW DX Contest (CW)) </translation>
74777477
</message>
74787478
<message>
7479-
<location filename="../ui/NewContactWidget.cpp" line="3869"/>
7479+
<location filename="../ui/NewContactWidget.cpp" line="3871"/>
74807480
<source>Description of the contacted station&apos;s equipment</source>
74817481
<translation>Popis vybavení kontaktované stanice</translation>
74827482
</message>
74837483
<message>
7484-
<location filename="../ui/NewContactWidget.cpp" line="3624"/>
7484+
<location filename="../ui/NewContactWidget.cpp" line="3626"/>
74857485
<source>Callbook search is inactive</source>
74867486
<translation>Hledání v Callbooku není aktivní</translation>
74877487
</message>
@@ -7491,17 +7491,17 @@
74917491
<translation>Rozbalit/sbalit</translation>
74927492
</message>
74937493
<message>
7494-
<location filename="../ui/NewContactWidget.cpp" line="3795"/>
7494+
<location filename="../ui/NewContactWidget.cpp" line="3797"/>
74957495
<source>two or four adjacent Maidenhead grid locators, each four characters long, (ex. EN98,FM08,EM97,FM07)</source>
74967496
<translation>dva nebo čtyři sousední lokátory, každý o délce čtyř znaků (např. EN98,FM08,EM97,FM07)</translation>
74977497
</message>
74987498
<message>
7499-
<location filename="../ui/NewContactWidget.cpp" line="3822"/>
7499+
<location filename="../ui/NewContactWidget.cpp" line="3824"/>
75007500
<source>Special Activity Group</source>
75017501
<translation></translation>
75027502
</message>
75037503
<message>
7504-
<location filename="../ui/NewContactWidget.cpp" line="3826"/>
7504+
<location filename="../ui/NewContactWidget.cpp" line="3828"/>
75057505
<source>Special Activity Group Information</source>
75067506
<translation></translation>
75077507
</message>
@@ -8891,7 +8891,7 @@
88918891
<location filename="../ui/QSODetailDialog.cpp" line="428"/>
88928892
<location filename="../ui/QSODetailDialog.cpp" line="474"/>
88938893
<location filename="../ui/QSODetailDialog.cpp" line="674"/>
8894-
<location filename="../ui/QSODetailDialog.cpp" line="1214"/>
8894+
<location filename="../ui/QSODetailDialog.cpp" line="1222"/>
88958895
<source>QLog Error</source>
88968896
<translation>Chyba QLog</translation>
88978897
</message>
@@ -9103,33 +9103,33 @@
91039103
<translation>Na základě POTA Summit, Můj Lokátor neodpovídat POTA definici - očekáváno </translation>
91049104
</message>
91059105
<message>
9106-
<location filename="../ui/QSODetailDialog.cpp" line="1214"/>
9106+
<location filename="../ui/QSODetailDialog.cpp" line="1222"/>
91079107
<source>Callbook error: </source>
91089108
<translation>Chyba Callbooku: </translation>
91099109
</message>
91109110
<message>
9111-
<location filename="../ui/QSODetailDialog.cpp" line="1349"/>
9112-
<location filename="../ui/QSODetailDialog.cpp" line="1354"/>
9111+
<location filename="../ui/QSODetailDialog.cpp" line="1357"/>
9112+
<location filename="../ui/QSODetailDialog.cpp" line="1362"/>
91139113
<source>&lt;b&gt;Warning: &lt;/b&gt;</source>
91149114
<translation>&lt;b&gt;Upozornění: &lt;/b&gt;</translation>
91159115
</message>
91169116
<message>
9117-
<location filename="../ui/QSODetailDialog.cpp" line="1544"/>
9117+
<location filename="../ui/QSODetailDialog.cpp" line="1577"/>
91189118
<source>Validation</source>
91199119
<translation>Kontrola</translation>
91209120
</message>
91219121
<message>
9122-
<location filename="../ui/QSODetailDialog.cpp" line="1544"/>
9122+
<location filename="../ui/QSODetailDialog.cpp" line="1577"/>
91239123
<source>Yellow marked fields are invalid.&lt;p&gt;Nevertheless, save the changes?&lt;/p&gt;</source>
91249124
<translation>Žlutě vyznačená pole obsahují neplatné hodnoty&lt;p&gt;I přes to uložit změny?&lt;/p&gt;</translation>
91259125
</message>
91269126
<message>
9127-
<location filename="../ui/QSODetailDialog.cpp" line="1602"/>
9127+
<location filename="../ui/QSODetailDialog.cpp" line="1635"/>
91289128
<source>&amp;Save</source>
91299129
<translation>&amp;Uložit</translation>
91309130
</message>
91319131
<message>
9132-
<location filename="../ui/QSODetailDialog.cpp" line="1603"/>
9132+
<location filename="../ui/QSODetailDialog.cpp" line="1636"/>
91339133
<source>&amp;Edit</source>
91349134
<translation>U&amp;pravit</translation>
91359135
</message>

‎i18n/qlog_de.ts

+25-25
Original file line numberDiff line numberDiff line change
@@ -7065,7 +7065,7 @@
70657065
<location filename="../ui/MapWebChannelHandler.cpp" line="61"/>
70667066
<location filename="../ui/MapWebChannelHandler.cpp" line="93"/>
70677067
<location filename="../ui/MapWebChannelHandler.cpp" line="164"/>
7068-
<source>Paths</source>
7068+
<source>Path</source>
70697069
<translation>Weg</translation>
70707070
</message>
70717071
</context>
@@ -7140,7 +7140,7 @@
71407140
<translation>Startzeit</translation>
71417141
</message>
71427142
<message>
7143-
<location filename="../ui/NewContactWidget.cpp" line="3867"/>
7143+
<location filename="../ui/NewContactWidget.cpp" line="3869"/>
71447144
<source> W</source>
71457145
<translation></translation>
71467146
</message>
@@ -7180,7 +7180,7 @@
71807180
<translation>&amp;Details</translation>
71817181
</message>
71827182
<message>
7183-
<location filename="../ui/NewContactWidget.cpp" line="3798"/>
7183+
<location filename="../ui/NewContactWidget.cpp" line="3800"/>
71847184
<source>the contacted station&apos;s DARC DOK (District Location Code) (ex. A01)</source>
71857185
<translation>DARC-DOK (Ortsverbandkenner) der kontaktierten Station (z.B. A01)</translation>
71867186
</message>
@@ -7215,7 +7215,7 @@
72157215
<translation>Dauer</translation>
72167216
</message>
72177217
<message>
7218-
<location filename="../ui/NewContactWidget.cpp" line="3818"/>
7218+
<location filename="../ui/NewContactWidget.cpp" line="3820"/>
72197219
<source>World Wide Flora &amp; Fauna</source>
72207220
<translation></translation>
72217221
</message>
@@ -7268,7 +7268,7 @@
72687268
<translation>&lt;b&gt;Stationsstatistik&lt;/b&gt;</translation>
72697269
</message>
72707270
<message>
7271-
<location filename="../ui/NewContactWidget.cpp" line="3866"/>
7271+
<location filename="../ui/NewContactWidget.cpp" line="3868"/>
72727272
<source>Blank</source>
72737273
<translation>Leer</translation>
72747274
</message>
@@ -7433,47 +7433,47 @@
74337433
<translation>Bestätigt</translation>
74347434
</message>
74357435
<message>
7436-
<location filename="../ui/NewContactWidget.cpp" line="2960"/>
7436+
<location filename="../ui/NewContactWidget.cpp" line="2962"/>
74377437
<source>GE</source>
74387438
<translation>GA</translation>
74397439
</message>
74407440
<message>
7441-
<location filename="../ui/NewContactWidget.cpp" line="2970"/>
7441+
<location filename="../ui/NewContactWidget.cpp" line="2972"/>
74427442
<source>GM</source>
74437443
<translation>GM</translation>
74447444
</message>
74457445
<message>
7446-
<location filename="../ui/NewContactWidget.cpp" line="2976"/>
7446+
<location filename="../ui/NewContactWidget.cpp" line="2978"/>
74477447
<source>GA</source>
74487448
<translation>GT</translation>
74497449
</message>
74507450
<message>
7451-
<location filename="../ui/NewContactWidget.cpp" line="3287"/>
7451+
<location filename="../ui/NewContactWidget.cpp" line="3289"/>
74527452
<source> m</source>
74537453
<translation></translation>
74547454
</message>
74557455
<message>
7456-
<location filename="../ui/NewContactWidget.cpp" line="3629"/>
7456+
<location filename="../ui/NewContactWidget.cpp" line="3631"/>
74577457
<source>Callbook search is active</source>
74587458
<translation>Callbook-Suche ist aktiv</translation>
74597459
</message>
74607460
<message>
7461-
<location filename="../ui/NewContactWidget.cpp" line="3702"/>
7461+
<location filename="../ui/NewContactWidget.cpp" line="3704"/>
74627462
<source>Contest ID must be filled in to activate</source>
74637463
<translation>Zur Aktivierung muss die Contest-ID ausgefüllt werden</translation>
74647464
</message>
74657465
<message>
7466-
<location filename="../ui/NewContactWidget.cpp" line="3854"/>
7466+
<location filename="../ui/NewContactWidget.cpp" line="3856"/>
74677467
<source>It is not the name of the contest but it is an assigned&lt;br&gt;Contest ID (ex. CQ-WW-CW for CQ WW DX Contest (CW)) </source>
74687468
<translation type="unfinished"></translation>
74697469
</message>
74707470
<message>
7471-
<location filename="../ui/NewContactWidget.cpp" line="3869"/>
7471+
<location filename="../ui/NewContactWidget.cpp" line="3871"/>
74727472
<source>Description of the contacted station&apos;s equipment</source>
74737473
<translation>Beschreibung der Ausrüstung der kontaktierten Station</translation>
74747474
</message>
74757475
<message>
7476-
<location filename="../ui/NewContactWidget.cpp" line="3624"/>
7476+
<location filename="../ui/NewContactWidget.cpp" line="3626"/>
74777477
<source>Callbook search is inactive</source>
74787478
<translation>Callbook-Suche ist inaktiv</translation>
74797479
</message>
@@ -7483,17 +7483,17 @@
74837483
<translation>Erweitern/Zusammenklappen</translation>
74847484
</message>
74857485
<message>
7486-
<location filename="../ui/NewContactWidget.cpp" line="3795"/>
7486+
<location filename="../ui/NewContactWidget.cpp" line="3797"/>
74877487
<source>two or four adjacent Maidenhead grid locators, each four characters long, (ex. EN98,FM08,EM97,FM07)</source>
74887488
<translation>zwei oder vier nebeneinander liegende, jeweils vier Zeichen lange Gitterfelder (z. B. EN98,FM08,EM97,FM07)</translation>
74897489
</message>
74907490
<message>
7491-
<location filename="../ui/NewContactWidget.cpp" line="3822"/>
7491+
<location filename="../ui/NewContactWidget.cpp" line="3824"/>
74927492
<source>Special Activity Group</source>
74937493
<translation>Spezielle Aktivitätsgruppe</translation>
74947494
</message>
74957495
<message>
7496-
<location filename="../ui/NewContactWidget.cpp" line="3826"/>
7496+
<location filename="../ui/NewContactWidget.cpp" line="3828"/>
74977497
<source>Special Activity Group Information</source>
74987498
<translation></translation>
74997499
</message>
@@ -8878,7 +8878,7 @@
88788878
<location filename="../ui/QSODetailDialog.cpp" line="428"/>
88798879
<location filename="../ui/QSODetailDialog.cpp" line="474"/>
88808880
<location filename="../ui/QSODetailDialog.cpp" line="674"/>
8881-
<location filename="../ui/QSODetailDialog.cpp" line="1214"/>
8881+
<location filename="../ui/QSODetailDialog.cpp" line="1222"/>
88828882
<source>QLog Error</source>
88838883
<translation>QLog Fehler</translation>
88848884
</message>
@@ -9090,33 +9090,33 @@
90909090
<translation>Auf Grundlage der POTA Daten, stimmt das eigene Gitterfeld nicht mit dem POTA-Gitterfeld überein - erwartend </translation>
90919091
</message>
90929092
<message>
9093-
<location filename="../ui/QSODetailDialog.cpp" line="1214"/>
9093+
<location filename="../ui/QSODetailDialog.cpp" line="1222"/>
90949094
<source>Callbook error: </source>
90959095
<translation>Callbook-Fehler: </translation>
90969096
</message>
90979097
<message>
9098-
<location filename="../ui/QSODetailDialog.cpp" line="1349"/>
9099-
<location filename="../ui/QSODetailDialog.cpp" line="1354"/>
9098+
<location filename="../ui/QSODetailDialog.cpp" line="1357"/>
9099+
<location filename="../ui/QSODetailDialog.cpp" line="1362"/>
91009100
<source>&lt;b&gt;Warning: &lt;/b&gt;</source>
91019101
<translation>&lt;b&gt;Warnung: &lt;/b&gt;</translation>
91029102
</message>
91039103
<message>
9104-
<location filename="../ui/QSODetailDialog.cpp" line="1544"/>
9104+
<location filename="../ui/QSODetailDialog.cpp" line="1577"/>
91059105
<source>Validation</source>
91069106
<translation>Überprüfung</translation>
91079107
</message>
91089108
<message>
9109-
<location filename="../ui/QSODetailDialog.cpp" line="1544"/>
9109+
<location filename="../ui/QSODetailDialog.cpp" line="1577"/>
91109110
<source>Yellow marked fields are invalid.&lt;p&gt;Nevertheless, save the changes?&lt;/p&gt;</source>
91119111
<translation>Gelb markierte Felder sind ungültig.&lt;p&gt;Dennoch die Änderungen speichern?&lt;/p&gt;</translation>
91129112
</message>
91139113
<message>
9114-
<location filename="../ui/QSODetailDialog.cpp" line="1602"/>
9114+
<location filename="../ui/QSODetailDialog.cpp" line="1635"/>
91159115
<source>&amp;Save</source>
91169116
<translation>&amp;Speichern</translation>
91179117
</message>
91189118
<message>
9119-
<location filename="../ui/QSODetailDialog.cpp" line="1603"/>
9119+
<location filename="../ui/QSODetailDialog.cpp" line="1636"/>
91209120
<source>&amp;Edit</source>
91219121
<translation>B&amp;earbeiten</translation>
91229122
</message>

0 commit comments

Comments
 (0)