about summary refs log tree commit diff
path: root/config/locales
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2019-10-28 16:25:55 +0100
committerGitHub <noreply@github.com>2019-10-28 16:25:55 +0100
commit00793a86bc52e4cb37318e42ea4ceb37a896c727 (patch)
tree1c49c58aa3c45a4ccc5c513ed0539facaf6cc137 /config/locales
parent18c07738a6b0fa3558863dbb1610695ab6f11b74 (diff)
parent046cd05a839896ffa3aedb3270c7487f0766bdf9 (diff)
Merge pull request #1240 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/locales')
-rw-r--r--config/locales/en.yml2
-rw-r--r--config/locales/simple_form.en.yml3
2 files changed, 4 insertions, 1 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 1ebeba2f2..fde013ca0 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -175,6 +175,7 @@ en:
         user: User
       salmon_url: Salmon URL
       search: Search
+      search_same_ip: Other users with the same IP
       shared_inbox_url: Shared inbox URL
       show:
         created_reports: Made reports
@@ -588,6 +589,7 @@ en:
     confirmation_dialogs: Confirmation dialogs
     discovery: Discovery
     sensitive_content: Sensitive content
+    toot_layout: Toot layout
   application_mailer:
     notification_preferences: Change e-mail preferences
     salutation: "%{name},"
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index 93312a9b1..9b467f84e 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -83,7 +83,7 @@ en:
         text: Custom warning
         type: Action
         types:
-          disable: Disable
+          disable: Disable login
           none: Do nothing
           silence: Silence
           suspend: Suspend and irreversibly delete account data
@@ -118,6 +118,7 @@ en:
         setting_aggregate_reblogs: Group boosts in timelines
         setting_auto_play_gif: Auto-play animated GIFs
         setting_boost_modal: Show confirmation dialog before boosting
+        setting_crop_images: Crop images in non-expanded toots to 16x9
         setting_default_content_type: Default format for toots
         setting_default_content_type_html: HTML
         setting_default_content_type_markdown: Markdown