gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'parent/main' into upstream-20240403

Browse source
This commit is contained in:
KMY 2024-04-03 12:12:09 +09:00
commit 479c4fecc1
63 changed files with 831 additions and 391 deletions
Download patch file Download diff file Expand all files Collapse all files

4
config/initializers/stoplight.rb
View file

@ -3,6 +3,6 @@
require 'stoplight'
Rails.application.reloader.to_prepare do
Stoplight::Light.default_data_store = Stoplight::DataStore::Redis.new(RedisConfiguration.new.connection)
Stoplight::Light.default_notifiers = [Stoplight::Notifier::Logger.new(Rails.logger)]
Stoplight.default_data_store = Stoplight::DataStore::Redis.new(RedisConfiguration.new.connection)
Stoplight.default_notifiers = [Stoplight::Notifier::Logger.new(Rails.logger)]
end

6
config/locales/activerecord.ia.yml
View file

@ -7,3 +7,9 @@ ia:
password: Contrasigno
user/account:
username: Nomine de usator
errors:
models:
status:
attributes:
reblog:
taken: del message jam existe

4
config/locales/devise.de.yml
View file

@ -28,12 +28,12 @@ de:
title: Verifiziere E-Mail-Adresse
email_changed:
explanation: 'Die E-Mail-Adresse deines Kontos wird geändert zu:'
extra: Wenn du deine E-Mail-Adresse nicht geändert hast, ist es wahrscheinlich, dass sich jemand Zugang zu deinem Konto verschafft hat. Bitte ändere sofort dein Passwort oder kontaktiere die Serververwaltung, wenn du aus deinem Konto ausgesperrt bist.
extra: Wenn du deine E-Mail-Adresse nicht geändert hast, ist es wahrscheinlich, dass sich jemand Zugang zu deinem Konto verschafft hat. Bitte ändere sofort dein Passwort oder kontaktiere die Administrator*innen des Servers, wenn du aus deinem Konto ausgesperrt bist.
subject: 'Mastodon: E-Mail-Adresse geändert'
title: Neue E-Mail-Adresse
password_change:
explanation: Das Passwort für dein Konto wurde geändert.
extra: Wenn du dein Passwort nicht geändert hast, ist es wahrscheinlich, dass sich jemand Zugang zu deinem Konto verschafft hat. Bitte ändere sofort dein Passwort oder kontaktiere die Serververwaltung, wenn du aus deinem Konto ausgesperrt bist.
extra: Wenn du dein Passwort nicht geändert hast, ist es wahrscheinlich, dass sich jemand Zugang zu deinem Konto verschafft hat. Bitte ändere sofort dein Passwort oder kontaktiere die Administrator*innen des Servers, wenn du aus deinem Konto ausgesperrt bist.
subject: 'Mastodon: Passwort geändert'
title: Passwort geändert
reconfirmation_instructions:

2
config/locales/es-MX.yml
View file

@ -1674,7 +1674,7 @@ es-MX:
lost_follows: Cuentas seguidas perdidas
preamble: Puedes perder cuentas seguidas y seguidores cuando bloqueas un dominio o cuando tus moderadores deciden suspender un servidor remoto. Cuando esto suceda, podrás descargar listas de relaciones cortadas, para ser inspeccionadas y posiblemente importadas en otro servidor.
purged: La información sobre este servidor ha sido purgada por los administradores de tu servidor.
type: Suceso
type: Evento
statuses:
attached:
audio:

20
config/locales/et.yml
View file

