Update code for translations, fix a few translation issues and add a few missing...

[cura.git] / Cura / gui / mainWindow.py

diff --git a/Cura/gui/mainWindow.py b/Cura/gui/mainWindow.py
index 971c19aa142d7aa830393625dfcefcaef5355456..61b88f85e39e9018a01df7a2cbead8920bb05333 100644 (file)
--- a/Cura/gui/mainWindow.py
+++ b/Cura/gui/mainWindow.py
@@ -14,6 +14,7 @@ from Cura.gui import configWizard
 from Cura.gui import firmwareInstall
 from Cura.gui import simpleMode
 from Cura.gui import sceneView
+from Cura.gui import aboutWindow
 from Cura.gui.util import dropTarget
 #from Cura.gui.tools import batchRun
 from Cura.gui.tools import pidDebugger
@@ -91,14 +92,14 @@ class mainWindow(wx.Frame):
 
                # Model MRU list
                modelHistoryMenu = wx.Menu()
-               self.fileMenu.AppendMenu(wx.NewId(), _("&Recent Model Files"), modelHistoryMenu)
+               self.fileMenu.AppendMenu(wx.NewId(), '&' + _("Recent Model Files"), modelHistoryMenu)
                self.modelFileHistory.UseMenu(modelHistoryMenu)
                self.modelFileHistory.AddFilesToMenu()
                self.Bind(wx.EVT_MENU_RANGE, self.OnModelMRU, id=self.ID_MRU_MODEL1, id2=self.ID_MRU_MODEL10)
 
                # Profle MRU list
                profileHistoryMenu = wx.Menu()
-               self.fileMenu.AppendMenu(wx.NewId(), _("&Recent Profile Files"), profileHistoryMenu)
+               self.fileMenu.AppendMenu(wx.NewId(), _("Recent Profile Files"), profileHistoryMenu)
                self.profileFileHistory.UseMenu(profileHistoryMenu)
                self.profileFileHistory.AddFilesToMenu()
                self.Bind(wx.EVT_MENU_RANGE, self.OnProfileMRU, id=self.ID_MRU_PROFILE1, id2=self.ID_MRU_PROFILE10)
@@ -106,7 +107,7 @@ class mainWindow(wx.Frame):
                self.fileMenu.AppendSeparator()
                i = self.fileMenu.Append(wx.ID_EXIT, _("Quit"))
                self.Bind(wx.EVT_MENU, self.OnQuit, i)
-               self.menubar.Append(self.fileMenu, _("&File"))
+               self.menubar.Append(self.fileMenu, '&' + _("File"))
 
                toolsMenu = wx.Menu()
 
@@ -124,7 +125,7 @@ class mainWindow(wx.Frame):
                #self.normalModeOnlyItems.append(i)
 
                if minecraftImport.hasMinecraft():
-                       i = toolsMenu.Append(-1, _("Minecraft import..."))
+                       i = toolsMenu.Append(-1, _("Minecraft map import..."))
                        self.Bind(wx.EVT_MENU, self.OnMinecraftImport, i)
 
                if version.isDevVersion():
@@ -526,31 +527,9 @@ class mainWindow(wx.Frame):
                        wx.MessageBox(_("You are running the latest version of Cura!"), _("Awesome!"), wx.ICON_INFORMATION)
 
        def OnAbout(self, e):
-               info = wx.AboutDialogInfo()
-               info.SetName("Cura")
-               info.SetDescription("""
-End solution for Open Source Fused Filament Fabrication 3D printing.
-* Cura is the graphical User Interface.
-* CuraEngine is the slicer/gcode generator.
-Cura and the CuraEngine are licensed AGPLv3.
-               """)
-               info.SetWebSite('http://software.ultimaker.com/')
-               info.SetCopyright(_("Copyright (C) David Braam"))
-               info.SetLicence("""
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program 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 Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-""")
-               wx.AboutBox(info)
+               aboutBox = aboutWindow.aboutWindow()
+               aboutBox.Centre()
+               aboutBox.Show()
 
        def OnClose(self, e):
                profile.saveProfile(profile.getDefaultProfilePath())
@@ -627,7 +606,7 @@ class normalSettingsPanel(configBase.configPanelBase):
                        n += 1 + len(profile.getSettingsForCategory(category, title))
                        if n > count / 2:
                                p = right
-                       configBase.TitleRow(p, title)
+                       configBase.TitleRow(p, _(title))
                        for s in profile.getSettingsForCategory(category, title):
                                configBase.SettingRow(p, s.getName())