Fix translation bug. Default names for increment and measurement should also

be validated in unit tests.

--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2017-03-28 10:18:19 +03:00
parent 5c3aeb3ef0
commit f8836cf563
25 changed files with 227 additions and 111 deletions

View File

@ -2412,7 +2412,7 @@
</message> </message>
<message> <message>
<source>Increment_%1</source> <source>Increment_%1</source>
<translation>Increment_%1</translation> <translation type="vanished">Increment_%1</translation>
</message> </message>
<message> <message>
<source>Edit increment</source> <source>Edit increment</source>
@ -7761,7 +7761,7 @@ Do you want to save your changes?</translation>
</message> </message>
<message> <message>
<source>M_%1</source> <source>M_%1</source>
<translation>M_%1</translation> <translation type="vanished">M_%1</translation>
</message> </message>
<message> <message>
<source>Error</source> <source>Error</source>
@ -11496,6 +11496,16 @@ Do you want to save your changes?</translation>
<comment>hyperbolic arcur tangens function working with degrees</comment> <comment>hyperbolic arcur tangens function working with degrees</comment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>M_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Increment_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>VVITConverter</name> <name>VVITConverter</name>

View File

@ -2120,10 +2120,6 @@
<source>Parser error: %1</source> <source>Parser error: %1</source>
<translation>Chyba zpracování: %1</translation> <translation>Chyba zpracování: %1</translation>
</message> </message>
<message>
<source>Increment_%1</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Edit increment</source> <source>Edit increment</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@ -6998,10 +6994,6 @@ Chcete uložit své změny?</translation>
<source>Edit measurement</source> <source>Edit measurement</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>M_%1</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Error</source> <source>Error</source>
<translation>Chyba</translation> <translation>Chyba</translation>
@ -10437,6 +10429,16 @@ Do you want to save your changes?</source>
<comment>hyperbolic arcur tangens function working with degrees</comment> <comment>hyperbolic arcur tangens function working with degrees</comment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>M_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Increment_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>VVITConverter</name> <name>VVITConverter</name>

View File

@ -2280,7 +2280,7 @@
</message> </message>
<message> <message>
<source>Increment_%1</source> <source>Increment_%1</source>
<translation>Zuwachs_%1</translation> <translation type="vanished">Zuwachs_%1</translation>
</message> </message>
<message> <message>
<source>Edit increment</source> <source>Edit increment</source>
@ -7473,7 +7473,7 @@ Sollen die Änderungen gespeichert werden?</translation>
</message> </message>
<message> <message>
<source>M_%1</source> <source>M_%1</source>
<translation>M_%1</translation> <translation type="vanished">M_%1</translation>
</message> </message>
<message> <message>
<source>Error</source> <source>Error</source>
@ -11118,6 +11118,16 @@ Do you want to save your changes?</source>
<comment>hyperbolic arcur tangens function working with degrees</comment> <comment>hyperbolic arcur tangens function working with degrees</comment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>M_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Increment_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>VVITConverter</name> <name>VVITConverter</name>

View File

@ -2340,7 +2340,7 @@
</message> </message>
<message> <message>
<source>Increment_%1</source> <source>Increment_%1</source>
<translation>Αύξηση_%1</translation> <translation type="vanished">Αύξηση_%1</translation>
</message> </message>
<message> <message>
<source>Edit increment</source> <source>Edit increment</source>
@ -7414,7 +7414,7 @@ Do you want to save your changes?</source>
</message> </message>
<message> <message>
<source>M_%1</source> <source>M_%1</source>
<translation>M_%1</translation> <translation type="vanished">M_%1</translation>
</message> </message>
<message> <message>
<source>Error</source> <source>Error</source>
@ -10875,6 +10875,16 @@ Do you want to save your changes?</source>
<comment>hyperbolic arcur tangens function working with degrees</comment> <comment>hyperbolic arcur tangens function working with degrees</comment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>M_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Increment_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>VVITConverter</name> <name>VVITConverter</name>

View File

