diff --git a/src/plugins/coreplugin/generalsettings.ui b/src/plugins/coreplugin/generalsettings.ui
index 0365ae1a66f..73fb6764fb1 100644
--- a/src/plugins/coreplugin/generalsettings.ui
+++ b/src/plugins/coreplugin/generalsettings.ui
@@ -77,14 +77,7 @@
- -
-
-
- Language:
-
-
-
- -
+
-
-
@@ -111,10 +104,10 @@
- -
+
-
- Default File Encoding:
+ Default file encoding:
@@ -151,6 +144,13 @@
+ -
+
+
+ Language:
+
+
+
diff --git a/src/plugins/cpaster/pastebindotcomsettings.ui b/src/plugins/cpaster/pastebindotcomsettings.ui
index 15d86897c57..3f2fd6c773c 100644
--- a/src/plugins/cpaster/pastebindotcomsettings.ui
+++ b/src/plugins/cpaster/pastebindotcomsettings.ui
@@ -25,7 +25,7 @@
-
- Server Prefix:
+ Server prefix:
diff --git a/src/plugins/cpptools/cppfilesettingspage.ui b/src/plugins/cpptools/cppfilesettingspage.ui
index a6dc2ba0f28..312454c5677 100644
--- a/src/plugins/cpptools/cppfilesettingspage.ui
+++ b/src/plugins/cpptools/cppfilesettingspage.ui
@@ -44,7 +44,7 @@
-
- License Template:
+ License template:
@@ -72,27 +72,6 @@
headerSuffixComboBox
sourceSuffixComboBox
licenseTemplateLabel
- licenseTemplatePathChooser
- sourceSuffixLabel
- headerSuffixLabel
- lowerCaseFileNamesCheckBox
- headerSuffixComboBox
- sourceSuffixComboBox
- licenseTemplateLabel
- licenseTemplatePathChooser
- sourceSuffixLabel
- headerSuffixLabel
- lowerCaseFileNamesCheckBox
- headerSuffixComboBox
- sourceSuffixComboBox
- licenseTemplateLabel
- licenseTemplatePathChooser
- sourceSuffixLabel
- headerSuffixLabel
- lowerCaseFileNamesCheckBox
- headerSuffixComboBox
- sourceSuffixComboBox
- licenseTemplateLabel
diff --git a/src/plugins/cvs/settingspage.ui b/src/plugins/cvs/settingspage.ui
index 601e9d28fcf..17edd2a71f4 100644
--- a/src/plugins/cvs/settingspage.ui
+++ b/src/plugins/cvs/settingspage.ui
@@ -20,7 +20,7 @@
-
- CVS Command:
+ CVS command:
@@ -30,7 +30,7 @@
-
- CVS Root:
+ CVS root:
@@ -49,7 +49,7 @@
-
- Diff Options:
+ Diff options:
@@ -117,6 +117,10 @@
QWidget
1
+
+ editingFinished()
+ browsingFinished()
+
diff --git a/src/plugins/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp
index c90cd5cca01..ecee113d3b4 100644
--- a/src/plugins/fakevim/fakevimplugin.cpp
+++ b/src/plugins/fakevim/fakevimplugin.cpp
@@ -310,7 +310,7 @@ QWidget *FakeVimExCommandsPage::createPage(QWidget *parent)
QWidget *w = CommandMappings::createPage(parent);
setPageTitle(tr("Ex Command Mapping"));
setTargetHeader(tr("Ex Trigger Expression"));
- setTargetLabelText(tr("Regular Expression:"));
+ setTargetLabelText(tr("Regular expression:"));
setTargetEditTitle(tr("Ex Command"));
setImportExportEnabled(false);
diff --git a/src/plugins/help/generalsettingspage.ui b/src/plugins/help/generalsettingspage.ui
index 8d55f9b0e17..d70d419fe65 100644
--- a/src/plugins/help/generalsettingspage.ui
+++ b/src/plugins/help/generalsettingspage.ui
@@ -212,7 +212,7 @@
-
- Home Page:
+ Home page:
diff --git a/src/plugins/locator/settingspage.ui b/src/plugins/locator/settingspage.ui
index b6c27d30569..6ae70a06f2c 100644
--- a/src/plugins/locator/settingspage.ui
+++ b/src/plugins/locator/settingspage.ui
@@ -70,7 +70,7 @@
-
- Refresh Interval:
+ Refresh interval:
diff --git a/src/plugins/perforce/settingspage.ui b/src/plugins/perforce/settingspage.ui
index dcdd04c0833..40fb16b72c5 100644
--- a/src/plugins/perforce/settingspage.ui
+++ b/src/plugins/perforce/settingspage.ui
@@ -20,7 +20,7 @@
-
- P4 Command:
+ P4 command:
@@ -57,21 +57,21 @@
-
- P4 Client:
+ P4 client:
-
- P4 User:
+ P4 user:
-
- P4 Port:
+ P4 port:
@@ -205,6 +205,10 @@
QWidget
1
+
+ editingFinished()
+ browsingFinished()
+
diff --git a/src/plugins/projectexplorer/editorsettingspropertiespage.ui b/src/plugins/projectexplorer/editorsettingspropertiespage.ui
index 1f97ce0f0b7..da7c45c2627 100644
--- a/src/plugins/projectexplorer/editorsettingspropertiespage.ui
+++ b/src/plugins/projectexplorer/editorsettingspropertiespage.ui
@@ -20,7 +20,7 @@
-
- Default File Encoding:
+ Default file encoding:
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.ui b/src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.ui
index 021a0c94558..3c07b9023cf 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.ui
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.ui
@@ -6,8 +6,8 @@
0
0
- 448
- 307
+ 550
+ 350
@@ -139,14 +139,14 @@
-
- Remote Device
+ Remote device
-
- Local Simulator
+ Local simulator
@@ -186,7 +186,7 @@
-
- Host Name:
+ Host name:
@@ -248,7 +248,7 @@
-
- Connection Timeout:
+ Connection timeout:
@@ -262,7 +262,7 @@
-
- User Name:
+ User name:
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.ui b/src/plugins/qt4projectmanager/qtversionmanager.ui
index 4ab4480a794..bb75e9ba569 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.ui
+++ b/src/plugins/qt4projectmanager/qtversionmanager.ui
@@ -6,7 +6,7 @@
0
0
- 400
+ 406
424
@@ -94,7 +94,7 @@
-
- Version Name:
+ Version name:
@@ -104,7 +104,7 @@
-
- qmake Location:
+ qmake location:
@@ -114,7 +114,7 @@
-
- MinGW Directory:
+ MinGW directory:
@@ -172,7 +172,7 @@ p, li { white-space: pre-wrap; }
-
- CSL/GCCE Directory:
+ CSL/GCCE directory:
@@ -182,7 +182,7 @@ p, li { white-space: pre-wrap; }
-
- Carbide Directory:
+ Carbide directory:
@@ -192,7 +192,7 @@ p, li { white-space: pre-wrap; }
-
- Debugging Helper:
+ Debugging helper:
@@ -244,6 +244,10 @@ p, li { white-space: pre-wrap; }
QWidget
1
+
+ editingFinished()
+ browsingFinished()
+
diff --git a/src/plugins/subversion/settingspage.ui b/src/plugins/subversion/settingspage.ui
index 861f81902f6..249ad3fef2f 100644
--- a/src/plugins/subversion/settingspage.ui
+++ b/src/plugins/subversion/settingspage.ui
@@ -12,7 +12,7 @@
-
- Subversion Command:
+ Subversion command:
@@ -139,6 +139,10 @@
QWidget
1
+
+ editingFinished()
+ browsingFinished()
+