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

Merge remote branch 'origin/2.0'

Browse Source 
Conflicts:
	doc/qtcreator.qdoc
	src/plugins/find/currentdocumentfind.cpp
	src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp
This commit is contained in:
con
2010-05-17 17:40:40 +02:00
parent d8318a9502 b52f3cb274
commit 38f6379f39
106 changed files with 1205 additions and 1111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/git/branchdialog.ui
View File

@@ -42,7 +42,7 @@
<item>
<widget class="QGroupBox" name="remoteBranchGroupBox">
<property name="title">
<string>Remote branches</string>
<string>Remote Branches</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>

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

@@ -40,7 +40,7 @@ ChangeSelectionDialog::ChangeSelectionDialog(QWidget *parent)
{
m_ui.setupUi(this);
connect(m_ui.repositoryButton, SIGNAL(clicked()), this, SLOT(selectWorkingDirectory()));
setWindowTitle(tr("Select a Git commit"));
setWindowTitle(tr("Select a Git Commit"));
}
QString ChangeSelectionDialog::change() const
@@ -62,7 +62,7 @@ void ChangeSelectionDialog::selectWorkingDirectory()
{
static QString location;
location = QFileDialog::getExistingDirectory(this,
tr("Select Git repository"),
tr("Select Git Repository"),
location);
if (location.isEmpty())
return;

2
src/plugins/git/changeselectiondialog.ui
View File

@@ -17,7 +17,7 @@
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Repository Location:</string>
<string>Repository location:</string>
</property>
</widget>
</item>

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

@@ -52,7 +52,7 @@ QIcon CloneWizard::icon() const
QString CloneWizard::description() const
{
return tr("Clones a project from a Git repository and tries to load the contained project.");
return tr("Clones a Git repository and tries to load the contained project.");
}
QString CloneWizard::displayName() const

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

@@ -862,7 +862,7 @@ QString GitClient::synchronousStash(const QString &workingDirectory,
do {
if ((flags & StashPromptDescription)) {
if (!inputText(Core::ICore::instance()->mainWindow(),
tr("Stash description"), tr("Description:"), &message))
tr("Stash Description"), tr("Description:"), &message))
break;
}
if (!executeSynchronousStash(workingDirectory, message))

2
src/plugins/git/gitorious/gitoriousclonewizard.cpp
View File

@@ -80,7 +80,7 @@ QIcon GitoriousCloneWizard::icon() const
QString GitoriousCloneWizard::description() const
{
return tr("Clones a project from a Gitorious repository and tries to load the contained project.");
return tr("Clones a Gitorious repository and tries to load the contained project.");
}
QString GitoriousCloneWizard::displayName() const

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

@@ -420,7 +420,7 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
ActionCommandPair actionCommand =
createRepositoryAction(actionManager, gitContainer,
tr("Stash snapshot..."), QLatin1String("Git.StashSnapshot"),
tr("Stash Snapshot..."), QLatin1String("Git.StashSnapshot"),
globalcontext, true, SLOT(stashSnapshot()));
actionCommand.first->setToolTip(tr("Saves the current state of your work."));

4
src/plugins/git/settingspage.ui
View File

@@ -17,7 +17,7 @@
<bool>true</bool>
</property>
<property name="title">
<string>Environment variables</string>
<string>Environment Variables</string>
</property>
<property name="checkable">
<bool>true</bool>
@@ -38,7 +38,7 @@
<item>
<widget class="QPushButton" name="adoptButton">
<property name="text">
<string>From system</string>
<string>From System</string>
</property>
</widget>
</item>