Merge branch '2.3' into 2.4

Conflicts:
	src/plugins/debugger/commonoptionspage.ui
	src/plugins/madde/maemoqtversion.cpp
	src/plugins/projectexplorer/runsettingspropertiespage.ui

Change-Id: Ieccda73ddca22f9a2d41351619cb682b06d9bfcf

src/app/main.cpp

@@ -149,7 +149,7 @@ static inline QString msgCoreLoadFailure(const QString &why)
 static inline int askMsgSendFailed()
 {
     return QMessageBox::question(0, QApplication::translate("Application","Could not send message"),
-                                 QCoreApplication::translate("Application", "Unable to send command line arguments to the already running instance."
+                                 QCoreApplication::translate("Application", "Unable to send command line arguments to the already running instance. "
                                                              "It appears to be not responding. Do you want to start a new instance of Creator?"),
                                  QMessageBox::Yes | QMessageBox::No | QMessageBox::Retry,
                                  QMessageBox::Retry);

src/plugins/coreplugin/mimetypesettingspage.ui

@@ -125,14 +125,14 @@
           <item>
            <widget class="QPushButton" name="addMagicButton">
             <property name="text">
-             <string>Add</string>
+             <string>Add...</string>
             </property>
            </widget>
           </item>
           <item>
            <widget class="QPushButton" name="editMagicButton">
             <property name="text">
-             <string>Edit</string>
+             <string>Edit...</string>
             </property>
            </widget>
           </item>

src/plugins/cpptools/cppfilesettingspage.cpp

@@ -247,7 +247,7 @@ CppFileSettingsWidget::CppFileSettingsWidget(QWidget *parent) :
         foreach (const QString &suffix, headerMt.suffixes())
             m_ui->headerSuffixComboBox->addItem(suffix);
     m_ui->licenseTemplatePathChooser->setExpectedKind(Utils::PathChooser::File);
-    m_ui->licenseTemplatePathChooser->addButton(tr("Edit"), this, SLOT(slotEdit()));
+    m_ui->licenseTemplatePathChooser->addButton(tr("Edit..."), this, SLOT(slotEdit()));
 }
 
 CppFileSettingsWidget::~CppFileSettingsWidget()

src/plugins/debugger/gdb/gdboptionspage.ui

@@ -149,7 +149,7 @@ on slow machines. In this case, the value should be increased.</string>
       <item row="10" column="0" colspan="2">
        <widget class="QCheckBox" name="checkBoxEnableReverseDebugging">
         <property name="toolTip">
-         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Selecting this enables reverse debugging.&lt;/p&gt;&lt;.p&gt;&lt;b&gt;Note:&lt;/b&gt;This feature is very slow and unstable on the GDB side. It exhibits unpredictable behaviour when going backwards over system calls and is very likely to destroy your debugging session.&lt;/p&gt;&lt;body&gt;&lt;/html&gt;</string>
+         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Selecting this enables reverse debugging.&lt;/p&gt;&lt;.p&gt;&lt;b&gt;Note:&lt;/b&gt; This feature is very slow and unstable on the GDB side. It exhibits unpredictable behavior when going backwards over system calls and is very likely to destroy your debugging session.&lt;/p&gt;&lt;body&gt;&lt;/html&gt;</string>
         </property>
         <property name="text">
          <string>Enable reverse debugging</string>

src/plugins/madde/maemodeviceconfigwizardreusekeyscheckpage.ui

@@ -17,7 +17,7 @@
    <item>
     <widget class="QLabel" name="questionLabel">
      <property name="text">
-      <string>Do wou want to re-use an existing pair of keys or should a new one be created?</string>
+      <string>Do you want to re-use an existing pair of keys or should a new one be created?</string>
      </property>
      <property name="wordWrap">
       <bool>true</bool>

src/plugins/madde/maemopackagecreationwidget.ui

@@ -229,7 +229,7 @@
        <item>
         <widget class="QPushButton" name="editDebianFileButton">
          <property name="text">
-          <string>Edit</string>
+          <string>Edit...</string>
          </property>
         </widget>
        </item>

src/plugins/madde/maemoqtversion.cpp

@@ -159,7 +159,7 @@ QString MaemoQtVersion::description() const
     else if (m_osType == QLatin1String(HarmattanOsType))
         return QCoreApplication::translate("QtVersion", "Harmattan ", "Qt Version is meant for Harmattan");
     else if (m_osType == QLatin1String(MeeGoOsType))
-        return QCoreApplication::translate("QtVersion", "Meego", "Qt Version is meant for Meego");
+        return QCoreApplication::translate("QtVersion", "MeeGo", "Qt Version is meant for MeeGo");
     return QString();
 }
 

src/plugins/madde/qt4maemotarget.cpp

