merge upstream changes?

[yarikoptic]

The issue will be closed without any reasons if it does not satisfy any of following requirements:

1. Please speak English.
2. Please take a moment to search that an issue doesn't already exist.
3. Please give all relevant information below for bug reports; incomplete details considered invalid report.

yoh@hopa:~/gocode/src/github.com/G-Node/gogs> git show v0.11.34 | head
commit 6f2347fc71f17b5703a9b1f383a2d3451f88b741
Author: Unknwon <u@gogs.io>
Date:   Wed Nov 22 14:46:14 2017 -0500

    locale: sync from Crowdin
    
    Fixes #4811

diff --git a/conf/locale/locale_fr-FR.ini b/conf/locale/locale_fr-FR.ini
index c04c931c..4754f168 100644

yoh@hopa:~/gocode/src/github.com/G-Node/gogs> git describe --tags 
v0.11.19-187-ga37c1225