about summary refs log tree commit diff
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/application.rb6
-rw-r--r--config/environments/production.rb8
-rw-r--r--config/i18n-tasks.yml2
-rw-r--r--config/initializers/content_security_policy.rb4
-rw-r--r--config/initializers/simple_form.rb10
-rwxr-xr-xconfig/locales/en-cafe.yml47
-rw-r--r--config/locales/simple_form.ar.yml1
-rw-r--r--config/locales/simple_form.ast.yml1
-rw-r--r--config/locales/simple_form.co.yml1
-rw-r--r--config/locales/simple_form.cs.yml1
-rw-r--r--config/locales/simple_form.cy.yml1
-rw-r--r--config/locales/simple_form.da.yml1
-rw-r--r--config/locales/simple_form.de.yml1
-rw-r--r--config/locales/simple_form.el.yml1
-rw-r--r--config/locales/simple_form.en.yml3
-rw-r--r--config/locales/simple_form.eo.yml1
-rw-r--r--config/locales/simple_form.es-AR.yml1
-rw-r--r--config/locales/simple_form.et.yml1
-rw-r--r--config/locales/simple_form.eu.yml1
-rw-r--r--config/locales/simple_form.fa.yml1
-rw-r--r--config/locales/simple_form.fi.yml1
-rw-r--r--config/locales/simple_form.fr.yml1
-rw-r--r--config/locales/simple_form.gl.yml1
-rw-r--r--config/locales/simple_form.hu.yml1
-rw-r--r--config/locales/simple_form.hy.yml1
-rw-r--r--config/locales/simple_form.id.yml1
-rw-r--r--config/locales/simple_form.is.yml1
-rw-r--r--config/locales/simple_form.it.yml1
-rw-r--r--config/locales/simple_form.ja.yml1
-rw-r--r--config/locales/simple_form.kab.yml1
-rw-r--r--config/locales/simple_form.kk.yml1
-rw-r--r--config/locales/simple_form.ko.yml1
-rw-r--r--config/locales/simple_form.nl.yml1
-rw-r--r--config/locales/simple_form.nn.yml1
-rw-r--r--config/locales/simple_form.no.yml1
-rw-r--r--config/locales/simple_form.oc.yml1
-rw-r--r--config/locales/simple_form.pl.yml1
-rw-r--r--config/locales/simple_form.pt-BR.yml1
-rw-r--r--config/locales/simple_form.pt-PT.yml1
-rw-r--r--config/locales/simple_form.ro.yml1
-rw-r--r--config/locales/simple_form.ru.yml1
-rw-r--r--config/locales/simple_form.sk.yml1
-rw-r--r--config/locales/simple_form.sl.yml1
-rw-r--r--config/locales/simple_form.sq.yml1
-rw-r--r--config/locales/simple_form.sv.yml1
-rw-r--r--config/locales/simple_form.th.yml1
-rw-r--r--config/locales/simple_form.tr.yml1
-rw-r--r--config/locales/simple_form.uk.yml1
-rw-r--r--config/locales/simple_form.vi.yml1
-rw-r--r--config/locales/simple_form.zh-CN.yml1
-rw-r--r--config/locales/simple_form.zh-HK.yml1
-rw-r--r--config/locales/simple_form.zh-TW.yml1
52 files changed, 59 insertions, 66 deletions
diff --git a/config/application.rb b/config/application.rb
index eb5af9cc0..1ce5fd857 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -84,6 +84,7 @@ module Mastodon
       :de,
       :el,
       :en,
+      :'en-cafe',
       :eo,
       :es,
       :'es-AR',
@@ -155,10 +156,13 @@ module Mastodon
       if config.i18n.available_locales.include?(custom_default_locale)
         custom_default_locale
       else
-        :en
+        :'en-cafe'
       end
     end
 
+    # fall back to English when a translation cannot be found
+    config.i18n.fallbacks = [:'en-cafe', :en]
+
     # config.paths.add File.join('app', 'api'), glob: File.join('**', '*.rb')
     # config.autoload_paths += Dir[Rails.root.join('app', 'api', '*')]
 
diff --git a/config/environments/production.rb b/config/environments/production.rb
index ce3c41799..1d9063cd6 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -65,10 +65,6 @@ Rails.application.configure do
   # Set this to true and configure the email server for immediate delivery to raise delivery errors.
   # config.action_mailer.raise_delivery_errors = false
 
