diff --git a/share/translations/measurements_p0_fr_FR.ts b/share/translations/measurements_p0_fr_FR.ts index ba103ee04..c1e60de9e 100644 --- a/share/translations/measurements_p0_fr_FR.ts +++ b/share/translations/measurements_p0_fr_FR.ts @@ -3821,7 +3821,7 @@ From Waist Side around hip curve down to surface, while seated on hard surface. Full measurement description. - + Du Côté de la Taille le long de la courbe des hanches jusqu'à la surface, en étant assis sur une surface dure diff --git a/share/translations/measurements_p0_nl_NL.ts b/share/translations/measurements_p0_nl_NL.ts index 9e28c7241..197f7b5bd 100644 --- a/share/translations/measurements_p0_nl_NL.ts +++ b/share/translations/measurements_p0_nl_NL.ts @@ -1945,7 +1945,7 @@ From mid-Shoulder down front to Highbust level, aimed at Bustpoint. Full measurement description. - + Van midden schouder tot hogeborstlijn, richting borstpunt. @@ -1963,19 +1963,19 @@ From Shoulder Tip, curving around Armscye Back, then down to Waist Side. Full measurement description. - + Van schouderpunt, rondom armplooi rug, tot aan zijkant taille. neck_side_to_waist_b Name in a formula. Don't use math symbols and space in name!!!! - + nek_zijkant_tot_taille_a Neck Side to Waist level, back Full measurement name. - + Zijkant nek tot taille, achter diff --git a/share/translations/measurements_p10_fr_FR.ts b/share/translations/measurements_p10_fr_FR.ts index c5d5b40ba..6d4e9b0c2 100644 --- a/share/translations/measurements_p10_fr_FR.ts +++ b/share/translations/measurements_p10_fr_FR.ts @@ -3821,7 +3821,7 @@ From Waist Side around hip curve down to surface, while seated on hard surface. Full measurement description. - + Du Côté de la Taille le long de la courbe des hanches jusqu'à la surface, en étant assis sur une surface dure diff --git a/share/translations/measurements_p10_nl_NL.ts b/share/translations/measurements_p10_nl_NL.ts index c0707caed..86dc2adbf 100644 --- a/share/translations/measurements_p10_nl_NL.ts +++ b/share/translations/measurements_p10_nl_NL.ts @@ -1946,7 +1946,7 @@ From mid-Shoulder down front to Highbust level, aimed at Bustpoint. Full measurement description. - + Van midden schouder tot hogeborstlijn, richting borstpunt. @@ -1970,13 +1970,13 @@ neck_side_to_waist_b Name in a formula. Don't use math symbols and space in name!!!! - + nek_zijkant_tot_taille_a Neck Side to Waist level, back Full measurement name. - + Zijkant nek tot taille, achter diff --git a/share/translations/measurements_p11_fr_FR.ts b/share/translations/measurements_p11_fr_FR.ts index c5d5b40ba..6d4e9b0c2 100644 --- a/share/translations/measurements_p11_fr_FR.ts +++ b/share/translations/measurements_p11_fr_FR.ts @@ -3821,7 +3821,7 @@ From Waist Side around hip curve down to surface, while seated on hard surface. Full measurement description. - + Du Côté de la Taille le long de la courbe des hanches jusqu'à la surface, en étant assis sur une surface dure diff --git a/share/translations/measurements_p11_nl_NL.ts b/share/translations/measurements_p11_nl_NL.ts index c0707caed..86dc2adbf 100644 --- a/share/translations/measurements_p11_nl_NL.ts +++ b/share/translations/measurements_p11_nl_NL.ts @@ -1946,7 +1946,7 @@ From mid-Shoulder down front to Highbust level, aimed at Bustpoint. Full measurement description. - + Van midden schouder tot hogeborstlijn, richting borstpunt. @@ -1970,13 +1970,13 @@ neck_side_to_waist_b Name in a formula. Don't use math symbols and space in name!!!! - + nek_zijkant_tot_taille_a Neck Side to Waist level, back Full measurement name. - + Zijkant nek tot taille, achter diff --git a/share/translations/measurements_p12_fr_FR.ts b/share/translations/measurements_p12_fr_FR.ts index c5d5b40ba..6d4e9b0c2 100644 --- a/share/translations/measurements_p12_fr_FR.ts +++ b/share/translations/measurements_p12_fr_FR.ts @@ -3821,7 +3821,7 @@ From Waist Side around hip curve down to surface, while seated on hard surface. Full measurement description. - + Du Côté de la Taille le long de la courbe des hanches jusqu'à la surface, en étant assis sur une surface dure diff --git a/share/translations/measurements_p12_nl_NL.ts b/share/translations/measurements_p12_nl_NL.ts index c0707caed..86dc2adbf 100644 --- a/share/translations/measurements_p12_nl_NL.ts +++ b/share/translations/measurements_p12_nl_NL.ts @@ -1946,7 +1946,7 @@ From mid-Shoulder down front to Highbust level, aimed at Bustpoint. Full measurement description. - + Van midden schouder tot hogeborstlijn, richting borstpunt. @@ -1970,13 +1970,13 @@ neck_side_to_waist_b Name in a formula. Don't use math symbols and space in name!!!! - + nek_zijkant_tot_taille_a Neck Side to Waist level, back Full measurement name. - + Zijkant nek tot taille, achter diff --git a/share/translations/measurements_p13_fr_FR.ts b/share/translations/measurements_p13_fr_FR.ts index c5d5b40ba..6d4e9b0c2 100644 --- a/share/translations/measurements_p13_fr_FR.ts +++ b/share/translations/measurements_p13_fr_FR.ts @@ -3821,7 +3821,7 @@ From Waist Side around hip curve down to surface, while seated on hard surface. Full measurement description. - + Du Côté de la Taille le long de la courbe des hanches jusqu'à la surface, en étant assis sur une surface dure diff --git a/share/translations/measurements_p13_nl_NL.ts b/share/translations/measurements_p13_nl_NL.ts index 2ba4d4553..86dc2adbf 100644 --- a/share/translations/measurements_p13_nl_NL.ts +++ b/share/translations/measurements_p13_nl_NL.ts @@ -1946,7 +1946,7 @@ From mid-Shoulder down front to Highbust level, aimed at Bustpoint. Full measurement description. - + Van midden schouder tot hogeborstlijn, richting borstpunt. @@ -1976,7 +1976,7 @@ Neck Side to Waist level, back Full measurement name. - + Zijkant nek tot taille, achter diff --git a/share/translations/measurements_p14_fr_FR.ts b/share/translations/measurements_p14_fr_FR.ts index 4f0873fb5..81463bcf5 100644 --- a/share/translations/measurements_p14_fr_FR.ts +++ b/share/translations/measurements_p14_fr_FR.ts @@ -3821,7 +3821,7 @@ From Waist Side around hip curve down to surface, while seated on hard surface. Full measurement description. - + Du Côté de la Taille le long de la courbe des hanches jusqu'à la surface, en étant assis sur une surface dure diff --git a/share/translations/measurements_p14_nl_NL.ts b/share/translations/measurements_p14_nl_NL.ts index 2ba4d4553..86dc2adbf 100644 --- a/share/translations/measurements_p14_nl_NL.ts +++ b/share/translations/measurements_p14_nl_NL.ts @@ -1946,7 +1946,7 @@ From mid-Shoulder down front to Highbust level, aimed at Bustpoint. Full measurement description. - + Van midden schouder tot hogeborstlijn, richting borstpunt. @@ -1976,7 +1976,7 @@ Neck Side to Waist level, back Full measurement name. - + Zijkant nek tot taille, achter diff --git a/share/translations/measurements_p15_fr_FR.ts b/share/translations/measurements_p15_fr_FR.ts index c5d5b40ba..6d4e9b0c2 100644 --- a/share/translations/measurements_p15_fr_FR.ts +++ b/share/translations/measurements_p15_fr_FR.ts @@ -3821,7 +3821,7 @@ From Waist Side around hip curve down to surface, while seated on hard surface. Full measurement description. - + Du Côté de la Taille le long de la courbe des hanches jusqu'à la surface, en étant assis sur une surface dure diff --git a/share/translations/measurements_p15_nl_NL.ts b/share/translations/measurements_p15_nl_NL.ts index 2ba4d4553..86dc2adbf 100644 --- a/share/translations/measurements_p15_nl_NL.ts +++ b/share/translations/measurements_p15_nl_NL.ts @@ -1946,7 +1946,7 @@ From mid-Shoulder down front to Highbust level, aimed at Bustpoint. Full measurement description. - + Van midden schouder tot hogeborstlijn, richting borstpunt. @@ -1976,7 +1976,7 @@ Neck Side to Waist level, back Full measurement name. - + Zijkant nek tot taille, achter diff --git a/share/translations/measurements_p16_fr_FR.ts b/share/translations/measurements_p16_fr_FR.ts index c5d5b40ba..6d4e9b0c2 100644 --- a/share/translations/measurements_p16_fr_FR.ts +++ b/share/translations/measurements_p16_fr_FR.ts @@ -3821,7 +3821,7 @@ From Waist Side around hip curve down to surface, while seated on hard surface. Full measurement description. - + Du Côté de la Taille le long de la courbe des hanches jusqu'à la surface, en étant assis sur une surface dure diff --git a/share/translations/measurements_p16_nl_NL.ts b/share/translations/measurements_p16_nl_NL.ts index 2ba4d4553..86dc2adbf 100644 --- a/share/translations/measurements_p16_nl_NL.ts +++ b/share/translations/measurements_p16_nl_NL.ts @@ -1946,7 +1946,7 @@ From mid-Shoulder down front to Highbust level, aimed at Bustpoint. Full measurement description. - + Van midden schouder tot hogeborstlijn, richting borstpunt. @@ -1976,7 +1976,7 @@ Neck Side to Waist level, back Full measurement name. - + Zijkant nek tot taille, achter diff --git a/share/translations/measurements_p17_fr_FR.ts b/share/translations/measurements_p17_fr_FR.ts index c5d5b40ba..6d4e9b0c2 100644 --- a/share/translations/measurements_p17_fr_FR.ts +++ b/share/translations/measurements_p17_fr_FR.ts @@ -3821,7 +3821,7 @@ From Waist Side around hip curve down to surface, while seated on hard surface. Full measurement description. - + Du Côté de la Taille le long de la courbe des hanches jusqu'à la surface, en étant assis sur une surface dure diff --git a/share/translations/measurements_p17_nl_NL.ts b/share/translations/measurements_p17_nl_NL.ts index 09fb9cc8e..86dc2adbf 100644 --- a/share/translations/measurements_p17_nl_NL.ts +++ b/share/translations/measurements_p17_nl_NL.ts @@ -1946,7 +1946,7 @@ From mid-Shoulder down front to Highbust level, aimed at Bustpoint. Full measurement description. - + Van midden schouder tot hogeborstlijn, richting borstpunt. diff --git a/share/translations/measurements_p18_fr_FR.ts b/share/translations/measurements_p18_fr_FR.ts index c5d5b40ba..6d4e9b0c2 100644 --- a/share/translations/measurements_p18_fr_FR.ts +++ b/share/translations/measurements_p18_fr_FR.ts @@ -3821,7 +3821,7 @@ From Waist Side around hip curve down to surface, while seated on hard surface. Full measurement description. - + Du Côté de la Taille le long de la courbe des hanches jusqu'à la surface, en étant assis sur une surface dure diff --git a/share/translations/measurements_p18_nl_NL.ts b/share/translations/measurements_p18_nl_NL.ts index 09fb9cc8e..86dc2adbf 100644 --- a/share/translations/measurements_p18_nl_NL.ts +++ b/share/translations/measurements_p18_nl_NL.ts @@ -1946,7 +1946,7 @@ From mid-Shoulder down front to Highbust level, aimed at Bustpoint. Full measurement description. - + Van midden schouder tot hogeborstlijn, richting borstpunt. diff --git a/share/translations/measurements_p19_fr_FR.ts b/share/translations/measurements_p19_fr_FR.ts index c5d5b40ba..6d4e9b0c2 100644 --- a/share/translations/measurements_p19_fr_FR.ts +++ b/share/translations/measurements_p19_fr_FR.ts @@ -3821,7 +3821,7 @@ From Waist Side around hip curve down to surface, while seated on hard surface. Full measurement description. - + Du Côté de la Taille le long de la courbe des hanches jusqu'à la surface, en étant assis sur une surface dure diff --git a/share/translations/measurements_p19_nl_NL.ts b/share/translations/measurements_p19_nl_NL.ts index 09fb9cc8e..86dc2adbf 100644 --- a/share/translations/measurements_p19_nl_NL.ts +++ b/share/translations/measurements_p19_nl_NL.ts @@ -1946,7 +1946,7 @@ From mid-Shoulder down front to Highbust level, aimed at Bustpoint. Full measurement description. - + Van midden schouder tot hogeborstlijn, richting borstpunt. diff --git a/share/translations/measurements_p1_fr_FR.ts b/share/translations/measurements_p1_fr_FR.ts index c5d5b40ba..6d4e9b0c2 100644 --- a/share/translations/measurements_p1_fr_FR.ts +++ b/share/translations/measurements_p1_fr_FR.ts @@ -3821,7 +3821,7 @@ From Waist Side around hip curve down to surface, while seated on hard surface. Full measurement description. - + Du Côté de la Taille le long de la courbe des hanches jusqu'à la surface, en étant assis sur une surface dure diff --git a/share/translations/measurements_p1_nl_NL.ts b/share/translations/measurements_p1_nl_NL.ts index 06c0aadd5..86dc2adbf 100644 --- a/share/translations/measurements_p1_nl_NL.ts +++ b/share/translations/measurements_p1_nl_NL.ts @@ -1946,7 +1946,7 @@ From mid-Shoulder down front to Highbust level, aimed at Bustpoint. Full measurement description. - + Van midden schouder tot hogeborstlijn, richting borstpunt. @@ -1964,19 +1964,19 @@ From Shoulder Tip, curving around Armscye Back, then down to Waist Side. Full measurement description. - + Van schouderpunt, rondom armplooi rug, tot aan zijkant taille. neck_side_to_waist_b Name in a formula. Don't use math symbols and space in name!!!! - + nek_zijkant_tot_taille_a Neck Side to Waist level, back Full measurement name. - + Zijkant nek tot taille, achter diff --git a/share/translations/measurements_p20_fr_FR.ts b/share/translations/measurements_p20_fr_FR.ts index c5d5b40ba..6d4e9b0c2 100644 --- a/share/translations/measurements_p20_fr_FR.ts +++ b/share/translations/measurements_p20_fr_FR.ts @@ -3821,7 +3821,7 @@ From Waist Side around hip curve down to surface, while seated on hard surface. Full measurement description. - + Du Côté de la Taille le long de la courbe des hanches jusqu'à la surface, en étant assis sur une surface dure diff --git a/share/translations/measurements_p20_nl_NL.ts b/share/translations/measurements_p20_nl_NL.ts index 09fb9cc8e..86dc2adbf 100644 --- a/share/translations/measurements_p20_nl_NL.ts +++ b/share/translations/measurements_p20_nl_NL.ts @@ -1946,7 +1946,7 @@ From mid-Shoulder down front to Highbust level, aimed at Bustpoint. Full measurement description. - + Van midden schouder tot hogeborstlijn, richting borstpunt. diff --git a/share/translations/measurements_p21_fr_FR.ts b/share/translations/measurements_p21_fr_FR.ts index c5d5b40ba..6d4e9b0c2 100644 --- a/share/translations/measurements_p21_fr_FR.ts +++ b/share/translations/measurements_p21_fr_FR.ts @@ -3821,7 +3821,7 @@ From Waist Side around hip curve down to surface, while seated on hard surface. Full measurement description. - + Du Côté de la Taille le long de la courbe des hanches jusqu'à la surface, en étant assis sur une surface dure diff --git a/share/translations/measurements_p21_nl_NL.ts b/share/translations/measurements_p21_nl_NL.ts index 09fb9cc8e..86dc2adbf 100644 --- a/share/translations/measurements_p21_nl_NL.ts +++ b/share/translations/measurements_p21_nl_NL.ts @@ -1946,7 +1946,7 @@ From mid-Shoulder down front to Highbust level, aimed at Bustpoint. Full measurement description. - + Van midden schouder tot hogeborstlijn, richting borstpunt. diff --git a/share/translations/measurements_p22_fr_FR.ts b/share/translations/measurements_p22_fr_FR.ts index c5d5b40ba..6d4e9b0c2 100644 --- a/share/translations/measurements_p22_fr_FR.ts +++ b/share/translations/measurements_p22_fr_FR.ts @@ -3821,7 +3821,7 @@ From Waist Side around hip curve down to surface, while seated on hard surface. Full measurement description. - + Du Côté de la Taille le long de la courbe des hanches jusqu'à la surface, en étant assis sur une surface dure diff --git a/share/translations/measurements_p22_nl_NL.ts b/share/translations/measurements_p22_nl_NL.ts index 09fb9cc8e..86dc2adbf 100644 --- a/share/translations/measurements_p22_nl_NL.ts +++ b/share/translations/measurements_p22_nl_NL.ts @@ -1946,7 +1946,7 @@ From mid-Shoulder down front to Highbust level, aimed at Bustpoint. Full measurement description. - + Van midden schouder tot hogeborstlijn, richting borstpunt. diff --git a/share/translations/measurements_p23_fr_FR.ts b/share/translations/measurements_p23_fr_FR.ts index c5d5b40ba..6d4e9b0c2 100644 --- a/share/translations/measurements_p23_fr_FR.ts +++ b/share/translations/measurements_p23_fr_FR.ts @@ -3821,7 +3821,7 @@ From Waist Side around hip curve down to surface, while seated on hard surface. Full measurement description. - + Du Côté de la Taille le long de la courbe des hanches jusqu'à la surface, en étant assis sur une surface dure diff --git a/share/translations/measurements_p23_nl_NL.ts b/share/translations/measurements_p23_nl_NL.ts index 09fb9cc8e..86dc2adbf 100644 --- a/share/translations/measurements_p23_nl_NL.ts +++ b/share/translations/measurements_p23_nl_NL.ts @@ -1946,7 +1946,7 @@ From mid-Shoulder down front to Highbust level, aimed at Bustpoint. Full measurement description. - + Van midden schouder tot hogeborstlijn, richting borstpunt. diff --git a/share/translations/measurements_p24_fr_FR.ts b/share/translations/measurements_p24_fr_FR.ts index c5d5b40ba..6d4e9b0c2 100644 --- a/share/translations/measurements_p24_fr_FR.ts +++ b/share/translations/measurements_p24_fr_FR.ts @@ -3821,7 +3821,7 @@ From Waist Side around hip curve down to surface, while seated on hard surface. Full measurement description. - + Du Côté de la Taille le long de la courbe des hanches jusqu'à la surface, en étant assis sur une surface dure diff --git a/share/translations/measurements_p24_nl_NL.ts b/share/translations/measurements_p24_nl_NL.ts index 09fb9cc8e..86dc2adbf 100644 --- a/share/translations/measurements_p24_nl_NL.ts +++ b/share/translations/measurements_p24_nl_NL.ts @@ -1946,7 +1946,7 @@ From mid-Shoulder down front to Highbust level, aimed at Bustpoint. Full measurement description. - + Van midden schouder tot hogeborstlijn, richting borstpunt. diff --git a/share/translations/measurements_p25_fr_FR.ts b/share/translations/measurements_p25_fr_FR.ts index c5d5b40ba..6d4e9b0c2 100644 --- a/share/translations/measurements_p25_fr_FR.ts +++ b/share/translations/measurements_p25_fr_FR.ts @@ -3821,7 +3821,7 @@ From Waist Side around hip curve down to surface, while seated on hard surface. Full measurement description. - + Du Côté de la Taille le long de la courbe des hanches jusqu'à la surface, en étant assis sur une surface dure diff --git a/share/translations/measurements_p25_nl_NL.ts b/share/translations/measurements_p25_nl_NL.ts index 09fb9cc8e..86dc2adbf 100644 --- a/share/translations/measurements_p25_nl_NL.ts +++ b/share/translations/measurements_p25_nl_NL.ts @@ -1946,7 +1946,7 @@ From mid-Shoulder down front to Highbust level, aimed at Bustpoint. Full measurement description. - + Van midden schouder tot hogeborstlijn, richting borstpunt. diff --git a/share/translations/measurements_p26_fr_FR.ts b/share/translations/measurements_p26_fr_FR.ts index c5d5b40ba..6d4e9b0c2 100644 --- a/share/translations/measurements_p26_fr_FR.ts +++ b/share/translations/measurements_p26_fr_FR.ts @@ -3821,7 +3821,7 @@ From Waist Side around hip curve down to surface, while seated on hard surface. Full measurement description. - + Du Côté de la Taille le long de la courbe des hanches jusqu'à la surface, en étant assis sur une surface dure diff --git a/share/translations/measurements_p26_nl_NL.ts b/share/translations/measurements_p26_nl_NL.ts index 09fb9cc8e..86dc2adbf 100644 --- a/share/translations/measurements_p26_nl_NL.ts +++ b/share/translations/measurements_p26_nl_NL.ts @@ -1946,7 +1946,7 @@ From mid-Shoulder down front to Highbust level, aimed at Bustpoint. Full measurement description. - + Van midden schouder tot hogeborstlijn, richting borstpunt. diff --git a/share/translations/measurements_p27_fr_FR.ts b/share/translations/measurements_p27_fr_FR.ts index c5d5b40ba..6d4e9b0c2 100644 --- a/share/translations/measurements_p27_fr_FR.ts +++ b/share/translations/measurements_p27_fr_FR.ts @@ -3821,7 +3821,7 @@ From Waist Side around hip curve down to surface, while seated on hard surface. Full measurement description. - + Du Côté de la Taille le long de la courbe des hanches jusqu'à la surface, en étant assis sur une surface dure diff --git a/share/translations/measurements_p27_nl_NL.ts b/share/translations/measurements_p27_nl_NL.ts index 09fb9cc8e..86dc2adbf 100644 --- a/share/translations/measurements_p27_nl_NL.ts +++ b/share/translations/measurements_p27_nl_NL.ts @@ -1946,7 +1946,7 @@ From mid-Shoulder down front to Highbust level, aimed at Bustpoint. Full measurement description. - + Van midden schouder tot hogeborstlijn, richting borstpunt. diff --git a/share/translations/measurements_p28_fr_FR.ts b/share/translations/measurements_p28_fr_FR.ts index c5d5b40ba..6d4e9b0c2 100644 --- a/share/translations/measurements_p28_fr_FR.ts +++ b/share/translations/measurements_p28_fr_FR.ts @@ -3821,7 +3821,7 @@ From Waist Side around hip curve down to surface, while seated on hard surface. Full measurement description. - + Du Côté de la Taille le long de la courbe des hanches jusqu'à la surface, en étant assis sur une surface dure diff --git a/share/translations/measurements_p28_nl_NL.ts b/share/translations/measurements_p28_nl_NL.ts index 09fb9cc8e..86dc2adbf 100644 --- a/share/translations/measurements_p28_nl_NL.ts +++ b/share/translations/measurements_p28_nl_NL.ts @@ -1946,7 +1946,7 @@ From mid-Shoulder down front to Highbust level, aimed at Bustpoint. Full measurement description. - + Van midden schouder tot hogeborstlijn, richting borstpunt. diff --git a/share/translations/measurements_p29_fr_FR.ts b/share/translations/measurements_p29_fr_FR.ts index c5d5b40ba..6d4e9b0c2 100644 --- a/share/translations/measurements_p29_fr_FR.ts +++ b/share/translations/measurements_p29_fr_FR.ts @@ -3821,7 +3821,7 @@ From Waist Side around hip curve down to surface, while seated on hard surface. Full measurement description. - + Du Côté de la Taille le long de la courbe des hanches jusqu'à la surface, en étant assis sur une surface dure diff --git a/share/translations/measurements_p29_nl_NL.ts b/share/translations/measurements_p29_nl_NL.ts index 09fb9cc8e..86dc2adbf 100644 --- a/share/translations/measurements_p29_nl_NL.ts +++ b/share/translations/measurements_p29_nl_NL.ts @@ -1946,7 +1946,7 @@ From mid-Shoulder down front to Highbust level, aimed at Bustpoint. Full measurement description. - + Van midden schouder tot hogeborstlijn, richting borstpunt. diff --git a/share/translations/measurements_p2_fr_FR.ts b/share/translations/measurements_p2_fr_FR.ts index c5d5b40ba..6d4e9b0c2 100644 --- a/share/translations/measurements_p2_fr_FR.ts +++ b/share/translations/measurements_p2_fr_FR.ts @@ -3821,7 +3821,7 @@ From Waist Side around hip curve down to surface, while seated on hard surface. Full measurement description. - + Du Côté de la Taille le long de la courbe des hanches jusqu'à la surface, en étant assis sur une surface dure diff --git a/share/translations/measurements_p2_nl_NL.ts b/share/translations/measurements_p2_nl_NL.ts index 06c0aadd5..86dc2adbf 100644 --- a/share/translations/measurements_p2_nl_NL.ts +++ b/share/translations/measurements_p2_nl_NL.ts @@ -1946,7 +1946,7 @@ From mid-Shoulder down front to Highbust level, aimed at Bustpoint. Full measurement description. - + Van midden schouder tot hogeborstlijn, richting borstpunt. @@ -1964,19 +1964,19 @@ From Shoulder Tip, curving around Armscye Back, then down to Waist Side. Full measurement description. - + Van schouderpunt, rondom armplooi rug, tot aan zijkant taille. neck_side_to_waist_b Name in a formula. Don't use math symbols and space in name!!!! - + nek_zijkant_tot_taille_a Neck Side to Waist level, back Full measurement name. - + Zijkant nek tot taille, achter diff --git a/share/translations/measurements_p30_fr_FR.ts b/share/translations/measurements_p30_fr_FR.ts index c5d5b40ba..6d4e9b0c2 100644 --- a/share/translations/measurements_p30_fr_FR.ts +++ b/share/translations/measurements_p30_fr_FR.ts @@ -3821,7 +3821,7 @@ From Waist Side around hip curve down to surface, while seated on hard surface. Full measurement description. - + Du Côté de la Taille le long de la courbe des hanches jusqu'à la surface, en étant assis sur une surface dure diff --git a/share/translations/measurements_p30_nl_NL.ts b/share/translations/measurements_p30_nl_NL.ts index 09fb9cc8e..86dc2adbf 100644 --- a/share/translations/measurements_p30_nl_NL.ts +++ b/share/translations/measurements_p30_nl_NL.ts @@ -1946,7 +1946,7 @@ From mid-Shoulder down front to Highbust level, aimed at Bustpoint. Full measurement description. - + Van midden schouder tot hogeborstlijn, richting borstpunt. diff --git a/share/translations/measurements_p31_fr_FR.ts b/share/translations/measurements_p31_fr_FR.ts index c5d5b40ba..6d4e9b0c2 100644 --- a/share/translations/measurements_p31_fr_FR.ts +++ b/share/translations/measurements_p31_fr_FR.ts @@ -3821,7 +3821,7 @@ From Waist Side around hip curve down to surface, while seated on hard surface. Full measurement description. - + Du Côté de la Taille le long de la courbe des hanches jusqu'à la surface, en étant assis sur une surface dure diff --git a/share/translations/measurements_p31_nl_NL.ts b/share/translations/measurements_p31_nl_NL.ts index 09fb9cc8e..86dc2adbf 100644 --- a/share/translations/measurements_p31_nl_NL.ts +++ b/share/translations/measurements_p31_nl_NL.ts @@ -1946,7 +1946,7 @@ From mid-Shoulder down front to Highbust level, aimed at Bustpoint. Full measurement description. - + Van midden schouder tot hogeborstlijn, richting borstpunt. diff --git a/share/translations/measurements_p32_fr_FR.ts b/share/translations/measurements_p32_fr_FR.ts index c5d5b40ba..6d4e9b0c2 100644 --- a/share/translations/measurements_p32_fr_FR.ts +++ b/share/translations/measurements_p32_fr_FR.ts @@ -3821,7 +3821,7 @@ From Waist Side around hip curve down to surface, while seated on hard surface. Full measurement description. - + Du Côté de la Taille le long de la courbe des hanches jusqu'à la surface, en étant assis sur une surface dure diff --git a/share/translations/measurements_p32_nl_NL.ts b/share/translations/measurements_p32_nl_NL.ts index 09fb9cc8e..86dc2adbf 100644 --- a/share/translations/measurements_p32_nl_NL.ts +++ b/share/translations/measurements_p32_nl_NL.ts @@ -1946,7 +1946,7 @@ From mid-Shoulder down front to Highbust level, aimed at Bustpoint. Full measurement description. - + Van midden schouder tot hogeborstlijn, richting borstpunt. diff --git a/share/translations/measurements_p33_fr_FR.ts b/share/translations/measurements_p33_fr_FR.ts index c5d5b40ba..6d4e9b0c2 100644 --- a/share/translations/measurements_p33_fr_FR.ts +++ b/share/translations/measurements_p33_fr_FR.ts @@ -3821,7 +3821,7 @@ From Waist Side around hip curve down to surface, while seated on hard surface. Full measurement description. - + Du Côté de la Taille le long de la courbe des hanches jusqu'à la surface, en étant assis sur une surface dure diff --git a/share/translations/measurements_p33_nl_NL.ts b/share/translations/measurements_p33_nl_NL.ts index 09fb9cc8e..86dc2adbf 100644 --- a/share/translations/measurements_p33_nl_NL.ts +++ b/share/translations/measurements_p33_nl_NL.ts @@ -1946,7 +1946,7 @@ From mid-Shoulder down front to Highbust level, aimed at Bustpoint. Full measurement description. - + Van midden schouder tot hogeborstlijn, richting borstpunt. diff --git a/share/translations/measurements_p34_fr_FR.ts b/share/translations/measurements_p34_fr_FR.ts index c5d5b40ba..6d4e9b0c2 100644 --- a/share/translations/measurements_p34_fr_FR.ts +++ b/share/translations/measurements_p34_fr_FR.ts @@ -3821,7 +3821,7 @@ From Waist Side around hip curve down to surface, while seated on hard surface. Full measurement description. - + Du Côté de la Taille le long de la courbe des hanches jusqu'à la surface, en étant assis sur une surface dure diff --git a/share/translations/measurements_p34_nl_NL.ts b/share/translations/measurements_p34_nl_NL.ts index 09fb9cc8e..86dc2adbf 100644 --- a/share/translations/measurements_p34_nl_NL.ts +++ b/share/translations/measurements_p34_nl_NL.ts @@ -1946,7 +1946,7 @@ From mid-Shoulder down front to Highbust level, aimed at Bustpoint. Full measurement description. - + Van midden schouder tot hogeborstlijn, richting borstpunt. diff --git a/share/translations/measurements_p35_fr_FR.ts b/share/translations/measurements_p35_fr_FR.ts index c5d5b40ba..6d4e9b0c2 100644 --- a/share/translations/measurements_p35_fr_FR.ts +++ b/share/translations/measurements_p35_fr_FR.ts @@ -3821,7 +3821,7 @@ From Waist Side around hip curve down to surface, while seated on hard surface. Full measurement description. - + Du Côté de la Taille le long de la courbe des hanches jusqu'à la surface, en étant assis sur une surface dure diff --git a/share/translations/measurements_p35_nl_NL.ts b/share/translations/measurements_p35_nl_NL.ts index 09fb9cc8e..86dc2adbf 100644 --- a/share/translations/measurements_p35_nl_NL.ts +++ b/share/translations/measurements_p35_nl_NL.ts @@ -1946,7 +1946,7 @@ From mid-Shoulder down front to Highbust level, aimed at Bustpoint. Full measurement description. - + Van midden schouder tot hogeborstlijn, richting borstpunt. diff --git a/share/translations/measurements_p36_fr_FR.ts b/share/translations/measurements_p36_fr_FR.ts index c5d5b40ba..6d4e9b0c2 100644 --- a/share/translations/measurements_p36_fr_FR.ts +++ b/share/translations/measurements_p36_fr_FR.ts @@ -3821,7 +3821,7 @@ From Waist Side around hip curve down to surface, while seated on hard surface. Full measurement description. - + Du Côté de la Taille le long de la courbe des hanches jusqu'à la surface, en étant assis sur une surface dure diff --git a/share/translations/measurements_p36_nl_NL.ts b/share/translations/measurements_p36_nl_NL.ts index 09fb9cc8e..86dc2adbf 100644 --- a/share/translations/measurements_p36_nl_NL.ts +++ b/share/translations/measurements_p36_nl_NL.ts @@ -1946,7 +1946,7 @@ From mid-Shoulder down front to Highbust level, aimed at Bustpoint. Full measurement description. - + Van midden schouder tot hogeborstlijn, richting borstpunt. diff --git a/share/translations/measurements_p37_fr_FR.ts b/share/translations/measurements_p37_fr_FR.ts index c5d5b40ba..6d4e9b0c2 100644 --- a/share/translations/measurements_p37_fr_FR.ts +++ b/share/translations/measurements_p37_fr_FR.ts @@ -3821,7 +3821,7 @@ From Waist Side around hip curve down to surface, while seated on hard surface. Full measurement description. - + Du Côté de la Taille le long de la courbe des hanches jusqu'à la surface, en étant assis sur une surface dure diff --git a/share/translations/measurements_p37_nl_NL.ts b/share/translations/measurements_p37_nl_NL.ts index 09fb9cc8e..86dc2adbf 100644 --- a/share/translations/measurements_p37_nl_NL.ts +++ b/share/translations/measurements_p37_nl_NL.ts @@ -1946,7 +1946,7 @@ From mid-Shoulder down front to Highbust level, aimed at Bustpoint. Full measurement description. - + Van midden schouder tot hogeborstlijn, richting borstpunt. diff --git a/share/translations/measurements_p38_fr_FR.ts b/share/translations/measurements_p38_fr_FR.ts index c5d5b40ba..6d4e9b0c2 100644 --- a/share/translations/measurements_p38_fr_FR.ts +++ b/share/translations/measurements_p38_fr_FR.ts @@ -3821,7 +3821,7 @@ From Waist Side around hip curve down to surface, while seated on hard surface. Full measurement description. - + Du Côté de la Taille le long de la courbe des hanches jusqu'à la surface, en étant assis sur une surface dure diff --git a/share/translations/measurements_p38_nl_NL.ts b/share/translations/measurements_p38_nl_NL.ts index 09fb9cc8e..86dc2adbf 100644 --- a/share/translations/measurements_p38_nl_NL.ts +++ b/share/translations/measurements_p38_nl_NL.ts @@ -1946,7 +1946,7 @@ From mid-Shoulder down front to Highbust level, aimed at Bustpoint. Full measurement description. - + Van midden schouder tot hogeborstlijn, richting borstpunt. diff --git a/share/translations/measurements_p39_fr_FR.ts b/share/translations/measurements_p39_fr_FR.ts index c5d5b40ba..6d4e9b0c2 100644 --- a/share/translations/measurements_p39_fr_FR.ts +++ b/share/translations/measurements_p39_fr_FR.ts @@ -3821,7 +3821,7 @@ From Waist Side around hip curve down to surface, while seated on hard surface. Full measurement description. - + Du Côté de la Taille le long de la courbe des hanches jusqu'à la surface, en étant assis sur une surface dure diff --git a/share/translations/measurements_p39_nl_NL.ts b/share/translations/measurements_p39_nl_NL.ts index 09fb9cc8e..86dc2adbf 100644 --- a/share/translations/measurements_p39_nl_NL.ts +++ b/share/translations/measurements_p39_nl_NL.ts @@ -1946,7 +1946,7 @@ From mid-Shoulder down front to Highbust level, aimed at Bustpoint. Full measurement description. - + Van midden schouder tot hogeborstlijn, richting borstpunt. diff --git a/share/translations/measurements_p3_fr_FR.ts b/share/translations/measurements_p3_fr_FR.ts index c5d5b40ba..6d4e9b0c2 100644 --- a/share/translations/measurements_p3_fr_FR.ts +++ b/share/translations/measurements_p3_fr_FR.ts @@ -3821,7 +3821,7 @@ From Waist Side around hip curve down to surface, while seated on hard surface. Full measurement description. - + Du Côté de la Taille le long de la courbe des hanches jusqu'à la surface, en étant assis sur une surface dure diff --git a/share/translations/measurements_p3_nl_NL.ts b/share/translations/measurements_p3_nl_NL.ts index 06c0aadd5..86dc2adbf 100644 --- a/share/translations/measurements_p3_nl_NL.ts +++ b/share/translations/measurements_p3_nl_NL.ts @@ -1946,7 +1946,7 @@ From mid-Shoulder down front to Highbust level, aimed at Bustpoint. Full measurement description. - + Van midden schouder tot hogeborstlijn, richting borstpunt. @@ -1964,19 +1964,19 @@ From Shoulder Tip, curving around Armscye Back, then down to Waist Side. Full measurement description. - + Van schouderpunt, rondom armplooi rug, tot aan zijkant taille. neck_side_to_waist_b Name in a formula. Don't use math symbols and space in name!!!! - + nek_zijkant_tot_taille_a Neck Side to Waist level, back Full measurement name. - + Zijkant nek tot taille, achter diff --git a/share/translations/measurements_p40_fr_FR.ts b/share/translations/measurements_p40_fr_FR.ts index c5d5b40ba..6d4e9b0c2 100644 --- a/share/translations/measurements_p40_fr_FR.ts +++ b/share/translations/measurements_p40_fr_FR.ts @@ -3821,7 +3821,7 @@ From Waist Side around hip curve down to surface, while seated on hard surface. Full measurement description. - + Du Côté de la Taille le long de la courbe des hanches jusqu'à la surface, en étant assis sur une surface dure diff --git a/share/translations/measurements_p40_nl_NL.ts b/share/translations/measurements_p40_nl_NL.ts index 09fb9cc8e..86dc2adbf 100644 --- a/share/translations/measurements_p40_nl_NL.ts +++ b/share/translations/measurements_p40_nl_NL.ts @@ -1946,7 +1946,7 @@ From mid-Shoulder down front to Highbust level, aimed at Bustpoint. Full measurement description. - + Van midden schouder tot hogeborstlijn, richting borstpunt. diff --git a/share/translations/measurements_p41_fr_FR.ts b/share/translations/measurements_p41_fr_FR.ts index c5d5b40ba..6d4e9b0c2 100644 --- a/share/translations/measurements_p41_fr_FR.ts +++ b/share/translations/measurements_p41_fr_FR.ts @@ -3821,7 +3821,7 @@ From Waist Side around hip curve down to surface, while seated on hard surface. Full measurement description. - + Du Côté de la Taille le long de la courbe des hanches jusqu'à la surface, en étant assis sur une surface dure diff --git a/share/translations/measurements_p41_nl_NL.ts b/share/translations/measurements_p41_nl_NL.ts index 09fb9cc8e..86dc2adbf 100644 --- a/share/translations/measurements_p41_nl_NL.ts +++ b/share/translations/measurements_p41_nl_NL.ts @@ -1946,7 +1946,7 @@ From mid-Shoulder down front to Highbust level, aimed at Bustpoint. Full measurement description. - + Van midden schouder tot hogeborstlijn, richting borstpunt. diff --git a/share/translations/measurements_p42_fr_FR.ts b/share/translations/measurements_p42_fr_FR.ts index c5d5b40ba..6d4e9b0c2 100644 --- a/share/translations/measurements_p42_fr_FR.ts +++ b/share/translations/measurements_p42_fr_FR.ts @@ -3821,7 +3821,7 @@ From Waist Side around hip curve down to surface, while seated on hard surface. Full measurement description. - + Du Côté de la Taille le long de la courbe des hanches jusqu'à la surface, en étant assis sur une surface dure diff --git a/share/translations/measurements_p42_nl_NL.ts b/share/translations/measurements_p42_nl_NL.ts index 09fb9cc8e..86dc2adbf 100644 --- a/share/translations/measurements_p42_nl_NL.ts +++ b/share/translations/measurements_p42_nl_NL.ts @@ -1946,7 +1946,7 @@ From mid-Shoulder down front to Highbust level, aimed at Bustpoint. Full measurement description. - + Van midden schouder tot hogeborstlijn, richting borstpunt. diff --git a/share/translations/measurements_p43_fr_FR.ts b/share/translations/measurements_p43_fr_FR.ts index c5d5b40ba..6d4e9b0c2 100644 --- a/share/translations/measurements_p43_fr_FR.ts +++ b/share/translations/measurements_p43_fr_FR.ts @@ -3821,7 +3821,7 @@ From Waist Side around hip curve down to surface, while seated on hard surface. Full measurement description. - + Du Côté de la Taille le long de la courbe des hanches jusqu'à la surface, en étant assis sur une surface dure diff --git a/share/translations/measurements_p43_nl_NL.ts b/share/translations/measurements_p43_nl_NL.ts index 09fb9cc8e..86dc2adbf 100644 --- a/share/translations/measurements_p43_nl_NL.ts +++ b/share/translations/measurements_p43_nl_NL.ts @@ -1946,7 +1946,7 @@ From mid-Shoulder down front to Highbust level, aimed at Bustpoint. Full measurement description. - + Van midden schouder tot hogeborstlijn, richting borstpunt. diff --git a/share/translations/measurements_p44_fr_FR.ts b/share/translations/measurements_p44_fr_FR.ts index c5d5b40ba..6d4e9b0c2 100644 --- a/share/translations/measurements_p44_fr_FR.ts +++ b/share/translations/measurements_p44_fr_FR.ts @@ -3821,7 +3821,7 @@ From Waist Side around hip curve down to surface, while seated on hard surface. Full measurement description. - + Du Côté de la Taille le long de la courbe des hanches jusqu'à la surface, en étant assis sur une surface dure diff --git a/share/translations/measurements_p44_nl_NL.ts b/share/translations/measurements_p44_nl_NL.ts index 09fb9cc8e..86dc2adbf 100644 --- a/share/translations/measurements_p44_nl_NL.ts +++ b/share/translations/measurements_p44_nl_NL.ts @@ -1946,7 +1946,7 @@ From mid-Shoulder down front to Highbust level, aimed at Bustpoint. Full measurement description. - + Van midden schouder tot hogeborstlijn, richting borstpunt. diff --git a/share/translations/measurements_p45_fr_FR.ts b/share/translations/measurements_p45_fr_FR.ts index c5d5b40ba..6d4e9b0c2 100644 --- a/share/translations/measurements_p45_fr_FR.ts +++ b/share/translations/measurements_p45_fr_FR.ts @@ -3821,7 +3821,7 @@ From Waist Side around hip curve down to surface, while seated on hard surface. Full measurement description. - + Du Côté de la Taille le long de la courbe des hanches jusqu'à la surface, en étant assis sur une surface dure diff --git a/share/translations/measurements_p45_nl_NL.ts b/share/translations/measurements_p45_nl_NL.ts index 09fb9cc8e..86dc2adbf 100644 --- a/share/translations/measurements_p45_nl_NL.ts +++ b/share/translations/measurements_p45_nl_NL.ts @@ -1946,7 +1946,7 @@ From mid-Shoulder down front to Highbust level, aimed at Bustpoint. Full measurement description. - + Van midden schouder tot hogeborstlijn, richting borstpunt. diff --git a/share/translations/measurements_p46_fr_FR.ts b/share/translations/measurements_p46_fr_FR.ts index c5d5b40ba..6d4e9b0c2 100644 --- a/share/translations/measurements_p46_fr_FR.ts +++ b/share/translations/measurements_p46_fr_FR.ts @@ -3821,7 +3821,7 @@ From Waist Side around hip curve down to surface, while seated on hard surface. Full measurement description. - + Du Côté de la Taille le long de la courbe des hanches jusqu'à la surface, en étant assis sur une surface dure diff --git a/share/translations/measurements_p46_nl_NL.ts b/share/translations/measurements_p46_nl_NL.ts index 09fb9cc8e..86dc2adbf 100644 --- a/share/translations/measurements_p46_nl_NL.ts +++ b/share/translations/measurements_p46_nl_NL.ts @@ -1946,7 +1946,7 @@ From mid-Shoulder down front to Highbust level, aimed at Bustpoint. Full measurement description. - + Van midden schouder tot hogeborstlijn, richting borstpunt. diff --git a/share/translations/measurements_p47_fr_FR.ts b/share/translations/measurements_p47_fr_FR.ts index c5d5b40ba..6d4e9b0c2 100644 --- a/share/translations/measurements_p47_fr_FR.ts +++ b/share/translations/measurements_p47_fr_FR.ts @@ -3821,7 +3821,7 @@ From Waist Side around hip curve down to surface, while seated on hard surface. Full measurement description. - + Du Côté de la Taille le long de la courbe des hanches jusqu'à la surface, en étant assis sur une surface dure diff --git a/share/translations/measurements_p47_nl_NL.ts b/share/translations/measurements_p47_nl_NL.ts index 09fb9cc8e..86dc2adbf 100644 --- a/share/translations/measurements_p47_nl_NL.ts +++ b/share/translations/measurements_p47_nl_NL.ts @@ -1946,7 +1946,7 @@ From mid-Shoulder down front to Highbust level, aimed at Bustpoint. Full measurement description. - + Van midden schouder tot hogeborstlijn, richting borstpunt. diff --git a/share/translations/measurements_p48_fr_FR.ts b/share/translations/measurements_p48_fr_FR.ts index c5d5b40ba..6d4e9b0c2 100644 --- a/share/translations/measurements_p48_fr_FR.ts +++ b/share/translations/measurements_p48_fr_FR.ts @@ -3821,7 +3821,7 @@ From Waist Side around hip curve down to surface, while seated on hard surface. Full measurement description. - + Du Côté de la Taille le long de la courbe des hanches jusqu'à la surface, en étant assis sur une surface dure diff --git a/share/translations/measurements_p48_nl_NL.ts b/share/translations/measurements_p48_nl_NL.ts index 09fb9cc8e..86dc2adbf 100644 --- a/share/translations/measurements_p48_nl_NL.ts +++ b/share/translations/measurements_p48_nl_NL.ts @@ -1946,7 +1946,7 @@ From mid-Shoulder down front to Highbust level, aimed at Bustpoint. Full measurement description. - + Van midden schouder tot hogeborstlijn, richting borstpunt. diff --git a/share/translations/measurements_p49_fr_FR.ts b/share/translations/measurements_p49_fr_FR.ts index c5d5b40ba..6d4e9b0c2 100644 --- a/share/translations/measurements_p49_fr_FR.ts +++ b/share/translations/measurements_p49_fr_FR.ts @@ -3821,7 +3821,7 @@ From Waist Side around hip curve down to surface, while seated on hard surface. Full measurement description. - + Du Côté de la Taille le long de la courbe des hanches jusqu'à la surface, en étant assis sur une surface dure diff --git a/share/translations/measurements_p49_nl_NL.ts b/share/translations/measurements_p49_nl_NL.ts index 09fb9cc8e..86dc2adbf 100644 --- a/share/translations/measurements_p49_nl_NL.ts +++ b/share/translations/measurements_p49_nl_NL.ts @@ -1946,7 +1946,7 @@ From mid-Shoulder down front to Highbust level, aimed at Bustpoint. Full measurement description. - + Van midden schouder tot hogeborstlijn, richting borstpunt. diff --git a/share/translations/measurements_p4_fr_FR.ts b/share/translations/measurements_p4_fr_FR.ts index c5d5b40ba..6d4e9b0c2 100644 --- a/share/translations/measurements_p4_fr_FR.ts +++ b/share/translations/measurements_p4_fr_FR.ts @@ -3821,7 +3821,7 @@ From Waist Side around hip curve down to surface, while seated on hard surface. Full measurement description. - + Du Côté de la Taille le long de la courbe des hanches jusqu'à la surface, en étant assis sur une surface dure diff --git a/share/translations/measurements_p4_nl_NL.ts b/share/translations/measurements_p4_nl_NL.ts index 06c0aadd5..86dc2adbf 100644 --- a/share/translations/measurements_p4_nl_NL.ts +++ b/share/translations/measurements_p4_nl_NL.ts @@ -1946,7 +1946,7 @@ From mid-Shoulder down front to Highbust level, aimed at Bustpoint. Full measurement description. - + Van midden schouder tot hogeborstlijn, richting borstpunt. @@ -1964,19 +1964,19 @@ From Shoulder Tip, curving around Armscye Back, then down to Waist Side. Full measurement description. - + Van schouderpunt, rondom armplooi rug, tot aan zijkant taille. neck_side_to_waist_b Name in a formula. Don't use math symbols and space in name!!!! - + nek_zijkant_tot_taille_a Neck Side to Waist level, back Full measurement name. - + Zijkant nek tot taille, achter diff --git a/share/translations/measurements_p50_fr_FR.ts b/share/translations/measurements_p50_fr_FR.ts index c5d5b40ba..6d4e9b0c2 100644 --- a/share/translations/measurements_p50_fr_FR.ts +++ b/share/translations/measurements_p50_fr_FR.ts @@ -3821,7 +3821,7 @@ From Waist Side around hip curve down to surface, while seated on hard surface. Full measurement description. - + Du Côté de la Taille le long de la courbe des hanches jusqu'à la surface, en étant assis sur une surface dure diff --git a/share/translations/measurements_p50_nl_NL.ts b/share/translations/measurements_p50_nl_NL.ts index 09fb9cc8e..86dc2adbf 100644 --- a/share/translations/measurements_p50_nl_NL.ts +++ b/share/translations/measurements_p50_nl_NL.ts @@ -1946,7 +1946,7 @@ From mid-Shoulder down front to Highbust level, aimed at Bustpoint. Full measurement description. - + Van midden schouder tot hogeborstlijn, richting borstpunt. diff --git a/share/translations/measurements_p51_fr_FR.ts b/share/translations/measurements_p51_fr_FR.ts index 48cd3ea92..1630dfcfd 100644 --- a/share/translations/measurements_p51_fr_FR.ts +++ b/share/translations/measurements_p51_fr_FR.ts @@ -3821,7 +3821,7 @@ From Waist Side around hip curve down to surface, while seated on hard surface. Full measurement description. - + Du Côté de la Taille le long de la courbe des hanches jusqu'à la surface, en étant assis sur une surface dure diff --git a/share/translations/measurements_p51_nl_NL.ts b/share/translations/measurements_p51_nl_NL.ts index 09fb9cc8e..86dc2adbf 100644 --- a/share/translations/measurements_p51_nl_NL.ts +++ b/share/translations/measurements_p51_nl_NL.ts @@ -1946,7 +1946,7 @@ From mid-Shoulder down front to Highbust level, aimed at Bustpoint. Full measurement description. - + Van midden schouder tot hogeborstlijn, richting borstpunt. diff --git a/share/translations/measurements_p52_fr_FR.ts b/share/translations/measurements_p52_fr_FR.ts index c5d5b40ba..6d4e9b0c2 100644 --- a/share/translations/measurements_p52_fr_FR.ts +++ b/share/translations/measurements_p52_fr_FR.ts @@ -3821,7 +3821,7 @@ From Waist Side around hip curve down to surface, while seated on hard surface. Full measurement description. - + Du Côté de la Taille le long de la courbe des hanches jusqu'à la surface, en étant assis sur une surface dure diff --git a/share/translations/measurements_p52_nl_NL.ts b/share/translations/measurements_p52_nl_NL.ts index 09fb9cc8e..86dc2adbf 100644 --- a/share/translations/measurements_p52_nl_NL.ts +++ b/share/translations/measurements_p52_nl_NL.ts @@ -1946,7 +1946,7 @@ From mid-Shoulder down front to Highbust level, aimed at Bustpoint. Full measurement description. - + Van midden schouder tot hogeborstlijn, richting borstpunt. diff --git a/share/translations/measurements_p53_fr_FR.ts b/share/translations/measurements_p53_fr_FR.ts index c5d5b40ba..6d4e9b0c2 100644 --- a/share/translations/measurements_p53_fr_FR.ts +++ b/share/translations/measurements_p53_fr_FR.ts @@ -3821,7 +3821,7 @@ From Waist Side around hip curve down to surface, while seated on hard surface. Full measurement description. - + Du Côté de la Taille le long de la courbe des hanches jusqu'à la surface, en étant assis sur une surface dure diff --git a/share/translations/measurements_p53_nl_NL.ts b/share/translations/measurements_p53_nl_NL.ts index 09fb9cc8e..86dc2adbf 100644 --- a/share/translations/measurements_p53_nl_NL.ts +++ b/share/translations/measurements_p53_nl_NL.ts @@ -1946,7 +1946,7 @@ From mid-Shoulder down front to Highbust level, aimed at Bustpoint. Full measurement description. - + Van midden schouder tot hogeborstlijn, richting borstpunt. diff --git a/share/translations/measurements_p54_fr_FR.ts b/share/translations/measurements_p54_fr_FR.ts index c5d5b40ba..6d4e9b0c2 100644 --- a/share/translations/measurements_p54_fr_FR.ts +++ b/share/translations/measurements_p54_fr_FR.ts @@ -3821,7 +3821,7 @@ From Waist Side around hip curve down to surface, while seated on hard surface. Full measurement description. - + Du Côté de la Taille le long de la courbe des hanches jusqu'à la surface, en étant assis sur une surface dure diff --git a/share/translations/measurements_p54_nl_NL.ts b/share/translations/measurements_p54_nl_NL.ts index 09fb9cc8e..86dc2adbf 100644 --- a/share/translations/measurements_p54_nl_NL.ts +++ b/share/translations/measurements_p54_nl_NL.ts @@ -1946,7 +1946,7 @@ From mid-Shoulder down front to Highbust level, aimed at Bustpoint. Full measurement description. - + Van midden schouder tot hogeborstlijn, richting borstpunt. diff --git a/share/translations/measurements_p5_fr_FR.ts b/share/translations/measurements_p5_fr_FR.ts index c5d5b40ba..6d4e9b0c2 100644 --- a/share/translations/measurements_p5_fr_FR.ts +++ b/share/translations/measurements_p5_fr_FR.ts @@ -3821,7 +3821,7 @@ From Waist Side around hip curve down to surface, while seated on hard surface. Full measurement description. - + Du Côté de la Taille le long de la courbe des hanches jusqu'à la surface, en étant assis sur une surface dure diff --git a/share/translations/measurements_p5_nl_NL.ts b/share/translations/measurements_p5_nl_NL.ts index 06c0aadd5..86dc2adbf 100644 --- a/share/translations/measurements_p5_nl_NL.ts +++ b/share/translations/measurements_p5_nl_NL.ts @@ -1946,7 +1946,7 @@ From mid-Shoulder down front to Highbust level, aimed at Bustpoint. Full measurement description. - + Van midden schouder tot hogeborstlijn, richting borstpunt. @@ -1964,19 +1964,19 @@ From Shoulder Tip, curving around Armscye Back, then down to Waist Side. Full measurement description. - + Van schouderpunt, rondom armplooi rug, tot aan zijkant taille. neck_side_to_waist_b Name in a formula. Don't use math symbols and space in name!!!! - + nek_zijkant_tot_taille_a Neck Side to Waist level, back Full measurement name. - + Zijkant nek tot taille, achter diff --git a/share/translations/measurements_p6_fr_FR.ts b/share/translations/measurements_p6_fr_FR.ts index 47f941fe2..c0468bc2a 100644 --- a/share/translations/measurements_p6_fr_FR.ts +++ b/share/translations/measurements_p6_fr_FR.ts @@ -3821,7 +3821,7 @@ From Waist Side around hip curve down to surface, while seated on hard surface. Full measurement description. - + Du Côté de la Taille le long de la courbe des hanches jusqu'à la surface, en étant assis sur une surface dure diff --git a/share/translations/measurements_p6_nl_NL.ts b/share/translations/measurements_p6_nl_NL.ts index 06c0aadd5..86dc2adbf 100644 --- a/share/translations/measurements_p6_nl_NL.ts +++ b/share/translations/measurements_p6_nl_NL.ts @@ -1946,7 +1946,7 @@ From mid-Shoulder down front to Highbust level, aimed at Bustpoint. Full measurement description. - + Van midden schouder tot hogeborstlijn, richting borstpunt. @@ -1964,19 +1964,19 @@ From Shoulder Tip, curving around Armscye Back, then down to Waist Side. Full measurement description. - + Van schouderpunt, rondom armplooi rug, tot aan zijkant taille. neck_side_to_waist_b Name in a formula. Don't use math symbols and space in name!!!! - + nek_zijkant_tot_taille_a Neck Side to Waist level, back Full measurement name. - + Zijkant nek tot taille, achter diff --git a/share/translations/measurements_p7_fr_FR.ts b/share/translations/measurements_p7_fr_FR.ts index c5d5b40ba..6d4e9b0c2 100644 --- a/share/translations/measurements_p7_fr_FR.ts +++ b/share/translations/measurements_p7_fr_FR.ts @@ -3821,7 +3821,7 @@ From Waist Side around hip curve down to surface, while seated on hard surface. Full measurement description. - + Du Côté de la Taille le long de la courbe des hanches jusqu'à la surface, en étant assis sur une surface dure diff --git a/share/translations/measurements_p7_nl_NL.ts b/share/translations/measurements_p7_nl_NL.ts index 06c0aadd5..86dc2adbf 100644 --- a/share/translations/measurements_p7_nl_NL.ts +++ b/share/translations/measurements_p7_nl_NL.ts @@ -1946,7 +1946,7 @@ From mid-Shoulder down front to Highbust level, aimed at Bustpoint. Full measurement description. - + Van midden schouder tot hogeborstlijn, richting borstpunt. @@ -1964,19 +1964,19 @@ From Shoulder Tip, curving around Armscye Back, then down to Waist Side. Full measurement description. - + Van schouderpunt, rondom armplooi rug, tot aan zijkant taille. neck_side_to_waist_b Name in a formula. Don't use math symbols and space in name!!!! - + nek_zijkant_tot_taille_a Neck Side to Waist level, back Full measurement name. - + Zijkant nek tot taille, achter diff --git a/share/translations/measurements_p8_fr_FR.ts b/share/translations/measurements_p8_fr_FR.ts index c5d5b40ba..6d4e9b0c2 100644 --- a/share/translations/measurements_p8_fr_FR.ts +++ b/share/translations/measurements_p8_fr_FR.ts @@ -3821,7 +3821,7 @@ From Waist Side around hip curve down to surface, while seated on hard surface. Full measurement description. - + Du Côté de la Taille le long de la courbe des hanches jusqu'à la surface, en étant assis sur une surface dure diff --git a/share/translations/measurements_p8_nl_NL.ts b/share/translations/measurements_p8_nl_NL.ts index c0707caed..86dc2adbf 100644 --- a/share/translations/measurements_p8_nl_NL.ts +++ b/share/translations/measurements_p8_nl_NL.ts @@ -1946,7 +1946,7 @@ From mid-Shoulder down front to Highbust level, aimed at Bustpoint. Full measurement description. - + Van midden schouder tot hogeborstlijn, richting borstpunt. @@ -1970,13 +1970,13 @@ neck_side_to_waist_b Name in a formula. Don't use math symbols and space in name!!!! - + nek_zijkant_tot_taille_a Neck Side to Waist level, back Full measurement name. - + Zijkant nek tot taille, achter diff --git a/share/translations/measurements_p998_fr_FR.ts b/share/translations/measurements_p998_fr_FR.ts index 3d1f0a44b..2e15717ff 100644 --- a/share/translations/measurements_p998_fr_FR.ts +++ b/share/translations/measurements_p998_fr_FR.ts @@ -3799,7 +3799,7 @@ From Waist Side around hip curve down to surface, while seated on hard surface. Full measurement description. - + Du Côté de la Taille le long de la courbe des hanches jusqu'à la surface, en étant assis sur une surface dure Sit on hard surface. Rise length, side, taken from waist over hip curve down to surface diff --git a/share/translations/measurements_p998_nl_NL.ts b/share/translations/measurements_p998_nl_NL.ts index cb43bc474..db56eba4c 100644 --- a/share/translations/measurements_p998_nl_NL.ts +++ b/share/translations/measurements_p998_nl_NL.ts @@ -1946,7 +1946,7 @@ From mid-Shoulder down front to Highbust level, aimed at Bustpoint. Full measurement description. - + Van midden schouder tot hogeborstlijn, richting borstpunt. diff --git a/share/translations/measurements_p9_fr_FR.ts b/share/translations/measurements_p9_fr_FR.ts index f83f84180..aa555531a 100644 --- a/share/translations/measurements_p9_fr_FR.ts +++ b/share/translations/measurements_p9_fr_FR.ts @@ -3821,7 +3821,7 @@ From Waist Side around hip curve down to surface, while seated on hard surface. Full measurement description. - + Du Côté de la Taille le long de la courbe des hanches jusqu'à la surface, en étant assis sur une surface dure diff --git a/share/translations/measurements_p9_nl_NL.ts b/share/translations/measurements_p9_nl_NL.ts index c0707caed..86dc2adbf 100644 --- a/share/translations/measurements_p9_nl_NL.ts +++ b/share/translations/measurements_p9_nl_NL.ts @@ -1946,7 +1946,7 @@ From mid-Shoulder down front to Highbust level, aimed at Bustpoint. Full measurement description. - + Van midden schouder tot hogeborstlijn, richting borstpunt. @@ -1970,13 +1970,13 @@ neck_side_to_waist_b Name in a formula. Don't use math symbols and space in name!!!! - + nek_zijkant_tot_taille_a Neck Side to Waist level, back Full measurement name. - + Zijkant nek tot taille, achter diff --git a/share/translations/valentina_nl_NL.ts b/share/translations/valentina_nl_NL.ts index dc8c1b198..3a67359b1 100644 --- a/share/translations/valentina_nl_NL.ts +++ b/share/translations/valentina_nl_NL.ts @@ -297,7 +297,7 @@ After each crash Valentina collects information that may help us fix the problem. We do not collect any personal information. Find more about what %1kind of information%2 we collect. - + Na iedere crash verzamelt Valentina informatie die mogelijk kunnen bijdragen het probleem te verhelpen. Wij verzamelen geen persoonlijke informatie. Voor meer informatie zie %1soort informatie%2. @@ -332,7 +332,7 @@ DeletePiece delete tool - verwijder gereedschap + Verwijder hulpmiddel @@ -347,11 +347,11 @@ Interfacing - Vlieseline + Vlieseline Interlining - Tussenvoering + Tussenvoering @@ -1508,6 +1508,18 @@ Grainline Recht van draad + + Grainline visible + Recht van draadlijn zichtbaar + + + Rotation: + Draaiing: + + + Formula wizard + Formule wizard + Value Waarde @@ -1516,6 +1528,22 @@ Calculation Berekening + + <html><head/><body><p>Show full calculation in message box</p></body></html> + <html><head/><body><p>Laat hele berekening zien in berichtenbox</p></body></html> + + + Length: + Lengte: + + + Infinite/undefined result + Ongeldige uitkomst + + + Length should be positive + Lengte van de schouder moet positief zijn + Arrows: Pijlen: @@ -1524,6 +1552,14 @@ Both Beide + + Just front + Alleen voorkant + + + Just rear + Alleen achterkant + DialogEditWrongFormula @@ -1665,7 +1701,7 @@ Filter list by keyword - + Filter de lijst met een sleutelwoord @@ -1680,7 +1716,7 @@ Formula wizard - Formule wizard + Formule wizard Value @@ -1692,7 +1728,7 @@ <html><head/><body><p>Show full calculation in message box</p></body></html> - + <html><head/><body><p>Laat hele berekening zien in berichtenbox</p></body></html> Radius2: @@ -1917,23 +1953,23 @@ Axis type: - + As-type: Select origin point - + Selecteer het draaipunt Select origin point that is not part of the list of objects - + Selecteer een draaipunt dat geen onderdeel is van de gekozen objecten Vertical axis - + Vertikale as Horizontal axis - + Horizontale as @@ -1944,7 +1980,7 @@ First line point: - Eerste lijnpunt: + Eerste punt van de lijn: Suffix: @@ -1952,23 +1988,23 @@ Second line point: - Tweede lijnpunt: + Tweede punt van de lijn: Select first line point - + Kies het eerste punt van de lijn Select first line point that is not part of the list of objects - + Het eerste punt van de lijn mag geen deel uitmaken van de gekozen objecten Select second line point - + Kies het tweede punt van de lijn Select second line point that is not part of the list of objects - + het tweede punt van de lijn mag geen deel uitmaken van de gekozen objecten @@ -2233,7 +2269,7 @@ Elliptical arc - + Ellipsvormige boog @@ -2396,7 +2432,7 @@ Curves control point lengths - + Kromming begrensd door controlepunten @@ -2644,12 +2680,12 @@ Toch de instellingen aanpassen? Printer: - + Printer: None Printer - Geen + Geen @@ -2997,11 +3033,11 @@ Toch de instellingen aanpassen? Angle: - Hoek: + Hoek: Formula wizard - Formule wizard + Formule wizard Value @@ -3009,11 +3045,11 @@ Toch de instellingen aanpassen? <html><head/><body><p>Show full calculation in message box</p></body></html> - + <html><head/><body><p>Laat hele berekening zien in berichtenbox</p></body></html> Length: - Lengte: + Lengte: Suffix: @@ -3021,11 +3057,11 @@ Toch de instellingen aanpassen? Edit angle - Verander de hoek + Bewerk de hoek Edit length - + Bewerk de lengte Calculation @@ -3393,7 +3429,7 @@ Toch de instellingen aanpassen? Use %1 and %2 to insert pattern size and height - + Gebruik %1 en %2 om maat en hoogte van patroon in te voegen Show date of layout creation (%1) @@ -3401,7 +3437,7 @@ Toch de instellingen aanpassen? Show measurements file - + Toon matenbestand @@ -3546,56 +3582,60 @@ Toch de instellingen aanpassen? Type: Soort: + + Type: + Type: + DialogPiecePath Piece path tool - + Gereedschap om pad van onderdeel te bepalen Path - Pad + Pad Name: - Naam: + Naam: Unnamed path - + Onbenoemd pad Create name for your path - + Maak een naam voor jouw pad Type: - Soort: + Type: Piece: - + Onderdeel: Type of pen: - + Soort lijn: Ready! - Klaar! + Klaar! Seam allowance - Naadtoeslag + Naadtoeslag Width: - Breedte: + Breedte: Formula wizard - Formule wizard + Formule wizard Value @@ -3607,87 +3647,87 @@ Toch de instellingen aanpassen? <html><head/><body><p>Show full calculation in message box</p></body></html> - + <html><head/><body><p>Laat hele berekening zien in berichtenbox</p></body></html> Nodes - + Knooppunten Node: - + Knooppunt: Before: - + Vooraf: Return to default width - + Terug naar standaard breedte Default - Standaardwaarde + Standaard After: - + Nadat: Angle: - Hoek: + Hoek: Select main path objects, <b>Shift</b> - reverse direction curve, <b>Enter</b> - finish creation - + Selecteer gewenste pad objecten, <b>Shift</b> - keer richting kromme, <b>Enter</b> -maak af Reverse - Omgekeerde + Keer om Delete - + Verwijder Current seam aloowance - + Huidige naadtoeslag Edit seam allowance width - + Bewerk naadtoeslag Edit seam allowance width before - + Bewerk vorige naadtoeslag Edit seam allowance width after - + Bewerk huidige naad Internal path - + Binnenste pad Custom seam allowance - + Aangepaste naadtoeslag You need more points! - Je hebt meer punten nodig! + Je hebt meer punten nodig! First point of <b>custom seam allowance</b> cannot be equal to the last point! - + Het eerste punt van <b>aangepaste naadtoeslag</b> kan niet gelijk zijn aan het laatste punt! You have double points! - Je hebt dubble punten! + Je hebt punten dubbel! List of objects is empty! - + Lijst van objecten is leeg! @@ -4219,11 +4259,11 @@ Toch de instellingen aanpassen? Select origin point - + Selecteer het beginpunt Select origin point that is not part of the list of objects - + Selecteer een draaipunt dat geen onderdeel is van de gekozen objecten Calculation @@ -4376,11 +4416,11 @@ Toch de instellingen aanpassen? Ready! - Klaar! + Klaar! Seam allowance - Naadtoeslag + Naadtoeslag Automatic @@ -4388,11 +4428,11 @@ Toch de instellingen aanpassen? Width: - Breedte: + Breedte: Formula wizard - Formule wizard + Formule wizard Value @@ -4404,35 +4444,35 @@ Toch de instellingen aanpassen? <html><head/><body><p>Show full calculation in message box</p></body></html> - + <html><head/><body><p>Laat hele berekening zien in berichtenbox</p></body></html> Nodes - + Knooppunten Node: - + Knooppunt: Before: - + Vooraf: Return to default width - + Terug naar standaard breedte Default - Standaardwaarde + Standaard After: - + Nadat: Angle: - Hoek: + Hoek: Custom @@ -4524,15 +4564,15 @@ Toch de instellingen aanpassen? Grainline visible - + Recht van draadlijn zichtbaar Rotation: - + Draaiing: Length: - Lengte: + Lengte: Arrows: @@ -4552,11 +4592,11 @@ Toch de instellingen aanpassen? Reverse - Omgekeerde + Keer om Delete - + Verwijder Options @@ -4568,11 +4608,11 @@ Toch de instellingen aanpassen? Infinite/undefined result - + Ongeldige uitkomst Length should be positive - + Lengte van de schouder moet positief zijn Parser error: %1 @@ -4584,23 +4624,23 @@ Toch de instellingen aanpassen? Current seam allowance - + Huidige naadtoeslag Edit seam allowance width - + Bewerk zoombreedte Edit seam allowance width before - + Bewerk vorige zoombreedte Edit seam allowance width after - + Bewerk huidige zoombreedte You need more points! - Je hebt meer punten nodig! + Je hebt meer punten nodig! You have to choose points in a clockwise direction! @@ -4612,7 +4652,7 @@ Toch de instellingen aanpassen? You have double points! - Je hebt dubble punten! + Je hebt punten dubbel! Empty @@ -4628,7 +4668,7 @@ Toch de instellingen aanpassen? None - Geen + Geen Cut on fold @@ -4640,11 +4680,11 @@ Toch de instellingen aanpassen? Just front - + Alleen voorkant Just rear - + Alleen achterkant @@ -6548,7 +6588,7 @@ Do you want to save your changes? You can't use now the Layout mode. Please, include at least one detail in layout. - U kunt de Opmaak modus nu niet gebruiken. Alstublieft, sluit in ieder geval een detail in in opmaak. + U kunt de Opmaak modus nu niet gebruiken. Alstublieft, zorg dat er minimaal een detail is in de opmaak. Original zoom @@ -6616,7 +6656,7 @@ Do you want to save your changes? Piece path tool - + Gereedschap om pad van onderdeel te bepalen Select main path objects clockwise. @@ -9086,7 +9126,7 @@ Wil je deze veranderingen opslaan? Unnamed path - + Onbenoemd pad Error creating or updating a piece path @@ -9455,11 +9495,11 @@ Wil je deze veranderingen opslaan? Vertical axis - + Vertikale as Horizontal axis - + Horizontale as Tool move @@ -9479,18 +9519,18 @@ Wil je deze veranderingen opslaan? Elliptical arc - + Ellipsvormige boog Rotation angle - + Hoek van draaiing VToolSeamAllowance Current seam allowance - + Huidige naadtoeslag move pattern piece label @@ -9538,7 +9578,7 @@ Wil je deze veranderingen opslaan? Delete - + Verwijder @@ -10719,27 +10759,27 @@ Wil je deze veranderingen opslaan? Select all - + Selecteer alles Select none - + Selecteer niets select all details - + Selecteer alle details select none details - + Selecteer geen details Invert selection - + Draai selectie om invert selection - + draai selectie om diff --git a/src/libs/qmuparser/qmuparser.cpp b/src/libs/qmuparser/qmuparser.cpp index 160481467..35f489bf6 100644 --- a/src/libs/qmuparser/qmuparser.cpp +++ b/src/libs/qmuparser/qmuparser.cpp @@ -45,6 +45,18 @@ namespace qmu { //--------------------------------------------------------------------------------------------------------------------- // Trigonometric function +qreal QmuParser::DegreeToRadian(qreal deg) +{ + return qDegreesToRadians(deg); +} + +//--------------------------------------------------------------------------------------------------------------------- +qreal QmuParser::RadianToDegree(qreal rad) +{ + return qRadiansToDegrees(rad); +} + +//--------------------------------------------------------------------------------------------------------------------- qreal QmuParser::Sinh(qreal v) { return sinh(v); @@ -79,6 +91,79 @@ qreal QmuParser::ATanh(qreal v) { return (0.5 * log((1 + v) / (1 - v))); } + +//--------------------------------------------------------------------------------------------------------------------- +qreal QmuParser::SinhD(qreal v) +{ + return qRadiansToDegrees(sinh(v)); +} + +//--------------------------------------------------------------------------------------------------------------------- +qreal QmuParser::CoshD(qreal v) +{ + return qRadiansToDegrees(cosh(v)); +} + +//--------------------------------------------------------------------------------------------------------------------- +qreal QmuParser::TanhD(qreal v) +{ + return qRadiansToDegrees(tanh(v)); +} + +//--------------------------------------------------------------------------------------------------------------------- +qreal QmuParser::ASinhD(qreal v) +{ + return qRadiansToDegrees(log(v + qSqrt(v * v + 1))); +} + +//--------------------------------------------------------------------------------------------------------------------- +qreal QmuParser::ACoshD(qreal v) +{ + return qRadiansToDegrees(log(v + qSqrt(v * v - 1))); +} + +//--------------------------------------------------------------------------------------------------------------------- +qreal QmuParser::ATanhD(qreal v) +{ + return qRadiansToDegrees(0.5 * log((1 + v) / (1 - v))); +} + +//--------------------------------------------------------------------------------------------------------------------- +qreal QmuParser::SinD(qreal v) +{ + return qRadiansToDegrees(qSin(v)); +} + +//--------------------------------------------------------------------------------------------------------------------- +qreal QmuParser::ASinD(qreal v) +{ + return qRadiansToDegrees(qAsin(v)); +} + +//--------------------------------------------------------------------------------------------------------------------- +qreal QmuParser::CosD(qreal v) +{ + return qRadiansToDegrees(qCos(v)); +} + +//--------------------------------------------------------------------------------------------------------------------- +qreal QmuParser::ACosD(qreal v) +{ + return qRadiansToDegrees(qAcos(v)); +} + +//--------------------------------------------------------------------------------------------------------------------- +qreal QmuParser::TanD(qreal v) +{ + return qRadiansToDegrees(qTan(v)); +} + +//--------------------------------------------------------------------------------------------------------------------- +qreal QmuParser::ATanD(qreal v) +{ + return qRadiansToDegrees(qAtan(v)); +} + //--------------------------------------------------------------------------------------------------------------------- // Logarithm functions @@ -279,23 +364,39 @@ void QmuParser::InitCharSets() */ void QmuParser::InitFun() { + // trigonometric helper functions + DefineFun("degTorad", DegreeToRadian); + DefineFun("radTodeg", RadianToDegree); + // trigonometric functions DefineFun("sin", qSin); DefineFun("cos", qCos); DefineFun("tan", qTan); + DefineFun("sinD", SinD); + DefineFun("cosD", CosD); + DefineFun("tanD", TanD); // arcus functions DefineFun("asin", qAsin); DefineFun("acos", qAcos); DefineFun("atan", qAtan); DefineFun("atan2", qAtan2); + DefineFun("asinD", ASinD); + DefineFun("acosD", ACosD); + DefineFun("atanD", ATanD); // hyperbolic functions DefineFun("sinh", Sinh); DefineFun("cosh", Cosh); DefineFun("tanh", Tanh); + DefineFun("sinhD", SinhD); + DefineFun("coshD", CoshD); + DefineFun("tanhD", TanhD); // arcus hyperbolic functions DefineFun("asinh", ASinh); DefineFun("acosh", ACosh); DefineFun("atanh", ATanh); + DefineFun("asinhD", ASinhD); + DefineFun("acoshD", ACoshD); + DefineFun("atanhD", ATanhD); // Logarithm functions DefineFun("log2", Log2); DefineFun("log10", Log10); diff --git a/src/libs/qmuparser/qmuparser.h b/src/libs/qmuparser/qmuparser.h index b0553ca10..1b98bee51 100644 --- a/src/libs/qmuparser/qmuparser.h +++ b/src/libs/qmuparser/qmuparser.h @@ -68,6 +68,22 @@ namespace qmu static qreal ASinh(qreal); static qreal ACosh(qreal); static qreal ATanh(qreal); + // functions working with degrees + static qreal DegreeToRadian(qreal); + static qreal RadianToDegree(qreal); + static qreal SinD(qreal); + static qreal CosD(qreal); + static qreal TanD(qreal); + static qreal ASinD(qreal); + static qreal ACosD(qreal); + static qreal ATanD(qreal); + static qreal SinhD(qreal); + static qreal CoshD(qreal); + static qreal TanhD(qreal); + static qreal ASinhD(qreal); + static qreal ACoshD(qreal); + static qreal ATanhD(qreal); + // Logarithm functions static qreal Log2(qreal); // Logarithm Base 2 static qreal Log10(qreal); // Logarithm Base 10 diff --git a/src/libs/qmuparser/qmuparsertokenreader.cpp b/src/libs/qmuparser/qmuparsertokenreader.cpp index c3ce39fed..45670468d 100644 --- a/src/libs/qmuparser/qmuparsertokenreader.cpp +++ b/src/libs/qmuparser/qmuparsertokenreader.cpp @@ -528,7 +528,7 @@ bool QmuParserTokenReader::IsArgSep ( token_type &a_Tok ) bool QmuParserTokenReader::IsEOF ( token_type &a_Tok ) { // check for EOF - if ( m_strFormula.data()[m_iPos] == false /*|| szFormula[m_iPos] == '\n'*/ ) + if ( m_iPos >= m_strFormula.size()) { if ( m_iSynFlags & noEND ) { diff --git a/src/libs/vlayout/vlayoutgenerator.cpp b/src/libs/vlayout/vlayoutgenerator.cpp index 755e5e508..2e9f703c3 100644 --- a/src/libs/vlayout/vlayoutgenerator.cpp +++ b/src/libs/vlayout/vlayoutgenerator.cpp @@ -46,7 +46,12 @@ VLayoutGenerator::VLayoutGenerator(QObject *parent) paperWidth(0), margins(), usePrinterFields(true), +#ifdef Q_CC_MSVC + // See https://stackoverflow.com/questions/15750917/initializing-stdatomic-bool + stopGeneration(ATOMIC_VAR_INIT(false)), +#else stopGeneration(false), +#endif state(LayoutErrors::NoError), shift(0), rotate(true), diff --git a/src/libs/vmisc/def.cpp b/src/libs/vmisc/def.cpp index 2b41af8b6..37207d9b9 100644 --- a/src/libs/vmisc/def.cpp +++ b/src/libs/vmisc/def.cpp @@ -381,6 +381,8 @@ const QString p54_S = QStringLiteral("p54"); const QString p998_S = QStringLiteral("p998"); //functions +const QString degTorad_F = QStringLiteral("degTorad"); +const QString radTodeg_F = QStringLiteral("radTodeg"); const QString sin_F = QStringLiteral("sin"); const QString cos_F = QStringLiteral("cos"); const QString tan_F = QStringLiteral("tan"); @@ -393,6 +395,18 @@ const QString tanh_F = QStringLiteral("tanh"); const QString asinh_F = QStringLiteral("asinh"); const QString acosh_F = QStringLiteral("acosh"); const QString atanh_F = QStringLiteral("atanh"); +const QString sinD_F = QStringLiteral("sinD"); +const QString cosD_F = QStringLiteral("cosD"); +const QString tanD_F = QStringLiteral("tanD"); +const QString asinD_F = QStringLiteral("asinD"); +const QString acosD_F = QStringLiteral("acosD"); +const QString atanD_F = QStringLiteral("atanD"); +const QString sinhD_F = QStringLiteral("sinhD"); +const QString coshD_F = QStringLiteral("coshD"); +const QString tanhD_F = QStringLiteral("tanhD"); +const QString asinhD_F = QStringLiteral("asinhD"); +const QString acoshD_F = QStringLiteral("acoshD"); +const QString atanhD_F = QStringLiteral("atanhD"); const QString log2_F = QStringLiteral("log2"); const QString log10_F = QStringLiteral("log10"); const QString log_F = QStringLiteral("log"); @@ -408,8 +422,11 @@ const QString sum_F = QStringLiteral("sum"); const QString avg_F = QStringLiteral("avg"); const QString fmod_F = QStringLiteral("fmod"); -const QStringList builInFunctions = QStringList() << sin_F << cos_F << tan_F << asin_F << acos_F << atan_F +const QStringList builInFunctions = QStringList() << degTorad_F << radTodeg_F + << sin_F << cos_F << tan_F << asin_F << acos_F << atan_F << sinh_F << cosh_F << tanh_F << asinh_F << acosh_F << atanh_F + << sinD_F << cosD_F << tanD_F << asinD_F << acosD_F << atanD_F + << sinhD_F << coshD_F << tanhD_F << asinhD_F << acoshD_F << atanhD_F << log2_F << log10_F << log_F << ln_F << exp_F << sqrt_F << sign_F << rint_F << abs_F << min_F << max_F << sum_F << avg_F << fmod_F; diff --git a/src/libs/vmisc/def.h b/src/libs/vmisc/def.h index 409dbce80..74afc98f8 100644 --- a/src/libs/vmisc/def.h +++ b/src/libs/vmisc/def.h @@ -615,6 +615,8 @@ QStringList ListPMSystems(); void InitPMSystems(QComboBox *systemCombo); // functions +extern const QString degTorad_F; +extern const QString radTodeg_F; extern const QString sin_F; extern const QString cos_F; extern const QString tan_F; @@ -627,6 +629,18 @@ extern const QString tanh_F; extern const QString asinh_F; extern const QString acosh_F; extern const QString atanh_F; +extern const QString sinD_F; +extern const QString cosD_F; +extern const QString tanD_F; +extern const QString asinD_F; +extern const QString acosD_F; +extern const QString atanD_F; +extern const QString sinhD_F; +extern const QString coshD_F; +extern const QString tanhD_F; +extern const QString asinhD_F; +extern const QString acoshD_F; +extern const QString atanhD_F; extern const QString log2_F; extern const QString log10_F; extern const QString log_F; diff --git a/src/libs/vpatterndb/variables/varcradius.cpp b/src/libs/vpatterndb/variables/varcradius.cpp index 2366552a1..c4fa85687 100644 --- a/src/libs/vpatterndb/variables/varcradius.cpp +++ b/src/libs/vpatterndb/variables/varcradius.cpp @@ -33,7 +33,7 @@ #include "../ifc/ifcdef.h" #include "../vgeometry/varc.h" -#include "vcurvevariable.h" +#include "../vgeometry/vellipticalarc.h" //--------------------------------------------------------------------------------------------------------------------- VArcRadius::VArcRadius() @@ -49,10 +49,29 @@ VArcRadius::VArcRadius(const quint32 &id, const quint32 &parentId, const VArc *a SCASSERT(arc != nullptr) SetType(VarType::ArcRadius); - SetName(QString(radius_V+"%1").arg(arc->name())); + SetName(radius_V + QString("%1").arg(arc->name())); SetValue(FromPixel(arc->GetRadius(), patternUnit)); } +//--------------------------------------------------------------------------------------------------------------------- +VArcRadius::VArcRadius(const quint32 &id, const quint32 &parentId, const VEllipticalArc *elArc, const int numberRadius, + Unit patternUnit) + : VCurveVariable(id, parentId) +{ + SCASSERT(elArc != nullptr) + + SetType(VarType::ArcRadius); + SetName(radius_V + QString("%1%2").arg(numberRadius).arg(elArc->name())); + if (numberRadius == 1) + { + SetValue(FromPixel(elArc->GetRadius1(), patternUnit)); + } + else + { + SetValue(FromPixel(elArc->GetRadius2(), patternUnit)); + } +} + //--------------------------------------------------------------------------------------------------------------------- VArcRadius::VArcRadius(const VArcRadius &var) :VCurveVariable(var) diff --git a/src/libs/vpatterndb/variables/varcradius.h b/src/libs/vpatterndb/variables/varcradius.h index 4d32d5ce5..beb85a168 100644 --- a/src/libs/vpatterndb/variables/varcradius.h +++ b/src/libs/vpatterndb/variables/varcradius.h @@ -37,12 +37,15 @@ #include "vcurvevariable.h" class VArc; +class VEllipticalArc; class VArcRadius :public VCurveVariable { public: VArcRadius(); VArcRadius(const quint32 &id, const quint32 &parentId, const VArc *arc, Unit patternUnit); + VArcRadius(const quint32 &id, const quint32 &parentId, const VEllipticalArc *elArc, const int numberRadius, + Unit patternUnit); VArcRadius(const VArcRadius &var); VArcRadius &operator=(const VArcRadius &var); virtual ~VArcRadius() Q_DECL_OVERRIDE; diff --git a/src/libs/vpatterndb/variables/vellipticalarcradius.cpp b/src/libs/vpatterndb/variables/vellipticalarcradius.cpp deleted file mode 100644 index 0503ee75c..000000000 --- a/src/libs/vpatterndb/variables/vellipticalarcradius.cpp +++ /dev/null @@ -1,80 +0,0 @@ -/************************************************************************ - ** - ** @file vellipticalarcradius.cpp - ** @author Valentina Zhuravska - ** @date 16 12, 2016 - ** - ** @brief - ** @copyright - ** This source code is part of the Valentine project, a pattern making - ** program, whose allow create and modeling patterns of clothing. - ** Copyright (C) 2016 Valentina project - ** All Rights Reserved. - ** - ** Valentina is free software: you can redistribute it and/or modify - ** it under the terms of the GNU General Public License as published by - ** the Free Software Foundation, either version 3 of the License, or - ** (at your option) any later version. - ** - ** Valentina is distributed in the hope that it will be useful, - ** but WITHOUT ANY WARRANTY; without even the implied warranty of - ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - ** GNU General Public License for more details. - ** - ** You should have received a copy of the GNU General Public License - ** along with Valentina. If not, see . - ** - *************************************************************************/ -#include "vellipticalarcradius.h" - -#include -#include - -#include "../ifc/ifcdef.h" -#include "../vgeometry/vellipticalarc.h" -#include "vcurvevariable.h" - -//--------------------------------------------------------------------------------------------------------------------- -VEllipticalArcRadius::VEllipticalArcRadius() - :VCurveVariable() -{ - SetType(VarType::ArcRadius); -} - -//--------------------------------------------------------------------------------------------------------------------- -VEllipticalArcRadius::VEllipticalArcRadius(const quint32 &id, const quint32 &parentId, const VEllipticalArc *elArc, - const int numberRadius, Unit patternUnit) : VCurveVariable(id, parentId) -{ - SCASSERT(elArc != nullptr) - - SetType(VarType::ArcRadius); - SetName(QString(radius_V+"%1"+"%2").arg(numberRadius).arg(elArc->name())); - if (numberRadius == 1) - { - SetValue(FromPixel(elArc->GetRadius1(), patternUnit)); - } - else - { - SetValue(FromPixel(elArc->GetRadius2(), patternUnit)); - } -} - -//--------------------------------------------------------------------------------------------------------------------- -VEllipticalArcRadius::VEllipticalArcRadius(const VEllipticalArcRadius &var) - :VCurveVariable(var) -{} - -//--------------------------------------------------------------------------------------------------------------------- -VEllipticalArcRadius &VEllipticalArcRadius::operator=(const VEllipticalArcRadius &var) -{ - if ( &var == this ) - { - return *this; - } - VCurveVariable::operator=(var); - return *this; -} - -//--------------------------------------------------------------------------------------------------------------------- -VEllipticalArcRadius::~VEllipticalArcRadius() -{} diff --git a/src/libs/vpatterndb/variables/vellipticalarcradius.h b/src/libs/vpatterndb/variables/vellipticalarcradius.h deleted file mode 100644 index 2ce41edf4..000000000 --- a/src/libs/vpatterndb/variables/vellipticalarcradius.h +++ /dev/null @@ -1,51 +0,0 @@ -/************************************************************************ - ** - ** @file vellipticalarcradius.h - ** @author Valentina Zhuravska - ** @date 16 12, 2016 - ** - ** @brief - ** @copyright - ** This source code is part of the Valentine project, a pattern making - ** program, whose allow create and modeling patterns of clothing. - ** Copyright (C) 2016 Valentina project - ** All Rights Reserved. - ** - ** Valentina is free software: you can redistribute it and/or modify - ** it under the terms of the GNU General Public License as published by - ** the Free Software Foundation, either version 3 of the License, or - ** (at your option) any later version. - ** - ** Valentina is distributed in the hope that it will be useful, - ** but WITHOUT ANY WARRANTY; without even the implied warranty of - ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - ** GNU General Public License for more details. - ** - ** You should have received a copy of the GNU General Public License - ** along with Valentina. If not, see . - ** - *************************************************************************/ -#ifndef VELLIPTICALARCRADIUS_H -#define VELLIPTICALARCRADIUS_H - -#include -#include - -#include "../vmisc/def.h" -#include "../ifc/ifcdef.h" -#include "vcurvevariable.h" - -class VEllipticalArc; - -class VEllipticalArcRadius :public VCurveVariable -{ -public: - VEllipticalArcRadius(); - VEllipticalArcRadius(const quint32 &id, const quint32 &parentId, const VEllipticalArc *elArc, - const int numberRadius, Unit patternUnit); - VEllipticalArcRadius(const VEllipticalArcRadius &var); - VEllipticalArcRadius &operator=(const VEllipticalArcRadius &var); - virtual ~VEllipticalArcRadius() Q_DECL_OVERRIDE; -}; - -#endif // VELLIPTICALARCRADIUS_H diff --git a/src/libs/vpatterndb/vcontainer.cpp b/src/libs/vpatterndb/vcontainer.cpp index 2034fbc3d..6bb83bfaa 100644 --- a/src/libs/vpatterndb/vcontainer.cpp +++ b/src/libs/vpatterndb/vcontainer.cpp @@ -45,7 +45,6 @@ #include "../vmisc/logging.h" #include "../vmisc/vabstractapplication.h" #include "variables/varcradius.h" -#include "variables/vellipticalarcradius.h" #include "variables/vcurveangle.h" #include "variables/vcurvelength.h" #include "variables/vcurveclength.h" @@ -410,10 +409,10 @@ void VContainer::AddArc(const QSharedPointer &arc, const quint32 { const QSharedPointer casted = arc.staticCast(); - VEllipticalArcRadius *radius1 = new VEllipticalArcRadius(id, parentId, casted.data(), 1, *GetPatternUnit()); + VArcRadius *radius1 = new VArcRadius(id, parentId, casted.data(), 1, *GetPatternUnit()); AddVariable(radius1->GetName(), radius1); - VEllipticalArcRadius *radius2 = new VEllipticalArcRadius(id, parentId, casted.data(), 2, *GetPatternUnit()); + VArcRadius *radius2 = new VArcRadius(id, parentId, casted.data(), 2, *GetPatternUnit()); AddVariable(radius2->GetName(), radius2); } } diff --git a/src/libs/vpatterndb/vpatterndb.pri b/src/libs/vpatterndb/vpatterndb.pri index 45c97a250..ddd66977d 100644 --- a/src/libs/vpatterndb/vpatterndb.pri +++ b/src/libs/vpatterndb/vpatterndb.pri @@ -18,7 +18,6 @@ SOURCES += \ $$PWD/variables/vvariable.cpp \ $$PWD/vformula.cpp \ $$PWD/variables/vcurveclength.cpp \ - $$PWD/variables/vellipticalarcradius.cpp \ $$PWD/vpiece.cpp \ $$PWD/vpiecenode.cpp \ $$PWD/vpiecepath.cpp \ @@ -57,7 +56,6 @@ HEADERS += \ $$PWD/variables/vvariable_p.h \ $$PWD/vformula.h \ $$PWD/variables/vcurveclength.h \ - $$PWD/variables/vellipticalarcradius.h \ $$PWD/vpiece.h \ $$PWD/vpiece_p.h \ $$PWD/vpiecenode.h \ diff --git a/src/libs/vpatterndb/vtranslatevars.cpp b/src/libs/vpatterndb/vtranslatevars.cpp index 2fce248c3..65552be53 100644 --- a/src/libs/vpatterndb/vtranslatevars.cpp +++ b/src/libs/vpatterndb/vtranslatevars.cpp @@ -401,18 +401,32 @@ void VTranslateVars::InitVariables() //--------------------------------------------------------------------------------------------------------------------- void VTranslateVars::InitFunctions() { - functions.insert(sin_F, translate("VTranslateVars", "sin", "sine function")); - functions.insert(cos_F, translate("VTranslateVars", "cos", "cosine function")); - functions.insert(tan_F, translate("VTranslateVars", "tan", "tangens function")); - functions.insert(asin_F, translate("VTranslateVars", "asin", "arcus sine function")); - functions.insert(acos_F, translate("VTranslateVars", "acos", "arcus cosine function")); - functions.insert(atan_F, translate("VTranslateVars", "atan", "arcus tangens function")); - functions.insert(sinh_F, translate("VTranslateVars", "sinh", "hyperbolic sine function")); - functions.insert(cosh_F, translate("VTranslateVars", "cosh", "hyperbolic cosine")); - functions.insert(tanh_F, translate("VTranslateVars", "tanh", "hyperbolic tangens function")); - functions.insert(asinh_F, translate("VTranslateVars", "asinh", "hyperbolic arcus sine function")); - functions.insert(acosh_F, translate("VTranslateVars", "acosh", "hyperbolic arcus cosine function")); - functions.insert(atanh_F, translate("VTranslateVars", "atanh", "hyperbolic arcur tangens function")); + functions.insert(degTorad_F, translate("VTranslateVars", "degTorad", "converts degrees to radian")); + functions.insert(radTodeg_F, translate("VTranslateVars", "radTodeg", "converts radian to degrees")); + functions.insert(sin_F, translate("VTranslateVars", "sin", "sine function working with radians")); + functions.insert(cos_F, translate("VTranslateVars", "cos", "cosine function working with radians")); + functions.insert(tan_F, translate("VTranslateVars", "tan", "tangens function working with radians")); + functions.insert(asin_F, translate("VTranslateVars", "asin", "arcus sine function working with radians")); + functions.insert(acos_F, translate("VTranslateVars", "acos", "arcus cosine function working with radians")); + functions.insert(atan_F, translate("VTranslateVars", "atan", "arcus tangens function working with radians")); + functions.insert(sinh_F, translate("VTranslateVars", "sinh", "hyperbolic sine function working with radians")); + functions.insert(cosh_F, translate("VTranslateVars", "cosh", "hyperbolic cosine working with radians")); + functions.insert(tanh_F, translate("VTranslateVars", "tanh", "hyperbolic tangens function working with radians")); + functions.insert(asinh_F, translate("VTranslateVars", "asinh", "hyperbolic arcus sine function working with radians")); + functions.insert(acosh_F, translate("VTranslateVars", "acosh", "hyperbolic arcus cosine function working with radians")); + functions.insert(atanh_F, translate("VTranslateVars", "atanh", "hyperbolic arcur tangens function working with radians")); + functions.insert(sinD_F, translate("VTranslateVars", "sinD", "sine function working with degrees")); + functions.insert(cosD_F, translate("VTranslateVars", "cosD", "cosine function working with degrees")); + functions.insert(tanD_F, translate("VTranslateVars", "tanD", "tangens function working with degrees")); + functions.insert(asinD_F, translate("VTranslateVars", "asinD", "arcus sine function working with degrees")); + functions.insert(acosD_F, translate("VTranslateVars", "acosD", "arcus cosine function working with degrees")); + functions.insert(atanD_F, translate("VTranslateVars", "atanD", "arcus tangens function working with degrees")); + functions.insert(sinhD_F, translate("VTranslateVars", "sinhD", "hyperbolic sine function working with degrees")); + functions.insert(coshD_F, translate("VTranslateVars", "coshD", "hyperbolic cosine function working with degrees")); + functions.insert(tanhD_F, translate("VTranslateVars", "tanhD", "hyperbolic tangens function working with degrees")); + functions.insert(asinhD_F, translate("VTranslateVars", "asinhD", "hyperbolic arcus sine function working with degrees")); + functions.insert(acoshD_F, translate("VTranslateVars", "acoshD", "hyperbolic arcus cosine function working with degrees")); + functions.insert(atanhD_F, translate("VTranslateVars", "atanhD", "hyperbolic arcur tangens function working with degrees")); functions.insert(log2_F, translate("VTranslateVars", "log2", "logarithm to the base 2")); functions.insert(log10_F, translate("VTranslateVars", "log10", "logarithm to the base 10")); functions.insert(log_F, translate("VTranslateVars", "log", "logarithm to the base 10"));