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 > <skost...@lyx.org> > > 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 > > > <skost...@lyx.org> > > > > 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 for this? > > > > > > > > > > This is somewhat chaotic territory, you can't be really sure without > > > > > consulting git log. > > > > > Usually sk.po/de.po will be newer in master plus some random chunks > > > > > when Uwe proxy > > > > > commits. (I think last time he cared about this transition). > > > > > > > > I see. I do not mind consulting git log. To make sure I understand > > > > correctly, just to simplify things, if I do the following: > > > > > > > > git log zz.po > > > > > > > > both on master and on branch, and I see that the date of the latest > > > > commit is newer on branch than it is on master, then I should copy the > > > > po file from branch to master. If the date of the latest commit is newer > > > > on master than it is on branch, then I should do nothing. > > > > > > > > Is that a sufficient rule to decide by? Or is there another source of > > > > chaos? > > > > > > > > Scott > > > > > > What if I make a commit to master and later commit also to branch? It > > > happens for e.g. sk.po. > > > > Why would something go wrong if I follow the strategy above? In this > > case because you later commit to branch, I would copy the sk.po from > > branch to master. Would that cause a problem? > > > > Note that I know very little about po files and the translation process. > > I would like to learn more though since it is an important part of LyX's > > development and release. > > 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 updated on master then. I'm not sure what else I could do. Scott
