From: Guillaume Munch <gm@lyx.org>
Date: Wed, 13 Jul 2016 16:44:25 +0000 (+0100)
Subject: Revert the change of "Output" into "Format"
X-Git-Tag: 2.2.1~34
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=030f4c6d1e56f94122d5e4fae08ac6a2f2b4c5cf;p=features.git

Revert the change of "Output" into "Format"

(Partial revert of commit 141d9d34dfb5ee5b642438f76945ee51ab931800.)
---

diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp
index aecdfcad63..e6d93faae5 100644
--- a/src/frontends/qt4/GuiDocument.cpp
+++ b/src/frontends/qt4/GuiDocument.cpp
@@ -749,7 +749,7 @@ GuiDocument::GuiDocument(GuiView & lv)
 	masterChildModule->childrenTW->resizeColumnToContents(2);
 
 
-	// Format
+	// output
 	outputModule = new UiWidget<Ui::OutputUi>;
 
 	connect(outputModule->defaultFormatCO, SIGNAL(activated(int)),
@@ -1424,7 +1424,7 @@ GuiDocument::GuiDocument(GuiView & lv)
 	docPS->addPanel(listingsModule, N_("Listings[[inset]]"));
 	docPS->addPanel(bulletsModule, N_("Bullets"));
 	docPS->addPanel(branchesModule, N_("Branches"));
-	docPS->addPanel(outputModule, N_("Format"));
+	docPS->addPanel(outputModule, N_("Output"));
 	docPS->addPanel(preambleModule, N_("LaTeX Preamble"));
 	docPS->setCurrentPanel("Document Class");
 // FIXME: hack to work around resizing bug in Qt >= 4.2
@@ -2839,7 +2839,7 @@ void GuiDocument::applyView()
 	bp_.listings_params =
 		InsetListingsParams(fromqstr(listingsModule->listingsED->toPlainText())).params();
 
-	// Format
+	// output
 	bp_.default_output_format = fromqstr(outputModule->defaultFormatCO->itemData(
 		outputModule->defaultFormatCO->currentIndex()).toString());
 
@@ -3395,7 +3395,7 @@ void GuiDocument::paramsToDialog()
 		fontModule->fontencLE->setText(toqstr(bp_.fontenc));
 	}
 
-	// Format
+	// Output
 	// This must be set _after_ fonts since updateDefaultFormat()
 	// checks osFontsCB settings.
 	// update combobox with formats