Skip to content

Commit 566fa81

Browse files
dg0ytdg0yt
committed
Merge branch 'master' into dev
2 parents 0ea83fd + fc9aa71 commit 566fa81

26 files changed

+1286
-1159
lines changed

‎src/gui/widgets/symbol_dropdown.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ SymbolDropDown::SymbolDropDown(const Map* map, int filter, const Symbol* initial
5353
: QComboBox(parent)
5454
{
5555
num_custom_items = 0;
56-
addItem(tr("- none -"), QVariant::fromValue<Symbol*>(nullptr));
56+
addItem(tr("- none -"), QVariant::fromValue<const Symbol*>(nullptr));
5757

5858
int size = map->getNumSymbols();
5959
for (int i = 0; i < size; ++i)

‎translations/OpenOrienteering_cs.ts

Lines changed: 103 additions & 98 deletions
Large diffs are not rendered by default.

‎translations/OpenOrienteering_da.ts

Lines changed: 49 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -2105,7 +2105,7 @@
21052105
</message>
21062106
<message>
21072107
<location filename="../src/fileformats/native_file_format.cpp" line="95"/>
2108-
<location filename="../src/fileformats/xml_file_format.cpp" line="90"/>
2108+
<location filename="../src/fileformats/xml_file_format.cpp" line="91"/>
21092109
<source>OpenOrienteering Mapper</source>
21102110
<translation>OpenOrienteering Mapper</translation>
21112111
</message>
@@ -2134,13 +2134,13 @@
21342134
<translation>Forventede %1 koordinater, fandt %2.</translation>
21352135
</message>
21362136
<message>
2137-
<location filename="../src/fileformats/xml_file_format.cpp" line="981"/>
2137+
<location filename="../src/fileformats/xml_file_format.cpp" line="982"/>
21382138
<source>Error while loading the printing configuration at %1:%2: %3</source>
21392139
<translation>Fejl under indlæsning af udskrivningskonfigurationen på %1:%2: %3</translation>
21402140
</message>
21412141
<message>
2142-
<location filename="../src/fileformats/xml_file_format.cpp" line="1000"/>
2143-
<location filename="../src/fileformats/xml_file_format.cpp" line="1020"/>
2142+
<location filename="../src/fileformats/xml_file_format.cpp" line="1001"/>
2143+
<location filename="../src/fileformats/xml_file_format.cpp" line="1021"/>
21442144
<source>Error while loading the undo/redo steps at %1:%2: %3</source>
21452145
<translation>Fejl under indlæsning af fortryd/gentag trin på %1:%2: %3</translation>
21462146
</message>
@@ -2212,13 +2212,13 @@
22122212
</message>
22132213
<message>
22142214
<location filename="../src/fileformats/native_file_format.cpp" line="139"/>
2215-
<location filename="../src/fileformats/xml_file_format.cpp" line="509"/>
2215+
<location filename="../src/fileformats/xml_file_format.cpp" line="510"/>
22162216
<source>Invalid file format version.</source>
22172217
<translation>Ugyldig fil formatversion.</translation>
22182218
</message>
22192219
<message>
22202220
<location filename="../src/fileformats/native_file_format.cpp" line="143"/>
2221-
<location filename="../src/fileformats/xml_file_format.cpp" line="511"/>
2221+
<location filename="../src/fileformats/xml_file_format.cpp" line="512"/>
22222222
<source>Unsupported old file format version. Please use an older program version to load and update the file.</source>
22232223
<translation>Filformatet er gammelt og derfor ikke understøttet. Brug venligst en ældre software version til at åbne og opdatere filen.</translation>
22242224
</message>
@@ -2269,12 +2269,12 @@
22692269
<translation>Kunne ikke læse filen: %1</translation>
22702270
</message>
22712271
<message>
2272-
<location filename="../src/fileformats/xml_file_format.cpp" line="503"/>
2272+
<location filename="../src/fileformats/xml_file_format.cpp" line="504"/>
22732273
<source>Unsupported file format.</source>
22742274
<translation>Ikke-understøttet filformat.</translation>
22752275
</message>
22762276
<message>
2277-
<location filename="../src/fileformats/xml_file_format.cpp" line="513"/>
2277+
<location filename="../src/fileformats/xml_file_format.cpp" line="514"/>
22782278
<source>Unsupported new file format version. Some map features will not be loaded or saved by this version of the program.</source>
22792279
<translation>Ikke understøttet nyt filformat. Enkelte dele af kortet vil ikke blive åbnet eller gemt af denne version af programmet.</translation>
22802280
</message>
@@ -4620,68 +4620,73 @@ zoom using the mouse wheel, if available.</source>
46204620
<translation type="unfinished"></translation>
46214621
</message>
46224622
<message>
4623-
<location filename="../src/fileformats/ocad8_file_format.cpp" line="1866"/>
4623+
<location filename="../src/fileformats/ocad8_file_format.cpp" line="1851"/>
4624+
<source>Unable to save correct position of missing template: &quot;%1&quot;</source>
4625+
<translation type="unfinished"></translation>
4626+
</message>
4627+
<message>
4628+
<location filename="../src/fileformats/ocad8_file_format.cpp" line="1891"/>
46244629
<source>Unable to export template: file type of &quot;%1&quot; is not supported yet</source>
46254630
<translation type="unfinished"></translation>
46264631
</message>
46274632
<message>
4628-
<location filename="../src/fileformats/ocad8_file_format.cpp" line="1889"/>
4629-
<location filename="../src/fileformats/ocad8_file_format.cpp" line="1900"/>
4633+
<location filename="../src/fileformats/ocad8_file_format.cpp" line="1914"/>
4634+
<location filename="../src/fileformats/ocad8_file_format.cpp" line="1925"/>
46304635
<source>Coordinates are adjusted to fit into the OCAD 8 drawing area (-2 m ... 2 m).</source>
46314636
<translation type="unfinished"></translation>
46324637
</message>
46334638
<message>
4634-
<location filename="../src/fileformats/ocad8_file_format.cpp" line="1911"/>
4639+
<location filename="../src/fileformats/ocad8_file_format.cpp" line="1936"/>
46354640
<source>Some coordinates remain outside of the OCAD 8 drawing area. They might be unreachable in OCAD.</source>
46364641
<translation type="unfinished"></translation>
46374642
</message>
46384643
<message>
4639-
<location filename="../src/fileformats/ocad8_file_format.cpp" line="2182"/>
4644+
<location filename="../src/fileformats/ocad8_file_format.cpp" line="2207"/>
46404645
<source>In line symbol &quot;%1&quot;, cannot represent cap/join combination.</source>
46414646
<translation type="unfinished"></translation>
46424647
</message>
46434648
<message>
4644-
<location filename="../src/fileformats/ocad8_file_format.cpp" line="2206"/>
4649+
<location filename="../src/fileformats/ocad8_file_format.cpp" line="2231"/>
46454650
<source>In line symbol &quot;%1&quot;, neglecting the dash grouping.</source>
46464651
<translation type="unfinished"></translation>
46474652
</message>
46484653
<message>
4649-
<location filename="../src/fileformats/ocad8_file_format.cpp" line="2217"/>
4654+
<location filename="../src/fileformats/ocad8_file_format.cpp" line="2242"/>
46504655
<source>In line symbol &quot;%1&quot;, the number of dashes in a group has been reduced to 2.</source>
46514656
<translation type="unfinished"></translation>
46524657
</message>
46534658
<message>
4654-
<location filename="../src/fileformats/ocad8_file_format.cpp" line="2273"/>
4659+
<location filename="../src/fileformats/ocad8_file_format.cpp" line="2298"/>
46554660
<source>In line symbol &quot;%1&quot;, cannot export the borders correctly.</source>
46564661
<translation type="unfinished"></translation>
46574662
</message>
46584663
<message>
4659-
<location filename="../src/fileformats/ocad8_file_format.cpp" line="2332"/>
4664+
<location filename="../src/fileformats/ocad8_file_format.cpp" line="2357"/>
46604665
<source>In area symbol &quot;%1&quot;, skipping a fill pattern.</source>
46614666
<translation type="unfinished"></translation>
46624667
</message>
46634668
<message>
4664-
<location filename="../src/fileformats/ocad8_file_format.cpp" line="2379"/>
4669+
<location filename="../src/fileformats/ocad8_file_format.cpp" line="2404"/>
46654670
<source>In area symbol &quot;%1&quot;, assuming a &quot;shifted rows&quot; point pattern. This might be correct as well as incorrect.</source>
46664671
<translation type="unfinished"></translation>
46674672
</message>
46684673
<message>
4669-
<location filename="../src/fileformats/ocad8_file_format.cpp" line="2418"/>
4674+
<location filename="../src/fileformats/ocad8_file_format.cpp" line="2443"/>
46704675
<source>In text symbol %1: custom character spacing is set, its implementation does not match OCAD&apos;s behavior yet</source>
46714676
<translation type="unfinished"></translation>
46724677
</message>
46734678
<message>
4674-
<location filename="../src/fileformats/ocad8_file_format.cpp" line="2425"/>
4679+
<location filename="../src/fileformats/ocad8_file_format.cpp" line="2450"/>
46754680
<source>In text symbol %1: ignoring underlining</source>
46764681
<translation type="unfinished"></translation>
46774682
</message>
46784683
<message>
4679-
<location filename="../src/fileformats/ocad8_file_format.cpp" line="2427"/>
4684+
<location filename="../src/fileformats/ocad8_file_format.cpp" line="2452"/>
46804685
<source>In text symbol %1: ignoring kerning</source>
46814686
<translation type="unfinished"></translation>
46824687
</message>
46834688
<message>
4684-
<location filename="../src/fileformats/ocad8_file_format.cpp" line="2851"/>
4689+
<location filename="../src/fileformats/ocad8_file_format.cpp" line="2876"/>
46854690
<source>String truncated (truncation marked with three &apos;|&apos;): %1</source>
46864691
<translation type="unfinished"></translation>
46874692
</message>
@@ -7572,28 +7577,28 @@ The maximum supported version is %2.</source>
75727577
<context>
75737578
<name>OpenOrienteering::UndoManager</name>
75747579
<message>
7575-
<location filename="../src/undo/undo_manager.cpp" line="148"/>
7576-
<location filename="../src/undo/undo_manager.cpp" line="193"/>
7580+
<location filename="../src/undo/undo_manager.cpp" line="155"/>
7581+
<location filename="../src/undo/undo_manager.cpp" line="200"/>
75777582
<source>Error</source>
75787583
<translation>Fejl</translation>
75797584
</message>
75807585
<message>
7581-
<location filename="../src/undo/undo_manager.cpp" line="148"/>
7586+
<location filename="../src/undo/undo_manager.cpp" line="155"/>
75827587
<source>Cannot undo because the last undo step became invalid. This can for example happen if you change the symbol of an object to another and then delete the old symbol.</source>
75837588
<translation type="unfinished"></translation>
75847589
</message>
75857590
<message>
7586-
<location filename="../src/undo/undo_manager.cpp" line="155"/>
7591+
<location filename="../src/undo/undo_manager.cpp" line="162"/>
75877592
<source>Confirmation</source>
75887593
<translation>Bekræftelse</translation>
75897594
</message>
75907595
<message>
7591-
<location filename="../src/undo/undo_manager.cpp" line="155"/>
7596+
<location filename="../src/undo/undo_manager.cpp" line="162"/>
75927597
<source>Undoing this step will go beyond the point where the file was loaded. Are you sure?</source>
75937598
<translation type="unfinished"></translation>
75947599
</message>
75957600
<message>
7596-
<location filename="../src/undo/undo_manager.cpp" line="193"/>
7601+
<location filename="../src/undo/undo_manager.cpp" line="200"/>
75977602
<source>Cannot redo because the first redo step became invalid. This can for example happen if you delete the symbol of an object you have drawn.</source>
75987603
<translation type="unfinished"></translation>
75997604
</message>
@@ -7659,77 +7664,77 @@ The maximum supported version is %2.</source>
76597664
<context>
76607665
<name>OpenOrienteering::XMLFileExporter</name>
76617666
<message>
7662-
<location filename="../src/fileformats/xml_file_format.cpp" line="208"/>
7667+
<location filename="../src/fileformats/xml_file_format.cpp" line="209"/>
76637668
<source>Older versions of Mapper do not support multiple map parts. To save the map in compatibility mode, you must first merge all map parts.</source>
76647669
<translation type="unfinished"></translation>
76657670
</message>
76667671
</context>
76677672
<context>
76687673
<name>OpenOrienteering::XMLFileImporter</name>
76697674
<message>
7670-
<location filename="../src/fileformats/xml_file_format.cpp" line="492"/>
7675+
<location filename="../src/fileformats/xml_file_format.cpp" line="493"/>
76717676
<source>Unsupported element: %1 (line %2 column %3)</source>
76727677
<translation type="unfinished"></translation>
76737678
</message>
76747679
<message>
7675-
<location filename="../src/fileformats/xml_file_format.cpp" line="523"/>
7680+
<location filename="../src/fileformats/xml_file_format.cpp" line="524"/>
76767681
<source>Some coordinates were out of bounds for printing. Map content was adjusted.</source>
76777682
<translation type="unfinished"></translation>
76787683
</message>
76797684
<message>
7680-
<location filename="../src/fileformats/xml_file_format.cpp" line="573"/>
7685+
<location filename="../src/fileformats/xml_file_format.cpp" line="574"/>
76817686
<source>unknown</source>
76827687
<translation type="unfinished"></translation>
76837688
</message>
76847689
<message>
7685-
<location filename="../src/fileformats/xml_file_format.cpp" line="574"/>
7690+
<location filename="../src/fileformats/xml_file_format.cpp" line="575"/>
76867691
<source>Parts of this file cannot be read by this version of Mapper. Minimum required version: %1</source>
76877692
<translation type="unfinished"></translation>
76887693
</message>
76897694
<message>
7690-
<location filename="../src/fileformats/xml_file_format.cpp" line="608"/>
7695+
<location filename="../src/fileformats/xml_file_format.cpp" line="609"/>
76917696
<source>Error at line %1 column %2: %3</source>
76927697
<translation type="unfinished"></translation>
76937698
</message>
76947699
<message>
7695-
<location filename="../src/fileformats/xml_file_format.cpp" line="620"/>
7696-
<location filename="../src/fileformats/xml_file_format.cpp" line="877"/>
7700+
<location filename="../src/fileformats/xml_file_format.cpp" line="621"/>
7701+
<location filename="../src/fileformats/xml_file_format.cpp" line="878"/>
76977702
<source>Some invalid characters had to be removed.</source>
76987703
<translation type="unfinished"></translation>
76997704
</message>
77007705
<message>
7701-
<location filename="../src/fileformats/xml_file_format.cpp" line="638"/>
7706+
<location filename="../src/fileformats/xml_file_format.cpp" line="639"/>
77027707
<source>Unknown error</source>
77037708
<translation>Ukendt fejl</translation>
77047709
</message>
77057710
<message>
7706-
<location filename="../src/fileformats/xml_file_format.cpp" line="639"/>
7711+
<location filename="../src/fileformats/xml_file_format.cpp" line="640"/>
77077712
<source>Unsupported or invalid georeferencing specification &apos;%1&apos;: %2</source>
77087713
<translation type="unfinished"></translation>
77097714
</message>
77107715
<message>
7711-
<location filename="../src/fileformats/xml_file_format.cpp" line="770"/>
7712-
<location filename="../src/fileformats/xml_file_format.cpp" line="823"/>
7716+
<location filename="../src/fileformats/xml_file_format.cpp" line="771"/>
7717+
<location filename="../src/fileformats/xml_file_format.cpp" line="824"/>
77137718
<source>Could not set knockout property of color &apos;%1&apos;.</source>
77147719
<translation type="unfinished"></translation>
77157720
</message>
77167721
<message>
7717-
<location filename="../src/fileformats/xml_file_format.cpp" line="783"/>
7722+
<location filename="../src/fileformats/xml_file_format.cpp" line="784"/>
77187723
<source>Expected %1 colors, found %2.</source>
77197724
<translation type="unfinished"></translation>
77207725
</message>
77217726
<message>
7722-
<location filename="../src/fileformats/xml_file_format.cpp" line="799"/>
7727+
<location filename="../src/fileformats/xml_file_format.cpp" line="800"/>
77237728
<source>Spot color %1 not found while processing %2 (%3).</source>
77247729
<translation type="unfinished"></translation>
77257730
</message>
77267731
<message>
7727-
<location filename="../src/fileformats/xml_file_format.cpp" line="855"/>
7732+
<location filename="../src/fileformats/xml_file_format.cpp" line="856"/>
77287733
<source>Expected %1 symbols, found %2.</source>
77297734
<translation type="unfinished"></translation>
77307735
</message>
77317736
<message>
7732-
<location filename="../src/fileformats/xml_file_format.cpp" line="894"/>
7737+
<location filename="../src/fileformats/xml_file_format.cpp" line="895"/>
77337738
<source>Expected %1 map parts, found %2.</source>
77347739
<translation>Forventede %1 kortdele, fandt %2.</translation>
77357740
</message>

0 commit comments

Comments
 (0)