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

String fixes

Browse Source 
Change-Id: Iffa87a0e394b799e3987fa60f0a7559d5c1d0d27
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Robert Loehning
2011-11-02 17:40:32 +01:00
committed by hjk
parent 31600758de
commit 7ec73a3e16
8 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
share/qtcreator/qmldesigner/propertyeditor/QtWebKit/WebViewSpecifics.qml
View File

@@ -55,7 +55,7 @@ QWidget {
leftMargin: 0; leftMargin: 0;
rightMargin: 0; rightMargin: 0;
Label { Label {
text: qsTr("Url") text: qsTr("URL")
} }
LineEdit { LineEdit {
backendValue: backendValues.url backendValue: backendValues.url

2
share/qtcreator/templates/wizards/qtcreatorplugin/wizard.xml
View File

@@ -83,7 +83,7 @@ leave room for the Qt 4 target page.
<field name="URL"> <field name="URL">
<fieldcontrol class="QLineEdit" <fieldcontrol class="QLineEdit"
defaulttext="http://www.mycompany.com" /> defaulttext="http://www.mycompany.com" />
<fielddescription>Url:</fielddescription> <fielddescription>URL:</fielddescription>
</field> </field>
<field mandatory="true" name="QtCreatorSources"> <field mandatory="true" name="QtCreatorSources">
<fieldcontrol class="Utils::PathChooser" <fieldcontrol class="Utils::PathChooser"

2
src/plugins/cpptools/cppfunctionsfilter.h
View File

@@ -46,7 +46,7 @@ public:
CppFunctionsFilter(CppModelManager *manager); CppFunctionsFilter(CppModelManager *manager);
~CppFunctionsFilter(); ~CppFunctionsFilter();
QString displayName() const { return tr("Methods and functions"); } QString displayName() const { return tr("Methods and Functions"); }
QString id() const { return QLatin1String("Methods"); } QString id() const { return QLatin1String("Methods"); }
Priority priority() const { return Medium; } Priority priority() const { return Medium; }
}; };

2
src/plugins/mercurial/srcdestdialog.ui
View File

@@ -39,7 +39,7 @@
<string>e.g. https://[user[:pass]@]host[:port]/[path]</string> <string>e.g. https://[user[:pass]@]host[:port]/[path]</string>
</property> </property>
<property name="text"> <property name="text">
<string>Specify Url:</string> <string>Specify URL:</string>
</property> </property>
</widget> </widget>
</item> </item>

2
src/plugins/qmljstools/qmljsfunctionfilter.h
View File

@@ -47,7 +47,7 @@ public:
explicit FunctionFilter(LocatorData *data, QObject *parent = 0); explicit FunctionFilter(LocatorData *data, QObject *parent = 0);
~FunctionFilter(); ~FunctionFilter();
QString displayName() const { return tr("Methods and functions"); } QString displayName() const { return tr("Methods and Functions"); }
QString id() const { return QLatin1String("Functions"); } QString id() const { return QLatin1String("Functions"); }
Priority priority() const { return Medium; } Priority priority() const { return Medium; }
QList<Locator::FilterEntry> matchesFor(QFutureInterface<Locator::FilterEntry> &future, const QString &entry); QList<Locator::FilterEntry> matchesFor(QFutureInterface<Locator::FilterEntry> &future, const QString &entry);

2
src/plugins/qt4projectmanager/wizards/librarywizard.cpp
View File

@@ -59,7 +59,7 @@ LibraryWizard::LibraryWizard()
tr("C++ Library"), tr("C++ Library"),
tr("Creates a C++ library based on qmake. This can be used to create:<ul>" tr("Creates a C++ library based on qmake. This can be used to create:<ul>"
"<li>a shared C++ library for use with <tt>QPluginLoader</tt> and runtime (Plugins)</li>" "<li>a shared C++ library for use with <tt>QPluginLoader</tt> and runtime (Plugins)</li>"
"<li>a shared or static C++ library for use with another project at linktime</li></ul>."), "<li>a shared or static C++ library for use with another project at linktime</li></ul>"),
QIcon(QLatin1String(":/wizards/images/lib.png"))) QIcon(QLatin1String(":/wizards/images/lib.png")))
{ {
} }

3
src/plugins/texteditor/behaviorsettingswidget.ui
View File

@@ -220,6 +220,9 @@ Specifies how backspace interacts with indentation.
</item> </item>
<item row="3" column="0" colspan="2"> <item row="3" column="0" colspan="2">
<widget class="QCheckBox" name="addFinalNewLine"> <widget class="QCheckBox" name="addFinalNewLine">
<property name="toolTip">
<string>Always write a newline character at the end of the file.</string>
</property>
<property name="text"> <property name="text">
<string>&amp;Ensure newline at end of file</string> <string>&amp;Ensure newline at end of file</string>
</property> </property>