-  # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
-  # English when a translation cannot be found).
-  config.i18n.fallbacks = [:en]
-
   # Send deprecation notices to registered listeners.
   config.active_support.deprecation = :notify
 
@@ -121,7 +117,9 @@ Rails.application.configure do
     'X-XSS-Protection'        => '0',
     'Permissions-Policy'      => 'interest-cohort=()',
     'Referrer-Policy'         => 'same-origin',
-    'X-Clacks-Overhead' => 'GNU Natalie Nguyen'
+    'Strict-Transport-Security' => 'max-age=63072000; includeSubDomains; preload',
+    'X-Clacks-Overhead' => 'GNU Natalie Nguyen, GNU Anna Harren',
+    'big-tails' => 'never-fail'
   }
 
   config.x.otp_secret = ENV.fetch('OTP_SECRET')
diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml
index a3d7baecd..84f5d6666 100644
--- a/config/i18n-tasks.yml
+++ b/config/i18n-tasks.yml
@@ -51,7 +51,7 @@ ignore_unused:
   - 'activerecord.errors.*'
   - '{devise,pagination,doorkeeper}.*'
   - '{date,datetime,time,number}.*'
-  - 'simple_form.{yes,no,recommended}'
+  - 'simple_form.{yes,no}'
   - 'simple_form.{placeholders,hints,labels}.*'
   - 'simple_form.{error_notification,required}.:'
   - 'errors.messages.*'
diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb
index 21f782b9c..863db9d15 100644
--- a/config/initializers/content_security_policy.rb
+++ b/config/initializers/content_security_policy.rb
@@ -33,9 +33,9 @@ if Rails.env.production?
     p.frame_ancestors :none
     p.script_src      :self, assets_host
     p.font_src        :self, assets_host
-    p.img_src         :self, :data, :blob, *data_hosts
+    p.img_src         :self, :data, :blob, *data_hosts, "pool.jortage.com", "blob.jortage.com", "s3-us-east-2.amazonaws.com"
     p.style_src       :self, assets_host
-    p.media_src       :self, :data, *data_hosts
+    p.media_src       :self, :data, *data_hosts, "pool.jortage.com", "blob.jortage.com", "s3-us-east-2.amazonaws.com"
     p.frame_src       :self, :https
     p.child_src       :self, :blob, assets_host
     p.worker_src      :self, :blob, assets_host
diff --git a/config/initializers/simple_form.rb b/config/initializers/simple_form.rb
index 3a2097d2f..8ec642653 100644
--- a/config/initializers/simple_form.rb
+++ b/config/initializers/simple_form.rb
@@ -8,16 +8,7 @@ module AppendComponent
   end
 end
 
-module RecommendedComponent
-  def recommended(_wrapper_options = nil)
-    return unless options[:recommended]
-    options[:label_text] = ->(raw_label_text, _required_label_text, _label_present) { safe_join([raw_label_text, ' ', content_tag(:span, I18n.t('simple_form.recommended'), class: 'recommended')]) }
-    nil
-  end
-end
-
 SimpleForm.include_component(AppendComponent)
-SimpleForm.include_component(RecommendedComponent)
 
 SimpleForm.setup do |config|
   # Wrappers are used by the form builder to generate a
@@ -74,7 +65,6 @@ SimpleForm.setup do |config|
     b.use :html5
 
     b.wrapper tag: :div, class: :label_input do |ba|
-      ba.optional :recommended
       ba.use :label
 
       ba.wrapper tag: :div, class: :label_input__wrapper do |bb|
