On Wed, 2012-11-14 at 13:36 +0100, Jabier Arraiza wrote:
Im new to develop whith BZR. I develop a branch, and after i made a
of changes on the branch but i want to know what version of code is
What i do? 2 branches or update original branch whith the new code.
The new code is more powerful but im not sure is ok whith the filosophy
of inkscape, because made more changes to the code and change some
behviors on usage.
If you want to compare a branch, to let's say trunk you can do that
using bzr by specifying the branch. So:
$ bzr diff --new lp:inkscape
Would compare to trunk. Usually I find it useful to compare to the
common ancestor as the diff is a bit cleaner:
$ bzr diff -r ancestor:lp:inkscape
If you'd like to update your branch to include the changes that are on
trunk currently you can just merge them in. No need to worry about
rebasing or anything like that, Bazaar handles it for you.
$ bzr merge lp:inkscape
$ bzr commit -m "Updating to trunk"
It's difficult to know which is "better", but hopefully that helps you
figuring out the information you need.
Another cuestion is about lang.
I want to chage some mensagges in the GUI. IN the core i change it in
english but i want to know how to prepare for inernatioalization. Is
only one or two mensages in the tip bottom zone.
Translations should be done in the /po directory. You might want to
post on the Inkscape translators list so that you can find the Spanish
translator to coordinate your efforts.
Thanks in advance and sorry for my english.
P.D. Think is beter put the mensages in my natural -spanish- lang too?
No problem it's better than my Spanish! I think dual language posts
make sense, I know there are several people who speak Spanish on this
list. Unfortunately, for me to reply it'll have to be in English, but
don't let that hold you back!