@ -2328,7 +2328,7 @@
</message> </message>
<message> <message>
<source>Increment_%1</source> <source>Increment_%1</source>
<translation>Increment_%1</translation> <translation type="vanished">Increment_%1</translation>
</message> </message>
<message> <message>
<source>Edit increment</source> <source>Edit increment</source>
@ -7541,7 +7541,7 @@ Do you want to save your changes?</translation>
</message> </message>
<message> <message>
<source>M_%1</source> <source>M_%1</source>
<translation>M_%1</translation> <translation type="vanished">M_%1</translation>
</message> </message>
<message> <message>
<source>Error</source> <source>Error</source>
@ -11252,6 +11252,16 @@ Do you want to save your changes?</translation>
<comment>hyperbolic arcur tangens function working with degrees</comment> <comment>hyperbolic arcur tangens function working with degrees</comment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>M_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Increment_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>VVITConverter</name> <name>VVITConverter</name>

View File

@ -2328,7 +2328,7 @@
</message> </message>
<message> <message>
<source>Increment_%1</source> <source>Increment_%1</source>
<translation>Increment_%1</translation> <translation type="vanished">Increment_%1</translation>
</message> </message>
<message> <message>
<source>Edit increment</source> <source>Edit increment</source>
@ -7541,7 +7541,7 @@ Do you want to save your changes?</translation>
</message> </message>
<message> <message>
<source>M_%1</source> <source>M_%1</source>
<translation>M_%1</translation> <translation type="vanished">M_%1</translation>
</message> </message>
<message> <message>
<source>Error</source> <source>Error</source>
@ -11252,6 +11252,16 @@ Do you want to save your changes?</translation>
<comment>hyperbolic arcur tangens function working with degrees</comment> <comment>hyperbolic arcur tangens function working with degrees</comment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>M_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Increment_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>VVITConverter</name> <name>VVITConverter</name>

View File

@ -2328,7 +2328,7 @@
</message> </message>
<message> <message>
<source>Increment_%1</source> <source>Increment_%1</source>
<translation>Increment_%1</translation> <translation type="vanished">Increment_%1</translation>
</message> </message>
<message> <message>
<source>Edit increment</source> <source>Edit increment</source>
@ -7541,7 +7541,7 @@ Do you want to save your changes?</translation>
</message> </message>
<message> <message>
<source>M_%1</source> <source>M_%1</source>
<translation>M_%1</translation> <translation type="vanished">M_%1</translation>
</message> </message>
<message> <message>
<source>Error</source> <source>Error</source>
@ -11252,6 +11252,16 @@ Do you want to save your changes?</translation>
<comment>hyperbolic arcur tangens function working with degrees</comment> <comment>hyperbolic arcur tangens function working with degrees</comment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>M_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Increment_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>VVITConverter</name> <name>VVITConverter</name>

View File

@ -1707,10 +1707,6 @@
</context> </context>
<context> <context>
<name>DialogEllipticalArc</name> <name>DialogEllipticalArc</name>
<message>
<source>Dialog</source>
<translation type="vanished">Diálogo</translation>
</message>
<message> <message>
<source>Radius1:</source> <source>Radius1:</source>
<translation>Alcance1:</translation> <translation>Alcance1:</translation>
@ -2413,7 +2409,7 @@
</message> </message>
<message> <message>
<source>Increment_%1</source> <source>Increment_%1</source>
<translation>Incremento_%1</translation> <translation type="vanished">Incremento_%1</translation>
</message> </message>
<message> <message>
<source>Edit increment</source> <source>Edit increment</source>
@ -3771,10 +3767,6 @@ Apply settings anyway?</source>
</context> </context>
<context> <context>
<name>DialogPin</name> <name>DialogPin</name>
<message>
<source>Dialog</source>
<translation type="vanished">Diálogo</translation>
</message>
<message> <message>
<source>Pin tool</source> <source>Pin tool</source>
<translation>Imperdible</translation> <translation>Imperdible</translation>
@ -7637,7 +7629,7 @@ Quiere guardar los cambios?</translation>
</message> </message>
<message> <message>
<source>M_%1</source> <source>M_%1</source>
<translation>M_%1</translation> <translation type="vanished">M_%1</translation>
</message> </message>
<message> <message>
<source>Error</source> <source>Error</source>
@ -11372,6 +11364,16 @@ Do you want to save your changes?</source>
<comment>hyperbolic arcur tangens function working with degrees</comment> <comment>hyperbolic arcur tangens function working with degrees</comment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>M_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Increment_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>VVITConverter</name> <name>VVITConverter</name>

