Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-08-16 08:34:10 +02:00
Code Issues Releases Wiki Activity

Substitute, don't concatenate in user-visible strings

Browse Source
This commit is contained in:
Paul Licameli 2020-05-02 12:17:36 -04:00
parent d22b650e6a
commit eb721f33ef
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/prefs/KeyConfigPrefs.cpp
View File

@ -450,11 +450,13 @@ TranslatableString KeyConfigPrefs::MergeWithExistingKeys(
{
TranslatableString name{ mManager->GetKeyFromName(mNames[sRes]).GET(), {} };
disabledShortcuts += XO("\n * \"") +
mManager->GetPrefixedLabelFromName(mNames[i]) +
XO("\" (because the shortcut \'") + name +
XO("\' is used by \"") + mManager->GetPrefixedLabelFromName(mNames[sRes])
+XO("\")\n");
disabledShortcuts +=
XO(
"\n * \"%s\" (because the shortcut \'%s\' is used by \"%s\")\n")
.Format(
mManager->GetPrefixedLabelFromName(mNames[i]),
name,
mManager->GetPrefixedLabelFromName(mNames[sRes]) );
mManager->SetKeyFromIndex(i, noKey);
}
@ -528,8 +530,10 @@ void KeyConfigPrefs::OnImport(wxCommandEvent & WXUNUSED(event))
mKeys = oldKeys;
// output an error message
AudacityMessageBox(XO("The file with the shortcuts contains illegal shortcut duplicates for \"") +
fMatching + XO("\" and \"") + sMatching + XO("\".\nNothing is imported."),
AudacityMessageBox(
XO(
"The file with the shortcuts contains illegal shortcut duplicates for \"%s\" and \"%s\".\nNothing is imported.")
.Format( fMatching, sMatching ),
XO("Error Importing Keyboard Shortcuts"),
wxICON_ERROR | wxCENTRE, this);