[LyX/2.3.x] Update sk.po

2017-12-20 Thread Kornel Benko 
commit 9e1e13570476b6e54cc12d9a9ea2a079b9cf8c0f
Author: Kornel Benko 
Date:   Thu Dec 21 06:12:44 2017 +0100

Update sk.po
---
 po/sk.gmo |  Bin 526800 -> 526825 bytes
 po/sk.po  |  111 +
 2 files changed, 60 insertions(+), 51 deletions(-)

diff --git a/po/sk.gmo b/po/sk.gmo
index 5b0044f..c541504 100644
Binary files a/po/sk.gmo and b/po/sk.gmo differ
diff --git a/po/sk.po b/po/sk.po
index d589bdc..995391e 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LyX-2.3\n"
 "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n"
-"POT-Creation-Date: 2017-12-17 06:57+0100\n"
-"PO-Revision-Date: 2017-12-17 05:59+\n"
+"POT-Creation-Date: 2017-12-17 19:29+0100\n"
+"PO-Revision-Date: 2017-12-21 05:06+\n"
 "Last-Translator: Kornel Benko \n"
 "Language-Team: Slovak \n"
 "Language: sk\n"
@@ -1394,11 +1394,11 @@ msgstr "Percento zmeny zobrazenia v LyXe"
 
 #: src/frontends/qt4/ui/ExternalUi.ui:215
 msgid "Sca on Screen (%):"
-msgstr "Mierka na O (%):"
+msgstr " na Obrazovke (%):"
 
 #: src/frontends/qt4/ui/ExternalUi.ui:271
 msgid "Si and Rotation"
-msgstr "ľkosť a rotácia"
+msgstr "Ve&ľkosť a rotácia"
 
 #: src/frontends/qt4/ui/ExternalUi.ui:283 src/frontends/qt4/ui/TabularUi.ui:175
 msgid "Rotate"
@@ -1819,15 +1819,15 @@ msgstr "Povoliť mikré rozšírenia"
 
 #: src/frontends/qt4/ui/FontUi.ui:300
 msgid ""
-"Use font ligatures -- and --- instead of \\textendash and \\textemdash for "
-"en- and em-dashes"
+"By default, a line break can occur after en- and em-dashes. Checking this "
+"box prevents that."
 msgstr ""
-"Použiť zliatky fontu pre '--' a '---' namiesto \\textendash a \\textemdash "
-"pre en a em čiarky"
+"Normálne, zalomenie prichádza za 'en'- a 'em'- pomlčkou. Začiarknutím "
+"políčka sa tomu zabráni."
 
 #: src/frontends/qt4/ui/FontUi.ui:303
-msgid "Output en- and  as ligatures"
-msgstr "Výstup pre en a em čiarky ako zliatky"
+msgid "Disallow l breaks after dashes"
+msgstr "Nepovoliť zalomenie  za pomlčkami"
 
 #: src/frontends/qt4/ui/GraphicsUi.ui:43
 msgid ""
@@ -1915,7 +1915,7 @@ msgstr "Dodatočné LaTeX voľby"
 
 #: src/frontends/qt4/ui/GraphicsUi.ui:491
 msgid "LaTeX :"
-msgstr "LaTe voľby:"
+msgstr "LaTeX voľby:"
 
 #: src/frontends/qt4/ui/GraphicsUi.ui:517
 msgid ""
@@ -2008,7 +2008,7 @@ msgstr ":"
 
 #: src/frontends/qt4/ui/HSpaceUi.ui:100 src/frontends/qt4/ui/VSpaceUi.ui:61
 msgid "Custom value. Needs spacing type \"Custom\"."
-msgstr "Vlastná hodnota. Potrebuje typ rozstupu Vlastný."
+msgstr "Vlastná hodnota. Potrebuje typ rozstupu \"Vlastný\"."
 
 #: src/frontends/qt4/ui/HSpaceUi.ui:110
 msgid " Pattern:"
@@ -2513,7 +2513,7 @@ msgstr "Zalamovať riadky presahujúce štandardnú dĺžku 
riadkov"
 
 #: src/frontends/qt4/ui/ListingsUi.ui:271
 msgid " long lines"
-msgstr "Rozdeliť dlé riadky"
+msgstr "Rozdeliť dlh&é riadky"
 
 #: src/frontends/qt4/ui/ListingsUi.ui:281
 msgid "Make spaces visible by a special symbol"
