Type: New Feature
original here - http://lang.moodle.org/mod/forum/discuss.php?d=1005
Recent work on Russian translation showed me one great problem.
Now we have diffrerncies in russian in more than 1000 string between 2.0 and 2.1 on strings that are equal in english. This is because we made a lot of changes to 2.0 version after creation of 2.1 branch. The problem becomes harder with appearance of 2.2 branch, because we have to think of it too.
Standart merge tool does not helps, because strings was alredy translated, and merge tool searches only for new strings.
Branch compare tool does not helps, because it only shows difference, and i need to manually copy 1000 strings from 2.0 branch to 2.1 (and then 1000 times from 2.1 to 2.2).
The tool we need should take strings, that are equal in english, but different in e.g. Russian. For each string needs to take branch with more recent translation and apply this translation to another branch.
Maybe it's better just to modify current merge tool, to take modified strings into account. In that case new strings should be staged only if english strings have not been changed.