summaryrefslogtreecommitdiff
path: root/muse2/muse/app.cpp
diff options
context:
space:
mode:
authorFlorian Jung <flo@windfisch.org>2011-08-18 16:45:06 +0000
committerFlorian Jung <flo@windfisch.org>2011-08-18 16:45:06 +0000
commit0002e57359fb002a70cc9559308619ff611718c9 (patch)
tree4d430468df5c1a38895ae9f56a61127240e5ea2b /muse2/muse/app.cpp
parent3513555193d44fe99bc30dd3bf04701278a797a1 (diff)
parent35c95c10cca9938210818c0b809b1ff4f9c4ad3d (diff)
merged with trunk, except:
- not applied the "masteredit saves toolbar state" change, as this is done by TopWin here in experimental - fixed some indentation error in scoreedit.cpp
Diffstat (limited to 'muse2/muse/app.cpp')
-rw-r--r--muse2/muse/app.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/muse2/muse/app.cpp b/muse2/muse/app.cpp
index e48425d7..8f059c73 100644
--- a/muse2/muse/app.cpp
+++ b/muse2/muse/app.cpp
@@ -1422,7 +1422,7 @@ void MusE::closeEvent(QCloseEvent* event)
n = QMessageBox::warning(this, appName,
tr("The current Project contains unsaved data\n"
"Save Current Project?"),
- tr("&Save"), tr("&Skip"), tr("&Cancel"), 0, 2);
+ tr("&Save"), tr("S&kip"), tr("&Cancel"), 0, 2);
if (n == 0) {
if (!save()) // dont quit if save failed
{
@@ -2601,7 +2601,7 @@ bool MusE::clearSong(bool clear_all)
tr("The current Project contains unsaved data\n"
"Load overwrites current Project:\n"
"Save Current Project?"),
- tr("&Save"), tr("&Skip"), tr("&Abort"), 0, 2);
+ tr("&Save"), tr("S&kip"), tr("&Abort"), 0, 2);
switch (n) {
case 0:
if (!save()) // abort if save failed