diff --git a/src/Mod/Complete/Gui/Resources/translations/Complete_af.qm b/src/Mod/Complete/Gui/Resources/translations/Complete_af.qm index 129a3fc9a..4661e9716 100644 Binary files a/src/Mod/Complete/Gui/Resources/translations/Complete_af.qm and b/src/Mod/Complete/Gui/Resources/translations/Complete_af.qm differ diff --git a/src/Mod/Complete/Gui/Resources/translations/Complete_af.ts b/src/Mod/Complete/Gui/Resources/translations/Complete_af.ts index ad183f4d5..d1adc14ef 100644 --- a/src/Mod/Complete/Gui/Resources/translations/Complete_af.ts +++ b/src/Mod/Complete/Gui/Resources/translations/Complete_af.ts @@ -32,11 +32,11 @@ Workbench - &Drawing + Dr&awing &Teken - Ske&tch + S&ketch &Skets diff --git a/src/Mod/Complete/Gui/Resources/translations/Complete_de.qm b/src/Mod/Complete/Gui/Resources/translations/Complete_de.qm index 83e0263a6..11eb3fd4d 100644 Binary files a/src/Mod/Complete/Gui/Resources/translations/Complete_de.qm and b/src/Mod/Complete/Gui/Resources/translations/Complete_de.qm differ diff --git a/src/Mod/Complete/Gui/Resources/translations/Complete_de.ts b/src/Mod/Complete/Gui/Resources/translations/Complete_de.ts index 8543422ea..8b39f34e4 100644 --- a/src/Mod/Complete/Gui/Resources/translations/Complete_de.ts +++ b/src/Mod/Complete/Gui/Resources/translations/Complete_de.ts @@ -32,11 +32,11 @@ Workbench - &Drawing + Dr&awing &Zeichnung - Ske&tch + S&ketch Ski&zze diff --git a/src/Mod/Complete/Gui/Resources/translations/Complete_es.qm b/src/Mod/Complete/Gui/Resources/translations/Complete_es.qm index 11eeb5138..e0609785c 100644 Binary files a/src/Mod/Complete/Gui/Resources/translations/Complete_es.qm and b/src/Mod/Complete/Gui/Resources/translations/Complete_es.qm differ diff --git a/src/Mod/Complete/Gui/Resources/translations/Complete_es.ts b/src/Mod/Complete/Gui/Resources/translations/Complete_es.ts index be0d66977..a4befd9fe 100644 --- a/src/Mod/Complete/Gui/Resources/translations/Complete_es.ts +++ b/src/Mod/Complete/Gui/Resources/translations/Complete_es.ts @@ -32,11 +32,11 @@ Workbench - &Drawing + Dr&awing %Dibujo - Ske&tch + S&ketch Boc&eto diff --git a/src/Mod/Complete/Gui/Resources/translations/Complete_fi.qm b/src/Mod/Complete/Gui/Resources/translations/Complete_fi.qm index 9f5dee744..3a02f3bd9 100644 Binary files a/src/Mod/Complete/Gui/Resources/translations/Complete_fi.qm and b/src/Mod/Complete/Gui/Resources/translations/Complete_fi.qm differ diff --git a/src/Mod/Complete/Gui/Resources/translations/Complete_fi.ts b/src/Mod/Complete/Gui/Resources/translations/Complete_fi.ts index 910ed1ee3..1dfd6c849 100644 --- a/src/Mod/Complete/Gui/Resources/translations/Complete_fi.ts +++ b/src/Mod/Complete/Gui/Resources/translations/Complete_fi.ts @@ -32,11 +32,11 @@ Workbench - &Drawing + Dr&awing &Piirustus - Ske&tch + S&ketch Ske&tch diff --git a/src/Mod/Complete/Gui/Resources/translations/Complete_fr.qm b/src/Mod/Complete/Gui/Resources/translations/Complete_fr.qm index 2c96f695d..0817a13e8 100644 Binary files a/src/Mod/Complete/Gui/Resources/translations/Complete_fr.qm and b/src/Mod/Complete/Gui/Resources/translations/Complete_fr.qm differ diff --git a/src/Mod/Complete/Gui/Resources/translations/Complete_fr.ts b/src/Mod/Complete/Gui/Resources/translations/Complete_fr.ts index 4cf54ae22..aedbd4a84 100644 --- a/src/Mod/Complete/Gui/Resources/translations/Complete_fr.ts +++ b/src/Mod/Complete/Gui/Resources/translations/Complete_fr.ts @@ -32,11 +32,11 @@ Workbench - &Drawing + Dr&awing &Dessin - Ske&tch + S&ketch Es&quisse diff --git a/src/Mod/Complete/Gui/Resources/translations/Complete_hr.qm b/src/Mod/Complete/Gui/Resources/translations/Complete_hr.qm index f4e9747ea..85bf319cd 100644 Binary files a/src/Mod/Complete/Gui/Resources/translations/Complete_hr.qm and b/src/Mod/Complete/Gui/Resources/translations/Complete_hr.qm differ diff --git a/src/Mod/Complete/Gui/Resources/translations/Complete_hr.ts b/src/Mod/Complete/Gui/Resources/translations/Complete_hr.ts index d061d8923..e386f67a5 100644 --- a/src/Mod/Complete/Gui/Resources/translations/Complete_hr.ts +++ b/src/Mod/Complete/Gui/Resources/translations/Complete_hr.ts @@ -32,11 +32,11 @@ Workbench - &Drawing + Dr&awing &Crtež - Ske&tch + S&ketch Sk&ica diff --git a/src/Mod/Complete/Gui/Resources/translations/Complete_hu.qm b/src/Mod/Complete/Gui/Resources/translations/Complete_hu.qm index 21c0a053a..6080e9c88 100644 Binary files a/src/Mod/Complete/Gui/Resources/translations/Complete_hu.qm and b/src/Mod/Complete/Gui/Resources/translations/Complete_hu.qm differ diff --git a/src/Mod/Complete/Gui/Resources/translations/Complete_hu.ts b/src/Mod/Complete/Gui/Resources/translations/Complete_hu.ts index 8cee0ef4c..3210bbb88 100644 --- a/src/Mod/Complete/Gui/Resources/translations/Complete_hu.ts +++ b/src/Mod/Complete/Gui/Resources/translations/Complete_hu.ts @@ -32,11 +32,11 @@ Workbench - &Drawing + Dr&awing Rajzolás - Ske&tch + S&ketch Vázlat diff --git a/src/Mod/Complete/Gui/Resources/translations/Complete_it.qm b/src/Mod/Complete/Gui/Resources/translations/Complete_it.qm index 625eb325c..d4157f8fb 100644 Binary files a/src/Mod/Complete/Gui/Resources/translations/Complete_it.qm and b/src/Mod/Complete/Gui/Resources/translations/Complete_it.qm differ diff --git a/src/Mod/Complete/Gui/Resources/translations/Complete_it.ts b/src/Mod/Complete/Gui/Resources/translations/Complete_it.ts index 48466f7e1..3f8e83425 100644 --- a/src/Mod/Complete/Gui/Resources/translations/Complete_it.ts +++ b/src/Mod/Complete/Gui/Resources/translations/Complete_it.ts @@ -32,11 +32,11 @@ Workbench - &Drawing + Dr&awing &Disegno - Ske&tch + S&ketch S&ketch diff --git a/src/Mod/Complete/Gui/Resources/translations/Complete_ja.qm b/src/Mod/Complete/Gui/Resources/translations/Complete_ja.qm index 8365b44ea..495423814 100644 Binary files a/src/Mod/Complete/Gui/Resources/translations/Complete_ja.qm and b/src/Mod/Complete/Gui/Resources/translations/Complete_ja.qm differ diff --git a/src/Mod/Complete/Gui/Resources/translations/Complete_ja.ts b/src/Mod/Complete/Gui/Resources/translations/Complete_ja.ts index 1bbd50762..0a05b50ae 100644 --- a/src/Mod/Complete/Gui/Resources/translations/Complete_ja.ts +++ b/src/Mod/Complete/Gui/Resources/translations/Complete_ja.ts @@ -32,11 +32,11 @@ Workbench - &Drawing + Dr&awing ドローイング (&D) - Ske&tch + S&ketch スケッチ(&T) diff --git a/src/Mod/Complete/Gui/Resources/translations/Complete_nl.qm b/src/Mod/Complete/Gui/Resources/translations/Complete_nl.qm index e80a5e904..51d5ff4fc 100644 Binary files a/src/Mod/Complete/Gui/Resources/translations/Complete_nl.qm and b/src/Mod/Complete/Gui/Resources/translations/Complete_nl.qm differ diff --git a/src/Mod/Complete/Gui/Resources/translations/Complete_nl.ts b/src/Mod/Complete/Gui/Resources/translations/Complete_nl.ts index 4af85c543..c3d1b6a81 100644 --- a/src/Mod/Complete/Gui/Resources/translations/Complete_nl.ts +++ b/src/Mod/Complete/Gui/Resources/translations/Complete_nl.ts @@ -32,11 +32,11 @@ Workbench - &Drawing + Dr&awing &Tekenen - Ske&tch + S&ketch Sche&ts diff --git a/src/Mod/Complete/Gui/Resources/translations/Complete_no.qm b/src/Mod/Complete/Gui/Resources/translations/Complete_no.qm index de3d432d6..5dd637250 100644 Binary files a/src/Mod/Complete/Gui/Resources/translations/Complete_no.qm and b/src/Mod/Complete/Gui/Resources/translations/Complete_no.qm differ diff --git a/src/Mod/Complete/Gui/Resources/translations/Complete_no.ts b/src/Mod/Complete/Gui/Resources/translations/Complete_no.ts index 02900feaf..6d80d0509 100644 --- a/src/Mod/Complete/Gui/Resources/translations/Complete_no.ts +++ b/src/Mod/Complete/Gui/Resources/translations/Complete_no.ts @@ -32,11 +32,11 @@ Workbench - &Drawing + Dr&awing &Tegning - Ske&tch + S&ketch Sk&isser diff --git a/src/Mod/Complete/Gui/Resources/translations/Complete_pl.qm b/src/Mod/Complete/Gui/Resources/translations/Complete_pl.qm index 20ac1afe7..959ad6b12 100644 Binary files a/src/Mod/Complete/Gui/Resources/translations/Complete_pl.qm and b/src/Mod/Complete/Gui/Resources/translations/Complete_pl.qm differ diff --git a/src/Mod/Complete/Gui/Resources/translations/Complete_pl.ts b/src/Mod/Complete/Gui/Resources/translations/Complete_pl.ts index 761a19332..58b62fd97 100644 --- a/src/Mod/Complete/Gui/Resources/translations/Complete_pl.ts +++ b/src/Mod/Complete/Gui/Resources/translations/Complete_pl.ts @@ -32,11 +32,11 @@ Workbench - &Drawing + Dr&awing &Rysunek - Ske&tch + S&ketch Szki&c diff --git a/src/Mod/Complete/Gui/Resources/translations/Complete_pt.qm b/src/Mod/Complete/Gui/Resources/translations/Complete_pt.qm index 34a16816c..55f13d3b7 100644 Binary files a/src/Mod/Complete/Gui/Resources/translations/Complete_pt.qm and b/src/Mod/Complete/Gui/Resources/translations/Complete_pt.qm differ diff --git a/src/Mod/Complete/Gui/Resources/translations/Complete_pt.ts b/src/Mod/Complete/Gui/Resources/translations/Complete_pt.ts index 90d092c66..408fba3d3 100644 --- a/src/Mod/Complete/Gui/Resources/translations/Complete_pt.ts +++ b/src/Mod/Complete/Gui/Resources/translations/Complete_pt.ts @@ -32,11 +32,11 @@ Workbench - &Drawing + Dr&awing &Desenho - Ske&tch + S&ketch Sk&etch diff --git a/src/Mod/Complete/Gui/Resources/translations/Complete_ru.qm b/src/Mod/Complete/Gui/Resources/translations/Complete_ru.qm index 517679124..b0977c27c 100644 Binary files a/src/Mod/Complete/Gui/Resources/translations/Complete_ru.qm and b/src/Mod/Complete/Gui/Resources/translations/Complete_ru.qm differ diff --git a/src/Mod/Complete/Gui/Resources/translations/Complete_ru.ts b/src/Mod/Complete/Gui/Resources/translations/Complete_ru.ts index 28d46c787..ac8194f3c 100644 --- a/src/Mod/Complete/Gui/Resources/translations/Complete_ru.ts +++ b/src/Mod/Complete/Gui/Resources/translations/Complete_ru.ts @@ -32,11 +32,11 @@ Workbench - &Drawing + Dr&awing &Рисование - Ske&tch + S&ketch Эс&киз diff --git a/src/Mod/Complete/Gui/Resources/translations/Complete_se.qm b/src/Mod/Complete/Gui/Resources/translations/Complete_se.qm index f01b401a6..c3fc4c544 100644 Binary files a/src/Mod/Complete/Gui/Resources/translations/Complete_se.qm and b/src/Mod/Complete/Gui/Resources/translations/Complete_se.qm differ diff --git a/src/Mod/Complete/Gui/Resources/translations/Complete_se.ts b/src/Mod/Complete/Gui/Resources/translations/Complete_se.ts index fe2bf21e6..868c35e03 100644 --- a/src/Mod/Complete/Gui/Resources/translations/Complete_se.ts +++ b/src/Mod/Complete/Gui/Resources/translations/Complete_se.ts @@ -32,11 +32,11 @@ Workbench - &Drawing + Dr&awing R&itning - Ske&tch + S&ketch S&kiss diff --git a/src/Mod/Complete/Gui/Resources/translations/Complete_uk.qm b/src/Mod/Complete/Gui/Resources/translations/Complete_uk.qm index 6b8111534..1aba32e8e 100644 Binary files a/src/Mod/Complete/Gui/Resources/translations/Complete_uk.qm and b/src/Mod/Complete/Gui/Resources/translations/Complete_uk.qm differ diff --git a/src/Mod/Complete/Gui/Resources/translations/Complete_uk.ts b/src/Mod/Complete/Gui/Resources/translations/Complete_uk.ts index ecac8e183..49840b58c 100644 --- a/src/Mod/Complete/Gui/Resources/translations/Complete_uk.ts +++ b/src/Mod/Complete/Gui/Resources/translations/Complete_uk.ts @@ -32,11 +32,11 @@ Workbench - &Drawing + Dr&awing &Малювання - Ske&tch + S&ketch Ес&кіз diff --git a/src/Mod/Complete/Gui/Resources/translations/Complete_zh.qm b/src/Mod/Complete/Gui/Resources/translations/Complete_zh.qm index 8b3fc5bc2..e770a01e0 100644 Binary files a/src/Mod/Complete/Gui/Resources/translations/Complete_zh.qm and b/src/Mod/Complete/Gui/Resources/translations/Complete_zh.qm differ diff --git a/src/Mod/Complete/Gui/Resources/translations/Complete_zh.ts b/src/Mod/Complete/Gui/Resources/translations/Complete_zh.ts index 106c42019..26cfdf217 100644 --- a/src/Mod/Complete/Gui/Resources/translations/Complete_zh.ts +++ b/src/Mod/Complete/Gui/Resources/translations/Complete_zh.ts @@ -32,11 +32,11 @@ Workbench - &Drawing + Dr&awing 图纸(&D) - Ske&tch + S&ketch 草绘(&T) diff --git a/src/Mod/Complete/Gui/Workbench.cpp b/src/Mod/Complete/Gui/Workbench.cpp index 80a0336dd..d2a5e5aaf 100644 --- a/src/Mod/Complete/Gui/Workbench.cpp +++ b/src/Mod/Complete/Gui/Workbench.cpp @@ -45,12 +45,12 @@ using namespace CompleteGui; #if 0 // needed for Qt's lupdate utility - qApp->translate("Workbench", "Ske&tch"); - qApp->translate("Workbench", "&Drawing"); + qApp->translate("Workbench", "S&ketch"); + qApp->translate("Workbench", "Dr&awing"); qApp->translate("Workbench", "&Raytracing"); qApp->translate("Workbench", "&Drafting"); qApp->translate("Workbench", "Sketch based"); - qApp->translate("Workbench", "Parametric"); + qApp->translate("Workbench", "Primitives"); qApp->translate("Workbench", "Object appearence"); qApp->translate("Workbench", "Wire Tools"); // taken from TestGui.py @@ -238,7 +238,7 @@ Gui::MenuItem* Workbench::setupMenuBar() const // submenu boolean Gui::MenuItem* para = new Gui::MenuItem(); - para->setCommand("Parametric"); + para->setCommand("Primitives"); *para << "Part_Box" << "Part_Cylinder" << "Part_Sphere" @@ -306,7 +306,7 @@ Gui::MenuItem* Workbench::setupMenuBar() const Gui::MenuItem* drawing = new Gui::MenuItem(menuBar); - drawing->setCommand("&Drawing"); + drawing->setCommand("Dr&awing"); *drawing << "Drawing_Open" << "Separator" diff --git a/src/Mod/Part/Gui/Workbench.cpp b/src/Mod/Part/Gui/Workbench.cpp index bceedc093..ea42cb9f3 100644 --- a/src/Mod/Part/Gui/Workbench.cpp +++ b/src/Mod/Part/Gui/Workbench.cpp @@ -58,11 +58,16 @@ Gui::MenuItem* Workbench::setupMenuBar() const Gui::MenuItem* root = StdWorkbench::setupMenuBar(); Gui::MenuItem* item = root->findItem("&Windows"); + Gui::MenuItem* prim = new Gui::MenuItem; + prim->setCommand("Primitives"); + *prim << "Part_Box" << "Part_Cylinder" << "Part_Sphere" + << "Part_Cone" << "Part_Torus"; + Gui::MenuItem* part = new Gui::MenuItem; root->insertItem(item, part); part->setCommand("&Part"); *part << "Part_Import" << "Part_Export" << "Separator"; - *part << "Part_Primitives" << "Part_ShapeFromMesh" + *part << prim << "Part_Primitives" << "Separator" << "Part_ShapeFromMesh" << "Part_MakeSolid" << "Part_ReverseShape" << "Part_SimpleCopy" << "Part_RefineShape" << "Separator" << "Part_Boolean" << "Part_CrossSections" << "Part_Extrude" @@ -70,16 +75,10 @@ Gui::MenuItem* Workbench::setupMenuBar() const << "Part_RuledSurface" << "Part_Loft" << "Part_Builder"; - Gui::MenuItem* partSimple = new Gui::MenuItem; - root->insertItem(item, partSimple); - partSimple->setCommand("&Simple"); - *partSimple << "Part_SimpleCylinder"; - - Gui::MenuItem* solids = new Gui::MenuItem; - root->insertItem(item, solids); - solids->setCommand("&Parametric"); - *solids << "Part_Box" << "Part_Cylinder" << "Part_Sphere" << "Part_Cone" - << "Part_Torus" << "Separator" << "Part_Primitives"; + //Gui::MenuItem* partSimple = new Gui::MenuItem; + //root->insertItem(item, partSimple); + //partSimple->setCommand("&Simple"); + //*partSimple << "Part_SimpleCylinder"; return root; } diff --git a/src/Mod/Sketcher/Gui/Workbench.cpp b/src/Mod/Sketcher/Gui/Workbench.cpp index c196d63ce..15a285f52 100644 --- a/src/Mod/Sketcher/Gui/Workbench.cpp +++ b/src/Mod/Sketcher/Gui/Workbench.cpp @@ -57,7 +57,7 @@ Gui::MenuItem* Workbench::setupMenuBar() const Gui::MenuItem* sketch = new Gui::MenuItem; root->insertItem(item, sketch); - sketch->setCommand("Ske&tch"); + sketch->setCommand("S&ketch"); Gui::MenuItem* geom = new Gui::MenuItem(); geom->setCommand("Sketcher geometries"); *geom /*<< "Sketcher_CreatePoint"*/