From 85dcdcd8bdbc55d3d2c793e9afe6d5db5ec2164d Mon Sep 17 00:00:00 2001 From: Olly Betts Date: Sun, 19 Feb 2017 12:49:26 +1300 Subject: [PATCH] Use symbol instead of word for status var rad units We use the superscript 'g' in the compass and clino indicator, so it's more consistent to use it here too. It's shorter than the word, and the status bar is of limited length. --- lib/bg.po | 17 ++--------------- lib/ca.po | 17 ++--------------- lib/de.po | 17 ++--------------- lib/de_CH.po | 17 ++--------------- lib/deadmessages.txt | 19 ++++++++++++++++++- lib/el.po | 17 ++--------------- lib/en_US.po | 17 ++--------------- lib/es.po | 17 ++--------------- lib/fr.po | 17 ++--------------- lib/hu.po | 17 ++--------------- lib/id.po | 17 ++--------------- lib/it.po | 17 ++--------------- lib/pl.po | 17 ++--------------- lib/pt.po | 17 ++--------------- lib/pt_BR.po | 17 ++--------------- lib/ro.po | 17 ++--------------- lib/ru.po | 17 ++--------------- lib/sk.po | 17 ++--------------- lib/survex.pot | 17 ++--------------- lib/zh_CN.po | 17 ++--------------- src/commands.c | 2 +- src/gfxcore.cc | 6 +++--- src/mainfrm.cc | 9 ++------- 23 files changed, 62 insertions(+), 297 deletions(-) diff --git a/lib/bg.po b/lib/bg.po index ed5dc797..5f5755fc 100644 --- a/lib/bg.po +++ b/lib/bg.po @@ -2383,9 +2383,7 @@ msgid "%.2f E, %.2f N" msgstr "" #. TRANSLATORS: Used in Aven: -#. From -#. H: 123.45m V: 234.56m -#. Dist: 456.78m Brg: 200 +#. From : H 12.24m, Brg 234.5° #: ../src/mainfrm.cc:2287 #: ../src/mainfrm.cc:2337 #: ../src/mainfrm.cc:2399 @@ -2575,21 +2573,10 @@ msgstr "°" #: ../src/gfxcore.cc:775 #: ../src/gfxcore.cc:865 #: ../src/gfxcore.cc:1182 -#: n:76 +#: n:345 msgid "ᵍ" msgstr "ᵍ" -#. TRANSLATORS: alternative angle units (400 grad = 360 degrees = -#. full circle). Try to make this as short as sensibly possible. -#. -#. E.g. in Italian and Spanish we use "g.cent." rather than -#. "gradi quattrocentesimali"/"grados centesimales" -#: ../src/mainfrm.cc:2298 -#: ../src/mainfrm.cc:2419 -#: n:345 -msgid "grad" -msgstr "град" - #. TRANSLATORS: symbol for percentage gradient (100% = 45 #. degrees = 50 grad). #: ../src/commands.c:335 diff --git a/lib/ca.po b/lib/ca.po index fe447bd9..4df5e085 100644 --- a/lib/ca.po +++ b/lib/ca.po @@ -2384,9 +2384,7 @@ msgid "%.2f E, %.2f N" msgstr "%.2f E, %.2f N" #. TRANSLATORS: Used in Aven: -#. From -#. H: 123.45m V: 234.56m -#. Dist: 456.78m Brg: 200 +#. From : H 12.24m, Brg 234.5° #: ../src/mainfrm.cc:2287 #: ../src/mainfrm.cc:2337 #: ../src/mainfrm.cc:2399 @@ -2576,21 +2574,10 @@ msgstr "°" #: ../src/gfxcore.cc:775 #: ../src/gfxcore.cc:865 #: ../src/gfxcore.cc:1182 -#: n:76 +#: n:345 msgid "ᵍ" msgstr "ᵍ" -#. TRANSLATORS: alternative angle units (400 grad = 360 degrees = -#. full circle). Try to make this as short as sensibly possible. -#. -#. E.g. in Italian and Spanish we use "g.cent." rather than -#. "gradi quattrocentesimali"/"grados centesimales" -#: ../src/mainfrm.cc:2298 -#: ../src/mainfrm.cc:2419 -#: n:345 -msgid "grad" -msgstr "g.cent" - #. TRANSLATORS: symbol for percentage gradient (100% = 45 #. degrees = 50 grad). #: ../src/commands.c:335 diff --git a/lib/de.po b/lib/de.po index 2a4d0199..b5d15905 100644 --- a/lib/de.po +++ b/lib/de.po @@ -2384,9 +2384,7 @@ msgid "%.2f E, %.2f N" msgstr "%.2f H, %.2f R" #. TRANSLATORS: Used in Aven: -#. From -#. H: 123.45m V: 234.56m -#. Dist: 456.78m Brg: 200 +#. From : H 12.24m, Brg 234.5° #: ../src/mainfrm.cc:2287 #: ../src/mainfrm.cc:2337 #: ../src/mainfrm.cc:2399 @@ -2576,21 +2574,10 @@ msgstr "°" #: ../src/gfxcore.cc:775 #: ../src/gfxcore.cc:865 #: ../src/gfxcore.cc:1182 -#: n:76 +#: n:345 msgid "ᵍ" msgstr "ᵍ" -#. TRANSLATORS: alternative angle units (400 grad = 360 degrees = -#. full circle). Try to make this as short as sensibly possible. -#. -#. E.g. in Italian and Spanish we use "g.cent." rather than -#. "gradi quattrocentesimali"/"grados centesimales" -#: ../src/mainfrm.cc:2298 -#: ../src/mainfrm.cc:2419 -#: n:345 -msgid "grad" -msgstr "Neugrad" - #. TRANSLATORS: symbol for percentage gradient (100% = 45 #. degrees = 50 grad). #: ../src/commands.c:335 diff --git a/lib/de_CH.po b/lib/de_CH.po index 4fdd844e..e9b76617 100644 --- a/lib/de_CH.po +++ b/lib/de_CH.po @@ -2384,9 +2384,7 @@ msgid "%.2f E, %.2f N" msgstr "%.2f H, %.2f R" #. TRANSLATORS: Used in Aven: -#. From -#. H: 123.45m V: 234.56m -#. Dist: 456.78m Brg: 200 +#. From : H 12.24m, Brg 234.5° #: ../src/mainfrm.cc:2287 #: ../src/mainfrm.cc:2337 #: ../src/mainfrm.cc:2399 @@ -2576,21 +2574,10 @@ msgstr "°" #: ../src/gfxcore.cc:775 #: ../src/gfxcore.cc:865 #: ../src/gfxcore.cc:1182 -#: n:76 +#: n:345 msgid "ᵍ" msgstr "ᵍ" -#. TRANSLATORS: alternative angle units (400 grad = 360 degrees = -#. full circle). Try to make this as short as sensibly possible. -#. -#. E.g. in Italian and Spanish we use "g.cent." rather than -#. "gradi quattrocentesimali"/"grados centesimales" -#: ../src/mainfrm.cc:2298 -#: ../src/mainfrm.cc:2419 -#: n:345 -msgid "grad" -msgstr "Neugrad" - #. TRANSLATORS: symbol for percentage gradient (100% = 45 #. degrees = 50 grad). #: ../src/commands.c:335 diff --git a/lib/deadmessages.txt b/lib/deadmessages.txt index d8c94e4e..1eeaf6bd 100644 --- a/lib/deadmessages.txt +++ b/lib/deadmessages.txt @@ -820,7 +820,6 @@ fr:612 Erreur de lecture à la ligne %i du fichier de spécification it:612 Errore di lettura alla linea %i del file di specifiche # #. TRANSLATORS: %c is “x”, “y” or “z” -#: n:76 #, c-format msgid "Solving to find %c coordinates" ca "Resolent per trobar coordenades %c" @@ -1243,3 +1242,21 @@ id "tampilan persentase kemajuan" it "mostra la percentuale di progresso" ru "отображать ход выполнения задачи в процентах" sk "zobraz postup v percento" + +msgid "grad" +bg "град" +ca "g.cent" +de "Neugrad" +de_CH "Neugrad" +en_US "grad" +es "g.cent." +fr "grade" +id "grad" +it "g.cent." +pl "grad" +pt "grados" +pt_BR "grados" +ro "gr.cent" +ru "град" +sk "grády" +zh_CN "梯度" diff --git a/lib/el.po b/lib/el.po index e45adda9..34a82ea1 100644 --- a/lib/el.po +++ b/lib/el.po @@ -2378,9 +2378,7 @@ msgid "%.2f E, %.2f N" msgstr "" #. TRANSLATORS: Used in Aven: -#. From -#. H: 123.45m V: 234.56m -#. Dist: 456.78m Brg: 200 +#. From : H 12.24m, Brg 234.5° #: ../src/mainfrm.cc:2287 #: ../src/mainfrm.cc:2337 #: ../src/mainfrm.cc:2399 @@ -2570,19 +2568,8 @@ msgstr "" #: ../src/gfxcore.cc:775 #: ../src/gfxcore.cc:865 #: ../src/gfxcore.cc:1182 -#: n:76 -msgid "ᵍ" -msgstr "" - -#. TRANSLATORS: alternative angle units (400 grad = 360 degrees = -#. full circle). Try to make this as short as sensibly possible. -#. -#. E.g. in Italian and Spanish we use "g.cent." rather than -#. "gradi quattrocentesimali"/"grados centesimales" -#: ../src/mainfrm.cc:2298 -#: ../src/mainfrm.cc:2419 #: n:345 -msgid "grad" +msgid "ᵍ" msgstr "" #. TRANSLATORS: symbol for percentage gradient (100% = 45 diff --git a/lib/en_US.po b/lib/en_US.po index 1ef88754..95987be8 100644 --- a/lib/en_US.po +++ b/lib/en_US.po @@ -2377,9 +2377,7 @@ msgid "%.2f E, %.2f N" msgstr "%.2f E, %.2f N" #. TRANSLATORS: Used in Aven: -#. From -#. H: 123.45m V: 234.56m -#. Dist: 456.78m Brg: 200 +#. From : H 12.24m, Brg 234.5° #: ../src/mainfrm.cc:2287 #: ../src/mainfrm.cc:2337 #: ../src/mainfrm.cc:2399 @@ -2569,21 +2567,10 @@ msgstr "°" #: ../src/gfxcore.cc:775 #: ../src/gfxcore.cc:865 #: ../src/gfxcore.cc:1182 -#: n:76 +#: n:345 msgid "ᵍ" msgstr "ᵍ" -#. TRANSLATORS: alternative angle units (400 grad = 360 degrees = -#. full circle). Try to make this as short as sensibly possible. -#. -#. E.g. in Italian and Spanish we use "g.cent." rather than -#. "gradi quattrocentesimali"/"grados centesimales" -#: ../src/mainfrm.cc:2298 -#: ../src/mainfrm.cc:2419 -#: n:345 -msgid "grad" -msgstr "grad" - #. TRANSLATORS: symbol for percentage gradient (100% = 45 #. degrees = 50 grad). #: ../src/commands.c:335 diff --git a/lib/es.po b/lib/es.po index ae83cb79..3ee287f0 100644 --- a/lib/es.po +++ b/lib/es.po @@ -2383,9 +2383,7 @@ msgid "%.2f E, %.2f N" msgstr "%.2f E, %.2f N" #. TRANSLATORS: Used in Aven: -#. From -#. H: 123.45m V: 234.56m -#. Dist: 456.78m Brg: 200 +#. From : H 12.24m, Brg 234.5° #: ../src/mainfrm.cc:2287 #: ../src/mainfrm.cc:2337 #: ../src/mainfrm.cc:2399 @@ -2575,21 +2573,10 @@ msgstr "°" #: ../src/gfxcore.cc:775 #: ../src/gfxcore.cc:865 #: ../src/gfxcore.cc:1182 -#: n:76 +#: n:345 msgid "ᵍ" msgstr "ᵍ" -#. TRANSLATORS: alternative angle units (400 grad = 360 degrees = -#. full circle). Try to make this as short as sensibly possible. -#. -#. E.g. in Italian and Spanish we use "g.cent." rather than -#. "gradi quattrocentesimali"/"grados centesimales" -#: ../src/mainfrm.cc:2298 -#: ../src/mainfrm.cc:2419 -#: n:345 -msgid "grad" -msgstr "g.cent." - #. TRANSLATORS: symbol for percentage gradient (100% = 45 #. degrees = 50 grad). #: ../src/commands.c:335 diff --git a/lib/fr.po b/lib/fr.po index 45f1e464..087eaa0c 100644 --- a/lib/fr.po +++ b/lib/fr.po @@ -2377,9 +2377,7 @@ msgid "%.2f E, %.2f N" msgstr "%.2f E, %.2f N" #. TRANSLATORS: Used in Aven: -#. From -#. H: 123.45m V: 234.56m -#. Dist: 456.78m Brg: 200 +#. From : H 12.24m, Brg 234.5° #: ../src/mainfrm.cc:2287 #: ../src/mainfrm.cc:2337 #: ../src/mainfrm.cc:2399 @@ -2569,21 +2567,10 @@ msgstr "°" #: ../src/gfxcore.cc:775 #: ../src/gfxcore.cc:865 #: ../src/gfxcore.cc:1182 -#: n:76 +#: n:345 msgid "ᵍ" msgstr "ᵍ" -#. TRANSLATORS: alternative angle units (400 grad = 360 degrees = -#. full circle). Try to make this as short as sensibly possible. -#. -#. E.g. in Italian and Spanish we use "g.cent." rather than -#. "gradi quattrocentesimali"/"grados centesimales" -#: ../src/mainfrm.cc:2298 -#: ../src/mainfrm.cc:2419 -#: n:345 -msgid "grad" -msgstr "grade" - #. TRANSLATORS: symbol for percentage gradient (100% = 45 #. degrees = 50 grad). #: ../src/commands.c:335 diff --git a/lib/hu.po b/lib/hu.po index 4bfb97d3..25974428 100644 --- a/lib/hu.po +++ b/lib/hu.po @@ -2389,9 +2389,7 @@ msgid "%.2f E, %.2f N" msgstr "" #. TRANSLATORS: Used in Aven: -#. From -#. H: 123.45m V: 234.56m -#. Dist: 456.78m Brg: 200 +#. From : H 12.24m, Brg 234.5° #: ../src/mainfrm.cc:2287 #: ../src/mainfrm.cc:2337 #: ../src/mainfrm.cc:2399 @@ -2581,21 +2579,10 @@ msgstr "°" #: ../src/gfxcore.cc:775 #: ../src/gfxcore.cc:865 #: ../src/gfxcore.cc:1182 -#: n:76 +#: n:345 msgid "ᵍ" msgstr "ᵍ" -#. TRANSLATORS: alternative angle units (400 grad = 360 degrees = -#. full circle). Try to make this as short as sensibly possible. -#. -#. E.g. in Italian and Spanish we use "g.cent." rather than -#. "gradi quattrocentesimali"/"grados centesimales" -#: ../src/mainfrm.cc:2298 -#: ../src/mainfrm.cc:2419 -#: n:345 -msgid "grad" -msgstr "" - #. TRANSLATORS: symbol for percentage gradient (100% = 45 #. degrees = 50 grad). #: ../src/commands.c:335 diff --git a/lib/id.po b/lib/id.po index 62085420..71e65687 100644 --- a/lib/id.po +++ b/lib/id.po @@ -2377,9 +2377,7 @@ msgid "%.2f E, %.2f N" msgstr "%.2f T, %.2f U" #. TRANSLATORS: Used in Aven: -#. From -#. H: 123.45m V: 234.56m -#. Dist: 456.78m Brg: 200 +#. From : H 12.24m, Brg 234.5° #: ../src/mainfrm.cc:2287 #: ../src/mainfrm.cc:2337 #: ../src/mainfrm.cc:2399 @@ -2569,21 +2567,10 @@ msgstr "°" #: ../src/gfxcore.cc:775 #: ../src/gfxcore.cc:865 #: ../src/gfxcore.cc:1182 -#: n:76 +#: n:345 msgid "ᵍ" msgstr "ᵍ" -#. TRANSLATORS: alternative angle units (400 grad = 360 degrees = -#. full circle). Try to make this as short as sensibly possible. -#. -#. E.g. in Italian and Spanish we use "g.cent." rather than -#. "gradi quattrocentesimali"/"grados centesimales" -#: ../src/mainfrm.cc:2298 -#: ../src/mainfrm.cc:2419 -#: n:345 -msgid "grad" -msgstr "grad" - #. TRANSLATORS: symbol for percentage gradient (100% = 45 #. degrees = 50 grad). #: ../src/commands.c:335 diff --git a/lib/it.po b/lib/it.po index b7606d39..01c908d3 100644 --- a/lib/it.po +++ b/lib/it.po @@ -2383,9 +2383,7 @@ msgid "%.2f E, %.2f N" msgstr "%.2f E, %.2f N" #. TRANSLATORS: Used in Aven: -#. From -#. H: 123.45m V: 234.56m -#. Dist: 456.78m Brg: 200 +#. From : H 12.24m, Brg 234.5° #: ../src/mainfrm.cc:2287 #: ../src/mainfrm.cc:2337 #: ../src/mainfrm.cc:2399 @@ -2575,21 +2573,10 @@ msgstr "°" #: ../src/gfxcore.cc:775 #: ../src/gfxcore.cc:865 #: ../src/gfxcore.cc:1182 -#: n:76 +#: n:345 msgid "ᵍ" msgstr "ᵍ" -#. TRANSLATORS: alternative angle units (400 grad = 360 degrees = -#. full circle). Try to make this as short as sensibly possible. -#. -#. E.g. in Italian and Spanish we use "g.cent." rather than -#. "gradi quattrocentesimali"/"grados centesimales" -#: ../src/mainfrm.cc:2298 -#: ../src/mainfrm.cc:2419 -#: n:345 -msgid "grad" -msgstr "g.cent." - #. TRANSLATORS: symbol for percentage gradient (100% = 45 #. degrees = 50 grad). #: ../src/commands.c:335 diff --git a/lib/pl.po b/lib/pl.po index 68bd1d10..d6e0707d 100644 --- a/lib/pl.po +++ b/lib/pl.po @@ -2377,9 +2377,7 @@ msgid "%.2f E, %.2f N" msgstr "%.2f E, %.2f N" #. TRANSLATORS: Used in Aven: -#. From -#. H: 123.45m V: 234.56m -#. Dist: 456.78m Brg: 200 +#. From : H 12.24m, Brg 234.5° #: ../src/mainfrm.cc:2287 #: ../src/mainfrm.cc:2337 #: ../src/mainfrm.cc:2399 @@ -2569,21 +2567,10 @@ msgstr "°" #: ../src/gfxcore.cc:775 #: ../src/gfxcore.cc:865 #: ../src/gfxcore.cc:1182 -#: n:76 +#: n:345 msgid "ᵍ" msgstr "ᵍ" -#. TRANSLATORS: alternative angle units (400 grad = 360 degrees = -#. full circle). Try to make this as short as sensibly possible. -#. -#. E.g. in Italian and Spanish we use "g.cent." rather than -#. "gradi quattrocentesimali"/"grados centesimales" -#: ../src/mainfrm.cc:2298 -#: ../src/mainfrm.cc:2419 -#: n:345 -msgid "grad" -msgstr "grad" - #. TRANSLATORS: symbol for percentage gradient (100% = 45 #. degrees = 50 grad). #: ../src/commands.c:335 diff --git a/lib/pt.po b/lib/pt.po index 11e5875e..fc4fde91 100644 --- a/lib/pt.po +++ b/lib/pt.po @@ -2385,9 +2385,7 @@ msgid "%.2f E, %.2f N" msgstr "%.2f L, %.2f N" #. TRANSLATORS: Used in Aven: -#. From -#. H: 123.45m V: 234.56m -#. Dist: 456.78m Brg: 200 +#. From : H 12.24m, Brg 234.5° #: ../src/mainfrm.cc:2287 #: ../src/mainfrm.cc:2337 #: ../src/mainfrm.cc:2399 @@ -2577,21 +2575,10 @@ msgstr "°" #: ../src/gfxcore.cc:775 #: ../src/gfxcore.cc:865 #: ../src/gfxcore.cc:1182 -#: n:76 +#: n:345 msgid "ᵍ" msgstr "" -#. TRANSLATORS: alternative angle units (400 grad = 360 degrees = -#. full circle). Try to make this as short as sensibly possible. -#. -#. E.g. in Italian and Spanish we use "g.cent." rather than -#. "gradi quattrocentesimali"/"grados centesimales" -#: ../src/mainfrm.cc:2298 -#: ../src/mainfrm.cc:2419 -#: n:345 -msgid "grad" -msgstr "grados" - #. TRANSLATORS: symbol for percentage gradient (100% = 45 #. degrees = 50 grad). #: ../src/commands.c:335 diff --git a/lib/pt_BR.po b/lib/pt_BR.po index f002b14c..9a3465d9 100644 --- a/lib/pt_BR.po +++ b/lib/pt_BR.po @@ -2385,9 +2385,7 @@ msgid "%.2f E, %.2f N" msgstr "%.2f L, %.2f N" #. TRANSLATORS: Used in Aven: -#. From -#. H: 123.45m V: 234.56m -#. Dist: 456.78m Brg: 200 +#. From : H 12.24m, Brg 234.5° #: ../src/mainfrm.cc:2287 #: ../src/mainfrm.cc:2337 #: ../src/mainfrm.cc:2399 @@ -2578,21 +2576,10 @@ msgstr "°" #: ../src/gfxcore.cc:775 #: ../src/gfxcore.cc:865 #: ../src/gfxcore.cc:1182 -#: n:76 +#: n:345 msgid "ᵍ" msgstr "ᵍ" -#. TRANSLATORS: alternative angle units (400 grad = 360 degrees = -#. full circle). Try to make this as short as sensibly possible. -#. -#. E.g. in Italian and Spanish we use "g.cent." rather than -#. "gradi quattrocentesimali"/"grados centesimales" -#: ../src/mainfrm.cc:2298 -#: ../src/mainfrm.cc:2419 -#: n:345 -msgid "grad" -msgstr "grados" - #. TRANSLATORS: symbol for percentage gradient (100% = 45 #. degrees = 50 grad). #: ../src/commands.c:335 diff --git a/lib/ro.po b/lib/ro.po index 329da154..4f163bbc 100644 --- a/lib/ro.po +++ b/lib/ro.po @@ -2383,9 +2383,7 @@ msgid "%.2f E, %.2f N" msgstr "%.2f E, %.2f N" #. TRANSLATORS: Used in Aven: -#. From -#. H: 123.45m V: 234.56m -#. Dist: 456.78m Brg: 200 +#. From : H 12.24m, Brg 234.5° #: ../src/mainfrm.cc:2287 #: ../src/mainfrm.cc:2337 #: ../src/mainfrm.cc:2399 @@ -2575,21 +2573,10 @@ msgstr "°" #: ../src/gfxcore.cc:775 #: ../src/gfxcore.cc:865 #: ../src/gfxcore.cc:1182 -#: n:76 +#: n:345 msgid "ᵍ" msgstr "" -#. TRANSLATORS: alternative angle units (400 grad = 360 degrees = -#. full circle). Try to make this as short as sensibly possible. -#. -#. E.g. in Italian and Spanish we use "g.cent." rather than -#. "gradi quattrocentesimali"/"grados centesimales" -#: ../src/mainfrm.cc:2298 -#: ../src/mainfrm.cc:2419 -#: n:345 -msgid "grad" -msgstr "gr.cent" - #. TRANSLATORS: symbol for percentage gradient (100% = 45 #. degrees = 50 grad). #: ../src/commands.c:335 diff --git a/lib/ru.po b/lib/ru.po index a2441501..5910954f 100644 --- a/lib/ru.po +++ b/lib/ru.po @@ -2381,9 +2381,7 @@ msgid "%.2f E, %.2f N" msgstr "%.2f E, %.2f N" #. TRANSLATORS: Used in Aven: -#. From -#. H: 123.45m V: 234.56m -#. Dist: 456.78m Brg: 200 +#. From : H 12.24m, Brg 234.5° #: ../src/mainfrm.cc:2287 #: ../src/mainfrm.cc:2337 #: ../src/mainfrm.cc:2399 @@ -2573,21 +2571,10 @@ msgstr "°" #: ../src/gfxcore.cc:775 #: ../src/gfxcore.cc:865 #: ../src/gfxcore.cc:1182 -#: n:76 +#: n:345 msgid "ᵍ" msgstr "ᵍ" -#. TRANSLATORS: alternative angle units (400 grad = 360 degrees = -#. full circle). Try to make this as short as sensibly possible. -#. -#. E.g. in Italian and Spanish we use "g.cent." rather than -#. "gradi quattrocentesimali"/"grados centesimales" -#: ../src/mainfrm.cc:2298 -#: ../src/mainfrm.cc:2419 -#: n:345 -msgid "grad" -msgstr "град" - #. TRANSLATORS: symbol for percentage gradient (100% = 45 #. degrees = 50 grad). #: ../src/commands.c:335 diff --git a/lib/sk.po b/lib/sk.po index d3368089..71f8af07 100644 --- a/lib/sk.po +++ b/lib/sk.po @@ -2382,9 +2382,7 @@ msgid "%.2f E, %.2f N" msgstr "%.2f V, %.2f S" #. TRANSLATORS: Used in Aven: -#. From -#. H: 123.45m V: 234.56m -#. Dist: 456.78m Brg: 200 +#. From : H 12.24m, Brg 234.5° #: ../src/mainfrm.cc:2287 #: ../src/mainfrm.cc:2337 #: ../src/mainfrm.cc:2399 @@ -2575,21 +2573,10 @@ msgstr "°" #: ../src/gfxcore.cc:775 #: ../src/gfxcore.cc:865 #: ../src/gfxcore.cc:1182 -#: n:76 +#: n:345 msgid "ᵍ" msgstr "ᵍ" -#. TRANSLATORS: alternative angle units (400 grad = 360 degrees = -#. full circle). Try to make this as short as sensibly possible. -#. -#. E.g. in Italian and Spanish we use "g.cent." rather than -#. "gradi quattrocentesimali"/"grados centesimales" -#: ../src/mainfrm.cc:2298 -#: ../src/mainfrm.cc:2419 -#: n:345 -msgid "grad" -msgstr "grády" - #. TRANSLATORS: symbol for percentage gradient (100% = 45 #. degrees = 50 grad). #: ../src/commands.c:335 diff --git a/lib/survex.pot b/lib/survex.pot index 6ceeaf7a..623370be 100644 --- a/lib/survex.pot +++ b/lib/survex.pot @@ -2379,9 +2379,7 @@ msgid "%.2f E, %.2f N" msgstr "" #. TRANSLATORS: Used in Aven: -#. From -#. H: 123.45m V: 234.56m -#. Dist: 456.78m Brg: 200 +#. From : H 12.24m, Brg 234.5° #: ../src/mainfrm.cc:2287 #: ../src/mainfrm.cc:2337 #: ../src/mainfrm.cc:2399 @@ -2571,19 +2569,8 @@ msgstr "" #: ../src/gfxcore.cc:775 #: ../src/gfxcore.cc:865 #: ../src/gfxcore.cc:1182 -#: n:76 -msgid "ᵍ" -msgstr "" - -#. TRANSLATORS: alternative angle units (400 grad = 360 degrees = -#. full circle). Try to make this as short as sensibly possible. -#. -#. E.g. in Italian and Spanish we use "g.cent." rather than -#. "gradi quattrocentesimali"/"grados centesimales" -#: ../src/mainfrm.cc:2298 -#: ../src/mainfrm.cc:2419 #: n:345 -msgid "grad" +msgid "ᵍ" msgstr "" #. TRANSLATORS: symbol for percentage gradient (100% = 45 diff --git a/lib/zh_CN.po b/lib/zh_CN.po index 20834f88..e710f4b3 100644 --- a/lib/zh_CN.po +++ b/lib/zh_CN.po @@ -2380,9 +2380,7 @@ msgid "%.2f E, %.2f N" msgstr "%.2f东%.2f北" #. TRANSLATORS: Used in Aven: -#. From -#. H: 123.45m V: 234.56m -#. Dist: 456.78m Brg: 200 +#. From : H 12.24m, Brg 234.5° #: ../src/mainfrm.cc:2287 #: ../src/mainfrm.cc:2337 #: ../src/mainfrm.cc:2399 @@ -2572,21 +2570,10 @@ msgstr "°" #: ../src/gfxcore.cc:775 #: ../src/gfxcore.cc:865 #: ../src/gfxcore.cc:1182 -#: n:76 +#: n:345 msgid "ᵍ" msgstr "" -#. TRANSLATORS: alternative angle units (400 grad = 360 degrees = -#. full circle). Try to make this as short as sensibly possible. -#. -#. E.g. in Italian and Spanish we use "g.cent." rather than -#. "gradi quattrocentesimali"/"grados centesimales" -#: ../src/mainfrm.cc:2298 -#: ../src/mainfrm.cc:2419 -#: n:345 -msgid "grad" -msgstr "梯度" - #. TRANSLATORS: symbol for percentage gradient (100% = 45 #. degrees = 50 grad). #: ../src/commands.c:335 diff --git a/src/commands.c b/src/commands.c index b484d1aa..7207a830 100644 --- a/src/commands.c +++ b/src/commands.c @@ -331,7 +331,7 @@ const int units_to_msgno[] = { /*ft*/428, -1, /* yards */ /*°*/344, - /*ᵍ*/76, + /*ᵍ*/345, /*%*/96, -1 /* minutes */ }; diff --git a/src/gfxcore.cc b/src/gfxcore.cc index 03d79feb..e15811ee 100644 --- a/src/gfxcore.cc +++ b/src/gfxcore.cc @@ -772,7 +772,7 @@ void GfxCore::Draw2dIndicators() value = int(m_PanAngle * 200.0 / 180.0); /* TRANSLATORS: symbol for grad (400 grad = 360 degrees = full * circle). */ - brg_unit = /*ᵍ*/76; + brg_unit = /*ᵍ*/345; } str.Printf(wxT("%03d"), value); str += wmsg(brg_unit); @@ -862,7 +862,7 @@ void GfxCore::Draw2dIndicators() width = triple_zero_width; angle = int(m_TiltAngle * 200.0 / 180.0); str = angle ? wxString::Format(wxT("%+04d"), angle) : wxT("000"); - unit = /*ᵍ*/76; + unit = /*ᵍ*/345; } int sign_offset = 0; @@ -1179,7 +1179,7 @@ void GfxCore::DrawGradientKey() // Use fixed colours for each gradient so it's directly visually comparable // between surveys. num_bands = GetNumColourBands(); - wxString units = wmsg(m_Degrees ? /*°*/344 : /*ᵍ*/76); + wxString units = wmsg(m_Degrees ? /*°*/344 : /*ᵍ*/345); for (int band = 0; band < num_bands; ++band) { double gradient = double(band) / (num_bands - 1); if (m_Degrees) { diff --git a/src/mainfrm.cc b/src/mainfrm.cc index 3c110ea8..7e739247 100644 --- a/src/mainfrm.cc +++ b/src/mainfrm.cc @@ -2289,12 +2289,7 @@ void MainFrm::SetCoords(Double x, Double y, const LabelInfo * there) brg_unit = /*°*/344; } else { brg *= 400.0 / 360.0; - /* TRANSLATORS: alternative angle units (400 grad = 360 degrees = - * full circle). Try to make this as short as sensibly possible. - * - * E.g. in Italian and Spanish we use "g.cent." rather than - * "gradi quattrocentesimali"/"grados centesimales" */ - brg_unit = /*grad*/345; + brg_unit = /*ᵍ*/345; } int units; @@ -2415,7 +2410,7 @@ void MainFrm::ShowInfo(const LabelInfo *here, const LabelInfo *there) brg_unit = /*°*/344; } else { brg *= 400.0 / 360.0; - brg_unit = /*grad*/345; + brg_unit = /*ᵍ*/345; } wxString & d = dist_text; /* TRANSLATORS: "Dist" is short for "Distance", "Brg" for "Bearing" (as -- 2.11.4.GIT