[Tails-l10n] Checking French translation after 4.5 publicati…

Delete this message

Reply to this message
Autore: Cyril Brulebois
Data:  
To: xin
CC: tails-l10n
Oggetto: [Tails-l10n] Checking French translation after 4.5 publication
Heya xin,

For the first time I've had to resolve a conflict when merging the
web/release branch into master before pushing the latter.

Please double check this commit, and the resulting files, when you
get a chance:

    commit ab4aad44fa5351ba0344ff70c7a3547422719143
    Merge: ed786d37d2 45e38b3dbd
    Author: Cyril Brulebois <ckb@???>
    Date:   Tue Apr 7 18:04:33 2020 +0200


        Merge remote-tracking branch 'origin/web/release-4.5'


        Conflicts:
                wiki/src/doc/first_steps/persistence/copy.fr.po


        Fix conflict by picking the older dates, to try and ensure the PO file
        has a chance of getting double checked.



Cheers,
--
Cyril 'kibi' Brulebois (ckb@???)