diff options
| author | ncls7615 <himasoto@gmail.com> | 2017-12-11 09:43:21 +0900 |
|---|---|---|
| committer | ncls7615 <himasoto@gmail.com> | 2017-12-11 09:43:21 +0900 |
| commit | a98b0a47ef19f587da60907b68c5c5edfde432a0 (patch) | |
| tree | 50a37fa1dc6aafb1210a441dd989605a646d3e21 /config/locales/fr.yml | |
| parent | 0e567977923f2e7827192da0990d529859033f1a (diff) | |
| parent | 26c9b9fa276fd629789fd06f65a5d698b182f67a (diff) | |
Merge branch 'master' of https://github.com/glitch-soc/mastodon into glitch-langfiles
# Conflicts: # app/javascript/glitch/locales/ja.json
Diffstat (limited to 'config/locales/fr.yml')
| -rw-r--r-- | config/locales/fr.yml | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/config/locales/fr.yml b/config/locales/fr.yml index cd97f5967..45243d07e 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -677,8 +677,6 @@ fr: <p>Originellement adapté à partir de la politique de confidentialité de <a href="https://github.com/discourse/discourse">Discourse</a>.</p> title: "%{instance} Conditions d’utilisations et politique de confidentialité" - themes: - default: Mastodon time: formats: default: "%d %b %Y, %H:%M" |