Skip to content

Commit c579059

Browse files
authored
Merge pull request #26937 from Jojo-Schmitz/websitenames
Fix GH#26920: Spelling of audio.com, musescore.com, musescore.org
2 parents 003a240 + 60f9cf0 commit c579059

File tree

6 files changed

+27
-27
lines changed

6 files changed

+27
-27
lines changed

src/appshell/view/firstlaunchsetup/firstlaunchsetupmodel.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ bool FirstLaunchSetupModel::askAboutClosingEarly()
105105
IInteractive::Result result
106106
= interactive()->warning(muse::trc("appshell/gettingstarted", "Are you sure you want to cancel?"),
107107
muse::trc("appshell/gettingstarted", "If you choose to cancel, then be sure to check out "
108-
"our free MuseSounds playback library on musescore.org."),
108+
"our free MuseSounds playback library on MuseScore.org."),
109109
buttons,
110110
int(IInteractive::Button::Cancel));
111111

src/engraving/engravingerrors.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ inline muse::Ret make_ret(Err err, const muse::io::path_t& filePath = {})
8686
break;
8787
case Err::FileTooNew:
8888
text = muse::mtrc("engraving", "This file was saved using a newer version of MuseScore Studio. "
89-
"Please visit <a href=\"https://musescore.org\">musescore.org</a> to obtain the latest version.");
89+
"Please visit <a href=\"https://musescore.org\">MuseScore.org</a> to obtain the latest version.");
9090
break;
9191
case Err::FileOld300Format:
9292
text = muse::mtrc("engraving", "This file was last saved in a development version of 3.0.");

src/framework/cloud/qml/Muse/Cloud/CloudScoresView.qml

+2-2
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ ScoresView {
128128
anchors.rightMargin: root.sideMargin
129129

130130
title: qsTrc("project", "You don’t have any online scores yet")
131-
body: qsTrc("project", "Scores will appear here when you save a file to the cloud, or publish a score on <a href=\"https://musescore.com\">musescore.com</a>.")
131+
body: qsTrc("project", "Scores will appear here when you save a file to the cloud, or publish a score on <a href=\"https://musescore.com\">MuseScore.com</a>.")
132132
}
133133
}
134134
}
@@ -153,7 +153,7 @@ ScoresView {
153153
width: parent.width
154154

155155
title: qsTrc("project", "You are not signed in")
156-
body: qsTrc("project", "Log in or create a new account on <a href=\"https://musescore.com\">musescore.com</a> to view online scores.")
156+
body: qsTrc("project", "Log in or create a new account on <a href=\"https://musescore.com\">MuseScore.com</a> to view online scores.")
157157
}
158158

