diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 91a25b9a2e4a74735309915cfddc9f40275eb85e..5026295e151df1d5e60261e0344ba14967314e70 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -421,6 +421,7 @@ bool GitClient::synchronousCheckoutBranch(const QString &workingDirectory, VCSBase::VCSBaseOutputWindow::instance()->append(output); if (!rc) { const QString stdErr = commandOutputFromLocal8Bit(errorText); + //: Meaning of the arguments: %1: Branch, %2: Repository, %3: Error message const QString msg = tr("Unable to checkout %1 of %2: %3").arg(branch, workingDirectory, stdErr); if (errorMessage) { *errorMessage = msg; @@ -583,6 +584,8 @@ bool GitClient::synchronousCheckoutFiles(const QString &workingDirectory, const bool rc = synchronousGit(workingDirectory, arguments, &outputText, &errorText); if (!rc) { const QString fileArg = files.join(QLatin1String(", ")); + //: Meaning of the arguments: %1: revision, %2: files, %3: repository, + //: %4: Error message const QString msg = tr("Unable to checkout %1 of %2 in %3: %4"). arg(revision, fileArg, workingDirectory, commandOutputFromLocal8Bit(errorText)); if (errorMessage) { @@ -599,6 +602,7 @@ static inline QString msgParentRevisionFailed(const QString &workingDirectory, const QString &revision, const QString &why) { + //: Failed to find parent revisions of a SHA1 for "annotate previous" return GitClient::tr("Unable to find parent revisions of %1 in %2: %3").arg(revision, workingDirectory, why); } @@ -897,6 +901,7 @@ bool GitClient::stashNameFromMessage(const QString &workingDirectory, return true; } } + //: Look-up of a stash via its descriptive message failed. const QString msg = tr("Unable to resolve stash message '%1' in %2").arg(message, workingDirectory); if (errorMessage) { *errorMessage = msg; diff --git a/src/plugins/perforce/perforceplugin.cpp b/src/plugins/perforce/perforceplugin.cpp index 548e8553fc3608e42578a57841f3468f00253fdb..8648f2c4a5ae4d3692595090d757b66878520c28 100644 --- a/src/plugins/perforce/perforceplugin.cpp +++ b/src/plugins/perforce/perforceplugin.cpp @@ -348,7 +348,7 @@ bool PerforcePlugin::initialize(const QStringList & /* arguments */, QString * e mperforce->addAction(command); m_commandLocator->appendCommand(command); - m_logProjectAction = new Utils::ParameterAction(tr("Log Project Log"), tr("Log Project \"%1\""), Utils::ParameterAction::EnabledWithParameter, this); + m_logProjectAction = new Utils::ParameterAction(tr("Log Project"), tr("Log Project \"%1\""), Utils::ParameterAction::EnabledWithParameter, this); command = am->registerAction(m_logProjectAction, CMD_ID_PROJECTLOG, globalcontext); command->setAttribute(Core::Command::CA_UpdateText); connect(m_logProjectAction, SIGNAL(triggered()), this, SLOT(logProject())); @@ -1387,6 +1387,8 @@ void PerforcePlugin::setSettings(const Settings &newSettings) static inline QString msgWhereFailed(const QString & file, const QString &why) { + //: Failed to run p4 "where" to resolve a Perforce file name to a local + //: file system name. return PerforcePlugin::tr("Error running \"where\" on %1: %2").arg(file, why); } @@ -1417,6 +1419,7 @@ QString PerforcePlugin::fileNameFromPerforceName(const QString& perforceName, output.chop(1); if (output.isEmpty()) { + //: File is not managed by Perforce *errorMessage = msgWhereFailed(perforceName, tr("The file is not mapped")); return QString(); } diff --git a/src/plugins/projectexplorer/projectexplorersettingspage.ui b/src/plugins/projectexplorer/projectexplorersettingspage.ui index 385e48aa2e604033b6eddd609106e11fcc8bd948..78b01f1ac84df49ba12124aa69b56bbf27dd253e 100644 --- a/src/plugins/projectexplorer/projectexplorersettingspage.ui +++ b/src/plugins/projectexplorer/projectexplorersettingspage.ui @@ -14,7 +14,7 @@ <item> <widget class="QGroupBox" name="directoryGroupBox"> <property name="title"> - <string>Projects Directory </string> + <string>Projects Directory</string> </property> <layout class="QFormLayout" name="formLayout"> <property name="fieldGrowthPolicy"> diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp index f0f200d443f87fd756c47e6cc3ab27e2412066b1..fade94543928866b26be51aa99ac9e9a85264f5c 100644 --- a/src/plugins/subversion/subversionplugin.cpp +++ b/src/plugins/subversion/subversionplugin.cpp @@ -377,7 +377,7 @@ bool SubversionPlugin::initialize(const QStringList & /*arguments */, QString *e subversionMenu->addAction(command); m_commandLocator->appendCommand(command); - m_logProjectAction = new Utils::ParameterAction(tr("Log Project Log"), tr("Log Project \"%1\""), Utils::ParameterAction::EnabledWithParameter, this); + m_logProjectAction = new Utils::ParameterAction(tr("Log Project"), tr("Log Project \"%1\""), Utils::ParameterAction::EnabledWithParameter, this); command = ami->registerAction(m_logProjectAction, CMD_ID_PROJECTLOG, globalcontext); command->setAttribute(Core::Command::CA_UpdateText); connect(m_logProjectAction, SIGNAL(triggered()), this, SLOT(logProject()));