@ -597,6 +597,9 @@ et:
actions_description_html: Otsustus, mida raporti lahendamiseks ette võtta. Karistava tegevuse korral saadetakse e-postiga teade, välja arvatud kategooria <strong>rämpspost</strong> puhul.
actions_description_remote_html: Otsusta, mida teha selle raporti lahendamiseks. See mõjutab ainult seda, kuidas <strong>Sinu</strong> server selle kaugkontoga suhtleb ning selle sisu käsitleb.
add_to_report: Lisa raportile juurde
already_suspended_badges:
local: Juba kustutamisel selles serveris
remote: Juba kustutamisel tema serveris
are_you_sure: Oled kindel?
assign_to_self: Määra mulle
assigned: Määratud moderaator
@ -1652,13 +1655,26 @@ et:
import: Impordi
import_and_export: Import / eksport
migrate: Konto kolimine
notifications: E-postiteavitused
preferences: Eelistused
profile: Profiil
relationships: Jälgitud ja jälgijad
severed_relationships: Katkestatud seos
statuses_cleanup: Automaatne kustutamine
strikes: Modereerimisjuhtumid
two_factor_authentication: Kaheastmeline autentimine
webauthn_authentication: Turvavõtmed
severed_relationships:
download: Allalaadimine (%{count})
event_type:
account_suspension: Konto kustutamisel (%{target_name})
domain_block: Server kustutamisel (%{target_name})
user_domain_block: Blokeerisid %{target_name}
lost_followers: Kadunud jälgijad
lost_follows: Kaotatud jälgimised
preamble: Võid kaotada jälgijaid ja jälgitavaid, kui blokeerid domeeni või kui su moderaatorid otsustavad kustutada kaugserveri. Kui see juhtub, saad alla laadida katkestatud seoste loetelu, et see üle vaadata ja võib-olla teise serverisse üles laadida.
purged: Selle serveri info on sinu serveri administraatorite poolt tühjendatud.
type: Sündmus
statuses:
attached:
audio:
@ -1754,6 +1770,7 @@ et:
contrast: Mastodon (Kõrge kontrast)
default: Mastodon (Tume)
mastodon-light: Mastodon (Hele)
system: Automaatne (kasuta süsteemi teemat)
time:
formats:
default: "%d. %B, %Y. aastal, kell %H:%M"
@ -1866,6 +1883,9 @@ et:
follows_subtitle: Jälgi teada-tuntud kasutajaid
follows_title: Keda jälgida
follows_view_more: Vaata lähemalt, keda jälgida
hashtags_recent_count:
one: "%{people} isikut viimase 2 päeva jooksul"
other: "%{people} inimest viimase 2 päeva jooksul"
hashtags_subtitle: Avasta, mis viimase 2 päeva jooksul on toimunud
hashtags_title: Populaarsed märksõnad
hashtags_view_more: Vaata teisi trendikaid märksõnu

13
config/locales/ia.yml
View file

@ -1,7 +1,20 @@
---
ia:
about:
about_mastodon_html: 'Le rete social del futuro: nulle publicitate, nulle surveliantia corporative, conception ethic, e decentralisation! Mantene le controlo de tu datos con Mastodon!'
contact_missing: Non definite
contact_unavailable: N/D
hosted_on: Mastodon albergate sur %{domain}
title: A proposito
accounts:
follow: Sequer
followers:
one: Sequitor
other: Sequitores
following: Sequente
instance_actor_flash: Iste conto es un agente virtual usate pro representar le servitor mesme e non alcun usator individual. Illo es usate pro le federation e non debe esser suspendite.
last_active: ultime activitate
link_verified_on: Le proprietate de iste ligamine ha essite verificate le %{date}
admin:
accounts:
are_you_sure: Es tu secur?

16
config/locales/ie.yml
View file

@ -597,6 +597,9 @@ ie:
actions_description_html: Decider quel action a far por soluer ti raporte. Si tu fa un punitiv action contra li raportat conto, li usator va reciver un notification per email, except in li casu que li <strong>Spam</strong> categorie es selectet.
actions_description_remote_html: Decider quel action a far por soluer ti raporte. It va afecter solmen qualmen <strong>vor</strong> servitor comunica con ti lontan conto e tractar su contenete.
add_to_report: Adjunter plu al raporte
already_suspended_badges:
local: Ja suspendet sur ti-ci servitor
remote: Ja suspendet sur su servitor
are_you_sure: Es tu cert?
assign_to_self: Assignar it a me
assigned: Assignat moderator
@ -1652,6 +1655,7 @@ ie:
import: Importar
import_and_export: Importation e exportation
migrate: Migration de conto
notifications: E-postal notificationes
preferences: Preferenties
profile: Public profil
relationships: Sequetes e sequitores
@ -1659,6 +1663,14 @@ ie:
strikes: Admonimentes moderatori
two_factor_authentication: 2-factor autentication
webauthn_authentication: Claves de securitá
severed_relationships:
download: Descargar (%{count})
event_type:
account_suspension: Suspension del conto (%{target_name})
user_domain_block: Tu bloccat %{target_name}
lost_followers: Perdit sequitores
preamble: Tu posse perdir tis queles tu seque e tui sequitores quande tu blocca un domonia o quande tui moderatores decide suspender un lontan servitor. Tande, tu va posser descargar listes de dejuntet relationes, a inspecter e possibilmen importar sur un altri servitor.
type: Eveniment
statuses:
attached:
audio:
@ -1752,6 +1764,7 @@ ie:
contrast: Mastodon (Alt contraste)
default: Mastodon (Obscur)
mastodon-light: Mastodon (Luminosi)
system: Automatic (usar tema del sistema)
time:
formats:
default: "%d.%m.%Y ye %H:%M"
@ -1864,6 +1877,9 @@ ie:
follows_subtitle: Sequer famosi contos
follows_title: Persones a sequer
follows_view_more: Vider plu persones a sequer
hashtags_recent_count:
one: "%{people} person in li passat 2 dies"
other: "%{people} persones in li passat 2 dies"
hashtags_subtitle: Explorar li postas de tendentie durant li passat 2 dies
hashtags_title: Populari hashtags
hashtags_view_more: Vider plu hashtags in tendentie