View File

@ -2113,10 +2113,6 @@
<source>Parser error: %1</source> <source>Parser error: %1</source>
<translation>Jäsentämis virhe: %1</translation> <translation>Jäsentämis virhe: %1</translation>
</message> </message>
<message>
<source>Increment_%1</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Edit increment</source> <source>Edit increment</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@ -6983,10 +6979,6 @@ Haluatko tallentaa muutokset?</translation>
<source>Edit measurement</source> <source>Edit measurement</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>M_%1</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Error</source> <source>Error</source>
<translation>Virhe</translation> <translation>Virhe</translation>
@ -10420,6 +10412,16 @@ Do you want to save your changes?</source>
<comment>hyperbolic arcur tangens function working with degrees</comment> <comment>hyperbolic arcur tangens function working with degrees</comment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>M_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Increment_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>VVITConverter</name> <name>VVITConverter</name>

View File

@ -1706,10 +1706,6 @@
</context> </context>
<context> <context>
<name>DialogEllipticalArc</name> <name>DialogEllipticalArc</name>
<message>
<source>Dialog</source>
<translation type="vanished">Dialogue</translation>
</message>
<message> <message>
<source>Radius1:</source> <source>Radius1:</source>
<translation>Rayon1 :</translation> <translation>Rayon1 :</translation>
@ -2412,7 +2408,7 @@
</message> </message>
<message> <message>
<source>Increment_%1</source> <source>Increment_%1</source>
<translation>Increment_%1</translation> <translation type="vanished">Increment_%1</translation>
</message> </message>
<message> <message>
<source>Edit increment</source> <source>Edit increment</source>
@ -3768,10 +3764,6 @@ Appliquer les réglages quand-même ?</translation>
</context> </context>
<context> <context>
<name>DialogPin</name> <name>DialogPin</name>
<message>
<source>Dialog</source>
<translation type="vanished">Dialogue</translation>
</message>
<message> <message>
<source>Pin tool</source> <source>Pin tool</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@ -7630,7 +7622,7 @@ Voulez-vous sauvegarder les changements?</translation>
</message> </message>
<message> <message>
<source>M_%1</source> <source>M_%1</source>
<translation>M_%1</translation> <translation type="vanished">M_%1</translation>
</message> </message>
<message> <message>
<source>Error</source> <source>Error</source>
@ -11340,6 +11332,16 @@ Voulez-vous enregistrer les changements?</translation>
<comment>hyperbolic arcur tangens function working with degrees</comment> <comment>hyperbolic arcur tangens function working with degrees</comment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>M_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Increment_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>VVITConverter</name> <name>VVITConverter</name>

View File

@ -1793,10 +1793,6 @@
<source>Parser error: %1</source> <source>Parser error: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Increment_%1</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Edit increment</source> <source>Edit increment</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@ -6215,10 +6211,6 @@ Do you want to save your changes?</source>
<source>Edit measurement</source> <source>Edit measurement</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>M_%1</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Error</source> <source>Error</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@ -9434,6 +9426,16 @@ Do you want to save your changes?</source>
<comment>hyperbolic arcur tangens function working with degrees</comment> <comment>hyperbolic arcur tangens function working with degrees</comment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>M_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Increment_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>VWidgetDetails</name> <name>VWidgetDetails</name>

View File

