From dd97cd3ea3b65ac3a5fca43da24b5a111cdd4cd3 Mon Sep 17 00:00:00 2001 From: Joachim Schmitz Date: Mon, 20 Jan 2014 20:26:23 +0100 Subject: [PATCH 1/4] fix 24359: changing "directory" to "folder" --- mscore/prefsdialog.ui | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mscore/prefsdialog.ui b/mscore/prefsdialog.ui index 9c51ddf5f5..4792466591 100644 --- a/mscore/prefsdialog.ui +++ b/mscore/prefsdialog.ui @@ -465,7 +465,7 @@ - Images directory: + Images folder: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -478,7 +478,7 @@ - Scores directory: + Scores folder: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -491,7 +491,7 @@ - Styles directory: + Styles folder: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -507,7 +507,7 @@ - Templates directory: + Templates folder: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -537,7 +537,7 @@ - Plugins directory: + Plugins folder: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -592,7 +592,7 @@ - SFZ Files folders: + SFZ folders: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter From 3b91ec6438e224f63f0923b6cedb7fd6f4081b27 Mon Sep 17 00:00:00 2001 From: Joachim Schmitz Date: Tue, 21 Jan 2014 09:49:19 +0100 Subject: [PATCH 2/4] fix #24359: changing plural to singular --- mscore/prefsdialog.ui | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mscore/prefsdialog.ui b/mscore/prefsdialog.ui index 4792466591..67abf83b94 100644 --- a/mscore/prefsdialog.ui +++ b/mscore/prefsdialog.ui @@ -465,7 +465,7 @@ - Images folder: + Image folder: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -478,7 +478,7 @@ - Scores folder: + Score folder: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -491,7 +491,7 @@ - Styles folder: + Style folder: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -507,7 +507,7 @@ - Templates folder: + Template folder: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -537,7 +537,7 @@ - Plugins folder: + Plugin folder: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -563,7 +563,7 @@ - Soundfonts folders: + Soundfont folders: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter From 46283dee1a67449f38abc5f0d9faa452ce45296e Mon Sep 17 00:00:00 2001 From: Joachim Schmitz Date: Tue, 21 Jan 2014 10:21:11 +0100 Subject: [PATCH 3/4] fix 24359: it wasn't just the UI file affected... --- mscore/musescore.cpp | 2 +- mscore/preferences.cpp | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mscore/musescore.cpp b/mscore/musescore.cpp index fea8e9316d..df7d758e7b 100644 --- a/mscore/musescore.cpp +++ b/mscore/musescore.cpp @@ -1404,7 +1404,7 @@ static void usage() " -F use factory settings\n" " -i load icons from INSTALLPATH/icons\n" " -e enable experimental features\n" - " -c dir override config/settings directory\n" + " -c dir override config/settings folder\n" " -t set testMode flag for all files\n" " -w write buildin workspace\n" ); diff --git a/mscore/preferences.cpp b/mscore/preferences.cpp index 5ef411e3a9..962f387901 100644 --- a/mscore/preferences.cpp +++ b/mscore/preferences.cpp @@ -1533,7 +1533,7 @@ void PreferenceDialog::selectScoresDirectory() { QString s = QFileDialog::getExistingDirectory( this, - tr("Choose Scores Directory"), + tr("Choose Score Folder"), myScores->text() ); if (!s.isNull()) @@ -1548,7 +1548,7 @@ void PreferenceDialog::selectStylesDirectory() { QString s = QFileDialog::getExistingDirectory( this, - tr("Choose Styles Directory"), + tr("Choose Style Folder"), myStyles->text() ); if (!s.isNull()) @@ -1563,7 +1563,7 @@ void PreferenceDialog::selectTemplatesDirectory() { QString s = QFileDialog::getExistingDirectory( this, - tr("Choose Templates Directory"), + tr("Choose Template Folder"), myTemplates->text() ); if (!s.isNull()) @@ -1578,7 +1578,7 @@ void PreferenceDialog::selectPluginsDirectory() { QString s = QFileDialog::getExistingDirectory( this, - tr("Choose Plugins Directory"), + tr("Choose Plugin Folder"), myPlugins->text() ); if (!s.isNull()) @@ -1593,7 +1593,7 @@ void PreferenceDialog::selectImagesDirectory() { QString s = QFileDialog::getExistingDirectory( this, - tr("Choose Images Directory"), + tr("Choose Image Folder"), myImages->text() ); if (!s.isNull()) @@ -1607,7 +1607,7 @@ void PreferenceDialog::selectImagesDirectory() void PreferenceDialog::changeSoundfontPaths() { PathListDialog pld(this); - pld.setWindowTitle(tr("Soundfont folders")); + pld.setWindowTitle(tr("Soundfont Folders")); pld.setPath(sfPath->text()); if(pld.exec()) sfPath->setText(pld.path()); @@ -1620,7 +1620,7 @@ void PreferenceDialog::changeSoundfontPaths() void PreferenceDialog::changeSfzPaths() { PathListDialog pld(this); - pld.setWindowTitle(tr("SFZ folders")); + pld.setWindowTitle(tr("SFZ Folders")); pld.setPath(sfzPath->text()); if(pld.exec()) sfzPath->setText(pld.path()); From 22e9e964d958f985ca49030ad4adf5b7dc63cf7f Mon Sep 17 00:00:00 2001 From: Joachim Schmitz Date: Tue, 21 Jan 2014 14:37:31 +0100 Subject: [PATCH 4/4] fix 23366: more capitalization --- fluid/fluidgui.cpp | 2 +- zerberus/zerberusgui.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fluid/fluidgui.cpp b/fluid/fluidgui.cpp index 368dee3c07..fa78360a41 100644 --- a/fluid/fluidgui.cpp +++ b/fluid/fluidgui.cpp @@ -18,7 +18,7 @@ using namespace Ms; SfListDialog::SfListDialog() : QDialog(0) { - setWindowTitle(tr("Soundfont files")); + setWindowTitle(tr("Soundfont Files")); setWindowFlags(this->windowFlags() & ~Qt::WindowContextHelpButtonHint); list = new QListWidget; QVBoxLayout* layout = new QVBoxLayout; diff --git a/zerberus/zerberusgui.cpp b/zerberus/zerberusgui.cpp index 3e37bba633..32d42900eb 100644 --- a/zerberus/zerberusgui.cpp +++ b/zerberus/zerberusgui.cpp @@ -21,7 +21,7 @@ SfzListDialog::SfzListDialog() : QDialog(0) { - setWindowTitle(tr("SFZ files")); + setWindowTitle(tr("SFZ Files")); setWindowFlags(this->windowFlags() & ~Qt::WindowContextHelpButtonHint); list = new QListWidget; QVBoxLayout* layout = new QVBoxLayout;