Re: [Sugar-devel] #3797 localization UNSP: Update pootle strings for Graph Plotter
On Mon, Aug 13, 2012 at 10:09 AM, S. Daniel Francis wrote: > 2012/8/13 Chris Leonard : >> Daniel, >> >> In that case, it is I who owes you an apology. I am not a git expert >> and I had some difficulty getting the repos synched up, It would >> appear then that I inadvertently issued a git command that reverted >> your Gitorious repo to what was in the local Pootle repo and I am >> sincerely sorry. >> >> Thankfully, with the history kept by git, it should be simple for you >> to correct my mistake. >> > Don't worry, I didn't touch the mainline repository after the release > 4 because I'm developing Sweetener, a framework which can do the > activity compatible with Sugar and desktop environments (the Sugar > ToolButtons can be seen as menu items at GNOME) and it implies the > unreleased changes are in other temporal repository, so I got all the > files from ASLO and no much more to do. > > ~danielf I asked Aleksey Lim to help me review this and I believe it is all straightened out now, we may need to wait another day for the pot regeneration cycle to catch up, but hopefully things will go smoothly after that. Sorry for the trouble and thanks to Aleksey. cjl ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] #3797 localization UNSP: Update pootle strings for Graph Plotter
2012/8/13 Chris Leonard : > Daniel, > > In that case, it is I who owes you an apology. I am not a git expert > and I had some difficulty getting the repos synched up, It would > appear then that I inadvertently issued a git command that reverted > your Gitorious repo to what was in the local Pootle repo and I am > sincerely sorry. > > Thankfully, with the history kept by git, it should be simple for you > to correct my mistake. > Don't worry, I didn't touch the mainline repository after the release 4 because I'm developing Sweetener, a framework which can do the activity compatible with Sugar and desktop environments (the Sugar ToolButtons can be seen as menu items at GNOME) and it implies the unreleased changes are in other temporal repository, so I got all the files from ASLO and no much more to do. ~danielf ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] #3797 localization UNSP: Update pootle strings for Graph Plotter
On Mon, Aug 13, 2012 at 8:47 AM, S. Daniel Francis wrote: > I think I found the problem, I just pulled the pootle commits, it > reverted all the changes done after the previous pootle commit > (version 1), and of course the new strings for be translated. I'll > push the current version (version 3) and watch what happens with > pootle and the git repository. > > Thanks for your patience. Daniel, In that case, it is I who owes you an apology. I am not a git expert and I had some difficulty getting the repos synched up, It would appear then that I inadvertently issued a git command that reverted your Gitorious repo to what was in the local Pootle repo and I am sincerely sorry. Thankfully, with the history kept by git, it should be simple for you to correct my mistake. cjl Sugar Labs Translation Team Coordinator ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] #3797 localization UNSP: Update pootle strings for Graph Plotter
2012/8/13 Chris Leonard : > > Initial investigation showed a lack of synchrony between Gitorious and > Pootle local git copy of about 28 commits. The common cause of this > is direct commit to the /po dir by the dev. > > http://wiki.sugarlabs.org/go/Translation_Team/i18n_Best_Practices#Do_not_touch_anything_inside_your_po_directory > > Manual re-synch was performed, all indications are that POT updates > are happening as normal. Please specify a string that is not > appearing in the PO so that a closer examination can be performed. > > cjl I think I found the problem, I just pulled the pootle commits, it reverted all the changes done after the previous pootle commit (version 1), and of course the new strings for be translated. I'll push the current version (version 3) and watch what happens with pootle and the git repository. Thanks for your patience. ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] #3797 localization UNSP: Update pootle strings for Graph Plotter
On Sun, Aug 12, 2012 at 6:30 PM, S. Daniel Francis wrote: > 2012/8/12 Sugar Labs Bugs : >> Comment: >> >> I fixed it manually. >> >> When you touch files in the /po dir in Gitorious it gets out of synch with >> the local copy that Pootle holds (and uses to recalculate the POT >> template) and this causes a failure to update the POT. The POT is now up- >> to-date in Poolte and commits from Pootle will work (instead of fail). >> >> Closing as fixed. >> >> cjl > > I forgot to say I'm sorry. > > I prefer asking it out of bugs.sl.org: > I'm looking the Spanish translations on pootle and the new strings > aren't there. Is pootle going to check my activity and make a new pot > file? or it isn't completely ´fixed´? > I note I received a commit from pootle with a small change at the file header. > > Cheers. > ~danielf Initial investigation showed a lack of synchrony between Gitorious and Pootle local git copy of about 28 commits. The common cause of this is direct commit to the /po dir by the dev. http://wiki.sugarlabs.org/go/Translation_Team/i18n_Best_Practices#Do_not_touch_anything_inside_your_po_directory Manual re-synch was performed, all indications are that POT updates are happening as normal. Please specify a string that is not appearing in the PO so that a closer examination can be performed. cjl ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] #3797 localization UNSP: Update pootle strings for Graph Plotter
2012/8/12 Sugar Labs Bugs : > Comment: > > I fixed it manually. > > When you touch files in the /po dir in Gitorious it gets out of synch with > the local copy that Pootle holds (and uses to recalculate the POT > template) and this causes a failure to update the POT. The POT is now up- > to-date in Poolte and commits from Pootle will work (instead of fail). > > Closing as fixed. > > cjl I forgot to say I'm sorry. I prefer asking it out of bugs.sl.org: I'm looking the Spanish translations on pootle and the new strings aren't there. Is pootle going to check my activity and make a new pot file? or it isn't completely ´fixed´? I note I received a commit from pootle with a small change at the file header. Cheers. ~danielf ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
