feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

UI text: fix git cherry-picking strings

Browse Source 
Fix grammar and capitalization.

Change-Id: Iccabb01c72783f486cdb7d574c2cbb942d4d1cfe
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Leena Miettinen
2013-02-08 17:11:07 +01:00
committed by Orgad Shaneh
parent 81a69f3e42
commit 2473349c3d
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/git/giteditor.cpp
View File

@@ -267,7 +267,7 @@ bool GitEditor::isValidRevision(const QString &revision) const
void GitEditor::addChangeActions(QMenu *menu, const QString &change) void GitEditor::addChangeActions(QMenu *menu, const QString &change)
{ {
m_currentChange = change; m_currentChange = change;
menu->addAction(tr("Cherry-pick Change %1").arg(change), this, SLOT(cherryPickChange())); menu->addAction(tr("Cherry-Pick Change %1").arg(change), this, SLOT(cherryPickChange()));
menu->addAction(tr("Revert Change %1").arg(change), this, SLOT(revertChange())); menu->addAction(tr("Revert Change %1").arg(change), this, SLOT(revertChange()));
} }

4
src/plugins/git/mergetool.cpp
View File

@@ -294,8 +294,8 @@ void MergeTool::done()
tr("You need to commit changes to finish revert.\nCommit now?"), tr("You need to commit changes to finish revert.\nCommit now?"),
tr("Commit"), QLatin1String("revert")); tr("Commit"), QLatin1String("revert"));
} else if (QFile::exists(gitDir + QLatin1String("/CHERRY_PICK_HEAD"))) { } else if (QFile::exists(gitDir + QLatin1String("/CHERRY_PICK_HEAD"))) {
continuePreviousGitCommand(tr("Continue Cherry-Pick"), continuePreviousGitCommand(tr("Continue Cherry-Picking"),
tr("You need to commit changes to finish cherry-pick.\nCommit now?"), tr("You need to commit changes to finish cherry-picking.\nCommit now?"),
tr("Commit"), QLatin1String("cherry-pick")); tr("Commit"), QLatin1String("cherry-pick"));
} }
} else { } else {