summaryrefslogtreecommitdiff
path: root/src/plugins/git
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2009-04-17 21:11:52 +0200
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2009-04-20 16:51:10 +0200
commit6d5eeb7afbf6bb29681b9dd88d4e1321ed1f8674 (patch)
tree07615aec177112842a026ba32c72c8f418ae1072 /src/plugins/git
parent9db13e325576844970fe86fadd70b8ed5d230bc6 (diff)
downloadqt-creator-6d5eeb7afbf6bb29681b9dd88d4e1321ed1f8674.tar.gz
add missing tr()s, etc., add some //: comments
Diffstat (limited to 'src/plugins/git')
-rw-r--r--src/plugins/git/changeselectiondialog.cpp6
-rw-r--r--src/plugins/git/gitclient.cpp1
-rw-r--r--src/plugins/git/gitplugin.cpp6
3 files changed, 7 insertions, 6 deletions
diff --git a/src/plugins/git/changeselectiondialog.cpp b/src/plugins/git/changeselectiondialog.cpp
index 51576d11aa..c1227fa2cb 100644
--- a/src/plugins/git/changeselectiondialog.cpp
+++ b/src/plugins/git/changeselectiondialog.cpp
@@ -46,7 +46,7 @@ void ChangeSelectionDialog::selectWorkingDirectory()
{
static QString location = QString();
location = QFileDialog::getExistingDirectory(this,
- QLatin1String("Select Git repository"),
+ tr("Select Git repository"),
location);
if (location.isEmpty())
return;
@@ -63,7 +63,7 @@ void ChangeSelectionDialog::selectWorkingDirectory()
} while (repository.cdUp());
// Did not find a repo
- QMessageBox::critical(this, QLatin1String("Error"),
- QLatin1String("Selected directory is not a Git repository"));
+ QMessageBox::critical(this, tr("Error"),
+ tr("Selected directory is not a Git repository"));
}
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index 2b93589317..99301d3801 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -89,6 +89,7 @@ static inline QString msgParseFilesFailed()
static QString formatCommand(const QString &binary, const QStringList &args)
{
const QString timeStamp = QTime::currentTime().toString(QLatin1String("HH:mm"));
+ //: <timestamp> Executing: <executable> <arguments>
return GitClient::tr("%1 Executing: %2 %3\n").arg(timeStamp, binary, args.join(QString(QLatin1Char(' '))));
}
diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp
index 93e387d0de..204453936d 100644
--- a/src/plugins/git/gitplugin.cpp
+++ b/src/plugins/git/gitplugin.cpp
@@ -376,7 +376,7 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
gitContainer->addAction(createSeparator(actionManager, globalcontext, QLatin1String("Git.Sep.Global"), this));
m_stashAction = new QAction(tr("Stash"), this);
- m_stashAction->setToolTip("Saves the current state of your work.");
+ m_stashAction->setToolTip(tr("Saves the current state of your work."));
command = actionManager->registerAction(m_stashAction, "Git.Stash", globalcontext);
command->setAttribute(Core::Command::CA_UpdateText);
connect(m_stashAction, SIGNAL(triggered()), this, SLOT(stash()));
@@ -389,7 +389,7 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
gitContainer->addAction(command);
m_stashPopAction = new QAction(tr("Stash Pop"), this);
- m_stashAction->setToolTip("Restores changes saved to the stash list using \"Stash\".");
+ m_stashAction->setToolTip(tr("Restores changes saved to the stash list using \"Stash\"."));
command = actionManager->registerAction(m_stashPopAction, "Git.StashPop", globalcontext);
command->setAttribute(Core::Command::CA_UpdateText);
connect(m_stashPopAction, SIGNAL(triggered()), this, SLOT(stashPop()));
@@ -785,7 +785,7 @@ void GitPlugin::updateActions()
const QString repository = m_gitClient->findRepositoryForFile(current.absoluteFilePath());
// First check for file commands and if the current file is inside
// a Git-repository
- const QString file = fileName.isEmpty() ? "File" : "File \"" + fileName + '"';
+ const QString file = fileName.isEmpty() ? tr("File") : "\"" + fileName + '"';
m_diffAction->setText(tr("Diff %1").arg(file));
m_statusAction->setText(tr("Status Related to %1").arg(file));
m_logAction->setText(tr("Log of %1").arg(file));