Merge branch '2.3.x' of git.lyx.org:lyx into 2.3.x

This commit is contained in:
Uwe Stöhr 2017-12-14 14:49:16 +01:00
commit a0130c343b
2 changed files with 6 additions and 6 deletions

BIN
po/de.gmo

Binary file not shown.

View File

@ -96,14 +96,14 @@ msgstr ""
"Project-Id-Version: LyX 2.3\n"
"Report-Msgid-Bugs-To: lyx-devel@lists.lyx.org\n"
"POT-Creation-Date: 2017-12-14 02:51+0100\n"
"PO-Revision-Date: 2017-12-14 03:21+0100\n"
"Last-Translator: Uwe Stöhr <uwestoehr@web.de>\n"
"PO-Revision-Date: 2017-12-14 08:07+0100\n"
"Last-Translator: Juergen Spitzmueller <spitz@lyx.org>\n"
"Language-Team: German <lyx-docs@lists.lyx.org>\n"
"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 2.0.5\n"
"X-Generator: Lokalize 2.0\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
#: src/frontends/qt4/ui/AboutUi.ui:33
@ -5687,19 +5687,19 @@ msgstr " et al."
#: lib/citeengines/biblatex.citeengine:145
#: lib/citeengines/natbib.citeengine:124 lib/layouts/stdciteformats.inc:27
msgid ", [[separate author names in citation, except for last name]]"
msgstr ","
msgstr ", "
#: lib/citeengines/biblatex-natbib.citeengine:154
#: lib/citeengines/biblatex.citeengine:146
#: lib/citeengines/natbib.citeengine:125 lib/layouts/stdciteformats.inc:28
msgid ", and [[separate name of last author in citation]]"
msgstr ", und"
msgstr ", und "
#: lib/citeengines/biblatex-natbib.citeengine:155
#: lib/citeengines/biblatex.citeengine:147
#: lib/citeengines/natbib.citeengine:126 lib/layouts/stdciteformats.inc:29
msgid " and [[separate two authors in citation]]"
msgstr " und"
msgstr " und "
#: lib/citeengines/biblatex-natbib.citeengine:299
#: lib/citeengines/biblatex.citeengine:283