On Tue, 2007-04-17 at 13:52 +0200, David Fraser wrote: > Christian Perrier wrote: > >> I suppose that the "Update" option from Pootle handles such > >> conflicts...but I guess that a "svn up" will not handle them. > >> > > > > It does not. If I use the "Update" function for a given file in a > > project which uses SVN repository, the changes I made locally without > > committing are overwritten by the content of the translations from the > > SVN server. > > > > That makes any automated SVN update very likely to discard changes > > made through the Pootle interface and not committed. > > > This is a bug then from how I remember coding this. I think what > actually is supposed to happen is local changes that conflict with > repository changes get moved to suggestions - you could check this.
Yes definitely a bug it should go into the suggestions file for resolution by a translator. The assumption was always that SVN is authoritative thus we have to abandon the local translation unless the message from SVN was untranslated. So untranslated should be accepted. Translated in SVN and changed in Pootle should become a suggestion. One thing which we have not looked at but that could make this process better is the new feature in Gettext 0.16 (I think) which allows PO files to store the previous translation. This would allow make it easier to accept some translations made in Pootle when doing this upgrade. Re: a command line tool. One doesn't exist. We'd need to pull out the code that does merging from Pootle. Another concern would be locking which isn't being done currently in Pootle. -- Dwayne Bailey Translate.org.za +27-12-460-1095 (w) +27-83-443-7114 (cell) ------------------------------------------------------------------------- This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ _______________________________________________ Translate-pootle mailing list Translate-pootle@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/translate-pootle