@@ -4419,8 +4419,7 @@ msgstr "á Šírka:"
 #: src/frontends/qt4/ui/PrintNomenclUi.ui:52
 msgid "Custom value. \"List Indentation\" needs to be set to \"Custom\"."
 msgstr ""
-"Vlastná hodnota. Odsadzovanie Zoznamov je treba nastaviť na "
-"Vlastné."
+"Vlastná hodnota. \"Odsadzovanie Zoznamov\" je treba nastaviť na \"Vlastné\"."
 
 #: src/frontends/qt4/ui/PrintindexUi.ui:40
 msgid "Avai indexes:"
@@ -4465,7 +4464,7 @@ msgstr "Pred pokračovaním kompilácie LaTeX-om okno 
automaticky vyčistiť"
 
 #: src/frontends/qt4/ui/ProgressViewUi.ui:176
 msgid " automatically"
-msgstr "Vyčistiť "
+msgstr "Vyčisť automaticky"
 
 #: src/frontends/qt4/ui/ProgressViewUi.ui:191
 msgid "Debug messages"
@@ -4477,7 +4476,7 @@ msgstr "Neukazovať žiadne ladiace hlásenia"
 
 #: src/frontends/qt4/ui/ProgressViewUi.ui:206
 msgid ""
-msgstr "Žia"
+msgstr "Ž"
 
 #: src/frontends/qt4/ui/ProgressViewUi.ui:213
 msgid "Display the debug messages selected to the right"
@@ -4493,7 +4492,7 @@ msgstr "Ukazovať všetky ladiace hlásenia"
 
 #: src/frontends/qt4/ui/ProgressViewUi.ui:226
 msgid ""
-msgstr "šetko"
+msgstr "Vš"
 
 #: src/frontends/qt4/ui/ProgressViewUi.ui:236
 msgid "Display statusbar messages?"
@@ -4501,7 +4500,7 @@ msgstr "Ukázať správy v stavovom pruhu?"
 
 #: src/frontends/qt4/ui/ProgressViewUi.ui:239
 msgid " messages"
-msgstr "Správy v  pruhu"
+msgstr "Spávy v stavovom pruhu"
 
 #: src/frontends/qt4/ui/RefUi.ui:73
 msgid "[[buffer]]:"
@@ -4674,7 +4673,7 @@ msgstr "Zmazať súčasnú skratku"
 #: src/frontends/qt4/ui/ShortcutUi.ui:100
 #: src/frontends/qt4/ui/TabularUi.ui:1118
 msgid "C"
-msgstr "čistiť"
+msgstr "Včistiť"
 
 #: src/frontends/qt4/ui/ShortcutUi.ui:107
 msgid ":"
@@ -4799,7 +4798,7 @@ msgstr "Zlúčiť bunky rozličných riadkov"
 
 #: src/frontends/qt4/ui/TabularUi.ui:121
 msgid "M"
-msgstr "Viac-ré"
+msgstr "é"
 
 #: src/frontends/qt4/ui/TabularUi.ui:133
 msgid " Offset:"
@@ -4950,7 +4949,7 @@ msgstr "Použiť štandardný štýl okraja (mriežka)"
 
 #:

[LyX/master] Update sk.po

2017-12-20 Thread Kornel Benko 
commit 36581c25ccb6b298248904271f575104e61b6952
Author: Kornel Benko 
Date:   Thu Dec 21 05:57:54 2017 +0100

Update sk.po
---
 po/sk.gmo |  Bin 527415 -> 527386 bytes
 po/sk.po  |  130 ++--
 2 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/po/sk.gmo b/po/sk.gmo
index c976803..a054cba 100644
Binary files a/po/sk.gmo and b/po/sk.gmo differ
diff --git a/po/sk.po b/po/sk.po
index e182119..2bb6656 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LyX-2.4\n"
 "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n"
-"POT-Creation-Date: 2017-12-17 09:29+0100\n"
-"PO-Revision-Date: 2017-12-17 08:45+\n"
+"POT-Creation-Date: 2017-12-20 19:15+0100\n"
+"PO-Revision-Date: 2017-12-21 04:48+\n"
 "Last-Translator: Kornel Benko \n"
 "Language-Team: Slovak \n"
 "Language: sk\n"
@@ -1394,11 +1394,11 @@ msgstr "Percento zmeny zobrazenia v LyXe"
 
 #: src/frontends/qt4/ui/ExternalUi.ui:215
 msgid "Sca on Screen (%):"
