Re: [Gimp-docs] more changes to help
2. Running GIMP 1. Running GIMP 1.1. Known Platforms 1.2. Language 1.3. Command Line Arguments 1.4. For Photoshop Users 1.5. Starting GIMP for the first time 1.6. Before you proceed 2. Running GIMP 2.1. Known Platforms 2.2. Language 2.3. Command Line Arguments 2.4. Starting GIMP for the first time 2.5. Before you proceed 2.6. For Photoshop Users Julien ___ Gimp-docs mailing list Gimp-docs@lists.XCF.Berkeley.EDU https://lists.XCF.Berkeley.EDU/mailman/listinfo/gimp-docs
Re: [Gimp-docs] concepts
- When explaining a term, please add an indexterm indexterm primaryResolution/primary /indexterm This will automatcally appear in the index chapter: last line in the html summary. I've been meaning to ask about this: There were 7 terms in concepts.xml but only one of them, channels, had an indexterm. So if I understand correctly, the reason is that those other terms are explained at length elsewhere, and THOSE places are linked to in the index, while there is no other reference to resolution in the help? That is docbook rules: there is no varlistentry parent for indexterm but there is title. In varlistentry you must include indexterm within term tags. Please see http://docbook.org/tdg/en/html/indexterm.html There are some inconsistencies in the index. It has to be reviewed. I made these changes in your xml file. Do you want I push your changes? Sure. Done http://git.gnome.org/browse/gimp-help-2/ ___ Gimp-docs mailing list Gimp-docs@lists.XCF.Berkeley.EDU https://lists.XCF.Berkeley.EDU/mailman/listinfo/gimp-docs
Re: [Gimp-docs] Translated strings in po remain in English in html
Hi, Remove and recreate xml/fr/dialogs/templates-dialog.xml. All is OK now Thank you and Merry Xmas! Julien ___ Gimp-docs mailing list Gimp-docs@lists.XCF.Berkeley.EDU https://lists.XCF.Berkeley.EDU/mailman/listinfo/gimp-docs
Re: [Gimp-docs] Translated strings in po remain in English in html
Hi, what strings exactly you mean? #: src/dialogs/templates-dialog.xml:34(para) msgid Templates are templates for an image format to be created.acronymGIMP/acronym offers you a lot of templates and you can create your owns. When you create a New image, you can access to the list of existing templates but you can't manage them. The quoteTemplates/quote dialog allows you to manage all these templates. msgstr Il s'agit de modèles pour un format d'image à créer.acronymGIMP/acronym vous offre un certain nombre de modèles, et vous pouvez créer vos propres modèles. Quand vous créez une Nouvelle image, vous pouvez accéder à la liste des modèles existants, mais vous ne pouvez pas les gérer. La fenêtre de dialogue quoteModèles/quote vous donne la possibilité de gérer ces différents modèles. This French string is displayed in English in the French Html. I tried deleting the fr string, and saving dialogs.po; then reopening dialogs.po and translating the string again, saving again. make html-fr: the string is still English :-( Julien ___ Gimp-docs mailing list Gimp-docs@lists.XCF.Berkeley.EDU https://lists.XCF.Berkeley.EDU/mailman/listinfo/gimp-docs
Re: [Gimp-docs] Translated strings in po remain in English in html
did you try to run make clean before make html-fr? you can also make
sure xml directory is deleted after make clean (as files in this
directory are used for generating of the html files).
~/gimp-help-2 make clean
Making clean in quickreference
make[1]: entrant dans le répertoire «
/home/julien/gimp-help-2/quickreference »
rm -rf docbook
rm -rf svg
rm -rf xml
rm -f .xml2po.mo
make[1]: quittant le répertoire « /home/julien/gimp-help-2/quickreference »
Making clean in .
make[1]: entrant dans le répertoire « /home/julien/gimp-help-2 »
make[1]: quittant le répertoire « /home/julien/gimp-help-2 »
~/gimp-help-2 make html-fr
Makefile:488: xml/de/.deps.mk: Aucun fichier ou dossier de ce type
Makefile:488: xml/fr/.deps.mk: Aucun fichier ou dossier de ce type
[SRC] src/preface/authors.xml
[DEP] xml/fr/.deps.mk
[DEP] xml/de/.deps.mk
[POT] pot/appendix.pot
[POT] pot/dialogs.pot
Traceback (most recent call last):
File ./tools/xml2po.py, line 191, in module
main(sys.argv[1:])
File ./tools/xml2po.py, line 184, in main
xml2po_main.to_pot(filenames)
File /home/julien/gimp-help-2/tools/xml2po/__init__.py, line 570, in
to_pot
self.current_mode.preProcessXml(doc.doc, self.msg)
File /home/julien/gimp-help-2/tools/xml2po/modes/gimphelp.py, line
85, in preProcessXml
root = doc.getRootElement()
File /usr/lib64/python2.6/site-packages/libxml2.py, line 4199, in
getRootElement
if ret is None:raise treeError('xmlDocGetRootElement() failed')
libxml2.treeError: xmlDocGetRootElement() failed
make: *** [pot/dialogs.pot] Erreur 1
There is a serious problem!
If you understand that...
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 Miroslav, Your patches have been pushed. Good work! Could you tell us how you modified msgid strings in po files? A command line? A script? 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
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
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
i have 10 patches in my local git repo now fixing various problems, and now even in the proper format. i just did not want to spam bugzilla more. Hi Miroslav, I'll take care of your patches in Bugzilla. In magnify_to_zoom.patch, there are changes in po of different languages. Usually, patches are only for source xml files. I am not sure translators will agree foreign changes in their work. I'll apply only changes in source xml files. Your new look at GIMP Help is precious. All the best, 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 again, In magnify_to_zoom patch: #: src/toolbox/tool-zoom.xml:50(para) msgid -The Magnify Tool is used to change the zoom level of your working image. If +The Zoom Tool is used to change the zoom level of your working image. If src/toolbox/tool-zoom.xml doesn't exist. We presently have src/toolbox/zoom.xml where no Magnify is present. Which version of gimp-help-2 are you working on? You must do git clone git://git.gnome.org/gimp-help-2 In the gimp-help-2 directory you get, you run ./autogen.sh --without-gimp ALL_LINGUAS=cz en make html-en to get the up-to-date English html. Julien ___ 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
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. 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
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. 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. 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...) 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. 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
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. 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. Julien ___ 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
anybody knows where i could find czech po files for gimp documentation? there exists czech translation of gimp 2.2 but the po files are not in the gimp-help-2 repo. Hi, cz PO files don't exist in the gimp-help-2 module. If you want to start a new translation for your language, you have to add cz to the gimp-help-2/configure.ac file, line 60. Then, run ./autogen.sh --without-gimp ALL_LINGUAS=cz en (you can add other languages if you want). Then make po-cz, and you will get your PO files with all strings untranslated. Julien ___ Gimp-docs mailing list Gimp-docs@lists.XCF.Berkeley.EDU https://lists.XCF.Berkeley.EDU/mailman/listinfo/gimp-docs