@@ -1200,7 +1200,7 @@ Qt4MeegoTarget::~Qt4MeegoTarget() {}
 QString Qt4MeegoTarget::defaultDisplayName()
 {
     return QApplication::translate("Qt4ProjectManager::Qt4Target",
-        "Meego", "Qt4 Meego target display name");
+        "MeeGo", "Qt4 MeeGo target display name");
 }
 
 QString Qt4MeegoTarget::specFileName() const

src/plugins/projectexplorer/projectwizardpage.ui

@@ -67,7 +67,7 @@
      <item row="2" column="2">
       <widget class="QPushButton" name="vcsManageButton">
        <property name="text">
-        <string>Manage</string>
+        <string>Manage ...</string>
        </property>
       </widget>
      </item>

src/plugins/projectexplorer/runsettingspropertiespage.ui

@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ProjectExplorer::Internal::RunSettingsPropertiesPage</class>
+ <widget class="QWidget" name="ProjectExplorer::Internal::RunSettingsPropertiesPage">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>485</width>
+    <height>191</height>
+   </rect>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <property name="horizontalSpacing">
+    <number>6</number>
+   </property>
+   <item row="0" column="0">
+    <widget class="QLabel" name="deployLabel">
+     <property name="text">
+      <string>Deployment:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1">
+    <widget class="QComboBox" name="deployConfigurationCombo"/>
+   </item>
+   <item row="0" column="2">
+    <widget class="QPushButton" name="addDeployToolButton">
+     <property name="text">
+      <string>Add</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="3">
+    <widget class="QPushButton" name="removeDeployToolButton">
+     <property name="text">
+      <string>Remove</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="4">
+    <widget class="QPushButton" name="renameDeployButton">
+     <property name="text">
+      <string>Rename ...</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0" colspan="6">
+    <widget class="QWidget" name="deployWidget" native="true"/>
+   </item>
+   <item row="2" column="0">
+    <widget class="QLabel" name="runLabel">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string>Run configuration:</string>
+     </property>
+     <property name="buddy">
+      <cstring>runConfigurationCombo</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1">
+    <widget class="QComboBox" name="runConfigurationCombo">
+     <property name="maximumSize">
+      <size>
+       <width>500</width>
+       <height>16777215</height>
+      </size>
+     </property>
+     <property name="sizeAdjustPolicy">
+      <enum>QComboBox::AdjustToContents</enum>
+     </property>
+     <property name="minimumContentsLength">
+      <number>15</number>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="2">
+    <widget class="QPushButton" name="addRunToolButton">
+     <property name="text">
+      <string>Add</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="3">
+    <widget class="QPushButton" name="removeRunToolButton">
+     <property name="text">
+      <string>Remove</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="4">
+    <widget class="QPushButton" name="renameRunButton">
+     <property name="text">
+      <string>Rename ...</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="5">
+    <spacer name="runHorizontalSpacer">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>17</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="3" column="0" colspan="6">
+    <widget class="QWidget" name="runWidget" native="true"/>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="0" margin="0"/>
+ <resources/>
+ <connections/>
+</ui>

src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.cpp

@@ -94,7 +94,7 @@ QmlProjectRunConfigurationWidget::QmlProjectRunConfigurationWidget(QmlProjectRun
             this, SLOT(onQtVersionSelectionChanged()));
 
     QPushButton *pushButton = new QPushButton;
-    pushButton->setText(tr("Manage Qt versions"));
+    pushButton->setText(tr("Manage Qt versions..."));
     connect(pushButton, SIGNAL(clicked()), this, SLOT(manageQtVersions()));
 
     QHBoxLayout *qtVersionLayout = new QHBoxLayout;

src/plugins/qt4projectmanager/qt4nodes.cpp

