Re: synchronizing po file of branch and trunk

2015-11-16 Thread Georg Baum
Kornel Benko wrote: > Am Sonntag, 15. November 2015 um 19:03:01, schrieb Georg Baum > >> Kornel Benko wrote: > >> Nice, but a pity that it is not python;-( Many years ago it was decided >> that all scripts should be python, and everything was converted. > > We do not provide perl scripts, but de

Re: synchronizing po file of branch and trunk

2015-11-15 Thread Kornel Benko
Am Sonntag, 15. November 2015 um 19:03:01, schrieb Georg Baum > Kornel Benko wrote: > > > Am Freitag, 13. November 2015 um 20:18:46, schrieb Georg Baum > > > >> > >> I am tempted to write our own merge tool in python.. > > > > I have a script ready, though it is perl. > > Nice, but a pity tha

Re: synchronizing po file of branch and trunk

2015-11-15 Thread Georg Baum
Kornel Benko wrote: > Am Freitag, 13. November 2015 um 20:18:46, schrieb Georg Baum > >> >> I am tempted to write our own merge tool in python.. > > I have a script ready, though it is perl. Nice, but a pity that it is not python;-( Many years ago it was decided that all scripts should be pyth

Re: synchronizing po file of branch and trunk

2015-11-14 Thread Kornel Benko
Am Freitag, 13. November 2015 um 20:18:46, schrieb Georg Baum > Scott Kostyshak wrote: > > > This would be nice. If the only way to do things is with manual merging, > > I'm happy to spend the time to learn how to do that. But if you think it > > is possible to come up with a script that either

Re: synchronizing po file of branch and trunk

2015-11-13 Thread Georg Baum
Scott Kostyshak wrote: > This would be nice. If the only way to do things is with manual merging, > I'm happy to spend the time to learn how to do that. But if you think it > is possible to come up with a script that either does the merging > automatically or at least facilitates the merging, then

Re: synchronizing po file of branch and trunk

2015-11-13 Thread Scott Kostyshak
On Fri, Nov 13, 2015 at 05:27:48PM +, Guillaume Munch wrote: > Le 13/11/2015 16:58, Scott Kostyshak a écrit : > >On Thu, Nov 12, 2015 at 07:12:52PM +0100, Georg Baum wrote: > >>Jean-Marc Lasgouttes wrote: > >> > >>>Le 11/11/15 22:39, Scott Kostyshak a écrit : > >Branch has less strings than

Re: synchronizing po file of branch and trunk

2015-11-13 Thread Guillaume Munch
Le 13/11/2015 16:58, Scott Kostyshak a écrit : On Thu, Nov 12, 2015 at 07:12:52PM +0100, Georg Baum wrote: Jean-Marc Lasgouttes wrote: Le 11/11/15 22:39, Scott Kostyshak a écrit : Branch has less strings than master. (6609 vs. 6817). And not all strings from branch are common with master. I

Re: synchronizing po file of branch and trunk

2015-11-13 Thread Scott Kostyshak
On Thu, Nov 12, 2015 at 07:12:52PM +0100, Georg Baum wrote: > Jean-Marc Lasgouttes wrote: > > > Le 11/11/15 22:39, Scott Kostyshak a écrit : > >>> Branch has less strings than master. (6609 vs. 6817). And not all > >>> strings from branch are common with master. > >> > >> I see. So there is no rul

Re: synchronizing po file of branch and trunk

2015-11-12 Thread Georg Baum
Jean-Marc Lasgouttes wrote: > Le 11/11/15 22:39, Scott Kostyshak a écrit : >>> Branch has less strings than master. (6609 vs. 6817). And not all >>> strings from branch are common with master. >> >> I see. So there is no rule that I can use to do what I want then. I >> guess I will just copy over

Re: synchronizing po file of branch and trunk

2015-11-11 Thread Scott Kostyshak
On Wed, Nov 11, 2015 at 04:29:19PM -0800, Pavel Sanda wrote: > Scott Kostyshak wrote: > > Or is there another source of chaos? > > Unfortunately it is. It is called 'remerge of strings' when no new > translations are added > but po files are made up-to-date with the current source code. > So if y

Re: synchronizing po file of branch and trunk

2015-11-11 Thread Pavel Sanda
Scott Kostyshak wrote: > Or is there another source of chaos? Unfortunately it is. It is called 'remerge of strings' when no new translations are added but po files are made up-to-date with the current source code. So if you have remerge in master all po files get touched although no new transla

Re: synchronizing po file of branch and trunk

2015-11-11 Thread Scott Kostyshak
On Wed, Nov 11, 2015 at 11:14:49PM +0100, Jean-Marc Lasgouttes wrote: > Le 11/11/15 22:39, Scott Kostyshak a écrit : > >>Branch has less strings than master. (6609 vs. 6817). And not all strings > >>from branch > >>are common with master. > > > >I see. So there is no rule that I can use to do what

Re: synchronizing po file of branch and trunk

2015-11-11 Thread Jean-Marc Lasgouttes
Le 11/11/15 22:39, Scott Kostyshak a écrit : Branch has less strings than master. (6609 vs. 6817). And not all strings from branch are common with master. I see. So there is no rule that I can use to do what I want then. I guess I will just copy over the po files from branch that have not been

Re: synchronizing po file of branch and trunk

2015-11-11 Thread Scott Kostyshak
On Wed, Nov 11, 2015 at 08:56:33PM +0100, Kornel Benko wrote: > Am Mittwoch, 11. November 2015 um 13:59:39, schrieb Scott Kostyshak > > > On Wed, Nov 11, 2015 at 07:46:46PM +0100, Kornel Benko wrote: > > > Am Mittwoch, 11. November 2015 um 13:14:11, schrieb Scott Kostyshak > > > > > > > On Wed,

Re: synchronizing po file of branch and trunk

2015-11-11 Thread Kornel Benko
Am Mittwoch, 11. November 2015 um 13:59:39, schrieb Scott Kostyshak > On Wed, Nov 11, 2015 at 07:46:46PM +0100, Kornel Benko wrote: > > Am Mittwoch, 11. November 2015 um 13:14:11, schrieb Scott Kostyshak > > > > > On Wed, Nov 11, 2015 at 12:52:43AM -0800, Pavel Sanda wrote: > > > > Scott Kostys

Re: synchronizing po file of branch and trunk

2015-11-11 Thread Scott Kostyshak
On Wed, Nov 11, 2015 at 07:46:46PM +0100, Kornel Benko wrote: > Am Mittwoch, 11. November 2015 um 13:14:11, schrieb Scott Kostyshak > > > On Wed, Nov 11, 2015 at 12:52:43AM -0800, Pavel Sanda wrote: > > > Scott Kostyshak wrote: > > > > I thought I just needed to overwrite the trunk po files with

Re: synchronizing po file of branch and trunk

2015-11-11 Thread Kornel Benko
Am Mittwoch, 11. November 2015 um 13:14:11, schrieb Scott Kostyshak > On Wed, Nov 11, 2015 at 12:52:43AM -0800, Pavel Sanda wrote: > > Scott Kostyshak wrote: > > > I thought I just needed to overwrite the trunk po files with the branch > > > po files, but it seems there are changes in the trunk p

Re: synchronizing po file of branch and trunk

2015-11-11 Thread Scott Kostyshak
On Wed, Nov 11, 2015 at 12:52:43AM -0800, Pavel Sanda wrote: > Scott Kostyshak wrote: > > I thought I just needed to overwrite the trunk po files with the branch > > po files, but it seems there are changes in the trunk po files that are > > not in branch (e.g. a73c2647). So what is the procedure f

Re: synchronizing po file of branch and trunk

2015-11-11 Thread Pavel Sanda
Scott Kostyshak wrote: > I thought I just needed to overwrite the trunk po files with the branch > po files, but it seems there are changes in the trunk po files that are > not in branch (e.g. a73c2647). So what is the procedure for this? This is somewhat chaotic territory, you can't be really sur