Merge branch 'origin/master' into Weblate

This commit is contained in:
Hosted Weblate 2018-11-02 01:30:12 +01:00
commit 2ac2170e72
No known key found for this signature in database
GPG Key ID: A3FAAA06E6569B4C
1 changed files with 3 additions and 2 deletions

View File

@ -190,7 +190,7 @@
<string name="media_thumbnail_height">Hauteur des pièces jointes dans linterface
\n(défaut=64(dp), redémarrage nécessaire)</string>
<string name="mention">mention</string>
<string name="mention2">Mention</string>
<string name="mention2">Mentionner</string>
<string name="menu">Menu</string>
<string name="minimum_column_width">Largeur minimum des colonnes \n(défaut=300(dp), redémarrage nécessaire)</string>
<string name="missing_permission_to_access_media">Missing app permission to access media.</string>
@ -814,4 +814,5 @@
<string name="ftl_around_toot">Fil fédéré autour de ce pouet … (Mastodon 2.6)</string>
<string name="verified_at">vérifié à</string>
</resources>
<string name="use_old_api">Utiliser lancienne API</string>
</resources>