-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 The Saturday 2008-04-19 at 18:13 +0200, Leandro Regueiro wrote:
Ok.
- You download your file. - You translate it in several days (say seven days). - Two days after you took the file (five days before you try to commit it) a developer updates the .pot and the .po on the server updates automatically. - You have translated the file an you try to do svn ci. - It fails. -Then you have to do a backup of your file (for when doing svn update your translations doesnt dissapear). - Then you do svn update. - You copy the backup over the .po file downloaded in the previous step from the server using svn update. - You merge it with the latest .pot (remember to checkout it from the server)
What is a merge? An svn operation? There is a command "svn merge". You mean that? cer@nimrodel:~> svn help merge merge: Apply the differences between two sources to a working copy path. usage: 1. merge sourceURL1[@N] sourceURL2[@M] [WCPATH] 2. merge sourceWCPATH1@N sourceWCPATH2@M [WCPATH] 3. merge [-c M | -r N:M] SOURCE[@REV] [WCPATH] What exactly do I type? Or do you mean a manual operation, using an editor to mix both files, the one on the server and the one from the translator? That's not my job, I'm not the translator. I'm the commiter. See below.
- You translate the new strings
Impossible.
- You do svn ci (now it works)
You forget that I'm not the translator that translated that file. I'm only the one uploading it. There are two translators involved, using Verbum. If we don't find an automated procedure soon, what we'll do is commit the translator file deleting the developer file. :-/ Meanwhile, the entire (ES) team is stopped, waiting for an answer. - -- Cheers, Carlos E. R. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.4-svn0 (GNU/Linux) iD8DBQFICjFztTMYHG2NR9URAqBWAJ451mhT74ZELPue7f7o1364tnex7wCfZ9p8 iZSrsLfOQE5d6zeSULNEWYs= =OBpj -----END PGP SIGNATURE----- --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-translation+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-translation+help@opensuse.org