diff --git a/config/locales/en-cafe.yml b/config/locales/en-cafe.yml
new file mode 100755
index 000000000..77c5338f0
--- /dev/null
+++ b/config/locales/en-cafe.yml
@@ -0,0 +1,47 @@
+---
+en-cafe:
+  about:
+    about_hashtag_html: These are public toots tagged with <strong>#%{hashtag}</strong>. You can interact with them if you have an account anywhere in the fediverse.
+    hosted_on: GlitchCafé hosted on %{domain}
+    posts:
+      one: Toot
+      other: Toots
+    posts_tab_heading: Toots
+    posts_with_replies: Toots and replies
+    unavailable_content: Domain blocks
+    unavailable_content_description:
+      domain: Instance
+      reason: Reason
+      rejecting_media: 'Media files from these instances will not be processed or stored, and no thumbnails will be displayed, requiring manual click-through to the original file:'
+      rejecting_media_title: Filtered media
+      silenced: 'Posts from these instances will be hidden in public timelines and conversations, and no notifications will be generated from their users interactions, unless you are following them:'
+      silenced_title: Silenced instances
+      suspended: 'No data from these instances will be processed, stored or exchanged, making any interaction or communication with users from these instances impossible:'
+      suspended_title: Suspended instances
+  archive_takeout:
+      hint_html: You can request an archive of your <strong>toots and uploaded media</strong>. The exported data will be in the ActivityPub format, readable by any compliant software. You can request an archive every 7 days.
+  auth:
+    description:
+      prefix_invited_by_user: "@%{name} invites you to join Plural Café!"
+      prefix_sign_up: Sign up on Plural Café today!
+  remote_interaction:
+    favourite:
+      prompt: 'You want to favourite this toot:'
+    reblog:
+      prompt: 'You want to boost this toot:'
+    reply:
+      prompt: 'You want to reply to this toot:'
+  scheduled_statuses:
+    over_daily_limit: You have exceeded the limit of %{limit} scheduled toots for that day
+    over_total_limit: You have exceeded the limit of %{limit} scheduled toots
+  statuses:
+    pin_errors:
+      limit: You have already pinned the maximum number of toots
+      ownership: Someone else's toot cannot be pinned
+      private: Non-public toot cannot be pinned
+  stream_entries:
+    pinned: Pinned toot
+  user_mailer:
+    warning:
+      explanation:
+        silence: You can still use your account but only people who are already following you will see your toots on this server, and you may be excluded from various public listings. However, others may still manually follow you.
diff --git a/config/locales/simple_form.ar.yml b/config/locales/simple_form.ar.yml
index cf8140278..be4b33fdc 100644
--- a/config/locales/simple_form.ar.yml
+++ b/config/locales/simple_form.ar.yml
@@ -214,7 +214,6 @@ ar:
         trendable: السماح لهذه الكلمة المفتاحية بالظهور تحت المتداوَلة
         usable: اسمح للمنشورات استخدام هذا الوسم
     'no': لا
-    recommended: موصى بها
     required:
       mark: "*"
       text: مطلوب
diff --git a/config/locales/simple_form.ast.yml b/config/locales/simple_form.ast.yml
index ae7cf5217..6c9753523 100644
--- a/config/locales/simple_form.ast.yml
+++ b/config/locales/simple_form.ast.yml
@@ -97,7 +97,6 @@ ast:
       tag:
         name: Etiqueta
     'no': Non
-    recommended: Aconséyase
     required:
       mark: "*"
       text: ríquese
diff --git a/config/locales/simple_form.co.yml b/config/locales/simple_form.co.yml
index 576feb031..529a2ba44 100644
--- a/config/locales/simple_form.co.yml
+++ b/config/locales/simple_form.co.yml
@@ -203,7 +203,6 @@ co:
         trendable: Auturizà stu hashtag à esse vistu in e tendenze
         usable: Auturizà i statuti à utilizà stu hashtag
     'no': Nò
-    recommended: Ricumandati
     required:
       mark: "*"
       text: riquisiti
diff --git a/config/locales/simple_form.cs.yml b/config/locales/simple_form.cs.yml
index 3276b4843..c8cc9985d 100644
--- a/config/locales/simple_form.cs.yml
+++ b/config/locales/simple_form.cs.yml
@@ -209,7 +209,6 @@ cs:
         trendable: Povolit zobrazení tohoto hashtagu mezi populárními
         usable: Povolit používat tento hashtag v příspěvcích
     'no': Ne
-    recommended: Doporučeno
     required:
       mark: "*"
       text: vyžadováno
diff --git a/config/locales/simple_form.cy.yml b/config/locales/simple_form.cy.yml
index 38d27cd4d..c2ab1d4f7 100644
--- a/config/locales/simple_form.cy.yml
+++ b/config/locales/simple_form.cy.yml
@@ -179,7 +179,6 @@ cy:
         trendable: Gadewch i'r hashnod hwn ymddangos o dan dueddiadau
         usable: Caniatáu i tŵtiau ddefnyddio'r hashnod hwn
     'no': Na
-    recommended: Argymhellwyd
     required:
       text: gofynnol
     'yes': Ie
