-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 The Saturday 2008-04-19 at 16:18 +0200, Stephan Kulow wrote:
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.
No, we are two or three people with svn write access, and a few more without. The procedure you describe is what we do, and we get collisions: 1) Translator 'A' downloads a file via the http interface, and translates it, taking perhaps several days. 2) During this time, a developer changes the .pot file, changes get to the .po in the server copy. Translator 'A' does not know anything about this, nor can he/she do anything even if he/she knows. 3) Translator 'A' emails, via Verbum aka Poat, the file to the pool of translators having svn write access 4) One of the several translators with svn access, say 'B', takes the file. 5) Translator 'B' does: - svn up - copy file to local tree - svn commit 6a) Translator 'B' gets a collision, and simply rejects the file. We are stuck. 6b) Alternatively, translator 'B' overwrites the developer changes, committing translator 'A' file, destroying whatever the developer changed. 7) If the translation is now packaged, some strings will not be translated. I hope this helps to understand our problem :-) - -- Cheers, Carlos E. R. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.4-svn0 (GNU/Linux) iD8DBQFICgdQtTMYHG2NR9URAnvoAJ97sNSpI5bqMERzgyPHQc+IMO8/6wCfenzh DsADGF/6peqBWiARaYuZcLc= =Y58O -----END PGP SIGNATURE----- --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-translation+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-translation+help@opensuse.org