Commit 2c42b06f authored by Jarek Kobus's avatar Jarek Kobus
Browse files

Fix some strings.



Change-Id: Iaac415d25ebfac507df73fc4b3977425df521979
Reviewed-by: default avatarLeena Miettinen <riitta-leena.miettinen@digia.com>
parent 12445a05
...@@ -264,7 +264,7 @@ void MergeTool::done() ...@@ -264,7 +264,7 @@ void MergeTool::done()
const QString workingDirectory = m_process->workingDirectory(); const QString workingDirectory = m_process->workingDirectory();
int exitCode = m_process->exitCode(); int exitCode = m_process->exitCode();
if (!exitCode) { if (!exitCode) {
outputWindow->appendMessage(tr("Merge tool process finished successully.")); outputWindow->appendMessage(tr("Merge tool process finished successfully."));
m_gitClient->continueCommandIfNeeded(workingDirectory); m_gitClient->continueCommandIfNeeded(workingDirectory);
} else { } else {
outputWindow->appendError(tr("Merge tool process terminated with exit code %1") outputWindow->appendError(tr("Merge tool process terminated with exit code %1")
......
...@@ -110,7 +110,7 @@ void BlackBerryDebugTokenPinsDialog::removePin() ...@@ -110,7 +110,7 @@ void BlackBerryDebugTokenPinsDialog::removePin()
const QString pin = m_model->item(index.row(), 0)->text(); const QString pin = m_model->item(index.row(), 0)->text();
const int result = QMessageBox::question(this, tr("Confirmation"), const int result = QMessageBox::question(this, tr("Confirmation"),
tr("Are you sure you want to remove PIN: %1") tr("Are you sure you want to remove PIN: %1?")
.arg(pin), QMessageBox::Yes | QMessageBox::No); .arg(pin), QMessageBox::Yes | QMessageBox::No);
if (result == QMessageBox::Yes) { if (result == QMessageBox::Yes) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment