I asked the author of deadbeef and here is his workflow: 1. Do new UI changes and add new string in master branch, and sync the changes with i18n branch. 2. Do translations in i18n branch, and after it's well tested, merge it back to master.
What we're doing now: 1. Clone the i18n branch of deadbeef and put it in i18n branch of our repo lxde/deafbeef. 2. Sync with the author's i18n branch 3. Do the translations in i18n branch of our lxde/deadbeef repo. 4. The author will merge our translations back to his own i18n branch. 5. When he sees fit, he'll merge his i18n branch to his master branch, so our translations get into his master branch. It's a little bit complicated, but it will works. We don't need to sync with his i18n branch. He'll push new changes to our repo when he change his i18n branch. What we only need to do is to make sure our translation systems works with i18n branch of our lxde/deadbeef repo. Is this explanation ok for you? On Thu, May 27, 2010 at 11:12 PM, Martin Bagge / brother <[email protected]> wrote: > Hi > I have had some serious battle with the deadbeef repo today and it is > probably mostly because of my lacking git knowledge. > > There are two branches at the repo, master and i18n. Earlier there were > only one (i18n) and I followed that. After my clone refused to merge two > commits I dropped the clone and started fresh and I am now following the > master branch. > > It looks like Transifex is following the i18n branch though. As we have > earlier discussed that languages probably not should be worked on in > both tools this will hopefully not be of any issues but it's a bit > unpractical for sure. > > What branch serves what purpose? > Should I change or should Transifex change? > > Can somebody please tell me how to do it. My earlier method to get > things going lead up to this mess so I really need some help with this > setup, my knowledge in git is really low. > > This was what I did that failed HARD: > git clone git://lxde.git.sourceforge.net/gitroot/lxde/deadbeef > cd deadbeef > git checkout --track -b l10n origin/i18n > > Adn ofc I added the push url to the .git/config file. The l10n branch > somehow ended up at the remote repo. > > This time it looks like this: > r...@l10n:/var/lib/pootle/po/lxde/deadbeef/po (master)# git branch -av > * master dad344c [ahead 13, behind 2] Resync PO files > remotes/origin/HEAD -> origin/master > remotes/origin/i18n bc8542c Commit from LXDE Translation Proj... > remotes/origin/master dad344c Resync PO files > > What puzzles me here is "ahead 13, behind 2". As far as I can tell I am > not behind at all and not ahead either. > > -- > brother > http://sis.bthstudent.se > > ------------------------------------------------------------------------------ > > _______________________________________________ > Lxde-list mailing list > [email protected] > https://lists.sourceforge.net/lists/listinfo/lxde-list > ------------------------------------------------------------------------------ _______________________________________________ Lxde-list mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/lxde-list
