[LyX features/2.1.0rc1] 2.1.0rc1

[Vincent van Ravesteijn]

The annotated tag, 2.1.0rc1, has been created.
at  655782029dc5eede4158466dcd86ea0065117226 (tag)
   tagging  fd7c0c299339098d0dbb788c231c4d32e489cd6d (commit)
  replaces  2.1.0beta2
 tagged by  Vincent van Ravesteijn
on  Wed Mar 26 19:56:08 2014 +0100

- Log -
This is LyX 2.1.0rc1.
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)

iQEcBAABAgAGBQJTMyLIAAoJEN56RPrH+zgt3FoH/Alv/Hruc0Nru75IXD/F8NYm
uE1OqyMunI2iQdE/+qHqTK+Fohdh5VjY/c3QvvZ12a5lafCGwGB7bW8dQt3EppPY
unnhdIZYa++UuIuXSFPbTgtOcGP5rpgE6Gx2J6GYdEA1dnke6y8+byz9QQAqB0w8
hCksYg/3J4rs+y7bNV6LAK5YcMKoe5PQr3Hurj8ji3g7Ug1E/lccjBZ7tUIY/IxP
wnRkNw7X49gavWc+yeJPzBcBYhsv7UoAx/fUMDry6BHbWylcjD0YXf4zr8zdYRIZ
OVsvB/WWh36YNIzK3N7D1vx8do8ISIzFa7kLhRq6jaRVGfrUCtHJ7UtSKlF1i8c=
=uaIb
-END PGP SIGNATURE-

Benjamin Piwowarski (2):
  Updates to AppleScript support, and documentaoin for it.
  Fix typo in configFunctions.h (wrong define for the header)

Enrico Forestieri (6):
  Update it.po
  Fix file dialogs with Qt 5.2.0 and later.
  Update it.po
  Update it.po again
  Fix bug #8889 by always issuing \protect in fragile environments.
  Update it.po

