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

Merge commit '15fd712464' into kb_migration

Browse source
This commit is contained in:
KMY 2023-05-01 15:05:34 +09:00
commit 3a1a6ba39e
289 changed files with 1339 additions and 1337 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/environments/production.rb
View file

@ -56,7 +56,7 @@ Rails.application.configure do
# Enable locale fallbacks for I18n (makes lookups for any locale fall back to
# English when a translation cannot be found).
config.i18n.fallbacks = true
config.i18n.fallbacks = [:en]
# Send deprecation notices to registered listeners.
config.active_support.deprecation = :notify

2
config/initializers/content_security_policy.rb
View file

@ -3,7 +3,7 @@
# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy
def host_to_url(str)
"http#{Rails.configuration.x.use_https ? 's' : ''}://#{str}" unless str.blank?
"http#{Rails.configuration.x.use_https ? 's' : ''}://#{str}" if str.present?
end
base_host = Rails.configuration.x.web_domain

2
config/initializers/paperclip.rb
View file

@ -7,7 +7,7 @@ Paperclip.interpolates :filename do |attachment, style|
if style == :original
attachment.original_filename
else
[basename(attachment, style), extension(attachment, style)].delete_if(&:blank?).join('.')
[basename(attachment, style), extension(attachment, style)].compact_blank!.join('.')
end
end

6
config/locales/af.yml
View file

@ -91,13 +91,7 @@ af:
approve_appeal: Aanvaar appèl
reject_appeal: Verwerp appèl
errors:
'400': The request you submitted was invalid or malformed.
'403': Jy het nie toestemming om hierdie bladsy te sien nie.
'404': The page you are looking for isn't here.
'406': This page is not available in the requested format.
'410': The page you were looking for doesn't exist here anymore.
'429': Too many requests
'503': The page could not be served due to a temporary server failure.
exports:
bookmarks: Boekmerke
lists: Lyste

8
config/locales/bn.yml
View file

@ -224,13 +224,5 @@ bn:
report_notes:
created_msg: রিপোর্ট নোট সফলভাবে তৈরি করা হয়েছে!
destroyed_msg: রিপোর্ট নোট সফলভাবে মোছা হয়েছে!
errors:
'400': The request you submitted was invalid or malformed.
'403': You don't have permission to view this page.
'404': The page you are looking for isn't here.
'406': This page is not available in the requested format.
'410': The page you were looking for doesn't exist here anymore.
'429': Too many requests
'503': The page could not be served due to a temporary server failure.
verification:
verification: সত্যতা নির্ধারণ

8
config/locales/br.yml
View file

@ -334,14 +334,6 @@ br:
created_at: Deiziad
title_actions:
none: Diwall
errors:
'400': The request you submitted was invalid or malformed.
'403': You don't have permission to view this page.
'404': The page you are looking for isn't here.
'406': This page is not available in the requested format.
'410': The page you were looking for doesn't exist here anymore.
'429': Too many requests
'503': The page could not be served due to a temporary server failure.
exports:
archive_takeout:
date: Deiziad

8
config/locales/bs.yml
View file

@ -1,10 +1,2 @@
---
bs:
errors:
'400': The request you submitted was invalid or malformed.
'403': You don't have permission to view this page.
'404': The page you are looking for isn't here.
'406': This page is not available in the requested format.
'410': The page you were looking for doesn't exist here anymore.
'429': Too many requests
'503': The page could not be served due to a temporary server failure.

18
config/locales/en.yml
View file

