about summary refs log tree commit diff
path: root/config/locales
diff options
context:
space:
mode:
Diffstat (limited to 'config/locales')
-rw-r--r--config/locales/en.yml5
-rw-r--r--config/locales/simple_form.en.yml4
2 files changed, 6 insertions, 3 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6d6f67f91..a1dc1c326 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -550,6 +550,9 @@ en:
       trends:
         desc_html: Publicly display previously reviewed hashtags that are currently trending
         title: Trending hashtags
+    site_uploads:
+      delete: Delete uploaded file
+      destroyed_msg: Site upload successfully deleted!
     statuses:
       back_to_account: Back to account page
       batch:
@@ -738,7 +741,7 @@ en:
     '422':
       content: Security verification failed. Are you blocking cookies?
       title: Security verification failed
-    '429': Throttled
+    '429': Too many requests
     '500':
       content: We're sorry, but something went wrong on our end.
       title: This page is not correct
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index ca105defa..cf8f7120d 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -46,8 +46,8 @@ en:
         setting_default_language: The language of your toots can be detected automatically, but it's not always accurate
         setting_default_sensitive: Sensitive media is hidden by default and can be revealed with a click
         setting_display_media_default: Hide media marked as sensitive
-        setting_display_media_hide_all: Always hide all media
-        setting_display_media_show_all: Always show media marked as sensitive
+        setting_display_media_hide_all: Always hide media
+        setting_display_media_show_all: Always show media
         setting_hide_network: Who you follow and who follows you will not be shown on your profile
         setting_noindex: Affects your public profile and status pages
         setting_show_application: The application you use to toot will be displayed in the detailed view of your toots