From: Guillaume Munch <gm@lyx.org>
Date: Sun, 28 Aug 2016 15:51:15 +0000 (+0100)
Subject: Change "Format" into "Formats"
X-Git-Tag: 2.3.0alpha1~1094
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=0779b3c36cb693bdb85aea7a155f4384b49c4902;p=features.git

Change "Format" into "Formats"

The plural form seems more appropriate and the tag [[output]] is added for
disambiguation (e.g. for the French translation).
---

diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index 51e5924b24..43a9316095 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -1,5 +1,5 @@
 #LyX 2.3 created this file. For more info see http://www.lyx.org/
-\lyxformat 511
+\lyxformat 512
 \begin_document
 \begin_header
 \save_transient_properties true
@@ -142,6 +142,7 @@ enumitem
 \html_be_strict true
 \author 274215730 "scott"
 \author 424524441 "rgheck"
+\author 2047637253 "Guillaume Munch"
 \end_header
 
 \begin_body
@@ -16117,7 +16118,7 @@ reference "sec:File-Formats"
 
 \begin_inset CommandInset ref
 LatexCommand ref
-reference "sec:Doc-Output"
+reference "sec:Doc-Formats"
 
 \end_inset
 
@@ -37652,7 +37653,7 @@ Format
 
 \begin_inset CommandInset ref
 LatexCommand ref
-reference "sec:Doc-Output"
+reference "sec:Doc-Formats"
 
 \end_inset
 
@@ -37919,7 +37920,7 @@ Format
 
 \begin_inset CommandInset ref
 LatexCommand ref
-reference "sec:Doc-Output"
+reference "sec:Doc-Formats"
 
 \end_inset
 
@@ -38016,7 +38017,7 @@ Format
 
 \begin_inset CommandInset ref
 LatexCommand ref
-reference "sec:Doc-Output"
+reference "sec:Doc-Formats"
 
 \end_inset
 
@@ -42811,10 +42812,16 @@ reference "sec:Branches"
 \end_layout
 
 \begin_layout Section
+
+\change_deleted 2047637253 1472399758
 Output
+\change_inserted 2047637253 1472400015
+Formats
+\change_unchanged
+
 \begin_inset CommandInset label
 LatexCommand label
-name "sec:Doc-Output"
+name "sec:Doc-Formats"
 
 \end_inset
 
@@ -43005,15 +43012,27 @@ Save transient properties
  controls whether document settings that are frequently switched or that
  are specific to the user are saved with the document.
  The properties that are affected by option are currently
+\change_inserted 2047637253 1472400492
+:
+\change_unchanged
+
 \end_layout
 
 \begin_deeper
 \begin_layout Itemize
 the activation of change tracking
+\change_inserted 2047637253 1472400062
+,
+\change_unchanged
+
 \end_layout
 
 \begin_layout Itemize
 the output of tracked changes
+\change_inserted 2047637253 1472400062
+,
+\change_unchanged
+
 \end_layout
 
 \begin_layout Itemize
diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp
index c54ded9b5e..e96e9ace43 100644
--- a/src/frontends/qt4/GuiDocument.cpp
+++ b/src/frontends/qt4/GuiDocument.cpp
@@ -767,7 +767,7 @@ GuiDocument::GuiDocument(GuiView & lv)
 	masterChildModule->childrenTW->resizeColumnToContents(2);
 
 
-	// Format
+	// Formats
 	outputModule = new UiWidget<Ui::OutputUi>;
 
 	connect(outputModule->defaultFormatCO, SIGNAL(activated(int)),
@@ -1444,7 +1444,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_("Formats[[output]]"));
 	docPS->addPanel(preambleModule, N_("LaTeX Preamble"));
 	docPS->setCurrentPanel("Document Class");
 // FIXME: hack to work around resizing bug in Qt >= 4.2
@@ -2846,7 +2846,7 @@ void GuiDocument::applyView()
 	bp_.listings_params =
 		InsetListingsParams(fromqstr(listingsModule->listingsED->toPlainText())).params();
 
-	// Format
+	// Formats
 	bp_.default_output_format = fromqstr(outputModule->defaultFormatCO->itemData(
 		outputModule->defaultFormatCO->currentIndex()).toString());
 
@@ -3406,7 +3406,7 @@ void GuiDocument::paramsToDialog()
 		fontModule->fontencLE->setText(toqstr(bp_.fontenc));
 	}
 
-	// Format
+	// Formats
 	// This must be set _after_ fonts since updateDefaultFormat()
 	// checks osFontsCB settings.
 	// update combobox with formats