Merge remote branch 'origin/2.0'

Conflicts:
	doc/qtcreator.qdoc
	src/plugins/find/currentdocumentfind.cpp
	src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp

src/plugins/debugger/attachexternaldialog.ui

@@ -28,7 +28,7 @@
      <item row="0" column="0">
       <widget class="QLabel" name="pidLabel">
        <property name="text">
-        <string>Attach to Process ID:</string>
+        <string>Attach to process ID:</string>
        </property>
       </widget>
      </item>

src/plugins/debugger/cdb/cdboptionspagewidget.ui

@@ -19,7 +19,7 @@
         <string>These options take effect at the next start of Qt Creator.</string>
        </property>
        <property name="title">
-        <string extracomment="Placeholder">Cdb</string>
+        <string extracomment="Placeholder">CDB</string>
        </property>
        <property name="checkable">
         <bool>true</bool>
@@ -82,13 +82,13 @@
    <item>
     <widget class="QGroupBox" name="variousOptionsGroupBox">
      <property name="title">
-      <string>Other options</string>
+      <string>Other Options</string>
      </property>
      <layout class="QFormLayout" name="formLayout_3">
       <item row="0" column="0" colspan="2">
        <widget class="QCheckBox" name="verboseSymbolLoadingCheckBox">
         <property name="text">
-         <string>Verbose Symbol Loading</string>
+         <string>Verbose symbol loading</string>
         </property>
        </widget>
       </item>

src/plugins/debugger/commonoptionspage.ui

@@ -33,7 +33,7 @@
    <item>
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
-      <string>Gui behavior</string>
+      <string>GUI Behavior</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_2">
       <item row="0" column="0" colspan="2">
@@ -66,7 +66,7 @@
          <string>Register Qt Creator for debugging crashed applications.</string>
         </property>
         <property name="text">
-         <string>Use Creator for post-mortem debugging</string>
+         <string>Use Qt Creator for post-mortem debugging</string>
         </property>
        </widget>
       </item>

src/plugins/debugger/dumperoptionpage.ui

@@ -21,7 +21,7 @@
    <item>
     <widget class="QGroupBox" name="debuggingHelperGroupBox">
      <property name="title">
-      <string>Use debugging helper</string>
+      <string>Use Debugging Helper</string>
      </property>
      <property name="checkable">
       <bool>true</bool>

src/plugins/debugger/gdb/gdboptionspage.ui

@@ -135,7 +135,7 @@ name in different directories.</string>
    <item>
     <widget class="QGroupBox" name="groupBoxPluginDebugging">
      <property name="title">
-      <string>Behaviour of breakpoint setting in plugins</string>
+      <string>Behavior of Breakpoint Setting in Plugins</string>
      </property>
      <layout class="QGridLayout" name="gridLayout">
       <item row="0" column="0">