Am Samstag, 19. April 2008 schrieb Carlos E. R.:
The Saturday 2008-04-19 at 14:49 +0200, Stephan Kulow wrote:
And how do we handle collisions? Currently we reject the new translated file, work is lost...
Because you don't see if automerge or another translator commited? That's bad then. This needs fixing in the tool then.
Sorry, I have no idea what you are talking about :-?
Please read my answer to Guillaume for an explanation of what is hapening to us.
What is the correct procedure to merge a finished translation, with a file in the SVN that has been updated by some one outside of our team, probably the result of a new .pot file with new messages or modified messages?
If you're the only one with SVN access and you're sure that you do not overwrite other people's work, just svn up; copy file; svn ci. If you wait too long between svn up and svn ci; do: svn revert file; svn up; copy file; svn ci. Greetings, Stephan --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-translation+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-translation+help@opensuse.org