@ -895,14 +895,14 @@ en:
statuses:
allow: Allow post
allow_account: Allow author
description_html: These are posts that your server knows about that are currently being shared and favourited a lot at the moment. It can help your new and returning users to find more people to follow. No posts are displayed publicly until you approve the author, and the author allows their account to be suggested to others. You can also allow or reject individual posts.
description_html: These are posts that your server knows about that are currently being shared and favorited a lot at the moment. It can help your new and returning users to find more people to follow. No posts are displayed publicly until you approve the author, and the author allows their account to be suggested to others. You can also allow or reject individual posts.
disallow: Disallow post
disallow_account: Disallow author
no_status_selected: No trending posts were changed as none were selected
not_discoverable: Author has not opted-in to being discoverable
shared_by:
one: Shared or favourited one time
other: Shared and favourited %{friendly_count} times
one: Shared or favorited one time
other: Shared and favorited %{friendly_count} times
title: Trending posts
tags:
current_score: Current score %{score}
@ -1672,10 +1672,10 @@ en:
enabled_hint: Automatically deletes your posts once they reach a specified age threshold, unless they match one of the exceptions below
exceptions: Exceptions
explanation: Because deleting posts is an expensive operation, this is done slowly over time when the server is not otherwise busy. For this reason, your posts may be deleted a while after they reach the age threshold.
ignore_favs: Ignore favourites
ignore_favs: Ignore favorites
ignore_reblogs: Ignore boosts
interaction_exceptions: Exceptions based on interactions
interaction_exceptions_explanation: Note that there is no guarantee for posts to be deleted if they go below the favourite or boost threshold after having once gone over them.
interaction_exceptions_explanation: Note that there is no guarantee for posts to be deleted if they go below the favorite or boost threshold after having once gone over them.
keep_direct: Keep direct messages
keep_direct_hint: Doesn't delete any of your direct messages
keep_media: Keep posts with media attachments
@ -1686,8 +1686,8 @@ en:
keep_polls_hint: Doesn't delete any of your polls
keep_self_bookmark: Keep posts you bookmarked
keep_self_bookmark_hint: Doesn't delete your own posts if you have bookmarked them
keep_self_fav: Keep posts you favourited
keep_self_fav_hint: Doesn't delete your own posts if you have favourited them
keep_self_fav: Keep posts you favorited
keep_self_fav_hint: Doesn't delete your own posts if you have favorited them
min_age:
'1209600': 2 weeks
'15778476': 6 months
@ -1698,8 +1698,8 @@ en:
'63113904': 2 years
'7889238': 3 months
min_age_label: Age threshold
min_favs: Keep posts favourited at least
min_favs_hint: Doesn't delete any of your posts that has received at least this number of favourites. Leave blank to delete posts regardless of their number of favourites
min_favs: Keep posts favorited at least
min_favs_hint: Doesn't delete any of your posts that has received at least this number of favorites. Leave blank to delete posts regardless of their number of favorites
min_reblogs: Keep posts boosted at least
min_reblogs_hint: Doesn't delete any of your posts that has been boosted at least this number of times. Leave blank to delete posts regardless of their number of boosts
stream_entries:

10
config/locales/ga.yml
View file

@ -94,6 +94,7 @@ ga:
search: Cuardaigh
security_measures:
only_password: Pasfhocal amháin
password_and_2fa: Pasfhocal agus fíordheimhniú déshraithe
sensitized: Marcáladh mar íogair
silence: Teorannaigh
silenced: Teoranta
@ -238,6 +239,7 @@ ga:
status: Stádas
reports:
are_you_sure: An bhfuil tú cinnte?
cancel: Cealaigh
category: Catagóir
created_at: Tuairiscithe
delete_and_resolve: Scrios postálacha
@ -361,14 +363,6 @@ ga:
title_actions:
none: Rabhadh
your_appeal_pending: Chuir tú achomharc isteach
errors:
'400': The request you submitted was invalid or malformed.
'403': You don't have permission to view this page.
'404': The page you are looking for isn't here.
'406': This page is not available in the requested format.
'410': The page you were looking for doesn't exist here anymore.
'429': Too many requests
'503': The page could not be served due to a temporary server failure.
exports:
archive_takeout:
date: Dáta

8
config/locales/hi.yml
View file

@ -7,14 +7,6 @@ hi:
upload_check_privacy_error_object_storage:
action: अधिक जानकारी हेतु यहां क्लिक करें।
message_html: "<strong> आपके वेब सर्वर का कन्फिगरेशन सही नहीं है। उपयोगकर्ताओं की निजता खतरे में है। </strong>"
errors:
'400': The request you submitted was invalid or malformed.
'403': You don't have permission to view this page.
'404': The page you are looking for isn't here.
'406': This page is not available in the requested format.
'410': The page you were looking for doesn't exist here anymore.
'429': Too many requests
'503': The page could not be served due to a temporary server failure.
relationships:
follow_failure: चुने हुए अकाउंट्स में से कुछ को फ़ॉलो नहीं किया जा सकता
sessions:

