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

Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline

Browse Source
This commit is contained in:
Erik Verbruggen
2009-07-31 16:53:15 +02:00
parent e205126774 cbfa2c0191
commit 0870d28108
14 changed files with 3300 additions and 1818 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5000
share/qtcreator/translations/qtcreator_de.ts
View File

File diff suppressed because it is too large Load Diff

2
src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
View File

@@ -299,7 +299,7 @@ void CMakeRunPage::initializePage()
if (m_cmakeWizard->existsUpToDateXmlFile()) {
m_descriptionLabel->setText(
tr("The directoyr %1 already contains a cbp file, which is recent enough. "
tr("The directory %1 already contains a cbp file, which is recent enough. "
"You can pass special arguments or change the used toolchain here and rerun cmake. "
"Or simply finish the wizard directly").arg(m_buildDirectory));
} else {

3
src/plugins/cpptools/cppcodecompletion.cpp
View File

@@ -669,7 +669,8 @@ static int startOfOperator(TextEditor::ITextEditable *editor,
break;
const SimpleToken &previousToken = tokens.at(i - 1);
if (previousToken.is(T_IDENTIFIER)) {
if (previousToken.text() == QLatin1String("include")) {
if (previousToken.text() == QLatin1String("include") ||
previousToken.text() == QLatin1String("import")) {
include = true;
break;
}

2
src/plugins/cvs/checkoutwizard.cpp
View File

@@ -51,7 +51,7 @@ QIcon CheckoutWizard::icon() const
QString CheckoutWizard::description() const
{
return tr("Check-out a project from a CVS repository.");
return tr("Checks out a project from a CVS repository.");
}
QString CheckoutWizard::name() const

4
src/plugins/fakevim/fakevimplugin.cpp
View File

@@ -533,7 +533,7 @@ void FakeVimPluginPrivate::handleExCommand(const QString &cmd)
if (failed.isEmpty())
handler->showBlackMessage(tr("Saving succeeded"));
else
handler->showRedMessage(tr("%1 files not saaved").arg(failed.size()));
handler->showRedMessage(tr("%n files not saved", 0, failed.size()));
} else if (reQuit.indexIn(cmd) != -1) {
// :q
bool forced = cmd.contains(QChar('!'));
@@ -543,7 +543,7 @@ void FakeVimPluginPrivate::handleExCommand(const QString &cmd)
bool forced = cmd.contains(QChar('!'));
emit delayedQuitAllRequested(forced);
} else {
handler->showRedMessage(tr("Not an editor command: ") + cmd);
handler->showRedMessage(tr("Not an editor command: %1").arg(cmd));
}
}

6
src/plugins/help/xbelsupport.cpp
View File

@@ -30,6 +30,8 @@
#include "xbelsupport.h"
#include "bookmarkmanager.h"
#include <QtCore/QCoreApplication>
using namespace Help::Internal;
struct Bookmark {
@@ -114,7 +116,7 @@ bool XbelReader::readFromFile(QIODevice *device)
== QLatin1String("1.0")) {
readXBEL();
} else {
raiseError(QObject::tr("The file is not an XBEL version 1.0 file."));
raiseError(QCoreApplication::translate("Help::Internal::XbelReader", "The file is not an XBEL version 1.0 file."));
}
}
}
@@ -187,7 +189,7 @@ void XbelReader::readBookmark(QStandardItem *item)
{
QStandardItem *bookmark = createChildItem(item);
bookmark->setIcon(bookmarkIcon);
bookmark->setText(QObject::tr("Unknown title"));
bookmark->setText(QCoreApplication::translate("Help::Internal::XbelReader", "Unknown title"));
bookmark->setData(attributes().value(QLatin1String("href")).toString(),
Qt::UserRole + 10);

2
src/plugins/qt4projectmanager/customwidgetwizard/classdefinition.ui
View File

@@ -74,7 +74,7 @@
<item row="3" column="1">
<widget class="QLineEdit" name="widgetHeaderEdit">
<property name="whatsThis">
<string>The header file as to be specified i source code. </string>
<string>The header file has to be specified in source code.</string>
</property>
</widget>
</item>

2
src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp
View File

@@ -248,7 +248,7 @@ QStringList GettingStartedWelcomePageWidget::tipsOfTheDay()
"by clicking the <tt>+</tt> button in <tt>Projects -> Run Settings -> Run Configuration</tt> and then select the new "
"target in the combo box."));
tips.append(tr("You can use Qt Creator with a number of <a href=\"qthelp://com.nokia.qtcreator/doc/creator-version-control.html\">"
"revision control systems</a> such as Subversion, Perforce and Git."));
"revision control systems</a> such as Subversion, Perforce, CVS and Git."));
tips.append(tr("In the editor, <tt>F2</tt> toggles declaration and definition while <tt>F4</tt> toggles header file and source file."));
}
return tips;

