Changeset aecd032 in git


Ignore:
Timestamp:
20/09/11 06:41:05 (8 years ago)
Author:
Olly Betts <olly@…>
Branches:
add-show-splays, line_contents, master, stereo, svn/github/master, svn/origin/master, svn/tags/1.2.1, svn/tags/1.2.2, svn/tags/1.2.3, svn/tags/1.2.4, svn/tags/1.2.5, svn/trunk, travis-osx
Children:
36316cb
Parents:
7831cef
Message:

lib/,src/cavern.c: Fix reporting of ranges of survey coordinates,
which was broken by the message handling changes in 1.2.0.

git-svn-id: file:///home/survex-svn/survex/trunk@3670 4b37db11-9a0c-4f06-9ece-9ab7cdaee568

Files:
14 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    r7831cef raecd032  
     1Tue Sep 20 05:39:50 GMT 2011  Olly Betts <olly@survex.com>
     2
     3        * lib/,src/cavern.c: Fix reporting of ranges of survey coordinates,
     4          which was broken by the message handling changes in 1.2.0.
     5
    16Tue Sep 20 04:30:14 GMT 2011  Olly Betts <olly@survex.com>
    27
  • lib/ca.po

    r7831cef raecd032  
    745745
    746746#. TRANSLATORS: numbers are altitudes of highest and lowest stations
    747 #: ../src/cavern.c:437
    748 msgid "Vertical range = %4.2fm (from "
    749 msgstr "Desnivell total = %4.2fm (des de "
    750 
    751 #. TRANSLATORS: for many translations, 196/197 will be the same as 136/137
    752 #: ../src/cavern.c:438
    753 msgid " at %4.2fm to "
    754 msgstr " a %4.2fm a "
    755 
    756 #: ../src/cavern.c:438
    757 msgid " at %4.2fm)"
    758 msgstr " a %4.2fm)"
     747#: ../src/cavern.c:457
     748msgid "Vertical range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
     749msgstr "Desnivell total = %4.2fm (des de %s a %4.2fm a %s a %4.2fm)"
     750
     751#. TRANSLATORS: c.f. previous message
     752#: ../src/cavern.c:458
     753msgid "North-South range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
     754msgstr "Extensió Nord-Sud = %4.2fm (des de %s a %4.2fm a %s a %4.2fm)"
     755
     756#. TRANSLATORS: c.f. previous two messages
     757#: ../src/cavern.c:459
     758msgid "East-West range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
     759msgstr "Extensió Est-Oest = %4.2fm (des de %s a %4.2fm a %s a %4.2fm)"
    759760
    760761#: ../src/cavern.c:413
     
    802803msgid "Error    N/A"
    803804msgstr "Error    N/A"
    804 
    805 #: ../src/cavern.c:439
    806 msgid "North-South range = %4.2fm (from "
    807 msgstr "Extensió Nord-Sud = %4.2fm (des de "
    808 
    809 #: ../src/cavern.c:441
    810 msgid "East-West range = %4.2fm (from "
    811 msgstr "Extensió Est-Oest = %4.2fm (des de "
    812805
    813806#. TRANSLATORS: description of --help option
  • lib/codes.po

    r7831cef raecd032  
    754754
    755755#. TRANSLATORS: numbers are altitudes of highest and lowest stations
    756 #: ../src/cavern.c:438
    757 msgid "Vertical range = %4.2fm (from "
     756#: ../src/cavern.c:457
     757msgid "Vertical range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
    758758msgstr "135"
    759759
    760 #. TRANSLATORS: for many translations, 196/197 will be the same as 136/137
    761 #: ../src/cavern.c:439
    762 msgid " at %4.2fm to "
     760#. TRANSLATORS: c.f. previous message
     761#: ../src/cavern.c:458
     762msgid "North-South range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
    763763msgstr "136"
    764764
    765 #: ../src/cavern.c:439
    766 msgid " at %4.2fm)"
     765#. TRANSLATORS: c.f. previous two messages
     766#: ../src/cavern.c:459
     767msgid "East-West range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
    767768msgstr "137"
    768769
     
    812813msgstr "147"
    813814
    814 #: ../src/cavern.c:440
    815 msgid "North-South range = %4.2fm (from "
    816 msgstr "148"
    817 
    818 #: ../src/cavern.c:442
    819 msgid "East-West range = %4.2fm (from "
    820 msgstr "149"
     815#~ msgid "North-South range = %4.2fm (from "
     816#~ msgstr "148"
     817
     818#~ msgid "East-West range = %4.2fm (from "
     819#~ msgstr "149"
    821820
    822821#. TRANSLATORS: description of --help option
     
    10291028msgid "( Easting, Northing, Altitude )"
    10301029msgstr "195"
     1030
     1031#~ msgid "unused"
     1032#~ msgstr "196"
     1033
     1034#~ msgid "unused"
     1035#~ msgstr "197"
    10311036
    10321037#: ../src/readval.c:444
  • lib/de.po

    r7831cef raecd032  
    778778
    779779#. TRANSLATORS: numbers are altitudes of highest and lowest stations
    780 #: ../src/cavern.c:437
    781 msgid "Vertical range = %4.2fm (from "
    782 msgstr "Vertikale Erstreckung = %4.2fm (von "
    783 
    784 #. TRANSLATORS: for many translations, 196/197 will be the same as 136/137
    785 #: ../src/cavern.c:438
    786 msgid " at %4.2fm to "
    787 msgstr " auf %4.2fm bis "
    788 
    789 #: ../src/cavern.c:438
    790 msgid " at %4.2fm)"
    791 msgstr " auf %4.2fm)"
     780#: ../src/cavern.c:457
     781msgid "Vertical range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
     782msgstr "Vertikale Erstreckung = %4.2fm (von %s auf %4.2fm bis %s auf %4.2fm)"
     783
     784#. TRANSLATORS: c.f. previous message
     785#: ../src/cavern.c:458
     786msgid "North-South range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
     787msgstr "Nord-Süd-Erstreckung = %4.2fm (von %s bei %4.2fm bis %s bei %4.2fm)"
     788
     789#. TRANSLATORS: c.f. previous two messages
     790#: ../src/cavern.c:459
     791msgid "East-West range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
     792msgstr "Ost-West-Erstreckung = %4.2fm (von %s bei %4.2fm bis %s bei %4.2fm)"
    792793
    793794#. TRANSLATORS: de: There _is_ a technical term for this which I fail to remember at the moment.
     
    838839msgid "Error    N/A"
    839840msgstr "Fehler   belanglos"
    840 
    841 #: ../src/cavern.c:439
    842 msgid "North-South range = %4.2fm (from "
    843 msgstr "Nord-Süd-Erstreckung = %4.2fm (von "
    844 
    845 #: ../src/cavern.c:441
    846 msgid "East-West range = %4.2fm (from "
    847 msgstr "Ost-West-Erstreckung = %4.2fm (von "
    848841
    849842#. TRANSLATORS: description of --help option
  • lib/de_CH.po

    r7831cef raecd032  
    778778
    779779#. TRANSLATORS: numbers are altitudes of highest and lowest stations
    780 #: ../src/cavern.c:437
    781 msgid "Vertical range = %4.2fm (from "
    782 msgstr "Vertikale Erstreckung = %4.2fm (von "
    783 
    784 #. TRANSLATORS: for many translations, 196/197 will be the same as 136/137
    785 #: ../src/cavern.c:438
    786 msgid " at %4.2fm to "
    787 msgstr " auf %4.2fm bis "
    788 
    789 #: ../src/cavern.c:438
    790 msgid " at %4.2fm)"
    791 msgstr " auf %4.2fm)"
     780#: ../src/cavern.c:457
     781msgid "Vertical range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
     782msgstr "Vertikale Erstreckung = %4.2fm (von %s auf %4.2fm bis %s auf %4.2fm)"
     783
     784#. TRANSLATORS: c.f. previous message
     785#: ../src/cavern.c:458
     786msgid "North-South range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
     787msgstr "Nord-Süd-Erstreckung = %4.2fm (von %s bei %4.2fm bis %s bei %4.2fm)"
     788
     789#. TRANSLATORS: c.f. previous two messages
     790#: ../src/cavern.c:459
     791msgid "East-West range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
     792msgstr "Ost-West-Erstreckung = %4.2fm (von %s bei %4.2fm bis %s bei %4.2fm)"
    792793
    793794#. TRANSLATORS: de: There _is_ a technical term for this which I fail to remember at the moment.
     
    838839msgid "Error    N/A"
    839840msgstr "Fehler   belanglos"
    840 
    841 #: ../src/cavern.c:439
    842 msgid "North-South range = %4.2fm (from "
    843 msgstr "Nord-Süd-Erstreckung = %4.2fm (von "
    844 
    845 #: ../src/cavern.c:441
    846 msgid "East-West range = %4.2fm (from "
    847 msgstr "Ost-West-Erstreckung = %4.2fm (von "
    848841
    849842#. TRANSLATORS: description of --help option
  • lib/en_US.po

    r7831cef raecd032  
    749749
    750750#. TRANSLATORS: numbers are altitudes of highest and lowest stations
    751 #: ../src/cavern.c:438
    752 msgid "Vertical range = %4.2fm (from "
    753 msgstr "Vertical range = %4.2fm (from "
    754 
    755 #. TRANSLATORS: for many translations, 196/197 will be the same as 136/137
    756 #: ../src/cavern.c:439
    757 msgid " at %4.2fm to "
    758 msgstr " at %4.2fm to "
    759 
    760 #: ../src/cavern.c:439
    761 msgid " at %4.2fm)"
    762 msgstr " at %4.2fm)"
     751#: ../src/cavern.c:457
     752msgid "Vertical range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
     753msgstr "Vertical range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
     754
     755#. TRANSLATORS: c.f. previous message
     756#: ../src/cavern.c:458
     757msgid "North-South range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
     758msgstr "North-South range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
     759
     760#. TRANSLATORS: c.f. previous two messages
     761#: ../src/cavern.c:459
     762msgid "East-West range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
     763msgstr "East-West range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
    763764
    764765#: ../src/cavern.c:414
     
    806807msgid "Error    N/A"
    807808msgstr "Error    N/A"
    808 
    809 #: ../src/cavern.c:440
    810 msgid "North-South range = %4.2fm (from "
    811 msgstr "North-South range = %4.2fm (from "
    812 
    813 #: ../src/cavern.c:442
    814 msgid "East-West range = %4.2fm (from "
    815 msgstr "East-West range = %4.2fm (from "
    816809
    817810#. TRANSLATORS: description of --help option
  • lib/es.po

    r7831cef raecd032  
    749749
    750750#. TRANSLATORS: numbers are altitudes of highest and lowest stations
    751 #: ../src/cavern.c:437
    752 msgid "Vertical range = %4.2fm (from "
    753 msgstr "Desnivel total = %4.2fm (desde "
    754 
    755 #. TRANSLATORS: for many translations, 196/197 will be the same as 136/137
    756 #: ../src/cavern.c:438
    757 msgid " at %4.2fm to "
    758 msgstr " en %4.2fm a "
    759 
    760 #: ../src/cavern.c:438
    761 msgid " at %4.2fm)"
    762 msgstr " en %4.2fm)"
     751#: ../src/cavern.c:457
     752msgid "Vertical range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
     753msgstr "Desnivel total = %4.2fm (desde %s en %4.2fm a %s en %4.2fm)"
     754
     755#. TRANSLATORS: c.f. previous message
     756#: ../src/cavern.c:458
     757msgid "North-South range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
     758msgstr "Extensión Norte-Sur = %4.2fm (desde %s en %4.2fm a %s en %4.2fm)"
     759
     760#. TRANSLATORS: c.f. previous two messages
     761#: ../src/cavern.c:459
     762msgid "East-West range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
     763msgstr "Extensión Este-Oeste = %4.2fm (desde %s en %4.2fm a %s en %4.2fm)"
    763764
    764765#: ../src/cavern.c:413
     
    806807msgid "Error    N/A"
    807808msgstr "Error    N/A"
    808 
    809 #: ../src/cavern.c:439
    810 msgid "North-South range = %4.2fm (from "
    811 msgstr "Extensión Norte-Sur = %4.2fm (desde "
    812 
    813 #: ../src/cavern.c:441
    814 msgid "East-West range = %4.2fm (from "
    815 msgstr "Extensión Este-Oeste = %4.2fm (desde "
    816809
    817810#. TRANSLATORS: description of --help option
  • lib/fr.po

    r7831cef raecd032  
    755755
    756756#. TRANSLATORS: numbers are altitudes of highest and lowest stations
    757 #: ../src/cavern.c:437
    758 msgid "Vertical range = %4.2fm (from "
    759 msgstr "Interval vertical = %4.2fm (de "
    760 
    761 #. TRANSLATORS: for many translations, 196/197 will be the same as 136/137
    762 #: ../src/cavern.c:438
    763 msgid " at %4.2fm to "
    764 msgstr " à %4.2fm jusqu'à "
    765 
    766 #: ../src/cavern.c:438
    767 msgid " at %4.2fm)"
    768 msgstr " à %4.2fm)"
     757#: ../src/cavern.c:457
     758msgid "Vertical range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
     759msgstr "Interval vertical = %4.2fm (de %s à %4.2fm jusqu'à %s à %4.2fm)"
     760
     761#. TRANSLATORS: c.f. previous message
     762#: ../src/cavern.c:458
     763msgid "North-South range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
     764msgstr "Interval Nord-Sud = %4.2fm (de %s à %4.2fm jusqu'à %s à %4.2fm)"
     765
     766#. TRANSLATORS: c.f. previous two messages
     767#: ../src/cavern.c:459
     768msgid "East-West range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
     769msgstr "Interval Est-Ouest = %4.2fm (de %s à %4.2fm jusqu'à %s à %4.2fm)"
    769770
    770771#: ../src/cavern.c:414
     
    813814msgid "Error    N/A"
    814815msgstr "Erreur    N/A"
    815 
    816 #: ../src/cavern.c:439
    817 msgid "North-South range = %4.2fm (from "
    818 msgstr "Interval Nord-Sud = %4.2fm (de "
    819 
    820 #: ../src/cavern.c:441
    821 msgid "East-West range = %4.2fm (from "
    822 msgstr "Interval Est-Ouest = %4.2fm (de "
    823816
    824817#. TRANSLATORS: description of --help option
  • lib/it.po

    r7831cef raecd032  
    753753
    754754#. TRANSLATORS: numbers are altitudes of highest and lowest stations
    755 #: ../src/cavern.c:437
    756 msgid "Vertical range = %4.2fm (from "
    757 msgstr "Dislivello totale = %4.2fm (da "
    758 
    759 #. TRANSLATORS: for many translations, 196/197 will be the same as 136/137
    760 #: ../src/cavern.c:438
    761 msgid " at %4.2fm to "
    762 msgstr " a %4.2fm a "
    763 
    764 #: ../src/cavern.c:438
    765 msgid " at %4.2fm)"
    766 msgstr " a %4.2fm)"
     755#: ../src/cavern.c:457
     756msgid "Vertical range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
     757msgstr "Dislivello totale = %4.2fm (da %s a %4.2fm a %s a %4.2fm)"
     758
     759#. TRANSLATORS: c.f. previous message
     760#: ../src/cavern.c:458
     761msgid "North-South range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
     762msgstr "Estensione Nord-Sud = %4.2fm (da %s a %4.2fm a %s a %4.2fm)"
     763
     764#. TRANSLATORS: c.f. previous two messages
     765#: ../src/cavern.c:459
     766msgid "East-West range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
     767msgstr "Estensione Est-Ovest = %4.2fm (da %s a %4.2fm a %s a %4.2fm)"
    767768
    768769#: ../src/cavern.c:413
     
    810811msgid "Error    N/A"
    811812msgstr "Errore    N/A"
    812 
    813 #: ../src/cavern.c:439
    814 msgid "North-South range = %4.2fm (from "
    815 msgstr "Estensione Nord-Sud = %4.2fm (da "
    816 
    817 #: ../src/cavern.c:441
    818 msgid "East-West range = %4.2fm (from "
    819 msgstr "Estensione Est-Ovest = %4.2fm (da "
    820813
    821814#. TRANSLATORS: description of --help option
  • lib/pt.po

    r7831cef raecd032  
    761761
    762762#. TRANSLATORS: numbers are altitudes of highest and lowest stations
    763 #: ../src/cavern.c:437
    764 msgid "Vertical range = %4.2fm (from "
    765 msgstr "Desnível = %4.2fm (de "
    766 
    767 #. TRANSLATORS: for many translations, 196/197 will be the same as 136/137
    768 #: ../src/cavern.c:438
    769 msgid " at %4.2fm to "
    770 msgstr " a %4.2fm a "
    771 
    772 #: ../src/cavern.c:438
    773 msgid " at %4.2fm)"
    774 msgstr " a %4.2fm)"
     763#: ../src/cavern.c:457
     764msgid "Vertical range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
     765msgstr "Desnível = %4.2fm (de %s a %4.2fm a %s a %4.2fm)"
     766
     767#. TRANSLATORS: c.f. previous message
     768#: ../src/cavern.c:458
     769msgid "North-South range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
     770msgstr "Extensão Norte-Sul = %4.2fm (de %s a %4.2fm a %s a %4.2fm)"
     771
     772#. TRANSLATORS: c.f. previous two messages
     773#: ../src/cavern.c:459
     774msgid "East-West range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
     775msgstr "Extensão Leste-Oeste = %4.2fm (de %s a %4.2fm a %s a %4.2fm)"
    775776
    776777#: ../src/cavern.c:413
     
    818819msgid "Error    N/A"
    819820msgstr "Erro    N/A"
    820 
    821 #: ../src/cavern.c:439
    822 msgid "North-South range = %4.2fm (from "
    823 msgstr "Extensão Norte-Sul = %4.2fm (de "
    824 
    825 #: ../src/cavern.c:441
    826 msgid "East-West range = %4.2fm (from "
    827 msgstr "Extensão Leste-Oeste = %4.2fm (de "
    828821
    829822#. TRANSLATORS: description of --help option
  • lib/pt_BR.po

    r7831cef raecd032  
    761761
    762762#. TRANSLATORS: numbers are altitudes of highest and lowest stations
    763 #: ../src/cavern.c:437
    764 msgid "Vertical range = %4.2fm (from "
    765 msgstr "Desnível = %4.2fm (de "
    766 
    767 #. TRANSLATORS: for many translations, 196/197 will be the same as 136/137
    768 #: ../src/cavern.c:438
    769 msgid " at %4.2fm to "
    770 msgstr " a %4.2fm a "
    771 
    772 #: ../src/cavern.c:438
    773 msgid " at %4.2fm)"
    774 msgstr " a %4.2fm)"
     763#: ../src/cavern.c:457
     764msgid "Vertical range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
     765msgstr "Desnível = %4.2fm (de %s a %4.2fm a %s a %4.2fm)"
     766
     767#. TRANSLATORS: c.f. previous message
     768#: ../src/cavern.c:458
     769msgid "North-South range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
     770msgstr "Extensão Norte-Sul = %4.2fm (de %s a %4.2fm a %s a %4.2fm)"
     771
     772#. TRANSLATORS: c.f. previous two messages
     773#: ../src/cavern.c:459
     774msgid "East-West range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
     775msgstr "Extensão Leste-Oeste = %4.2fm (de %s a %4.2fm a %s a %4.2fm)"
    775776
    776777#: ../src/cavern.c:413
     
    818819msgid "Error    N/A"
    819820msgstr "Erro    N/A"
    820 
    821 #: ../src/cavern.c:439
    822 msgid "North-South range = %4.2fm (from "
    823 msgstr "Extensão Norte-Sul = %4.2fm (de "
    824 
    825 #: ../src/cavern.c:441
    826 msgid "East-West range = %4.2fm (from "
    827 msgstr "Extensão Leste-Oeste = %4.2fm (de "
    828821
    829822#. TRANSLATORS: description of --help option
  • lib/ro.po

    r7831cef raecd032  
    753753
    754754#. TRANSLATORS: numbers are altitudes of highest and lowest stations
    755 #: ../src/cavern.c:437
    756 msgid "Vertical range = %4.2fm (from "
    757 msgstr "Interval vertical = %4.2fm (de la "
    758 
    759 #. TRANSLATORS: for many translations, 196/197 will be the same as 136/137
    760 #: ../src/cavern.c:438
    761 msgid " at %4.2fm to "
    762 msgstr " la %4.2fm de la "
    763 
    764 #: ../src/cavern.c:438
    765 msgid " at %4.2fm)"
    766 msgstr " la %4.2fm)"
     755#: ../src/cavern.c:457
     756msgid "Vertical range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
     757msgstr "Interval vertical = %4.2fm (de la %s la %4.2fm de la %s la %4.2fm)"
     758
     759#. TRANSLATORS: c.f. previous message
     760#: ../src/cavern.c:458
     761msgid "North-South range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
     762msgstr "Extindere Nord-Sud = %4.2fm (de la %s la %4.2fm de la %s la %4.2fm)"
     763
     764#. TRANSLATORS: c.f. previous two messages
     765#: ../src/cavern.c:459
     766msgid "East-West range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
     767msgstr "Extindere Est-Vest = %4.2fm (de la %s la %4.2fm de la %s la %4.2fm)"
    767768
    768769#: ../src/cavern.c:413
     
    810811msgid "Error    N/A"
    811812msgstr "Eroare    N/A"
    812 
    813 #: ../src/cavern.c:439
    814 msgid "North-South range = %4.2fm (from "
    815 msgstr "Extindere Nord-Sud = %4.2fm (de la "
    816 
    817 #: ../src/cavern.c:441
    818 msgid "East-West range = %4.2fm (from "
    819 msgstr "Extindere Est-Vest = %4.2fm (de la "
    820813
    821814#. TRANSLATORS: description of --help option
  • lib/sk.po

    r7831cef raecd032  
    750750
    751751#. TRANSLATORS: numbers are altitudes of highest and lowest stations
    752 #: ../src/cavern.c:437
    753 msgid "Vertical range = %4.2fm (from "
    754 msgstr "Vertikálny rozsah = %4.2fm (od "
    755 
    756 #. TRANSLATORS: for many translations, 196/197 will be the same as 136/137
    757 #: ../src/cavern.c:438
    758 msgid " at %4.2fm to "
    759 msgstr " v %4.2fm do "
    760 
    761 #: ../src/cavern.c:438
    762 msgid " at %4.2fm)"
    763 msgstr " v %4.2fm)"
     752#: ../src/cavern.c:457
     753msgid "Vertical range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
     754msgstr "Vertikálny rozsah = %4.2fm (od %s v %4.2fm do %s v %4.2fm)"
     755
     756#. TRANSLATORS: c.f. previous message
     757#: ../src/cavern.c:458
     758msgid "North-South range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
     759msgstr "Rozsah sever-juh = %4.2fm (od %s od %4.2fm do %s do %4.2fm)"
     760
     761#. TRANSLATORS: c.f. previous two messages
     762#: ../src/cavern.c:459
     763msgid "East-West range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)"
     764msgstr "Rozsah východ-západ = %4.2fm (od %s od %4.2fm do %s do %4.2fm)"
    764765
    765766#: ../src/cavern.c:413
     
    807808msgid "Error    N/A"
    808809msgstr "Chyba (nemá zmysel)"
    809 
    810 #: ../src/cavern.c:439
    811 msgid "North-South range = %4.2fm (from "
    812 msgstr "Rozsah sever-juh = %4.2fm (od "
    813 
    814 #: ../src/cavern.c:441
    815 msgid "East-West range = %4.2fm (from "
    816 msgstr "Rozsah východ-západ = %4.2fm (od "
    817810
    818811#. TRANSLATORS: description of --help option
  • src/cavern.c

    r7831cef raecd032  
    390390
    391391static void
    392 do_range(int d, int msg1, int msg2, int msg3)
    393 {
    394    printf(msg(msg1), max[d] - min[d]);
    395    fprint_prefix(stdout, pfxHi[d]);
    396    printf(msg(msg2), max[d]);
    397    fprint_prefix(stdout, pfxLo[d]);
    398    printf(msg(msg3), min[d]);
    399    putnl();
     392do_range(int d, int msgno)
     393{
     394   // sprint_prefix uses a single buffer, so to report two stations in one
     395   // message we need to make a temporary copy of the string for one of them.
     396   char * pfx_hi = osstrdup(sprint_prefix(pfxHi[d]));
     397   char * pfx_lo = sprint_prefix(pfxLo[d]);
     398   printf(msg(msgno), max[d] - min[d], pfx_hi, max[d], pfx_lo, min[d]);
     399   osfree(pfx_hi);
     400   putnl();
     401}
     402
     403static void
     404svx_fprintf(FILE *f, const char * fmt, ...)
     405{
     406    va_list ap;
     407    va_start(ap, fmt);
     408    svx_vfprintf(f, fmt, ap);
     409    va_end(ap);
    400410}
    401411
     
    446456   /* If there's no underground survey, we've no ranges */
    447457   if (pfxHi[0]) {
    448       do_range(2, /*Vertical range = %4.2fm (from */135,
    449                /* at %4.2fm to */136, /* at %4.2fm)*/137);
    450       do_range(1, /*North-South range = %4.2fm (from */148,
    451                /* at %4.2fm to */196, /* at %4.2fm)*/197);
    452       do_range(0, /*East-West range = %4.2fm (from */149,
    453                /* at %4.2fm to */196, /* at %4.2fm)*/197);
     458      do_range(2, /*Vertical range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)*/135);
     459      do_range(1, /*North-South range = %4.2fm (from %s at %4.2fm to %s at %4.2fm)*/136);
     460      do_range(0, /*East-West range = %4.2fm from %s at %4.2fm to %s at %4.2fm)*/137);
    454461   }
    455462
Note: See TracChangeset for help on using the changeset viewer.