Changeset 099256a in git


Ignore:
Timestamp:
21/01/14 10:31:38 (6 years ago)
Author:
Olly Betts <olly@…>
Branches:
line_contents, master, stereo, travis-osx
Children:
fa56920
Parents:
df26b81
Message:

lib/survex.pot,src/mainfrm.cc: Allow "m" and "ft" suffixes to be
translated.

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    rdf26b81 r099256a  
     1Tue Jan 21 10:30:45 GMT 2014  Olly Betts <olly@survex.com>
     2
     3        * lib/survex.pot,src/mainfrm.cc: Allow "m" and "ft" suffixes to be
     4          translated.
     5
    16Tue Jan 21 04:14:55 GMT 2014  Olly Betts <olly@survex.com>
    27
  • lib/survex.pot

    rdf26b81 r099256a  
    3535#. "spoon.svx:12: warning: *prefix is deprecated"
    3636#: ../src/aven.cc:365
    37 #: ../src/message.c:1215
     37#: ../src/message.c:1235
    3838#: n:4
    3939msgid "warning"
     
    143143msgstr ""
    144144
    145 #: ../src/message.c:1230
     145#: ../src/message.c:1250
    146146#: n:19
    147147msgid "Too many errors - giving up"
     
    175175#: ../src/datain.c:361
    176176#: ../src/img_hosted.c:30
    177 #: ../src/printwx.cc:1456
     177#: ../src/printwx.cc:1457
    178178#: n:24
    179179#, c-format
     
    665665
    666666#: ../src/extend.c:536
    667 #: ../src/mainfrm.cc:381
     667#: ../src/mainfrm.cc:395
    668668#: ../src/sorterr.c:140
    669669#: n:93
     
    672672msgstr ""
    673673
    674 #: ../src/printwx.cc:586
     674#: ../src/printwx.cc:587
    675675#: n:402
    676676#, c-format
     
    762762#. internally.  Probably best to keep it the same for all translations.
    763763#: ../src/img.c:43
    764 #: ../src/mainfrm.cc:1343
     764#: ../src/mainfrm.cc:1358
    765765#: n:107
    766766#, c-format
     
    769769
    770770#. TRANSLATORS: put in .3d file if we can’t read the date/time
    771 #: ../src/mainfrm.cc:1339
     771#: ../src/mainfrm.cc:1354
    772772#: n:108
    773773msgid "Date and time not available."
     
    782782#: ../src/filename.c:79
    783783#: ../src/img_hosted.c:36
    784 #: ../src/mainfrm.cc:339
    785 #: ../src/mainfrm.cc:1824
     784#: ../src/mainfrm.cc:353
     785#: ../src/mainfrm.cc:1848
    786786#: n:110
    787787#, c-format
     
    813813msgstr ""
    814814
    815 #: ../src/printwx.cc:922
     815#: ../src/printwx.cc:923
    816816#: n:115
    817817msgid "North"
     
    819819
    820820#. TRANSLATORS: "Elevation on" 020 <-> 200 degrees
    821 #: ../src/printwx.cc:946
     821#: ../src/printwx.cc:947
    822822#: n:116
    823823msgid "Elevation on"
    824824msgstr ""
    825825
    826 #: ../src/printwx.cc:418
     826#: ../src/printwx.cc:419
    827827#: n:117
    828828msgid "P&lan view"
    829829msgstr ""
    830830
    831 #: ../src/printwx.cc:420
     831#: ../src/printwx.cc:421
    832832#: n:285
    833833msgid "&Elevation"
     
    835835
    836836#: ../src/gfxcore.cc:692
    837 #: ../src/mainfrm.cc:127
     837#: ../src/mainfrm.cc:141
    838838#: n:118
    839839msgid "Elevation"
     
    10881088msgstr ""
    10891089
    1090 #: ../src/mainfrm.cc:131
    1091 #: ../src/printwx.cc:370
    1092 #: ../src/printwx.cc:983
    1093 #: ../src/printwx.cc:1037
     1090#: ../src/mainfrm.cc:145
     1091#: ../src/printwx.cc:371
     1092#: ../src/printwx.cc:984
     1093#: ../src/printwx.cc:1038
    10941094#: n:154
    10951095msgid "Scale"
     
    11091109
    11101110#: ../src/avenprcore.cc:272
    1111 #: ../src/printwx.cc:1462
     1111#: ../src/printwx.cc:1463
    11121112#: n:167
    11131113#, c-format
     
    11171117#. TRANSLATORS: This is used on printouts of plans, with %s replaced by
    11181118#. something like "123°".  The bearing is up the page.
    1119 #: ../src/printwx.cc:928
     1119#: ../src/printwx.cc:929
    11201120#: n:168
    11211121#, c-format
     
    11251125#. TRANSLATORS: This is used on printouts of elevations, with %s replaced by
    11261126#. something like "123°".  The bearing is the direction we’re looking.
    1127 #: ../src/printwx.cc:962
     1127#: ../src/printwx.cc:963
    11281128#: n:169
    11291129#, c-format
     
    11341134#. %s replaced by something like "123°", and the second by something like "-45°".
    11351135#. The bearing is the direction we’re looking.
    1136 #: ../src/printwx.cc:967
     1136#: ../src/printwx.cc:968
    11371137#: n:284
    11381138#, c-format
     
    11411141
    11421142#. TRANSLATORS: This is used on printouts of extended elevations.
    1143 #: ../src/printwx.cc:975
     1143#: ../src/printwx.cc:976
    11441144#: n:191
    11451145msgid "Extended elevation"
     
    13821382
    13831383#. TRANSLATORS: In the "File" menu
    1384 #: ../src/mainfrm.cc:745
     1384#: ../src/mainfrm.cc:760
    13851385#: n:201
    13861386msgid "&Screenshot…"
    13871387msgstr ""
    13881388
    1389 #: ../src/mainfrm.cc:1353
     1389#: ../src/mainfrm.cc:1368
    13901390#: n:202
    13911391#, c-format
     
    14101410#.
    14111411#. File->Open dialog:
    1412 #: ../src/mainfrm.cc:1797
     1412#: ../src/mainfrm.cc:1821
    14131413#: n:206
    14141414msgid "Select a survey file to view"
    14151415msgstr ""
    14161416
    1417 #: ../src/mainfrm.cc:1789
     1417#: ../src/mainfrm.cc:1813
    14181418#: n:207
    14191419msgid "Survex 3d files"
    14201420msgstr ""
    14211421
    1422 #: ../src/mainfrm.cc:1794
    1423 #: ../src/mainfrm.cc:2189
    1424 #: ../src/printwx.cc:562
     1422#: ../src/mainfrm.cc:1818
     1423#: ../src/mainfrm.cc:2217
     1424#: ../src/printwx.cc:563
    14251425#: n:208
    14261426msgid "All files"
     
    14301430#. it should be translated to the terminology that cavers using the language
    14311431#. would use.
    1432 #: ../src/mainfrm.cc:1788
     1432#: ../src/mainfrm.cc:1812
    14331433#: n:229
    14341434msgid "All survey files"
    14351435msgstr ""
    14361436
    1437 #: ../src/mainfrm.cc:1790
     1437#: ../src/mainfrm.cc:1814
    14381438#: n:329
    14391439msgid "Survex svx files"
    14401440msgstr ""
    14411441
    1442 #: ../src/mainfrm.cc:1792
     1442#: ../src/mainfrm.cc:1816
    14431443#: n:330
    14441444msgid "Compass DAT and MAK files"
    14451445msgstr ""
    14461446
    1447 #: ../src/printwx.cc:268
     1447#: ../src/printwx.cc:269
    14481448#: n:411
    14491449msgid "DXF files"
    14501450msgstr ""
    14511451
    1452 #: ../src/printwx.cc:269
     1452#: ../src/printwx.cc:270
    14531453#: n:412
    14541454msgid "EPS files"
    14551455msgstr ""
    14561456
    1457 #: ../src/printwx.cc:270
     1457#: ../src/printwx.cc:271
    14581458#: n:413
    14591459msgid "GPX files"
    14601460msgstr ""
    14611461
    1462 #: ../src/printwx.cc:271
     1462#: ../src/printwx.cc:272
    14631463#: n:414
    14641464msgid "HPGL for plotters"
    14651465msgstr ""
    14661466
    1467 #: ../src/printwx.cc:272
     1467#: ../src/printwx.cc:273
    14681468#: n:415
    14691469msgid "Compass PLT for use with Carto"
    14701470msgstr ""
    14711471
    1472 #: ../src/printwx.cc:273
     1472#: ../src/printwx.cc:274
    14731473#: n:416
    14741474msgid "Skencil files"
    14751475msgstr ""
    14761476
    1477 #: ../src/printwx.cc:274
     1477#: ../src/printwx.cc:275
    14781478#: n:417
    14791479msgid "SVG files"
     
    14921492#. TRANSLATORS: Aven menu titles.  An “&” goes before the letter of any accelerator key.
    14931493#. The accelerators must be different within this group
    1494 #: ../src/mainfrm.cc:871
     1494#: ../src/mainfrm.cc:886
    14951495#: n:210
    14961496msgid "&File"
    14971497msgstr ""
    14981498
    1499 #: ../src/mainfrm.cc:872
     1499#: ../src/mainfrm.cc:887
    15001500#: n:211
    15011501msgid "&Rotation"
    15021502msgstr ""
    15031503
    1504 #: ../src/mainfrm.cc:873
     1504#: ../src/mainfrm.cc:888
    15051505#: n:212
    15061506msgid "&Orientation"
    15071507msgstr ""
    15081508
    1509 #: ../src/mainfrm.cc:874
     1509#: ../src/mainfrm.cc:889
    15101510#: n:213
    15111511msgid "&View"
    15121512msgstr ""
    15131513
    1514 #: ../src/mainfrm.cc:876
     1514#: ../src/mainfrm.cc:891
    15151515#: n:214
    15161516msgid "&Controls"
    15171517msgstr ""
    15181518
    1519 #: ../src/mainfrm.cc:885
     1519#: ../src/mainfrm.cc:900
    15201520#: n:215
    15211521msgid "&Help"
    15221522msgstr ""
    15231523
    1524 #: ../src/mainfrm.cc:878
     1524#: ../src/mainfrm.cc:893
    15251525#: n:216
    15261526msgid "&Presentation"
     
    15781578#. TRANSLATORS: "File" menu.  The accelerators must be different within this group.
    15791579#. c.f. 201, 380, 381.
    1580 #: ../src/mainfrm.cc:739
     1580#: ../src/mainfrm.cc:754
    15811581#: n:220
    15821582msgid "&Open…\tCtrl+O"
     
    16541654
    16551655#. TRANSLATORS: Used in the "Export" settings dialog
    1656 #: ../src/printwx.cc:520
     1656#: ../src/printwx.cc:521
    16571657#: n:230
    16581658msgid "&Export…"
     
    16611661#. TRANSLATORS: "Rotation" menu.  The accelerators must be different within this group.
    16621662#. Tickable menu item which toggles auto rotation
    1663 #: ../src/mainfrm.cc:758
     1663#: ../src/mainfrm.cc:773
    16641664#: n:231
    16651665msgid "Au&to-Rotate\tSpace"
    16661666msgstr ""
    16671667
    1668 #: ../src/mainfrm.cc:760
     1668#: ../src/mainfrm.cc:775
    16691669#: n:232
    16701670msgid "Speed &Up"
    16711671msgstr ""
    16721672
    1673 #: ../src/mainfrm.cc:761
     1673#: ../src/mainfrm.cc:776
    16741674#: n:233
    16751675msgid "Slow &Down"
    16761676msgstr ""
    16771677
    1678 #: ../src/mainfrm.cc:763
     1678#: ../src/mainfrm.cc:778
    16791679#: n:234
    16801680msgid "&Reverse Direction"
    16811681msgstr ""
    16821682
    1683 #: ../src/mainfrm.cc:765
     1683#: ../src/mainfrm.cc:780
    16841684#: n:235
    16851685msgid "Step Once &Anticlockwise"
    16861686msgstr ""
    16871687
    1688 #: ../src/mainfrm.cc:766
     1688#: ../src/mainfrm.cc:781
    16891689#: n:236
    16901690msgid "Step Once &Clockwise"
     
    16931693#. TRANSLATORS: View *looking* North
    16941694#: ../src/gfxcore.cc:3005
    1695 #: ../src/mainfrm.cc:769
     1695#: ../src/mainfrm.cc:784
    16961696#: n:240
    16971697msgid "View &North"
     
    17001700#. TRANSLATORS: View *looking* East
    17011701#: ../src/gfxcore.cc:3006
    1702 #: ../src/mainfrm.cc:770
     1702#: ../src/mainfrm.cc:785
    17031703#: n:241
    17041704msgid "View &East"
     
    17071707#. TRANSLATORS: View *looking* South
    17081708#: ../src/gfxcore.cc:3007
    1709 #: ../src/mainfrm.cc:771
     1709#: ../src/mainfrm.cc:786
    17101710#: n:242
    17111711msgid "View &South"
     
    17141714#. TRANSLATORS: View *looking* West
    17151715#: ../src/gfxcore.cc:3008
    1716 #: ../src/mainfrm.cc:772
     1716#: ../src/mainfrm.cc:787
    17171717#: n:243
    17181718msgid "View &West"
     
    17221722#. it should be translated to the terminology that cavers using the language
    17231723#. would use.
    1724 #: ../src/mainfrm.cc:774
     1724#: ../src/mainfrm.cc:789
    17251725#: n:244
    17261726msgid "Shift Survey &Left"
     
    17301730#. it should be translated to the terminology that cavers using the language
    17311731#. would use.
    1732 #: ../src/mainfrm.cc:775
     1732#: ../src/mainfrm.cc:790
    17331733#: n:245
    17341734msgid "Shift Survey &Right"
     
    17381738#. it should be translated to the terminology that cavers using the language
    17391739#. would use.
    1740 #: ../src/mainfrm.cc:776
     1740#: ../src/mainfrm.cc:791
    17411741#: n:246
    17421742msgid "Shift Survey &Up"
     
    17461746#. it should be translated to the terminology that cavers using the language
    17471747#. would use.
    1748 #: ../src/mainfrm.cc:777
     1748#: ../src/mainfrm.cc:792
    17491749#: n:247
    17501750msgid "Shift Survey &Down"
     
    17521752
    17531753#: ../src/gfxcore.cc:3020
    1754 #: ../src/mainfrm.cc:779
     1754#: ../src/mainfrm.cc:794
    17551755#: n:248
    17561756msgid "&Plan View"
     
    17581758
    17591759#: ../src/gfxcore.cc:3021
    1760 #: ../src/mainfrm.cc:780
     1760#: ../src/mainfrm.cc:795
    17611761#: n:249
    17621762msgid "Ele&vation"
    17631763msgstr ""
    17641764
    1765 #: ../src/mainfrm.cc:782
     1765#: ../src/mainfrm.cc:797
    17661766#: n:250
    17671767msgid "&Higher Viewpoint"
    17681768msgstr ""
    17691769
    1770 #: ../src/mainfrm.cc:783
     1770#: ../src/mainfrm.cc:798
    17711771#: n:251
    17721772msgid "L&ower Viewpoint"
    17731773msgstr ""
    17741774
    1775 #: ../src/mainfrm.cc:786
     1775#: ../src/mainfrm.cc:801
    17761776#: n:252
    17771777msgid "&Zoom In\t]"
    17781778msgstr ""
    17791779
    1780 #: ../src/mainfrm.cc:787
     1780#: ../src/mainfrm.cc:802
    17811781#: n:253
    17821782msgid "Zoo&m Out\t["
    17831783msgstr ""
    17841784
    1785 #: ../src/mainfrm.cc:789
     1785#: ../src/mainfrm.cc:804
    17861786#: n:254
    17871787msgid "Restore De&fault View"
     
    17911791#. "Tilt angle" fields, and the "Plan view" and "Elevation" buttons in the
    17921792#. "what to print" dialog.
    1793 #: ../src/printwx.cc:336
     1793#: ../src/printwx.cc:337
    17941794#: n:283
    17951795msgid "View"
     
    17991799#. "names" etc checkboxes in the "what to print" dialog.  "Elements" isn’t a
    18001800#. good name for this but nothing better has yet come to mind!
    1801 #: ../src/printwx.cc:337
     1801#: ../src/printwx.cc:338
    18021802#: n:256
    18031803msgid "Elements"
    18041804msgstr ""
    18051805
    1806 #: ../src/printwx.cc:391
    1807 #: ../src/printwx.cc:726
     1806#: ../src/printwx.cc:392
     1807#: ../src/printwx.cc:727
    18081808#: n:257
    18091809#, c-format
     
    18141814#. the implicit meaning is "choose a suitable scale to fit the
    18151815#. plot on a single page", but we need something shorter
    1816 #: ../src/printwx.cc:373
    1817 #: ../src/printwx.cc:745
     1816#: ../src/printwx.cc:374
     1817#: ../src/printwx.cc:746
    18181818#: n:258
    18191819msgid "One page"
    18201820msgstr ""
    18211821
    1822 #: ../src/mainfrm.cc:123
    1823 #: ../src/printwx.cc:404
     1822#: ../src/mainfrm.cc:137
     1823#: ../src/printwx.cc:405
    18241824#: n:259
    18251825msgid "Bearing"
    18261826msgstr ""
    18271827
    1828 #: ../src/printwx.cc:438
     1828#: ../src/printwx.cc:439
    18291829#: n:260
    18301830msgid "Station Names"
    18311831msgstr ""
    18321832
    1833 #: ../src/printwx.cc:434
     1833#: ../src/printwx.cc:435
    18341834#: n:261
    18351835msgid "Crosses"
     
    18381838#. TRANSLATORS: Here a "survey leg" is a set of measurements between two
    18391839#. "survey stations".
    1840 #: ../src/printwx.cc:426
     1840#: ../src/printwx.cc:427
    18411841#: n:262
    18421842msgid "Underground Survey Legs"
    18431843msgstr ""
    18441844
    1845 #: ../src/printwx.cc:454
     1845#: ../src/printwx.cc:455
    18461846#: n:393
    18471847msgid "Cross-sections"
    18481848msgstr ""
    18491849
    1850 #: ../src/printwx.cc:459
     1850#: ../src/printwx.cc:460
    18511851#: n:394
    18521852msgid "Walls"
    18531853msgstr ""
    18541854
    1855 #: ../src/printwx.cc:463
     1855#: ../src/printwx.cc:464
    18561856#: n:395
    18571857msgid "Passages"
    18581858msgstr ""
    18591859
    1860 #: ../src/printwx.cc:467
     1860#: ../src/printwx.cc:468
    18611861#: n:421
    18621862msgid "Origin in centre"
    18631863msgstr ""
    18641864
    1865 #: ../src/printwx.cc:471
     1865#: ../src/printwx.cc:472
    18661866#: n:422
    18671867msgid "Full coordinates"
     
    18691869
    18701870#. TRANSLATORS: Used in the print dialog:
    1871 #: ../src/printwx.cc:409
     1871#: ../src/printwx.cc:410
    18721872#: n:263
    18731873msgid "Tilt angle"
     
    18751875
    18761876#. TRANSLATORS: used in the print dialog - controls drawing lines around each page
    1877 #: ../src/printwx.cc:477
     1877#: ../src/printwx.cc:478
    18781878#: n:264
    18791879msgid "Page Borders"
     
    18821882#. TRANSLATORS: As in the legend on a map.  Used in the print dialog - controls
    18831883#. drawing the box at the lower left with survey name, view angles, etc
    1884 #: ../src/printwx.cc:483
     1884#: ../src/printwx.cc:484
    18851885#: n:265
    18861886msgid "Legend"
     
    18891889#. TRANSLATORS: will be used in the print dialog - check this to print blank pages
    18901890#. (otherwise they’ll be skipped to save paper)
    1891 #: ../src/printwx.cc:481
     1891#: ../src/printwx.cc:482
    18921892#: n:266
    18931893msgid "Blank Pages"
     
    18951895
    18961896#. TRANSLATORS: Items in the "View" menu:
    1897 #: ../src/mainfrm.cc:803
     1897#: ../src/mainfrm.cc:818
    18981898#: n:270
    18991899msgid "Station &Names\tCtrl+N"
     
    19011901
    19021902#. TRANSLATORS: Toggles drawing of 3D passages
    1903 #: ../src/mainfrm.cc:804
     1903#: ../src/mainfrm.cc:819
    19041904#: n:346
    19051905msgid "Passage &Tubes\tCtrl+T"
    19061906msgstr ""
    19071907
    1908 #: ../src/mainfrm.cc:805
     1908#: ../src/mainfrm.cc:820
    19091909#: n:271
    19101910msgid "&Crosses\tCtrl+X"
    19111911msgstr ""
    19121912
    1913 #: ../src/mainfrm.cc:806
     1913#: ../src/mainfrm.cc:821
    19141914#: n:297
    19151915msgid "&Grid\tCtrl+G"
    19161916msgstr ""
    19171917
    1918 #: ../src/mainfrm.cc:807
     1918#: ../src/mainfrm.cc:822
    19191919#: n:318
    19201920msgid "&Bounding Box\tCtrl+B"
     
    19231923#. TRANSLATORS: Here a "survey leg" is a set of measurements between two
    19241924#. "survey stations".
    1925 #: ../src/mainfrm.cc:809
     1925#: ../src/mainfrm.cc:824
    19261926#: n:272
    19271927msgid "&Underground Survey Legs\tCtrl+L"
     
    19301930#. TRANSLATORS: Here a "survey leg" is a set of measurements between two
    19311931#. "survey stations".
    1932 #: ../src/mainfrm.cc:810
     1932#: ../src/mainfrm.cc:825
    19331933#: n:291
    19341934msgid "&Surface Survey Legs\tCtrl+F"
    19351935msgstr ""
    19361936
    1937 #: ../src/mainfrm.cc:819
     1937#: ../src/mainfrm.cc:834
    19381938#: n:273
    19391939msgid "&Overlapping Names"
     
    19411941
    19421942#: ../src/gfxcore.cc:3043
    1943 #: ../src/mainfrm.cc:820
     1943#: ../src/mainfrm.cc:835
    19441944#: n:292
    19451945msgid "Colour by &Depth"
     
    19471947
    19481948#: ../src/gfxcore.cc:3044
    1949 #: ../src/mainfrm.cc:821
     1949#: ../src/mainfrm.cc:836
    19501950#: n:293
    19511951msgid "Colour by D&ate"
     
    19531953
    19541954#: ../src/gfxcore.cc:3045
    1955 #: ../src/mainfrm.cc:822
     1955#: ../src/mainfrm.cc:837
    19561956#: n:289
    19571957msgid "Colour by E&rror"
    19581958msgstr ""
    19591959
    1960 #: ../src/mainfrm.cc:824
     1960#: ../src/mainfrm.cc:839
    19611961#: n:294
    19621962msgid "Highlight &Entrances"
    19631963msgstr ""
    19641964
    1965 #: ../src/mainfrm.cc:825
     1965#: ../src/mainfrm.cc:840
    19661966#: n:295
    19671967msgid "Highlight &Fixed Points"
    19681968msgstr ""
    19691969
    1970 #: ../src/mainfrm.cc:826
     1970#: ../src/mainfrm.cc:841
    19711971#: n:296
    19721972msgid "Highlight E&xported Points"
    19731973msgstr ""
    19741974
    1975 #: ../src/printwx.cc:442
     1975#: ../src/printwx.cc:443
    19761976#: n:418
    19771977msgid "Entrances"
    19781978msgstr ""
    19791979
    1980 #: ../src/printwx.cc:446
     1980#: ../src/printwx.cc:447
    19811981#: n:419
    19821982msgid "Fixed Points"
    19831983msgstr ""
    19841984
    1985 #: ../src/printwx.cc:450
     1985#: ../src/printwx.cc:451
    19861986#: n:420
    19871987msgid "Exported Stations"
    19881988msgstr ""
    19891989
    1990 #: ../src/mainfrm.cc:831
     1990#: ../src/mainfrm.cc:846
    19911991#: n:237
    19921992msgid "&Perspective"
    19931993msgstr ""
    19941994
    1995 #: ../src/mainfrm.cc:833
     1995#: ../src/mainfrm.cc:848
    19961996#: n:238
    19971997msgid "Textured &Walls"
     
    20002000#. TRANSLATORS: Toggles OpenGL "Depth Fogging" - feel free to translate using that term
    20012001#. instead if it gives a better translation which most users will understand.
    2002 #: ../src/mainfrm.cc:834
     2002#: ../src/mainfrm.cc:849
    20032003#: n:239
    20042004msgid "Fade Distant Ob&jects"
     
    20072007#. TRANSLATORS: Here a "survey leg" is a set of measurements between two
    20082008#. "survey stations".
    2009 #: ../src/mainfrm.cc:835
     2009#: ../src/mainfrm.cc:850
    20102010#: n:298
    20112011msgid "Smoot&hed Survey Legs"
    20122012msgstr ""
    20132013
    2014 #: ../src/mainfrm.cc:841
    2015 #: ../src/mainfrm.cc:845
     2014#: ../src/mainfrm.cc:856
     2015#: ../src/mainfrm.cc:860
    20162016#: n:356
    20172017msgid "Full Screen &Mode\tF11"
    20182018msgstr ""
    20192019
    2020 #: ../src/mainfrm.cc:859
     2020#: ../src/mainfrm.cc:874
    20212021#: n:274
    20222022msgid "&Compass"
    20232023msgstr ""
    20242024
    2025 #: ../src/mainfrm.cc:860
     2025#: ../src/mainfrm.cc:875
    20262026#: n:275
    20272027msgid "C&linometer"
     
    20302030#. TRANSLATORS: The "Colour Key" is the thing in aven showing which colour
    20312031#. corresponds to which depth, date, survey closure error, etc.
    2032 #: ../src/mainfrm.cc:861
     2032#: ../src/mainfrm.cc:876
    20332033#: n:276
    20342034msgid "Colour &Key"
    20352035msgstr ""
    20362036
    2037 #: ../src/mainfrm.cc:862
     2037#: ../src/mainfrm.cc:877
    20382038#: n:277
    20392039msgid "&Scale Bar"
    20402040msgstr ""
    20412041
    2042 #: ../src/mainfrm.cc:854
     2042#: ../src/mainfrm.cc:869
    20432043#: n:280
    20442044msgid "&Reverse Sense\tCtrl+R"
    20452045msgstr ""
    20462046
    2047 #: ../src/mainfrm.cc:829
    2048 #: ../src/mainfrm.cc:856
     2047#: ../src/mainfrm.cc:844
     2048#: ../src/mainfrm.cc:871
    20492049#: n:281
    20502050msgid "&Cancel Measuring Line\tEscape"
    20512051msgstr ""
    20522052
    2053 #: ../src/mainfrm.cc:863
     2053#: ../src/mainfrm.cc:878
    20542054#: n:299
    20552055msgid "&Indicators"
     
    21372137msgstr ""
    21382138
    2139 #: ../src/mainfrm.cc:792
     2139#: ../src/mainfrm.cc:807
    21402140#: n:311
    21412141msgid "&New Presentation"
    21422142msgstr ""
    21432143
    2144 #: ../src/mainfrm.cc:793
     2144#: ../src/mainfrm.cc:808
    21452145#: n:312
    21462146msgid "&Open Presentation…"
    21472147msgstr ""
    21482148
    2149 #: ../src/mainfrm.cc:794
     2149#: ../src/mainfrm.cc:809
    21502150#: n:313
    21512151msgid "&Save Presentation"
    21522152msgstr ""
    21532153
    2154 #: ../src/mainfrm.cc:795
     2154#: ../src/mainfrm.cc:810
    21552155#: n:314
    21562156msgid "Sa&ve Presentation As…"
     
    21582158
    21592159#. TRANSLATORS: "Mark" as in "Mark this position"
    2160 #: ../src/mainfrm.cc:797
     2160#: ../src/mainfrm.cc:812
    21612161#: n:315
    21622162msgid "&Mark"
     
    21642164
    21652165#. TRANSLATORS: "Play" as in "Play back a recording"
    2166 #: ../src/mainfrm.cc:798
     2166#: ../src/mainfrm.cc:813
    21672167#: n:316
    21682168msgid "Pla&y"
    21692169msgstr ""
    21702170
    2171 #: ../src/mainfrm.cc:799
     2171#: ../src/mainfrm.cc:814
    21722172#: n:317
    21732173msgid "&Export as Movie…"
    21742174msgstr ""
    21752175
    2176 #: ../src/mainfrm.cc:2266
     2176#: ../src/mainfrm.cc:2294
    21772177#: n:331
    21782178msgid "Export Movie"
    21792179msgstr ""
    21802180
    2181 #: ../src/mainfrm.cc:326
     2181#: ../src/mainfrm.cc:340
    21822182#: n:319
    21832183msgid "Select an output filename"
    21842184msgstr ""
    21852185
    2186 #: ../src/mainfrm.cc:323
    2187 #: ../src/mainfrm.cc:2188
     2186#: ../src/mainfrm.cc:337
     2187#: ../src/mainfrm.cc:2216
    21882188#: n:320
    21892189msgid "Aven presentations"
     
    21912191
    21922192#. TRANSLATORS: title of the save screenshot dialog
    2193 #: ../src/mainfrm.cc:1810
     2193#: ../src/mainfrm.cc:1834
    21942194#: n:321
    21952195msgid "Save Screenshot"
    21962196msgstr ""
    21972197
    2198 #: ../src/mainfrm.cc:2183
    2199 #: ../src/mainfrm.cc:2186
     2198#: ../src/mainfrm.cc:2211
     2199#: ../src/mainfrm.cc:2214
    22002200#: n:322
    22012201msgid "Select a presentation to open"
    22022202msgstr ""
    22032203
    2204 #: ../src/mainfrm.cc:405
     2204#: ../src/mainfrm.cc:419
    22052205#: n:323
    22062206#, c-format
     
    22102210#. TRANSLATORS: "Compass" as in Larry Fish’s cave surveying package, so probably shouldn’t
    22112211#. be translated
    2212 #: ../src/mainfrm.cc:1791
     2212#: ../src/mainfrm.cc:1815
    22132213#: n:324
    22142214msgid "Compass PLT files"
     
    22162216
    22172217#. TRANSLATORS: "CMAP" is Bob Thrun’s cave surveying package, so don’t translate it.
    2218 #: ../src/mainfrm.cc:1793
     2218#: ../src/mainfrm.cc:1817
    22192219#: n:325
    22202220msgid "CMAP XYZ files"
     
    22222222
    22232223#. TRANSLATORS: title of message box
    2224 #: ../src/mainfrm.cc:1866
    2225 #: ../src/mainfrm.cc:2160
    2226 #: ../src/mainfrm.cc:2177
     2224#: ../src/mainfrm.cc:1890
     2225#: ../src/mainfrm.cc:2188
     2226#: ../src/mainfrm.cc:2205
    22272227#: n:326
    22282228msgid "Modified Presentation"
     
    22302230
    22312231#. TRANSLATORS: and the question in that box
    2232 #: ../src/mainfrm.cc:1865
    2233 #: ../src/mainfrm.cc:2159
    2234 #: ../src/mainfrm.cc:2176
     2232#: ../src/mainfrm.cc:1889
     2233#: ../src/mainfrm.cc:2187
     2234#: ../src/mainfrm.cc:2204
    22352235#: n:327
    22362236msgid "The current presentation has been modified.  Abandon unsaved changes?"
    22372237msgstr ""
    22382238
    2239 #: ../src/mainfrm.cc:2477
    2240 #: ../src/mainfrm.cc:2486
     2239#: ../src/mainfrm.cc:2505
     2240#: ../src/mainfrm.cc:2514
    22412241#: n:328
    22422242msgid "No matches were found."
     
    22552255
    22562256#. TRANSLATORS: "Find stations" button tooltip
    2257 #: ../src/mainfrm.cc:935
     2257#: ../src/mainfrm.cc:950
    22582258#: n:332
    22592259msgid "Find"
     
    22612261
    22622262#. TRANSLATORS: "Hide stations" button default tooltip
    2263 #: ../src/mainfrm.cc:936
    2264 #: ../src/mainfrm.cc:2518
     2263#: ../src/mainfrm.cc:951
     2264#: ../src/mainfrm.cc:2546
    22652265#: n:333
    22662266msgid "Hide"
     
    22682268
    22692269#. TRANSLATORS: "Hide stations" button tooltip when stations are found
    2270 #: ../src/mainfrm.cc:2479
     2270#: ../src/mainfrm.cc:2507
    22712271#: n:334
    22722272#, c-format
     
    22742274msgstr ""
    22752275
    2276 #: ../src/mainfrm.cc:206
    2277 #: ../src/mainfrm.cc:1936
    2278 #: ../src/mainfrm.cc:1940
    2279 #: ../src/mainfrm.cc:2005
    2280 #: ../src/mainfrm.cc:2007
    2281 #: ../src/mainfrm.cc:2050
    2282 #: ../src/mainfrm.cc:2054
     2276#: ../src/mainfrm.cc:220
     2277#: ../src/mainfrm.cc:1960
     2278#: ../src/mainfrm.cc:1965
     2279#: ../src/mainfrm.cc:2030
     2280#: ../src/mainfrm.cc:2033
     2281#: ../src/mainfrm.cc:2077
     2282#: ../src/mainfrm.cc:2082
    22832283#: n:335
    22842284msgid "Altitude"
     
    22862286
    22872287#. TRANSLATORS: error if you try to drag multiple files to the aven window
    2288 #: ../src/mainfrm.cc:679
     2288#: ../src/mainfrm.cc:693
    22892289#: n:336
    22902290msgid "You may only view one 3d file at a time."
    22912291msgstr ""
    22922292
    2293 #: ../src/mainfrm.cc:864
     2293#: ../src/mainfrm.cc:879
    22942294#: n:337
    22952295msgid "&Side Panel"
     
    22972297
    22982298#. TRANSLATORS: show coordinates (N = North or Northing, E = East or Easting)
    2299 #: ../src/mainfrm.cc:1935
    2300 #: ../src/mainfrm.cc:1938
    2301 #: ../src/mainfrm.cc:1961
     2299#: ../src/mainfrm.cc:1959
    23022300#: ../src/mainfrm.cc:1963
    2303 #: ../src/mainfrm.cc:2049
    2304 #: ../src/mainfrm.cc:2052
     2301#: ../src/mainfrm.cc:1986
     2302#: ../src/mainfrm.cc:1988
     2303#: ../src/mainfrm.cc:2076
     2304#: ../src/mainfrm.cc:2080
    23052305#: n:338
    23062306msgid "%.2f E, %.2f N"
     
    23112311#. H: 123.45m V: 234.56m
    23122312#. Dist: 456.78m  Brg: 200
    2313 #: ../src/mainfrm.cc:1978
    2314 #: ../src/mainfrm.cc:2017
    2315 #: ../src/mainfrm.cc:2073
     2313#: ../src/mainfrm.cc:2003
     2314#: ../src/mainfrm.cc:2044
     2315#: ../src/mainfrm.cc:2101
    23162316#: n:339
    23172317#, c-format
     
    23202320
    23212321#. TRANSLATORS: "H" is short for "Horizontal", "V" for "Vertical"
    2322 #: ../src/mainfrm.cc:2077
    2323 #: ../src/mainfrm.cc:2080
     2322#: ../src/mainfrm.cc:2105
     2323#: ../src/mainfrm.cc:2108
    23242324#: n:340
    23252325#, c-format
     
    23282328
    23292329#. TRANSLATORS: "Dist" is short for "Distance", "Brg" for "Bearing" (as in Compass bearing)
    2330 #: ../src/mainfrm.cc:2093
    2331 #: ../src/mainfrm.cc:2097
     2330#: ../src/mainfrm.cc:2121
     2331#: ../src/mainfrm.cc:2125
    23322332#: n:341
    23332333#, c-format
     
    23382338#: ../src/gfxcore.cc:3034
    23392339#: ../src/gfxcore.cc:3049
    2340 #: ../src/mainfrm.cc:866
     2340#: ../src/mainfrm.cc:881
    23412341#: n:342
    23422342msgid "&Metric"
     
    23482348#: ../src/gfxcore.cc:3011
    23492349#: ../src/gfxcore.cc:3024
    2350 #: ../src/mainfrm.cc:867
     2350#: ../src/mainfrm.cc:882
    23512351#: n:343
    23522352msgid "&Degrees"
     2353msgstr ""
     2354
     2355#. TRANSLATORS: abbreviation for "metres" (unit of length), used e.g. as "10m".
     2356#. If there should be a space between the number and this, include one in the
     2357#. translation.
     2358#: ../src/mainfrm.cc:61
     2359#: n:96
     2360msgid "m"
     2361msgstr ""
     2362
     2363#. TRANSLATORS: abbreviation for "feet" (unit of length), used e.g. as "10ft".
     2364#. If there should be a space between the number and this, include one in the
     2365#. translation.
     2366#: ../src/mainfrm.cc:67
     2367#: n:76
     2368msgid "ft"
    23532369msgstr ""
    23542370
     
    23802396
    23812397#. TRANSLATORS: degree symbol - probably should be translated to itself.
    2382 #: ../src/mainfrm.cc:1982
    2383 #: ../src/mainfrm.cc:2086
    2384 #: ../src/printwx.cc:926
    2385 #: ../src/printwx.cc:951
    2386 #: ../src/printwx.cc:955
    2387 #: ../src/printwx.cc:959
    2388 #: ../src/printwx.cc:966
     2398#: ../src/mainfrm.cc:2007
     2399#: ../src/mainfrm.cc:2114
     2400#: ../src/printwx.cc:927
     2401#: ../src/printwx.cc:952
     2402#: ../src/printwx.cc:956
     2403#: ../src/printwx.cc:960
     2404#: ../src/printwx.cc:967
    23892405#: n:344
    23902406msgid "°"
     
    23962412#. E.g. in Italian and Spanish we use "g.cent." rather than
    23972413#. "gradi quattrocentesimali"/"grados centesimales"
    2398 #: ../src/mainfrm.cc:1985
    2399 #: ../src/mainfrm.cc:2089
     2414#: ../src/mainfrm.cc:2010
     2415#: ../src/mainfrm.cc:2117
    24002416#: n:345
    24012417msgid "grad"
    24022418msgstr ""
    24032419
    2404 #: ../src/mainfrm.cc:849
     2420#: ../src/mainfrm.cc:864
    24052421#: n:347
    24062422#~ msgid "&Preferences…"
     
    25192535
    25202536#. TRANSLATORS: "H" is short for "Horizontal", "Brg" for "Bearing" (as in Compass bearing)
    2521 #: ../src/mainfrm.cc:1989
    2522 #: ../src/mainfrm.cc:1992
     2537#: ../src/mainfrm.cc:2014
     2538#: ../src/mainfrm.cc:2017
    25232539#: n:374
    25242540#, c-format
     
    25272543
    25282544#. TRANSLATORS: "V" is short for "Vertical"
    2529 #: ../src/mainfrm.cc:2020
    2530 #: ../src/mainfrm.cc:2023
     2545#: ../src/mainfrm.cc:2047
     2546#: ../src/mainfrm.cc:2050
    25312547#: n:375
    25322548#, c-format
     
    25362552#. TRANSLATORS: labels for tabbed side panel
    25372553#. this is for the tab with the tree hierarchy of survey station names
    2538 #: ../src/mainfrm.cc:987
     2554#: ../src/mainfrm.cc:1002
    25392555#: n:376
    25402556msgid "Surveys"
    25412557msgstr ""
    25422558
    2543 #: ../src/mainfrm.cc:988
     2559#: ../src/mainfrm.cc:1003
    25442560#: n:377
    25452561msgid "Presentation"
    25462562msgstr ""
    25472563
    2548 #: ../src/mainfrm.cc:204
     2564#: ../src/mainfrm.cc:218
    25492565#: n:378
    25502566msgid "Easting"
    25512567msgstr ""
    25522568
    2553 #: ../src/mainfrm.cc:205
     2569#: ../src/mainfrm.cc:219
    25542570#: n:379
    25552571msgid "Northing"
    25562572msgstr ""
    25572573
    2558 #: ../src/mainfrm.cc:742
     2574#: ../src/mainfrm.cc:757
    25592575#: n:380
    25602576msgid "&Print…\tCtrl+P"
    25612577msgstr ""
    25622578
    2563 #: ../src/mainfrm.cc:743
     2579#: ../src/mainfrm.cc:758
    25642580#: n:381
    25652581msgid "P&age Setup…"
    25662582msgstr ""
    25672583
    2568 #: ../src/mainfrm.cc:746
     2584#: ../src/mainfrm.cc:761
    25692585#: n:382
    25702586msgid "&Export as…"
     
    25722588
    25732589#. TRANSLATORS: Title of file dialog to choose name and type of exported file.
    2574 #: ../src/printwx.cc:566
     2590#: ../src/printwx.cc:567
    25752591#: n:401
    25762592msgid "Export as:"
     
    25782594
    25792595#. TRANSLATORS: Title of the export dialog
    2580 #: ../src/printwx.cc:286
     2596#: ../src/printwx.cc:287
    25812597#: n:383
    25822598msgid "Export"
     
    25902606
    25912607#. TRANSLATORS: Title of the print preview dialog
    2592 #: ../src/printwx.cc:605
     2608#: ../src/printwx.cc:606
    25932609#: n:398
    25942610msgid "Print Preview"
     
    25962612
    25972613#. TRANSLATORS: Title of the print dialog
    2598 #: ../src/printwx.cc:286
     2614#: ../src/printwx.cc:287
    25992615#: n:399
    26002616msgid "Print"
    26012617msgstr ""
    26022618
    2603 #: ../src/printwx.cc:517
     2619#: ../src/printwx.cc:518
    26042620#: n:400
    26052621msgid "&Print…"
     
    26082624#. TRANSLATORS: Here a "survey leg" is a set of measurements between two
    26092625#. "survey stations".
    2610 #: ../src/printwx.cc:430
     2626#: ../src/printwx.cc:431
    26112627#: n:403
    26122628msgid "Sur&face Survey Legs"
     
    26142630
    26152631#. TRANSLATORS: Title of dialog to edit a waypoint in a presentation.
    2616 #: ../src/mainfrm.cc:96
     2632#: ../src/mainfrm.cc:110
    26172633#: n:404
    26182634msgid "Edit Waypoint"
     
    26202636
    26212637#. TRANSLATORS: Note after "Scale" field in dialog to edit a waypoint in a presentation.
    2622 #: ../src/mainfrm.cc:133
     2638#: ../src/mainfrm.cc:147
    26232639#: n:278
    26242640msgid " (unused in perspective view)"
     
    26262642
    26272643#. TRANSLATORS: Field label in dialog to edit a waypoint in a presentation.
    2628 #: ../src/mainfrm.cc:138
     2644#: ../src/mainfrm.cc:152
    26292645#: n:279
    26302646msgid "Time: "
     
    26322648
    26332649#. TRANSLATORS: units+info after time field in dialog to edit a waypoint in a presentation.
    2634 #: ../src/mainfrm.cc:140
     2650#: ../src/mainfrm.cc:154
    26352651#: n:282
    26362652msgid " secs (0 = auto; *6 = 6 times auto)"
     
    27932809#. pass findentrances a string to tell PROJ what the input datum is.
    27942810#: ../src/findentrances.cc:146
    2795 #: ../src/printwx.cc:495
     2811#: ../src/printwx.cc:496
    27962812#: n:389
    27972813msgid "input datum as string to pass to PROJ"
     
    28152831msgstr ""
    28162832
    2817 #: ../src/mainfrm.cc:816
     2833#: ../src/mainfrm.cc:831
    28182834#: n:406
    28192835msgid "Spla&y Legs"
    28202836msgstr ""
    28212837
    2822 #: ../src/mainfrm.cc:813
     2838#: ../src/mainfrm.cc:828
    28232839#: n:407
    28242840msgid "&Hide"
    28252841msgstr ""
    28262842
    2827 #: ../src/mainfrm.cc:814
     2843#: ../src/mainfrm.cc:829
    28282844#: n:408
    28292845msgid "&Fade"
    28302846msgstr ""
    28312847
    2832 #: ../src/mainfrm.cc:815
     2848#: ../src/mainfrm.cc:830
    28332849#: n:409
    28342850msgid "&Show"
    28352851msgstr ""
    28362852
    2837 #: ../src/printwx.cc:345
     2853#: ../src/printwx.cc:346
    28382854#: n:410
    28392855msgid "Export format"
  • src/mainfrm.cc

    rdf26b81 r099256a  
    5454
    5555using namespace std;
     56
     57static wxString m_string, ft_string;
     58
     59static const wxChar * m() {
     60    if (m_string.empty())
     61        m_string = wmsg(/*m*/96);
     62    return m_string.c_str();
     63}
     64
     65static const wxChar * ft() {
     66    if (ft_string.empty())
     67        ft_string = wmsg(/*ft*/76);
     68    return ft_string.c_str();
     69}
    5670
    5771const static int img2aven_tab[] = {
     
    19441958    if (m_Gfx->GetMetric()) {
    19451959        s.Printf(wmsg(/*%.2f E, %.2f N*/338), v.GetX(), v.GetY());
    1946         s += wxString::Format(wxT(", %s %.2fm"), wmsg(/*Altitude*/335).c_str(), v.GetZ());
     1960        s += wxString::Format(wxT(", %s %.2f%s"), wmsg(/*Altitude*/335).c_str(),
     1961                              v.GetZ(), m());
    19471962    } else {
    19481963        s.Printf(wmsg(/*%.2f E, %.2f N*/338),
    19491964                 v.GetX() / METRES_PER_FOOT, v.GetY() / METRES_PER_FOOT);
    1950         s += wxString::Format(wxT(", %s %.2fft"), wmsg(/*Altitude*/335).c_str(),
    1951                               v.GetZ() / METRES_PER_FOOT);
     1965        s += wxString::Format(wxT(", %s %.2f%s"), wmsg(/*Altitude*/335).c_str(),
     1966                              v.GetZ() / METRES_PER_FOOT, ft());
    19521967    }
    19531968    distfree_text = wxString();
     
    19982013        if (m_Gfx->GetMetric()) {
    19992014            t.Printf(wmsg(/*%s: H %.2f%s, Brg %03d%s*/374),
    2000                      from_str.c_str(), dh, wxT("m"), int(brg), brg_unit.c_str());
     2015                     from_str.c_str(), dh, m(), int(brg), brg_unit.c_str());
    20012016        } else {
    20022017            t.Printf(wmsg(/*%s: H %.2f%s, Brg %03d%s*/374),
    2003                      from_str.c_str(), dh / METRES_PER_FOOT, wxT("ft"), int(brg),
     2018                     from_str.c_str(), dh / METRES_PER_FOOT, ft(), int(brg),
    20042019                     brg_unit.c_str());
    20052020        }
     
    20132028    wxString & s = coords_text;
    20142029    if (m_Gfx->GetMetric()) {
    2015         s.Printf(wxT("%s %.2fm"), wmsg(/*Altitude*/335).c_str(), double(z));
     2030        s.Printf(wxT("%s %.2f%s"), wmsg(/*Altitude*/335).c_str(),
     2031                 double(z), m());
    20162032    } else {
    2017         s.Printf(wxT("%s %.2fft"), wmsg(/*Altitude*/335).c_str(), double(z / METRES_PER_FOOT));
     2033        s.Printf(wxT("%s %.2f%s"), wmsg(/*Altitude*/335).c_str(),
     2034                 double(z / METRES_PER_FOOT), ft());
    20182035    }
    20192036
     
    20292046        if (m_Gfx->GetMetric()) {
    20302047            t.Printf(wmsg(/*%s: V %.2f%s*/375),
    2031                      from_str.c_str(), dz, wxT("m"));
     2048                     from_str.c_str(), dz, m());
    20322049        } else {
    20332050            t.Printf(wmsg(/*%s: V %.2f%s*/375),
    2034                      from_str.c_str(), dz / METRES_PER_FOOT, wxT("ft"));
     2051                     from_str.c_str(), dz / METRES_PER_FOOT, ft());
    20352052        }
    20362053    }
     
    20582075    if (m_Gfx->GetMetric()) {
    20592076        s.Printf(wmsg(/*%.2f E, %.2f N*/338), v.GetX(), v.GetY());
    2060         s += wxString::Format(wxT(", %s %.2fm"), wmsg(/*Altitude*/335).c_str(), v.GetZ());
     2077        s += wxString::Format(wxT(", %s %.2f%s"), wmsg(/*Altitude*/335).c_str(),
     2078                              v.GetZ(), m());
    20612079    } else {
    20622080        s.Printf(wmsg(/*%.2f E, %.2f N*/338),
    20632081                 v.GetX() / METRES_PER_FOOT, v.GetY() / METRES_PER_FOOT);
    2064         s += wxString::Format(wxT(", %s %.2fft"), wmsg(/*Altitude*/335).c_str(),
    2065                               v.GetZ() / METRES_PER_FOOT);
     2082        s += wxString::Format(wxT(", %s %.2f%s"), wmsg(/*Altitude*/335).c_str(),
     2083                              v.GetZ() / METRES_PER_FOOT, ft());
    20662084    }
    20672085    s += wxT(": ");
     
    20862104        if (m_Gfx->GetMetric()) {
    20872105            hv_str.Printf(wmsg(/*H %.2f%s, V %.2f%s*/340),
    2088                           d_horiz, wxT("m"), delta.GetZ(), wxT("m"));
     2106                          d_horiz, m(), delta.GetZ(), m());
    20892107        } else {
    20902108            hv_str.Printf(wmsg(/*H %.2f%s, V %.2f%s*/340),
    2091                           d_horiz / METRES_PER_FOOT, wxT("ft"),
    2092                           delta.GetZ() / METRES_PER_FOOT, wxT("ft"));
     2109                          d_horiz / METRES_PER_FOOT, ft(),
     2110                          delta.GetZ() / METRES_PER_FOOT, ft());
    20932111        }
    20942112        wxString brg_unit;
     
    21032121            d.Printf(wmsg(/*%s: %s, Dist %.2f%s, Brg %03d%s*/341),
    21042122                     from_str.c_str(), hv_str.c_str(),
    2105                      dr, wxT("m"), int(brg), brg_unit.c_str());
     2123                     dr, m(), int(brg), brg_unit.c_str());
    21062124        } else {
    21072125            d.Printf(wmsg(/*%s: %s, Dist %.2f%s, Brg %03d%s*/341),
    21082126                     from_str.c_str(), hv_str.c_str(),
    2109                      dr / METRES_PER_FOOT, wxT("ft"), int(brg),
     2127                     dr / METRES_PER_FOOT, ft(), int(brg),
    21102128                     brg_unit.c_str());
    21112129        }
Note: See TracChangeset for help on using the changeset viewer.