Re: Copying translations from 2.2.x to master?

Le 05/07/2017 à 10:14, Jean-Pierre Chrétien a écrit : If I follow your usual way, I should now copy these changes in the French, German, Japanese and Spanish docs. As the subject says, I guess I should first load the foreign 2.2.x doc files in 2.3.0dev and push them in master as 2.3 doc

Re: Copying translations from 2.2.x to master?

Le 05/07/2017 à 07:46, Scott Kostyshak a écrit : On Wed, Jul 05, 2017 at 01:50:19AM +0200, Uwe Stöhr wrote: The translations can be done. I stored all changes I made at the usual changelog files in the docs folder‎. Thanks, Uwe! I sent the email for translations and asked them to finish

Re: Copying translations from 2.2.x to master?

Le 05/07/2017 à 09:08, Uwe Stöhr a écrit : Hi Scott, I try to find time for Lyx on Thursday evening. I totally lost contact to LyX, sorry. Uwe, if you are overbooked, I said I could take care until you find time to come back to LyX. Currently I've made a recollection of what is changed in

Re: Copying translations from 2.2.x to master?

Hi Scott, I try to find time for Lyx on Thursday evening. I totally lost contact to LyX, sorry. Regards Uwe   Original Message   From: Scott Kostyshak Sent: Mittwoch, 5. Juli 2017 07:46 To: Uwe Stöhr Cc: lyx-devel@lists.lyx.org; Jean-Pierre Chrétien Subject: Re: Copying translations from 2.2.x

Re: Copying translations from 2.2.x to master?

On Wed, Jul 05, 2017 at 01:50:19AM +0200, Uwe Stöhr wrote: > The translations can be done. I stored all changes I made at the usual > changelog files in the docs folder‎. Thanks, Uwe! I sent the email for translations and asked them to finish within two weeks. Scott signature.asc Description:

Re: Copying translations from 2.2.x to master?

The translations can be done. I stored all changes I made at the usual changelog files in the docs folder‎.   Original Message   From: Scott Kostyshak Sent: Mittwoch, 5. Juli 2017 00:04 To: lyx-devel@lists.lyx.org; Uwe Stöhr Cc: Jean-Pierre Chrétien Subject: Re: Copying translations from 2.2.x

Re: Copying translations from 2.2.x to master?

On Fri, Jun 30, 2017 at 11:15:29PM -0400, Scott Kostyshak wrote: > Uwe, I am going to send an email to the translators. My big question to > you (or anyone else) is: am I supposed to wait for the docs to be > prepared before sending the email so that the translators can work on > translating the

Re: Copying translations from 2.2.x to master?

On Fri, Jun 30, 2017 at 11:18:14AM +0200, Jean-Pierre Chrétien wrote: > As sole French translator of the UI since 2007 and of the docs since 2012, I > think I can take care of the update of the 2.3 docs until the release and > the come back of Uwe. Thanks for volunteering, Jean-Pierre! This is

Re: Copying translations from 2.2.x to master?

On Fri, Jun 30, 2017 at 01:24:52AM +0200, Uwe Stöhr wrote: > El 25.06.2017 a las 22:52, Scott Kostyshak escribió: > > > I just wanted to make sure you saw my above questions. > > Hi Scott, > > I was too busy to follow LyX. I won't have time to take care for the docs > for LyX 2.3. So I hereby

Re: Copying translations from 2.2.x to master?

Le 30/06/2017 à 01:24, Uwe Stöhr a écrit : El 25.06.2017 a las 22:52, Scott Kostyshak escribió: I just wanted to make sure you saw my above questions. Hi Scott, I was too busy to follow LyX. I won't have time to take care for the docs for LyX 2.3. So I hereby resign as docs maintainer for

Re: Copying translations from 2.2.x to master?

El 25.06.2017 a las 22:52, Scott Kostyshak escribió: I just wanted to make sure you saw my above questions. Hi Scott, I was too busy to follow LyX. I won't have time to take care for the docs for LyX 2.3. So I hereby resign as docs maintainer for LyX 2.3. When I find time I will work on

Re: Copying translations from 2.2.x to master?

On Sat, Jun 10, 2017 at 01:27:02PM -0400, Scott Kostyshak wrote: > On Sat, Jun 10, 2017 at 10:29:04AM +0200, Uwe Stöhr wrote: > > Hi Scott, I am still away for another week. I already transferred the po > > files from 2.2.x to master for all active translations . > > Great, thank you! > > > So

Re: Copying translations from 2.2.x to master?

Kornel Benko wrote: > So what is Uwe doing when he is re-merging? Probably calling > development/tools/mergepo.py. No. The workhose for remerging translations from the source code is po/lyx_pot.py. mergepo.py is only for merging between two branches without ptoducing huge nonsense diffs. > I

Re: Copying translations from 2.2.x to master?

Am Sonntag, 11. Juni 2017 um 08:55:11, schrieb Georg Baum > Kornel Benko wrote: > > > Am Samstag, 10. Juni 2017 um 10:41:43, schrieb Georg Baum > >> > >> I would suggest to use git correctly instead of fixing broken line ends > >> again and again, producing huge

Re: Copying translations from 2.2.x to master?

Kornel Benko wrote: > Am Samstag, 10. Juni 2017 um 10:41:43, schrieb Georg Baum >> >> I would suggest to use git correctly instead of fixing broken line ends >> again and again, producing huge nonsense diffs. We had this discussion >> several times in the past. >> > > Maybe a problem in merging

Re: Copying translations from 2.2.x to master?

