diff --git a/src/Mod/Arch/InitGui.py b/src/Mod/Arch/InitGui.py index 0459f3cf3..49a2c601f 100644 --- a/src/Mod/Arch/InitGui.py +++ b/src/Mod/Arch/InitGui.py @@ -74,11 +74,11 @@ class ArchWorkbench(Workbench): self.appendToolbar(QT_TRANSLATE_NOOP("Workbench","Arch tools"),self.archtools) self.appendToolbar(QT_TRANSLATE_NOOP("Workbench","Draft tools"),self.drafttools) self.appendToolbar(QT_TRANSLATE_NOOP("Workbench","Draft mod tools"),self.draftmodtools) - self.appendMenu([translate("arch","&Arch"),translate("arch","Utilities")],self.utilities) - self.appendMenu(translate("arch","&Arch"),self.archtools) - self.appendMenu(translate("arch","&Draft"),self.drafttools+self.draftmodtools+self.draftextratools) - self.appendMenu([translate("arch","&Draft"),translate("arch","Utilities")],self.draftutils+self.draftcontexttools) - self.appendMenu([translate("arch","&Draft"),translate("arch","Snapping")],self.snapList) + self.appendMenu([QT_TRANSLATE_NOOP("arch","&Arch"),QT_TRANSLATE_NOOP("arch","Utilities")],self.utilities) + self.appendMenu(QT_TRANSLATE_NOOP("arch","&Arch"),self.archtools) + self.appendMenu(QT_TRANSLATE_NOOP("arch","&Draft"),self.drafttools+self.draftmodtools+self.draftextratools) + self.appendMenu([QT_TRANSLATE_NOOP("arch","&Draft"),QT_TRANSLATE_NOOP("arch","Utilities")],self.draftutils+self.draftcontexttools) + self.appendMenu([QT_TRANSLATE_NOOP("arch","&Draft"),QT_TRANSLATE_NOOP("arch","Snapping")],self.snapList) FreeCADGui.addIconPath(":/icons") FreeCADGui.addLanguagePath(":/translations") FreeCADGui.addPreferencePage(":/ui/preferences-arch.ui","Arch") diff --git a/src/Mod/Draft/InitGui.py b/src/Mod/Draft/InitGui.py index 4aad8f8f0..282b5ebcf 100644 --- a/src/Mod/Draft/InitGui.py +++ b/src/Mod/Draft/InitGui.py @@ -91,10 +91,10 @@ class DraftWorkbench (Workbench): 'Draft_Snap_Dimensions','Draft_Snap_WorkingPlane'] self.appendToolbar(QT_TRANSLATE_NOOP("Workbench","Draft creation tools"),self.cmdList) self.appendToolbar(QT_TRANSLATE_NOOP("Workbench","Draft modification tools"),self.modList) - self.appendMenu(translate("draft","&Draft"),self.cmdList+self.modList) - self.appendMenu([translate("draft","&Draft"),translate("draft","Utilities")],self.utils+self.treecmdList) - self.appendMenu([translate("draft","&Draft"),translate("draft","Wire tools")],self.lineList) - self.appendMenu([translate("draft","&Draft"),translate("draft","Snapping")],self.snapList) + self.appendMenu(QT_TRANSLATE_NOOP("draft","&Draft"),self.cmdList+self.modList) + self.appendMenu([QT_TRANSLATE_NOOP("draft","&Draft"),QT_TRANSLATE_NOOP("draft","Utilities")],self.utils+self.treecmdList) + self.appendMenu([QT_TRANSLATE_NOOP("draft","&Draft"),QT_TRANSLATE_NOOP("draft","Wire tools")],self.lineList) + self.appendMenu([QT_TRANSLATE_NOOP("draft","&Draft"),QT_TRANSLATE_NOOP("draft","Snapping")],self.snapList) if hasattr(FreeCADGui,"draftToolBar"): if not hasattr(FreeCADGui.draftToolBar,"loadedPreferences"): FreeCADGui.addPreferencePage(":/ui/preferences-draft.ui","Draft") diff --git a/src/Mod/Path/InitGui.py b/src/Mod/Path/InitGui.py index 3a81dacc9..cc8405ef8 100644 --- a/src/Mod/Path/InitGui.py +++ b/src/Mod/Path/InitGui.py @@ -93,29 +93,29 @@ class PathWorkbench (Workbench): def translate(context, text): return QtGui.QApplication.translate(context, text, None, QtGui.QApplication.UnicodeUTF8).encode("utf8") - self.appendToolbar(translate("Path", "Project Setup"), projcmdlist) - self.appendToolbar(translate("Path", "Tool Commands"), toolcmdlist) - #self.appendToolbar(translate("Path", "Partial Commands"), prepcmdlist) - self.appendToolbar(translate("Path", "New Operations"), twodopcmdlist+threedopcmdlist) - self.appendToolbar(translate("Path", "Path Modification"), modcmdlist) - self.appendToolbar(translate("Path", "Helpful Tools"), extracmdlist) + self.appendToolbar(QT_TRANSLATE_NOOP("Path", "Project Setup"), projcmdlist) + self.appendToolbar(QT_TRANSLATE_NOOP("Path", "Tool Commands"), toolcmdlist) + #self.appendToolbar(QT_TRANSLATE_NOOP("Path", "Partial Commands"), prepcmdlist) + self.appendToolbar(QT_TRANSLATE_NOOP("Path", "New Operations"), twodopcmdlist+threedopcmdlist) + self.appendToolbar(QT_TRANSLATE_NOOP("Path", "Path Modification"), modcmdlist) + self.appendToolbar(QT_TRANSLATE_NOOP("Path", "Helpful Tools"), extracmdlist) - self.appendMenu([translate("Path", "&Path")], projcmdlist +["Separator"] + toolcmdlist +["Separator"] +twodopcmdlist +["Separator"] +threedopcmdlist +["Separator"]) - #self.appendMenu([translate("Path", "Path"), translate( + self.appendMenu([QT_TRANSLATE_NOOP("Path", "&Path")], projcmdlist +["Separator"] + toolcmdlist +["Separator"] +twodopcmdlist +["Separator"] +threedopcmdlist +["Separator"]) + #self.appendMenu([QT_TRANSLATE_NOOP("Path", "Path"), QT_TRANSLATE_NOOP( # "Path", "Tools")], toolcmdlist) - self.appendMenu([translate("Path", "&Path"), translate( + self.appendMenu([QT_TRANSLATE_NOOP("Path", "&Path"), QT_TRANSLATE_NOOP( "Path", "Path Dressup")], dressupcmdlist) - self.appendMenu([translate("Path", "&Path"), translate( + self.appendMenu([QT_TRANSLATE_NOOP("Path", "&Path"), QT_TRANSLATE_NOOP( "Path", "Partial Commands")], prepcmdlist) - #self.appendMenu([translate("Path", "Path"), translate( + #self.appendMenu([QT_TRANSLATE_NOOP("Path", "Path"), QT_TRANSLATE_NOOP( # "Path", "New Operations")], opcmdlist) - self.appendMenu([translate("Path", "&Path"), translate( + self.appendMenu([QT_TRANSLATE_NOOP("Path", "&Path"), QT_TRANSLATE_NOOP( "Path", "Path Modification")], modcmdlist) - #self.appendMenu([translate("Path", "Path"), translate( + #self.appendMenu([QT_TRANSLATE_NOOP("Path", "Path"), QT_TRANSLATE_NOOP( # "Path", "Path Modification")], modcmdmore) - # self.appendMenu([translate("Path", "Path"), translate( + # self.appendMenu([QT_TRANSLATE_NOOP("Path", "Path"), QT_TRANSLATE_NOOP( # "Path", "Remote Operations")], remotecmdlist) - self.appendMenu([translate("Path", "&Path")], extracmdlist) + self.appendMenu([QT_TRANSLATE_NOOP("Path", "&Path")], extracmdlist) Log('Loading Path workbench... done\n')