diff options
Diffstat (limited to 'config')
52 files changed, 59 insertions, 101 deletions
diff --git a/config/application.rb b/config/application.rb index 4d6c7ebf1..7ee9d16b6 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 c50ece2f9..fedfe5efb 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 @@ -139,7 +135,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 8bed34638..666b3a08b 100644 --- a/config/i18n-tasks.yml +++ b/config/i18n-tasks.yml @@ -50,7 +50,7 @@ ignore_unused: - 'activerecord.errors.*' - '{devise,pagination,doorkeeper}.*' - '{date,datetime,time,number}.*' - - 'simple_form.{yes,no,recommended,not_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 d167a1600..5e4763b7f 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] @@ -28,7 +17,6 @@ module GlitchOnlyComponent end SimpleForm.include_component(AppendComponent) -SimpleForm.include_component(RecommendedComponent) SimpleForm.include_component(GlitchOnlyComponent) SimpleForm.setup do |config| @@ -86,7 +74,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 301ae8764..6eaff01a8 100644 --- a/config/locales/simple_form.ar.yml +++ b/config/locales/simple_form.ar.yml @@ -277,8 +277,6 @@ ar: permissions_as_keys: الصلاحيات position: الأولوية 'no': لا - not_recommended: غير مستحسن - recommended: موصى بها required: mark: "*" text: مطلوب diff --git a/config/locales/simple_form.ast.yml b/config/locales/simple_form.ast.yml index f0fca6a68..378542359 100644 --- a/config/locales/simple_form.ast.yml +++ b/config/locales/simple_form.ast.yml @@ -106,7 +106,6 @@ ast: permissions_as_keys: Permisos position: Prioridá '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 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 4dd7463f4..7c30b53a5 100644 --- a/config/locales/simple_form.cs.yml +++ b/config/locales/simple_form.cs.yml @@ -298,8 +298,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 111429257..78215dfa0 100644 --- a/config/locales/simple_form.cy.yml +++ b/config/locales/simple_form.cy.yml @@ -193,7 +193,6 @@ cy: name: Enw permissions_as_keys: Caniatâd 'no': Na - recommended: Argymhellwyd required: mark: "*" text: gofynnol diff --git a/config/locales/simple_form.da.yml b/config/locales/simple_form.da.yml index e4dccca73..ddeebaed0 100644 --- a/config/locales/simple_form.da.yml +++ b/config/locales/simple_form.da.yml @@ -298,8 +298,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 a9c59b2ef..f9880a38f 100644 --- a/config/locales/simple_form.de.yml +++ b/config/locales/simple_form.de.yml @@ -298,8 +298,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 c68fd4799..a4b30b012 100644 --- a/config/locales/simple_form.el.yml +++ b/config/locales/simple_form.el.yml @@ -223,7 +223,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 6edf7b4e9..8934f862e 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -99,7 +99,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. @@ -298,8 +298,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 342c31403..e8577d35b 100644 --- a/config/locales/simple_form.eo.yml +++ b/config/locales/simple_form.eo.yml @@ -214,7 +214,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 39c5e9674..ac4dfaf03 100644 --- a/config/locales/simple_form.es-AR.yml +++ b/config/locales/simple_form.es-AR.yml @@ -298,8 +298,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 b2009500d..43465969c 100644 --- a/config/locales/simple_form.et.yml +++ b/config/locales/simple_form.et.yml @@ -177,7 +177,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 34c60a553..c39fac3c0 100644 --- a/config/locales/simple_form.eu.yml +++ b/config/locales/simple_form.eu.yml @@ -298,8 +298,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 b74b08e9a..e2a95c118 100644 --- a/config/locales/simple_form.fa.yml +++ b/config/locales/simple_form.fa.yml @@ -216,7 +216,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 218113d32..26d905ccc 100644 --- a/config/locales/simple_form.fi.yml +++ b/config/locales/simple_form.fi.yml @@ -298,8 +298,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 3b2d30aae..d99698041 100644 --- a/config/locales/simple_form.fr.yml +++ b/config/locales/simple_form.fr.yml @@ -298,8 +298,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 bcd7453f6..cf3e6f635 100644 --- a/config/locales/simple_form.gl.yml +++ b/config/locales/simple_form.gl.yml @@ -298,8 +298,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 be1ba159f..871065d54 100644 --- a/config/locales/simple_form.hu.yml +++ b/config/locales/simple_form.hu.yml @@ -298,8 +298,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 b214e856a..7923d9574 100644 --- a/config/locales/simple_form.id.yml +++ b/config/locales/simple_form.id.yml @@ -298,8 +298,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 64cc2e602..b5ffc211e 100644 --- a/config/locales/simple_form.is.yml +++ b/config/locales/simple_form.is.yml @@ -298,8 +298,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 2f33fb622..5ce33b62d 100644 --- a/config/locales/simple_form.it.yml +++ b/config/locales/simple_form.it.yml @@ -298,8 +298,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 bd3a752ea..309a14dfa 100644 --- a/config/locales/simple_form.ja.yml +++ b/config/locales/simple_form.ja.yml @@ -298,8 +298,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 ae18d2a42..7508308d6 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 82abda07e..9a78256e3 100644 --- a/config/locales/simple_form.ko.yml +++ b/config/locales/simple_form.ko.yml @@ -298,8 +298,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 44db45390..f1c8c3f25 100644 --- a/config/locales/simple_form.nl.yml +++ b/config/locales/simple_form.nl.yml @@ -298,8 +298,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 50dacf53a..c918f3a94 100644 --- a/config/locales/simple_form.nn.yml +++ b/config/locales/simple_form.nn.yml @@ -298,8 +298,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 7d005171a..b3d9613e7 100644 --- a/config/locales/simple_form.no.yml +++ b/config/locales/simple_form.no.yml @@ -207,7 +207,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 b6e6da78f..d608e49be 100644 --- a/config/locales/simple_form.oc.yml +++ b/config/locales/simple_form.oc.yml @@ -229,8 +229,6 @@ oc: permissions_as_keys: Autorizacions position: Prioritat '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 b660f4d89..8478282a7 100644 --- a/config/locales/simple_form.pl.yml +++ b/config/locales/simple_form.pl.yml @@ -298,8 +298,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 d2bb4dfbd..2d26cf848 100644 --- a/config/locales/simple_form.pt-BR.yml +++ b/config/locales/simple_form.pt-BR.yml @@ -267,8 +267,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 211a2fac4..6f674d83b 100644 --- a/config/locales/simple_form.pt-PT.yml +++ b/config/locales/simple_form.pt-PT.yml @@ -298,8 +298,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 c7339008a..75c198af6 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 e95b22377..6ef1f6b38 100644 --- a/config/locales/simple_form.ru.yml +++ b/config/locales/simple_form.ru.yml @@ -257,8 +257,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 18a3b032f..b621ced66 100644 --- a/config/locales/simple_form.sk.yml +++ b/config/locales/simple_form.sk.yml @@ -172,7 +172,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 30d0b24e4..bdc7592a4 100644 --- a/config/locales/simple_form.sl.yml +++ b/config/locales/simple_form.sl.yml @@ -298,8 +298,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 4d7d8935e..161521a57 100644 --- a/config/locales/simple_form.sq.yml +++ b/config/locales/simple_form.sq.yml @@ -298,8 +298,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 8e2a40a04..8dd5245f3 100644 --- a/config/locales/simple_form.sv.yml +++ b/config/locales/simple_form.sv.yml @@ -298,8 +298,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 3083f44a3..05b35852d 100644 --- a/config/locales/simple_form.th.yml +++ b/config/locales/simple_form.th.yml @@ -297,8 +297,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 5ccb60169..ede97ad3e 100644 --- a/config/locales/simple_form.tr.yml +++ b/config/locales/simple_form.tr.yml @@ -298,8 +298,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 03bc404c6..6bcb9c0f6 100644 --- a/config/locales/simple_form.uk.yml +++ b/config/locales/simple_form.uk.yml @@ -298,8 +298,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 69bf94329..f2ed1391f 100644 --- a/config/locales/simple_form.vi.yml +++ b/config/locales/simple_form.vi.yml @@ -298,8 +298,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 1a8aefda8..2c73730fc 100644 --- a/config/locales/simple_form.zh-CN.yml +++ b/config/locales/simple_form.zh-CN.yml @@ -298,8 +298,6 @@ zh-CN: events: 已启用事件 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 24533e604..00c354a8f 100644 --- a/config/locales/simple_form.zh-HK.yml +++ b/config/locales/simple_form.zh-HK.yml @@ -207,7 +207,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 f19dc24b0..37844c7af 100644 --- a/config/locales/simple_form.zh-TW.yml +++ b/config/locales/simple_form.zh-TW.yml @@ -298,8 +298,6 @@ zh-TW: events: 已啟用的事件 url: 端點 URL 'no': 否 - not_recommended: 不建議 - recommended: 建議 required: mark: "*" text: 必須填寫 |