diff --git a/config/locales/simple_form.da.yml b/config/locales/simple_form.da.yml
index f69a92a60..2af37ff4e 100644
--- a/config/locales/simple_form.da.yml
+++ b/config/locales/simple_form.da.yml
@@ -218,7 +218,6 @@ da:
         trendable: Tillad visning af dette hashtag under trends
         usable: Tillad indlæg at benytte dette hashtag
     'no': Nej
-    recommended: Anbefalet
     required:
       mark: "*"
       text: obligatorisk
diff --git a/config/locales/simple_form.de.yml b/config/locales/simple_form.de.yml
index 5595059b1..b4158953e 100644
--- a/config/locales/simple_form.de.yml
+++ b/config/locales/simple_form.de.yml
@@ -218,7 +218,6 @@ de:
         trendable: Erlaube es diesen Hashtag in den Trends erscheinen zu lassen
         usable: Beiträge erlauben, diesen Hashtag zu verwenden
     'no': Nein
-    recommended: Empfohlen
     required:
       mark: "*"
       text: Pflichtfeld
diff --git a/config/locales/simple_form.el.yml b/config/locales/simple_form.el.yml
index 39dbef161..c5c1243ad 100644
--- a/config/locales/simple_form.el.yml
+++ b/config/locales/simple_form.el.yml
@@ -209,7 +209,6 @@ el:
         trendable: Εμφάνιση της ετικέτας στις τάσεις
         usable: Χρήση της ετικέτας σε τουτ
     'no': Όχι
-    recommended: Προτείνεται
     required:
       mark: "*"
       text: απαιτείται
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index b19b7891f..f3378a83e 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -72,7 +72,7 @@ en:
       imports:
         data: CSV file exported from another Mastodon server
       invite_request:
-        text: This will help us review your application
+        text: 'If you are interested in signing up, please put whether you are a plural system or singlet in the "Why do you want to join" box. This is purely to ward off spam bots. If this is not answered, your request to join the instance will be rejected.'
       ip_block:
         comment: Optional. Remember why you added this rule.
         expires_in: IP addresses are a finite resource, they are sometimes shared and often change hands. For this reason, indefinite IP blocks are not recommended.
@@ -218,7 +218,6 @@ en:
         trendable: Allow this hashtag to appear under trends
         usable: Allow posts to use this hashtag
     'no': 'No'
-    recommended: Recommended
     required:
       mark: "*"
       text: required
diff --git a/config/locales/simple_form.eo.yml b/config/locales/simple_form.eo.yml
index 11eeac74e..745ff8db7 100644
--- a/config/locales/simple_form.eo.yml
+++ b/config/locales/simple_form.eo.yml
@@ -202,7 +202,6 @@ eo:
         trendable: Permesi al ĉi tiu kradvorto aperi en furoraĵoj
         usable: Permesi mesaĝojn uzi ĉi tiun kradvorton
     'no': Ne
-    recommended: Rekomendita
     required:
       mark: "*"
       text: bezonata
diff --git a/config/locales/simple_form.es-AR.yml b/config/locales/simple_form.es-AR.yml
index 00d4ce897..9df8a8f63 100644
--- a/config/locales/simple_form.es-AR.yml
+++ b/config/locales/simple_form.es-AR.yml
@@ -218,7 +218,6 @@ es-AR:
         trendable: Permitir que esta etiqueta aparezca bajo tendencias
         usable: Permitir a los mensajes usar esta etiqueta
     'no': 'No'
-    recommended: Opción recomendada
     required:
       mark: "*"
       text: obligatorio
diff --git a/config/locales/simple_form.et.yml b/config/locales/simple_form.et.yml
index d2e51b209..bb2a2f50e 100644
--- a/config/locales/simple_form.et.yml
+++ b/config/locales/simple_form.et.yml
@@ -179,7 +179,6 @@ et:
         trendable: Luba sellel sildil trendida
         usable: Luba tuututustel seda silti kasutada
     'no': Ei
-    recommended: Soovituslik
     required:
       text: kohustuslik
     'yes': Jah
diff --git a/config/locales/simple_form.eu.yml b/config/locales/simple_form.eu.yml
index f2894385f..a3d3de4af 100644
--- a/config/locales/simple_form.eu.yml
+++ b/config/locales/simple_form.eu.yml
@@ -218,7 +218,6 @@ eu:
         trendable: Baimendu traola hau joeretan agertzea
         usable: Baimendu tootek traola hau erabiltzea
     'no': Ez
-    recommended: Aholkatua
     required:
       mark: "*"
       text: beharrezkoa