-msgstr "Mierka na O (%):"
+msgstr " na Obrazovke (%):"
 
 #: src/frontends/qt4/ui/ExternalUi.ui:271
 msgid "Si and Rotation"
-msgstr "ľkosť a rotácia"
+msgstr "Ve&ľkosť a rotácia"
 
 #: src/frontends/qt4/ui/ExternalUi.ui:283 src/frontends/qt4/ui/TabularUi.ui:175
 msgid "Rotate"
@@ -1893,7 +1893,7 @@ msgstr "Názov súbora s obrázkom"
 
 #: src/frontends/qt4/ui/GraphicsUi.ui:313
 msgid " and Clipping"
-msgstr "áty a Orezanie"
+msgstr "Koordin&áty a Orezanie"
 
 #: src/frontends/qt4/ui/GraphicsUi.ui:347
 msgid ""
@@ -1932,7 +1932,7 @@ msgstr "Dodatočné LaTeX voľby"
 
 #: src/frontends/qt4/ui/GraphicsUi.ui:530
 msgid "LaTeX :"
-msgstr "LaTe voľby:"
+msgstr "LaTeX voľby:"
 
 #: src/frontends/qt4/ui/GraphicsUi.ui:556
 msgid ""
@@ -2025,7 +2025,7 @@ msgstr ":"
 
 #: src/frontends/qt4/ui/HSpaceUi.ui:100 src/frontends/qt4/ui/VSpaceUi.ui:61
 msgid "Custom value. Needs spacing type \"Custom\"."
-msgstr "Vlastná hodnota. Potrebuje typ rozstupu Vlastný."
+msgstr "Vlastná hodnota. Potrebuje typ rozstupu \"Vlastný\"."
 
 #: src/frontends/qt4/ui/HSpaceUi.ui:110
 msgid " Pattern:"
@@ -2530,7 +2530,7 @@ msgstr "Zalamovať riadky presahujúce štandardnú dĺžku 
riadkov"
 
 #: src/frontends/qt4/ui/ListingsUi.ui:271
 msgid " long lines"
-msgstr "Rozdeliť dlé riadky"
+msgstr "Rozdeliť dlh&é riadky"
 
 #: src/frontends/qt4/ui/ListingsUi.ui:281
 msgid "Make spaces visible by a special symbol"
@@ -4436,8 +4436,7 @@ msgstr "á Šírka:"
 #: src/frontends/qt4/ui/PrintNomenclUi.ui:52
 msgid "Custom value. \"List Indentation\" needs to be set to \"Custom\"."
 msgstr ""
-"Vlastná hodnota. Odsadzovanie Zoznamov je treba nastaviť na "
-"Vlastné."
+"Vlastná hodnota. \"Odsadzovanie Zoznamov\" je treba nastaviť na \"Vlastné\"."
 
 #: src/frontends/qt4/ui/PrintindexUi.ui:40
 msgid "Avai indexes:"
@@ -4482,7 +4481,7 @@ msgstr "Pred pokračovaním kompilácie LaTeX-om okno 
automaticky vyčistiť"
 
 #: src/frontends/qt4/ui/ProgressViewUi.ui:176
 msgid " automatically"
-msgstr "Vyčistiť "
+msgstr "Vyčisť automaticky"
 
 #: src/frontends/qt4/ui/ProgressViewUi.ui:191
 msgid "Debug messages"
@@ -4494,7 +4493,7 @@ msgstr "Neukazovať žiadne ladiace hlásenia"
 
 #: src/frontends/qt4/ui/ProgressViewUi.ui:206
 msgid ""
-msgstr "Žia"
+msgstr "Ž"
 
 #: src/frontends/qt4/ui/ProgressViewUi.ui:213
 msgid "Display the debug messages selected to the right"
@@ -4510,7 +4509,7 @@ msgstr "Ukazovať všetky ladiace hlásenia"
 
 #: src/frontends/qt4/ui/ProgressViewUi.ui:226
 msgid ""
-msgstr "šetko"
+msgstr "Vš"
 
 #: src/frontends/qt4/ui/ProgressViewUi.ui:236
 msgid "Display statusbar messages?"
@@ -4518,7 +4517,7 @@ msgstr "Ukázať správy v stavovom pruhu?"
 
 #: src/frontends/qt4/ui/ProgressViewUi.ui:239
 msgid " messages"
-msgstr "Správy v  pruhu"
+msgstr "Spávy v stavovom pruhu"
 
 #: src/frontends/qt4/ui/RefUi.ui:73
 msgid "[[buffer]]:"
