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-20240424

Browse source
This commit is contained in:
KMY 2024-04-24 08:57:07 +09:00
commit 32a8f367a3
91 changed files with 1073 additions and 446 deletions
Download patch file Download diff file Expand all files Collapse all files

1
config/application.rb
View file

@ -50,7 +50,6 @@ require_relative '../lib/rails/engine_extensions'
require_relative '../lib/active_record/database_tasks_extensions'
require_relative '../lib/active_record/batches'
require_relative '../lib/simple_navigation/item_extensions'
require_relative '../lib/http_extensions'
Dotenv::Rails.load

1
config/initializers/doorkeeper.rb
View file

@ -89,6 +89,7 @@ Doorkeeper.configure do
:'write:reports',
:'write:statuses',
:read,
:'read:me',
:'read:accounts',
:'read:blocks',
:'read:bookmarks',

5
config/initializers/ffmpeg.rb
View file

@ -1,5 +1,6 @@
# frozen_string_literal: true
if ENV['FFMPEG_BINARY'].present?
FFMPEG.ffmpeg_binary = ENV['FFMPEG_BINARY']
Rails.application.configure do
config.x.ffmpeg_binary = ENV['FFMPEG_BINARY'] || 'ffmpeg'
config.x.ffprobe_binary = ENV['FFPROBE_BINARY'] || 'ffprobe'
end

4
config/initializers/propshaft.rb
View file

@ -1,3 +1,7 @@
# frozen_string_literal: true
# SVG icons
Rails.application.config.assets.paths << Rails.root.join('app', 'javascript', 'images')
# Material Design icons
Rails.application.config.assets.paths << Rails.root.join('app', 'javascript', 'material-icons')

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

@ -2,14 +2,58 @@
ia:
activerecord:
attributes:
poll:
expires_at: Data limite
options: Optiones
user:
agreement: Accordo de servicio
email: Adresse de e-mail
locale: Region
password: Contrasigno
user/account:
username: Nomine de usator
user/invite_request:
text: Motivo
errors:
models:
account:
attributes:
username:
invalid: debe continer solmente litteras, numeros e tractos de sublineamento
reserved: es reservate
admin/webhook:
attributes:
url:
invalid: non es un URL valide
doorkeeper/application:
attributes:
website:
invalid: non es un URL valide
import:
attributes:
data:
malformed: es mal formate
status:
attributes:
reblog:
taken: del message jam existe
user:
attributes:
email:
blocked: usa un fornitor de e-mail prohibite
unreachable: non pare exister
role_id:
elevated: non pote esser superior a tu rolo actual
user_role:
attributes:
permissions_as_keys:
dangerous: includer permissiones non secur pro le rolo de base
elevated: non pote includer permissiones que tu rolo actual non possede
own_role: non pote esser cambiate con tu rolo actual
position:
elevated: non pote esser superior a tu rolo actual
own_role: non pote esser cambiate con tu rolo actual
webhook:
attributes:
events:
invalid_permissions: non pote includer eventos pro le quales tu non ha le derectos

13
config/locales/devise.ia.yml
View file

@ -1,8 +1,21 @@
---
ia:
devise:
confirmations:
confirmed: Tu conto de e-mail ha essite confirmate con successo.
send_instructions: Tu recipera un e-mail con instructiones pro confirmar tu adresse de e-mail in poc minutas. Per favor verifica tu dossier de spam si tu non lo recipe.
send_paranoid_instructions: Si tu adresse de e-mail existe in nostre base de datos, tu recipera un e-mail con instructiones pro confirmar tu adresse de e-mail in poc minutas. Per favor verifica tu dossier de spam si tu non lo recipe.
failure:
already_authenticated: Tu jam initiava le session.
inactive: Tu conto ancora non es activate.
invalid: "%{authentication_keys} o contrasigno non valide."
last_attempt: Tu ha solmente un altere tentativa ante que tu conto es serrate.
locked: Tu conto es blocate.
not_found_in_database: "%{authentication_keys} o contrasigno non valide."
omniauth_user_creation_failure: Error creante un conto pro iste identitate.
pending: Tu conto es ancora sub revision.
timeout: Tu session ha expirate. Per favor reaperi session pro continuar.
unauthenticated: Es necessari aperir session o crear un conto ante de continuar.
mailer:
confirmation_instructions:
action: Verificar adresse de e-mail