diff --git a/config/locales/simple_form.fa.yml b/config/locales/simple_form.fa.yml
index 679d7d8fd..c44a789d9 100644
--- a/config/locales/simple_form.fa.yml
+++ b/config/locales/simple_form.fa.yml
@@ -209,7 +209,6 @@ fa:
         trendable: بگذارید که این برچسب در موضوعات پرطرفدار دیده شود
         usable: بگذارید که این برچسب در بوق‌ها به کار بروند
     'no': خیر
-    recommended: توصیه می‌شود
     required:
       mark: "*"
       text: ضروری
diff --git a/config/locales/simple_form.fi.yml b/config/locales/simple_form.fi.yml
index 678ce7291..0b1239f03 100644
--- a/config/locales/simple_form.fi.yml
+++ b/config/locales/simple_form.fi.yml
@@ -217,7 +217,6 @@ fi:
         trendable: Salli tämän aihetunnisteen näkyä trendeissä
         usable: Salli postauksien käyttää tätä aihetunnistetta
     'no': Ei
-    recommended: Suositeltu
     required:
       mark: "*"
       text: pakollinen tieto
diff --git a/config/locales/simple_form.fr.yml b/config/locales/simple_form.fr.yml
index 52e4ceb2a..12d0a6c4f 100644
--- a/config/locales/simple_form.fr.yml
+++ b/config/locales/simple_form.fr.yml
@@ -218,7 +218,6 @@ fr:
         trendable: Autoriser ce hashtag à apparaitre dans les tendances
         usable: Autoriser les messages à utiliser ce hashtag
     'no': Non
-    recommended: Recommandé
     required:
       mark: "*"
       text: champs requis
diff --git a/config/locales/simple_form.gl.yml b/config/locales/simple_form.gl.yml
index e120c2c8b..23a27a4d7 100644
--- a/config/locales/simple_form.gl.yml
+++ b/config/locales/simple_form.gl.yml
@@ -218,7 +218,6 @@ gl:
         trendable: Permitir que este cancelo apareza en tendencias
         usable: Permitir que as publicacións utilicen este cancelo
     'no': Non
-    recommended: Recomendado
     required:
       mark: "*"
       text: requerido
diff --git a/config/locales/simple_form.hu.yml b/config/locales/simple_form.hu.yml
index 0b9451db8..2c9b4159f 100644
--- a/config/locales/simple_form.hu.yml
+++ b/config/locales/simple_form.hu.yml
@@ -218,7 +218,6 @@ hu:
         trendable: A hashtag megjelenhet a felkapottak között
         usable: Bejegyzések használhatják ezt a hashtaget
     'no': Nem
-    recommended: Ajánlott
     required:
       mark: "*"
       text: kötelező
diff --git a/config/locales/simple_form.hy.yml b/config/locales/simple_form.hy.yml
index 94b0096fa..3f7bb7833 100644
--- a/config/locales/simple_form.hy.yml
+++ b/config/locales/simple_form.hy.yml
@@ -201,7 +201,6 @@ hy:
         trendable: Թոյլատրել, որ այս պիտակը յայտնուի թրենդներում
         usable: Թոյլատրել գրառումներին օգտագործել այս պիտակը
     'no': Ոչ
-    recommended: Խորհուրդ է տրվում
     required:
       mark: "*"
       text: պարտադիր
diff --git a/config/locales/simple_form.id.yml b/config/locales/simple_form.id.yml
index bba49f1e2..a6f86064f 100644
--- a/config/locales/simple_form.id.yml
+++ b/config/locales/simple_form.id.yml
@@ -218,7 +218,6 @@ id:
         trendable: Izinkan tagar ini muncul di bawah tren
         usable: Izinkan toot memakai tagar ini
     'no': Tidak
-    recommended: Direkomendasikan
     required:
       mark: "*"
       text: wajib
diff --git a/config/locales/simple_form.is.yml b/config/locales/simple_form.is.yml
index c04660f22..f9b5f5410 100644
--- a/config/locales/simple_form.is.yml
+++ b/config/locales/simple_form.is.yml
@@ -218,7 +218,6 @@ is:
         trendable: Leyfa þessu myllumerki að birtast undir tilhneigingum
         usable: Leyfa færslum að nota þetta myllumerki
     'no': Nei
-    recommended: Mælt með
     required:
       mark: "*"
       text: nauðsynlegt
