[LyX/2.2.x] de.po: some translations
commit a762244ca675d0cc77441307fe50ef392335373d Author: Uwe Stöhr Date: Tue May 31 23:18:28 2016 +0200 de.po: some translations diff --git a/po/de.po b/po/de.po index 7463b72..5aeacb9 100644 --- a/po/de.po +++ b/po/de.po @@ -96,7 +96,7 @@ msgstr "" "Project-Id-Version: LyX 2.2\n" "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n" "POT-Creation-Date: 2016-04-24 10:40+0200\n" -"PO-Revision-Date: 2016-04-09 18:44+0200\n" +"PO-Revision-Date: 2016-05-31 23:11+0200\n" "Last-Translator: Uwe Stöhr \n" "Language-Team: German \n" "Language: de\n" @@ -134,15 +134,14 @@ msgstr "Versionshinweise" #: src/frontends/qt4/ui/AboutUi.ui:159 src/frontends/qt4/ui/CompareUi.ui:163 #: src/frontends/qt4/ui/DelimiterUi.ui:286 #: src/frontends/qt4/ui/ErrorListUi.ui:60 -#: src/frontends/qt4/ui/ExternalUi.ui:620 -#: src/frontends/qt4/ui/IncludeUi.ui:250 +#: src/frontends/qt4/ui/ExternalUi.ui:620 src/frontends/qt4/ui/IncludeUi.ui:250 #: src/frontends/qt4/ui/InsetParamsUi.ui:138 src/frontends/qt4/ui/LogUi.ui:88 #: src/frontends/qt4/ui/ParagraphUi.ui:261 src/frontends/qt4/ui/PrefsUi.ui:90 #: src/frontends/qt4/ui/RefUi.ui:343 src/frontends/qt4/ui/SearchUi.ui:203 #: src/frontends/qt4/ui/ShowFileUi.ui:55 src/frontends/qt4/ui/SymbolsUi.ui:66 -#: src/frontends/qt4/ui/TexinfoUi.ui:58 -#: src/frontends/qt4/ui/ThesaurusUi.ui:138 src/frontends/qt4/ui/WrapUi.ui:173 -#: src/frontends/qt4/GuiParagraph.cpp:163 src/frontends/qt4/GuiView.cpp:2737 +#: src/frontends/qt4/ui/TexinfoUi.ui:58 src/frontends/qt4/ui/ThesaurusUi.ui:138 +#: src/frontends/qt4/ui/WrapUi.ui:173 src/frontends/qt4/GuiParagraph.cpp:163 +#: src/frontends/qt4/GuiView.cpp:2737 msgid "&Close" msgstr "&Schließen" @@ -276,16 +275,15 @@ msgid "Enter BibTeX database name" msgstr "Name der BibTeX-Datenbank eingeben" #: src/frontends/qt4/ui/BibtexAddUi.ui:114 -#: src/frontends/qt4/ui/BranchesUi.ui:113 -#: src/frontends/qt4/ui/CitationUi.ui:84 src/frontends/qt4/ui/IndicesUi.ui:134 -#: src/CutAndPaste.cpp:369 +#: src/frontends/qt4/ui/BranchesUi.ui:113 src/frontends/qt4/ui/CitationUi.ui:84 +#: src/frontends/qt4/ui/IndicesUi.ui:134 src/CutAndPaste.cpp:369 msgid "&Add" msgstr "&Hinzufügen" -#: src/frontends/qt4/ui/BibtexAddUi.ui:127 -#: src/frontends/qt4/ui/BibtexUi.ui:213 src/frontends/qt4/ui/ChangesUi.ui:91 -#: src/frontends/qt4/ui/SendtoUi.ui:92 src/frontends/qt4/ui/ShortcutUi.ui:65 -#: src/buffer_funcs.cpp:123 src/frontends/qt4/ButtonController.cpp:239 +#: src/frontends/qt4/ui/BibtexAddUi.ui:127 src/frontends/qt4/ui/BibtexUi.ui:213 +#: src/frontends/qt4/ui/ChangesUi.ui:91 src/frontends/qt4/ui/SendtoUi.ui:92 +#: src/frontends/qt4/ui/ShortcutUi.ui:65 src/buffer_funcs.cpp:123 +#: src/frontends/qt4/ButtonController.cpp:239 #: src/frontends/qt4/GuiApplication.cpp:1773 #: src/frontends/qt4/GuiCompare.cpp:192 msgid "Cancel" @@ -332,19 +330,16 @@ msgstr "Literaturverzeichnis im Inhaltsverzeichnis aufführen" msgid "Add bibliography to &TOC" msgstr "Literatur&verzeichnis ins Inhaltsverzeichnis" -#: src/frontends/qt4/ui/BibtexUi.ui:200 -#: src/frontends/qt4/ui/CharacterUi.ui:357 +#: src/frontends/qt4/ui/BibtexUi.ui:200 src/frontends/qt4/ui/CharacterUi.ui:357 #: src/frontends/qt4/ui/CitationUi.ui:527 #: src/frontends/qt4/ui/CompareHistoryUi.ui:183 #: src/frontends/qt4/ui/CompareUi.ui:153 src/frontends/qt4/ui/DocumentUi.ui:67 #: src/frontends/qt4/ui/ExternalUi.ui:600 -#: src/frontends/qt4/ui/GraphicsUi.ui:711 -#: src/frontends/qt4/ui/IncludeUi.ui:237 src/frontends/qt4/ui/IndexUi.ui:41 -#: src/frontends/qt4/ui/InsetParamsUi.ui:118 +#: src/frontends/qt4/ui/GraphicsUi.ui:711 src/frontends/qt4/ui/IncludeUi.ui:237 +#: src/frontends/qt4/ui/IndexUi.ui:41 src/frontends/qt4/ui/InsetParamsUi.ui:118 #: src/frontends/qt4/ui/ListingsUi.ui:539 #: src/frontends/qt4/ui/MathMatrixUi.ui:263 src/frontends/qt4/ui/NoteUi.ui:38 -#: src/frontends/qt4/ui/ParagraphUi.ui:241 -#: src/frontends/qt4/ui/PhantomUi.ui:38 +#: src/frontends/qt4/ui/ParagraphUi.ui:241 src/frontends/qt4/ui/PhantomUi.ui:38 #: src/frontends/qt4/ui/PrintindexUi.ui:38 src/frontends/qt4/ui/RefUi.ui:317 #: src/frontends/qt4/ui/SendtoUi.ui:72 src/frontends/qt4/ui/ShortcutUi.ui:52 #: src/frontends/qt4/ui/SymbolsUi.ui:49 @@ -424,14 +419,12 @@ msgid "Inner box type" msgstr "Art der inneren Box" #: src/frontends/qt4/ui/BoxUi.ui:91 src/frontends/qt4/ui/HSpaceUi.ui:32 -#: src/frontends/qt4/ui/ListingsUi.ui:98 -#: src/frontends/qt4/ui/TabularUi.ui:1199 +#: src/frontends/qt4/ui/ListingsUi.ui:98 src/frontends/qt4/ui/TabularUi.ui:1199 #: src/frontends/qt4/ui/TabularUi.ui:1218 #: src/frontends/qt4/ui/TabularUi.ui:1266 src/frontends/qt4/GuiBox.cpp:425 #: src/frontends/qt4/GuiBox.cpp:635 src/frontends/qt4/GuiDocument.cpp:120 -#: src/frontends/qt4/GuiGraphics.cpp:582 -#: src/frontends/qt4/GuiMathMatrix.cpp:33 src/frontends/qt4/GuiPrefs.cpp:2186 -#: src/frontends/qt4/GuiPrefs.cpp:2209 +#: src/frontends/qt4/GuiGraphics.cpp:582 src/frontends/qt4/GuiMathMatrix.cpp:33 +#: src/frontends/qt4/GuiPrefs.cpp:2186 src/frontends/qt4/GuiPr
[LyX/2.2.x] ErrorListUi.ui: correct an expression
commit 13af7aa426b5d2fde357e043ef8e4223a123e265 Author: Uwe Stöhr Date: Tue May 31 23:16:32 2016 +0200 ErrorListUi.ui: correct an expression diff --git a/src/frontends/qt4/ui/ErrorListUi.ui b/src/frontends/qt4/ui/ErrorListUi.ui index 9cb2374..ffbdd38 100644 --- a/src/frontends/qt4/ui/ErrorListUi.ui +++ b/src/frontends/qt4/ui/ErrorListUi.ui @@ -100,7 +100,7 @@ - Selecting an error will show the error message in the panel below, and jump the cursor to the location in the document where the error occurred. + Selecting an error will show the error message in the panel below and the cursor will jump to the location in the document where the error occurred.
[LyX/master] de.po: some translations
commit 82518e46021f1b8ad06e6861000223802f381100 Author: Uwe Stöhr Date: Tue May 31 23:15:56 2016 +0200 de.po: some translations diff --git a/po/de.po b/po/de.po index 7463b72..88e01db 100644 --- a/po/de.po +++ b/po/de.po @@ -96,7 +96,7 @@ msgstr "" "Project-Id-Version: LyX 2.2\n" "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n" "POT-Creation-Date: 2016-04-24 10:40+0200\n" -"PO-Revision-Date: 2016-04-09 18:44+0200\n" +"PO-Revision-Date: 2016-05-31 23:09+0200\n" "Last-Translator: Uwe Stöhr \n" "Language-Team: German \n" "Language: de\n" @@ -134,15 +134,14 @@ msgstr "Versionshinweise" #: src/frontends/qt4/ui/AboutUi.ui:159 src/frontends/qt4/ui/CompareUi.ui:163 #: src/frontends/qt4/ui/DelimiterUi.ui:286 #: src/frontends/qt4/ui/ErrorListUi.ui:60 -#: src/frontends/qt4/ui/ExternalUi.ui:620 -#: src/frontends/qt4/ui/IncludeUi.ui:250 +#: src/frontends/qt4/ui/ExternalUi.ui:620 src/frontends/qt4/ui/IncludeUi.ui:250 #: src/frontends/qt4/ui/InsetParamsUi.ui:138 src/frontends/qt4/ui/LogUi.ui:88 #: src/frontends/qt4/ui/ParagraphUi.ui:261 src/frontends/qt4/ui/PrefsUi.ui:90 #: src/frontends/qt4/ui/RefUi.ui:343 src/frontends/qt4/ui/SearchUi.ui:203 #: src/frontends/qt4/ui/ShowFileUi.ui:55 src/frontends/qt4/ui/SymbolsUi.ui:66 -#: src/frontends/qt4/ui/TexinfoUi.ui:58 -#: src/frontends/qt4/ui/ThesaurusUi.ui:138 src/frontends/qt4/ui/WrapUi.ui:173 -#: src/frontends/qt4/GuiParagraph.cpp:163 src/frontends/qt4/GuiView.cpp:2737 +#: src/frontends/qt4/ui/TexinfoUi.ui:58 src/frontends/qt4/ui/ThesaurusUi.ui:138 +#: src/frontends/qt4/ui/WrapUi.ui:173 src/frontends/qt4/GuiParagraph.cpp:163 +#: src/frontends/qt4/GuiView.cpp:2737 msgid "&Close" msgstr "&Schließen" @@ -276,16 +275,15 @@ msgid "Enter BibTeX database name" msgstr "Name der BibTeX-Datenbank eingeben" #: src/frontends/qt4/ui/BibtexAddUi.ui:114 -#: src/frontends/qt4/ui/BranchesUi.ui:113 -#: src/frontends/qt4/ui/CitationUi.ui:84 src/frontends/qt4/ui/IndicesUi.ui:134 -#: src/CutAndPaste.cpp:369 +#: src/frontends/qt4/ui/BranchesUi.ui:113 src/frontends/qt4/ui/CitationUi.ui:84 +#: src/frontends/qt4/ui/IndicesUi.ui:134 src/CutAndPaste.cpp:369 msgid "&Add" msgstr "&Hinzufügen" -#: src/frontends/qt4/ui/BibtexAddUi.ui:127 -#: src/frontends/qt4/ui/BibtexUi.ui:213 src/frontends/qt4/ui/ChangesUi.ui:91 -#: src/frontends/qt4/ui/SendtoUi.ui:92 src/frontends/qt4/ui/ShortcutUi.ui:65 -#: src/buffer_funcs.cpp:123 src/frontends/qt4/ButtonController.cpp:239 +#: src/frontends/qt4/ui/BibtexAddUi.ui:127 src/frontends/qt4/ui/BibtexUi.ui:213 +#: src/frontends/qt4/ui/ChangesUi.ui:91 src/frontends/qt4/ui/SendtoUi.ui:92 +#: src/frontends/qt4/ui/ShortcutUi.ui:65 src/buffer_funcs.cpp:123 +#: src/frontends/qt4/ButtonController.cpp:239 #: src/frontends/qt4/GuiApplication.cpp:1773 #: src/frontends/qt4/GuiCompare.cpp:192 msgid "Cancel" @@ -332,19 +330,16 @@ msgstr "Literaturverzeichnis im Inhaltsverzeichnis aufführen" msgid "Add bibliography to &TOC" msgstr "Literatur&verzeichnis ins Inhaltsverzeichnis" -#: src/frontends/qt4/ui/BibtexUi.ui:200 -#: src/frontends/qt4/ui/CharacterUi.ui:357 +#: src/frontends/qt4/ui/BibtexUi.ui:200 src/frontends/qt4/ui/CharacterUi.ui:357 #: src/frontends/qt4/ui/CitationUi.ui:527 #: src/frontends/qt4/ui/CompareHistoryUi.ui:183 #: src/frontends/qt4/ui/CompareUi.ui:153 src/frontends/qt4/ui/DocumentUi.ui:67 #: src/frontends/qt4/ui/ExternalUi.ui:600 -#: src/frontends/qt4/ui/GraphicsUi.ui:711 -#: src/frontends/qt4/ui/IncludeUi.ui:237 src/frontends/qt4/ui/IndexUi.ui:41 -#: src/frontends/qt4/ui/InsetParamsUi.ui:118 +#: src/frontends/qt4/ui/GraphicsUi.ui:711 src/frontends/qt4/ui/IncludeUi.ui:237 +#: src/frontends/qt4/ui/IndexUi.ui:41 src/frontends/qt4/ui/InsetParamsUi.ui:118 #: src/frontends/qt4/ui/ListingsUi.ui:539 #: src/frontends/qt4/ui/MathMatrixUi.ui:263 src/frontends/qt4/ui/NoteUi.ui:38 -#: src/frontends/qt4/ui/ParagraphUi.ui:241 -#: src/frontends/qt4/ui/PhantomUi.ui:38 +#: src/frontends/qt4/ui/ParagraphUi.ui:241 src/frontends/qt4/ui/PhantomUi.ui:38 #: src/frontends/qt4/ui/PrintindexUi.ui:38 src/frontends/qt4/ui/RefUi.ui:317 #: src/frontends/qt4/ui/SendtoUi.ui:72 src/frontends/qt4/ui/ShortcutUi.ui:52 #: src/frontends/qt4/ui/SymbolsUi.ui:49 @@ -424,14 +419,12 @@ msgid "Inner box type" msgstr "Art der inneren Box" #: src/frontends/qt4/ui/BoxUi.ui:91 src/frontends/qt4/ui/HSpaceUi.ui:32 -#: src/frontends/qt4/ui/ListingsUi.ui:98 -#: src/frontends/qt4/ui/TabularUi.ui:1199 +#: src/frontends/qt4/ui/ListingsUi.ui:98 src/frontends/qt4/ui/TabularUi.ui:1199 #: src/frontends/qt4/ui/TabularUi.ui:1218 #: src/frontends/qt4/ui/TabularUi.ui:1266 src/frontends/qt4/GuiBox.cpp:425 #: src/frontends/qt4/GuiBox.cpp:635 src/frontends/qt4/GuiDocument.cpp:120 -#: src/frontends/qt4/GuiGraphics.cpp:582 -#: src/frontends/qt4/GuiMathMatrix.cpp:33 src/frontends/qt4/GuiPrefs.cpp:2186 -#: src/frontends/qt4/GuiPrefs.cpp:2209 +#: src/frontends/qt4/GuiGraphics.cpp:582 src/frontends/qt4/GuiMathMatrix.cpp:33 +#: src/frontends/qt4/GuiPrefs.cpp:2186 src/frontends/qt4/GuiPr
[LyX/master] ErrorListUi.ui: correct an expression
commit b540bc1c424d6b2155370e407e37b7eaa0478efb Author: Uwe Stöhr Date: Tue May 31 23:15:07 2016 +0200 ErrorListUi.ui: correct an expression diff --git a/src/frontends/qt4/ui/ErrorListUi.ui b/src/frontends/qt4/ui/ErrorListUi.ui index 9cb2374..ffbdd38 100644 --- a/src/frontends/qt4/ui/ErrorListUi.ui +++ b/src/frontends/qt4/ui/ErrorListUi.ui @@ -100,7 +100,7 @@ - Selecting an error will show the error message in the panel below, and jump the cursor to the location in the document where the error occurred. + Selecting an error will show the error message in the panel below and the cursor will jump to the location in the document where the error occurred.
[LyX/master] Force native line endings for .po files
commit 9df45c383adf5819c90937f9d3cd1e6efc36292e Author: Georg Baum Date: Tue May 31 22:43:09 2016 +0200 Force native line endings for .po files As discussed on the list some time ago. cmake produces .po files already in native line endings. Only autotools on mingw might produce wrong line endings now, but I am pretty sure that nobody updates .po files using autotools on mingw. diff --git a/.gitattributes b/.gitattributes index 51a1fc9..980e824 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,9 @@ # configure.ac needs to have unix line ends on windows, see #10053 configure.ac eol=lf +# Set the default behavior, in case people don't have core.autocrlf set. +* text=auto + +# Our .po file update scripts produce native line endings +*.po text +
[LyX/master] Allow automatic text direction in Painter::text()
commit 51ee267c6e8336727b3d94db424a8efd1cfc4a1e
Author: Jean-Marc Lasgouttes
Date: Tue May 31 09:13:18 2016 +0200
Allow automatic text direction in Painter::text()
It is wrong to assume that direction is left-to-right when no indication
exist.
Add a new enum with values LtR, RtL and Auto to be used as argument of
the private text() methods. When direction is Auto, let Qt decide how
the string shall be layed out.
Fixes bug #10169.
diff --git a/src/frontends/qt4/GuiPainter.cpp b/src/frontends/qt4/GuiPainter.cpp
index a622940..725320b 100644
--- a/src/frontends/qt4/GuiPainter.cpp
+++ b/src/frontends/qt4/GuiPainter.cpp
@@ -335,11 +335,13 @@ void GuiPainter::text(int x, int y, char_type c, FontInfo
const & f)
void GuiPainter::text(int x, int y, docstring const & s, FontInfo const & f)
{
- text(x, y, s, f, false, 0.0, 0.0);
+ text(x, y, s, f, Auto, 0.0, 0.0);
}
-void GuiPainter::do_drawText(int x, int y, QString str, bool rtl, FontInfo
const & f, QFont ff)
+void GuiPainter::do_drawText(int x, int y, QString str,
+ GuiPainter::Direction const dir,
+ FontInfo const & f, QFont ff)
{
setQPainterPen(computeColor(f.realColor()));
if (font() != ff)
@@ -352,10 +354,10 @@ void GuiPainter::do_drawText(int x, int y, QString str,
bool rtl, FontInfo const
/* Use unicode override characters to enforce drawing direction
* Source: http://www.iamcal.com/understanding-bidirectional-text/
*/
- if (rtl)
+ if (dir == RtL)
// Right-to-left override: forces to draw text right-to-left
str = QChar(0x202E) + str;
- else
+ else if (dir == LtR)
// Left-to-right override: forces to draw text left-to-right
str = QChar(0x202D) + str;
drawText(x, y, str);
@@ -366,8 +368,12 @@ void GuiPainter::do_drawText(int x, int y, QString str,
bool rtl, FontInfo const
* Keep it here for now, in case it can be helpful
*/
//This is much stronger than setLayoutDirection.
- int flag = rtl ? Qt::TextForceRightToLeft : Qt::TextForceLeftToRight;
- drawText(x + (rtl ? textwidth : 0), y - fm.maxAscent(), 0, 0,
+ int flag = 0;
+ if (dir == RtL)
+ flag = Qt::TextForceRightToLeft;
+ else if (dir == LtR)
+ flag = Qt::TextForceLeftToRight;
+ drawText(x + ((dir == RtL) ? textwidth : 0), y - fm.maxAscent(), 0, 0,
flag | Qt::TextDontClip,
str);
#endif
@@ -375,7 +381,7 @@ void GuiPainter::do_drawText(int x, int y, QString str,
bool rtl, FontInfo const
void GuiPainter::text(int x, int y, docstring const & s,
- FontInfo const & f, bool const rtl,
+ FontInfo const & f, Direction const dir,
double const wordspacing, double const tw)
{
//LYXERR0("text: x=" << x << ", s=" << s);
@@ -450,7 +456,7 @@ void GuiPainter::text(int x, int y, docstring const & s,
#endif
pm.fill(Qt::transparent);
GuiPainter p(&pm, pixelRatio());
- p.do_drawText(-lb, mA, str, rtl, f, ff);
+ p.do_drawText(-lb, mA, str, dir, f, ff);
QPixmapCache::insert(key, pm);
//LYXERR(Debug::PAINTING, "h=" << h << " mA=" << mA <<
" mD=" << mD
// << " w=" << w << " lb=" << lb << " tw=" <<
textwidth
@@ -464,7 +470,7 @@ void GuiPainter::text(int x, int y, docstring const & s,
}
// don't use the pixmap cache,
- do_drawText(x, y, str, rtl, f, ff);
+ do_drawText(x, y, str, dir, f, ff);
//LYXERR(Debug::PAINTING, "draw " << string(str.toUtf8())
// << " at " << x << "," << y);
}
@@ -473,7 +479,8 @@ void GuiPainter::text(int x, int y, docstring const & s,
void GuiPainter::text(int x, int y, docstring const & str, Font const & f,
double const wordspacing, double const tw)
{
- text(x, y, str, f.fontInfo(), f.isVisibleRightToLeft(), wordspacing,
tw);
+ text(x, y, str, f.fontInfo(), f.isVisibleRightToLeft() ? RtL : LtR,
+wordspacing, tw);
}
@@ -483,13 +490,13 @@ void GuiPainter::text(int x, int y, docstring const &
str, Font const & f,
{
GuiFontMetrics const & fm = getFontMetrics(f.fontInfo());
FontInfo fi = f.fontInfo();
- bool const rtl = f.isVisibleRightToLeft();
+ Direction const dir = f.isVisibleRightToLeft() ? RtL : LtR;
// dimensions
int const ascent = fm.maxAscent();
int const height = fm.maxAscent() + fm.maxDescent();
- int xmin = fm.pos2x(str, from, rtl, wordspacing);
- int xmax = fm.pos2x(str, to, rtl, wordspacing);
+ int xmin = fm.pos2x(str, from, dir == RtL, wordspacing);
+ int xmax = fm.pos2x(str, to, d
[LyX/master] Update sk.po
commit d88a813701b3b9a4788722d7d71b3a2b82452b84 Author: Kornel Benko Date: Tue May 31 09:18:29 2016 +0200 Update sk.po diff --git a/po/sk.gmo b/po/sk.gmo index c235a3d..4e29772 100644 Binary files a/po/sk.gmo and b/po/sk.gmo differ diff --git a/po/sk.po b/po/sk.po index 6feb92e..2b4e0f2 100644 --- a/po/sk.po +++ b/po/sk.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: LyX-2.2\n" "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n" -"POT-Creation-Date: 2016-04-24 10:40+0200\n" -"PO-Revision-Date: 2016-04-10 10:28+\n" +"POT-Creation-Date: 2016-05-30 19:00+0200\n" +"PO-Revision-Date: 2016-05-30 17:05+\n" "Last-Translator: Kornel Benko \n" "Language-Team: Slovak \n" "Language: sk\n" @@ -23479,6 +23479,11 @@ msgstr "LyX Archív (zip)" msgid "LyX Archive (tar.gz)" msgstr "LyX Archív (tar.gz)" +#: src/Author.cpp:57 +#, c-format +msgid "%1$s[[name]] (%2$s[[email]])" +msgstr "%1$s (%2$s)" + #: src/BiblioInfo.cpp:318 src/frontends/qt4/GuiDocument.cpp:2339 #, c-format msgid "%1$s and %2$s" @@ -24452,14 +24457,10 @@ msgstr "" "Vyberte vhodné kódovanie dokumentu (napr. utf8)\n" "alebo zmeňte písanie mena autora." -#: src/Chktex.cpp:62 +#: src/Chktex.cpp:59 #, c-format -msgid "ChkTeX warning id # %1$d" -msgstr "Varovanie ChkTeXu id # %1$d" - -#: src/Chktex.cpp:64 -msgid "ChkTeX warning id # " -msgstr "Varovanie ChkTeXu id # " +msgid "ChkTeX warning id # %1$s" +msgstr "Varovanie ChkTeXu id # %1$s" #: src/Color.cpp:203 src/insets/InsetBibtex.cpp:182 #: src/insets/InsetBibtex.cpp:207 @@ -26141,13 +26142,10 @@ msgstr "Znak je v doslovných(verbatim) odstavcoch nekódovateľný." msgid "[Change Tracking] " msgstr "[Zmeniť Sledovanie] " -#: src/Text.cpp:1894 -msgid "Change: " -msgstr "Zmena: " - -#: src/Text.cpp:1898 -msgid " at " -msgstr " na " +#: src/Text.cpp:1883 +#, c-format +msgid "Changed by %1$s[[author]] on %2$s[[date]]. " +msgstr "Zmenené %2$s od %1$s." #: src/Text.cpp:1908 src/mathed/InsetMathFont.cpp:207 #: src/mathed/InsetMathFontOld.cpp:103 @@ -27167,19 +27165,16 @@ msgstr "Vetvu nebolo možné premenovať." msgid "Merge Changes" msgstr "Zlúčiť Zmeny" -#: src/frontends/qt4/GuiChanges.cpp:64 -#, c-format +#: src/frontends/qt4/GuiChanges.cpp:73 msgid "" -"Change by %1$s\n" +"Changed by %1\n" "\n" -msgstr "" -"Zmenil %1$s\n" +msgstr "Zmenené od %1\n" "\n" -#: src/frontends/qt4/GuiChanges.cpp:66 -#, c-format -msgid "Change made at %1$s\n" -msgstr "Zmena zrobená %1$s\n" +#: src/frontends/qt4/GuiChanges.cpp:78 +msgid "Change made on %1\n" +msgstr "Zmeny zrobené %1\n" #: src/frontends/qt4/GuiCharacter.cpp:49 src/frontends/qt4/GuiCharacter.cpp:62 #: src/frontends/qt4/GuiCharacter.cpp:83 @@ -31439,6 +31434,12 @@ msgstr "" msgid "Unknown user" msgstr "Neznámy používateľ" +#~ msgid "Change: " +#~ msgstr "Zmena: " + +#~ msgid " at " +#~ msgstr " na " + #~ msgid "American Geophysical Union (AGUTeX) (version 2015)" #~ msgstr "American Geophysical Union (AGUTeX) (verzia 2015)" @@ -34762,5 +34763,12 @@ msgstr "Neznámy používateľ" #~ msgid "Change tracking error" #~ msgstr "Chyba pri zmene sledovania" -#~ msgid "ACM SIGGRAPH" -#~ msgstr "ACM SIGGRAPH" +#~ msgid "" +#~ "Change by %1\n" +#~ "\n" +#~ msgstr "" +#~ "Zmenil %1\n" +#~ "\n" + +#~ msgid "Change made at %1\n" +#~ msgstr "Zmena zrobená %1\n"
[LyX/master] Cmake export tests: Added testcases for erroneous xhtml exports
commit 246d4bdf66271cd72a7dbf5871b91a082a9b01f4
Author: Kornel Benko
Date: Tue May 31 09:13:35 2016 +0200
Cmake export tests: Added testcases for erroneous xhtml exports
diff --git a/autotests/export/IncludeMissingEndTagDiv.lyx
b/autotests/export/IncludeMissingEndTagDiv.lyx
new file mode 100644
index 000..3e56e2b
--- /dev/null
+++ b/autotests/export/IncludeMissingEndTagDiv.lyx
@@ -0,0 +1,102 @@
+#LyX 2.3 created this file. For more info see http://www.lyx.org/
+\lyxformat 508
+\begin_document
+\begin_header
+\save_transient_properties true
+\origin unavailable
+\textclass article
+\use_default_options false
+\maintain_unincluded_children false
+\language english
+\language_package default
+\inputencoding auto
+\fontencoding global
+\font_roman "default" "TeX Gyre Termes"
+\font_sans "default" "TeX Gyre Pagella"
+\font_typewriter "default" "TeX Gyre Cursor"
+\font_math "auto" "auto"
+\font_default_family default
+\use_non_tex_fonts true
+\font_sc false
+\font_osf false
+\font_sf_scale 100 100
+\font_tt_scale 100 100
+\graphics default
+\default_output_format pdf5
+\output_sync 0
+\bibtex_command default
+\index_command default
+\paperfontsize default
+\spacing single
+\use_hyperref false
+\papersize a4paper
+\use_geometry false
+\use_package amsmath 0
+\use_package amssymb 0
+\use_package cancel 0
+\use_package esint 0
+\use_package mathdots 0
+\use_package mathtools 0
+\use_package mhchem 0
+\use_package stackrel 0
+\use_package stmaryrd 0
+\use_package undertilde 0
+\cite_engine basic
+\cite_engine_type default
+\biblio_style plain
+\use_bibtopic false
+\use_indices false
+\paperorientation portrait
+\suppress_date false
+\justification true
+\use_refstyle 0
+\index Register
+\shortcut idx
+\color #008000
+\end_index
+\paperwidth 22cm
+\paperheight 11cm
+\leftmargin 1cm
+\topmargin 0cm
+\rightmargin 1cm
+\bottommargin 0cm
+\secnumdepth 3
+\tocdepth 3
+\paragraph_separation skip
+\defskip medskip
+\quotes_language english
+\papercolumns 1
+\papersides 1
+\paperpagestyle empty
+\tracking_changes false
+\output_changes false
+\html_math_output 0
+\html_css_as_file 0
+\html_be_strict false
+\end_header
+
+\begin_body
+
+\begin_layout Standard
+\begin_inset ERT
+status open
+
+\begin_layout Plain Layout
+
+
+\backslash
+addcontentsline{toc}{chapter}{Abstract}
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+Remove this text or the ERT to make the xhtml export of the main document
+ work
+\end_layout
+
+\end_body
+\end_document
diff --git a/autotests/export/MissingEndTagDiv.lyx
b/autotests/export/MissingEndTagDiv.lyx
new file mode 100644
index 000..4a292a6
--- /dev/null
+++ b/autotests/export/MissingEndTagDiv.lyx
@@ -0,0 +1,146 @@
+#LyX 2.3 created this file. For more info see http://www.lyx.org/
+\lyxformat 508
+\begin_document
+\begin_header
+\save_transient_properties true
+\origin unavailable
+\textclass scrbook
+\options
intoc,bibliography=totoc,index=totoc,BCOR10mm,captions=tableheading,titlepage,fleqn
+\use_default_options true
+\begin_modules
+customHeadersFooters
+\end_modules
+\maintain_unincluded_children false
+\language english
+\language_package default
+\inputencoding auto
+\fontencoding global
+\font_roman "lmodern" "default"
+\font_sans "lmss" "default"
+\font_typewriter "lmtt" "default"
+\font_math "auto" "auto"
+\font_default_family default
+\use_non_tex_fonts false
+\font_sc false
+\font_osf false
+\font_sf_scale 100 100
+\font_tt_scale 100 100
+\graphics default
+\default_output_format default
+\output_sync 0
+\bibtex_command bibtex
+\index_command default
+\float_placement h
+\paperfontsize 12
+\spacing single
+\use_hyperref true
+\pdf_bookmarks true
+\pdf_bookmarksnumbered true
+\pdf_bookmarksopen true
+\pdf_bookmarksopenlevel 1
+\pdf_breaklinks false
+\pdf_pdfborder true
+\pdf_colorlinks false
+\pdf_backref false
+\pdf_pdfusetitle true
+\pdf_quoted_options "pdfpagelayout=OneColumn, pdfnewwindow=true,
pdfstartview=XYZ, plainpages=false"
+\papersize a4paper
+\use_geometry false
+\use_package amsmath 2
+\use_package amssymb 2
+\use_package cancel 0
+\use_package esint 1
+\use_package mathdots 1
+\use_package mathtools 0
+\use_package mhchem 1
+\use_package stackrel 0
+\use_package stmaryrd 0
+\use_package undertilde 0
+\cite_engine basic
+\cite_engine_type default
+\biblio_style plain
+\use_bibtopic false
+\use_indices false
+\paperorientation portrait
+\suppress_date true
+\justification true
+\use_refstyle 0
+\branch chapter-1
+\selected 1
+\filename_suffix 0
+\color #ffaa00
+\end_branch
+\branch chapter-2
+\selected 1
+\filename_suffix 0
+\color #55aaff
+\end_branch
+\branch Summary
+\selected 1
+\filename_suffix 0
+\color #7f7f7f
+\end_branch
+\branch Acknowledgments
+\selected 1
+\filename_suffix 0
+\color #00
+\end_branch
+\branch Appendix
+\selected 1
+\filename_suffix 0
+\color #faf0e6
+\end_branch
+\index Index
+\shortcut idx
+\color #008000
+\end_index
+\secnumdepth 3
+\tocdepth 2
+\paragraph_separation skip
+\defskip medskip
+\quote
