Scott Kostyshak wrote: > This would be nice. If the only way to do things is with manual merging, > I'm happy to spend the time to learn how to do that. But if you think it > is possible to come up with a script that either does the merging > automatically or at least facilitates the merging, then that would be > really nice.
I played a bit with msgcat and the results are disappointing: Lots of unwanted additions, or almost no merging at all, and unanted reformatting. I still think it should be possible to have an automatic merge tool, since the algorithm is easy: 1) remerge po files in master to ensure that all strings are up to date 2) merge in all translations from branch for untranslated strings This would not handle slightly different translations in master and branch, but if we try to catch them as well then we'd end up with lots of unwanted old stuff which does not exist in master anymore as well. I am tempted to write our own merge tool in python.. Georg
