Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Replace concatenated string in MythControls::ResolveConflict().

  • Loading branch information...
commit 67ef67bbb44e2cfddcacdf00d7c46719297e1b6b 1 parent 7d9bb76
Stuart Morgan stuartm authored
Showing with 7 additions and 4 deletions.
  1. +7 −4 mythtv/programs/mythfrontend/mythcontrols.cpp
11 mythtv/programs/mythfrontend/mythcontrols.cpp
View
@@ -600,15 +600,18 @@ void MythControls::ResolveConflict(ActionID *conflict, int error_level,
if (!conflict)
return;
- QString label = tr("This key binding conflicts with %1 in the %2 context.")
- .arg(conflict->GetAction()).arg(conflict->GetContext());
+ QString label;
bool error = (KeyBindings::kKeyBindingError == error_level);
if (error)
- label.append(tr(" Unable to bind key."));
+ label = tr("This key binding conflicts with %1 in the %2 context. "
+ "Unable to bind key.")
+ .arg(conflict->GetAction()).arg(conflict->GetContext());
else
- label.append(tr(" Do you want to bind it anyway?"));
+ label = tr("This key binding conflicts with %1 in the %2 context. "
+ "Do you want to bind it anyway?")
+ .arg(conflict->GetAction()).arg(conflict->GetContext());
MythScreenStack *popupStack =
GetMythMainWindow()->GetStack("popup stack");
Please sign in to comment.
Something went wrong with that request. Please try again.