@@ -1004,7 +1004,7 @@ bool Qt4PriFileNode::priFileWritable(const QString &path)
     switch (Core::FileManager::promptReadOnlyFile(path, versionControl, core->mainWindow(), false)) {
     case Core::FileManager::RO_OpenVCS:
         if (!versionControl->vcsOpen(path)) {
-            QMessageBox::warning(core->mainWindow(), tr("Cannot Open File"), tr("Cannot open the file for edit with VCS."));
+            QMessageBox::warning(core->mainWindow(), tr("Cannot Open File"), tr("Cannot open the file for editing with VCS."));
             return false;
         }
         break;

src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp

@@ -409,7 +409,7 @@ void Qt4ProjectConfigWidget::updateImportLabel()
         m_ui->problemLabel->setVisible(true);
         m_ui->warningLabel->setVisible(true);
         m_ui->importLabel->setVisible(false);
-        m_ui->problemLabel->setText(tr("An build for a different project exists in %1, which will be overwritten.",
+        m_ui->problemLabel->setText(tr("A build for a different project exists in %1, which will be overwritten.",
                                        "%1 build directory").
                                     arg(m_ui->shadowBuildDirEdit->path()));
     } else if (!issues.isEmpty()) {

src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp

@@ -83,7 +83,7 @@ void AbstractMobileAppWizardDialog::addMobilePages()
     m_symbianOptionsPageId = addPageWithTitle(m_symbianOptionsPage,
         QLatin1String("    ") + tr("Symbian Specific"));
     m_maemoOptionsPageId = addPageWithTitle(m_maemoOptionsPage,
-        QLatin1String("    ") + tr("Maemo5 And Meego Specific"));
+        QLatin1String("    ") + tr("Maemo5 And MeeGo Specific"));
     m_harmattanOptionsPageId = addPageWithTitle(m_harmattanOptionsPage,
         QLatin1String("    ") + tr("Harmattan Specific"));
 

src/plugins/qt4projectmanager/wizards/qtquickapp.cpp

@@ -316,7 +316,7 @@ bool QtQuickApp::addCppPlugin(const QString &qmldirLine, QmlModule *module)
     } else {
         m_error = QCoreApplication::translate(
                     "Qt4ProjectManager::Internal::QtQuickApp",
-                    "No .pro file for plugin '%1' cannot be found.").arg(name);
+                    "No .pro file for plugin '%1' can be found.").arg(name);
         return false;
     }
     QmlCppPlugin *plugin =

src/plugins/qt4projectmanager/wizards/qtquickcomponentsetoptionspage.ui

@@ -43,7 +43,7 @@
       <item>
        <widget class="QRadioButton" name="meego10RadioButton">
         <property name="text">
-         <string>Qt Quick Components for Meego/Harmattan</string>
+         <string>Qt Quick Components for MeeGo/Harmattan</string>
         </property>
         <attribute name="buttonGroup">
          <string notr="true">buttonGroup</string>
@@ -151,7 +151,7 @@ Requires Qt 4.7.3 or newer, and the component set installed for your Qt version.
           <item row="0" column="0">
            <widget class="QLabel" name="meego1DescriptionLabel">
             <property name="text">
-             <string>The Qt Quick Components for Meego/Harmattan are a set of ready-made components that are designed with specific native appearance for the Meego/Harmattan platform.
+             <string>The Qt Quick Components for MeeGo/Harmattan are a set of ready-made components that are designed with specific native appearance for the MeeGo/Harmattan platform.
 
 Requires Qt 4.7.4 or newer, and the component set installed for your Qt version.</string>
             </property>

src/plugins/qtsupport/qtversionmanager.ui

@@ -50,7 +50,7 @@
           </size>
          </property>
          <property name="text">
-          <string>Add</string>
+          <string>Add...</string>
          </property>
         </widget>
        </item>

src/plugins/texteditor/generichighlighter/highlightersettingspage.cpp

@@ -97,7 +97,7 @@ QWidget *HighlighterSettingsPage::createPage(QWidget *parent)
     m_d->m_page = new Ui::HighlighterSettingsPage;
     m_d->m_page->setupUi(w);
     m_d->m_page->definitionFilesPath->setExpectedKind(Utils::PathChooser::ExistingDirectory);
-    m_d->m_page->definitionFilesPath->addButton(tr("Download Definitions"), this,
+    m_d->m_page->definitionFilesPath->addButton(tr("Download Definitions..."), this,
                                                SLOT(requestAvailableDefinitionsMetaData()));
     m_d->m_page->fallbackDefinitionFilesPath->setExpectedKind(Utils::PathChooser::ExistingDirectory);
     m_d->m_page->fallbackDefinitionFilesPath->addButton(tr("Autodetect"), this,

src/plugins/texteditor/plaintexteditorfactory.cpp

@@ -107,7 +107,7 @@ void PlainTextEditorFactory::updateEditorInfoBar(Core::IEditor *editor)
             Core::InfoBarEntry info(Constants::INFO_SYNTAX_DEFINITION,
                                     tr("A highlight definition was not found for this file. "
                                        "Would you like to try to find one?"));
-            info.setCustomButtonInfo(tr("Show highlighter options"),
+            info.setCustomButtonInfo(tr("Show highlighter options..."),
                                      textEditor, SLOT(acceptMissingSyntaxDefinitionInfo()));
             info.setCancelButtonInfo(textEditor, SLOT(ignoreMissingSyntaxDefinitionInfo()));
             file->infoBar()->addInfo(info);

src/plugins/vcsbase/vcsconfigurationpage.ui

@@ -14,7 +14,7 @@
    <item>
     <widget class="QPushButton" name="configureButton">
      <property name="text">
-      <string>Configure</string>
+      <string>Configure...</string>
      </property>
     </widget>
    </item>