From 1e7b3bf6257dc7fd12c5bafffb941f84bce4b982 Mon Sep 17 00:00:00 2001
From: JeanGauthier <32121978+JeanGauthier@users.noreply.github.com>
Date: Mon, 16 Oct 2017 14:09:26 +0200
Subject: [PATCH] =?UTF-8?q?i18n=20ultim=20hour=20=C2=ABMore=C2=BB=20dropdo?=
 =?UTF-8?q?wn=20title=20+=20reduce=20motion=20(#5415)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Correction fem. form

* More dropdown title

* More dropdown title

* More dropdown title

* Add option to reduce motion (#5393)
---
 app/javascript/mastodon/locales/ca.json | 1 +
 app/javascript/mastodon/locales/es.json | 1 +
 app/javascript/mastodon/locales/oc.json | 1 +
 config/locales/oc.yml                   | 4 ++--
 config/locales/simple_form.oc.yml       | 1 +
 5 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index fe24335919..1130e6c09f 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -184,6 +184,7 @@
   "status.load_more": "Carrega més",
   "status.media_hidden": "Multimèdia amagat",
   "status.mention": "Esmentar @{name}",
+  "status.more": "Més",
   "status.mute_conversation": "Silenciar conversació",
   "status.open": "Ampliar aquest estat",
   "status.pin": "Fixat en el perfil",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index f6bfbb04d9..03dd9ce022 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -179,6 +179,7 @@
   "status.load_more": "Cargar más",
   "status.media_hidden": "Contenido multimedia oculto",
   "status.mention": "Mencionar",
+  "status.more": "Más",
   "status.mute_conversation": "Silenciar conversación",
   "status.open": "Expandir estado",
   "status.pin": "Fijar",
diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json
index 4715f60efb..773f2d1e4b 100644
--- a/app/javascript/mastodon/locales/oc.json
+++ b/app/javascript/mastodon/locales/oc.json
@@ -179,6 +179,7 @@
   "status.load_more": "Cargar mai",
   "status.media_hidden": "Mèdia rescondut",
   "status.mention": "Mencionar",
+  "status.more": "Mai",
   "status.mute_conversation": "Rescondre la conversacion",
   "status.open": "Desplegar aqueste estatut",
   "status.pin": "Penjar al perfil",
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 2d72d247f8..b30f797c7d 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -120,9 +120,9 @@ oc:
       destroyed_msg: Nòta de moderacion ben suprimida !
 
     custom_emojis:
-      copied_msg: Còpia locale de l’emoji ben creada
+      copied_msg: Còpia locala de l’emoji ben creada
       copy: Copiar
-      copy_failed_msg: Fracàs de la còpia locale de l’emoji
+      copy_failed_msg: Fracàs de la còpia locala de l’emoji
       created_msg: Emoji ben creat !
       delete: Suprimir
       destroyed_msg: Emojo ben suprimit !
diff --git a/config/locales/simple_form.oc.yml b/config/locales/simple_form.oc.yml
index d45f98e66b..c1d5e20080 100644
--- a/config/locales/simple_form.oc.yml
+++ b/config/locales/simple_form.oc.yml
@@ -38,6 +38,7 @@ oc:
         otp_attempt: Còdi Two-factor
         password: Senhal
         setting_auto_play_gif: Lectura automatica dels GIFS animats
+        setting_reduce_motion: Reduire la velocitat de las animacions
         setting_boost_modal: Afichar una fenèstra de confirmacion abans de partejar un estatut
         setting_default_privacy: Confidencialitat de las publicacions
         setting_default_sensitive: Totjorn marcar los mèdias coma sensibles