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/fakevim/fakevimoptions.ui | |
| 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/fakevim/fakevimoptions.ui')
| -rw-r--r-- | src/plugins/fakevim/fakevimoptions.ui | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/fakevim/fakevimoptions.ui b/src/plugins/fakevim/fakevimoptions.ui index a5355f7ea8..450a862906 100644 --- a/src/plugins/fakevim/fakevimoptions.ui +++ b/src/plugins/fakevim/fakevimoptions.ui @@ -200,21 +200,21 @@ <item> <widget class="QPushButton" name="pushButtonCopyTextEditorSettings"> <property name="text"> - <string>Copy text editor settings</string> + <string>Copy Text Editor Settings</string> </property> </widget> </item> <item> <widget class="QPushButton" name="pushButtonSetQtStyle"> <property name="text"> - <string>Set Qt style</string> + <string>Set Qt Style</string> </property> </widget> </item> <item> <widget class="QPushButton" name="pushButtonSetPlainStyle"> <property name="text"> - <string>Set plain style</string> + <string>Set Plain Style</string> </property> </widget> </item> |