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

This commit is contained in:
Juergen Spitzmueller 2023-07-21 09:09:30 +02:00
commit c3e0ae4bfd
3 changed files with 104 additions and 11 deletions

View File

@ -20,6 +20,9 @@ changes happened in particular if possible. A good example would be
* Format incremented to 616: Do not output LaTeX for a macro if the LaTeX part is empty
- This allows the user to define the LyX display for LaTeX commands
that are already defined (e.g., in user preamble or a package).
- No substantive change to file format. Format change just in case someone defined a
math macro with an empty LaTeX field. In that case, lyx2lyx adds {} to the LaTeX
part on conversion and removes the macro altogether on reversion.
2023-04-02 Jürgen Spitzmüller <spitz@lyx.org>
* Format incremented to 615: Unifiy spelling of "acknowledgment" styles

106
po/sk.po
View File

@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: LyX-2.4\n"
"Report-Msgid-Bugs-To: lyx-devel@lists.lyx.org\n"
"POT-Creation-Date: 2023-06-17 10:35+0200\n"
"PO-Revision-Date: 2023-06-17 08:39+0000\n"
"POT-Creation-Date: 2023-07-20 17:30+0200\n"
"PO-Revision-Date: 2023-07-20 16:33+0000\n"
"Last-Translator: Kornel Benko <kornel@lyx.org>\n"
"Language-Team: Slovak <kornel@lyx.org>\n"
"Language: sk\n"
@ -14351,10 +14351,30 @@ msgstr "\\theexamplei (\\alph{subexampleiv})"
msgid "Numbered Example (multiline)"
msgstr "Číslovaný príklad (viac-riadkový)"
#: lib/layouts/linguistics.module:85
msgid "Example options"
msgstr "Príkladné voľby"
#: lib/layouts/linguistics.module:86
msgid "Examples options|s"
msgstr "Voľby pre príklady|y"
#: lib/layouts/linguistics.module:87
msgid "Add examples options here"
msgstr "Pridajte sem voľby pre príklady"
#: lib/layouts/linguistics.module:93
msgid "Numbered Examples (consecutive)"
msgstr "Číslované príklady (postupne)"
#: lib/layouts/linguistics.module:117
msgid "Judgment|J"
msgstr "Úsudok|D"
#: lib/layouts/linguistics.module:118
msgid "Grammaticality judgment marker"
msgstr "Marker pre gramatikalizujúcy úsudok"
#: lib/layouts/linguistics.module:111
msgid "Custom Numbering|s"
msgstr "Vlastné číslovanie|é"
@ -14363,17 +14383,49 @@ msgstr "Vlastné číslovanie|é"
msgid "Customize the numeration"
msgstr "Prispôsobiť číslovanie"
#: lib/layouts/linguistics.module:130
#: lib/layouts/linguistics.module:142
msgid "Subexamples options"
msgstr "Podpríkladné voľby"
msgstr "Pod-príkladné voľby"
#: lib/layouts/linguistics.module:131
#: lib/layouts/linguistics.module:143
msgid "Subexamples options|s"
msgstr "Podpríkladné voľby|n"
msgstr "Pod-príkladné voľby|n"
#: lib/layouts/linguistics.module:132
#: lib/layouts/linguistics.module:144
msgid "Add subexamples options here"
msgstr "Pridajte sem voľby pre podpríklad"
msgstr "Pridajte sem voľby pre pod-príklad"
#: lib/layouts/linguistics.module:150
msgid "Example Preamble"
msgstr "Príkladná preambula"
#: lib/layouts/linguistics.module:155
msgid "Ex. Preamble"
msgstr "Pr. preambula"
#: lib/layouts/linguistics.module:159
msgid "Subexample Preamble"
msgstr "Pod-príkladná preambula"
#: lib/layouts/linguistics.module:162
msgid "Subex. Preamble"
msgstr "Podpr. preambula"
#: lib/layouts/linguistics.module:166
msgid "Example Postamble"
msgstr "Príkladný záver"
#: lib/layouts/linguistics.module:169
msgid "Ex. Postamble"
msgstr "Pr. záver"
#: lib/layouts/linguistics.module:172
msgid "Subexample Postamble"
msgstr "Pod-príkladný záver"
#: lib/layouts/linguistics.module:175
msgid "Subex. Postamble"
msgstr "Podpr. záver"
#: lib/layouts/linguistics.module:144
msgid "Interlinear Gloss (2 Lines)"
@ -14396,6 +14448,15 @@ msgstr "Voľby glosy|s"
msgid "Add digloss options here"
msgstr "Pridajte sem voľby pre digloss"
#: lib/layouts/linguistics.module:207 lib/layouts/linguistics.module:208
#: lib/layouts/linguistics.module:263 lib/layouts/linguistics.module:264
msgid "Sentence Comment"
msgstr "Komentár na vetu"
#: lib/layouts/linguistics.module:209 lib/layouts/linguistics.module:265
msgid "Add an optional sentence comment here"
msgstr "Pridajte sem nepovinný komentár glosovej vety"
# Med
#: lib/layouts/linguistics.module:168 lib/layouts/linguistics.module:169
msgid "Interlinear Gloss"
@ -14405,6 +14466,15 @@ msgstr "Medziriadková glosa"
msgid "Add the inter-linear gloss here"
msgstr "Vložte sem medzi-riadkovú glosu"
#: lib/layouts/linguistics.module:222 lib/layouts/linguistics.module:223
msgid "Gloss Comment"
msgstr "Komentár na glosu"
#: lib/layouts/linguistics.module:224 lib/layouts/linguistics.module:280
#: lib/layouts/linguistics.module:295
msgid "Add an optional gloss comment here"
msgstr "Pridajte sem nepovinný komentár glosy"
#: lib/layouts/linguistics.module:178 lib/layouts/linguistics.module:234
msgid "Translation"
msgstr "Preklad"
@ -14441,6 +14511,14 @@ msgstr "Medziriadková glosa (riadok 1)|1"
msgid "Add the first inter-linear gloss line here"
msgstr "Vložte sem prvý riadok medzi-riadkovej glosy"
#: lib/layouts/linguistics.module:278
msgid "Gloss Comment (1)"
msgstr "Komentár na glosu (1)"
#: lib/layouts/linguistics.module:279
msgid "Gloss Comment (Line 1)"
msgstr "Komentár na glosu (riadok 1)"
#: lib/layouts/linguistics.module:224
msgid "Interlinear Gloss (2)"
msgstr "Medziriadková glosa (2)"
@ -14449,6 +14527,18 @@ msgstr "Medziriadková glosa (2)"
msgid "Interlinear Gloss (Line 2)|2"
msgstr "Medziriadková glosa (riadok 2)|2"
#: lib/layouts/linguistics.module:286
msgid "Add the second inter-linear gloss line here"
msgstr "Pridajte sem druhú medzi-riadkovú glosu"
#: lib/layouts/linguistics.module:293
msgid "Gloss Comment (2)"
msgstr "Komentár na glosu (2)"
#: lib/layouts/linguistics.module:294
msgid "Gloss Comment (Line 2)"
msgstr "Komentár na glosu (riadok 2)"
#: lib/layouts/linguistics.module:236
msgid "Add a translation for the glosse"
msgstr "Pridajte preklad pre túto glosu"

