about summary refs log tree commit diff
path: root/config/locales/simple_form.ca.yml
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2018-01-28 22:45:17 -0600
committerDavid Yip <yipdw@member.fsf.org>2018-01-28 22:45:17 -0600
commitf4b2478af11bd5e2125eb245bda4fda7577817d1 (patch)
tree6a09934546f4e2ad8db8d43372ac3192834a42f1 /config/locales/simple_form.ca.yml
parent00ce2be148a06ddd7e692ce963dfab356e331629 (diff)
parente14c20582f9f455ade989307016e6726cb8ff959 (diff)
Merge remote-tracking branch 'origin/master' into merge-upstream
 Conflicts:
	app/views/layouts/mailer.html.haml
	config/locales/ko.yml
Diffstat (limited to 'config/locales/simple_form.ca.yml')
-rw-r--r--config/locales/simple_form.ca.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/locales/simple_form.ca.yml b/config/locales/simple_form.ca.yml
index 3d210b73c..9bb48e5be 100644
--- a/config/locales/simple_form.ca.yml
+++ b/config/locales/simple_form.ca.yml
@@ -41,7 +41,7 @@ ca:
         otp_attempt: Codi de dos factors
         password: Contrasenya
         setting_auto_play_gif: Auto-reproducció de GIFs animats
-        setting_boost_modal: Mostrar finestra de confirmació abans d'un Retoot
+        setting_boost_modal: Mostrar finestra de confirmació abans d'un retoot
         setting_default_privacy: Privacitat de publicacions
         setting_default_sensitive: Marca sempre els multimèdia com a sensibles
         setting_delete_modal: Mostrar finestra de confirmació abans d'esborrar un toot