[i10n] Maintaining translations on a branch

Monday, I was about to run 'make locale-gnu-po-update; svn ci' on the po
area in the 1.1.x branch to make sure the right messages are marked obsolete
and the right ones are included when it hit me it would render the
merge-from trunk strategy useless.

So, I'm kind of stuck in how to do this:

1) Using 'make locale-gnu-po-update' in trunk would mark messages only in
the 1.1.x branch obsolete. Merging from trunk would not be possible anymore,
because those messages are to be marked as translated.

2) Running 'make locale-gnu-po-update' in the branch would generate (lots
of) conflicts on any next merge from trunk because of the updated line
numbers preceding the msgid lines.

3) We don't develop directly on the branch...

Anybody?

bye,

Erik.

-- 
NEU: WLAN-Router für 0,- EUR* - auch für DSL-Wechsler!
GMX DSL = supergünstig & kabellos http://www.gmx.net/de/go/dsl
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org