diff options
| author | con <qtc-committer@nokia.com> | 2010-05-17 17:40:40 +0200 |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2010-05-17 17:40:40 +0200 |
| commit | 38f6379f3949779963b90c904e02314c8f2eaa50 (patch) | |
| tree | 146111bd5b7a5a73bef2cfde7e561e3375d6360e /src/plugins/subversion | |
| parent | d8318a9502b2de2a5fc2e8984deb1383a4e216f7 (diff) | |
| parent | b52f3cb27464d20302599dec0f63e950a39dd64c (diff) | |
| download | qt-creator-38f6379f3949779963b90c904e02314c8f2eaa50.tar.gz | |
Merge remote branch 'origin/2.0'
Conflicts:
doc/qtcreator.qdoc
src/plugins/find/currentdocumentfind.cpp
src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp
Diffstat (limited to 'src/plugins/subversion')
| -rw-r--r-- | src/plugins/subversion/checkoutwizard.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/subversion/settingspage.ui | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/subversion/checkoutwizard.cpp b/src/plugins/subversion/checkoutwizard.cpp index dbe355b813..1175408a93 100644 --- a/src/plugins/subversion/checkoutwizard.cpp +++ b/src/plugins/subversion/checkoutwizard.cpp @@ -53,7 +53,7 @@ QIcon CheckoutWizard::icon() const QString CheckoutWizard::description() const { - return tr("Checks out a project from a Subversion repository and tries to load the contained project."); + return tr("Checks out a Subversion repository and tries to load the contained project."); } QString CheckoutWizard::displayName() const diff --git a/src/plugins/subversion/settingspage.ui b/src/plugins/subversion/settingspage.ui index 249ad3fef2..4b659929aa 100644 --- a/src/plugins/subversion/settingspage.ui +++ b/src/plugins/subversion/settingspage.ui @@ -34,7 +34,7 @@ <item row="0" column="0"> <widget class="QLabel" name="usernameLabel"> <property name="text"> - <string>User name:</string> + <string>Username:</string> </property> </widget> </item> |