diff options
Diffstat (limited to 'config')
54 files changed, 32 insertions, 72 deletions
diff --git a/config/application.rb b/config/application.rb index 116eaf29d..93f258190 100644 --- a/config/application.rb +++ b/config/application.rb @@ -63,6 +63,7 @@ module Mastodon :de, :el, :en, + :'en-cafe', :eo, :es, :'es-AR', @@ -128,9 +129,12 @@ module Mastodon config.i18n.default_locale = ENV['DEFAULT_LOCALE']&.to_sym unless config.i18n.available_locales.include?(config.i18n.default_locale) - config.i18n.default_locale = :en + config.i18n.default_locale = :'en-cafe' 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 c2e8210f8..bdda469ba 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -58,10 +58,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 @@ -106,11 +102,11 @@ Rails.application.configure do config.action_dispatch.default_headers = { 'Server' => 'Mastodon', - 'X-Frame-Options' => 'DENY', - 'X-Content-Type-Options' => 'nosniff', - 'X-XSS-Protection' => '1; mode=block', - 'Referrer-Policy' => 'same-origin', - 'Strict-Transport-Security' => 'max-age=63072000; includeSubDomains; preload', + #'X-Frame-Options' => 'DENY', + #'X-Content-Type-Options' => 'nosniff', + #'X-XSS-Protection' => '1; mode=block', + #'Referrer-Policy' => 'same-origin', + #'Strict-Transport-Security' => 'max-age=63072000; includeSubDomains; preload', 'X-Clacks-Overhead' => 'GNU Natalie Nguyen' } diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml index e09f4262b..3db1bc602 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 68d3751fc..a0d48eafd 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..b91edcf1d --- /dev/null +++ b/config/locales/en-cafe.yml @@ -0,0 +1,18 @@ +--- +en-cafe: + about: + hosted_on: GlitchCafé hosted on %{domain} + 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 + auth: + description: + prefix_invited_by_user: "@%{name} invites you to join Plural Café!" + prefix_sign_up: Sign up on Plural Café today! diff --git a/config/locales/simple_form.ar.yml b/config/locales/simple_form.ar.yml index 63f122b78..0663c65b4 100644 --- a/config/locales/simple_form.ar.yml +++ b/config/locales/simple_form.ar.yml @@ -180,7 +180,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 1a62eb76b..1fe5fa798 100644 --- a/config/locales/simple_form.ast.yml +++ b/config/locales/simple_form.ast.yml @@ -94,7 +94,6 @@ ast: tag: name: Etiqueta 'no': Non - recommended: Aconséyase required: mark: "*" text: ríquese diff --git a/config/locales/simple_form.ca.yml b/config/locales/simple_form.ca.yml index b3692f5ba..181f7d504 100644 --- a/config/locales/simple_form.ca.yml +++ b/config/locales/simple_form.ca.yml @@ -203,7 +203,6 @@ ca: trendable: Permet que aquesta etiqueta aparegui en les tendències usable: Permet als tuts emprar aquesta etiqueta 'no': 'No' - recommended: Recomanat required: mark: "*" text: necessari diff --git a/config/locales/simple_form.co.yml b/config/locales/simple_form.co.yml index 1d41066d1..a36ad17c6 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 d03636247..9f3f36b1e 100644 --- a/config/locales/simple_form.cs.yml +++ b/config/locales/simple_form.cs.yml @@ -184,7 +184,6 @@ cs: trendable: Povolit tento hashtag v trendech usable: Povolit používat tento hashtag v tootech '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 cb3f75c1a..1b4250c0c 100644 --- a/config/locales/simple_form.cy.yml +++ b/config/locales/simple_form.cy.yml @@ -184,7 +184,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: mark: "*" text: gofynnol diff --git a/config/locales/simple_form.da.yml b/config/locales/simple_form.da.yml index 1c16c8e37..fb011f573 100644 --- a/config/locales/simple_form.da.yml +++ b/config/locales/simple_form.da.yml @@ -156,7 +156,6 @@ da: trendable: Tillad at dette hashtag vises under trends usable: Tillad toots at benytte dette hashtag 'no': Nej - recommended: Anbefalet required: mark: "*" text: påkrævet diff --git a/config/locales/simple_form.de.yml b/config/locales/simple_form.de.yml index 711dbf5c6..48c2b08f8 100644 --- a/config/locales/simple_form.de.yml +++ b/config/locales/simple_form.de.yml @@ -203,7 +203,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 d4c8a2da6..9cb84bddd 100644 --- a/config/locales/simple_form.el.yml +++ b/config/locales/simple_form.el.yml @@ -201,7 +201,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 20c916560..cea777550 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -64,7 +64,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. @@ -203,7 +203,6 @@ en: trendable: Allow this hashtag to appear under trends usable: Allow toots 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 3f399deae..16b3f7d18 100644 --- a/config/locales/simple_form.eo.yml +++ b/config/locales/simple_form.eo.yml @@ -172,7 +172,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 153c1101d..64bf8c799 100644 --- a/config/locales/simple_form.es-AR.yml +++ b/config/locales/simple_form.es-AR.yml @@ -203,7 +203,6 @@ es-AR: trendable: Permitir que esta etiqueta aparezca bajo tendencias usable: Permitir a los toots usar esta etiqueta 'no': 'No' - recommended: Opción recomendada required: mark: "*" text: obligatorio diff --git a/config/locales/simple_form.es.yml b/config/locales/simple_form.es.yml index 5da47d54a..5608b529c 100644 --- a/config/locales/simple_form.es.yml +++ b/config/locales/simple_form.es.yml @@ -203,7 +203,6 @@ es: trendable: Permitir que esta etiqueta aparezca bajo tendencias usable: Permitir a los toots usar esta etiqueta 'no': 'No' - recommended: Recomendado required: mark: "*" text: necesario diff --git a/config/locales/simple_form.et.yml b/config/locales/simple_form.et.yml index 79934c0b1..93154745d 100644 --- a/config/locales/simple_form.et.yml +++ b/config/locales/simple_form.et.yml @@ -183,7 +183,6 @@ et: trendable: Luba sellel sildil trendida usable: Luba tuututustel seda silti kasutada 'no': Ei - recommended: Soovituslik required: mark: "*" text: kohustuslik diff --git a/config/locales/simple_form.eu.yml b/config/locales/simple_form.eu.yml index c3520b072..41eded347 100644 --- a/config/locales/simple_form.eu.yml +++ b/config/locales/simple_form.eu.yml @@ -183,7 +183,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 5960c2610..a081f81e5 100644 --- a/config/locales/simple_form.fa.yml +++ b/config/locales/simple_form.fa.yml @@ -203,7 +203,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 1b4acc9b9..74eda70fc 100644 --- a/config/locales/simple_form.fi.yml +++ b/config/locales/simple_form.fi.yml @@ -128,7 +128,6 @@ fi: trendable: Salli tämän aihetunnisteen näkyä trendeissä usable: Salli tuuttauksien 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 e173dc0dc..fa90dfe55 100644 --- a/config/locales/simple_form.fr.yml +++ b/config/locales/simple_form.fr.yml @@ -203,7 +203,6 @@ fr: trendable: Autoriser ce hashtag à apparaitre dans les tendances usable: Autoriser les pouets à 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 799312e33..e9a33cd0d 100644 --- a/config/locales/simple_form.gl.yml +++ b/config/locales/simple_form.gl.yml @@ -203,7 +203,6 @@ gl: trendable: Permitir que este cancelo apareza en tendencias usable: Permitir que os toots 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 d5e82ecb2..276a3a1b4 100644 --- a/config/locales/simple_form.hu.yml +++ b/config/locales/simple_form.hu.yml @@ -203,7 +203,6 @@ hu: trendable: A hashtag megjelenhet a trendek között usable: Tülkök 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 ff4bfcaab..b7b4f2d30 100644 --- a/config/locales/simple_form.hy.yml +++ b/config/locales/simple_form.hy.yml @@ -203,7 +203,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 4b469cd93..0ae63f356 100644 --- a/config/locales/simple_form.id.yml +++ b/config/locales/simple_form.id.yml @@ -203,7 +203,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 53e34f00c..6e64f0478 100644 --- a/config/locales/simple_form.is.yml +++ b/config/locales/simple_form.is.yml @@ -203,7 +203,6 @@ is: trendable: Leyfa þessu myllumerki að birtast undir tilhneigingum usable: Leyfa tístum 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 82f12861f..cc660fd8d 100644 --- a/config/locales/simple_form.it.yml +++ b/config/locales/simple_form.it.yml @@ -203,7 +203,6 @@ it: trendable: Permetti a questo hashtag di apparire nelle tendenze usable: Permetti ai toot di utilizzare 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 abe986acd..b6df486bc 100644 --- a/config/locales/simple_form.ja.yml +++ b/config/locales/simple_form.ja.yml @@ -203,7 +203,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 bbc23ed51..2e7f93a34 100644 --- a/config/locales/simple_form.kab.yml +++ b/config/locales/simple_form.kab.yml @@ -99,7 +99,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 544c684a6..859c70418 100644 --- a/config/locales/simple_form.kk.yml +++ b/config/locales/simple_form.kk.yml @@ -164,7 +164,6 @@ kk: trendable: Хештегті трендтерде көрсетуге рұқсат бер usable: Бұл хештегті қолдануға рұқсат бер 'no': Жоқ - recommended: Рекоменделген required: mark: "*" text: міндетті diff --git a/config/locales/simple_form.ko.yml b/config/locales/simple_form.ko.yml index 5c47a99c4..18f60dd9e 100644 --- a/config/locales/simple_form.ko.yml +++ b/config/locales/simple_form.ko.yml @@ -203,7 +203,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 8abc9448c..41dc2f28b 100644 --- a/config/locales/simple_form.nl.yml +++ b/config/locales/simple_form.nl.yml @@ -198,7 +198,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 f4a62ac07..a28bcaef8 100644 --- a/config/locales/simple_form.nn.yml +++ b/config/locales/simple_form.nn.yml @@ -195,7 +195,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 cdf3d61e8..65eb6fba8 100644 --- a/config/locales/simple_form.no.yml +++ b/config/locales/simple_form.no.yml @@ -195,7 +195,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 79c621ee2..28dfd05d8 100644 --- a/config/locales/simple_form.oc.yml +++ b/config/locales/simple_form.oc.yml @@ -203,7 +203,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 6fc33ab08..865b26d91 100644 --- a/config/locales/simple_form.pl.yml +++ b/config/locales/simple_form.pl.yml @@ -203,7 +203,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 574a3e3dc..bc1dc0d12 100644 --- a/config/locales/simple_form.pt-BR.yml +++ b/config/locales/simple_form.pt-BR.yml @@ -203,7 +203,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 869ecaddc..6cd5511eb 100644 --- a/config/locales/simple_form.pt-PT.yml +++ b/config/locales/simple_form.pt-PT.yml @@ -203,7 +203,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 aa0b07708..36ac81b65 100644 --- a/config/locales/simple_form.ro.yml +++ b/config/locales/simple_form.ro.yml @@ -183,7 +183,6 @@ ro: trendable: Permite acestui hashtag să apară sub tendințe usable: Permite postărilor să folosească acest hashtag 'no': Nu - recommended: Recomandat required: mark: "*" text: obligatoriu diff --git a/config/locales/simple_form.ru.yml b/config/locales/simple_form.ru.yml index 5baa9d46e..ad9fc3323 100644 --- a/config/locales/simple_form.ru.yml +++ b/config/locales/simple_form.ru.yml @@ -203,7 +203,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 9e03d7254..a5fdc2a69 100644 --- a/config/locales/simple_form.sk.yml +++ b/config/locales/simple_form.sk.yml @@ -170,7 +170,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: mark: "*" text: povinné diff --git a/config/locales/simple_form.sl.yml b/config/locales/simple_form.sl.yml index 771edf383..31648b119 100644 --- a/config/locales/simple_form.sl.yml +++ b/config/locales/simple_form.sl.yml @@ -137,7 +137,6 @@ sl: reblog: Pošlji e-pošto, ko nekdo sune vaše stanje report: Pošlji e-pošto, ko je oddana nova prijava '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 18211e69e..f00030ccf 100644 --- a/config/locales/simple_form.sq.yml +++ b/config/locales/simple_form.sq.yml @@ -203,7 +203,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 8500f109e..0bfcd8fca 100644 --- a/config/locales/simple_form.sv.yml +++ b/config/locales/simple_form.sv.yml @@ -121,7 +121,6 @@ sv: mention: Skicka e-post när någon nämner dig reblog: Skicka e-post när någon knuffar din status '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 23add1d45..0e2187c5a 100644 --- a/config/locales/simple_form.th.yml +++ b/config/locales/simple_form.th.yml @@ -195,7 +195,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 39ae58dc2..834a22207 100644 --- a/config/locales/simple_form.tr.yml +++ b/config/locales/simple_form.tr.yml @@ -203,7 +203,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 adfc07a09..7580ef0c1 100644 --- a/config/locales/simple_form.uk.yml +++ b/config/locales/simple_form.uk.yml @@ -185,7 +185,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 dfe1ae36e..b9b15cc0e 100644 --- a/config/locales/simple_form.vi.yml +++ b/config/locales/simple_form.vi.yml @@ -203,7 +203,6 @@ vi: trendable: Cho phép hashtag này xuất hiện trong xu hướng usable: Cho phép dùng hashtag này trong tút 'no': Tắt - recommended: Khuyến nghị 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 35222c076..0e7b1e665 100644 --- a/config/locales/simple_form.zh-CN.yml +++ b/config/locales/simple_form.zh-CN.yml @@ -203,7 +203,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 eaed6e32b..ffa2fcde5 100644 --- a/config/locales/simple_form.zh-HK.yml +++ b/config/locales/simple_form.zh-HK.yml @@ -203,7 +203,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 000ec529b..fbc2ff98b 100644 --- a/config/locales/simple_form.zh-TW.yml +++ b/config/locales/simple_form.zh-TW.yml @@ -170,7 +170,6 @@ zh-TW: trendable: 允許此主題標籤在趨勢下顯示 usable: 允許嘟文使用此主題標籤 'no': 否 - recommended: 建議 required: mark: "*" text: 必須填寫 |