French translation updating and italian 25% translation

postiffm / bibledit-desktop

Desktop version of Bibledit

GNU General Public License v3.0

4 stars 6 forks source link

Closed LAfricain closed 5 years ago

postiffm commented 5 years ago

Wonderful. But we do have a conflict. Do you know what the conflict is about?

LAfricain commented 5 years ago

The conflicts is probably because your fr.po is not up to date. You can use mine.

postiffm commented 5 years ago

Merged and conflict fixed at hash 6912461.