[Inkscape-devel] Cuestion about branches test

Hello. Im new to develop whith BZR. I develop a branch, and after i made a lot of changes on the branch but i want to know what version of code is better. 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. 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.

Thanks in advance and sorry for my english. P.D. Think is beter put the mensages in my natural -spanish- lang too?