8
config/locales/hr.yml
View file

@ -73,14 +73,6 @@ hr:
less_than_x_seconds: Upravo sada
over_x_years: "%{count}god"
x_months: "%{count}mj"
errors:
'400': The request you submitted was invalid or malformed.
'403': You don't have permission to view this page.
'404': The page you are looking for isn't here.
'406': This page is not available in the requested format.
'410': The page you were looking for doesn't exist here anymore.
'429': Too many requests
'503': The page could not be served due to a temporary server failure.
exports:
archive_takeout:
date: Datum

5
config/locales/hy.yml
View file

@ -529,15 +529,10 @@ hy:
domain_validator:
invalid_domain: անվաւէր տիրոյթի անուն
errors:
'400': The request you submitted was invalid or malformed.
'403': You don't have permission to view this page.
'404': Էջը, որը փնտրում ես գոյութիւն չունի։
'406': This page is not available in the requested format.
'410': The page you were looking for doesn't exist here anymore.
'429': Չափազանց շատ հարցումներ
'500':
title: Էջը ճիշտ չէ
'503': The page could not be served due to a temporary server failure.
existing_username_validator:
not_found: չյաջողուեց գտնել այս ծածկագրով լոկալ օգտատիրոջ
not_found_multiple: չյաջողուեց գտնել %{usernames}

8
config/locales/ig.yml
View file

@ -1,10 +1,2 @@
---
ig:
errors:
'400': The request you submitted was invalid or malformed.
'403': You don't have permission to view this page.
'404': The page you are looking for isn't here.
'406': This page is not available in the requested format.
'410': The page you were looking for doesn't exist here anymore.
'429': Too many requests
'503': The page could not be served due to a temporary server failure.

3
config/locales/ka.yml
View file

@ -263,10 +263,8 @@ ka:
proceed: ანგარიშის გაუქმება
success_msg: თქვენი ანგარიში წარმატებით გაუქმდა
errors:
'400': The request you submitted was invalid or malformed.
'403': ამ გვერდის ხილვის უფლება არ გაქვთ.
'404': გვერდი რომელსაც ეძებთ არ არსებობს.
'406': This page is not available in the requested format.
'410': გვერდი რომელსაც ეძებდით აღარ არსებობს.
'422':
content: უსაფრთხოების ვერიფიკაცია ვერ მოხერხდა. ბლოკავთ ქუქის?
@ -275,7 +273,6 @@ ka:
'500':
content: ბოდიში, ჩვენ მხარეს რაღაც არია.
title: გვერდი არაა სწორი
'503': The page could not be served due to a temporary server failure.
noscript_html: მასტოდონ ვებ-აპლიკაციის გამოყენებისთვის, გთხოვთ ჩართოთ ჯავასკრიპტი. სხვა შემთხვევაში, მასტოდონის თქვენი პატფორმისთვის სცადეთ გამოიყენოთ ერთ-ერთი <a href="%{apps_path}">მშობლიური აპლიკაცია</a>.
exports:
archive_takeout:

8
config/locales/kn.yml
View file

@ -1,10 +1,2 @@
---
kn:
errors:
'400': The request you submitted was invalid or malformed.
'403': You don't have permission to view this page.
'404': The page you are looking for isn't here.
'406': This page is not available in the requested format.
'410': The page you were looking for doesn't exist here anymore.
'429': Too many requests
'503': The page could not be served due to a temporary server failure.

8
config/locales/kw.yml
View file

@ -5,13 +5,5 @@ kw:
email: Ebost
followers: Holyoryon
title: Akontow
errors:
'400': The request you submitted was invalid or malformed.
'403': You don't have permission to view this page.
'404': The page you are looking for isn't here.
'406': This page is not available in the requested format.
'410': The page you were looking for doesn't exist here anymore.
'429': Too many requests
'503': The page could not be served due to a temporary server failure.
settings:
account: Akont

3
config/locales/lt.yml
View file

