Hello all, Last weekend I got an error when commiting the add-on-creator po file, probably due to the fact that the file was merged on the server when I was working on it and there were added some new strings. I tried to resolve the conflicts locally after updating, but the result I got (I'm using RapidSVN) is unusable. Unfortunately I don't have the exact text of the error message any more, but it was about my version being older than the one on the server. Is there any specific time/date when merging occurs? Thanks, Daiana ____________________________________________________________________________________ Be a better Heartthrob. Get better relationship answers from someone who knows. Yahoo! Answers - Check it out. http://answers.yahoo.com/dir/?link=list&sid=396545433 --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-translation+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-translation+help@opensuse.org