2
config/locales/it.yml
View file

@ -1234,7 +1234,7 @@ it:
bookmarks: Segnalibri
csv: CSV
domain_blocks: Blocchi di dominio
lists: Liste
lists: Elenchi
mutes: Stai silenziando
storage: Archiviazione media
featured_tags:

4
config/locales/lad.yml
View file

@ -1665,6 +1665,10 @@ lad:
webauthn_authentication: Yaves de sigurita
severed_relationships:
download: Abasha (%{count})
event_type:
user_domain_block: Blokates a %{target_name}
lost_followers: Suivantes pedridos
lost_follows: Segimyentos pedridos
type: Evenimiento
statuses:
attached:

2
config/locales/simple_form.et.yml
View file

@ -116,6 +116,7 @@ et:
sign_up_requires_approval: Uued liitumised vajavad kinnitamist
severity: Valik, mis juhtub päringutega sellelt IP-aadressilt
rule:
hint: Valikuline. Anna reegli kohta rohkem üksikasju
text: Reegli või nõude kirjeldus selle serveri kasutajatele. Võimalikult lühidalt ja lihtsalt
sessions:
otp: 'Kaheastmelise autentimise kood telefonirakendusest või mõni taastekood:'
@ -299,6 +300,7 @@ et:
patch: Teata veaparandusuuendustest
trending_tag: Uus trend vajab ülevaatust
rule:
hint: Lisainfo
text: Reegel
settings:
indexable: Kaasa profiilileht otsimootoritesse

7
config/locales/simple_form.ia.yml
View file

@ -15,6 +15,7 @@ ia:
current_password: Contrasigno actual
new_password: Nove contrasigno
password: Contrasigno
setting_default_language: Lingua de publication
setting_display_media_default: Predefinite
setting_display_media_hide_all: Celar toto
setting_display_media_show_all: Monstrar toto
@ -35,9 +36,15 @@ ia:
site_title: Nomine de servitor
theme: Thema predefinite
trends: Activar tendentias
ip_block:
severity: Regula
notification_emails:
software_updates:
label: Un nove version de Mastodon es disponibile
rule:
text: Regula
settings:
indexable: Includer pagina de profilo in le motores de recerca
user:
time_zone: Fuso horari
user_role:

2
config/locales/simple_form.ie.yml
View file

@ -116,6 +116,7 @@ ie:
sign_up_requires_approval: Nov registrationes va besonar tui aprobation
severity: Selecter quo va evenir con demandes ex ti-ci IP
rule:
hint: Optional. Ples provider plu detallies pri li regul
text: Descrir un regul o postulation por usatores sur ti-ci servitor. Prova scrir un descrition curt e simplic
sessions:
otp: 'Intrar li 2-factor code generat del app sur tui portabile o usar un de tui codes de recuperation:'
@ -299,6 +300,7 @@ ie:
patch: Notificar pri problema-fixant actualisationes
trending_tag: Nov tendentie besonant inspection
rule:
hint: Information in plu
text: Regul
settings:
indexable: Includer profil-pagine in serchatores

4
config/navigation.rb
View file

@ -50,7 +50,9 @@ SimpleNavigation::Configuration.run do |navigation|
s.item :links, safe_join([fa_icon('newspaper-o fw'), t('admin.trends.links.title')]), admin_trends_links_path, highlights_on: %r{/admin/trends/links}
end
n.item :moderation, safe_join([fa_icon('gavel fw'), t('moderation.title')]), nil, if: -> { current_user.can?(:manage_reports, :view_audit_log, :manage_users, :manage_invites, :manage_taxonomies, :manage_federation, :manage_blocks, :manage_ng_words, :manage_sensitive_words) && !self_destruct } do |s|
n.item :moderation, safe_join([fa_icon('gavel fw'), t('moderation.title')]), nil, if: lambda {
current_user.can?(:manage_reports, :view_audit_log, :manage_users, :manage_invites, :manage_taxonomies, :manage_federation, :manage_blocks, :manage_ng_words, :manage_sensitive_words) && !self_destruct
} do |s|
s.item :reports, safe_join([fa_icon('flag fw'), t('admin.reports.title')]), admin_reports_path, highlights_on: %r{/admin/reports}, if: -> { current_user.can?(:manage_reports) }
s.item :accounts, safe_join([fa_icon('users fw'), t('admin.accounts.title')]), admin_accounts_path(origin: 'local'), highlights_on: %r{/admin/accounts|/admin/pending_accounts|/admin/disputes|/admin/users}, if: -> { current_user.can?(:manage_users) }
s.item :ng_words, safe_join([fa_icon('list fw'), t('admin.ng_words.title')]), admin_ng_words_keywords_path, highlights_on: %r{/admin/(ng_words|ngword_histories)}, if: -> { current_user.can?(:manage_ng_words) }