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/help/generalsettingspage.cpp
View File

@@ -68,7 +68,7 @@ QString GeneralSettingsPage::id() const
QString GeneralSettingsPage::displayName() const
{
return tr("General settings");
return tr("General Settings");
}
QString GeneralSettingsPage::category() const

12
src/plugins/help/generalsettingspage.ui
View File

@@ -156,17 +156,17 @@
</property>
<item>
<property name="text">
<string>Show side-by-side if possible</string>
<string>Show Side-by-Side if Possible</string>
</property>
</item>
<item>
<property name="text">
<string>Always show side-by-side</string>
<string>Always Show Side-by-Side</string>
</property>
</item>
<item>
<property name="text">
<string>Always start full help</string>
<string>Always Start Full Help</string>
</property>
</item>
</widget>
@@ -194,17 +194,17 @@
</property>
<item>
<property name="text">
<string>Show my home page</string>
<string>Show My Home Page</string>
</property>
</item>
<item>
<property name="text">
<string>Show a blank page</string>
<string>Show a Blank Page</string>
</property>
</item>
<item>
<property name="text">
<string>Show my tabs from last session</string>
<string>Show My Tabs from Last Session</string>
</property>
</item>
</widget>