diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtWebKit/WebViewSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/QtWebKit/WebViewSpecifics.qml index 7b777e84ea8..0153329794b 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/QtWebKit/WebViewSpecifics.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/QtWebKit/WebViewSpecifics.qml @@ -55,7 +55,7 @@ QWidget { leftMargin: 0; rightMargin: 0; Label { - text: qsTr("Url") + text: qsTr("URL") } LineEdit { backendValue: backendValues.url diff --git a/share/qtcreator/templates/wizards/qtcreatorplugin/wizard.xml b/share/qtcreator/templates/wizards/qtcreatorplugin/wizard.xml index a593f3d414e..e7d5f3d62ea 100644 --- a/share/qtcreator/templates/wizards/qtcreatorplugin/wizard.xml +++ b/share/qtcreator/templates/wizards/qtcreatorplugin/wizard.xml @@ -83,7 +83,7 @@ leave room for the Qt 4 target page. - Url: + URL: e.g. https://[user[:pass]@]host[:port]/[path] - Specify Url: + Specify URL: diff --git a/src/plugins/qmljstools/qmljsfunctionfilter.h b/src/plugins/qmljstools/qmljsfunctionfilter.h index ec77ac81fda..9fa9b54d1ea 100644 --- a/src/plugins/qmljstools/qmljsfunctionfilter.h +++ b/src/plugins/qmljstools/qmljsfunctionfilter.h @@ -47,7 +47,7 @@ public: explicit FunctionFilter(LocatorData *data, QObject *parent = 0); ~FunctionFilter(); - QString displayName() const { return tr("Methods and functions"); } + QString displayName() const { return tr("Methods and Functions"); } QString id() const { return QLatin1String("Functions"); } Priority priority() const { return Medium; } QList matchesFor(QFutureInterface &future, const QString &entry); diff --git a/src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp b/src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp index e3e53dfce4a..65dd32143f6 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp @@ -71,7 +71,7 @@ Core::BaseFileWizardParameters QmlProjectApplicationWizard::parameters() parameters.setDisplayName(tr("Qt Quick UI")); parameters.setId(QLatin1String("QB.QML Application")); - parameters.setDescription(tr("Creates a Qt Quick UI project with a single " + parameters.setDescription(tr("Creates a Qt Quick UI project with a single " "QML file that contains the main view.\n\n" "You can review Qt Quick UI projects in the QML Viewer and you need not build them. " "You do not need to have the development environment installed " diff --git a/src/plugins/qt4projectmanager/wizards/librarywizard.cpp b/src/plugins/qt4projectmanager/wizards/librarywizard.cpp index 57f74cb4590..188262c0352 100644 --- a/src/plugins/qt4projectmanager/wizards/librarywizard.cpp +++ b/src/plugins/qt4projectmanager/wizards/librarywizard.cpp @@ -59,7 +59,7 @@ LibraryWizard::LibraryWizard() tr("C++ Library"), tr("Creates a C++ library based on qmake. This can be used to create:
    " "
  • a shared C++ library for use with QPluginLoader and runtime (Plugins)
  • " - "
  • a shared or static C++ library for use with another project at linktime
."), + "
  • a shared or static C++ library for use with another project at linktime
  • "), QIcon(QLatin1String(":/wizards/images/lib.png"))) { } diff --git a/src/plugins/texteditor/behaviorsettingswidget.ui b/src/plugins/texteditor/behaviorsettingswidget.ui index 4bd338b6fe5..963da8955da 100644 --- a/src/plugins/texteditor/behaviorsettingswidget.ui +++ b/src/plugins/texteditor/behaviorsettingswidget.ui @@ -220,6 +220,9 @@ Specifies how backspace interacts with indentation. + + Always write a newline character at the end of the file. + &Ensure newline at end of file