1
config/locales/doorkeeper.en.yml
View file

@ -174,6 +174,7 @@ en:
read:filters: see your filters
read:follows: see your follows
read:lists: see your lists
read:me: read only your account's basic information
read:mutes: see your mutes
read:notifications: see your notifications
read:reports: see your reports

18
config/locales/doorkeeper.ia.yml
View file

@ -5,9 +5,16 @@ ia:
doorkeeper/application:
name: Nomine de application
website: Sito web de application
errors:
models:
doorkeeper/application:
attributes:
redirect_uri:
invalid_uri: debe esser un URI valide.
doorkeeper:
applications:
buttons:
authorize: Autorisar
cancel: Cancellar
edit: Modificar
confirmations:
@ -28,6 +35,8 @@ ia:
actions: Actiones
title: 'Application: %{name}'
authorizations:
buttons:
authorize: Autorisar
error:
title: Ocurreva un error
authorized_applications:
@ -50,14 +59,17 @@ ia:
title:
accounts: Contos
admin/accounts: Gestion de contos
admin/reports: Gestion de reportos
all: Accesso plen a tu conto de Mastodon
bookmarks: Marcapaginas
conversations: Conversationes
favourites: Favoritos
filters: Filtros
lists: Listas
mutes: Silentiates
notifications: Notificationes
push: Notificationes push
reports: Reportos
search: Cercar
statuses: Messages
layouts:
@ -67,16 +79,21 @@ ia:
oauth2_provider: Fornitor OAuth2
scopes:
admin:read: leger tote le datos in le servitor
admin:write: modificar tote le datos in le servitor
read: leger tote le datos de tu conto
read:accounts: vider informationes de conto
read:bookmarks: vider tu marcapaginas
read:favourites: vider tu favoritos
read:filters: vider tu filtros
read:follows: vider tu sequites
read:lists: vider tu listas
read:notifications: vider tu notificationes
read:reports: vider tu reportos
read:statuses: vider tote le messages
write: modificar tote le datos de tu conto
write:accounts: modificar tu profilo
write:blocks: blocar contos e dominios
write:bookmarks: adder messages al marcapaginas
write:conversations: silentiar e deler conversationes
write:favourites: messages favorite
write:filters: crear filtros
@ -85,4 +102,5 @@ ia:
write:media: incargar files de medios
write:mutes: silentiar personas e conversationes
write:notifications: rader tu notificationes
write:reports: signalar altere personas
write:statuses: publicar messages

8
config/locales/fi.yml
View file

@ -770,7 +770,7 @@ fi:
disabled: Ei kenellekkään
users: Kirjautuneille paikallisille käyttäjille
registrations:
moderation_recommandation: Varmista, että sinulla on riittävä ja toimintavalmis joukko moderaattoreita ennen kuin avaat rekisteröitymiset kaikille!
moderation_recommandation: Varmista, että sinulla on riittävä ja toimintavalmis joukko moderaattoreita, ennen kuin vapautat rekisteröitymismenettelyn kaikille!
preamble: Määritä, kuka voi luoda tilin palvelimellesi.
title: Rekisteröityminen
registrations_mode:
@ -972,7 +972,7 @@ fi:
webhook: Webhook
admin_mailer:
auto_close_registrations:
body: Viimeaikaisen moderaattoritoiminnan puutteen vuoksi palvelimen %{instance} rekisteröitymiset on vaihdettu automaattisesti manuaaliseen tarkasteluun, jotta palvelinta %{instance} ei käytetä mahdollisten huonojen toimijoiden alustana. Voit vaihtaa takaisin avoimiin rekisteröitymisiin milloin tahansa.
body: Palvelimen %{instance} moderaattorit eivät ole olleet viime aikoina aktiivisia. Tästä syystä rekisteröitymismenettely on automaattisesti vaihdettu erillishyväksyntöjä edellyttäväksi. Näin vähennetään riskiä palvelimen %{instance} käyttöön haitallisten toimijoiden alustana. Voit koska tahansa palauttaa käyttöön vapaat rekisteröitymiset.
subject: Rekisteröitymiset palvelimelle %{instance} on automaattisesti vaihdettu vaatimaan hyväksyntää
new_appeal:
actions:
@ -1882,8 +1882,8 @@ fi:
follows_title: Ehdotuksia seurattavaksi
follows_view_more: Näytä lisää seurattavia henkilöitä
hashtags_recent_count:
one: "%{people} henkilö viimeisenä 2 päivänä"
other: "%{people} henkilöä viimeisenä 2 päivänä"
one: "%{people} henkilö viimeisen 2 päivän aikana"
other: "%{people} henkilöä viimeisen 2 päivän aikana"
hashtags_subtitle: Tutki, mikä on ollut suosittua viimeisenä 2 päivänä
hashtags_title: Suositut aihetunnisteet
hashtags_view_more: Näytä lisää suosittuja aihetunnisteita

73
config/locales/ia.yml
View file

@ -22,6 +22,7 @@ ia:
admin:
account_moderation_notes:
create: Lassar un nota
created_msg: Nota de moderation create con successo!
accounts:
add_email_domain_block: Blocar dominio de e-mail
are_you_sure: Es tu secur?
@ -53,7 +54,10 @@ ia:
all: Toto
title: Location
moderation:
active: Active
all: Toto
disabled: Disactivate
moderation_notes: Notas de moderation
most_recent_activity: Activitate plus recente
most_recent_ip: IP plus recente
public: Public
@ -71,26 +75,41 @@ ia:
security_measures:
only_password: Solmente contrasigno
password_and_2fa: Contrasigno e 2FA
show:
created_reports: Reportos facite
targeted_reports: Signalate per alteres
silenced: Limitate
statuses: Messages
subscribe: Subscriber
suspended: Suspendite
title: Contos
unblock_email: Disblocar adresse de e-mail
unblocked_email_msg: Adresse de e-mail de %{username} disblocate con successo
unconfirmed_email: E-mail non confirmate
undo_silenced: Disfacer le limite
undo_suspension: Disfacer le suspension
username: Nomine de usator
view_domain: Vider summario de dominio
action_logs:
action_types:
confirm_user: Confirmar le usator
create_account_warning: Crear un advertimento
create_announcement: Crear annuncio
create_ip_block: Crear un regula IP
destroy_announcement: Deler annuncio
destroy_ip_block: Deler le regula IP
destroy_status: Deler le message
destroy_unavailable_domain: Deler le dominio non disponibile
disable_2fa_user: Disactivar 2FA
disable_custom_emoji: Disactivar emoji personalisate
disable_user: Disactivar le usator
enable_custom_emoji: Activar emoji personalisate
enable_user: Activar le usator
promote_user: Promover usator
reset_password_user: Reinitialisar contrasigno
silence_account: Limitar conto
unblock_email_account: Disblocar adresse de e-mail
unsilence_account: Disfacer le limite de conto
update_announcement: Actualisar annuncio
update_custom_emoji: Actualisar emoji personalisate
update_ip_block: Actualisar le regula IP
@ -112,8 +131,10 @@ ia:
title: Annuncios
custom_emojis:
by_domain: Dominio
copied_msg: Copia local del emoji create con successo
copy: Copiar
create_new_category: Crear nove categoria
created_msg: Emoji create con successo!
delete: Deler
disable: Disactivar
disabled: Disactivate
@ -122,19 +143,27 @@ ia:
enabled_msg: Emoji activate con successo
new:
title: Adder nove emoji personalisate
title: Emojis personalisate
upload: Incargar
dashboard:
active_users: usatores active
interactions: interactiones
media_storage: Immagazinage de medios
new_users: nove usatores
opened_reports: reportos aperte
top_languages: Linguas le plus active
top_servers: Servitores le plus active
website: Sito web
domain_allows:
add_new: Permitter federation con dominio
export: Exportar
import: Importar
domain_blocks:
confirm_suspension:
cancel: Cancellar
stop_communication: Tu servitor stoppara le communication con iste servitores.
domain: Dominio
edit: Modificar un bloco de dominio
export: Exportar
import: Importar
private_comment: Commento private
@ -145,19 +174,31 @@ ia:
domain: Dominio
new:
create: Adder un dominio
title: Blocar un nove dominio de e-mail
title: Dominios de e-mail blocate
export_domain_allows:
no_file: Necun file seligite
export_domain_blocks:
no_file: Necun file seligite
follow_recommendations:
language: Per lingua
status: Stato
title: Sequer le recommendationes
instances:
back_to_warning: Advertimento
by_domain: Dominio
content_policies:
reason: Ration public
dashboard:
instance_accounts_dimension: Contos le plus sequite
instance_languages_dimension: Linguas principal
delivery:
unavailable: Non disponibile
empty: Necun dominios trovate.
private_comment: Commento private
public_comment: Commento public
total_blocked_by_us: Blocate per nos
total_followed_by_us: Sequite per nos
invites:
deactivate_all: Disactivar toto
filter:
@ -179,12 +220,17 @@ ia:
disabled: Disactivate
enable: Activar
enabled: Activate
save_and_enable: Salveguardar e activar
status: Stato
reports:
add_to_report: Adder plus al reporto
are_you_sure: Es tu secur?
cancel: Cancellar
category: Categoria
confirm: Confirmar
delete_and_resolve: Deler le messages
notes:
create: Adder un nota
delete: Deler
skip_to_actions: Saltar al actiones
status: Stato
@ -193,6 +239,11 @@ ia:
roles:
everyone: Permissiones predefinite
privileges:
delete_user_data: Deler le datos de usator
manage_announcements: Gerer le annuncios
manage_invites: Gerer le invitationes
manage_rules: Gerer le regulas
manage_settings: Gerer le parametros
manage_users: Gerer usatores
rules:
delete: Deler
@ -294,6 +345,13 @@ ia:
not_found: non poterea esser trovate
preferences:
public_timelines: Chronologias public
statuses:
poll:
vote: Votar
show_more: Monstrar plus
visibilities:
private_long: Solmente monstrar a sequitores
public: Public
statuses_cleanup:
min_age:
'1209600': 2 septimanas
@ -307,11 +365,26 @@ ia:
themes:
default: Mastodon (Obscur)
mastodon-light: Mastodon (Clar)
system: Automatic (usar thema del systema)
two_factor_authentication:
add: Adder
disable: Disactivar 2FA
edit: Modificar
user_mailer:
appeal_approved:
action: Parametros de conto
welcome:
apps_android_action: Obtene lo sur Google Play
apps_ios_action: Discargar sur le App Store
apps_step: Discarga nostre applicationes official.
apps_title: Applicationes de Mastodon
edit_profile_action: Personalisar
edit_profile_title: Personalisar tu profilo
feature_action: Apprender plus
share_title: Compartir tu profilo de Mastodon
subject: Benvenite in Mastodon
verification:
verified_links: Tu ligamines verificate
webauthn_credentials:
add: Adder un nove clave de securitate
delete: Deler

2
config/locales/ja.yml
View file

@ -2247,6 +2247,8 @@ ja:
follows_subtitle: 人気アカウントをフォロー
follows_title: フォローを増やしてみませんか？
follows_view_more: フォローするユーザーを探す
hashtags_recent_count:
other: 過去 2 日間で %{people} 人が共有
hashtags_subtitle: 過去2日間のトレンドを見る
hashtags_title: トレンドのハッシュタグ
hashtags_view_more: トレンドのハッシュタグをもっと見る

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

@ -116,7 +116,7 @@ fi:
sign_up_requires_approval: Uudet rekisteröitymiset edellyttävät hyväksyntääsi
severity: Valitse, mitä tapahtuu tämän IP-osoitteen pyynnöille
rule:
hint: Valinnainen. Anna lisätietoja säännöstä
hint: Vapaaehtoinen. Anna yksityiskohtaisempia tietoja säännöstä
text: Kuvaile sääntöä tai edellytystä palvelimesi käyttäjille. Suosi tiivistä, yksinkertaista ilmaisua
sessions:
otp: 'Näppäile mobiilisovelluksessa näkyvä kaksivaiheisen todennuksen tunnusluku, tai käytä tarvittaessa palautuskoodia:'

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

@ -1,20 +1,44 @@
---
ia:
simple_form:
hints:
account:
note: 'Tu pote @mentionar altere personas o #hashtags.'
defaults:
setting_display_media_hide_all: Sempre celar le medios
setting_display_media_show_all: Sempre monstrar le medios
webhook:
events: Selige le eventos a inviar
url: Ubi le eventos essera inviate
labels:
account:
discoverable: Evidentiar le profilo e messages in le algorithmos de discoperta
fields:
name: Etiquetta
value: Contento
indexable: Includer messages public in le resultatos de recerca
show_collections: Monstrar sequites e sequitores in le profilo
unlocked: Acceptar automaticamente nove sequitores
account_warning_preset:
title: Titulo
admin_account_action:
type: Action
types:
none: Inviar un advertimento
announcement:
text: Annuncio
defaults:
autofollow: Invitar a sequer tu conto
avatar: Pictura de profilo
confirm_new_password: Confirmar nove contrasigno
confirm_password: Confirmar contrasigno
current_password: Contrasigno actual
display_name: Nomine a monstrar
email: Adresse de e-mail
locale: Lingua de interfacie
new_password: Nove contrasigno
password: Contrasigno
setting_advanced_layout: Activar le interfacie web avantiate
setting_default_language: Lingua de publication
setting_display_media_default: Predefinite
setting_display_media_hide_all: Celar toto
@ -26,29 +50,50 @@ ia:
title: Titulo
username: Nomine de usator
username_or_email: Nomine de usator o e-mail
featured_tag:
name: Hashtag
filters:
actions:
hide: Celar completemente
warn: Celar con un advertimento
form_admin_settings:
bootstrap_timeline_accounts: Recommenda sempre iste contos a nove usatores
custom_css: CSS personalisate
profile_directory: Activar directorio de profilos
site_contact_email: Adresse de e-mail de contacto
site_contact_username: Nomine de usator de contacto
site_short_description: Description de servitor
site_terms: Politica de confidentialitate
site_title: Nomine de servitor
status_page_url: URL del pagina de stato
theme: Thema predefinite
trends: Activar tendentias
ip_block:
comment: Commento
severity: Regula
notification_emails:
software_updates:
all: Notificar sur tote le actualisationes
critical: Notificar solmente sur actualisationes critic
label: Un nove version de Mastodon es disponibile
none: Nunquam notificar sur actualisationes (non recommendate)
rule:
hint: Information additional
text: Regula
settings:
indexable: Includer pagina de profilo in le motores de recerca
tag:
listable: Permitter a iste hashtag apparer in le recercas e suggestiones
name: Hashtag
usable: Permitter al messages usar iste hashtag
user:
time_zone: Fuso horari
user_role:
name: Nomine
permissions_as_keys: Permissiones
position: Prioritate
not_recommended: Non recommendate
recommended: Recommendate
required:
text: requirite
'yes': Si

2
config/webpacker.yml
View file

@ -2,7 +2,7 @@
default: &default
source_path: app/javascript
source_entry_path: packs
source_entry_path: entrypoints
public_root_path: public
public_output_path: packs
cache_path: tmp/cache/webpacker