From fa0be3f834b54bb276eb5233195181fa3760710f Mon Sep 17 00:00:00 2001 From: Nolan Lawson Date: Mon, 16 Oct 2017 00:36:15 -0700 Subject: Add option to reduce motion (#5393) * Add option to reduce motion * Use HOC to wrap all Motion calls * fix case-sensitive issue * Avoid updating too frequently * Get rid of unnecessary change to _simple_status.html.haml --- config/locales/simple_form.en.yml | 1 + 1 file changed, 1 insertion(+) (limited to 'config/locales/simple_form.en.yml') diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index 86c80290c..5a58e8667 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -39,6 +39,7 @@ en: otp_attempt: Two-factor code password: Password setting_auto_play_gif: Auto-play animated GIFs + setting_reduce_motion: Reduce motion in animations setting_boost_modal: Show confirmation dialog before boosting setting_default_privacy: Post privacy setting_default_sensitive: Always mark media as sensitive -- cgit From 3c530d95f66c3408b438aba924e943e4af35f92e Mon Sep 17 00:00:00 2001 From: Marcin Mikołajczak Date: Mon, 16 Oct 2017 14:09:51 +0200 Subject: i18n: Update Polish translation (#5416) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marcin Mikołajczak --- app/javascript/mastodon/locales/pl.json | 1 + config/locales/simple_form.en.yml | 2 +- config/locales/simple_form.pl.yml | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) (limited to 'config/locales/simple_form.en.yml') diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json index c8228c0cb..77da77e10 100644 --- a/app/javascript/mastodon/locales/pl.json +++ b/app/javascript/mastodon/locales/pl.json @@ -179,6 +179,7 @@ "status.load_more": "Załaduj więcej", "status.media_hidden": "Zawartość multimedialna ukryta", "status.mention": "Wspomnij o @{name}", + "status.more": "Więcej", "status.mute_conversation": "Wycisz konwersację", "status.open": "Rozszerz ten wpis", "status.pin": "Przypnij do profilu", diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index 5a58e8667..aafae48ce 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -39,12 +39,12 @@ en: otp_attempt: Two-factor code password: Password setting_auto_play_gif: Auto-play animated GIFs - setting_reduce_motion: Reduce motion in animations setting_boost_modal: Show confirmation dialog before boosting setting_default_privacy: Post privacy 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.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 -- cgit