Re: po-files with trailing

2016-04-14 Thread Georg Baum
Kornel Benko wrote: > Am Donnerstag, 7. April 2016 um 17:02:42, schrieb Richard Heck > >> >> Maybe a simple solution would be to add something into CMakeLists.txt >> that would strip all the "\r" before sending the files through gettext. > > Maybe, see my other mail. But I prefer the solution w

Re: [PATCH] Re: po-files with trailing

2016-04-14 Thread Georg Baum
Richard Heck wrote: > On 04/09/2016 11:36 AM, Uwe Stöhr wrote: >> Am 07.04.2016 um 23:37 schrieb Richard Heck: >> >>> Then maybe the solution is to disable the writing of native line >>> endings. Apparently, we can do this by opening the output files in >>> binary mode. The attached patch does thi

Re: [PATCH] Re: po-files with trailing

2016-04-09 Thread Pavel Sanda
Richard Heck wrote: > No, it's bad. I'm faikrly sure there should be almost no difference > between the files if it is working correctly. Something has happend > involving this sort of thing: > > -#: src/frontends/qt4/ui/WrapUi.ui:173 src/frontends/qt4/GuiParagraph.cpp:163 > +#: src/frontends/qt4/

Re: [PATCH] Re: po-files with trailing

2016-04-09 Thread Richard Heck
On 04/09/2016 11:36 AM, Uwe Stöhr wrote: > Am 07.04.2016 um 23:37 schrieb Richard Heck: > >> Then maybe the solution is to disable the writing of native line >> endings. Apparently, we can do this by opening the output files in >> binary mode. The attached patch does this. Can someone test? > > Thi

Re: [PATCH] Re: po-files with trailing

2016-04-07 Thread Pavel Sanda
Richard Heck wrote: > The attached patch does this. Can someone test? More precisely, Uwe could you remerge strings using this patch on clean master and give us single sample .po file so we can check it is identical when we remerge it on linux machines? Pavel

[PATCH] Re: po-files with trailing

2016-04-07 Thread Richard Heck
On 04/07/2016 05:21 PM, Pavel Sanda wrote: > Richard Heck wrote: >> I think the problem may not be that gettext works differently but, >> perhaps, that it works the same. I am guessing that what happens is this. >> First, lyx_pot.py writes the po files with native line endings. > Yep, that might e

Re: po-files with trailing

2016-04-07 Thread Pavel Sanda
Richard Heck wrote: > I think the problem may not be that gettext works differently but, > perhaps, that it works the same. I am guessing that what happens is > this. First, lyx_pot.py writes the po files with native line endings. Yep, that might explain the original problem, why line wrapping is

Re: po-files with trailing

2016-04-07 Thread Kornel Benko
Am Donnerstag, 7. April 2016 um 17:02:42, schrieb Richard Heck > On 04/07/2016 04:26 PM, Pavel Sanda wrote: > > Richard Heck wrote: > >> Using autotools, this is done via the msguniq program. I cannot tell how > >> it is done with cmake, but I suspect that this is where the error > >> occurs, and

Re: po-files with trailing

2016-04-07 Thread Kornel Benko
Am Donnerstag, 7. April 2016 um 13:26:05, schrieb Pavel Sanda > Richard Heck wrote: > > Using autotools, this is done via the msguniq program. I cannot tell how > > it is done with cmake, It is the same with cmake. po/lyx_pot.py -> *_l10n.pot po/cat.py: *_l10n.pot -> lyx.cat_tmp.pot po/dos2un

Re: po-files with trailing

2016-04-07 Thread Richard Heck
On 04/07/2016 04:26 PM, Pavel Sanda wrote: > Richard Heck wrote: >> Using autotools, this is done via the msguniq program. I cannot tell how >> it is done with cmake, but I suspect that this is where the error >> occurs, and that this is why you get "\r" in the middle of some lines, >> namely, we g

Re: po-files with trailing

2016-04-07 Thread Pavel Sanda
Richard Heck wrote: > Using autotools, this is done via the msguniq program. I cannot tell how > it is done with cmake, but I suspect that this is where the error > occurs, and that this is why you get "\r" in the middle of some lines, > namely, we get: Then we are back at the old problem we were

Re: po-files with trailing

2016-04-07 Thread Richard Heck
On 04/07/2016 03:13 PM, Pavel Sanda wrote: > Georg Baum wrote: >> Pavel Sanda wrote: >>> Georg Baum wrote: python script we should forbid .po file remerging on windows IMHO. >>> Except it is Uwe who took the burden to be recipient of po updates sent to >>> po-upda...@lyx.org and care for them

Re: po-files with trailing

2016-04-07 Thread Pavel Sanda
Georg Baum wrote: > Pavel Sanda wrote: > > Georg Baum wrote: > >> python script we should forbid .po file remerging on windows IMHO. > > > > Except it is Uwe who took the burden to be recipient of po updates sent > > to po-upda...@lyx.org and care for them in the long term fashion... > > Pavel >

