about summary refs log tree commit diff
path: root/config
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2017-10-16 15:46:12 -0500
committerGitHub <noreply@github.com>2017-10-16 15:46:12 -0500
commit7c44ad63550ccf3cb7532440f79196b20dc24c5d (patch)
treefb5d8ed08dc130607fd7fd31c67b7cad4ebfd8f5 /config
parent6cd5b3bbe5a11fcf25bbefba2803f2ae840f39fc (diff)
parent37ff061d9bf0a91da6580960be01e3c6bc5e5c4c (diff)
Merge pull request #181 from glitch-soc/upstream-merge-again
Merge upstream, pull in fixes for tootsuite/mastodon#{5409,5417}
Diffstat (limited to 'config')
-rw-r--r--config/locales/oc.yml4
-rw-r--r--config/locales/simple_form.en.yml1
-rw-r--r--config/locales/simple_form.oc.yml1
-rw-r--r--config/locales/simple_form.pl.yml1
-rw-r--r--config/settings.yml1
5 files changed, 6 insertions, 2 deletions
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 2d72d247f..b30f797c7 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.en.yml b/config/locales/simple_form.en.yml
index 86c80290c..aafae48ce 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -44,6 +44,7 @@ en:
         setting_default_sensitive: Always mark media as sensitive
         setting_delete_modal: Show confirmation dialog before deleting a toot
         setting_noindex: Opt-out of search engine indexing
+        setting_reduce_motion: Reduce motion in animations
         setting_system_font_ui: Use system's default font
         setting_theme: Site theme
         setting_unfollow_modal: Show confirmation dialog before unfollowing someone
diff --git a/config/locales/simple_form.oc.yml b/config/locales/simple_form.oc.yml
index d45f98e66..c1d5e2008 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
diff --git a/config/locales/simple_form.pl.yml b/config/locales/simple_form.pl.yml
index e5d408973..68f84d109 100644
--- a/config/locales/simple_form.pl.yml
+++ b/config/locales/simple_form.pl.yml
@@ -48,6 +48,7 @@ pl:
         setting_default_sensitive: Zawsze oznaczaj zawartość multimedialną jako wrażliwą
         setting_delete_modal: Pytaj o potwierdzenie przed usunięciem wpisu
         setting_noindex: Nie indeksuj mojego profilu w wyszukiwarkach internetowych
+        setting_reduce_motion: Ogranicz ruch w animacjach
         setting_system_font_ui: Używaj domyślnej czcionki systemu
         setting_theme: Motyw strony
         setting_unfollow_modal: Pytaj o potwierdzenie przed cofnięciem śledzenia
diff --git a/config/settings.yml b/config/settings.yml
index 3cd3307f4..c03d0b766 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -22,6 +22,7 @@ defaults: &defaults
   boost_modal: false
   delete_modal: true
   auto_play_gif: false
+  reduce_motion: false
   system_font_ui: false
   noindex: false
   theme: 'default'