Merge branch 'master' of git.lyx.org:lyx

diff --git a/development/autotests/invertedTests b/development/autotests/invertedTests
index d87ca6835ac3ba58caa00618089cf6ccef948b89..df0a94b13d3bf5f828ab8ba0a72cc2d6cb02d271 100644 (file)
--- a/development/autotests/invertedTests
+++ b/development/autotests/invertedTests
@@ -82,12 +82,6 @@ export/export/latex/fa-OT1_pdf2
 # -> Missing character (Greek letter omikron with tonos),
 #    suboptimal character spacing in non-Japanese text parts.
 export/examples/ja/multilingual_.*_systemF
-#
-# Noto Fonts not found with LuaTeX.
-export/doc/zh_CN/Intro_(dvi3|pdf5)_systemF
-export/doc/zh_CN/Tutorial_(dvi3|pdf5)_systemF
-# "Hand-compiling" with XeTeX works but the test fails here (G.Milde)
-#export/doc/zh_CN/Tutorial_pdf4_systemF
 
 # CJK for multilingual documents:
 #

diff --git a/lib/doc/zh_CN/Intro.lyx b/lib/doc/zh_CN/Intro.lyx
index 4a0ed510b61b31fa52e1095fcb45a3a05c7f3ab6..93c2341830a66274b7f085a6113f97c7675629ed 100644 (file)
--- a/lib/doc/zh_CN/Intro.lyx
+++ b/lib/doc/zh_CN/Intro.lyx
@@ -17,7 +17,7 @@
 \language_package default
 \inputencoding utf8-cjk
 \fontencoding auto
-\font_roman "default" "Noto Serif"
+\font_roman "default" "Noto Serif CJK SC"
 \font_sans "default" "Noto Sans CJK SC"
 \font_typewriter "default" "Noto Sans Mono CJK SC"
 \font_math "auto" "auto"

diff --git a/lib/doc/zh_CN/Tutorial.lyx b/lib/doc/zh_CN/Tutorial.lyx
index c900232e68aa145c79eb604060a99074ab18ce48..10d1265442e5fd8a581968da64717fcf155beb1d 100644 (file)
--- a/lib/doc/zh_CN/Tutorial.lyx
+++ b/lib/doc/zh_CN/Tutorial.lyx
@@ -23,9 +23,9 @@
 \language_package default
 \inputencoding utf8-cjk
 \fontencoding auto
-\font_roman "default" "Noto Serif"
+\font_roman "default" "Noto Serif CJK SC"
 \font_sans "default" "Noto Sans CJK SC"
-\font_typewriter "default" "default"
+\font_typewriter "default" "Noto Sans Mono CJK SC"
 \font_math "auto" "auto"
 \font_default_family default
 \use_non_tex_fonts false

diff --git a/lib/examples/ko/splash.lyx b/lib/examples/ko/splash.lyx
index ca01186ef00d5048821036ad02f3a0922c405316..7506f0ace2ac5eb9536904403b9ee541b537a6c5 100644 (file)
--- a/lib/examples/ko/splash.lyx
+++ b/lib/examples/ko/splash.lyx
@@ -1,4 +1,4 @@
-#LyX 2.3 created this file. For more info see http://www.lyx.org/
+#LyX 2.4 created this file. For more info see https://www.lyx.org/
 \lyxformat 544
 \begin_document
 \begin_header
@@ -11,9 +11,9 @@
 \language_package default
 \inputencoding utf8-cjk
 \fontencoding OT1
-\font_roman "default" "NanumMyeongjo"
-\font_sans "default" "NanumGothic"
-\font_typewriter "default" "NanumGothicCoding"
+\font_roman "default" "Noto Serif CJK KR"
+\font_sans "default" "Noto Sans CJK KR"
+\font_typewriter "default" "Noto Sans Mono CJK KR"
 \font_math "auto" "auto"
 \font_default_family default
 \use_non_tex_fonts false

diff --git a/po/de.po b/po/de.po
index 6310bd57dc9860bbac58e856e24e790d38a7845d..4ce80aa62fca190acc2194e88bc68601ef8d569b 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -96,7 +96,7 @@ msgstr ""
 "Project-Id-Version: LyX 2.4git\n"
 "Report-Msgid-Bugs-To: lyx-devel@lists.lyx.org\n"
 "POT-Creation-Date: 2019-01-25 14:43+0100\n"
-"PO-Revision-Date: 2019-01-25 14:48+0100\n"
+"PO-Revision-Date: 2019-01-25 15:00+0100\n"
 "Last-Translator: Juergen Spitzmueller <spitz@lyx.org>\n"
 "Language-Team: German <lyx-docs@lists.lyx.org>\n"
 "Language: de\n"
@@ -26377,7 +26377,7 @@ msgstr "Notspeicherungsdatei jetzt löschen?"
 
 #: src/Buffer.cpp:4792
 msgid "Can't rename emergency file!"
-msgstr "Notspeicherung kann nicht umbenannt werden!"
+msgstr "Notspeicherungsdatei kann nicht umbenannt werden!"
 
 #: src/Buffer.cpp:4793
 msgid ""