From 3b2382262a97de8f19e5164219b587cbf31b77ea Mon Sep 17 00:00:00 2001 From: fuzzgun Date: Mon, 13 May 2013 20:38:37 +0100 Subject: [PATCH] Standardise on 'Quit' rather than 'Exit' --- src/bitmessageqt/__init__.py | 2 +- src/bitmessageui.py | 2 +- src/bitmessageui.ui | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bitmessageqt/__init__.py b/src/bitmessageqt/__init__.py index 338384f3..c72762b4 100644 --- a/src/bitmessageqt/__init__.py +++ b/src/bitmessageqt/__init__.py @@ -73,7 +73,7 @@ class MyForm(QtGui.QMainWindow): traySignal = "activated(QSystemTrayIcon::ActivationReason)" QtCore.QObject.connect(self.trayIcon, QtCore.SIGNAL(traySignal), self.__icon_activated) menu = QtGui.QMenu() - self.exitAction = menu.addAction("Exit", self.quit) + self.exitAction = menu.addAction("Quit", self.quit) self.trayIcon.setContextMenu(menu) #I'm currently under the impression that Mac users have different expectations for the tray icon. They don't necessairly expect it to open the main window when clicked and they still expect a program showing a tray icon to also be in the dock. if 'darwin' in sys.platform: diff --git a/src/bitmessageui.py b/src/bitmessageui.py index 20e5b973..a7c85206 100644 --- a/src/bitmessageui.py +++ b/src/bitmessageui.py @@ -515,7 +515,7 @@ class Ui_MainWindow(object): self.menuHelp.setTitle(QtGui.QApplication.translate("MainWindow", "Help", None, QtGui.QApplication.UnicodeUTF8)) self.actionImport_keys.setText(QtGui.QApplication.translate("MainWindow", "Import keys", None, QtGui.QApplication.UnicodeUTF8)) self.actionManageKeys.setText(QtGui.QApplication.translate("MainWindow", "Manage keys", None, QtGui.QApplication.UnicodeUTF8)) - self.actionExit.setText(QtGui.QApplication.translate("MainWindow", "Exit", None, QtGui.QApplication.UnicodeUTF8)) + self.actionExit.setText(QtGui.QApplication.translate("MainWindow", "Quit", None, QtGui.QApplication.UnicodeUTF8)) self.actionHelp.setText(QtGui.QApplication.translate("MainWindow", "Help", None, QtGui.QApplication.UnicodeUTF8)) self.actionAbout.setText(QtGui.QApplication.translate("MainWindow", "About", None, QtGui.QApplication.UnicodeUTF8)) self.actionSettings.setText(QtGui.QApplication.translate("MainWindow", "Settings", None, QtGui.QApplication.UnicodeUTF8)) diff --git a/src/bitmessageui.ui b/src/bitmessageui.ui index e1b1e319..cef8cd69 100644 --- a/src/bitmessageui.ui +++ b/src/bitmessageui.ui @@ -979,7 +979,7 @@ p, li { white-space: pre-wrap; } - Exit + Quit