@ -298,10 +298,8 @@ lt:
proceed: Ištrinti paskyrą
success_msg: Jūsų paskyra sėkmingai ištrinta
errors:
'400': The request you submitted was invalid or malformed.
'403': Jūs neturie prieigos matyti šiam puslapiui.
'404': Puslapis nerastas.
'406': This page is not available in the requested format.
'410': Puslapis neegzistuoja.
'422':
content: Apsaugos patvirtinmas klaidingas. Ar jūs blokuojate sausainius?
@ -310,7 +308,6 @@ lt:
'500':
content: Atsiprašome, tačiau mūsų pusėje įvyko klaida.
title: Netinkamas puslapis
'503': The page could not be served due to a temporary server failure.
noscript_html: Kad naudotumėtės Mastodon web aplikacija, prašome įsijungti JavaScript. Alternatyviai, pabandykite viena iš <a href="%{apps_path}">vietinių aplikacijų</a> Mastodon savo platformai.
exports:
archive_takeout:

8
config/locales/mk.yml
View file

@ -1,10 +1,2 @@
---
mk:
errors:
'400': The request you submitted was invalid or malformed.
'403': You don't have permission to view this page.
'404': The page you are looking for isn't here.
'406': This page is not available in the requested format.
'410': The page you were looking for doesn't exist here anymore.
'429': Too many requests
'503': The page could not be served due to a temporary server failure.

8
config/locales/ml.yml
View file

@ -78,14 +78,6 @@ ml:
all: എല്ലാം
authorize_follow:
following: 'വിജയകരം! നിങ്ങൾ ഇപ്പോൾ പിന്തുടരുന്നു:'
errors:
'400': The request you submitted was invalid or malformed.
'403': You don't have permission to view this page.
'404': The page you are looking for isn't here.
'406': This page is not available in the requested format.
'410': The page you were looking for doesn't exist here anymore.
'429': Too many requests
'503': The page could not be served due to a temporary server failure.
filters:
contexts:
notifications: അറിയിപ്പുകൾ

8
config/locales/mr.yml
View file

@ -1,10 +1,2 @@
---
mr:
errors:
'400': The request you submitted was invalid or malformed.
'403': You don't have permission to view this page.
'404': The page you are looking for isn't here.
'406': This page is not available in the requested format.
'410': The page you were looking for doesn't exist here anymore.
'429': Too many requests
'503': The page could not be served due to a temporary server failure.

2
config/locales/oc.yml
View file

@ -560,7 +560,6 @@ oc:
domain_validator:
invalid_domain: es pas un nom de domeni valid
errors:
'400': The request you submitted was invalid or malformed.
'403': Avètz pas l’autorizacion de veire aquesta pagina.
'404': La pagina que cercatz existís pas aquí.
'406': La pagina es pas disponibla dins lo format demandat.
@ -572,7 +571,6 @@ oc:
'500':
content: Un quicomet a pas foncionat coma caliá.
title: Aquesta pagina es pas corrècta
'503': The page could not be served due to a temporary server failure.
noscript_html: Per utilizar l’aplicacion web de Mastodon, mercés d’activar JavaScript. O podètz utilizar <a href="%{apps_path}">una aplicacion</a> per vòstra plataforma coma alernativa.
existing_username_validator:
not_found: impossible de trobar un utilizaire local amb aqueste nom d’utilizaire

2
config/locales/pl.yml
View file

@ -1057,6 +1057,7 @@ pl:
security: Bezpieczeństwo
set_new_password: Ustaw nowe hasło
setup:
email_below_hint_html: Sprawdź folder ze spamem lub poproś o inny link potwierdzający. Możesz poprawić swój adres e-mail, jeśli jest niepoprawny.
email_settings_hint_html: Kliknij link, który wysłaliśmy do Ciebie w celu zweryfikowania %{email}. Poczekamy tutaj.
link_not_received: Nie otrzymano linku?
new_confirmation_instructions_sent: Za kilka minut otrzymasz nowy e-mail z linkiem potwierdzającym!
@ -1065,6 +1066,7 @@ pl:
preamble_html: Zaloguj się przy użyciu danych logowania <strong>%{domain}</strong>. Jeśli Twoje konto jest hostowane na innym serwerze, nie będziesz mógł się zalogować tutaj.
title: Zaloguj się do %{domain}
sign_up:
manual_review: Rejestracja na %{domain} przechodzi przez ręczne sprawdzanie przez naszych moderatorów. Aby pomóc nam usprawnić ten proces, napisz coś o sobie oraz dlaczego chcesz założyć konto na %{domain}.
preamble: Z kontem na tym serwerze Mastodon będziesz mógł obserwować każdą inną osobę w sieci, niezależnie od miejsca przechowywania ich konta.
title: Skonfigurujmy Twoje konto na %{domain}.
status:

