search

mikifus / padland

Padland is a tool to manage, share, remember and read collaborative documents based on the Etherpad technology in Android.
Apache License 2.0
62 stars 15 forks source link

Updated fr (French) translation #41

Closed Poussinou closed 6 years ago

Poussinou commented 6 years ago

Here is an update for the french translation, commit made via Stringlate

I would like to say thank you, mikifus. Padland was one of the first repo (the second one, in fact) I contributed to on Github two years ago. You took some time to help me, and you welcomed me well. That's not a lot, but I will say it again: thank you! 🥇

Poussinou commented 6 years ago

I don't understand why

This branch has conflicts that must be resolved

Check the strings.xml yourself, everything is translated, each translation key is present in my file...

mikifus commented 6 years ago

Hi!

The branch indeed has conflicts. This is because before you edit and push you must do pull. That way you download all the changes I made during this time and then you can push without conflict. At this point you can save the work you already did, then revert the changes, then pull and finally apply the new translations again. There's plenty of documentation about this, but feel free to ask if you have any doubts.

I'm glad to hear my project was a motivation for you. This was also my first FOSS project trying to follow the rules and also my way to learn Android, so we're both into this. Thank you for your contributions!

Poussinou commented 6 years ago

Better to reopen a new PR, see #43