[LyX/master] 008-greek-and-coptic.lyx now compilable with iso8859-7 inputencoding

[Kornel Benko]

commit b47c31d52a6c2784c01911964fb4709f114e8b6c
Author: Kornel Benko 
Date:   Sat May 5 08:24:50 2018 +0200

008-greek-and-coptic.lyx now compilable with iso8859-7 inputencoding

Removed from invertedTests
---
 development/autotests/invertedTests |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/development/autotests/invertedTests 
b/development/autotests/invertedTests
index 8dd43cf..27bfe25 100644
--- a/development/autotests/invertedTests
+++ b/development/autotests/invertedTests
@@ -159,9 +159,9 @@ export/examples/es/linguistics_pdf4_texF
 export/export/latex/ru-accent-ascii.*
 
 #9681 textgreek and textcyr also required for encodable characters
-# Greek fails with utf8, utf8x, and iso8859-7 encodings,
+# Greek fails with utf8 and utf8x encodings,
 # Cyrillic fails with utf8 and Cyrillic encodings:
-export/export/latex/unicodesymbols/008-greek-and-coptic_(utf8|utf8x|iso8859-7)_pdf2
+export/export/latex/unicodesymbols/008-greek-and-coptic_(utf8|utf8x)_pdf2
 
 # ==
 Sublabel: ert

[LyX/2.3.x] Fixes for nested ulem commands

[Juergen Spitzmueller]

commit 36096435e5ef605eb851afc270110938f9c4b65f
Author: Juergen Spitzmueller 
Date:   Fri May 4 19:32:38 2018 +0200

Fixes for nested ulem commands

1. \uuline must be on top of \sout
2. \uwave in \xout needs a hack to compile