@ -1977,10 +1977,6 @@
<source>Parser error: %1</source> <source>Parser error: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Increment_%1</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Edit increment</source> <source>Edit increment</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@ -6468,10 +6464,6 @@ Apakah anda ingin menyimpan perubahan anda?</translation>
<source>Edit measurement</source> <source>Edit measurement</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>M_%1</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Error</source> <source>Error</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@ -9707,6 +9699,16 @@ Do you want to save your changes?</source>
<comment>hyperbolic arcur tangens function working with degrees</comment> <comment>hyperbolic arcur tangens function working with degrees</comment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>M_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Increment_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>VWidgetDetails</name> <name>VWidgetDetails</name>

View File

@ -2324,7 +2324,7 @@
</message> </message>
<message> <message>
<source>Increment_%1</source> <source>Increment_%1</source>
<translation>Incremento_%1</translation> <translation type="vanished">Incremento_%1</translation>
</message> </message>
<message> <message>
<source>Edit increment</source> <source>Edit increment</source>
@ -7533,7 +7533,7 @@ Vuoi salvare i cambiamenti?</translation>
</message> </message>
<message> <message>
<source>M_%1</source> <source>M_%1</source>
<translation>M_%1</translation> <translation type="vanished">M_%1</translation>
</message> </message>
<message> <message>
<source>Error</source> <source>Error</source>
@ -11076,6 +11076,16 @@ Vuoi salvare le tue modifiche?</translation>
<comment>hyperbolic arcur tangens function working with degrees</comment> <comment>hyperbolic arcur tangens function working with degrees</comment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>M_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Increment_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>VVITConverter</name> <name>VVITConverter</name>

View File

@ -1706,10 +1706,6 @@
</context> </context>
<context> <context>
<name>DialogEllipticalArc</name> <name>DialogEllipticalArc</name>
<message>
<source>Dialog</source>
<translation type="vanished">Dialoog</translation>
</message>
<message> <message>
<source>Radius1:</source> <source>Radius1:</source>
<translation>Straal1:</translation> <translation>Straal1:</translation>
@ -2412,7 +2408,7 @@
</message> </message>
<message> <message>
<source>Increment_%1</source> <source>Increment_%1</source>
<translation>Verkleinen/vergroten_%1</translation> <translation type="vanished">Verkleinen/vergroten_%1</translation>
</message> </message>
<message> <message>
<source>Edit increment</source> <source>Edit increment</source>
@ -3771,10 +3767,6 @@ Toch de instellingen aanpassen?</translation>
</context> </context>
<context> <context>
<name>DialogPin</name> <name>DialogPin</name>
<message>
<source>Dialog</source>
<translation type="vanished">Dialoog</translation>
</message>
<message> <message>
<source>Pin tool</source> <source>Pin tool</source>
<translation>Pin gereedschap</translation> <translation>Pin gereedschap</translation>
@ -7637,7 +7629,7 @@ Do you want to save your changes?</source>
</message> </message>
<message> <message>
<source>M_%1</source> <source>M_%1</source>
<translation>M_%1</translation> <translation type="vanished">M_%1</translation>
</message> </message>
<message> <message>
<source>Error</source> <source>Error</source>
@ -11368,6 +11360,16 @@ Wil je deze veranderingen opslaan?</translation>
<comment>hyperbolic arcur tangens function working with degrees</comment> <comment>hyperbolic arcur tangens function working with degrees</comment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>M_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Increment_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>VVITConverter</name> <name>VVITConverter</name>

View File

@ -2158,10 +2158,6 @@
<source>Parser error: %1</source> <source>Parser error: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Increment_%1</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Edit increment</source> <source>Edit increment</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@ -6699,10 +6695,6 @@ Do you want to save your changes?</source>
<source>Edit measurement</source> <source>Edit measurement</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>M_%1</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Error</source> <source>Error</source>
<translation>Erro</translation> <translation>Erro</translation>
@ -10048,6 +10040,16 @@ Do you want to save your changes?</source>
<comment>hyperbolic arcur tangens function working with degrees</comment> <comment>hyperbolic arcur tangens function working with degrees</comment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>M_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Increment_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>VVITConverter</name> <name>VVITConverter</name>