Re: po-files with trailing

2016-04-06 Thread Kornel Benko
Am Mittwoch, 6. April 2016 um 23:58:20, schrieb Uwe Stöhr > Am 05.04.2016 um 10:16 schrieb Kornel Benko: > > > Recently someone probably merged the po files on a windows system. > > Yes, this was me. > as described in our file README.localization I did: > > " > - on Windows: either build the up

Re: po-files with trailing

2016-04-06 Thread Uwe Stöhr
Am 05.04.2016 um 10:16 schrieb Kornel Benko: Recently someone probably merged the po files on a windows system. Yes, this was me. as described in our file README.localization I did: " - on Windows: either build the update-po target in MSVC or run the command: msbuild po\update-p

Re: po-files with trailing

2016-04-05 Thread Georg Baum
Pavel Sanda wrote: > Georg Baum wrote: >> python script we should forbid .po file remerging on windows IMHO. > > Except it is Uwe who took the burden to be recipient of po updates sent > to po-upda...@lyx.org and care for them in the long term fashion... > Pavel Yes, fixing the python script wou

Re: po-files with trailing

2016-04-05 Thread Pavel Sanda
Georg Baum wrote: > python script we should forbid .po file remerging on windows IMHO. Except it is Uwe who took the burden to be recipient of po updates sent to po-upda...@lyx.org and care for them in the long term fashion... Pavel

Re: po-files with trailing

2016-04-05 Thread Scott Kostyshak
On Tue, Apr 05, 2016 at 09:08:35PM +0200, Georg Baum wrote: > Kornel Benko wrote: > > > Nice article. So for us it would suffice to create '.gitattributes' file > > with the content: *.po text > > I fixed the .po files with some sed magic now (like I did already in > november). Thanks for doing

Re: po-files with trailing

2016-04-05 Thread Georg Baum
Kornel Benko wrote: > Nice article. So for us it would suffice to create '.gitattributes' file > with the content: *.po text Almost. The last time I investigated this I was about to add the attached one, but it is not enough. Not only the line ends of the files are broken, but they do contain a

Re: po-files with trailing

2016-04-05 Thread Kornel Benko
Am Dienstag, 5. April 2016 um 10:27:55, schrieb Richard Heck > On 04/05/2016 06:17 AM, Kornel Benko wrote: > > Am Dienstag, 5. April 2016 um 11:45:50, schrieb Jean-Marc Lasgouttes > > > >> Le 05/04/2016 11:10, Kornel Benko a écrit : > You mean by using a .gitattributes file? > >>> Yes, but

Re: po-files with trailing

2016-04-05 Thread Richard Heck
On 04/05/2016 06:17 AM, Kornel Benko wrote: > Am Dienstag, 5. April 2016 um 11:45:50, schrieb Jean-Marc Lasgouttes > >> Le 05/04/2016 11:10, Kornel Benko a écrit : You mean by using a .gitattributes file? >>> Yes, but maybe there are better possibilities. >>> I checked that we do not have lo

Re: po-files with trailing

2016-04-05 Thread Kornel Benko
Am Dienstag, 5. April 2016 um 11:45:50, schrieb Jean-Marc Lasgouttes > Le 05/04/2016 11:10, Kornel Benko a écrit : > >> You mean by using a .gitattributes file? > > > > Yes, but maybe there are better possibilities. > > I checked that we do not have local attributes file yet, still the .cpp > >

Re: po-files with trailing

2016-04-05 Thread Jean-Marc Lasgouttes
Le 05/04/2016 11:10, Kornel Benko a écrit : You mean by using a .gitattributes file? Yes, but maybe there are better possibilities. I checked that we do not have local attributes file yet, still the .cpp sources are handled correctly. From what I understand, it would be nice to have a gitat

Re: po-files with trailing

2016-04-05 Thread Kornel Benko
Am Dienstag, 5. April 2016 um 10:28:29, schrieb Jean-Marc Lasgouttes > Le 05/04/2016 10:16, Kornel Benko a écrit : > > Recently someone probably merged the po files on a windows system. > > Now the files have a mix of and terminated lines. > > > > Could we declare *.po as text files (like *.cp

Re: po-files with trailing

2016-04-05 Thread Jean-Marc Lasgouttes
Le 05/04/2016 10:16, Kornel Benko a écrit : Recently someone probably merged the po files on a windows system. Now the files have a mix of and terminated lines. Could we declare *.po as text files (like *.cpp or *.h)? You mean by using a .gitattributes file? JMarc

po-files with trailing

2016-04-05 Thread Kornel Benko
Recently someone probably merged the po files on a windows system. Now the files have a mix of and terminated lines. Could we declare *.po as text files (like *.cpp or *.h)? Kornel signature.asc Description: This is a digitally signed message part.