159159
Row {

src/framework/update/internal/updatescenario.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ void UpdateScenario::processUpdateResult(int errorCode)
138138
void UpdateScenario::showNoUpdateMsg()
139139
{
140140
QString str = muse::qtrc("update", "You already have the latest version of MuseScore Studio. "
141-
"Please visit <a href=\"%1\">musescore.org</a> for news on what’s coming next.")
141+
"Please visit <a href=\"%1\">MuseScore.org</a> for news on what’s coming next.")
142142
.arg(QString::fromStdString(configuration()->museScoreUrl()));
143143

144144
IInteractive::Text text(str.toStdString(), IInteractive::TextFormat::RichText);

src/project/internal/opensaveprojectscenario.cpp

+12-12
Original file line numberDiff line numberDiff line change
@@ -231,8 +231,8 @@ RetVal<CloudProjectInfo> OpenSaveProjectScenario::doAskCloudLocation(INotationPr
231231
}
232232

233233
std::string dialogText = isPublishShare
234-
? muse::trc("project/save", "Log in to musescore.com to save this score to the cloud.")
235-
: muse::trc("project/save", "Log in to musescore.com to publish this score.");
234+
? muse::trc("project/save", "Log in to MuseScore.com to save this score to the cloud.")
235+
: muse::trc("project/save", "Log in to MuseScore.com to publish this score.");
236236
RetVal<Val> retVal = museScoreComService()->authorization()->ensureAuthorization(true, dialogText);
237237
if (!retVal.ret) {
238238
return retVal.ret;
@@ -465,7 +465,7 @@ static std::string cloudStatusCodeErrorMessage(const Ret& ret, bool withHelp = f
465465
}
466466

467467
if (withHelp) {
468-
message += "\n\n" + muse::trc("project/cloud", "Please try again later, or get help for this problem on musescore.org.");
468+
message += "\n\n" + muse::trc("project/cloud", "Please try again later, or get help for this problem on MuseScore.org.");
469469
}
470470

471471
return message;
@@ -484,7 +484,7 @@ void OpenSaveProjectScenario::showCloudOpenError(const Ret& ret) const
484484
message = muse::trc("project/cloud", "The file could not be downloaded to your disk.");
485485
break;
486486
case int(cloud::Err::Status403_AccountNotActivated):
487-
message = muse::trc("project/cloud", "Your musescore.com account needs to be verified first. "
487+
message = muse::trc("project/cloud", "Your MuseScore.com account needs to be verified first. "
488488
"Please activate your account via the link in the activation email.");
489489
break;
490490
case int(cloud::Err::Status403_NotOwner):
@@ -505,7 +505,7 @@ void OpenSaveProjectScenario::showCloudOpenError(const Ret& ret) const
505505
break;
506506

507507
case int(cloud::Err::NetworkError):
508-
message = muse::trc("project/cloud", "Could not connect to <a href=\"https://musescore.com\">musescore.com</a>. "
508+
message = muse::trc("project/cloud", "Could not connect to <a href=\"https://musescore.com\">MuseScore.com</a>. "
509509
"Please check your internet connection or try again later.");
510510
break;
511511
default:
@@ -550,7 +550,7 @@ Ret OpenSaveProjectScenario::showCloudSaveError(const Ret& ret, const CloudProje
550550

551551
switch (ret.code()) {
552552
case int(cloud::Err::Status403_AccountNotActivated):
553-
msg = muse::trc("project/cloud", "Your musescore.com account needs to be verified first. "
553+
msg = muse::trc("project/cloud", "Your MuseScore.com account needs to be verified first. "
554554
"Please activate your account via the link in the activation email.");
555555
buttons = { okBtn };
556556
break;
@@ -591,11 +591,11 @@ Ret OpenSaveProjectScenario::showCloudSaveError(const Ret& ret, const CloudProje
591591
break;
592592

593593
case int(cloud::Err::NetworkError):
594-
msg = muse::trc("project/cloud", "Could not connect to <a href=\"https://musescore.com\">musescore.com</a>. "
594+
msg = muse::trc("project/cloud", "Could not connect to <a href=\"https://musescore.com\">MuseScore.com</a>. "
595595
"Please check your internet connection or try again later.");
596596
break;
597597
default:
598-
msg = muse::trc("project/cloud", "Please try again later, or get help for this problem on musescore.org.");
598+
msg = muse::trc("project/cloud", "Please try again later, or get help for this problem on MuseScore.org.");
599599
break;
600600
}
601601

@@ -627,7 +627,7 @@ Ret OpenSaveProjectScenario::showAudioCloudShareError(const Ret& ret) const
627627

628628
switch (ret.code()) {
629629
case int(cloud::Err::Status403_AccountNotActivated):
630-
msg = muse::trc("project/share", "Your audio.com account needs to be verified first. "
630+
msg = muse::trc("project/share", "Your Audio.com account needs to be verified first. "
631631
"Please activate your account via the link in the activation email.");
632632
break;
633633
case int(cloud::Err::UnknownStatusCode): {
@@ -639,14 +639,14 @@ Ret OpenSaveProjectScenario::showAudioCloudShareError(const Ret& ret) const
639639
} else {
640640
msg = muse::trc("project/share", "Audio.com returned an unknown error code.");
641641
}
642-
msg += "\n\n" + muse::trc("project/share", "Please try again later, or get help for this problem on audio.com.");
642+
msg += "\n\n" + muse::trc("project/share", "Please try again later, or get help for this problem on Audio.com.");
643643
} break;
644644
case int(cloud::Err::NetworkError):
645-
msg = muse::trc("project/share", "Could not connect to audio.com. "
645+
msg = muse::trc("project/share", "Could not connect to Audio.com. "
646646
"Please check your internet connection or try again later.");
647647
break;
648648
default:
649-
msg = muse::trc("project/share", "Please try again later, or get help for this problem on audio.com.");
649+
msg = muse::trc("project/share", "Please try again later, or get help for this problem on Audio.com.");
650650
break;
651651
}
652652

src/project/internal/projectactionscontroller.cpp

+10-10
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ void ProjectActionsController::downloadAndOpenCloudProject(int scoreId, const QS
439439
return;
440440
}
441441

442-
std::string dialogText = muse::trc("project/save", "Log in or create a free account on musescore.com to open this score.");
442+
std::string dialogText = muse::trc("project/save", "Log in or create a free account on MuseScore.com to open this score.");
443443
Ret ret = museScoreComService()->authorization()->ensureAuthorization(false, dialogText).ret;
444444
if (!ret) {
445445
return;
@@ -536,7 +536,7 @@ Ret ProjectActionsController::openScoreFromMuseScoreCom(const QUrl& url)
536536
}
537537

538538
// Ensure logged in
539-
std::string dialogText = muse::trc("project/save", "Log in or create a free account on musescore.com to open this score.");
539+
std::string dialogText = muse::trc("project/save", "Log in or create a free account on MuseScore.com to open this score.");
540540
Ret ret = museScoreComService()->authorization()->ensureAuthorization(false, dialogText).ret;
541541
if (!ret) {
542542
return ret;
@@ -994,7 +994,7 @@ bool ProjectActionsController::saveProjectToCloud(CloudProjectInfo info, SaveMod
994994
if (!isCloudAvailable) {
995995
warnCloudIsNotAvailable();
996996
} else {
997-
std::string dialogText = muse::trc("project/save", "Log in to musescore.com to save this score to the cloud.");
997+
std::string dialogText = muse::trc("project/save", "Log in to MuseScore.com to save this score to the cloud.");
998998
RetVal<Val> retVal = museScoreComService()->authorization()->ensureAuthorization(true, dialogText);
999999
if (!retVal.ret) {
10001000
return false;
@@ -1376,7 +1376,7 @@ void ProjectActionsController::onProjectSuccessfullyUploaded(const QUrl& urlToOp
13761376
IInteractive::ButtonData okBtn = interactive()->buttonData(IInteractive::Button::Ok);
13771377

13781378
std::string msg = muse::trc("project/save", "All saved changes will now update to the cloud. "
1379-
"You can manage this file in the score manager on musescore.com.");
1379+
"You can manage this file in the score manager on MuseScore.com.");
13801380

13811381
int btn = interactive()->info(muse::trc("global", "Success!"), msg, { viewOnlineBtn, okBtn },
13821382
static_cast<int>(IInteractive::Button::Ok)).button();
@@ -1502,7 +1502,7 @@ void ProjectActionsController::warnCorruptedScoreCannotBeSavedOnCloud(const std:
15021502
std::string title = muse::trc("project", "Your score cannot be uploaded to the cloud");
15031503
std::string body = muse::trc("project", "This score has become corrupted and contains errors. "
15041504
"You can fix the errors manually, or save the score to your computer "
1505-
"and get help for this issue on musescore.org.");
1505+
"and get help for this issue on MuseScore.org.");
15061506

15071507
IInteractive::ButtonDatas buttons;
15081508
buttons.push_back(interactive()->buttonData(IInteractive::Button::Cancel));
@@ -1535,10 +1535,10 @@ bool ProjectActionsController::askIfUserAgreesToSaveCorruptedScoreLocally(const
15351535
{
15361536
std::string title = muse::trc("project", "This score has become corrupted and contains errors");
15371537
std::string body = !canRevert ? muse::trc("project", "You can continue saving it locally, although the file may become unusable. "
1538-
"You can try to fix the errors manually, or get help for this issue on musescore.org.")
1538+
"You can try to fix the errors manually, or get help for this issue on MuseScore.org.")
15391539
: muse::trc("project", "You can continue saving it locally, although the file may become unusable. "
15401540
"To preserve your score, revert to the last saved version, or fix the errors manually. "
1541-
"You can also get help for this issue on musescore.org.");
1541+
"You can also get help for this issue on MuseScore.org.");
15421542

15431543
IInteractive::ButtonDatas buttons;
15441544
buttons.push_back(interactive()->buttonData(IInteractive::Button::Cancel));
@@ -1582,7 +1582,7 @@ void ProjectActionsController::showErrCorruptedScoreCannotBeSaved(const SaveLoca
15821582
{
15831583
std::string title = location.isLocal() ? muse::trc("project", "Your score cannot be saved")
15841584
: muse::trc("project", "Your score cannot be uploaded to the cloud");
1585-
std::string body = muse::trc("project", "This score is corrupted. You can get help for this issue on musescore.org.");
1585+
std::string body = muse::trc("project", "This score is corrupted. You can get help for this issue on MuseScore.org.");
15861586

15871587
IInteractive::ButtonData getHelpBtn(IInteractive::Button::CustomButton, muse::trc("project", "Get help"));
15881588

@@ -1742,7 +1742,7 @@ void ProjectActionsController::warnFileTooNew(const muse::io::path_t& filepath)
17421742
{
17431743
interactive()->error(muse::qtrc("project", "Cannot read file %1").arg(io::toNativeSeparators(filepath).toQString()).toStdString(),
17441744
muse::trc("project", "This file was saved using a newer version of MuseScore Studio. "
1745-
"Please visit <a href=\"https://musescore.org\">musescore.org</a> to obtain the latest version."));
1745+
"Please visit <a href=\"https://musescore.org\">MuseScore.org</a> to obtain the latest version."));
17461746
}
17471747

17481748
bool ProjectActionsController::askIfUserAgreesToOpenCorruptedProject(const String& projectName, const std::string& errorText)
@@ -1763,7 +1763,7 @@ bool ProjectActionsController::askIfUserAgreesToOpenCorruptedProject(const Strin
17631763
void ProjectActionsController::warnProjectCriticallyCorrupted(const String& projectName, const std::string& errorText)
17641764
{
17651765
std::string title = muse::mtrc("project", "File “%1” is corrupted and cannot be opened").arg(projectName).toStdString();
1766-
std::string body = muse::trc("project", "Get help for this issue on musescore.org.");
1766+
std::string body = muse::trc("project", "Get help for this issue on MuseScore.org.");
17671767

17681768
IInteractive::ButtonData getHelpBtn(IInteractive::Button::CustomButton, muse::trc("project", "Get help"), true /*accent*/);
17691769

0 commit comments

Comments
 (0)