On Tue, Jan 11, 2011 at 2:08 PM, Gonzalo Odiard gonz...@laptop.org wrote:
The following activities projects have merge or pull conflicts.
Remember: If you change anything inside the po directory (including the POT
file), and push it to Git, it will create a conflict which has to be updated
in
Walter:
Pootle generate the pot file from the sources he takes from git.
You can read
http://wiki.sugarlabs.org/go/Translation_Team/i18n_Best_Practices
and http://wiki.sugarlabs.org/go/Translation_Team/Workflow
Gonzalo
I don't understand how the .pot file can represent a conflict. Pootle
is
Fortunately is not in all your projects, you are too much prolific ;)
I can do a pull -s ours in the pootle server to merge your changes but
preserving the changes in pootle.
From your activities, I only see conflicts in VisualMatch.
Gonzalo
My mistake. I have screwed this up on all of my
Excerpts from Gonzalo Odiard's message of Wed Jan 12 16:24:00 +0100 2011:
Pootle generate the pot file from the sources he takes from git.
You can read
http://wiki.sugarlabs.org/go/Translation_Team/i18n_Best_Practices
and http://wiki.sugarlabs.org/go/Translation_Team/Workflow
Since Pootle
Hi Gonzalo,
On 12 Jan 2011, at 15:24, Gonzalo Odiard gonz...@laptop.org wrote:
Walter:
Pootle generate the pot file from the sources he takes from git.
You can read http://wiki.sugarlabs.org/go/Translation_Team/i18n_Best_Practices
and http://wiki.sugarlabs.org/go/Translation_Team/Workflow
On 12.01.2011, at 19:07, Gary Martin wrote:
Hi Gonzalo,
On 12 Jan 2011, at 15:24, Gonzalo Odiard gonz...@laptop.org wrote:
Walter:
Pootle generate the pot file from the sources he takes from git.
You can read
http://wiki.sugarlabs.org/go/Translation_Team/i18n_Best_Practices
and
What if we promote use a file .gitignore with po/* in all the activities
translated by pootle?
Gonzalo
On Wed, Jan 12, 2011 at 2:29 PM, Sascha Silbe si...@sugarlabs.org wrote:
Excerpts from Gonzalo Odiard's message of Wed Jan 12 16:24:00 +0100 2011:
Pootle generate the pot file from the
Only when they use pootle to translate it.
Gonzalo
On Wed, Jan 12, 2011 at 3:07 PM, Gary Martin garycmar...@googlemail.comwrote:
Hi Gonzalo,
On 12 Jan 2011, at 15:24, Gonzalo Odiard gonz...@laptop.org wrote:
Walter:
Pootle generate the pot file from the sources he takes from git.
You can
On Wed, Jan 12, 2011 at 1:09 PM, Bert Freudenberg b...@freudenbergs.de wrote:
On 12.01.2011, at 19:07, Gary Martin wrote:
So activity developers/maintainers should never ./setup genpot, or commit
and push a .pot file when first building an activity?
Gary -- correct. If github allowed hooks,
On Wed, Jan 12, 2011 at 4:26 PM, Martin Langhoff
martin.langh...@gmail.com wrote:
On Wed, Jan 12, 2011 at 1:09 PM, Bert Freudenberg b...@freudenbergs.de
wrote:
On 12.01.2011, at 19:07, Gary Martin wrote:
So activity developers/maintainers should never ./setup genpot, or commit
and push a
On Wed, Jan 12, 2011 at 4:39 PM, Walter Bender walter.ben...@gmail.com wrote:
Why are conflicts only showing up now, and for only some of my
activities? Or had Sayamindu been cleaning things up behind the
scenes?
Well, they've been accumulating for a while, and nobody's noticed
until we
In Make Your Own Sugar Activities! I specifically tell people to run
./setup.py genpot. If there's anything wrong in that chapter I'd like
to correct it. We need to fix the Spanish version too.
The URL is:
http://en.flossmanuals.net/ActivitiesGuideSugar/GoingInternationalWithPootle
James
On Wed, Jan 12, 2011 at 4:57 PM, James Simmons nices...@gmail.com wrote:
In Make Your Own Sugar Activities! I specifically tell people to run
./setup.py genpot. If there's anything wrong in that chapter I'd like
to correct it. We need to fix the Spanish version too.
The problem is not in
On Wed, Jan 12, 2011 at 4:57 PM, James Simmons nices...@gmail.com wrote:
In Make Your Own Sugar Activities! I specifically tell people to run
./setup.py genpot. If there's anything wrong in that chapter I'd like
to correct it. We need to fix the Spanish version too.
Good point. I'm not sure
On Wed, Jan 12, 2011 at 4:26 PM, Martin Langhoff
martin.langh...@gmail.com wrote:
On Wed, Jan 12, 2011 at 1:09 PM, Bert Freudenberg b...@freudenbergs.de
wrote:
That's a very unusual setup. IMHO it should be the developer's choice when
to generate the POT.
Bert - I'm not an expert in PO
The following activities projects have merge or pull conflicts.
Remember: If you change anything inside the po directory (including the POT
file), and push it to Git, it will create a conflict which has to be updated
in the Pootle side manually.
16 matches
Mail list logo