@@ -4691,7 +4690,7 @@ msgstr "Zmazať súčasnú skratku"
 #: src/frontends/qt4/ui/ShortcutUi.ui:100
 #: src/frontends/qt4/ui/TabularUi.ui:1118
 msgid "C"
-msgstr "čistiť"
+msgstr "Včistiť"
 
 #: src/frontends/qt4/ui/ShortcutUi.ui:107
 msgid ":"
@@ -4816,7 +4815,7 @@ msgstr "Zlúčiť bunky rozličných riadkov"
 
 #: src/frontends/qt4/ui/TabularUi.ui:121
 msgid "M"
-msgstr "Viac-ré"
+msgstr "é"
 
 #: src/frontends/qt4/ui/TabularUi.ui:133
 msgid " Offset:"
@@ -4967,7 +4966,7 @@ msgstr "Použiť štandardný štýl okraja (mriežka)"
 
 #: src/frontends/qt4/ui/TabularUi.ui:1150
 msgid "De"
-msgstr "Šý"
+msgstr "Štandardn&ý"
 
 #: src/frontends/qt4/ui/TabularUi.ui:1176
 msgid "Additional Space"
@@ -4987,7 +4986,7 @@ msgstr " riadkami:"
 
 #: src/frontends/qt4/ui/TabularUi.ui:1304
 msgid " table"
-msgstr "Viaá tabuľka"
+msgstr "Vá tabuľka"
 
 #: src/frontends/qt4/ui/TabularUi.ui:1310
 msgid "Select for tables that span multiple pages"
@@ -6594,7 +6593,7 @@ msgstr "Autor"
 
 #: lib/layouts/IEEEtran.layout:124 lib/layouts/beamer.layout:984
 msgid "Short Author|S"
-msgstr "Skratka Autora"
+msgstr

[LyX/2.3.x] Fix typo.

2017-12-20 Thread Juergen Spitzmueller 
commit 2b927cbc2ee79f1d1f8a125f4d1a88162a1e5dfa
Author: Juergen Spitzmueller 
Date:   Wed Dec 20 12:17:04 2017 +0100

Fix typo.

This had the effect that for file dialogs supposed to use two buttons,
only the second one was displayed, while file dialogs supposed to use
one button did not have a button at all.

Candidate for 2.3.x and 2.2.x.

(cherry picked from commit 74607702a585fd68bdf6b9cda668421a4ed06f3e)
---
 src/frontends/qt4/GuiPrefs.cpp |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/frontends/qt4/GuiPrefs.cpp b/src/frontends/qt4/GuiPrefs.cpp
