Re: LyX version 2.3.0 (beta 1)

[Kornel Benko]

Am Montag, 4. September 2017 um 02:28:33, schrieb Scott Kostyshak 
<skost...@lyx.org>
> On Sun, Sep 03, 2017 at 11:11:55PM +0200, Kornel Benko wrote:
> > Am Donnerstag, 31. August 2017 um 13:07:46, schrieb Pavel Sanda 
> > <sa...@lyx.org>
> > > Scott Kostyshak wrote:
> > > > > I did not make any stats, cherrypicking single commit (likely close 
> > > > > to worst-case) gives me uncompressed 45 megs in blobs:
> > > > > $ git diff-tree -r -c -M -C --no-commit-id  cf5d9e1 |acut -f 4 |  git 
> > > > > cat-file --batch-check |acut -f 3|asum
> > > > > 45175575
> > > >
> > > > 45MB for all gmo commits ever? That does not seem bad at all to me. Good
> > > > to know.
> > >
> > > No, 45MB uncompressed per _single_ commit. P
> >
> > We may want to unify the output of msgmerge to possibly minimize the 
> > differences in po-files.
> > For instance while remerging using '--width� --sort-output' may create the 
> > same output  on all platforms.
>
> I'm open to anything, but if there's something you want me specifically
> to do, please let me know the exact steps.
>
> Scott

Like the attached. (Not tested for automake)
The expected effect is big commit at next remerge (po-files only, no need to 
remerge the gmo files too).
It should pay of on later remerges.

        Kornel
diff --git a/development/cmake/modules/FindLyXGettext.cmake b/development/cmake/modules/FindLyXGettext.cmake
index 8533cbf..3e8a9b0 100755
--- a/development/cmake/modules/FindLyXGettext.cmake
+++ b/development/cmake/modules/FindLyXGettext.cmake
@@ -51,7 +51,7 @@ MACRO(GETTEXT_CREATE_TRANSLATIONS _potFile _firstPoFile)

       ADD_CUSTOM_COMMAND(
          OUTPUT ${_gmoFile}
-         COMMAND ${GETTEXT_MSGMERGE_EXECUTABLE} --quiet --update --backup=none ${_absFile} ${_absPotFile}
+         COMMAND ${GETTEXT_MSGMERGE_EXECUTABLE} --quiet --update --backup=none --width€ --sort-output ${_absFile} ${_absPotFile}
          COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -c --statistics -o ${_gmoFile}.1 ${_absFile}
          COMMAND ${CMAKE_COMMAND} -E rename ${_gmoFile}.1 ${_gmoFile}
          DEPENDS ${_absPotFile} ${_absFile}
diff --git a/po/Makevars.template b/po/Makevars.template
index 0648ec7..c318c89 100644
--- a/po/Makevars.template
+++ b/po/Makevars.template
@@ -63,7 +63,7 @@ MSGMERGE_OPTIONS  # If you want to disable line wrapping when writing PO files, add
 # --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and
 # MSGINIT_OPTIONS.
-MSGINIT_OPTIONS +MSGINIT_OPTIONS = --width€ --sort-output

 # This tells whether or not to regenerate a PO file when $(DOMAIN).pot
 # has changed.  Possible values are "yes" and "no".  Set this to no if

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