Re: [Sugar-devel] Conflicts in pootle
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 the Pootle side manually. http://wiki.sugarlabs.org/go/Translation_Team/i18n_Best_Practices Please maintainers try to revert the commits if is possible or tell ma and I can merge the changes with the Pootle ones. --- honey/kandid: # Your branch is behind 'origin/master' by 16 commits, and can be fast-forwarded. The offending commit must be: http://git.sugarlabs.org/kandid/mainline/commit/0e093254c3c3e10569fa3a199d5609695bcb395f File po/Kandid.pot honey/viewslides: # Your branch is behind 'origin/master' by 7 commits, and can be fast-forwarded. The offending commit must be: http://git.sugarlabs.org/viewslides/mainline/commit/48438c1a84536e2f7e57c2d46f5fcd143ab64cbd File po/el.po honey/visualmatch: # Your branch is behind 'origin/master' by 32 commits, and can be fast-forwarded. The offending commit must be: http://git.sugarlabs.org/visualmatch/mainline/commit/8adf1632be974cfe1cce1bc0e8b2d833fa25a9d0 or http://git.sugarlabs.org/visualmatch/mainline/commit/f0d175677d970f39eacb5ef2d80cc24dca9418d1 File po/VisualMatch.pot I don't understand how the .pot file can represent a conflict. Pootle is suppose to pull .pot files from git, not push to git. -walter fructose82/calculate-activity: # Your branch is ahead of 'origin/sucrose-0.82' by 4 commits. Solved fructose82/pippy-activity: # Your branch is behind 'origin/master' by 22 commits, and can be fast-forwarded. Solved glucose84/sugar: # Your branch is behind 'origin/sucrose-0.84' by 49 commits, and can be fast-forwarded. Solved glucose84/sugar-base: # Your branch is behind 'origin/master' by 11 commits, and can be fast-forwarded. Solved Regards, Gonzalo ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel -- Walter Bender Sugar Labs http://www.sugarlabs.org ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] Conflicts in pootle
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 suppose to pull .pot files from git, not push to git. -walter ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] Conflicts in pootle
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 projects. What is the best way to resolve the conflicts? -walter I don't understand how the .pot file can represent a conflict. Pootle is suppose to pull .pot files from git, not push to git. -walter -- Walter Bender Sugar Labs http://www.sugarlabs.org ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] Conflicts in pootle
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 now seems to generate the POT itself, can we remove it from git, please? It's very easy and quite annoying to accidentally include POT changes (which can happen even without string changes) in commits. Sascha -- http://sascha.silbe.org/ http://www.infra-silbe.de/ signature.asc Description: PGP signature ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] Conflicts in 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 So activity developers/maintainers should never ./setup genpot, or commit and push a .pot file when first building an activity? Regards, --Gary Gonzalo I don't understand how the .pot file can represent a conflict. Pootle is suppose to pull .pot files from git, not push to git. -walter ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] Conflicts in pootle
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 http://wiki.sugarlabs.org/go/Translation_Team/Workflow So activity developers/maintainers should never ./setup genpot, or commit and push a .pot file when first building an activity? Regards, --Gary That's a very unusual setup. IMHO it should be the developer's choice when to generate the POT. - Bert - ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] Conflicts in pootle
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 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 now seems to generate the POT itself, can we remove it from git, please? It's very easy and quite annoying to accidentally include POT changes (which can happen even without string changes) in commits. Sascha -- http://sascha.silbe.org/ http://www.infra-silbe.de/ ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] Conflicts in pootle
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 read http://wiki.sugarlabs.org/go/Translation_Team/i18n_Best_Practices http://wiki.sugarlabs.org/go/Translation_Team/i18n_Best_Practices and http://wiki.sugarlabs.org/go/Translation_Team/Workflow http://wiki.sugarlabs.org/go/Translation_Team/Workflow So activity developers/maintainers should never ./setup genpot, or commit and push a .pot file when first building an activity? Regards, --Gary Gonzalo I don't understand how the .pot file can represent a conflict. Pootle is suppose to pull .pot files from git, not push to git. -walter ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] Conflicts in pootle
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, I'd suggest a hook that rejects pushes that change anything in the .po file (unless the pusher is Pootle). 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 and POT files, but Pootle seems to make the assumtion that everything under the po directory, including the POT file, is under its control. The POT file is generated automatically, based on your sources, so in general this should not be an issue. Special cases do exist I am sure :-) We could mess around with Pootle, but limited manpower from all sides says... let's try to avoid it. To wit - I drafted a change that would allow Pootle to override the POT file when necessary but I commented out. One oddity with Pootle is that it seems to treat the POT and PO files it works on as the main data repository. Initially I thought its main data was in the DB, and it would export to POT PO files; but apparently that's not the case. The PO and POT files are the main data storage. So I am very hesitant to change how they are managed. OTOH, I may have misunderstood the Pootle code, we didn't work in depth on it :-) m -- martin.langh...@gmail.com mar...@laptop.org -- School Server Architect - ask interesting questions - don't get distracted with shiny stuff - working code first - http://wiki.laptop.org/go/User:Martinlanghoff ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] Conflicts in pootle
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 .pot file when first building an activity? Gary -- correct. If github allowed hooks, I'd suggest a hook that rejects pushes that change anything in the .po file (unless the pusher is Pootle). 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 and POT files, but Pootle seems to make the assumtion that everything under the po directory, including the POT file, is under its control. The POT file is generated automatically, based on your sources, so in general this should not be an issue. Special cases do exist I am sure :-) We could mess around with Pootle, but limited manpower from all sides says... let's try to avoid it. To wit - I drafted a change that would allow Pootle to override the POT file when necessary but I commented out. One oddity with Pootle is that it seems to treat the POT and PO files it works on as the main data repository. Initially I thought its main data was in the DB, and it would export to POT PO files; but apparently that's not the case. The PO and POT files are the main data storage. So I am very hesitant to change how they are managed. OTOH, I may have misunderstood the Pootle code, we didn't work in depth on it :-) m -- martin.langh...@gmail.com mar...@laptop.org -- School Server Architect - ask interesting questions - don't get distracted with shiny stuff - working code first - http://wiki.laptop.org/go/User:Martinlanghoff ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel What is strange to me is that from Day One I had been operating under the mistaken assumption that activity developers were suppose to push changes to the POT file (but not the PO files) and have been doing so. Why are conflicts only showing up now, and for only some of my activities? Or had Sayamindu been cleaning things up behind the scenes? -walter -- Walter Bender Sugar Labs http://www.sugarlabs.org ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] Conflicts in pootle
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 looked. When we looked earlier this week, some activities' translations had been held up for a while. As Gonzalo pointed out, Pootle reports errors to the end user when synchronizing, and doesn't log them anywhere, nor report them to admins that can sort them out. That's why we added scripts to alert people of conflicts and other issues. And yes, I think Sayamindu used to helpfully clean up lots of little things :-) cheers, m -- martin.langh...@gmail.com mar...@laptop.org -- School Server Architect - ask interesting questions - don't get distracted with shiny stuff - working code first - http://wiki.laptop.org/go/User:Martinlanghoff ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] Conflicts in pootle
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 Simmons On Wed, Jan 12, 2011 at 3:39 PM, Walter Bender walter.ben...@gmail.com wrote: 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 .pot file when first building an activity? Gary -- correct. If github allowed hooks, I'd suggest a hook that rejects pushes that change anything in the .po file (unless the pusher is Pootle). 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 and POT files, but Pootle seems to make the assumtion that everything under the po directory, including the POT file, is under its control. The POT file is generated automatically, based on your sources, so in general this should not be an issue. Special cases do exist I am sure :-) We could mess around with Pootle, but limited manpower from all sides says... let's try to avoid it. To wit - I drafted a change that would allow Pootle to override the POT file when necessary but I commented out. One oddity with Pootle is that it seems to treat the POT and PO files it works on as the main data repository. Initially I thought its main data was in the DB, and it would export to POT PO files; but apparently that's not the case. The PO and POT files are the main data storage. So I am very hesitant to change how they are managed. OTOH, I may have misunderstood the Pootle code, we didn't work in depth on it :-) m -- martin.langh...@gmail.com mar...@laptop.org -- School Server Architect - ask interesting questions - don't get distracted with shiny stuff - working code first - http://wiki.laptop.org/go/User:Martinlanghoff ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel What is strange to me is that from Day One I had been operating under the mistaken assumption that activity developers were suppose to push changes to the POT file (but not the PO files) and have been doing so. Why are conflicts only showing up now, and for only some of my activities? Or had Sayamindu been cleaning things up behind the scenes? -walter -- Walter Bender Sugar Labs http://www.sugarlabs.org ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] Conflicts in pootle
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 running genpot, it is in pushing the pot file to git. We should recommend adding to .gitignore as previously suggested: po/* -walter The URL is: http://en.flossmanuals.net/ActivitiesGuideSugar/GoingInternationalWithPootle James Simmons On Wed, Jan 12, 2011 at 3:39 PM, Walter Bender walter.ben...@gmail.com wrote: 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 .pot file when first building an activity? Gary -- correct. If github allowed hooks, I'd suggest a hook that rejects pushes that change anything in the .po file (unless the pusher is Pootle). 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 and POT files, but Pootle seems to make the assumtion that everything under the po directory, including the POT file, is under its control. The POT file is generated automatically, based on your sources, so in general this should not be an issue. Special cases do exist I am sure :-) We could mess around with Pootle, but limited manpower from all sides says... let's try to avoid it. To wit - I drafted a change that would allow Pootle to override the POT file when necessary but I commented out. One oddity with Pootle is that it seems to treat the POT and PO files it works on as the main data repository. Initially I thought its main data was in the DB, and it would export to POT PO files; but apparently that's not the case. The PO and POT files are the main data storage. So I am very hesitant to change how they are managed. OTOH, I may have misunderstood the Pootle code, we didn't work in depth on it :-) m -- martin.langh...@gmail.com mar...@laptop.org -- School Server Architect - ask interesting questions - don't get distracted with shiny stuff - working code first - http://wiki.laptop.org/go/User:Martinlanghoff ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel What is strange to me is that from Day One I had been operating under the mistaken assumption that activity developers were suppose to push changes to the POT file (but not the PO files) and have been doing so. Why are conflicts only showing up now, and for only some of my activities? Or had Sayamindu been cleaning things up behind the scenes? -walter -- Walter Bender Sugar Labs http://www.sugarlabs.org ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel -- Walter Bender Sugar Labs http://www.sugarlabs.org ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] Conflicts in pootle
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 what happens when you start a new activity. It's probably harmless. Once it's hooked up to Pootle, however, the whole po directory should only be managed by Pootle. I am not sure about the .gitignore suggestion -- it may mess up Pootle. m -- martin.langh...@gmail.com mar...@laptop.org -- School Server Architect - ask interesting questions - don't get distracted with shiny stuff - working code first - http://wiki.laptop.org/go/User:Martinlanghoff ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] Conflicts in pootle
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 and POT files, but Pootle seems to make the assumtion that everything under the po directory, including the POT file, is under its control. I rather suspect that generating the pot is a specialty added only for this Pootle installation? We've been checking in pot's for years. The POT file is generated automatically, based on your sources, so in general this should not be an issue. Special cases do exist I am sure :-) Indeed. - Bert - ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
[Sugar-devel] Conflicts in pootle
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. http://wiki.sugarlabs.org/go/Translation_Team/i18n_Best_Practices Please maintainers try to revert the commits if is possible or tell ma and I can merge the changes with the Pootle ones. --- honey/kandid: # Your branch is behind 'origin/master' by 16 commits, and can be fast-forwarded. The offending commit must be: http://git.sugarlabs.org/kandid/mainline/commit/0e093254c3c3e10569fa3a199d5609695bcb395f File po/Kandid.pot honey/viewslides: # Your branch is behind 'origin/master' by 7 commits, and can be fast-forwarded. The offending commit must be: http://git.sugarlabs.org/viewslides/mainline/commit/48438c1a84536e2f7e57c2d46f5fcd143ab64cbd File po/el.po honey/visualmatch: # Your branch is behind 'origin/master' by 32 commits, and can be fast-forwarded. The offending commit must be: http://git.sugarlabs.org/visualmatch/mainline/commit/8adf1632be974cfe1cce1bc0e8b2d833fa25a9d0 or http://git.sugarlabs.org/visualmatch/mainline/commit/f0d175677d970f39eacb5ef2d80cc24dca9418d1 File po/VisualMatch.pot fructose82/calculate-activity: # Your branch is ahead of 'origin/sucrose-0.82' by 4 commits. Solved fructose82/pippy-activity: # Your branch is behind 'origin/master' by 22 commits, and can be fast-forwarded. Solved glucose84/sugar: # Your branch is behind 'origin/sucrose-0.84' by 49 commits, and can be fast-forwarded. Solved glucose84/sugar-base: # Your branch is behind 'origin/master' by 11 commits, and can be fast-forwarded. Solved Regards, Gonzalo ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
