Changeset 85c0078 in git


Ignore:
Timestamp:
08/03/15 02:19:33 (5 years ago)
Author:
Olly Betts <olly@…>
Branches:
line_contents, master, stereo, travis-osx
Children:
2a0f70e
Parents:
d5427e7
Message:

doc/TODO.htm,lib/,src/,tests/: In cavern, use the currently set units
when outputting measurements in warnings, errors, and the stats at
the end of the run.

Files:
31 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    rd5427e7 r85c0078  
     1Sun Mar 08 02:16:39 GMT 2015  Olly Betts <olly@survex.com>
     2
     3        * doc/TODO.htm,lib/,src/,tests/: In cavern, use the currently set units
     4          when outputting measurements in warnings, errors, and the stats at
     5          the end of the run.
     6
    17Sun Mar 08 02:10:03 GMT 2015  Olly Betts <olly@survex.com>
    28
  • doc/TODO.htm

    rd5427e7 r85c0078  
    155155<li>Update translations.
    156156
    157 <li>control of output units in .err file and in stats at end of cavern run?
    158 In fact anywhere we report a value in degrees or metres, the units should be
    159 selectable
     157<li>length units in .err file?
    160158
    161159</ul>
  • lib/bg.po

    rd5427e7 r85c0078  
    466466msgstr ""
    467467
    468 #. TRANSLATORS: Degrees are the angular measurement where there are
    469 #. 360 in a full circle.
     468#. TRANSLATORS: %.f%s will be replaced with a right angle in the
     469#. units currently in use, e.g. "90°" or "100ᵍ".  And "absolute
     470#. value" means the reading ignoring the sign (so it might be
     471#. < -90° or > 90°.
    470472#: ../src/datain.c:969
    471473#: ../src/datain.c:977
    472474#: ../src/datain.c:989
    473475#: n:51
    474 msgid "Clino reading over 90 degrees (absolute value)"
     476#, c-format
     477msgid "Clino reading over %.f%s (absolute value)"
    475478msgstr ""
    476479
     
    758761msgstr ""
    759762
    760 #. TRANSLATORS: Degrees are the angular measurement where there are
    761 #. 360 in a full circle.
     763#. TRANSLATORS: %s is replaced by the amount the readings disagree
     764#. by, e.g. "2.5°" or "3ᵍ".
    762765#: ../src/datain.c:906
    763766#: n:98
    764767#, c-format
    765 msgid "COMPASS reading and BACKCOMPASS reading disagree by %s degrees"
    766 msgstr ""
    767 
    768 #. TRANSLATORS: Degrees are the angular measurement where
    769 #. there are 360 in a full circle.
     768msgid "COMPASS reading and BACKCOMPASS reading disagree by %s"
     769msgstr ""
     770
     771#. TRANSLATORS: %s is replaced by the amount the readings disagree
     772#. by, e.g. "2.5°" or "3ᵍ".
    770773#: ../src/datain.c:1082
    771774#: n:99
    772775#, c-format
    773 msgid "CLINO reading and BACKCLINO reading disagree by %s degrees"
     776msgid "CLINO reading and BACKCLINO reading disagree by %s"
    774777msgstr ""
    775778
     
    972975#: n:132
    973976#, c-format
    974 msgid "Total length of survey legs = %7.2fm (%7.2fm adjusted)"
     977msgid "Total length of survey legs = %7.2f%s (%7.2f%s adjusted)"
    975978msgstr ""
    976979
     
    978981#: n:133
    979982#, c-format
    980 msgid "Total plan length of survey legs = %7.2fm"
     983msgid "Total plan length of survey legs = %7.2f%s"
    981984msgstr ""
    982985
     
    984987#: n:134
    985988#, c-format
    986 msgid "Total vertical length of survey legs = %7.2fm"
     989msgid "Total vertical length of survey legs = %7.2f%s"
    987990msgstr ""
    988991
     
    991994#: n:135
    992995#, c-format
    993 msgid "Vertical range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
     996msgid "Vertical range = %4.2f%s (from %s at %4.2f%s to %s at %4.2f%s)"
    994997msgstr ""
    995998
     
    9981001#: n:136
    9991002#, fuzzy, c-format
    1000 msgid "North-South range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
    1001 msgstr "Север-Юг range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
     1003msgid "North-South range = %4.2f%s (from %s at %4.2f%s to %s at %4.2f%s)"
     1004msgstr "Север-Юг range = %4.2f%s (from %s at %4.2f%s to %s at %4.2f%s)"
    10021005
    10031006#. TRANSLATORS: c.f. previous two messages
     
    10051008#: n:137
    10061009#, fuzzy, c-format
    1007 msgid "East-West range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
    1008 msgstr "Изток-Запад range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
     1010msgid "East-West range = %4.2f%s (from %s at %4.2f%s to %s at %4.2f%s)"
     1011msgstr "Изток-Запад range = %4.2f%s (from %s at %4.2f%s to %s at %4.2f%s)"
    10091012
    10101013#: ../src/cavern.c:434
  • lib/ca.po

    rd5427e7 r85c0078  
    466466msgstr "Tirada amb la mateixa estació a ambdues puntes (“%s”) - error de transcripció?"
    467467
    468 #. TRANSLATORS: Degrees are the angular measurement where there are
    469 #. 360 in a full circle.
     468#. TRANSLATORS: %.f%s will be replaced with a right angle in the
     469#. units currently in use, e.g. "90°" or "100ᵍ".  And "absolute
     470#. value" means the reading ignoring the sign (so it might be
     471#. < -90° or > 90°.
    470472#: ../src/datain.c:969
    471473#: ../src/datain.c:977
    472474#: ../src/datain.c:989
    473475#: n:51
    474 msgid "Clino reading over 90 degrees (absolute value)"
    475 msgstr "Lectura del clino superior a 90 graus (valor absolut)"
     476#, c-format
     477msgid "Clino reading over %.f%s (absolute value)"
     478msgstr "Lectura del clino superior a %.f%s (valor absolut)"
    476479
    477480#: ../src/netbits.c:464
     
    758761msgstr "Utilitzacions futures d’aquesta funció obsoleta no seran informats"
    759762
    760 #. TRANSLATORS: Degrees are the angular measurement where there are
    761 #. 360 in a full circle.
     763#. TRANSLATORS: %s is replaced by the amount the readings disagree
     764#. by, e.g. "2.5°" or "3ᵍ".
    762765#: ../src/datain.c:906
    763766#: n:98
    764767#, c-format
    765 msgid "COMPASS reading and BACKCOMPASS reading disagree by %s degrees"
    766 msgstr "Les lectures de COMPASS i BACKCOMPASS difereixen de %s graus"
    767 
    768 #. TRANSLATORS: Degrees are the angular measurement where
    769 #. there are 360 in a full circle.
     768msgid "COMPASS reading and BACKCOMPASS reading disagree by %s"
     769msgstr "Les lectures de COMPASS i BACKCOMPASS difereixen de %s"
     770
     771#. TRANSLATORS: %s is replaced by the amount the readings disagree
     772#. by, e.g. "2.5°" or "3ᵍ".
    770773#: ../src/datain.c:1082
    771774#: n:99
    772775#, c-format
    773 msgid "CLINO reading and BACKCLINO reading disagree by %s degrees"
    774 msgstr "Les lectures de CLINO i BACKCLINO difereixen de %s graus"
     776msgid "CLINO reading and BACKCLINO reading disagree by %s"
     777msgstr "Les lectures de CLINO i BACKCLINO difereixen de %s"
    775778
    776779#: ../src/commands.c:1157
     
    972975#: n:132
    973976#, c-format
    974 msgid "Total length of survey legs = %7.2fm (%7.2fm adjusted)"
    975 msgstr "Longitut total de les tirades de topografía = %7.2fm (%7.2fm corregit)"
     977msgid "Total length of survey legs = %7.2f%s (%7.2f%s adjusted)"
     978msgstr "Longitut total de les tirades de topografía = %7.2f%s (%7.2f%s corregit)"
    976979
    977980#: ../src/cavern.c:452
    978981#: n:133
    979982#, c-format
    980 msgid "Total plan length of survey legs = %7.2fm"
    981 msgstr "Longitut total en projecció horitzontal = %7.2fm"
     983msgid "Total plan length of survey legs = %7.2f%s"
     984msgstr "Longitut total en projecció horitzontal = %7.2f%s"
    982985
    983986#: ../src/cavern.c:455
    984987#: n:134
    985988#, c-format
    986 msgid "Total vertical length of survey legs = %7.2fm"
    987 msgstr "Longitut vertical total de les tirades de topografía = %7.2fm"
     989msgid "Total vertical length of survey legs = %7.2f%s"
     990msgstr "Longitut vertical total de les tirades de topografía = %7.2f%s"
    988991
    989992#. TRANSLATORS: numbers are altitudes of highest and lowest stations
     
    991994#: n:135
    992995#, c-format
    993 msgid "Vertical range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
    994 msgstr "Desnivell total = %4.2fm (des de %s a %4.2fm a %s a %4.2fm)"
     996msgid "Vertical range = %4.2f%s (from %s at %4.2f%s to %s at %4.2f%s)"
     997msgstr "Desnivell total = %4.2f%s (des de %s a %4.2f%s a %s a %4.2f%s)"
    995998
    996999#. TRANSLATORS: c.f. previous message
     
    9981001#: n:136
    9991002#, c-format
    1000 msgid "North-South range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
    1001 msgstr "Extensió Nord-Sud = %4.2fm (des de %s a %4.2fm a %s a %4.2fm)"
     1003msgid "North-South range = %4.2f%s (from %s at %4.2f%s to %s at %4.2f%s)"
     1004msgstr "Extensió Nord-Sud = %4.2f%s (des de %s a %4.2f%s a %s a %4.2f%s)"
    10021005
    10031006#. TRANSLATORS: c.f. previous two messages
     
    10051008#: n:137
    10061009#, c-format
    1007 msgid "East-West range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
    1008 msgstr "Extensió Est-Oest = %4.2fm (des de %s a %4.2fm a %s a %4.2fm)"
     1010msgid "East-West range = %4.2f%s (from %s at %4.2f%s to %s at %4.2f%s)"
     1011msgstr "Extensió Est-Oest = %4.2f%s (des de %s a %4.2f%s a %s a %4.2f%s)"
    10091012
    10101013#: ../src/cavern.c:434
  • lib/de.po

    rd5427e7 r85c0078  
    466466msgstr "Messstrecke mit einem auf sich selbst bezogenen Messpunkt (»%s«) – Tippfehler?"
    467467
    468 #. TRANSLATORS: Degrees are the angular measurement where there are
    469 #. 360 in a full circle.
     468#. TRANSLATORS: %.f%s will be replaced with a right angle in the
     469#. units currently in use, e.g. "90°" or "100ᵍ".  And "absolute
     470#. value" means the reading ignoring the sign (so it might be
     471#. < -90° or > 90°.
    470472#: ../src/datain.c:969
    471473#: ../src/datain.c:977
    472474#: ../src/datain.c:989
    473475#: n:51
    474 msgid "Clino reading over 90 degrees (absolute value)"
    475 msgstr "Neigungseintrag übertrifft 90 Grad (Absolutwert)"
     476#, c-format
     477msgid "Clino reading over %.f%s (absolute value)"
     478msgstr "Neigungseintrag übertrifft %.f%s (Absolutwert)"
    476479
    477480#: ../src/netbits.c:464
     
    758761msgstr "Weitere Vorkommen dieser veralteten Funktionalität werden nicht gemeldet werden"
    759762
    760 #. TRANSLATORS: Degrees are the angular measurement where there are
    761 #. 360 in a full circle.
     763#. TRANSLATORS: %s is replaced by the amount the readings disagree
     764#. by, e.g. "2.5°" or "3ᵍ".
    762765#: ../src/datain.c:906
    763766#: n:98
    764767#, c-format
    765 msgid "COMPASS reading and BACKCOMPASS reading disagree by %s degrees"
    766 msgstr "COMPASS- und BACKCOMPASS-Eintrag differieren um %s Grad"
    767 
    768 #. TRANSLATORS: Degrees are the angular measurement where
    769 #. there are 360 in a full circle.
     768msgid "COMPASS reading and BACKCOMPASS reading disagree by %s"
     769msgstr "COMPASS- und BACKCOMPASS-Eintrag differieren um %s"
     770
     771#. TRANSLATORS: %s is replaced by the amount the readings disagree
     772#. by, e.g. "2.5°" or "3ᵍ".
    770773#: ../src/datain.c:1082
    771774#: n:99
    772775#, c-format
    773 msgid "CLINO reading and BACKCLINO reading disagree by %s degrees"
    774 msgstr "CLINO- und BACKCLINO-Eintrag differieren um %s Grad"
     776msgid "CLINO reading and BACKCLINO reading disagree by %s"
     777msgstr "CLINO- und BACKCLINO-Eintrag differieren um %s"
    775778
    776779#: ../src/commands.c:1157
     
    972975#: n:132
    973976#, c-format
    974 msgid "Total length of survey legs = %7.2fm (%7.2fm adjusted)"
    975 msgstr "Gesamtlänge der Messstrecken = %7.2fm (%7.2fm ausgeglichen)"
     977msgid "Total length of survey legs = %7.2f%s (%7.2f%s adjusted)"
     978msgstr "Gesamtlänge der Messstrecken = %7.2f%s (%7.2f%s ausgeglichen)"
    976979
    977980#: ../src/cavern.c:452
    978981#: n:133
    979982#, c-format
    980 msgid "Total plan length of survey legs = %7.2fm"
    981 msgstr "Gesamte Horizontallänge der Messstrecken = %7.2fm"
     983msgid "Total plan length of survey legs = %7.2f%s"
     984msgstr "Gesamte Horizontallänge der Messstrecken = %7.2f%s"
    982985
    983986#: ../src/cavern.c:455
    984987#: n:134
    985988#, c-format
    986 msgid "Total vertical length of survey legs = %7.2fm"
    987 msgstr "Gesamte Vertikallänge der Messstrecken = %7.2fm"
     989msgid "Total vertical length of survey legs = %7.2f%s"
     990msgstr "Gesamte Vertikallänge der Messstrecken = %7.2f%s"
    988991
    989992#. TRANSLATORS: numbers are altitudes of highest and lowest stations
     
    991994#: n:135
    992995#, c-format
    993 msgid "Vertical range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
    994 msgstr "Vertikale Erstreckung = %4.2fm (von %s auf %4.2fm bis %s auf %4.2fm)"
     996msgid "Vertical range = %4.2f%s (from %s at %4.2f%s to %s at %4.2f%s)"
     997msgstr "Vertikale Erstreckung = %4.2f%s (von %s auf %4.2f%s bis %s auf %4.2f%s)"
    995998
    996999#. TRANSLATORS: c.f. previous message
     
    9981001#: n:136
    9991002#, c-format
    1000 msgid "North-South range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
    1001 msgstr "Nord-Süd-Erstreckung = %4.2fm (von %s bei %4.2fm bis %s bei %4.2fm)"
     1003msgid "North-South range = %4.2f%s (from %s at %4.2f%s to %s at %4.2f%s)"
     1004msgstr "Nord-Süd-Erstreckung = %4.2f%s (von %s bei %4.2f%s bis %s bei %4.2f%s)"
    10021005
    10031006#. TRANSLATORS: c.f. previous two messages
     
    10051008#: n:137
    10061009#, c-format
    1007 msgid "East-West range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
    1008 msgstr "Ost-West-Erstreckung = %4.2fm (von %s bei %4.2fm bis %s bei %4.2fm)"
     1010msgid "East-West range = %4.2f%s (from %s at %4.2f%s to %s at %4.2f%s)"
     1011msgstr "Ost-West-Erstreckung = %4.2f%s (von %s bei %4.2f%s bis %s bei %4.2f%s)"
    10091012
    10101013#: ../src/cavern.c:434
  • lib/de_CH.po

    rd5427e7 r85c0078  
    466466msgstr "Messstrecke mit einem auf sich selbst bezogenen Messpunkt («%s») – Tippfehler?"
    467467
    468 #. TRANSLATORS: Degrees are the angular measurement where there are
    469 #. 360 in a full circle.
     468#. TRANSLATORS: %.f%s will be replaced with a right angle in the
     469#. units currently in use, e.g. "90°" or "100ᵍ".  And "absolute
     470#. value" means the reading ignoring the sign (so it might be
     471#. < -90° or > 90°.
    470472#: ../src/datain.c:969
    471473#: ../src/datain.c:977
    472474#: ../src/datain.c:989
    473475#: n:51
    474 msgid "Clino reading over 90 degrees (absolute value)"
    475 msgstr "Neigungseintrag übertrifft 90 Grad (Absolutwert)"
     476#, c-format
     477msgid "Clino reading over %.f%s (absolute value)"
     478msgstr "Neigungseintrag übertrifft %.f%s (Absolutwert)"
    476479
    477480#: ../src/netbits.c:464
     
    758761msgstr "Weitere Vorkommen dieser veralteten Funktionalität werden nicht gemeldet werden"
    759762
    760 #. TRANSLATORS: Degrees are the angular measurement where there are
    761 #. 360 in a full circle.
     763#. TRANSLATORS: %s is replaced by the amount the readings disagree
     764#. by, e.g. "2.5°" or "3ᵍ".
    762765#: ../src/datain.c:906
    763766#: n:98
    764767#, c-format
    765 msgid "COMPASS reading and BACKCOMPASS reading disagree by %s degrees"
    766 msgstr "COMPASS- und BACKCOMPASS-Eintrag differieren um %s Grad"
    767 
    768 #. TRANSLATORS: Degrees are the angular measurement where
    769 #. there are 360 in a full circle.
     768msgid "COMPASS reading and BACKCOMPASS reading disagree by %s"
     769msgstr "COMPASS- und BACKCOMPASS-Eintrag differieren um %s"
     770
     771#. TRANSLATORS: %s is replaced by the amount the readings disagree
     772#. by, e.g. "2.5°" or "3ᵍ".
    770773#: ../src/datain.c:1082
    771774#: n:99
    772775#, c-format
    773 msgid "CLINO reading and BACKCLINO reading disagree by %s degrees"
    774 msgstr "CLINO- und BACKCLINO-Eintrag differieren um %s Grad"
     776msgid "CLINO reading and BACKCLINO reading disagree by %s"
     777msgstr "CLINO- und BACKCLINO-Eintrag differieren um %s"
    775778
    776779#: ../src/commands.c:1157
     
    972975#: n:132
    973976#, c-format
    974 msgid "Total length of survey legs = %7.2fm (%7.2fm adjusted)"
    975 msgstr "Gesamtlänge der Messstrecken = %7.2fm (%7.2fm ausgeglichen)"
     977msgid "Total length of survey legs = %7.2f%s (%7.2f%s adjusted)"
     978msgstr "Gesamtlänge der Messstrecken = %7.2f%s (%7.2f%s ausgeglichen)"
    976979
    977980#: ../src/cavern.c:452
    978981#: n:133
    979982#, c-format
    980 msgid "Total plan length of survey legs = %7.2fm"
    981 msgstr "Gesamte Horizontallänge der Messstrecken = %7.2fm"
     983msgid "Total plan length of survey legs = %7.2f%s"
     984msgstr "Gesamte Horizontallänge der Messstrecken = %7.2f%s"
    982985
    983986#: ../src/cavern.c:455
    984987#: n:134
    985988#, c-format
    986 msgid "Total vertical length of survey legs = %7.2fm"
    987 msgstr "Gesamte Vertikallänge der Messstrecken = %7.2fm"
     989msgid "Total vertical length of survey legs = %7.2f%s"
     990msgstr "Gesamte Vertikallänge der Messstrecken = %7.2f%s"
    988991
    989992#. TRANSLATORS: numbers are altitudes of highest and lowest stations
     
    991994#: n:135
    992995#, c-format
    993 msgid "Vertical range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
    994 msgstr "Vertikale Erstreckung = %4.2fm (von %s auf %4.2fm bis %s auf %4.2fm)"
     996msgid "Vertical range = %4.2f%s (from %s at %4.2f%s to %s at %4.2f%s)"
     997msgstr "Vertikale Erstreckung = %4.2f%s (von %s auf %4.2f%s bis %s auf %4.2f%s)"
    995998
    996999#. TRANSLATORS: c.f. previous message
     
    9981001#: n:136
    9991002#, c-format
    1000 msgid "North-South range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
    1001 msgstr "Nord-Süd-Erstreckung = %4.2fm (von %s bei %4.2fm bis %s bei %4.2fm)"
     1003msgid "North-South range = %4.2f%s (from %s at %4.2f%s to %s at %4.2f%s)"
     1004msgstr "Nord-Süd-Erstreckung = %4.2f%s (von %s bei %4.2f%s bis %s bei %4.2f%s)"
    10021005
    10031006#. TRANSLATORS: c.f. previous two messages
     
    10051008#: n:137
    10061009#, c-format
    1007 msgid "East-West range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
    1008 msgstr "Ost-West-Erstreckung = %4.2fm (von %s bei %4.2fm bis %s bei %4.2fm)"
     1010msgid "East-West range = %4.2f%s (from %s at %4.2f%s to %s at %4.2f%s)"
     1011msgstr "Ost-West-Erstreckung = %4.2f%s (von %s bei %4.2f%s bis %s bei %4.2f%s)"
    10091012
    10101013#: ../src/cavern.c:434
  • lib/el.po

    rd5427e7 r85c0078  
    465465msgstr ""
    466466
    467 #. TRANSLATORS: Degrees are the angular measurement where there are
    468 #. 360 in a full circle.
     467#. TRANSLATORS: %.f%s will be replaced with a right angle in the
     468#. units currently in use, e.g. "90°" or "100ᵍ".  And "absolute
     469#. value" means the reading ignoring the sign (so it might be
     470#. < -90° or > 90°.
    469471#: ../src/datain.c:969
    470472#: ../src/datain.c:977
    471473#: ../src/datain.c:989
    472474#: n:51
    473 msgid "Clino reading over 90 degrees (absolute value)"
     475#, c-format
     476msgid "Clino reading over %.f%s (absolute value)"
    474477msgstr ""
    475478
     
    757760msgstr ""
    758761
    759 #. TRANSLATORS: Degrees are the angular measurement where there are
    760 #. 360 in a full circle.
     762#. TRANSLATORS: %s is replaced by the amount the readings disagree
     763#. by, e.g. "2.5°" or "3ᵍ".
    761764#: ../src/datain.c:906
    762765#: n:98
    763766#, c-format
    764 msgid "COMPASS reading and BACKCOMPASS reading disagree by %s degrees"
    765 msgstr ""
    766 
    767 #. TRANSLATORS: Degrees are the angular measurement where
    768 #. there are 360 in a full circle.
     767msgid "COMPASS reading and BACKCOMPASS reading disagree by %s"
     768msgstr ""
     769
     770#. TRANSLATORS: %s is replaced by the amount the readings disagree
     771#. by, e.g. "2.5°" or "3ᵍ".
    769772#: ../src/datain.c:1082
    770773#: n:99
    771774#, c-format
    772 msgid "CLINO reading and BACKCLINO reading disagree by %s degrees"
     775msgid "CLINO reading and BACKCLINO reading disagree by %s"
    773776msgstr ""
    774777
     
    971974#: n:132
    972975#, c-format
    973 msgid "Total length of survey legs = %7.2fm (%7.2fm adjusted)"
     976msgid "Total length of survey legs = %7.2f%s (%7.2f%s adjusted)"
    974977msgstr ""
    975978
     
    977980#: n:133
    978981#, c-format
    979 msgid "Total plan length of survey legs = %7.2fm"
     982msgid "Total plan length of survey legs = %7.2f%s"
    980983msgstr ""
    981984
     
    983986#: n:134
    984987#, c-format
    985 msgid "Total vertical length of survey legs = %7.2fm"
     988msgid "Total vertical length of survey legs = %7.2f%s"
    986989msgstr ""
    987990
     
    990993#: n:135
    991994#, c-format
    992 msgid "Vertical range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
     995msgid "Vertical range = %4.2f%s (from %s at %4.2f%s to %s at %4.2f%s)"
    993996msgstr ""
    994997
     
    9971000#: n:136
    9981001#, c-format
    999 msgid "North-South range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
     1002msgid "North-South range = %4.2f%s (from %s at %4.2f%s to %s at %4.2f%s)"
    10001003msgstr ""
    10011004
     
    10041007#: n:137
    10051008#, c-format
    1006 msgid "East-West range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
     1009msgid "East-West range = %4.2f%s (from %s at %4.2f%s to %s at %4.2f%s)"
    10071010msgstr ""
    10081011
  • lib/en_US.po

    rd5427e7 r85c0078  
    465465msgstr "Survey shot with same station (“%s”) at both ends - typing error?"
    466466
    467 #. TRANSLATORS: Degrees are the angular measurement where there are
    468 #. 360 in a full circle.
     467#. TRANSLATORS: %.f%s will be replaced with a right angle in the
     468#. units currently in use, e.g. "90°" or "100ᵍ".  And "absolute
     469#. value" means the reading ignoring the sign (so it might be
     470#. < -90° or > 90°.
    469471#: ../src/datain.c:969
    470472#: ../src/datain.c:977
    471473#: ../src/datain.c:989
    472474#: n:51
    473 msgid "Clino reading over 90 degrees (absolute value)"
    474 msgstr "Clino reading over 90 degrees (absolute value)"
     475#, c-format
     476msgid "Clino reading over %.f%s (absolute value)"
     477msgstr "Clino reading over %.f%s (absolute value)"
    475478
    476479#: ../src/netbits.c:464
     
    757760msgstr "Further uses of this deprecated feature will not be reported"
    758761
    759 #. TRANSLATORS: Degrees are the angular measurement where there are
    760 #. 360 in a full circle.
     762#. TRANSLATORS: %s is replaced by the amount the readings disagree
     763#. by, e.g. "2.5°" or "3ᵍ".
    761764#: ../src/datain.c:906
    762765#: n:98
    763766#, c-format
    764 msgid "COMPASS reading and BACKCOMPASS reading disagree by %s degrees"
    765 msgstr "COMPASS reading and BACKCOMPASS reading disagree by %s degrees"
    766 
    767 #. TRANSLATORS: Degrees are the angular measurement where
    768 #. there are 360 in a full circle.
     767msgid "COMPASS reading and BACKCOMPASS reading disagree by %s"
     768msgstr "COMPASS reading and BACKCOMPASS reading disagree by %s"
     769
     770#. TRANSLATORS: %s is replaced by the amount the readings disagree
     771#. by, e.g. "2.5°" or "3ᵍ".
    769772#: ../src/datain.c:1082
    770773#: n:99
    771774#, c-format
    772 msgid "CLINO reading and BACKCLINO reading disagree by %s degrees"
    773 msgstr "CLINO reading and BACKCLINO reading disagree by %s degrees"
     775msgid "CLINO reading and BACKCLINO reading disagree by %s"
     776msgstr "CLINO reading and BACKCLINO reading disagree by %s"
    774777
    775778#: ../src/commands.c:1157
     
    971974#: n:132
    972975#, c-format
    973 msgid "Total length of survey legs = %7.2fm (%7.2fm adjusted)"
    974 msgstr "Total length of survey shots = %7.2fm (%7.2fm adjusted)"
     976msgid "Total length of survey legs = %7.2f%s (%7.2f%s adjusted)"
     977msgstr "Total length of survey shots = %7.2f%s (%7.2f%s adjusted)"
    975978
    976979#: ../src/cavern.c:452
    977980#: n:133
    978981#, c-format
    979 msgid "Total plan length of survey legs = %7.2fm"
    980 msgstr "Total plan length of survey shots = %7.2fm"
     982msgid "Total plan length of survey legs = %7.2f%s"
     983msgstr "Total plan length of survey shots = %7.2f%s"
    981984
    982985#: ../src/cavern.c:455
    983986#: n:134
    984987#, c-format
    985 msgid "Total vertical length of survey legs = %7.2fm"
    986 msgstr "Total vertical length of survey shots = %7.2fm"
     988msgid "Total vertical length of survey legs = %7.2f%s"
     989msgstr "Total vertical length of survey shots = %7.2f%s"
    987990
    988991#. TRANSLATORS: numbers are altitudes of highest and lowest stations
     
    990993#: n:135
    991994#, c-format
    992 msgid "Vertical range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
    993 msgstr "Vertical range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
     995msgid "Vertical range = %4.2f%s (from %s at %4.2f%s to %s at %4.2f%s)"
     996msgstr "Vertical range = %4.2f%s (from %s at %4.2f%s to %s at %4.2f%s)"
    994997
    995998#. TRANSLATORS: c.f. previous message
     
    9971000#: n:136
    9981001#, c-format
    999 msgid "North-South range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
    1000 msgstr "North-South range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
     1002msgid "North-South range = %4.2f%s (from %s at %4.2f%s to %s at %4.2f%s)"
     1003msgstr "North-South range = %4.2f%s (from %s at %4.2f%s to %s at %4.2f%s)"
    10011004
    10021005#. TRANSLATORS: c.f. previous two messages
     
    10041007#: n:137
    10051008#, c-format
    1006 msgid "East-West range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
    1007 msgstr "East-West range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
     1009msgid "East-West range = %4.2f%s (from %s at %4.2f%s to %s at %4.2f%s)"
     1010msgstr "East-West range = %4.2f%s (from %s at %4.2f%s to %s at %4.2f%s)"
    10081011
    10091012#: ../src/cavern.c:434
  • lib/es.po

    rd5427e7 r85c0078  
    466466msgstr "Tirada con la misma estación en ambas puntas (“%s”) - error de transcripción?"
    467467
    468 #. TRANSLATORS: Degrees are the angular measurement where there are
    469 #. 360 in a full circle.
     468#. TRANSLATORS: %.f%s will be replaced with a right angle in the
     469#. units currently in use, e.g. "90°" or "100ᵍ".  And "absolute
     470#. value" means the reading ignoring the sign (so it might be
     471#. < -90° or > 90°.
    470472#: ../src/datain.c:969
    471473#: ../src/datain.c:977
    472474#: ../src/datain.c:989
    473475#: n:51
    474 msgid "Clino reading over 90 degrees (absolute value)"
    475 msgstr "Lectura del clino superior a 90 grados (valor absoluto)"
     476#, c-format
     477msgid "Clino reading over %.f%s (absolute value)"
     478msgstr "Lectura del clino superior a %.f%s (valor absoluto)"
    476479
    477480#: ../src/netbits.c:464
     
    758761msgstr "Usos futuros de ésta función obsoleta no serán informados"
    759762
    760 #. TRANSLATORS: Degrees are the angular measurement where there are
    761 #. 360 in a full circle.
     763#. TRANSLATORS: %s is replaced by the amount the readings disagree
     764#. by, e.g. "2.5°" or "3ᵍ".
    762765#: ../src/datain.c:906
    763766#: n:98
    764767#, c-format
    765 msgid "COMPASS reading and BACKCOMPASS reading disagree by %s degrees"
    766 msgstr "Las lecturas de COMPASS y BACKCOMPASS difieren de %s grados"
    767 
    768 #. TRANSLATORS: Degrees are the angular measurement where
    769 #. there are 360 in a full circle.
     768msgid "COMPASS reading and BACKCOMPASS reading disagree by %s"
     769msgstr "Las lecturas de COMPASS y BACKCOMPASS difieren de %s"
     770
     771#. TRANSLATORS: %s is replaced by the amount the readings disagree
     772#. by, e.g. "2.5°" or "3ᵍ".
    770773#: ../src/datain.c:1082
    771774#: n:99
    772775#, c-format
    773 msgid "CLINO reading and BACKCLINO reading disagree by %s degrees"
    774 msgstr "Las lecturas de CLINO y BACKCLINO difieren de %s grados"
     776msgid "CLINO reading and BACKCLINO reading disagree by %s"
     777msgstr "Las lecturas de CLINO y BACKCLINO difieren de %s"
    775778
    776779#: ../src/commands.c:1157
     
    972975#: n:132
    973976#, c-format
    974 msgid "Total length of survey legs = %7.2fm (%7.2fm adjusted)"
    975 msgstr "Longitud total de las tiradas de topografia = %7.2fm (%7.2fm corregido)"
     977msgid "Total length of survey legs = %7.2f%s (%7.2f%s adjusted)"
     978msgstr "Longitud total de las tiradas de topografia = %7.2f%s (%7.2f%s corregido)"
    976979
    977980#: ../src/cavern.c:452
    978981#: n:133
    979982#, c-format
    980 msgid "Total plan length of survey legs = %7.2fm"
    981 msgstr "Longitud total en proyección horizontal = %7.2fm"
     983msgid "Total plan length of survey legs = %7.2f%s"
     984msgstr "Longitud total en proyección horizontal = %7.2f%s"
    982985
    983986#: ../src/cavern.c:455
    984987#: n:134
    985988#, c-format
    986 msgid "Total vertical length of survey legs = %7.2fm"
    987 msgstr "Longitud vertical total de las tiradas de topografia = %7.2fm"
     989msgid "Total vertical length of survey legs = %7.2f%s"
     990msgstr "Longitud vertical total de las tiradas de topografia = %7.2f%s"
    988991
    989992#. TRANSLATORS: numbers are altitudes of highest and lowest stations
     
    991994#: n:135
    992995#, c-format
    993 msgid "Vertical range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
    994 msgstr "Desnivel total = %4.2fm (desde %s en %4.2fm a %s en %4.2fm)"
     996msgid "Vertical range = %4.2f%s (from %s at %4.2f%s to %s at %4.2f%s)"
     997msgstr "Desnivel total = %4.2f%s (desde %s en %4.2f%s a %s en %4.2f%s)"
    995998
    996999#. TRANSLATORS: c.f. previous message
     
    9981001#: n:136
    9991002#, c-format
    1000 msgid "North-South range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
    1001 msgstr "Extensión Norte-Sur = %4.2fm (desde %s en %4.2fm a %s en %4.2fm)"
     1003msgid "North-South range = %4.2f%s (from %s at %4.2f%s to %s at %4.2f%s)"
     1004msgstr "Extensión Norte-Sur = %4.2f%s (desde %s en %4.2f%s a %s en %4.2f%s)"
    10021005
    10031006#. TRANSLATORS: c.f. previous two messages
     
    10051008#: n:137
    10061009#, c-format
    1007 msgid "East-West range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
    1008 msgstr "Extensión Este-Oeste = %4.2fm (desde %s en %4.2fm a %s en %4.2fm)"
     1010msgid "East-West range = %4.2f%s (from %s at %4.2f%s to %s at %4.2f%s)"
     1011msgstr "Extensión Este-Oeste = %4.2f%s (desde %s en %4.2f%s a %s en %4.2f%s)"
    10091012
    10101013#: ../src/cavern.c:434
  • lib/fr.po

    rd5427e7 r85c0078  
    466466msgstr "Visée avec 2 extrémités identiques (“%s”) - erreur de frappe?"
    467467
    468 #. TRANSLATORS: Degrees are the angular measurement where there are
    469 #. 360 in a full circle.
     468#. TRANSLATORS: %.f%s will be replaced with a right angle in the
     469#. units currently in use, e.g. "90°" or "100ᵍ".  And "absolute
     470#. value" means the reading ignoring the sign (so it might be
     471#. < -90° or > 90°.
    470472#: ../src/datain.c:969
    471473#: ../src/datain.c:977
    472474#: ../src/datain.c:989
    473475#: n:51
    474 msgid "Clino reading over 90 degrees (absolute value)"
    475 msgstr "Lecture de clino supérieure à 90 degrés (en value absolue)"
     476#, c-format
     477msgid "Clino reading over %.f%s (absolute value)"
     478msgstr "Lecture de clino supérieure à %.f%s (en value absolue)"
    476479
    477480#: ../src/netbits.c:464
     
    758761msgstr "Cette functionnalité n’est plus utilisée; les usages ultérieurs ne seront pas signalés."
    759762
    760 #. TRANSLATORS: Degrees are the angular measurement where there are
    761 #. 360 in a full circle.
     763#. TRANSLATORS: %s is replaced by the amount the readings disagree
     764#. by, e.g. "2.5°" or "3ᵍ".
    762765#: ../src/datain.c:906
    763766#: n:98
    764767#, c-format
    765 msgid "COMPASS reading and BACKCOMPASS reading disagree by %s degrees"
    766 msgstr "Les mesures de COMPASS et BACKCOMPASS diffèrent de %s degrés"
    767 
    768 #. TRANSLATORS: Degrees are the angular measurement where
    769 #. there are 360 in a full circle.
     768msgid "COMPASS reading and BACKCOMPASS reading disagree by %s"
     769msgstr "Les mesures de COMPASS et BACKCOMPASS diffèrent de %s"
     770
     771#. TRANSLATORS: %s is replaced by the amount the readings disagree
     772#. by, e.g. "2.5°" or "3ᵍ".
    770773#: ../src/datain.c:1082
    771774#: n:99
    772775#, c-format
    773 msgid "CLINO reading and BACKCLINO reading disagree by %s degrees"
    774 msgstr "Les mesures de CLINO et BACKCLINO diffèrent de %s degrés"
     776msgid "CLINO reading and BACKCLINO reading disagree by %s"
     777msgstr "Les mesures de CLINO et BACKCLINO diffèrent de %s"
    775778
    776779#: ../src/commands.c:1157
     
    972975#: n:132
    973976#, c-format
    974 msgid "Total length of survey legs = %7.2fm (%7.2fm adjusted)"
    975 msgstr "Longueur totale de la topo = %7.2fm (%7.2fm adjusté)"
     977msgid "Total length of survey legs = %7.2f%s (%7.2f%s adjusted)"
     978msgstr "Longueur totale de la topo = %7.2f%s (%7.2f%s adjusté)"
    976979
    977980#: ../src/cavern.c:452
    978981#: n:133
    979982#, c-format
    980 msgid "Total plan length of survey legs = %7.2fm"
    981 msgstr "Longueur totale en projection horizontale = %7.2fm"
     983msgid "Total plan length of survey legs = %7.2f%s"
     984msgstr "Longueur totale en projection horizontale = %7.2f%s"
    982985
    983986#: ../src/cavern.c:455
    984987#: n:134
    985988#, c-format
    986 msgid "Total vertical length of survey legs = %7.2fm"
    987 msgstr "Longueur totale verticale = %7.2fm"
     989msgid "Total vertical length of survey legs = %7.2f%s"
     990msgstr "Longueur totale verticale = %7.2f%s"
    988991
    989992#. TRANSLATORS: numbers are altitudes of highest and lowest stations
     
    991994#: n:135
    992995#, c-format
    993 msgid "Vertical range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
    994 msgstr "Interval vertical = %4.2fm (de %s à %4.2fm jusqu’à %s à %4.2fm)"
     996msgid "Vertical range = %4.2f%s (from %s at %4.2f%s to %s at %4.2f%s)"
     997msgstr "Interval vertical = %4.2f%s (de %s à %4.2f%s jusqu’à %s à %4.2f%s)"
    995998
    996999#. TRANSLATORS: c.f. previous message
     
    9981001#: n:136
    9991002#, c-format
    1000 msgid "North-South range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
    1001 msgstr "Interval Nord-Sud = %4.2fm (de %s à %4.2fm jusqu’à %s à %4.2fm)"
     1003msgid "North-South range = %4.2f%s (from %s at %4.2f%s to %s at %4.2f%s)"
     1004msgstr "Interval Nord-Sud = %4.2f%s (de %s à %4.2f%s jusqu’à %s à %4.2f%s)"
    10021005
    10031006#. TRANSLATORS: c.f. previous two messages
     
    10051008#: n:137
    10061009#, c-format
    1007 msgid "East-West range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
    1008 msgstr "Interval Est-Ouest = %4.2fm (de %s à %4.2fm jusqu’à %s à %4.2fm)"
     1010msgid "East-West range = %4.2f%s (from %s at %4.2f%s to %s at %4.2f%s)"
     1011msgstr "Interval Est-Ouest = %4.2f%s (de %s à %4.2f%s jusqu’à %s à %4.2f%s)"
    10091012
    10101013#: ../src/cavern.c:434
  • lib/hu.po

    rd5427e7 r85c0078  
    465465msgstr ""
    466466
    467 #. TRANSLATORS: Degrees are the angular measurement where there are
    468 #. 360 in a full circle.
     467#. TRANSLATORS: %.f%s will be replaced with a right angle in the
     468#. units currently in use, e.g. "90°" or "100ᵍ".  And "absolute
     469#. value" means the reading ignoring the sign (so it might be
     470#. < -90° or > 90°.
    469471#: ../src/datain.c:969
    470472#: ../src/datain.c:977
    471473#: ../src/datain.c:989
    472474#: n:51
    473 msgid "Clino reading over 90 degrees (absolute value)"
     475#, c-format
     476msgid "Clino reading over %.f%s (absolute value)"
    474477msgstr ""
    475478
     
    757760msgstr ""
    758761
    759 #. TRANSLATORS: Degrees are the angular measurement where there are
    760 #. 360 in a full circle.
     762#. TRANSLATORS: %s is replaced by the amount the readings disagree
     763#. by, e.g. "2.5°" or "3ᵍ".
    761764#: ../src/datain.c:906
    762765#: n:98
    763766#, c-format
    764 msgid "COMPASS reading and BACKCOMPASS reading disagree by %s degrees"
    765 msgstr ""
    766 
    767 #. TRANSLATORS: Degrees are the angular measurement where
    768 #. there are 360 in a full circle.
     767msgid "COMPASS reading and BACKCOMPASS reading disagree by %s"
     768msgstr ""
     769
     770#. TRANSLATORS: %s is replaced by the amount the readings disagree
     771#. by, e.g. "2.5°" or "3ᵍ".
    769772#: ../src/datain.c:1082
    770773#: n:99
    771774#, c-format
    772 msgid "CLINO reading and BACKCLINO reading disagree by %s degrees"
     775msgid "CLINO reading and BACKCLINO reading disagree by %s"
    773776msgstr ""
    774777
     
    971974#: n:132
    972975#, c-format
    973 msgid "Total length of survey legs = %7.2fm (%7.2fm adjusted)"
    974 msgstr "A felmérés teljes hossza: %7.2fm (%7.2fm javítva)"
     976msgid "Total length of survey legs = %7.2f%s (%7.2f%s adjusted)"
     977msgstr "A felmérés teljes hossza: %7.2f%s (%7.2f%s javítva)"
    975978
    976979#: ../src/cavern.c:452
    977980#: n:133
    978981#, c-format
    979 msgid "Total plan length of survey legs = %7.2fm"
     982msgid "Total plan length of survey legs = %7.2f%s"
    980983msgstr ""
    981984
     
    983986#: n:134
    984987#, c-format
    985 msgid "Total vertical length of survey legs = %7.2fm"
     988msgid "Total vertical length of survey legs = %7.2f%s"
    986989msgstr ""
    987990
     
    990993#: n:135
    991994#, c-format
    992 msgid "Vertical range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
     995msgid "Vertical range = %4.2f%s (from %s at %4.2f%s to %s at %4.2f%s)"
    993996msgstr ""
    994997
     
    9971000#: n:136
    9981001#, c-format
    999 msgid "North-South range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
     1002msgid "North-South range = %4.2f%s (from %s at %4.2f%s to %s at %4.2f%s)"
    10001003msgstr ""
    10011004
     
    10041007#: n:137
    10051008#, c-format
    1006 msgid "East-West range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
     1009msgid "East-West range = %4.2f%s (from %s at %4.2f%s to %s at %4.2f%s)"
    10071010msgstr ""
    10081011
  • lib/id.po

    rd5427e7 r85c0078  
    465465msgstr "Kaki survei dengan stasiun yang sama (“%s”) pada kedua ujungnya - salah ketik?"
    466466
    467 #. TRANSLATORS: Degrees are the angular measurement where there are
    468 #. 360 in a full circle.
     467#. TRANSLATORS: %.f%s will be replaced with a right angle in the
     468#. units currently in use, e.g. "90°" or "100ᵍ".  And "absolute
     469#. value" means the reading ignoring the sign (so it might be
     470#. < -90° or > 90°.
    469471#: ../src/datain.c:969
    470472#: ../src/datain.c:977
    471473#: ../src/datain.c:989
    472474#: n:51
    473 msgid "Clino reading over 90 degrees (absolute value)"
    474 msgstr "Membaca clino lebih dari 90 derajat (nilai absolut)"
     475#, c-format
     476msgid "Clino reading over %.f%s (absolute value)"
     477msgstr "Membaca clino lebih dari %.f%s (nilai absolut)"
    475478
    476479#: ../src/netbits.c:464
     
    757760msgstr "Penggunaan lebih lanjut dari fitur yang ditinggalkan ini tidak perlu dilaporkan"
    758761
    759 #. TRANSLATORS: Degrees are the angular measurement where there are
    760 #. 360 in a full circle.
     762#. TRANSLATORS: %s is replaced by the amount the readings disagree
     763#. by, e.g. "2.5°" or "3ᵍ".
    761764#: ../src/datain.c:906
    762765#: n:98
    763766#, c-format
    764 msgid "COMPASS reading and BACKCOMPASS reading disagree by %s degrees"
    765 msgstr "Pembacaan COMPASS dan pembacaan BACKCOMPASS tidak sama %s derajat"
    766 
    767 #. TRANSLATORS: Degrees are the angular measurement where
    768 #. there are 360 in a full circle.
     767msgid "COMPASS reading and BACKCOMPASS reading disagree by %s"
     768msgstr "Pembacaan COMPASS dan pembacaan BACKCOMPASS tidak sama %s"
     769
     770#. TRANSLATORS: %s is replaced by the amount the readings disagree
     771#. by, e.g. "2.5°" or "3ᵍ".
    769772#: ../src/datain.c:1082
    770773#: n:99
    771774#, c-format
    772 msgid "CLINO reading and BACKCLINO reading disagree by %s degrees"
    773 msgstr "Pembacaan CLINO dan pembacaan BACKCLINO tidak sama %s derajat"
     775msgid "CLINO reading and BACKCLINO reading disagree by %s"
     776msgstr "Pembacaan CLINO dan pembacaan BACKCLINO tidak sama %s"
    774777
    775778#: ../src/commands.c:1157
     
    971974#: n:132
    972975#, c-format
    973 msgid "Total length of survey legs = %7.2fm (%7.2fm adjusted)"
    974 msgstr "Total panjang dari kaki survei = %7.2fm (%7.2fm yang disesuaikan)"
     976msgid "Total length of survey legs = %7.2f%s (%7.2f%s adjusted)"
     977msgstr "Total panjang dari kaki survei = %7.2f%s (%7.2f%s yang disesuaikan)"
    975978
    976979#: ../src/cavern.c:452
    977980#: n:133
    978981#, c-format
    979 msgid "Total plan length of survey legs = %7.2fm"
    980 msgstr "Total panjang tampak atas kaki survei = %7.2fm"
     982msgid "Total plan length of survey legs = %7.2f%s"
     983msgstr "Total panjang tampak atas kaki survei = %7.2f%s"
    981984
    982985#: ../src/cavern.c:455
    983986#: n:134
    984987#, c-format
    985 msgid "Total vertical length of survey legs = %7.2fm"
    986 msgstr "Total panjang vertikal kaki survei = %7.2fm"
     988msgid "Total vertical length of survey legs = %7.2f%s"
     989msgstr "Total panjang vertikal kaki survei = %7.2f%s"
    987990
    988991#. TRANSLATORS: numbers are altitudes of highest and lowest stations
     
    990993#: n:135
    991994#, c-format
    992 msgid "Vertical range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
    993 msgstr "Rentang vertikal = %4.2fm (dari %s di %4.2fm ke %s di %4.2fm)"
     995msgid "Vertical range = %4.2f%s (from %s at %4.2f%s to %s at %4.2f%s)"
     996msgstr "Rentang vertikal = %4.2f%s (dari %s di %4.2f%s ke %s di %4.2f%s)"
    994997
    995998#. TRANSLATORS: c.f. previous message
     
    9971000#: n:136
    9981001#, c-format
    999 msgid "North-South range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
    1000 msgstr "Rentang Utara-Selatan = %4.2fm (dari %s di %4.2fm ke %s di %4.2fm)"
     1002msgid "North-South range = %4.2f%s (from %s at %4.2f%s to %s at %4.2f%s)"
     1003msgstr "Rentang Utara-Selatan = %4.2f%s (dari %s di %4.2f%s ke %s di %4.2f%s)"
    10011004
    10021005#. TRANSLATORS: c.f. previous two messages
     
    10041007#: n:137
    10051008#, c-format
    1006 msgid "East-West range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
    1007 msgstr "Rentang Timur-Barat = %4.2fm (dari %s di %4.2fm ke %s di %4.2fm)"
     1009msgid "East-West range = %4.2f%s (from %s at %4.2f%s to %s at %4.2f%s)"
     1010msgstr "Rentang Timur-Barat = %4.2f%s (dari %s di %4.2f%s ke %s di %4.2f%s)"
    10081011
    10091012#: ../src/cavern.c:434
  • lib/it.po

    rd5427e7 r85c0078  
    466466msgstr "Alle estremitá di una battuta c’é la stessa stazione (“%s”) - Errore di trascrizione?"
    467467
    468 #. TRANSLATORS: Degrees are the angular measurement where there are
    469 #. 360 in a full circle.
     468#. TRANSLATORS: %.f%s will be replaced with a right angle in the
     469#. units currently in use, e.g. "90°" or "100ᵍ".  And "absolute
     470#. value" means the reading ignoring the sign (so it might be
     471#. < -90° or > 90°.
    470472#: ../src/datain.c:969
    471473#: ../src/datain.c:977
    472474#: ../src/datain.c:989
    473475#: n:51
    474 msgid "Clino reading over 90 degrees (absolute value)"
    475 msgstr "Lettura del clinometro superiore a 90 gradi (valore assoluto)"
     476#, c-format
     477msgid "Clino reading over %.f%s (absolute value)"
     478msgstr "Lettura del clinometro superiore a %.f%s (valore assoluto)"
    476479
    477480#: ../src/netbits.c:464
     
    758761msgstr "Usi futuri di questa funzionalitá non piú usata non verranno segnalati"
    759762
    760 #. TRANSLATORS: Degrees are the angular measurement where there are
    761 #. 360 in a full circle.
     763#. TRANSLATORS: %s is replaced by the amount the readings disagree
     764#. by, e.g. "2.5°" or "3ᵍ".
    762765#: ../src/datain.c:906
    763766#: n:98
    764767#, c-format
    765 msgid "COMPASS reading and BACKCOMPASS reading disagree by %s degrees"
    766 msgstr "Le letture COMPASS e BACKCOMPASS differiscono di %s gradi"
    767 
    768 #. TRANSLATORS: Degrees are the angular measurement where
    769 #. there are 360 in a full circle.
     768msgid "COMPASS reading and BACKCOMPASS reading disagree by %s"
     769msgstr "Le letture COMPASS e BACKCOMPASS differiscono di %s"
     770
     771#. TRANSLATORS: %s is replaced by the amount the readings disagree
     772#. by, e.g. "2.5°" or "3ᵍ".
    770773#: ../src/datain.c:1082
    771774#: n:99
    772775#, c-format
    773 msgid "CLINO reading and BACKCLINO reading disagree by %s degrees"
    774 msgstr "Le letture CLINO e BACKCLINO differiscono di %s gradi"
     776msgid "CLINO reading and BACKCLINO reading disagree by %s"
     777msgstr "Le letture CLINO e BACKCLINO differiscono di %s"
    775778
    776779#: ../src/commands.c:1157
     
    972975#: n:132
    973976#, c-format
    974 msgid "Total length of survey legs = %7.2fm (%7.2fm adjusted)"
    975 msgstr "Sviluppo spaziale = %7.2fm (%7.2fm corretto)"
     977msgid "Total length of survey legs = %7.2f%s (%7.2f%s adjusted)"
     978msgstr "Sviluppo spaziale = %7.2f%s (%7.2f%s corretto)"
    976979
    977980#: ../src/cavern.c:452
    978981#: n:133
    979982#, c-format
    980 msgid "Total plan length of survey legs = %7.2fm"
    981 msgstr "Sviluppo planimetrico = %7.2fm"
     983msgid "Total plan length of survey legs = %7.2f%s"
     984msgstr "Sviluppo planimetrico = %7.2f%s"
    982985
    983986#: ../src/cavern.c:455
    984987#: n:134
    985988#, c-format
    986 msgid "Total vertical length of survey legs = %7.2fm"
    987 msgstr "Totale delle componenti verticali delle battute = %7.2fm"
     989msgid "Total vertical length of survey legs = %7.2f%s"
     990msgstr "Totale delle componenti verticali delle battute = %7.2f%s"
    988991
    989992#. TRANSLATORS: numbers are altitudes of highest and lowest stations
     
    991994#: n:135
    992995#, c-format
    993 msgid "Vertical range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
    994 msgstr "Dislivello totale = %4.2fm (da %s a %4.2fm a %s a %4.2fm)"
     996msgid "Vertical range = %4.2f%s (from %s at %4.2f%s to %s at %4.2f%s)"
     997msgstr "Dislivello totale = %4.2f%s (da %s a %4.2f%s a %s a %4.2f%s)"
    995998
    996999#. TRANSLATORS: c.f. previous message
     
    9981001#: n:136
    9991002#, c-format
    1000 msgid "North-South range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
    1001 msgstr "Estensione Nord-Sud = %4.2fm (da %s a %4.2fm a %s a %4.2fm)"
     1003msgid "North-South range = %4.2f%s (from %s at %4.2f%s to %s at %4.2f%s)"
     1004msgstr "Estensione Nord-Sud = %4.2f%s (da %s a %4.2f%s a %s a %4.2f%s)"
    10021005
    10031006#. TRANSLATORS: c.f. previous two messages
     
    10051008#: n:137
    10061009#, c-format
    1007 msgid "East-West range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
    1008 msgstr "Estensione Est-Ovest = %4.2fm (da %s a %4.2fm a %s a %4.2fm)"
     1010msgid "East-West range = %4.2f%s (from %s at %4.2f%s to %s at %4.2f%s)"
     1011msgstr "Estensione Est-Ovest = %4.2f%s (da %s a %4.2f%s a %s a %4.2f%s)"
    10091012
    10101013#: ../src/cavern.c:434
  • lib/pl.po

    rd5427e7 r85c0078  
    465465msgstr ""
    466466
    467 #. TRANSLATORS: Degrees are the angular measurement where there are
    468 #. 360 in a full circle.
     467#. TRANSLATORS: %.f%s will be replaced with a right angle in the
     468#. units currently in use, e.g. "90°" or "100ᵍ".  And "absolute
     469#. value" means the reading ignoring the sign (so it might be
     470#. < -90° or > 90°.
    469471#: ../src/datain.c:969
    470472#: ../src/datain.c:977
    471473#: ../src/datain.c:989
    472474#: n:51
    473 msgid "Clino reading over 90 degrees (absolute value)"
     475#, c-format
     476msgid "Clino reading over %.f%s (absolute value)"
    474477msgstr ""
    475478
     
    758761msgstr ""
    759762
    760 #. TRANSLATORS: Degrees are the angular measurement where there are
    761 #. 360 in a full circle.
     763#. TRANSLATORS: %s is replaced by the amount the readings disagree
     764#. by, e.g. "2.5°" or "3ᵍ".
    762765#: ../src/datain.c:906
    763766#: n:98
    764767#, c-format
    765 msgid "COMPASS reading and BACKCOMPASS reading disagree by %s degrees"
    766 msgstr ""
    767 
    768 #. TRANSLATORS: Degrees are the angular measurement where
    769 #. there are 360 in a full circle.
     768msgid "COMPASS reading and BACKCOMPASS reading disagree by %s"
     769msgstr ""
     770
     771#. TRANSLATORS: %s is replaced by the amount the readings disagree
     772#. by, e.g. "2.5°" or "3ᵍ".
    770773#: ../src/datain.c:1082
    771774#: n:99
    772775#, c-format
    773 msgid "CLINO reading and BACKCLINO reading disagree by %s degrees"
     776msgid "CLINO reading and BACKCLINO reading disagree by %s"
    774777msgstr ""
    775778
     
    972975#: n:132
    973976#, c-format
    974 msgid "Total length of survey legs = %7.2fm (%7.2fm adjusted)"
     977msgid "Total length of survey legs = %7.2f%s (%7.2f%s adjusted)"
    975978msgstr ""
    976979
     
    978981#: n:133
    979982#, c-format
    980 msgid "Total plan length of survey legs = %7.2fm"
     983msgid "Total plan length of survey legs = %7.2f%s"
    981984msgstr ""
    982985
     
    984987#: n:134
    985988#, c-format
    986 msgid "Total vertical length of survey legs = %7.2fm"
     989msgid "Total vertical length of survey legs = %7.2f%s"
    987990msgstr ""
    988991
     
    991994#: n:135
    992995#, c-format
    993 msgid "Vertical range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
     996msgid "Vertical range = %4.2f%s (from %s at %4.2f%s to %s at %4.2f%s)"
    994997msgstr ""
    995998
     
    9981001#: n:136
    9991002#, c-format
    1000 msgid "North-South range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
     1003msgid "North-South range = %4.2f%s (from %s at %4.2f%s to %s at %4.2f%s)"
    10011004msgstr ""
    10021005
     
    10051008#: n:137
    10061009#, c-format
    1007 msgid "East-West range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
     1010msgid "East-West range = %4.2f%s (from %s at %4.2f%s to %s at %4.2f%s)"
    10081011msgstr ""
    10091012
  • lib/pt.po

    rd5427e7 r85c0078  
    466466msgstr "Visada com mesma base em ambas as pontas (“%s”) - erro de digitação?"
    467467
    468 #. TRANSLATORS: Degrees are the angular measurement where there are
    469 #. 360 in a full circle.
     468#. TRANSLATORS: %.f%s will be replaced with a right angle in the
     469#. units currently in use, e.g. "90°" or "100ᵍ".  And "absolute
     470#. value" means the reading ignoring the sign (so it might be
     471#. < -90° or > 90°.
    470472#: ../src/datain.c:969
    471473#: ../src/datain.c:977
    472474#: ../src/datain.c:989
    473475#: n:51
    474 msgid "Clino reading over 90 degrees (absolute value)"
    475 msgstr "Inclinação maior que 90 graus em valor absoluto"
     476#, c-format
     477msgid "Clino reading over %.f%s (absolute value)"
     478msgstr "Inclinação maior que %.f%s em valor absoluto"
    476479
    477480#: ../src/netbits.c:464
     
    758761msgstr "Futuros usos deste recurso desaconselhado não serão reportados"
    759762
    760 #. TRANSLATORS: Degrees are the angular measurement where there are
    761 #. 360 in a full circle.
     763#. TRANSLATORS: %s is replaced by the amount the readings disagree
     764#. by, e.g. "2.5°" or "3ᵍ".
    762765#: ../src/datain.c:906
    763766#: n:98
    764767#, c-format
    765 msgid "COMPASS reading and BACKCOMPASS reading disagree by %s degrees"
    766 msgstr "Ângulos de COMPASS e BACKCOMPASS diferem em %s graus"
    767 
    768 #. TRANSLATORS: Degrees are the angular measurement where
    769 #. there are 360 in a full circle.
     768msgid "COMPASS reading and BACKCOMPASS reading disagree by %s"
     769msgstr "Ângulos de COMPASS e BACKCOMPASS diferem em %s"
     770
     771#. TRANSLATORS: %s is replaced by the amount the readings disagree
     772#. by, e.g. "2.5°" or "3ᵍ".
    770773#: ../src/datain.c:1082
    771774#: n:99
    772775#, c-format
    773 msgid "CLINO reading and BACKCLINO reading disagree by %s degrees"
    774 msgstr "Ângulos de CLINO e BACKCLINO diferem em %s graus"
     776msgid "CLINO reading and BACKCLINO reading disagree by %s"
     777msgstr "Ângulos de CLINO e BACKCLINO diferem em %s"
    775778
    776779#: ../src/commands.c:1157
     
    972975#: n:132
    973976#, c-format
    974 msgid "Total length of survey legs = %7.2fm (%7.2fm adjusted)"
    975 msgstr "Desenvolvimento linear das visadas = %7.2fm (%7.2fm corrigidos)"
     977msgid "Total length of survey legs = %7.2f%s (%7.2f%s adjusted)"
     978msgstr "Desenvolvimento linear das visadas = %7.2f%s (%7.2f%s corrigidos)"
    976979
    977980#: ../src/cavern.c:452
    978981#: n:133
    979982#, c-format
    980 msgid "Total plan length of survey legs = %7.2fm"
    981 msgstr "Desenvolvimento horizontal das visadas = %7.2fm"
     983msgid "Total plan length of survey legs = %7.2f%s"
     984msgstr "Desenvolvimento horizontal das visadas = %7.2f%s"
    982985
    983986#: ../src/cavern.c:455
    984987#: n:134
    985988#, c-format
    986 msgid "Total vertical length of survey legs = %7.2fm"
    987 msgstr "Desenvolvimento vertical das visadas = %7.2fm"
     989msgid "Total vertical length of survey legs = %7.2f%s"
     990msgstr "Desenvolvimento vertical das visadas = %7.2f%s"
    988991
    989992#. TRANSLATORS: numbers are altitudes of highest and lowest stations
     
    991994#: n:135
    992995#, c-format
    993 msgid "Vertical range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
    994 msgstr "Desnível = %4.2fm (de %s a %4.2fm a %s a %4.2fm)"
     996msgid "Vertical range = %4.2f%s (from %s at %4.2f%s to %s at %4.2f%s)"
     997msgstr "Desnível = %4.2f%s (de %s a %4.2f%s a %s a %4.2f%s)"
    995998
    996999#. TRANSLATORS: c.f. previous message
     
    9981001#: n:136
    9991002#, c-format
    1000 msgid "North-South range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
    1001 msgstr "Extensão Norte-Sul = %4.2fm (de %s a %4.2fm a %s a %4.2fm)"
     1003msgid "North-South range = %4.2f%s (from %s at %4.2f%s to %s at %4.2f%s)"
     1004msgstr "Extensão Norte-Sul = %4.2f%s (de %s a %4.2f%s a %s a %4.2f%s)"
    10021005
    10031006#. TRANSLATORS: c.f. previous two messages
     
    10051008#: n:137
    10061009#, c-format
    1007 msgid "East-West range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
    1008 msgstr "Extensão Leste-Oeste = %4.2fm (de %s a %4.2fm a %s a %4.2fm)"
     1010msgid "East-West range = %4.2f%s (from %s at %4.2f%s to %s at %4.2f%s)"
     1011msgstr "Extensão Leste-Oeste = %4.2f%s (de %s a %4.2f%s a %s a %4.2f%s)"
    10091012
    10101013#: ../src/cavern.c:434
  • lib/pt_BR.po

    rd5427e7 r85c0078  
    466466msgstr "Visada com mesma base em ambas as pontas (“%s”) - erro de digitação?"
    467467
    468 #. TRANSLATORS: Degrees are the angular measurement where there are
    469 #. 360 in a full circle.
     468#. TRANSLATORS: %.f%s will be replaced with a right angle in the
     469#. units currently in use, e.g. "90°" or "100ᵍ".  And "absolute
     470#. value" means the reading ignoring the sign (so it might be
     471#. < -90° or > 90°.
    470472#: ../src/datain.c:969
    471473#: ../src/datain.c:977
    472474#: ../src/datain.c:989
    473475#: n:51
    474 msgid "Clino reading over 90 degrees (absolute value)"
    475 msgstr "Inclinação maior que 90 graus em valor absoluto"
     476#, c-format
     477msgid "Clino reading over %.f%s (absolute value)"
     478msgstr "Inclinação maior que %.f%s em valor absoluto"
    476479
    477480#: ../src/netbits.c:464
     
    758761msgstr "Futuros usos deste recurso desaconselhado não serão reportados"
    759762
    760 #. TRANSLATORS: Degrees are the angular measurement where there are
    761 #. 360 in a full circle.
     763#. TRANSLATORS: %s is replaced by the amount the readings disagree
     764#. by, e.g. "2.5°" or "3ᵍ".
    762765#: ../src/datain.c:906
    763766#: n:98
    764767#, c-format
    765 msgid "COMPASS reading and BACKCOMPASS reading disagree by %s degrees"
    766 msgstr "Ângulos de COMPASS e BACKCOMPASS diferem em %s graus"
    767 
    768 #. TRANSLATORS: Degrees are the angular measurement where
    769 #. there are 360 in a full circle.
     768msgid "COMPASS reading and BACKCOMPASS reading disagree by %s"
     769msgstr "Ângulos de COMPASS e BACKCOMPASS diferem em %s"
     770
     771#. TRANSLATORS: %s is replaced by the amount the readings disagree
     772#. by, e.g. "2.5°" or "3ᵍ".
    770773#: ../src/datain.c:1082
    771774#: n:99
    772775#, c-format
    773 msgid "CLINO reading and BACKCLINO reading disagree by %s degrees"
    774 msgstr "Ângulos de CLINO e BACKCLINO diferem em %s graus"
     776msgid "CLINO reading and BACKCLINO reading disagree by %s"
     777msgstr "Ângulos de CLINO e BACKCLINO diferem em %s"
    775778
    776779#: ../src/commands.c:1157
     
    972975#: n:132
    973976#, c-format
    974 msgid "Total length of survey legs = %7.2fm (%7.2fm adjusted)"
    975 msgstr "Desenvolvimento linear das visadas = %7.2fm (%7.2fm corrigidos)"
     977msgid "Total length of survey legs = %7.2f%s (%7.2f%s adjusted)"
     978msgstr "Desenvolvimento linear das visadas = %7.2f%s (%7.2f%s corrigidos)"
    976979
    977980#: ../src/cavern.c:452
    978981#: n:133
    979982#, c-format
    980 msgid "Total plan length of survey legs = %7.2fm"
    981 msgstr "Desenvolvimento horizontal das visadas = %7.2fm"
     983msgid "Total plan length of survey legs = %7.2f%s"
     984msgstr "Desenvolvimento horizontal das visadas = %7.2f%s"
    982985
    983986#: ../src/cavern.c:455
    984987#: n:134
    985988#, c-format
    986 msgid "Total vertical length of survey legs = %7.2fm"
    987 msgstr "Desenvolvimento vertical das visadas = %7.2fm"
     989msgid "Total vertical length of survey legs = %7.2f%s"
     990msgstr "Desenvolvimento vertical das visadas = %7.2f%s"
    988991
    989992#. TRANSLATORS: numbers are altitudes of highest and lowest stations
     
    991994#: n:135
    992995#, c-format
    993 msgid "Vertical range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
    994 msgstr "Desnível = %4.2fm (de %s a %4.2fm a %s a %4.2fm)"
     996msgid "Vertical range = %4.2f%s (from %s at %4.2f%s to %s at %4.2f%s)"
     997msgstr "Desnível = %4.2f%s (de %s a %4.2f%s a %s a %4.2f%s)"
    995998
    996999#. TRANSLATORS: c.f. previous message
     
    9981001#: n:136
    9991002#, c-format
    1000 msgid "North-South range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
    1001 msgstr "Extensão Norte-Sul = %4.2fm (de %s a %4.2fm a %s a %4.2fm)"
     1003msgid "North-South range = %4.2f%s (from %s at %4.2f%s to %s at %4.2f%s)"
     1004msgstr "Extensão Norte-Sul = %4.2f%s (de %s a %4.2f%s a %s a %4.2f%s)"
    10021005
    10031006#. TRANSLATORS: c.f. previous two messages
     
    10051008#: n:137
    10061009#, c-format
    1007 msgid "East-West range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
    1008 msgstr "Extensão Leste-Oeste = %4.2fm (de %s a %4.2fm a %s a %4.2fm)"
     1010msgid "East-West range = %4.2f%s (from %s at %4.2f%s to %s at %4.2f%s)"
     1011msgstr "Extensão Leste-Oeste = %4.2f%s (de %s a %4.2f%s a %s a %4.2f%s)"
    10091012
    10101013#: ../src/cavern.c:434
  • lib/ro.po

    rd5427e7 r85c0078  
    466466msgstr "Masuratoare cu acelasi punct (“%s”) la ambele capete - eroare de transcriere?"
    467467
    468 #. TRANSLATORS: Degrees are the angular measurement where there are
    469 #. 360 in a full circle.
     468#. TRANSLATORS: %.f%s will be replaced with a right angle in the
     469#. units currently in use, e.g. "90°" or "100ᵍ".  And "absolute
     470#. value" means the reading ignoring the sign (so it might be
     471#. < -90° or > 90°.
    470472#: ../src/datain.c:969
    471473#: ../src/datain.c:977
    472474#: ../src/datain.c:989
    473475#: n:51
    474 msgid "Clino reading over 90 degrees (absolute value)"
    475 msgstr "Valoare a clinometrului peste 90 grade (valoare absoluta)"
     476#, c-format
     477msgid "Clino reading over %.f%s (absolute value)"
     478msgstr "Valoare a clinometrului peste %.f%s (valoare absoluta)"
    476479
    477480#: ../src/netbits.c:464
     
    758761msgstr "Folosirea ulterioara a acestei facilitate dezaprobată nu va fi semnalata"
    759762
    760 #. TRANSLATORS: Degrees are the angular measurement where there are
    761 #. 360 in a full circle.
     763#. TRANSLATORS: %s is replaced by the amount the readings disagree
     764#. by, e.g. "2.5°" or "3ᵍ".
    762765#: ../src/datain.c:906
    763766#: n:98
    764767#, c-format
    765 msgid "COMPASS reading and BACKCOMPASS reading disagree by %s degrees"
    766 msgstr "Lectura COMPASS si BACKCOMPASS nu concorda cu %s grade"
    767 
    768 #. TRANSLATORS: Degrees are the angular measurement where
    769 #. there are 360 in a full circle.
     768msgid "COMPASS reading and BACKCOMPASS reading disagree by %s"
     769msgstr "Lectura COMPASS si BACKCOMPASS nu concorda cu %s"
     770
     771#. TRANSLATORS: %s is replaced by the amount the readings disagree
     772#. by, e.g. "2.5°" or "3ᵍ".
    770773#: ../src/datain.c:1082
    771774#: n:99
    772775#, c-format
    773 msgid "CLINO reading and BACKCLINO reading disagree by %s degrees"
    774 msgstr "Lectura CLINO si BACKCLINO nu concorda cu %s grade"
     776msgid "CLINO reading and BACKCLINO reading disagree by %s"
     777msgstr "Lectura CLINO si BACKCLINO nu concorda cu %s"
    775778
    776779#: ../src/commands.c:1157
     
    972975#: n:132
    973976#, c-format
    974 msgid "Total length of survey legs = %7.2fm (%7.2fm adjusted)"
    975 msgstr "Lungimea totala a masuratorilor topografiei = %7.2fm (%7.2fm ajustat)"
     977msgid "Total length of survey legs = %7.2f%s (%7.2f%s adjusted)"
     978msgstr "Lungimea totala a masuratorilor topografiei = %7.2f%s (%7.2f%s ajustat)"
    976979
    977980#: ../src/cavern.c:452
    978981#: n:133
    979982#, c-format
    980 msgid "Total plan length of survey legs = %7.2fm"
    981 msgstr "Lungimea totala in plan a masuratorilor topografiei = %7.2fm"
     983msgid "Total plan length of survey legs = %7.2f%s"
     984msgstr "Lungimea totala in plan a masuratorilor topografiei = %7.2f%s"
    982985
    983986#: ../src/cavern.c:455
    984987#: n:134
    985988#, c-format
    986 msgid "Total vertical length of survey legs = %7.2fm"
    987 msgstr "Lungimea totala verticala a masuratorilor topografiei = %7.2fm"
     989msgid "Total vertical length of survey legs = %7.2f%s"
     990msgstr "Lungimea totala verticala a masuratorilor topografiei = %7.2f%s"
    988991
    989992#. TRANSLATORS: numbers are altitudes of highest and lowest stations
     
    991994#: n:135
    992995#, c-format
    993 msgid "Vertical range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
    994 msgstr "Interval vertical = %4.2fm (de la %s la %4.2fm de la %s la %4.2fm)"
     996msgid "Vertical range = %4.2f%s (from %s at %4.2f%s to %s at %4.2f%s)"
     997msgstr "Interval vertical = %4.2f%s (de la %s la %4.2f%s de la %s la %4.2f%s)"
    995998
    996999#. TRANSLATORS: c.f. previous message
     
    9981001#: n:136
    9991002#, c-format
    1000 msgid "North-South range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
    1001 msgstr "Extindere Nord-Sud = %4.2fm (de la %s la %4.2fm de la %s la %4.2fm)"
     1003msgid "North-South range = %4.2f%s (from %s at %4.2f%s to %s at %4.2f%s)"
     1004msgstr "Extindere Nord-Sud = %4.2f%s (de la %s la %4.2f%s de la %s la %4.2f%s)"
    10021005
    10031006#. TRANSLATORS: c.f. previous two messages
     
    10051008#: n:137
    10061009#, c-format
    1007 msgid "East-West range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
    1008 msgstr "Extindere Est-Vest = %4.2fm (de la %s la %4.2fm de la %s la %4.2fm)"
     1010msgid "East-West range = %4.2f%s (from %s at %4.2f%s to %s at %4.2f%s)"
     1011msgstr "Extindere Est-Vest = %4.2f%s (de la %s la %4.2f%s de la %s la %4.2f%s)"
    10091012
    10101013#: ../src/cavern.c:434
  • lib/ru.po

    rd5427e7 r85c0078  
    465465msgstr "Замер с одинаковым именем пикета (“%s”) на обоих концах замера - опечатка?"
    466466
    467 #. TRANSLATORS: Degrees are the angular measurement where there are
    468 #. 360 in a full circle.
     467#. TRANSLATORS: %.f%s will be replaced with a right angle in the
     468#. units currently in use, e.g. "90°" or "100ᵍ".  And "absolute
     469#. value" means the reading ignoring the sign (so it might be
     470#. < -90° or > 90°.
    469471#: ../src/datain.c:969
    470472#: ../src/datain.c:977
    471473#: ../src/datain.c:989
    472474#: n:51
    473 msgid "Clino reading over 90 degrees (absolute value)"
     475#, c-format
     476msgid "Clino reading over %.f%s (absolute value)"
    474477msgstr ""
    475478
     
    758761msgstr ""
    759762
    760 #. TRANSLATORS: Degrees are the angular measurement where there are
    761 #. 360 in a full circle.
     763#. TRANSLATORS: %s is replaced by the amount the readings disagree
     764#. by, e.g. "2.5°" or "3ᵍ".
    762765#: ../src/datain.c:906
    763766#: n:98
    764767#, c-format
    765 msgid "COMPASS reading and BACKCOMPASS reading disagree by %s degrees"
    766 msgstr ""
    767 
    768 #. TRANSLATORS: Degrees are the angular measurement where
    769 #. there are 360 in a full circle.
     768msgid "COMPASS reading and BACKCOMPASS reading disagree by %s"
     769msgstr ""
     770
     771#. TRANSLATORS: %s is replaced by the amount the readings disagree
     772#. by, e.g. "2.5°" or "3ᵍ".
    770773#: ../src/datain.c:1082
    771774#: n:99
    772775#, c-format
    773 msgid "CLINO reading and BACKCLINO reading disagree by %s degrees"
     776msgid "CLINO reading and BACKCLINO reading disagree by %s"
    774777msgstr ""
    775778
     
    972975#: n:132
    973976#, c-format
    974 msgid "Total length of survey legs = %7.2fm (%7.2fm adjusted)"
     977msgid "Total length of survey legs = %7.2f%s (%7.2f%s adjusted)"
    975978msgstr ""
    976979
     
    978981#: n:133
    979982#, c-format
    980 msgid "Total plan length of survey legs = %7.2fm"
     983msgid "Total plan length of survey legs = %7.2f%s"
    981984msgstr ""
    982985
     
    984987#: n:134
    985988#, c-format
    986 msgid "Total vertical length of survey legs = %7.2fm"
     989msgid "Total vertical length of survey legs = %7.2f%s"
    987990msgstr ""
    988991
     
    991994#: n:135
    992995#, c-format
    993 msgid "Vertical range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
     996msgid "Vertical range = %4.2f%s (from %s at %4.2f%s to %s at %4.2f%s)"
    994997msgstr ""
    995998
     
    9981001#: n:136
    9991002#, c-format
    1000 msgid "North-South range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
     1003msgid "North-South range = %4.2f%s (from %s at %4.2f%s to %s at %4.2f%s)"
    10011004msgstr ""
    10021005
     
    10051008#: n:137
    10061009#, c-format
    1007 msgid "East-West range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
     1010msgid "East-West range = %4.2f%s (from %s at %4.2f%s to %s at %4.2f%s)"
    10081011msgstr ""
    10091012
  • lib/sk.po

    rd5427e7 r85c0078  
    466466msgstr "Zámera s tým istým bodom (“%s”) na oboch koncoch - preklep?"
    467467
    468 #. TRANSLATORS: Degrees are the angular measurement where there are
    469 #. 360 in a full circle.
     468#. TRANSLATORS: %.f%s will be replaced with a right angle in the
     469#. units currently in use, e.g. "90°" or "100ᵍ".  And "absolute
     470#. value" means the reading ignoring the sign (so it might be
     471#. < -90° or > 90°.
    470472#: ../src/datain.c:969
    471473#: ../src/datain.c:977
    472474#: ../src/datain.c:989
    473475#: n:51
    474 msgid "Clino reading over 90 degrees (absolute value)"
    475 msgstr "Absolútna hodnota sklonu väčšia ako 90 stupňov"
     476#, c-format
     477msgid "Clino reading over %.f%s (absolute value)"
     478msgstr "Absolútna hodnota sklonu väčšia ako %.f%s"
    476479
    477480#: ../src/netbits.c:464
     
    758761msgstr "Ďalšie použitia zamietnutej fukcie nebudú zaznamenané"
    759762
    760 #. TRANSLATORS: Degrees are the angular measurement where there are
    761 #. 360 in a full circle.
     763#. TRANSLATORS: %s is replaced by the amount the readings disagree
     764#. by, e.g. "2.5°" or "3ᵍ".
    762765#: ../src/datain.c:906
    763766#: n:98
    764767#, c-format
    765 msgid "COMPASS reading and BACKCOMPASS reading disagree by %s degrees"
    766 msgstr "Hodnoty COMPASS a BACKCOMPASS sa líši o %s stupňov"
    767 
    768 #. TRANSLATORS: Degrees are the angular measurement where
    769 #. there are 360 in a full circle.
     768msgid "COMPASS reading and BACKCOMPASS reading disagree by %s"
     769msgstr "Hodnoty COMPASS a BACKCOMPASS sa líši o %s"
     770
     771#. TRANSLATORS: %s is replaced by the amount the readings disagree
     772#. by, e.g. "2.5°" or "3ᵍ".
    770773#: ../src/datain.c:1082
    771774#: n:99
    772775#, c-format
    773 msgid "CLINO reading and BACKCLINO reading disagree by %s degrees"
    774 msgstr "Hodnoty CLINO a BACKCLINO sa líši o %s stupňov"
     776msgid "CLINO reading and BACKCLINO reading disagree by %s"
     777msgstr "Hodnoty CLINO a BACKCLINO sa líši o %s"
    775778
    776779#: ../src/commands.c:1157
     
    972975#: n:132
    973976#, c-format
    974 msgid "Total length of survey legs = %7.2fm (%7.2fm adjusted)"
    975 msgstr "Celková dļžka zámer = %7.2fm (%7.2fm nastavené)"
     977msgid "Total length of survey legs = %7.2f%s (%7.2f%s adjusted)"
     978msgstr "Celková dļžka zámer = %7.2f%s (%7.2f%s nastavené)"
    976979
    977980#: ../src/cavern.c:452
    978981#: n:133
    979982#, c-format
    980 msgid "Total plan length of survey legs = %7.2fm"
    981 msgstr "Celková pôdorysná dļžka zámer %7.2fm"
     983msgid "Total plan length of survey legs = %7.2f%s"
     984msgstr "Celková pôdorysná dļžka zámer %7.2f%s"
    982985
    983986#: ../src/cavern.c:455
    984987#: n:134
    985988#, c-format
    986 msgid "Total vertical length of survey legs = %7.2fm"
    987 msgstr "Celková vertikálna dļžka zámer %7.2fm"
     989msgid "Total vertical length of survey legs = %7.2f%s"
     990msgstr "Celková vertikálna dļžka zámer %7.2f%s"
    988991
    989992#. TRANSLATORS: numbers are altitudes of highest and lowest stations
     
    991994#: n:135
    992995#, c-format
    993 msgid "Vertical range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
    994 msgstr "Vertikálny rozsah = %4.2fm (od %s v %4.2fm do %s v %4.2fm)"
     996msgid "Vertical range = %4.2f%s (from %s at %4.2f%s to %s at %4.2f%s)"
     997msgstr "Vertikálny rozsah = %4.2f%s (od %s v %4.2f%s do %s v %4.2f%s)"
    995998
    996999#. TRANSLATORS: c.f. previous message
     
    9981001#: n:136
    9991002#, c-format
    1000 msgid "North-South range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
    1001 msgstr "Rozsah sever-juh = %4.2fm (od %s od %4.2fm do %s do %4.2fm)"
     1003msgid "North-South range = %4.2f%s (from %s at %4.2f%s to %s at %4.2f%s)"
     1004msgstr "Rozsah sever-juh = %4.2f%s (od %s od %4.2f%s do %s do %4.2f%s)"
    10021005
    10031006#. TRANSLATORS: c.f. previous two messages
     
    10051008#: n:137
    10061009#, c-format
    1007 msgid "East-West range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
    1008 msgstr "Rozsah východ-západ = %4.2fm (od %s od %4.2fm do %s do %4.2fm)"
     1010msgid "East-West range = %4.2f%s (from %s at %4.2f%s to %s at %4.2f%s)"
     1011msgstr "Rozsah východ-západ = %4.2f%s (od %s od %4.2f%s do %s do %4.2f%s)"
    10091012
    10101013#: ../src/cavern.c:434
  • lib/survex.pot

    rd5427e7 r85c0078  
    467467msgstr ""
    468468
    469 #. TRANSLATORS: Degrees are the angular measurement where there are
    470 #. 360 in a full circle.
     469#. TRANSLATORS: %.f%s will be replaced with a right angle in the
     470#. units currently in use, e.g. "90°" or "100ᵍ".  And "absolute
     471#. value" means the reading ignoring the sign (so it might be
     472#. < -90° or > 90°.
    471473#: ../src/datain.c:969
    472474#: ../src/datain.c:977
    473475#: ../src/datain.c:989
    474476#: n:51
    475 msgid "Clino reading over 90 degrees (absolute value)"
     477#, c-format
     478msgid "Clino reading over %.f%s (absolute value)"
    476479msgstr ""
    477480
     
    759762msgstr ""
    760763
    761 #. TRANSLATORS: Degrees are the angular measurement where there are
    762 #. 360 in a full circle.
     764#. TRANSLATORS: %s is replaced by the amount the readings disagree
     765#. by, e.g. "2.5°" or "3ᵍ".
    763766#: ../src/datain.c:906
    764767#: n:98
    765768#, c-format
    766 msgid "COMPASS reading and BACKCOMPASS reading disagree by %s degrees"
    767 msgstr ""
    768 
    769 #. TRANSLATORS: Degrees are the angular measurement where
    770 #. there are 360 in a full circle.
     769msgid "COMPASS reading and BACKCOMPASS reading disagree by %s"
     770msgstr ""
     771
     772#. TRANSLATORS: %s is replaced by the amount the readings disagree
     773#. by, e.g. "2.5°" or "3ᵍ".
    771774#: ../src/datain.c:1082
    772775#: n:99
    773776#, c-format
    774 msgid "CLINO reading and BACKCLINO reading disagree by %s degrees"
     777msgid "CLINO reading and BACKCLINO reading disagree by %s"
    775778msgstr ""
    776779
     
    973976#: n:132
    974977#, c-format
    975 msgid "Total length of survey legs = %7.2fm (%7.2fm adjusted)"
     978msgid "Total length of survey legs = %7.2f%s (%7.2f%s adjusted)"
    976979msgstr ""
    977980
     
    979982#: n:133
    980983#, c-format
    981 msgid "Total plan length of survey legs = %7.2fm"
     984msgid "Total plan length of survey legs = %7.2f%s"
    982985msgstr ""
    983986
     
    985988#: n:134
    986989#, c-format
    987 msgid "Total vertical length of survey legs = %7.2fm"
     990msgid "Total vertical length of survey legs = %7.2f%s"
    988991msgstr ""
    989992
     
    992995#: n:135
    993996#, c-format
    994 msgid "Vertical range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
     997msgid "Vertical range = %4.2f%s (from %s at %4.2f%s to %s at %4.2f%s)"
    995998msgstr ""
    996999
     
    9991002#: n:136
    10001003#, c-format
    1001 msgid "North-South range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
     1004msgid "North-South range = %4.2f%s (from %s at %4.2f%s to %s at %4.2f%s)"
    10021005msgstr ""
    10031006
     
    10061009#: n:137
    10071010#, c-format
    1008 msgid "East-West range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
     1011msgid "East-West range = %4.2f%s (from %s at %4.2f%s to %s at %4.2f%s)"
    10091012msgstr ""
    10101013
  • lib/zh_CN.po

    rd5427e7 r85c0078  
    465465msgstr ""
    466466
    467 #. TRANSLATORS: Degrees are the angular measurement where there are
    468 #. 360 in a full circle.
     467#. TRANSLATORS: %.f%s will be replaced with a right angle in the
     468#. units currently in use, e.g. "90°" or "100ᵍ".  And "absolute
     469#. value" means the reading ignoring the sign (so it might be
     470#. < -90° or > 90°.
    469471#: ../src/datain.c:969
    470472#: ../src/datain.c:977
    471473#: ../src/datain.c:989
    472474#: n:51
    473 msgid "Clino reading over 90 degrees (absolute value)"
     475#, c-format
     476msgid "Clino reading over %.f%s (absolute value)"
    474477msgstr ""
    475478
     
    757760msgstr ""
    758761
    759 #. TRANSLATORS: Degrees are the angular measurement where there are
    760 #. 360 in a full circle.
     762#. TRANSLATORS: %s is replaced by the amount the readings disagree
     763#. by, e.g. "2.5°" or "3ᵍ".
    761764#: ../src/datain.c:906
    762765#: n:98
    763766#, c-format
    764 msgid "COMPASS reading and BACKCOMPASS reading disagree by %s degrees"
    765 msgstr ""
    766 
    767 #. TRANSLATORS: Degrees are the angular measurement where
    768 #. there are 360 in a full circle.
     767msgid "COMPASS reading and BACKCOMPASS reading disagree by %s"
     768msgstr ""
     769
     770#. TRANSLATORS: %s is replaced by the amount the readings disagree
     771#. by, e.g. "2.5°" or "3ᵍ".
    769772#: ../src/datain.c:1082
    770773#: n:99
    771774#, c-format
    772 msgid "CLINO reading and BACKCLINO reading disagree by %s degrees"
     775msgid "CLINO reading and BACKCLINO reading disagree by %s"
    773776msgstr ""
    774777
     
    971974#: n:132
    972975#, c-format
    973 msgid "Total length of survey legs = %7.2fm (%7.2fm adjusted)"
     976msgid "Total length of survey legs = %7.2f%s (%7.2f%s adjusted)"
    974977msgstr ""
    975978
     
    977980#: n:133
    978981#, c-format
    979 msgid "Total plan length of survey legs = %7.2fm"
     982msgid "Total plan length of survey legs = %7.2f%s"
    980983msgstr ""
    981984
     
    983986#: n:134
    984987#, c-format
    985 msgid "Total vertical length of survey legs = %7.2fm"
     988msgid "Total vertical length of survey legs = %7.2f%s"
    986989msgstr ""
    987990
     
    990993#: n:135
    991994#, c-format
    992 msgid "Vertical range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
     995msgid "Vertical range = %4.2f%s (from %s at %4.2f%s to %s at %4.2f%s)"
    993996msgstr ""
    994997
     
    9971000#: n:136
    9981001#, c-format
    999 msgid "North-South range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
     1002msgid "North-South range = %4.2f%s (from %s at %4.2f%s to %s at %4.2f%s)"
    10001003msgstr ""
    10011004
     
    10041007#: n:137
    10051008#, c-format
    1006 msgid "East-West range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
     1009msgid "East-West range = %4.2f%s (from %s at %4.2f%s to %s at %4.2f%s)"
    10071010msgstr ""
    10081011
  • src/cavern.c

    rd5427e7 r85c0078  
    11/* cavern.c
    22 * SURVEX Cave surveying software: data reduction main and related functions
    3  * Copyright (C) 1991-2003,2004,2005,2010,2011,2013,2014 Olly Betts
     3 * Copyright (C) 1991-2003,2004,2005,2010,2011,2013,2014,2015 Olly Betts
    44 *
    55 * This program is free software; you can redistribute it and/or modify
     
    398398
    399399static void
    400 do_range(int d, int msgno)
     400do_range(int d, int msgno, real length_factor, const char * units)
    401401{
    402402   /* sprint_prefix uses a single buffer, so to report two stations in one
     
    405405   char * pfx_hi = osstrdup(sprint_prefix(pfxHi[d]));
    406406   char * pfx_lo = sprint_prefix(pfxLo[d]);
    407    printf(msg(msgno), max[d] - min[d], pfx_hi, max[d], pfx_lo, min[d]);
     407   real hi = max[d] * length_factor;
     408   real lo = min[d] * length_factor;
     409   printf(msg(msgno), hi - lo, units, pfx_hi, hi, units, pfx_lo, lo, units);
    408410   osfree(pfx_hi);
    409411   putnl();
     
    414416{
    415417   long cLoops = cComponents + cLegs - cStns;
     418   int length_units = get_length_units(Q_LENGTH);
     419   const char * units = get_units_string(length_units);
     420   real length_factor = 1.0 / get_units_factor(length_units);
    416421
    417422   putnl();
     
    447452   }
    448453
    449    printf(msg(/*Total length of survey legs = %7.2fm (%7.2fm adjusted)*/132),
    450           total, totadj);
    451    putnl();
    452    printf(msg(/*Total plan length of survey legs = %7.2fm*/133),
    453           totplan);
    454    putnl();
    455    printf(msg(/*Total vertical length of survey legs = %7.2fm*/134),
    456           totvert);
     454   printf(msg(/*Total length of survey legs = %7.2f%s (%7.2f%s adjusted)*/132),
     455          total * length_factor, units, totadj * length_factor, units);
     456   putnl();
     457   printf(msg(/*Total plan length of survey legs = %7.2f%s*/133),
     458          totplan * length_factor, units);
     459   putnl();
     460   printf(msg(/*Total vertical length of survey legs = %7.2f%s*/134),
     461          totvert * length_factor, units);
    457462   putnl();
    458463
     
    460465   if (pfxHi[0]) {
    461466      /* TRANSLATORS: numbers are altitudes of highest and lowest stations */
    462       do_range(2, /*Vertical range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)*/135);
     467      do_range(2, /*Vertical range = %4.2f%s (from %s at %4.2f%s to %s at %4.2f%s)*/135,
     468               length_factor, units);
    463469      /* TRANSLATORS: c.f. previous message */
    464       do_range(1, /*North-South range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)*/136);
     470      do_range(1, /*North-South range = %4.2f%s (from %s at %4.2f%s to %s at %4.2f%s)*/136,
     471               length_factor, units);
    465472      /* TRANSLATORS: c.f. previous two messages */
    466       do_range(0, /*East-West range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)*/137);
     473      do_range(0, /*East-West range = %4.2f%s (from %s at %4.2f%s to %s at %4.2f%s)*/137,
     474               length_factor, units);
    467475   }
    468476
  • src/commands.c

    rd5427e7 r85c0078  
    297297
    298298/* ordering must be the same as the units enum */
    299 static const real factor_tab[] = {
     299const real factor_tab[] = {
    300300   1.0, METRES_PER_FOOT, (METRES_PER_FOOT*3.0),
    301301   (M_PI/180.0), (M_PI/200.0), 0.01, (M_PI/180.0/60.0)
    302302};
     303
     304const int units_to_msgno[] = {
     305    /*m*/424,
     306    /*ft*/428,
     307    -1, /* yards */
     308    /*°*/344,
     309    /*ᵍ*/76,
     310    /*%*/96,
     311    -1 /* minutes */
     312};
     313
     314int get_length_units(int quantity) {
     315    double factor = pcs->units[quantity];
     316    if (fabs(factor - METRES_PER_FOOT) <= REAL_EPSILON ||
     317        fabs(factor - METRES_PER_FOOT * 3.0) <= REAL_EPSILON) {
     318        return UNITS_FEET;
     319    }
     320    return UNITS_METRES;
     321}
     322
     323int get_angle_units(int quantity) {
     324    double factor = pcs->units[quantity];
     325    if (fabs(factor - M_PI / 200.0) <= REAL_EPSILON) {
     326        return UNITS_GRADS;
     327    }
     328    return UNITS_DEGS;
     329}
    303330
    304331static int
  • src/commands.h

    rd5427e7 r85c0078  
    11/* commands.h
    22 * Header file for code for directives
    3  * Copyright (C) 1994-2003,2014 Olly Betts
     3 * Copyright (C) 1994-2003,2014,2015 Olly Betts
    44 *
    55 * This program is free software; you can redistribute it and/or modify
     
    1717 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
    1818 */
     19
     20int get_length_units(int quantity);
     21int get_angle_units(int quantity);
     22
     23extern const real factor_tab[];
     24extern const int units_to_msgno[];
     25
     26#define get_units_factor(U) (factor_tab[(U)])
     27#define get_units_string(U) (msg(units_to_msgno[(U)]))
    1928
    2029void handle_command(void);
  • src/datain.c

    rd5427e7 r85c0078  
    839839
    840840static void
    841 warn_readings_differ(int msgno, real diff)
     841warn_readings_differ(int msgno, real diff, int units)
    842842{
    843843   char buf[64];
    844844   char *p;
    845    sprintf(buf, "%.2f", deg(fabs(diff)));
    846    p = strchr(buf, '.');
    847    if (p) {
    848       char *z = p;
    849       while (*++p) {
    850          if (*p != '0') z = p + 1;
    851       }
    852       *z = '\0';
    853    }
     845   diff /= get_units_factor(units);
     846   sprintf(buf, "%.2f", fabs(diff));
     847   for (p = buf; *p; ++p) {
     848      if (*p == '.') {
     849         char *z = p;
     850         while (*++p) {
     851            if (*p != '0') z = p + 1;
     852         }
     853         p = z;
     854         break;
     855      }
     856   }
     857   strcpy(p, get_units_string(units));
    854858   compile_warning(msgno, buf);
    855859}
     
    902906         if (sqrd(diff / 3.0) > compvar + VAR(Q_BACKBEARING)) {
    903907            /* fore and back readings differ by more than 3 sds */
    904             /* TRANSLATORS: Degrees are the angular measurement where there are
    905              * 360 in a full circle. */
    906             warn_readings_differ(/*COMPASS reading and BACKCOMPASS reading disagree by %s degrees*/98, diff);
     908            /* TRANSLATORS: %s is replaced by the amount the readings disagree
     909             * by, e.g. "2.5°" or "3ᵍ". */
     910            warn_readings_differ(/*COMPASS reading and BACKCOMPASS reading disagree by %s*/98,
     911                                 diff, get_angle_units(Q_BEARING));
    907912         }
    908913         comp = (comp / compvar + backcomp / VAR(BackComp));
     
    964969      diff_from_abs90 = fabs(clin) - M_PI_2;
    965970      if (diff_from_abs90 > EPSILON) {
    966          if (!range_0_180)
    967             /* TRANSLATORS: Degrees are the angular measurement where there are
    968              * 360 in a full circle. */
    969             compile_warning(/*Clino reading over 90 degrees (absolute value)*/51);
     971         if (!range_0_180) {
     972            int clino_units = get_angle_units(Q_GRADIENT);
     973            const char * units = get_units_string(clino_units);
     974            real right_angle = M_PI_2 / get_units_factor(clino_units);
     975            /* TRANSLATORS: %.f%s will be replaced with a right angle in the
     976             * units currently in use, e.g. "90°" or "100ᵍ".  And "absolute
     977             * value" means the reading ignoring the sign (so it might be
     978             * < -90° or > 90°. */
     979            compile_warning(/*Clino reading over %.f%s (absolute value)*/51,
     980                            right_angle, units);
     981         }
    970982      } else if (TSTBIT(pcs->infer, INFER_PLUMBS) &&
    971983                 diff_from_abs90 >= -EPSILON) {
     
    974986      if (range_0_180 && ctype != CTYPE_INFERPLUMB) {
    975987         /* FIXME: Warning message not ideal... */
    976          if (clin < 0.0 || clin - M_PI > EPSILON)
    977             compile_warning(/*Clino reading over 90 degrees (absolute value)*/51);
     988         if (clin < 0.0 || clin - M_PI > EPSILON) {
     989            int clino_units = get_angle_units(Q_GRADIENT);
     990            const char * units = get_units_string(clino_units);
     991            real right_angle = M_PI_2 / get_units_factor(clino_units);
     992            compile_warning(/*Clino reading over %.f%s (absolute value)*/51,
     993                            right_angle, units);
     994         }
    978995      }
    979996   }
     
    9871004         if (diff_from_abs90 > EPSILON) {
    9881005            /* FIXME: different message for BackClino? */
    989             compile_warning(/*Clino reading over 90 degrees (absolute value)*/51);
     1006            int clino_units = get_angle_units(Q_BACKGRADIENT);
     1007            const char * units = get_units_string(clino_units);
     1008            real right_angle = M_PI_2 / get_units_factor(clino_units);
     1009            compile_warning(/*Clino reading over %.f%s degrees (absolute value)*/51,
     1010                            right_angle, units);
    9901011         } else if (TSTBIT(pcs->infer, INFER_PLUMBS) &&
    9911012                    diff_from_abs90 >= -EPSILON) {
     
    10781099               if (sqrd((clin + backclin) / 3.0) > var_clin + VAR(BackClino)) {
    10791100                  /* fore and back readings differ by more than 3 sds */
    1080                   /* TRANSLATORS: Degrees are the angular measurement where
    1081                    * there are 360 in a full circle. */
    1082                   warn_readings_differ(/*CLINO reading and BACKCLINO reading disagree by %s degrees*/99, clin + backclin);
     1101                  /* TRANSLATORS: %s is replaced by the amount the readings disagree
     1102                   * by, e.g. "2.5°" or "3ᵍ". */
     1103                  warn_readings_differ(/*CLINO reading and BACKCLINO reading disagree by %s*/99,
     1104                                       clin + backclin, get_angle_units(Q_GRADIENT));
    10831105               }
    10841106               clin = (clin / var_clin - backclin / VAR(BackClino));
  • tests/Makefile.am

    rd5427e7 r85c0078  
    3939includecomment.svx reenterwarn.svx\
    4040angleunits.svx angleunits.pos\
    41 lengthunits.svx lengthunits.pos\
     41lengthunits.svx lengthunits.out lengthunits.pos\
    4242cmd_alias.svx cmd_alias.out cmd_alias.pos\
    4343cmd_default.svx cmd_prefix.svx cmd_truncate.svx cmd_truncate.pos\
     
    7878extend2names.svx extend2namesx.3d\
    7979omitclino.svx omitclino.pos\
    80 back.svx back.pos\
    81 back2.svx back2.pos\
     80back.svx back.out back.pos\
     81back2.svx back2.out back2.pos\
    8282notentranceorexport.svx inferunknown.svx inferexports.svx\
    8383bad_units_factor.svx bad_units_factor.out\
  • tests/back.svx

    rd5427e7 r85c0078  
    1 ; pos=yes warn=0
     1; pos=yes warn=2
    22*data normal from to tape compass clino backcompass backclino
    33*fix 1 0 0 0
     
    12121 E 1.0 000 -30 180  -
    1313*data normal from to tape compass backcompass clino backclino
    14 1 X 10 000.5 179.5  00  -
    15 1 Y 10 000  -   01  01
    16 1 Z 10 000  -  -01 -01
     14*units compass backcompass clino backclino grads
     151 X 10 000.5 199.5  00  -
     161 Y 10 000  -   02  02
     171 Z 10 000  -  -01.25 -01.25
  • tests/badunits.out

    rd5427e7 r85c0078  
    2828Survey contains 1 survey station, joined by 0 legs.
    2929There are 0 loops.
    30 Total length of survey legs =    0.00m (   0.00m adjusted)
    31 Total plan length of survey legs =    0.00m
    32 Total vertical length of survey legs =    0.00m
     30Total length of survey legs =    0.00ft (   0.00ft adjusted)
     31Total plan length of survey legs =    0.00ft
     32Total vertical length of survey legs =    0.00ft
    3333   1 0-node.
    3434There were 0 warning(s) and 12 error(s) - no output files produced.
  • tests/badunits.svx

    rd5427e7 r85c0078  
    1414*units DEFault Tape
    1515*units DEFault Tape Feet
     16*units tape feet
  • tests/calibrate_clino.out

    rd5427e7 r85c0078  
    1 ./calibrate_clino.svx:8: warning: Clino reading over 90 degrees (absolute value)
    2 ./calibrate_clino.svx:9: warning: Clino reading over 90 degrees (absolute value)
    3 ./calibrate_clino.svx:10: warning: Clino reading over 90 degrees (absolute value)
    4 ./calibrate_clino.svx:11: warning: Clino reading over 90 degrees (absolute value)
    5 ./calibrate_clino.svx:18: warning: Clino reading over 90 degrees (absolute value)
    6 ./calibrate_clino.svx:19: warning: Clino reading over 90 degrees (absolute value)
    7 ./calibrate_clino.svx:26: warning: Clino reading over 90 degrees (absolute value)
    8 ./calibrate_clino.svx:27: warning: Clino reading over 90 degrees (absolute value)
     1./calibrate_clino.svx:8: warning: Clino reading over 90dg (absolute value)
     2./calibrate_clino.svx:9: warning: Clino reading over 90dg (absolute value)
     3./calibrate_clino.svx:10: warning: Clino reading over 90dg (absolute value)
     4./calibrate_clino.svx:11: warning: Clino reading over 90dg (absolute value)
     5./calibrate_clino.svx:18: warning: Clino reading over 90dg (absolute value)
     6./calibrate_clino.svx:19: warning: Clino reading over 90dg (absolute value)
     7./calibrate_clino.svx:26: warning: Clino reading over 90dg (absolute value)
     8./calibrate_clino.svx:27: warning: Clino reading over 90dg (absolute value)
    99
    1010Removing trailing traverses...
  • tests/lengthunits.svx

    rd5427e7 r85c0078  
    99*end
    10103 4 10.00 0 00
    11 *units tape 3 feet
     11*units tape yards
    12124 5 10.00 0 00
Note: See TracChangeset for help on using the changeset viewer.