[LyX/master] ru.po: update from Yuriy.

2018-03-18 Thread Juergen Spitzmueller
commit 593a0956fab548e73884c8adfb1ae79cac392938
Author: Juergen Spitzmueller 
Date:   Sun Mar 18 18:42:50 2018 +0100

ru.po: update from Yuriy.
---
 po/ru.po |  151 +++--
 1 files changed, 47 insertions(+), 104 deletions(-)

diff --git a/po/ru.po b/po/ru.po
index 759b2aa..6c04d8a 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: LyX 2.3\n"
 "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n"
 "POT-Creation-Date: 2018-03-17 16:03-0400\n"
-"PO-Revision-Date: 2018-03-05 15:11+0200\n"
+"PO-Revision-Date: 2018-03-18 15:56+0200\n"
 "Last-Translator: Yuriy Skalko \n"
 "Language-Team: Russian \n"
 "Language: ru\n"
@@ -1900,6 +1900,8 @@ msgid ""
 "Clip to the coordinates specified below (bounding box for DVI/PS output, "
 "viewport for PDF output)"
 msgstr ""
+"Обрезать по координатам, указанным ниже (bounding box для вывода DVI/PS, "
+"viewport для вывода PDF)"
 
 #: src/frontends/qt4/ui/GraphicsUi.ui:350
 msgid "Clip to c"
@@ -1920,6 +1922,8 @@ msgid ""
 "Read coordinates from the file (bounding box value in case of PostScript "
 "files, graphic dimensions in case of other file types)"
 msgstr ""
+"Читать координаты из файла (значение bounding box для файлов PostScript, "
+"размеры изображения - для файлов других типов)"
 
 #: src/frontends/qt4/ui/GraphicsUi.ui:520
 #: src/frontends/qt4/ui/GraphicsUi.ui:527
@@ -1955,7 +1959,6 @@ msgid "Graphics Group"
 msgstr "Группа изображений"
 
 #: src/frontends/qt4/ui/GraphicsUi.ui:680
-#, fuzzy
 msgid "Assigned  group:"
 msgstr "П&рисоединено к группе:"
 
@@ -2153,7 +2156,6 @@ msgid "Listing Parameters"
 msgstr "Параметры листинга"
 
 #: src/frontends/qt4/ui/IncludeUi.ui:248
-#, fuzzy
 msgid ":"
 msgstr "Подпись:"
 
@@ -2170,12 +2172,10 @@ msgid " validation"
 msgstr "Пропускать проверку"
 
 #: src/frontends/qt4/ui/IncludeUi.ui:285
-#, fuzzy
 msgid " parameters"
 msgstr "До&полнительные параметры"
 
 #: src/frontends/qt4/ui/IncludeUi.ui:295
-#, fuzzy
 msgid ""
 "Pass content of the `Caption' field literally to LaTeX. Check this if you "
 "want to enter LaTeX code."
@@ -17322,9 +17322,8 @@ msgid "Palatino"
 msgstr "Palatino"
 
 #: lib/latexfonts:360 lib/latexfonts:368
-#, fuzzy
 msgid "ParaType Serif"
-msgstr "Bera Serif"
+msgstr "ParaType Serif"
 
 #: lib/latexfonts:374 lib/latexfonts:383 lib/latexfonts:390 lib/latexfonts:396
 msgid "Times Roman"
@@ -17355,9 +17354,8 @@ msgid "Utopia (Fourier)"
 msgstr "Utopia (Fourier)"
 
 #: lib/latexfonts:464
-#, fuzzy
 msgid "Bitstream Charter (XCharter)"
-msgstr "Bitstream Charter (Mathdesign)"
+msgstr "Bitstream Charter (XCharter)"
 
 #: lib/latexfonts:475
 msgid "Avant Garde"
@@ -17424,9 +17422,8 @@ msgid "Noto Sans"
 msgstr "Noto Sans"
 
 #: lib/latexfonts:606
-#, fuzzy
 msgid "ParaType Sans"
-msgstr "Bera Sans"
+msgstr "ParaType Sans"
 
 #: lib/latexfonts:614
 msgid "TeX Gyre Adventor"
@@ -17473,9 +17470,8 @@ msgid "Noto Mono"
 msgstr "Noto Mono"
 
 #: lib/latexfonts:702
-#, fuzzy
 msgid "ParaType Mono"
-msgstr "Bera Mono"
+msgstr "ParaType Mono"
 
 #: lib/latexfonts:710
 msgid "TeX Gyre Cursor"
@@ -18268,9 +18264,8 @@ msgid "Paragraph Settings...|P"
 msgstr "Настройки абзаца...|а"
 
 #: lib/ui/stdcontext.inc:361
-#, fuzzy
 msgid "Unify Graphics Groups|U"
-msgstr "Группа изображений"
+msgstr "Объединить группы изображений|б"
 
 #: lib/ui/stdcontext.inc:364
 msgid "Fullscreen Mode"
@@ -19423,9 +19418,8 @@ msgid "Update Master Document|a"
 msgstr "Обновить главный документ"
 
 #: lib/ui/stdmenus.inc:547
-#, fuzzy
 msgid "Cancel Background Process|P"
-msgstr "Закрашенный фон|З"
+msgstr "Отменить фоновый процесс|ф"
 
 #: lib/ui/stdmenus.inc:549
 msgid "Compressed|o"
@@ -20775,24 +20769,20 @@ msgid "cancelto"
 msgstr "cancelto"
 
 #: lib/ui/stdtoolbars.inc:469
-#, fuzzy
 msgid "Insert left/right side scripts (sideset)"
-msgstr "Вставка левых/правых боковых скриптов"
+msgstr "Сторонние индексы слева/справа (sideset)"
 
 #: lib/ui/stdtoolbars.inc:470
-#, fuzzy
 msgid "Insert right side scripts (sidesetr)"
-msgstr "Вставка правых скриптов"
+msgstr "Cторонние индексы справа (sidesetr)"
 
 #: lib/ui/stdtoolbars.inc:471
-#, fuzzy
 msgid "Insert left side scripts (sidesetl)"
-msgstr "Вставка левых скриптов"
+msgstr "Сторонние индексы слева (sidesetl)"
 
 #: lib/ui/stdtoolbars.inc:472
-#, fuzzy
 msgid "Insert side scripts (sidesetn)"
-msgstr "Вставка боковых скриптов"
+msgstr "Сторонние индексы (sidesetn)"
 
 #: lib/ui/stdtoolbars.inc:473
 msgid "overset"
