Merging during import

[Carlos Perelló Marín]

On Sun, 2006-03-19 at 10:37 +0000, Tim Morley wrote:
> Got a question about how Rosetta handles imported .po files: how  
> sophisticated is the handling of differences between the imported  
> file and the database? Is there anything CVS-like about it, or does  
> it simply overwrite the database with the contents of the file?

Well, we are not so sophisticate like a control version system, but we
do something like that. Every time someone changes a translation the old
one is moved to the 'Suggestion' part so we are never removing anything.

> 
> The problem I've noticed is this: I downloaded ooo-writer, did a  
> global search and replace one a term that we realised we'd  
> mistranslated all the way through the file, then uploaded it again.  
> In the meantime, apparently another team member also downloaded the  
> file, did some work on it, then uploaded it back.
> 
> Will his upload destroy my work if he downloaded the same version as  
> me, then uploaded his work after me? If not, how is that case handled?

Well, in this case, he will revert your changes except that your change
will then appear as a suggestion on that entry.

The only exception for this is when you upload a file and check the
'published' flag. That means that the .po file you are uploading is the
same as the main product uses on their CVS/SVN/whatever they use. In
this case nothing will be changed on Rosetta except that empty
translations will be filled if that upstream import has it. The other
translations will be added as suggestions.

Jordi, please, could you expand and add this explanation to the
RosettaFAQ page?

Thank you.

> 
> Thanks in advance.
> 
> 
> Tim
> 

-- 
Carlos Perelló Marín
Ubuntu => http://www.ubuntu.com
mailto:carlos.perello at canonical.com
http://carlos.pemas.net
Valencia - Spain
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 191 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/rosetta-users/attachments/20060320/7bd6e15c/attachment.pgp