diff --git a/config/locales/simple_form.it.yml b/config/locales/simple_form.it.yml
index 7e44489b5..6355d298c 100644
--- a/config/locales/simple_form.it.yml
+++ b/config/locales/simple_form.it.yml
@@ -218,7 +218,6 @@ it:
         trendable: Permetti a questo hashtag di apparire nelle tendenze
         usable: Permetti ai post di usare questo hashtag
     'no': 'No'
-    recommended: Consigliato
     required:
       mark: "*"
       text: richiesto
diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml
index c6a52ce78..8eb39dd9e 100644
--- a/config/locales/simple_form.ja.yml
+++ b/config/locales/simple_form.ja.yml
@@ -209,7 +209,6 @@ ja:
         trendable: トレンドへの表示を許可する
         usable: 投稿への使用を許可する
     'no': いいえ
-    recommended: おすすめ
     required:
       mark: "*"
       text: 必須
diff --git a/config/locales/simple_form.kab.yml b/config/locales/simple_form.kab.yml
index cd73cdb47..f4c929de6 100644
--- a/config/locales/simple_form.kab.yml
+++ b/config/locales/simple_form.kab.yml
@@ -103,7 +103,6 @@ kab:
       tag:
         name: Ahacṭag
     'no': Ala
-    recommended: Yettuwelleh
     required:
       mark: "*"
       text: ilaq
diff --git a/config/locales/simple_form.kk.yml b/config/locales/simple_form.kk.yml
index 7932e54be..5b97a0e83 100644
--- a/config/locales/simple_form.kk.yml
+++ b/config/locales/simple_form.kk.yml
@@ -91,7 +91,6 @@ kk:
         trendable: Хештегті трендтерде көрсетуге рұқсат бер
         usable: Бұл хештегті қолдануға рұқсат бер
     'no': Жоқ
-    recommended: Рекоменделген
     required:
       text: міндетті
     'yes': Иә
diff --git a/config/locales/simple_form.ko.yml b/config/locales/simple_form.ko.yml
index 7ca16089e..2c6530fc8 100644
--- a/config/locales/simple_form.ko.yml
+++ b/config/locales/simple_form.ko.yml
@@ -218,7 +218,6 @@ ko:
         trendable: 이 해시태그가 유행에 보여지도록 허용
         usable: 이 해시태그를 게시물에 사용 가능하도록 허용
     'no': 아니오
-    recommended: 추천함
     required:
       mark: "*"
       text: 필수 항목
diff --git a/config/locales/simple_form.nl.yml b/config/locales/simple_form.nl.yml
index 13d86443c..56a3f2b76 100644
--- a/config/locales/simple_form.nl.yml
+++ b/config/locales/simple_form.nl.yml
@@ -209,7 +209,6 @@ nl:
         trendable: Toestaan dat deze hashtag onder trends te zien valt
         usable: Toestaan dat deze hashtag in toots gebruikt mag worden
     'no': Nee
-    recommended: Aanbevolen
     required:
       mark: "*"
       text: vereist
diff --git a/config/locales/simple_form.nn.yml b/config/locales/simple_form.nn.yml
index 0e9988654..25bc156e1 100644
--- a/config/locales/simple_form.nn.yml
+++ b/config/locales/simple_form.nn.yml
@@ -208,7 +208,6 @@ nn:
         trendable: Tillat denne emneknaggen til å synast under trendar
         usable: Gje tut lov til å nytta denne emneknaggen
     'no': Nei
-    recommended: Tilrådt
     required:
       mark: "*"
       text: obligatorisk
diff --git a/config/locales/simple_form.no.yml b/config/locales/simple_form.no.yml
index 7f1b8cbac..6d09fb788 100644
--- a/config/locales/simple_form.no.yml
+++ b/config/locales/simple_form.no.yml
@@ -208,7 +208,6 @@
         trendable: Tillat denne emneknaggen til å vises under trender
         usable: Tillat tuter å bruke denne emneknaggen
     'no': Nei
-    recommended: Anbefalt
     required:
       mark: "*"
       text: obligatorisk
diff --git a/config/locales/simple_form.oc.yml b/config/locales/simple_form.oc.yml
index 0ae0bb365..1773218a5 100644
--- a/config/locales/simple_form.oc.yml
+++ b/config/locales/simple_form.oc.yml
@@ -201,7 +201,6 @@ oc:
         trendable: Permetre a aquesta etiqueta d’aparéisser a las tendéncias
         usable: Permetre als tuts d’utilizar aquesta etiqueta
     'no': Non
