[LyX/master] Customization: accept and merge some changes

commit 9464112840f037627a0e87afbf0e554dec1cff7d Author: Uwe Stöhr Date: Sun Nov 29 18:24:05 2015 +0100 Customization: accept and merge some changes diff --git a/lib/doc/Customization.lyx b/lib/doc/Customization.lyx index 0076264..d23215d 100644 ---

[LyX/master] Customization.lyx: accept all remaining changes

commit 281131f6b266080a91293ed3ff1ec4a6ef71d7c4 Author: Uwe Stöhr Date: Sun Nov 29 19:25:46 2015 +0100 Customization.lyx: accept all remaining changes diff --git a/lib/doc/Customization.lyx b/lib/doc/Customization.lyx index d23215d..b8316f3 100644 ---

[LyX/master] Fix merging of obsolete entries

commit 124be71cb98685e868316b1b5c24f4bccedfdc9f Author: Georg Baum Date: Sun Nov 29 20:14:54 2015 +0100 Fix merging of obsolete entries Thanks Kornel for spotting this. diff --git a/development/tools/mergepo.py b/development/tools/mergepo.py index 84eec1c..c4d402c

[LyX/master] Changelog-Customization-LyX_22x.txt: new fileContents

commit 0ed6724de3e6fbcf6d2857e2711acc8c0f8cab11 Author: Uwe Stöhr Date: Sun Nov 29 18:26:21 2015 +0100 Changelog-Customization-LyX_22x.txt: new fileContents - documents the changes for the translators diff --git

[LyX/master] Make Japanese manual Additional.lyx compilable.

commit 5b73df0f318015efc782f339be8f5647e7cab860 Author: Kornel Benko Date: Sun Nov 29 23:04:36 2015 +0100 Make Japanese manual Additional.lyx compilable. Added a protected space in default language after an english text. This is needed only if the imaadiately

[LyX/master] Add utility to merge po files

commit 4db3169fbcf8e7abea61f35e5517b72bd3e8 Author: Georg Baum Date: Sun Nov 29 18:04:20 2015 +0100 Add utility to merge po files Surprisingly I could not find a tool that merges updated translations into a .po file in a way that a) merges only

[LyX/master] Customization.lyx: update version number

commit 8a73992a49959fd07302be42d30df4497dc84cff Author: Uwe Stöhr Date: Sun Nov 29 19:42:07 2015 +0100 Customization.lyx: update version number diff --git a/lib/doc/Customization.lyx b/lib/doc/Customization.lyx index b8316f3..8be4a55 100644 ---

[LyX/master] Autotest: This file shows error if exported to dvi.

commit 6d7054cb46831e96c89c84ae9bb0b5c88e49eb5b Author: Kornel Benko Date: Sun Nov 29 22:05:33 2015 +0100 Autotest: This file shows error if exported to dvi. To omit the error, there are 2 possibilities 1.) Change \inputencoding to utf8-platex or 2.)

[LyX/master] Baskian Tutorial.lyx: use inset info

commit 140b55af510956e5b0a01f03e60aff6fda209b3e Author: Uwe Stöhr Date: Sun Nov 29 20:21:05 2015 +0100 Baskian Tutorial.lyx: use inset info - also run lyx2lyx diff --git a/lib/doc/eu/Tutorial.lyx b/lib/doc/eu/Tutorial.lyx index c893fd8..e49c3df 100644 ---

[LyX/master] German Customization.lyx: some translations and fixed typos

commit 3bf6f43d11f96ae81b42534ab99f87a475e7e854 Author: Uwe Stöhr Date: Sun Nov 29 19:40:25 2015 +0100 German Customization.lyx: some translations and fixed typos diff --git a/lib/doc/de/Customization.lyx b/lib/doc/de/Customization.lyx index 3bec44a..82fa264 100644 ---

[LyX/master] Galician Tutorial.lyx: use inset info

commit 13ec15247054500ff9f8b20d172edfabdcc7d5de Author: Uwe Stöhr Date: Sun Nov 29 20:29:05 2015 +0100 Galician Tutorial.lyx: use inset info - also run lyx2lyx diff --git a/lib/doc/gl/Tutorial.lyx b/lib/doc/gl/Tutorial.lyx index 9589ff6..0badc9d 100644 ---

[LyX/master] Update sk.po

commit d441d21bbd2b14b59a262e01a38d678b3edb3e56 Author: Kornel Benko Date: Sun Nov 29 20:28:36 2015 +0100 Update sk.po diff --git a/po/sk.gmo b/po/sk.gmo index decb28d..31c14f8 100644 Binary files a/po/sk.gmo and b/po/sk.gmo differ diff --git a/po/sk.po b/po/sk.po index

[LyX/master] de.po: a translation

commit 7aeab53e4e802ef256678f2b7aa5916fb20a37e7 Author: Uwe Stöhr Date: Sun Nov 29 22:23:58 2015 +0100 de.po: a translation diff --git a/po/de.gmo b/po/de.gmo index 4708d8d..ef76e92 100644 Binary files a/po/de.gmo and b/po/de.gmo differ diff --git a/po/de.po b/po/de.po

[LyX/master] Cmake lyx2lyx tests: Ignore warning about "no conversion needed"

commit 2b9a9d97a6ba44dc72956939e45207de5c3af2b7 Author: Kornel Benko Date: Sun Nov 29 15:26:56 2015 +0100 Cmake lyx2lyx tests: Ignore warning about "no conversion needed" diff --git a/development/autotests/lyx2lyxtest.cmake b/development/autotests/lyx2lyxtest.cmake index

[LyX/master] Cmake export tests: Use build dir as source for _all_ latex output formats

commit af18890ed668c870eb8d852730e0399f3fdd9755 Author: Kornel Benko Date: Sun Nov 29 16:11:10 2015 +0100 Cmake export tests: Use build dir as source for _all_ latex output formats diff --git a/development/autotests/export.cmake b/development/autotests/export.cmake index

[LyX/master] Add test for language nesting regression

commit 2f3f82e75be5e862e1628af46212a9b26fd2da52 Author: Georg Baum Date: Sun Nov 29 11:52:34 2015 +0100 Add test for language nesting regression The new test shows a language nesting regression: With LyX 2.1 it exports fine in all formats, with 2.2 it fails for

[LyX/master] Fix bug #9096: Load all the files specified on the command line, and then dispatch whatever commands we are given to those Buffers.

commit a8f57334e25a48ebdb74b6aa3004f30f0e2aaed9 Author: Richard Heck Date: Sat Nov 7 17:04:32 2015 -0500 Fix bug #9096: Load all the files specified on the command line, and then dispatch whatever commands we are given to those Buffers. Original patch due to

[LyX/master] Whitespace.

commit c01a533acccbc77189b5009a45216f7da78ec3a9 Author: Richard Heck Date: Sun Nov 29 11:20:56 2015 -0500 Whitespace. diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp index f17ab77..7676356 100644 --- a/src/frontends/qt4/GuiView.cpp +++

[LyX/master] Cmake autotests: Corrected suspiciousTests for new testfile

commit 8f225ebdea161836d4ce1fa3ce06f402b034ba9b Author: Kornel Benko Date: Mon Nov 30 00:42:48 2015 +0100 Cmake autotests: Corrected suspiciousTests for new testfile diff --git a/development/autotests/suspiciousTests b/development/autotests/suspiciousTests index