Cyriaque Dupoirieux wrote:
> David Crossley wrote:
> >Thanks, would you please do an 'svn update' and verify that the accented 
> >character is okay. 
> It's Okay,
> 
> >Subversion reported conflicts for other reasons, so i applied it by hand. 
> >Also i tweaked it to be consistent with the others. I we change the colon 
> >spacing, we should be consistent.
> > 
> In French we have to put one blanc before and one blanc after the 
> semi-colon <;>, the colon <:>, the question mark <?> and the exclamation 
> mark <!>...
> http://grammaire.reverso.net/index_alpha/Fiches/Fiche193.htm
> 
> That's why I did not do as the others ;-) .

Okay i will put it back.

> >You might need to do 'svn revert CommonMessages_fr.xml' before you update.
> >
> I effectively had to resolve a conflict..;

That is why i suggested that you copy your file to a save.
Then either remove your copy or do 'svn revert'. Then do 'svn update'.

--David

Reply via email to