Le Wed, 06 Jun 2012 15:26:31 -0300,
intrigeri <intrigeri@???> a écrit :
> Merged and pushed to origin/master, but still needs review (I quickly
> noticed a bunch of spelling mistakes).
The pages 'persistence' and 'persistence/configure' were reviewed, a
few corrections* were done via the web interface.
> There were a large number of unresolved merge conflicts left around,
> which made the resulting affected .po files invalid and mostly
> useless. I quickly "fixed" this, by blindly resolving all conflicts in
> favour of your own version. If work was lost by doing this, it can be
> found in the Git history. Please check the result is OK.
Checked, everything looks fine
ciao
* see here :
git.immerda.ch/?p=amnesia.git;a=blobdiff;f=wiki/src/doc%2Ffirst_steps%2Fpersistence%2Fconfigure.fr.po;h=f843e61df2fb2bbb49f423e18a55ab7981478e9f;hp=44ce2332a912405445462cbc09ac006bba9f7ade;hb=672c5fbd66ada397d1a1b43a5cbf93c327bff429;hpb=62d6f92f2516522f0a8b47643bc14a48a2d589bc
