Mailinglist Archive: opensuse-translation (281 mails)

< Previous Next >
Re: [opensuse-translation] We need urgent clarification on translation start date
  • From: "Carlos E. R." <robin.listas@xxxxxxxxxxxxxx>
  • Date: Sat, 19 Apr 2008 13:56:30 +0200 (CEST)
  • Message-id: <alpine.LSU.1.00.0804191346360.4075@xxxxxxxxxxxxxxxx>
Hash: SHA1

The Saturday 2008-04-19 at 12:45 +0200, Guillaume Gardet wrote:

Can't you merge the files ?

Let me explain the procedure.

A translator without SVN access emails, via POAT, his newly translated file to someone, like me. I run "svn up", then copy that file to my SVN local copy, then run "svn commit", and I get a big error with collision, and prbably three files: the one on the server, the new one from the translator, and a diff file.

Result: abort.

How can I commit the translated file, and add to it the changes from the new one on the server?

If the file were mine, I'd use and editor looking at the diff file on one term and the new file on another. That's time consuming, and I would have to be doing that for half the team work.

If I were the only translator, I would force commit of the newly translated file and then run "make update-po" locally so that changes in the .pot file gets added automatically, and finally I would commit that changed file, that hopefully would be correct.

But I'm not the only translator, so I can't do that.

If I knew of a procedure to apply the update-po to a single file, I would do that. But I don't know of such a procedure.

I don't know of an automated procedure to "merge" those two files. I don't know what you mean by "merge".

Therefore, all the Spanish team is right now siting doing nothing, since the 17th, waiting till this thread tells them how to continue. We are stuck :-(

- -- Cheers,
Carlos E. R.

Version: GnuPG v2.0.4-svn0 (GNU/Linux)

To unsubscribe, e-mail: opensuse-translation+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-translation+help@xxxxxxxxxxxx

< Previous Next >