-    recommended: Recomandat
     required:
       mark: "*"
       text: requesit
diff --git a/config/locales/simple_form.pl.yml b/config/locales/simple_form.pl.yml
index 8aa8626f9..e4f328e30 100644
--- a/config/locales/simple_form.pl.yml
+++ b/config/locales/simple_form.pl.yml
@@ -210,7 +210,6 @@ pl:
         trendable: Pozwól na wyświetlanie tego hashtagu w „Na czasie”
         usable: Pozwól na umieszczanie tego hashtagu we wpisach
     'no': Nie
-    recommended: Polecane
     required:
       mark: "*"
       text: pole wymagane
diff --git a/config/locales/simple_form.pt-BR.yml b/config/locales/simple_form.pt-BR.yml
index b96952e96..4260723c4 100644
--- a/config/locales/simple_form.pt-BR.yml
+++ b/config/locales/simple_form.pt-BR.yml
@@ -214,7 +214,6 @@ pt-BR:
         trendable: Permitir que esta hashtag fique em alta
         usable: Permitir que toots usem esta hashtag
     'no': Não
-    recommended: Recomendado
     required:
       mark: "*"
       text: obrigatório
diff --git a/config/locales/simple_form.pt-PT.yml b/config/locales/simple_form.pt-PT.yml
index 7e75b96e5..19f5d180f 100644
--- a/config/locales/simple_form.pt-PT.yml
+++ b/config/locales/simple_form.pt-PT.yml
@@ -218,7 +218,6 @@ pt-PT:
         trendable: Permitir que esta hashtag apareça em destaque
         usable: Permitir que toots utilizem esta hashtag
     'no': Não
-    recommended: Recomendado
     required:
       mark: "*"
       text: obrigatório
diff --git a/config/locales/simple_form.ro.yml b/config/locales/simple_form.ro.yml
index 1f0fee419..9f298f384 100644
--- a/config/locales/simple_form.ro.yml
+++ b/config/locales/simple_form.ro.yml
@@ -176,7 +176,6 @@ ro:
         trendable: Permite acestui hashtag să apară sub tendințe
         usable: Permite postărilor să folosească acest hashtag
     'no': Nu
-    recommended: Recomandat
     required:
       text: obligatoriu
     'yes': Da
diff --git a/config/locales/simple_form.ru.yml b/config/locales/simple_form.ru.yml
index ef3bf4ad3..7748b0b0b 100644
--- a/config/locales/simple_form.ru.yml
+++ b/config/locales/simple_form.ru.yml
@@ -218,7 +218,6 @@ ru:
         trendable: Разрешить показ хэштега в трендах
         usable: Разрешить использовать этот хэштег в постах
     'no': Нет
-    recommended: Рекомендуем
     required:
       mark: "*"
       text: обязательно
diff --git a/config/locales/simple_form.sk.yml b/config/locales/simple_form.sk.yml
index 847a68e0f..5d42684c8 100644
--- a/config/locales/simple_form.sk.yml
+++ b/config/locales/simple_form.sk.yml
@@ -167,7 +167,6 @@ sk:
         trendable: Povoľ zobrazovanie tohto haštagu medzi trendujúcimi
         usable: Povoľ používanie tohto haštagu v príspevkoch
     'no': Nie
-    recommended: Odporúčané
     required:
       text: povinné
     'yes': Áno
diff --git a/config/locales/simple_form.sl.yml b/config/locales/simple_form.sl.yml
index 7c8cdeadc..2a2f3b4d5 100644
--- a/config/locales/simple_form.sl.yml
+++ b/config/locales/simple_form.sl.yml
@@ -187,7 +187,6 @@ sl:
         trendable: Dovoli, da se ta ključnik pojavi med trendi
         usable: Dovoli, da objave uporabljajo ta ključnik
     'no': Ne
-    recommended: Priporočeno
     required:
       mark: "*"
       text: zahtevano
diff --git a/config/locales/simple_form.sq.yml b/config/locales/simple_form.sq.yml
index dbb8c80f7..9dbb334b8 100644
--- a/config/locales/simple_form.sq.yml
+++ b/config/locales/simple_form.sq.yml
@@ -218,7 +218,6 @@ sq:
         trendable: Lejoje këtë hashtag të shfaqet në prirje
         usable: Lejoji mesazhet të përdorin këtë hashtag
     'no': Jo