3
config/locales/ro.yml
View file

@ -492,10 +492,8 @@ ro:
email_change_html: Puteți <a href="%{path}">schimba adresa de e-mail</a> fără a șterge contul dvs
email_contact_html: Dacă tot nu ajunge, puteți trimite e-mail la <a href="mailto:%{email}">%{email}</a> pentru ajutor
errors:
'400': The request you submitted was invalid or malformed.
'403': Nu ai permisiunea să vizitezi această pagină.
'404': Pagina pe care o cauți nu există.
'406': This page is not available in the requested format.
'410': Pagina pe care o cauți nu mai există.
'422':
content: Verificarea securității a eșuat. Ai blocat cookiurile?
@ -504,7 +502,6 @@ ro:
'500':
content: Ne pare rău, dar ceva a funcționat greșit. Încercați din nou!?
title: Această pagină nu este corectă
'503': The page could not be served due to a temporary server failure.
noscript_html: Pentru a utiliza o aplicație web Mastodon, te rog activează JavaScript. Alternativ, încearcă una din <a href="%{apps_path}">aplicațiile native</a> Mastodon pentru platforma ta.
exports:
archive_takeout:

8
config/locales/sa.yml
View file

@ -1,10 +1,2 @@
---
sa:
errors:
'400': The request you submitted was invalid or malformed.
'403': You don't have permission to view this page.
'404': The page you are looking for isn't here.
'406': This page is not available in the requested format.
'410': The page you were looking for doesn't exist here anymore.
'429': Too many requests
'503': The page could not be served due to a temporary server failure.

12
config/locales/simple_form.ga.yml
View file

@ -3,15 +3,15 @@ ga:
simple_form:
hints:
account_alias:
acct: Sonraigh ainm@fearann an chuntais ar mhaith leat aistriú uaidh
acct: Sonraigh ainm@fearann don chuntas ar mhaith leat aistriú uaidh
account_migration:
acct: Sonraigh ainm@fearann an chuntais ar mhaith leat aistriú chuige
acct: Sonraigh ainm@fearann don chuntas ar mhaith leat aistriú chuige
admin_account_action:
types:
disable: Cuir cosc ar an úsáideoir a chuntas a úsáid, ach ná scrios nó folaigh a bhfuil ann.
disable: Cuir cosc ar an úsáideoir a chuntas a úsáid, ach ná scrios ná folaigh a bhfuil ann.
defaults:
setting_display_media_hide_all: Folaítear meáin i gcónaí
setting_display_media_show_all: Go dtaispeántar meáin i gcónaí
setting_display_media_hide_all: Folaigh meáin i gcónaí
setting_display_media_show_all: Taispeáin meáin i gcónaí
labels:
account:
fields:
@ -40,7 +40,7 @@ ga:
setting_display_media_hide_all: Cuir uile i bhfolach
setting_display_media_show_all: Taispeáin uile
setting_theme: Téama suímh
setting_trends: Taispeáin treochta an lae
setting_trends: Taispeáin treochtaí an lae inniu
title: Teideal
username: Ainm úsáideora
featured_tag:

1
config/locales/simple_form.vi.yml
View file

@ -59,6 +59,7 @@ vi:
setting_show_application: Tên ứng dụng bạn dùng để đăng tút sẽ hiện trong chi tiết của tút
setting_use_blurhash: Lớp phủ mờ dựa trên màu sắc của hình ảnh nhạy cảm
setting_use_pending_items: Dồn lại toàn bộ tút mới và chỉ hiển thị khi nhấn vào
username: Chỉ chấp nhận ký tự, số và dấu gạch dưới
whole_word: Khi từ khóa hoặc cụm từ là chữ và số, nó sẽ chỉ hiện ra những từ chính xác như vậy
domain_allow:
domain: Máy chủ này sẽ tiếp nhận dữ liệu, rồi sau đó xử lý và lưu trữ

