Re: GCompris needs a translation update
On Wed, May 16, 2012 at 11:20 AM, Bruno Coudoin bruno.coud...@gcompris.net wrote: Hi, We have set the 3rd of June as the new release date for GCompris. It will be mostly a maintenance release, a good opportunity to update the translations if its not already done. Also, you can refer to this page for additional instructions: http://gcompris.net/wiki/Translation_addons Thanks for your help, Bruno. Dear Gnome L10n teams, I would like to add my voice to Bruno's in asking for your help with completing the GCompris strings for the upcoming release. http://l10n.gnome.org/module/gcompris/ At Sugar Labs, we give GCompris games a light coat of Sugar and re-package them as Activities for deployment on OLPC XO laptops (and the other ways of tasting Sugar). http://wiki.sugarlabs.org/go/DocumentationTeam/Try_Sugar The GCompris games are very popular with deployments and any assistance with making these learning games available in these children's native languages would be much appreciated and a wonderful contribution to education. Warmest Regards, cjl Sugar Labs Translation Team Coordinator ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
GCompris needs a translation update
Hi, We have set the 3rd of June as the new release date for GCompris. It will be mostly a maintenance release, a good opportunity to update the translations if its not already done. Also, you can refer to this page for additional instructions: http://gcompris.net/wiki/Translation_addons Thanks for your help, Bruno. ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: GCompris needs a translation update
Le samedi 12 février 2011 à 13:16 +0100, Bruno Coudoin a écrit : Hi, We have set the 26th of February as the new release date for GCompris. A good opportunity to update the translation if its not already done. Please note that we are back on the master branch. Also, you can refer to this page for additional instructions: http://gcompris.net/wiki/Translation_addons Hi all, Some translators asked for a delay so the release date is now fixed to Monday evening the 28th Paris time. By the way, thanks a lot for the numerous translation updates we received. Bruno. ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
GCompris needs a translation update
Hi, We have set the 26th of February as the new release date for GCompris. A good opportunity to update the translation if its not already done. Please note that we are back on the master branch. Also, you can refer to this page for additional instructions: http://gcompris.net/wiki/Translation_addons Thanks for your help, -- Bruno Coudoin http://gcompris.net Free educational software for kids http://toulibre.org Logiciel Libre à Toulouse http://april.org Promouvoir et défendre le Logiciel Libre ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: GCompris needs a translation update
On Thu, Jan 06, 2011 at 11:34:48PM +0100, Bruno Coudoin wrote: Le jeudi 06 janvier 2011 à 08:39 +0100, Olav Vitters a écrit : git.gnome.org doesn't accept it from you. But I can still (forcefully) run the command if you're ok with it :) scripts have exceptions for sysadmins and so on I created a branch gcompris-8-4-13 to keep track of the latest change in master. Now yes please proceed, I want to be the real master again ;) done I had to commit/copy the gcompris.doap from master to the gcomprixogoo branch. After that I ran the git push -f origin gcomprixogoo:master command. -- Regards, Olav ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: GCompris needs a translation update
Le samedi 08 janvier 2011 à 17:32 +0100, Olav Vitters a écrit : I had to commit/copy the gcompris.doap from master to the gcomprixogoo branch. After that I ran the git push -f origin gcomprixogoo:master command. Thanks a lot, happy to be master again. Bruno. ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: GCompris needs a translation update
Le jeudi 06 janvier 2011 à 08:39 +0100, Olav Vitters a écrit : git.gnome.org doesn't accept it from you. But I can still (forcefully) run the command if you're ok with it :) scripts have exceptions for sysadmins and so on I created a branch gcompris-8-4-13 to keep track of the latest change in master. Now yes please proceed, I want to be the real master again ;) -- Bruno Coudoin http://gcompris.net Free educational software for kids http://toulibre.org Logiciel Libre à Toulouse http://april.org Promouvoir et défendre le Logiciel Libre ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: GCompris needs a translation update
Le dimanche 26 décembre 2010 à 00:05 +0100, Marek Černocký a écrit : I send the word list for Czech. Thanks a lot, it is commited. Bruno. ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: GCompris needs a translation update
On Fri, Nov 05, 2010 at 10:31:38PM +0100, Bruno Coudoin wrote: the help of an admin. I asked the gnome administration team but did not get an answer so far. I think it's because even on the server side it is not that easy to do. I did not notice such a request. Maybe we missed it? Anyway, cannot help as I do not know anything about Git. However, can ask Owen for assistance. -- Regards, Olav ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: GCompris needs a translation update
On Wed, Jan 05, 2011 at 11:52:17PM +0100, Olav Vitters wrote: On Fri, Nov 05, 2010 at 10:31:38PM +0100, Bruno Coudoin wrote: the help of an admin. I asked the gnome administration team but did not get an answer so far. I think it's because even on the server side it is not that easy to do. I did not notice such a request. Maybe we missed it? Anyway, cannot help as I do not know anything about Git. However, can ask Owen for assistance. Ok, talked to Owen. He suggested something equivalent to the following command: git push origin gcomprixogoo:master Is this acceptable? Note: I do not know anything about Git! So I am asking if it would do what is intended as well as for approval. Note to myself (this is sysadmin specific, just ignore): 0. Owen suggested to test scripts before reconfiguring, log: owen bkor: if you want to check the scripts, you could change the setting and do the command above with the -f and without the --exec=force owen bkor: that should deny you because we don't want normal users to do that, and the --exec=force is basically sudo bkor owen: ah, you mean to check if the scripts deny the non-fast-forward owen bkor: yeah, that's what I mean 1. Make backup of repos, as forced non-fast-forward hasn't been tested with our scripts 2. Edit /git/gcompris.git/config, change following to false: [receive] denyNonFastforwards = true 3. Run: git push -f --exec=force origin gcomprixogoo:master -- Regards, Olav ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: GCompris needs a translation update
Le jeudi 06 janvier 2011 à 00:12 +0100, Olav Vitters a écrit : On Wed, Jan 05, 2011 at 11:52:17PM +0100, Olav Vitters wrote: On Fri, Nov 05, 2010 at 10:31:38PM +0100, Bruno Coudoin wrote: the help of an admin. I asked the gnome administration team but did not get an answer so far. I think it's because even on the server side it is not that easy to do. I did not notice such a request. Maybe we missed it? Anyway, cannot help as I do not know anything about Git. However, can ask Owen for assistance. Ok, talked to Owen. He suggested something equivalent to the following command: git push origin gcomprixogoo:master Is this acceptable? Note: I do not know anything about Git! So I am asking if it would do what is intended as well as for approval. Hi, Thanks a lot to take care of this. In fact this command is not accepted by git because it would loose history on the master branch: To ssh://x...@git.gnome.org/git/gcompris ! [rejected]gcomprixogoo - master (non-fast-forward) error: failed to push some refs to 'ssh://x...@git.gnome.org/git/gcompris' To prevent you from losing history, non-fast-forward updates were rejected Merge the remote changes before pushing again. See the 'Note about fast-forwards' section of 'git push --help' for details. Perhaps the idea would be to branch master in a branch gcompris-8.4 starting at when the gcomprixogoo branch was created. I am not sure how to do this either. -- Bruno Coudoin http://gcompris.net Free educational software for kids http://toulibre.org Logiciel Libre à Toulouse http://april.org Promouvoir et défendre le Logiciel Libre ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: GCompris needs a translation update
On Thu, Jan 06, 2011 at 01:34:02AM +0100, Bruno Coudoin wrote: Le jeudi 06 janvier 2011 à 00:12 +0100, Olav Vitters a écrit : On Wed, Jan 05, 2011 at 11:52:17PM +0100, Olav Vitters wrote: On Fri, Nov 05, 2010 at 10:31:38PM +0100, Bruno Coudoin wrote: the help of an admin. I asked the gnome administration team but did not get an answer so far. I think it's because even on the server side it is not that easy to do. I did not notice such a request. Maybe we missed it? Anyway, cannot help as I do not know anything about Git. However, can ask Owen for assistance. Ok, talked to Owen. He suggested something equivalent to the following command: git push origin gcomprixogoo:master Is this acceptable? Note: I do not know anything about Git! So I am asking if it would do what is intended as well as for approval. Hi, Thanks a lot to take care of this. In fact this command is not accepted by git because it would loose history on the master branch: git.gnome.org doesn't accept it from you. But I can still (forcefully) run the command if you're ok with it :) scripts have exceptions for sysadmins and so on -- Regards, Olav ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: GCompris needs a translation update
I send the word list for Czech. Regards Marv Bruno Coudoin píše v Út 02. 11. 2010 v 22:58 +0100: Hi, We have set the 26th of November as the new release date for GCompris. A good opportunity to update the translation if its not already done. There is a special think to do, the new hangman activity uses our src/readingh-activity/resources/wordsgame/default-locale.xml files to propose words to the children. It is thus very important now to have them properly filled with about 1000 to 2000 words. For now I did the work for English and French. Translators, please refer to this page for instructions: http://gcompris.net/wiki/Translation_addons Thanks for your help, default-cs.xml Description: XML document ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: GCompris needs a translation update
El dv 05 de 11 de 2010 a les 13:34 +0200, en/na Khaled Hosny va escriure: On Fri, Nov 05, 2010 at 01:29:15PM +0200, Simos Xenitellis wrote: On Fri, Nov 5, 2010 at 9:51 AM, Matej Urban matej.ur...@gmail.com wrote: Well, we don't care much, the master branch is unmaintained and hopefully nobody uses it. I understand this developers perspecitve. But I read your statement as: Well, we don't care much *about the quality of the translations*, the master branch is unmaintained and *if somebody uses it, , why do we bother translating anyway?*. I also read: If translators want some order in the project, they should get one of those boring paper-sorting jobs. I also hear: Anyway, be glad that we let you use it. Is really so hard to rename master to old_master and then rename gcomvcyvycprxsyvcyvcydsfdaso to master? I would say the concern is something like this, http://stackoverflow.com/questions/1526794/git-rename-remote-branch Bruno mentioned that he does not oppose to the switch (I am rephrasing). Therefore, assuming that indeed people would need to clone again the gcompris repository (who can verify this? Matej, Александър?), there should be an announcement for those with gcompris clones to clone again after a specific cutoff date. I discussed this a while ago with Bruno, and IIRC the only practical solution requires admin intervention because some git operations are restricted on g.g.o. Regards, Khaled Hi, Maybe there's an even easier solution if you (gcompris devs I mean) reply 'no' to the following question: Does any commit on master branch really matters[1]? If the answer is no then you can just clone gcompris and checkout master branch, then in a separate folder clone again compris and checkout to gcomprixogoo. With those two folders (one containing master and the other gcomprixogoo) just do a plain replace of all files changed and added from gcomprixogoo to master and remove all files not in gcomprixogoo which are on master and make a huge commit with it (or partial commits if you prefer). With this you will simulate a git merge but effectively you are making master as gcomprixogoo. With this approach no sysadmins' help is needed and you will be 100% sure that the resulting master branch will be exactly the gcomprixogoo branch. A first step to do this would be to plain copy/replace/remove all images and binary files, just doing a git diff --stat master..gcomprixogoo gives that +5k files are changed but lots of them are images which is trivial to move (you know the good ones are on gcomprixogoo) and it will allow git merge tool to be less stressed when doing the merge. After either approach is taken just create a new branch based on master if you still plan to work on different branches for stable/dev work. Hope this approach can help. Cheers, [1] Sure translations, but those can be easily migrated -- gil forcada [ca] guifi.net - una xarxa lliure que no para de créixer [en] guifi.net - a non-stopping free network bloc: http://gil.badall.net planet: http://planet.guifi.net ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: GCompris needs a translation update
Hi! With this you will simulate a git merge but effectively you are making master as gcomprixogoo. With this approach no sysadmins' help is needed and you will be 100% sure that the resulting master branch will be exactly the gcomprixogoo branch. This would kill the complete history of the gcomprixgoo branch which I wouldn't do as a maintainer. What's the problem in mergin gcromprixgoo in the first place. If the two branches really diverged you could still just revert all commits on master that are in the way master doesn't really matter and do a merge. Maybe there is also some git flag to use the branch version in case of a conflict. I would just ask some git gurus on #gnome-hackers for help - I am pretty sure there is some way. Regards, Johannes ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: GCompris needs a translation update
On Fri, Nov 5, 2010 at 10:31 PM, Bruno Coudoin bruno.coud...@gcompris.net wrote: Le vendredi 05 novembre 2010 à 13:29 +0200, Simos Xenitellis a écrit : You misunderstand me. I am not please with the situation and did my best to have our master branch represent the head of our development branch. As it as been mentioned, it is not possible for me to do it and requires the help of an admin. I asked the gnome administration team but did not get an answer so far. I think it's because even on the server side it is not that easy to do. I am still open to suggestion to fix the problem. I'm really glad I misunderstood you :) Unfortunately I do not have the knowledge to be of any use. Hopefully DL guys will master it. M! ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: GCompris needs a translation update
Well, we don't care much, the master branch is unmaintained and hopefully nobody uses it. I understand this developers perspecitve. But I read your statement as: Well, we don't care much *about the quality of the translations*, the master branch is unmaintained and *if somebody uses it, , why do we bother translating anyway?*. I also read: If translators want some order in the project, they should get one of those boring paper-sorting jobs. I also hear: Anyway, be glad that we let you use it. Is really so hard to rename master to old_master and then rename gcomvcyvycprxsyvcyvcydsfdaso to master? A, really, now that I know that master is actually obsolete, I'll sync the translations. No problem. This proggy is getting quite a momentum in local schools and they do not care about branches. Thank you for the good work! M! ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: GCompris needs a translation update
On Fri, Nov 05, 2010 at 01:29:15PM +0200, Simos Xenitellis wrote: On Fri, Nov 5, 2010 at 9:51 AM, Matej Urban matej.ur...@gmail.com wrote: Well, we don't care much, the master branch is unmaintained and hopefully nobody uses it. I understand this developers perspecitve. But I read your statement as: Well, we don't care much *about the quality of the translations*, the master branch is unmaintained and *if somebody uses it, , why do we bother translating anyway?*. I also read: If translators want some order in the project, they should get one of those boring paper-sorting jobs. I also hear: Anyway, be glad that we let you use it. Is really so hard to rename master to old_master and then rename gcomvcyvycprxsyvcyvcydsfdaso to master? I would say the concern is something like this, http://stackoverflow.com/questions/1526794/git-rename-remote-branch Bruno mentioned that he does not oppose to the switch (I am rephrasing). Therefore, assuming that indeed people would need to clone again the gcompris repository (who can verify this? Matej, Александър?), there should be an announcement for those with gcompris clones to clone again after a specific cutoff date. I discussed this a while ago with Bruno, and IIRC the only practical solution requires admin intervention because some git operations are restricted on g.g.o. Regards, Khaled -- Khaled Hosny Arabic localiser and member of Arabeyes.org team Free font developer ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: GCompris needs a translation update
Le vendredi 05 novembre 2010 à 13:29 +0200, Simos Xenitellis a écrit : On Fri, Nov 5, 2010 at 9:51 AM, Matej Urban matej.ur...@gmail.com wrote: Well, we don't care much, the master branch is unmaintained and hopefully nobody uses it. I understand this developers perspecitve. But I read your statement as: Well, we don't care much *about the quality of the translations*, the master branch is unmaintained and *if somebody uses it, , why do we bother translating anyway?*. I also read: If translators want some order in the project, they should get one of those boring paper-sorting jobs. I also hear: Anyway, be glad that we let you use it. Is really so hard to rename master to old_master and then rename gcomvcyvycprxsyvcyvcydsfdaso to master? You misunderstand me. I am not please with the situation and did my best to have our master branch represent the head of our development branch. As it as been mentioned, it is not possible for me to do it and requires the help of an admin. I asked the gnome administration team but did not get an answer so far. I think it's because even on the server side it is not that easy to do. I am still open to suggestion to fix the problem. -- Bruno Coudoin http://gcompris.net Free educational software for kids http://toulibre.org Logiciel Libre à Toulouse http://april.org Promouvoir et défendre le Logiciel Libre ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: GCompris needs a translation update
On Wed, Nov 3, 2010 at 7:18 PM, Bruno Coudoin bruno.coud...@gcompris.net 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. A good opportunity to update the translation if its not already done. are you going to release the new version based on gcomprixogoo or in master? Sorry, I should have mentioned it, the current working branch is gcomprixogoo. master is not maintained anymore. 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 again. This should be policy if you ask me. M! ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: GCompris needs a translation update
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 again. This should be policy if you ask me. I agree with you, but GCompris developers have warned several times in this list. Anyway, you can use most of those translations into the gcomprixogoo branch. Cheers. -- Jorge González González alor...@gmail.com Weblog: http://aloriel.no-ip.org Fotolog: http://www.flickr.com/photos/aloriel ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: GCompris needs a translation update
Le jeudi 04 novembre 2010 à 08:36 +0100, Matej Urban a écrit : On Wed, Nov 3, 2010 at 7:18 PM, Bruno Coudoin bruno.coud...@gcompris.net 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. A good opportunity to update the translation if its not already done. are you going to release the new version based on gcomprixogoo or in master? Sorry, I should have mentioned it, the current working branch is gcomprixogoo. master is not maintained anymore. 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 again. This should be policy if you ask me. If you find a git expert who knows how to reconcile two branches who diverged for a long time, I'm sure Bruno will be more than happy to get main development back to master! Claude ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: GCompris needs a translation update
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.gnome.org/mailman/listinfo/gnome-i18n
Re: GCompris needs a translation update
2010/11/4 Александър Шопов li...@kambanaria.org 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 to the other, it takes 10 seconds to perform the switch, because there are too many files that need to be changed. If you perform the standard git merge, you get $ git merge gcomprixogoo warning: too many files (created: 473 deleted: 3781), skipping inexact rename detection warning: too many files (created: 2157 deleted: 5795), skipping inexact rename detection warning: Cannot merge binary files: gcompris.png (HEAD vs. gcomprixogoo) warning: Cannot merge binary files: macosx/gcompris.png (HEAD vs. gcomprixogoo) CONFLICT (rename/delete): Rename boards/draw/color-selector.png-src/anim-activity/resources/anim/color-selector.png in gcomprixogoo and deleted in HEAD CONFLICT (rename/delete): Rename boards/draw/counter.png-src/anim-activity/resources/anim/counter.png in gcomprixogoo and deleted in HEAD CONFLICT (rename/delete): Rename boards/draw/down.png-src/anim-activity/resources/anim/down.png in gcomprixogoo and deleted in HEAD CONFLICT (rename/delete): Rename boards/draw/tool-circle.png-src/anim-activity/resources/anim/tool-circle.png in gcomprixogoo and deleted in HEAD CONFLICT (rename/delete): Rename boards/draw/tool-circle_on.png-src/anim-activity/resources/anim/tool-circle_on.png in gcomprixogoo and deleted in HEAD CONFLICT (rename/delete): Rename boards/draw/tool-del.png-src/anim-activity/resources/anim/tool-del.png in gcomprixogoo and deleted in HEAD CONFLICT (rename/delete): Rename boards/draw/tool-del_on.png-src/anim-activity/resources/anim/tool-del_on.png in gcomprixogoo and deleted in HEAD many more Auto-merging src/gcompris/timer.h CONFLICT (content): Merge conflict in src/gcompris/timer.h Auto-merging src/gcompris/wordlist.c Auto-merging src/gcompris/wordlist.h Auto-merging tools/gcompris_shapegame.py CONFLICT (content): Merge conflict in tools/gcompris_shapegame.py Automatic merge failed; fix conflicts and then commit the result. $ _ which means that it requires quite a bit of manual labor. Simos ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: GCompris needs a translation update
2010/11/4 Simos Xenitellis simos.li...@googlemail.com 2010/11/4 Александър Шопов li...@kambanaria.org 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 to the other, it takes 10 seconds to perform the switch, because there are too many files that need to be changed. If you perform the standard git merge, you get $ git merge gcomprixogoo warning: too many files (created: 473 deleted: 3781), skipping inexact rename detection warning: too many files (created: 2157 deleted: 5795), skipping inexact rename detection warning: Cannot merge binary files: gcompris.png (HEAD vs. gcomprixogoo) warning: Cannot merge binary files: macosx/gcompris.png (HEAD vs. gcomprixogoo) CONFLICT (rename/delete): Rename boards/draw/color-selector.png-src/anim-activity/resources/anim/color-selector.png in gcomprixogoo and deleted in HEAD CONFLICT (rename/delete): Rename boards/draw/counter.png-src/anim-activity/resources/anim/counter.png in gcomprixogoo and deleted in HEAD CONFLICT (rename/delete): Rename boards/draw/down.png-src/anim-activity/resources/anim/down.png in gcomprixogoo and deleted in HEAD CONFLICT (rename/delete): Rename boards/draw/tool-circle.png-src/anim-activity/resources/anim/tool-circle.png in gcomprixogoo and deleted in HEAD CONFLICT (rename/delete): Rename boards/draw/tool-circle_on.png-src/anim-activity/resources/anim/tool-circle_on.png in gcomprixogoo and deleted in HEAD CONFLICT (rename/delete): Rename boards/draw/tool-del.png-src/anim-activity/resources/anim/tool-del.png in gcomprixogoo and deleted in HEAD CONFLICT (rename/delete): Rename boards/draw/tool-del_on.png-src/anim-activity/resources/anim/tool-del_on.png in gcomprixogoo and deleted in HEAD many more Auto-merging src/gcompris/timer.h CONFLICT (content): Merge conflict in src/gcompris/timer.h Auto-merging src/gcompris/wordlist.c Auto-merging src/gcompris/wordlist.h Auto-merging tools/gcompris_shapegame.py CONFLICT (content): Merge conflict in tools/gcompris_shapegame.py Automatic merge failed; fix conflicts and then commit the result. $ _ which means that it requires quite a bit of manual labor. I now read the URL you gave earlier. It suggests to rename the gcomprixogoo branch to master (and get rid of the old master). 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 the way to go. Simos ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: GCompris needs a translation update
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 Logiciel Libre à Toulouse http://april.org Promouvoir et défendre le Logiciel Libre ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: GCompris needs a translation update
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 the way to go. Well, we don't care much, the master branch is unmaintained and hopefully nobody uses it. -- Bruno Coudoin http://gcompris.net Free educational software for kids http://toulibre.org Logiciel Libre à Toulouse http://april.org Promouvoir et défendre le Logiciel Libre ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: GCompris needs a translation update
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. A good opportunity to update the translation if its not already done. are you going to release the new version based on gcomprixogoo or in master? Thanks. -- Jorge González González alor...@gmail.com Weblog: http://aloriel.no-ip.org Fotolog: http://www.flickr.com/photos/aloriel ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: GCompris needs a translation update
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. A good opportunity to update the translation if its not already done. are you going to release the new version based on gcomprixogoo or in master? Sorry, I should have mentioned it, the current working branch is gcomprixogoo. master is not maintained anymore. -- Bruno Coudoin http://gcompris.net Free educational software for kids http://toulibre.org Logiciel Libre à Toulouse http://april.org Promouvoir et défendre le Logiciel Libre ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: GCompris needs a translation update
Le mercredi 03 novembre 2010 à 19:18 +0100, Bruno Coudoin a écrit : 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. A good opportunity to update the translation if its not already done. are you going to release the new version based on gcomprixogoo or in master? Sorry, I should have mentioned it, the current working branch is gcomprixogoo. master is not maintained anymore. I've added a note on http://l10n.gnome.org/module/gcompris/ Claude ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
GCompris needs a translation update
Hi, We have set the 26th of November as the new release date for GCompris. A good opportunity to update the translation if its not already done. There is a special think to do, the new hangman activity uses our src/readingh-activity/resources/wordsgame/default-locale.xml files to propose words to the children. It is thus very important now to have them properly filled with about 1000 to 2000 words. For now I did the work for English and French. Translators, please refer to this page for instructions: http://gcompris.net/wiki/Translation_addons Thanks for your help, -- Bruno Coudoin http://gcompris.net Free educational software for kids http://toulibre.org Logiciel Libre à Toulouse http://april.org Promouvoir et défendre le Logiciel Libre ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