On Sat, Jun 10, 2017 at 10:34:51AM +0200, Georg Baum wrote: > Scott Kostyshak wrote: > > > On Sat, Jun 03, 2017 at 08:07:39PM -0400, Scott Kostyshak wrote: > > > >> Unless someone has a different idea, I will replace the Windows > >> linebreaks with non-Windows linebreaks, update the strings on

Re: Copying translations from 2.2.x to master?

On Sat, Jun 10, 2017 at 10:29:04AM +0200, Uwe Stöhr wrote: > Hi Scott, I am still away for another week. I already transferred the po > files from 2.2.x to master for all active translations . Great, thank you! > So please don't touch the po files in master. OK. > The translators will be

Re: Copying translations from 2.2.x to master?

Am Samstag, 10. Juni 2017 um 10:41:43, schrieb Georg Baum > Kornel Benko wrote: > > > Am Sonntag, 4. Juni 2017 um 10:33:02, schrieb Scott Kostyshak > > > >> On Sun, Jun 04, 2017 at 12:17:27PM +0200, Kornel Benko wrote: > >> > >> > > Unless

Re: Copying translations from 2.2.x to master?

Kornel Benko wrote: > Am Sonntag, 4. Juni 2017 um 10:33:02, schrieb Scott Kostyshak > >> On Sun, Jun 04, 2017 at 12:17:27PM +0200, Kornel Benko wrote: >> >> > > Unless someone has a different idea, I will replace the Windows >> > > linebreaks with non-Windows linebreaks,

Re: Copying translations from 2.2.x to master?

Scott Kostyshak wrote: > On Sat, Jun 03, 2017 at 08:07:39PM -0400, Scott Kostyshak wrote: > >> Unless someone has a different idea, I will replace the Windows >> linebreaks with non-Windows linebreaks, update the strings on master, >> and try the mergepo.py call above again. > > After Kornel's

Re: Copying translations from 2.2.x to master?

    Original Message   From: Scott Kostyshak Sent: Freitag, 9. Juni 2017 20:28 To: LyX Developers; Uwe Stöhr; Georg Baum Subject: Re: Copying translations from 2.2.x to master? On Sat, Jun 03, 2017 at 08:07:39PM -0400, Scott Kostyshak wrote: > On Mon, May 29, 2017 at 11:09:55PM -0400, Scott Kostys

Re: Copying translations from 2.2.x to master?

On Sat, Jun 03, 2017 at 08:07:39PM -0400, Scott Kostyshak wrote: > On Mon, May 29, 2017 at 11:09:55PM -0400, Scott Kostyshak wrote: > > Uwe, > > > > Do you have time to copy the translations from 2.2.x to master? From > > what I understand, you've done this in the past. > > > > If Uwe doesn't

Re: Copying translations from 2.2.x to master?

Am Mittwoch, 7. Juni 2017 um 09:29:31, schrieb Scott Kostyshak > On Wed, Jun 07, 2017 at 10:20:58AM +0200, Kornel Benko wrote: > > > With 'make layouttranslations1' I get this change to lib/layouttranslations > > I think you can push that. But we will have to run that again

Re: Copying translations from 2.2.x to master?

On Wed, Jun 07, 2017 at 10:20:58AM +0200, Kornel Benko wrote: > With 'make layouttranslations1' I get this change to lib/layouttranslations I think you can push that. But we will have to run that again after merging translations from 2.2.x. Scott

Re: Copying translations from 2.2.x to master?

Am Dienstag, 6. Juni 2017 um 15:53:13, schrieb Scott Kostyshak > On Sat, Jun 03, 2017 at 08:07:39PM -0400, Scott Kostyshak wrote: > > > Unless someone has a different idea, I will replace the Windows > > linebreaks with non-Windows linebreaks, update the strings on master, > >

Re: Copying translations from 2.2.x to master?

On Sat, Jun 03, 2017 at 08:07:39PM -0400, Scott Kostyshak wrote: > Unless someone has a different idea, I will replace the Windows > linebreaks with non-Windows linebreaks, update the strings on master, > and try the mergepo.py call above again. After Kornel's fixes to the Windows linebreaks, I

Re: Copying translations from 2.2.x to master?

Am Sonntag, 4. Juni 2017 um 10:33:02, schrieb Scott Kostyshak > On Sun, Jun 04, 2017 at 12:17:27PM +0200, Kornel Benko wrote: > > > > Unless someone has a different idea, I will replace the Windows > > > linebreaks with non-Windows linebreaks, update the strings on master, > >

Re: Copying translations from 2.2.x to master?

On Sun, Jun 04, 2017 at 12:17:27PM +0200, Kornel Benko wrote: > > Unless someone has a different idea, I will replace the Windows > > linebreaks with non-Windows linebreaks, update the strings on master, > > and try the mergepo.py call above again. > > I made a perl-script for this purpose

Re: Copying translations from 2.2.x to master?

Am Samstag, 3. Juni 2017 um 20:07:39, schrieb Scott Kostyshak > On Mon, May 29, 2017 at 11:09:55PM -0400, Scott Kostyshak wrote: > > Uwe, > > > > Do you have time to copy the translations from 2.2.x to master? From > > what I understand, you've done this in the past. > > > >

Re: Copying translations from 2.2.x to master?

On Mon, May 29, 2017 at 11:09:55PM -0400, Scott Kostyshak wrote: > Uwe, > > Do you have time to copy the translations from 2.2.x to master? From > what I understand, you've done this in the past. > > If Uwe doesn't have time, hopefully someone else can help or can tell me > what I should do. I

Copying translations from 2.2.x to master?

Uwe, Do you have time to copy the translations from 2.2.x to master? From what I understand, you've done this in the past. If Uwe doesn't have time, hopefully someone else can help or can tell me what I should do. Scott