diff options
author | David Yip <yipdw@member.fsf.org> | 2017-10-12 04:22:59 -0500 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2017-10-12 04:22:59 -0500 |
commit | 13e05fece2a60c3b0a6f4328f7e96f8dd89008cf (patch) | |
tree | 8941bce1cd7b9b00b1732cb2879707ddfac14eef /app/javascript | |
parent | eeaa8fba43d40e9ecaf6c16c5989c8ead89b4935 (diff) | |
parent | 8e9911962d71e5f010bf5e8974dbe9ab59220185 (diff) |
Merge tag 'v2.0.0rc2' into gs-master
Diffstat (limited to 'app/javascript')
-rw-r--r-- | app/javascript/mastodon/locales/fr.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json index 48f174c4c..4eca47b60 100644 --- a/app/javascript/mastodon/locales/fr.json +++ b/app/javascript/mastodon/locales/fr.json @@ -168,7 +168,7 @@ "search_popout.search_format": "Recherche avancée", "search_popout.tips.hashtag": "hashtag", "search_popout.tips.status": "statuts", - "search_popout.tips.text": "Un texte simple renvoie les noms affichés, les noms d'utilisateur⋅ice et les hashtags correspondants", + "search_popout.tips.text": "Un texte simple renvoie les noms affichés, les noms d’utilisateur⋅ice et les hashtags correspondants", "search_popout.tips.user": "utilisateur⋅ice", "search_results.total": "{count, number} {count, plural, one {résultat} other {résultats}}", "standalone.public_title": "Jeter un coup d’œil…", |