Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-03-25 15:17:21 +00:00
parent 995b59526b 85a395fab6
commit 837b3804bf
128 changed files with 1274 additions and 1030 deletions
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@ -634,6 +634,14 @@ fr:
    two_factor_authentication: Identification à deux facteurs
    your_apps: Vos applications
  statuses:
+    attached:
+      description: 'Attaché : %{attached}'
+      image:
+        one: "%{count} image"
+        other: "%{count} images"
+      video:
+        one: "%{count} vidéo"
+        other: "%{count} vidéos"
    open_in_web: Ouvrir sur le web
    over_character_limit: limite de caractères dépassée de %{max} caractères
    pin_errors: