Merge pull request #659 from Jojo-Schmitz/24359-directories

In prefsdialog.ui change "directory" to "folder" and plural to singular
This commit is contained in:
Werner Schweer 2014-01-24 01:57:11 -08:00
commit dfabf91244
5 changed files with 17 additions and 17 deletions

View file

@ -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;

View file

@ -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"
);

View file

@ -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());

View file

@ -465,7 +465,7 @@
<item row="6" column="0">
<widget class="QLabel" name="label_9">
<property name="text">
<string>Images directory:</string>
<string>Image folder:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@ -478,7 +478,7 @@
<item row="0" column="0">
<widget class="QLabel" name="label_86">
<property name="text">
<string>Scores directory:</string>
<string>Score folder:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@ -491,7 +491,7 @@
<item row="1" column="0">
<widget class="QLabel" name="label_88">
<property name="text">
<string>Styles directory:</string>
<string>Style folder:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@ -507,7 +507,7 @@
<item row="2" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Templates directory:</string>
<string>Template folder:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@ -537,7 +537,7 @@
<item row="3" column="0">
<widget class="QLabel" name="label_89">
<property name="text">
<string>Plugins directory:</string>
<string>Plugin folder:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@ -563,7 +563,7 @@
<item row="4" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Soundfonts folders:</string>
<string>Soundfont folders:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@ -592,7 +592,7 @@
<item row="5" column="0">
<widget class="QLabel" name="label_19">
<property name="text">
<string>SFZ Files folders:</string>
<string>SFZ folders:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>

View file

@ -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;