2
src/plugins/subversion/checkoutwizard.cpp
View File

@@ -51,7 +51,7 @@ QIcon CheckoutWizard::icon() const
QString CheckoutWizard::description() const
{
return tr("Check-out a project from a Subversion repository.");
return tr("Checks out a project from a Subversion repository.");
}
QString CheckoutWizard::name() const

84
src/plugins/subversion/checkoutwizardpage.ui
View File

@@ -1,84 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>Subversion::Internal::CheckoutWizardPage</class>
<widget class="QWizardPage" name="Subversion::Internal::CheckoutWizardPage">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>464</width>
<height>302</height>
</rect>
</property>
<property name="windowTitle">
<string>WizardPage</string>
</property>
<property name="subTitle">
<string>Specify path and repository URL.</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<layout class="QFormLayout" name="formLayout">
<item row="0" column="0">
<widget class="QLabel" name="repositoryLabel">
<property name="text">
<string>Clone URL:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="repositoryLineEdit"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="checkoutDirectoryLabel">
<property name="text">
<string>Checkout Directory:</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="pathLabel">
<property name="text">
<string>Path:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="Core::Utils::PathChooser" name="pathChooser"/>
</item>
<item row="1" column="1">
<widget class="Core::Utils::ProjectNameValidatingLineEdit" name="checkoutDirectoryLineEdit"/>
</item>
</layout>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>Core::Utils::ProjectNameValidatingLineEdit</class>
<extends>QLineEdit</extends>
<header location="global">utils/projectnamevalidatinglineedit.h</header>
</customwidget>
<customwidget>
<class>Core::Utils::PathChooser</class>
<extends>QWidget</extends>
<header location="global">utils/pathchooser.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<resources/>
<connections/>
</ui>

3
src/plugins/subversion/subversion.pro
View File

@@ -30,8 +30,7 @@ SOURCES += annotationhighlighter.cpp \
checkoutwizard.cpp \
checkoutwizardpage.cpp
FORMS += settingspage.ui \
checkoutwizardpage.ui
FORMS += settingspage.ui
RESOURCES += subversion.qrc

3
src/plugins/texteditor/colorscheme.cpp
View File

@@ -32,6 +32,7 @@
#include "texteditorconstants.h"
#include <QtCore/QFile>
#include <QtCore/QCoreApplication>
#include <QtXml/QXmlStreamWriter>
using namespace TextEditor;
@@ -206,7 +207,7 @@ bool ColorSchemeReader::read(const QString &fileName, ColorScheme *scheme)
if (readNextStartElement() && name() == QLatin1String("style-scheme"))
readStyleScheme();
else
raiseError(QObject::tr("Not a color scheme file."));
raiseError(QCoreApplication::translate("TextEditor::Internal::ColorScheme", "Not a color scheme file."));
return true;
}

3
src/plugins/texteditor/fontsettings.cpp
View File

@@ -34,6 +34,7 @@
#include <coreplugin/icore.h>
#include <QtCore/QSettings>
#include <QtCore/QCoreApplication>
#include <QtGui/QTextCharFormat>
static const char *fontFamilyKey = "FontFamily";
@@ -132,7 +133,7 @@ bool FontSettings::fromSettings(const QString &category,
m_scheme.setFormatFor(name, format);
}
m_scheme.setName(QObject::tr("Customized"));
m_scheme.setName(QCoreApplication::translate("TextEditor::Internal::FontSettings", "Customized"));
}
return true;

2
src/plugins/vcsbase/basecheckoutwizard.cpp
View File

@@ -101,7 +101,7 @@ QStringList BaseCheckoutWizard::runWizard(const QString &path, QWidget *parent)
const QString projectFile = openProject(checkoutPath, &errorMessage);
if (projectFile.isEmpty()) {
QMessageBox msgBox(QMessageBox::Warning, tr("Cannot Open Project"),
tr("Failed to open project in '%1'").arg(checkoutPath));
tr("Failed to open project in '%1'.").arg(checkoutPath));
msgBox.setDetailedText(errorMessage);
msgBox.exec();
return QStringList();