-    recommended: E rekomanduar
     required:
       mark: "*"
       text: e domosdoshme
diff --git a/config/locales/simple_form.sv.yml b/config/locales/simple_form.sv.yml
index c311eb189..782a9cda2 100644
--- a/config/locales/simple_form.sv.yml
+++ b/config/locales/simple_form.sv.yml
@@ -194,7 +194,6 @@ sv:
         trendable: Tillåt att denna hashtag visas under trender
         usable: Tillåt tutningar att använda denna hashtag
     'no': Nej
-    recommended: Rekommenderad
     required:
       mark: "*"
       text: obligatorisk
diff --git a/config/locales/simple_form.th.yml b/config/locales/simple_form.th.yml
index a1dbe66f9..6557ecc4a 100644
--- a/config/locales/simple_form.th.yml
+++ b/config/locales/simple_form.th.yml
@@ -211,7 +211,6 @@ th:
         trendable: อนุญาตให้แฮชแท็กนี้ปรากฏภายใต้แนวโน้ม
         usable: อนุญาตให้โพสต์ใช้แฮชแท็กนี้
     'no': ไม่
-    recommended: แนะนำ
     required:
       mark: "*"
       text: จำเป็น
diff --git a/config/locales/simple_form.tr.yml b/config/locales/simple_form.tr.yml
index 4a2115742..d50825b0e 100644
--- a/config/locales/simple_form.tr.yml
+++ b/config/locales/simple_form.tr.yml
@@ -218,7 +218,6 @@ tr:
         trendable: Bu etiketin gündem altında görünmesine izin ver
         usable: Tootların bu etiketi kullanmasına izin ver
     'no': Hayır
-    recommended: Önerilen
     required:
       mark: "*"
       text: gerekli
diff --git a/config/locales/simple_form.uk.yml b/config/locales/simple_form.uk.yml
index 339af8ffb..bc3536672 100644
--- a/config/locales/simple_form.uk.yml
+++ b/config/locales/simple_form.uk.yml
@@ -210,7 +210,6 @@ uk:
         trendable: Дозволити появу цього хештеґа у списку популярних хештеґів
         usable: Дозволити дмухам використовувати цей хештеґ
     'no': Ні
-    recommended: Рекомендовано
     required:
       mark: "*"
       text: обов'язкове
diff --git a/config/locales/simple_form.vi.yml b/config/locales/simple_form.vi.yml
index 033209456..7b09fcaf3 100644
--- a/config/locales/simple_form.vi.yml
+++ b/config/locales/simple_form.vi.yml
@@ -218,7 +218,6 @@ vi:
         trendable: Cho phép xuất hiện trong xu hướng
         usable: Cho phép dùng trong tút
     'no': Tắt
-    recommended: Đề xuất
     required:
       mark: "*"
       text: yêu cầu
diff --git a/config/locales/simple_form.zh-CN.yml b/config/locales/simple_form.zh-CN.yml
index 2867b47b6..8cde113df 100644
--- a/config/locales/simple_form.zh-CN.yml
+++ b/config/locales/simple_form.zh-CN.yml
@@ -218,7 +218,6 @@ zh-CN:
         trendable: 允许在热门下显示此话题
         usable: 允许嘟文使用此话题标签
     'no': 否
-    recommended: 推荐
     required:
       mark: "*"
       text: 必填
diff --git a/config/locales/simple_form.zh-HK.yml b/config/locales/simple_form.zh-HK.yml
index 412b1a769..9fdb59a6e 100644
--- a/config/locales/simple_form.zh-HK.yml
+++ b/config/locales/simple_form.zh-HK.yml
@@ -209,7 +209,6 @@ zh-HK:
         trendable: 允許此主題標籤在趨勢下顯示
         usable: 允許文章使用此主題標籤
     'no': 否
-    recommended: 建議
     required:
       mark: "*"
       text: 必須填寫
diff --git a/config/locales/simple_form.zh-TW.yml b/config/locales/simple_form.zh-TW.yml
index 9501533f1..b69678e3d 100644
--- a/config/locales/simple_form.zh-TW.yml
+++ b/config/locales/simple_form.zh-TW.yml
@@ -218,7 +218,6 @@ zh-TW:
         trendable: 允許此主題標籤在趨勢下顯示
         usable: 允許嘟文使用此主題標籤
     'no': 否
-    recommended: 建議
     required:
       mark: "*"
       text: 必須填寫