summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Alejandro <ivanalejandro0@gmail.com>2013-10-08 12:12:32 -0300
committerIvan Alejandro <ivanalejandro0@gmail.com>2013-10-08 12:12:32 -0300
commitfabbffdee3327259ba6b79eecfa2ddad349f68c5 (patch)
tree826c7ded06ecc236718df181b76ef1800af9b5cb
parent1240049bc5a1974ac9ef3b6ec2c07746938136ef (diff)
parent105aac0666ea5715f91ca0bba1f987b03ccdd766 (diff)
Merge remote-tracking branch 'chiiph/bug/osx_menu' into develop
-rw-r--r--changes/bug_util_menu_as_file1
-rw-r--r--src/leap/bitmask/gui/mainwindow.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/changes/bug_util_menu_as_file b/changes/bug_util_menu_as_file
new file mode 100644
index 00000000..48228f26
--- /dev/null
+++ b/changes/bug_util_menu_as_file
@@ -0,0 +1 @@
+ o Change the Util menu to be named File in OSX. Fixes #4039. \ No newline at end of file
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py
index db6a19d2..dd625f52 100644
--- a/src/leap/bitmask/gui/mainwindow.py
+++ b/src/leap/bitmask/gui/mainwindow.py
@@ -258,7 +258,7 @@ class MainWindow(QtGui.QMainWindow):
self._launch_wizard)
if IS_MAC:
- self.ui.menuFile.menuAction().setText(self.tr("Util"))
+ self.ui.menuFile.menuAction().setText(self.tr("File"))
self.raise_window.connect(self._do_raise_mainwindow)