diff options
Diffstat (limited to 'config')
51 files changed, 65 insertions, 108 deletions
diff --git a/config/application.rb b/config/application.rb index f0e65f443..f72cc8e11 100644 --- a/config/application.rb +++ b/config/application.rb @@ -88,6 +88,7 @@ module Mastodon :de, :el, :en, + :'en-cafe', :'en-GB', :eo, :es, @@ -173,10 +174,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 95c6e790f..aec3b80a1 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -123,12 +123,15 @@ Rails.application.configure do config.action_mailer.delivery_method = ENV.fetch('SMTP_DELIVERY_METHOD', 'smtp').to_sym config.action_dispatch.default_headers = { - 'Server' => 'Mastodon', - 'X-Frame-Options' => 'DENY', - 'X-Content-Type-Options' => 'nosniff', - 'X-XSS-Protection' => '0', - 'X-Clacks-Overhead' => 'GNU Natalie Nguyen', - 'Referrer-Policy' => 'same-origin', + 'Server' => 'Mastodon', + 'X-Frame-Options' => 'DENY', + 'X-Content-Type-Options' => 'nosniff', + 'X-XSS-Protection' => '0', + 'Permissions-Policy' => 'interest-cohort=()', + 'Referrer-Policy' => 'same-origin', + '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 a3b5e5c72..6b34f6011 100644 --- a/config/i18n-tasks.yml +++ b/config/i18n-tasks.yml @@ -57,7 +57,7 @@ ignore_unused: - 'activerecord.errors.*' - '{devise,pagination,doorkeeper}.*' - '{date,datetime,time,number}.*' - - 'simple_form.{yes,no,recommended,not_recommended,glitch_only}' + - 'simple_form.{yes,no,glitch_only}' - '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 ce8aa7af2..c6fff9889 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, "'wasm-unsafe-eval'" 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 fff4f538e..2de22a945 100644 --- a/config/initializers/simple_form.rb +++ b/config/initializers/simple_form.rb @@ -8,17 +8,6 @@ module AppendComponent end end -module RecommendedComponent - def recommended(_wrapper_options = nil) - return unless options[:recommended] - - key = options[:recommended].is_a?(Symbol) ? options[:recommended] : :recommended - options[:label_text] = ->(raw_label_text, _required_label_text, _label_present) { safe_join([raw_label_text, ' ', content_tag(:span, I18n.t(key, scope: 'simple_form'), class: key)]) } - - nil - end -end - module GlitchOnlyComponent def glitch_only(_wrapper_options = nil) return unless options[:glitch_only] @@ -29,7 +18,6 @@ module GlitchOnlyComponent end SimpleForm.include_component(AppendComponent) -SimpleForm.include_component(RecommendedComponent) SimpleForm.include_component(GlitchOnlyComponent) SimpleForm.setup do |config| @@ -87,7 +75,6 @@ SimpleForm.setup do |config| b.use :html5 b.wrapper tag: :div, class: :label_input do |ba| - ba.optional :recommended ba.optional :glitch_only ba.use :label 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 61befb9e6..1863db702 100644 --- a/config/locales/simple_form.ar.yml +++ b/config/locales/simple_form.ar.yml @@ -305,8 +305,6 @@ ar: events: الأحداث المفعلة url: الرابط التشعبّي URL لنقطة النهاية 'no': لا - not_recommended: غير مستحسن - recommended: موصى بها required: mark: "*" text: مطلوب diff --git a/config/locales/simple_form.co.yml b/config/locales/simple_form.co.yml index 79e5837d4..593cb561a 100644 --- a/config/locales/simple_form.co.yml +++ b/config/locales/simple_form.co.yml @@ -201,7 +201,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 7025c6385..4669cdd02 100644 --- a/config/locales/simple_form.cs.yml +++ b/config/locales/simple_form.cs.yml @@ -306,8 +306,6 @@ cs: events: Zapnuté události url: URL koncového bodu 'no': Ne - not_recommended: Nedoporučuje se - 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 d965f6b71..542d06fa2 100644 --- a/config/locales/simple_form.cy.yml +++ b/config/locales/simple_form.cy.yml @@ -306,8 +306,6 @@ cy: events: Digwyddiadau wedi'u galluogi url: URL diweddbwynt 'no': Na - not_recommended: Heb ei argymell - recommended: Argymhellwyd required: mark: "*" text: gofynnol diff --git a/config/locales/simple_form.da.yml b/config/locales/simple_form.da.yml index af2942742..b5ee9ee04 100644 --- a/config/locales/simple_form.da.yml +++ b/config/locales/simple_form.da.yml @@ -306,8 +306,6 @@ da: events: Aktive begivenheder url: Endepunkts-URL 'no': Nej - not_recommended: Ikke anbefalet - recommended: Anbefalet required: mark: "*" text: obligatorisk diff --git a/config/locales/simple_form.de.yml b/config/locales/simple_form.de.yml index 4a13cea7c..bc2983063 100644 --- a/config/locales/simple_form.de.yml +++ b/config/locales/simple_form.de.yml @@ -306,8 +306,6 @@ de: events: Aktivierte Ereignisse url: Endpunkt-URL 'no': Nein - not_recommended: Nicht empfohlen - recommended: Empfohlen required: mark: "*" text: Pflichtfeld diff --git a/config/locales/simple_form.el.yml b/config/locales/simple_form.el.yml index 2788fd9b5..f56be1d24 100644 --- a/config/locales/simple_form.el.yml +++ b/config/locales/simple_form.el.yml @@ -306,8 +306,6 @@ el: events: Ενεργοποιημένα συμβάντα url: Endpoint URL 'no': Όχι - not_recommended: Δεν προτείνεται - recommended: Προτείνεται required: mark: "*" text: απαιτείται diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index 96b0131ef..f9caef346 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -103,7 +103,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. @@ -306,8 +306,6 @@ en: events: Enabled events url: Endpoint URL 'no': 'No' - not_recommended: Not recommended - recommended: Recommended required: mark: "*" text: required diff --git a/config/locales/simple_form.eo.yml b/config/locales/simple_form.eo.yml index d54248de0..2e9ec45e6 100644 --- a/config/locales/simple_form.eo.yml +++ b/config/locales/simple_form.eo.yml @@ -306,8 +306,6 @@ eo: events: Ŝaltitaj eventoj url: Finpunkto-URL 'no': Ne - not_recommended: Nerekomendita - 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 bcceccfb1..e70232479 100644 --- a/config/locales/simple_form.es-AR.yml +++ b/config/locales/simple_form.es-AR.yml @@ -306,8 +306,6 @@ es-AR: events: Eventos habilitados url: Dirección web del punto final 'no': 'No' - not_recommended: No recomendado - 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 83aa4159d..8a999ce2f 100644 --- a/config/locales/simple_form.et.yml +++ b/config/locales/simple_form.et.yml @@ -306,8 +306,6 @@ et: events: Lubatud sündmused url: Lõpp-punkti URL 'no': Ei - not_recommended: Pole soovitatav - recommended: Soovituslik required: mark: "*" text: kohustuslik diff --git a/config/locales/simple_form.eu.yml b/config/locales/simple_form.eu.yml index 175e0c96d..a6ebedc3a 100644 --- a/config/locales/simple_form.eu.yml +++ b/config/locales/simple_form.eu.yml @@ -306,8 +306,6 @@ eu: events: Gertaerak gaituta url: Amaiera-puntuaren URLa 'no': Ez - not_recommended: Ez gomendatua - recommended: Aholkatua required: mark: "*" text: beharrezkoa diff --git a/config/locales/simple_form.fa.yml b/config/locales/simple_form.fa.yml index 18dd82790..20409ec6c 100644 --- a/config/locales/simple_form.fa.yml +++ b/config/locales/simple_form.fa.yml @@ -250,8 +250,6 @@ fa: events: رویدادهای به کار افتاده url: نشانی نقطهٔ پایانی 'no': خیر - not_recommended: پیشنهاد نشده - recommended: توصیه میشود required: mark: "*" text: ضروری diff --git a/config/locales/simple_form.fi.yml b/config/locales/simple_form.fi.yml index b96cf0cd7..434924fa8 100644 --- a/config/locales/simple_form.fi.yml +++ b/config/locales/simple_form.fi.yml @@ -306,8 +306,6 @@ fi: events: Tapahtumat käytössä url: Päätepisteen URL 'no': Ei - not_recommended: Ei suositella - recommended: Suositeltu required: mark: "*" text: pakollinen tieto diff --git a/config/locales/simple_form.fr.yml b/config/locales/simple_form.fr.yml index d395b8517..4a026084c 100644 --- a/config/locales/simple_form.fr.yml +++ b/config/locales/simple_form.fr.yml @@ -306,8 +306,6 @@ fr: events: Événements activés url: URL du point de terminaison 'no': Non - not_recommended: Non recommandé - recommended: Recommandé required: mark: "*" text: champs requis diff --git a/config/locales/simple_form.gl.yml b/config/locales/simple_form.gl.yml index c4a6da566..d3d7a53c1 100644 --- a/config/locales/simple_form.gl.yml +++ b/config/locales/simple_form.gl.yml @@ -306,8 +306,6 @@ gl: events: Eventos activados url: URL do extremo 'no': Non - not_recommended: Non é recomendable - recommended: Recomendado required: mark: "*" text: requerido diff --git a/config/locales/simple_form.hu.yml b/config/locales/simple_form.hu.yml index 81d74cebe..32f305ce9 100644 --- a/config/locales/simple_form.hu.yml +++ b/config/locales/simple_form.hu.yml @@ -306,8 +306,6 @@ hu: events: Engedélyezett események url: Végponti URL 'no': Nem - not_recommended: Nem ajánlott - 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 b95502155..a120777c4 100644 --- a/config/locales/simple_form.hy.yml +++ b/config/locales/simple_form.hy.yml @@ -199,7 +199,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 43f278264..607d3bdd0 100644 --- a/config/locales/simple_form.id.yml +++ b/config/locales/simple_form.id.yml @@ -296,8 +296,6 @@ id: events: Acara yang diaktifkan url: URL Titik Akhir 'no': Tidak - not_recommended: Tidak disarankan - recommended: Direkomendasikan required: mark: "*" text: wajib diff --git a/config/locales/simple_form.is.yml b/config/locales/simple_form.is.yml index ed17c9753..6c9e2e869 100644 --- a/config/locales/simple_form.is.yml +++ b/config/locales/simple_form.is.yml @@ -306,8 +306,6 @@ is: events: Virkjaðir atburðir url: Slóð á endapunkt 'no': Nei - not_recommended: Ekki mælt með þessu - 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 189b9bfc5..a62699c3f 100644 --- a/config/locales/simple_form.it.yml +++ b/config/locales/simple_form.it.yml @@ -306,8 +306,6 @@ it: events: Eventi abilitati url: URL endpoint 'no': 'No' - not_recommended: Non consigliato - recommended: Consigliato required: mark: "*" text: richiesto diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml index f7e2cb954..5af0130d4 100644 --- a/config/locales/simple_form.ja.yml +++ b/config/locales/simple_form.ja.yml @@ -306,8 +306,6 @@ ja: events: 有効なイベント url: エンドポイントURL 'no': いいえ - not_recommended: 非推奨 - recommended: おすすめ required: mark: "*" text: 必須 diff --git a/config/locales/simple_form.kab.yml b/config/locales/simple_form.kab.yml index 2f8a9261e..73420169f 100644 --- a/config/locales/simple_form.kab.yml +++ b/config/locales/simple_form.kab.yml @@ -108,7 +108,6 @@ kab: name: Isem permissions_as_keys: Tisirag '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 1d63fb631..f340b207c 100644 --- a/config/locales/simple_form.ko.yml +++ b/config/locales/simple_form.ko.yml @@ -306,8 +306,6 @@ ko: events: 활성화된 이벤트 url: 엔드포인트 URL 'no': 아니요 - not_recommended: 추천하지 않음 - recommended: 추천함 required: mark: "*" text: 필수 항목 diff --git a/config/locales/simple_form.nl.yml b/config/locales/simple_form.nl.yml index 8592857d4..b23ede506 100644 --- a/config/locales/simple_form.nl.yml +++ b/config/locales/simple_form.nl.yml @@ -306,8 +306,6 @@ nl: events: Ingeschakelde gebeurtenissen url: Eindpunt URL 'no': Nee - not_recommended: Niet aanbevolen - recommended: Aanbevolen required: mark: "*" text: vereist diff --git a/config/locales/simple_form.nn.yml b/config/locales/simple_form.nn.yml index db4007c4f..2e279b93f 100644 --- a/config/locales/simple_form.nn.yml +++ b/config/locales/simple_form.nn.yml @@ -296,8 +296,6 @@ nn: events: Aktiverte hendingar url: Endepunkts-URL 'no': Nei - not_recommended: Ikkje anbefalt - recommended: Tilrådt required: mark: "*" text: obligatorisk diff --git a/config/locales/simple_form.no.yml b/config/locales/simple_form.no.yml index 4cf678b83..933bc264f 100644 --- a/config/locales/simple_form.no.yml +++ b/config/locales/simple_form.no.yml @@ -287,8 +287,6 @@ webhook: events: Aktiverte hendelser 'no': Nei - not_recommended: Ikke anbefalt - recommended: Anbefalt required: mark: "*" text: obligatorisk diff --git a/config/locales/simple_form.oc.yml b/config/locales/simple_form.oc.yml index 566f4f100..f898f3f6b 100644 --- a/config/locales/simple_form.oc.yml +++ b/config/locales/simple_form.oc.yml @@ -243,8 +243,6 @@ oc: events: Eveniments activats url: URL de ponch de terminason 'no': Non - not_recommended: Pas recomandat - recommended: Recomandat required: mark: "*" text: requesit diff --git a/config/locales/simple_form.pl.yml b/config/locales/simple_form.pl.yml index b6d351cb2..712dc834e 100644 --- a/config/locales/simple_form.pl.yml +++ b/config/locales/simple_form.pl.yml @@ -306,8 +306,6 @@ pl: events: Włączone zdarzenia url: Endpoint URL 'no': Nie - not_recommended: Niezalecane - 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 bf46305ee..08a4b3704 100644 --- a/config/locales/simple_form.pt-BR.yml +++ b/config/locales/simple_form.pt-BR.yml @@ -306,8 +306,6 @@ pt-BR: events: Eventos habilitados url: URL do Endpoint 'no': Não - not_recommended: Não recomendado - 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 4e34c5897..e94eae4f9 100644 --- a/config/locales/simple_form.pt-PT.yml +++ b/config/locales/simple_form.pt-PT.yml @@ -306,8 +306,6 @@ pt-PT: events: Eventos ativados url: URL do Endpoint 'no': Não - not_recommended: Não recomendado - recommended: Recomendado required: mark: "*" text: obrigatório diff --git a/config/locales/simple_form.ro.yml b/config/locales/simple_form.ro.yml index 6ed4905db..31e9b4e89 100644 --- a/config/locales/simple_form.ro.yml +++ b/config/locales/simple_form.ro.yml @@ -174,7 +174,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 7e23edf7d..49dcb1d5f 100644 --- a/config/locales/simple_form.ru.yml +++ b/config/locales/simple_form.ru.yml @@ -306,8 +306,6 @@ ru: events: Включенные события url: Endpoint URL 'no': Нет - not_recommended: Не рекомендуется - recommended: Рекомендуем required: mark: "*" text: обязательно diff --git a/config/locales/simple_form.sk.yml b/config/locales/simple_form.sk.yml index e8fb86f29..cf5086be5 100644 --- a/config/locales/simple_form.sk.yml +++ b/config/locales/simple_form.sk.yml @@ -175,7 +175,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 ac14735a9..d852d9f9d 100644 --- a/config/locales/simple_form.sl.yml +++ b/config/locales/simple_form.sl.yml @@ -306,8 +306,6 @@ sl: events: Omogočeni dogodki url: URL končne točke 'no': Ne - not_recommended: Ni priporočeno - recommended: Priporočeno required: mark: "*" text: zahtevano diff --git a/config/locales/simple_form.sq.yml b/config/locales/simple_form.sq.yml index a11037fa9..6fe61ca23 100644 --- a/config/locales/simple_form.sq.yml +++ b/config/locales/simple_form.sq.yml @@ -306,8 +306,6 @@ sq: events: Akte të aktivizuar url: URL pikëmbarimi 'no': Jo - not_recommended: Jo e këshilluar - 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 cf914b058..0a57fa4e3 100644 --- a/config/locales/simple_form.sv.yml +++ b/config/locales/simple_form.sv.yml @@ -306,8 +306,6 @@ sv: events: Aktiverade händelser url: Slutpunkts-URL 'no': Nej - not_recommended: Rekommenderas inte - recommended: Rekommenderad required: mark: "*" text: krävs diff --git a/config/locales/simple_form.th.yml b/config/locales/simple_form.th.yml index 345f8c183..052f10836 100644 --- a/config/locales/simple_form.th.yml +++ b/config/locales/simple_form.th.yml @@ -306,8 +306,6 @@ th: events: เหตุการณ์ที่เปิดใช้งาน url: URL ปลายทาง 'no': ไม่ - not_recommended: ไม่แนะนำ - recommended: แนะนำ required: mark: "*" text: จำเป็น diff --git a/config/locales/simple_form.tr.yml b/config/locales/simple_form.tr.yml index a2f42e259..7fffb81da 100644 --- a/config/locales/simple_form.tr.yml +++ b/config/locales/simple_form.tr.yml @@ -306,8 +306,6 @@ tr: events: Etkin olaylar url: Uç nokta URL’si 'no': Hayır - not_recommended: Önerilmez - recommended: Önerilen required: mark: "*" text: gerekli diff --git a/config/locales/simple_form.uk.yml b/config/locales/simple_form.uk.yml index be4d4b764..677c04aa7 100644 --- a/config/locales/simple_form.uk.yml +++ b/config/locales/simple_form.uk.yml @@ -306,8 +306,6 @@ uk: events: Увімкнені події url: URL кінцевої точки 'no': Ні - not_recommended: Не рекомендовано - recommended: Рекомендовано required: mark: "*" text: обов'язкове diff --git a/config/locales/simple_form.vi.yml b/config/locales/simple_form.vi.yml index b5da24dd1..39447f838 100644 --- a/config/locales/simple_form.vi.yml +++ b/config/locales/simple_form.vi.yml @@ -306,8 +306,6 @@ vi: events: Những sự kiện đã bật url: URL endpoint 'no': Tắt - not_recommended: Không đề xuấ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 09e051cb5..57b25af8b 100644 --- a/config/locales/simple_form.zh-CN.yml +++ b/config/locales/simple_form.zh-CN.yml @@ -306,8 +306,6 @@ zh-CN: events: 已启用事件 url: 对端 URL 'no': 否 - not_recommended: 不推荐 - recommended: 推荐 required: mark: "*" text: 必填 diff --git a/config/locales/simple_form.zh-HK.yml b/config/locales/simple_form.zh-HK.yml index 02ef592c9..50bbd0e71 100644 --- a/config/locales/simple_form.zh-HK.yml +++ b/config/locales/simple_form.zh-HK.yml @@ -306,8 +306,6 @@ zh-HK: events: 已啟用事件 url: 端點網址 'no': 否 - not_recommended: 不推薦 - recommended: 建議 required: mark: "*" text: 必須填寫 diff --git a/config/locales/simple_form.zh-TW.yml b/config/locales/simple_form.zh-TW.yml index 28aacb92e..fbb4d94a7 100644 --- a/config/locales/simple_form.zh-TW.yml +++ b/config/locales/simple_form.zh-TW.yml @@ -306,8 +306,6 @@ zh-TW: events: 已啟用的事件 url: 端點 URL 'no': 否 - not_recommended: 不建議 - recommended: 建議 required: mark: "*" text: 必須填寫 |