View File

@ -2206,10 +2206,6 @@
<source>Parser error: %1</source> <source>Parser error: %1</source>
<translation>Eroare Parser: %1</translation> <translation>Eroare Parser: %1</translation>
</message> </message>
<message>
<source>Increment_%1</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Edit increment</source> <source>Edit increment</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@ -6955,10 +6951,6 @@ Do you want to save your changes?</source>
<source>Edit measurement</source> <source>Edit measurement</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>M_%1</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Error</source> <source>Error</source>
<translation>Eroare</translation> <translation>Eroare</translation>
@ -10282,6 +10274,16 @@ Do you want to save your changes?</source>
<comment>hyperbolic arcur tangens function working with degrees</comment> <comment>hyperbolic arcur tangens function working with degrees</comment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>M_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Increment_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>VWidgetDetails</name> <name>VWidgetDetails</name>

View File

@ -1706,10 +1706,6 @@
</context> </context>
<context> <context>
<name>DialogEllipticalArc</name> <name>DialogEllipticalArc</name>
<message>
<source>Dialog</source>
<translation type="vanished">Диалог</translation>
</message>
<message> <message>
<source>Radius1:</source> <source>Radius1:</source>
<translation>Радиус1:</translation> <translation>Радиус1:</translation>
@ -2412,7 +2408,7 @@
</message> </message>
<message> <message>
<source>Increment_%1</source> <source>Increment_%1</source>
<translation>Прибавка_%1</translation> <translation type="vanished">Прибавка_%1</translation>
</message> </message>
<message> <message>
<source>Edit increment</source> <source>Edit increment</source>
@ -7633,7 +7629,7 @@ Do you want to save your changes?</source>
</message> </message>
<message> <message>
<source>M_%1</source> <source>M_%1</source>
<translation>М_%1</translation> <translation type="vanished">М_%1</translation>
</message> </message>
<message> <message>
<source>Error</source> <source>Error</source>
@ -11369,6 +11365,16 @@ Do you want to save your changes?</source>
<comment>hyperbolic arcur tangens function working with degrees</comment> <comment>hyperbolic arcur tangens function working with degrees</comment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>M_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Increment_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>VVITConverter</name> <name>VVITConverter</name>

View File

@ -2312,7 +2312,7 @@
</message> </message>
<message> <message>
<source>Increment_%1</source> <source>Increment_%1</source>
<translation>Прибавка_%1</translation> <translation type="vanished">Прибавка_%1</translation>
</message> </message>
<message> <message>
<source>Edit increment</source> <source>Edit increment</source>
@ -7504,7 +7504,7 @@ Do you want to save your changes?</source>
</message> </message>
<message> <message>
<source>M_%1</source> <source>M_%1</source>
<translation>M_%1</translation> <translation type="vanished">M_%1</translation>
</message> </message>
<message> <message>
<source>Error</source> <source>Error</source>
@ -11189,6 +11189,16 @@ Do you want to save your changes?</source>
<comment>hyperbolic arcur tangens function working with degrees</comment> <comment>hyperbolic arcur tangens function working with degrees</comment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>M_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Increment_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>VVITConverter</name> <name>VVITConverter</name>

View File

@ -1760,10 +1760,6 @@
<source>Parser error: %1</source> <source>Parser error: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Increment_%1</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Edit increment</source> <source>Edit increment</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@ -6142,10 +6138,6 @@ Do you want to save your changes?</source>
<source>Edit measurement</source> <source>Edit measurement</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>M_%1</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Error</source> <source>Error</source>
<translation></translation> <translation></translation>
@ -9373,6 +9365,16 @@ Do you want to save your changes?</source>
<comment>hyperbolic arcur tangens function working with degrees</comment> <comment>hyperbolic arcur tangens function working with degrees</comment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>M_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Increment_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>VWidgetDetails</name> <name>VWidgetDetails</name>

View File