index 7f55a4d..4681dd3 100644
--- a/src/frontends/qt4/GuiPrefs.cpp
+++ b/src/frontends/qt4/GuiPrefs.cpp
@@ -112,7 +112,7 @@ QString browseFile(QString const & filename,
lastPath = fallback_dir;
 
FileDialog dlg(title);
-   dlg.setButton2(label1, dir1);
+   dlg.setButton1(label1, dir1);
dlg.setButton2(label2, dir2);
 
FileDialog::Result result;

[LyX/master] tex2lyx: do not keep the Flex prefix for Flex insets names

2017-12-20 Thread Jean-Marc Lasgouttes 
commit 40a3a44aa26c5b70dfcf9dad0fc388cbca975ffd
Author: Jean-Marc Lasgouttes 
Date:   Wed Dec 20 16:00:39 2017 +0100

tex2lyx: do not keep the Flex prefix for Flex insets names

While there is code in LyX that handles this, tex2lyx should respect
the format that LyX produces and the Flex: prefix is gone since
cfeddb92 in 2014.

In particular, this prefix is known to cause assertion when undoing a
document setting change.
---
 src/tex2lyx/text.cpp |   11 +--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp
index 5330c62..f550532 100644
--- a/src/tex2lyx/text.cpp
+++ b/src/tex2lyx/text.cpp
@@ -1994,7 +1994,11 @@ void parse_environment(Parser & p, ostream & os, bool 
outer,
eat_whitespace(p, os, parent_context, false);
parent_context.check_layout(os);
begin_inset(os, "Flex ");
-   os << to_utf8(newinsetlayout->name()) << '\n'
+   docstring flex_name = newinsetlayout->name();
+   // FIXME: what do we do if the prefix is not Flex: ?
+   if (prefixIs(flex_name, from_ascii("Flex:")))
+   flex_name.erase(0, 5);
+   os << to_utf8(flex_name) << '\n'
   << "status collapsed\n";
if (newinsetlayout->isPassThru()) {
string const arg = p.verbatimEnvironment(name);
@@ -4803,7 +4807,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, 
bool outer,
p.get_token();
p.skip_spaces();
context.check_layout(os);
-   docstring const name = newinsetlayout->name();
+   docstring name = newinsetlayout->name();
bool const caption = name.find(from_ascii("Caption:")) 
== 0;
if (caption) {
// Already done for floating minted listings.
@@ -4812,6 +4816,9 @@ void parse_text(Parser & p, ostream & os, unsigned flags, 
bool outer,
os << to_utf8(name.substr(8)) << '\n';
}
} else {
+   // FIXME: what do we do if the prefix is not 
Flex: ?
+   if (prefixIs(name, from_ascii("Flex:")))
+   name.erase(0, 5);
begin_inset(os, "Flex ");
os << to_utf8(name) << '\n'
   << "status collapsed\n";

[LyX/master] de.po: update

2017-12-20 Thread Juergen Spitzmueller 
commit 1eaf66d79ec7c403323f866e33d766a911ef8345
Author: Juergen Spitzmueller 
Date:   Wed Dec 20 12:25:27 2017 +0100

de.po: update
---
 po/de.gmo |  Bin 540789 -> 540739 bytes
 po/de.po  |   60 +---
 2 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/po/de.gmo b/po/de.gmo
index a70daa8..be7ee54 100644
Binary files a/po/de.gmo and b/po/de.gmo differ
diff --git a/po/de.po b/po/de.po
index af48fd1..5d3346f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -95,8 +95,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LyX 2.4git\n"
 "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n"
-"POT-Creation-Date: 2017-12-17 14:10+0100\n"
-"PO-Revision-Date: 2017-12-17 09:25+0100\n"
+"POT-Creation-Date: 2017-12-20 12:21+0100\n"
+"PO-Revision-Date: 2017-12-20 12:25+0100\n"
 "Last-Translator: Juergen Spitzmueller \n"
 "Language-Team: German \n"
 "Language: de\n"
@@ -7426,7 +7426,7 @@ msgid "Altaffilation"
 msgstr "Alt. Zugehörigkeit"
 
 #: lib/layouts/aastex.layout:185 lib/layouts/agutex.layout:124
-#: src/mathed/InsetMathHull.cpp:1842 src/mathed/InsetMathHull.cpp:1851
+#: src/mathed/InsetMathHull.cpp:1861 src/mathed/InsetMathHull.cpp:1870
 msgid "Number"
 msgstr "Nummer"
 
@@ -29156,8 +29156,8 @@ msgstr "alle Literaturverzeichnisse"
 #: src/frontends/qt4/GuiView.cpp:2196 src/frontends/qt4/GuiView.cpp:2253
 #: src/frontends/qt4/GuiView.cpp:2391 src/frontends/qt4/GuiView.cpp:2524
 #: src/frontends/qt4/GuiView.cpp:2564 src/frontends/qt4/GuiView.cpp:2682
-msgid "Documents|#o#O"
-msgstr "Dokumente|#k"
+msgid "D"
+msgstr "Do"
 
 #: src/frontends/qt4/GuiBibtex.cpp:437
 msgid "BibTeX Databases (*.bib)"
@@ -29917,8 +29917,8 @@ msgid "Class Default"
 msgstr "Klassenvoreinstellungen"
 
 #: src/frontends/qt4/GuiDocument.cpp:2310
-msgid "Layouts|#o#O"
-msgstr "Formatdateien|#o#O"
+msgid "Lay"
+msgstr "F"
 
 #: src/frontends/qt4/GuiDocument.cpp:2312
 msgid "LyX Layout (*.layout)"
@@ -30293,8 +30293,8 @@ msgid "Select graphics file"
 msgstr "Wählen Sie eine Grafikdatei"
 
 #: src/frontends/qt4/GuiGraphics.cpp:792
-msgid "Clipart|#C#c"
-msgstr "Clipart|#C#c"
+msgid ""
+msgstr ""
 
 #: src/frontends/qt4/GuiHSpace.cpp:45 src/frontends/qt4/GuiHSpace.cpp:58
 #: src/insets/InsetSpace.cpp:69
@@ -30608,12 +30608,12 @@ msgid "Phantom Settings"
 msgstr "Phantom Einstellungen"
 
 #: src/frontends/qt4/GuiPrefs.cpp:141
-msgid "System files|#S#s"
-msgstr "Systemdateien|#S#s"
+msgid " files"
+msgstr ""
 
 #: src/frontends/qt4/GuiPrefs.cpp:145
-msgid "User files|#U#u"
-msgstr "Benutzerdateien|#B#b"
+msgid " files"
+msgstr ""
 
 #: src/frontends/qt4/GuiPrefs.cpp:251
 msgid "Look & Feel"
@@ -31443,8 +31443,8 @@ msgid "Select template file"
 msgstr "Wählen Sie eine Vorlagendatei"
 
 #: src/frontends/qt4/GuiView.cpp:2197 src/frontends/qt4/GuiView.cpp:2565
-msgid "Templates|#T#t"
-msgstr "Vorlagen|#V"
+msgid ""
+msgstr ""
 
 #: src/frontends/qt4/GuiView.cpp:2224
 msgid "Document not loaded."
@@ -31456,8 +31456,8 @@ msgstr "Wählen Sie das zu öffnende Dokument"
 
 #: src/frontends/qt4/GuiView.cpp:2254 src/frontends/qt4/GuiView.cpp:2392
 #: src/frontends/qt4/GuiView.cpp:2525
-msgid "Examples|#E#e"
-msgstr "Beispiele|#B"
+msgid ""
+msgstr ""
 
 #: src/frontends/qt4/GuiView.cpp:2282
 #, c-format
@@ -33426,7 +33426,7 @@ msgstr "Die Zeichenkette wurde nicht gefunden!"
 msgid "Match found!"
 msgstr "Die Zeichenkette wurde gefunden!"
 
-#: src/mathed/InsetMathAMSArray.cpp:115 src/mathed/InsetMathHull.cpp:2139
+#: src/mathed/InsetMathAMSArray.cpp:115 src/mathed/InsetMathHull.cpp:2158
 #: src/mathed/InsetMathSplit.cpp:120 src/mathed/InsetMathSubstack.cpp:70
 #, c-format
 msgid "Can't add vertical grid lines in '%1$s'"
@@ -33489,16 +33489,16 @@ msgstr "Keine vertikale Linie zu löschen"
 msgid "Unknown tabular feature '%1$s'"
 msgstr "Unbekanntes Tabellenmerkmal '%1$s'"
 
-#: src/mathed/InsetMathHull.cpp:1700
+#: src/mathed/InsetMathHull.cpp:1719
 #, c-format
 msgid "Type: %1$s"
 msgstr "Typ: %1$s"
 
-#: src/mathed/InsetMathHull.cpp:1738
+#: src/mathed/InsetMathHull.cpp:1757
 msgid "Bad math environment"
 msgstr "Ungeeignete Matheumgebung"
 
-#: src/mathed/InsetMathHull.cpp:1739
+#: src/mathed/InsetMathHull.cpp:1758
 msgid ""
 "Computation cannot be performed for AMS math environments.\n"
 "Change the math formula type and try again."
@@ -33506,16 +33506,16 @@ msgstr ""
 "In AMS-Matheumgebungen kann keine Berechnung durchgeführt werden.\n"
 "Bitte ändern Sie die Formelart und versuchen Sie es noch einmal."
 
-#: src/mathed/InsetMathHull.cpp:1842 src/mathed/InsetMathHull.cpp:1851
+#: src/mathed/InsetMathHull.cpp:1861 src/mathed/InsetMathHull.cpp:1870
 msgid "No number"
 msgstr "Keine Nummer"
 
-#: src/mathed/InsetMathHull.cpp:2122
+#: src/mathed/InsetMathHull.cpp:2141
 #, c-format
 msgid "Can't change number of rows in '%1$s'"
 msgstr "Die Anzahl der Zeilen in '%1$s' kann nicht geändert werden."
 
-#: src/mathed/InsetMathHull.cpp:2132
+#:

[LyX/master] Fix typo.

2017-12-20 Thread Juergen Spitzmueller 
commit 74607702a585fd68bdf6b9cda668421a4ed06f3e
Author: Juergen Spitzmueller 
Date:   Wed Dec 20 12:17:04 2017 +0100

Fix typo.

This had the effect that for file dialogs supposed to use two buttons,
only the second one was displayed, while file dialogs supposed to use
one button did not have a button at all.

Candidate for 2.3.x and 2.2.x.
---
 src/frontends/qt4/GuiPrefs.cpp |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/frontends/qt4/GuiPrefs.cpp b/src/frontends/qt4/GuiPrefs.cpp
index 1474cb3..e93c6b7 100644
--- a/src/frontends/qt4/GuiPrefs.cpp
+++ b/src/frontends/qt4/GuiPrefs.cpp
@@ -112,7 +112,7 @@ QString browseFile(QString const & filename,
lastPath = fallback_dir;
 
FileDialog dlg(title);
-   dlg.setButton2(label1, dir1);
+   dlg.setButton1(label1, dir1);
dlg.setButton2(label2, dir2);
 
FileDialog::Result result;

[LyX/master] Get rid of idiosyncratic accelerator syntax

2017-12-20 Thread Juergen Spitzmueller 
commit 25a17d72e103cc0d7f8be27cec3ff2143221412a
Author: Juergen Spitzmueller 
Date:   Wed Dec 20 11:36:32 2017 +0100

Get rid of idiosyncratic accelerator syntax
---
 src/frontends/qt4/GuiBibtex.cpp |4 ++--
 src/frontends/qt4/GuiCompare.cpp|4 ++--
 src/frontends/qt4/GuiDocument.cpp   |4 ++--
 src/frontends/qt4/GuiExternal.cpp   |2 +-
 src/frontends/qt4/GuiGraphics.cpp   |4 ++--
 src/frontends/qt4/GuiInclude.cpp|2 +-
 src/frontends/qt4/GuiPrefs.cpp  |4 ++--
 src/frontends/qt4/GuiView.cpp   |   22 +++---
 src/frontends/qt4/LyXFileDialog.cpp |   19 ++-
 9 files changed, 25 insertions(+), 40 deletions(-)

diff --git a/src/frontends/qt4/GuiBibtex.cpp b/src/frontends/qt4/GuiBibtex.cpp
index d3c728a..1c3917b 100644
--- a/src/frontends/qt4/GuiBibtex.cpp
+++ b/src/frontends/qt4/GuiBibtex.cpp
@@ -432,7 +432,7 @@ bool GuiBibtex::isValid()
 
 QString GuiBibtex::browseBib(QString const & in_name) const
 {
-   QString const label1 = qt_("Documents|#o#O");
+   QString const label1 = qt_("D");
QString const dir1 = toqstr(lyxrc.document_path);
QStringList const filter(qt_("BibTeX Databases (*.bib)"));
return browseRelToParent(in_name, bufferFilePath(),
@@ -442,7 +442,7 @@ QString GuiBibtex::browseBib(QString const & in_name) const
 
 QString GuiBibtex::browseBst(QString const & in_name) const
 {
-   QString const label1 = qt_("Documents|#o#O");
+   QString const label1 = qt_("D");
QString const dir1 = toqstr(lyxrc.document_path);
QStringList const filter(qt_("BibTeX Styles (*.bst)"));
return browseRelToParent(in_name, bufferFilePath(),
diff --git a/src/frontends/qt4/GuiCompare.cpp b/src/frontends/qt4/GuiCompare.cpp
index 4ea7f35..f7a8132 100644
--- a/src/frontends/qt4/GuiCompare.cpp
+++ b/src/frontends/qt4/GuiCompare.cpp
@@ -159,11 +159,11 @@ QString GuiCompare::browse(QString const & in_name) const
if (lyxview().documentBufferView()) {
QString path = bufferFilePath();
filename = browseRelToParent(in_name, path, title, filters, 
false,
-   qt_("Documents|#o#O"), toqstr(lyxrc.document_path));
+   qt_("D"), toqstr(lyxrc.document_path));
} else {
QString path = toqstr(lyxrc.document_path);
QString rel_filename = browseRelToParent(in_name, path, title, 
filters, false,
-   qt_("Documents|#o#O"), toqstr(lyxrc.document_path));
+   qt_("D"), toqstr(lyxrc.document_path));
filename = makeAbsPath(rel_filename, path);
}
return filename;
diff --git a/src/frontends/qt4/GuiDocument.cpp 
b/src/frontends/qt4/GuiDocument.cpp
index 53cee98..e6217f5 100644
--- a/src/frontends/qt4/GuiDocument.cpp
+++ b/src/frontends/qt4/GuiDocument.cpp
@@ -2307,7 +2307,7 @@ void GuiDocument::updatePagestyle(string const & items, 
string const & sel)
 
 void GuiDocument::browseLayout()
 {
-   QString const label1 = qt_("Layouts|#o#O");
+   QString const label1 = qt_("Lay");
QString const dir1 = toqstr(lyxrc.document_path);
QStringList const filter(qt_("LyX Layout (*.layout)"));
QString file = browseRelToParent(QString(), bufferFilePath(),
@@ -2376,7 +2376,7 @@ void GuiDocument::browseMaster()
QString const docpath = 
toqstr(support::onlyPath(buffer().absFileName()));
QStringList const filter(qt_("LyX Files (*.lyx)"));
QString file = browseRelToSub(old, docpath, title, filter, false,
-   qt_("Documents|#o#O"), toqstr(lyxrc.document_path));
+   qt_("D"), toqstr(lyxrc.document_path));
 
if (!file.isEmpty())
latexModule->childDocLE->setText(file);
diff --git a/src/frontends/qt4/GuiExternal.cpp 
b/src/frontends/qt4/GuiExternal.cpp
index 8215f07..f721bd2 100644
--- a/src/frontends/qt4/GuiExternal.cpp
+++ b/src/frontends/qt4/GuiExternal.cpp
@@ -672,7 +672,7 @@ QString GuiExternal::browse(QString const & input,
QString const bufpath = bufferFilePath();
QStringList const filter = templateFilters(template_name);
 
-   QString const label1 = qt_("Documents|#o#O");
+   QString const label1 = qt_("D");
QString const dir1 = toqstr(lyxrc.document_path);
 
return browseRelToParent(input, bufpath, title, filter, false, label1, 
dir1);
diff --git a/src/frontends/qt4/GuiGraphics.cpp 
b/src/frontends/qt4/GuiGraphics.cpp
index d2467cd..3c6bd21 100644
--- a/src/frontends/qt4/GuiGraphics.cpp
+++ b/src/frontends/qt4/GuiGraphics.cpp
@@ -789,8 +789,8 @@ QString GuiGraphics::browse(QString const & in_name) const
 
return browseRelToParent(in_name, bufferFilePath(),
title, fileFilters(QString()), false,
-   qt_("Clipart|#C#c"), toqstr(clipdir),
-   qt_("Documents|#o#O"), toqstr(lyxrc.document_path));
+   qt_(""), toqstr(clipdir),
+

[LyX/master] Reintroduce the spacing around delimiters

2017-12-20 Thread Jean-Marc Lasgouttes 
commit 4cb5cc0c7de7cb5dbaaf14328e5a82e1cfe5a6ca
Author: Jean-Marc Lasgouttes 
Date:   Wed Dec 20 11:22:21 2017 +0100

Reintroduce the spacing around delimiters

This spacing was wrongly removed at 361bd53b as part of the
introduction of proper spacing btween elements, but it only introduces
some breathing space around the delimiters. This will not be necessary
anymore when/if we use proper delimiters from the cmex10 font.
---
 src/mathed/InsetMathDelim.cpp |9 +
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/mathed/InsetMathDelim.cpp b/src/mathed/InsetMathDelim.cpp
index d664959..809e8a0 100644
--- a/src/mathed/InsetMathDelim.cpp
+++ b/src/mathed/InsetMathDelim.cpp
@@ -103,7 +103,7 @@ void InsetMathDelim::metrics(MetricsInfo & mi, Dimension & 
dim) const
dw_ = 8;
if (dw_ < 4)
dw_ = 4;
-   dim.wid = dim0.width() + 2 * dw_;
+   dim.wid = dim0.width() + 2 * dw_ + 2 * mathed_thinmuskip(mi.base.font);
dim.asc = max(a0, d0) + h0;
dim.des = max(a0, d0) - h0;
 }
@@ -114,9 +114,10 @@ void InsetMathDelim::draw(PainterInfo & pi, int x, int y) 
const
Changer dummy = pi.base.changeEnsureMath();
Dimension const dim = dimension(*pi.base.bv);
int const b = y - dim.asc;
-   cell(0).draw(pi, x + dw_, y);
-   mathed_draw_deco(pi, x, b, dw_, dim.height(), left_);
-   mathed_draw_deco(pi, x + dim.width() - dw_,
+   int const skip = mathed_thinmuskip(pi.base.font);
+   cell(0).draw(pi, x + dw_ + skip, y);
+   mathed_draw_deco(pi, x + skip / 2, b, dw_, dim.height(), left_);
+   mathed_draw_deco(pi, x + dim.width() - dw_ - skip / 2,
b, dw_, dim.height(), right_);
 }