Re: [Gimp-docs] some docs fixes
Miroslav Šulc (Thursday, 16. December 2010) well, as i think of it, the best way would be to create the patches on gimp-help-2-6-0 branch (to fix current documentation) and then merge them to master branch and update them to the changes in master branch (to have the fixes at the latest changes too), I forgot: Ignore the gimp-help-2-6-0 branch, this is/was a temporary branch and is no longer used. I had renamed it to obsolete/gimp-help-2-6-0, but somehow (voodoo?) it came back... Ulf -- Gott ist der einzige Herr der Welt, der weniger zu sagen hat als seine Diener. -- Karlheinz Deschner signature.asc Description: This is a digitally signed message part. ___ Gimp-docs mailing list Gimp-docs@lists.XCF.Berkeley.EDU https://lists.XCF.Berkeley.EDU/mailman/listinfo/gimp-docs
Re: [Gimp-docs] some docs fixes
Dne 20.12.2010 08:00, Julien Hardelin napsal(a): Le 19/12/2010 17:17, Miroslav Šulc a écrit : my git repo is up to date, what is not probably up to date is po files of some translations. just run this to see yourself: If your repo is up-to-date, go to src/toolbox. You must find the zoom.xml file. Open it in a text editor : you will see that there is no Magnify. there is really no Magnify in src/toolbox/zoom.xml file. it is in src/menus/view/zoom.xml. you can try this: $ git grep Magnify src/ src/menus/view/zoom.xml: can also use the link linkend=gimp-tool-zoomMagnify/link tool src/toolbox/zoom.xml: 2009-04-04 j.h: review for v2.6. Magnify - Zoom second is reference to changelog, so only first has to be fixed. and i see Magnify is still there, though the linkend is already fixed. git grep src/toolbox/tool-zoom.xml This command shows reference to tool-zoom.xml in the old changelogs that we no longer fill since we migrated to git from svn. well, not only changelogs, you probably did not scroll to the end of the output :-) on my laptop the output for a while contained only changelog entries, but after a while occurrences in po files were added. you can try this: git grep src/toolbox/tool-zoom.xml po/ you should see that it is referenced in po/lang/toolbox.po files of es, fi, hr, ko, lt, nl, pl, sv and zh_CN. so these are not up to date with latest xml files. Julien miroslav ___ Gimp-docs mailing list Gimp-docs@lists.XCF.Berkeley.EDU https://lists.XCF.Berkeley.EDU/mailman/listinfo/gimp-docs
Re: [Gimp-docs] some docs fixes
Dne 19.12.2010 21:25, Ulf-D. Ehlert napsal(a): Miroslav Šulc (Thursday, 16. December 2010) well, as i think of it, the best way would be to create the patches on gimp-help-2-6-0 branch (to fix current documentation) and then merge them to master branch and update them to the changes in master branch (to have the fixes at the latest changes too), I forgot: Ignore the gimp-help-2-6-0 branch, this is/was a temporary branch and is no longer used. I had renamed it to obsolete/gimp-help-2-6-0, but somehow (voodoo?) it came back... ah, now it makes sense, thx. anyway, some translators are still committing there it seems: http://git.gnome.org/browse/gimp-help-2/log/?h=gimp-help-2-6-0 Ulf miroslav ___ Gimp-docs mailing list Gimp-docs@lists.XCF.Berkeley.EDU https://lists.XCF.Berkeley.EDU/mailman/listinfo/gimp-docs
Re: [Gimp-docs] some docs fixes
Dne 20.12.2010 07:50, Julien Hardelin napsal(a): Le 19/12/2010 17:34, Miroslav Šulc a écrit : I'll apply only changes in source xml files. cool, thanks. i have more patches on my disk, and planning to make a patch for other stuff too, like the capitalization of titles (and uncapitalization of image labels), tagging ui objects etc ... just need to know what is supposed to be the right style for the docs as it is not obvious to me yet. I have several English books and in all, title are capitalized. Image legends are not capitalized, excepted when they they refer to a command. Example: The Save as Brush dialog, showing a sample brush. that is the same what i saw in the GNOME Documentation Style Guide that Jan Smith pointed to. imo that is the style guide that should be used for gimp documentation too, but i am not the one to say that, proly Róman is the right person to say that :-) also, i agree with you that the fixes should probably be done only in src dir, the translation teams will get them once they update their po files as it affects also msgid items. i have no idea how much it will break their work as the msgid values will be new and will not match what comes from the main xml files. from this point of view patching also msgid lines would be better, but it's a question whether some inner po logic will not be broken by that. Modifying msgid strings manually is nonsense. A normal workflow is: - git pull --rebase This will update, in your repo, src/*.xml files and synchronize po files if another translator made changes in them. - make pot-xx This updates pot files according to changes in xml files. - make po-xx This updates your po files: msgid strings are updated and marked with a #, fuzzy comment. yes, i understand the workflow, i just did not want to create too much work for nothing for the translation teams as they will get every text that contains typos marked as fuzzy. and if they do not follow, they will wonder why their text is fuzzy and will waste time on checking the translation. it make no sense to me to mark their work fuzzy when the the is replaced with the etc. so you are sure you wanna go the fuzzy way? up to that, the changes are just in english language, so it affects either the untranslated texts or the msgid lines, not their translations. just as thinking about it, please let me know what way you wanna apply the patches. if you wanna change just src files, i can adjust the patches. i used mostly grep and sed for these patches so they were fast to create, but there were also cases with one line ending with the and following line beginning with the so some changes were not that trivial. Patches are applied to the src/*.xml files. also, as these issues occur both in gimp-help-2-6-0 and in master, in my opinion they should go first to branch gimp-help-2-6-0 and then should be merged to master (and after that master should be searched for any ommitted cases), but i noticed there is quite a lot (exactly 9) unmerged changes between gimp-help-2-6-0 and master so i am not sure you port everything from 2.6 branch to master. up to that, some changes, though not merged from the branch, are in the master anyway, which confuses me even more :-) Don't worry about gimp-help-2.6.0. We work on master only. Our boss, Roman, periodically makes a new release of this help (which is always behind the master...) he makes releases of the gimp-help-2.6.0 branch? i proly did not understand this correctly, as according to Ulf, this branch should be obsolete now, but it reappeared in repo again. after this, i can adjust the patches and prepare the rest of patches (i have total 10, just 6 are at bugzilla atm) and i will know how to prepare the rest. Please send patches directly to me, so that I am not obliged to retrieve them from Bugzilla. ok. i have 12 patches now here and more will be coming. i just need your confirmation that you want the typo fixes do the fuzzy way (as described above in this mail) and then i will send them all your way in proper format. Julien miroslav ___ Gimp-docs mailing list Gimp-docs@lists.XCF.Berkeley.EDU https://lists.XCF.Berkeley.EDU/mailman/listinfo/gimp-docs
Re: [Gimp-docs] some docs fixes
Oh sorry, I understand now what you want to do with your patch. I was accustomed to have a #, fuzzy comment for one lettre changed. I just resumed work after six monthes absence. I have lost familiarity with gimp-help and I had gorgotten that there are two zoom.xml :-( But I get now into a problem: When I run git-apply --check xxx.patch I get the error Command not found. Trying to resolve it... Julien ___ Gimp-docs mailing list Gimp-docs@lists.XCF.Berkeley.EDU https://lists.XCF.Berkeley.EDU/mailman/listinfo/gimp-docs
Re: [Gimp-docs] some docs fixes
Dne 20.12.2010 16:27, Julien Hardelin napsal(a): Oh sorry, I understand now what you want to do with your patch. I was accustomed to have a #, fuzzy comment for one lettre changed. well, i have no idea what is the rule now, but imo making extra work for translation teams just because there was a typo in english version does not make sense to me :-) I just resumed work after six monthes absence. I have lost familiarity with gimp-help and I had gorgotten that there are two zoom.xml :-( But I get now into a problem: When I run git-apply --check xxx.patch I get the error Command not found. Trying to resolve it... try git apply, so instead '-' use space :-) Julien miroslav ___ Gimp-docs mailing list Gimp-docs@lists.XCF.Berkeley.EDU https://lists.XCF.Berkeley.EDU/mailman/listinfo/gimp-docs
[Gimp-docs] A question about quickreference
Hello For 'es', we use Mayús (in english shift). Could I translate shift/ in es.po file of quickreference? For example: msgid shift/U msgstr Mayús/U Or that could cause any problem? Thanks Ignacio AntI ___ Gimp-docs mailing list Gimp-docs@lists.XCF.Berkeley.EDU https://lists.XCF.Berkeley.EDU/mailman/listinfo/gimp-docs
Re: [Gimp-docs] A question about quickreference
Dne 20.12.2010 17:00, Ignacio napsal(a): Hello For 'es', we use Mayús (in english shift). Could I translate shift/ in es.po file of quickreference? For example: msgid shift/U msgstr Mayús/U Or that could cause any problem? Thanks Ignacio AntI as far as i can see, there is no shift/ used in current src files, so i think you should first update your po files. the tags that are used in src are: keycap function=shiftShift/keycap that looks like the right thing to translate. you should probably run make po-es before you continue your translation work to get your po files updated. but take this just as my opinion, i follow this project just for one week so i might be wrong. miroslav ___ Gimp-docs mailing list Gimp-docs@lists.XCF.Berkeley.EDU https://lists.XCF.Berkeley.EDU/mailman/listinfo/gimp-docs
Re: [Gimp-docs] A question about quickreference
Dne 20.12.2010 17:12, Miroslav Šulc napsal(a): Dne 20.12.2010 17:00, Ignacio napsal(a): Hello For 'es', we use Mayús (in english shift). Could I translate shift/ in es.po file of quickreference? For example: msgid shift/U msgstr Mayús/U Or that could cause any problem? Thanks Ignacio AntI as far as i can see, there is no shift/ used in current src files, so i think you should first update your po files. the tags that are used in src are: keycap function=shiftShift/keycap that looks like the right thing to translate. you should probably run make po-es before you continue your translation work to get your po files updated. but take this just as my opinion, i follow this project just for one week so i might be wrong. yes, i was right i am wrong :-P i was looking at something else. anyway, the tags do not seem to be designed for translation, as then they would not be caught by the stylesheet, so shift/ will always end up as keycap function=shiftShift/keycap+. maybe the stylesheet could be adjusted to output keycap function=shiftMayús/keycap+ for spanish instead. but again, i might be wrong :-) miroslav ___ Gimp-docs mailing list Gimp-docs@lists.XCF.Berkeley.EDU https://lists.XCF.Berkeley.EDU/mailman/listinfo/gimp-docs
Re: [Gimp-docs] czech po files
Julien Hardelin (Monday, 20. December 2010) Le 19/12/2010 22:57, Miroslav Šulc a écrit : i just found that in that time .po files were not used yet, all translations were done in the xml files with language attributes. i wonder what was the way you used to migrate the translations from xml files to po files, unless you did it manually. There has been so many changes in the gimp-help-2 tree since we migrated to po that an automatical tranfer is not possible now, IMO. Ulf, who made this migration would give a more documented advice. Oh god, that was 100 years ago ;-) We used a script to split the multi-language xml files and create po files using as many extracted translations as possible, if I remember correctly. So we'd had to checkout a really old version and repeat this step for cz po files. But the resulting po files would probably contain 99% fuzzy or untranslated strings... If you (Miroslav) are interested I can try to create cz po files (this evening or so). Bye, Ulf -- Allein bin ich manchmal einsam; mit anderen oft; in Gesellschaft fast immer. Was mich mehr als alles krank macht, sind die unheilbar Gesunden. -- Karlheinz Deschner signature.asc Description: This is a digitally signed message part. ___ Gimp-docs mailing list Gimp-docs@lists.XCF.Berkeley.EDU https://lists.XCF.Berkeley.EDU/mailman/listinfo/gimp-docs
Re: [Gimp-docs] A question about quickreference
Dne 20.12.2010 17:29, Ignacio napsal(a): Hi Miroslav 2010/12/20 Miroslav Šulc fordf...@fordfrog.name mailto:fordf...@fordfrog.name Dne 20.12.2010 17:00, Ignacio napsal(a): Hello For 'es', we use Mayús (in english shift). Could I translate shift/ in es.po file of quickreference? For example: msgid shift/U msgstr Mayús/U Or that could cause any problem? Thanks Ignacio AntI as far as i can see, there is no shift/ used in current src files, so Yes, there is no quickreference in src, but my question is about these po files: /gimp-help-2/quickreference/po Thanks Ignacio AntI well, as i wrote in my last post, i looked wrong way :-) but as shift/ is tag that is processed by stylesheet and replaced with keycap function=shiftShift/keycap, you should not translate it. and as gimp-key.pot does not contain Shift string, there is probably no way to translate it. miroslav ___ Gimp-docs mailing list Gimp-docs@lists.XCF.Berkeley.EDU https://lists.XCF.Berkeley.EDU/mailman/listinfo/gimp-docs
Re: [Gimp-docs] czech po files
Dne 20.12.2010 12:01, Ulf-D. Ehlert napsal(a): Julien Hardelin (Monday, 20. December 2010) Le 19/12/2010 22:57, Miroslav Šulc a écrit : i just found that in that time .po files were not used yet, all translations were done in the xml files with language attributes. i wonder what was the way you used to migrate the translations from xml files to po files, unless you did it manually. There has been so many changes in the gimp-help-2 tree since we migrated to po that an automatical tranfer is not possible now, IMO. Ulf, who made this migration would give a more documented advice. Oh god, that was 100 years ago ;-) We used a script to split the multi-language xml files and create po files using as many extracted translations as possible, if I remember correctly. So we'd had to checkout a really old version and repeat this step for cz po files. But the resulting po files would probably contain 99% fuzzy or untranslated strings... If you (Miroslav) are interested I can try to create cz po files (this evening or so). well, i wanted to see how much could be used from the old translation = how much work it would need to update it to 2.6/2.8. btw, though we have domain .cz, language code is cs. also, as i saw there are many typos and other language issues in english version, i do not plan to start with czech translation until english version is clean, which will sure take some time. i have no idea whether there would be a difference exporting czech po files out of it now or one month later after many typo fixes in the english version. whether it would still match the translations as fuzzy or they would not match at all. what you think? Bye, Ulf miroslav ___ Gimp-docs mailing list Gimp-docs@lists.XCF.Berkeley.EDU https://lists.XCF.Berkeley.EDU/mailman/listinfo/gimp-docs
Re: [Gimp-docs] some docs fixes
Hi Miroslav, well, i have no idea what is the rule now, but imo making extra work for translation teams just because there was a typo in english version does not make sense to me :-) You are right. But here what I get when applying patches: ~/gimp-help-2 git apply select_to_channel.patch ~/gimp-help-2 git apply access_to.patch error: patch failed: po/es/toolbox.po:2754 error: po/es/toolbox.po: patch does not apply ~/gimp-help-2 git apply magnify_to_zoom.patch error: patch failed: po/es/toolbox.po:183 error: po/es/toolbox.po: patch does not apply ~/gimp-help-2 git apply duplicate.patch ~/git-patches/gimp-help-2 The es toolbox.po files has been updated after you made patches. The problem is that there are 1769 lines only in this file and that line 183 looks perfectly normal. Do you have a solution? Julien ___ Gimp-docs mailing list Gimp-docs@lists.XCF.Berkeley.EDU https://lists.XCF.Berkeley.EDU/mailman/listinfo/gimp-docs
Re: [Gimp-docs] some docs fixes
Hi Jan, On Sun, Dec 19, 2010 at 01:59:07AM +0100, Miroslav Šulc wrote: Hi Roman, Does the GIMP documentation project have a style guide such as the excellent GNOME Documentation Style Guide? http://library.gnome.org/devel/gdp-style-guide/2.32/index.html.en well, maybe gimp documentation team should use that guide instead of creating its own :-) Yes. Afaik - we don't have one on our own, but use the guide lines from the GNOME documentation project like the one you've found. Cheers, -- Roman Joost www: http://www.romanofski.de email: romanof...@gimp.org signature.asc Description: Digital signature ___ Gimp-docs mailing list Gimp-docs@lists.XCF.Berkeley.EDU https://lists.XCF.Berkeley.EDU/mailman/listinfo/gimp-docs
Re: [Gimp-docs] some docs fixes
Hi Marco, On Sat, Dec 18, 2010 at 02:10:12PM +0100, Marco Ciampa wrote: On Sat, Dec 18, 2010 at 12:12:35PM +0100, Miroslav Šulc wrote: Dne 18.12.2010 08:22, Roman Joost napsal(a): http://en.wikipedia.org/wiki/Capitalization http://jon.henshaw.me/rules-for-capitalization-in-a-title/ Cheers for clarifying. I never bothered to look around actually. Cheers -- Roman Joost www: http://www.romanofski.de email: romanof...@gimp.org signature.asc Description: Digital signature ___ Gimp-docs mailing list Gimp-docs@lists.XCF.Berkeley.EDU https://lists.XCF.Berkeley.EDU/mailman/listinfo/gimp-docs
