[LyX/master] typo
commit 7f614397ed9e67e4eb71b9e2c9b8203312d19bbf
Author: Pavel Sanda
Date: Fri Apr 14 10:53:37 2023 +0200
typo
---
src/frontends/qt/GuiPrefs.cpp |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/frontends/qt/GuiPrefs.cpp b/src/frontends/qt/GuiPrefs.cpp
index 4368b68..4fb3452 100644
--- a/src/frontends/qt/GuiPrefs.cpp
+++ b/src/frontends/qt/GuiPrefs.cpp
@@ -1886,7 +1886,7 @@ void PrefConverters::on_needauthCB_toggled(bool checked)
}
int ret = frontend::Alert::prompt(
- _("SECURITY WARNING!"), _("Unchecking this option has the
effect that potentially harmful converters would be run without asking your
permission first. This is UNSAFE and NOT recommended, unless you know what you
are doing. Are you sure you would like to proceed ? The recommended and safe
answer is NO!"),
+ _("SECURITY WARNING!"), _("Unchecking this option has the
effect that potentially harmful converters would be run without asking your
permission first. This is UNSAFE and NOT recommended, unless you know what you
are doing. Are you sure you would like to proceed? The recommended and safe
answer is NO!"),
0, 0, _("&No"), _("&Yes"));
if (ret == 1)
changed();
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] tex2lyx: fix import of umlauts and ß in math (#12739)
commit 9ec80456feed688440360e0a493cbf537c4fe5f9
Author: Juergen Spitzmueller
Date: Fri Apr 14 19:13:23 2023 +0200
tex2lyx: fix import of umlauts and ß in math (#12739)
---
src/tex2lyx/math.cpp | 24
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/src/tex2lyx/math.cpp b/src/tex2lyx/math.cpp
index 616b616..adda26d 100644
--- a/src/tex2lyx/math.cpp
+++ b/src/tex2lyx/math.cpp
@@ -213,17 +213,25 @@ void parse_math(Parser & p, ostream & os, unsigned flags,
const mode_type mode)
else if (t.cs() == "\"") {
string const name = p.verbatim_item();
-if (name == "a") os << '\xe4';
- else if (name == "o") os << '\xf6';
- else if (name == "u") os << '\xfc';
- else if (name == "A") os << '\xc4';
- else if (name == "O") os << '\xd6';
- else if (name == "U") os << '\xdc';
- else os << "\"{" << name << "}";
+ LYXERR0("name: " << name);
+ if (name == "a")
+ os << "ä";
+ else if (name == "o")
+ os << "ö";
+ else if (name == "u")
+ os << "ü";
+ else if (name == "A")
+ os << "Ä";
+ else if (name == "O")
+ os << "Ö";
+ else if (name == "U")
+ os << "Ü";
+ else
+ os << "\"{" << name << "}";
}
else if (t.cs() == "ss")
- os << "\xdf";
+ os << "ß";
else if (t.cs() == "cr") {
// lyx can't handle \\cr
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] de.po
commit d4afa56f1cad9ef44462b3a6ca9ef2d4c629f375 Author: Juergen Spitzmueller Date: Fri Apr 14 19:33:48 2023 +0200 de.po --- po/de.po | 61 + 1 files changed, 33 insertions(+), 28 deletions(-) diff --git a/po/de.po b/po/de.po index d0d12f5..052bff2 100644 --- a/po/de.po +++ b/po/de.po @@ -94,8 +94,8 @@ msgid "" msgstr "" "Project-Id-Version: LyX 2.4git\n" "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n" -"POT-Creation-Date: 2023-04-11 07:04+0200\n" -"PO-Revision-Date: 2023-04-11 07:07+0200\n" +"POT-Creation-Date: 2023-04-14 19:28+0200\n" +"PO-Revision-Date: 2023-04-14 19:33+0200\n" "Last-Translator: Juergen Spitzmueller \n" "Language-Team: German \n" "Language: de\n" @@ -9506,22 +9506,22 @@ msgstr "Paragraph" msgid "Paragraph*" msgstr "Paragraph*" -#: lib/layouts/aguplus.inc:80 lib/layouts/customHeadersFooters.module:12 +#: lib/layouts/aguplus.inc:80 lib/layouts/customHeadersFooters.module:14 #: lib/layouts/foils.layout:216 lib/layouts/simplecv.layout:144 msgid "Left Header" msgstr "Kopfzeile links" -#: lib/layouts/aguplus.inc:93 lib/layouts/customHeadersFooters.module:19 +#: lib/layouts/aguplus.inc:93 lib/layouts/customHeadersFooters.module:21 #: lib/layouts/foils.layout:220 msgid "Left Header:" msgstr "Kopfzeile links:" -#: lib/layouts/aguplus.inc:103 lib/layouts/customHeadersFooters.module:40 +#: lib/layouts/aguplus.inc:103 lib/layouts/customHeadersFooters.module:42 #: lib/layouts/foils.layout:224 lib/layouts/simplecv.layout:163 msgid "Right Header" msgstr "Kopfzeile rechts" -#: lib/layouts/aguplus.inc:107 lib/layouts/customHeadersFooters.module:43 +#: lib/layouts/aguplus.inc:107 lib/layouts/customHeadersFooters.module:45 #: lib/layouts/foils.layout:228 msgid "Right Header:" msgstr "Kopfzeile rechts:" @@ -11396,57 +11396,62 @@ msgstr "Chinesischer Bericht (CTeX)" msgid "Custom Header/Footer Text" msgstr "Benutzerdefinierter Kopf-/Fußzeilentext" -#: lib/layouts/customHeadersFooters.module:8 +#: lib/layouts/customHeadersFooters.module:10 msgid "" -"Adds environments to define header and footer lines. NOTE: To use this " -"module you must set the 'Page style' in the menu Document Settings -> Page " -"Layout to 'fancy'!" +"Adds environments to define header and footer lines. See the Additional " +"manual, section Modules > Page Layout > Custom Header/Footer Text, for a " +"detailed description. NOTE: To use this module you must set the 'Page style' " +"in the menu Document Settings -> Page Layout to 'fancy'!" msgstr "" -"Fügt Umgebungen zur Definition von Kopf- und Fußzeilen hinzu. WICHTIG: Um " -"dieses Modul verwenden zu können, müssen Sie in Dokument > Einstellungen > " +"Fügt Umgebungen zur Definition von Kopf- und Fußzeilen hinzu. Für weitere" +" Infrmationen " +"siehe Handbuchergänzungen, Abschnitt Module > Seitenlayout >" +" Benutzerdefinierter Kopf-/Fußzeilentext. " +"WICHTIG: Um dieses Modul verwenden zu können, müssen Sie in Dokument >" +" Einstellungen > " "Seitenlayout den Seiten-Stil \"ausgefallen\" wählen!" -#: lib/layouts/customHeadersFooters.module:13 +#: lib/layouts/customHeadersFooters.module:15 msgid "Header/Footer" msgstr "Kopf-/Fußzeile" -#: lib/layouts/customHeadersFooters.module:21 +#: lib/layouts/customHeadersFooters.module:23 msgid "Even Header" msgstr "Kopfzeile (gerade)" -#: lib/layouts/customHeadersFooters.module:22 +#: lib/layouts/customHeadersFooters.module:24 msgid "Alternative text for the even header" msgstr "Alternativer Text für die gerade Kopfzeile" -#: lib/layouts/customHeadersFooters.module:34 +#: lib/layouts/customHeadersFooters.module:36 msgid "Center Header" msgstr "Kopfzeile mitte" -#: lib/layouts/customHeadersFooters.module:37 +#: lib/layouts/customHeadersFooters.module:39 msgid "Center Header:" msgstr "Kopfzeile mitte:" -#: lib/layouts/customHeadersFooters.module:46 +#: lib/layouts/customHeadersFooters.module:48 msgid "Left Footer" msgstr "Fußzeile links" -#: lib/layouts/customHeadersFooters.module:49 +#: lib/layouts/customHeadersFooters.module:51 msgid "Left Footer:" msgstr "Fußzeile links:" -#: lib/layouts/customHeadersFooters.module:52 +#: lib/layouts/customHeadersFooters.module:54 msgid "Center Footer" msgstr "Fußzeile mitte" -#: lib/layouts/customHeadersFooters.module:55 +#: lib/layouts/customHeadersFooters.module:57 msgid "Center Footer:" msgstr "Fußzeile mitte:" -#: lib/layouts/customHeadersFooters.module:58 lib/layouts/foils.layout:232 +#: lib/layouts/customHeadersFooters.module:60 lib/layouts/foils.layout:232 msgid "Right Footer" msgstr "Fußzeile rechts" -#: lib/layouts/customHeadersFooters.module:61 lib/layouts/foils.layout:236 +#: lib/layouts/customHeadersFooters.module:63 lib/layouts/foils.layout:236 msgid "Right Footer:" msgstr "Fußzeile rechts:" @@ -28277,7 +28282,7 @@ msgstr "Keine Informationen vorhanden, um das Format %1$s zu exportieren." #: src/Buffer.cpp:4469 #, c-format -msgid "Hint: use
[LyX/master] * cs.po
commit 0752822f92507b887525146e82a1f3970a4732e8 Author: Pavel Sanda Date: Fri Apr 14 22:56:03 2023 +0200 * cs.po --- po/cs.po | 181 - 1 files changed, 83 insertions(+), 98 deletions(-) diff --git a/po/cs.po b/po/cs.po index 0200a23..9aa2714 100644 --- a/po/cs.po +++ b/po/cs.po @@ -2767,7 +2767,7 @@ msgstr "Str&ana:" #: src/frontends/qt/ui/ListingsUi.ui:101 msgid "On which side should line numbers be printed?" -msgstr "Na jaké straně by měla být vysázena čísla řádků ?" +msgstr "Na jaké straně by měla být vysázena čísla řádků?" #: src/frontends/qt/ui/ListingsUi.ui:126 msgid "S&tep:" @@ -27915,11 +27915,11 @@ msgid "" msgstr "" "Existuje nouzové uložení dokumentu %1$s .\n" "\n" -"Obnovit z nouzového uložení ?" +"Obnovit z nouzového uložení?" #: src/Buffer.cpp:4739 msgid "Load emergency save?" -msgstr "Načíst nouzové uložení ?" +msgstr "Načíst nouzové uložení?" #: src/Buffer.cpp:4740 msgid "&Recover" @@ -27957,12 +27957,12 @@ msgid "" "Remove emergency file now?\n" "(%1$s)" msgstr "" -"Smazat nyní soubor s nouzovým uložením ?\n" +"Smazat nyní soubor s nouzovým uložením?\n" "(%1$s)" #: src/Buffer.cpp:4765 src/Buffer.cpp:4777 msgid "Delete emergency file?" -msgstr "Smazat nouzové uložení ?" +msgstr "Smazat nouzové uložení?" #: src/Buffer.cpp:4766 src/Buffer.cpp:4779 msgid "&Keep" @@ -27978,7 +27978,7 @@ msgstr "Nezapomeňte uložit nyní váš soubor!" #: src/Buffer.cpp:4778 msgid "Remove emergency file now?" -msgstr "Smazat nyní soubor s nouzovým uložením ?" +msgstr "Smazat nyní soubor s nouzovým uložením?" #: src/Buffer.cpp:4801 msgid "Can't rename emergency file!" @@ -28013,11 +28013,11 @@ msgid "" msgstr "" "Záloha dokumentu %1$s je novější.\n" "\n" -"Načíst místo toho zálohu ?" +"Načíst místo toho zálohu?" #: src/Buffer.cpp:4849 msgid "Load backup?" -msgstr "Načíst zálohu ?" +msgstr "Načíst zálohu?" #: src/Buffer.cpp:4850 msgid "&Load backup" @@ -28159,7 +28159,7 @@ msgstr "Třída dokumentu není dostupná" #: src/BufferParams.cpp:1103 src/Color.cpp:281 #: src/frontends/qt/GuiDocument.cpp:3632 msgid "greyedout inset text" -msgstr "zašedlá vložka textu" +msgstr "poznámka - zašedlá - text" #: src/BufferParams.cpp:1721 src/BufferParams.cpp:1875 #: src/BufferParams.cpp:2330 src/Encoding.cpp:264 src/Paragraph.cpp:3060 @@ -28646,7 +28646,7 @@ msgstr "kurzor" #: src/Color.cpp:263 msgid "background" -msgstr "pozadí" +msgstr "text - pozadí" #: src/Color.cpp:264 msgid "text" @@ -28658,26 +28658,23 @@ msgstr "výběr" #: src/Color.cpp:266 msgid "selected text" -msgstr "označený text" +msgstr "výběr - text" #: src/Color.cpp:267 msgid "LaTeX text" msgstr "text LaTeX-u" #: src/Color.cpp:268 -#, fuzzy msgid "Text label 1" -msgstr "značka hesla rejstříku" +msgstr "Text vlastní vložky 1" #: src/Color.cpp:269 -#, fuzzy msgid "Text label 2" -msgstr "značka hesla rejstříku" +msgstr "Text vlastní vložky 2" #: src/Color.cpp:270 -#, fuzzy msgid "Text label 3" -msgstr "značka hesla rejstříku" +msgstr "Text vlastní vložky 3" #: src/Color.cpp:271 msgid "inline completion" @@ -28685,7 +28682,7 @@ msgstr "doplnění v řádku" #: src/Color.cpp:273 msgid "non-unique inline completion" -msgstr "nejednoznačné doplnění v řádku" +msgstr "doplnění v řádku - nejednoznačné" #: src/Color.cpp:275 msgid "previewed snippet" @@ -28693,35 +28690,35 @@ msgstr "výstřižek (okamžitý náhled)" #: src/Color.cpp:276 msgid "note label" -msgstr "značka poznámky" +msgstr "poznámka LyX-u - popisek" #: src/Color.cpp:277 msgid "note background" -msgstr "pozadí poznámky" +msgstr "poznámka LyX-u - pozadí" #: src/Color.cpp:278 msgid "comment label" -msgstr "značka komentáře" +msgstr "poznámka - komentář - popisek" #: src/Color.cpp:279 msgid "comment background" -msgstr "pozadí komentáře" +msgstr "poznámka - komentář - pozadí" #: src/Color.cpp:280 msgid "greyedout inset label" -msgstr "značka vložky zašednutí" +msgstr "poznámka - zašedlá - popisek" #: src/Color.cpp:282 msgid "greyedout inset background" -msgstr "pozadí vložky zašednutí" +msgstr "poznámka - zašedlá - pozadí" #: src/Color.cpp:283 msgid "phantom inset text" -msgstr "text fantómu" +msgstr "text - fantóm" #: src/Color.cpp:284 msgid "shaded box" -msgstr "stínovaný rámeček" +msgstr "rámeček - stínovaný" #: src/Color.cpp:285 msgid "listings background" @@ -28729,23 +28726,23 @@ msgstr "výpis kódu - pozadí" #: src/Color.cpp:286 msgid "branch label" -msgstr "značka větve" +msgstr "větev - popisek" #: src/Color.cpp:287 msgid "footnote label" -msgstr "značka poznámky pod čarou" +msgstr "poznámka pod čarou - popisek" #: src/Color.cpp:288 msgid "index label" -msgstr "značka hesla rejstříku" +msgstr "heslo rejstříku - popisek" #: src/Color.cpp:289 msgid "margin note label" -msgstr "značka poznámky na okraj" +msgstr "poznámka na okraj - popisek" #: src/Color.cpp:290 msgid "URL label" -msgstr "značka URL" +m
[LyX/master] Add few color comments
commit 4b736a19f2e11b41412e281dbc1840f7fed1d758
Author: Pavel Sanda
Date: Fri Apr 14 23:16:54 2023 +0200
Add few color comments
---
src/ColorCode.h |8
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/ColorCode.h b/src/ColorCode.h
index f2d0f68..17f7597 100644
--- a/src/ColorCode.h
+++ b/src/ColorCode.h
@@ -159,7 +159,7 @@ enum ColorCode {
Color_mathframe,
/// Math inset frame color not under focus
Color_mathcorners,
- /// Math line color
+ /// Math empty box line color
Color_mathline,
/// Collapsible insets text
@@ -182,9 +182,9 @@ enum ColorCode {
Color_appendix,
/// Changebar color
Color_changebar,
- /// Deleted text color (output)
+ /// Deleted text color (exported output) in CT
Color_deletedtext_output,
- /// Added text color (output)
+ /// Added text color (exported output) in CT
Color_addedtext_output,
/// Changed text color author 1 (workarea)
Color_changedtext_workarea_author1,
@@ -198,7 +198,7 @@ enum ColorCode {
Color_changedtext_workarea_author5,
/// Changed text color document comparison (workarea)
Color_changedtext_workarea_comparison,
- /// Deleted text modifying color (workarea)
+ /// Deleted text modifying color (for brightness modulation) (workarea)
Color_deletedtext_workarea_modifier,
/// Table line color
Color_tabularline,
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] * Customization.lyx - some forgotten colors
commit 442d463288c1a24a437ad2a2d552b35e51e68227 Author: Pavel Sanda Date: Fri Apr 14 23:33:11 2023 +0200 * Customization.lyx - some forgotten colors --- lib/doc/Customization.lyx | 52 + 1 files changed, 52 insertions(+), 0 deletions(-) diff --git a/lib/doc/Customization.lyx b/lib/doc/Customization.lyx index 92de9c8..22f2c0c 100644 --- a/lib/doc/Customization.lyx +++ b/lib/doc/Customization.lyx @@ -36296,6 +36296,16 @@ appendix Appendix marker color \begin_layout Description background Background color +\change_inserted 5863208 1681507589 + +\end_layout + +\begin_layout Description + +\change_inserted 5863208 1681507597 +bookmark Bookmark indicator color +\change_unchanged + \end_layout \begin_layout Description @@ -36340,6 +36350,16 @@ changedtextauthor4 Changed text color author 4 \begin_layout Description changedtextauthor5 Changed text color author 5 +\change_inserted 5863208 1681507402 + +\end_layout + +\begin_layout Description + +\change_inserted 5863208 1681507414 +changedtextcomparison Changed text color document comparison (workarea) +\change_unchanged + \end_layout \begin_layout Description @@ -36360,6 +36380,34 @@ commandbg Background color for command insets \begin_layout Description commandframe Frame color for command insets +\change_inserted 5863208 1681507735 + +\end_layout + +\begin_layout Description + +\change_inserted 5863208 1681507880 +command_broken Text color for broken(-reference) insets +\end_layout + +\begin_layout Description + +\change_inserted 5863208 1681507827 +commandbg_broken Background color for broken insets +\end_layout + +\begin_layout Description + +\change_inserted 5863208 1681507835 +commandframe_broken Frame color for broken insets +\end_layout + +\begin_layout Description + +\change_inserted 5863208 1681507842 +buttonhoverbg_broken Color used for broken inset button under focus +\change_unchanged + \end_layout \begin_layout Description @@ -36380,6 +36428,10 @@ deletedtext Deleted text color \begin_layout Description deletedtextmodifier Deleted text modifying color +\change_inserted 5863208 1681507525 + (for adjusting the brightnes) +\change_unchanged + \end_layout \begin_layout Description -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] comment only
commit 3dd79b1c4e52aedf546ea76fa60f47435710dbbf
Author: Pavel Sanda
Date: Fri Apr 14 23:58:59 2023 +0200
comment only
---
src/Color.cpp |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/src/Color.cpp b/src/Color.cpp
index aaa7d02..effdc83 100644
--- a/src/Color.cpp
+++ b/src/Color.cpp
@@ -238,6 +238,7 @@ ColorSet::ColorSet()
//char const * grey90 = "#e5e5e5";
// ColorCode, gui, latex, x11hexname, x11darkhexname, lyx
// Warning: several of these entries are overridden in GuiApplication
constructor
+ // lyx color names are collected for users in Customization manual (B.#
Dynamic colors)
static ColorEntry const items[] = {
{ Color_none, N_("none"), "none", black, black, "none" },
{ Color_black, N_("black"), "black", black, black, "black" },
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
