merging strings from another branch

merging strings from another branch

Daniel Neis Araujo - ން
Number of replies: 2
ފޮޓޯ

Hello,

this new feature of amos looks promising, here at brazil we have a lot of strings that can be merged from 1.9 i guess.

But i have one doubt before try this: if i select 1.9 in the source branch, 2.0 in the target branch, and click "merge", all the strings will be merged, that is, it will be commited in the official tree. Is this true or they will be applied to my stage so i can review before commit?

Regards,

Daniel

In reply to Daniel Neis Araujo

Re: merging strings from another branch

David Mudrák - ން
ފޮޓޯ

Daniel, as stated in the help for the merge tool, merge will just stage the strings. You will have to commit them manually then. As you can see, the stage is actually the most important node of the whole process as it is the place where strings are put from various sources (web based translator, uploaded file or merge tool) before they are committed.

In reply to David Mudrák

Re: merging strings from another branch

Daniel Neis Araujo - ން
ފޮޓޯ

Great! And sorry for not having read the help =/

I am surprised that only two strings were staged because, if i am not wrong, we have less than 500 strings missing in brazilian 1.9 translation, so moodle 2.0 have more than  6K new strings !