search

postiffm / bibledit-desktop

Desktop version of Bibledit
GNU General Public License v3.0
4 stars 6 forks source link

New po file #45

Closed LAfricain closed 6 years ago

LAfricain commented 6 years ago

New fr.po file to be merge, I hope this time the pull request will well be done ?? If not I can send the file manually. I'm just surprised to see so much commits in the pull request...

LAfricain commented 6 years ago

Stylesheet.xml is now internationalized, please update the po.

postiffm commented 6 years ago

I think the extra commits happen in the pull request because you are not keeping up to date on my commits, or not rebasing. I'm not sure.

postiffm commented 6 years ago

I have cherry-picked d801b22, ee15ab3, and ef277c1. I think that is all I need to close this pull request. (I am not expert enough in git to figure out how to do this easily...I had to wade through commit conflicts between your pull request and my latest master.)

postiffm commented 6 years ago

Closed with commit 825f787..4f1fbad

LAfricain commented 6 years ago

I think the extra commits happen in the pull request because you are not keeping up to date on my commits, or not rebasing. I'm not sure.

Yes I was surprised with all this extra commits! I don't know how to do to avoid this??

I have cherry-picked d801b22, ee15ab3, and ef277c1.

Yes, this is OK!