[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: translation

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Sat, 17 Oct 2009 10:36:47 +0200

On 17.10.2009 04:54, Rafael M. Heise wrote:
> Hey guys.
> I would like to know if I must translate the docs and everything else in
> 1.6.x branche. Is it necessary?
> I'm asking because I did all translate directly in trunk and the files
> aren't in branche.
>
> I belive when the changes in trunk are done the changes will merge in
> branche. Am I correct?
>

No, if you want your changes to appear on the 1.6.x branch, *you* will
have to merge them. That's because you're the one who understands the
language and you can resolve conflicts that may appear when merging.

If you want to merge your changes is up to you: changes on trunk won't
appear in a release until 1.7 comes out.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2408467
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-10-17 10:36:56 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.