[gnome-nettool] Created branch gnome-2-32

2010-11-04 Thread Robert Ancell
The branch 'gnome-2-32' was created pointing to: 6a9bdf9... Added UG translation ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n

Re: GCompris needs a translation update

2010-11-04 Thread Bruno Coudoin
Le jeudi 04 novembre 2010 à 15:32 +0200, Simos Xenitellis a écrit : > The only concern for this is what happens to those that already have a > copy of the repository. > Would those with a copy of the repository be able to pull with 'git > pull' and update as normal? If it is possible, then this is

Re: GCompris needs a translation update

2010-11-04 Thread Bruno Coudoin
Le jeudi 04 novembre 2010 à 15:00 +0200, Simos Xenitellis a écrit : > which means that it requires quite a bit of manual labor. > True, I spent a couple hours and resigned in front of the task. -- Bruno Coudoin http://gcompris.net Free educational software for kids http://toulibre.org Logicie

Re: GCompris needs a translation update

2010-11-04 Thread Simos Xenitellis
2010/11/4 Simos Xenitellis > > 2010/11/4 Александър Шопов > > > If you find a git expert who knows how to reconcile two branches who >> Not an expert, but won't >> >> git branch -m do the trick? >> http://www.dmo.ca/blog/20080307124544/ >> >> > As Claude mentioned, the two branches diverged qui

Re: GCompris needs a translation update

2010-11-04 Thread Simos Xenitellis
2010/11/4 Александър Шопов > > If you find a git expert who knows how to reconcile two branches who > Not an expert, but won't > > git branch -m do the trick? > http://www.dmo.ca/blog/20080307124544/ > > As Claude mentioned, the two branches diverged quite a bit. If you checkout from one branch

Re: GCompris needs a translation update

2010-11-04 Thread Александър Шопов
> If you find a git expert who knows how to reconcile two branches who Not an expert, but won't git branch -m do the trick? http://www.dmo.ca/blog/20080307124544/ Kind regards: al_shopov ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.g

Re: GCompris needs a translation update

2010-11-04 Thread Claude Paroz
Le jeudi 04 novembre 2010 à 08:36 +0100, Matej Urban a écrit : > On Wed, Nov 3, 2010 at 7:18 PM, Bruno Coudoin > wrote: > > Le mercredi 03 novembre 2010 à 16:23 +0100, Jorge González González a > > écrit : > >> Hi: > >> > >> El mar, 02-11-2010 a las 22:58 +0100, Bruno Coudoin escribió: > >> > Hi,

Re: GCompris needs a translation update

2010-11-04 Thread Jorge González González
Hi, > Oh, darn, and I was updating master all the time, leaving gcompriogoo > unmaintained. > Shouldn't be master branch the one "logically" always on the top of > development? > > Are there any other project with not-master as their master? > Just want to know, how much work I will have to do a

Re: GCompris needs a translation update

2010-11-04 Thread Matej Urban
On Wed, Nov 3, 2010 at 7:18 PM, Bruno Coudoin wrote: > Le mercredi 03 novembre 2010 à 16:23 +0100, Jorge González González a > écrit : >> Hi: >> >> El mar, 02-11-2010 a las 22:58 +0100, Bruno Coudoin escribió: >> > Hi, >> > >> > We have set the 26th of November as the new release date for GCompris