13
config/locales/sq.yml
View file

@ -982,6 +982,7 @@ sq:
prefix_invited_by_user: "@%{name} ju fton të bëheni pjesë e këtij shërbyesi Mastodon!"
prefix_sign_up: Regjistrohuni në Mastodon që sot!
suffix: Me një llogari, do të jeni në gjendje të ndiqni persona, përditësime postimesh dhe të shkëmbeni mesazhe me përdorues nga cilido shërbyes Mastodon, etj!
didnt_get_confirmation: S’morët një lidhje ripohimi?
dont_have_your_security_key: S’i keni kyçet tuaj të sigurisë?
forgot_password: Harruat fjalëkalimin tuaj?
invalid_reset_password_token: Token-i i ricaktimit të fjalëkalimit është i pavlefshëm ose ka skaduar. Ju lutemi, kërkoni një të ri.
@ -994,11 +995,16 @@ sq:
migrate_account_html: Nëse doni ta ridrejtoni këtë llogari te një tjetër, këtë mund <a href="%{path}">ta formësoni këtu</a>.
or_log_in_with: Ose bëni hyrjen me
privacy_policy_agreement_html: I kam lexuar dhe pajtohem me <a href="%{privacy_policy_path}" target="_blank">rregullat e privatësisë</a>
progress:
confirm: Email ripohimi
details: Hollësitë tuaja
review: Shqyrtimi ynë
providers:
cas: CAS
saml: SAML
register: Regjistrohuni
registration_closed: "%{instance} s’pranon anëtarë të rinj"
resend_confirmation: Ridërgo lidhje ripohimi
reset_password: Ricaktoni fjalëkalimin
rules:
accept: Pranoje
@ -1007,10 +1013,17 @@ sq:
title: Disa rregulla bazë.
security: Siguri
set_new_password: Caktoni fjalëkalim të ri
setup:
email_below_hint_html: Shihni te dosja juaj e të padëshiruara, ose kërkoni një tjetër. Mund të ndreqni adresën tuaj email, nëse është e gabuar.
email_settings_hint_html: Që të verifikoni %{email}, klikoni lidhjen që ju dërguam. Do të presim këtu.
link_not_received: S’morët lidhje?
new_confirmation_instructions_sent: Pas pak minutash do të merrni një email të ri me lidhjen e ripohimit!
title: Shihni te email-et tuaj
sign_in:
preamble_html: Hyni me kredencialet tuaja për te <strong>%{domain}</strong>. Nëse llogaria juaj strehohet në një tjetër shërbyes, s’do të jeni në gjendje të bëni hyrjen këtu.
title: Bëni hyrjen te %{domain}
sign_up:
manual_review: Regjistrimet te %{domain} kalojnë një shqyrtim dorazi nga moderatorët tanë. Që të na ndihmoni të përfundojmë regjistrimin tuaj, na shkruani pakëz mbi veten dhe pse doni një llogari në %{domain}.
preamble: Me një llogari në këtë shërbyes Mastodon, do të jeni në gjendje të ndiqni cilindo person tjetër në rrjet, pavarësisht se ku strehohet llogaria e tyre.
title: Le të ujdisim llogarinë tuaj në %{domain}.
status:

9
config/locales/sv.yml
View file