View File

@ -795,7 +795,7 @@ void Cursor::dispatch(FuncRequest const & cmd0)
disp_.dispatched(true);
disp_.screenUpdate(Update::FitCursor | Update::Force);
FuncRequest tmpcmd = cmd;
LYXERR(Debug::DEBUG, "Cursor::dispatch: (AtPoint) cmd: "
LYXERR(Debug::ACTION, "Cursor::dispatch: (AtPoint) cmd: "
<< cmd0 << endl << *this);
nextInset()->dispatch(*this, tmpcmd);
if (disp_.dispatched()) {
@ -807,7 +807,7 @@ void Cursor::dispatch(FuncRequest const & cmd0)
// store some values to be used inside of the handlers
beforeDispatchCursor_ = *this;
for (; depth(); pop(), boundary(false)) {
LYXERR(Debug::DEBUG, "Cursor::dispatch: cmd: "
LYXERR(Debug::ACTION, "Cursor::dispatch: cmd: "
<< cmd0 << endl << *this);
// In any of these cases, the cursor is invalid, and we should
@ -829,7 +829,7 @@ void Cursor::dispatch(FuncRequest const & cmd0)
// it completely to get a 'bomb early' behaviour in case this
// object will be used again.
if (!disp_.dispatched()) {
LYXERR(Debug::DEBUG, "RESTORING OLD CURSOR!");
LYXERR(Debug::ACTION, "RESTORING OLD CURSOR!");
// We might have invalidated the cursor when removing an empty
// paragraph while the cursor could not be moved out the inset
// while we initially thought we could. This might happen when