Georg Baum (50):
  Fix encoding for copying LaTeX from clipboard
  Silence unwanted error popup on copying
  Fix regression of e02df14 (bug #8900)
  Do not ignore literate programming errors
  Fix wrong description screen font (bug #8869)
  Fix indentation for 'python -tt'
  Make -userdir available to child processes
  Add some missing unicode math symbols
  Make sty file parser fit for mdsymbol.sty
  Fix writer2latex quote handling (bug #8903)
  Fix typo
  Add more paste lfun doc from bug #8749.
  Document paste options (bug #8749)
  Fix conflicting inset font defaults (bug #8874)
  Fix typo and add a note about ResetsFont default
  Fix regression of 18779013 for \smash
  Fix bug #4036 (lyx2lyx produces invalid LyX 1.4.x)
  Fix remaining part of bug #8967
  Fix bug #8891 (wrong depth of copied text)
  Fix bug #8784 (mathml export for scripts)
  Fix bug #8992 without reintroducing #8933
  Fix crash on recursive include (bug #8994)
  Remove unsupported optional argument.
  whitespace
  Load listings after babel (bug #8995)
  Add missing math delim decorations
  Fix misparsing of alternative simple formulas
  Fix dataloss for align env inside math
  Fix crash if magic_file() returns an error
  Fix compilation with libc++
  Fix logic error in layout translation extraction
  Remove context also for translated strings
  Add new layout translations to be reviewed
  Transfer layout translations to fi.po
  Transfer layout translations to nl.po
  Update layouttranslations from current po files
  Update chinese layouttranslations
  whitespace
  Add two missing unicodesymbols
  Work around broken math symbol display (bug 7954)
  Remove dead code + whitespace
  Add review comments for translations in beta
  Prevent the most important case of bug #9012
  Disable unicode math symbol replacement.
  MSVC compile fix
  Arrgh, fix warning
  Add comment (thanks Enrico)
  Add comments about putenv() usage
  Fix wrong comment (thanks Enrico)
  Update layouttranslation review status

Jean-Marc Lasgouttes (15):
  Remove obsolete comment
  Handle undo in `branch-add' LFUN
  Do not skip space at start of row (fixes #8947, #8838)
  Improve autotools support for generating LFUNs.lyx
  Rename some LFUN names to match their text name
  Fix various typos in LFUNs.lyx
  Do not use enum names to describe lfuns in release notes
  Whitespace
  Fix bug #8884: Crash when "navigate to next change"
  Fix bug #8998: changed document setting is recoded twice as undo
  Bug #9005: various things that do not work as intended in passthru 
paragraphs
  Whitespace only.
  Remove duplicate call to Cursor::selHandle
  Also show boundary when displaying Cursor value.
  Fix bug #8837: LyX hangs on selection

Juergen Spitzmueller (102):
  Improve beamer frame conversion: consider explicit EndFrames between two 
identical frame types
  de.po
  powerdot: fix argument order with empty first argument
  enumitem module: one forgotten adaptation to new argument possibilities
  We only have the last LyX release in the export menu (the others are 
accessible via SendTo and SaveAs dialogs)
  Fix bug 8880: do not try to validate custom value if it is disabled
  Fix shortcut clash (bug #8878)
  Do not try to validate custom value in VSpace dialog if it is disabled
  Also consider main language in hasOnlyPolyglossiaLanguages() and 
hasPolyglossiaExclusiveLanguages()
  Fix language issues in Argument read (#8471)
  List all exportable docume

[LyX features/2.1.0beta1] This is LyX 2.1.0beta1

[Vincent van Ravesteijn]

The tag, 2.1.0beta1, has been created.
at  290f3af8625052ac47183fda0d3695d8057a880d (commit)

- Log -
commit 290f3af8625052ac47183fda0d3695d8057a880d
Author: Vincent van Ravesteijn 
Date:   Wed Jul 3 23:40:58 2013 +0200

This is LyX 2.1.0beta1
---


hooks/post-receive
-- 
Repository for new features
-- 
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs

[LyX features/2.1.0] 2.1.0

[Vincent van Ravesteijn]

The annotated tag, 2.1.0, has been created.
at  33505d6992470523d055f8a195f844245e2bb54a (tag)
   tagging  fde16219ca7860fdfe8adf171d109a7cce61e7b4 (commit)
  replaces  2.1.0rc1
 tagged by  Vincent van Ravesteijn
on  Fri Apr 18 11:45:21 2014 +0200

- Log -
This is LyX 2.1.0.
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)

iQEcBAABAgAGBQJTUPQxAAoJEN56RPrH+zgtxfQIAI/CQKWP+Ehe99DRzI4ILlJA
yDL98jy1mOIiRZPGLOfZ0PUObu62UIgB7wK0VguMED0gsnsQ5Q2QTBbeRmj3LaoM
/adaY/b+Wui2AKKloa9wCxt5CIJcFLv/0C9KpdOOLTxEh7e3JlV0LpnydPNDrhgP
HxVAzxfSDfpYG3rXy7sPYiLh1djEPfbQ2depK7lfKarjQ6/WxrfqYuDUbZXmPsvL
2UYtxKdLMBWlCsd+i5ZFZ7/qQ4TFh0dDOKe+1Lyo/9WVy4nrUbRU4LPIRTuhhhTD
CIIHfu8VLEw+AawGd416XKToQlI88qdmF4aI9KjeY+fCrcKqpU9WKu6BVO6+dLg=
=lORK
-END PGP SIGNATURE-

Benjamin Piwowarski (1):
  Fix problem with python and change of PATH

Enrico Forestieri (2):
  Update it.po
  Update it.po (thanks for the clarification, Georg)

Georg Baum (2):
  Fix display of predefined macros (bug #9059)
  Improve translation of "Graph" for achemso.layout

Juergen Spitzmueller (6):
  Re-enable translation of pdfpages help text (works around #9045)
  elsarticle: use standard xampl bib from texmf tree (relative path does 
not work for templates)
  Set cursor pos after cursor idx to avoid invalid cursor.
  Fix iterator invalidation.
  Do not stop on BibTeX errors.
  Typo. Sorry.

Kornel Benko (1):
  sk.po: Rechecked 'mathematical' context

Pavel Sanda (29):
  Fix make install phase.
  * cs.po
  Squash gcc warning.
  * Additional.lyx (accept changes)
  * cs/splash.lyx update
  * cs/Tutorial.lyx
  * cs.po shortcut conflict
  * cs.po
  Forgotten in 0ad02c437e08.
  * layouttranslations.review - sk done in multiple commits.
  * layouttranslations.review - de seems to be updated at 050c768eef.
  * layouttranslations.review - sr done at 9fc888fa65.
  * layouttranslations - zh_TW recently checked.
  * layouttranslations.review - ja changes in 10d8a929.
  * layouttranslations.review - ia updated in 5435701af1.
  * layouttranslations.review - da - Note eems to be correct according to 
9a3ba796d8f.
  * layouttranslations.review - less precise but also less confusing
  ia.po - technical error in translatio
  * layouttranslations.review - review of all langs.
  * cs.po
  * layouttranslations.review - sk reviewed by Kornel
  layouttranslations fot pt(_br) checked by Jose.
  * layouttranslations.review - remove dupes
  * cs.po
  Typo.
  * layouttranslations.review - got explicit ack for danish translation.
  * pt.po & layouttranslation from Jose.
  * layouttranslations.review - nn reviewed
  * cs.po

Richard Heck (4):
  Remove obsolete formats from file dialog
  Copy NEWS for 2.0.7 from branch.
  Add news from 2.0.8.
  Fix problem with verbatim reversion.

Tommaso Cucinotta (1):
  Fixing #7987: deleted text in change-tracking mode is not found in 
Advanced F any more.

Uwe Stöhr (29):
  ja.po: translation update by Koji
  Japanese doc image files: updates and additions by Koji
  doc files: push all changes sine master was closed and the updates from 
Koji
  uk.po: translations for 2.1 from Yuri
  Japanese docs: another update from Koji
  id.po: port translations from branch
  installer: commit files with which installer for RC1 was built
  xypic.lyx: updates from Jean-Pierre
  installer: fix a bug with file associations
  template files: remove relative paths
  template files: remove all relative paths to re-eanable to use "new from 
template"
  partly revert commit a860d18b5a722606c68fb1a4ec22ffe3e99792e6
  Japanese EmbeddedObjects.lyx: fix a formatting
  Intro.lyx: change a sentence to avoid misunderstandings
  French splash.lyx: a fix by Jean-Pierre
  UserGuide.lyx: fix 2 Typos (thanks Ignacio)
  Spanish manuals: translations by Ignacio
  sv.po: translations for lyX 2.1 from Jim
  es.po: translations by Ignacio
  fr.po: translations for LyX 2.1 by Jean-Pierre
  French splash.lyx: update fileformat
  fr.po: another update by Jean-Pierre
  French EmbeddedObjects.lyx: translations for LyX 2.1 by Jean-Pierre
  French doc files: translations by Jean-Pierre
  French Math.lyx: re-introduce 2 formulas that got accidentally lost by 
the last commit
  Spanish manuals: translations by Ignacio
  Additional.lyx: update version name to "2.1.x"
  manuals: fix 2 typos spotted by Ignacio
  fr.po: 3 shortcut conflicts by Jean-Pierre

Vincent van Ravesteijn (39):
  Revert "Fixing #7987: deleted text in change-tracking mode is not found 
in Advanced F any more."
  Release notes: Warn Windows users to not use Qt 4.8.5
  Release note

[LyX/master] cmake: Properly suppress CMake warning about qtmain

[Vincent van Ravesteijn]

commit 02db183373f8112f95ed554e832d212ab2a52d7d
Author: Vincent van Ravesteijn <v...@lyx.org>
Date:   Wed Oct 28 20:19:49 2015 +0100

cmake: Properly suppress CMake warning about qtmain

CMake policy CMP0020 exists since version 2.8.11, so this prevents an
error on older versions.

This fixes up commit ec6f51b.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a25f548..a87b049 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,6 +40,9 @@ if(COMMAND cmake_policy)
cmake_policy(SET CMP0005 OLD)
# Installing MACOSX_BUNDLE targets requires a BUNDLE DESTINATION
cmake_policy(SET CMP0006 NEW)
+   if(POLICY CMP0020)
+   cmake_policy(SET CMP0020 OLD)
+   endif()
if(POLICY CMP0028)
cmake_policy(SET CMP0028 OLD)
endif()
@@ -47,7 +50,6 @@ if(COMMAND cmake_policy)
# COMPILE_DEFINITIONS are not used yet. Enable new behavior.
cmake_policy(SET CMP0043 NEW)
endif()
-   cmake_policy(SET CMP0020 OLD)
 endif()
 
 set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)

[LyX/master] msvc: Proper fix for compilation of TexRow

[Vincent van Ravesteijn]

commit 7a60c96dfa151d5c3bf4510c1889297de95b3c07
Author: Guillaume Munch 
Date:   Tue Oct 20 19:18:28 2015 +0200

msvc: Proper fix for compilation of TexRow

This bug in MSVC 10 was fixed at e948caf6, but the workaround belongs to
strfwd.h.

Thanks Vincent and Georg.

diff --git a/src/support/docstream.h b/src/support/docstream.h
index 52916b0..108d00e 100644
--- a/src/support/docstream.h
+++ b/src/support/docstream.h
@@ -14,13 +14,6 @@
 
 #include "support/docstring.h"
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1600) 
-// Ugly workaround for MSVC10 STL bug:
-// std::numpunct has a hardcoded dllimport in definition, but we wanna it with 
32 bit 
-// so we can't import it and must define it but then the compiler complains.
-#include "support/numpunct_lyx_char_type.h"
-#endif
-
 #include 
 #include 
 
diff --git a/src/support/strfwd.h b/src/support/strfwd.h
index 8419b51..30e1c09 100644
--- a/src/support/strfwd.h
+++ b/src/support/strfwd.h
@@ -61,6 +61,15 @@ typedef basic_ostringstream ostringst
 
 #endif
 
+
+// Ugly workaround for MSVC10 STL bug:
+// std::numpunct has a hardcoded dllimport in definition, but we wanna it with 
32 bit 
+// so we can't import it and must define it but then the compiler complains.
+#if defined(_MSC_VER) && (_MSC_VER >= 1600) 
+#include "support/numpunct_lyx_char_type.h"
+#endif
+
+
 namespace lyx {
 
 /**

[LyX/master] Revert "msvc: Fix compilation of TexRow"

[Vincent van Ravesteijn]

commit 42e5353f8a9fedc5829f25aa06399bc9f1150cc4
Author: Vincent van Ravesteijn <v...@lyx.org>
Date:   Tue Oct 20 19:19:31 2015 +0200

Revert "msvc: Fix compilation of TexRow"

This reverts commit 10d7f6d479b05cf101173a8ab036676482b7c251.

diff --git a/src/TexRow.cpp b/src/TexRow.cpp
index 516aade..e72af19 100644
--- a/src/TexRow.cpp
+++ b/src/TexRow.cpp
@@ -463,12 +463,12 @@ std::pair<int,int> TexRow::rowFromCursor(Cursor const & 
cur) const
 ///
 docstring TexRow::asString(RowEntry const & entry)
 {
-   std::ostringstream t;
+   odocstringstream os;
if (entry.is_math)
-   t << "(1," << entry.math.id << "," << entry.math.cell << ")";
+   os << "(1," << entry.math.id << "," << entry.math.cell << ")";
else
-   t << "(0," << entry.text.id << "," << entry.text.pos << ")";
-   return from_utf8( t.str() );
+   os << "(0," << entry.text.id << "," << entry.text.pos << ")";
+   return os.str();
 }
 
 

[LyX/master] cmake: Put updatetex2lyxtests in an appropriate folder

[Vincent van Ravesteijn]

commit 92b7c5a92f21956f6da19c8ac783cd9132ca82b9
Author: Vincent van Ravesteijn <v...@lyx.org>
Date:   Mon Oct 19 17:50:59 2015 +0200

cmake: Put updatetex2lyxtests in an appropriate folder

diff --git a/src/tex2lyx/test/CMakeLists.txt b/src/tex2lyx/test/CMakeLists.txt
index e11b345..c513d6e 100644
--- a/src/tex2lyx/test/CMakeLists.txt
+++ b/src/tex2lyx/test/CMakeLists.txt
@@ -71,3 +71,4 @@ add_custom_command(
 )
 
 add_custom_target(updatetex2lyxtests DEPENDS LyxTestFiles)
+set_target_properties(updatetex2lyxtests PROPERTIES FOLDER "tests/tex2lyx")

[LyX/master] msvc: Fix compilation of TexRow

[Vincent van Ravesteijn]

commit 10d7f6d479b05cf101173a8ab036676482b7c251
Author: Vincent van Ravesteijn <v...@lyx.org>
Date:   Mon Oct 19 21:25:26 2015 +0200

msvc: Fix compilation of TexRow

The problem was that "odocstringstream << (const char *) ptr" did not
compile using msvc.

diff --git a/src/TexRow.cpp b/src/TexRow.cpp
index 4bec66e..60a3539 100644
--- a/src/TexRow.cpp
+++ b/src/TexRow.cpp
@@ -466,12 +466,12 @@ std::pair<int,int> TexRow::rowFromCursor(Cursor const & 
cur) const
 ///
 docstring TexRow::asString(RowEntry const & entry)
 {
-   odocstringstream os;
+   std::ostringstream t;
if (entry.is_math)
-   os << "(1," << entry.math.id << "," << entry.math.cell << ")";
+   t << "(1," << entry.math.id << "," << entry.math.cell << ")";
else
-   os << "(0," << entry.text.id << "," << entry.text.pos << ")";
-   return os.str();
+   t << "(0," << entry.text.id << "," << entry.text.pos << ")";
+   return from_utf8( t.str() );
 }
 
 

Re: [LyX/master] Make RELEASE-NOTES accessible from GUI (#8616)

[Vincent van Ravesteijn]

On Tue, May 19, 2015 at 9:59 AM, Juergen Spitzmueller sp...@lyx.org wrote:
 commit 9f55ce9b04c1786c5bed52afc9028f287d28bb32
 Author: Juergen Spitzmueller sp...@lyx.org
 Date:   Tue May 19 09:57:52 2015 +0200

 Make RELEASE-NOTES accessible from GUI (#8616)

 CMake people, please check if something needs to be done to install
 lib/RELEASE-NOTES.


Shall we leave behind the original RELEASE-NOTES file with the text:
The RELEASE-NOTES can be found in lib/RELEASE-NOTES. ?

People probably are used to look for the RELEASE-NOTES in the main
directory, and we do not have the possibility of attending them to
this change by putting something in the release notes :S..

Vincent

[LyX/master] po: Fix EOL of fi.po

[Vincent van Ravesteijn]

commit a5d8f9a1b462501abfe8528e786fbc448ab01ce5
Author: Vincent van Ravesteijn v...@lyx.org
Date:   Tue May 19 22:40:57 2015 +0200

po: Fix EOL of fi.po

diff --git a/po/fi.po b/po/fi.po
index 95b3ce7..b8d8871 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,73 +1,73 @@
-# Suomalainen LyX-lokalisointi / Finnish LyX-localization
-# Copyright (C) 1997-2008 The LyX Team
-#   Originally modified by martin.verm...@fgi.fi
-#   Pauli Virtanen pauli.virta...@hut.fi
-#   Martin Vermeer martin.verm...@tkk.fi
-#   Jari-Matti Mäkelä j...@iki.fi
-# 
-# Translations:
-# 
-#  collapse = laskostua
-#  minibuffer = tilarivi
-#  branch = haara
-#  bullet = ransk. viiva
-# 
-# LaTeX terminology: (please tell me if I have got something wrong!)
-# 
-# * Font Sizes:
-#  (A bit stupid though, but I like to maintain association to LaTeX)
-#  tiny = pikkuruinen
-#  script = indeksi|| smallest = pienin
-#  footnote = alaviite || smaller = pienempi
-#  small = pieni
-#  normal = tavallinen
-#  large = suuri
-#  Large = suurempi
-#  LARGE = suurin
-#  huge = valtava
-#  Huge = Huger = valtavin
-# 
-# * Misc
-#  Float = kelluva [upote]
-#  Inset = upote
-#  Tabular = taulukko (since LyX does not use tables any more)
-# 
-#  cross reference = viittaus
-#  citation = lainaus
-# 
-#  float = kelluva upote
-#  wrap = tykö?
-#  theorem = väittämä
-#   encoding = merkistö
-# 
-# 
-# * Environments and stuff
-#  Title = Teoksen nimi
-#  Subtitle = Alaotsikko
-#  Part = Osa
-#  Chapter = Luku
-#  Section = Kappale
-#  Subsection = Alikappale
-#  Subsubsection = Alialikappale
-#  Paragraph = Osakappale
-#  Subparagraph = Aliosakappale
-#  Caption = Kuvateksti
-#  Subcaption = Alikuvateksti
-# 
-#  Affiliation = Järjestö
-# 
-#  Remark = Huomautus
-#  Note = Muistiinpano
-#  Comment = Huomautus
-# 
-#  Slide = Kalvo
-#  Overlay = Kalvokerros
-# 
-#  Running = Jatkuva (Well, I know it is something continued from the
-#previous page, and shown on the top of the page.)
-# 
-# 
-#  Do not overwrite trunk fi.po by this file (layouttranslations).
+# Suomalainen LyX-lokalisointi / Finnish LyX-localization
+# Copyright (C) 1997-2008 The LyX Team
+#   Originally modified by martin.verm...@fgi.fi
+#   Pauli Virtanen pauli.virta...@hut.fi
+#   Martin Vermeer martin.verm...@tkk.fi
+#   Jari-Matti Mäkelä j...@iki.fi
+# 
+# Translations:
+# 
+#  collapse = laskostua
+#  minibuffer = tilarivi
+#  branch = haara
+#  bullet = ransk. viiva
+# 
+# LaTeX terminology: (please tell me if I have got something wrong!)
+# 
+# * Font Sizes:
+#  (A bit stupid though, but I like to maintain association to LaTeX)
+#  tiny = pikkuruinen
+#  script = indeksi|| smallest = pienin
+#  footnote = alaviite || smaller = pienempi
+#  small = pieni
+#  normal = tavallinen
+#  large = suuri
+#  Large = suurempi
+#  LARGE = suurin
+#  huge = valtava
+#  Huge = Huger = valtavin
+# 
+# * Misc
+#  Float = kelluva [upote]
+#  Inset = upote
+#  Tabular = taulukko (since LyX does not use tables any more)
+# 
+#  cross reference = viittaus
+#  citation = lainaus
+# 
+#  float = kelluva upote
+#  wrap = tykö?
+#  theorem = väittämä
+#   encoding = merkistö
+# 
+# 
+# * Environments and stuff
+#  Title = Teoksen nimi
+#  Subtitle = Alaotsikko
+#  Part = Osa
+#  Chapter = Luku
+#  Section = Kappale
+#  Subsection = Alikappale
+#  Subsubsection = Alialikappale
+#  Paragraph = Osakappale
+#  Subparagraph = Aliosakappale
+#  Caption = Kuvateksti
+#  Subcaption = Alikuvateksti
+# 
+#  Affiliation = Järjestö
+# 
+#  Remark = Huomautus
+#  Note = Muistiinpano
+#  Comment = Huomautus
+# 
+#  Slide = Kalvo
+#  Overlay = Kalvokerros
+# 
+#  Running = Jatkuva (Well, I know it is something continued from the
+#previous page, and shown on the top of the page.)
+# 
+# 
+#  Do not overwrite trunk fi.po by this file (layouttranslations).
 msgid 
 msgstr 
 Project-Id-Version: lyx\n
@@ -1243,7 +1243,7 @@ msgstr Näytä ERT-kehyksen sisältö
 msgid Open
 msgstr Auki
 
-# Now this wasn't very obvious.
+# Now this wasn't very obvious.
 #: src/frontends/qt4/ui/LineUi.ui:22
 #, fuzzy
 msgid Offset:
@@ -7981,7 +7981,7 @@ msgstr Hyväksytty
 msgid Accepted:
 msgstr Hyväksytty:
 
-# Now this wasn't very obvious.
+# Now this wasn't very obvious.
 #: lib/layouts/egs.layout:467
 msgid Offsets
 msgstr Uusintapainosten välittäjä
@@ -12470,7 +12470,7 @@ msgstr yläotsikot
 msgid City:
 msgstr äärettömmyys
 
-# Now this wasn't very obvious.
+# Now this wasn't very obvious.
 #: lib/layouts/lettre.layout:263
 #, fuzzy
 msgid Office:

[LyX/master] po: Fix wrong parameter placeholder in fi.po

[Vincent van Ravesteijn]

commit 809a57848f45dc9abdad2ac652e5881eb9c2d556
Author: Vincent van Ravesteijn v...@lyx.org
Date:   Tue May 19 22:44:01 2015 +0200

po: Fix wrong parameter placeholder in fi.po

diff --git a/po/fi.gmo b/po/fi.gmo
index 91e96f3..a59acc0 100644
Binary files a/po/fi.gmo and b/po/fi.gmo differ
diff --git a/po/fi.po b/po/fi.po
index b8d8871..9183a27 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -30032,7 +30032,7 @@ msgstr Ei muuta uudelleen tehtävää
 #: src/frontends/qt4/qt_helpers.cpp:268
 #, c-format
 msgid The script `%1$s' failed.
-msgstr Skriptin '%s' ajo epäonnistui.
+msgstr Skriptin '%1$s' ajo epäonnistui.
 
 #: src/frontends/qt4/qt_helpers.cpp:521
 msgid All Files 

Re: [LyX/master] Make RELEASE-NOTES accessible from GUI (#8616)

[Vincent van Ravesteijn]

On Tue, May 19, 2015 at 9:59 AM, Juergen Spitzmueller  wrote:
> commit 9f55ce9b04c1786c5bed52afc9028f287d28bb32
> Author: Juergen Spitzmueller 
> Date:   Tue May 19 09:57:52 2015 +0200
>
> Make RELEASE-NOTES accessible from GUI (#8616)
>
> CMake people, please check if something needs to be done to install
> lib/RELEASE-NOTES.
>

Shall we leave behind the original RELEASE-NOTES file with the text:
"The RELEASE-NOTES can be found in lib/RELEASE-NOTES." ?

People probably are used to look for the RELEASE-NOTES in the main
directory, and we do not have the possibility of attending them to
this change by putting something in the release notes :S..

Vincent

[LyX/master] po: Fix wrong parameter placeholder in fi.po

[Vincent van Ravesteijn]

commit 809a57848f45dc9abdad2ac652e5881eb9c2d556
Author: Vincent van Ravesteijn <v...@lyx.org>
Date:   Tue May 19 22:44:01 2015 +0200

po: Fix wrong parameter placeholder in fi.po

diff --git a/po/fi.gmo b/po/fi.gmo
index 91e96f3..a59acc0 100644
Binary files a/po/fi.gmo and b/po/fi.gmo differ
diff --git a/po/fi.po b/po/fi.po
index b8d8871..9183a27 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -30032,7 +30032,7 @@ msgstr "Ei muuta uudelleen tehtävää"
 #: src/frontends/qt4/qt_helpers.cpp:268
 #, c-format
 msgid "The script `%1$s' failed."
-msgstr "Skriptin '%s' ajo epäonnistui."
+msgstr "Skriptin '%1$s' ajo epäonnistui."
 
 #: src/frontends/qt4/qt_helpers.cpp:521
 msgid "All Files "

[LyX/master] po: Fix EOL of fi.po

[Vincent van Ravesteijn]

commit a5d8f9a1b462501abfe8528e786fbc448ab01ce5
Author: Vincent van Ravesteijn <v...@lyx.org>
Date:   Tue May 19 22:40:57 2015 +0200

po: Fix EOL of fi.po

diff --git a/po/fi.po b/po/fi.po
index 95b3ce7..b8d8871 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,73 +1,73 @@
-# Suomalainen LyX-lokalisointi / Finnish LyX-localization
-# Copyright (C) 1997-2008 The LyX Team
-#   Originally modified by martin.verm...@fgi.fi
-#   Pauli Virtanen <pauli.virta...@hut.fi>
-#   Martin Vermeer <martin.verm...@tkk.fi>
-#   Jari-Matti Mäkelä <j...@iki.fi>
-# 
-# Translations:
-# 
-#  collapse = laskostua
-#  minibuffer = tilarivi
-#  branch = haara
-#  bullet = ransk. viiva
-# 
-# LaTeX terminology: (please tell me if I have got something wrong!)
-# 
-# * Font Sizes:
-#  (A bit stupid though, but I like to maintain association to LaTeX)
-#  tiny = pikkuruinen
-#  script = indeksi|| smallest = pienin
-#  footnote = alaviite || smaller = pienempi
-#  small = pieni
-#  normal = tavallinen
-#  large = suuri
-#  Large = suurempi
-#  LARGE = suurin
-#  huge = valtava
-#  Huge = Huger = valtavin
-# 
-# * Misc
-#  Float = kelluva [upote]
-#  Inset = upote
-#  Tabular = taulukko (since LyX does not use tables any more)
-# 
-#  cross reference = viittaus
-#  citation = lainaus
-# 
-#  float = kelluva upote
-#  wrap = tykö?
-#  theorem = väittämä
-#   encoding = merkistö
-# 
-# 
-# * Environments and stuff
-#  Title = Teoksen nimi
-#  Subtitle = Alaotsikko
-#  Part = Osa
-#  Chapter = Luku
-#  Section = Kappale
-#  Subsection = Alikappale
-#  Subsubsection = Alialikappale
-#  Paragraph = Osakappale
-#  Subparagraph = Aliosakappale
-#  Caption = Kuvateksti
-#  Subcaption = Alikuvateksti
-# 
-#  Affiliation = Järjestö
-# 
-#  Remark = Huomautus
-#  Note = Muistiinpano
-#  Comment = Huomautus
-# 
-#  Slide = Kalvo
-#  Overlay = Kalvokerros
-# 
-#  Running = Jatkuva (Well, I know it is something continued from the
-#previous page, and shown on the top of the page.)
-# 
-# 
-#  Do not overwrite trunk fi.po by this file (layouttranslations).
+# Suomalainen LyX-lokalisointi / Finnish LyX-localization
+# Copyright (C) 1997-2008 The LyX Team
+#   Originally modified by martin.verm...@fgi.fi
+#   Pauli Virtanen <pauli.virta...@hut.fi>
+#   Martin Vermeer <martin.verm...@tkk.fi>
+#   Jari-Matti Mäkelä <j...@iki.fi>
+# 
+# Translations:
+# 
+#  collapse = laskostua
+#  minibuffer = tilarivi
+#  branch = haara
+#  bullet = ransk. viiva
+# 
+# LaTeX terminology: (please tell me if I have got something wrong!)
+# 
+# * Font Sizes:
+#  (A bit stupid though, but I like to maintain association to LaTeX)
+#  tiny = pikkuruinen
+#  script = indeksi|| smallest = pienin
+#  footnote = alaviite || smaller = pienempi
+#  small = pieni
+#  normal = tavallinen
+#  large = suuri
+#  Large = suurempi
+#  LARGE = suurin
+#  huge = valtava
+#  Huge = Huger = valtavin
+# 
+# * Misc
+#  Float = kelluva [upote]
+#  Inset = upote
+#  Tabular = taulukko (since LyX does not use tables any more)
+# 
+#  cross reference = viittaus
+#  citation = lainaus
+# 
+#  float = kelluva upote
+#  wrap = tykö?
+#  theorem = väittämä
+#   encoding = merkistö
+# 
+# 
+# * Environments and stuff
+#  Title = Teoksen nimi
+#  Subtitle = Alaotsikko
+#  Part = Osa
+#  Chapter = Luku
+#  Section = Kappale
+#  Subsection = Alikappale
+#  Subsubsection = Alialikappale
+#  Paragraph = Osakappale
+#  Subparagraph = Aliosakappale
+#  Caption = Kuvateksti
+#  Subcaption = Alikuvateksti
+# 
+#  Affiliation = Järjestö
+# 
+#  Remark = Huomautus
+#  Note = Muistiinpano
+#  Comment = Huomautus
+# 
+#  Slide = Kalvo
+#  Overlay = Kalvokerros
+# 
+#  Running = Jatkuva (Well, I know it is something continued from the
+#previous page, and shown on the top of the page.)
+# 
+# 
+#  Do not overwrite trunk fi.po by this file (layouttranslations).
 msgid ""
 msgstr ""
 "Project-Id-Version: lyx\n"
@@ -1243,7 +1243,7 @@ msgstr "Näytä ERT-kehyksen sisältö"
 msgid "O"
 msgstr ""
 
-# Now this wasn't very obvious.
+# Now this wasn't very obvious.
 #: src/frontends/qt4/ui/LineUi.ui:22
 #, fuzzy
 msgid "Of:"
@@ -7981,7 +7981,7 @@ msgstr "Hyväksytty"
 msgid "Accepted:"
 msgstr "Hyväksytty:"
 
-# Now this wasn't very obvious.
+# Now this wasn't very obvious.
 #: lib/layouts/egs.layout:467
 msgid "Offsets"
 msgstr "Uusintapainosten välittäjä"
@@ -12470,7 +12470,7 @@ msgstr "yläotsikot"
 msgid "City:"
 msgstr "äärettömmyys"
 
-# Now this wasn't very obvious.
+# Now this wasn't very obvious.
 #: lib/layouts/lettre.layout:263
 #, fuzzy
 msgid "Office:"

[LyX/master] ConsoleApplication: Fix typos

[Vincent van Ravesteijn]

commit 51b28ba1d83f9e64f555a27235ca71b04da64736
Author: Vincent van Ravesteijn v...@lyx.org
Date:   Tue Jan 13 21:59:39 2015 +0100

ConsoleApplication: Fix typos

diff --git a/src/support/ConsoleApplication.h b/src/support/ConsoleApplication.h
index bfb5d07..a66b283 100644
--- a/src/support/ConsoleApplication.h
+++ b/src/support/ConsoleApplication.h
@@ -8,8 +8,8 @@
  * Full author contact details are available in file CREDITS.
  */
 
-#ifndef CONSOPLEAPPLICATION_H
-#define CONSOPLEAPPLICATION_H
+#ifndef CONSOLEAPPLICATION_H
+#define CONSOLEAPPLICATION_H
 
 #include support/strfwd.h
 
@@ -58,4 +58,4 @@ private:
 } // namespace support
 } // namespace lyx
 
-#endif // CONSOPLEAPPLICATION_H
+#endif // CONSOLEAPPLICATION_H

[LyX/master] cmake: Put check_ExternalTransforms in tests folder

[Vincent van Ravesteijn]

commit 1950152b39c4651d44df0d673707853ed5bc6f2d
Author: Vincent van Ravesteijn v...@lyx.org
Date:   Wed Jan 7 21:13:50 2015 +0100

cmake: Put check_ExternalTransforms in tests folder

diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index f2dd265..9f8faff 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -51,7 +51,7 @@ target_link_libraries(check_ExternalTransforms support
${Lyx_Boost_Libraries} ${QT_QTCORE_LIBRARY})
 
 add_dependencies(lyx_run_tests check_ExternalTransforms)
-set_target_properties(check_ExternalTransforms PROPERTIES FOLDER src)
+set_target_properties(check_ExternalTransforms PROPERTIES FOLDER tests/src)
 target_link_libraries(check_ExternalTransforms ${ICONV_LIBRARY})
 
 add_test(NAME check_ExternalTransforms

[LyX/master] ConsoleApplication: Fix typos

[Vincent van Ravesteijn]

commit 51b28ba1d83f9e64f555a27235ca71b04da64736
Author: Vincent van Ravesteijn <v...@lyx.org>
Date:   Tue Jan 13 21:59:39 2015 +0100

ConsoleApplication: Fix typos

diff --git a/src/support/ConsoleApplication.h b/src/support/ConsoleApplication.h
index bfb5d07..a66b283 100644
--- a/src/support/ConsoleApplication.h
+++ b/src/support/ConsoleApplication.h
@@ -8,8 +8,8 @@
  * Full author contact details are available in file CREDITS.
  */
 
-#ifndef CONSOPLEAPPLICATION_H
-#define CONSOPLEAPPLICATION_H
+#ifndef CONSOLEAPPLICATION_H
+#define CONSOLEAPPLICATION_H
 
 #include "support/strfwd.h"
 
@@ -58,4 +58,4 @@ private:
 } // namespace support
 } // namespace lyx
 
-#endif // CONSOPLEAPPLICATION_H
+#endif // CONSOLEAPPLICATION_H

[LyX/master] cmake: Put check_ExternalTransforms in tests folder

[Vincent van Ravesteijn]

commit 1950152b39c4651d44df0d673707853ed5bc6f2d
Author: Vincent van Ravesteijn <v...@lyx.org>
Date:   Wed Jan 7 21:13:50 2015 +0100

cmake: Put check_ExternalTransforms in tests folder

diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index f2dd265..9f8faff 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -51,7 +51,7 @@ target_link_libraries(check_ExternalTransforms support
${Lyx_Boost_Libraries} ${QT_QTCORE_LIBRARY})
 
 add_dependencies(lyx_run_tests check_ExternalTransforms)
-set_target_properties(check_ExternalTransforms PROPERTIES FOLDER "src")
+set_target_properties(check_ExternalTransforms PROPERTIES FOLDER "tests/src")
 target_link_libraries(check_ExternalTransforms ${ICONV_LIBRARY})
 
 add_test(NAME "check_ExternalTransforms"

[LyX/master] InsetTabular.cpp: Remove commented code without a comment

[Vincent van Ravesteijn]

commit ad6c03fe26b57dd07974b2ff1e1e4ad2739c3d78
Author: Vincent van Ravesteijn v...@lyx.org
Date:   Tue Jan 6 19:35:41 2015 +0100

InsetTabular.cpp: Remove commented code without a comment

This was a leftover of [b2246c4e/lyxgit].

diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp
index de9f862..6e69a03 100644
--- a/src/insets/InsetTabular.cpp
+++ b/src/insets/InsetTabular.cpp
@@ -3875,7 +3875,6 @@ void InsetTabular::edit(Cursor  cur, bool front, 
EntryDirection)
 {
//lyxerr  InsetTabular::edit:   this  endl;
cur.finishUndo();
-   //cur.setSelection(false);
cur.push(*this);
if (front) {
if (isRightToLeft(cur))

[LyX/master] str_metrics: Prevent clipping of chars with negative bearing

[Vincent van Ravesteijn]

commit c313b1c8eb01c85775e62a8675fa569d2c2aac2c
Author: Vincent van Ravesteijn v...@lyx.org
Date:   Tue Jan 6 18:48:19 2015 +0100

str_metrics: Prevent clipping of chars with negative bearing

This happens when part of the word is selected.

To reproduce:
1. Start a new document
2. Type af
3. Select 'a'
4. Observe that the right part of the 'f' is clipped away.

This patch uses QRegion to set a clip region that is everything except
the part that is drawn in another color.

Fixes: #9223.

diff --git a/src/frontends/qt4/GuiPainter.cpp b/src/frontends/qt4/GuiPainter.cpp
index 5730819..95ab52a 100644
--- a/src/frontends/qt4/GuiPainter.cpp
+++ b/src/frontends/qt4/GuiPainter.cpp
@@ -465,15 +465,16 @@ int GuiPainter::text(int x, int y, docstring const  str, 
Font const  f,
// First the part in other color
Color const orig = fi.realColor();
fi.setPaintColor(other);
-   setClipRect(QRect(x + xmin, y - ascent, xmax - xmin, height));
+   QRegion const clip(x + xmin, y - ascent, xmax - xmin, height);
+   setClipRegion(clip);
int const textwidth = text(x, y, str, fi, rtl);
 
// Then the part in normal color
-   // Note that in Qt5, it is not possible to use Qt::UniteClip
+   // Note that in Qt5, it is not possible to use Qt::UniteClip,
+   // therefore QRegion is used.
fi.setPaintColor(orig);
-   setClipRect(QRect(x, y - ascent, xmin, height));
-   text(x, y, str, fi, rtl);
-   setClipRect(QRect(x + xmax, y - ascent, textwidth - xmax, height));
+   QRegion region(viewport());
+   setClipRegion(region - clip);
text(x, y, str, fi, rtl);
setClipping(false);
 

[LyX/master] str_metrics: Prevent clipping of chars with negative bearing

[Vincent van Ravesteijn]

commit c313b1c8eb01c85775e62a8675fa569d2c2aac2c
Author: Vincent van Ravesteijn <v...@lyx.org>
Date:   Tue Jan 6 18:48:19 2015 +0100

str_metrics: Prevent clipping of chars with negative bearing

This happens when part of the word is selected.

To reproduce:
1. Start a new document
2. Type "af"
3. Select 'a'
4. Observe that the right part of the 'f' is clipped away.

This patch uses QRegion to set a clip region that is everything except
the part that is drawn in another color.

Fixes: #9223.

diff --git a/src/frontends/qt4/GuiPainter.cpp b/src/frontends/qt4/GuiPainter.cpp
index 5730819..95ab52a 100644
--- a/src/frontends/qt4/GuiPainter.cpp
+++ b/src/frontends/qt4/GuiPainter.cpp
@@ -465,15 +465,16 @@ int GuiPainter::text(int x, int y, docstring const & str, 
Font const & f,
// First the part in other color
Color const orig = fi.realColor();
fi.setPaintColor(other);
-   setClipRect(QRect(x + xmin, y - ascent, xmax - xmin, height));
+   QRegion const clip(x + xmin, y - ascent, xmax - xmin, height);
+   setClipRegion(clip);
int const textwidth = text(x, y, str, fi, rtl);
 
// Then the part in normal color
-   // Note that in Qt5, it is not possible to use Qt::UniteClip
+   // Note that in Qt5, it is not possible to use Qt::UniteClip,
+   // therefore QRegion is used.
fi.setPaintColor(orig);
-   setClipRect(QRect(x, y - ascent, xmin, height));
-   text(x, y, str, fi, rtl);
-   setClipRect(QRect(x + xmax, y - ascent, textwidth - xmax, height));
+   QRegion region(viewport());
+   setClipRegion(region - clip);
text(x, y, str, fi, rtl);
setClipping(false);
 

[LyX/master] InsetTabular.cpp: Remove commented code without a comment

[Vincent van Ravesteijn]

commit ad6c03fe26b57dd07974b2ff1e1e4ad2739c3d78
Author: Vincent van Ravesteijn <v...@lyx.org>
Date:   Tue Jan 6 19:35:41 2015 +0100

InsetTabular.cpp: Remove commented code without a comment

This was a leftover of [b2246c4e/lyxgit].

diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp
index de9f862..6e69a03 100644
--- a/src/insets/InsetTabular.cpp
+++ b/src/insets/InsetTabular.cpp
@@ -3875,7 +3875,6 @@ void InsetTabular::edit(Cursor & cur, bool front, 
EntryDirection)
 {
//lyxerr << "InsetTabular::edit: " << this << endl;
cur.finishUndo();
-   //cur.setSelection(false);
cur.push(*this);
if (front) {
if (isRightToLeft(cur))

[LyX/master] Capitalize layout tag

[Vincent van Ravesteijn]

commit cee8e61b2e4d7fcfaf193501ab7837c163988962
Author: Vincent van Ravesteijn v...@lyx.org
Date:   Tue Apr 29 11:16:41 2014 +0200

Capitalize layout tag

diff --git a/lib/layouts/logicalmkup.module b/lib/layouts/logicalmkup.module
index 889a830..5319faf 100644
--- a/lib/layouts/logicalmkup.module
+++ b/lib/layouts/logicalmkup.module
@@ -74,5 +74,5 @@ InsetLayout Flex:Code
InToc true
HTMLTag   code
ResetsFont true
-   spellcheckfalse
+   Spellcheckfalse
 End

[LyX/master] Use the cached value GuiSelection::selection_supported_

[Vincent van Ravesteijn]

commit 847d1fb2f5829d1a4bb1302b6a9555265796ada9
Author: Vincent van Ravesteijn v...@lyx.org
Date:   Tue Apr 29 15:17:07 2014 +0200

Use the cached value GuiSelection::selection_supported_

That's where it is for.

diff --git a/src/frontends/qt4/GuiSelection.cpp 
b/src/frontends/qt4/GuiSelection.cpp
index 362da4a..fef258c 100644
--- a/src/frontends/qt4/GuiSelection.cpp
+++ b/src/frontends/qt4/GuiSelection.cpp
@@ -39,7 +39,7 @@ GuiSelection::GuiSelection()
 
 void GuiSelection::haveSelection(bool own)
 {
-   if (!qApp-clipboard()-supportsSelection())
+   if (!selection_supported_)
return;
 
// Tell qt that we have a selection by setting a dummy selection.

[LyX/master] GuiLog: Use GuiClipboard to put the log on the clipboard

[Vincent van Ravesteijn]

commit 2552c737be8a761ab6f6993215f98baa95c09829
Author: Vincent van Ravesteijn v...@lyx.org
Date:   Tue Apr 29 15:28:21 2014 +0200

GuiLog: Use GuiClipboard to put the log on the clipboard

All direct interaction with the Qt clipboard is now done in either 
GuiClipboard or GuiSelection.

diff --git a/src/frontends/Clipboard.h b/src/frontends/Clipboard.h
index 980c6bc..faf4e0a 100644
--- a/src/frontends/Clipboard.h
+++ b/src/frontends/Clipboard.h
@@ -75,6 +75,9 @@ public:
 */
virtual void put(std::string const  lyx, docstring const  html, 
docstring const  text) = 0;
 
+   /// Put a general string on the system clipboard (not LyX text)
+   virtual void put(std::string const  text) const = 0;
+
/// Does the clipboard contain text contents?
virtual bool hasTextContents(TextType type = AnyTextType) const = 0;
/// Does the clipboard contain graphics contents of a certain type?
diff --git a/src/frontends/qt4/GuiClipboard.cpp 
b/src/frontends/qt4/GuiClipboard.cpp
index 2df20a0..d96dd26 100644
--- a/src/frontends/qt4/GuiClipboard.cpp
+++ b/src/frontends/qt4/GuiClipboard.cpp
@@ -413,6 +413,12 @@ docstring const GuiClipboard::getAsText(TextType type) 
const
 }
 
 
+void GuiClipboard::put(string const  text) const
+{
+   qApp-clipboard()-setText(toqstr(text));
+}
+
+
 void GuiClipboard::put(string const  lyx, docstring const  html, docstring 
const  text)
 {
LYXERR(Debug::ACTION, GuiClipboard::put(`  lyx  ' `
diff --git a/src/frontends/qt4/GuiClipboard.h b/src/frontends/qt4/GuiClipboard.h
index 3ffdafc..392f059 100644
--- a/src/frontends/qt4/GuiClipboard.h
+++ b/src/frontends/qt4/GuiClipboard.h
@@ -70,6 +70,7 @@ public:
std::string const getAsLyX() const;
FileName getAsGraphics(Cursor const  cur, GraphicsType type) const;
docstring const getAsText(TextType type) const;
+   void put(std::string const  text) const;
void put(std::string const  lyx, docstring const  html, docstring 
const  text);
bool hasGraphicsContents(GraphicsType type = AnyGraphicsType) const;
bool hasTextContents(TextType typetype = AnyTextType) const;
diff --git a/src/frontends/qt4/GuiLog.cpp b/src/frontends/qt4/GuiLog.cpp
index 8c74139..d81849a 100644
--- a/src/frontends/qt4/GuiLog.cpp
+++ b/src/frontends/qt4/GuiLog.cpp
@@ -18,6 +18,8 @@
 #include qt_helpers.h
 #include Lexer.h
 
+#include frontends/Clipboard.h
+
 #include support/docstring.h
 #include support/FileName.h
 #include support/gettext.h
@@ -313,7 +315,7 @@ void GuiLog::getContents(ostream  ss) const
 
 void GuiLog::on_copyPB_clicked()
 {
-   qApp-clipboard()-setText(logTB-toPlainText());
+   theClipboard().put(fromqstr(logTB-toPlainText()));
 }
 
 

[LyX/master] lyx2lyx: Update the emergency value

[Vincent van Ravesteijn]

commit b0629c79acf7591bd082596017d2742284e11b3e
Author: Vincent van Ravesteijn v...@lyx.org
Date:   Sun Mar 23 13:32:37 2014 +0100

lyx2lyx: Update the emergency value

Actually, this should not be hardcoded.

diff --git a/lib/lyx2lyx/LyX.py b/lib/lyx2lyx/LyX.py
index 059e403..173aafc 100644
--- a/lib/lyx2lyx/LyX.py
+++ b/lib/lyx2lyx/LyX.py
@@ -33,7 +33,7 @@ try:
 import lyx2lyx_version
 version__ = lyx2lyx_version.version
 except: # we are running from build directory so assume the last version
-version__ = '2.1'
+version__ = '2.2'
 
 default_debug__ = 2
 

[LyX/master] boost: Turn off warning that signals are deprecated

[Vincent van Ravesteijn]

commit a25c946b318c6d4de6b2f548e5d820ac5f3c2f8c
Author: Vincent van Ravesteijn v...@lyx.org
Date:   Tue Apr 29 16:56:23 2014 +0200

boost: Turn off warning that signals are deprecated

diff --git a/configure.ac b/configure.ac
index e3302e4..a3d699d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -279,6 +279,7 @@ char * strerror(int n);
 #define BOOST_DISABLE_THREADS 1
 #define BOOST_NO_WREGEX 1
 #define BOOST_NO_WSTRING 1
+#define BOOST_SIGNALS_NO_DEPRECATION_WARNING 1
 
 // TR1 regex not supported in GCC = 4.5
 #ifndef LYX_USE_TR1

[LyX/master] Capitalize layout tag

[Vincent van Ravesteijn]

commit cee8e61b2e4d7fcfaf193501ab7837c163988962
Author: Vincent van Ravesteijn <v...@lyx.org>
Date:   Tue Apr 29 11:16:41 2014 +0200

Capitalize layout tag

diff --git a/lib/layouts/logicalmkup.module b/lib/layouts/logicalmkup.module
index 889a830..5319faf 100644
--- a/lib/layouts/logicalmkup.module
+++ b/lib/layouts/logicalmkup.module
@@ -74,5 +74,5 @@ InsetLayout Flex:Code
InToc true
HTMLTag   code
ResetsFont true
-   spellcheckfalse
+   Spellcheckfalse
 End

[LyX/master] Use the cached value GuiSelection::selection_supported_

[Vincent van Ravesteijn]

commit 847d1fb2f5829d1a4bb1302b6a9555265796ada9
Author: Vincent van Ravesteijn <v...@lyx.org>
Date:   Tue Apr 29 15:17:07 2014 +0200

Use the cached value GuiSelection::selection_supported_

That's where it is for.

diff --git a/src/frontends/qt4/GuiSelection.cpp 
b/src/frontends/qt4/GuiSelection.cpp
index 362da4a..fef258c 100644
--- a/src/frontends/qt4/GuiSelection.cpp
+++ b/src/frontends/qt4/GuiSelection.cpp
@@ -39,7 +39,7 @@ GuiSelection::GuiSelection()
 
 void GuiSelection::haveSelection(bool own)
 {
-   if (!qApp->clipboard()->supportsSelection())
+   if (!selection_supported_)
return;
 
// Tell qt that we have a selection by setting a dummy selection.

[LyX/master] GuiLog: Use GuiClipboard to put the log on the clipboard

[Vincent van Ravesteijn]

commit 2552c737be8a761ab6f6993215f98baa95c09829
Author: Vincent van Ravesteijn <v...@lyx.org>
Date:   Tue Apr 29 15:28:21 2014 +0200

GuiLog: Use GuiClipboard to put the log on the clipboard

All direct interaction with the Qt clipboard is now done in either 
GuiClipboard or GuiSelection.

diff --git a/src/frontends/Clipboard.h b/src/frontends/Clipboard.h
index 980c6bc..faf4e0a 100644
--- a/src/frontends/Clipboard.h
+++ b/src/frontends/Clipboard.h
@@ -75,6 +75,9 @@ public:
 */
virtual void put(std::string const & lyx, docstring const & html, 
docstring const & text) = 0;
 
+   /// Put a general string on the system clipboard (not LyX text)
+   virtual void put(std::string const & text) const = 0;
+
/// Does the clipboard contain text contents?
virtual bool hasTextContents(TextType type = AnyTextType) const = 0;
/// Does the clipboard contain graphics contents of a certain type?
diff --git a/src/frontends/qt4/GuiClipboard.cpp 
b/src/frontends/qt4/GuiClipboard.cpp
index 2df20a0..d96dd26 100644
--- a/src/frontends/qt4/GuiClipboard.cpp
+++ b/src/frontends/qt4/GuiClipboard.cpp
@@ -413,6 +413,12 @@ docstring const GuiClipboard::getAsText(TextType type) 
const
 }
 
 
+void GuiClipboard::put(string const & text) const
+{
+   qApp->clipboard()->setText(toqstr(text));
+}
+
+
 void GuiClipboard::put(string const & lyx, docstring const & html, docstring 
const & text)
 {
LYXERR(Debug::ACTION, "GuiClipboard::put(`" << lyx << "' `"
diff --git a/src/frontends/qt4/GuiClipboard.h b/src/frontends/qt4/GuiClipboard.h
index 3ffdafc..392f059 100644
--- a/src/frontends/qt4/GuiClipboard.h
+++ b/src/frontends/qt4/GuiClipboard.h
@@ -70,6 +70,7 @@ public:
std::string const getAsLyX() const;
FileName getAsGraphics(Cursor const & cur, GraphicsType type) const;
docstring const getAsText(TextType type) const;
+   void put(std::string const & text) const;
void put(std::string const & lyx, docstring const & html, docstring 
const & text);
bool hasGraphicsContents(GraphicsType type = AnyGraphicsType) const;
bool hasTextContents(TextType typetype = AnyTextType) const;
diff --git a/src/frontends/qt4/GuiLog.cpp b/src/frontends/qt4/GuiLog.cpp
index 8c74139..d81849a 100644
--- a/src/frontends/qt4/GuiLog.cpp
+++ b/src/frontends/qt4/GuiLog.cpp
@@ -18,6 +18,8 @@
 #include "qt_helpers.h"
 #include "Lexer.h"
 
+#include "frontends/Clipboard.h"
+
 #include "support/docstring.h"
 #include "support/FileName.h"
 #include "support/gettext.h"
@@ -313,7 +315,7 @@ void GuiLog::getContents(ostream & ss) const
 
 void GuiLog::on_copyPB_clicked()
 {
-   qApp->clipboard()->setText(logTB->toPlainText());
+   theClipboard().put(fromqstr(logTB->toPlainText()));
 }
 
 

[LyX/master] lyx2lyx: Update the emergency value

[Vincent van Ravesteijn]

commit b0629c79acf7591bd082596017d2742284e11b3e
Author: Vincent van Ravesteijn <v...@lyx.org>
Date:   Sun Mar 23 13:32:37 2014 +0100

lyx2lyx: Update the emergency value

Actually, this should not be hardcoded.

diff --git a/lib/lyx2lyx/LyX.py b/lib/lyx2lyx/LyX.py
index 059e403..173aafc 100644
--- a/lib/lyx2lyx/LyX.py
+++ b/lib/lyx2lyx/LyX.py
@@ -33,7 +33,7 @@ try:
 import lyx2lyx_version
 version__ = lyx2lyx_version.version
 except: # we are running from build directory so assume the last version
-version__ = '2.1'
+version__ = '2.2'
 
 default_debug__ = 2
 

[LyX/master] boost: Turn off warning that signals are deprecated

[Vincent van Ravesteijn]

commit a25c946b318c6d4de6b2f548e5d820ac5f3c2f8c
Author: Vincent van Ravesteijn <v...@lyx.org>
Date:   Tue Apr 29 16:56:23 2014 +0200

boost: Turn off warning that signals are deprecated

diff --git a/configure.ac b/configure.ac
index e3302e4..a3d699d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -279,6 +279,7 @@ char * strerror(int n);
 #define BOOST_DISABLE_THREADS 1
 #define BOOST_NO_WREGEX 1
 #define BOOST_NO_WSTRING 1
+#define BOOST_SIGNALS_NO_DEPRECATION_WARNING 1
 
 // TR1 regex not supported in GCC <= 4.5
 #ifndef LYX_USE_TR1

Re: r41003 - www-user/trunk/farm/cookbook/LyX

[Vincent van Ravesteijn]

Jürgen Spitzmüller schreef op 25-4-2014 17:58:

2014-04-25 17:44 GMT+02:00:

Author: rgheck
Date: Fri Apr 25 17:44:36 2014
New Revision: 41003
URL: http://www.lyx.org/trac/changeset/41003

Log:
Announce 2.1.0.


Excellent. Congrats to everybody.


Yes, congratulations.

Thanks Richard finishing off.

Vincent

Re: r41003 - www-user/trunk/farm/cookbook/LyX

[Vincent van Ravesteijn]

Jürgen Spitzmüller schreef op 25-4-2014 17:58:

2014-04-25 17:44 GMT+02:00:

Author: rgheck
Date: Fri Apr 25 17:44:36 2014
New Revision: 41003
URL: http://www.lyx.org/trac/changeset/41003

Log:
Announce 2.1.0.


Excellent. Congrats to everybody.


Yes, congratulations.

Thanks Richard finishing off.

Vincent

[LyX/master] configure: Add export format for 2.1.x

[Vincent van Ravesteijn]

commit b9489e73b5f5e8cfce745212ad2d811e0659d6a7
Author: Vincent van Ravesteijn v...@lyx.org
Date:   Mon Apr 14 22:58:35 2014 +0200

configure: Add export format for 2.1.x

diff --git a/lib/configure.py b/lib/configure.py
index 30cb407..8a8473c 100644
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -693,7 +693,8 @@ def checkFormatEntries(dtl_tools):
 \Format lyx14x 14.lyx LyX 1.4.x
document  
 \Format lyx15x 15.lyx LyX 1.5.x
document  
 \Format lyx16x 16.lyx LyX 1.6.x
document  
-\Format lyx20x 20.lyx LyX 2.0.x
document,menu=export  
+\Format lyx20x 20.lyx LyX 2.0.x
document  
+\Format lyx21x 21.lyx LyX 2.1.x
document,menu=export  
 \Format clyx   cjklyx CJK LyX 1.4.x (big5) 
document  
 \Format jlyx   cjklyx CJK LyX 1.4.x (euc-jp)   
document  
 \Format klyx   cjklyx CJK LyX 1.4.x (euc-kr)   
document  
@@ -1032,6 +1033,7 @@ def checkConverterEntries():
 \converter lyxlyx15x python -tt $$s/lyx2lyx/lyx2lyx -t 276 $$i  
$$o 
 \converter lyxlyx16x python -tt $$s/lyx2lyx/lyx2lyx -t 345 $$i  
$$o 
 \converter lyxlyx20x python -tt $$s/lyx2lyx/lyx2lyx -t 413 $$i  
$$o 
+\converter lyxlyx21x python -tt $$s/lyx2lyx/lyx2lyx -t 474 $$i  
$$o 
 \converter lyxclyx   python -tt $$s/lyx2lyx/lyx2lyx -c big5 -t 
245 $$i  $$o 
 \converter lyxjlyx   python -tt $$s/lyx2lyx/lyx2lyx -c euc_jp -t 
245 $$i  $$o   
 \converter lyxklyx   python -tt $$s/lyx2lyx/lyx2lyx -c euc_kr -t 
245 $$i  $$o   

[LyX/master] lyx2lyx: Add the 2.2 entry

[Vincent van Ravesteijn]

commit 03a73a40d856de7ca703bb0a525d6b244d3c423e
Author: Vincent van Ravesteijn v...@lyx.org
Date:   Sun Mar 23 13:33:05 2014 +0100

lyx2lyx: Add the 2.2 entry

diff --git a/lib/lyx2lyx/LyX.py b/lib/lyx2lyx/LyX.py
index 7b534fe..059e403 100644
--- a/lib/lyx2lyx/LyX.py
+++ b/lib/lyx2lyx/LyX.py
@@ -83,7 +83,8 @@ format_relation = [(0_06,[200], minor_versions(0.6 , 
4)),
(1_5, range(246,277), minor_versions(1.5 , 7)),
(1_6, range(277,346), minor_versions(1.6 , 10)),
(2_0, range(346,414), minor_versions(2.0, 8)),
-   (2_1, range(414,475), minor_versions(2.1, 0))
+   (2_1, range(414,475), minor_versions(2.1, 0)),
+   (2_2,   [], minor_versions(2.2, 0))
   ]
 
 
diff --git a/lib/lyx2lyx/lyx_2_2.py b/lib/lyx2lyx/lyx_2_2.py
new file mode 100644
index 000..5b1979b
--- /dev/null
+++ b/lib/lyx2lyx/lyx_2_2.py
@@ -0,0 +1,58 @@
+# -*- coding: utf-8 -*-
+# This file is part of lyx2lyx
+# -*- coding: utf-8 -*-
+# Copyright (C) 2011 The LyX team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+ Convert files to the file format generated by lyx 2.2
+
+import re, string
+import unicodedata
+import sys, os
+
+# Uncomment only what you need to import, please.
+
+#from parser_tools import find_token, find_end_of, find_tokens, \
+#  find_token_exact, find_end_of_inset, find_end_of_layout, \
+#  find_token_backwards, is_in_inset, get_value, get_quoted_value, \
+#  del_token, check_token, get_option_value
+  
+#from lyx2lyx_tools import add_to_preamble, insert_to_preamble, \
+#  put_cmd_in_ert, lyx2latex, latex_length, revert_flex_inset, \
+#  revert_font_attrs, hex2ratio, str2bool
+
+
+###
+###
+### Conversion and reversion routines
+###
+###
+
+
+##
+# Conversion hub
+#
+
+supported_versions = [2.2.0,2.2]
+convert = [#[475, []]
+  ]
+
+revert =  [#[474, []]
+  ]
+
+
+if __name__ == __main__:
+pass

[LyX/master] Start the 2.2 development cycle

[Vincent van Ravesteijn]

commit f0f815709965ba8c036a9b7e23cda4ec805cec97
Author: Vincent van Ravesteijn v...@lyx.org
Date:   Mon Mar 24 14:22:52 2014 +0100

Start the 2.2 development cycle

diff --git a/configure.ac b/configure.ac
index e245fde..1ce2ed3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,9 @@
 dnl Process with autoconf to generate configure script   -*- sh -*-
 
-AC_INIT(LyX,2.1.0,[lyx-de...@lists.lyx.org],[lyx])
+AC_INIT(LyX,2.2.0dev,[lyx-de...@lists.lyx.org],[lyx])
 AC_PRESERVE_HELP_ORDER
 # Use ISO format only. The frontend needs to parse this
-AC_SUBST(LYX_DATE, [2014-04-13])
+AC_SUBST(LYX_DATE, [2014-04-14])
 AC_PREREQ(2.60)
 AC_CONFIG_SRCDIR(src/main.cpp)
 AC_CONFIG_HEADERS([config.h])

[LyX/master] configure: Add export format for 2.1.x

[Vincent van Ravesteijn]

commit b9489e73b5f5e8cfce745212ad2d811e0659d6a7
Author: Vincent van Ravesteijn <v...@lyx.org>
Date:   Mon Apr 14 22:58:35 2014 +0200

configure: Add export format for 2.1.x

diff --git a/lib/configure.py b/lib/configure.py
index 30cb407..8a8473c 100644
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -693,7 +693,8 @@ def checkFormatEntries(dtl_tools):
 \Format lyx14x 14.lyx "LyX 1.4.x" "" """"  
"document"  ""
 \Format lyx15x 15.lyx "LyX 1.5.x" "" """"  
"document"  ""
 \Format lyx16x 16.lyx "LyX 1.6.x" "" """"  
"document"  ""
-\Format lyx20x 20.lyx "LyX 2.0.x" "" """"  
"document,menu=export"  ""
+\Format lyx20x 20.lyx "LyX 2.0.x" "" """"  
"document"  ""
+\Format lyx21x 21.lyx "LyX 2.1.x" "" """"  
"document,menu=export"  ""
 \Format clyx   cjklyx "CJK LyX 1.4.x (big5)"  "" """"  
"document"  ""
 \Format jlyx   cjklyx "CJK LyX 1.4.x (euc-jp)" "" ""   ""  
"document"  ""
 \Format klyx   cjklyx "CJK LyX 1.4.x (euc-kr)" "" ""   ""  
"document"  ""
@@ -1032,6 +1033,7 @@ def checkConverterEntries():
 \converter lyxlyx15x "python -tt $$s/lyx2lyx/lyx2lyx -t 276 $$i > 
$$o" ""
 \converter lyxlyx16x "python -tt $$s/lyx2lyx/lyx2lyx -t 345 $$i > 
$$o" ""
 \converter lyxlyx20x "python -tt $$s/lyx2lyx/lyx2lyx -t 413 $$i > 
$$o" ""
+\converter lyxlyx21x "python -tt $$s/lyx2lyx/lyx2lyx -t 474 $$i > 
$$o" ""
 \converter lyxclyx   "python -tt $$s/lyx2lyx/lyx2lyx -c big5 -t 
245 $$i > $$o" ""
 \converter lyxjlyx   "python -tt $$s/lyx2lyx/lyx2lyx -c euc_jp -t 
245 $$i > $$o"   ""
 \converter lyxklyx   "python -tt $$s/lyx2lyx/lyx2lyx -c euc_kr -t 
245 $$i > $$o"   ""

[LyX/master] lyx2lyx: Add the 2.2 entry

[Vincent van Ravesteijn]

commit 03a73a40d856de7ca703bb0a525d6b244d3c423e
Author: Vincent van Ravesteijn <v...@lyx.org>
Date:   Sun Mar 23 13:33:05 2014 +0100

lyx2lyx: Add the 2.2 entry

diff --git a/lib/lyx2lyx/LyX.py b/lib/lyx2lyx/LyX.py
index 7b534fe..059e403 100644
--- a/lib/lyx2lyx/LyX.py
+++ b/lib/lyx2lyx/LyX.py
@@ -83,7 +83,8 @@ format_relation = [("0_06",[200], minor_versions("0.6" , 
4)),
("1_5", range(246,277), minor_versions("1.5" , 7)),
("1_6", range(277,346), minor_versions("1.6" , 10)),
("2_0", range(346,414), minor_versions("2.0", 8)),
-   ("2_1", range(414,475), minor_versions("2.1", 0))
+   ("2_1", range(414,475), minor_versions("2.1", 0)),
+   ("2_2",   [], minor_versions("2.2", 0))
   ]
 
 
diff --git a/lib/lyx2lyx/lyx_2_2.py b/lib/lyx2lyx/lyx_2_2.py
new file mode 100644
index 000..5b1979b
--- /dev/null
+++ b/lib/lyx2lyx/lyx_2_2.py
@@ -0,0 +1,58 @@
+# -*- coding: utf-8 -*-
+# This file is part of lyx2lyx
+# -*- coding: utf-8 -*-
+# Copyright (C) 2011 The LyX team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+""" Convert files to the file format generated by lyx 2.2"""
+
+import re, string
+import unicodedata
+import sys, os
+
+# Uncomment only what you need to import, please.
+
+#from parser_tools import find_token, find_end_of, find_tokens, \
+#  find_token_exact, find_end_of_inset, find_end_of_layout, \
+#  find_token_backwards, is_in_inset, get_value, get_quoted_value, \
+#  del_token, check_token, get_option_value
+  
+#from lyx2lyx_tools import add_to_preamble, insert_to_preamble, \
+#  put_cmd_in_ert, lyx2latex, latex_length, revert_flex_inset, \
+#  revert_font_attrs, hex2ratio, str2bool
+
+
+###
+###
+### Conversion and reversion routines
+###
+###
+
+
+##
+# Conversion hub
+#
+
+supported_versions = ["2.2.0","2.2"]
+convert = [#[475, []]
+  ]
+
+revert =  [#[474, []]
+  ]
+
+
+if __name__ == "__main__":
+pass

[LyX/master] Start the 2.2 development cycle

[Vincent van Ravesteijn]

commit f0f815709965ba8c036a9b7e23cda4ec805cec97
Author: Vincent van Ravesteijn <v...@lyx.org>
Date:   Mon Mar 24 14:22:52 2014 +0100

Start the 2.2 development cycle

diff --git a/configure.ac b/configure.ac
index e245fde..1ce2ed3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,9 @@
 dnl Process with autoconf to generate configure script   -*- sh -*-
 
-AC_INIT(LyX,2.1.0,[lyx-de...@lists.lyx.org],[lyx])
+AC_INIT(LyX,2.2.0dev,[lyx-de...@lists.lyx.org],[lyx])
 AC_PRESERVE_HELP_ORDER
 # Use ISO format only. The frontend needs to parse this
-AC_SUBST(LYX_DATE, ["2014-04-13"])
+AC_SUBST(LYX_DATE, ["2014-04-14"])
 AC_PREREQ(2.60)
 AC_CONFIG_SRCDIR(src/main.cpp)
 AC_CONFIG_HEADERS([config.h])

[LyX/master] This is LyX 2.1.0.

[Vincent van Ravesteijn]

commit fde16219ca7860fdfe8adf171d109a7cce61e7b4
Author: Vincent van Ravesteijn v...@lyx.org
Date:   Sun Apr 13 16:31:16 2014 +0200

This is LyX 2.1.0.

diff --git a/configure.ac b/configure.ac
index 90b7ffa..e245fde 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,9 @@
 dnl Process with autoconf to generate configure script   -*- sh -*-
 
-AC_INIT(LyX,2.1.0dev,[lyx-de...@lists.lyx.org],[lyx])
+AC_INIT(LyX,2.1.0,[lyx-de...@lists.lyx.org],[lyx])
 AC_PRESERVE_HELP_ORDER
 # Use ISO format only. The frontend needs to parse this
-AC_SUBST(LYX_DATE, [2014-03-24])
+AC_SUBST(LYX_DATE, [2014-04-13])
 AC_PREREQ(2.60)
 AC_CONFIG_SRCDIR(src/main.cpp)
 AC_CONFIG_HEADERS([config.h])

[LyX/master] This is LyX 2.1.0.

[Vincent van Ravesteijn]

commit fde16219ca7860fdfe8adf171d109a7cce61e7b4
Author: Vincent van Ravesteijn <v...@lyx.org>
Date:   Sun Apr 13 16:31:16 2014 +0200

This is LyX 2.1.0.

diff --git a/configure.ac b/configure.ac
index 90b7ffa..e245fde 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,9 @@
 dnl Process with autoconf to generate configure script   -*- sh -*-
 
-AC_INIT(LyX,2.1.0dev,[lyx-de...@lists.lyx.org],[lyx])
+AC_INIT(LyX,2.1.0,[lyx-de...@lists.lyx.org],[lyx])
 AC_PRESERVE_HELP_ORDER
 # Use ISO format only. The frontend needs to parse this
-AC_SUBST(LYX_DATE, ["2014-03-24"])
+AC_SUBST(LYX_DATE, ["2014-04-13"])
 AC_PREREQ(2.60)
 AC_CONFIG_SRCDIR(src/main.cpp)
 AC_CONFIG_HEADERS([config.h])

[LyX/master] Revert Update INSTALL

[Vincent van Ravesteijn]

commit 7ab58d5d9ea6868e9975aeebf0363ebb78c2a300
Author: Vincent van Ravesteijn v...@lyx.org
Date:   Sat Apr 12 14:01:11 2014 +0200

Revert Update INSTALL

This reverts commit 30d1cf47c18bf938e6be3e3fd45a3115cff435c1.

diff --git a/INSTALL b/INSTALL
index 6202ee8..17592e1 100644
--- a/INSTALL
+++ b/INSTALL
@@ -37,7 +37,8 @@ Note for Git checkouts
 
 If you have checked this out from Git, you need to have:
 * automake = 1.8
-* autoconf = 2.60
+* autoconf = 2.59d
+* gettext = 0.16.1
 Then type ./autogen.sh to build the needed configuration
 files and proceed as stated above/below.
 
@@ -66,6 +67,12 @@ libraries. See the RELEASE-NOTES for details.
 
 * Other things to note
 
+If you make modifications to files in src/ (for example by applying a
+patch), you will need to have the GNU gettext package installed, due
+to some dependencies in the makefiles. You can get the latest version
+from:
+   ftp://ftp.gnu.org/gnu/gettext/
+
 The two following programs should be available at configuration time:
 
   o LaTeX2e should be correctly setup for the user you are logged in

[LyX/master] INSTALL: Update INSTALL

[Vincent van Ravesteijn]

commit 7511bcf39f3bbb329e3d2644fd3466509039f24a
Author: Vincent van Ravesteijn v...@lyx.org
Date:   Sun Apr 13 16:10:57 2014 +0200

INSTALL: Update INSTALL

- adjust the supported versions for autotools
- add a note about the adviced Qt version
- remove gettext as a hard requirement and adjust the note

diff --git a/INSTALL b/INSTALL
index 17592e1..a330a0b 100644
--- a/INSTALL
+++ b/INSTALL
@@ -36,9 +36,8 @@ Note for Git checkouts
 -
 
 If you have checked this out from Git, you need to have:
-* automake = 1.8
-* autoconf = 2.59d
-* gettext = 0.16.1
+* automake (supported versions are 1.8--1.14)
+* autoconf (supported versions are 2.60--2.69)
 Then type ./autogen.sh to build the needed configuration
 files and proceed as stated above/below.
 
@@ -55,10 +54,11 @@ LyX makes great use of the C++ Standard Template Library 
(STL).
 This means that gcc users will have to install the relevant libstdc++
 library to be able to compile this version of LyX.
 
-For full LyX usability we suggest to use at least Qt 4.8 which has been
-widely tested. For compilation you need to compile against at least
-Qt 4.5.0. The only special point to make is that you must ensure that both
-LyX and the Qt libraries are compiled with the same C++ compiler.
+For full LyX usability we suggest to use Qt 4.x and at least Qt 4.8 which 
+has been widely tested. For compilation you need to compile against at
+least Qt 4.5.0 and at Windows we advise at highest Qt 4.8.4. The only
+special point to make is that you must ensure that both LyX and the 
+Qt libraries are compiled with the same C++ compiler.
 
 To build LyX with spell checking capabilities included you have to
 install at least one of the development packages of the spell checker
@@ -67,10 +67,11 @@ libraries. See the RELEASE-NOTES for details.
 
 * Other things to note
 
-If you make modifications to files in src/ (for example by applying a
-patch), you will need to have the GNU gettext package installed, due
-to some dependencies in the makefiles. You can get the latest version
-from:
+If you make modifications to the source that affect any of the
+translations or you change the translation files themselves (po/*.po)
+files, you will need to have the GNU gettext package installed to 
+compile LyX with up-to-date translations (at least gettext version
+0.16.1 is needed). You can get the latest version from:
ftp://ftp.gnu.org/gnu/gettext/
 
 The two following programs should be available at configuration time:

[LyX/master] * ja.po: Update from Koji Yokota

[Vincent van Ravesteijn]

commit 710b3fbdea4d1ad7f6e536dd4c038f770c60e911
Author: Vincent van Ravesteijn v...@lyx.org
Date:   Sun Apr 13 18:07:27 2014 +0200

* ja.po: Update from Koji Yokota

diff --git a/po/ja.gmo b/po/ja.gmo
index a5213ef..79515bc 100644
Binary files a/po/ja.gmo and b/po/ja.gmo differ
diff --git a/po/ja.po b/po/ja.po
index 12967ba..0cf5968 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,9 +8,9 @@ msgstr 
 Project-Id-Version: LyX 2.1\n
 Report-Msgid-Bugs-To: lyx-d...@lists.lyx.org\n
 POT-Creation-Date: 2014-03-20 11:00+0100\n
-PO-Revision-Date: 2014-04-04 01:25+0900\n
+PO-Revision-Date: 2014-04-13 02:59+0900\n
 Last-Translator: Koji Yokota yok...@res.otaru-uc.ac.jp\n
-Language-Team: Japanese lyx-d...@lists.lyx.org\n
+Language-Team: Japanese kde-i18n-...@kde.org\n
 Language: ja\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -1930,7 +1930,7 @@ msgstr Input
 
 #: src/frontends/qt4/ui/IncludeUi.ui:303 lib/layouts/stdlayouts.inc:74
 msgid Verbatim
-msgstr 無調整(Verbatim)
+msgstr Verbatim
 
 #: src/frontends/qt4/ui/IncludeUi.ui:308 src/insets/InsetInclude.cpp:1196
 #: src/insets/InsetInclude.cpp:1202
@@ -6099,11 +6099,11 @@ msgstr チャート一覧
 
 #: lib/layouts/achemso.layout:209 lib/layouts/achemso.layout:220
 msgid Graph[[mathematical]]
-msgstr グラフ
+msgstr グラフ[[mathematical]]
 
 #: lib/layouts/achemso.layout:214
 msgid List of Graphs[[mathematical]]
-msgstr グラフ一覧
+msgstr グラフ一覧[[mathematical]]
 
 #: lib/layouts/achemso.layout:248
 msgid SupplementalInfo
@@ -15085,11 +15085,11 @@ msgstr Input|p
 
 #: lib/ui/stdcontext.inc:277 lib/ui/stdcontext.inc:540
 msgid Verbatim|V
-msgstr 無調整(Verbatim)|V
+msgstr Verbatim|V
 
 #: lib/ui/stdcontext.inc:278 lib/ui/stdcontext.inc:541
 msgid Verbatim (marked blanks)|b
-msgstr 無調整(Verbatim) (空白記号付き)|b
+msgstr Verbatim (marked blanks)|b
 
 #: lib/ui/stdcontext.inc:279 lib/ui/stdcontext.inc:542
 msgid Listing|L
@@ -15522,7 +15522,7 @@ msgstr 保存(S)|S
 
 #: lib/ui/stdmenus.inc:53
 msgid Save As...|A
-msgstr 名前を付けて保存(A)...|A
+msgstr 名前を付けて保存(A),,,|A
 
 #: lib/ui/stdmenus.inc:54
 msgid Save All|l
@@ -15618,11 +15618,11 @@ msgstr 他の形式とオプション(O)...|O
 
 #: lib/ui/stdmenus.inc:102
 msgid Undo|U
-msgstr 操作を取り消す(U)|U
+msgstr 元に戻す(U)|U
 
 #: lib/ui/stdmenus.inc:103
 msgid Redo|R
-msgstr 同じ操作を繰り返す(R)|R
+msgstr やり直す(R)|R
 
 #: lib/ui/stdmenus.inc:109
 msgid Paste Special
@@ -16498,11 +16498,11 @@ msgstr 連続スペルチェック
 
 #: lib/ui/stdtoolbars.inc:79 src/BufferView.cpp:1333
 msgid Undo
-msgstr 操作を取り消す
+msgstr 元に戻す
 
 #: lib/ui/stdtoolbars.inc:80 src/BufferView.cpp:1343
 msgid Redo
-msgstr 同じ操作を繰り返す
+msgstr やり直す
 
 #: lib/ui/stdtoolbars.inc:84
 msgid Find and replace
@@ -22454,11 +22454,11 @@ msgstr 文書クラス「%1$s」を読み込むことができませんでし
 
 #: src/BufferView.cpp:1336
 msgid No further undo information
-msgstr これ以上操作を取り消すことはできません
+msgstr これ以上元に戻すことはできません
 
 #: src/BufferView.cpp:1346
 msgid No further redo information
-msgstr これ以上同じ操作を繰り返すことはできません
+msgstr これ以上やり直すことはできません
 
 #: src/BufferView.cpp:1593
 msgid Mark off
@@ -24324,7 +24324,7 @@ msgstr 
 
 #: src/Text.cpp:1013
 msgid Character is uncodable in verbatim paragraphs.
-msgstr 無調整(verbatim)環境では文字をコード化できません。
+msgstr verbatim環境では文字をコード化できません。
 
 #: src/Text.cpp:1850
 msgid [Change Tracking] 
@@ -26706,7 +26706,7 @@ msgstr 関数
 
 #: src/frontends/qt4/GuiPrefs.cpp:2796
 msgid Shortcut
-msgstr 捷径
+msgstr 捷径 (ショートカット)
 
 #: src/frontends/qt4/GuiPrefs.cpp:2873
 msgid Cursor, Mouse and Editing Functions
@@ -29404,7 +29404,7 @@ msgstr 外部制御インタフェース
 
 #: src/support/debug.cpp:56
 msgid Undo/Redo mechanism
-msgstr 操作の取消/繰返機構
+msgstr 元に戻す/やり直すの動作
 
 #: src/support/debug.cpp:57
 msgid User commands
@@ -29493,8 +29493,9 @@ msgid 
 Assertion %1$s violated in\n
 file: %2$s, line: %3$s
 msgstr 
-アサーション %1$s 違反です。\n
-ファイル: %2$s, 行: %3$s
+アサーション %1$s が\n
+ファイル: %2$s, 行: %3$s\n
+で満たされていません。
 
 #: src/support/lassert.cpp:62
 msgid 
@@ -29554,4 +29555,444 @@ msgstr 
 
 #: src/support/userinfo.cpp:45
 msgid Unknown user
-msgstr 知らないユーザー
+msgstr 未知の
+
+#~ msgid Graph
+#~ msgstr グラフ
+
+#~ msgid List of Graphs
+#~ msgstr グラフ一覧
+
+#~ msgid Scope
+#~ msgstr 範囲(P)
+
+#~ msgid Long Table Caption (unnumbered)
+#~ msgstr 長尺表キャプション(無番)
+
+#~ msgid The caption as it appears in the list of tables
+#~ msgstr 表一覧に表示するキャプション
+
+#~ msgid Unformatted Text|U
+#~ msgstr 書式なし平文(U)|U
+
+#~ msgid Unformatted, Join Lines|o
+#~ msgstr 書式なし平文(行を連結して)(O)|O
+
+#~ msgid Down
+#~ msgstr 下へ(D)
+
+#~ msgid Split Environment|l
+#~ msgstr Split環境|l
+
+#, fuzzy
+#~ msgid %1$s (*.%2$s)
+#~ msgstr %1$s (%2$s)
+
+#~ msgid report (R Journal)
+#~ msgstr report (R Journal)
+
+#~ msgid Alternative Theorem String|S
+#~ msgstr 追加の定理見出し文(S)|S
+
+#~ msgid Alternative theorem string
+#~ msgstr 追加の定理見出し文
+
+#~ msgid Default Format
+#~ msgstr 既定形式
+
+#~ msgid Key Words.
+#~ msgstr キーワード.
+
+#~ msgid Scrap
+#~ msgstr スクラップ
+
+#~ msgid Begin Multiple Columns
+#~ msgstr 多段組始まり
+
+#~ msgid ---Begin Multiple Columns---
+#~ msgstr ―――多段組始まり―――
+
+#~ msgid End Multiple Columns
+#~ msgstr 多段組終わり
+
+#~ msgid ---End Multiple Columns

[LyX/master] * doc/ja: Updates from Koji Yokota

[Vincent van Ravesteijn]

commit 1468a40bac4c667ed11c2461010713a8471da3be
Author: Vincent van Ravesteijn v...@lyx.org
Date:   Sun Apr 13 18:36:43 2014 +0200

* doc/ja: Updates from Koji Yokota

diff --git a/lib/doc/ja/Additional.lyx b/lib/doc/ja/Additional.lyx
index 7ad6c52..e753e8a 100644
--- a/lib/doc/ja/Additional.lyx
+++ b/lib/doc/ja/Additional.lyx
@@ -13,8 +13,8 @@
 % the documentation team
 % email: lyx-d...@lists.lyx.org
 
-\ifnum 42146=\eucA4A2 \AtBeginDvi{\special{pdf:tounicode EUC-UCS2}}\else
-\AtBeginDvi{\special{pdf:tounicode 90ms-RKSJ-UCS2}}\fi
+\IfFileExists{pxjahyper.sty}
+{\usepackage{pxjahyper}}
 
 % if pdflatex is used
 \usepackage{ifpdf}
@@ -93,7 +93,7 @@ End
 \end_local_layout
 \language japanese
 \language_package default
-\inputencoding jis-platex
+\inputencoding auto
 \fontencoding global
 \font_roman default
 \font_sans default
@@ -113,11 +113,11 @@ End
 \paperfontsize 12
 \spacing single
 \use_hyperref true
-\pdf_title LyX拡張機能篇
-\pdf_author LyXプロジェクトチーム
-\pdf_subject LyX拡張機能取扱説明書
-\pdf_keywords LyX、取扱説明書、文書化、拡張
-\pdf_bookmarks true
+\pdf_title LyX's Additional Features manual
+\pdf_author LyX Team
+\pdf_subject LyX's additional features documentation
+\pdf_keywords LyX, Documentation, Additional
+\pdf_bookmarks false
 \pdf_bookmarksnumbered true
 \pdf_bookmarksopen false
 \pdf_bookmarksopenlevel 1
@@ -126,7 +126,7 @@ End
 \pdf_colorlinks true
 \pdf_backref false
 \pdf_pdfusetitle false
-\pdf_quoted_options linkcolor=black, citecolor=black, urlcolor=blue, 
filecolor=blue, pdfpagelayout=OneColumn, pdfnewwindow=true, pdfstartview=XYZ, 
plainpages=false
+\pdf_quoted_options pdfencoding=pdfdoc, linkcolor=black, citecolor=black, 
urlcolor=blue, filecolor=blue, pdfpagelayout=OneColumn, pdfnewwindow=true, 
pdfstartview=XYZ, plainpages=false
 \papersize default
 \use_geometry false
 \use_package amsmath 1
@@ -8726,157 +8726,157 @@ aasguide.tex
 \backslash
 documentclass
 \family default
-(2.1.1)・
+ (2.1.1)・
 \family typewriter
 
 \backslash
 begin{document}
 \family default
-(2.2)・
+ (2.2)・
 \family typewriter
 
 \backslash
 title
 \family default
-(2.3)・
+ (2.3)・
 \family typewriter
 
 \backslash
 author
 \family default
-(2.3)・
+ (2.3)・
 \family typewriter
 
 \backslash
 affil
 \family default
-(2.3)・
+ (2.3)・
 \family typewriter
 
 \backslash
 abstract
 \family default
-(2.4)・
+ (2.4)・
 \family typewriter
 
 \backslash
 keywords
 \family default
-(2.5)・
+ (2.5)・
 \family typewriter
 
 \backslash
 section
 \family default
-(2.7)・
+ (2.7)・
 \family typewriter
 
 \backslash
 subsection
 \family default
-(2.7)・
+ (2.7)・
 \family typewriter
 
 \backslash
 subsubsection
 \family default
-(2.7)・
+ (2.7)・
 \family typewriter
 
 \backslash
 paragraph
 \family default
-(2.7)・
+ (2.7)・
 \family typewriter
 
 \backslash
 facility
 \family default
-(2.10)・
+ (2.10)・
 \family typewriter
 
 \backslash
 begin{displaymath}
 \family default
-(2.12)・
+ (2.12)・
 \family typewriter
 
 \backslash
 begin{equation}
 \family default
-(2.12)・
+ (2.12)・
 \family typewriter
 
 \backslash
 begin{eqnarray}
 \family default
-(2.12)・
+ (2.12)・
 \family typewriter
 
 \backslash
 begin{mathletters}
 \family default
-(2.12)・
+ (2.12)・
 \family typewriter
 
 \backslash
 begin{thebibliography}
 \family default
-(2.13.1)・
+ (2.13.1)・
 \family typewriter
 
 \backslash
 bibitem
 \family default
-(2.13.2)・全引用コマンドとその派生(2.13.2)・一般的なgraphicx図コマンド(2.14.1)・
+ (2.13.2)・全引用コマンドとその派生(2.13.2)・一般的なgraphicx図コマンド(2.14.1)・
 \family typewriter
 
 \backslash
 begin{table}
 \family default
-(2.15.4)・
+ (2.15.4)・
 \family typewriter
 
 \backslash
 begin{tabular}
 \family default
-(2.15.4)・
+ (2.15.4)・
 \family typewriter
 
 \backslash
 caption
 \family default
-(2.15.4)・
+ (2.15.4)・
 \family typewriter
 
 \backslash
 label
 \family default
-(他にもあるが特に2.15.4)・
+ (他にもあるが特に2.15.4)・
 \family typewriter
 
 \backslash
 tablerefs
 \family default
-(2.15.5)・
+ (2.15.5)・
 \family typewriter
 
 \backslash
 tablecomments
 \family default
-(2.15.5)・
+ (2.15.5)・
 \family typewriter
 
 \backslash
 url
 \family default
-(2.17.4)・
+ (2.17.4)・
 \family typewriter
 
 \backslash
 end{document}
 \family default
-(2.18)。
+ (2.18)。
 \end_layout
 
 \begin_layout Standard
@@ -8884,23 +8884,23 @@ end{document}
 \family typewriter
 longabstract
 \family default
-(2.4)・
+ (2.4)・
 \family typewriter
 preprint
 \family default
-(3.2.1)・
+ (3.2.1)・
 \family typewriter
 preprint2
 \family default
-(3.2.2)・
+ (3.2.2)・
 \family typewriter
 eqsecnum
 \family default
-(3.3)・
+ (3.3)・
 \family typewriter
 flushrt
 \family default
-(3.4)。これらは、
+ (3.4)。これらは、
 \begin_inset Flex MenuItem
 status collapsed
 
diff --git a/lib/doc/ja/Customization.lyx b/lib/doc/ja/Customization.lyx
index 6000942..680f4fd 100644
--- a/lib/doc/ja/Customization.lyx
+++ b/lib/doc/ja/Customization.lyx
@@ -34,12 +34,6 @@
 % Added only for Japanese translation
 % This is needed to use \textquotedbl (this doesn't exist in OT1 encoding)
 \usepackage[T1]{fontenc}
-% Below is to correct PDF bookmarks
-% but doesn't work because

[LyX/master] * ja.po: Fix Graph strings

[Vincent van Ravesteijn]

commit 05662daf5b5f6889732780455a0df84af24e33de
Author: Vincent van Ravesteijn v...@lyx.org
Date:   Sun Apr 13 19:17:27 2014 +0200

* ja.po: Fix Graph strings

diff --git a/po/ja.gmo b/po/ja.gmo
index 79515bc..4b91c1a 100644
Binary files a/po/ja.gmo and b/po/ja.gmo differ
diff --git a/po/ja.po b/po/ja.po
index 0cf5968..0754521 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6099,11 +6099,11 @@ msgstr チャート一覧
 
 #: lib/layouts/achemso.layout:209 lib/layouts/achemso.layout:220
 msgid Graph[[mathematical]]
-msgstr グラフ[[mathematical]]
+msgstr グラフ
 
 #: lib/layouts/achemso.layout:214
 msgid List of Graphs[[mathematical]]
-msgstr グラフ一覧[[mathematical]]
+msgstr グラフ一覧
 
 #: lib/layouts/achemso.layout:248
 msgid SupplementalInfo

[LyX/master] Revert "Update INSTALL"

[Vincent van Ravesteijn]

commit 7ab58d5d9ea6868e9975aeebf0363ebb78c2a300
Author: Vincent van Ravesteijn <v...@lyx.org>
Date:   Sat Apr 12 14:01:11 2014 +0200

Revert "Update INSTALL"

This reverts commit 30d1cf47c18bf938e6be3e3fd45a3115cff435c1.

diff --git a/INSTALL b/INSTALL
index 6202ee8..17592e1 100644
--- a/INSTALL
+++ b/INSTALL
@@ -37,7 +37,8 @@ Note for Git checkouts
 
 If you have checked this out from Git, you need to have:
 * automake >= 1.8
-* autoconf >= 2.60
+* autoconf >= 2.59d
+* gettext >= 0.16.1
 Then type "./autogen.sh" to build the needed configuration
 files and proceed as stated above/below.
 
@@ -66,6 +67,12 @@ libraries. See the RELEASE-NOTES for details.
 
 * Other things to note
 
+If you make modifications to files in src/ (for example by applying a
+patch), you will need to have the GNU gettext package installed, due
+to some dependencies in the makefiles. You can get the latest version
+from:
+   ftp://ftp.gnu.org/gnu/gettext/
+
 The two following programs should be available at configuration time:
 
   o LaTeX2e should be correctly setup for the user you are logged in

[LyX/master] INSTALL: Update INSTALL

[Vincent van Ravesteijn]

commit 7511bcf39f3bbb329e3d2644fd3466509039f24a
Author: Vincent van Ravesteijn <v...@lyx.org>
Date:   Sun Apr 13 16:10:57 2014 +0200

INSTALL: Update INSTALL

- adjust the supported versions for autotools
- add a note about the adviced Qt version
- remove gettext as a hard requirement and adjust the note

diff --git a/INSTALL b/INSTALL
index 17592e1..a330a0b 100644
--- a/INSTALL
+++ b/INSTALL
@@ -36,9 +36,8 @@ Note for Git checkouts
 -
 
 If you have checked this out from Git, you need to have:
-* automake >= 1.8
-* autoconf >= 2.59d
-* gettext >= 0.16.1
+* automake (supported versions are 1.8--1.14)
+* autoconf (supported versions are 2.60--2.69)
 Then type "./autogen.sh" to build the needed configuration
 files and proceed as stated above/below.
 
@@ -55,10 +54,11 @@ LyX makes great use of the C++ Standard Template Library 
(STL).
 This means that gcc users will have to install the relevant libstdc++
 library to be able to compile this version of LyX.
 
-For full LyX usability we suggest to use at least Qt 4.8 which has been
-widely tested. For compilation you need to compile against at least
-Qt 4.5.0. The only special point to make is that you must ensure that both
-LyX and the Qt libraries are compiled with the same C++ compiler.
+For full LyX usability we suggest to use Qt 4.x and at least Qt 4.8 which 
+has been widely tested. For compilation you need to compile against at
+least Qt 4.5.0 and at Windows we advise at highest Qt 4.8.4. The only
+special point to make is that you must ensure that both LyX and the 
+Qt libraries are compiled with the same C++ compiler.
 
 To build LyX with spell checking capabilities included you have to
 install at least one of the development packages of the spell checker
@@ -67,10 +67,11 @@ libraries. See the RELEASE-NOTES for details.
 
 * Other things to note
 
-If you make modifications to files in src/ (for example by applying a
-patch), you will need to have the GNU gettext package installed, due
-to some dependencies in the makefiles. You can get the latest version
-from:
+If you make modifications to the source that affect any of the
+translations or you change the translation files themselves (po/*.po)
+files, you will need to have the GNU gettext package installed to 
+compile LyX with up-to-date translations (at least gettext version
+0.16.1 is needed). You can get the latest version from:
ftp://ftp.gnu.org/gnu/gettext/
 
 The two following programs should be available at configuration time:

[LyX/master] * ja.po: Update from Koji Yokota

[Vincent van Ravesteijn]

commit 710b3fbdea4d1ad7f6e536dd4c038f770c60e911
Author: Vincent van Ravesteijn <v...@lyx.org>
Date:   Sun Apr 13 18:07:27 2014 +0200

* ja.po: Update from Koji Yokota

diff --git a/po/ja.gmo b/po/ja.gmo
index a5213ef..79515bc 100644
Binary files a/po/ja.gmo and b/po/ja.gmo differ
diff --git a/po/ja.po b/po/ja.po
index 12967ba..0cf5968 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,9 +8,9 @@ msgstr ""
 "Project-Id-Version: LyX 2.1\n"
 "Report-Msgid-Bugs-To: lyx-d...@lists.lyx.org\n"
 "POT-Creation-Date: 2014-03-20 11:00+0100\n"
-"PO-Revision-Date: 2014-04-04 01:25+0900\n"
+"PO-Revision-Date: 2014-04-13 02:59+0900\n"
 "Last-Translator: Koji Yokota <yok...@res.otaru-uc.ac.jp>\n"
-"Language-Team: Japanese <lyx-d...@lists.lyx.org>\n"
+"Language-Team: Japanese <kde-i18n-...@kde.org>\n"
 "Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1930,7 +1930,7 @@ msgstr "Input"
 
 #: src/frontends/qt4/ui/IncludeUi.ui:303 lib/layouts/stdlayouts.inc:74
 msgid "Verbatim"
-msgstr "無調整(Verbatim)"
+msgstr "Verbatim"
 
 #: src/frontends/qt4/ui/IncludeUi.ui:308 src/insets/InsetInclude.cpp:1196
 #: src/insets/InsetInclude.cpp:1202
@@ -6099,11 +6099,11 @@ msgstr "チャート一覧"
 
 #: lib/layouts/achemso.layout:209 lib/layouts/achemso.layout:220
 msgid "Graph[[mathematical]]"
-msgstr "グラフ"
+msgstr "グラフ[[mathematical]]"
 
 #: lib/layouts/achemso.layout:214
 msgid "List of Graphs[[mathematical]]"
-msgstr "グラフ一覧"
+msgstr "グラフ一覧[[mathematical]]"
 
 #: lib/layouts/achemso.layout:248
 msgid "SupplementalInfo"
@@ -15085,11 +15085,11 @@ msgstr "Input|p"
 
 #: lib/ui/stdcontext.inc:277 lib/ui/stdcontext.inc:540
 msgid "Verbatim|V"
-msgstr "無調整(Verbatim)|V"
+msgstr "Verbatim|V"
 
 #: lib/ui/stdcontext.inc:278 lib/ui/stdcontext.inc:541
 msgid "Verbatim (marked blanks)|b"
-msgstr "無調整(Verbatim) (空白記号付き)|b"
+msgstr "Verbatim (marked blanks)|b"
 
 #: lib/ui/stdcontext.inc:279 lib/ui/stdcontext.inc:542
 msgid "Listing|L"
@@ -15522,7 +15522,7 @@ msgstr "保存(S)|S"
 
 #: lib/ui/stdmenus.inc:53
 msgid "Save As...|A"
-msgstr "名前を付けて保存(A)...|A"
+msgstr "名前を付けて保存(A),,,|A"
 
 #: lib/ui/stdmenus.inc:54
 msgid "Save All|l"
@@ -15618,11 +15618,11 @@ msgstr "他の形式とオプション(O)...|O"
 
 #: lib/ui/stdmenus.inc:102
 msgid "Undo|U"
-msgstr "操作を取り消す(U)|U"
+msgstr "元に戻す(U)|U"
 
 #: lib/ui/stdmenus.inc:103
 msgid "Redo|R"
-msgstr "同じ操作を繰り返す(R)|R"
+msgstr "やり直す(R)|R"
 
 #: lib/ui/stdmenus.inc:109
 msgid "Paste Special"
@@ -16498,11 +16498,11 @@ msgstr "連続スペルチェック"
 
 #: lib/ui/stdtoolbars.inc:79 src/BufferView.cpp:1333
 msgid "Undo"
-msgstr "操作を取り消す"
+msgstr "元に戻す"
 
 #: lib/ui/stdtoolbars.inc:80 src/BufferView.cpp:1343
 msgid "Redo"
-msgstr "同じ操作を繰り返す"
+msgstr "やり直す"
 
 #: lib/ui/stdtoolbars.inc:84
 msgid "Find and replace"
@@ -22454,11 +22454,11 @@ msgstr "文書クラス「%1$s」を読み込むことができませんでし
 
 #: src/BufferView.cpp:1336
 msgid "No further undo information"
-msgstr "これ以上操作を取り消すことはできません"
+msgstr "これ以上元に戻すことはできません"
 
 #: src/BufferView.cpp:1346
 msgid "No further redo information"
-msgstr "これ以上同じ操作を繰り返すことはできません"
+msgstr "これ以上やり直すことはできません"
 
 #: src/BufferView.cpp:1593
 msgid "Mark off"
@@ -24324,7 +24324,7 @@ msgstr ""
 
 #: src/Text.cpp:1013
 msgid "Character is uncodable in verbatim paragraphs."
-msgstr "無調整(verbatim)環境では文字をコード化できません。"
+msgstr "verbatim環境では文字をコード化できません。"
 
 #: src/Text.cpp:1850
 msgid "[Change Tracking] "
@@ -26706,7 +26706,7 @@ msgstr "関数"
 
 #: src/frontends/qt4/GuiPrefs.cpp:2796
 msgid "Shortcut"
-msgstr "捷径"
+msgstr "捷径 (ショートカット)"
 
 #: src/frontends/qt4/GuiPrefs.cpp:2873
 msgid "Cursor, Mouse and Editing Functions"
@@ -29404,7 +29404,7 @@ msgstr "外部制御インタフェース"
 
 #: src/support/debug.cpp:56
 msgid "Undo/Redo mechanism"
-msgstr "操作の取消/繰返機構"
+msgstr "元に戻す/やり直すの動作"
 
 #: src/support/debug.cpp:57
 msgid "User commands"
@@ -29493,8 +29493,9 @@ msgid ""
 "Assertion %1$s violated in\n"
 "file: %2$s, line: %3$s"
 msgstr ""
-"アサーション %1$s 違反です。\n"
-"ファイル: %2$s, 行: %3$s"
+"アサーション %1$s が\n"
+"ファイル: %2$s, 行: %3$s\n"
+"で満たされていません。"
 
 #: src/support/lassert.cpp:62
 msgid ""
@@ -29554,4 +29555,444 @@ msgstr ""
 
 #: src/support/userinfo.cpp:45
 msgid "Unknown us

[LyX/master] * doc/ja: Updates from Koji Yokota

[Vincent van Ravesteijn]

commit 1468a40bac4c667ed11c2461010713a8471da3be
Author: Vincent van Ravesteijn <v...@lyx.org>
Date:   Sun Apr 13 18:36:43 2014 +0200

* doc/ja: Updates from Koji Yokota

diff --git a/lib/doc/ja/Additional.lyx b/lib/doc/ja/Additional.lyx
index 7ad6c52..e753e8a 100644
--- a/lib/doc/ja/Additional.lyx
+++ b/lib/doc/ja/Additional.lyx
@@ -13,8 +13,8 @@
 % the documentation team
 % email: lyx-d...@lists.lyx.org
 
-\ifnum 42146=\euc"A4A2 \AtBeginDvi{\special{pdf:tounicode EUC-UCS2}}\else
-\AtBeginDvi{\special{pdf:tounicode 90ms-RKSJ-UCS2}}\fi
+\IfFileExists{pxjahyper.sty}
+{\usepackage{pxjahyper}}
 
 % if pdflatex is used
 \usepackage{ifpdf}
@@ -93,7 +93,7 @@ End
 \end_local_layout
 \language japanese
 \language_package default
-\inputencoding jis-platex
+\inputencoding auto
 \fontencoding global
 \font_roman default
 \font_sans default
@@ -113,11 +113,11 @@ End
 \paperfontsize 12
 \spacing single
 \use_hyperref true
-\pdf_title "LyX拡張機能篇"
-\pdf_author "LyXプロジェクトチーム"
-\pdf_subject "LyX拡張機能取扱説明書"
-\pdf_keywords "LyX、取扱説明書、文書化、拡張"
-\pdf_bookmarks true
+\pdf_title "LyX's Additional Features manual"
+\pdf_author "LyX Team"
+\pdf_subject "LyX's additional features documentation"
+\pdf_keywords "LyX, Documentation, Additional"
+\pdf_bookmarks false
 \pdf_bookmarksnumbered true
 \pdf_bookmarksopen false
 \pdf_bookmarksopenlevel 1
@@ -126,7 +126,7 @@ End
 \pdf_colorlinks true
 \pdf_backref false
 \pdf_pdfusetitle false
-\pdf_quoted_options "linkcolor=black, citecolor=black, urlcolor=blue, 
filecolor=blue, pdfpagelayout=OneColumn, pdfnewwindow=true, pdfstartview=XYZ, 
plainpages=false"
+\pdf_quoted_options "pdfencoding=pdfdoc, linkcolor=black, citecolor=black, 
urlcolor=blue, filecolor=blue, pdfpagelayout=OneColumn, pdfnewwindow=true, 
pdfstartview=XYZ, plainpages=false"
 \papersize default
 \use_geometry false
 \use_package amsmath 1
@@ -8726,157 +8726,157 @@ aasguide.tex
 \backslash
 documentclass
 \family default
-(2.1.1)・
+ (2.1.1)・
 \family typewriter
 
 \backslash
 begin{document}
 \family default
-(2.2)・
+ (2.2)・
 \family typewriter
 
 \backslash
 title
 \family default
-(2.3)・
+ (2.3)・
 \family typewriter
 
 \backslash
 author
 \family default
-(2.3)・
+ (2.3)・
 \family typewriter
 
 \backslash
 affil
 \family default
-(2.3)・
+ (2.3)・
 \family typewriter
 
 \backslash
 abstract
 \family default
-(2.4)・
+ (2.4)・
 \family typewriter
 
 \backslash
 keywords
 \family default
-(2.5)・
+ (2.5)・
 \family typewriter
 
 \backslash
 section
 \family default
-(2.7)・
+ (2.7)・
 \family typewriter
 
 \backslash
 subsection
 \family default
-(2.7)・
+ (2.7)・
 \family typewriter
 
 \backslash
 subsubsection
 \family default
-(2.7)・
+ (2.7)・
 \family typewriter
 
 \backslash
 paragraph
 \family default
-(2.7)・
+ (2.7)・
 \family typewriter
 
 \backslash
 facility
 \family default
-(2.10)・
+ (2.10)・
 \family typewriter
 
 \backslash
 begin{displaymath}
 \family default
-(2.12)・
+ (2.12)・
 \family typewriter
 
 \backslash
 begin{equation}
 \family default
-(2.12)・
+ (2.12)・
 \family typewriter
 
 \backslash
 begin{eqnarray}
 \family default
-(2.12)・
+ (2.12)・
 \family typewriter
 
 \backslash
 begin{mathletters}
 \family default
-(2.12)・
+ (2.12)・
 \family typewriter
 
 \backslash
 begin{thebibliography}
 \family default
-(2.13.1)・
+ (2.13.1)・
 \family typewriter
 
 \backslash
 bibitem
 \family default
-(2.13.2)・全引用コマンドとその派生(2.13.2)・一般的なgraphicx図コマンド(2.14.1)・
+ (2.13.2)・全引用コマンドとその派生(2.13.2)・一般的なgraphicx図コマンド(2.14.1)・
 \family typewriter
 
 \backslash
 begin{table}
 \family default
-(2.15.4)・
+ (2.15.4)・
 \family typewriter
 
 \backslash
 begin{tabular}
 \family default
-(2.15.4)・
+ (2.15.4)・
 \family typewriter
 
 \backslash
 caption
 \family default
-(2.15.4)・
+ (2.15.4)・
 \family typewriter
 
 \backslash
 label
 \family default
-(他にもあるが特に2.15.4)・
+ (他にもあるが特に2.15.4)・
 \family typewriter
 
 \backslash
 tablerefs
 \family default
-(2.15.5)・
+ (2.15.5)・
 \family typewriter
 
 \backslash
 tablecomments
 \family default
-(2.15.5)・
+ (2.15.5)・
 \family typewriter
 
 \backslash
 url
 \family default
-(2.17.4)・
+ (2.17.4)・
 \family typewriter
 
 \backslash
 end{document}
 \family default
-(2.18)。
+ (2.18)。
 \end_layout
 
 \begin_layout Standard
@@ -8884,23 +8884,23 @@ end{document}
 \family typewriter
 longabstract
 \family default
-(2.4)・
+ (2.4)・
 \family typewriter
 preprint
 \family default
-(3.2.1)・
+ (3.2.1)・
 \family typewriter
 preprint2
 \family default
-(3.2.2)・
+ (3.2.2)・
 \family typewriter
 eqsecnum
 \family default
-(3.3)・
+ (3.3)・
 \family typewriter
 flushrt
 \family default
-(3.4)。これらは、
+ (3.4)。これらは、
 \begin_inset Flex MenuItem
 status collapsed
 
diff --git a/lib/doc/ja/Customization.lyx b/lib/doc/ja/Customization.lyx
index 6000942..680f4fd 100644
--- a/lib/doc/ja/Customization.lyx
+++ b/lib/doc/ja/Customization.lyx
@@ -34,12 +34,6 @@
 % Added only for Japanese translation
 % This is needed to use \t

[LyX/master] * ja.po: Fix Graph strings

[Vincent van Ravesteijn]

commit 05662daf5b5f6889732780455a0df84af24e33de
Author: Vincent van Ravesteijn <v...@lyx.org>
Date:   Sun Apr 13 19:17:27 2014 +0200

* ja.po: Fix Graph strings

diff --git a/po/ja.gmo b/po/ja.gmo
index 79515bc..4b91c1a 100644
Binary files a/po/ja.gmo and b/po/ja.gmo differ
diff --git a/po/ja.po b/po/ja.po
index 0cf5968..0754521 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6099,11 +6099,11 @@ msgstr "チャート一覧"
 
 #: lib/layouts/achemso.layout:209 lib/layouts/achemso.layout:220
 msgid "Graph[[mathematical]]"
-msgstr "グラフ[[mathematical]]"
+msgstr "グラフ"
 
 #: lib/layouts/achemso.layout:214
 msgid "List of Graphs[[mathematical]]"
-msgstr "グラフ一覧[[mathematical]]"
+msgstr "グラフ一覧"
 
 #: lib/layouts/achemso.layout:248
 msgid "SupplementalInfo"

Re: [LyX/master] Update ANNOUNCE

[Vincent van Ravesteijn]

On Fri, Apr 11, 2014 at 9:46 AM, Jürgen Spitzmüller sp...@lyx.org wrote:
 2014-04-10 22:32 GMT+02:00 Vincent van Ravesteijn:

 -We are proud to announce the first release candidate of the new
 -LyX 2.1 series.
 +We are proud to announce the release candidate of LyX 2.1.0.


 You probably want to delete release candidate.

 Jürgen

Pavel already fixed this. I was alternating between We are proud to
announce LyX 2.1.0 and We are proud to announce the release of LyX
2.1.0, and apparently candidate creeped in as well.

Vincent

Re: [LyX/2.0.x] Allow 2.0.8 to read and write 2.1.x files. Also incorporates some bugfixes in lyx2lyx that made it into 2.1.0.

[Vincent van Ravesteijn]

On Fri, Apr 11, 2014 at 5:42 PM, Richard Heck rgh...@lyx.org wrote:
 commit 8c3d6f717893b091ae2b461a5b08f4bc77f84691
 Author: Richard Heck rgh...@lyx.org
 Date:   Fri Apr 11 11:41:56 2014 -0400

 Allow 2.0.8 to read and write 2.1.x files. Also incorporates some
 bugfixes in lyx2lyx that made it into 2.1.0.

 diff --git a/lib/configure.py b/lib/configure.py
 index 71f7521..a90f716 100644
 --- a/lib/configure.py
 +++ b/lib/configure.py
 @@ -672,6 +672,7 @@ def checkFormatEntries(dtl_tools):
  \Format lyx14x 14.lyx  LyX 1.4.x   
 document
  \Format lyx15x 15.lyx  LyX 1.5.x   
 document
  \Format lyx16x 16.lyx  LyX 1.6.x   
 document,menu=export
 +\Format lyx21x 21.lyx  LyX 2.1.x   
 document,menu=export
  \Format clyx   cjklyx CJK LyX 1.4.x (big5) 
 document
  \Format jlyx   cjklyx CJK LyX 1.4.x (euc-jp)   
 document
  \Format klyx   cjklyx CJK LyX 1.4.x (euc-kr)   
 document
 @@ -1008,6 +1009,7 @@ def checkConverterEntries():
  \converter lyxlyx14x python -tt $$s/lyx2lyx/lyx2lyx -t 245 $$i 
  $$o 
  \converter lyxlyx15x python -tt $$s/lyx2lyx/lyx2lyx -t 276 $$i 
  $$o 
  \converter lyxlyx16x python -tt $$s/lyx2lyx/lyx2lyx -t 345 $$i 
  $$o 
 +\converter lyxlyx21x python -tt $$s/lyx2lyx/lyx2lyx -t 474 $$i 
  $$o 
  \converter lyxclyx   python -tt $$s/lyx2lyx/lyx2lyx -c big5 -t 
 245 $$i  $$o 
  \converter lyxjlyx   python -tt $$s/lyx2lyx/lyx2lyx -c euc_jp 
 -t 245 $$i  $$o   
  \converter lyxklyx   python -tt $$s/lyx2lyx/lyx2lyx -c euc_kr 
 -t 245 $$i  $$o   


The last time you reverted this. See,

http://git.lyx.org/?p=lyx.git;a=commit;h=46c599179ee6f81cf341ade49d048c163e31d1fc

Vincent

Re: [LyX/2.0.x] Remove 21x export. LyX 2.1.x already reads 2.0.x files.

[Vincent van Ravesteijn]

On Fri, Apr 11, 2014 at 5:50 PM, Richard Heck rgh...@lyx.org wrote:
 commit d41d84f0b8c3cc10154145d86a3c5e9536b6b643
 Author: Richard Heck rgh...@lyx.org
 Date:   Fri Apr 11 11:49:54 2014 -0400

 Remove 21x export. LyX 2.1.x already reads 2.0.x files.



 +\Format lyx21x 21.lyx LyX 2.1.x   
 document,menu=export

... and the format doesn't make much sense anymore without the exporter.

Vincent

[LyX/master] * nn.po: Update from Ingar Pareliussen

[Vincent van Ravesteijn]

commit 1b4986793ee69f6a830b67bda9383664f2928466
Author: Vincent van Ravesteijn v...@lyx.org
Date:   Fri Apr 11 20:39:04 2014 +0200

* nn.po: Update from Ingar Pareliussen

diff --git a/lib/layouttranslations b/lib/layouttranslations
index f86c4fd..0d18b4b 100644
--- a/lib/layouttranslations
+++ b/lib/layouttranslations
@@ -905,7 +905,7 @@ Translation nl
 End
 
 Translation nn
-   Acknowledgement Takk
+   Acknowledgement Takk til
Algorithm Algoritme
Assumption Asumpsjon
Axiom Aksiom
@@ -929,7 +929,7 @@ Translation nn
List of Schemes Liste over skjema
List of Tableaux Liste over tablå
Listing Kodeliste
-   Listings[[List of Listings]] Listings
+   Listings[[List of Listings]] Liste over kodelister
Notation Notasjon
Note Notis
Problem Problem
diff --git a/po/nn.gmo b/po/nn.gmo
index 43ad373..608de42 100644
Binary files a/po/nn.gmo and b/po/nn.gmo differ
diff --git a/po/nn.po b/po/nn.po
index 6cc2bc8..f609227 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -5415,7 +5415,7 @@ msgstr Brevbyt med:
 #: lib/layouts/theorems-ams-extended.module:302
 #: lib/layouts/theorems-ams-extended.module:305
 msgid Acknowledgement
-msgstr Takk
+msgstr Takk til
 
 #: lib/layouts/aa.layout:158 lib/layouts/aastex.layout:310
 #: lib/layouts/aastex.layout:374 lib/layouts/aastex.layout:406
@@ -12555,12 +12555,10 @@ msgid ERT
 msgstr ERT
 
 #: lib/layouts/stdinsets.inc:227 lib/layouts/stdinsets.inc:233
-#, fuzzy
 msgid Listings[[List of Listings]]
 msgstr Liste over kodelister
 
 #: lib/layouts/stdinsets.inc:259 src/frontends/qt4/GuiDocument.cpp:1417
-#, fuzzy
 msgid Listings[[inset]]
 msgstr Kodeliste
 
@@ -16493,7 +16491,6 @@ msgid Table of Contents|C
 msgstr Innhaldsliste|I
 
 #: lib/ui/stdmenus.inc:457
-#, fuzzy
 msgid List of Listings|L
 msgstr Liste over kodelister
 

[LyX/master] * fr.po: Update from Jean-Pierre Chretien

[Vincent van Ravesteijn]

commit 80dfb44171bdb081ec56ae9bd7bcc301359cb1ab
Author: Vincent van Ravesteijn v...@lyx.org
Date:   Fri Apr 11 20:49:15 2014 +0200

* fr.po: Update from Jean-Pierre Chretien

In discussion with Juergen Spitzmuller was decided to just have the same 
translation as for the List of Tables.

diff --git a/lib/layouttranslations b/lib/layouttranslations
index 0d18b4b..658729a 100644
--- a/lib/layouttranslations
+++ b/lib/layouttranslations
@@ -480,7 +480,7 @@ Translation fr
List of Charts Liste des diagrammes
List of Graphs[[mathematical]] Liste des graphiques
List of Schemes Liste des schémas
-   List of Tableaux Liste des tableaux (TO)
+   List of Tableaux Liste des tableaux
Listing Listing
Listings[[List of Listings]] Liste des listings
Notation Notation
diff --git a/po/fr.gmo b/po/fr.gmo
index 1c26bef..0976f42 100644
Binary files a/po/fr.gmo and b/po/fr.gmo differ
diff --git a/po/fr.po b/po/fr.po
index e13ed0f..8c73b51 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -14889,7 +14889,7 @@ msgstr Tableau
 
 #: lib/layouts/linguistics.module:179
 msgid List of Tableaux
-msgstr Liste des tableaux (TO)
+msgstr Liste des tableaux
 
 #: lib/layouts/logicalmkup.module:2
 msgid Logical Markup

[LyX/master] * fr.po: Another shortcut conflict

[Vincent van Ravesteijn]

commit 1b2c67a8f281c04f5e7684864bddb9632f554e27
Author: Vincent van Ravesteijn v...@lyx.org
Date:   Fri Apr 11 21:00:02 2014 +0200

* fr.po: Another shortcut conflict

diff --git a/po/fr.gmo b/po/fr.gmo
index 0976f42..286cb3e 100644
Binary files a/po/fr.gmo and b/po/fr.gmo differ
diff --git a/po/fr.po b/po/fr.po
index 8c73b51..b0b19e7 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -294,7 +294,7 @@ msgstr 
 Project-Id-Version: LyX 1.6.0\n
 Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n
 POT-Creation-Date: 2014-03-20 11:00+0100\n
-PO-Revision-Date: 2014-04-11 00:33+0100\n
+PO-Revision-Date: 2014-04-11 15:12+0100\n
 Last-Translator: Jean-Pierre Chrétien jeanpierre.chret...@free.fr\n
 Language-Team: lyxfr\n
 Language: fr\n
@@ -6822,7 +6822,7 @@ msgstr fig.
 #: lib/layouts/stdsections.inc:60
 #: lib/layouts/stdsections.inc:88
 msgid Short Title|S
-msgstr Titre court|T
+msgstr Titre court
 
 #: lib/layouts/aastex.layout:533
 msgid The caption as it appears in the list of figures

[LyX/master] * fr/linguistics.lyx: Update from Jean-Pierre Chretien

[Vincent van Ravesteijn]

commit cafe6c60f3a6defb3c2369d70bb64ddc0838032d
Author: Vincent van Ravesteijn v...@lyx.org
Date:   Fri Apr 11 21:00:28 2014 +0200

* fr/linguistics.lyx: Update from Jean-Pierre Chretien

diff --git a/lib/examples/fr/linguistics.lyx b/lib/examples/fr/linguistics.lyx
index e91abf4..4085924 100644
--- a/lib/examples/fr/linguistics.lyx
+++ b/lib/examples/fr/linguistics.lyx
@@ -809,13 +809,13 @@ textwidth
 
 \end_deeper
 \begin_layout Section
-Tableaux résultant de la théorie de l'optimalité (TO)
+Tableaux résultant de la théorie de l'optimalité (OT en anglais)
 \end_layout
 
 \begin_layout Standard
-Un tableau TO peut bien évidemment être inséré comme un tableau ordinaire
- (pour ce qui concerne les saisies spécifiques comme les lignes tiretées
- et les cellules ombrées, voir le manuel 
+Un tableau de ce type peut bien évidemment être inséré comme un tableau
+ ordinaire (pour ce qui concerne les saisies spécifiques comme les lignes
+ tiretées et les cellules ombrées, voir le manuel 
 \emph on
 Objets
 \emph default
@@ -827,7 +827,7 @@ insérés
  Cependant, vous pouvez souhaiter numéroter ces tableaux à part dans le
  document, avec une 
 \emph on
-Liste des tableaux TO
+Liste des tableaux
 \emph default
 , semblable à la 
 \emph on
@@ -1128,7 +1128,7 @@ a.ti.kap
 \begin_inset Caption Standard
 
 \begin_layout Plain Layout
-Exemple tableau (TO)
+Exemple de tableau utilisé dans la théorie de l'optimalité
 \end_layout
 
 \end_inset
@@ -1145,7 +1145,7 @@ Exemple tableau (TO)
 Noter que, de manière implicite, la légende est toujours placée au-dessous
  des tableaux dans le résultat imprimé, quel que soit le positionnement
  choisi dans la fenêtre LyX.
- Pour mettre les légendes des tableaux (TO) au-dessus, insérer le code suivant
+ Pour mettre les légendes des tableaux au-dessus, insérer le code suivant
  dans 
 \family sans
 Document\SpecialChar \menuseparator
@@ -1187,14 +1187,26 @@ restylefloat{tableau}
 \begin_layout Standard
 Un insert pour la 
 \emph on
-Liste des tableaux (TO)
+Liste des tableaux 
 \emph default
- est accessible via 
+est accessible via 
 \family sans
 Insertion\SpecialChar \menuseparator
 Listes  TdM
 \family default
-.
+ (il y a deux occurrences dans le menu, c'est la seconde qui est la bonne
+ en principe
+\begin_inset Foot
+status collapsed
+
+\begin_layout Plain Layout
+Au cas où vous auriez en même temps des tableaux ordinaires et des tableaux
+ linguistiques, il vous faudra lever l’ambiguïté en modifiant l'un des 
intitulés
+\end_layout
+
+\end_inset
+
+).
  Bien que celle-ci soit placée d'habitude au début ou à la fin du document,
  nous l'insérons ici à titre d'exemple:
 \end_layout

[LyX/master] * EmbeddedObjects.lyx: Increase version number

[Vincent van Ravesteijn]

commit c9dd2d4624da4491b634259cc862afc8166fee71
Author: Vincent van Ravesteijn v...@lyx.org
Date:   Fri Apr 11 21:16:36 2014 +0200

* EmbeddedObjects.lyx: Increase version number

diff --git a/lib/doc/EmbeddedObjects.lyx b/lib/doc/EmbeddedObjects.lyx
index ee0c4a4..9c11df3 100644
--- a/lib/doc/EmbeddedObjects.lyx
+++ b/lib/doc/EmbeddedObjects.lyx
@@ -296,7 +296,7 @@ author: Uwe Stöhr
 
 
 \family sans
-Version 2.0.x
+Version 2.1.x
 \end_layout
 
 \begin_layout Standard
diff --git a/lib/doc/de/EmbeddedObjects.lyx b/lib/doc/de/EmbeddedObjects.lyx
index 524eb63..1ad45e5 100644
--- a/lib/doc/de/EmbeddedObjects.lyx
+++ b/lib/doc/de/EmbeddedObjects.lyx
@@ -314,7 +314,7 @@ Autor: Uwe Stöhr uwesto...@web.de
 
 
 \family sans
-Version 2.0.x
+Version 2.1.x
 \end_layout
 
 \begin_layout Standard
diff --git a/lib/doc/es/EmbeddedObjects.lyx b/lib/doc/es/EmbeddedObjects.lyx
index b379108..69ff18a 100644
--- a/lib/doc/es/EmbeddedObjects.lyx
+++ b/lib/doc/es/EmbeddedObjects.lyx
@@ -310,7 +310,7 @@ Traducción de: Ignacio García
 
 
 \family sans
-Versión 2.0.x
+Versión 2.1.x
 \end_layout
 
 \begin_layout Standard

[LyX/master] Update lib/layouttranslations

[Vincent van Ravesteijn]

commit 777b8f7133ee1781489d87767f109ca8abcef912
Author: Vincent van Ravesteijn v...@lyx.org
Date:   Fri Apr 11 21:33:09 2014 +0200

Update lib/layouttranslations

Italian translations were updated

diff --git a/lib/layouttranslations b/lib/layouttranslations
index 658729a..5a08733 100644
--- a/lib/layouttranslations
+++ b/lib/layouttranslations
@@ -720,11 +720,11 @@ Translation it
Example Esempio
Exercise Esercizio
Fact Fatto
-   Graph[[mathematical]] Grafico
+   Graph[[mathematical]] Grafo
Lemma Lemma
List of Algorithms Elenco degli algoritmi
List of Charts Elenco dei diagrammi
-   List of Graphs[[mathematical]] Elenco dei grafici
+   List of Graphs[[mathematical]] Elenco dei grafi
List of Schemes Elenco degli schemi
List of Tableaux Elenco dei tableau
Listing Listato

Re: [LyX/master] Update ANNOUNCE

[Vincent van Ravesteijn]

On Fri, Apr 11, 2014 at 9:46 AM, Jürgen Spitzmüller <sp...@lyx.org> wrote:
> 2014-04-10 22:32 GMT+02:00 Vincent van Ravesteijn:
>
>> -We are proud to announce the first release candidate of the new
>> -LyX 2.1 series.
>> +We are proud to announce the release candidate of LyX 2.1.0.
>
>
> You probably want to delete "release candidate".
>
> Jürgen

Pavel already fixed this. I was alternating between "We are proud to
announce LyX 2.1.0" and "We are proud to announce the release of LyX
2.1.0", and apparently "candidate" creeped in as well.

Vincent

Re: [LyX/2.0.x] Allow 2.0.8 to read and write 2.1.x files. Also incorporates some bugfixes in lyx2lyx that made it into 2.1.0.

[Vincent van Ravesteijn]

On Fri, Apr 11, 2014 at 5:42 PM, Richard Heck  wrote:
> commit 8c3d6f717893b091ae2b461a5b08f4bc77f84691
> Author: Richard Heck 
> Date:   Fri Apr 11 11:41:56 2014 -0400
>
> Allow 2.0.8 to read and write 2.1.x files. Also incorporates some
> bugfixes in lyx2lyx that made it into 2.1.0.
>
> diff --git a/lib/configure.py b/lib/configure.py
> index 71f7521..a90f716 100644
> --- a/lib/configure.py
> +++ b/lib/configure.py
> @@ -672,6 +672,7 @@ def checkFormatEntries(dtl_tools):
>  \Format lyx14x 14.lyx  "LyX 1.4.x" "" ""   ""  
> "document"
>  \Format lyx15x 15.lyx  "LyX 1.5.x" "" ""   ""  
> "document"
>  \Format lyx16x 16.lyx  "LyX 1.6.x" "" ""   ""  
> "document,menu=export"
> +\Format lyx21x 21.lyx  "LyX 2.1.x" "" ""   ""  
> "document,menu=export"
>  \Format clyx   cjklyx "CJK LyX 1.4.x (big5)"  "" """"  
> "document"
>  \Format jlyx   cjklyx "CJK LyX 1.4.x (euc-jp)" "" ""   ""  
> "document"
>  \Format klyx   cjklyx "CJK LyX 1.4.x (euc-kr)" "" ""   ""  
> "document"
> @@ -1008,6 +1009,7 @@ def checkConverterEntries():
>  \converter lyxlyx14x "python -tt $$s/lyx2lyx/lyx2lyx -t 245 $$i 
> > $$o" ""
>  \converter lyxlyx15x "python -tt $$s/lyx2lyx/lyx2lyx -t 276 $$i 
> > $$o" ""
>  \converter lyxlyx16x "python -tt $$s/lyx2lyx/lyx2lyx -t 345 $$i 
> > $$o" ""
> +\converter lyxlyx21x "python -tt $$s/lyx2lyx/lyx2lyx -t 474 $$i 
> > $$o" ""
>  \converter lyxclyx   "python -tt $$s/lyx2lyx/lyx2lyx -c big5 -t 
> 245 $$i > $$o" ""
>  \converter lyxjlyx   "python -tt $$s/lyx2lyx/lyx2lyx -c euc_jp 
> -t 245 $$i > $$o"   ""
>  \converter lyxklyx   "python -tt $$s/lyx2lyx/lyx2lyx -c euc_kr 
> -t 245 $$i > $$o"   ""


The last time you reverted this. See,

http://git.lyx.org/?p=lyx.git;a=commit;h=46c599179ee6f81cf341ade49d048c163e31d1fc

Vincent

Re: [LyX/2.0.x] Remove 21x export. LyX 2.1.x already reads 2.0.x files.

[Vincent van Ravesteijn]

On Fri, Apr 11, 2014 at 5:50 PM, Richard Heck  wrote:
> commit d41d84f0b8c3cc10154145d86a3c5e9536b6b643
> Author: Richard Heck 
> Date:   Fri Apr 11 11:49:54 2014 -0400
>
> Remove 21x export. LyX 2.1.x already reads 2.0.x files.
>
>

>>> +\Format lyx21x 21.lyx "LyX 2.1.x" "" "" ""
>>> "document,menu=export"

... and the format doesn't make much sense anymore without the exporter.

Vincent

[LyX/master] * nn.po: Update from Ingar Pareliussen

[Vincent van Ravesteijn]

commit 1b4986793ee69f6a830b67bda9383664f2928466
Author: Vincent van Ravesteijn <v...@lyx.org>
Date:   Fri Apr 11 20:39:04 2014 +0200

* nn.po: Update from Ingar Pareliussen

diff --git a/lib/layouttranslations b/lib/layouttranslations
index f86c4fd..0d18b4b 100644
--- a/lib/layouttranslations
+++ b/lib/layouttranslations
@@ -905,7 +905,7 @@ Translation nl
 End
 
 Translation nn
-   "Acknowledgement" "Takk"
+   "Acknowledgement" "Takk til"
"Algorithm" "Algoritme"
"Assumption" "Asumpsjon"
"Axiom" "Aksiom"
@@ -929,7 +929,7 @@ Translation nn
"List of Schemes" "Liste over skjema"
"List of Tableaux" "Liste over tablå"
"Listing" "Kodeliste"
-   "Listings[[List of Listings]]" "Listings"
+   "Listings[[List of Listings]]" "Liste over kodelister"
"Notation" "Notasjon"
"Note" "Notis"
"Problem" "Problem"
diff --git a/po/nn.gmo b/po/nn.gmo
index 43ad373..608de42 100644
Binary files a/po/nn.gmo and b/po/nn.gmo differ
diff --git a/po/nn.po b/po/nn.po
index 6cc2bc8..f609227 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -5415,7 +5415,7 @@ msgstr "Brevbyt med:"
 #: lib/layouts/theorems-ams-extended.module:302
 #: lib/layouts/theorems-ams-extended.module:305
 msgid "Acknowledgement"
-msgstr "Takk"
+msgstr "Takk til"
 
 #: lib/layouts/aa.layout:158 lib/layouts/aastex.layout:310
 #: lib/layouts/aastex.layout:374 lib/layouts/aastex.layout:406
@@ -12555,12 +12555,10 @@ msgid "ERT"
 msgstr "ERT"
 
 #: lib/layouts/stdinsets.inc:227 lib/layouts/stdinsets.inc:233
-#, fuzzy
 msgid "Listings[[List of Listings]]"
 msgstr "Liste over kodelister"
 
 #: lib/layouts/stdinsets.inc:259 src/frontends/qt4/GuiDocument.cpp:1417
-#, fuzzy
 msgid "Listings[[inset]]"
 msgstr "Kodeliste"
 
@@ -16493,7 +16491,6 @@ msgid "Table of Contents|C"
 msgstr "Innhaldsliste|I"
 
 #: lib/ui/stdmenus.inc:457
-#, fuzzy
 msgid "List of Listings|L"
 msgstr "Liste over kodelister"
 

[LyX/master] * fr.po: Update from Jean-Pierre Chretien

[Vincent van Ravesteijn]

commit 80dfb44171bdb081ec56ae9bd7bcc301359cb1ab
Author: Vincent van Ravesteijn <v...@lyx.org>
Date:   Fri Apr 11 20:49:15 2014 +0200

* fr.po: Update from Jean-Pierre Chretien

In discussion with Juergen Spitzmuller was decided to just have the same 
translation as for the List of Tables.

diff --git a/lib/layouttranslations b/lib/layouttranslations
index 0d18b4b..658729a 100644
--- a/lib/layouttranslations
+++ b/lib/layouttranslations
@@ -480,7 +480,7 @@ Translation fr
"List of Charts" "Liste des diagrammes"
"List of Graphs[[mathematical]]" "Liste des graphiques"
"List of Schemes" "Liste des schémas"
-   "List of Tableaux" "Liste des tableaux (TO)"
+   "List of Tableaux" "Liste des tableaux"
"Listing" "Listing"
"Listings[[List of Listings]]" "Liste des listings"
"Notation" "Notation"
diff --git a/po/fr.gmo b/po/fr.gmo
index 1c26bef..0976f42 100644
Binary files a/po/fr.gmo and b/po/fr.gmo differ
diff --git a/po/fr.po b/po/fr.po
index e13ed0f..8c73b51 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -14889,7 +14889,7 @@ msgstr "Tableau"
 
 #: lib/layouts/linguistics.module:179
 msgid "List of Tableaux"
-msgstr "Liste des tableaux (TO)"
+msgstr "Liste des tableaux"
 
 #: lib/layouts/logicalmkup.module:2
 msgid "Logical Markup"

[LyX/master] * fr.po: Another shortcut conflict

[Vincent van Ravesteijn]

commit 1b2c67a8f281c04f5e7684864bddb9632f554e27
Author: Vincent van Ravesteijn <v...@lyx.org>
Date:   Fri Apr 11 21:00:02 2014 +0200

* fr.po: Another shortcut conflict

diff --git a/po/fr.gmo b/po/fr.gmo
index 0976f42..286cb3e 100644
Binary files a/po/fr.gmo and b/po/fr.gmo differ
diff --git a/po/fr.po b/po/fr.po
index 8c73b51..b0b19e7 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -294,7 +294,7 @@ msgstr ""
 "Project-Id-Version: LyX 1.6.0\n"
 "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n"
 "POT-Creation-Date: 2014-03-20 11:00+0100\n"
-"PO-Revision-Date: 2014-04-11 00:33+0100\n"
+"PO-Revision-Date: 2014-04-11 15:12+0100\n"
 "Last-Translator: Jean-Pierre Chrétien <jeanpierre.chret...@free.fr>\n"
 "Language-Team: lyxfr\n"
 "Language: fr\n"
@@ -6822,7 +6822,7 @@ msgstr "fig."
 #: lib/layouts/stdsections.inc:60
 #: lib/layouts/stdsections.inc:88
 msgid "Short Title|S"
-msgstr "Titre court|T"
+msgstr "Titre court"
 
 #: lib/layouts/aastex.layout:533
 msgid "The caption as it appears in the list of figures"

[LyX/master] * fr/linguistics.lyx: Update from Jean-Pierre Chretien

[Vincent van Ravesteijn]

commit cafe6c60f3a6defb3c2369d70bb64ddc0838032d
Author: Vincent van Ravesteijn <v...@lyx.org>
Date:   Fri Apr 11 21:00:28 2014 +0200

* fr/linguistics.lyx: Update from Jean-Pierre Chretien

diff --git a/lib/examples/fr/linguistics.lyx b/lib/examples/fr/linguistics.lyx
index e91abf4..4085924 100644
--- a/lib/examples/fr/linguistics.lyx
+++ b/lib/examples/fr/linguistics.lyx
@@ -809,13 +809,13 @@ textwidth
 
 \end_deeper
 \begin_layout Section
-Tableaux résultant de la théorie de l'optimalité (TO)
+Tableaux résultant de la théorie de l'optimalité (OT en anglais)
 \end_layout
 
 \begin_layout Standard
-Un tableau TO peut bien évidemment être inséré comme un tableau ordinaire
- (pour ce qui concerne les saisies spécifiques comme les lignes tiretées
- et les cellules ombrées, voir le manuel 
+Un tableau de ce type peut bien évidemment être inséré comme un tableau
+ ordinaire (pour ce qui concerne les saisies spécifiques comme les lignes
+ tiretées et les cellules ombrées, voir le manuel 
 \emph on
 Objets
 \emph default
@@ -827,7 +827,7 @@ insérés
  Cependant, vous pouvez souhaiter numéroter ces tableaux à part dans le
  document, avec une 
 \emph on
-Liste des tableaux TO
+Liste des tableaux
 \emph default
 , semblable à la 
 \emph on
@@ -1128,7 +1128,7 @@ a.ti.kap
 \begin_inset Caption Standard
 
 \begin_layout Plain Layout
-Exemple tableau (TO)
+Exemple de tableau utilisé dans la théorie de l'optimalité
 \end_layout
 
 \end_inset
@@ -1145,7 +1145,7 @@ Exemple tableau (TO)
 Noter que, de manière implicite, la légende est toujours placée au-dessous
  des tableaux dans le résultat imprimé, quel que soit le positionnement
  choisi dans la fenêtre LyX.
- Pour mettre les légendes des tableaux (TO) au-dessus, insérer le code suivant
+ Pour mettre les légendes des tableaux au-dessus, insérer le code suivant
  dans 
 \family sans
 Document\SpecialChar \menuseparator
@@ -1187,14 +1187,26 @@ restylefloat{tableau}
 \begin_layout Standard
 Un insert pour la 
 \emph on
-Liste des tableaux (TO)
+Liste des tableaux 
 \emph default
- est accessible via 
+est accessible via 
 \family sans
 Insertion\SpecialChar \menuseparator
 Listes & TdM
 \family default
-.
+ (il y a deux occurrences dans le menu, c'est la seconde qui est la bonne
+ en principe
+\begin_inset Foot
+status collapsed
+
+\begin_layout Plain Layout
+Au cas où vous auriez en même temps des tableaux ordinaires et des tableaux
+ linguistiques, il vous faudra lever l’ambiguïté en modifiant l'un des 
intitulés
+\end_layout
+
+\end_inset
+
+).
  Bien que celle-ci soit placée d'habitude au début ou à la fin du document,
  nous l'insérons ici à titre d'exemple:
 \end_layout

[LyX/master] * EmbeddedObjects.lyx: Increase version number

[Vincent van Ravesteijn]

commit c9dd2d4624da4491b634259cc862afc8166fee71
Author: Vincent van Ravesteijn <v...@lyx.org>
Date:   Fri Apr 11 21:16:36 2014 +0200

* EmbeddedObjects.lyx: Increase version number

diff --git a/lib/doc/EmbeddedObjects.lyx b/lib/doc/EmbeddedObjects.lyx
index ee0c4a4..9c11df3 100644
--- a/lib/doc/EmbeddedObjects.lyx
+++ b/lib/doc/EmbeddedObjects.lyx
@@ -296,7 +296,7 @@ author: Uwe Stöhr
 
 
 \family sans
-Version 2.0.x
+Version 2.1.x
 \end_layout
 
 \begin_layout Standard
diff --git a/lib/doc/de/EmbeddedObjects.lyx b/lib/doc/de/EmbeddedObjects.lyx
index 524eb63..1ad45e5 100644
--- a/lib/doc/de/EmbeddedObjects.lyx
+++ b/lib/doc/de/EmbeddedObjects.lyx
@@ -314,7 +314,7 @@ Autor: Uwe Stöhr <uwesto...@web.de>
 
 
 \family sans
-Version 2.0.x
+Version 2.1.x
 \end_layout
 
 \begin_layout Standard
diff --git a/lib/doc/es/EmbeddedObjects.lyx b/lib/doc/es/EmbeddedObjects.lyx
index b379108..69ff18a 100644
--- a/lib/doc/es/EmbeddedObjects.lyx
+++ b/lib/doc/es/EmbeddedObjects.lyx
@@ -310,7 +310,7 @@ Traducción de: Ignacio García
 
 
 \family sans
-Versión 2.0.x
+Versión 2.1.x
 \end_layout
 
 \begin_layout Standard

[LyX/master] Update lib/layouttranslations

[Vincent van Ravesteijn]

commit 777b8f7133ee1781489d87767f109ca8abcef912
Author: Vincent van Ravesteijn <v...@lyx.org>
Date:   Fri Apr 11 21:33:09 2014 +0200

Update lib/layouttranslations

Italian translations were updated

diff --git a/lib/layouttranslations b/lib/layouttranslations
index 658729a..5a08733 100644
--- a/lib/layouttranslations
+++ b/lib/layouttranslations
@@ -720,11 +720,11 @@ Translation it
"Example" "Esempio"
"Exercise" "Esercizio"
"Fact" "Fatto"
-   "Graph[[mathematical]]" "Grafico"
+   "Graph[[mathematical]]" "Grafo"
"Lemma" "Lemma"
"List of Algorithms" "Elenco degli algoritmi"
"List of Charts" "Elenco dei diagrammi"
-   "List of Graphs[[mathematical]]" "Elenco dei grafici"
+   "List of Graphs[[mathematical]]" "Elenco dei grafi"
"List of Schemes" "Elenco degli schemi"
"List of Tableaux" "Elenco dei tableau"
"Listing" "Listato"

[LyX/master] * zh_CN.po: Translate List of Listings

[Vincent van Ravesteijn]

commit e67b3c347e4cc16056452c6d6280041e954abf81
Author: Vincent van Ravesteijn v...@lyx.org
Date:   Wed Apr 9 21:48:12 2014 +0200

* zh_CN.po: Translate List of Listings

diff --git a/lib/layouttranslations b/lib/layouttranslations
index 75630c6..82b0220 100644
--- a/lib/layouttranslations
+++ b/lib/layouttranslations
@@ -1380,7 +1380,7 @@ Translation zh_CN
List of Schemes 方案列表
List of Tableaux 场景列表
Listing 列表
-   Listings[[List of Listings]] Listings
+   Listings[[List of Listings]] 列表列表
Notation 记号
Note 备忘
Problem 问题
diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo
index 46ccc9b..5c9206d 100644
Binary files a/po/zh_CN.gmo and b/po/zh_CN.gmo differ
diff --git a/po/zh_CN.po b/po/zh_CN.po
index c4e8e81..a0dae15 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -12896,9 +12896,8 @@ msgid ERT
 msgstr ERT
 
 #: lib/layouts/stdinsets.inc:227 lib/layouts/stdinsets.inc:233
-#, fuzzy
 msgid Listings[[List of Listings]]
-msgstr 程序列表
+msgstr 列表列表
 
 #: lib/layouts/stdinsets.inc:259 src/frontends/qt4/GuiDocument.cpp:1418
 #, fuzzy

[LyX/2.0.x] * nn.po: Update from Ingar Pareliussen

[Vincent van Ravesteijn]

commit a22cf772d4a39f0e9b577f8aa2a599d4ac54cb5a
Author: Vincent van Ravesteijn v...@lyx.org
Date:   Thu Apr 10 21:37:53 2014 +0200

* nn.po: Update from Ingar Pareliussen

diff --git a/po/nn.po b/po/nn.po
index 1cef379..4fdb88c 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -4,20 +4,20 @@
 #
 # Lars Gullik Bjønnes lar...@lyx.org, 1999.
 # Ingar Pareliussen ingar.parelius...@samfundet.no, 2003,2005,2006, 2006, 
2007, 2010.
-# Ingar Pareliussen ingar.pareliussen@_dmmh_no, 2010, 2011, 2012, 2013.
+# Ingar Pareliussen ingar.pareliussen@_dmmh_no, 2010, 2011, 2012, 2013, 2014.
 msgid 
 msgstr 
 Project-Id-Version: nn\n
 Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n
 POT-Creation-Date: 2014-03-25 11:04-0400\n
-PO-Revision-Date: 2013-11-24 18:57+0100\n
-Last-Translator: ingar Pareliussen\n
+PO-Revision-Date: 2014-04-09 18:20+0200\n
+Last-Translator: \n
 Language-Team: Norwegian Nynorsk i18n...@lister.ping.uio.no\n
 Language: nn\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
 Content-Transfer-Encoding: 8bit\n
-X-Generator: Lokalize 1.4\n
+X-Generator: Lokalize 1.5\n
 Plural-Forms: nplurals=2; plural=(n != 1);\n
 X-Language: nn_NO\n
 X-Source-Language: C\n
@@ -22268,6 +22268,8 @@ msgid 
 The file name '%1$s' is invalid!\n
 Aborting import.
 msgstr 
+Filnamnet '%1$s'  er ugyldig!\n
+Avbryt import.
 
 #: src/frontends/qt4/GuiView.cpp:2141 src/frontends/qt4/GuiView.cpp:2305
 #, c-format

[LyX/master] * nl.po: Improve translation of Graph [[mathematical]]

[Vincent van Ravesteijn]

commit a79e161f510a658dfec11386eee15c2b28de22fb
Author: Vincent van Ravesteijn v...@lyx.org
Date:   Thu Apr 10 22:03:05 2014 +0200

* nl.po: Improve translation of Graph [[mathematical]]

diff --git a/lib/layouttranslations b/lib/layouttranslations
index 911bf7d..4687f03 100644
--- a/lib/layouttranslations
+++ b/lib/layouttranslations
@@ -880,11 +880,11 @@ Translation nl
Example Voorbeeld
Exercise Oefening
Fact Feit
-   Graph[[mathematical]] Grafiek
+   Graph[[mathematical]] Graaf
Lemma Lemma
List of Algorithms Lijst van Algoritmen
List of Charts Lijst van Diagrammen
-   List of Graphs[[mathematical]] Lijst van Grafieken
+   List of Graphs[[mathematical]] Lijst van Grafen
List of Schemes Lijst van Schema's
List of Tableaux Lijst van Tableaus
Listing Listing
diff --git a/po/nl.gmo b/po/nl.gmo
index 8dd4121..2d25510 100644
Binary files a/po/nl.gmo and b/po/nl.gmo differ
diff --git a/po/nl.po b/po/nl.po
index 247e850..8fd229a 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6262,11 +6262,11 @@ msgstr Lijst van Diagrammen
 
 #: lib/layouts/achemso.layout:209 lib/layouts/achemso.layout:220
 msgid Graph[[mathematical]]
-msgstr Grafiek
+msgstr Graaf
 
 #: lib/layouts/achemso.layout:214
 msgid List of Graphs[[mathematical]]
-msgstr Lijst van Grafieken
+msgstr Lijst van Grafen
 
 #: lib/layouts/achemso.layout:248
 msgid SupplementalInfo

[LyX/master] Fix nn.po such that the statistic update script works

[Vincent van Ravesteijn]

commit 38c0dc701fe064baa05572423ab7941259c27fbf
Author: Vincent van Ravesteijn v...@lyx.org
Date:   Thu Apr 10 22:26:09 2014 +0200

Fix nn.po such that the statistic update script works

diff --git a/po/nn.po b/po/nn.po
index e3bf7cb..6cc2bc8 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -11,7 +11,7 @@ msgstr 
 Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n
 POT-Creation-Date: 2013-11-10 15:41+0100\n
 PO-Revision-Date: 2014-01-24 19:33+0100\n
-Last-Translator: ingar Pareliussen\n
+Last-Translator: Ingar Pareliussen \n
 Language-Team: Norwegian Nynorsk i18n...@lister.ping.uio.no\n
 Language: nn\n
 MIME-Version: 1.0\n

[LyX/master] Release notes: Remove entry about BibTeX errors

[Vincent van Ravesteijn]

commit 0c1a0b603819cbe7cda72a74e7313a215aeba913
Author: Vincent van Ravesteijn v...@lyx.org
Date:   Thu Apr 10 22:22:05 2014 +0200

Release notes: Remove entry about BibTeX errors

This feature has been disabled for this release.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index d623a32..f680014 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -229,9 +229,3 @@ Caveats when upgrading from earlier versions to 2.1.x
   on remote X connections and we provide the \\use_qimage preference
   variable, which brings back the old way of painting (when set to false).
 
-- BibTeX errors are now processed and cause the document to fail
-  compilation. Before, these errors were ignored, which means that it 
-  may happen that documents that did compile with a previous version
-  do not compile anymore with LyX 2.1.x. To solve this, one needs to 
-  fix the offending BibTeX errors in the document.
-

[LyX/master] Update ANNOUNCE

[Vincent van Ravesteijn]

commit 8fc37519ccb6a6ff80f65d0cdc36fabdd72531b1
Author: Vincent van Ravesteijn v...@lyx.org
Date:   Thu Apr 10 22:32:36 2014 +0200

Update ANNOUNCE

diff --git a/ANNOUNCE b/ANNOUNCE
index 86a2c7e..9b6c1a0 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,19 +1,16 @@
-Public release of LyX version 2.1.0rc1
+Public release of LyX version 2.1.0
 
 
-We are proud to announce the first release candidate of the new
-LyX 2.1 series.
+We are proud to announce the release candidate of LyX 2.1.0.
 
 With this release, LyX celebrates 18 years of existence. The 2.1 series
 has a rich set of new features compared to the current stable series.
 
-LyX 2.1.0rc1 is the culmination of three years of hard work.
-This release is meant for testing before we actually release LyX 2.1.
-
-An overview of the new features can be found here:
+LyX 2.1.0 is the culmination of three years of hard work. An overview
+of the new features can be found here:
   http://wiki.lyx.org/LyX/NewInLyX21
 
-You can download LyX 2.1.0rc1 from ftp://ftp.lyx.org/pub/lyx/devel/.
+You can download LyX 2.1.0 from http://www.lyx.org/Download.
 
 We hope you will enjoy the result!
 
@@ -22,8 +19,8 @@ to the current stable releases (LyX 2.0.x). We strongly 
recommend that
 packagers of LyX on various platforms and distributions read this file.
 
 As with any major release, this one comes with lot of new features but 
-also some bugs. If you think you have found a bug in LyX 2.1.0rc1,
-either email the LyX developers' mailing list (lyx-devel at lists.lyx.org),
+also some bugs. If you think you have found a bug in LyX 2.1.0, either
+email the LyX developers' mailing list (lyx-devel at lists.lyx.org),
 or open a bug report at http://www.lyx.org/trac/wiki/BugTrackerHome.
 
 If you have trouble using LyX or have a question, consult the

[LyX/master] Update INSTALL

[Vincent van Ravesteijn]

commit 30d1cf47c18bf938e6be3e3fd45a3115cff435c1
Author: Vincent van Ravesteijn v...@lyx.org
Date:   Thu Apr 10 22:35:32 2014 +0200

Update INSTALL

diff --git a/INSTALL b/INSTALL
index 17592e1..6202ee8 100644
--- a/INSTALL
+++ b/INSTALL
@@ -37,8 +37,7 @@ Note for Git checkouts
 
 If you have checked this out from Git, you need to have:
 * automake = 1.8
-* autoconf = 2.59d
-* gettext = 0.16.1
+* autoconf = 2.60
 Then type ./autogen.sh to build the needed configuration
 files and proceed as stated above/below.
 
@@ -67,12 +66,6 @@ libraries. See the RELEASE-NOTES for details.
 
 * Other things to note
 
-If you make modifications to files in src/ (for example by applying a
-patch), you will need to have the GNU gettext package installed, due
-to some dependencies in the makefiles. You can get the latest version
-from:
-   ftp://ftp.gnu.org/gnu/gettext/
-
 The two following programs should be available at configuration time:
 
   o LaTeX2e should be correctly setup for the user you are logged in

Re: [LyX/master] Update INSTALL

[Vincent van Ravesteijn]

Op 10 apr. 2014 22:42 schreef Jean-Marc Lasgouttes lasgout...@lyx.org:

 Le 10/04/14 22:37, Vincent van Ravesteijn a écrit :

   * Other things to note

 -If you make modifications to files in src/ (for example by applying a
 -patch), you will need to have the GNU gettext package installed, due
 -to some dependencies in the makefiles. You can get the latest version
 -from:
 -   ftp://ftp.gnu.org/gnu/gettext/


 Are you sure? I think I left this part because of the gettext tools that
create the .gmo files. I agree though that the description as it was is not
really useful.

 JMarc


If you change the translations and want them to have effect you need
gettext.. would be more appropriate then ?

Vincent

[LyX/master] * zh_CN.po: Translate "List of Listings"

[Vincent van Ravesteijn]

commit e67b3c347e4cc16056452c6d6280041e954abf81
Author: Vincent van Ravesteijn <v...@lyx.org>
Date:   Wed Apr 9 21:48:12 2014 +0200

* zh_CN.po: Translate "List of Listings"

diff --git a/lib/layouttranslations b/lib/layouttranslations
index 75630c6..82b0220 100644
--- a/lib/layouttranslations
+++ b/lib/layouttranslations
@@ -1380,7 +1380,7 @@ Translation zh_CN
"List of Schemes" "方案列表"
"List of Tableaux" "场景列表"
"Listing" "列表"
-   "Listings[[List of Listings]]" "Listings"
+   "Listings[[List of Listings]]" "列表列表"
"Notation" "记号"
"Note" "备忘"
"Problem" "问题"
diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo
index 46ccc9b..5c9206d 100644
Binary files a/po/zh_CN.gmo and b/po/zh_CN.gmo differ
diff --git a/po/zh_CN.po b/po/zh_CN.po
index c4e8e81..a0dae15 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -12896,9 +12896,8 @@ msgid "ERT"
 msgstr "ERT"
 
 #: lib/layouts/stdinsets.inc:227 lib/layouts/stdinsets.inc:233
-#, fuzzy
 msgid "Listings[[List of Listings]]"
-msgstr "程序列表"
+msgstr "列表列表"
 
 #: lib/layouts/stdinsets.inc:259 src/frontends/qt4/GuiDocument.cpp:1418
 #, fuzzy

[LyX/2.0.x] * nn.po: Update from Ingar Pareliussen

[Vincent van Ravesteijn]

commit a22cf772d4a39f0e9b577f8aa2a599d4ac54cb5a
Author: Vincent van Ravesteijn <v...@lyx.org>
Date:   Thu Apr 10 21:37:53 2014 +0200

* nn.po: Update from Ingar Pareliussen

diff --git a/po/nn.po b/po/nn.po
index 1cef379..4fdb88c 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -4,20 +4,20 @@
 #
 # Lars Gullik Bjønnes <lar...@lyx.org>, 1999.
 # Ingar Pareliussen <ingar.parelius...@samfundet.no>, 2003,2005,2006, 2006, 
2007, 2010.
-# Ingar Pareliussen <ingar.pareliussen@_dmmh_no>, 2010, 2011, 2012, 2013.
+# Ingar Pareliussen <ingar.pareliussen@_dmmh_no>, 2010, 2011, 2012, 2013, 2014.
 msgid ""
 msgstr ""
 "Project-Id-Version: nn\n"
 "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n"
 "POT-Creation-Date: 2014-03-25 11:04-0400\n"
-"PO-Revision-Date: 2013-11-24 18:57+0100\n"
-"Last-Translator: ingar Pareliussen\n"
+"PO-Revision-Date: 2014-04-09 18:20+0200\n"
+"Last-Translator: \n"
 "Language-Team: Norwegian Nynorsk <i18n...@lister.ping.uio.no>\n"
 "Language: nn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.4\n"
+"X-Generator: Lokalize 1.5\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Language: nn_NO\n"
 "X-Source-Language: C\n"
@@ -22268,6 +22268,8 @@ msgid ""
 "The file name '%1$s' is invalid!\n"
 "Aborting import."
 msgstr ""
+"Filnamnet '%1$s'  er ugyldig!\n"
+"Avbryt import."
 
 #: src/frontends/qt4/GuiView.cpp:2141 src/frontends/qt4/GuiView.cpp:2305
 #, c-format

[LyX/master] * nl.po: Improve translation of Graph [[mathematical]]

[Vincent van Ravesteijn]

commit a79e161f510a658dfec11386eee15c2b28de22fb
Author: Vincent van Ravesteijn <v...@lyx.org>
Date:   Thu Apr 10 22:03:05 2014 +0200

* nl.po: Improve translation of Graph [[mathematical]]

diff --git a/lib/layouttranslations b/lib/layouttranslations
index 911bf7d..4687f03 100644
--- a/lib/layouttranslations
+++ b/lib/layouttranslations
@@ -880,11 +880,11 @@ Translation nl
"Example" "Voorbeeld"
"Exercise" "Oefening"
"Fact" "Feit"
-   "Graph[[mathematical]]" "Grafiek"
+   "Graph[[mathematical]]" "Graaf"
"Lemma" "Lemma"
"List of Algorithms" "Lijst van Algoritmen"
"List of Charts" "Lijst van Diagrammen"
-   "List of Graphs[[mathematical]]" "Lijst van Grafieken"
+   "List of Graphs[[mathematical]]" "Lijst van Grafen"
"List of Schemes" "Lijst van Schema's"
"List of Tableaux" "Lijst van Tableaus"
"Listing" "Listing"
diff --git a/po/nl.gmo b/po/nl.gmo
index 8dd4121..2d25510 100644
Binary files a/po/nl.gmo and b/po/nl.gmo differ
diff --git a/po/nl.po b/po/nl.po
index 247e850..8fd229a 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6262,11 +6262,11 @@ msgstr "Lijst van Diagrammen"
 
 #: lib/layouts/achemso.layout:209 lib/layouts/achemso.layout:220
 msgid "Graph[[mathematical]]"
-msgstr "Grafiek"
+msgstr "Graaf"
 
 #: lib/layouts/achemso.layout:214
 msgid "List of Graphs[[mathematical]]"
-msgstr "Lijst van Grafieken"
+msgstr "Lijst van Grafen"
 
 #: lib/layouts/achemso.layout:248
 msgid "SupplementalInfo"

[LyX/master] Fix nn.po such that the statistic update script works

[Vincent van Ravesteijn]

commit 38c0dc701fe064baa05572423ab7941259c27fbf
Author: Vincent van Ravesteijn <v...@lyx.org>
Date:   Thu Apr 10 22:26:09 2014 +0200

Fix nn.po such that the statistic update script works

diff --git a/po/nn.po b/po/nn.po
index e3bf7cb..6cc2bc8 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -11,7 +11,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n"
 "POT-Creation-Date: 2013-11-10 15:41+0100\n"
 "PO-Revision-Date: 2014-01-24 19:33+0100\n"
-"Last-Translator: ingar Pareliussen\n"
+"Last-Translator: Ingar Pareliussen <>\n"
 "Language-Team: Norwegian Nynorsk <i18n...@lister.ping.uio.no>\n"
 "Language: nn\n"
 "MIME-Version: 1.0\n"

[LyX/master] Release notes: Remove entry about BibTeX errors

[Vincent van Ravesteijn]

commit 0c1a0b603819cbe7cda72a74e7313a215aeba913
Author: Vincent van Ravesteijn <v...@lyx.org>
Date:   Thu Apr 10 22:22:05 2014 +0200

Release notes: Remove entry about BibTeX errors

This feature has been disabled for this release.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index d623a32..f680014 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -229,9 +229,3 @@ Caveats when upgrading from earlier versions to 2.1.x
   on remote X connections and we provide the \\use_qimage preference
   variable, which brings back the old way of painting (when set to false).
 
-- BibTeX errors are now processed and cause the document to fail
-  compilation. Before, these errors were ignored, which means that it 
-  may happen that documents that did compile with a previous version
-  do not compile anymore with LyX 2.1.x. To solve this, one needs to 
-  fix the offending BibTeX errors in the document.
-

[LyX/master] Update ANNOUNCE

[Vincent van Ravesteijn]

commit 8fc37519ccb6a6ff80f65d0cdc36fabdd72531b1
Author: Vincent van Ravesteijn <v...@lyx.org>
Date:   Thu Apr 10 22:32:36 2014 +0200

Update ANNOUNCE

diff --git a/ANNOUNCE b/ANNOUNCE
index 86a2c7e..9b6c1a0 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,19 +1,16 @@
-Public release of LyX version 2.1.0rc1
+Public release of LyX version 2.1.0
 
 
-We are proud to announce the first release candidate of the new
-LyX 2.1 series.
+We are proud to announce the release candidate of LyX 2.1.0.
 
 With this release, LyX celebrates 18 years of existence. The 2.1 series
 has a rich set of new features compared to the current stable series.
 
-LyX 2.1.0rc1 is the culmination of three years of hard work.
-This release is meant for testing before we actually release LyX 2.1.
-
-An overview of the new features can be found here:
+LyX 2.1.0 is the culmination of three years of hard work. An overview
+of the new features can be found here:
   http://wiki.lyx.org/LyX/NewInLyX21
 
-You can download LyX 2.1.0rc1 from ftp://ftp.lyx.org/pub/lyx/devel/.
+You can download LyX 2.1.0 from http://www.lyx.org/Download.
 
 We hope you will enjoy the result!
 
@@ -22,8 +19,8 @@ to the current stable releases (LyX 2.0.x). We strongly 
recommend that
 packagers of LyX on various platforms and distributions read this file.
 
 As with any major release, this one comes with lot of new features but 
-also some bugs. If you think you have found a bug in LyX 2.1.0rc1,
-either email the LyX developers' mailing list (lyx-devel at lists.lyx.org),
+also some bugs. If you think you have found a bug in LyX 2.1.0, either
+email the LyX developers' mailing list (lyx-devel at lists.lyx.org),
 or open a bug report at http://www.lyx.org/trac/wiki/BugTrackerHome.
 
 If you have trouble using LyX or have a question, consult the

[LyX/master] Update INSTALL

[Vincent van Ravesteijn]

commit 30d1cf47c18bf938e6be3e3fd45a3115cff435c1
Author: Vincent van Ravesteijn <v...@lyx.org>
Date:   Thu Apr 10 22:35:32 2014 +0200

Update INSTALL

diff --git a/INSTALL b/INSTALL
index 17592e1..6202ee8 100644
--- a/INSTALL
+++ b/INSTALL
@@ -37,8 +37,7 @@ Note for Git checkouts
 
 If you have checked this out from Git, you need to have:
 * automake >= 1.8
-* autoconf >= 2.59d
-* gettext >= 0.16.1
+* autoconf >= 2.60
 Then type "./autogen.sh" to build the needed configuration
 files and proceed as stated above/below.
 
@@ -67,12 +66,6 @@ libraries. See the RELEASE-NOTES for details.
 
 * Other things to note
 
-If you make modifications to files in src/ (for example by applying a
-patch), you will need to have the GNU gettext package installed, due
-to some dependencies in the makefiles. You can get the latest version
-from:
-   ftp://ftp.gnu.org/gnu/gettext/
-
 The two following programs should be available at configuration time:
 
   o LaTeX2e should be correctly setup for the user you are logged in

Re: [LyX/master] Update INSTALL

[Vincent van Ravesteijn]

Op 10 apr. 2014 22:42 schreef "Jean-Marc Lasgouttes" <lasgout...@lyx.org>:
>
> Le 10/04/14 22:37, Vincent van Ravesteijn a écrit :
>
>>   * Other things to note
>>
>> -If you make modifications to files in src/ (for example by applying a
>> -patch), you will need to have the GNU gettext package installed, due
>> -to some dependencies in the makefiles. You can get the latest version
>> -from:
>> -   ftp://ftp.gnu.org/gnu/gettext/
>
>
> Are you sure? I think I left this part because of the gettext tools that
create the .gmo files. I agree though that the description as it was is not
really useful.
>
> JMarc
>

"If you change the translations and want them to have effect you need
gettext.". would be more appropriate then ?

Vincent

Re: [LyX/master] * layouttranslations.review - review of all langs.

[Vincent van Ravesteijn]

On Wed, Apr 9, 2014 at 6:34 AM, Pavel Sanda sa...@lyx.org wrote:
 commit 7b48843c778a8f9c97bc676d01ad549579014060
 Author: Pavel Sanda sa...@lyx.org
 Date:   Tue Apr 8 21:33:13 2014 -0700

 * layouttranslations.review - review of all langs.

 This list is hard to get exactly, but tried my best according
 to git blame  knowledge of translators.

 diff --git a/lib/layouttranslations.review b/lib/layouttranslations.review
 index 82c9f73..dcb9828 100644
 --- a/lib/layouttranslations.review
 +++ b/lib/layouttranslations.review
 @@ -16,14 +16,30 @@ tr


  
 -Before LyX 2.1.0 release these strings should be reviewed again by the 
 translators:
 +(8.4.2014, LyX 2.1.0 release)

 -all languages (even the ones with additional strings below):
 +Additionally to the top ones, these languages should be reviewed for the 
 following strings:
  Property
  Solution
  Listing
  Listings

 +da
 +el
 +eu
 +fi
 +gl
 +he
 +hu
 +id
 +nn
 +pt
 +pt_BR
 +ro
 +sk

Kornel has reviewed Slovak, so this can be removed.

Vincent

[LyX/master] Disable the languages Urdu and Syriac

[Vincent van Ravesteijn]

commit cf9c7ad108fbcb9c58cad89947b7e8e0f717c8a8
Author: Vincent van Ravesteijn v...@lyx.org
Date:   Wed Apr 9 18:23:50 2014 +0200

Disable the languages Urdu and Syriac

At the moment these languages are unusable because the characters on
screen do not appear in their contextual forms.

diff --git a/lib/languages b/lib/languages
index 3fe5b8f..0572289 100644
--- a/lib/languages
+++ b/lib/languages
@@ -883,13 +883,13 @@ Language swedish
 End
 
 # not supported by babel
-Language syriac
-   GuiName  Syriac
-   PolyglossiaName  syriac
-   Encoding utf8
-   RTL  true
-   LangCode syr_SY
-End
+#Language syriac
+#  GuiName  Syriac
+#  PolyglossiaName  syriac
+#  Encoding utf8
+#  RTL  true
+#  LangCode syr_SY
+#End
 
 # not supported by babel
 Language tamil
@@ -970,13 +970,13 @@ Language uppersorbian
 End
 
 # not supported by babel
-Language urdu
-   GuiName  Urdu
-   PolyglossiaName  urdu
-   Encoding utf8
-   RTL  true
-   LangCode ur_PK
-End
+#Language urdu
+#  GuiName  Urdu
+#  PolyglossiaName  urdu
+#  Encoding utf8
+#  RTL  true
+#  LangCode ur_PK
+#End
 
 # vietnam must be loaded locally with babel options,
 # not globally via class options, see

[LyX/master] Fix the languages entry for Urdu and Syriac

[Vincent van Ravesteijn]

commit 2c6264d0b0499caf486e60eda8f8534991562012
Author: Vincent van Ravesteijn v...@lyx.org
Date:   Wed Apr 9 18:21:54 2014 +0200

Fix the languages entry for Urdu and Syriac

diff --git a/lib/languages b/lib/languages
index 3ce6239..3fe5b8f 100644
--- a/lib/languages
+++ b/lib/languages
@@ -887,6 +887,7 @@ Language syriac
GuiName  Syriac
PolyglossiaName  syriac
Encoding utf8
+   RTL  true
LangCode syr_SY
 End
 
@@ -973,6 +974,7 @@ Language urdu
GuiName  Urdu
PolyglossiaName  urdu
Encoding utf8
+   RTL  true
LangCode ur_PK
 End
 

[LyX/master] Update layouttranslations

[Vincent van Ravesteijn]

commit 5ac5897198b5d5ede66f8d4bf3aa4172b60259cb
Author: Vincent van Ravesteijn v...@lyx.org
Date:   Wed Apr 9 20:30:15 2014 +0200

Update layouttranslations

This string was not picked up by the script to generate the 
layouttranslations file. After deleting the file and re-running the script, 
this string was picked up.

diff --git a/lib/layouttranslations b/lib/layouttranslations
index bdc5560..aae75c8 100644
--- a/lib/layouttranslations
+++ b/lib/layouttranslations
@@ -193,7 +193,7 @@ Translation da
Listing Listing
Listings[[List of Listings]] Listings
Notation Notation
-   Note Notat
+   Note Note
Problem Problem
Proof Bevis
Property Property

[LyX/master] * nl.po : Update from Vincent van Ravesteijn

[Vincent van Ravesteijn]

commit 6dee93f26b5cd3221306345a580fec738d1035d3
Author: Vincent van Ravesteijn v...@lyx.org
Date:   Wed Apr 9 19:27:39 2014 +0200

* nl.po : Update from Vincent van Ravesteijn

diff --git a/lib/layouttranslations b/lib/layouttranslations
index aae75c8..75630c6 100644
--- a/lib/layouttranslations
+++ b/lib/layouttranslations
@@ -869,26 +869,26 @@ Translation nl
Assumption Aanname
Axiom Axioma
Case Geval
-   Chart Grafiek
+   Chart Diagram
Claim Bewering
Conclusion Conclusie
Condition Voorwaarde
Conjecture Vermoeden
-   Corollary Gevolg
-   Criterion Kriterium
+   Corollary Corollarium
+   Criterion Criterium
Definition Definitie
Example Voorbeeld
Exercise Oefening
Fact Feit
Graph Grafiek
Lemma Lemma
-   List of Algorithms Algoritmelijst
-   List of Charts Kaartenlijst
-   List of Graphs Grafiekenlijst
-   List of Schemes Schema-lijst
+   List of Algorithms Lijst van Algoritmen
+   List of Charts Lijst van Diagrammen
+   List of Graphs Lijst van Grafieken
+   List of Schemes Lijst van Schema's
List of Tableaux Lijst van Tableaus
-   Listing Opsomming
-   Listings[[List of Listings]] Listings
+   Listing Listing
+   Listings[[List of Listings]] Lijst van Listings
Notation Notatie
Note Noot
Problem Opgave
diff --git a/lib/layouttranslations.review b/lib/layouttranslations.review
index 5e628e7..7110c35 100644
--- a/lib/layouttranslations.review
+++ b/lib/layouttranslations.review
@@ -41,10 +41,7 @@ new or changed translations for individual languages:
 nb: Chart, Exercise, Graph, List of Algorithms, List of Charts,
 List of Graphs, List of Schemes, List of Tableaux, Note, Scheme,
 Tableau
-nl: Acknowledgement, Case, Chart, (same translation as Graph) Claim,
-Condition, Conjecture, Corollary, Criterion, Graph,
-List of Algorithms, List of Charts, List of Graphs,
-List of Schemes, Note, Problem, Proposition, Theorem
+
 zh_CN: Assumption, Axiom, Case, Claim, Corollary, Criterion,
Example, Fact, List of Schemes, List of Tableaux, Notation,
Proposition, Remark, Scheme, Summary, Tableau
diff --git a/po/nl.gmo b/po/nl.gmo
index fcbd6dd..8dd4121 100644
Binary files a/po/nl.gmo and b/po/nl.gmo differ
diff --git a/po/nl.po b/po/nl.po
index 8f19538..8a0ab54 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -2237,7 +2237,7 @@ msgstr Resultatenvenster
 #: lib/layouts/stdinsets.inc:253 src/insets/InsetCaption.cpp:389
 #: src/insets/InsetListings.cpp:365 src/insets/InsetListings.cpp:367
 msgid Listing
-msgstr Opsomming
+msgstr Listing
 
 #: src/frontends/qt4/ui/ListingsUi.ui:23
 msgid Main Settings
@@ -6250,16 +6250,15 @@ msgstr Schema
 
 #: lib/layouts/achemso.layout:170
 msgid List of Schemes
-msgstr Schema-lijst
+msgstr Lijst van Schema's
 
 #: lib/layouts/achemso.layout:187 lib/layouts/achemso.layout:198
-#, fuzzy
 msgid Chart
-msgstr Grafiek
+msgstr Diagram
 
 #: lib/layouts/achemso.layout:192
 msgid List of Charts
-msgstr Kaartenlijst
+msgstr Lijst van Diagrammen
 
 #: lib/layouts/achemso.layout:209 lib/layouts/achemso.layout:220
 msgid Graph
@@ -6267,7 +6266,7 @@ msgstr Grafiek
 
 #: lib/layouts/achemso.layout:214
 msgid List of Graphs
-msgstr Grafiekenlijst
+msgstr Lijst van Grafieken
 
 #: lib/layouts/achemso.layout:248
 msgid SupplementalInfo
@@ -6719,7 +6718,7 @@ msgstr Vermoeden
 #: lib/layouts/theorems-chap-bytype.module:66
 #: lib/layouts/theorems-sec-bytype.module:62
 msgid Corollary
-msgstr Gevolg
+msgstr Corollarium
 
 #: lib/layouts/AEA.layout:215 lib/layouts/elsart.layout:351
 #: lib/layouts/theorems-ams-extended-bytype.module:60
@@ -6733,7 +6732,7 @@ msgstr Gevolg
 #: lib/layouts/theorems-ams-extended.module:62
 #: lib/layouts/theorems-ams-extended.module:65
 msgid Criterion
-msgstr Kriterium
+msgstr Criterium
 
 #: lib/layouts/AEA.layout:223 lib/layouts/beamer.layout:1185
 #: lib/layouts/elsart.layout:365 lib/layouts/foils.layout:267
@@ -11326,7 +11325,7 @@ msgstr 
 #: lib/layouts/powerdot.layout:530 lib/layouts/stdfloats.inc:46
 #: lib/layouts/algorithm2e.module:20
 msgid List of Algorithms
-msgstr Algoritmelijst
+msgstr Lijst van Algoritmen
 
 #: lib/layouts/powerdot.layout:569
 #, fuzzy
@@ -12822,7 +12821,7 @@ msgstr 
 #: lib/layouts/stdinsets.inc:227 lib/layouts/stdinsets.inc:233
 #, fuzzy
 msgid Listings[[List of Listings]]
-msgstr Lijst van programmacodes
+msgstr Lijst van Listings
 
 #: lib/layouts/stdinsets.inc:259 src/frontends/qt4/GuiDocument.cpp:1418
 #, fuzzy
@@ -16756,9 +16755,8 @@ msgid Table of Contents|C
 msgstr Inhoudsopgave|I
 
 #: lib/ui/stdmenus.inc:459
-#, fuzzy
 msgid List of Listings|L
-msgstr Lijst van programmacodes
+msgstr Lijst van Listings
 
 #: lib/ui/stdmenus.inc:460
 msgid Nomenclature|N
@@ -29300,7 +29298,7 @@ msgstr Niet-afbreekbare horizontale ruimte (%1$s)
 
 #: src/insets/InsetTOC.cpp:77
 msgid List of Listings
-msgstr Lijst van

Re: [LyX/master] * layouttranslations.review - review of all langs.

[Vincent van Ravesteijn]

On Wed, Apr 9, 2014 at 6:34 AM, Pavel Sanda  wrote:
> commit 7b48843c778a8f9c97bc676d01ad549579014060
> Author: Pavel Sanda 
> Date:   Tue Apr 8 21:33:13 2014 -0700
>
> * layouttranslations.review - review of all langs.
>
> This list is hard to get exactly, but tried my best according
> to git blame & knowledge of translators.
>
> diff --git a/lib/layouttranslations.review b/lib/layouttranslations.review
> index 82c9f73..dcb9828 100644
> --- a/lib/layouttranslations.review
> +++ b/lib/layouttranslations.review
> @@ -16,14 +16,30 @@ tr
>
>
>  
> -Before LyX 2.1.0 release these strings should be reviewed again by the 
> translators:
> +(8.4.2014, LyX 2.1.0 release)
>
> -all languages (even the ones with additional strings below):
> +Additionally to the top ones, these languages should be reviewed for the 
> following strings:
>  "Property"
>  "Solution"
>  "Listing"
>  "Listings"
>
> +da
> +el
> +eu
> +fi
> +gl
> +he
> +hu
> +id
> +nn
> +pt
> +pt_BR
> +ro
> +sk

Kornel has reviewed Slovak, so this can be removed.

Vincent

[LyX/master] Disable the languages Urdu and Syriac

[Vincent van Ravesteijn]

commit cf9c7ad108fbcb9c58cad89947b7e8e0f717c8a8
Author: Vincent van Ravesteijn <v...@lyx.org>
Date:   Wed Apr 9 18:23:50 2014 +0200

Disable the languages Urdu and Syriac

At the moment these languages are unusable because the characters on
screen do not appear in their contextual forms.

diff --git a/lib/languages b/lib/languages
index 3fe5b8f..0572289 100644
--- a/lib/languages
+++ b/lib/languages
@@ -883,13 +883,13 @@ Language swedish
 End
 
 # not supported by babel
-Language syriac
-   GuiName  "Syriac"
-   PolyglossiaName  syriac
-   Encoding utf8
-   RTL  true
-   LangCode syr_SY
-End
+#Language syriac
+#  GuiName  "Syriac"
+#  PolyglossiaName  syriac
+#  Encoding utf8
+#  RTL  true
+#  LangCode syr_SY
+#End
 
 # not supported by babel
 Language tamil
@@ -970,13 +970,13 @@ Language uppersorbian
 End
 
 # not supported by babel
-Language urdu
-   GuiName  "Urdu"
-   PolyglossiaName  urdu
-   Encoding utf8
-   RTL  true
-   LangCode ur_PK
-End
+#Language urdu
+#  GuiName  "Urdu"
+#  PolyglossiaName  urdu
+#  Encoding utf8
+#  RTL  true
+#  LangCode ur_PK
+#End
 
 # vietnam must be loaded locally with babel options,
 # not globally via class options, see

[LyX/master] Fix the languages entry for Urdu and Syriac

[Vincent van Ravesteijn]

commit 2c6264d0b0499caf486e60eda8f8534991562012
Author: Vincent van Ravesteijn <v...@lyx.org>
Date:   Wed Apr 9 18:21:54 2014 +0200

Fix the languages entry for Urdu and Syriac

diff --git a/lib/languages b/lib/languages
index 3ce6239..3fe5b8f 100644
--- a/lib/languages
+++ b/lib/languages
@@ -887,6 +887,7 @@ Language syriac
GuiName  "Syriac"
PolyglossiaName  syriac
Encoding utf8
+   RTL  true
LangCode syr_SY
 End
 
@@ -973,6 +974,7 @@ Language urdu
GuiName  "Urdu"
PolyglossiaName  urdu
Encoding utf8
+   RTL  true
LangCode ur_PK
 End
 

[LyX/master] Update layouttranslations

[Vincent van Ravesteijn]

commit 5ac5897198b5d5ede66f8d4bf3aa4172b60259cb
Author: Vincent van Ravesteijn <v...@lyx.org>
Date:   Wed Apr 9 20:30:15 2014 +0200

Update layouttranslations

This string was not picked up by the script to generate the 
layouttranslations file. After deleting the file and re-running the script, 
this string was picked up.

diff --git a/lib/layouttranslations b/lib/layouttranslations
index bdc5560..aae75c8 100644
--- a/lib/layouttranslations
+++ b/lib/layouttranslations
@@ -193,7 +193,7 @@ Translation da
"Listing" "Listing"
"Listings[[List of Listings]]" "Listings"
"Notation" "Notation"
-   "Note" "Notat"
+   "Note" "Note"
"Problem" "Problem"
"Proof" "Bevis"
"Property" "Property"

[LyX/master] * nl.po : Update from Vincent van Ravesteijn

[Vincent van Ravesteijn]

commit 6dee93f26b5cd3221306345a580fec738d1035d3
Author: Vincent van Ravesteijn <v...@lyx.org>
Date:   Wed Apr 9 19:27:39 2014 +0200

* nl.po : Update from Vincent van Ravesteijn

diff --git a/lib/layouttranslations b/lib/layouttranslations
index aae75c8..75630c6 100644
--- a/lib/layouttranslations
+++ b/lib/layouttranslations
@@ -869,26 +869,26 @@ Translation nl
"Assumption" "Aanname"
"Axiom" "Axioma"
"Case" "Geval"
-   "Chart" "Grafiek"
+   "Chart" "Diagram"
"Claim" "Bewering"
"Conclusion" "Conclusie"
"Condition" "Voorwaarde"
"Conjecture" "Vermoeden"
-   "Corollary" "Gevolg"
-   "Criterion" "Kriterium"
+   "Corollary" "Corollarium"
+   "Criterion" "Criterium"
"Definition" "Definitie"
"Example" "Voorbeeld"
"Exercise" "Oefening"
"Fact" "Feit"
"Graph" "Grafiek"
"Lemma" "Lemma"
-   "List of Algorithms" "Algoritmelijst"
-   "List of Charts" "Kaartenlijst"
-   "List of Graphs" "Grafiekenlijst"
-   "List of Schemes" "Schema-lijst"
+   "List of Algorithms" "Lijst van Algoritmen"
+   "List of Charts" "Lijst van Diagrammen"
+   "List of Graphs" "Lijst van Grafieken"
+   "List of Schemes" "Lijst van Schema's"
"List of Tableaux" "Lijst van Tableaus"
-   "Listing" "Opsomming"
-   "Listings[[List of Listings]]" "Listings"
+   "Listing" "Listing"
+   "Listings[[List of Listings]]" "Lijst van Listings"
"Notation" "Notatie"
"Note" "Noot"
"Problem" "Opgave"
diff --git a/lib/layouttranslations.review b/lib/layouttranslations.review
index 5e628e7..7110c35 100644
--- a/lib/layouttranslations.review
+++ b/lib/layouttranslations.review
@@ -41,10 +41,7 @@ new or changed translations for individual languages:
 nb: "Chart", "Exercise", "Graph", "List of Algorithms", "List of Charts",
 "List of Graphs", "List of Schemes", "List of Tableaux", "Note", "Scheme",
 "Tableau"
-nl: "Acknowledgement", "Case", "Chart", (same translation as "Graph") "Claim",
-"Condition", "Conjecture", "Corollary", "Criterion", "Graph",
-"List of Algorithms", "List of Charts", "List of Graphs",
-"List of Schemes", "Note", "Problem", "Proposition", "Theorem"
+
 zh_CN: "Assumption", "Axiom", "Case", "Claim", "Corollary", "Criterion",
"Example", "Fact", "List of Schemes", "List of Tableaux", "Notation",
"Proposition", "Remark", "Scheme", "Summary", "Tableau"
diff --git a/po/nl.gmo b/po/nl.gmo
index fcbd6dd..8dd4121 100644
Binary files a/po/nl.gmo and b/po/nl.gmo differ
diff --git a/po/nl.po b/po/nl.po
index 8f19538..8a0ab54 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -2237,7 +2237,7 @@ msgstr "Resultatenvenster"
 #: lib/layouts/stdinsets.inc:253 src/insets/InsetCaption.cpp:389
 #: src/insets/InsetListings.cpp:365 src/insets/InsetListings.cpp:367
 msgid "Listing"
-msgstr "Opsomming"
+msgstr "Listing"
 
 #: src/frontends/qt4/ui/ListingsUi.ui:23
 msgid " Settings"
@@ -6250,16 +6250,15 @@ msgstr "Schema"
 
 #: lib/layouts/achemso.layout:170
 msgid "List of Schemes"
-msgstr "Schema-lijst"
+msgstr "Lijst van Schema's"
 
 #: lib/layouts/achemso.layout:187 lib/layouts/achemso.layout:198
-#, fuzzy
 msgid "Chart"
-msgstr "Grafiek"
+msgstr "Diagram"
 
 #: lib/layouts/achemso.layout:192
 msgid "List of Charts"
-msgstr "Kaartenlijst"
+msgstr "Lijst van Diagrammen"
 
 #: lib/layouts/achemso.layout:209 lib/layouts/achemso.layout:220
 msgid "Graph"
@@ -6267,7 +6266,7 @@ msgstr "Grafiek"
 
 #: lib/layouts/achemso.layout:214
 msgid "List of Graphs"
-msgstr "Grafiekenlijst"
+msgstr "Lijst van Grafieken"
 
 #

[LyX/2.0.x] * fr.po: Update from Jean-Pierre Chretien

[Vincent van Ravesteijn]

commit 1dd511f93871d1e7462cc39f4217a211e81518f3
Author: Vincent van Ravesteijn v...@lyx.org
Date:   Tue Apr 8 20:53:47 2014 +0200

* fr.po: Update from Jean-Pierre Chretien

diff --git a/po/fr.po b/po/fr.po
index 72e7e44..6a7e710 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -287,7 +287,7 @@ msgstr 
 Project-Id-Version: LyX 1.6.0\n
 Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n
 POT-Creation-Date: 2014-04-03 17:39+0200\n
-PO-Revision-Date: 2014-04-03 23:23+0200\n
+PO-Revision-Date: 2014-04-08 17:24+0100\n
 Last-Translator: Jean-Pierre Chrétien jeanpierre.chret...@free.fr\n
 Language-Team: lyxfr\n
 Language: fr\n
@@ -20158,7 +20158,7 @@ msgstr LyX normalement ne change pas la position du 
curseur quand vous vous dé
 
 #: src/LyXRC.cpp:3149
 msgid LyX normally doesn't allow the user to scroll further than the bottom 
of the document. Set to true if you prefer to scroll the bottom of the document 
to the top of the screen
-msgstr LyX ne permet pas normalement le défilement au-delà de la fin du 
document. Positionnez sur « vrai » si vous préférez voir la fin du document en 
haut de la fenêtre.
+msgstr LyX ne permet pas normalement le défilement au-delà de la fin du 
document. Cochez si vous préférez voir la fin du document en haut de la 
fenêtre.
 
 #: src/LyXRC.cpp:3153
 msgid Make Apple key act as Meta and Control key as Ctrl.
@@ -24741,11 +24741,11 @@ msgstr Accolades non appariées !
 # A condition que ce soit traduit !
 #: src/insets/InsetListingsParams.cpp:132
 msgid Please specify true or false.
-msgstr Veuillez répondre par vrai ou faux.
+msgstr Veuillez répondre par « true » or  « false ».
 
 #: src/insets/InsetListingsParams.cpp:135
 msgid Only true or false is allowed.
-msgstr Seuls vrai ou faux sont autorisés.
+msgstr Seuls « true » ou « false » sont autorisés.
 
 #: src/insets/InsetListingsParams.cpp:145
 msgid Please specify an integer value.

[LyX/master] * sv.po: Update from Jim Rotmalm

[Vincent van Ravesteijn]

commit 866ee369b58ab7dfb9342b5d31eec241b5437a25
Author: Vincent van Ravesteijn v...@lyx.org
Date:   Tue Apr 8 20:33:20 2014 +0200

* sv.po: Update from Jim Rotmalm

diff --git a/po/sv.gmo b/po/sv.gmo
index 7b2e616..7fd7ac0 100644
Binary files a/po/sv.gmo and b/po/sv.gmo differ
diff --git a/po/sv.po b/po/sv.po
index 46d8933..2118f7b 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -4,7 +4,7 @@
 # Joacim Persson sp2j...@ida.his.se 1997, 1998.
 # Jim Rotmalm jim.rotm...@gmail.com, 2010-2014.
 #
-# Information 2014-04-01:
+# Information 2014-04-04:
 #   Bad Qt shortcuts: 129
 #   Inconsistent translations: 16
 #   Bad menu shortcuts: 159
@@ -213,8 +213,8 @@ msgid 
 msgstr 
 Project-Id-Version: LyX 2.1.0\n
 Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n
-POT-Creation-Date: 2014-04-01 12:21+0200\n
-PO-Revision-Date: 2014-04-01 21:12+0100\n
+POT-Creation-Date: 2014-04-04 12:21+0200\n
+PO-Revision-Date: 2014-04-04 21:12+0100\n
 Last-Translator: Jim Rotmalm jim.rotm...@gmail.com\n
 Language-Team: Swedish lyx-d...@lists.lyx.org\n
 Language: sv\n
@@ -3452,7 +3452,7 @@ msgstr Visa enkel stängknapp för flikar
 
 #: src/frontends/qt4/ui/PrefDocHandlingUi.ui:193
 msgid Closing last view:
-msgstr Stänger senaste vy:
+msgstr Stängning av senaste vy:
 
 #: src/frontends/qt4/ui/PrefDocHandlingUi.ui:204
 msgid Closes document
@@ -3612,7 +3612,7 @@ msgstr Standardformat för utmatning
 
 #: src/frontends/qt4/ui/PrefFileformatsUi.ui:214
 msgid With TeX fonts:
-msgstr Med Tex-typsnitt:
+msgstr Med TeX-typsnitt:
 
 #: src/frontends/qt4/ui/PrefFileformatsUi.ui:224
 msgid The default output format for documents (except with non-TeX fonts)
@@ -3844,11 +3844,11 @@ msgstr Använd LaTeX typsnittskodning:
 
 #: src/frontends/qt4/ui/PrefLatexUi.ui:41
 msgid DVI viewer paper size options:
-msgstr DVI-visarens alternativ för papperstorlek:
+msgstr DVI-visarens alternativ för pappersstorlek:
 
 #: src/frontends/qt4/ui/PrefLatexUi.ui:51
 msgid Optional paper size flag (-paper) for some DVI viewers
-msgstr Alternativ papperstorleksflagga (-paper) för vissa DVI-visare
+msgstr Alternativ pappersstorleksflagga (-paper) för vissa DVI-visare
 
 #: src/frontends/qt4/ui/PrefLatexUi.ui:108
 msgid BibTeX command and options

[LyX/master] * fr.po: Update from Jean-Pierre Chretien

[Vincent van Ravesteijn]

commit 61c2306a510a271327c1c22a8447e985f4f76b17
Author: Vincent van Ravesteijn v...@lyx.org
Date:   Tue Apr 8 20:40:14 2014 +0200

* fr.po: Update from Jean-Pierre Chretien

diff --git a/po/fr.gmo b/po/fr.gmo
index 779b3a8..1c26bef 100644
Binary files a/po/fr.gmo and b/po/fr.gmo differ
diff --git a/po/fr.po b/po/fr.po
index c882445..9e7f7e1 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -294,7 +294,7 @@ msgstr 
 Project-Id-Version: LyX 1.6.0\n
 Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n
 POT-Creation-Date: 2014-03-20 11:00+0100\n
-PO-Revision-Date: 2014-04-03 23:30+0200\n
+PO-Revision-Date: 2014-04-08 16:51+0100\n
 Last-Translator: Jean-Pierre Chrétien jeanpierre.chret...@free.fr\n
 Language-Team: lyxfr\n
 Language: fr\n
@@ -30301,11 +30301,11 @@ msgstr Accolades non appariées !
 # ??? JPC
 #: src/insets/InsetListingsParams.cpp:132
 msgid Please specify true or false.
-msgstr Veuillez répondre par vrai ou faux.
+msgstr Veuillez répondre par « true » ou « false ».
 
 #: src/insets/InsetListingsParams.cpp:135
 msgid Only true or false is allowed.
-msgstr Seuls vrai ou faux sont autorisés.
+msgstr Seuls « true » ou « false » sont autorisés.
 
 #: src/insets/InsetListingsParams.cpp:145
 msgid Please specify an integer value.

[LyX/master] * ja.po: Update from Koji Yokota

[Vincent van Ravesteijn]

commit abb8f014491ff04249cea1001587dc6313bbd0bc
Author: Vincent van Ravesteijn v...@lyx.org
Date:   Tue Apr 8 20:31:39 2014 +0200

* ja.po: Update from Koji Yokota

diff --git a/po/ja.gmo b/po/ja.gmo
index 2512dc9..a5213ef 100644
Binary files a/po/ja.gmo and b/po/ja.gmo differ
diff --git a/po/ja.po b/po/ja.po
index c01ef1f..1bf5b37 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,9 +8,9 @@ msgstr 
 Project-Id-Version: LyX 2.1\n
 Report-Msgid-Bugs-To: lyx-d...@lists.lyx.org\n
 POT-Creation-Date: 2014-03-20 11:00+0100\n
-PO-Revision-Date: 2014-03-25 01:33+0900\n
+PO-Revision-Date: 2014-04-04 01:25+0900\n
 Last-Translator: Koji Yokota yok...@res.otaru-uc.ac.jp\n
-Language-Team: Japanese kde-i18n-...@kde.org\n
+Language-Team: Japanese lyx-d...@lists.lyx.org\n
 Language: ja\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -1930,7 +1930,7 @@ msgstr Input
 
 #: src/frontends/qt4/ui/IncludeUi.ui:303 lib/layouts/stdlayouts.inc:74
 msgid Verbatim
-msgstr Verbatim
+msgstr 無調整(Verbatim)
 
 #: src/frontends/qt4/ui/IncludeUi.ui:308 src/insets/InsetInclude.cpp:1196
 #: src/insets/InsetInclude.cpp:1202
@@ -15085,11 +15085,11 @@ msgstr Input|p
 
 #: lib/ui/stdcontext.inc:277 lib/ui/stdcontext.inc:540
 msgid Verbatim|V
-msgstr Verbatim|V
+msgstr 無調整(Verbatim)|V
 
 #: lib/ui/stdcontext.inc:278 lib/ui/stdcontext.inc:541
 msgid Verbatim (marked blanks)|b
-msgstr Verbatim (marked blanks)|b
+msgstr 無調整(Verbatim) (空白記号付き)|b
 
 #: lib/ui/stdcontext.inc:279 lib/ui/stdcontext.inc:542
 msgid Listing|L
@@ -15522,7 +15522,7 @@ msgstr 保存(S)|S
 
 #: lib/ui/stdmenus.inc:53
 msgid Save As...|A
-msgstr 名前を付けて保存(A),,,|A
+msgstr 名前を付けて保存(A)...|A
 
 #: lib/ui/stdmenus.inc:54
 msgid Save All|l
@@ -15618,11 +15618,11 @@ msgstr 他の形式とオプション(O)...|O
 
 #: lib/ui/stdmenus.inc:102
 msgid Undo|U
-msgstr 元に戻す(U)|U
+msgstr 操作を取り消す(U)|U
 
 #: lib/ui/stdmenus.inc:103
 msgid Redo|R
-msgstr やり直す(R)|R
+msgstr 同じ操作を繰り返す(R)|R
 
 #: lib/ui/stdmenus.inc:109
 msgid Paste Special
@@ -16498,11 +16498,11 @@ msgstr 連続スペルチェック
 
 #: lib/ui/stdtoolbars.inc:79 src/BufferView.cpp:1333
 msgid Undo
-msgstr 元に戻す
+msgstr 操作を取り消す
 
 #: lib/ui/stdtoolbars.inc:80 src/BufferView.cpp:1343
 msgid Redo
-msgstr やり直す
+msgstr 同じ操作を繰り返す
 
 #: lib/ui/stdtoolbars.inc:84
 msgid Find and replace
@@ -22454,11 +22454,11 @@ msgstr 文書クラス「%1$s」を読み込むことができませんでし
 
 #: src/BufferView.cpp:1336
 msgid No further undo information
-msgstr これ以上元に戻すことはできません
+msgstr これ以上操作を取り消すことはできません
 
 #: src/BufferView.cpp:1346
 msgid No further redo information
-msgstr これ以上やり直すことはできません
+msgstr これ以上同じ操作を繰り返すことはできません
 
 #: src/BufferView.cpp:1593
 msgid Mark off
@@ -24324,7 +24324,7 @@ msgstr 
 
 #: src/Text.cpp:1013
 msgid Character is uncodable in verbatim paragraphs.
-msgstr verbatim環境では文字をコード化できません。
+msgstr 無調整(verbatim)環境では文字をコード化できません。
 
 #: src/Text.cpp:1850
 msgid [Change Tracking] 
@@ -29404,7 +29404,7 @@ msgstr 外部制御インタフェース
 
 #: src/support/debug.cpp:56
 msgid Undo/Redo mechanism
-msgstr 元に戻す/やり直すの動作
+msgstr 操作の取消/繰返機構
 
 #: src/support/debug.cpp:57
 msgid User commands
@@ -29493,9 +29493,8 @@ msgid 
 Assertion %1$s violated in\n
 file: %2$s, line: %3$s
 msgstr 
-アサーション %1$s が\n
-ファイル: %2$s, 行: %3$s\n
-で満たされていません。
+アサーション %1$s 違反です。\n
+ファイル: %2$s, 行: %3$s
 
 #: src/support/lassert.cpp:62
 msgid 
@@ -29555,441 +29554,4 @@ msgstr 
 
 #: src/support/userinfo.cpp:45
 msgid Unknown user
-msgstr 未知の
-
-#~ msgid Scope
-#~ msgstr 範囲(P)
-
-#~ msgid Long Table Caption (unnumbered)
-#~ msgstr 長尺表キャプション(無番)
-
-#~ msgid The caption as it appears in the list of tables
-#~ msgstr 表一覧に表示するキャプション
-
-#~ msgid Unformatted Text|U
-#~ msgstr 書式なし平文(U)|U
-
-#~ msgid Unformatted, Join Lines|o
-#~ msgstr 書式なし平文(行を連結して)(O)|O
-
-#~ msgid Down
-#~ msgstr 下へ(D)
-
-#~ msgid Split Environment|l
-#~ msgstr Split環境|l
-
-#, fuzzy
-#~ msgid %1$s (*.%2$s)
-#~ msgstr %1$s (%2$s)
-
-#~ msgid report (R Journal)
-#~ msgstr report (R Journal)
-
-#~ msgid Alternative Theorem String|S
-#~ msgstr 追加の定理見出し文(S)|S
-
-#~ msgid Alternative theorem string
-#~ msgstr 追加の定理見出し文
-
-#~ msgid Default Format
-#~ msgstr 既定形式
-
-#~ msgid Key Words.
-#~ msgstr キーワード.
-
-#~ msgid Scrap
-#~ msgstr スクラップ
-
-#~ msgid Begin Multiple Columns
-#~ msgstr 多段組始まり
-
-#~ msgid ---Begin Multiple Columns---
-#~ msgstr ―――多段組始まり―――
-
-#~ msgid End Multiple Columns
-#~ msgstr 多段組終わり
-
-#~ msgid ---End Multiple Columns---
-#~ msgstr ―――多段組終わり―――
-
-#~ msgid  Macro: %1$s: 
-#~ msgstr マクロ: %1$s：
-
-#~ msgid [[Replace with the code of your language]]
-#~ msgstr ja
-
-#~ msgid Use AMS math package automatically
-#~ msgstr 自動的にAMS mathパッケージを使う(U)
-
-#~ msgid Use AMS math package
-#~ msgstr AMS mathパッケージを使う
-
-#~ msgid Use esint package automatically
-#~ msgstr 自動的にesintパッケージを使う(A)
-
-#~ msgid Use esint package
-#~ msgstr esintパッケージを使う
-
-#~ msgid Use mathdots package automatically
-#~ msgstr 自動的にmathdotsパッケージを使う
-
-#~ msgid Use mathdots package
-#~ msgstr mathdotsパッケージを使う
-
-#~ msgid Use mhchem package automatically
-#~ msgstr 自動的にmhchemパッケージを使う(P)
-
-#~ msgid The LaTeX