@ -125,6 +125,8 @@ sv:
removed_header_msg: Tog bort %{username}s sidhuvudsbild
resend_confirmation:
already_confirmed: Den här användaren är redan bekräftad
send: Skicka bekräftelselänken igen
success: Bekräftelselänken har skickats!
reset: Återställ
reset_password: Återställ lösenord
resubscribe: Starta en ny prenumeration
@ -986,6 +988,7 @@ sv:
prefix_invited_by_user: "@%{name} bjuder in dig att gå med i en Mastodon-server!"
prefix_sign_up: Registrera dig på Mastodon idag!
suffix: Med ett konto kommer du att kunna följa personer, göra inlägg och utbyta meddelanden med användare från andra Mastodon-servrar, och ännu mer!
didnt_get_confirmation: Fick du ingen bekräftelselänk?
dont_have_your_security_key: Har du inte din säkerhetsnyckel?
forgot_password: Glömt ditt lösenord?
invalid_reset_password_token: Lösenordsåterställningstoken är ogiltig eller utgått. Vänligen be om en ny.
@ -998,11 +1001,15 @@ sv:
migrate_account_html: Om du vill omdirigera detta konto till ett annat, kan du <a href="%{path}">konfigurera det här</a>.
or_log_in_with: Eller logga in med
privacy_policy_agreement_html: Jag har läst och godkänner <a href="%{privacy_policy_path}" target="_blank">integritetspolicyn</a>
progress:
confirm: Bekräfta e-postadress
details: Dina uppgifter
providers:
cas: CAS
saml: SAML
register: Registrera
registration_closed: "%{instance} accepterar inte nya medlemmar"
resend_confirmation: Skicka bekräftelselänken igen
reset_password: Återställ lösenord
rules:
accept: Godkänn
@ -1011,6 +1018,8 @@ sv:
title: Några grundregler.
security: Säkerhet
set_new_password: Skriv in nytt lösenord
setup:
link_not_received: Fick du ingen länk?
sign_in:
preamble_html: Logga in med dina användaruppgifter på <strong>%{domain}</strong>. Om ditt konto finns på en annan server kommer du inte att kunna logga in här.
title: Logga in på %{domain}

8
config/locales/szl.yml
View file

@ -1,10 +1,2 @@
---
szl:
errors:
'400': The request you submitted was invalid or malformed.
'403': You don't have permission to view this page.
'404': The page you are looking for isn't here.
'406': This page is not available in the requested format.
'410': The page you were looking for doesn't exist here anymore.
'429': Too many requests
'503': The page could not be served due to a temporary server failure.

8
config/locales/ta.yml
View file

@ -197,14 +197,6 @@ ta:
errors:
invalid_key: ஒரு முறையான Ed25519 அல்லது Curve25519 key அல்ல
invalid_signature: ஒரு முறையான Ed25519 அடையாளம் அல்ல
errors:
'400': The request you submitted was invalid or malformed.
'403': You don't have permission to view this page.
'404': The page you are looking for isn't here.
'406': This page is not available in the requested format.
'410': The page you were looking for doesn't exist here anymore.
'429': Too many requests
'503': The page could not be served due to a temporary server failure.
filters:
index:
empty: தடுப்புகள் ஏதும் இல்லை.

8
config/locales/te.yml
View file

@ -70,11 +70,3 @@ te:
moderation_notes: మోడరేషన్ నోట్స్
most_recent_activity: ఇటీవల యాక్టివిటీ
most_recent_ip: ఇటీవలి IP
errors:
'400': The request you submitted was invalid or malformed.
'403': You don't have permission to view this page.
'404': The page you are looking for isn't here.
'406': This page is not available in the requested format.
'410': The page you were looking for doesn't exist here anymore.
'429': Too many requests
'503': The page could not be served due to a temporary server failure.

8
config/locales/tt.yml
View file

@ -140,14 +140,6 @@ tt:
x_minutes: "%{count}м"
x_months: "%{count}ай"
x_seconds: "%{count}сек"
errors:
'400': The request you submitted was invalid or malformed.
'403': You don't have permission to view this page.
'404': The page you are looking for isn't here.
'406': This page is not available in the requested format.
'410': The page you were looking for doesn't exist here anymore.
'429': Too many requests
'503': The page could not be served due to a temporary server failure.
exports:
archive_takeout:
date: Көне

8
config/locales/ug.yml
View file

@ -1,10 +1,2 @@
---
ug:
errors:
'400': The request you submitted was invalid or malformed.
'403': You don't have permission to view this page.
'404': The page you are looking for isn't here.
'406': This page is not available in the requested format.
'410': The page you were looking for doesn't exist here anymore.
'429': Too many requests
'503': The page could not be served due to a temporary server failure.

8
config/locales/ur.yml
View file

@ -1,10 +1,2 @@
---
ur:
errors:
'400': The request you submitted was invalid or malformed.
'403': You don't have permission to view this page.
'404': The page you are looking for isn't here.
'406': This page is not available in the requested format.
'410': The page you were looking for doesn't exist here anymore.
'429': Too many requests
'503': The page could not be served due to a temporary server failure.

8
config/locales/uz.yml
View file

@ -39,11 +39,3 @@ uz:
most_recent_ip: Eng oxirgi IP
perform_full_suspension: To'xtatilgan
reject: Rad etish
errors:
'400': The request you submitted was invalid or malformed.
'403': You don't have permission to view this page.
'404': The page you are looking for isn't here.
'406': This page is not available in the requested format.
'410': The page you were looking for doesn't exist here anymore.
'429': Too many requests
'503': The page could not be served due to a temporary server failure.

13
config/locales/vi.yml
View file

@ -983,11 +983,17 @@ vi:
migrate_account_html: Nếu bạn muốn bỏ tài khoản này để dùng một tài khoản khác, bạn có thể <a href="%{path}">thiết lập tại đây</a>.
or_log_in_with: Hoặc đăng nhập bằng
privacy_policy_agreement_html: Tôi đã đọc và đồng ý <a href="%{privacy_policy_path}" target="_blank">chính sách bảo mật</a>
progress:
confirm: Xác minh email
details: Thông tin của bạn
review: Đợi duyệt
rules: Đọc nội quy
providers:
cas: CAS
saml: SAML
register: Đăng ký
registration_closed: "%{instance} tạm ngưng đăng ký mới"
resend_confirmation: Gửi lại email xác nhận
reset_password: Đặt lại mật khẩu
rules:
accept: Chấp nhận
@ -996,10 +1002,17 @@ vi:
title: Nội quy máy chủ.
security: Bảo mật
set_new_password: Đặt mật khẩu mới
setup:
email_below_hint_html: Kiểm tra thư rác của bạn hoặc yêu cầu gửi lại. Bạn có thể sửa địa chỉ email của mình nếu sai.
email_settings_hint_html: Nhấn vào liên kết chúng tôi vừa gửi để xác minh %{email}. Nhanh nhé bạn.
link_not_received: Không nhận được mã?
new_confirmation_instructions_sent: Bạn sẽ nhận được một email mới với liên kết xác nhận sau vài phút!
title: Kiểm tra hộp thư của bạn
sign_in:
preamble_html: Đăng nhập bằng tài khoản <strong>%{domain}</strong>. Nếu tài khoản của bạn được lưu trữ trên một máy chủ khác, bạn sẽ không thể đăng nhập tại đây.
title: Đăng nhập %{domain}
sign_up:
manual_review: Đăng ký trên %{domain} cần duyệt thủ công. Để giúp chúng tôi xử lý nhanh, hãy viết một chút về bản thân và lý do bạn muốn có một tài khoản trên %{domain}.
preamble: Với tài khoản trên máy chủ Mastodon này, bạn sẽ có thể theo dõi bất kỳ người nào trên các máy chủ khác, bất kể tài khoản của họ ở đâu.
title: Cho phép bạn đăng ký trên %{domain}.
status:

8
config/locales/zgh.yml
View file

@ -83,14 +83,6 @@ zgh:
title: ⴹⴼⵕ %{acct}
deletes:
proceed: ⴽⴽⵙ ⴰⵎⵉⴹⴰⵏ
errors:
'400': The request you submitted was invalid or malformed.
'403': You don't have permission to view this page.
'404': The page you are looking for isn't here.
'406': This page is not available in the requested format.
'410': The page you were looking for doesn't exist here anymore.
'429': Too many requests
'503': The page could not be served due to a temporary server failure.
exports:
archive_takeout:
date: ⴰⵣⵎⵣ

2
config/routes.rb
View file

@ -84,6 +84,8 @@ Rails.application.routes.draw do
}
get '/users/:username', to: redirect('/@%{username}'), constraints: lambda { |req| req.format.nil? || req.format.html? }
get '/users/:username/following', to: redirect('/@%{username}/following'), constraints: lambda { |req| req.format.nil? || req.format.html? }
get '/users/:username/followers', to: redirect('/@%{username}/followers'), constraints: lambda { |req| req.format.nil? || req.format.html? }
get '/users/:username/statuses/:id', to: redirect('/@%{username}/%{id}'), constraints: lambda { |req| req.format.nil? || req.format.html? }
get '/authorize_follow', to: redirect { |_, request| "/authorize_interaction?#{request.params.to_query}" }