@ -1237,7 +1237,7 @@ void TMainWindow::AddCustom()
QString name; QString name;
do do
{ {
name = CustomMSign + tr("M_%1").arg(num); name = CustomMSign + qApp->TrVars()->InternalVarToUser(measurement_) + QString().number(num);
num++; num++;
} while (data->IsUnique(name) == false); } while (data->IsUnique(name) == false);

View File

@ -471,7 +471,7 @@ void DialogIncrements::AddIncrement()
QString name; QString name;
do do
{ {
name = CustomIncrSign + tr("Increment_%1").arg(num); name = CustomIncrSign + qApp->TrVars()->InternalVarToUser(increment_) + QString().number(num);
num++; num++;
} while (data->IsUnique(name)==false); } while (data->IsUnique(name)==false);

View File

@ -165,6 +165,8 @@ const QString ColorDeepSkyBlue = QStringLiteral("deepskyblue");
const QString ColorCornFlowerBlue = QStringLiteral("cornflowerblue"); const QString ColorCornFlowerBlue = QStringLiteral("cornflowerblue");
//variables //variables
const QString measurement_ = QStringLiteral("M_");
const QString increment_ = QStringLiteral("Increment_");
const QString line_ = QStringLiteral("Line_"); const QString line_ = QStringLiteral("Line_");
const QString angleLine_ = QStringLiteral("AngleLine_"); const QString angleLine_ = QStringLiteral("AngleLine_");
const QString spl_ = QStringLiteral(SPL_); const QString spl_ = QStringLiteral(SPL_);
@ -190,7 +192,9 @@ const QString seg_ = QStringLiteral("Seg_");
const QString currentLength = QStringLiteral("CurrentLength"); const QString currentLength = QStringLiteral("CurrentLength");
const QString currentSeamAllowance = QStringLiteral("CurrentSeamAllowance"); const QString currentSeamAllowance = QStringLiteral("CurrentSeamAllowance");
const QStringList builInVariables = QStringList() << line_ const QStringList builInVariables = QStringList() << measurement_
<< increment_
<< line_
<< angleLine_ << angleLine_
<< arc_ << arc_
<< spl_ << spl_

View File

@ -174,6 +174,8 @@ extern const QString ColorCornFlowerBlue;
#define ARC_ "Arc_" #define ARC_ "Arc_"
#define EARC_ "ElArc_" #define EARC_ "ElArc_"
extern const QString measurement_;
extern const QString increment_;
extern const QString line_; extern const QString line_;
extern const QString angleLine_; extern const QString angleLine_;
extern const QString arc_; extern const QString arc_;

View File

@ -372,6 +372,8 @@ void VTranslateVars::InitPatternMakingSystems()
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void VTranslateVars::InitVariables() void VTranslateVars::InitVariables()
{ {
variables.insert(measurement_, translate("VTranslateVars", "M_", "Left symbol _ in the name"));
variables.insert(increment_, translate("VTranslateVars", "Increment_", "Left symbol _ in the name"));
variables.insert(line_, translate("VTranslateVars", "Line_", "Left symbol _ in the name")); variables.insert(line_, translate("VTranslateVars", "Line_", "Left symbol _ in the name"));
variables.insert(angleLine_, translate("VTranslateVars", "AngleLine_", "Left symbol _ in the name")); variables.insert(angleLine_, translate("VTranslateVars", "AngleLine_", "Left symbol _ in the name"));
variables.insert(arc_, translate("VTranslateVars", "Arc_", "Left symbol _ in the name")); variables.insert(arc_, translate("VTranslateVars", "Arc_", "Left symbol _ in the name"));

View File

@ -124,6 +124,8 @@ void TST_BuitInRegExp::TestCheckUnderlineExists_data()
{ {
QMap<QString, bool> data; QMap<QString, bool> data;
data.insert(measurement_, true);
data.insert(increment_, true);
data.insert(line_, true); data.insert(line_, true);
data.insert(angleLine_, true); data.insert(angleLine_, true);
data.insert(arc_, true); data.insert(arc_, true);