@@ -24917,9 +24907,8 @@ msgid "LyX 2.2.x"
 msgstr "LyX 2.2.x"
 
 #: lib/configure.py:758
-#, fuzzy
 msgid "LyX 2.3.x"
-msgstr "LyX 2.0.x"
+msgstr "LyX 2.3.x"
 
 #: lib/configure.py:759
 msgid "CJK LyX 1.4.x (big5)"
@@ -25275,21 +25264,19 @@ msgstr ""
 "Пожалуйста проверьте что программное обеспечение, поддерживающее Вашу "
 "кодировку (%1$s), корректно установлено"
 
-# code point - место в коде?
 #: src/Buffer.cpp:1710
-#, fuzzy, 

[LyX/master] Open ExternalInset dialog on first tab for new insets

2018-03-18 Thread Juergen Spitzmueller
commit 126e0c3dac5a6b223d609a7bfa29295f19992987
Author: Juergen Spitzmueller 
Date:   Sun Mar 18 18:30:48 2018 +0100

Open ExternalInset dialog on first tab for new insets

Fixes: #11081
---
 src/frontends/qt4/GuiExternal.cpp |3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/frontends/qt4/GuiExternal.cpp 
b/src/frontends/qt4/GuiExternal.cpp
index f721bd2..87005fe 100644
--- a/src/frontends/qt4/GuiExternal.cpp
+++ b/src/frontends/qt4/GuiExternal.cpp
@@ -493,6 +493,9 @@ static void getCrop(external::ClipData & data,
 
 void GuiExternal::updateContents()
 {
+   if (params_.filename.empty())
+   tab->setCurrentIndex(0);
+
string const name =
params_.filename.outputFileName(fromqstr(bufferFilePath()));
fileED->setText(toqstr(name));


[LyX/2.3.2-staging] GuiDocument.cpp: change back alignment for column with package names

2018-03-18 Thread Juergen Spitzmueller
commit 91a15383f99eb0981b33c491021f27ff654f1a14
Author: Uwe Stöhr 
Date:   Sun Nov 5 13:39:09 2017 +0100

GuiDocument.cpp: change back alignment for column with package names

- as discussed in bug #10777 the first column should be left-aligned

(cherry picked from commit 56670d73224e3bc2b80943b789fa2364d00a552d)
---
 src/frontends/qt4/GuiDocument.cpp |3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/frontends/qt4/GuiDocument.cpp 
b/src/frontends/qt4/GuiDocument.cpp
index e063545..7e40ff6 100644
--- a/src/frontends/qt4/GuiDocument.cpp
+++ b/src/frontends/qt4/GuiDocument.cpp
@@ -1252,8 +1252,7 @@ GuiDocument::GuiDocument(GuiView & lv)
mathsModule->packagesTW->setCellWidget(i, 1, autoRB);
mathsModule->packagesTW->setCellWidget(i, 2, alwaysRB);
mathsModule->packagesTW->setCellWidget(i, 3, neverRB);
-   //center the table contents
-   pack->setTextAlignment(Qt::AlignHCenter);
+   //center the radio buttons
autoRB->setStyleSheet("margin-left:50%; margin-right:50%;");
alwaysRB->setStyleSheet("margin-left:50%; margin-right:50%;");
neverRB->setStyleSheet("margin-left:50%; margin-right:50%;");


[LyX/2.3.2-staging] GuiDocument.cpp: fix bug 10777

2018-03-18 Thread Juergen Spitzmueller
commit eb172be29b3c9154abd8af376c0acdfa37211d71
Author: Uwe Stöhr 
Date:   Thu Nov 2 22:25:26 2017 +0100

GuiDocument.cpp: fix bug 10777

- the column width must be as wide as the column header text
- also center the radiobuttons in the table
- also use alternating colors for the table rows

(cherry picked from commit a69f1a9e161c87cc58e1a2dcec1e174136190b89)
---
 src/frontends/qt4/GuiDocument.cpp |7 ++-
 src/frontends/qt4/ui/MathsUi.ui   |3 +++
 2 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/src/frontends/qt4/GuiDocument.cpp 
b/src/frontends/qt4/GuiDocument.cpp
index 560883e..e063545 100644
--- a/src/frontends/qt4/GuiDocument.cpp
+++ b/src/frontends/qt4/GuiDocument.cpp
@@ -1213,7 +1213,7 @@ GuiDocument::GuiDocument(GuiView & lv)
headers << qt_("Package") << qt_("Load automatically")
<< qt_("Load always") << qt_("Do not load");
mathsModule->packagesTW->setHorizontalHeaderLabels(headers);
-   setSectionResizeMode(mathsModule->packagesTW->horizontalHeader(), 
QHeaderView::Stretch);
+   setSectionResizeMode(mathsModule->packagesTW->horizontalHeader(), 
QHeaderView::ResizeToContents);
map const & packages = BufferParams::auto_packages();
mathsModule->packagesTW->setRowCount(packages.size());
int i = 0;
@@ -1252,6 +1252,11 @@ GuiDocument::GuiDocument(GuiView & lv)
mathsModule->packagesTW->setCellWidget(i, 1, autoRB);
mathsModule->packagesTW->setCellWidget(i, 2, alwaysRB);
mathsModule->packagesTW->setCellWidget(i, 3, neverRB);
+   //center the table contents
+   pack->setTextAlignment(Qt::AlignHCenter);
+   autoRB->setStyleSheet("margin-left:50%; margin-right:50%;");
+   alwaysRB->setStyleSheet("margin-left:50%; margin-right:50%;");
+   neverRB->setStyleSheet("margin-left:50%; margin-right:50%;");
 
connect(autoRB, SIGNAL(clicked()),
this, SLOT(change_adaptor()));
diff --git a/src/frontends/qt4/ui/MathsUi.ui b/src/frontends/qt4/ui/MathsUi.ui
index 8ee7c4e..380d76a 100644
--- a/src/frontends/qt4/ui/MathsUi.ui
+++ b/src/frontends/qt4/ui/MathsUi.ui
@@ -179,6 +179,9 @@
0
   
  
+ 
+  true
+ 
  
   4
  


[LyX/2.3.2-staging] Properly fix math packages table in Document Settings

2018-03-18 Thread Juergen Spitzmueller
commit 7927d71a08ee22ff43782e34ea9f4f94f65210e0
Author: Juergen Spitzmueller 
Date:   Sun Mar 18 12:11:26 2018 +0100

Properly fix math packages table in Document Settings

Fixes: #10777
(cherry picked from commit 3face5e119e27bf297bbaf647e8941bc6babd0c3)
---
 src/frontends/qt4/GuiDocument.cpp |   62 +--
 src/frontends/qt4/ui/MathsUi.ui   |  328 +++--
 status.23x|3 +
 3 files changed, 215 insertions(+), 178 deletions(-)

diff --git a/src/frontends/qt4/GuiDocument.cpp 
b/src/frontends/qt4/GuiDocument.cpp
index 7e40ff6..4020f17 100644
--- a/src/frontends/qt4/GuiDocument.cpp
+++ b/src/frontends/qt4/GuiDocument.cpp
@@ -1213,10 +1213,10 @@ GuiDocument::GuiDocument(GuiView & lv)
headers << qt_("Package") << qt_("Load automatically")
<< qt_("Load always") << qt_("Do not load");
mathsModule->packagesTW->setHorizontalHeaderLabels(headers);
-   setSectionResizeMode(mathsModule->packagesTW->horizontalHeader(), 
QHeaderView::ResizeToContents);
+   setSectionResizeMode(mathsModule->packagesTW->horizontalHeader(), 
QHeaderView::Stretch);
map const & packages = BufferParams::auto_packages();
mathsModule->packagesTW->setRowCount(packages.size());
-   int i = 0;
+   int packnum = 0;
for (map::const_iterator it = packages.begin();
 it != packages.end(); ++it) {
docstring const package = from_ascii(it->first);
@@ -1247,15 +1247,35 @@ GuiDocument::GuiDocument(GuiView & lv)
autoRB->setToolTip(autoTooltip);
alwaysRB->setToolTip(alwaysTooltip);
neverRB->setToolTip(neverTooltip);
+
+   // Pack the buttons in a layout in order to get proper alignment
+   QWidget * autoRBWidget = new QWidget();
+   QHBoxLayout * autoRBLayout = new QHBoxLayout(autoRBWidget);
+   autoRBLayout->addWidget(autoRB);
+   autoRBLayout->setAlignment(Qt::AlignCenter);
+   autoRBLayout->setContentsMargins(0, 0, 0, 0);
+   autoRBWidget->setLayout(autoRBLayout);
+
+   QWidget * alwaysRBWidget = new QWidget();
+   QHBoxLayout * alwaysRBLayout = new QHBoxLayout(alwaysRBWidget);
+   alwaysRBLayout->addWidget(alwaysRB);
+   alwaysRBLayout->setAlignment(Qt::AlignCenter);
+   alwaysRBLayout->setContentsMargins(0, 0, 0, 0);
+   alwaysRBWidget->setLayout(alwaysRBLayout);
+
+   QWidget * neverRBWidget = new QWidget();
+   QHBoxLayout * neverRBLayout = new QHBoxLayout(neverRBWidget);
+   neverRBLayout->addWidget(neverRB);
+   neverRBLayout->setAlignment(Qt::AlignCenter);
+   neverRBLayout->setContentsMargins(0, 0, 0, 0);
+   neverRBWidget->setLayout(neverRBLayout);
+
QTableWidgetItem * pack = new QTableWidgetItem(toqstr(package));
-   mathsModule->packagesTW->setItem(i, 0, pack);
-   mathsModule->packagesTW->setCellWidget(i, 1, autoRB);
-   mathsModule->packagesTW->setCellWidget(i, 2, alwaysRB);
-   mathsModule->packagesTW->setCellWidget(i, 3, neverRB);
-   //center the radio buttons
-   autoRB->setStyleSheet("margin-left:50%; margin-right:50%;");
-   alwaysRB->setStyleSheet("margin-left:50%; margin-right:50%;");
-   neverRB->setStyleSheet("margin-left:50%; margin-right:50%;");
+
+   mathsModule->packagesTW->setItem(packnum, 0, pack);
+   mathsModule->packagesTW->setCellWidget(packnum, 1, 
autoRBWidget);
+   mathsModule->packagesTW->setCellWidget(packnum, 2, 
alwaysRBWidget);
+   mathsModule->packagesTW->setCellWidget(packnum, 3, 
neverRBWidget);
 
connect(autoRB, SIGNAL(clicked()),
this, SLOT(change_adaptor()));
@@ -1263,7 +1283,7 @@ GuiDocument::GuiDocument(GuiView & lv)
this, SLOT(change_adaptor()));
connect(neverRB, SIGNAL(clicked()),
this, SLOT(change_adaptor()));
-   ++i;
+   ++packnum;
}
connect(mathsModule->allPackagesAutoPB, SIGNAL(clicked()),
this, SLOT(allPackagesAuto()));
@@ -3004,17 +3024,19 @@ void GuiDocument::applyView()
if (!item)
continue;
int row = mathsModule->packagesTW->row(item);
-   QRadioButton * rb = 
(QRadioButton*)mathsModule->packagesTW->cellWidget(row, 1);
+
+   QRadioButton * rb =
+   (QRadioButton*)mathsModule->packagesTW->cellWidget(row, 
1)->layout()->itemAt(0)->widget();
if (rb->isChecked()) {
bp_.use_package(it->first, BufferParams::package_auto);
continue;
  

[LyX/2.3.x] Update contributor.

2018-03-18 Thread Richard Heck
commit 25a176ee71250147ee2f792756e9e1fbfa881193
Author: Richard Heck 
Date:   Sun Mar 18 11:34:05 2018 -0400

Update contributor.
---
 lib/generate_contributions.py |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/generate_contributions.py b/lib/generate_contributions.py
index 2bb442c..c698ff3 100755
--- a/lib/generate_contributions.py
+++ b/lib/generate_contributions.py
@@ -871,8 +871,8 @@ contributors = [
  "23 December 2016",
  u"File opening enhancement"),
 
- contributor(u"Richard Heck",
- "rgheck () comcast ! net",
+ contributor(u"Richard Kimberly Heck",
+ "rikiheck () lyx ! org",
  "GPL",
  "GPL Statement",
  "m=117501689204059",


[LyX/master] Update contributor.

2018-03-18 Thread Richard Heck
commit a5c859f863e874aca129260ed44fd6ddd1bd63e9
Author: Richard Heck 
Date:   Sun Mar 18 11:34:38 2018 -0400

Update contributor.
---
 lib/generate_contributions.py |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/generate_contributions.py b/lib/generate_contributions.py
index 75710d3..e3d966a 100755
--- a/lib/generate_contributions.py
+++ b/lib/generate_contributions.py
@@ -879,8 +879,8 @@ contributors = [
  "23 December 2016",
  u"File opening enhancement"),
 
- contributor(u"Richard Heck",
- "rgheck () comcast ! net",
+ contributor(u"Richard Kimberly Heck",
+ "rikiheck () lyx ! org",
  "GPL",
  "GPL Statement",
  "m=117501689204059",


[LyX/2.3.x] Set branch tag, per Jürgen's suggestion.

2018-03-18 Thread Richard Heck
commit d9f7453671c16ef16f00124993e0cd4405053f01
Author: Richard Heck 
Date:   Sun Mar 18 11:18:54 2018 -0400

Set branch tag, per Jürgen's suggestion.
---
 po/postats.py |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/po/postats.py b/po/postats.py
index fe48651..068377f 100755
--- a/po/postats.py
+++ b/po/postats.py
@@ -31,7 +31,7 @@ from __future__ import print_function
 # modify this when you change branch
 # Note that an empty lyx_branch variable (ie svn trunk)
 # will "do the right thing".
-lyx_branch=""
+lyx_branch="2.3.x"
 # these po-files will be skipped:
 ommitted = ('en.po')
 


[LyX/master] Properly fix math packages table in Document Settings

2018-03-18 Thread Juergen Spitzmueller
commit 3face5e119e27bf297bbaf647e8941bc6babd0c3
Author: Juergen Spitzmueller 
Date:   Sun Mar 18 12:11:26 2018 +0100

Properly fix math packages table in Document Settings

Fixes: #10777
---
 src/frontends/qt4/GuiDocument.cpp |   55 +--
 src/frontends/qt4/ui/MathsUi.ui   |  328 +++--
 2 files changed, 208 insertions(+), 175 deletions(-)

diff --git a/src/frontends/qt4/GuiDocument.cpp 
b/src/frontends/qt4/GuiDocument.cpp
index 8149b50..b6f1f12 100644
--- a/src/frontends/qt4/GuiDocument.cpp
+++ b/src/frontends/qt4/GuiDocument.cpp
@@ -1212,7 +1212,7 @@ GuiDocument::GuiDocument(GuiView & lv)
headers << qt_("Package") << qt_("Load automatically")
<< qt_("Load always") << qt_("Do not load");
mathsModule->packagesTW->setHorizontalHeaderLabels(headers);
-   setSectionResizeMode(mathsModule->packagesTW->horizontalHeader(), 
QHeaderView::ResizeToContents);
+   setSectionResizeMode(mathsModule->packagesTW->horizontalHeader(), 
QHeaderView::Stretch);
map const & packages = BufferParams::auto_packages();
mathsModule->packagesTW->setRowCount(packages.size());
int packnum = 0;
@@ -1245,15 +1245,34 @@ GuiDocument::GuiDocument(GuiView & lv)
autoRB->setToolTip(autoTooltip);
alwaysRB->setToolTip(alwaysTooltip);
neverRB->setToolTip(neverTooltip);
+
+   // Pack the buttons in a layout in order to get proper alignment
+   QWidget * autoRBWidget = new QWidget();
+   QHBoxLayout * autoRBLayout = new QHBoxLayout(autoRBWidget);
+   autoRBLayout->addWidget(autoRB);
+   autoRBLayout->setAlignment(Qt::AlignCenter);
+   autoRBLayout->setContentsMargins(0, 0, 0, 0);
+   autoRBWidget->setLayout(autoRBLayout);
+
+   QWidget * alwaysRBWidget = new QWidget();
+   QHBoxLayout * alwaysRBLayout = new QHBoxLayout(alwaysRBWidget);
+   alwaysRBLayout->addWidget(alwaysRB);
+   alwaysRBLayout->setAlignment(Qt::AlignCenter);
+   alwaysRBLayout->setContentsMargins(0, 0, 0, 0);
+   alwaysRBWidget->setLayout(alwaysRBLayout);
+
+   QWidget * neverRBWidget = new QWidget();
+   QHBoxLayout * neverRBLayout = new QHBoxLayout(neverRBWidget);
+   neverRBLayout->addWidget(neverRB);
+   neverRBLayout->setAlignment(Qt::AlignCenter);
+   neverRBLayout->setContentsMargins(0, 0, 0, 0);
+   neverRBWidget->setLayout(neverRBLayout);
+
QTableWidgetItem * pack = new QTableWidgetItem(toqstr(package));
mathsModule->packagesTW->setItem(packnum, 0, pack);
-   mathsModule->packagesTW->setCellWidget(packnum, 1, autoRB);
-   mathsModule->packagesTW->setCellWidget(packnum, 2, alwaysRB);
-   mathsModule->packagesTW->setCellWidget(packnum, 3, neverRB);
-   //center the radio buttons
-   autoRB->setStyleSheet("margin-left:50%; margin-right:50%;");
-   alwaysRB->setStyleSheet("margin-left:50%; margin-right:50%;");
-   neverRB->setStyleSheet("margin-left:50%; margin-right:50%;");
+   mathsModule->packagesTW->setCellWidget(packnum, 1, 
autoRBWidget);
+   mathsModule->packagesTW->setCellWidget(packnum, 2, 
alwaysRBWidget);
+   mathsModule->packagesTW->setCellWidget(packnum, 3, 
neverRBWidget);
 
connect(autoRB, SIGNAL(clicked()),
this, SLOT(change_adaptor()));
@@ -3000,17 +3019,19 @@ void GuiDocument::applyView()
if (!item)
continue;
int row = mathsModule->packagesTW->row(item);
-   QRadioButton * rb = 
(QRadioButton*)mathsModule->packagesTW->cellWidget(row, 1);
+
+   QRadioButton * rb =
+   (QRadioButton*)mathsModule->packagesTW->cellWidget(row, 
1)->layout()->itemAt(0)->widget();
if (rb->isChecked()) {
bp_.use_package(it->first, BufferParams::package_auto);
continue;
}
-   rb = (QRadioButton*)mathsModule->packagesTW->cellWidget(row, 2);
+   rb = (QRadioButton*)mathsModule->packagesTW->cellWidget(row, 
2)->layout()->itemAt(0)->widget();
if (rb->isChecked()) {
bp_.use_package(it->first, BufferParams::package_on);
continue;
}
-   rb = (QRadioButton*)mathsModule->packagesTW->cellWidget(row, 3);
+   rb = (QRadioButton*)mathsModule->packagesTW->cellWidget(row, 
3)->layout()->itemAt(0)->widget();
if (rb->isChecked())
bp_.use_package(it->first, BufferParams::package_off);
}
@@ -3545,17 +3566,20 @@ void GuiDocument::paramsToDialog()
  

r41187 - www-user/trunk/farm/cookbook/LyX

2018-03-18 Thread spitz
Author: spitz
Date: Sun Mar 18 10:28:07 2018
New Revision: 41187
URL: http://www.lyx.org/trac/changeset/41187

Log:
i18n_trunk.inc: correct authorship

Modified:
   www-user/trunk/farm/cookbook/LyX/i18n_trunk.inc

Modified: www-user/trunk/farm/cookbook/LyX/i18n_trunk.inc
==
--- www-user/trunk/farm/cookbook/LyX/i18n_trunk.inc Sun Mar 18 10:26:09 
2018(r41186)
+++ www-user/trunk/farm/cookbook/LyX/i18n_trunk.inc Sun Mar 18 10:28:07 
2018(r41187)
@@ -12,8 +12,8 @@
 array ( 'langcode' => 'cs', "date" => "2018-02-24",
 "msg_tr" => 6877, "msg_fu" => 217, "msg_nt" => 148,
 "translator" => "Pavel Sanda", "email" => "sanda () lyx ! org"),
-array ( 'langcode' => 'de', "date" => "2018-01-27",
-"msg_tr" => 7226, "msg_fu" => 15, "msg_nt" => 1,
+array ( 'langcode' => 'de', "date" => "2018-03-18",
+"msg_tr" => 7242, "msg_fu" => 0, "msg_nt" => 0,
 "translator" => "Juergen Spitzmueller", "email" => "spitz () lyx ! org"),
 array ( 'langcode' => 'el', "date" => "2018-02-19",
 "msg_tr" => 4328, "msg_fu" => 127, "msg_nt" => 2787,
@@ -26,7 +26,7 @@
 "translator" => "Inaki Larranaga Murgoitio", "email" => "dooteo () zundan ! 
com"),
 array ( 'langcode' => 'fi', "date" => "2017-11-14",
 "msg_tr" => 5317, "msg_fu" => 686, "msg_nt" => 1239,
-"translator" => "Jean-Pierre Chrtien", "email" => "jeanpierre ! chretien 
() free ! fr"),
+"translator" => "Jari-Matti Mkel", "email" => "jmjm () iki ! fi"),
 array ( 'langcode' => 'fr', "date" => "2018-02-21",
 "msg_tr" => 7203, "msg_fu" => 31, "msg_nt" => 8,
 "translator" => "Jean-Pierre Chrtien", "email" => "jeanpierre ! chretien 
() free ! fr"),


r41186 - www-user/trunk/farm/cookbook/LyX

2018-03-18 Thread spitz
Author: spitz
Date: Sun Mar 18 10:26:09 2018
New Revision: 41186
URL: http://www.lyx.org/trac/changeset/41186

Log:
i18n.inc: correct authorship

Modified:
   www-user/trunk/farm/cookbook/LyX/i18n.inc

Modified: www-user/trunk/farm/cookbook/LyX/i18n.inc
==
--- www-user/trunk/farm/cookbook/LyX/i18n.inc   Sun Mar 18 07:59:00 2018
(r41185)
+++ www-user/trunk/farm/cookbook/LyX/i18n.inc   Sun Mar 18 10:26:09 2018
(r41186)
@@ -12,8 +12,8 @@
 array ( 'langcode' => 'cs', "date" => "2018-02-24",
 "msg_tr" => 6874, "msg_fu" => 202, "msg_nt" => 147,
 "translator" => "Pavel Sanda", "email" => "sanda () lyx ! org"),
-array ( 'langcode' => 'de', "date" => "2018-01-28",
-"msg_tr" => 7219, "msg_fu" => 4, "msg_nt" => 0,
+array ( 'langcode' => 'de', "date" => "2018-03-18",
+"msg_tr" => 7223, "msg_fu" => 0, "msg_nt" => 0,
 "translator" => "Juergen Spitzmueller", "email" => "spitz () lyx ! org"),
 array ( 'langcode' => 'el', "date" => "2018-02-19",
 "msg_tr" => 4342, "msg_fu" => 106, "msg_nt" => 2775,
@@ -26,9 +26,9 @@
 "translator" => "Inaki Larranaga Murgoitio", "email" => "dooteo () zundan ! 
com"),
 array ( 'langcode' => 'fi', "date" => "2017-11-14",
 "msg_tr" => 5330, "msg_fu" => 663, "msg_nt" => 1230,
-"translator" => "Jean-Pierre Chrtien", "email" => "jeanpierre ! chretien 
() free ! fr"),
-array ( 'langcode' => 'fr', "date" => "2018-02-21",
-"msg_tr" => 7219, "msg_fu" => 4, "msg_nt" => 0,
+"translator" => "Jari-Matti Mkel", "email" => "jmjm () iki ! fi"),
+array ( 'langcode' => 'fr', "date" => "2018-03-18",
+"msg_tr" => 7223, "msg_fu" => 0, "msg_nt" => 0,
 "translator" => "Jean-Pierre Chrtien", "email" => "jeanpierre ! chretien 
() free ! fr"),
 array ( 'langcode' => 'he', "date" => "2015-04-03",
 "msg_tr" => 3855, "msg_fu" => 1696, "msg_nt" => 1672,
@@ -63,11 +63,11 @@
 array ( 'langcode' => 'pt_PT', "date" => "2014-10-03",
 "msg_tr" => 6125, "msg_fu" => 747, "msg_nt" => 351,
 "translator" => "Jorge Pinto", "email" => "antelo ! jorge () gmail ! com"),
-array ( 'langcode' => 'ru', "date" => "2018-03-05",
-"msg_tr" => 7219, "msg_fu" => 4, "msg_nt" => 0,
+array ( 'langcode' => 'ru', "date" => "2018-03-18",
+"msg_tr" => 7223, "msg_fu" => 0, "msg_nt" => 0,
 "translator" => "Yuriy Skalko", "email" => "yuriy ! skalko () gmail ! com"),
-array ( 'langcode' => 'sk', "date" => "2018-02-26",
-"msg_tr" => 7219, "msg_fu" => 4, "msg_nt" => 0,
+array ( 'langcode' => 'sk', "date" => "2018-03-17",
+"msg_tr" => 7223, "msg_fu" => 0, "msg_nt" => 0,
 "translator" => "Kornel Benko", "email" => "kornel () lyx ! org"),
 array ( 'langcode' => 'sv', "date" => "2018-02-01",
 "msg_tr" => 7219, "msg_fu" => 4, "msg_nt" => 0,


[LyX/2.3.x] fi.po: correct authorship

2018-03-18 Thread Juergen Spitzmueller
commit 0de3f4e2c592b5abf46edfd401f127eab7eeb32d
Author: Juergen Spitzmueller 
Date:   Sun Mar 18 10:17:24 2018 +0100

fi.po: correct authorship
---
 po/fi.po |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/po/fi.po b/po/fi.po
index f4692db..c99b71f 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -74,7 +74,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n"
 "POT-Creation-Date: 2018-03-17 15:55-0400\n"
 "PO-Revision-Date: 2017-11-14 17:46+0200\n"
-"Last-Translator: Jean-Pierre Chrétien \n"
+"Last-Translator: Jari-Matti Mäkelä \n"
 "Language-Team: Finnish \n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"


[LyX/master] fi.po: correct authorship

2018-03-18 Thread Juergen Spitzmueller
commit 40c290ac27f22868d9310007e06b1cbe6ede42d6
Author: Juergen Spitzmueller 
Date:   Sun Mar 18 10:16:52 2018 +0100

fi.po: correct authorship
---
 po/fi.po |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/po/fi.po b/po/fi.po
index 9a27443..d55fa14 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -74,7 +74,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n"
 "POT-Creation-Date: 2018-03-17 16:03-0400\n"
 "PO-Revision-Date: 2017-11-14 17:46+0200\n"
-"Last-Translator: Jean-Pierre Chrétien \n"
+"Last-Translator: Jari-Matti Mäkelä \n"
 "Language-Team: Finnish \n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"


[LyX/2.3.x] ru.po: update from Yuriy

2018-03-18 Thread Juergen Spitzmueller
commit 935aba005fc9736acf4e05f8ea2513370845050a
Author: Juergen Spitzmueller 
Date:   Sun Mar 18 09:59:48 2018 +0100

ru.po: update from Yuriy
---
 po/ru.gmo |  Bin 660442 -> 660933 bytes
 po/ru.po  |   53 +
 2 files changed, 5 insertions(+), 48 deletions(-)

diff --git a/po/ru.gmo b/po/ru.gmo
index 44ef87c..58d8f5b 100644
Binary files a/po/ru.gmo and b/po/ru.gmo differ
diff --git a/po/ru.po b/po/ru.po
index bbe8f9b..f6c2313 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: LyX 2.3\n"
 "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n"
 "POT-Creation-Date: 2018-03-17 15:55-0400\n"
-"PO-Revision-Date: 2018-03-05 15:11+0200\n"
+"PO-Revision-Date: 2018-03-18 09:52+0200\n"
 "Last-Translator: Yuriy Skalko \n"
 "Language-Team: Russian \n"
 "Language: ru\n"
@@ -20723,24 +20723,20 @@ msgid "cancelto"
 msgstr "cancelto"
 
 #: lib/ui/stdtoolbars.inc:468
-#, fuzzy
 msgid "Insert left/right side scripts (sideset)"
-msgstr "Вставка левых/правых боковых скриптов"
+msgstr "Сторонние индексы слева/справа (sideset)"
 
 #: lib/ui/stdtoolbars.inc:469
-#, fuzzy
 msgid "Insert right side scripts (sidesetr)"
-msgstr "Вставка правых скриптов"
+msgstr "Cторонние индексы справа (sidesetr)"
 
 #: lib/ui/stdtoolbars.inc:470
-#, fuzzy
 msgid "Insert left side scripts (sidesetl)"
-msgstr "Вставка левых скриптов"
+msgstr "Сторонние индексы слева (sidesetl)"
 
 #: lib/ui/stdtoolbars.inc:471
-#, fuzzy
 msgid "Insert side scripts (sidesetn)"
-msgstr "Вставка боковых скриптов"
+msgstr "Сторонние индексы (sidesetn)"
 
 #: lib/ui/stdtoolbars.inc:472
 msgid "overset"
@@ -33671,36 +33667,15 @@ msgstr "Неизвестный пользователь"
 #~ msgid " et al."
 #~ msgstr " и др."
 
-#~ msgid ", [[separate author names in citation, except for last name]]"
-#~ msgstr ", "
-
-#~ msgid ", and [[separate name of last author in citation]]"
-#~ msgstr " и "
-
-#~ msgid " and [[separate two authors in citation]]"
-#~ msgstr " и "
-
-#~ msgid "/"
-#~ msgstr "/"
-
-#~ msgid "pp."
-#~ msgstr "с."
-
 #~ msgid "ed."
 #~ msgstr "ред."
 
-#~ msgid "eds."
-#~ msgstr "ред."
-
 #~ msgid "vol."
 #~ msgstr "том"
 
 #~ msgid "no."
 #~ msgstr "номер"
 
-#~ msgid "in"
-#~ msgstr "в"
-
 #~ msgid ""
 #~ "Use font ligatures -- and --- instead of \\textendash and \\textemdash "
 #~ "for en- and em-dashes"
@@ -33891,24 +33866,6 @@ msgstr "Неизвестный пользователь"
 #~ msgid "Conversion Failed!"
 #~ msgstr "Конверсия не выполнена"
 
-#~ msgid "``text''"
-#~ msgstr "“текст”"
-
-#~ msgid "''text''"
-#~ msgstr "”текст”"
-
-#~ msgid ",,text``"
-#~ msgstr "„текст“"
-
-#~ msgid ",,text''"
-#~ msgstr "„текст”"
-
-#~ msgid "<>"
-#~ msgstr "«текст»"
-
-#~ msgid ">>text<<"
-#~ msgstr "»текст«"
-
 #~ msgid "Jump back"
 #~ msgstr "Вернуться обратно"
 


[LyX/2.3.x] Merge branch '2.3.x' of git.lyx.org:lyx into 2.3.x

2018-03-18 Thread Juergen Spitzmueller
commit 43e5594dfd18e9037b2358f2c6e2cad5cbec1c0a
Merge: 935aba0 b22c640
Author: Juergen Spitzmueller 
Date:   Sun Mar 18 10:00:21 2018 +0100

Merge branch '2.3.x' of git.lyx.org:lyx into 2.3.x

 po/fr.gmo |  Bin 542418 -> 542880 bytes
 po/fr.po  |   16 +++-
 2 files changed, 7 insertions(+), 9 deletions(-)


[LyX/2.3.x] Update fr.po

2018-03-18 Thread jpc
commit b22c640919766b6a278773dc247f2ee5c5bd9bf7
Author: jpc 
Date:   Sun Mar 18 09:55:53 2018 +0100

   Update fr.po
---
 po/fr.gmo |  Bin 542418 -> 542880 bytes
 po/fr.po  |   16 +++-
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/po/fr.gmo b/po/fr.gmo
index 8469401..4782099 100644
Binary files a/po/fr.gmo and b/po/fr.gmo differ
diff --git a/po/fr.po b/po/fr.po
index 41211d8..44743fa 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -343,12 +343,14 @@
 # -
 # 21 février 2018 : revue traduction strike/cross out avant 2.3.0
 # -
+# 18 mars 2018 : traduction message sideset (2.3.0 est publié)
+# -
 msgid ""
 msgstr ""
 "Project-Id-Version: LyX 2.3\n"
 "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n"
 "POT-Creation-Date: 2018-03-17 15:55-0400\n"
-"PO-Revision-Date: 2018-02-21 14:06+0100\n"
+"PO-Revision-Date: 2018-03-18 09:54+0100\n"
 "Last-Translator: Jean-Pierre Chrétien \n"
 "Language-Team: lyxfr\n"
 "Language: fr\n"
@@ -21127,24 +21129,20 @@ msgid "cancelto"
 msgstr "cancelto"
 
 #: lib/ui/stdtoolbars.inc:468
-#, fuzzy
 msgid "Insert left/right side scripts (sideset)"
-msgstr "Insérer des indices/exposants latéraux droits/gauches"
+msgstr "Insérer des scripts latéraux droits/gauches (sideset)"
 
 #: lib/ui/stdtoolbars.inc:469
-#, fuzzy
 msgid "Insert right side scripts (sidesetr)"
-msgstr "Insérer des indices/exposants latéraux droits"
+msgstr "Insérer des scripts latéraux droits (sidesetr)"
 
 #: lib/ui/stdtoolbars.inc:470
-#, fuzzy
 msgid "Insert left side scripts (sidesetl)"
-msgstr "Insérer des indices/exposants latéraux gauches"
+msgstr "Insérer des scripts latéraux gauches (sidesetl)"
 
 #: lib/ui/stdtoolbars.inc:471
-#, fuzzy
 msgid "Insert side scripts (sidesetn)"
-msgstr "Insérer des indices/exposants latéraux"
+msgstr "Insérer des scripts latéraux (sidesetn)"
 
 #: lib/ui/stdtoolbars.inc:472
 msgid "overset"


[LyX/master] de.po

2018-03-18 Thread Juergen Spitzmueller
commit 318f403474803fcf6e04c87a9162f8d1c940f1a4
Author: Juergen Spitzmueller 
Date:   Sun Mar 18 09:55:14 2018 +0100

de.po
---
 po/de.gmo |  Bin 541750 -> 543310 bytes
 po/de.po  |   54 ++
 2 files changed, 22 insertions(+), 32 deletions(-)

diff --git a/po/de.gmo b/po/de.gmo
index 87d2931..fbc086f 100644
Binary files a/po/de.gmo and b/po/de.gmo differ
diff --git a/po/de.po b/po/de.po
index 7f545d2..8749fb2 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-03-17 16:03-0400\n"
-"PO-Revision-Date: 2018-01-27 11:19+0100\n"
+"POT-Creation-Date: 2018-03-18 09:44+0100\n"
+"PO-Revision-Date: 2018-03-18 09:50+0100\n"
 "Last-Translator: Juergen Spitzmueller \n"
 "Language-Team: German \n"
 "Language: de\n"
@@ -2251,9 +2251,8 @@ msgid "Listing Parameters"
 msgstr "Listing-Parameter"
 
 #: src/frontends/qt4/ui/IncludeUi.ui:248
-#, fuzzy
 msgid ":"
-msgstr "Legende:"
+msgstr "Le:"
 
 #: src/frontends/qt4/ui/IncludeUi.ui:275
 #: src/frontends/qt4/ui/ListingsSettingsUi.ui:79
@@ -2270,17 +2269,16 @@ msgid " validation"
 msgstr "Überprüfung "
 
 #: src/frontends/qt4/ui/IncludeUi.ui:285
-#, fuzzy
 msgid " parameters"
 msgstr " Parameter"
 
 #: src/frontends/qt4/ui/IncludeUi.ui:295
-#, fuzzy
 msgid ""
 "Pass content of the `Caption' field literally to LaTeX. Check this if you "
 "want to enter LaTeX code."
 msgstr ""
-"Übergebe den Inhalt des Feldes ,Name` unformatiert an LaTeX. Aktivieren Sie "
+"Übergebe den Inhalt des Feldes ,Legende` unformatiert an LaTeX. Aktivieren"
+" Sie "
 "dies, wenn Sie LaTeX-Code eingeben wollen."
 
 #: src/frontends/qt4/ui/IndexUi.ui:59 src/frontends/qt4/ui/IndicesUi.ui:143
@@ -17452,9 +17450,8 @@ msgid "Palatino"
 msgstr "Palatino"
 
 #: lib/latexfonts:360 lib/latexfonts:368
-#, fuzzy
 msgid "ParaType Serif"
-msgstr "Bera Serif"
+msgstr "ParaType Serif"
 
 #: lib/latexfonts:374 lib/latexfonts:383 lib/latexfonts:390 lib/latexfonts:396
 msgid "Times Roman"
@@ -17485,9 +17482,8 @@ msgid "Utopia (Fourier)"
 msgstr "Utopia (Fourier)"
 
 #: lib/latexfonts:464
-#, fuzzy
 msgid "Bitstream Charter (XCharter)"
-msgstr "Bitstream Charter (Mathdesign)"
+msgstr "Bitstream Charter (XCharter)"
 
 #: lib/latexfonts:475
 msgid "Avant Garde"
@@ -17554,9 +17550,8 @@ msgid "Noto Sans"
 msgstr "Noto Sans"
 
 #: lib/latexfonts:606
-#, fuzzy
 msgid "ParaType Sans"
-msgstr "Bera Sans"
+msgstr "ParaType Sans"
 
 #: lib/latexfonts:614
 msgid "TeX Gyre Adventor"
@@ -17603,9 +17598,8 @@ msgid "Noto Mono"
 msgstr "Noto Mono"
 
 #: lib/latexfonts:702
-#, fuzzy
 msgid "ParaType Mono"
-msgstr "Bera Mono"
+msgstr "ParaType Mono"
 
 #: lib/latexfonts:710
 msgid "TeX Gyre Cursor"
@@ -18389,9 +18383,8 @@ msgid "Paragraph Settings...|P"
 msgstr "Absatz-Einstellungen...|A"
 
 #: lib/ui/stdcontext.inc:361
-#, fuzzy
 msgid "Unify Graphics Groups|U"
-msgstr "Grafikgruppe"
+msgstr "Grafikgruppe zusammenstellen|z"
 
 #: lib/ui/stdcontext.inc:364
 msgid "Fullscreen Mode"
@@ -20893,24 +20886,20 @@ msgid "cancelto"
 msgstr "cancelto"
 
 #: lib/ui/stdtoolbars.inc:469
-#, fuzzy
 msgid "Insert left/right side scripts (sideset)"
-msgstr "Indices rechts/links einfügen"
+msgstr "Indices rechts/links einfügen (sideset)"
 
 #: lib/ui/stdtoolbars.inc:470
-#, fuzzy
 msgid "Insert right side scripts (sidesetr)"
-msgstr "Indices rechts einfügen"
+msgstr "Indices rechts einfügen (sitesetr)"
 
 #: lib/ui/stdtoolbars.inc:471
-#, fuzzy
 msgid "Insert left side scripts (sidesetl)"
-msgstr "Indices links einfügen"
+msgstr "Indices links einfügen (sidesetl)"
 
 #: lib/ui/stdtoolbars.inc:472
-#, fuzzy
 msgid "Insert side scripts (sidesetn)"
-msgstr "Seitliche Indices einfügen"
+msgstr "Seitliche Indices einfügen (sitesetn)"
 
 #: lib/ui/stdtoolbars.inc:473
 msgid "overset"
@@ -25036,9 +25025,8 @@ msgid "LyX 2.2.x"
 msgstr "LyX 2.2.x"
 
 #: lib/configure.py:758
-#, fuzzy
 msgid "LyX 2.3.x"
-msgstr "LyX 2.0.x"
+msgstr "LyX 2.3.x"
 
 #: lib/configure.py:759
 msgid "CJK LyX 1.4.x (big5)"
@@ -28899,11 +28887,12 @@ msgid "ERROR: LyX wasn't able to find the CREDITS 
file\n"
 msgstr "Fehler: LyX konnte die Datei CREDITS nicht finden\n"
 
 #: src/frontends/qt4/GuiAbout.cpp:52 src/frontends/qt4/GuiAbout.cpp:57
-#, fuzzy
 msgid ""
 "Please install correctly to estimate the great\n"
 "amount of work other people have done for the LyX project."
-msgstr "an Arbeit abschätzen zu können, die andere in LyX gesteckt haben."
+msgstr ""
+"Bitte installieren Sie diese Datei, um die große Menge\n"
+"an Arbeit abschätzen zu können, die andere in LyX gesteckt haben."
 
 #: src/frontends/qt4/GuiAbout.cpp:56
 msgid "ERROR: LyX wasn't able to read the CREDITS file\n"
@@ -28914,11 +28903,12 @@ msgid "ERROR: LyX wasn't able to find the 
RELEASE-NOTES file\n"
 msgstr "Fehler: LyX konnte die Datei RELEASE-NOTES nicht finden\n"
 
 #: 

[LyX/2.3.x] de.po

2018-03-18 Thread Juergen Spitzmueller
commit d706a2a291c5d2bae141010d9f161098ed6beb6a
Author: Juergen Spitzmueller 
Date:   Sun Mar 18 08:36:28 2018 +0100

de.po
---
 po/de.gmo |  Bin 540487 -> 540903 bytes
 po/de.po  |   14 +-
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/po/de.gmo b/po/de.gmo
index 3a34cc6..94ab697 100644
Binary files a/po/de.gmo and b/po/de.gmo differ
diff --git a/po/de.po b/po/de.po
index 03be462..dafd45d 100644
--- a/po/de.po
+++ b/po/de.po
@@ -96,7 +96,7 @@ msgstr ""
 "Project-Id-Version: LyX 2.3\n"
 "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n"
 "POT-Creation-Date: 2018-03-17 15:55-0400\n"
-"PO-Revision-Date: 2018-01-28 08:39+0100\n"
+"PO-Revision-Date: 2018-03-18 08:35+0100\n"
 "Last-Translator: Juergen Spitzmueller \n"
 "Language-Team: German \n"
 "Language: de\n"
@@ -20839,24 +20839,20 @@ msgid "cancelto"
 msgstr "cancelto"
 
 #: lib/ui/stdtoolbars.inc:468
-#, fuzzy
 msgid "Insert left/right side scripts (sideset)"
-msgstr "Indices rechts/links einfügen"
+msgstr "Indices rechts/links einfügen (sideset)"
 
 #: lib/ui/stdtoolbars.inc:469
-#, fuzzy
 msgid "Insert right side scripts (sidesetr)"
-msgstr "Indices rechts einfügen"
+msgstr "Indices rechts einfügen (sitesetr)"
 
 #: lib/ui/stdtoolbars.inc:470
-#, fuzzy
 msgid "Insert left side scripts (sidesetl)"
-msgstr "Indices links einfügen"
+msgstr "Indices links einfügen (sidesetl)"
 
 #: lib/ui/stdtoolbars.inc:471
-#, fuzzy
 msgid "Insert side scripts (sidesetn)"
-msgstr "Seitliche Indices einfügen"
+msgstr "Seitliche Indices einfügen (sitesetn)"
 
 #: lib/ui/stdtoolbars.inc:472
 msgid "overset"


r41185 - www-user/trunk/farm/cookbook/LyX

2018-03-18 Thread spitz
Author: spitz
Date: Sun Mar 18 07:59:00 2018
New Revision: 41185
URL: http://www.lyx.org/trac/changeset/41185

Log:
fix

Modified:
   www-user/trunk/farm/cookbook/LyX/i18n.inc

Modified: www-user/trunk/farm/cookbook/LyX/i18n.inc
==
--- www-user/trunk/farm/cookbook/LyX/i18n.inc   Sat Mar 17 21:04:20 2018
(r41184)
+++ www-user/trunk/farm/cookbook/LyX/i18n.inc   Sun Mar 18 07:59:00 2018
(r41185)
@@ -2,7 +2,7 @@
 // The current version
 $lyx_version = "2.3.1dev";
 // The branch tag
-$branch_tag = "master";
+$branch_tag = "2.3.x";
 
 // The data itself
 $podata = array (