(cherry picked from commit 9fd94a2dd0631a7d408ad013736312a5cf563f2f)
---
 src/Font.cpp |   16 +++-
 status.23x   |2 ++
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/Font.cpp b/src/Font.cpp
index e81e124..b810e45 100644
--- a/src/Font.cpp
+++ b/src/Font.cpp
@@ -441,6 +441,11 @@ int Font::latexWriteStartChanges(odocstream & os, 
BufferParams const & bparams,
count += 10;
++runparams.inulemcmd;
}
+   if (f.uuline() == FONT_ON) {
+   os << "\\uuline{";
+   count += 11;
+   ++runparams.inulemcmd;
+   }
if (f.strikeout() == FONT_ON) {
os << "\\sout{";
count += 9;
@@ -451,12 +456,13 @@ int Font::latexWriteStartChanges(odocstream & os, 
BufferParams const & bparams,
count += 9;
++runparams.inulemcmd;
}
-   if (f.uuline() == FONT_ON) {
-   os << "\\uuline{";
-   count += 11;
-   ++runparams.inulemcmd;
-   }
if (f.uwave() == FONT_ON) {
+   if (runparams.inulemcmd) {
+   // needed with nested uwave in xout
+   // see https://tex.stackexchange.com/a/263042
+   os << "\\ULdepth=1000pt";
+   count += 15;
+   }
os << "\\uwave{";
count += 10;
++runparams.inulemcmd;
diff --git a/status.23x b/status.23x
index 4228e96..a740f49 100644
--- a/status.23x
+++ b/status.23x
@@ -143,6 +143,8 @@ What's new
 
 - Load hyperref with a suitable driver (bug 6418).
 
+- Fix LaTeX errors with nested ulem commands.
+
 - Recompile grandchildren when they have updated (bug 2).
 
 - Output list of bibliography files in the order given in the dialog, rather

[LyX/master] de.po: update

[Juergen Spitzmueller]

commit 0573d31f056d9b1ab165b91a39df0512a77840c4
Author: Juergen Spitzmueller 
Date:   Sat May 5 12:00:22 2018 +0200

de.po: update

 po/de.gmo |  Bin 543850 -> 544429 bytes
 po/de.po  | 3499 +++--
 2 files changed, 1785 insertions(+), 1714 deletions(-)

[LyX/master] Make textcommabelow feature conditional on encoding

[Juergen Spitzmueller]

commit 09b2e337f744afac869ac2370e9700e3b2adef5e
Author: Juergen Spitzmueller 
Date:   Sat May 5 15:43:54 2018 +0200

Make textcommabelow feature conditional on encoding
---
 lib/unicodesymbols |   10 +-
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/unicodesymbols b/lib/unicodesymbols
index ed11fb0..ba2afdf 100644
--- a/lib/unicodesymbols
+++ b/lib/unicodesymbols
@@ -441,10 +441,10 @@
 0x0215 "\\textdoublegrave{u}" "tipa" "force,mathalpha" "\\dgrave{u}" 
"tipasymb,dgrave" # LATIN SMALL LETTER U WITH DOUBLE GRAVE
 0x0216 "\\textroundcap{U}""tipa" "force,mathalpha" "\\rcap{U}" 
"tipasymb,rcap" # LATIN CAPITAL LETTER U WITH INVERTED BREVE
 0x0217 "\\textroundcap{u}""tipa" "force,mathalpha" "\\rcap{u}" 
"tipasymb,rcap" # LATIN SMALL LETTER U WITH INVERTED BREVE
-0x0218 "\\textcommabelow{S}"  "textcommabelow" "" # LATIN CAPITAL LETTER S 
WITH COMMA BELOW
-0x0219 "\\textcommabelow{s}"  "textcommabelow" "" # LATIN SMALL LETTER S 
WITH COMMA BELOW
-0x021a "\\textcommabelow{T}"  "textcommabelow" "" # LATIN CAPITAL LETTER T 
WITH COMMA BELOW
-0x021b "\\textcommabelow{t}"  "textcommabelow" "" # LATIN SMALL LETTER T 
WITH COMMA BELOW
+0x0218 "\\textcommabelow{S}"  "textcommabelow!=utf8;iso8859-16" "" # LATIN 
CAPITAL LETTER S WITH COMMA BELOW
+0x0219 "\\textcommabelow{s}"  "textcommabelow!=utf8;iso8859-16" "" # LATIN 
SMALL LETTER S WITH COMMA BELOW
+0x021a "\\textcommabelow{T}"  "textcommabelow!=utf8;iso8859-16" "" # LATIN 
CAPITAL LETTER T WITH COMMA BELOW
+0x021b "\\textcommabelow{t}"  "textcommabelow!=utf8;iso8859-16" "" # LATIN 
SMALL LETTER T WITH COMMA BELOW
 #0x021c "" "" "" # LATIN CAPITAL LETTER YOGH
 #0x021d "" "" "" # LATIN SMALL LETTER YOGH
 0x021e "\\v{H}"   "" "mathalpha,force=utf8" "\\check{H}" # 
LATIN CAPITAL LETTER H WITH CARON
@@ -719,7 +719,7 @@
 0x0323 "\\d"  "" "combining,force" # COMBINING DOT BELOW
 0x0324 "\\textsubumlaut"  "tipa" "combining,force" # COMBINING 
DIAERESIS BELOW
 0x0325 "\\textsubring""tipa" "combining,force" # COMBINING RING 
BELOW
-0x0326 "\\textcommabelow" "textcommabelow" "combining,force" # 
COMBINING COMMA BELOW
+0x0326 "\\textcommabelow" "textcommabelow!=utf8;iso8859-16" 
"combining,force" # COMBINING COMMA BELOW
 0x0327 "\\c"  "" "combining,force" # COMBINING CEDILLA
 0x0328 "\\k"  "" "combining,force" # COMBINING OGONEK
 0x0329 "\\textsyllabic"   "tipa" "combining,force" # COMBINING 
VERTICAL LINE BELOW

[LyX/master] de.po: update

[Juergen Spitzmueller]

commit 39596ab558e2152c557fd2be880b00694355e69a
Author: Juergen Spitzmueller 
Date:   Sat May 5 16:04:54 2018 +0200

de.po: update
---
 po/de.gmo |  Bin 544429 -> 544429 bytes
 po/de.po  |6 +++---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/po/de.gmo b/po/de.gmo
index 1b646d6..ad7f329 100644
Binary files a/po/de.gmo and b/po/de.gmo differ
diff --git a/po/de.po b/po/de.po
index 9ad3790..c6aef82 100644
--- a/po/de.po
+++ b/po/de.po
@@ -96,7 +96,7 @@ msgstr ""
 "Project-Id-Version: LyX 2.4git\n"
 "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n"
 "POT-Creation-Date: 2018-05-05 11:50+0200\n"
-"PO-Revision-Date: 2018-05-05 11:55+0100\n"
+"PO-Revision-Date: 2018-05-05 15:50+0100\n"
 "Last-Translator: Juergen Spitzmueller \n"
 "Language-Team: German \n"
 "Language: de\n"
@@ -985,7 +985,7 @@ msgstr "Strichstärke"
 
 #: src/frontends/qt4/ui/CharacterUi.ui:60
 msgid ":"
-msgstr "ärke:"
+msgstr "Särke:"
 
 #: src/frontends/qt4/ui/CharacterUi.ui:83
 #: src/frontends/qt4/ui/CharacterUi.ui:102
@@ -1012,7 +1012,7 @@ msgstr "F:"
 
 #: src/frontends/qt4/ui/CharacterUi.ui:177
 msgid "U:"
-msgstr "U:"
+msgstr ":"
 
 #: src/frontends/qt4/ui/CharacterUi.ui:193
 msgid "Underlining of text"

[LyX/master] Fix BC issue with autoapply

[Juergen Spitzmueller]

commit 01ca60187718ef97552488adbd976d7436f98228
Author: Juergen Spitzmueller 
Date:   Sat May 5 12:35:07 2018 +0200

Fix BC issue with autoapply
---
 src/frontends/qt4/GuiCharacter.cpp |3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/frontends/qt4/GuiCharacter.cpp 
b/src/frontends/qt4/GuiCharacter.cpp
index 349fea2..5dd6dde 100644
--- a/src/frontends/qt4/GuiCharacter.cpp
+++ b/src/frontends/qt4/GuiCharacter.cpp
@@ -527,7 +527,8 @@ void GuiCharacter::paramsToDialog(Font const & font)
? "reset" : toqstr(font.language()->lang());
langCO->setCurrentIndex(findPos2nd(language, lang));
// disable the OK/Apply buttons, since we have no changes yet
-   bc().setValid(false);
+   if (!autoapplyCB->isChecked())
+   bc().setValid(false);
 }
 
 

[LyX/master] Remove connections

[Juergen Spitzmueller]

commit 0a8ec32a3bbcefc5ce7d7772fec82b85ba58f2d1
Author: Juergen Spitzmueller 
Date:   Sat May 5 10:00:20 2018 +0200

Remove connections

We have on_emphCB_clicked() and on_nounCB_cklicked() that call
change_adaptor at the end (after doing other things)
---
 src/frontends/qt4/GuiCharacter.cpp |2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/src/frontends/qt4/GuiCharacter.cpp 
b/src/frontends/qt4/GuiCharacter.cpp
index d1bbc52..5e6e124 100644
--- a/src/frontends/qt4/GuiCharacter.cpp
+++ b/src/frontends/qt4/GuiCharacter.cpp
@@ -219,8 +219,6 @@ GuiCharacter::GuiCharacter(GuiView & lv)
 
connect(ulineCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
connect(strikeCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
-   connect(emphCB, SIGNAL(clicked(bool)), this, SLOT(change_adaptor()));
-   connect(nounCB, SIGNAL(clicked(bool)), this, SLOT(change_adaptor()));
connect(sizeCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
connect(familyCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
connect(seriesCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));

[LyX/master] Add missing transition to button controller

[Juergen Spitzmueller]

commit 164e8d1dc80ddd2017479ed4db701d76c133c22d
Author: Juergen Spitzmueller 
Date:   Sat May 5 11:32:56 2018 +0200

Add missing transition to button controller

(needed by GuiCharacter, the only user of that specific policy)
---
 src/frontends/qt4/ButtonPolicy.cpp |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/frontends/qt4/ButtonPolicy.cpp 
b/src/frontends/qt4/ButtonPolicy.cpp
index 1866a3c..5426271 100644
--- a/src/frontends/qt4/ButtonPolicy.cpp
+++ b/src/frontends/qt4/ButtonPolicy.cpp
@@ -595,6 +595,7 @@ void ButtonPolicy::Private::initOkApplyCancelAutoReadOnly()
state_machine_[INVALID][SMI_INVALID] = INVALID;
state_machine_[INVALID][SMI_READ_WRITE] = INVALID;
state_machine_[INVALID][SMI_VALID] = VALID;
+   state_machine_[INVALID][SMI_OKAY] = INITIAL;
state_machine_[INVALID][SMI_RESTORE] = INITIAL;
state_machine_[INVALID][SMI_READ_ONLY] = RO_INVALID;
state_machine_[INVALID][SMI_AUTOAPPLY] = AUTOAPPLY_CHANGED;

[LyX/master] Remove unused code

[Juergen Spitzmueller]

commit d4598bab62744d26e62fd956658d33422e4facdf
Author: Juergen Spitzmueller 
Date:   Sat May 5 11:28:54 2018 +0200

Remove unused code
---
 src/frontends/qt4/GuiView.cpp |6 +-
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index a91928c..104214e 100644
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -4139,11 +4139,7 @@ void GuiView::dispatch(FuncRequest const & cmd, 
DispatchResult & dr)
string const name = cmd.getArg(0);
string sdata = 
trim(to_utf8(cmd.argument()).substr(name.size()));
 
-   if (name == "character") {
-   sdata = freefont2string();
-   if (!sdata.empty())
-   showDialog("character", sdata);
-   } else if (name == "latexlog") {
+   if (name == "latexlog") {
// gettatus checks that
LATTEST(doc_buffer);
Buffer::LogType type;

[LyX/master] Have OK/Apply buttons initially disabled.

[Juergen Spitzmueller]

commit fe18bea3d07be1987a8c6c561b4c714e0c4fad2a
Author: Juergen Spitzmueller 
Date:   Sat May 5 11:33:45 2018 +0200

Have OK/Apply buttons initially disabled.
---
 src/frontends/qt4/GuiCharacter.cpp |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/frontends/qt4/GuiCharacter.cpp 
b/src/frontends/qt4/GuiCharacter.cpp
index 295b59e..349fea2 100644
--- a/src/frontends/qt4/GuiCharacter.cpp
+++ b/src/frontends/qt4/GuiCharacter.cpp
@@ -526,6 +526,8 @@ void GuiCharacter::paramsToDialog(Font const & font)
QString const lang = (font.language() == reset_language)
? "reset" : toqstr(font.language()->lang());
langCO->setCurrentIndex(findPos2nd(language, lang));
+   // disable the OK/Apply buttons, since we have no changes yet
+   bc().setValid(false);
 }
 
 

[LyX/master] Check script char fontenc from main language.

[Juergen Spitzmueller]

commit a853dab61fe99f133d029266384bdcbb123c1e0f
Author: Juergen Spitzmueller 
Date:   Sat May 5 15:26:37 2018 +0200

Check script char fontenc from main language.
---
 src/Paragraph.cpp |7 ++-
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 307f8f4..7aa0d1f 100644
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -913,7 +913,7 @@ int Paragraph::Private::latexSurrogatePair(BufferParams 
const & bparams,
if (runparams.local_font)
fontenc = runparams.local_font->language()->fontenc(bparams);
else
-   fontenc = runparams.main_fontenc;
+   fontenc = bparams.language->fontenc(bparams);
docstring scriptmacro;
docstring cb;
if (script == "textgreek" || script == "textcyrillic") {
@@ -1395,10 +1395,7 @@ void Paragraph::Private::latexSpecialChar(otexstream & 
os,
}
}
string fontenc;
-   if (running_font.language()->lang() == bparams.language->lang())
-   fontenc = runparams.main_fontenc;
-   else
-   fontenc = running_font.language()->fontenc(bparams);
+   fontenc = running_font.language()->fontenc(bparams);
// "Script chars" need to embraced in \textcyrillic and 
\textgreek notwithstanding
// whether they are encodable or not (it only depends on the 
font encoding)
if (!runparams.isFullUnicode() && 
Encodings::isKnownScriptChar(c, script)) {

[LyX/master] Use a copy of BufferParams

[Juergen Spitzmueller]

commit c62055458e26a510f6e9187de3f9bb2ef589f734
Author: Juergen Spitzmueller 
Date:   Sat May 5 15:26:58 2018 +0200

Use a copy of BufferParams
---
 src/Converter.cpp |   26 ++
 1 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/Converter.cpp b/src/Converter.cpp
index 118d0b6..8c22b1c 100644
--- a/src/Converter.cpp
+++ b/src/Converter.cpp
@@ -476,19 +476,21 @@ Converters::RetVal Converters::convert(Buffer const * 
buffer,
runparams.flavor = getFlavor(edgepath, buffer);
 
if (buffer) {
+   BufferParams const & bp = buffer->params();
runparams.use_japanese =
-   (buffer->params().bufferFormat() == "latex"
-|| suffixIs(buffer->params().bufferFormat(), "-ja"))
-   && buffer->params().encoding().package() == 
Encoding::japanese;
-   runparams.use_indices = buffer->params().use_indices;
-   runparams.bibtex_command = buffer->params().bibtexCommand();
-   runparams.index_command = (buffer->params().index_command == 
"default") ?
-   string() : buffer->params().index_command;
-   runparams.document_language = 
buffer->params().language->babel();
-   runparams.main_fontenc = buffer->params().main_font_encoding();
-   runparams.only_childbibs = !buffer->params().useBiblatex()
-   && !buffer->params().useBibtopic()
-   && buffer->params().multibib == "child";
+   (bp.bufferFormat() == "latex"
+|| suffixIs(bp.bufferFormat(), "-ja"))
+   && bp.encoding().package() == Encoding::japanese;
+   runparams.use_indices = bp.use_indices;
+   runparams.bibtex_command = bp.bibtexCommand();
+   runparams.index_command = (bp.index_command == "default") ?
+   string() : bp.index_command;
+   runparams.document_language = bp.language->babel();
+   // Some macros rely on font encoding
+   runparams.main_fontenc = bp.main_font_encoding();
+   runparams.only_childbibs = !bp.useBiblatex()
+   && !bp.useBibtopic()
+   && bp.multibib == "child";
}
 
// Some converters (e.g. lilypond) can only output files to the

[LyX/master] Add translator hints

[Juergen Spitzmueller]

commit 01ffcd5f6742823537edcf32d3f972b595ef60b6
Author: Juergen Spitzmueller 
Date:   Sat May 5 10:04:46 2018 +0200

Add translator hints
---
 src/frontends/qt4/GuiCharacter.cpp |8 
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/frontends/qt4/GuiCharacter.cpp 
b/src/frontends/qt4/GuiCharacter.cpp
index 5e6e124..b805166 100644
--- a/src/frontends/qt4/GuiCharacter.cpp
+++ b/src/frontends/qt4/GuiCharacter.cpp
@@ -83,8 +83,8 @@ static QList barData()
QList bars;
bars << BarPair(qt_("No change"), IGNORE);
bars << BarPair(qt_("(Without)[[underlining]]"), NONE);
-   bars << BarPair(qt_("Single"), UNDERBAR);
-   bars << BarPair(qt_("Double"), UULINE);
+   bars << BarPair(qt_("Single[[underlining]]"), UNDERBAR);
+   bars << BarPair(qt_("Double[[underlining]]"), UULINE);
bars << BarPair(qt_("Wavy"), UWAVE);
bars << BarPair(qt_("Reset"), INHERIT);
return bars;
@@ -96,7 +96,7 @@ static QList strikeData()
QList strike;
strike << BarPair(qt_("No change"), IGNORE);
strike << BarPair(qt_("(Without)[[strikethrough]]"), NONE);
-   strike << BarPair(qt_("Single"), STRIKEOUT);
+   strike << BarPair(qt_("Single[[strikethrough]]"), STRIKEOUT);
strike << BarPair(qt_("With /"), XOUT);
strike << BarPair(qt_("Reset"), INHERIT);
return strike;
@@ -187,7 +187,7 @@ void fillComboColor(QComboBox * combo, QList const & 
list)
 {
// at first add the 2 colors "No change" and "No color"
combo->addItem(qt_("No change"), "ignore");
-   combo->addItem(qt_("No color"), "none");
+   combo->addItem(qt_("(Without)[[color]]"), "none");
// now add the real colors
QPixmap coloritem(32, 32);
QColor color;

[LyX/master] Add and correct tooltips

[Juergen Spitzmueller]

commit fe6b0e2670827ae6cdf53877f7fcbb620f91ac5b
Author: Juergen Spitzmueller 
Date:   Sat May 5 10:05:01 2018 +0200

Add and correct tooltips
---
 src/frontends/qt4/ui/CharacterUi.ui |   10 --
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/frontends/qt4/ui/CharacterUi.ui 
b/src/frontends/qt4/ui/CharacterUi.ui
index 653ea98..9f01b84 100644
--- a/src/frontends/qt4/ui/CharacterUi.ui
+++ b/src/frontends/qt4/ui/CharacterUi.ui
@@ -190,7 +190,7 @@

   
   
-   Other font settings
+   Underlining of text
   
  
 
@@ -213,7 +213,7 @@

   
   
-   Other font settings
+   Strike-through text
   
  
 
@@ -290,6 +290,9 @@
  
   

+
+ Semantic emphasizing (italic by default, but can be 
adapted)
+
 
  Emphasized
 
@@ -297,6 +300,9 @@
   
   

+
+ Semantic markup of nouns (small caps by default, but can be 
adapted)
+
 
  Noun
 

[LyX/master] Remove hack that's no longer needed

[Juergen Spitzmueller]

commit a320403590dd645e89e0c9c864073e099f481343
Author: Juergen Spitzmueller 
Date:   Sat May 5 10:28:43 2018 +0200

Remove hack that's no longer needed
---
 src/frontends/qt4/GuiCharacter.cpp |7 ---
 1 files changed, 0 insertions(+), 7 deletions(-)

diff --git a/src/frontends/qt4/GuiCharacter.cpp 
b/src/frontends/qt4/GuiCharacter.cpp
index b805166..3085b37 100644
--- a/src/frontends/qt4/GuiCharacter.cpp
+++ b/src/frontends/qt4/GuiCharacter.cpp
@@ -271,13 +271,6 @@ GuiCharacter::GuiCharacter(GuiView & lv)
setWindowFlags(Qt::Tool);
autoapplyCB->setChecked(true);
 #endif
-
-// FIXME: hack to work around resizing bug in Qt >= 4.2
-// bug verified with Qt 4.2.{0-3} (JSpitzm)
-#if QT_VERSION >= 0x040200
-   // qt resizes the comboboxes only after show(), so ...
-   QDialog::show();
-#endif
 }
 
 

[LyX/master] Fix signals

[Juergen Spitzmueller]

commit 6c35d5cb5b9cc6e8fd6887db976a3dc325818109
Author: Juergen Spitzmueller 
Date:   Sat May 5 10:29:26 2018 +0200

Fix signals
---
 src/frontends/qt4/GuiCharacter.cpp |   16 
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/frontends/qt4/GuiCharacter.cpp 
b/src/frontends/qt4/GuiCharacter.cpp
index 3085b37..295b59e 100644
--- a/src/frontends/qt4/GuiCharacter.cpp
+++ b/src/frontends/qt4/GuiCharacter.cpp
@@ -217,14 +217,14 @@ GuiCharacter::GuiCharacter(GuiView & lv)
connect(autoapplyCB, SIGNAL(stateChanged(int)), this,
SLOT(slotAutoApply()));
 
-   connect(ulineCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
-   connect(strikeCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
-   connect(sizeCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
-   connect(familyCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
-   connect(seriesCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
-   connect(shapeCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
-   connect(colorCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
-   connect(langCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
+   connect(ulineCO, SIGNAL(currentIndexChanged(int)), this, 
SLOT(change_adaptor()));
+   connect(strikeCO, SIGNAL(currentIndexChanged(int)), this, 
SLOT(change_adaptor()));
+   connect(sizeCO, SIGNAL(currentIndexChanged(int)), this, 
SLOT(change_adaptor()));
+   connect(familyCO, SIGNAL(currentIndexChanged(int)), this, 
SLOT(change_adaptor()));
+   connect(seriesCO, SIGNAL(currentIndexChanged(int)), this, 
SLOT(change_adaptor()));
+   connect(shapeCO, SIGNAL(currentIndexChanged(int)), this, 
SLOT(change_adaptor()));
+   connect(colorCO, SIGNAL(currentIndexChanged(int)), this, 
SLOT(change_adaptor()));
+   connect(langCO, SIGNAL(currentIndexChanged(int)), this, 
SLOT(change_adaptor()));
 
family = familyData();
series = seriesData();

[LyX/master] Update sk.po

[Kornel Benko]

commit 145d81da6860bbec6272445446b8671fcb4eba71
Author: Kornel Benko 
Date:   Sat May 5 11:55:38 2018 +0200

Update sk.po
---
 po/sk.po |  179 ++
 1 files changed, 122 insertions(+), 57 deletions(-)

diff --git a/po/sk.po b/po/sk.po
index bcc119d..94a26aa 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: 2018-05-03 08:32+0200\n"
-"PO-Revision-Date: 2018-05-03 06:38+\n"
+"POT-Creation-Date: 2018-05-05 11:29+0200\n"
+"PO-Revision-Date: 2018-05-05 09:52+\n"
 "Last-Translator: Kornel Benko \n"
 "Language-Team: Slovak \n"
 "Language: sk\n"
@@ -884,10 +884,6 @@ msgstr "ť"
 msgid "Font family"
 msgstr "Rodina písma"
 
-#: src/frontends/qt4/ui/CharacterUi.ui:47
-msgid ":"
-msgstr ":"
-
 #: src/frontends/qt4/ui/CharacterUi.ui:65
 #: src/frontends/qt4/ui/CharacterUi.ui:72
 msgid "Font shape"
@@ -933,36 +929,11 @@ msgstr "éria:"
 msgid ":"
 msgstr ":"
 
-#: src/frontends/qt4/ui/CharacterUi.ui:197
-msgid "Never Toggled"
-msgstr "Nikdy neprepnuté"
-
 #: src/frontends/qt4/ui/CharacterUi.ui:209
 #: src/frontends/qt4/ui/CharacterUi.ui:230
 msgid "Font size"
 msgstr "Veľkosť písma"
 
-#: src/frontends/qt4/ui/CharacterUi.ui:240
-#: src/frontends/qt4/ui/CharacterUi.ui:273
-msgid "Other font settings"
-msgstr "Ďalšie nastavenie písma"
-
-#: src/frontends/qt4/ui/CharacterUi.ui:243
-msgid "Always Toggled"
-msgstr "Vždy prepnuté"
-
-#: src/frontends/qt4/ui/CharacterUi.ui:255
-msgid ":"
-msgstr "Rô:"
-
-#: src/frontends/qt4/ui/CharacterUi.ui:295
-msgid "toggle font on all of the above"
-msgstr "Prepnúť všetky vyššie uvedené vlastnosti písma"
-
-#: src/frontends/qt4/ui/CharacterUi.ui:298
-msgid " all"
-msgstr "Vš prepnúť"
-
 #: src/frontends/qt4/ui/CharacterUi.ui:305
 msgid "Apply each change automatically"
 msgstr "Používať každú zmenu automaticky"
@@ -2144,10 +2115,18 @@ msgstr "Upraviť súbor"
 msgid ""
 msgstr "ť"
 
+#: src/frontends/qt4/ui/CharacterUi.ui:294
+msgid ""
+msgstr "ýraznenie"
+
 #: src/frontends/qt4/ui/IncludeUi.ui:136
 msgid "Underline spaces in generated output"
 msgstr "Podčiarknuť medzery v generovanom výstupe"
 
+#: src/frontends/qt4/ui/CharacterUi.ui:193
+msgid "Underlining of text"
+msgstr "Podčiarknutie textu"
+
 #: src/frontends/qt4/ui/IncludeUi.ui:139
 msgid " spaces in output"
 msgstr "Označiť  vo výstupe"
@@ -2509,6 +2488,10 @@ msgstr "Na ktorej strane by mali byť vytlačené čísla 
riadkov?"
 msgid "S:"
 msgstr "K:"
 
+#: src/frontends/qt4/ui/CharacterUi.ui:200
+msgid "S:"
+msgstr "Prškrtnutie:"
+
 #: src/frontends/qt4/ui/ListingsUi.ui:132
 msgid "Difference between two numbered lines"
 msgstr "Odstup v číslovaní riadkov"
@@ -2538,6 +2521,10 @@ msgstr "Základná veľkosť písma"
 msgid "Font Famil:"
 msgstr "Rodi písma:"
 
+#: src/frontends/qt4/ui/CharacterUi.ui:23
+msgid "Font Properties"
+msgstr "Vlastnosti Písma"
+
 #: src/frontends/qt4/ui/ListingsUi.ui:252
 msgid "The content's base font style"
 msgstr "Základná rodina písma"
@@ -3218,11 +3205,19 @@ msgstr "šie návestie"
 msgid "Line "
 msgstr "Rozst riadkov"
 
-#: src/frontends/qt4/ui/ParagraphUi.ui:121 src/Text.cpp:1936
-#: src/frontends/qt4/GuiDocument.cpp:749
+#: src/frontends/qt4/ui/ParagraphUi.ui:121 src/Text.cpp:1937
+#: src/frontends/qt4/GuiDocument.cpp:779
 msgid "Single"
 msgstr "Jednoduchý"
 
+#: src/frontends/qt4/GuiCharacter.cpp:99
+msgid "Single[[strikethrough]]"
+msgstr "Jednoduché"
+
+#: src/frontends/qt4/GuiCharacter.cpp:86
+msgid "Single[[underlining]]"
+msgstr "Jednoduché"
+
 #: src/frontends/qt4/ui/ParagraphUi.ui:126
 msgid "1.5"
 msgstr "1.5"
@@ -3826,6 +3821,10 @@ msgstr "Pre ni fonty:"
 msgid "With  fonts:"
 msgstr "Pre  fonty:"
 
+#: src/frontends/qt4/GuiCharacter.cpp:100
+msgid "With /"
+msgstr "S /"
+
 #: src/frontends/qt4/ui/PrefFileformatsUi.ui:294
 msgid ":"
 msgstr ":"
@@ -4327,6 +4326,10 @@ msgstr "é:"
 msgid ":"
 msgstr "Noálne:"
 
+#: src/frontends/qt4/ui/CharacterUi.ui:301
+msgid ""
+msgstr ""
+
 #: src/frontends/qt4/ui/PrefScreenFontsUi.ui:387
 msgid ":"
 msgstr "é:"
@@ -13645,6 +13648,10 @@ msgstr "Pravý súhrn"
 msgid "DoubleListItem"
 msgstr "ZáznamDvojitáListina"
 
+#: src/frontends/qt4/GuiCharacter.cpp:87
+msgid "Double[[underlining]]"
+msgstr "Dvojité"
+
 #: lib/layouts/moderncv.layout:457
 msgid "Double List Item:"
 msgstr "Záznam pre dvojitú listinu:"
@@ -18819,6 +18826,21 @@ msgstr "Prostý Text, Riadky Spojiť|S"
 msgid "Selection|S"
 msgstr "Výber|V"
 
+#: src/frontends/qt4/ui/CharacterUi.ui:288
+msgid "Semantic Markup"
+msgstr "Sémantické Značkovanie"
+
+#: src/frontends/qt4/ui/CharacterUi.ui:294
+msgid "Semantic emphasizing (italic by default, but can be adapted)"
+msgstr ""
+"Sémantické zvýraznenie (štandard je kurzíva, ale môže byť prispôsobené)"
+
+#: src/frontends/qt4/ui/CharacterUi.ui:304
+msgid "Semantic markup of nouns (small caps by default, but can be 

[LyX/master] Remove unused function.

[Richard Kimberly Heck]

commit c7a2011adf92bddf7dd9fc308b1df2c1dde9bef6
Author: Richard Kimberly Heck 
Date:   Sat May 5 12:02:10 2018 -0400

Remove unused function.
---
 src/Font.h|5 -
 src/Text3.cpp |6 --
 2 files changed, 0 insertions(+), 11 deletions(-)

diff --git a/src/Font.h b/src/Font.h
index 8b8ddf8..9ec853d 100644
--- a/src/Font.h
+++ b/src/Font.h
@@ -132,11 +132,6 @@ bool operator!=(Font const & font1, Font const & font2)
return !(font1 == font2);
 }
 
-/** Returns the current freefont, encoded as a std::string to be passed to the
- *  frontends. Implemented in Text3.cpp.
- */
-std::string const freefont2string();
-
 } // namespace lyx
 
 #endif
diff --git a/src/Text3.cpp b/src/Text3.cpp
index 572e4bd..9b0f50c 100644
--- a/src/Text3.cpp
+++ b/src/Text3.cpp
@@ -346,12 +346,6 @@ static bool doInsertInset(Cursor & cur, Text * text,
 }
 
 
-string const freefont2string()
-{
-   return freefont.toString(toggleall);
-}
-
-
 /// the type of outline operation
 enum OutlineOp {
OutlineUp, // Move this header with text down

[LyX/master] More UI tuning following Scott's suggestions

[Juergen Spitzmueller]

commit 16918f97069cd664f817e87e11ffac697a9215e9
Author: Juergen Spitzmueller 
Date:   Sat May 5 18:48:43 2018 +0200

More UI tuning following Scott's suggestions
---
 src/frontends/qt4/ui/CharacterUi.ui |   72 +++
 1 files changed, 22 insertions(+), 50 deletions(-)

diff --git a/src/frontends/qt4/ui/CharacterUi.ui 
b/src/frontends/qt4/ui/CharacterUi.ui
index 4341b73..80db751 100644
--- a/src/frontends/qt4/ui/CharacterUi.ui
+++ b/src/frontends/qt4/ui/CharacterUi.ui
@@ -7,7 +7,7 @@
 0
 0
 523
-352
+365

   
   
@@ -243,56 +243,28 @@
 


-
+
  
-  
-   
-
- 
-  Qt::Vertical
- 
- 
-  QSizePolicy::Fixed
- 
- 
-  
-   20
-   20
-  
- 
-
-   
-   
-
- 
-  
-   
-Language
-   
-   
-Language:
-   
-   
-langCO
-   
-  
- 
- 
-  
-   
-
- 0
- 0
-
-   
-   
-Language
-   
-  
- 
-
-   
-  
+  
+   
+Language
+   
+   
+
+ 
+  
+   
+0
+0
+   
+  
+  
+   Language
+  
+ 
+
+   
+  
  
  
   

[LyX/master] Update sk.po

[Kornel Benko]

commit 1affb7257e7606bcf2097cdd74502beb5f529392
Author: Kornel Benko 
Date:   Sat May 5 19:23:20 2018 +0200

Update sk.po
---
 po/sk.po |8 ++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/po/sk.po b/po/sk.po
index 94a26aa..1e35e15 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: 2018-05-05 11:29+0200\n"
-"PO-Revision-Date: 2018-05-05 09:52+\n"
+"POT-Creation-Date: 2018-05-05 19:12+0200\n"
+"PO-Revision-Date: 2018-05-05 17:13+\n"
 "Last-Translator: Kornel Benko \n"
 "Language-Team: Slovak \n"
 "Language: sk\n"
@@ -3167,6 +3167,10 @@ msgstr "Na výš"
 msgid ""
 msgstr "Na šírk"
 
+#: src/frontends/qt4/ui/CharacterUi.ui:250
+msgid ""
+msgstr ""
+
 #: src/frontends/qt4/ui/PageLayoutUi.ui:162
 #: src/frontends/qt4/GuiDocument.cpp:1499
 msgid "Page Layout"

[LyX/master] Further BC fixes to GuiCharacter

[Juergen Spitzmueller]

commit 7be3805a658fde0ed75e247f3a38368da984bea6
Author: Juergen Spitzmueller 
Date:   Sat May 5 17:24:09 2018 +0200

Further BC fixes to GuiCharacter
---
 src/frontends/qt4/ButtonPolicy.cpp |2 +-
 src/frontends/qt4/GuiCharacter.cpp |6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/frontends/qt4/ButtonPolicy.cpp 
b/src/frontends/qt4/ButtonPolicy.cpp
index 5426271..3061d6a 100644
--- a/src/frontends/qt4/ButtonPolicy.cpp
+++ b/src/frontends/qt4/ButtonPolicy.cpp
@@ -595,7 +595,6 @@ void ButtonPolicy::Private::initOkApplyCancelAutoReadOnly()
state_machine_[INVALID][SMI_INVALID] = INVALID;
state_machine_[INVALID][SMI_READ_WRITE] = INVALID;
state_machine_[INVALID][SMI_VALID] = VALID;
-   state_machine_[INVALID][SMI_OKAY] = INITIAL;
state_machine_[INVALID][SMI_RESTORE] = INITIAL;
state_machine_[INVALID][SMI_READ_ONLY] = RO_INVALID;
state_machine_[INVALID][SMI_AUTOAPPLY] = AUTOAPPLY_CHANGED;
@@ -609,6 +608,7 @@ void ButtonPolicy::Private::initOkApplyCancelAutoReadOnly()
state_machine_[APPLIED][SMI_AUTOAPPLY] = AUTOAPPLY_INITIAL;
// State::AUTOAPPLY_INITIAL
state_machine_[AUTOAPPLY_INITIAL][SMI_AUTOAPPLY] = APPLIED;
+   state_machine_[AUTOAPPLY_INITIAL][SMI_APPLY] = AUTOAPPLY_INITIAL;
state_machine_[AUTOAPPLY_INITIAL][SMI_READ_ONLY] = RO_AUTOAPPLY;
state_machine_[AUTOAPPLY_INITIAL][SMI_VALID] = AUTOAPPLY_CHANGED;
state_machine_[AUTOAPPLY_INITIAL][SMI_INVALID] = AUTOAPPLY_CHANGED;
diff --git a/src/frontends/qt4/GuiCharacter.cpp 
b/src/frontends/qt4/GuiCharacter.cpp
index 5dd6dde..777ca1c 100644
--- a/src/frontends/qt4/GuiCharacter.cpp
+++ b/src/frontends/qt4/GuiCharacter.cpp
@@ -526,9 +526,6 @@ void GuiCharacter::paramsToDialog(Font const & font)
QString const lang = (font.language() == reset_language)
? "reset" : toqstr(font.language()->lang());
langCO->setCurrentIndex(findPos2nd(language, lang));
-   // disable the OK/Apply buttons, since we have no changes yet
-   if (!autoapplyCB->isChecked())
-   bc().setValid(false);
 }
 
 
@@ -568,6 +565,9 @@ bool GuiCharacter::initialiseParams(string const &)
setButtonsValid(true);
 
paramsToDialog(font_);
+   // Make sure that the bc is in the INITIAL state
+   if (bc().policy().buttonStatus(ButtonPolicy::OKAY))
+   bc().restore();
return true;
 }
 

[LyX/master] Fine-tune character dialog UI

[Juergen Spitzmueller]

commit 9c0bea33b6fdb98baddf864f710c481b99bb6504
Author: Juergen Spitzmueller 
Date:   Sat May 5 17:45:17 2018 +0200

Fine-tune character dialog UI
---
 src/frontends/qt4/ui/CharacterUi.ui |  550 ++-
 1 files changed, 282 insertions(+), 268 deletions(-)

diff --git a/src/frontends/qt4/ui/CharacterUi.ui 
b/src/frontends/qt4/ui/CharacterUi.ui
index 9f01b84..4341b73 100644
--- a/src/frontends/qt4/ui/CharacterUi.ui
+++ b/src/frontends/qt4/ui/CharacterUi.ui
@@ -17,301 +17,315 @@
true
   
   
-   
-
- 
-  Font Properties
- 
- 
-  
-   
+   
+
+ 
+  
+   
+Font Properties
+   
+   
 
- 
-  
-   Font family
-  
-  
-   Family:
-  
-  
-   familyCO
-  
- 
+ 
+  
+   
+
+ Font family
+
+
+ Family:
+
+
+ familyCO
+
+   
+  
+  
+   
+
+ 
+  0
+  0
+ 
+
+
+ Font family
+
+   
+  
+  
+   
+
+ Font series
+
+
+ Series:
+
+
+ seriesCO
+
+   
+  
+  
+   
+
+ 
+  0
+  0
+ 
+
+
+ Font series
+
+   
+  
+  
+   
+
+ Font shape
+
+
+ Shape:
+
+
+ shapeCO
+
+   
+  
+  
+   
+
+ 
+  0
+  0
+ 
+
+
+ Font shape
+
+   
+  
+  
+   
+
+ Font size
+
+
+ Size:
+
+
+ sizeCO
+
+   
+  
+  
+   
+
+ 
+  0
+  0
+ 
+
+
+ Font size
+
+   
+  
+ 
 
-
- 
-  
-   
-0
-0
-   
-  
-  
-   Font family
-  
- 
+   
+  
+ 
+ 
+  
+   
+Decoration
+   
+   
+
+ 
+  
+   
+
+ true
+
+
+ Font color
+
+
+ Color:
+
+
+ colorCO
+
+   
+  
+  
+   
+
+ 
+  0
+  0
+ 
+
+
+ Font color
+
+   
+  
+  
+   
+
+ Underlining:
+
+
+ ulineCO
+
+   
+  
+  
+   
+
+ 
+  0
+  0
+ 
+
+
+ Underlining of text
+
+   
+  
+  
+   
+
+ Strikethrough:
+
+
+ strikeCO
+
+   
+  
+  
+   
+
+ 
+  0
+  0
+ 
+
+
+ Strike-through text
+
+   
+  
+ 
 
 
- 
-  
-   Font series
+ 
+  
+   Qt::Vertical
   
-  
-   Series:
-  
-  
-   seriesCO
-  
- 
-
-
- 
-  
-   
-0
-0
-   
+  
+   QSizePolicy::Fixed
   
-  
-   Font series
+  
+   
+20
+36
+   
   
- 
-
-
- 
-  
-   Font shape
-  
-  
-   Shape:
-  
-  
-   shapeCO
-  
- 
-
-
- 
-  
-   
-0
-0
-   
-  
-  
-   Font shape
-  
- 
-
-
- 
-  
-   Font size
-  
-  
-   Size:
-  
-  
-   sizeCO
-  
- 
-
-
- 
-   

[LyX/master] de.po: update

[Juergen Spitzmueller]

commit 753b8afebae6e8fd3f81045684f7d8c71b4e941c
Author: Juergen Spitzmueller 
Date:   Sat May 5 18:57:26 2018 +0200

de.po: update
---
 po/de.gmo |  Bin 544429 -> 544464 bytes
 po/de.po  |  174 +++--
 2 files changed, 88 insertions(+), 86 deletions(-)

diff --git a/po/de.gmo b/po/de.gmo
index ad7f329..025ce74 100644
Binary files a/po/de.gmo and b/po/de.gmo differ
diff --git a/po/de.po b/po/de.po
index c6aef82..b7eb572 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: 2018-05-05 11:50+0200\n"
-"PO-Revision-Date: 2018-05-05 15:50+0100\n"
+"POT-Creation-Date: 2018-05-05 18:54+0200\n"
+"PO-Revision-Date: 2018-05-05 18:55+0100\n"
 "Last-Translator: Juergen Spitzmueller \n"
 "Language-Team: German \n"
 "Language: de\n"
@@ -488,7 +488,7 @@ msgstr ""
 "Optionen des Biblatex-Bibliographiebefehls. Konsultieren Sie das Biblatex-"
 "Handbuch für Einzelheiten."
 
-#: src/frontends/qt4/ui/BibtexUi.ui:283 src/frontends/qt4/ui/CharacterUi.ui:376
+#: src/frontends/qt4/ui/BibtexUi.ui:283 src/frontends/qt4/ui/CharacterUi.ui:362
 #: src/frontends/qt4/ui/CitationUi.ui:453
 #: src/frontends/qt4/ui/CompareHistoryUi.ui:183
 #: src/frontends/qt4/ui/CompareUi.ui:153 src/frontends/qt4/ui/DocumentUi.ui:67
@@ -660,7 +660,7 @@ msgstr "Zentriert"
 msgid "Right"
 msgstr "Rechts"
 
-#: src/frontends/qt4/ui/BoxUi.ui:299 src/frontends/qt4/ui/CharacterUi.ui:140
+#: src/frontends/qt4/ui/BoxUi.ui:299 src/frontends/qt4/ui/CharacterUi.ui:142
 #: src/frontends/qt4/ui/MathMatrixUi.ui:210
 msgid "Decoration"
 msgstr "Verzierung"
@@ -836,7 +836,7 @@ msgstr " Zweige:"
 msgid ":"
 msgstr ":"
 
-#: src/frontends/qt4/ui/BulletsUi.ui:44 src/frontends/qt4/ui/CharacterUi.ui:112
+#: src/frontends/qt4/ui/BulletsUi.ui:44 src/frontends/qt4/ui/CharacterUi.ui:114
 #: src/frontends/qt4/ui/DelimiterUi.ui:100
 msgid "Si:"
 msgstr "öße:"
@@ -965,69 +965,72 @@ msgstr "Diese Änderung ablehnen"
 msgid ""
 msgstr ""
 
-#: src/frontends/qt4/ui/CharacterUi.ui:23
+#: src/frontends/qt4/ui/CharacterUi.ui:25
 msgid "Font Properties"
 msgstr "Schrifteigenschaften"
 
-#: src/frontends/qt4/ui/CharacterUi.ui:31
-#: src/frontends/qt4/ui/CharacterUi.ui:50
+#: src/frontends/qt4/ui/CharacterUi.ui:33
+#: src/frontends/qt4/ui/CharacterUi.ui:52
 msgid "Font family"
 msgstr "Schriftfamilie"
 
-#: src/frontends/qt4/ui/CharacterUi.ui:34
+#: src/frontends/qt4/ui/CharacterUi.ui:36
 msgid "Fa:"
 msgstr ":"
 
-#: src/frontends/qt4/ui/CharacterUi.ui:57
-#: src/frontends/qt4/ui/CharacterUi.ui:76
+#: src/frontends/qt4/ui/CharacterUi.ui:59
+#: src/frontends/qt4/ui/CharacterUi.ui:78
 msgid "Font series"
 msgstr "Strichstärke"
 
-#: src/frontends/qt4/ui/CharacterUi.ui:60
+#: src/frontends/qt4/ui/CharacterUi.ui:62
 msgid ":"
 msgstr "Särke:"
 
-#: src/frontends/qt4/ui/CharacterUi.ui:83
-#: src/frontends/qt4/ui/CharacterUi.ui:102
+#: src/frontends/qt4/ui/CharacterUi.ui:85
+#: src/frontends/qt4/ui/CharacterUi.ui:104
 msgid "Font shape"
 msgstr "Schriftschnitt"
 
-#: src/frontends/qt4/ui/CharacterUi.ui:86
+#: src/frontends/qt4/ui/CharacterUi.ui:88
 msgid "S:"
 msgstr "Sch:"
 
-#: src/frontends/qt4/ui/CharacterUi.ui:109
-#: src/frontends/qt4/ui/CharacterUi.ui:128
+#: src/frontends/qt4/ui/CharacterUi.ui:111
+#: src/frontends/qt4/ui/CharacterUi.ui:130
 msgid "Font size"
 msgstr "Schriftgrad"
 
-#: src/frontends/qt4/ui/CharacterUi.ui:151
-#: src/frontends/qt4/ui/CharacterUi.ui:170
+#: src/frontends/qt4/ui/CharacterUi.ui:153
+#: src/frontends/qt4/ui/CharacterUi.ui:172
 msgid "Font color"
 msgstr "Schriftfarbe"
 
-#: src/frontends/qt4/ui/CharacterUi.ui:154
+#: src/frontends/qt4/ui/CharacterUi.ui:156
 msgid ":"
 msgstr "F:"
 
-#: src/frontends/qt4/ui/CharacterUi.ui:177
+#: src/frontends/qt4/ui/CharacterUi.ui:179
 msgid "U:"
 msgstr ":"
 
-#: src/frontends/qt4/ui/CharacterUi.ui:193
+#: src/frontends/qt4/ui/CharacterUi.ui:195
 msgid "Underlining of text"
 msgstr "Unterstreichung des Texts"
 
-#: src/frontends/qt4/ui/CharacterUi.ui:200
+#: src/frontends/qt4/ui/CharacterUi.ui:202
 msgid "S:"
 msgstr ":"
 
-#: src/frontends/qt4/ui/CharacterUi.ui:216
+#: src/frontends/qt4/ui/CharacterUi.ui:218
 msgid "Strike-through text"
 msgstr "Durchstreichung des Texts"
 
-#: src/frontends/qt4/ui/CharacterUi.ui:258
-#: src/frontends/qt4/ui/CharacterUi.ui:277
+#: src/frontends/qt4/ui/CharacterUi.ui:250
+msgid ""
+msgstr "S"
+
+#: src/frontends/qt4/ui/CharacterUi.ui:262
 #: src/frontends/qt4/ui/ListingsUi.ui:339 lib/layouts/bicaption.module:15
 #: lib/layouts/europasscv.layout:340 lib/layouts/europasscv.layout:373
 #: lib/layouts/europasscv.layout:380 lib/layouts/europecv.layout:247
@@ -1037,46 +1040,39 @@ msgstr "Durchstreichung des Texts"
 msgid "Language"
 msgstr "Sprache"
 
-#: src/frontends/qt4/ui/CharacterUi.ui:261
-#: src/frontends/qt4/ui/LanguageUi.ui:113
-#: