commit 46a16b0ca778ed32f7aa0cbc6c4d6d57f1270b98
Merge: a4a1c11 c0a8259
Author: Richard Heck <[email protected]>
Date: Mon Jul 25 14:55:16 2016 -0400
Merge branch '2.2.x' into 2.2.2-staging
ANNOUNCE | 220 +-
INSTALL.Win32 | 92 +-
NEWS | 29 +
autotests/export/utf8-plain-with-tex-fonts.lyx | 86 +
configure.ac | 2 +-
.../Win32/packaging/installer/ChangeLog.txt | 9 +-
development/Win32/packaging/installer/settings.nsh | 10 +-
development/autotests/suspiciousTests | 5 +
development/autotests/unreliableTests | 4 +
development/tools/lyx-build | 2 +-
lib/Makefile.am | 1 +
lib/doc/Additional.lyx | 102 +-
lib/doc/Changelog-Math-LyX_22.txt | 1 +
lib/doc/Changelog-Tutorial-LyX_22x.txt | 2 +-
lib/doc/Changelog-UserGuide-LyX_22x.txt | 2 +
lib/doc/Customization.lyx | 36 -
lib/doc/EmbeddedObjects.lyx | 2 +-
lib/doc/LaTeXConfig.lyx | 16 -
lib/doc/Math.lyx | 358 +-
lib/doc/MergedManuals.lyx | 2 +-
lib/doc/Tutorial.lyx | 28 +-
lib/doc/UserGuide.lyx | 41 +-
lib/doc/cs/Tutorial.lyx | 12 -
lib/doc/da/Intro.lyx | 32 -
lib/doc/de/Additional.lyx | 108 -
lib/doc/de/Customization.lyx | 32 -
lib/doc/de/EmbeddedObjects.lyx | 108 -
lib/doc/de/Intro.lyx | 21 +-
lib/doc/de/Math.lyx | 306 +-
lib/doc/de/Tutorial.lyx | 27 +-
lib/doc/de/UserGuide.lyx | 280 +-
lib/doc/es/Additional.lyx | 152 +-
lib/doc/es/Customization.lyx | 49 +-
lib/doc/es/EmbeddedObjects.lyx | 96 -
lib/doc/es/Math.lyx | 398 +-
lib/doc/es/Tutorial.lyx | 27 +-
lib/doc/es/UserGuide.lyx | 285 +-
lib/doc/eu/Tutorial.lyx | 12 -
lib/doc/fr/Additional.lyx | 112 -
lib/doc/fr/Customization.lyx | 58 +-
lib/doc/fr/EmbeddedObjects.lyx | 96 -
lib/doc/fr/Intro.lyx | 44 -
lib/doc/fr/Math.lyx | 380 +-
lib/doc/fr/Tutorial.lyx | 29 +-
lib/doc/fr/UserGuide.lyx | 341 +-
lib/doc/gl/Intro.lyx | 44 -
lib/doc/gl/Tutorial.lyx | 12 -
lib/doc/he/Tutorial.lyx | 20 -
lib/doc/hu/Intro.lyx | 36 -
lib/doc/hu/Tutorial.lyx | 16 -
lib/doc/id/Tutorial.lyx | 16 -
lib/doc/it/Tutorial.lyx | 16 -
lib/doc/ja/Additional.lyx | 80 -
lib/doc/ja/Customization.lyx | 105 +-
lib/doc/ja/EmbeddedObjects.lyx | 96 -
lib/doc/ja/Intro.lyx | 4 -
lib/doc/ja/LaTeXConfig.lyx | 20 -
lib/doc/ja/Math.lyx | 347 +-
lib/doc/ja/Tutorial.lyx | 27 +-
lib/doc/ja/UserGuide.lyx | 290 +-
lib/doc/nb/Intro.lyx | 40 -
lib/doc/nb/Tutorial.lyx | 16 -
lib/doc/nl/Intro.lyx | 12 -
lib/doc/nl/Tutorial.lyx | 20 -
lib/doc/pl/Intro.lyx | 8 -
lib/doc/pl/Tutorial.lyx | 24 -
lib/doc/pt/Intro.lyx | 8 -
lib/doc/pt/Tutorial.lyx | 20 -
lib/doc/ro/Intro.lyx | 8 -
lib/doc/ru/Intro.lyx | 32 -
lib/doc/ru/Tutorial.lyx | 20 -
lib/doc/sk/Tutorial.lyx | 16 -
lib/doc/sl/Intro.lyx | 12 -
lib/doc/sl/Tutorial.lyx | 20 -
lib/doc/sv/Tutorial.lyx | 12 -
lib/doc/zh_CN/Tutorial.lyx | 16 -
lib/examples/de/beispiel_gelyxt.lyx | 28 +-
lib/examples/docbook_article.lyx | 28 -
lib/examples/es/ejemplo_con_lyx.lyx | 19 +-
lib/examples/es/linguistics.lyx | 24 -
lib/examples/example_lyxified.lyx | 19 +-
lib/examples/fr/exemple_lyxifie.lyx | 7 +-
lib/examples/fr/linguistics.lyx | 24 -
lib/examples/ja/FeynmanDiagrams.lyx | 4 -
lib/examples/ja/beamer.lyx | 284 +-
lib/examples/ja/lilypond.lyx | 4 -
lib/examples/ja/xypic.lyx | 8 -
lib/examples/lilypond.lyx | 4 -
lib/examples/springer/svmono_chapter.lyx | 12 +-
lib/examples/springer/svmono_foreword.lyx | 4 -
lib/examples/springer/svmono_preface.lyx | 4 -
lib/examples/springer/svmono_referenc.lyx | 4 -
lib/examples/springer/svmono_solutions.lyx | 2 +-
lib/examples/springer/svmult_author.lyx | 10 +-
lib/examples/springer/svmult_foreword.lyx | 4 -
lib/examples/springer/svmult_preface.lyx | 4 -
lib/examples/springer/svmult_referenc.lyx | 4 -
lib/layouts/linguistics.module | 2 +-
lib/templates/AEA.lyx | 16 -
lib/templates/IJMPC.lyx | 4 -
lib/templates/IJMPD.lyx | 4 -
.../ja_beamer-conference-ornate-20min.lyx | 56 +-
po/Rules-lyx | 2 +-
po/ar.gmo | Bin 361933 -> 361757
bytes
po/ar.po | 8780 ++++----
po/ca.gmo | Bin 162393 -> 162417
bytes
po/ca.po | 9187 ++++----
po/cs.gmo | Bin 420067 -> 419857
bytes
po/cs.po | 9065 ++++----
po/da.gmo | Bin 211610 -> 211392
bytes
po/da.po | 9245 ++++----
po/de.gmo | Bin 490433 -> 492117
bytes
po/de.po | 9010 ++++----
po/el.gmo | Bin 278232 -> 278000
bytes
po/el.po | 9038 ++++----
po/en.gmo | Bin 1139 -> 1139 bytes
po/en.po | 8480 ++++----
po/es.gmo | Bin 481556 -> 481230
bytes
po/es.po | 8855 ++++----
po/eu.gmo | Bin 345945 -> 345723
bytes
po/eu.po | 9132 ++++----
po/fi.gmo | Bin 242882 -> 242671
bytes
po/fi.po | 9128 ++++----
po/fr.gmo | Bin 493690 -> 495814
bytes
po/fr.po |24472 ++++++++++----------
po/gl.gmo | Bin 170426 -> 170222
bytes
po/gl.po | 9231 ++++----
po/he.gmo | Bin 259770 -> 259579
bytes
po/he.po | 9224 ++++----
po/hu.gmo | Bin 283469 -> 283250
bytes
po/hu.po | 9121 ++++----
po/ia.gmo | Bin 444082 -> 474961
bytes
po/ia.po | 8856 ++++----
po/id.gmo | Bin 350474 -> 350235
bytes
po/id.po | 9132 ++++----
po/it.gmo | Bin 482929 -> 485067
bytes
po/it.po | 9454 ++++----
po/ja.gmo | Bin 509579 -> 508940
bytes
po/ja.po | 8956 ++++----
po/nb.gmo | Bin 452460 -> 451914
bytes
po/nb.po | 8885 ++++----
po/nl.gmo | Bin 152471 -> 152495
bytes
po/nl.po | 9028 ++++----
po/nn.gmo | Bin 360305 -> 360093
bytes
po/nn.po | 9107 ++++----
po/pl.gmo | Bin 359150 -> 358936
bytes
po/pl.po | 9533 ++++----
po/pt_BR.gmo | Bin 487543 -> 489663
bytes
po/pt_BR.po | 8904 ++++----
po/pt_PT.gmo | Bin 439188 -> 438906
bytes
po/pt_PT.po | 9101 ++++----
po/ro.gmo | Bin 151306 -> 151330
bytes
po/ro.po | 9174 ++++----
po/ru.gmo | Bin 294850 -> 294659
bytes
po/ru.po | 9345 ++++----
po/sk.gmo | Bin 480030 -> 482058
bytes
po/sk.po | 8851 ++++----
po/sr.gmo | Bin 161875 -> 161793
bytes
po/sr.po | 9067 ++++----
po/sv.gmo | Bin 468962 -> 468361
bytes
po/sv.po |11461 +++++-----
po/tr.gmo | Bin 224008 -> 223830
bytes
po/tr.po | 9140 ++++----
po/uk.gmo | Bin 606923 -> 606546
bytes
po/uk.po | 8863 ++++----
po/zh_CN.gmo | Bin 214138 -> 213947
bytes
po/zh_CN.po | 9145 ++++----
po/zh_TW.gmo | Bin 418725 -> 418469
bytes
po/zh_TW.po | 9043 ++++----
src/Buffer.cpp | 14 +-
src/BufferParams.cpp | 17 +-
src/frontends/qt4/GuiApplication.cpp | 13 +-
src/frontends/qt4/GuiDocument.cpp | 11 +-
src/frontends/qt4/GuiErrorList.cpp | 4 +-
src/frontends/qt4/ui/OutputUi.ui | 51 +-
src/insets/InsetCollapsable.cpp | 1 +
status.22x | 7 +-
177 files changed, 161268 insertions(+), 161916 deletions(-)
diff --cc status.22x
index 7c18611,0e9f06d..a6d4801
--- a/status.22x
+++ b/status.22x
@@@ -18,12 -18,11 +18,12 @@@ What's ne
* TEX2LYX IMPROVEMENTS
-
* USER INTERFACE
+* When changing zoom level, show current value in status bar (bug
+ 10212).
--
++
* DOCUMENTATION AND LOCALIZATION
@@@ -45,19 -43,9 +45,23 @@@
* USER INTERFACE
+- Avoid crashing in release mode if we stumble across an unrealized font.
-* INTERNALS
+- Fix display of citations with two authors.
+
+- Fix display of multi-author citations when the GUI language is not English.
+- Fix bug where change tracking marks are lost under math insets (bug
+ 10265).
+
+- Fix display glitch when switching to Description layout with an inset
+ at the beginning of the paragraph (bug 10163)
+
++
++* USER INTERFACE
++
++
+* INTERNALS
* DOCUMENTATION AND LOCALIZATION
@@@ -69,7 -57,7 +73,6 @@@
* TEX2LYX
--
* ADVANCED FIND AND REPLACE
