Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

fix #23366: more fixes for capitalization

and some more fixes.
  • Loading branch information...
commit 4f8f63f91e039a5923a00a0d6fdd67eedb79d264 1 parent d9fa175
@Jojo-Schmitz Jojo-Schmitz authored
View
2  libmscore/chordlist.cpp
@@ -1714,7 +1714,7 @@ bool ChordList::read(const QString& name)
return false;
QFile f(path);
if (!f.open(QIODevice::ReadOnly)) {
- QString s = QT_TRANSLATE_NOOP("file", "cannot open chord description:\n%1\n%2");
+ QString s = QT_TRANSLATE_NOOP("file", "Cannot open chord description:\n%1\n%2");
MScore::lastError = s.arg(f.fileName()).arg(f.errorString());
qDebug("ChordList::read failed: <%s>", qPrintable(path));
return false;
View
2  libmscore/edit.cpp
@@ -442,7 +442,7 @@ static void warnTupletCrossing()
if (!MScore::noGui)
QMessageBox::warning(0,
QT_TRANSLATE_NOOP("addRemoveTimeSig", "MuseScore"),
- QT_TRANSLATE_NOOP("addRemoveTimeSig", "cannot rewrite measures:\n"
+ QT_TRANSLATE_NOOP("addRemoveTimeSig", "Cannot rewrite measures:\n"
"tuplet would cross measure")
);
}
View
2  libmscore/figuredbass.cpp
@@ -1514,7 +1514,7 @@ bool FiguredBass::readConfigFile(const QString& fileName)
QFile f(path);
if (!f.open(QIODevice::ReadOnly)) {
- QString s = QT_TRANSLATE_NOOP("file", "cannot open figured bass description:\n%1\n%2");
+ QString s = QT_TRANSLATE_NOOP("file", "Cannot open figured bass description:\n%1\n%2");
MScore::lastError = s.arg(f.fileName()).arg(f.errorString());
qDebug("FiguredBass::read failed: <%s>\n", qPrintable(path));
return false;
View
2  libmscore/imageStore.cpp
@@ -72,7 +72,7 @@ void ImageStoreItem::load()
return;
QFile inFile(_path);
if (!inFile.open(QIODevice::ReadOnly)) {
- qDebug("cannot open picture file");
+ qDebug("Cannot open picture file");
return;
}
_buffer = inFile.readAll();
View
2  libmscore/measure.cpp
@@ -2102,7 +2102,7 @@ void Measure::read(XmlReader& e, int staffIdx)
segment = getSegment(Segment::SegChordRest, e.tick());
ChordRest* cr = static_cast<ChordRest*>(segment->element(e.track()));
if (!cr)
- qDebug("Internal Error: no Chord/Rest for lyrics");
+ qDebug("Internal error: no chord/rest for lyrics");
else
cr->add(element);
}
View
2  libmscore/stafftype.cpp
@@ -994,7 +994,7 @@ bool StaffTypeTablature::readConfigFile(const QString& fileName)
QFile f(path);
if (!fi.exists() || !f.open(QIODevice::ReadOnly)) {
- QString s = QT_TRANSLATE_NOOP("file", "cannot open tablature font description:\n%1\n%2");
+ QString s = QT_TRANSLATE_NOOP("file", "Cannot open tablature font description:\n%1\n%2");
MScore::lastError = s.arg(f.fileName()).arg(f.errorString());
qDebug("StaffTypeTablature::readConfigFile failed: <%s>\n", qPrintable(path));
return false;
View
4 miditools/smf2xml.cpp
@@ -78,13 +78,13 @@ int main(int argc, char* argv[])
case 2:
out = new QFile(argv[1 + optind]);
if (!out->open(QIODevice::WriteOnly)) {
- qDebug("cannot open output file <%s>: %s\n", argv[2], strerror(errno));
+ qDebug("Cannot open output file <%s>: %s\n", argv[2], strerror(errno));
return -3;
}
case 1:
in = new QFile(argv[0 + optind]);
if (!in->open(QIODevice::ReadOnly)) {
- qDebug("cannot open input file <%s>: %s\n", argv[1], strerror(errno));
+ qDebug("Cannot open input file <%s>: %s\n", argv[1], strerror(errno));
return -4;
}
break;
View
4 miditools/xml2smf.cpp
@@ -75,13 +75,13 @@ int main(int argc, char* argv[])
case 2:
out = new QFile(argv[1 + optind]);
if (!out->open(QIODevice::WriteOnly)) {
- printf("cannot open output file <%s>: %s\n", argv[optind+1], strerror(errno));
+ fprintf(stderr, "Cannot open output file <%s>: %s\n", argv[optind+1], strerror(errno));
return -3;
}
case 1:
in = new QFile(argv[optind]);
if (!in->open(QIODevice::ReadOnly)) {
- printf("cannot open input file <%s>: %s\n", argv[optind], strerror(errno));
+ fprintf(stderr, "Cannot open input file <%s>: %s\n", argv[optind], strerror(errno));
return -4;
}
break;
View
2  mscore/bb.cpp
@@ -380,7 +380,7 @@ Score::FileError importBB(Score* score, const QString& name)
if(!QFileInfo(name).exists())
return Score::FILE_NOT_FOUND;
if (!bb.read(name)) {
- qDebug("cannot open file <%s>", qPrintable(name));
+ qDebug("Cannot open file <%s>", qPrintable(name));
return Score::FILE_OPEN_ERROR;
}
score->style()->set(ST_chordsXmlFile, true);
View
10 mscore/exportmp3.cpp
@@ -621,7 +621,7 @@ bool MuseScore::saveMp3(Score* score, const QString& name)
settings.setValue("/Export/lameMP3LibPath", "");
if(!MScore::noGui)
QMessageBox::warning(0,
- tr("Error opening LAME library"),
+ tr("Error Opening LAME library"),
tr("Could not open MP3 encoding library!"),
QString::null, QString::null);
qDebug("Could not open MP3 encoding library!\n");
@@ -633,7 +633,7 @@ bool MuseScore::saveMp3(Score* score, const QString& name)
settings.setValue("/Export/lameMP3LibPath", "");
if(!MScore::noGui)
QMessageBox::warning(0,
- tr("Error opening LAME library"),
+ tr("Error Opening LAME library"),
tr("Not a valid or supported MP3 encoding library!"),
QString::null, QString::null);
qDebug("Not a valid or supported MP3 encoding library!\n");
@@ -661,7 +661,7 @@ bool MuseScore::saveMp3(Score* score, const QString& name)
int inSamples = exporter.initializeStream(channels, sampleRate);
if (inSamples < 0) {
if (!MScore::noGui) {
- QMessageBox::warning(0, tr("Encoding error"),
+ QMessageBox::warning(0, tr("Encoding Error"),
tr("Unable to initialize MP3 stream"),
QString::null, QString::null);
}
@@ -674,7 +674,7 @@ bool MuseScore::saveMp3(Score* score, const QString& name)
if (!file.open(QIODevice::WriteOnly)) {
if (!MScore::noGui) {
QMessageBox::warning(0,
- tr("Encoding error"),
+ tr("Encoding Error"),
tr("Unable to open target file for writing"),
QString::null, QString::null);
}
@@ -792,7 +792,7 @@ bool MuseScore::saveMp3(Score* score, const QString& name)
printf("exportmp3: error from encoder: %ld\n", bytes);
else {
QMessageBox::warning(0,
- tr("Encoding error"),
+ tr("Encoding Error"),
tr("Error %1 returned from MP3 encoder").arg(bytes),
QString::null, QString::null);
break;
View
10 mscore/file.cpp
@@ -200,7 +200,7 @@ static bool readScoreError(const QString& name, Score::FileError error, bool ask
}
if (canIgnore && ask) {
QMessageBox msgBox;
- msgBox.setWindowTitle(QT_TRANSLATE_NOOP(file, "MuseScore: Load error"));
+ msgBox.setWindowTitle(QT_TRANSLATE_NOOP(file, "MuseScore: Load Error"));
msgBox.setText(msg);
msgBox.setTextFormat(Qt::RichText);
msgBox.setIcon(QMessageBox::Warning);
@@ -210,7 +210,7 @@ static bool readScoreError(const QString& name, Score::FileError error, bool ask
return msgBox.exec() == QMessageBox::Ignore;
}
else
- QMessageBox::critical(0, QT_TRANSLATE_NOOP(file, "MuseScore: Load error"), msg);
+ QMessageBox::critical(0, QT_TRANSLATE_NOOP(file, "MuseScore: Load Error"), msg);
return rv;
}
@@ -1584,7 +1584,7 @@ bool MuseScore::exportParts()
if(fip.exists() && !overwrite) {
if(noToAll)
continue;
- QMessageBox msgBox( QMessageBox::Question, tr("Confirm replace"),
+ QMessageBox msgBox( QMessageBox::Question, tr("Confirm Replace"),
tr("\"%1\" already exists.\nDo you want to replace it?\n").arg(QDir::toNativeSeparators(partfn)),
QMessageBox::Yes | QMessageBox::YesToAll | QMessageBox::No | QMessageBox::NoToAll);
msgBox.setButtonText(QMessageBox::Yes, tr("Replace"));
@@ -1693,7 +1693,7 @@ bool MuseScore::saveAs(Score* cs, bool saveCopy, const QString& path, const QStr
rv = savePositions(cs, fn);
}
else {
- qDebug("internal error: unsupported extension <%s>\n",
+ qDebug("Internal error: unsupported extension <%s>\n",
qPrintable(ext));
return false;
}
@@ -2093,7 +2093,7 @@ bool MuseScore::savePng(Score* score, const QString& name, bool screenshot, bool
if(fip.exists() && !overwrite) {
if(noToAll)
continue;
- QMessageBox msgBox( QMessageBox::Question, tr("Confirm replace"),
+ QMessageBox msgBox( QMessageBox::Question, tr("Confirm Replace"),
tr("\"%1\" already exists.\nDo you want to replace it?\n").arg(QDir::toNativeSeparators(fileName)),
QMessageBox::Yes | QMessageBox::YesToAll | QMessageBox::No | QMessageBox::NoToAll);
msgBox.setButtonText(QMessageBox::Yes, tr("Replace"));
View
2  mscore/importmidi.cpp
@@ -1006,7 +1006,7 @@ Score::FileError importMidi(Score *score, const QString &name)
catch (QString errorText) {
if (!MScore::noGui) {
QMessageBox::warning(0,
- QWidget::tr("MuseScore: load midi"),
+ QWidget::tr("MuseScore: Load MIDI"),
QWidget::tr("Load failed: ") + errorText,
QString::null, QWidget::tr("Quit"), QString::null, 0, 1);
}
View
10 mscore/importxml.cpp
@@ -430,7 +430,7 @@ static bool initMusicXmlSchema(QXmlSchema& schema)
QFile schemaFile(":/schema/musicxml.xsd");
if (!schemaFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
qDebug("initMusicXmlSchema() could not open resource musicxml.xsd");
- MScore::lastError = QT_TRANSLATE_NOOP("file", "internal error: could not open resource musicxml.xsd\n");
+ MScore::lastError = QT_TRANSLATE_NOOP("file", "Internal error: could not open resource musicxml.xsd\n");
return false;
}
@@ -451,7 +451,7 @@ static bool initMusicXmlSchema(QXmlSchema& schema)
schema.load(schemaBa);
if (!schema.isValid()) {
qDebug("initMusicXmlSchema() internal error: MusicXML schema is invalid");
- MScore::lastError = QT_TRANSLATE_NOOP("file", "internal error: MusicXML schema is invalid\n");
+ MScore::lastError = QT_TRANSLATE_NOOP("file", "Internal error: MusicXML schema is invalid\n");
return false;
}
@@ -474,7 +474,7 @@ static int musicXMLValidationErrorDialog(QString text, QString detailedText)
QMessageBox errorDialog;
errorDialog.setIcon(QMessageBox::Question);
errorDialog.setText(text);
- errorDialog.setInformativeText("Do you want to try to load this file anyway ?");
+ errorDialog.setInformativeText("Do you want to try to load this file anyway?");
errorDialog.setDetailedText(detailedText);
errorDialog.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
errorDialog.setDefaultButton(QMessageBox::No);
@@ -499,7 +499,7 @@ static bool extractRootfile(QFile* qf, QByteArray& data)
int line, column;
QString err;
if (!container.setContent(data, false, &err, &line, &column)) {
- QString s = QT_TRANSLATE_NOOP("file", "error reading container.xml at line %1 column %2: %3\n");
+ QString s = QT_TRANSLATE_NOOP("file", "Error reading container.xml at line %1 column %2: %3\n");
MScore::lastError = s.arg(line).arg(column).arg(err);
return false;
}
@@ -595,7 +595,7 @@ static Score::FileError doImport(Score* score, const QString& name, QIODevice* d
int column;
QString err;
if (!doc.setContent(dev, false, &err, &line, &column)) {
- QString s = QT_TRANSLATE_NOOP("file", "error at line %1 column %2: %3\n");
+ QString s = QT_TRANSLATE_NOOP("file", "Error at line %1 column %2: %3\n");
MScore::lastError = s.arg(line).arg(column).arg(err);
return Score::FILE_BAD_FORMAT;
}
View
2  mscore/importxmlfirstpass.cpp
@@ -723,7 +723,7 @@ Score::FileError MxmlReaderFirstPass::setContent(QIODevice* d)
QString err;
if (!doc.setContent(d, false, &err, &line, &column)) {
- QString s = QT_TRANSLATE_NOOP("file", "error at line %1 column %2: %3\n");
+ QString s = QT_TRANSLATE_NOOP("file", "Error at line %1 column %2: %3\n");
MScore::lastError = s.arg(line).arg(column).arg(err);
return Score::FILE_BAD_FORMAT;
}
View
4 mscore/instrdialog.cpp
@@ -1235,7 +1235,7 @@ void InstrumentsDialog::on_saveButton_clicked()
if (!f.open(QIODevice::WriteOnly)) {
QString s = tr("Open Instruments File\n") + f.fileName() + tr("\nfailed: ")
+ QString(strerror(errno));
- QMessageBox::critical(mscore, tr("MuseScore: Open Instruments file"), s);
+ QMessageBox::critical(mscore, tr("MuseScore: Open Instruments File"), s);
return;
}
@@ -1273,7 +1273,7 @@ void InstrumentsDialog::on_loadButton_clicked()
QFile f(fn);
if (!loadInstrumentTemplates(fn)) {
QMessageBox::warning(0,
- QWidget::tr("MuseScore: load Style failed:"),
+ QWidget::tr("MuseScore: Load Style Failed"),
QString(strerror(errno)),
QString::null, QWidget::tr("Quit"), QString::null, 0, 1);
return;
View
2  mscore/musedata.cpp
@@ -653,7 +653,7 @@ bool MuseData::read(const QString& name)
{
QFile fp(name);
if (!fp.open(QIODevice::ReadOnly)) {
- qDebug("cannot open file <%s>\n", qPrintable(name));
+ qDebug("Cannot open file <%s>\n", qPrintable(name));
return false;
}
QTextStream ts(&fp);
View
18 mscore/musescore.cpp
@@ -1661,7 +1661,7 @@ void MuseScore::dropEvent(QDropEvent* event)
}
else {
QMessageBox::critical(0,
- tr("MuseScore: Load error"),
+ tr("MuseScore: Load Error"),
tr("Open failed: unknown file extension or broken file"));
}
@@ -2406,10 +2406,10 @@ bool MuseScore::readLanguages(const QString& path)
QString err;
if (!doc.setContent(&qf, false, &err, &line, &column)) {
QString error;
- error.sprintf("error reading language file %s at line %d column %d: %s\n",
+ error.sprintf(qPrintable(tr("Error reading language file %s at line %d column %d: %s\n")),
qPrintable(qf.fileName()), line, column, qPrintable(err));
QMessageBox::warning(0,
- QWidget::tr("MuseScore: Load languages failed:"),
+ QWidget::tr("MuseScore: Load Languages Failed:"),
error,
QString::null, QWidget::tr("Quit"), QString::null, 0, 1);
return false;
@@ -3255,7 +3255,7 @@ bool MuseScore::restoreSession(bool always)
if (!f.exists())
return false;
if (!f.open(QIODevice::ReadOnly)) {
- qDebug("cannot open session file <%s>", qPrintable(f.fileName()));
+ qDebug("Cannot open session file <%s>", qPrintable(f.fileName()));
return false;
}
XmlReader e(&f);
@@ -3910,7 +3910,7 @@ void MuseScore::cmd(QAction* a)
}
if (cs && (sc->state() & _sstate) == 0) {
QMessageBox::warning(0,
- QWidget::tr("MuseScore: invalid command"),
+ QWidget::tr("MuseScore: Invalid Command"),
QString("Command %1 not valid in current state").arg(cmdn));
return;
}
@@ -4171,7 +4171,7 @@ void MuseScore::cmd(QAction* a, const QString& cmd)
if (!name.isEmpty()) {
if (!cs->saveStyle(name)) {
QMessageBox::critical(this,
- tr("MuseScore: save style"), MScore::lastError);
+ tr("MuseScore: Save Style"), MScore::lastError);
}
}
}
@@ -4181,7 +4181,7 @@ void MuseScore::cmd(QAction* a, const QString& cmd)
if (!name.isEmpty()) {
if (!cs->saveStyle(name)) {
QMessageBox::critical(this,
- tr("MuseScore: save style"), MScore::lastError);
+ tr("MuseScore: Save Style"), MScore::lastError);
}
else {
QFileInfo info(name);
@@ -4198,7 +4198,7 @@ void MuseScore::cmd(QAction* a, const QString& cmd)
cs->startCmd();
if (!cs->loadStyle(name)) {
QMessageBox::critical(this,
- tr("MuseScore: load style"), MScore::lastError);
+ tr("MuseScore: Load Style"), MScore::lastError);
}
cs->endCmd();
endCmd();
@@ -4392,7 +4392,7 @@ void MuseScore::closeScore(Score* score)
void MuseScore::noteTooShortForTupletDialog()
{
- QMessageBox::warning(this, tr("MuseScore: warning"),
+ QMessageBox::warning(this, tr("MuseScore: Warning"),
tr("Cannot create tuplet: note value too short")
);
}
View
2  mscore/palette.cpp
@@ -1055,7 +1055,7 @@ static void writeFailed(const QString& path)
{
QString s = qApp->translate("Palette", "Open Palette File\n") + path
+ qApp->translate("Palette", "\nfailed: ");
- QMessageBox::critical(mscore, qApp->translate("Palette", "MuseScore: Writing Palette file"), s);
+ QMessageBox::critical(mscore, qApp->translate("Palette", "MuseScore: Writing Palette File"), s);
}
//---------------------------------------------------------
View
2  mscore/preferences.cpp
@@ -1666,7 +1666,7 @@ bool Preferences::readPluginList()
if (!f.exists())
return false;
if (!f.open(QIODevice::ReadOnly)) {
- qDebug("cannot open plugins file <%s>\n", qPrintable(f.fileName()));
+ qDebug("Cannot open plugins file <%s>\n", qPrintable(f.fileName()));
return false;
}
XmlReader e(&f);
View
2  mscore/scoreview.cpp
@@ -2841,7 +2841,7 @@ void ScoreView::cmd(const QAction* a)
if (!_score->selection().measureRange(&m1, &m2) || m1 == m2) {
QMessageBox::warning(0, "MuseScore",
tr("No measures selected:\n"
- "please select range of measures to join and try again"));
+ "please select a range of measures to join and try again"));
}
else {
_score->cmdJoinMeasure(m1, m2);
View
6 mscore/shortcut.cpp
@@ -211,7 +211,7 @@ Shortcut* Shortcut::getShortcut(const char* id)
{
Shortcut* s = _shortcuts.value(id);
if (s == 0) {
- qDebug("internal error: shortcut <%s> not found\n", id);
+ qDebug("Internal error: shortcut <%s> not found\n", id);
return 0;
}
return s;
@@ -407,7 +407,7 @@ void Shortcut::load()
if (!f.exists())
f.setFileName(":/data/shortcuts.xml");
if (!f.open(QIODevice::ReadOnly)) {
- qDebug("cannot open shortcuts <%s>", qPrintable(f.fileName()));
+ qDebug("Cannot open shortcuts <%s>", qPrintable(f.fileName()));
return;
}
if (MScore::debugMode)
@@ -477,7 +477,7 @@ static QList<Shortcut1*> loadDefaultShortcuts()
QList<Shortcut1*> list;
QFile f(":/data/shortcuts.xml");
if (!f.open(QIODevice::ReadOnly)) {
- qDebug("cannot open shortcuts");
+ qDebug("Cannot open shortcuts");
return list;
}
XmlReader e(&f);
View
2  mscore/shortcutcapturedialog.cpp
@@ -114,7 +114,7 @@ void ShortcutCaptureDialog::keyPress(QKeyEvent* e)
case 2: key = QKeySequence(key[0], key[1], k); break;
case 3: key = QKeySequence(key[0], key[1], key[2], k); break;
default:
- qDebug("internal error: bad key count\n");
+ qDebug("Internal error: bad key count\n");
break;
}
View
2  mscore/workspace.cpp
@@ -214,7 +214,7 @@ static void writeFailed(const QString& _path)
{
QString s = qApp->translate("Workspace", "Open Workspace File\n") + _path
+ qApp->translate("Workspace", "\nfailed: ");
- QMessageBox::critical(mscore, qApp->translate("Workspace", "MuseScore: Writing Workspace file"), s);
+ QMessageBox::critical(mscore, qApp->translate("Workspace", "MuseScore: Writing Workspace File"), s);
}
//---------------------------------------------------------
View
2  mtest/mtest.cpp
@@ -58,7 +58,7 @@ int main(int argc, char* argv[])
#if 0
log.setFileName("mtest.log");
if (!log.open(QIODevice::WriteOnly)) {
- printf("mtest: cannot open log file <mtest.log>\n");
+ fprintf(stderr, "mtest: cannot open log file <mtest.log>\n");
exit(-1);
}
#endif
Please sign in to comment.
Something went wrong with that request. Please try again.