[LyX master] Beamer provides [x]color (#8103)

2012-10-09 Thread Juergen Spitzmueller 
The branch, master, has been updated.

- Log -

commit 170399154421dd831483c5b361ed0ec0a7f13589
Author: Juergen Spitzmueller sp...@lyx.org
Date:   Tue Oct 9 07:59:43 2012 +0200

Beamer provides [x]color (#8103)

diff --git a/lib/layouts/beamer.layout b/lib/layouts/beamer.layout
index a3311a3..859d2cb 100644
--- a/lib/layouts/beamer.layout
+++ b/lib/layouts/beamer.layout
@@ -19,6 +19,8 @@ TocDepth   2
 DefaultStyle   Standard
 Provides hyperref  1
 Provides geometry  1
+Provides color 1
+Provides xcolor1
 
 DefaultFont
   Family   Sans

---

Summary of changes:
 lib/layouts/beamer.layout |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

[LyX master] Really put uncategorized items at the end if sortCats is true

2012-10-09 Thread Juergen Spitzmueller 
The branch, master, has been updated.

- Log -

commit 006b50b22266b7ba5d16427cbfc21fca969ef608
Author: Juergen Spitzmueller sp...@lyx.org
Date:   Tue Oct 9 08:51:39 2012 +0200

Really put uncategorized items at the end if sortCats is true

diff --git a/src/frontends/qt4/CategorizedCombo.cpp 
b/src/frontends/qt4/CategorizedCombo.cpp
index 7a9508b..d4410cf 100644
--- a/src/frontends/qt4/CategorizedCombo.cpp
+++ b/src/frontends/qt4/CategorizedCombo.cpp
@@ -516,9 +516,12 @@ void CategorizedCombo::addItemSort(QString const  item, 
QString const  guiname
// find category
int i = 0;
if (sortedByCat) {
+   // If sortCats == true, sort categories alphabetically, 
uncategorized at the end.
while (i  end  d-model_-item(i, 2)-text() != qcat
-   (!sortCats || (d-model_-item(i, 
2)-text().localeAwareCompare(qcat)  0)
-  || (uncategorized  d-model_-item(i, 2)-text() 
== qt_(Uncategorized
+   (!sortCats 
+  || (!uncategorized  d-model_-item(i, 
2)-text().localeAwareCompare(qcat)  0
+   d-model_-item(i, 2)-text() != 
qt_(Uncategorized))
+  || (uncategorized  d-model_-item(i, 2)-text() 
!= qt_(Uncategorized
++i;
}
 

---

Summary of changes:
 src/frontends/qt4/CategorizedCombo.cpp |7 +--
 1 files changed, 5 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

[LyX master] Document textclass categorization

2012-10-09 Thread Juergen Spitzmueller 
The branch, master, has been updated.

- Log -

commit d4d4ee74ba912bec7e3e6d3d24d6b72071aa145d
Author: Juergen Spitzmueller sp...@lyx.org
Date:   Tue Oct 9 09:29:02 2012 +0200

Document textclass categorization

diff --git a/lib/doc/Customization.lyx b/lib/doc/Customization.lyx
index d985391..f5b4a5b 100644
--- a/lib/doc/Customization.lyx
+++ b/lib/doc/Customization.lyx
@@ -1,5 +1,5 @@
 #LyX 2.1 created this file. For more info see http://www.lyx.org/
-\lyxformat 442
+\lyxformat 444
 \begin_document
 \begin_header
 \textclass scrbook
@@ -137,6 +137,7 @@ End
 \html_math_output 0
 \html_css_as_file 0
 \html_be_strict true
+\author -712698321 Jürgen Spitzmüller 
 \author -195340706 Georg Baum 
 \author 5863208 ab 
 \author 1082167584 Kayvan Sylvan kay...@sylvan.com
@@ -7234,6 +7235,10 @@ default
 
 \begin_layout Subsection
 The document class declaration
+\change_inserted -712698321 1349766602
+ and classification
+\change_unchanged
+
 \end_layout
 
 \begin_layout Standard
@@ -7259,7 +7264,15 @@ status collapsed
 
 \end_inset
 
- files should begin with a line like:
+ files should begin with 
+\change_deleted -712698321 1349766533
+a 
+\change_unchanged
+line
+\change_inserted -712698321 1349766536
+s
+\change_unchanged
+ like:
 \end_layout
 
 \begin_layout LyX-Code
@@ -7273,11 +7286,45 @@ status collapsed
 \size small
 #  
 \backslash
-DeclareLaTeXClass{article}
+DeclareLaTeXClass{
+\change_deleted -712698321 1349766193
+article
+\change_inserted -712698321 1349766201
+Article (Standard Class)
+\change_unchanged
+}
+\change_inserted -712698321 1349766538
+
+\end_layout
+
+\begin_layout LyX-Code
+
+\change_inserted -712698321 1349766581
+
+\size small
+#  
+\backslash
+DeclareCategory{Articles}
+\change_unchanged
+
 \end_layout
 
 \begin_layout Standard
-The second line is used when you (re)configure LyX.
+The second 
+\change_inserted -712698321 1349766695
+and third 
+\change_unchanged
+line
+\change_inserted -712698321 1349766626
+s
+\change_unchanged
+ 
+\change_deleted -712698321 1349766628
+is
+\change_inserted -712698321 1349766628
+are
+\change_unchanged
+ used when you (re)configure LyX.
  The layout file is read by the LaTeX script 
 \begin_inset Flex Code
 status collapsed
@@ -7299,8 +7346,19 @@ status collapsed
 \end_inset
 
  is ignored.
- The first line is just a LaTeX comment, and the second one contains the
- declaration of the text class.
+ The first line is just a LaTeX comment, 
+\change_deleted -712698321 1349766656
+and 
+\change_unchanged
+the second one contains the 
+\change_inserted -712698321 1349766650
+mandatory 
+\change_unchanged
+declaration of the text class
+\change_inserted -712698321 1349766689
+, and the third line contains the optional classification of the class
+\change_unchanged
+.
  If these lines appear in a file named 
 \begin_inset Flex Code
 status collapsed
@@ -7336,7 +7394,13 @@ article.cls
 \begin_inset Quotes eld
 \end_inset
 
+
+\change_deleted -712698321 1349766253
 article
+\change_inserted -712698321 1349766260
+Article (Standard Class)
+\change_unchanged
+
 \begin_inset Quotes erd
 \end_inset
 
@@ -7352,6 +7416,90 @@ Settings
 \end_inset
 
  dialog.
+
+\change_inserted -712698321 1349767097
+ The category (
+\begin_inset Quotes eld
+\end_inset
+
+Articles
+\begin_inset Quotes erd
+\end_inset
+
+ in the example) is also used in the 
+\begin_inset Flex MenuItem
+status collapsed
+
+\begin_layout Plain Layout
+
+\change_inserted -712698321 1349766801
+Document\SpecialChar \menuseparator
+Settings
+\end_layout
+
+\end_inset
+
+ dialog: the text classes are grouped by these categories (which are usually
+ genres, so typical categories are 
+\begin_inset Quotes eld
+\end_inset
+
+Articles
+\begin_inset Quotes erd
+\end_inset
+
+, 
+\begin_inset Quotes eld
+\end_inset
+
+Books
+\begin_inset Quotes erd
+\end_inset
+
+, 
+\begin_inset Quotes eld
+\end_inset
+
+Reports
+\begin_inset Quotes erd
+\end_inset
+
+, 
+\begin_inset Quotes eld
+\end_inset
+
+Letters
+\begin_inset Quotes erd
+\end_inset
+
+, 
+\begin_inset Quotes eld
+\end_inset
+
+Presentations
+\begin_inset Quotes erd
+\end_inset
+
+, 
+\begin_inset Quotes eld
+\end_inset
+
+Curricula Vitae
+\begin_inset Quotes erd
+\end_inset
+
+ etc.).
+ If no category has been declared, the class will be put in the 
+\begin_inset Quotes eld
+\end_inset
+
+Uncategorized
+\begin_inset Quotes erd
+\end_inset
+
+ group.
+\change_unchanged
+
 \end_layout
 
 \begin_layout Standard
@@ -7390,7 +7538,45 @@ myarticle.layout
 \size small
 #  
 \backslash
-DeclareLaTeXClass[article]{article (with my own headings)}
+DeclareLaTeXClass[article]{
+\change_deleted -712698321 1349766303
+a
+\change_inserted -712698321 1349766303
+A
+\change_unchanged
+rticle (with 
+\change_deleted -712698321 1349766338
+m
+\change_inserted -712698321 1349766338
+M
+\change_unchanged
+y 
+\change_deleted -712698321 1349766340
+o
+\change_inserted -712698321 1349766340
+O

[LyX master] Fix widget relation

2012-10-09 Thread Juergen Spitzmueller 
The branch, master, has been updated.

- Log -

commit 81bc1c1ff4602739f0686b8519ff444ada47c023
Author: Juergen Spitzmueller sp...@lyx.org
Date:   Tue Oct 9 10:16:38 2012 +0200

Fix widget relation

diff --git a/src/frontends/qt4/ui/PrefUi.ui b/src/frontends/qt4/ui/PrefUi.ui
index 3880c94..a9a8dc5 100644
--- a/src/frontends/qt4/ui/PrefUi.ui
+++ b/src/frontends/qt4/ui/PrefUi.ui
@@ -282,6 +282,9 @@
 property name=text
  stringClosing last view:/string
 /property
+property name=buddy
+ cstringcloseLastViewCO/cstring
+/property
/widget
   /item
   item row=7 column=1 colspan=4

---

Summary of changes:
 src/frontends/qt4/ui/PrefUi.ui |3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

[LyX master] Categorize Linguistics paragraph styles

2012-10-09 Thread Juergen Spitzmueller 
The branch, master, has been updated.

- Log -

commit 2c8815957656ab5961dc9fb6de66560328eafdf1
Author: Juergen Spitzmueller sp...@lyx.org
Date:   Tue Oct 9 10:59:19 2012 +0200

Categorize Linguistics paragraph styles

Should go to branch as well (after 2.0.5)

diff --git a/lib/layouts/linguistics.module b/lib/layouts/linguistics.module
index 6b02038..3038548 100644
--- a/lib/layouts/linguistics.module
+++ b/lib/layouts/linguistics.module
@@ -30,6 +30,7 @@ Style Numbered_Example_(multiline)
Color Blue
EndFont
Requires  covington
+   Category  Linguistics
 End
 
 

---

Summary of changes:
 lib/layouts/linguistics.module |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

[LyX master] Thinko

2012-10-09 Thread Juergen Spitzmueller 
The branch, master, has been updated.

- Log -

commit c3001fba5cf440504511176b5184737eb0c2dcb0
Author: Juergen Spitzmueller sp...@lyx.org
Date:   Tue Oct 9 11:12:54 2012 +0200

Thinko

diff --git a/lib/configure.py b/lib/configure.py
index ea0bbab..35f2254 100644
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -1063,7 +1063,7 @@ def processLayoutFile(file, bool_docbook):
 return classdeclaration +   + categorydeclaration
 if qres != None:
  categorydeclaration = '%s' % (qres.groups()[0])
- if classdeclaration != :
+ if classdeclaration != '':
  return classdeclaration +   + categorydeclaration
 if classdeclaration != :
 return classdeclaration +   + categorydeclaration

---

Summary of changes:
 lib/configure.py |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

[LyX master] Double Thinko :-/

2012-10-09 Thread Juergen Spitzmueller 
The branch, master, has been updated.

- Log -

commit 7c8f4d57a70c18dcbed81a249c41680813205155
Author: Juergen Spitzmueller sp...@lyx.org
Date:   Tue Oct 9 11:14:13 2012 +0200

Double Thinko :-/

diff --git a/lib/configure.py b/lib/configure.py
index 35f2254..58234c0 100644
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -1059,11 +1059,11 @@ def processLayoutFile(file, bool_docbook):
 prereq_docbook = {'true':'', 'false':'docbook'}[bool_docbook]
 prereq = {'LaTeX':prereq_latex, 
'DocBook':prereq_docbook}[classtype]
 classdeclaration = '%s %s %s %s %s' % (classname, opt, 
desc, avai, prereq)
-if categorydeclaration != :
+if categorydeclaration != '':
 return classdeclaration +   + categorydeclaration
 if qres != None:
  categorydeclaration = '%s' % (qres.groups()[0])
- if classdeclaration != '':
+ if classdeclaration != :
  return classdeclaration +   + categorydeclaration
 if classdeclaration != :
 return classdeclaration +   + categorydeclaration

---

Summary of changes:
 lib/configure.py |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

Re: [LyX master] Add new CategorizedCombo widget

2012-10-09 Thread Kornel Benko 
Am Dienstag, 9. Oktober 2012 um 07:20:26, schrieb Juergen Spitzmueller 
sp...@lyx.org
 
 diff --git a/src/frontends/qt4/CategorizedCombo.cpp 
 b/src/frontends/qt4/CategorizedCombo.cpp
 new file mode 100644

Is this here a typo? (%1 vs %1$s)

src/frontends/qt4/CategorizedCombo.cpp:496

QString titem = available ? guiname : qt_(Unavailable: 
%1).arg(guiname);

.
Kornel

signature.asc
Description: This is a digitally signed message part.

[LyX master] Merge branch 'master' of git.lyx.org:lyx

2012-10-09 Thread Kornel Benko 
The branch, master, has been updated.

- Log -

commit df880b8e924900c388ca856f5b2c5475ee1f8e9a
Merge: 280b1ca 7c8f4d5
Author: Kornel Benko kor...@lyx.org
Date:   Tue Oct 9 13:24:39 2012 +0200

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


commit 280b1ca76445a97b7192593689de38a8a5db9fd0
Author: Kornel Benko kor...@lyx.org
Date:   Tue Oct 9 13:24:09 2012 +0200

* sk.po

diff --git a/po/sk.po b/po/sk.po
index aba71fa..9ab7854 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,8 +8,8 @@ msgid 
 msgstr 
 Project-Id-Version: LyX-2.1\n
 Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n
-POT-Creation-Date: 2012-10-08 19:42+0200\n
-PO-Revision-Date: 2012-10-07 19:17+0200\n
+POT-Creation-Date: 2012-10-09 11:04+0200\n
+PO-Revision-Date: 2012-10-09 12:48+0200\n
 Last-Translator: Kornel Benko kor...@lyx.org\n
 Language-Team: Slovak lyx-d...@lists.lyx.org\n
 Language: sk\n
@@ -5106,6 +5106,42 @@ msgstr Povoľuje premenlivé umiestnenie
 msgid Allow floating
 msgstr Umožni plávajúce objekty
 
+#: lib/layouts/AEA.layout:3
+msgid American Economic Association (AEA)
+msgstr American Economic Association (AEA)
+
+#: lib/layouts/AEA.layout:4 lib/layouts/IEEEtran.layout:4
+#: lib/layouts/aa.layout:4 lib/layouts/aapaper.layout:4
+#: lib/layouts/aastex.layout:4 lib/layouts/achemso.layout:4
+#: lib/layouts/acmsiggraph.layout:4 lib/layouts/agums.layout:4
+#: lib/layouts/agutex.layout:4 lib/layouts/amsart.layout:4
+#: lib/layouts/apa.layout:4 lib/layouts/arab-article.layout:4
+#: lib/layouts/article-beamer.layout:4 lib/layouts/article.layout:4
+#: lib/layouts/chess.layout:4 lib/layouts/cl2emult.layout:4
+#: lib/layouts/ctex-article.layout:4 lib/layouts/doublecol-new.layout:4
+#: lib/layouts/dtk.layout:4 lib/layouts/ectaart.layout:4
+#: lib/layouts/egs.layout:4 lib/layouts/elsart.layout:4
+#: lib/layouts/elsarticle.layout:4 lib/layouts/entcs.layout:4
+#: lib/layouts/extarticle.layout:4 lib/layouts/heb-article.layout:4
+#: lib/layouts/ijmpc.layout:4 lib/layouts/ijmpd.layout:4
+#: lib/layouts/iopart.layout:4 lib/layouts/isprs.layout:4
+#: lib/layouts/jarticle.layout:4 lib/layouts/jasatex.layout:4
+#: lib/layouts/jgrga.layout:4 lib/layouts/jsarticle.layout:4
+#: lib/layouts/jss.layout:4 lib/layouts/kluwer.layout:4
+#: lib/layouts/latex8.layout:4 lib/layouts/literate-article.layout:4
+#: lib/layouts/llncs.layout:4 lib/layouts/ltugboat.layout:4
+#: lib/layouts/mwart.layout:4 lib/layouts/paper.layout:4
+#: lib/layouts/revtex.layout:4 lib/layouts/revtex4-1.layout:4
+#: lib/layouts/revtex4.layout:4 lib/layouts/scrartcl.layout:4
+#: lib/layouts/scrarticle-beamer.layout:4 lib/layouts/siamltex.layout:4
+#: lib/layouts/sigplanconf.layout:4 lib/layouts/singlecol-new.layout:4
+#: lib/layouts/singlecol.layout:4 lib/layouts/spie.layout:4
+#: lib/layouts/svglobal.layout:4 lib/layouts/svglobal3.layout:4
+#: lib/layouts/svjog.layout:4 lib/layouts/svprobth.layout:4
+#: lib/layouts/tarticle.layout:4
+msgid Articles
+msgstr Články
+
 #: lib/layouts/AEA.layout:55 lib/layouts/apa.layout:92
 msgid ShortTitle
 msgstr KrátkyTitul
@@ -5651,6 +5687,10 @@ msgstr Popis: 
 msgid Proof
 msgstr Dôkaz
 
+#: lib/layouts/IEEEtran.layout:3
+msgid IEEE Transactions
+msgstr IEEE Transactions
+
 #: lib/layouts/IEEEtran.layout:34 lib/layouts/aa.layout:27
 #: lib/layouts/aapaper.layout:34 lib/layouts/aastex.layout:52
 #: lib/layouts/achemso.layout:32 lib/layouts/acmsiggraph.layout:34
@@ -5886,6 +5926,10 @@ msgstr ŽivotopisBezFotky
 msgid Proof.
 msgstr Dôkaz.
 
+#: lib/layouts/aa.layout:3
+msgid Astronomy  Astrophysics
+msgstr Astronomy  Astrophysics
+
 #: lib/layouts/aa.layout:42 lib/layouts/aa.layout:229
 #: lib/layouts/aapaper.layout:64 lib/layouts/aapaper.layout:137
 #: lib/layouts/aastex.layout:67 lib/layouts/aastex.layout:177
@@ -6099,11 +6143,19 @@ msgstr E-mail
 msgid email
 msgstr E-mail
 
+#: lib/layouts/aapaper.layout:3 lib/layouts/aapaper.layout:14
+msgid Astronomy  Astrophysics (V. 4, Obsolete)
+msgstr Astronomy  Astrophysics (V. 4, zastaralé)
+
 #: lib/layouts/aapaper.layout:94 lib/layouts/aapaper.inc:103
 #: lib/ui/stdtoolbars.inc:139 src/frontends/qt4/GuiThesaurus.cpp:46
 msgid Thesaurus
 msgstr Tezaurus
 
+#: lib/layouts/aastex.layout:3
+msgid American Astronomical Society (AASTeX)
+msgstr American Astronomical Society (AASTeX)
+
 #: lib/layouts/aastex.layout:79 lib/layouts/agutex.layout:149
 #: lib/layouts/amsbook.layout:126 lib/layouts/apa.layout:341
 #: lib/layouts/egs.layout:71 lib/layouts/kluwer.layout:89
@@ -6264,6 +6316,10 @@ msgstr Obj:
 msgid Dataset:
 msgstr Dataset:
 
+#: lib/layouts/achemso.layout:3
+msgid American Chemical Society (ACS)
+msgstr American Chemical Society (ACS)
+
 #: lib/layouts/achemso.layout:100
 msgid Alt Affiliation
 msgstr Alternatívne Príslušenstvo
@@ -6323,6 +6379,10 @@ msgstr Chemistry
 msgid chemistry
 msgstr chemistry
 
+#: lib/layouts/acmsiggraph.layout:3
+msgid ACM SIGGRAPH
+msgstr ACM SIGGRAPH
+
 #: lib/layouts/acmsiggraph.layout:64
 msgid

[LyX master] Merge branch 'master' of git.lyx.org:lyx

2012-10-09 Thread Juergen Spitzmueller 
The branch, master, has been updated.

- Log -

commit 9a0f82d44141e63ff9818a9a1e426ea3e232
Merge: c851350 df880b8
Author: Juergen Spitzmueller sp...@lyx.org
Date:   Tue Oct 9 16:13:00 2012 +0200

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


commit c85135090e230c046851603c372b3ad0fd47a788
Author: Juergen Spitzmueller sp...@lyx.org
Date:   Tue Oct 9 16:12:32 2012 +0200

Stick to bformat

diff --git a/src/frontends/qt4/CategorizedCombo.cpp 
b/src/frontends/qt4/CategorizedCombo.cpp
index d4410cf..878d277 100644
--- a/src/frontends/qt4/CategorizedCombo.cpp
+++ b/src/frontends/qt4/CategorizedCombo.cpp
@@ -493,7 +493,9 @@ void CategorizedCombo::addItemSort(QString const  item, 
QString const  guiname
   bool sorted, bool sortedByCat, bool sortCats,
   bool available)
 {
-   QString titem = available ? guiname : qt_(Unavailable: 
%1).arg(guiname);
+   QString titem = available ? guiname
+ : toqstr(bformat(_(Unavailable: %1$s),
+  qstring_to_ucs4(guiname)));
bool const uncategorized = category.isEmpty();
QString qcat = uncategorized ? qt_(Uncategorized) : category;
 

---

Summary of changes:
 src/frontends/qt4/CategorizedCombo.cpp |4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

[LyX master] de.po: update

2012-10-09 Thread Juergen Spitzmueller 
The branch, master, has been updated.

- Log -

commit 0aecfa0663d02492a4efa4e0260aa045d8ca57a9
Author: Juergen Spitzmueller sp...@lyx.org
Date:   Tue Oct 9 16:13:52 2012 +0200

de.po: update

diff --git a/po/de.po b/po/de.po
index 7140cc6..ac18667 100644
--- a/po/de.po
+++ b/po/de.po
@@ -95,8 +95,8 @@ msgid 
 msgstr 
 Project-Id-Version: LyX 2.1\n
 Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n
-POT-Creation-Date: 2012-10-09 08:03+0200\n
-PO-Revision-Date: 2012-10-09 08:34+0200\n
+POT-Creation-Date: 2012-10-09 16:07+0200\n
+PO-Revision-Date: 2012-10-09 16:10+0200\n
 Last-Translator: Jürgen Spitzmüller sp...@lyx.org\n
 Language-Team: German lyx-d...@lists.lyx.org\n
 Language: de\n
@@ -2732,15 +2732,15 @@ msgstr Globaler Knopf zum Schließen von 
Registerkarten
 msgid Closing last view:
 msgstr Beim Schließen der letzten Ansicht:
 
-#: src/frontends/qt4/ui/PrefUi.ui:291
+#: src/frontends/qt4/ui/PrefUi.ui:294
 msgid Closes document
 msgstr Dokument schließen
 
-#: src/frontends/qt4/ui/PrefUi.ui:296
+#: src/frontends/qt4/ui/PrefUi.ui:299
 msgid Hides document
 msgstr Dokument verbergen
 
-#: src/frontends/qt4/ui/PrefUi.ui:301
+#: src/frontends/qt4/ui/PrefUi.ui:304
 msgid Ask the user
 msgstr Nachfragen
 
@@ -12064,7 +12064,7 @@ msgstr 
 msgid Enumerate-Resume
 msgstr Aufzählung fortführen
 
-#: lib/layouts/linguistics.module:2
+#: lib/layouts/linguistics.module:2 lib/layouts/linguistics.module:33
 msgid Linguistics
 msgstr Linguistik
 
@@ -12086,59 +12086,59 @@ msgstr Nummeriertes Beispiel (mehrere Zeilen)
 msgid Example:
 msgstr Beispiel:
 
-#: lib/layouts/linguistics.module:37
+#: lib/layouts/linguistics.module:38
 msgid Numbered Examples (consecutive)
 msgstr Nummeriertes Beispiel (konsekutiv)
 
-#: lib/layouts/linguistics.module:41
+#: lib/layouts/linguistics.module:42
 msgid Examples:
 msgstr Beispiele:
 
-#: lib/layouts/linguistics.module:46
+#: lib/layouts/linguistics.module:47
 msgid Subexample
 msgstr Unterbeispiel
 
-#: lib/layouts/linguistics.module:50
+#: lib/layouts/linguistics.module:51
 msgid Subexample:
 msgstr Unterbeispiel:
 
-#: lib/layouts/linguistics.module:65 lib/layouts/linguistics.module:67
+#: lib/layouts/linguistics.module:66 lib/layouts/linguistics.module:68
 msgid Glosse
 msgstr Glosse
 
-#: lib/layouts/linguistics.module:94 lib/layouts/linguistics.module:96
+#: lib/layouts/linguistics.module:95 lib/layouts/linguistics.module:97
 msgid Tri-Glosse
 msgstr Tri-Glosse
 
-#: lib/layouts/linguistics.module:122
+#: lib/layouts/linguistics.module:123
 msgid Expression
 msgstr Ausdruck
 
-#: lib/layouts/linguistics.module:124
+#: lib/layouts/linguistics.module:125
 msgid expr.
 msgstr Ausdr.
 
-#: lib/layouts/linguistics.module:137
+#: lib/layouts/linguistics.module:138
 msgid Concepts
 msgstr Konzept
 
-#: lib/layouts/linguistics.module:139
+#: lib/layouts/linguistics.module:140
 msgid concept
 msgstr Konzept
 
-#: lib/layouts/linguistics.module:152
+#: lib/layouts/linguistics.module:153
 msgid Meaning
 msgstr Bedeutung
 
-#: lib/layouts/linguistics.module:154
+#: lib/layouts/linguistics.module:155
 msgid meaning
 msgstr Bedeutung
 
-#: lib/layouts/linguistics.module:168
+#: lib/layouts/linguistics.module:169
 msgid Tableau
 msgstr Tableau
 
-#: lib/layouts/linguistics.module:173
+#: lib/layouts/linguistics.module:174
 msgid List of Tableaux
 msgstr Tableaux-Verzeichnis
 
@@ -21902,12 +21902,14 @@ msgstr Dings 4
 msgid Unavailable:
 msgstr Nicht verfügbar:
 
-#: src/frontends/qt4/CategorizedCombo.cpp:496
-msgid Unavailable: %1
-msgstr Nicht verfügbar: %1
+#: src/frontends/qt4/CategorizedCombo.cpp:497
+#, c-format
+msgid Unavailable: %1$s
+msgstr Nicht verfügbar: %1$s
 
-#: src/frontends/qt4/CategorizedCombo.cpp:498
-#: src/frontends/qt4/CategorizedCombo.cpp:521
+#: src/frontends/qt4/CategorizedCombo.cpp:500
+#: src/frontends/qt4/CategorizedCombo.cpp:525
+#: src/frontends/qt4/CategorizedCombo.cpp:526
 msgid Uncategorized
 msgstr Nicht kategorisiert
 
@@ -23018,8 +23020,7 @@ msgid 
 all requires packages (%2$s) installed.
 msgstr 
 Klasse wurde von LyX nicht gefunden. Bitte prüfen Sie, ob Sie die 
-entsprechende %1$s-Klasse 
-und alle nötigen Pakete (%2$s) installiert haben.
+entsprechende %1$s-Klasse und alle nötigen Pakete (%2$s) installiert haben.
 
 #: src/frontends/qt4/GuiDocument.cpp:1404
 #: src/frontends/qt4/GuiDocument.cpp:1505

---

Summary of changes:
 po/de.po |   55 ---
 1 files changed, 28 insertions(+), 27 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

[LyX master] * sk.po

2012-10-09 Thread Kornel Benko 
The branch, master, has been updated.

- Log -

commit 210ea2dd01ff98acfbd04a60a4c6bad7fdbf9f14
Author: Kornel Benko kor...@lyx.org
Date:   Tue Oct 9 16:29:13 2012 +0200

* sk.po

diff --git a/po/sk.po b/po/sk.po
index 9ab7854..74cd1b4 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -21569,9 +21569,10 @@ msgstr Dings 4
 msgid Unavailable:
 msgstr Nedostupné:
 
-#: src/frontends/qt4/CategorizedCombo.cpp:496
-msgid Unavailable: %1
-msgstr Nedostupné: %1
+#: src/frontends/qt4/CategorizedCombo.cpp:497
+#, c-format
+msgid Unavailable: %1$s
+msgstr Nedostupné: %1$s
 
 #: src/frontends/qt4/CategorizedCombo.cpp:498
 #: src/frontends/qt4/CategorizedCombo.cpp:523

---

Summary of changes:
 po/sk.po |7 ---
 1 files changed, 4 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

r40942 - www-user/trunk/images/svnwiki/NewInLyX21

2012-10-09 Thread spitz 
Author: spitz
Date: Tue Oct  9 16:53:55 2012
New Revision: 40942
URL: http://www.lyx.org/trac/changeset/40942

Log:
More complete IPA screenshot

Added:
   www-user/trunk/images/svnwiki/NewInLyX21/lyx-newipa.png   (contents, props 
changed)

Added: www-user/trunk/images/svnwiki/NewInLyX21/lyx-newipa.png
==
Binary file. No diff available.

r40943 - www-user/trunk/images/svnwiki/NewInLyX21

2012-10-09 Thread spitz 
Author: spitz
Date: Tue Oct  9 17:09:42 2012
New Revision: 40943
URL: http://www.lyx.org/trac/changeset/40943

Log:
Category screenshot

Added:
   www-user/trunk/images/svnwiki/NewInLyX21/cats.png   (contents, props changed)

Added: www-user/trunk/images/svnwiki/NewInLyX21/cats.png
==
Binary file. No diff available.

[LyX master] Cmake build: Handle option LYX_DEVEL_VERSION to add the preprocesor definition of DEVEL_VERSION The effect should be alike the configure parameter --enable-build-type=dev

2012-10-09 Thread Kornel Benko 
The branch, master, has been updated.

- Log -

commit 8217df8a687bb920186e2531b9cff72e75e1ee25
Author: Kornel Benko kor...@lyx.org
Date:   Tue Oct 9 21:52:17 2012 +0200

Cmake build:
Handle option LYX_DEVEL_VERSION to add the preprocesor definition of 
DEVEL_VERSION
The effect should be alike the configure parameter --enable-build-type=dev

diff --git a/development/cmake/config.h.cmake b/development/cmake/config.h.cmake
index 7ec087e..cec1d0e 100644
--- a/development/cmake/config.h.cmake
+++ b/development/cmake/config.h.cmake
@@ -24,6 +24,12 @@
 #endif
 
 
+#cmakedefine LYX_DEVEL_VERSION 1
+#if defined(LYX_DEVEL_VERSION)
+   #define DEVEL_VERSION 1
+#else
+   #undef DEVEL_VERSION
+#endif
 #cmakedefine PACKAGE ${PACKAGE}
 #cmakedefine PACKAGE_VERSION ${PACKAGE_VERSION}
 #define PACKAGE_STRING LyX ${PACKAGE_VERSION}

---

Summary of changes:
 development/cmake/config.h.cmake |6 ++
 1 files changed, 6 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

[LyX master] Cmake build: Define for 'DEVEL_VERSION' already done in development/cmake/config.h.cmake

2012-10-09 Thread Kornel Benko 
The branch, master, has been updated.

- Log -

commit 648e19702142d567c197c391e37ae80097d8b42b
Author: Kornel Benko kor...@lyx.org
Date:   Tue Oct 9 22:45:12 2012 +0200

Cmake build: Define for 'DEVEL_VERSION' already done in 
development/cmake/config.h.cmake

diff --git a/src/frontends/qt4/CMakeLists.txt b/src/frontends/qt4/CMakeLists.txt
index 8d05dcf..c71873b 100644
--- a/src/frontends/qt4/CMakeLists.txt
+++ b/src/frontends/qt4/CMakeLists.txt
@@ -37,10 +37,6 @@ include_directories(
${QT_INCLUDES}
${CMAKE_CURRENT_BINARY_DIR})
 
-if (LYX_DEVEL_VERSION)
-   add_definitions(-DDEVEL_VERSION)
-endif()
-
 if(LYX_MERGE_FILES)
lyx_const_touched_files(_allinone frontends_qt4_sources)
set(depends_moc_uic ${frontends_qt4_headers} ${ui_files})

---

Summary of changes:
 src/frontends/qt4/CMakeLists.txt |4 
 1 files changed, 0 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

[LyX master] Beamer provides [x]color (#8103)

2012-10-09 Thread Juergen Spitzmueller 
The branch, master, has been updated.

- Log -

commit 170399154421dd831483c5b361ed0ec0a7f13589
Author: Juergen Spitzmueller 
Date:   Tue Oct 9 07:59:43 2012 +0200

Beamer provides [x]color (#8103)

diff --git a/lib/layouts/beamer.layout b/lib/layouts/beamer.layout
index a3311a3..859d2cb 100644
--- a/lib/layouts/beamer.layout
+++ b/lib/layouts/beamer.layout
@@ -19,6 +19,8 @@ TocDepth   2
 DefaultStyle   Standard
 Provides hyperref  1
 Provides geometry  1
+Provides color 1
+Provides xcolor1
 
 DefaultFont
   Family   Sans

---

Summary of changes:
 lib/layouts/beamer.layout |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

[LyX master] Really put uncategorized items at the end if sortCats is true

2012-10-09 Thread Juergen Spitzmueller 
The branch, master, has been updated.

- Log -

commit 006b50b22266b7ba5d16427cbfc21fca969ef608
Author: Juergen Spitzmueller 
Date:   Tue Oct 9 08:51:39 2012 +0200

Really put uncategorized items at the end if sortCats is true

diff --git a/src/frontends/qt4/CategorizedCombo.cpp 
b/src/frontends/qt4/CategorizedCombo.cpp
index 7a9508b..d4410cf 100644
--- a/src/frontends/qt4/CategorizedCombo.cpp
+++ b/src/frontends/qt4/CategorizedCombo.cpp
@@ -516,9 +516,12 @@ void CategorizedCombo::addItemSort(QString const & item, 
QString const & guiname
// find category
int i = 0;
if (sortedByCat) {
+   // If sortCats == true, sort categories alphabetically, 
uncategorized at the end.
while (i < end && d->model_->item(i, 2)->text() != qcat
-  && (!sortCats || (d->model_->item(i, 
2)->text().localeAwareCompare(qcat) < 0)
-  || (uncategorized && d->model_->item(i, 2)->text() 
== qt_("Uncategorized"
+  && (!sortCats 
+  || (!uncategorized && d->model_->item(i, 
2)->text().localeAwareCompare(qcat) < 0
+  && d->model_->item(i, 2)->text() != 
qt_("Uncategorized"))
+  || (uncategorized && d->model_->item(i, 2)->text() 
!= qt_("Uncategorized"
++i;
}
 

---

Summary of changes:
 src/frontends/qt4/CategorizedCombo.cpp |7 +--
 1 files changed, 5 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

[LyX master] Document textclass categorization

2012-10-09 Thread Juergen Spitzmueller 
The branch, master, has been updated.

- Log -

commit d4d4ee74ba912bec7e3e6d3d24d6b72071aa145d
Author: Juergen Spitzmueller 
Date:   Tue Oct 9 09:29:02 2012 +0200

Document textclass categorization

diff --git a/lib/doc/Customization.lyx b/lib/doc/Customization.lyx
index d985391..f5b4a5b 100644
--- a/lib/doc/Customization.lyx
+++ b/lib/doc/Customization.lyx
@@ -1,5 +1,5 @@
 #LyX 2.1 created this file. For more info see http://www.lyx.org/
-\lyxformat 442
+\lyxformat 444
 \begin_document
 \begin_header
 \textclass scrbook
@@ -137,6 +137,7 @@ End
 \html_math_output 0
 \html_css_as_file 0
 \html_be_strict true
+\author -712698321 "Jürgen Spitzmüller" 
 \author -195340706 "Georg Baum" 
 \author 5863208 "ab" 
 \author 1082167584 "Kayvan Sylvan" kay...@sylvan.com
@@ -7234,6 +7235,10 @@ default
 
 \begin_layout Subsection
 The document class declaration
+\change_inserted -712698321 1349766602
+ and classification
+\change_unchanged
+
 \end_layout
 
 \begin_layout Standard
@@ -7259,7 +7264,15 @@ status collapsed
 
 \end_inset
 
- files should begin with a line like:
+ files should begin with 
+\change_deleted -712698321 1349766533
+a 
+\change_unchanged
+line
+\change_inserted -712698321 1349766536
+s
+\change_unchanged
+ like:
 \end_layout
 
 \begin_layout LyX-Code
@@ -7273,11 +7286,45 @@ status collapsed
 \size small
 #  
 \backslash
-DeclareLaTeXClass{article}
+DeclareLaTeXClass{
+\change_deleted -712698321 1349766193
+article
+\change_inserted -712698321 1349766201
+Article (Standard Class)
+\change_unchanged
+}
+\change_inserted -712698321 1349766538
+
+\end_layout
+
+\begin_layout LyX-Code
+
+\change_inserted -712698321 1349766581
+
+\size small
+#  
+\backslash
+DeclareCategory{Articles}
+\change_unchanged
+
 \end_layout
 
 \begin_layout Standard
-The second line is used when you (re)configure LyX.
+The second 
+\change_inserted -712698321 1349766695
+and third 
+\change_unchanged
+line
+\change_inserted -712698321 1349766626
+s
+\change_unchanged
+ 
+\change_deleted -712698321 1349766628
+is
+\change_inserted -712698321 1349766628
+are
+\change_unchanged
+ used when you (re)configure LyX.
  The layout file is read by the LaTeX script 
 \begin_inset Flex Code
 status collapsed
@@ -7299,8 +7346,19 @@ status collapsed
 \end_inset
 
  is ignored.
- The first line is just a LaTeX comment, and the second one contains the
- declaration of the text class.
+ The first line is just a LaTeX comment, 
+\change_deleted -712698321 1349766656
+and 
+\change_unchanged
+the second one contains the 
+\change_inserted -712698321 1349766650
+mandatory 
+\change_unchanged
+declaration of the text class
+\change_inserted -712698321 1349766689
+, and the third line contains the optional classification of the class
+\change_unchanged
+.
  If these lines appear in a file named 
 \begin_inset Flex Code
 status collapsed
@@ -7336,7 +7394,13 @@ article.cls
 \begin_inset Quotes eld
 \end_inset
 
+
+\change_deleted -712698321 1349766253
 article
+\change_inserted -712698321 1349766260
+Article (Standard Class)
+\change_unchanged
+
 \begin_inset Quotes erd
 \end_inset
 
@@ -7352,6 +7416,90 @@ Settings
 \end_inset
 
  dialog.
+
+\change_inserted -712698321 1349767097
+ The category (
+\begin_inset Quotes eld
+\end_inset
+
+Articles
+\begin_inset Quotes erd
+\end_inset
+
+ in the example) is also used in the 
+\begin_inset Flex MenuItem
+status collapsed
+
+\begin_layout Plain Layout
+
+\change_inserted -712698321 1349766801
+Document\SpecialChar \menuseparator
+Settings
+\end_layout
+
+\end_inset
+
+ dialog: the text classes are grouped by these categories (which are usually
+ genres, so typical categories are 
+\begin_inset Quotes eld
+\end_inset
+
+Articles
+\begin_inset Quotes erd
+\end_inset
+
+, 
+\begin_inset Quotes eld
+\end_inset
+
+Books
+\begin_inset Quotes erd
+\end_inset
+
+, 
+\begin_inset Quotes eld
+\end_inset
+
+Reports
+\begin_inset Quotes erd
+\end_inset
+
+, 
+\begin_inset Quotes eld
+\end_inset
+
+Letters
+\begin_inset Quotes erd
+\end_inset
+
+, 
+\begin_inset Quotes eld
+\end_inset
+
+Presentations
+\begin_inset Quotes erd
+\end_inset
+
+, 
+\begin_inset Quotes eld
+\end_inset
+
+Curricula Vitae
+\begin_inset Quotes erd
+\end_inset
+
+ etc.).
+ If no category has been declared, the class will be put in the 
+\begin_inset Quotes eld
+\end_inset
+
+Uncategorized
+\begin_inset Quotes erd
+\end_inset
+
+ group.
+\change_unchanged
+
 \end_layout
 
 \begin_layout Standard
@@ -7390,7 +7538,45 @@ myarticle.layout
 \size small
 #  
 \backslash
-DeclareLaTeXClass[article]{article (with my own headings)}
+DeclareLaTeXClass[article]{
+\change_deleted -712698321 1349766303
+a
+\change_inserted -712698321 1349766303
+A
+\change_unchanged
+rticle (with 
+\change_deleted -712698321 1349766338
+m
+\change_inserted -712698321 1349766338
+M
+\change_unchanged
+y 
+\change_deleted -712698321 1349766340
+o
+\change_inserted -712698321 1349766340
+O

[LyX master] Fix widget relation

2012-10-09 Thread Juergen Spitzmueller 
The branch, master, has been updated.

- Log -

commit 81bc1c1ff4602739f0686b8519ff444ada47c023
Author: Juergen Spitzmueller 
Date:   Tue Oct 9 10:16:38 2012 +0200

Fix widget relation

diff --git a/src/frontends/qt4/ui/PrefUi.ui b/src/frontends/qt4/ui/PrefUi.ui
index 3880c94..a9a8dc5 100644
--- a/src/frontends/qt4/ui/PrefUi.ui
+++ b/src/frontends/qt4/ui/PrefUi.ui
@@ -282,6 +282,9 @@
 
  Closing last view:
 
+
+ closeLastViewCO
+

   
   

---

Summary of changes:
 src/frontends/qt4/ui/PrefUi.ui |3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

[LyX master] Categorize Linguistics paragraph styles

2012-10-09 Thread Juergen Spitzmueller 
The branch, master, has been updated.

- Log -

commit 2c8815957656ab5961dc9fb6de66560328eafdf1
Author: Juergen Spitzmueller 
Date:   Tue Oct 9 10:59:19 2012 +0200

Categorize Linguistics paragraph styles

Should go to branch as well (after 2.0.5)

diff --git a/lib/layouts/linguistics.module b/lib/layouts/linguistics.module
index 6b02038..3038548 100644
--- a/lib/layouts/linguistics.module
+++ b/lib/layouts/linguistics.module
@@ -30,6 +30,7 @@ Style Numbered_Example_(multiline)
Color Blue
EndFont
Requires  covington
+   Category  Linguistics
 End
 
 

---

Summary of changes:
 lib/layouts/linguistics.module |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

[LyX master] Thinko

2012-10-09 Thread Juergen Spitzmueller 
The branch, master, has been updated.

- Log -

commit c3001fba5cf440504511176b5184737eb0c2dcb0
Author: Juergen Spitzmueller 
Date:   Tue Oct 9 11:12:54 2012 +0200

Thinko

diff --git a/lib/configure.py b/lib/configure.py
index ea0bbab..35f2254 100644
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -1063,7 +1063,7 @@ def processLayoutFile(file, bool_docbook):
 return classdeclaration + " " + categorydeclaration
 if qres != None:
  categorydeclaration = '"%s"' % (qres.groups()[0])
- if classdeclaration != "":
+ if classdeclaration != '""':
  return classdeclaration + " " + categorydeclaration
 if classdeclaration != "":
 return classdeclaration + " " + categorydeclaration

---

Summary of changes:
 lib/configure.py |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

[LyX master] Double Thinko :-/

2012-10-09 Thread Juergen Spitzmueller 
The branch, master, has been updated.

- Log -

commit 7c8f4d57a70c18dcbed81a249c41680813205155
Author: Juergen Spitzmueller 
Date:   Tue Oct 9 11:14:13 2012 +0200

Double Thinko :-/

diff --git a/lib/configure.py b/lib/configure.py
index 35f2254..58234c0 100644
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -1059,11 +1059,11 @@ def processLayoutFile(file, bool_docbook):
 prereq_docbook = {'true':'', 'false':'docbook'}[bool_docbook]
 prereq = {'LaTeX':prereq_latex, 
'DocBook':prereq_docbook}[classtype]
 classdeclaration = '"%s" "%s" "%s" "%s" "%s"' % (classname, opt, 
desc, avai, prereq)
-if categorydeclaration != "":
+if categorydeclaration != '""':
 return classdeclaration + " " + categorydeclaration
 if qres != None:
  categorydeclaration = '"%s"' % (qres.groups()[0])
- if classdeclaration != '""':
+ if classdeclaration != "":
  return classdeclaration + " " + categorydeclaration
 if classdeclaration != "":
 return classdeclaration + " " + categorydeclaration

---

Summary of changes:
 lib/configure.py |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

Re: [LyX master] Add new CategorizedCombo widget

2012-10-09 Thread Kornel Benko 
Am Dienstag, 9. Oktober 2012 um 07:20:26, schrieb Juergen Spitzmueller 

> 
> diff --git a/src/frontends/qt4/CategorizedCombo.cpp 
> b/src/frontends/qt4/CategorizedCombo.cpp
> new file mode 100644

Is this here a typo? (%1 vs %1$s)

src/frontends/qt4/CategorizedCombo.cpp:496

QString titem = available ? guiname : qt_("Unavailable: 
%1").arg(guiname);

.
Kornel

signature.asc
Description: This is a digitally signed message part.

[LyX master] Merge branch 'master' of git.lyx.org:lyx

2012-10-09 Thread Kornel Benko 
The branch, master, has been updated.

- Log -

commit df880b8e924900c388ca856f5b2c5475ee1f8e9a
Merge: 280b1ca 7c8f4d5
Author: Kornel Benko 
Date:   Tue Oct 9 13:24:39 2012 +0200

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


commit 280b1ca76445a97b7192593689de38a8a5db9fd0
Author: Kornel Benko 
Date:   Tue Oct 9 13:24:09 2012 +0200

* sk.po

diff --git a/po/sk.po b/po/sk.po
index aba71fa..9ab7854 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LyX-2.1\n"
 "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n"
-"POT-Creation-Date: 2012-10-08 19:42+0200\n"
-"PO-Revision-Date: 2012-10-07 19:17+0200\n"
+"POT-Creation-Date: 2012-10-09 11:04+0200\n"
+"PO-Revision-Date: 2012-10-09 12:48+0200\n"
 "Last-Translator: Kornel Benko \n"
 "Language-Team: Slovak \n"
 "Language: sk\n"
@@ -5106,6 +5106,42 @@ msgstr "Povoľuje premenlivé umiestnenie"
 msgid "Allow "
 msgstr "Užni plávajúce objekty"
 
+#: lib/layouts/AEA.layout:3
+msgid "American Economic Association (AEA)"
+msgstr "American Economic Association (AEA)"
+
+#: lib/layouts/AEA.layout:4 lib/layouts/IEEEtran.layout:4
+#: lib/layouts/aa.layout:4 lib/layouts/aapaper.layout:4
+#: lib/layouts/aastex.layout:4 lib/layouts/achemso.layout:4
+#: lib/layouts/acmsiggraph.layout:4 lib/layouts/agums.layout:4
+#: lib/layouts/agutex.layout:4 lib/layouts/amsart.layout:4
+#: lib/layouts/apa.layout:4 lib/layouts/arab-article.layout:4
+#: lib/layouts/article-beamer.layout:4 lib/layouts/article.layout:4
+#: lib/layouts/chess.layout:4 lib/layouts/cl2emult.layout:4
+#: lib/layouts/ctex-article.layout:4 lib/layouts/doublecol-new.layout:4
+#: lib/layouts/dtk.layout:4 lib/layouts/ectaart.layout:4
+#: lib/layouts/egs.layout:4 lib/layouts/elsart.layout:4
+#: lib/layouts/elsarticle.layout:4 lib/layouts/entcs.layout:4
+#: lib/layouts/extarticle.layout:4 lib/layouts/heb-article.layout:4
+#: lib/layouts/ijmpc.layout:4 lib/layouts/ijmpd.layout:4
+#: lib/layouts/iopart.layout:4 lib/layouts/isprs.layout:4
+#: lib/layouts/jarticle.layout:4 lib/layouts/jasatex.layout:4
+#: lib/layouts/jgrga.layout:4 lib/layouts/jsarticle.layout:4
+#: lib/layouts/jss.layout:4 lib/layouts/kluwer.layout:4
+#: lib/layouts/latex8.layout:4 lib/layouts/literate-article.layout:4
+#: lib/layouts/llncs.layout:4 lib/layouts/ltugboat.layout:4
+#: lib/layouts/mwart.layout:4 lib/layouts/paper.layout:4
+#: lib/layouts/revtex.layout:4 lib/layouts/revtex4-1.layout:4
+#: lib/layouts/revtex4.layout:4 lib/layouts/scrartcl.layout:4
+#: lib/layouts/scrarticle-beamer.layout:4 lib/layouts/siamltex.layout:4
+#: lib/layouts/sigplanconf.layout:4 lib/layouts/singlecol-new.layout:4
+#: lib/layouts/singlecol.layout:4 lib/layouts/spie.layout:4
+#: lib/layouts/svglobal.layout:4 lib/layouts/svglobal3.layout:4
+#: lib/layouts/svjog.layout:4 lib/layouts/svprobth.layout:4
+#: lib/layouts/tarticle.layout:4
+msgid "Articles"
+msgstr "Články"
+
 #: lib/layouts/AEA.layout:55 lib/layouts/apa.layout:92
 msgid "ShortTitle"
 msgstr "KrátkyTitul"
@@ -5651,6 +5687,10 @@ msgstr "Popis: "
 msgid "Proof"
 msgstr "Dôkaz"
 
+#: lib/layouts/IEEEtran.layout:3
+msgid "IEEE Transactions"
+msgstr "IEEE Transactions"
+
 #: lib/layouts/IEEEtran.layout:34 lib/layouts/aa.layout:27
 #: lib/layouts/aapaper.layout:34 lib/layouts/aastex.layout:52
 #: lib/layouts/achemso.layout:32 lib/layouts/acmsiggraph.layout:34
@@ -5886,6 +5926,10 @@ msgstr "ŽivotopisBezFotky"
 msgid "Proof."
 msgstr "Dôkaz."
 
+#: lib/layouts/aa.layout:3
+msgid "Astronomy & Astrophysics"
+msgstr "Astronomy & Astrophysics"
+
 #: lib/layouts/aa.layout:42 lib/layouts/aa.layout:229
 #: lib/layouts/aapaper.layout:64 lib/layouts/aapaper.layout:137
 #: lib/layouts/aastex.layout:67 lib/layouts/aastex.layout:177
@@ -6099,11 +6143,19 @@ msgstr "E-mail"
 msgid "email"
 msgstr "E-mail"
 
+#: lib/layouts/aapaper.layout:3 lib/layouts/aapaper.layout:14
+msgid "Astronomy & Astrophysics (V. 4, Obsolete)"
+msgstr "Astronomy & Astrophysics (V. 4, zastaralé)"
+
 #: lib/layouts/aapaper.layout:94 lib/layouts/aapaper.inc:103
 #: lib/ui/stdtoolbars.inc:139 src/frontends/qt4/GuiThesaurus.cpp:46
 msgid "Thesaurus"
 msgstr "Tezaurus"
 
+#: lib/layouts/aastex.layout:3
+msgid "American Astronomical Society (AASTeX)"
+msgstr "American Astronomical Society (AASTeX)"
+
 #: lib/layouts/aastex.layout:79 lib/layouts/agutex.layout:149
 #: lib/layouts/amsbook.layout:126 lib/layouts/apa.layout:341
 #: lib/layouts/egs.layout:71 lib/layouts/kluwer.layout:89
@@ -6264,6 +6316,10 @@ msgstr "Obj:"
 msgid "Dataset:"
 msgstr "Dataset:"
 
+#: lib/layouts/achemso.layout:3
+msgid "American Chemical Society (ACS)"
+msgstr "American Chemical Society (ACS)"
+
 #: lib/layouts/achemso.layout:100
 msgid "Alt Affiliation"
 msgstr "Alternatívne Príslušenstvo"
@@ -6323,6 +6379,10 @@ msgstr "Chemistry"
 msgid "chemistry"
 msgstr "chemistry"
 
+#:

[LyX master] Merge branch 'master' of git.lyx.org:lyx

2012-10-09 Thread Juergen Spitzmueller 
The branch, master, has been updated.

- Log -

commit 9a0f82d44141e63ff9818a9a1e426ea3e232
Merge: c851350 df880b8
Author: Juergen Spitzmueller 
Date:   Tue Oct 9 16:13:00 2012 +0200

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


commit c85135090e230c046851603c372b3ad0fd47a788
Author: Juergen Spitzmueller 
Date:   Tue Oct 9 16:12:32 2012 +0200

Stick to bformat

diff --git a/src/frontends/qt4/CategorizedCombo.cpp 
b/src/frontends/qt4/CategorizedCombo.cpp
index d4410cf..878d277 100644
--- a/src/frontends/qt4/CategorizedCombo.cpp
+++ b/src/frontends/qt4/CategorizedCombo.cpp
@@ -493,7 +493,9 @@ void CategorizedCombo::addItemSort(QString const & item, 
QString const & guiname
   bool sorted, bool sortedByCat, bool sortCats,
   bool available)
 {
-   QString titem = available ? guiname : qt_("Unavailable: 
%1").arg(guiname);
+   QString titem = available ? guiname
+ : toqstr(bformat(_("Unavailable: %1$s"),
+  qstring_to_ucs4(guiname)));
bool const uncategorized = category.isEmpty();
QString qcat = uncategorized ? qt_("Uncategorized") : category;
 

---

Summary of changes:
 src/frontends/qt4/CategorizedCombo.cpp |4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

[LyX master] de.po: update

2012-10-09 Thread Juergen Spitzmueller 
The branch, master, has been updated.

- Log -

commit 0aecfa0663d02492a4efa4e0260aa045d8ca57a9
Author: Juergen Spitzmueller 
Date:   Tue Oct 9 16:13:52 2012 +0200

de.po: update

diff --git a/po/de.po b/po/de.po
index 7140cc6..ac18667 100644
--- a/po/de.po
+++ b/po/de.po
@@ -95,8 +95,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LyX 2.1\n"
 "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n"
-"POT-Creation-Date: 2012-10-09 08:03+0200\n"
-"PO-Revision-Date: 2012-10-09 08:34+0200\n"
+"POT-Creation-Date: 2012-10-09 16:07+0200\n"
+"PO-Revision-Date: 2012-10-09 16:10+0200\n"
 "Last-Translator: Jürgen Spitzmüller \n"
 "Language-Team: German \n"
 "Language: de\n"
@@ -2732,15 +2732,15 @@ msgstr " Knopf zum Schließen von 
Registerkarten"
 msgid "Closing last view:"
 msgstr "Beim Schließen der letzten :"
 
-#: src/frontends/qt4/ui/PrefUi.ui:291
+#: src/frontends/qt4/ui/PrefUi.ui:294
 msgid "Closes document"
 msgstr "Dokument schließen"
 
-#: src/frontends/qt4/ui/PrefUi.ui:296
+#: src/frontends/qt4/ui/PrefUi.ui:299
 msgid "Hides document"
 msgstr "Dokument verbergen"
 
-#: src/frontends/qt4/ui/PrefUi.ui:301
+#: src/frontends/qt4/ui/PrefUi.ui:304
 msgid "Ask the user"
 msgstr "Nachfragen"
 
@@ -12064,7 +12064,7 @@ msgstr ""
 msgid "Enumerate-Resume"
 msgstr "Aufzählung fortführen"
 
-#: lib/layouts/linguistics.module:2
+#: lib/layouts/linguistics.module:2 lib/layouts/linguistics.module:33
 msgid "Linguistics"
 msgstr "Linguistik"
 
@@ -12086,59 +12086,59 @@ msgstr "Nummeriertes Beispiel (mehrere Zeilen)"
 msgid "Example:"
 msgstr "Beispiel:"
 
-#: lib/layouts/linguistics.module:37
+#: lib/layouts/linguistics.module:38
 msgid "Numbered Examples (consecutive)"
 msgstr "Nummeriertes Beispiel (konsekutiv)"
 
-#: lib/layouts/linguistics.module:41
+#: lib/layouts/linguistics.module:42
 msgid "Examples:"
 msgstr "Beispiele:"
 
-#: lib/layouts/linguistics.module:46
+#: lib/layouts/linguistics.module:47
 msgid "Subexample"
 msgstr "Unterbeispiel"
 
-#: lib/layouts/linguistics.module:50
+#: lib/layouts/linguistics.module:51
 msgid "Subexample:"
 msgstr "Unterbeispiel:"
 
-#: lib/layouts/linguistics.module:65 lib/layouts/linguistics.module:67
+#: lib/layouts/linguistics.module:66 lib/layouts/linguistics.module:68
 msgid "Glosse"
 msgstr "Glosse"
 
-#: lib/layouts/linguistics.module:94 lib/layouts/linguistics.module:96
+#: lib/layouts/linguistics.module:95 lib/layouts/linguistics.module:97
 msgid "Tri-Glosse"
 msgstr "Tri-Glosse"
 
-#: lib/layouts/linguistics.module:122
+#: lib/layouts/linguistics.module:123
 msgid "Expression"
 msgstr "Ausdruck"
 
-#: lib/layouts/linguistics.module:124
+#: lib/layouts/linguistics.module:125
 msgid "expr."
 msgstr "Ausdr."
 
-#: lib/layouts/linguistics.module:137
+#: lib/layouts/linguistics.module:138
 msgid "Concepts"
 msgstr "Konzept"
 
-#: lib/layouts/linguistics.module:139
+#: lib/layouts/linguistics.module:140
 msgid "concept"
 msgstr "Konzept"
 
-#: lib/layouts/linguistics.module:152
+#: lib/layouts/linguistics.module:153
 msgid "Meaning"
 msgstr "Bedeutung"
 
-#: lib/layouts/linguistics.module:154
+#: lib/layouts/linguistics.module:155
 msgid "meaning"
 msgstr "Bedeutung"
 
-#: lib/layouts/linguistics.module:168
+#: lib/layouts/linguistics.module:169
 msgid "Tableau"
 msgstr "Tableau"
 
-#: lib/layouts/linguistics.module:173
+#: lib/layouts/linguistics.module:174
 msgid "List of Tableaux"
 msgstr "Tableaux-Verzeichnis"
 
@@ -21902,12 +21902,14 @@ msgstr "Dings 4"
 msgid "Unavailable:"
 msgstr "Nicht verfügbar:"
 
-#: src/frontends/qt4/CategorizedCombo.cpp:496
-msgid "Unavailable: %1"
-msgstr "Nicht verfügbar: %1"
+#: src/frontends/qt4/CategorizedCombo.cpp:497
+#, c-format
+msgid "Unavailable: %1$s"
+msgstr "Nicht verfügbar: %1$s"
 
-#: src/frontends/qt4/CategorizedCombo.cpp:498
-#: src/frontends/qt4/CategorizedCombo.cpp:521
+#: src/frontends/qt4/CategorizedCombo.cpp:500
+#: src/frontends/qt4/CategorizedCombo.cpp:525
+#: src/frontends/qt4/CategorizedCombo.cpp:526
 msgid "Uncategorized"
 msgstr "Nicht kategorisiert"
 
@@ -23018,8 +23020,7 @@ msgid ""
 "all requires packages (%2$s) installed."
 msgstr ""
 "Klasse wurde von LyX nicht gefunden. Bitte prüfen Sie, ob Sie die "
-"entsprechende %1$s-Klasse "
-"und alle nötigen Pakete (%2$s) installiert haben."
+"entsprechende %1$s-Klasse und alle nötigen Pakete (%2$s) installiert haben."
 
 #: src/frontends/qt4/GuiDocument.cpp:1404
 #: src/frontends/qt4/GuiDocument.cpp:1505

---

Summary of changes:
 po/de.po |   55 ---
 1 files changed, 28 insertions(+), 27 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

[LyX master] * sk.po

2012-10-09 Thread Kornel Benko 
The branch, master, has been updated.

- Log -

commit 210ea2dd01ff98acfbd04a60a4c6bad7fdbf9f14
Author: Kornel Benko 
Date:   Tue Oct 9 16:29:13 2012 +0200

* sk.po

diff --git a/po/sk.po b/po/sk.po
index 9ab7854..74cd1b4 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -21569,9 +21569,10 @@ msgstr "Dings 4"
 msgid "Unavailable:"
 msgstr "Nedostupné:"
 
-#: src/frontends/qt4/CategorizedCombo.cpp:496
-msgid "Unavailable: %1"
-msgstr "Nedostupné: %1"
+#: src/frontends/qt4/CategorizedCombo.cpp:497
+#, c-format
+msgid "Unavailable: %1$s"
+msgstr "Nedostupné: %1$s"
 
 #: src/frontends/qt4/CategorizedCombo.cpp:498
 #: src/frontends/qt4/CategorizedCombo.cpp:523

---

Summary of changes:
 po/sk.po |7 ---
 1 files changed, 4 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

r40942 - www-user/trunk/images/svnwiki/NewInLyX21

2012-10-09 Thread spitz 
Author: spitz
Date: Tue Oct  9 16:53:55 2012
New Revision: 40942
URL: http://www.lyx.org/trac/changeset/40942

Log:
More complete IPA screenshot

Added:
   www-user/trunk/images/svnwiki/NewInLyX21/lyx-newipa.png   (contents, props 
changed)

Added: www-user/trunk/images/svnwiki/NewInLyX21/lyx-newipa.png
==
Binary file. No diff available.

r40943 - www-user/trunk/images/svnwiki/NewInLyX21

2012-10-09 Thread spitz 
Author: spitz
Date: Tue Oct  9 17:09:42 2012
New Revision: 40943
URL: http://www.lyx.org/trac/changeset/40943

Log:
Category screenshot

Added:
   www-user/trunk/images/svnwiki/NewInLyX21/cats.png   (contents, props changed)

Added: www-user/trunk/images/svnwiki/NewInLyX21/cats.png
==
Binary file. No diff available.

[LyX master] Cmake build: Handle option "LYX_DEVEL_VERSION" to add the preprocesor definition of DEVEL_VERSION The effect should be alike the configure parameter "--enable-build-type=dev"

2012-10-09 Thread Kornel Benko 
The branch, master, has been updated.

- Log -

commit 8217df8a687bb920186e2531b9cff72e75e1ee25
Author: Kornel Benko 
Date:   Tue Oct 9 21:52:17 2012 +0200

Cmake build:
Handle option "LYX_DEVEL_VERSION" to add the preprocesor definition of 
DEVEL_VERSION
The effect should be alike the configure parameter "--enable-build-type=dev"

diff --git a/development/cmake/config.h.cmake b/development/cmake/config.h.cmake
index 7ec087e..cec1d0e 100644
--- a/development/cmake/config.h.cmake
+++ b/development/cmake/config.h.cmake
@@ -24,6 +24,12 @@
 #endif
 
 
+#cmakedefine LYX_DEVEL_VERSION 1
+#if defined(LYX_DEVEL_VERSION)
+   #define DEVEL_VERSION 1
+#else
+   #undef DEVEL_VERSION
+#endif
 #cmakedefine PACKAGE "${PACKAGE}"
 #cmakedefine PACKAGE_VERSION "${PACKAGE_VERSION}"
 #define PACKAGE_STRING "LyX ${PACKAGE_VERSION}"

---

Summary of changes:
 development/cmake/config.h.cmake |6 ++
 1 files changed, 6 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

[LyX master] Cmake build: Define for 'DEVEL_VERSION' already done in development/cmake/config.h.cmake

2012-10-09 Thread Kornel Benko 
The branch, master, has been updated.

- Log -

commit 648e19702142d567c197c391e37ae80097d8b42b
Author: Kornel Benko 
Date:   Tue Oct 9 22:45:12 2012 +0200

Cmake build: Define for 'DEVEL_VERSION' already done in 
development/cmake/config.h.cmake

diff --git a/src/frontends/qt4/CMakeLists.txt b/src/frontends/qt4/CMakeLists.txt
index 8d05dcf..c71873b 100644
--- a/src/frontends/qt4/CMakeLists.txt
+++ b/src/frontends/qt4/CMakeLists.txt
@@ -37,10 +37,6 @@ include_directories(
${QT_INCLUDES}
${CMAKE_CURRENT_BINARY_DIR})
 
-if (LYX_DEVEL_VERSION)
-   add_definitions(-DDEVEL_VERSION)
-endif()
-
 if(LYX_MERGE_FILES)
lyx_const_touched_files(_allinone frontends_qt4_sources)
set(depends_moc_uic ${frontends_qt4_headers} ${ui_files})

---

Summary of changes:
 src/frontends/qt4/CMakeLists.txt |4 
 1 files changed, 0 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository