Changeset c20d521 in git


Ignore:
Timestamp:
19/01/14 01:46:46 (6 years ago)
Author:
Olly Betts <olly@…>
Branches:
line_contents, master, stereo, travis-osx
Children:
4a7b9e3
Parents:
e521b8e0
Message:

lib/,src/netskel.c,tests/: Drop "between nodes" from the progress
messages while solving the survey network, as the extra words don't
make the meaning clearer, and "node" doesn't mean exactly the same
here as the summary of nodes printed at the end of processing, which
is a bit confusing.

Files:
40 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    re521b8e0 rc20d521  
     1Sun Jan 19 01:44:44 GMT 2014  Olly Betts <olly@survex.com>
     2
     3        * lib/,src/netskel.c,tests/: Drop "between nodes" from the progress
     4          messages while solving the survey network, as the extra words don't
     5          make the meaning clearer, and "node" doesn't mean exactly the same
     6          here as the summary of nodes printed at the end of processing, which
     7          is a bit confusing.
     8
    19Sun Jan 19 01:31:54 GMT 2014  Olly Betts <olly@survex.com>
    210
  • lib/bg.po

    re521b8e0 rc20d521  
    885885#: ../src/netskel.c:217
    886886#: n:126
    887 msgid "Concatenating traverses between nodes"
     887msgid "Concatenating traverses"
    888888msgstr ""
    889889
     
    895895#: ../src/netskel.c:410
    896896#: n:127
    897 msgid "Calculating traverses between nodes"
     897msgid "Calculating traverses"
    898898msgstr ""
    899899
  • lib/ca.po

    re521b8e0 rc20d521  
    884884#: ../src/netskel.c:217
    885885#: n:126
    886 msgid "Concatenating traverses between nodes"
    887 msgstr "Connectant seqüències entre nodes"
     886msgid "Concatenating traverses"
     887msgstr "Connectant seqüències"
    888888
    889889#. TRANSLATORS: In French, Eric chose to use the terminology used by toporobot:
     
    894894#: ../src/netskel.c:410
    895895#: n:127
    896 msgid "Calculating traverses between nodes"
    897 msgstr "Calculant seqüències entre nodes"
     896msgid "Calculating traverses"
     897msgstr "Calculant seqüències"
    898898
    899899#. TRANSLATORS: In French, Eric chose to use the terminology used by toporobot:
  • lib/de.po

    re521b8e0 rc20d521  
    884884#: ../src/netskel.c:217
    885885#: n:126
    886 msgid "Concatenating traverses between nodes"
     886msgid "Concatenating traverses"
    887887msgstr "Messzüge zwischen Abzweigungen werden verbunden"
    888888
     
    894894#: ../src/netskel.c:410
    895895#: n:127
    896 msgid "Calculating traverses between nodes"
     896msgid "Calculating traverses"
    897897msgstr "Messzüge zwischen Abzweigungen werden berechnet"
    898898
  • lib/de_CH.po

    re521b8e0 rc20d521  
    884884#: ../src/netskel.c:217
    885885#: n:126
    886 msgid "Concatenating traverses between nodes"
     886msgid "Concatenating traverses"
    887887msgstr "Messzüge zwischen Abzweigungen werden verbunden"
    888888
     
    894894#: ../src/netskel.c:410
    895895#: n:127
    896 msgid "Calculating traverses between nodes"
     896msgid "Calculating traverses"
    897897msgstr "Messzüge zwischen Abzweigungen werden berechnet"
    898898
  • lib/en_US.po

    re521b8e0 rc20d521  
    884884#: ../src/netskel.c:217
    885885#: n:126
    886 msgid "Concatenating traverses between nodes"
    887 msgstr "Concatenating traverses between nodes"
     886msgid "Concatenating traverses"
     887msgstr "Concatenating traverses"
    888888
    889889#. TRANSLATORS: In French, Eric chose to use the terminology used by toporobot:
     
    894894#: ../src/netskel.c:410
    895895#: n:127
    896 msgid "Calculating traverses between nodes"
    897 msgstr "Calculating traverses between nodes"
     896msgid "Calculating traverses"
     897msgstr "Calculating traverses"
    898898
    899899#. TRANSLATORS: In French, Eric chose to use the terminology used by toporobot:
  • lib/es.po

    re521b8e0 rc20d521  
    884884#: ../src/netskel.c:217
    885885#: n:126
    886 msgid "Concatenating traverses between nodes"
    887 msgstr "Conectando secuencias entre nodos"
     886msgid "Concatenating traverses"
     887msgstr "Conectando secuencias"
    888888
    889889#. TRANSLATORS: In French, Eric chose to use the terminology used by toporobot:
     
    894894#: ../src/netskel.c:410
    895895#: n:127
    896 msgid "Calculating traverses between nodes"
    897 msgstr "Calculando secuencias entre nodos"
     896msgid "Calculating traverses"
     897msgstr "Calculando secuencias"
    898898
    899899#. TRANSLATORS: In French, Eric chose to use the terminology used by toporobot:
  • lib/fr.po

    re521b8e0 rc20d521  
    884884#: ../src/netskel.c:217
    885885#: n:126
    886 msgid "Concatenating traverses between nodes"
    887 msgstr "Connecte les séquences entre noeuds"
     886msgid "Concatenating traverses"
     887msgstr "Connecte les séquences"
    888888
    889889#. TRANSLATORS: In French, Eric chose to use the terminology used by toporobot:
     
    894894#: ../src/netskel.c:410
    895895#: n:127
    896 msgid "Calculating traverses between nodes"
    897 msgstr "Calcule les séquences entre noeuds"
     896msgid "Calculating traverses"
     897msgstr "Calcule les séquences"
    898898
    899899#. TRANSLATORS: In French, Eric chose to use the terminology used by toporobot:
  • lib/id.po

    re521b8e0 rc20d521  
    884884#: ../src/netskel.c:217
    885885#: n:126
    886 msgid "Concatenating traverses between nodes"
     886msgid "Concatenating traverses"
    887887msgstr ""
    888888
     
    894894#: ../src/netskel.c:410
    895895#: n:127
    896 msgid "Calculating traverses between nodes"
     896msgid "Calculating traverses"
    897897msgstr ""
    898898
  • lib/it.po

    re521b8e0 rc20d521  
    884884#: ../src/netskel.c:217
    885885#: n:126
    886 msgid "Concatenating traverses between nodes"
    887 msgstr "So connettendo le traverse fra i nodi"
     886msgid "Concatenating traverses"
     887msgstr "So connettendo le traverse"
    888888
    889889#. TRANSLATORS: In French, Eric chose to use the terminology used by toporobot:
     
    894894#: ../src/netskel.c:410
    895895#: n:127
    896 msgid "Calculating traverses between nodes"
    897 msgstr "Sto calcolando le traverse fra i nodi"
     896msgid "Calculating traverses"
     897msgstr "Sto calcolando le traverse"
    898898
    899899#. TRANSLATORS: In French, Eric chose to use the terminology used by toporobot:
  • lib/pt.po

    re521b8e0 rc20d521  
    884884#: ../src/netskel.c:217
    885885#: n:126
    886 msgid "Concatenating traverses between nodes"
    887 msgstr "Concatenando seqüências entre nodos"
     886msgid "Concatenating traverses"
     887msgstr "Concatenando seqüências"
    888888
    889889#. TRANSLATORS: In French, Eric chose to use the terminology used by toporobot:
     
    894894#: ../src/netskel.c:410
    895895#: n:127
    896 msgid "Calculating traverses between nodes"
    897 msgstr "Calculando seqüências entre nodos"
     896msgid "Calculating traverses"
     897msgstr "Calculando seqüências"
    898898
    899899#. TRANSLATORS: In French, Eric chose to use the terminology used by toporobot:
  • lib/pt_BR.po

    re521b8e0 rc20d521  
    884884#: ../src/netskel.c:217
    885885#: n:126
    886 msgid "Concatenating traverses between nodes"
    887 msgstr "Concatenando seqüências entre nodos"
     886msgid "Concatenating traverses"
     887msgstr "Concatenando seqüências"
    888888
    889889#. TRANSLATORS: In French, Eric chose to use the terminology used by toporobot:
     
    894894#: ../src/netskel.c:410
    895895#: n:127
    896 msgid "Calculating traverses between nodes"
    897 msgstr "Calculando seqüências entre nodos"
     896msgid "Calculating traverses"
     897msgstr "Calculando seqüências"
    898898
    899899#. TRANSLATORS: In French, Eric chose to use the terminology used by toporobot:
  • lib/ro.po

    re521b8e0 rc20d521  
    885885#: ../src/netskel.c:217
    886886#: n:126
    887 msgid "Concatenating traverses between nodes"
    888 msgstr "Leg traversele dintre noduri"
     887msgid "Concatenating traverses"
     888msgstr "Leg traversele"
    889889
    890890#. TRANSLATORS: In French, Eric chose to use the terminology used by toporobot:
     
    895895#: ../src/netskel.c:410
    896896#: n:127
    897 msgid "Calculating traverses between nodes"
    898 msgstr "Calculez traversele dintre noduri"
     897msgid "Calculating traverses"
     898msgstr "Calculez traversele"
    899899
    900900#. TRANSLATORS: In French, Eric chose to use the terminology used by toporobot:
  • lib/sk.po

    re521b8e0 rc20d521  
    884884#: ../src/netskel.c:217
    885885#: n:126
    886 msgid "Concatenating traverses between nodes"
    887 msgstr "Pripojenie spojok medzi uzlami"
     886msgid "Concatenating traverses"
     887msgstr "Pripojenie spojok"
    888888
    889889#. TRANSLATORS: In French, Eric chose to use the terminology used by toporobot:
     
    894894#: ../src/netskel.c:410
    895895#: n:127
    896 msgid "Calculating traverses between nodes"
    897 msgstr "Výpočet spojok medzi uzlami"
     896msgid "Calculating traverses"
     897msgstr "Výpočet spojok"
    898898
    899899#. TRANSLATORS: In French, Eric chose to use the terminology used by toporobot:
  • lib/survex.pot

    re521b8e0 rc20d521  
    886886#: ../src/netskel.c:217
    887887#: n:126
    888 msgid "Concatenating traverses between nodes"
     888msgid "Concatenating traverses"
    889889msgstr ""
    890890
     
    896896#: ../src/netskel.c:410
    897897#: n:127
    898 msgid "Calculating traverses between nodes"
     898msgid "Calculating traverses"
    899899msgstr ""
    900900
  • lib/zh_CN.po

    re521b8e0 rc20d521  
    884884#: ../src/netskel.c:217
    885885#: n:126
    886 msgid "Concatenating traverses between nodes"
     886msgid "Concatenating traverses"
    887887msgstr ""
    888888
     
    894894#: ../src/netskel.c:410
    895895#: n:127
    896 msgid "Calculating traverses between nodes"
     896msgid "Calculating traverses"
    897897msgstr ""
    898898
  • src/netskel.c

    re521b8e0 rc20d521  
    22 * Survex network reduction - remove trailing traverses and concatenate
    33 * traverses between junctions
    4  * Copyright (C) 1991-2004,2005,2006,2010,2011,2012,2013 Olly Betts
     4 * Copyright (C) 1991-2004,2005,2006,2010,2011,2012,2013,2014 Olly Betts
    55 *
    66 * This program is free software; you can redistribute it and/or modify
     
    215215{
    216216   node *stn;
    217    out_current_action(msg(/*Concatenating traverses between nodes*/126));
     217   out_current_action(msg(/*Concatenating traverses*/126));
    218218   FOR_EACH_STN(stn, stnlist) {
    219219      if (fixed(stn) || three_node(stn)) {
     
    408408   bool fArtic;
    409409
    410    out_current_action(msg(/*Calculating traverses between nodes*/127));
     410   out_current_action(msg(/*Calculating traverses*/127));
    411411
    412412   if (!fhErrStat && !fSuppress)
  • tests/anonstn.out

    re521b8e0 rc20d521  
    22Removing trailing traverses...
    33
    4 Concatenating traverses between nodes...
     4Concatenating traverses...
    55
    66Simplifying network...
     
    88Calculating network...
    99
    10 Calculating traverses between nodes...
     10Calculating traverses...
    1111
    1212Calculating trailing traverses...
  • tests/anonstnbad.out

    re521b8e0 rc20d521  
    88Removing trailing traverses...
    99
    10 Concatenating traverses between nodes...
     10Concatenating traverses...
    1111
    1212Simplifying network...
     
    1414Calculating network...
    1515
    16 Calculating traverses between nodes...
     16Calculating traverses...
    1717
    1818Calculating trailing traverses...
  • tests/anonstnrev.out

    re521b8e0 rc20d521  
    22Removing trailing traverses...
    33
    4 Concatenating traverses between nodes...
     4Concatenating traverses...
    55
    66Simplifying network...
     
    88Calculating network...
    99
    10 Calculating traverses between nodes...
     10Calculating traverses...
    1111
    1212Calculating trailing traverses...
  • tests/badbegin.out

    re521b8e0 rc20d521  
    55Removing trailing traverses...
    66
    7 Concatenating traverses between nodes...
     7Concatenating traverses...
    88
    99Simplifying network...
     
    1111Calculating network...
    1212
    13 Calculating traverses between nodes...
     13Calculating traverses...
    1414
    1515Calculating trailing traverses...
  • tests/badcalibrate.out

    re521b8e0 rc20d521  
    55Removing trailing traverses...
    66
    7 Concatenating traverses between nodes...
     7Concatenating traverses...
    88
    99Simplifying network...
     
    1111Calculating network...
    1212
    13 Calculating traverses between nodes...
     13Calculating traverses...
    1414
    1515Calculating trailing traverses...
  • tests/badinc4.out

    re521b8e0 rc20d521  
    55Removing trailing traverses...
    66
    7 Concatenating traverses between nodes...
     7Concatenating traverses...
    88
    99Simplifying network...
     
    1111Calculating network...
    1212
    13 Calculating traverses between nodes...
     13Calculating traverses...
    1414
    1515Calculating trailing traverses...
  • tests/badreadingdotplus.out

    re521b8e0 rc20d521  
    55Removing trailing traverses...
    66
    7 Concatenating traverses between nodes...
     7Concatenating traverses...
    88
    99Simplifying network...
     
    1111Calculating network...
    1212
    13 Calculating traverses between nodes...
     13Calculating traverses...
    1414
    1515Calculating trailing traverses...
  • tests/badunits.out

    re521b8e0 rc20d521  
    1414Removing trailing traverses...
    1515
    16 Concatenating traverses between nodes...
     16Concatenating traverses...
    1717
    1818Simplifying network...
     
    2020Calculating network...
    2121
    22 Calculating traverses between nodes...
     22Calculating traverses...
    2323
    2424Calculating trailing traverses...
  • tests/beginroot.out

    re521b8e0 rc20d521  
    66Removing trailing traverses...
    77
    8 Concatenating traverses between nodes...
     8Concatenating traverses...
    99
    1010Simplifying network...
     
    1212Calculating network...
    1313
    14 Calculating traverses between nodes...
     14Calculating traverses...
    1515
    1616Calculating trailing traverses...
  • tests/calibrate_clino.out

    re521b8e0 rc20d521  
    1010Removing trailing traverses...
    1111
    12 Concatenating traverses between nodes...
     12Concatenating traverses...
    1313
    1414Simplifying network...
     
    1818Calculating network...
    1919
    20 Calculating traverses between nodes...
     20Calculating traverses...
    2121
    2222Calculating trailing traverses...
  • tests/cmd_alias.out

    re521b8e0 rc20d521  
    22Removing trailing traverses...
    33
    4 Concatenating traverses between nodes...
     4Concatenating traverses...
    55
    66Simplifying network...
     
    88Calculating network...
    99
    10 Calculating traverses between nodes...
     10Calculating traverses...
    1111
    1212Calculating trailing traverses...
  • tests/cmd_datebad.out

    re521b8e0 rc20d521  
    3939Removing trailing traverses...
    4040
    41 Concatenating traverses between nodes...
     41Concatenating traverses...
    4242
    4343Simplifying network...
     
    4545Calculating network...
    4646
    47 Calculating traverses between nodes...
     47Calculating traverses...
    4848
    4949Calculating trailing traverses...
  • tests/cmd_datebad2.out

    re521b8e0 rc20d521  
    2424Removing trailing traverses...
    2525
    26 Concatenating traverses between nodes...
     26Concatenating traverses...
    2727
    2828Simplifying network...
     
    3030Calculating network...
    3131
    32 Calculating traverses between nodes...
     32Calculating traverses...
    3333
    3434Calculating trailing traverses...
  • tests/cmd_entrance_bad.out

    re521b8e0 rc20d521  
    33Removing trailing traverses...
    44
    5 Concatenating traverses between nodes...
     5Concatenating traverses...
    66
    77Simplifying network...
     
    99Calculating network...
    1010
    11 Calculating traverses between nodes...
     11Calculating traverses...
    1212
    1313Calculating trailing traverses...
  • tests/cmd_fix_bad.out

    re521b8e0 rc20d521  
    1212Removing trailing traverses...
    1313
    14 Concatenating traverses between nodes...
     14Concatenating traverses...
    1515
    1616Simplifying network...
     
    1818Calculating network...
    1919
    20 Calculating traverses between nodes...
     20Calculating traverses...
    2121
    2222Calculating trailing traverses...
  • tests/cmd_prefix.out

    re521b8e0 rc20d521  
    33Removing trailing traverses...
    44
    5 Concatenating traverses between nodes...
     5Concatenating traverses...
    66
    77Simplifying network...
     
    99Calculating network...
    1010
    11 Calculating traverses between nodes...
     11Calculating traverses...
    1212
    1313Calculating trailing traverses...
  • tests/cmd_prefix_bad.out

    re521b8e0 rc20d521  
    44Removing trailing traverses...
    55
    6 Concatenating traverses between nodes...
     6Concatenating traverses...
    77
    88Simplifying network...
     
    1010Calculating network...
    1111
    12 Calculating traverses between nodes...
     12Calculating traverses...
    1313
    1414Calculating trailing traverses...
  • tests/cmd_sd_bad.out

    re521b8e0 rc20d521  
    99Removing trailing traverses...
    1010
    11 Concatenating traverses between nodes...
     11Concatenating traverses...
    1212
    1313Simplifying network...
     
    1515Calculating network...
    1616
    17 Calculating traverses between nodes...
     17Calculating traverses...
    1818
    1919Calculating trailing traverses...
  • tests/cmd_set_bad.out

    re521b8e0 rc20d521  
    1111Removing trailing traverses...
    1212
    13 Concatenating traverses between nodes...
     13Concatenating traverses...
    1414
    1515Simplifying network...
     
    1717Calculating network...
    1818
    19 Calculating traverses between nodes...
     19Calculating traverses...
    2020
    2121Calculating trailing traverses...
  • tests/dotinsurvey.out

    re521b8e0 rc20d521  
    44Removing trailing traverses...
    55
    6 Concatenating traverses between nodes...
     6Concatenating traverses...
    77
    88Simplifying network...
     
    1010Calculating network...
    1111
    12 Calculating traverses between nodes...
     12Calculating traverses...
    1313
    1414Calculating trailing traverses...
  • tests/equatenosuchstn.out

    re521b8e0 rc20d521  
    22Removing trailing traverses...
    33
    4 Concatenating traverses between nodes...
     4Concatenating traverses...
    55
    66Simplifying network...
     
    88Calculating network...
    99
    10 Calculating traverses between nodes...
     10Calculating traverses...
    1111
    1212Calculating trailing traverses...
  • tests/normal_bad.out

    re521b8e0 rc20d521  
    55Removing trailing traverses...
    66
    7 Concatenating traverses between nodes...
     7Concatenating traverses...
    88
    99Simplifying network...
     
    1111Calculating network...
    1212
    13 Calculating traverses between nodes...
     13Calculating traverses...
    1414
    1515Calculating trailing traverses...
  • tests/surveytypo.out

    re521b8e0 rc20d521  
    22Removing trailing traverses...
    33
    4 Concatenating traverses between nodes...
     4Concatenating traverses...
    55
    66Simplifying network...
Note: See TracChangeset for help on using the changeset viewer.