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

Git: Do not use the (s) plural in UI text

Browse Source 
The UI text guidelines advice against this.

Change-Id: Ib8f9cb291f0217de10853412b133173f1d11e7b7
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Leena Miettinen
2017-07-28 09:51:55 +02:00
parent 6c25c67b98
commit b29ea4527a
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/git/gitclient.cpp
View File

@@ -1065,7 +1065,7 @@ bool GitClient::synchronousReset(const QString &workingDirectory,
if (files.isEmpty()) { if (files.isEmpty()) {
msgCannotRun(arguments, workingDirectory, resp.stdErr(), errorMessage); msgCannotRun(arguments, workingDirectory, resp.stdErr(), errorMessage);
} else { } else {
msgCannotRun(tr("Cannot reset %n file(s) in \"%1\": %2", 0, files.size()) msgCannotRun(tr("Cannot reset %n files in \"%1\": %2", 0, files.size())
.arg(QDir::toNativeSeparators(workingDirectory), resp.stdErr()), .arg(QDir::toNativeSeparators(workingDirectory), resp.stdErr()),
errorMessage); errorMessage);
} }
@@ -2468,9 +2468,9 @@ bool GitClient::getCommitData(const QString &workingDirectory,
static inline QString msgCommitted(const QString &amendSHA1, int fileCount) static inline QString msgCommitted(const QString &amendSHA1, int fileCount)
{ {
if (amendSHA1.isEmpty()) if (amendSHA1.isEmpty())
return GitClient::tr("Committed %n file(s).", 0, fileCount) + '\n'; return GitClient::tr("Committed %n files.", 0, fileCount) + '\n';
if (fileCount) if (fileCount)
return GitClient::tr("Amended \"%1\" (%n file(s)).", 0, fileCount).arg(amendSHA1) + '\n'; return GitClient::tr("Amended \"%1\" (%n files).", 0, fileCount).arg(amendSHA1) + '\n';
return GitClient::tr("Amended \"%1\".").arg(amendSHA1); return GitClient::tr("Amended \"%1\".").arg(amendSHA1);
} }
@@ -2561,7 +2561,7 @@ bool GitClient::addAndCommit(const QString &repositoryDirectory,
VcsOutputWindow::appendError(stdErr); VcsOutputWindow::appendError(stdErr);
return true; return true;
} else { } else {
VcsOutputWindow::appendError(tr("Cannot commit %n file(s): %1\n", 0, commitCount).arg(stdErr)); VcsOutputWindow::appendError(tr("Cannot commit %n files: %1\n", 0, commitCount).arg(stdErr));
return false; return false;
} }
} }