diff --git a/src/libs/qmljs/qmljsplugindumper.cpp b/src/libs/qmljs/qmljsplugindumper.cpp index a51929566ba..e5e3a952c05 100644 --- a/src/libs/qmljs/qmljsplugindumper.cpp +++ b/src/libs/qmljs/qmljsplugindumper.cpp @@ -210,7 +210,7 @@ static QString qmldumpFailedMessage(const FilePath &libraryPath, const QString & "\n" "%1" "\n" - "Check 'General Messages' output pane for details." + "Check General Messages for details." ).arg(firstLines); } diff --git a/src/plugins/coreplugin/dialogs/externaltoolconfig.ui b/src/plugins/coreplugin/dialogs/externaltoolconfig.ui index a49ae83b892..57fe84c348e 100644 --- a/src/plugins/coreplugin/dialogs/externaltoolconfig.ui +++ b/src/plugins/coreplugin/dialogs/externaltoolconfig.ui @@ -192,7 +192,7 @@ <html><head/><body> <p>What to do with the executable's standard output. -<ul><li>Ignore: Do nothing with it.</li><li>Show in pane: Show it in the general output pane.</li><li>Replace selection: Replace the current selection in the current document with it.</li></ul></p></body></html> +<ul><li>Ignore: Do nothing with it.</li><li>Show in General Messages.</li><li>Replace selection: Replace the current selection in the current document with it.</li></ul></p></body></html> @@ -209,7 +209,7 @@ - Show in Pane + Show in General Messages @@ -225,7 +225,7 @@ <html><head><body> <p >What to do with the executable's standard error output.</p> <ul><li>Ignore: Do nothing with it.</li> -<li>Show in pane: Show it in the general output pane.</li> +<li>Show in General Messages.</li> <li>Replace selection: Replace the current selection in the current document with it.</li> </ul></body></html> @@ -243,7 +243,7 @@ - Show in Pane + Show in General Messages diff --git a/src/plugins/coreplugin/outputpanemanager.cpp b/src/plugins/coreplugin/outputpanemanager.cpp index 6ae58c88b28..7785ab5b651 100644 --- a/src/plugins/coreplugin/outputpanemanager.cpp +++ b/src/plugins/coreplugin/outputpanemanager.cpp @@ -303,10 +303,10 @@ void OutputPaneManager::updateMaximizeButton(bool maximized) { if (maximized) { m_instance->m_minMaxAction->setIcon(m_instance->m_minimizeIcon); - m_instance->m_minMaxAction->setText(tr("Minimize Output Pane")); + m_instance->m_minMaxAction->setText(tr("Minimize")); } else { m_instance->m_minMaxAction->setIcon(m_instance->m_maximizeIcon); - m_instance->m_minMaxAction->setText(tr("Maximize Output Pane")); + m_instance->m_minMaxAction->setText(tr("Maximize")); } } @@ -352,7 +352,7 @@ OutputPaneManager::OutputPaneManager(QWidget *parent) : m_minMaxAction = new QAction(this); m_minMaxAction->setIcon(m_maximizeIcon); - m_minMaxAction->setText(tr("Maximize Output Pane")); + m_minMaxAction->setText(tr("Maximize")); m_closeButton->setIcon(Icons::CLOSE_SPLIT_BOTTOM.icon()); connect(m_closeButton, &QAbstractButton::clicked, this, &OutputPaneManager::slotHide); diff --git a/src/plugins/cpaster/settings.cpp b/src/plugins/cpaster/settings.cpp index d10af8fb807..a27e9876f95 100644 --- a/src/plugins/cpaster/settings.cpp +++ b/src/plugins/cpaster/settings.cpp @@ -68,7 +68,7 @@ Settings::Settings() registerAspect(&displayOutput); displayOutput.setSettingsKey("DisplayOutput"); displayOutput.setDefaultValue(true); - displayOutput.setLabelText(tr("Display Output pane after sending a post")); + displayOutput.setLabelText(tr("Display General Messages after sending a post")); } // SettingsPage diff --git a/src/plugins/projectexplorer/appoutputpane.cpp b/src/plugins/projectexplorer/appoutputpane.cpp index 9fc9562355e..589c3357e84 100644 --- a/src/plugins/projectexplorer/appoutputpane.cpp +++ b/src/plugins/projectexplorer/appoutputpane.cpp @@ -174,7 +174,7 @@ AppOutputPane::AppOutputPane() : m_formatterWidget(new QWidget), m_handler(new ShowOutputTaskHandler(this, tr("Show &App Output"), - tr("Show the output that generated this issue in the Application Output pane."), + tr("Show the output that generated this issue in Application Output."), tr("A"))) { ExtensionSystem::PluginManager::addObject(m_handler); diff --git a/src/plugins/projectexplorer/buildstep.cpp b/src/plugins/projectexplorer/buildstep.cpp index 94bdf78accc..d66a3a4e80e 100644 --- a/src/plugins/projectexplorer/buildstep.cpp +++ b/src/plugins/projectexplorer/buildstep.cpp @@ -113,7 +113,7 @@ \fn void ProjectExplorer::BuildStep::addOutput(const QString &string, ProjectExplorer::BuildStep::OutputFormat format, ProjectExplorer::BuildStep::OutputNewlineSetting newlineSetting = DoAppendNewline) const - The \a string is added to the generated output, usually in the output pane. + The \a string is added to the generated output, usually in the output. It should be in plain text, with the format in the parameter. */ diff --git a/src/plugins/projectexplorer/compileoutputwindow.cpp b/src/plugins/projectexplorer/compileoutputwindow.cpp index abb6736a955..9b908c9fd4b 100644 --- a/src/plugins/projectexplorer/compileoutputwindow.cpp +++ b/src/plugins/projectexplorer/compileoutputwindow.cpp @@ -118,7 +118,7 @@ CompileOutputWindow::CompileOutputWindow(QAction *cancelBuildAction) : m_handler = new ShowOutputTaskHandler(this, tr("Show Compile &Output"), - tr("Show the output that generated this issue in the Compile Output pane."), + tr("Show the output that generated this issue in Compile Output."), tr("O")); ExtensionSystem::PluginManager::addObject(m_handler); setupContext(C_COMPILE_OUTPUT, m_outputWindow); diff --git a/src/plugins/qmldesigner/designmodewidget.cpp b/src/plugins/qmldesigner/designmodewidget.cpp index ed2c3d333bf..5699875fd78 100644 --- a/src/plugins/qmldesigner/designmodewidget.cpp +++ b/src/plugins/qmldesigner/designmodewidget.cpp @@ -336,7 +336,7 @@ void DesignModeWidget::setup() auto outputPanePlaceholder = new Core::OutputPanePlaceHolder(Core::Constants::MODE_DESIGN); m_outputPaneDockWidget = new ADS::DockWidget(uniqueId); m_outputPaneDockWidget->setWidget(outputPanePlaceholder); - m_outputPaneDockWidget->setWindowTitle(tr("Output Pane")); + m_outputPaneDockWidget->setWindowTitle(tr("Output")); m_dockManager->addDockWidget(ADS::NoDockWidgetArea, m_outputPaneDockWidget); // Set unique id as object name diff --git a/src/plugins/welcome/introductionwidget.cpp b/src/plugins/welcome/introductionwidget.cpp index 6fc31990d20..f6b5d82c916 100644 --- a/src/plugins/welcome/introductionwidget.cpp +++ b/src/plugins/welcome/introductionwidget.cpp @@ -143,7 +143,7 @@ IntroductionWidget::IntroductionWidget(QWidget *parent) "
  • click on the magnifier icon for a complete list of possible options
    • " "")}, {QLatin1String("OutputPaneButtons"), - tr("Output Panes"), + tr("Output"), tr("Find compile and application output here, " "as well as a list of configuration and build issues, " "and the panel for global searches."), @@ -155,7 +155,7 @@ IntroductionWidget::IntroductionWidget(QWidget *parent) {{}, tr("Escape to Editor"), tr("Pressing the Escape key brings you back to the editor. Press it " - "multiple times to also hide output panes and context help, giving the editor more " + "multiple times to also hide context help and output, giving the editor more " "space."), {}}, {{},