specter/mastodon
1
0
Fork 0
forked from fedi/mastodon
Code Pull requests Activity

Update fr.yml (#5330)

Browse source 
* Update fr.yml

Update of french translation and reformatting Privacy Policy for better maintenance.

* Update fr.yml

* Update fr.yml

* Update fr.yml

Corrections suivant les remarques d'Alda.

* Update fr.yml

* Update fr.yml

* Update fr.yml

* Update fr.yml

* Update fr.yml

I have replaced my proposals with those accepted here to reduce the conflict.

https://github.com/tootsuite/mastodon/pull/5340

J'ai remplacé mes propositions par celles acceptées ici pour réduire le conflit.

Comment dois-je faire à l'avenir pour éviter ce genre de situations ?

* Update fr.yml

Conflict reduction.
This commit is contained in:
JohnD28 2017-10-12 15:25:34 +02:00 committed by Eugen Rochko
parent 385df2c5a0
commit 691e9112f3
1 changed files with 85 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

105
config/locales/fr.yml
View file

File diff suppressed because one or more lines are too long