From d4d77ace97c105d6ef9823ced72eb9939fb52de6 Mon Sep 17 00:00:00 2001 From: diondiondion Date: Thu, 12 Jun 2025 05:24:58 +0200 Subject: [PATCH 01/10] fix: Fetch missing nested quotes (#35016) --- .../mastodon/components/status_quoted.tsx | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/app/javascript/mastodon/components/status_quoted.tsx b/app/javascript/mastodon/components/status_quoted.tsx index c99f63704e..36bd618df5 100644 --- a/app/javascript/mastodon/components/status_quoted.tsx +++ b/app/javascript/mastodon/components/status_quoted.tsx @@ -1,4 +1,4 @@ -import { useMemo } from 'react'; +import { useEffect, useMemo } from 'react'; import { FormattedMessage } from 'react-intl'; @@ -13,9 +13,10 @@ import { Icon } from 'mastodon/components/icon'; import StatusContainer from 'mastodon/containers/status_container'; import type { Status } from 'mastodon/models/status'; import type { RootState } from 'mastodon/store'; -import { useAppSelector } from 'mastodon/store'; +import { useAppDispatch, useAppSelector } from 'mastodon/store'; import QuoteIcon from '../../images/quote.svg?react'; +import { fetchStatus } from '../actions/statuses'; import { makeGetStatus } from '../selectors'; const MAX_QUOTE_POSTS_NESTING_LEVEL = 1; @@ -36,7 +37,7 @@ const QuoteWrapper: React.FC<{ ); }; -const QuoteLink: React.FC<{ +const NestedQuoteLink: React.FC<{ status: Status; }> = ({ status }) => { const accountId = status.get('account') as string; @@ -80,12 +81,18 @@ export const QuotedStatus: React.FC<{ variant?: 'full' | 'link'; nestingLevel?: number; }> = ({ quote, contextType, nestingLevel = 1, variant = 'full' }) => { + const dispatch = useAppDispatch(); const quotedStatusId = quote.get('quoted_status'); const quoteState = quote.get('state'); const status = useAppSelector((state) => quotedStatusId ? state.statuses.get(quotedStatusId) : undefined, ); - let quoteError: React.ReactNode = null; + + useEffect(() => { + if (!status) { + dispatch(fetchStatus(quotedStatusId)); + } + }, [status, quotedStatusId, dispatch]); // In order to find out whether the quoted post should be completely hidden // due to a matching filter, we run it through the selector used by `status_container`. @@ -96,6 +103,8 @@ export const QuotedStatus: React.FC<{ ); const isFilteredAndHidden = status && statusWithExtraData === null; + let quoteError: React.ReactNode = null; + if (isFilteredAndHidden) { quoteError = ( ; + return ; } const childQuote = status?.get('quote') as QuoteMap | undefined; From 35090648018b9b6254e7e02e3c7efb69dc2fa029 Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Thu, 12 Jun 2025 02:53:39 -0400 Subject: [PATCH 02/10] Reduce hard coding of instance hostname in `AdminMailer` specs (#35020) --- spec/mailers/admin_mailer_spec.rb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/spec/mailers/admin_mailer_spec.rb b/spec/mailers/admin_mailer_spec.rb index a4bf9dd667..6d11758add 100644 --- a/spec/mailers/admin_mailer_spec.rb +++ b/spec/mailers/admin_mailer_spec.rb @@ -18,8 +18,8 @@ RSpec.describe AdminMailer do .to be_present .and(deliver_to(recipient.user_email)) .and(deliver_from('notifications@localhost')) - .and(have_subject("New report for cb6e6126.ngrok.io (##{report.id})")) - .and(have_body_text("Mike,\r\n\r\nJohn has reported Mike\r\n\r\nView: https://cb6e6126.ngrok.io/admin/reports/#{report.id}\r\n")) + .and(have_subject(I18n.t('admin_mailer.new_report.subject', instance: Rails.configuration.x.local_domain, id: report.id))) + .and(have_body_text("Mike,\r\n\r\nJohn has reported Mike\r\n\r\nView: #{admin_report_url(report)}\r\n")) end end @@ -37,7 +37,7 @@ RSpec.describe AdminMailer do .to be_present .and(deliver_to(recipient.user_email)) .and(deliver_from('notifications@localhost')) - .and(have_subject("#{appeal.account.username} is appealing a moderation decision on cb6e6126.ngrok.io")) + .and(have_subject(I18n.t('admin_mailer.new_appeal.subject', instance: Rails.configuration.x.local_domain, username: appeal.account.username))) .and(have_body_text("#{appeal.account.username} is appealing a moderation decision by #{appeal.strike.account.username}")) end end @@ -56,7 +56,7 @@ RSpec.describe AdminMailer do .to be_present .and(deliver_to(recipient.user_email)) .and(deliver_from('notifications@localhost')) - .and(have_subject("New account up for review on cb6e6126.ngrok.io (#{user.account.username})")) + .and(have_subject(I18n.t('admin_mailer.new_pending_account.subject', instance: Rails.configuration.x.local_domain, username: user.account.username))) .and(have_body_text('The details of the new account are below. You can approve or reject this application.')) end end @@ -80,7 +80,7 @@ RSpec.describe AdminMailer do .to be_present .and(deliver_to(recipient.user_email)) .and(deliver_from('notifications@localhost')) - .and(have_subject('New trends up for review on cb6e6126.ngrok.io')) + .and(have_subject(I18n.t('admin_mailer.new_trends.subject', instance: Rails.configuration.x.local_domain))) .and(have_body_text('The following items need a review before they can be displayed publicly')) .and(have_body_text(ActivityPub::TagManager.instance.url_for(status))) .and(have_body_text(link.title)) @@ -101,7 +101,7 @@ RSpec.describe AdminMailer do .to be_present .and(deliver_to(recipient.user_email)) .and(deliver_from('notifications@localhost')) - .and(have_subject('New Mastodon versions are available for cb6e6126.ngrok.io!')) + .and(have_subject(I18n.t('admin_mailer.new_software_updates.subject', instance: Rails.configuration.x.local_domain))) .and(have_body_text('New Mastodon versions have been released, you may want to update!')) end end @@ -119,7 +119,7 @@ RSpec.describe AdminMailer do .to be_present .and(deliver_to(recipient.user_email)) .and(deliver_from('notifications@localhost')) - .and(have_subject('Critical Mastodon updates are available for cb6e6126.ngrok.io!')) + .and(have_subject(I18n.t('admin_mailer.new_critical_software_updates.subject', instance: Rails.configuration.x.local_domain))) .and(have_body_text('New critical versions of Mastodon have been released, you may want to update as soon as possible!')) .and(have_header('Importance', 'high')) .and(have_header('Priority', 'urgent')) @@ -140,7 +140,7 @@ RSpec.describe AdminMailer do .to be_present .and(deliver_to(recipient.user_email)) .and(deliver_from('notifications@localhost')) - .and(have_subject('Registrations for cb6e6126.ngrok.io have been automatically switched to requiring approval')) + .and(have_subject(I18n.t('admin_mailer.auto_close_registrations.subject', instance: Rails.configuration.x.local_domain))) .and(have_body_text('have been automatically switched')) end end From 1200f70ae71abbabf25e639b1c056d963d57b0e9 Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Thu, 12 Jun 2025 02:54:51 -0400 Subject: [PATCH 03/10] Simplify QR/OTP generation in 2FA/confirmations spec (#35019) --- .../confirmations_controller_spec.rb | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/spec/controllers/settings/two_factor_authentication/confirmations_controller_spec.rb b/spec/controllers/settings/two_factor_authentication/confirmations_controller_spec.rb index 0121c94330..db4fb19411 100644 --- a/spec/controllers/settings/two_factor_authentication/confirmations_controller_spec.rb +++ b/spec/controllers/settings/two_factor_authentication/confirmations_controller_spec.rb @@ -16,22 +16,30 @@ RSpec.describe Settings::TwoFactorAuthentication::ConfirmationsController do end def qr_code_markup - RQRCode::QRCode.new( - 'otpauth://totp/cb6e6126.ngrok.io:local-part%40domain?secret=thisisasecretforthespecofnewview&issuer=cb6e6126.ngrok.io' - ).as_svg(padding: 0, module_size: 4, use_path: true) + RQRCode::QRCode + .new(totp_provisioning_uri) + .as_svg(padding: 0, module_size: 4, use_path: true) + end + + def totp_provisioning_uri + ROTP::TOTP + .new(otp_secret_value, issuer: Rails.configuration.x.local_domain) + .provisioning_uri(user.email) end end [true, false].each do |with_otp_secret| let(:user) { Fabricate(:user, email: 'local-part@domain', otp_secret: with_otp_secret ? 'oldotpsecret' : nil) } + let(:otp_secret_value) { 'thisisasecretforthespecofnewview' } + context 'when signed in' do before { sign_in user, scope: :user } describe 'GET #new' do context 'when a new otp secret has been set in the session' do subject do - get :new, session: { challenge_passed_at: Time.now.utc, new_otp_secret: 'thisisasecretforthespecofnewview' } + get :new, session: { challenge_passed_at: Time.now.utc, new_otp_secret: otp_secret_value } end it_behaves_like 'renders expected page' @@ -47,7 +55,7 @@ RSpec.describe Settings::TwoFactorAuthentication::ConfirmationsController do describe 'POST #create' do describe 'when form_two_factor_confirmation parameter is not provided' do it 'raises ActionController::ParameterMissing' do - post :create, params: {}, session: { challenge_passed_at: Time.now.utc, new_otp_secret: 'thisisasecretforthespecofnewview' } + post :create, params: {}, session: { challenge_passed_at: Time.now.utc, new_otp_secret: otp_secret_value } expect(response).to have_http_status(400) end @@ -64,7 +72,7 @@ RSpec.describe Settings::TwoFactorAuthentication::ConfirmationsController do it 'renders page with success' do expect { post_create_with_options } - .to change { user.reload.otp_secret }.to 'thisisasecretforthespecofnewview' + .to change { user.reload.otp_secret }.to otp_secret_value expect(flash[:notice]) .to eq(I18n.t('two_factor_authentication.enabled_success')) @@ -102,7 +110,7 @@ RSpec.describe Settings::TwoFactorAuthentication::ConfirmationsController do def post_create_with_options post :create, params: { form_two_factor_confirmation: { otp_attempt: '123456' } }, - session: { challenge_passed_at: Time.now.utc, new_otp_secret: 'thisisasecretforthespecofnewview' } + session: { challenge_passed_at: Time.now.utc, new_otp_secret: otp_secret_value } end def prepare_user_otp_generation @@ -112,7 +120,7 @@ RSpec.describe Settings::TwoFactorAuthentication::ConfirmationsController do end def prepare_user_otp_consumption_response(result) - options = { otp_secret: 'thisisasecretforthespecofnewview' } + options = { otp_secret: otp_secret_value } allow(user) .to receive(:validate_and_consume_otp!) .with('123456', options) From 6fcbd7c17aee0751453bc9904556a3dfbc90520b Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Thu, 12 Jun 2025 10:13:31 +0200 Subject: [PATCH 04/10] Remove prominent logout button from profile card in sidebar in web UI (#35017) --- .../features/ui/components/navigation_panel.tsx | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/app/javascript/mastodon/features/ui/components/navigation_panel.tsx b/app/javascript/mastodon/features/ui/components/navigation_panel.tsx index b38888779d..5ea5e6dd91 100644 --- a/app/javascript/mastodon/features/ui/components/navigation_panel.tsx +++ b/app/javascript/mastodon/features/ui/components/navigation_panel.tsx @@ -19,7 +19,6 @@ import ExploreIcon from '@/material-icons/400-24px/explore.svg?react'; import HomeActiveIcon from '@/material-icons/400-24px/home-fill.svg?react'; import HomeIcon from '@/material-icons/400-24px/home.svg?react'; import InfoIcon from '@/material-icons/400-24px/info.svg?react'; -import LogoutIcon from '@/material-icons/400-24px/logout.svg?react'; import NotificationsActiveIcon from '@/material-icons/400-24px/notifications-fill.svg?react'; import NotificationsIcon from '@/material-icons/400-24px/notifications.svg?react'; import PersonAddActiveIcon from '@/material-icons/400-24px/person_add-fill.svg?react'; @@ -30,10 +29,8 @@ import SettingsIcon from '@/material-icons/400-24px/settings.svg?react'; import StarActiveIcon from '@/material-icons/400-24px/star-fill.svg?react'; import StarIcon from '@/material-icons/400-24px/star.svg?react'; import { fetchFollowRequests } from 'mastodon/actions/accounts'; -import { openModal } from 'mastodon/actions/modal'; import { openNavigation, closeNavigation } from 'mastodon/actions/navigation'; import { Account } from 'mastodon/components/account'; -import { IconButton } from 'mastodon/components/icon_button'; import { IconWithBadge } from 'mastodon/components/icon_with_badge'; import { WordmarkLogo } from 'mastodon/components/logo'; import { NavigationPortal } from 'mastodon/components/navigation_portal'; @@ -192,13 +189,6 @@ const SearchLink: React.FC = () => { }; const ProfileCard: React.FC = () => { - const intl = useIntl(); - const dispatch = useAppDispatch(); - - const handleLogoutClick = useCallback(() => { - dispatch(openModal({ modalType: 'CONFIRM_LOG_OUT', modalProps: {} })); - }, [dispatch]); - if (!me) { return null; } @@ -206,12 +196,6 @@ const ProfileCard: React.FC = () => { return (
-
); }; From 0ea4267839344ce9f8003d56d0ece7231d4a219a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 12 Jun 2025 10:23:59 +0200 Subject: [PATCH 05/10] New Crowdin Translations (automated) (#35021) Co-authored-by: GitHub Actions --- app/javascript/mastodon/locales/af.json | 1 - app/javascript/mastodon/locales/an.json | 1 - app/javascript/mastodon/locales/ar.json | 1 - app/javascript/mastodon/locales/ast.json | 2 +- app/javascript/mastodon/locales/az.json | 1 - app/javascript/mastodon/locales/be.json | 1 - app/javascript/mastodon/locales/bg.json | 1 - app/javascript/mastodon/locales/bn.json | 1 - app/javascript/mastodon/locales/br.json | 7 +++++- app/javascript/mastodon/locales/bs.json | 1 - app/javascript/mastodon/locales/ca.json | 11 ++++++++- app/javascript/mastodon/locales/ckb.json | 1 - app/javascript/mastodon/locales/co.json | 1 - app/javascript/mastodon/locales/cs.json | 15 +++++++++--- app/javascript/mastodon/locales/cy.json | 1 - app/javascript/mastodon/locales/da.json | 1 - app/javascript/mastodon/locales/de.json | 11 ++++++++- app/javascript/mastodon/locales/el.json | 1 - app/javascript/mastodon/locales/en-GB.json | 1 - app/javascript/mastodon/locales/eo.json | 1 - app/javascript/mastodon/locales/es-AR.json | 11 ++++++++- app/javascript/mastodon/locales/es-MX.json | 11 ++++++++- app/javascript/mastodon/locales/es.json | 11 ++++++++- app/javascript/mastodon/locales/et.json | 1 - app/javascript/mastodon/locales/eu.json | 1 - app/javascript/mastodon/locales/fa.json | 1 - app/javascript/mastodon/locales/fi.json | 1 - app/javascript/mastodon/locales/fo.json | 1 - app/javascript/mastodon/locales/fr-CA.json | 1 - app/javascript/mastodon/locales/fr.json | 1 - app/javascript/mastodon/locales/fy.json | 25 +++++++++++++++++++- app/javascript/mastodon/locales/ga.json | 2 +- app/javascript/mastodon/locales/gd.json | 1 - app/javascript/mastodon/locales/gl.json | 1 - app/javascript/mastodon/locales/he.json | 6 ++++- app/javascript/mastodon/locales/hi.json | 1 - app/javascript/mastodon/locales/hr.json | 1 - app/javascript/mastodon/locales/hu.json | 7 +++++- app/javascript/mastodon/locales/hy.json | 1 - app/javascript/mastodon/locales/ia.json | 1 - app/javascript/mastodon/locales/id.json | 1 - app/javascript/mastodon/locales/ie.json | 1 - app/javascript/mastodon/locales/ig.json | 1 - app/javascript/mastodon/locales/io.json | 1 - app/javascript/mastodon/locales/is.json | 12 +++++++++- app/javascript/mastodon/locales/it.json | 1 - app/javascript/mastodon/locales/ja.json | 1 - app/javascript/mastodon/locales/ka.json | 1 - app/javascript/mastodon/locales/kab.json | 1 - app/javascript/mastodon/locales/kk.json | 1 - app/javascript/mastodon/locales/kn.json | 1 - app/javascript/mastodon/locales/ko.json | 1 - app/javascript/mastodon/locales/ku.json | 1 - app/javascript/mastodon/locales/kw.json | 1 - app/javascript/mastodon/locales/la.json | 1 - app/javascript/mastodon/locales/lad.json | 1 - app/javascript/mastodon/locales/lt.json | 1 - app/javascript/mastodon/locales/lv.json | 1 - app/javascript/mastodon/locales/mk.json | 1 - app/javascript/mastodon/locales/ml.json | 1 - app/javascript/mastodon/locales/mr.json | 1 - app/javascript/mastodon/locales/ms.json | 1 - app/javascript/mastodon/locales/my.json | 1 - app/javascript/mastodon/locales/nan.json | 1 - app/javascript/mastodon/locales/ne.json | 1 - app/javascript/mastodon/locales/nl.json | 13 ++++++++-- app/javascript/mastodon/locales/nn.json | 1 - app/javascript/mastodon/locales/no.json | 1 - app/javascript/mastodon/locales/oc.json | 1 - app/javascript/mastodon/locales/pa.json | 1 - app/javascript/mastodon/locales/pl.json | 1 - app/javascript/mastodon/locales/pt-BR.json | 1 - app/javascript/mastodon/locales/pt-PT.json | 1 - app/javascript/mastodon/locales/ro.json | 1 - app/javascript/mastodon/locales/ru.json | 1 - app/javascript/mastodon/locales/ry.json | 1 - app/javascript/mastodon/locales/sa.json | 1 - app/javascript/mastodon/locales/sc.json | 1 - app/javascript/mastodon/locales/sco.json | 1 - app/javascript/mastodon/locales/si.json | 1 - app/javascript/mastodon/locales/sk.json | 1 - app/javascript/mastodon/locales/sl.json | 1 - app/javascript/mastodon/locales/sq.json | 11 ++++++++- app/javascript/mastodon/locales/sr-Latn.json | 1 - app/javascript/mastodon/locales/sr.json | 1 - app/javascript/mastodon/locales/sv.json | 1 - app/javascript/mastodon/locales/szl.json | 1 - app/javascript/mastodon/locales/ta.json | 1 - app/javascript/mastodon/locales/tai.json | 1 - app/javascript/mastodon/locales/te.json | 1 - app/javascript/mastodon/locales/th.json | 1 - app/javascript/mastodon/locales/tok.json | 1 - app/javascript/mastodon/locales/tr.json | 1 - app/javascript/mastodon/locales/tt.json | 1 - app/javascript/mastodon/locales/ug.json | 1 - app/javascript/mastodon/locales/uk.json | 11 ++++++++- app/javascript/mastodon/locales/ur.json | 1 - app/javascript/mastodon/locales/uz.json | 1 - app/javascript/mastodon/locales/vi.json | 19 +++++++++++---- app/javascript/mastodon/locales/zgh.json | 1 - app/javascript/mastodon/locales/zh-CN.json | 1 - app/javascript/mastodon/locales/zh-HK.json | 1 - app/javascript/mastodon/locales/zh-TW.json | 11 ++++++++- 103 files changed, 171 insertions(+), 110 deletions(-) diff --git a/app/javascript/mastodon/locales/af.json b/app/javascript/mastodon/locales/af.json index c622989f14..b5c7040d0b 100644 --- a/app/javascript/mastodon/locales/af.json +++ b/app/javascript/mastodon/locales/af.json @@ -110,7 +110,6 @@ "compose_form.poll.duration": "Duur van peiling", "compose_form.poll.switch_to_multiple": "Verander peiling om meer as een keuse toe te laat", "compose_form.poll.switch_to_single": "Verander die peiling om slegs een keuse toe te laat", - "compose_form.publish_form": "Publiseer", "compose_form.spoiler.marked": "Verwyder inhoudswaarskuwing", "compose_form.spoiler.unmarked": "Voeg inhoudswaarskuwing by", "confirmation_modal.cancel": "Kanselleer", diff --git a/app/javascript/mastodon/locales/an.json b/app/javascript/mastodon/locales/an.json index 51d76474a1..554fb127e2 100644 --- a/app/javascript/mastodon/locales/an.json +++ b/app/javascript/mastodon/locales/an.json @@ -120,7 +120,6 @@ "compose_form.poll.duration": "Duración d'a enqüesta", "compose_form.poll.switch_to_multiple": "Modificar enqüesta pa permitir multiples opcions", "compose_form.poll.switch_to_single": "Modificar enqüesta pa permitir una sola opción", - "compose_form.publish_form": "Publicar", "compose_form.spoiler.marked": "Texto amagau dimpués de l'alvertencia", "compose_form.spoiler.unmarked": "Texto no amagau", "confirmation_modal.cancel": "Cancelar", diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json index c51312c951..e983b367d7 100644 --- a/app/javascript/mastodon/locales/ar.json +++ b/app/javascript/mastodon/locales/ar.json @@ -164,7 +164,6 @@ "compose_form.poll.switch_to_single": "تغيِير الاستطلاع للسماح باِخيار واحد فقط", "compose_form.poll.type": "الطراز", "compose_form.publish": "نشر", - "compose_form.publish_form": "منشور جديد", "compose_form.reply": "ردّ", "compose_form.save_changes": "تحديث", "compose_form.spoiler.marked": "إزالة تحذير المحتوى", diff --git a/app/javascript/mastodon/locales/ast.json b/app/javascript/mastodon/locales/ast.json index f0ac646e9b..036dd64f9a 100644 --- a/app/javascript/mastodon/locales/ast.json +++ b/app/javascript/mastodon/locales/ast.json @@ -137,7 +137,6 @@ "compose_form.poll.option_placeholder": "Opción {number}", "compose_form.poll.type": "Tipu", "compose_form.publish": "Espublizar", - "compose_form.publish_form": "Publicación nueva", "compose_form.reply": "Responder", "confirmation_modal.cancel": "Encaboxar", "confirmations.block.confirm": "Bloquiar", @@ -550,6 +549,7 @@ "status.unpin": "Lliberar del perfil", "subscribed_languages.save": "Guardar los cambeos", "tabs_bar.home": "Aniciu", + "tabs_bar.menu": "Menú", "tabs_bar.notifications": "Avisos", "terms_of_service.title": "Términos del serviciu", "time_remaining.days": "{number, plural, one {Queda # día} other {Queden # díes}}", diff --git a/app/javascript/mastodon/locales/az.json b/app/javascript/mastodon/locales/az.json index af07429f36..a5fd01f4c7 100644 --- a/app/javascript/mastodon/locales/az.json +++ b/app/javascript/mastodon/locales/az.json @@ -192,7 +192,6 @@ "compose_form.poll.switch_to_single": "Tək cavaba icazə vermək üçün sorğunu redaktə et", "compose_form.poll.type": "Stil", "compose_form.publish": "Paylaş", - "compose_form.publish_form": "Yeni paylaşım", "compose_form.reply": "Cavabla", "compose_form.save_changes": "Yenilə", "compose_form.spoiler.marked": "Məzmun xəbərdarlığını sil", diff --git a/app/javascript/mastodon/locales/be.json b/app/javascript/mastodon/locales/be.json index 2d6f6579c4..0973b8b491 100644 --- a/app/javascript/mastodon/locales/be.json +++ b/app/javascript/mastodon/locales/be.json @@ -184,7 +184,6 @@ "compose_form.poll.switch_to_single": "Змяніце апытанне, каб дазволіць адзіны варыянт адказу", "compose_form.poll.type": "Стыль", "compose_form.publish": "Даслаць", - "compose_form.publish_form": "Новы допіс", "compose_form.reply": "Адказаць", "compose_form.save_changes": "Абнавіць", "compose_form.spoiler.marked": "Выдаліць папярэджанне аб змесціве", diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json index 6ffefbb553..3fb613fc3a 100644 --- a/app/javascript/mastodon/locales/bg.json +++ b/app/javascript/mastodon/locales/bg.json @@ -203,7 +203,6 @@ "compose_form.poll.switch_to_single": "Промяна на анкетата, за да се позволи един възможен избор", "compose_form.poll.type": "Стил", "compose_form.publish": "Публикация", - "compose_form.publish_form": "Публикуване", "compose_form.reply": "Отговор", "compose_form.save_changes": "Обновяване", "compose_form.spoiler.marked": "Отстраняване на предупреждение за съдържание", diff --git a/app/javascript/mastodon/locales/bn.json b/app/javascript/mastodon/locales/bn.json index f4e71d9cc9..b0951a6d28 100644 --- a/app/javascript/mastodon/locales/bn.json +++ b/app/javascript/mastodon/locales/bn.json @@ -139,7 +139,6 @@ "compose_form.poll.duration": "ভোটগ্রহনের সময়", "compose_form.poll.switch_to_multiple": "একাধিক পছন্দ অনুমতি দেওয়ার জন্য পোল পরিবর্তন করুন", "compose_form.poll.switch_to_single": "একটি একক পছন্দের অনুমতি দেওয়ার জন্য পোল পরিবর্তন করুন", - "compose_form.publish_form": "প্রকাশ করুন", "compose_form.spoiler.marked": "সতর্কতার পিছনে লেখানটি লুকানো আছে", "compose_form.spoiler.unmarked": "লেখাটি লুকানো নেই", "confirmation_modal.cancel": "বাতিল করুন", diff --git a/app/javascript/mastodon/locales/br.json b/app/javascript/mastodon/locales/br.json index 49d15f9cba..0d9d368922 100644 --- a/app/javascript/mastodon/locales/br.json +++ b/app/javascript/mastodon/locales/br.json @@ -161,7 +161,6 @@ "compose_form.poll.switch_to_single": "Kemmañ ar sontadeg evit aotren un dibab hepken", "compose_form.poll.type": "Neuz", "compose_form.publish": "Embann", - "compose_form.publish_form": "Embann", "compose_form.reply": "Respont", "compose_form.save_changes": "Hizivadur", "compose_form.spoiler.marked": "Kuzhet eo an destenn a-dreñv ur c'hemenn", @@ -371,6 +370,8 @@ "load_pending": "{count, plural, one {# dra nevez} other {# dra nevez}}", "loading_indicator.label": "O kargañ…", "navigation_bar.about": "Diwar-benn", + "navigation_bar.account_settings": "Ger-tremen ha surentez", + "navigation_bar.automated_deletion": "Dilemel an embannadenn ent-emgefreek", "navigation_bar.blocks": "Implijer·ezed·ien berzet", "navigation_bar.bookmarks": "Sinedoù", "navigation_bar.community_timeline": "Red-amzer lec'hel", @@ -384,8 +385,10 @@ "navigation_bar.follow_requests": "Pedadoù heuliañ", "navigation_bar.followed_tags": "Hashtagoù o heuliañ", "navigation_bar.follows_and_followers": "Heuliadennoù ha heulier·ezed·ien", + "navigation_bar.import_export": "Enporzhiañ hag ezporzhiañ", "navigation_bar.lists": "Listennoù", "navigation_bar.logout": "Digennaskañ", + "navigation_bar.more": "Muioc'h", "navigation_bar.mutes": "Implijer·ion·ezed kuzhet", "navigation_bar.personal": "Personel", "navigation_bar.pins": "Toudoù spilhennet", @@ -616,6 +619,8 @@ "subscribed_languages.target": "Cheñch ar yezhoù koumanantet evit {target}", "tabs_bar.home": "Degemer", "tabs_bar.notifications": "Kemennoù", + "tabs_bar.publish": "Embannadenn nevez", + "tabs_bar.search": "Klask", "terms_of_service.title": "Divizoù implijout", "time_remaining.days": "{number, plural,one {# devezh} other {# a zevezh}} a chom", "time_remaining.hours": "{number, plural, one {# eurvezh} other{# eurvezh}} a chom", diff --git a/app/javascript/mastodon/locales/bs.json b/app/javascript/mastodon/locales/bs.json index 9fbed54565..1ff8d19b40 100644 --- a/app/javascript/mastodon/locales/bs.json +++ b/app/javascript/mastodon/locales/bs.json @@ -7,7 +7,6 @@ "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.", "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.", "compose_form.placeholder": "What is on your mind?", - "compose_form.publish_form": "Publish", "compose_form.spoiler.marked": "Text is hidden behind warning", "compose_form.spoiler.unmarked": "Text is not hidden", "confirmations.delete.message": "Are you sure you want to delete this status?", diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json index 9d1fdbabae..d99feb839f 100644 --- a/app/javascript/mastodon/locales/ca.json +++ b/app/javascript/mastodon/locales/ca.json @@ -207,7 +207,6 @@ "compose_form.poll.switch_to_single": "Canvia l’enquesta per a permetre una única opció", "compose_form.poll.type": "Estil", "compose_form.publish": "Publica", - "compose_form.publish_form": "Nou tut", "compose_form.reply": "Respon", "compose_form.save_changes": "Actualitza", "compose_form.spoiler.marked": "Elimina l'avís de contingut", @@ -552,8 +551,10 @@ "mute_modal.you_wont_see_mentions": "No veureu publicacions que els esmentin.", "mute_modal.you_wont_see_posts": "Encara poden veure les vostres publicacions, però no veureu les seves.", "navigation_bar.about": "Quant a", + "navigation_bar.account_settings": "Contrasenya i seguretat", "navigation_bar.administration": "Administració", "navigation_bar.advanced_interface": "Obre en la interfície web avançada", + "navigation_bar.automated_deletion": "Esborrat automàtic de publicacions", "navigation_bar.blocks": "Usuaris blocats", "navigation_bar.bookmarks": "Marcadors", "navigation_bar.community_timeline": "Línia de temps local", @@ -567,17 +568,22 @@ "navigation_bar.follow_requests": "Sol·licituds de seguiment", "navigation_bar.followed_tags": "Etiquetes seguides", "navigation_bar.follows_and_followers": "Seguint i seguidors", + "navigation_bar.import_export": "Importació i exportació", "navigation_bar.lists": "Llistes", "navigation_bar.logout": "Tanca la sessió", "navigation_bar.moderation": "Moderació", + "navigation_bar.more": "Més", "navigation_bar.mutes": "Usuaris silenciats", "navigation_bar.opened_in_classic_interface": "Els tuts, comptes i altres pàgines especifiques s'obren per defecte en la interfície web clàssica.", "navigation_bar.personal": "Personal", "navigation_bar.pins": "Tuts fixats", "navigation_bar.preferences": "Preferències", + "navigation_bar.privacy_and_reach": "Privacitat i abast", "navigation_bar.public_timeline": "Línia de temps federada", "navigation_bar.search": "Cerca", "navigation_bar.security": "Seguretat", + "navigation_panel.collapse_lists": "Tanca el menú", + "navigation_panel.expand_lists": "Expandeix el menú", "not_signed_in_indicator.not_signed_in": "Cal que iniciïs la sessió per a accedir a aquest recurs.", "notification.admin.report": "{name} ha reportat {target}", "notification.admin.report_account": "{name} ha reportat {count, plural, one {una publicació} other {# publicacions}} de {target} per {category}", @@ -906,7 +912,10 @@ "subscribed_languages.save": "Desa els canvis", "subscribed_languages.target": "Canvia les llengües subscrites per a {target}", "tabs_bar.home": "Inici", + "tabs_bar.menu": "Menú", "tabs_bar.notifications": "Notificacions", + "tabs_bar.publish": "Nova Publicació", + "tabs_bar.search": "Cerca", "terms_of_service.effective_as_of": "En vigor a partir de {date}", "terms_of_service.title": "Condicions de servei", "terms_of_service.upcoming_changes_on": "Propers canvis el {date}", diff --git a/app/javascript/mastodon/locales/ckb.json b/app/javascript/mastodon/locales/ckb.json index 28308ac833..1d79f61c5a 100644 --- a/app/javascript/mastodon/locales/ckb.json +++ b/app/javascript/mastodon/locales/ckb.json @@ -143,7 +143,6 @@ "compose_form.poll.switch_to_single": "گۆڕینی ڕاپرسی بۆ ڕێگەدان بە تاکە هەڵبژاردنێک", "compose_form.poll.type": "ستایڵ", "compose_form.publish": "پۆست", - "compose_form.publish_form": "بڵاوی بکەوە", "compose_form.reply": "وەڵام", "compose_form.save_changes": "نوێکردنەوە", "compose_form.spoiler.marked": "دەق لە پشت ئاگاداریدا شاراوەتەوە", diff --git a/app/javascript/mastodon/locales/co.json b/app/javascript/mastodon/locales/co.json index 38984cd4b5..0e5ba3694e 100644 --- a/app/javascript/mastodon/locales/co.json +++ b/app/javascript/mastodon/locales/co.json @@ -75,7 +75,6 @@ "compose_form.poll.duration": "Durata di u scandagliu", "compose_form.poll.switch_to_multiple": "Cambià u scandagliu per accittà parechje scelte", "compose_form.poll.switch_to_single": "Cambià u scandagliu per ùn accittà ch'una scelta", - "compose_form.publish_form": "Publish", "compose_form.spoiler.marked": "Testu piattatu daret'à un'avertimentu", "compose_form.spoiler.unmarked": "Testu micca piattatu", "confirmation_modal.cancel": "Annullà", diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json index cfc2591276..1bbc3d3d52 100644 --- a/app/javascript/mastodon/locales/cs.json +++ b/app/javascript/mastodon/locales/cs.json @@ -207,7 +207,6 @@ "compose_form.poll.switch_to_single": "Povolit u ankety výběr pouze jedné volby", "compose_form.poll.type": "Styl", "compose_form.publish": "Odeslat", - "compose_form.publish_form": "Zveřejnit", "compose_form.reply": "Odpovědět", "compose_form.save_changes": "Aktualizovat", "compose_form.spoiler.marked": "Odebrat varování o obsahu", @@ -553,8 +552,10 @@ "mute_modal.you_wont_see_mentions": "Neuvidíte příspěvky, které je zmiňují.", "mute_modal.you_wont_see_posts": "Stále budou moci vidět vaše příspěvky, ale vy jejich neuvidíte.", "navigation_bar.about": "O aplikaci", + "navigation_bar.account_settings": "Heslo a zabezpečení", "navigation_bar.administration": "Administrace", "navigation_bar.advanced_interface": "Otevřít v pokročilém webovém rozhraní", + "navigation_bar.automated_deletion": "Automatické mazání příspěvků", "navigation_bar.blocks": "Blokovaní uživatelé", "navigation_bar.bookmarks": "Záložky", "navigation_bar.community_timeline": "Místní časová osa", @@ -568,17 +569,22 @@ "navigation_bar.follow_requests": "Žádosti o sledování", "navigation_bar.followed_tags": "Sledované hashtagy", "navigation_bar.follows_and_followers": "Sledovaní a sledující", + "navigation_bar.import_export": "Import a export", "navigation_bar.lists": "Seznamy", "navigation_bar.logout": "Odhlásit se", "navigation_bar.moderation": "Moderace", + "navigation_bar.more": "Více", "navigation_bar.mutes": "Skrytí uživatelé", "navigation_bar.opened_in_classic_interface": "Příspěvky, účty a další specifické stránky jsou ve výchozím nastavení otevřeny v klasickém webovém rozhraní.", "navigation_bar.personal": "Osobní", "navigation_bar.pins": "Připnuté příspěvky", "navigation_bar.preferences": "Předvolby", + "navigation_bar.privacy_and_reach": "Soukromí a dosah", "navigation_bar.public_timeline": "Federovaná časová osa", "navigation_bar.search": "Hledat", "navigation_bar.security": "Zabezpečení", + "navigation_panel.collapse_lists": "Sbalit menu", + "navigation_panel.expand_lists": "Rozbalit menu", "not_signed_in_indicator.not_signed_in": "Pro přístup k tomuto zdroji se musíte přihlásit.", "notification.admin.report": "Uživatel {name} nahlásil {target}", "notification.admin.report_account": "{name} nahlásil {count, plural, one {jeden příspěvek} few {# příspěvky} many {# příspěvků} other {# příspěvků}} od {target} za {category}", @@ -712,7 +718,7 @@ "onboarding.profile.title": "Nastavení profilu", "onboarding.profile.upload_avatar": "Nahrát profilový obrázek", "onboarding.profile.upload_header": "Nahrát hlavičku profilu", - "password_confirmation.exceeds_maxlength": "Potvrzení hesla překračuje maximální povolenou délku hesla", + "password_confirmation.exceeds_maxlength": "Potvrzení hesla překračuje maximální povolenou délku", "password_confirmation.mismatching": "Zadaná hesla se neshodují", "picture_in_picture.restore": "Vrátit zpět", "poll.closed": "Uzavřeno", @@ -815,7 +821,7 @@ "search.search_or_paste": "Hledat nebo vložit URL", "search_popout.full_text_search_disabled_message": "Nedostupné na {domain}.", "search_popout.full_text_search_logged_out_message": "Dostupné pouze po přihlášení.", - "search_popout.language_code": "Kód jazyka podle ISO", + "search_popout.language_code": "ISO kód jazyka", "search_popout.options": "Možnosti hledání", "search_popout.quick_actions": "Rychlé akce", "search_popout.recent": "Nedávná vyhledávání", @@ -907,7 +913,10 @@ "subscribed_languages.save": "Uložit změny", "subscribed_languages.target": "Změnit odebírané jazyky na {target}", "tabs_bar.home": "Domů", + "tabs_bar.menu": "Menu", "tabs_bar.notifications": "Oznámení", + "tabs_bar.publish": "Nový příspěvek", + "tabs_bar.search": "Vyhledávání", "terms_of_service.effective_as_of": "Platné od {date}", "terms_of_service.title": "Podmínky služby", "terms_of_service.upcoming_changes_on": "Nadcházející změny v {date}", diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json index 769eecb1d4..333f91a300 100644 --- a/app/javascript/mastodon/locales/cy.json +++ b/app/javascript/mastodon/locales/cy.json @@ -207,7 +207,6 @@ "compose_form.poll.switch_to_single": "Newid pleidlais i gyfyngu i un dewis", "compose_form.poll.type": "Arddull", "compose_form.publish": "Postio", - "compose_form.publish_form": "Postiad newydd", "compose_form.reply": "Ymateb", "compose_form.save_changes": "Diweddaru", "compose_form.spoiler.marked": "Dileu rhybudd cynnwys", diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json index 6053408b9b..a1f3ec3122 100644 --- a/app/javascript/mastodon/locales/da.json +++ b/app/javascript/mastodon/locales/da.json @@ -207,7 +207,6 @@ "compose_form.poll.switch_to_single": "Ændr afstemning til enkeltvalgstype", "compose_form.poll.type": "Stil", "compose_form.publish": "Indsend", - "compose_form.publish_form": "Publicér", "compose_form.reply": "Svar", "compose_form.save_changes": "Opdatér", "compose_form.spoiler.marked": "Fjern emnefelt", diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json index 695ed571da..6a14bcfc80 100644 --- a/app/javascript/mastodon/locales/de.json +++ b/app/javascript/mastodon/locales/de.json @@ -207,7 +207,6 @@ "compose_form.poll.switch_to_single": "Nur Einfachauswahl erlauben", "compose_form.poll.type": "Art", "compose_form.publish": "Veröffentlichen", - "compose_form.publish_form": "Neuer Beitrag", "compose_form.reply": "Antworten", "compose_form.save_changes": "Aktualisieren", "compose_form.spoiler.marked": "Inhaltswarnung entfernen", @@ -553,8 +552,10 @@ "mute_modal.you_wont_see_mentions": "Du wirst keine Beiträge sehen, die dieses Profil erwähnen.", "mute_modal.you_wont_see_posts": "Deine Beiträge können von diesem stummgeschalteten Profil weiterhin gesehen werden, aber du wirst dessen Beiträge nicht mehr sehen.", "navigation_bar.about": "Über", + "navigation_bar.account_settings": "Passwort und Sicherheit", "navigation_bar.administration": "Administration", "navigation_bar.advanced_interface": "Im erweiterten Webinterface öffnen", + "navigation_bar.automated_deletion": "Automatisiertes Löschen", "navigation_bar.blocks": "Blockierte Profile", "navigation_bar.bookmarks": "Lesezeichen", "navigation_bar.community_timeline": "Lokale Timeline", @@ -568,17 +569,22 @@ "navigation_bar.follow_requests": "Follower-Anfragen", "navigation_bar.followed_tags": "Gefolgte Hashtags", "navigation_bar.follows_and_followers": "Follower und Folge ich", + "navigation_bar.import_export": "Importieren und exportieren", "navigation_bar.lists": "Listen", "navigation_bar.logout": "Abmelden", "navigation_bar.moderation": "Moderation", + "navigation_bar.more": "Mehr", "navigation_bar.mutes": "Stummgeschaltete Profile", "navigation_bar.opened_in_classic_interface": "Beiträge, Konten und andere bestimmte Seiten werden standardmäßig im klassischen Webinterface geöffnet.", "navigation_bar.personal": "Persönlich", "navigation_bar.pins": "Angeheftete Beiträge", "navigation_bar.preferences": "Einstellungen", + "navigation_bar.privacy_and_reach": "Datenschutz und Reichweite", "navigation_bar.public_timeline": "Föderierte Timeline", "navigation_bar.search": "Suche", "navigation_bar.security": "Sicherheit", + "navigation_panel.collapse_lists": "Listen-Menü schließen", + "navigation_panel.expand_lists": "Listen-Menü öffnen", "not_signed_in_indicator.not_signed_in": "Du musst dich anmelden, um auf diesen Inhalt zugreifen zu können.", "notification.admin.report": "{name} meldete {target}", "notification.admin.report_account": "{name} meldete {count, plural, one {einen Beitrag} other {# Beiträge}} von {target} wegen {category}", @@ -907,7 +913,10 @@ "subscribed_languages.save": "Änderungen speichern", "subscribed_languages.target": "Abonnierte Sprachen für {target} ändern", "tabs_bar.home": "Startseite", + "tabs_bar.menu": "Menü", "tabs_bar.notifications": "Benachrichtigungen", + "tabs_bar.publish": "Neuer Beitrag", + "tabs_bar.search": "Suche", "terms_of_service.effective_as_of": "Gültig ab {date}", "terms_of_service.title": "Nutzungsbedingungen", "terms_of_service.upcoming_changes_on": "Anstehende Änderungen am {date}", diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json index af4cc77dce..4538a47697 100644 --- a/app/javascript/mastodon/locales/el.json +++ b/app/javascript/mastodon/locales/el.json @@ -193,7 +193,6 @@ "compose_form.poll.switch_to_single": "Ενημέρωση δημοσκόπησης με μοναδική επιλογή", "compose_form.poll.type": "Στυλ", "compose_form.publish": "Ανάρτηση", - "compose_form.publish_form": "Δημοσίευση", "compose_form.reply": "Απάντηση", "compose_form.save_changes": "Ενημέρωση", "compose_form.spoiler.marked": "Αφαίρεση προειδοποίηση περιεχομένου", diff --git a/app/javascript/mastodon/locales/en-GB.json b/app/javascript/mastodon/locales/en-GB.json index 5bb855983e..034a9308b2 100644 --- a/app/javascript/mastodon/locales/en-GB.json +++ b/app/javascript/mastodon/locales/en-GB.json @@ -207,7 +207,6 @@ "compose_form.poll.switch_to_single": "Change poll to allow for a single choice", "compose_form.poll.type": "Style", "compose_form.publish": "Post", - "compose_form.publish_form": "New post", "compose_form.reply": "Reply", "compose_form.save_changes": "Update", "compose_form.spoiler.marked": "Remove content warning", diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json index 5d748731d8..aefa9deebc 100644 --- a/app/javascript/mastodon/locales/eo.json +++ b/app/javascript/mastodon/locales/eo.json @@ -201,7 +201,6 @@ "compose_form.poll.switch_to_single": "Ŝanĝi la balotenketon por permesi unu solan elekton", "compose_form.poll.type": "Stilo", "compose_form.publish": "Afiŝi", - "compose_form.publish_form": "Afiŝi", "compose_form.reply": "Respondi", "compose_form.save_changes": "Ĝisdatigi", "compose_form.spoiler.marked": "Forigi la averton de enhavo", diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json index 4c2496ec8c..2801115790 100644 --- a/app/javascript/mastodon/locales/es-AR.json +++ b/app/javascript/mastodon/locales/es-AR.json @@ -207,7 +207,6 @@ "compose_form.poll.switch_to_single": "Cambiar encuesta para permitir una sola opción", "compose_form.poll.type": "Estilo", "compose_form.publish": "Enviar", - "compose_form.publish_form": "Nuevo mensaje", "compose_form.reply": "Responder", "compose_form.save_changes": "Actualizar", "compose_form.spoiler.marked": "Quitar advertencia de contenido", @@ -553,8 +552,10 @@ "mute_modal.you_wont_see_mentions": "No verás mensajes que los mencionen.", "mute_modal.you_wont_see_posts": "Todavía pueden ver tus mensajes, pero vos no verás los suyos.", "navigation_bar.about": "Información", + "navigation_bar.account_settings": "Contraseña y seguridad", "navigation_bar.administration": "Administración", "navigation_bar.advanced_interface": "Abrir en interface web avanzada", + "navigation_bar.automated_deletion": "Eliminación auto. de mensajes", "navigation_bar.blocks": "Usuarios bloqueados", "navigation_bar.bookmarks": "Marcadores", "navigation_bar.community_timeline": "Línea temporal local", @@ -568,17 +569,22 @@ "navigation_bar.follow_requests": "Solicitudes de seguimiento", "navigation_bar.followed_tags": "Etiquetas seguidas", "navigation_bar.follows_and_followers": "Cuentas seguidas y seguidores", + "navigation_bar.import_export": "Importación y exportación", "navigation_bar.lists": "Listas", "navigation_bar.logout": "Cerrar sesión", "navigation_bar.moderation": "Moderación", + "navigation_bar.more": "Más", "navigation_bar.mutes": "Usuarios silenciados", "navigation_bar.opened_in_classic_interface": "Los mensajes, las cuentas y otras páginas específicas se abren predeterminadamente en la interface web clásica.", "navigation_bar.personal": "Personal", "navigation_bar.pins": "Mensajes fijados", "navigation_bar.preferences": "Configuración", + "navigation_bar.privacy_and_reach": "Privacidad y alcance", "navigation_bar.public_timeline": "Línea temporal federada", "navigation_bar.search": "Buscar", "navigation_bar.security": "Seguridad", + "navigation_panel.collapse_lists": "Colapsar menú de lista", + "navigation_panel.expand_lists": "Expandir menú de lista", "not_signed_in_indicator.not_signed_in": "Necesitás iniciar sesión para acceder a este recurso.", "notification.admin.report": "{name} denunció a {target}", "notification.admin.report_account": "{name} denunció {count, plural, one {un mensaje} other {# mensajes}} de {target} por {category}", @@ -907,7 +913,10 @@ "subscribed_languages.save": "Guardar cambios", "subscribed_languages.target": "Cambiar idiomas suscritos para {target}", "tabs_bar.home": "Principal", + "tabs_bar.menu": "Menú", "tabs_bar.notifications": "Notificaciones", + "tabs_bar.publish": "Nuevo mensaje", + "tabs_bar.search": "Buscar", "terms_of_service.effective_as_of": "Efectivo a partir de {date}", "terms_of_service.title": "Términos del servicio", "terms_of_service.upcoming_changes_on": "Próximos cambios el {date}", diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json index f2a8215e89..ba8ec4517b 100644 --- a/app/javascript/mastodon/locales/es-MX.json +++ b/app/javascript/mastodon/locales/es-MX.json @@ -207,7 +207,6 @@ "compose_form.poll.switch_to_single": "Cambiar la encuesta para permitir una única opción", "compose_form.poll.type": "Estilo", "compose_form.publish": "Publicar", - "compose_form.publish_form": "Nueva publicación", "compose_form.reply": "Respuesta", "compose_form.save_changes": "Actualizar", "compose_form.spoiler.marked": "Quitar advertencia de contenido", @@ -553,8 +552,10 @@ "mute_modal.you_wont_see_mentions": "No verás publicaciones que los mencionen.", "mute_modal.you_wont_see_posts": "Todavía pueden ver tus publicaciones, pero tú no verás las de ellos.", "navigation_bar.about": "Acerca de", + "navigation_bar.account_settings": "Contraseña y seguridad", "navigation_bar.administration": "Administración", "navigation_bar.advanced_interface": "Abrir en interfaz web avanzada", + "navigation_bar.automated_deletion": "Eliminación automática de publicaciones", "navigation_bar.blocks": "Usuarios bloqueados", "navigation_bar.bookmarks": "Marcadores", "navigation_bar.community_timeline": "Historia local", @@ -568,17 +569,22 @@ "navigation_bar.follow_requests": "Solicitudes para seguirte", "navigation_bar.followed_tags": "Etiquetas seguidas", "navigation_bar.follows_and_followers": "Siguiendo y seguidores", + "navigation_bar.import_export": "Importar y exportar", "navigation_bar.lists": "Listas", "navigation_bar.logout": "Cerrar sesión", "navigation_bar.moderation": "Moderación", + "navigation_bar.more": "Más", "navigation_bar.mutes": "Usuarios silenciados", "navigation_bar.opened_in_classic_interface": "Publicaciones, cuentas y otras páginas específicas se abren por defecto en la interfaz web clásica.", "navigation_bar.personal": "Personal", "navigation_bar.pins": "Publicaciones fijadas", "navigation_bar.preferences": "Preferencias", + "navigation_bar.privacy_and_reach": "Privacidad y alcance", "navigation_bar.public_timeline": "Historia federada", "navigation_bar.search": "Buscar", "navigation_bar.security": "Seguridad", + "navigation_panel.collapse_lists": "Colapsar menú de lista", + "navigation_panel.expand_lists": "Expandir menú de lista", "not_signed_in_indicator.not_signed_in": "Necesitas iniciar sesión para acceder a este recurso.", "notification.admin.report": "{name} denunció a {target}", "notification.admin.report_account": "{name} reportó {count, plural, one {una publicación} other {# publicaciones}} de {target} por {category}", @@ -907,7 +913,10 @@ "subscribed_languages.save": "Guardar cambios", "subscribed_languages.target": "Cambiar idiomas suscritos para {target}", "tabs_bar.home": "Inicio", + "tabs_bar.menu": "Menú", "tabs_bar.notifications": "Notificaciones", + "tabs_bar.publish": "Nueva Publicación", + "tabs_bar.search": "Buscar", "terms_of_service.effective_as_of": "En vigor a partir del {date}", "terms_of_service.title": "Condiciones del servicio", "terms_of_service.upcoming_changes_on": "Próximos cambios el {date}", diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json index 95914b60dc..6f3ecbe8f4 100644 --- a/app/javascript/mastodon/locales/es.json +++ b/app/javascript/mastodon/locales/es.json @@ -207,7 +207,6 @@ "compose_form.poll.switch_to_single": "Modificar encuesta para permitir una única opción", "compose_form.poll.type": "Estilo", "compose_form.publish": "Publicar", - "compose_form.publish_form": "Publicar", "compose_form.reply": "Responder", "compose_form.save_changes": "Actualizar", "compose_form.spoiler.marked": "Quitar advertencia de contenido", @@ -553,8 +552,10 @@ "mute_modal.you_wont_see_mentions": "No verás mensajes que los mencionen.", "mute_modal.you_wont_see_posts": "Todavía pueden ver tus publicaciones, pero tú no verás las suyas.", "navigation_bar.about": "Acerca de", + "navigation_bar.account_settings": "Contraseña y seguridad", "navigation_bar.administration": "Administración", "navigation_bar.advanced_interface": "Abrir en la interfaz web avanzada", + "navigation_bar.automated_deletion": "Eliminación automática de publicaciones", "navigation_bar.blocks": "Usuarios bloqueados", "navigation_bar.bookmarks": "Marcadores", "navigation_bar.community_timeline": "Cronología local", @@ -568,17 +569,22 @@ "navigation_bar.follow_requests": "Solicitudes para seguirte", "navigation_bar.followed_tags": "Etiquetas seguidas", "navigation_bar.follows_and_followers": "Siguiendo y seguidores", + "navigation_bar.import_export": "Importar y exportar", "navigation_bar.lists": "Listas", "navigation_bar.logout": "Cerrar sesión", "navigation_bar.moderation": "Moderación", + "navigation_bar.more": "Más", "navigation_bar.mutes": "Usuarios silenciados", "navigation_bar.opened_in_classic_interface": "Publicaciones, cuentas y otras páginas específicas se abren por defecto en la interfaz web clásica.", "navigation_bar.personal": "Personal", "navigation_bar.pins": "Publicaciones fijadas", "navigation_bar.preferences": "Preferencias", + "navigation_bar.privacy_and_reach": "Privacidad y alcance", "navigation_bar.public_timeline": "Cronología federada", "navigation_bar.search": "Buscar", "navigation_bar.security": "Seguridad", + "navigation_panel.collapse_lists": "Colapsar menú de lista", + "navigation_panel.expand_lists": "Expandir menú de lista", "not_signed_in_indicator.not_signed_in": "Necesitas iniciar sesión para acceder a este recurso.", "notification.admin.report": "{name} informó {target}", "notification.admin.report_account": "{name} informó de {count, plural, one {una publicación} other {# publicaciones}} de {target} por {category}", @@ -907,7 +913,10 @@ "subscribed_languages.save": "Guardar cambios", "subscribed_languages.target": "Cambiar idiomas suscritos para {target}", "tabs_bar.home": "Inicio", + "tabs_bar.menu": "Menú", "tabs_bar.notifications": "Notificaciones", + "tabs_bar.publish": "Nueva Publicación", + "tabs_bar.search": "Buscar", "terms_of_service.effective_as_of": "En vigor a partir del {date}", "terms_of_service.title": "Términos del servicio", "terms_of_service.upcoming_changes_on": "Próximos cambios el {date}", diff --git a/app/javascript/mastodon/locales/et.json b/app/javascript/mastodon/locales/et.json index fb9673c5ea..d2b29b8067 100644 --- a/app/javascript/mastodon/locales/et.json +++ b/app/javascript/mastodon/locales/et.json @@ -203,7 +203,6 @@ "compose_form.poll.switch_to_single": "Muuda küsitlust ainult ühe valiku lubamiseks", "compose_form.poll.type": "Stiil", "compose_form.publish": "Postita", - "compose_form.publish_form": "Postita", "compose_form.reply": "Vasta", "compose_form.save_changes": "Uuenda", "compose_form.spoiler.marked": "Tekst on hoiatuse taha peidetud", diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json index 2c05e8f639..1ecc9cc107 100644 --- a/app/javascript/mastodon/locales/eu.json +++ b/app/javascript/mastodon/locales/eu.json @@ -180,7 +180,6 @@ "compose_form.poll.switch_to_single": "Aldatu inkesta aukera bakarra onartzeko", "compose_form.poll.type": "Estiloa", "compose_form.publish": "Argitaratu", - "compose_form.publish_form": "Argitaratu", "compose_form.reply": "Erantzun", "compose_form.save_changes": "Eguneratu", "compose_form.spoiler.marked": "Testua abisu batek ezkutatzen du", diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json index 9f9f7aec6b..ea86b820d7 100644 --- a/app/javascript/mastodon/locales/fa.json +++ b/app/javascript/mastodon/locales/fa.json @@ -204,7 +204,6 @@ "compose_form.poll.switch_to_single": "تبدیل به نظرسنجی تک‌گزینه‌ای", "compose_form.poll.type": "سبک", "compose_form.publish": "فرستادن", - "compose_form.publish_form": "انتشار", "compose_form.reply": "پاسخ", "compose_form.save_changes": "به‌روز رسانی", "compose_form.spoiler.marked": "برداشتن هشدار محتوا", diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json index 2823ffd09d..209b8a2543 100644 --- a/app/javascript/mastodon/locales/fi.json +++ b/app/javascript/mastodon/locales/fi.json @@ -207,7 +207,6 @@ "compose_form.poll.switch_to_single": "Muuta äänestys yksittäisvalinnaksi", "compose_form.poll.type": "Tyyli", "compose_form.publish": "Julkaise", - "compose_form.publish_form": "Uusi julkaisu", "compose_form.reply": "Vastaa", "compose_form.save_changes": "Päivitä", "compose_form.spoiler.marked": "Poista sisältövaroitus", diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json index d583ee264f..b7e91c13cf 100644 --- a/app/javascript/mastodon/locales/fo.json +++ b/app/javascript/mastodon/locales/fo.json @@ -207,7 +207,6 @@ "compose_form.poll.switch_to_single": "Broyt atkvøðugreiðslu til einstakt svar", "compose_form.poll.type": "Stílur", "compose_form.publish": "Posta", - "compose_form.publish_form": "Legg út", "compose_form.reply": "Svara", "compose_form.save_changes": "Dagfør", "compose_form.spoiler.marked": "Ávaring um at strika innihald", diff --git a/app/javascript/mastodon/locales/fr-CA.json b/app/javascript/mastodon/locales/fr-CA.json index 683dde091f..72429806ad 100644 --- a/app/javascript/mastodon/locales/fr-CA.json +++ b/app/javascript/mastodon/locales/fr-CA.json @@ -193,7 +193,6 @@ "compose_form.poll.switch_to_single": "Changer le sondage pour n'autoriser qu'un seul choix", "compose_form.poll.type": "Style", "compose_form.publish": "Publier", - "compose_form.publish_form": "Publier", "compose_form.reply": "Répondre", "compose_form.save_changes": "Mettre à jour", "compose_form.spoiler.marked": "Enlever l'avertissement de contenu", diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json index eccec003cc..79d0af1e24 100644 --- a/app/javascript/mastodon/locales/fr.json +++ b/app/javascript/mastodon/locales/fr.json @@ -193,7 +193,6 @@ "compose_form.poll.switch_to_single": "Modifier le sondage pour autoriser qu'un seul choix", "compose_form.poll.type": "Style", "compose_form.publish": "Publier", - "compose_form.publish_form": "Nouveau message", "compose_form.reply": "Répondre", "compose_form.save_changes": "Mettre à jour", "compose_form.spoiler.marked": "Enlever l’avertissement de contenu", diff --git a/app/javascript/mastodon/locales/fy.json b/app/javascript/mastodon/locales/fy.json index b93d459c32..43264b96b0 100644 --- a/app/javascript/mastodon/locales/fy.json +++ b/app/javascript/mastodon/locales/fy.json @@ -1,6 +1,7 @@ { "about.blocks": "Moderearre servers", "about.contact": "Kontakt:", + "about.default_locale": "Standert", "about.disclaimer": "Mastodon is frije, iepenboarnesoftware en in hannelsmerk fan Mastodon gGmbH.", "about.domain_blocks.no_reason_available": "Reden net beskikber", "about.domain_blocks.preamble": "Yn it algemien kinne jo mei Mastodon berjochten ûntfange fan, en ynteraksje hawwe mei brûkers fan elke server yn de fediverse. Dit binne de útsûnderingen dy’t op dizze spesifike server jilde.", @@ -8,6 +9,7 @@ "about.domain_blocks.silenced.title": "Beheind", "about.domain_blocks.suspended.explanation": "Der wurde gjin gegevens fan dizze server ferwurke, bewarre of útwiksele, wat ynteraksje of kommunikaasje mei brûkers fan dizze server ûnmooglik makket.", "about.domain_blocks.suspended.title": "Utsteld", + "about.language_label": "Taal", "about.not_available": "Dizze ynformaasje is troch dizze server net iepenbier makke.", "about.powered_by": "Desintralisearre sosjale media, mooglik makke troch {mastodon}", "about.rules": "Serverrigels", @@ -28,7 +30,11 @@ "account.edit_profile": "Profyl bewurkje", "account.enable_notifications": "Jou in melding mear wannear @{name} in berjocht pleatst", "account.endorse": "Op profyl werjaan", + "account.familiar_followers_many": "Folge troch {name1}, {name2} en {othersCount, plural, one {ien oar bekend account} other {# oare bekende accounts}}", + "account.familiar_followers_one": "Folge troch {name1}", + "account.familiar_followers_two": "Folge troch {name1} en {name2}", "account.featured": "Foarsteld", + "account.featured.accounts": "Profilen", "account.featured.hashtags": "Hashtags", "account.featured_tags.last_status_at": "Lêste berjocht op {date}", "account.featured_tags.last_status_never": "Gjin berjochten", @@ -37,6 +43,7 @@ "account.followers": "Folgers", "account.followers.empty": "Noch net ien folget dizze brûker.", "account.followers_counter": "{count, plural, one {{counter} folger} other {{counter} folgers}}", + "account.followers_you_know_counter": "{counter} dy’t jo kinne", "account.following": "Folgjend", "account.following_counter": "{count, plural, one {{counter} folgjend} other {{counter} folgjend}}", "account.follows.empty": "Dizze brûker folget noch net ien.", @@ -200,7 +207,6 @@ "compose_form.poll.switch_to_single": "Enkête wizigje om in inkelde kar ta te stean", "compose_form.poll.type": "Styl", "compose_form.publish": "Toot", - "compose_form.publish_form": "Publisearje", "compose_form.reply": "Reagearje", "compose_form.save_changes": "Bywurkje", "compose_form.spoiler.marked": "Ynhâldswarskôging fuortsmite", @@ -303,6 +309,8 @@ "emoji_button.search_results": "Sykresultaten", "emoji_button.symbols": "Symboalen", "emoji_button.travel": "Reizgje en lokaasjes", + "empty_column.account_featured.me": "Jo hawwe noch neat útljochte. Wisten jo dat jo jo hashtags dy’t jo it meast brûke, en sels de accounts fan dyn freonen fermelde kinne op jo profyl?", + "empty_column.account_featured.other": "{acct} hat noch neat útljochte. Wisten jo dat jo jo hashtags dy’t jo it meast brûke, en sels de accounts fan dyn freonen fermelde kinne op jo profyl?", "empty_column.account_featured_other.unknown": "Dizze account hat noch neat útljochte.", "empty_column.account_hides_collections": "Dizze brûker hat derfoar keazen dizze ynformaasje net beskikber te meitsjen", "empty_column.account_suspended": "Account beskoattele", @@ -336,6 +344,11 @@ "explore.trending_links": "Nijs", "explore.trending_statuses": "Berjochten", "explore.trending_tags": "Hashtags", + "featured_carousel.header": "{count, plural, one {Fêstset berjocht} other {Fêstsette berjochten}}", + "featured_carousel.next": "Folgjende", + "featured_carousel.post": "Berjocht", + "featured_carousel.previous": "Foarige", + "featured_carousel.slide": "{index} fan {total}", "filter_modal.added.context_mismatch_explanation": "Dizze filterkategory is net fan tapassing op de kontekst wêryn jo dit berjocht benadere hawwe. As jo wolle dat it berjocht ek yn dizze kontekst filtere wurdt, moatte jo it filter bewurkje.", "filter_modal.added.context_mismatch_title": "Kontekst komt net oerien!", "filter_modal.added.expired_explanation": "Dizze filterkategory is ferrûn. Jo moatte de ferrindatum wizigje om de kategory tapasse te kinnen.", @@ -402,8 +415,10 @@ "hashtag.counter_by_accounts": "{count, plural, one {{counter} dielnimmer} other {{counter} dielnimmers}}", "hashtag.counter_by_uses": "{count, plural, one {{counter} berjocht} other {{counter} berjochten}}", "hashtag.counter_by_uses_today": "{count, plural, one {{counter} berjocht} other {{counter} berjochten}} hjoed", + "hashtag.feature": "Op profyl útljochtsje", "hashtag.follow": "Hashtag folgje", "hashtag.mute": "#{hashtag} negearje", + "hashtag.unfeature": "Net op profyl útljochtsje", "hashtag.unfollow": "Hashtag ûntfolgje", "hashtags.and_other": "…en {count, plural, one {}other {# mear}}", "hints.profiles.followers_may_be_missing": "Folgers foar dit profyl kinne ûntbrekke.", @@ -414,6 +429,7 @@ "hints.profiles.see_more_posts": "Besjoch mear berjochten op {domain}", "hints.threads.replies_may_be_missing": "Antwurden fan oare servers kinne ûntbrekke.", "hints.threads.see_more": "Besjoch mear reaksjes op {domain}", + "home.column_settings.show_quotes": "Sitaten toane", "home.column_settings.show_reblogs": "Boosts toane", "home.column_settings.show_replies": "Reaksjes toane", "home.hide_announcements": "Meidielingen ferstopje", @@ -854,6 +870,13 @@ "status.mute_conversation": "Petear negearje", "status.open": "Dit berjocht útklappe", "status.pin": "Op profylside fêstsette", + "status.quote_error.filtered": "Ferburgen troch ien fan jo filters", + "status.quote_error.not_found": "Dit berjocht kin net toand wurde.", + "status.quote_error.pending_approval": "Dit berjocht is yn ôfwachting fan goedkarring troch de oarspronklike auteur.", + "status.quote_error.rejected": "Dit berjocht kin net toand wurde, omdat de oarspronklike auteur net tastiet dat it sitearre wurdt.", + "status.quote_error.removed": "Dit berjocht is fuotsmiten troch de auteur.", + "status.quote_error.unauthorized": "Dit berjocht kin net toand wurde, omdat jo net it foech hawwe om it te besjen.", + "status.quote_post_author": "Berjocht fan {name}", "status.read_more": "Mear ynfo", "status.reblog": "Booste", "status.reblog_private": "Boost nei oarspronklike ûntfangers", diff --git a/app/javascript/mastodon/locales/ga.json b/app/javascript/mastodon/locales/ga.json index 9782a5ea24..9520514473 100644 --- a/app/javascript/mastodon/locales/ga.json +++ b/app/javascript/mastodon/locales/ga.json @@ -207,7 +207,6 @@ "compose_form.poll.switch_to_single": "Athraigh suirbhé chun cead a thabhairt do rogha amháin", "compose_form.poll.type": "Stíl", "compose_form.publish": "Postáil", - "compose_form.publish_form": "Post nua", "compose_form.reply": "Freagra", "compose_form.save_changes": "Nuashonrú", "compose_form.spoiler.marked": "Bain rabhadh ábhair", @@ -430,6 +429,7 @@ "hints.profiles.see_more_posts": "Féach ar a thuilleadh postálacha ar {domain}", "hints.threads.replies_may_be_missing": "Seans go bhfuil freagraí ó fhreastalaithe eile in easnamh.", "hints.threads.see_more": "Féach ar a thuilleadh freagraí ar {domain}", + "home.column_settings.show_quotes": "Taispeáin Sleachta", "home.column_settings.show_reblogs": "Taispeáin moltaí", "home.column_settings.show_replies": "Taispeán freagraí", "home.hide_announcements": "Cuir fógraí i bhfolach", diff --git a/app/javascript/mastodon/locales/gd.json b/app/javascript/mastodon/locales/gd.json index 89fad4b5b7..c5294d764a 100644 --- a/app/javascript/mastodon/locales/gd.json +++ b/app/javascript/mastodon/locales/gd.json @@ -207,7 +207,6 @@ "compose_form.poll.switch_to_single": "Atharraich an cunntas-bheachd gus nach gabh ach aon roghainn a thaghadh", "compose_form.poll.type": "Stoidhle", "compose_form.publish": "Postaich", - "compose_form.publish_form": "Post ùr", "compose_form.reply": "Freagair", "compose_form.save_changes": "Ùraich", "compose_form.spoiler.marked": "Thoir air falbh an rabhadh susbainte", diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json index 6a70c8b750..1430d2de78 100644 --- a/app/javascript/mastodon/locales/gl.json +++ b/app/javascript/mastodon/locales/gl.json @@ -207,7 +207,6 @@ "compose_form.poll.switch_to_single": "Mudar a enquisa para permitir unha soa opción", "compose_form.poll.type": "Estilo", "compose_form.publish": "Publicar", - "compose_form.publish_form": "Publicar", "compose_form.reply": "Responder", "compose_form.save_changes": "Actualizar", "compose_form.spoiler.marked": "Retirar o aviso sobre o contido", diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json index c3b549033a..08caf41ec6 100644 --- a/app/javascript/mastodon/locales/he.json +++ b/app/javascript/mastodon/locales/he.json @@ -207,7 +207,6 @@ "compose_form.poll.switch_to_single": "אפשרו בחירה בודדת בסקר", "compose_form.poll.type": "סוג משאל", "compose_form.publish": "הודעה", - "compose_form.publish_form": "לפרסם", "compose_form.reply": "תגובה", "compose_form.save_changes": "עדכון", "compose_form.spoiler.marked": "הסר אזהרת תוכן", @@ -579,6 +578,8 @@ "navigation_bar.public_timeline": "פיד כללי (כל השרתים)", "navigation_bar.search": "חיפוש", "navigation_bar.security": "אבטחה", + "navigation_panel.collapse_lists": "קיפול תפריט רשימות", + "navigation_panel.expand_lists": "פתיחת תפריט רשימות", "not_signed_in_indicator.not_signed_in": "יש להיות מאומת כדי לגשת למשאב זה.", "notification.admin.report": "{name} דיווח.ה על {target}", "notification.admin.report_account": "{name} דווחו על {count, plural, one {הודעה אחת} two {הודעותיים} many {# הודעות} other {# הודעות}} מאת {target} בגין {category}", @@ -907,7 +908,10 @@ "subscribed_languages.save": "שמירת שינויים", "subscribed_languages.target": "שינוי רישום שפה עבור {target}", "tabs_bar.home": "פיד הבית", + "tabs_bar.menu": "תפריט", "tabs_bar.notifications": "התראות", + "tabs_bar.publish": "הודעה חדשה", + "tabs_bar.search": "חיפוש", "terms_of_service.effective_as_of": "בתוקף החל מתאריך {date}", "terms_of_service.title": "תנאי השירות", "terms_of_service.upcoming_changes_on": "שינויים עתידיים שיחולו ביום {date}", diff --git a/app/javascript/mastodon/locales/hi.json b/app/javascript/mastodon/locales/hi.json index bd5042a44c..ce686e700c 100644 --- a/app/javascript/mastodon/locales/hi.json +++ b/app/javascript/mastodon/locales/hi.json @@ -151,7 +151,6 @@ "compose_form.poll.switch_to_single": "एक ही विकल्प के लिए अनुमति देने के लिए पोल बदलें", "compose_form.poll.type": "स्टाइल", "compose_form.publish": "पोस्ट करें", - "compose_form.publish_form": "पब्लिश", "compose_form.reply": "जवाब दें", "compose_form.save_changes": "अपडेट करें", "compose_form.spoiler.marked": "चेतावनी के पीछे टेक्स्ट छिपा है", diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json index 531aba689b..01db2f5b76 100644 --- a/app/javascript/mastodon/locales/hr.json +++ b/app/javascript/mastodon/locales/hr.json @@ -133,7 +133,6 @@ "compose_form.poll.duration": "Trajanje ankete", "compose_form.poll.switch_to_multiple": "Omogući višestruki odabir opcija ankete", "compose_form.poll.switch_to_single": "Omogući odabir samo jedne opcije ankete", - "compose_form.publish_form": "Objavi", "compose_form.spoiler.marked": "Tekst je skriven iza upozorenja", "compose_form.spoiler.unmarked": "Tekst nije skriven", "confirmation_modal.cancel": "Otkaži", diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json index f7f2fce2a0..21118053e2 100644 --- a/app/javascript/mastodon/locales/hu.json +++ b/app/javascript/mastodon/locales/hu.json @@ -207,7 +207,6 @@ "compose_form.poll.switch_to_single": "Szavazás megváltoztatása egyetlen választásosra", "compose_form.poll.type": "Stílus", "compose_form.publish": "Közzététel", - "compose_form.publish_form": "Új bejegyzés", "compose_form.reply": "Válasz", "compose_form.save_changes": "Frissítés", "compose_form.spoiler.marked": "Tartalmi figyelmeztetés eltávolítása", @@ -430,6 +429,7 @@ "hints.profiles.see_more_posts": "További bejegyzések megtekintése itt: {domain}", "hints.threads.replies_may_be_missing": "A más kiszolgálókról érkező válaszok lehet, hogy hiányoznak.", "hints.threads.see_more": "További válaszok megtekintése itt: {domain}", + "home.column_settings.show_quotes": "Idézetek megjelenítése", "home.column_settings.show_reblogs": "Megtolások megjelenítése", "home.column_settings.show_replies": "Válaszok megjelenítése", "home.hide_announcements": "Közlemények elrejtése", @@ -578,6 +578,8 @@ "navigation_bar.public_timeline": "Föderációs idővonal", "navigation_bar.search": "Keresés", "navigation_bar.security": "Biztonság", + "navigation_panel.collapse_lists": "Listamenü összecsukása", + "navigation_panel.expand_lists": "Listamenü kibontása", "not_signed_in_indicator.not_signed_in": "Az erőforrás eléréséhez be kell jelentkezned.", "notification.admin.report": "{name} jelentette: {target}", "notification.admin.report_account": "{name} jelentett {count, plural, one {egy bejegyzést} other {# bejegyzést}} itt: {target}, ezért: {category}", @@ -906,7 +908,10 @@ "subscribed_languages.save": "Változások mentése", "subscribed_languages.target": "Feliratkozott nyelvek módosítása {target} esetében", "tabs_bar.home": "Kezdőlap", + "tabs_bar.menu": "Menü", "tabs_bar.notifications": "Értesítések", + "tabs_bar.publish": "Új bejegyzés", + "tabs_bar.search": "Keresés", "terms_of_service.effective_as_of": "Hatálybalépés dátuma: {date}", "terms_of_service.title": "Felhasználási feltételek", "terms_of_service.upcoming_changes_on": "Érkező változások: {date}", diff --git a/app/javascript/mastodon/locales/hy.json b/app/javascript/mastodon/locales/hy.json index c7c68ff5b6..bfc748a3a1 100644 --- a/app/javascript/mastodon/locales/hy.json +++ b/app/javascript/mastodon/locales/hy.json @@ -112,7 +112,6 @@ "compose_form.poll.duration": "Հարցման տեւողութիւնը", "compose_form.poll.switch_to_multiple": "Հարցումը դարձնել բազմակի ընտրութեամբ", "compose_form.poll.switch_to_single": "Հարցումը դարձնել եզակի ընտրութեամբ", - "compose_form.publish_form": "Հրապարակել", "compose_form.spoiler.marked": "Տեքստը թաքցուած է զգուշացման ետեւում", "compose_form.spoiler.unmarked": "Տեքստը թաքցուած չէ", "confirmation_modal.cancel": "Չեղարկել", diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json index 3fdc33d520..7c4902a72d 100644 --- a/app/javascript/mastodon/locales/ia.json +++ b/app/javascript/mastodon/locales/ia.json @@ -204,7 +204,6 @@ "compose_form.poll.switch_to_single": "Cambiar le sondage pro permitter selection singule", "compose_form.poll.type": "Stilo", "compose_form.publish": "Publicar", - "compose_form.publish_form": "Nove message", "compose_form.reply": "Responder", "compose_form.save_changes": "Actualisar", "compose_form.spoiler.marked": "Remover advertimento de contento", diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json index 6f591dd8a4..41c8c8ee11 100644 --- a/app/javascript/mastodon/locales/id.json +++ b/app/javascript/mastodon/locales/id.json @@ -162,7 +162,6 @@ "compose_form.poll.switch_to_single": "Ubah japat menjadi pilihan tunggal", "compose_form.poll.type": "Gaya", "compose_form.publish": "Postingan", - "compose_form.publish_form": "Terbitkan", "compose_form.reply": "Balas", "compose_form.save_changes": "Perbarui", "compose_form.spoiler.marked": "Hapus peringatan tentang isi konten", diff --git a/app/javascript/mastodon/locales/ie.json b/app/javascript/mastodon/locales/ie.json index bc6f9059ed..b76369f2d6 100644 --- a/app/javascript/mastodon/locales/ie.json +++ b/app/javascript/mastodon/locales/ie.json @@ -151,7 +151,6 @@ "compose_form.poll.switch_to_single": "Changea li balotation por permisser un singul selection", "compose_form.poll.type": "Stil", "compose_form.publish": "Postar", - "compose_form.publish_form": "Nov posta", "compose_form.reply": "Responder", "compose_form.save_changes": "Actualisar", "compose_form.spoiler.marked": "Remover avise pri li contenete", diff --git a/app/javascript/mastodon/locales/ig.json b/app/javascript/mastodon/locales/ig.json index 07110813f9..e2d5e10177 100644 --- a/app/javascript/mastodon/locales/ig.json +++ b/app/javascript/mastodon/locales/ig.json @@ -37,7 +37,6 @@ "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.", "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.", "compose_form.placeholder": "What is on your mind?", - "compose_form.publish_form": "Publish", "compose_form.reply": "Zaa", "compose_form.spoiler.marked": "Text is hidden behind warning", "compose_form.spoiler.unmarked": "Text is not hidden", diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json index e8670b01aa..b48a0afaeb 100644 --- a/app/javascript/mastodon/locales/io.json +++ b/app/javascript/mastodon/locales/io.json @@ -190,7 +190,6 @@ "compose_form.poll.switch_to_single": "Chanjez votinquesto por permisar unopla selektato", "compose_form.poll.type": "Stilo", "compose_form.publish": "Posto", - "compose_form.publish_form": "Publish", "compose_form.reply": "Respondez", "compose_form.save_changes": "Aktualigez", "compose_form.spoiler.marked": "Text is hidden behind warning", diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json index 01b575decb..b68a90e8fc 100644 --- a/app/javascript/mastodon/locales/is.json +++ b/app/javascript/mastodon/locales/is.json @@ -207,7 +207,6 @@ "compose_form.poll.switch_to_single": "Breyta könnun svo hægt sé að hafa einn stakan valkost", "compose_form.poll.type": "Stíll", "compose_form.publish": "Birta", - "compose_form.publish_form": "Birta", "compose_form.reply": "Svara", "compose_form.save_changes": "Uppfæra", "compose_form.spoiler.marked": "Fjarlægja aðvörun vegna efnis", @@ -430,6 +429,7 @@ "hints.profiles.see_more_posts": "Sjá fleiri færslur á {domain}", "hints.threads.replies_may_be_missing": "Svör af öðrum netþjónum gæti vantað.", "hints.threads.see_more": "Sjá fleiri svör á {domain}", + "home.column_settings.show_quotes": "Birta tilvitnanir", "home.column_settings.show_reblogs": "Sýna endurbirtingar", "home.column_settings.show_replies": "Birta svör", "home.hide_announcements": "Fela auglýsingar", @@ -552,8 +552,10 @@ "mute_modal.you_wont_see_mentions": "Þú munt ekki sjá færslur sem minnast á viðkomandi aðila.", "mute_modal.you_wont_see_posts": "Viðkomandi geta áfram séð færslurnar þínar en þú munt ekki sjá færslurnar þeirra.", "navigation_bar.about": "Um hugbúnaðinn", + "navigation_bar.account_settings": "Lykilorð og öryggi", "navigation_bar.administration": "Stjórnun", "navigation_bar.advanced_interface": "Opna í ítarlegu vefviðmóti", + "navigation_bar.automated_deletion": "Sjálfvirk eyðing færslna", "navigation_bar.blocks": "Útilokaðir notendur", "navigation_bar.bookmarks": "Bókamerki", "navigation_bar.community_timeline": "Staðvær tímalína", @@ -567,17 +569,22 @@ "navigation_bar.follow_requests": "Beiðnir um að fylgjast með", "navigation_bar.followed_tags": "Myllumerki sem fylgst er með", "navigation_bar.follows_and_followers": "Fylgist með og fylgjendur", + "navigation_bar.import_export": "Inn- og útflutningur", "navigation_bar.lists": "Listar", "navigation_bar.logout": "Útskráning", "navigation_bar.moderation": "Umsjón", + "navigation_bar.more": "Meira", "navigation_bar.mutes": "Þaggaðir notendur", "navigation_bar.opened_in_classic_interface": "Færslur, notendaaðgangar og aðrar sérhæfðar síður eru sjálfgefið opnaðar í klassíska vefviðmótinu.", "navigation_bar.personal": "Einka", "navigation_bar.pins": "Festar færslur", "navigation_bar.preferences": "Kjörstillingar", + "navigation_bar.privacy_and_reach": "Gagnaleynd og útbreiðsla", "navigation_bar.public_timeline": "Sameiginleg tímalína", "navigation_bar.search": "Leita", "navigation_bar.security": "Öryggi", + "navigation_panel.collapse_lists": "Fella saman valmyndalista", + "navigation_panel.expand_lists": "Fletta út valmyndalista", "not_signed_in_indicator.not_signed_in": "Þú þarft að skrá þig inn til að nota þetta tilfang.", "notification.admin.report": "{name} kærði {target}", "notification.admin.report_account": "{name} kærði {count, plural, one {eina færslu} other {# færslur}} frá {target} fyrir {category}", @@ -906,7 +913,10 @@ "subscribed_languages.save": "Vista breytingar", "subscribed_languages.target": "Breyta tungumálum í áskrift fyrir {target}", "tabs_bar.home": "Heim", + "tabs_bar.menu": "Valmynd", "tabs_bar.notifications": "Tilkynningar", + "tabs_bar.publish": "Ný færsla", + "tabs_bar.search": "Leita", "terms_of_service.effective_as_of": "Gildir frá og með {date}", "terms_of_service.title": "Þjónustuskilmálar", "terms_of_service.upcoming_changes_on": "Væntanlegar breytingar þann {date}", diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json index e84fd2fbb6..8389a1f0f3 100644 --- a/app/javascript/mastodon/locales/it.json +++ b/app/javascript/mastodon/locales/it.json @@ -207,7 +207,6 @@ "compose_form.poll.switch_to_single": "Modifica il sondaggio per consentire una singola scelta", "compose_form.poll.type": "Stile", "compose_form.publish": "Pubblica", - "compose_form.publish_form": "Nuovo post", "compose_form.reply": "Rispondi", "compose_form.save_changes": "Aggiorna", "compose_form.spoiler.marked": "Rimuovi l'avviso del contenuto", diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json index de000eab94..2f48a05ef9 100644 --- a/app/javascript/mastodon/locales/ja.json +++ b/app/javascript/mastodon/locales/ja.json @@ -207,7 +207,6 @@ "compose_form.poll.switch_to_single": "単一選択に変更", "compose_form.poll.type": "スタイル", "compose_form.publish": "投稿", - "compose_form.publish_form": "投稿", "compose_form.reply": "返信", "compose_form.save_changes": "更新", "compose_form.spoiler.marked": "本文は警告の後ろに隠されます", diff --git a/app/javascript/mastodon/locales/ka.json b/app/javascript/mastodon/locales/ka.json index 519c778907..166b145cee 100644 --- a/app/javascript/mastodon/locales/ka.json +++ b/app/javascript/mastodon/locales/ka.json @@ -62,7 +62,6 @@ "compose_form.lock_disclaimer": "თქვენი ანგარიში არაა {locked}. ნებისმიერს შეიძლია გამოგყვეთ, რომ იხილოს თქვენი მიმდევრებზე გათვლილი პოსტები.", "compose_form.lock_disclaimer.lock": "ჩაკეტილი", "compose_form.placeholder": "რაზე ფიქრობ?", - "compose_form.publish_form": "Publish", "compose_form.spoiler.marked": "გაფრთხილების უკან ტექსტი დამალულია", "compose_form.spoiler.unmarked": "ტექსტი არაა დამალული", "confirmation_modal.cancel": "გაუქმება", diff --git a/app/javascript/mastodon/locales/kab.json b/app/javascript/mastodon/locales/kab.json index b8dbb2ae10..8359662d95 100644 --- a/app/javascript/mastodon/locales/kab.json +++ b/app/javascript/mastodon/locales/kab.json @@ -151,7 +151,6 @@ "compose_form.poll.single": "Yiwen wefran", "compose_form.poll.type": "Aɣanib", "compose_form.publish": "Suffeɣ", - "compose_form.publish_form": "Tasuffeɣt tamaynut", "compose_form.reply": "Err", "compose_form.save_changes": "Leqqem", "compose_form.spoiler.marked": "Kkes aḍris yettwaffren deffir n walɣu", diff --git a/app/javascript/mastodon/locales/kk.json b/app/javascript/mastodon/locales/kk.json index 2ba9d35e02..1c1c1ec4eb 100644 --- a/app/javascript/mastodon/locales/kk.json +++ b/app/javascript/mastodon/locales/kk.json @@ -128,7 +128,6 @@ "compose_form.poll.duration": "Сауалнама мерзімі", "compose_form.poll.switch_to_multiple": "Бірнеше жауап таңдайтындай қылу", "compose_form.poll.switch_to_single": "Тек бір жауап таңдайтындай қылу", - "compose_form.publish_form": "Publish", "compose_form.spoiler.marked": "Мәтін ескертумен жасырылған", "compose_form.spoiler.unmarked": "Мәтін жасырылмаған", "confirmation_modal.cancel": "Қайтып алу", diff --git a/app/javascript/mastodon/locales/kn.json b/app/javascript/mastodon/locales/kn.json index 85eee0a443..c5b7582bac 100644 --- a/app/javascript/mastodon/locales/kn.json +++ b/app/javascript/mastodon/locales/kn.json @@ -24,7 +24,6 @@ "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.", "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.", "compose_form.placeholder": "What is on your mind?", - "compose_form.publish_form": "Publish", "compose_form.spoiler.marked": "Text is hidden behind warning", "compose_form.spoiler.unmarked": "Text is not hidden", "confirmations.delete.message": "Are you sure you want to delete this status?", diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json index f2e5a2c486..d9ac719707 100644 --- a/app/javascript/mastodon/locales/ko.json +++ b/app/javascript/mastodon/locales/ko.json @@ -207,7 +207,6 @@ "compose_form.poll.switch_to_single": "단일 선택 투표로 변경", "compose_form.poll.type": "형식", "compose_form.publish": "게시", - "compose_form.publish_form": "새 게시물", "compose_form.reply": "답장", "compose_form.save_changes": "수정", "compose_form.spoiler.marked": "열람주의 제거", diff --git a/app/javascript/mastodon/locales/ku.json b/app/javascript/mastodon/locales/ku.json index 9d4f7eaa17..ac99e3958a 100644 --- a/app/javascript/mastodon/locales/ku.json +++ b/app/javascript/mastodon/locales/ku.json @@ -152,7 +152,6 @@ "compose_form.poll.switch_to_single": "Rapirsîyê biguherîne da ku mafê bidî tenê vebijêrkek", "compose_form.poll.type": "Şêwaz", "compose_form.publish": "Şandî", - "compose_form.publish_form": "Biweşîne", "compose_form.reply": "Bersivê bide", "compose_form.save_changes": "Rojane bike", "compose_form.spoiler.marked": "Hişyariya naverokê rake", diff --git a/app/javascript/mastodon/locales/kw.json b/app/javascript/mastodon/locales/kw.json index b0b44f1684..4b1f9c9dfe 100644 --- a/app/javascript/mastodon/locales/kw.json +++ b/app/javascript/mastodon/locales/kw.json @@ -75,7 +75,6 @@ "compose_form.poll.duration": "Duryans sondyans", "compose_form.poll.switch_to_multiple": "Chanjya sondyans dhe asa lies dewis", "compose_form.poll.switch_to_single": "Chanjya sondyans dhe asa unn dewis hepken", - "compose_form.publish_form": "Publish", "compose_form.spoiler.marked": "Dilea gwarnyans dalgh", "compose_form.spoiler.unmarked": "Keworra gwarnyans dalgh", "confirmation_modal.cancel": "Hedhi", diff --git a/app/javascript/mastodon/locales/la.json b/app/javascript/mastodon/locales/la.json index 5e221e614c..ffdf8fa219 100644 --- a/app/javascript/mastodon/locales/la.json +++ b/app/javascript/mastodon/locales/la.json @@ -73,7 +73,6 @@ "compose_form.lock_disclaimer": "Tua ratio non est {locked}. Quisquis te sequi potest ut visum accipiat nuntios tuos tantum pro sectatoribus.", "compose_form.lock_disclaimer.lock": "clausum", "compose_form.placeholder": "What is on your mind?", - "compose_form.publish_form": "Barrire", "compose_form.spoiler.marked": "Text is hidden behind warning", "compose_form.spoiler.unmarked": "Adde praeconium contentūs", "confirmations.block.confirm": "Impedire", diff --git a/app/javascript/mastodon/locales/lad.json b/app/javascript/mastodon/locales/lad.json index 62b27c5dfb..1384a09c5d 100644 --- a/app/javascript/mastodon/locales/lad.json +++ b/app/javascript/mastodon/locales/lad.json @@ -182,7 +182,6 @@ "compose_form.poll.switch_to_single": "Troka anketa para permeter a eskojer solo una opsyon", "compose_form.poll.type": "Estilo", "compose_form.publish": "Publika", - "compose_form.publish_form": "Mueva publikasyon", "compose_form.reply": "Arisponde", "compose_form.save_changes": "Aktualiza", "compose_form.spoiler.marked": "Kita avertensya de kontenido", diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json index 22594fd895..6d9312642c 100644 --- a/app/javascript/mastodon/locales/lt.json +++ b/app/javascript/mastodon/locales/lt.json @@ -201,7 +201,6 @@ "compose_form.poll.switch_to_single": "Keisti apklausą, kad būtų leidžiama pasirinkti vieną pasirinkimą", "compose_form.poll.type": "Stilius", "compose_form.publish": "Skelbti", - "compose_form.publish_form": "Naujas įrašas", "compose_form.reply": "Atsakyti", "compose_form.save_changes": "Atnaujinti", "compose_form.spoiler.marked": "Pašalinti turinio įspėjimą", diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json index 3492d83cfa..d7399843be 100644 --- a/app/javascript/mastodon/locales/lv.json +++ b/app/javascript/mastodon/locales/lv.json @@ -201,7 +201,6 @@ "compose_form.poll.switch_to_single": "Mainīt aptaujas veidu, lai atļautu vienu izvēli", "compose_form.poll.type": "Stils", "compose_form.publish": "Nosūtīt", - "compose_form.publish_form": "Jauns ieraksts", "compose_form.reply": "Atbildēt", "compose_form.save_changes": "Atjaunināt", "compose_form.spoiler.marked": "Noņemt satura brīdinājumu", diff --git a/app/javascript/mastodon/locales/mk.json b/app/javascript/mastodon/locales/mk.json index ec6f302e81..f3a557cbe9 100644 --- a/app/javascript/mastodon/locales/mk.json +++ b/app/javascript/mastodon/locales/mk.json @@ -72,7 +72,6 @@ "compose_form.lock_disclaimer.lock": "заклучен", "compose_form.placeholder": "Што имате на ум?", "compose_form.poll.duration": "Времетрање на анкета", - "compose_form.publish_form": "Publish", "compose_form.spoiler.marked": "Текстот е сокриен зад предупредување", "compose_form.spoiler.unmarked": "Текстот не е сокриен", "confirmation_modal.cancel": "Откажи", diff --git a/app/javascript/mastodon/locales/ml.json b/app/javascript/mastodon/locales/ml.json index 36a0d829c9..e286e6f122 100644 --- a/app/javascript/mastodon/locales/ml.json +++ b/app/javascript/mastodon/locales/ml.json @@ -122,7 +122,6 @@ "compose_form.poll.switch_to_single": "വോട്ടെടുപ്പിൽ ഒരൊറ്റ ചോയ്‌സ്‌ മാത്രം ആക്കുക", "compose_form.poll.type": "രീതി", "compose_form.publish": "അയക്കുക", - "compose_form.publish_form": "Publish", "compose_form.reply": "മറുപടി", "compose_form.save_changes": "കാലാനുസ്യതമാക്കുക", "compose_form.spoiler.marked": "എഴുത്ത് മുന്നറിയിപ്പിനാൽ മറച്ചിരിക്കുന്നു", diff --git a/app/javascript/mastodon/locales/mr.json b/app/javascript/mastodon/locales/mr.json index 5c01c319a4..5bf7c1a2ca 100644 --- a/app/javascript/mastodon/locales/mr.json +++ b/app/javascript/mastodon/locales/mr.json @@ -95,7 +95,6 @@ "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.", "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.", "compose_form.placeholder": "आपल्या मनात काय आहे?", - "compose_form.publish_form": "Publish", "compose_form.spoiler.marked": "Text is hidden behind warning", "compose_form.spoiler.unmarked": "Text is not hidden", "confirmations.delete.confirm": "हटवा", diff --git a/app/javascript/mastodon/locales/ms.json b/app/javascript/mastodon/locales/ms.json index 785d643fc7..c2dd203310 100644 --- a/app/javascript/mastodon/locales/ms.json +++ b/app/javascript/mastodon/locales/ms.json @@ -194,7 +194,6 @@ "compose_form.poll.switch_to_single": "Ubah kepada undian pilihan tunggal", "compose_form.poll.type": "Gaya", "compose_form.publish": "Siaran", - "compose_form.publish_form": "Terbit", "compose_form.reply": "Balas", "compose_form.save_changes": "Kemas kini", "compose_form.spoiler.marked": "Buang amaran kandungan", diff --git a/app/javascript/mastodon/locales/my.json b/app/javascript/mastodon/locales/my.json index 8eb89dac71..18fc14e49b 100644 --- a/app/javascript/mastodon/locales/my.json +++ b/app/javascript/mastodon/locales/my.json @@ -138,7 +138,6 @@ "compose_form.poll.duration": "စစ်တမ်းကြာချိန်", "compose_form.poll.switch_to_multiple": "စစ်တမ်းတွင်တစ်ခုထပ်ပိုသောဆန္ဒပြုချက်လက်ခံမည်", "compose_form.poll.switch_to_single": "စစ်တမ်းတွင် တစ်ခုကိုသာရွေးချယ်ခွင့်ပြုမည်", - "compose_form.publish_form": "ပို့စ်တင်မည်", "compose_form.spoiler.marked": "Text is hidden behind warning", "compose_form.spoiler.unmarked": "Text is not hidden", "confirmation_modal.cancel": "ပယ်ဖျက်မည်", diff --git a/app/javascript/mastodon/locales/nan.json b/app/javascript/mastodon/locales/nan.json index 38f0790499..8c96c90161 100644 --- a/app/javascript/mastodon/locales/nan.json +++ b/app/javascript/mastodon/locales/nan.json @@ -207,7 +207,6 @@ "compose_form.poll.switch_to_single": "Kā投票改做kan-ta通選tsi̍t-ê", "compose_form.poll.type": "投票ê方法", "compose_form.publish": "PO文", - "compose_form.publish_form": "PO出去", "compose_form.reply": "回應", "compose_form.save_changes": "更新", "compose_form.spoiler.marked": "Thâi掉內容警告", diff --git a/app/javascript/mastodon/locales/ne.json b/app/javascript/mastodon/locales/ne.json index 3cc33e95ca..7dd610bc10 100644 --- a/app/javascript/mastodon/locales/ne.json +++ b/app/javascript/mastodon/locales/ne.json @@ -111,7 +111,6 @@ "compose_form.direct_message_warning_learn_more": "थप जान्नुहोस्", "compose_form.placeholder": "तपाईको मनमा के छ?", "compose_form.publish": "पोस्ट गर्नुहोस्", - "compose_form.publish_form": "नयाँ पोस्ट", "compose_form.reply": "जवाफ दिनुहोस्", "compose_form.save_changes": "अपडेट गर्नुहोस्", "confirmation_modal.cancel": "रद्द गर्नुहोस्", diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json index e28506f4fa..ed10403cb7 100644 --- a/app/javascript/mastodon/locales/nl.json +++ b/app/javascript/mastodon/locales/nl.json @@ -207,7 +207,6 @@ "compose_form.poll.switch_to_single": "Peiling wijzigen om een enkele keuze toe te staan", "compose_form.poll.type": "Stijl", "compose_form.publish": "Toot", - "compose_form.publish_form": "Nieuw bericht", "compose_form.reply": "Reageren", "compose_form.save_changes": "Bijwerken", "compose_form.spoiler.marked": "Inhoudswaarschuwing verwijderen", @@ -524,7 +523,7 @@ "lists.done": "Klaar", "lists.edit": "Lijst bewerken", "lists.exclusive": "Leden op je Startpagina verbergen", - "lists.exclusive_hint": "Als iemand op deze lijst staat, verberg deze persoon dan op je starttijdlijn om te voorkomen dat zijn berichten twee keer worden getoond.", + "lists.exclusive_hint": "Als iemand op deze lijst staat, verberg deze persoon dan op je starttijdlijn om te voorkomen dat diens berichten twee keer worden getoond.", "lists.find_users_to_add": "Vind gebruikers om toe te voegen", "lists.list_members_count": "{count, plural, one{# lid} other{# leden}}", "lists.list_name": "Lijstnaam", @@ -553,8 +552,10 @@ "mute_modal.you_wont_see_mentions": "Je ziet geen berichten meer die dit account vermelden.", "mute_modal.you_wont_see_posts": "De persoon kan nog steeds jouw berichten zien, maar diens berichten zie je niet meer.", "navigation_bar.about": "Over", + "navigation_bar.account_settings": "Wachtwoord en beveiliging", "navigation_bar.administration": "Beheer", "navigation_bar.advanced_interface": "In geavanceerde webinterface openen", + "navigation_bar.automated_deletion": "Automatisch berichten verwijderen", "navigation_bar.blocks": "Geblokkeerde gebruikers", "navigation_bar.bookmarks": "Bladwijzers", "navigation_bar.community_timeline": "Lokale tijdlijn", @@ -568,17 +569,22 @@ "navigation_bar.follow_requests": "Volgverzoeken", "navigation_bar.followed_tags": "Gevolgde hashtags", "navigation_bar.follows_and_followers": "Volgers en gevolgde accounts", + "navigation_bar.import_export": "Importeren en exporteren", "navigation_bar.lists": "Lijsten", "navigation_bar.logout": "Uitloggen", "navigation_bar.moderation": "Moderatie", + "navigation_bar.more": "Meer", "navigation_bar.mutes": "Genegeerde gebruikers", "navigation_bar.opened_in_classic_interface": "Berichten, accounts en andere specifieke pagina’s, worden standaard geopend in de klassieke webinterface.", "navigation_bar.personal": "Persoonlijk", "navigation_bar.pins": "Vastgemaakte berichten", "navigation_bar.preferences": "Instellingen", + "navigation_bar.privacy_and_reach": "Privacy en bereik", "navigation_bar.public_timeline": "Globale tijdlijn", "navigation_bar.search": "Zoeken", "navigation_bar.security": "Beveiliging", + "navigation_panel.collapse_lists": "Lijstmenu inklappen", + "navigation_panel.expand_lists": "Lijstmenu uitklappen", "not_signed_in_indicator.not_signed_in": "Je moet inloggen om toegang tot deze informatie te krijgen.", "notification.admin.report": "{name} heeft {target} geapporteerd", "notification.admin.report_account": "{name} rapporteerde {count, plural, one {een bericht} other {# berichten}} van {target} voor {category}", @@ -907,7 +913,10 @@ "subscribed_languages.save": "Wijzigingen opslaan", "subscribed_languages.target": "Getoonde talen voor {target} wijzigen", "tabs_bar.home": "Start", + "tabs_bar.menu": "Menu", "tabs_bar.notifications": "Meldingen", + "tabs_bar.publish": "Nieuw bericht", + "tabs_bar.search": "Zoeken", "terms_of_service.effective_as_of": "Van kracht met ingang van {date}", "terms_of_service.title": "Gebruiksvoorwaarden", "terms_of_service.upcoming_changes_on": "Aankomende wijzigingen op {date}", diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json index 67bf02c1ec..09fdf54851 100644 --- a/app/javascript/mastodon/locales/nn.json +++ b/app/javascript/mastodon/locales/nn.json @@ -207,7 +207,6 @@ "compose_form.poll.switch_to_single": "Endre rundspørjinga til å tillate berre eitt val", "compose_form.poll.type": "Stil", "compose_form.publish": "Publiser", - "compose_form.publish_form": "Legg ut", "compose_form.reply": "Svar", "compose_form.save_changes": "Oppdater", "compose_form.spoiler.marked": "Fjern innhaldsåtvaring", diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json index c9c8e794de..64e98fb668 100644 --- a/app/javascript/mastodon/locales/no.json +++ b/app/javascript/mastodon/locales/no.json @@ -207,7 +207,6 @@ "compose_form.poll.switch_to_single": "Endre avstemning til å tillate ett valg", "compose_form.poll.type": "Stil", "compose_form.publish": "Publiser", - "compose_form.publish_form": "Publiser", "compose_form.reply": "Svar", "compose_form.save_changes": "Oppdater", "compose_form.spoiler.marked": "Fjern innholdsvarsel", diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json index f328f2eef3..9fc5e4a77d 100644 --- a/app/javascript/mastodon/locales/oc.json +++ b/app/javascript/mastodon/locales/oc.json @@ -137,7 +137,6 @@ "compose_form.poll.switch_to_single": "Cambiar lo sondatge per permetre una sola causida", "compose_form.poll.type": "Estil", "compose_form.publish": "Publicar", - "compose_form.publish_form": "Publicar", "compose_form.reply": "Respondre", "compose_form.save_changes": "Actualizar", "compose_form.spoiler.marked": "Lo tèxte es rescondut jos l’avertiment", diff --git a/app/javascript/mastodon/locales/pa.json b/app/javascript/mastodon/locales/pa.json index c4ac296d26..df902fe695 100644 --- a/app/javascript/mastodon/locales/pa.json +++ b/app/javascript/mastodon/locales/pa.json @@ -127,7 +127,6 @@ "compose_form.poll.single": "ਇਕੱਲੀ ਚੋਣ", "compose_form.poll.type": "ਸਟਾਈਲ", "compose_form.publish": "ਪੋਸਟ", - "compose_form.publish_form": "ਨਵੀਂ ਪੋਸਟ", "compose_form.reply": "ਜਵਾਬ ਦਿਓ", "compose_form.save_changes": "ਅੱਪਡੇਟ", "compose_form.spoiler.marked": "ਸਮੱਗਰੀ ਚੇਤਾਵਨੀ ਨੂੰ ਹਟਾਓ", diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json index ecf52b963c..b810674d49 100644 --- a/app/javascript/mastodon/locales/pl.json +++ b/app/javascript/mastodon/locales/pl.json @@ -190,7 +190,6 @@ "compose_form.poll.switch_to_single": "Pozwól na zaznaczenie tylko jednej odpowiedzi", "compose_form.poll.type": "Styl", "compose_form.publish": "Opublikuj", - "compose_form.publish_form": "Nowy wpis", "compose_form.reply": "Skomentuj", "compose_form.save_changes": "Aktualizuj", "compose_form.spoiler.marked": "Usuń ostrzeżenie o treści", diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json index d539607e44..ae95a61163 100644 --- a/app/javascript/mastodon/locales/pt-BR.json +++ b/app/javascript/mastodon/locales/pt-BR.json @@ -205,7 +205,6 @@ "compose_form.poll.switch_to_single": "Opção única", "compose_form.poll.type": "Estilo", "compose_form.publish": "Publicação", - "compose_form.publish_form": "Publicar", "compose_form.reply": "Resposta", "compose_form.save_changes": "Atualização", "compose_form.spoiler.marked": "Com Aviso de Conteúdo", diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json index d3078108d2..aec2fa1c4c 100644 --- a/app/javascript/mastodon/locales/pt-PT.json +++ b/app/javascript/mastodon/locales/pt-PT.json @@ -207,7 +207,6 @@ "compose_form.poll.switch_to_single": "Alterar a sondagem para permitir uma única resposta", "compose_form.poll.type": "Estilo", "compose_form.publish": "Publicar", - "compose_form.publish_form": "Nova publicação", "compose_form.reply": "Responder", "compose_form.save_changes": "Atualizar", "compose_form.spoiler.marked": "Remover aviso de conteúdo", diff --git a/app/javascript/mastodon/locales/ro.json b/app/javascript/mastodon/locales/ro.json index 83d1c4ba5a..82abe23a14 100644 --- a/app/javascript/mastodon/locales/ro.json +++ b/app/javascript/mastodon/locales/ro.json @@ -161,7 +161,6 @@ "compose_form.poll.switch_to_single": "Modifică sondajul pentru a permite o singură opțiune", "compose_form.poll.type": "Stil", "compose_form.publish": "Postare", - "compose_form.publish_form": "Publică", "compose_form.reply": "Răspundeți", "compose_form.save_changes": "Actualizare", "compose_form.spoiler.marked": "Elimină avertismentul privind conținutul", diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json index 9eed6ab1dc..21a7f609e7 100644 --- a/app/javascript/mastodon/locales/ru.json +++ b/app/javascript/mastodon/locales/ru.json @@ -201,7 +201,6 @@ "compose_form.poll.switch_to_single": "Переключить в режим выбора одного варианта ответа", "compose_form.poll.type": "Тип", "compose_form.publish": "Опубликовать", - "compose_form.publish_form": "Опубликовать", "compose_form.reply": "Ответить", "compose_form.save_changes": "Сохранить", "compose_form.spoiler.marked": "Удалить предупреждение о содержании", diff --git a/app/javascript/mastodon/locales/ry.json b/app/javascript/mastodon/locales/ry.json index 79f6093e53..e2f3c2f76c 100644 --- a/app/javascript/mastodon/locales/ry.json +++ b/app/javascript/mastodon/locales/ry.json @@ -140,7 +140,6 @@ "compose_form.poll.switch_to_single": "Змінити убзвідованя обы поволити лишек єден варіант", "compose_form.poll.type": "Стіл", "compose_form.publish": "Публикація", - "compose_form.publish_form": "Нова публикація", "compose_form.reply": "Удповідь", "compose_form.save_changes": "Усокотити", "confirmations.logout.confirm": "Уйти гет", diff --git a/app/javascript/mastodon/locales/sa.json b/app/javascript/mastodon/locales/sa.json index 9c4e0db610..31f1494495 100644 --- a/app/javascript/mastodon/locales/sa.json +++ b/app/javascript/mastodon/locales/sa.json @@ -123,7 +123,6 @@ "compose_form.poll.duration": "मतदान-समयावधिः", "compose_form.poll.switch_to_multiple": "मतदानं परिवर्तयित्वा बहुवैकल्पिकमतदानं क्रियताम्", "compose_form.poll.switch_to_single": "मतदानं परिवर्तयित्वा निर्विकल्पमतदानं क्रियताम्", - "compose_form.publish_form": "प्रकाशीकुरु", "compose_form.spoiler.marked": "प्रच्छान्नाक्षरं विद्यते", "compose_form.spoiler.unmarked": "अप्रच्छन्नाक्षरं विद्यते", "confirmation_modal.cancel": "नश्यताम्", diff --git a/app/javascript/mastodon/locales/sc.json b/app/javascript/mastodon/locales/sc.json index 3b852b5251..bdb79b7027 100644 --- a/app/javascript/mastodon/locales/sc.json +++ b/app/javascript/mastodon/locales/sc.json @@ -157,7 +157,6 @@ "compose_form.poll.switch_to_single": "Muda su sondàgiu pro permìtere un'optzione isceti", "compose_form.poll.type": "Istile", "compose_form.publish": "Pùblica", - "compose_form.publish_form": "Publicatzione noa", "compose_form.reply": "Risponde", "compose_form.save_changes": "Atualiza", "compose_form.spoiler.marked": "Boga avisu de cuntenutu", diff --git a/app/javascript/mastodon/locales/sco.json b/app/javascript/mastodon/locales/sco.json index 0d2b3c5aef..dc6612be5a 100644 --- a/app/javascript/mastodon/locales/sco.json +++ b/app/javascript/mastodon/locales/sco.json @@ -126,7 +126,6 @@ "compose_form.poll.duration": "Poll lenth", "compose_form.poll.switch_to_multiple": "Chynge poll tae alloo multiple chyces", "compose_form.poll.switch_to_single": "Chynge poll tae alloo fir a single chyce", - "compose_form.publish_form": "Publish", "compose_form.spoiler.marked": "Tak aff the content warnin", "compose_form.spoiler.unmarked": "Pit on a content warnin", "compose_form.spoiler_placeholder": "Content warnin (optional)", diff --git a/app/javascript/mastodon/locales/si.json b/app/javascript/mastodon/locales/si.json index 6d519de906..63e3669798 100644 --- a/app/javascript/mastodon/locales/si.json +++ b/app/javascript/mastodon/locales/si.json @@ -204,7 +204,6 @@ "compose_form.poll.switch_to_single": "තනි තේරීමකට මත විමසුම වෙනස් කරන්න", "compose_form.poll.type": "ශෛලිය", "compose_form.publish": "ප්‍රකාශනය", - "compose_form.publish_form": "නව ලිපිය", "compose_form.reply": "පිළිතුරු", "compose_form.save_changes": "යාවත්කාලීන කරන්න", "compose_form.spoiler.marked": "අන්තර්ගත අවවාදය ඉවත් කරන්න", diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json index d69be9ed9c..8042b3ccbe 100644 --- a/app/javascript/mastodon/locales/sk.json +++ b/app/javascript/mastodon/locales/sk.json @@ -183,7 +183,6 @@ "compose_form.poll.switch_to_single": "Zmeniť anketu na jediný povolený výber", "compose_form.poll.type": "Typ", "compose_form.publish": "Uverejniť", - "compose_form.publish_form": "Nový príspevok", "compose_form.reply": "Odpovedať", "compose_form.save_changes": "Aktualizovať", "compose_form.spoiler.marked": "Odstrániť varovanie o obsahu", diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json index 4b67bb1727..8fb97b8e49 100644 --- a/app/javascript/mastodon/locales/sl.json +++ b/app/javascript/mastodon/locales/sl.json @@ -190,7 +190,6 @@ "compose_form.poll.switch_to_single": "Spremenite anketo, da omogočite izbiro ene možnosti", "compose_form.poll.type": "Slog", "compose_form.publish": "Objavi", - "compose_form.publish_form": "Objavi", "compose_form.reply": "Odgovori", "compose_form.save_changes": "Posodobi", "compose_form.spoiler.marked": "Odstrani opozorilo o vsebini", diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json index 92cca9e41d..2b12d5caf0 100644 --- a/app/javascript/mastodon/locales/sq.json +++ b/app/javascript/mastodon/locales/sq.json @@ -202,7 +202,6 @@ "compose_form.poll.switch_to_single": "Ndrysho votimin për të lejuar vetëm një zgjedhje", "compose_form.poll.type": "Stil", "compose_form.publish": "Postim", - "compose_form.publish_form": "Publikoje", "compose_form.reply": "Përgjigjuni", "compose_form.save_changes": "Përditësoje", "compose_form.spoiler.marked": "Hiq sinjalizim lënde", @@ -548,8 +547,10 @@ "mute_modal.you_wont_see_mentions": "S’do të shihni postime ku përmenden.", "mute_modal.you_wont_see_posts": "Ata munden ende të shohin postimet tuaja, por ju s’do të shihni të tyret.", "navigation_bar.about": "Mbi", + "navigation_bar.account_settings": "Fjalëkalim dhe siguri", "navigation_bar.administration": "Administrim", "navigation_bar.advanced_interface": "Hape në ndërfaqe web të thelluar", + "navigation_bar.automated_deletion": "Fshirje e automatizuar postimesh", "navigation_bar.blocks": "Përdorues të bllokuar", "navigation_bar.bookmarks": "Faqerojtës", "navigation_bar.community_timeline": "Rrjedhë kohore vendore", @@ -563,17 +564,22 @@ "navigation_bar.follow_requests": "Kërkesa për ndjekje", "navigation_bar.followed_tags": "Hashtag-ë të ndjekur", "navigation_bar.follows_and_followers": "Ndjekje dhe ndjekës", + "navigation_bar.import_export": "Importim dhe eksportim", "navigation_bar.lists": "Lista", "navigation_bar.logout": "Dalje", "navigation_bar.moderation": "Moderim", + "navigation_bar.more": "Më tepër", "navigation_bar.mutes": "Përdorues të heshtuar", "navigation_bar.opened_in_classic_interface": "Postime, llogari dhe të tjera faqe specifike, si parazgjedhje, hapen në ndërfaqe klasike web.", "navigation_bar.personal": "Personale", "navigation_bar.pins": "Mesazhe të fiksuar", "navigation_bar.preferences": "Parapëlqime", + "navigation_bar.privacy_and_reach": "Privatësi dhe shtrirje", "navigation_bar.public_timeline": "Rrjedhë kohore të federuarash", "navigation_bar.search": "Kërkoni", "navigation_bar.security": "Siguri", + "navigation_panel.collapse_lists": "Palose menunë listë", + "navigation_panel.expand_lists": "Hape menunë listë", "not_signed_in_indicator.not_signed_in": "Që të përdorni këtë burim, lypset të bëni hyrjen.", "notification.admin.report": "{name} raportoi {target}", "notification.admin.report_account": "{name} raportoi për {count, plural, one {një postim} other {# postime}} nga {target} për {category}", @@ -902,7 +908,10 @@ "subscribed_languages.save": "Ruaji ndryshimet", "subscribed_languages.target": "Ndryshoni gjuhë pajtimesh për {target}", "tabs_bar.home": "Kreu", + "tabs_bar.menu": "Menu", "tabs_bar.notifications": "Njoftime", + "tabs_bar.publish": "Postimi i Ri", + "tabs_bar.search": "Kërkim", "terms_of_service.effective_as_of": "Hyn në fuqi që prej {date}", "terms_of_service.title": "Kushte Shërbimi", "terms_of_service.upcoming_changes_on": "Ndryshime të ardhshme më {date}", diff --git a/app/javascript/mastodon/locales/sr-Latn.json b/app/javascript/mastodon/locales/sr-Latn.json index 6346afb6c6..9c82f48a0e 100644 --- a/app/javascript/mastodon/locales/sr-Latn.json +++ b/app/javascript/mastodon/locales/sr-Latn.json @@ -154,7 +154,6 @@ "compose_form.poll.switch_to_single": "Promenite anketu da biste omogućili jedan izbor", "compose_form.poll.type": "Stil", "compose_form.publish": "Objavi", - "compose_form.publish_form": "Nova objava", "compose_form.reply": "Odgovori", "compose_form.save_changes": "Ažuriraj", "compose_form.spoiler.marked": "Ukloni upozorenje o sadržaju", diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json index 1ac43aa3a1..67795eb404 100644 --- a/app/javascript/mastodon/locales/sr.json +++ b/app/javascript/mastodon/locales/sr.json @@ -154,7 +154,6 @@ "compose_form.poll.switch_to_single": "Промените анкету да бисте омогућили један избор", "compose_form.poll.type": "Стил", "compose_form.publish": "Објави", - "compose_form.publish_form": "Нова објава", "compose_form.reply": "Одговори", "compose_form.save_changes": "Ажурирај", "compose_form.spoiler.marked": "Уклони упозорење о садржају", diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json index 5a8d1a693c..b98d041223 100644 --- a/app/javascript/mastodon/locales/sv.json +++ b/app/javascript/mastodon/locales/sv.json @@ -207,7 +207,6 @@ "compose_form.poll.switch_to_single": "Ändra enkät för att tillåta ett enda val", "compose_form.poll.type": "Stil", "compose_form.publish": "Publicera", - "compose_form.publish_form": "Publicera", "compose_form.reply": "Svara", "compose_form.save_changes": "Uppdatera", "compose_form.spoiler.marked": "Texten är dold bakom en varning", diff --git a/app/javascript/mastodon/locales/szl.json b/app/javascript/mastodon/locales/szl.json index 22e4a8cc7a..963bfe302d 100644 --- a/app/javascript/mastodon/locales/szl.json +++ b/app/javascript/mastodon/locales/szl.json @@ -26,7 +26,6 @@ "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.", "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.", "compose_form.placeholder": "What is on your mind?", - "compose_form.publish_form": "Publish", "compose_form.spoiler.marked": "Text is hidden behind warning", "compose_form.spoiler.unmarked": "Text is not hidden", "confirmations.delete.message": "Are you sure you want to delete this status?", diff --git a/app/javascript/mastodon/locales/ta.json b/app/javascript/mastodon/locales/ta.json index ef127ee390..f534ca5813 100644 --- a/app/javascript/mastodon/locales/ta.json +++ b/app/javascript/mastodon/locales/ta.json @@ -115,7 +115,6 @@ "compose_form.poll.duration": "கருத்துக்கணிப்பின் கால அளவு", "compose_form.poll.switch_to_multiple": "பல தேர்வுகளை அனுமதிக்குமாறு மாற்று", "compose_form.poll.switch_to_single": "ஒரே ஒரு தேர்வை மட்டும் அனுமதிக்குமாறு மாற்று", - "compose_form.publish_form": "Publish", "compose_form.spoiler.marked": "எச்சரிக்கையின் பின்னால் பதிவு மறைக்கப்பட்டுள்ளது", "compose_form.spoiler.unmarked": "பதிவு மறைக்கப்படவில்லை", "confirmation_modal.cancel": "ரத்து", diff --git a/app/javascript/mastodon/locales/tai.json b/app/javascript/mastodon/locales/tai.json index 7029e1a20c..e8c4f26401 100644 --- a/app/javascript/mastodon/locales/tai.json +++ b/app/javascript/mastodon/locales/tai.json @@ -15,7 +15,6 @@ "compose_form.encryption_warning": "Tī Mastodon tah huah-siann m̄-sī tuan-tuì-tuan ka-pì ê. M̄-thang tī Mastodon hun-hióng jīm-hô bín-kám ê tsū-sìn.", "compose_form.hashtag_warning": "Tsit-ê huah-siann in-uī m̄-sī kong-khai ê, sóo-í buē tī jīm-hô tsú-tê piau-tshiam hián-sī. Kan-na kong-khai ê huah-siann ē-tàng hōo tsú-tê piau-tshiam tshâ-tshuē.", "compose_form.placeholder": "Lí teh siūnn siánn?", - "compose_form.publish_form": "Huah--tshut-khì", "compose_form.spoiler.marked": "Î-tû luē-iông kíng-kò", "compose_form.spoiler.unmarked": "Tsing-ka luē-iông kíng-kò", "confirmations.delete.message": "Lí kám bueh thâi-tiāu tsi̍t-ē huah-siann?", diff --git a/app/javascript/mastodon/locales/te.json b/app/javascript/mastodon/locales/te.json index a72268d3ab..3762d0dcea 100644 --- a/app/javascript/mastodon/locales/te.json +++ b/app/javascript/mastodon/locales/te.json @@ -65,7 +65,6 @@ "compose_form.lock_disclaimer.lock": "బిగించబడినది", "compose_form.placeholder": "మీ మనస్సులో ఏముంది?", "compose_form.poll.duration": "ఎన్నిక వ్యవధి", - "compose_form.publish_form": "Publish", "compose_form.spoiler.marked": "హెచ్చరిక వెనుక పాఠ్యం దాచబడింది", "compose_form.spoiler.unmarked": "పాఠ్యం దాచబడలేదు", "confirmation_modal.cancel": "రద్దు చెయ్యి", diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json index d4a9a0b40a..7244bcb173 100644 --- a/app/javascript/mastodon/locales/th.json +++ b/app/javascript/mastodon/locales/th.json @@ -190,7 +190,6 @@ "compose_form.poll.switch_to_single": "เปลี่ยนการสำรวจความคิดเห็นเป็นอนุญาตตัวเลือกเดียว", "compose_form.poll.type": "ลักษณะ", "compose_form.publish": "โพสต์", - "compose_form.publish_form": "โพสต์ใหม่", "compose_form.reply": "ตอบกลับ", "compose_form.save_changes": "อัปเดต", "compose_form.spoiler.marked": "เอาคำเตือนเนื้อหาออก", diff --git a/app/javascript/mastodon/locales/tok.json b/app/javascript/mastodon/locales/tok.json index 696954eea3..08e5b4358e 100644 --- a/app/javascript/mastodon/locales/tok.json +++ b/app/javascript/mastodon/locales/tok.json @@ -201,7 +201,6 @@ "compose_form.poll.switch_to_single": "o ante e nasin pana. pana wan taso o lon", "compose_form.poll.type": "nasin", "compose_form.publish": "o toki", - "compose_form.publish_form": "o toki sin", "compose_form.reply": "o toki lon ijo ni", "compose_form.save_changes": "o sin", "compose_form.spoiler.marked": "o weka e toki pi ijo ike ken", diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json index b68854b883..0473fc65ad 100644 --- a/app/javascript/mastodon/locales/tr.json +++ b/app/javascript/mastodon/locales/tr.json @@ -207,7 +207,6 @@ "compose_form.poll.switch_to_single": "Tek bir seçeneğe izin vermek için anketi değiştir", "compose_form.poll.type": "Stil", "compose_form.publish": "Gönder", - "compose_form.publish_form": "Gönder", "compose_form.reply": "Yanıtla", "compose_form.save_changes": "Güncelle", "compose_form.spoiler.marked": "Metin uyarının arkasına gizlenir", diff --git a/app/javascript/mastodon/locales/tt.json b/app/javascript/mastodon/locales/tt.json index b16441cf25..1d790d5586 100644 --- a/app/javascript/mastodon/locales/tt.json +++ b/app/javascript/mastodon/locales/tt.json @@ -133,7 +133,6 @@ "compose_form.poll.duration": "Сораштыру озынлыгы", "compose_form.poll.switch_to_multiple": "Берничә вариантны чишү өчен сораштыруны Үзгәртегез", "compose_form.poll.switch_to_single": "Бердәнбер сайлау өчен сораштыруны Үзгәртегез", - "compose_form.publish_form": "Бастыру", "compose_form.spoiler.marked": "Text is hidden behind warning", "compose_form.spoiler.unmarked": "Text is not hidden", "confirmation_modal.cancel": "Баш тарту", diff --git a/app/javascript/mastodon/locales/ug.json b/app/javascript/mastodon/locales/ug.json index b46d55d4a8..3252c187c8 100644 --- a/app/javascript/mastodon/locales/ug.json +++ b/app/javascript/mastodon/locales/ug.json @@ -15,7 +15,6 @@ "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.", "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.", "compose_form.placeholder": "What is on your mind?", - "compose_form.publish_form": "يېڭى يازما", "compose_form.reply": "جاۋاب", "compose_form.save_changes": "يېڭىلا", "compose_form.spoiler.marked": "مەزمۇن ئاگاھلاندۇرۇشىنى چىقىرىۋەت", diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json index 3c222e4310..607ec0d8e2 100644 --- a/app/javascript/mastodon/locales/uk.json +++ b/app/javascript/mastodon/locales/uk.json @@ -197,7 +197,6 @@ "compose_form.poll.switch_to_single": "Перемкнути у режим вибору однієї відповіді", "compose_form.poll.type": "Стиль", "compose_form.publish": "Опублікувати", - "compose_form.publish_form": "Новий допис", "compose_form.reply": "Відповісти", "compose_form.save_changes": "Оновити", "compose_form.spoiler.marked": "Прибрати попередження про вміст", @@ -528,8 +527,10 @@ "mute_modal.you_wont_see_mentions": "Ви не бачитимете дописів, де їх згадано.", "mute_modal.you_wont_see_posts": "Вони все ще можуть бачити ваші дописи, але ви не бачитимете їхніх.", "navigation_bar.about": "Про застосунок", + "navigation_bar.account_settings": "Пароль і безпека", "navigation_bar.administration": "Адміністрування", "navigation_bar.advanced_interface": "Відкрити в розширеному вебінтерфейсі", + "navigation_bar.automated_deletion": "Автовидалення допису", "navigation_bar.blocks": "Заблоковані користувачі", "navigation_bar.bookmarks": "Закладки", "navigation_bar.community_timeline": "Локальна стрічка", @@ -543,17 +544,22 @@ "navigation_bar.follow_requests": "Запити на підписку", "navigation_bar.followed_tags": "Відстежувані хештеґи", "navigation_bar.follows_and_followers": "Підписки та підписники", + "navigation_bar.import_export": "Імпорт та експорт", "navigation_bar.lists": "Списки", "navigation_bar.logout": "Вийти", "navigation_bar.moderation": "Модерування", + "navigation_bar.more": "Ще", "navigation_bar.mutes": "Приховані користувачі", "navigation_bar.opened_in_classic_interface": "Дописи, облікові записи та інші специфічні сторінки усталено відкриваються в класичному вебінтерфейсі.", "navigation_bar.personal": "Особисте", "navigation_bar.pins": "Закріплені дописи", "navigation_bar.preferences": "Налаштування", + "navigation_bar.privacy_and_reach": "Приватність і досяжність", "navigation_bar.public_timeline": "Глобальна стрічка", "navigation_bar.search": "Пошук", "navigation_bar.security": "Безпека", + "navigation_panel.collapse_lists": "Згорнути меню списку", + "navigation_panel.expand_lists": "Розгорнути меню списку", "not_signed_in_indicator.not_signed_in": "Ви повинні увійти, щоб отримати доступ до цього ресурсу.", "notification.admin.report": "Скарга від {name} на {target}", "notification.admin.report_account": "{name} повідомляє про {count, plural, one {один допис} few {# дописи} many {# дописів} other {# дописів}} від {target} в категорії {category}", @@ -877,7 +883,10 @@ "subscribed_languages.save": "Зберегти зміни", "subscribed_languages.target": "Змінити підписані мови для {target}", "tabs_bar.home": "Головна", + "tabs_bar.menu": "Меню", "tabs_bar.notifications": "Сповіщення", + "tabs_bar.publish": "Новий допис", + "tabs_bar.search": "Пошук", "terms_of_service.effective_as_of": "Ефективний на {date}", "terms_of_service.title": "Умови використання", "terms_of_service.upcoming_changes_on": "Майбутні зміни {date}", diff --git a/app/javascript/mastodon/locales/ur.json b/app/javascript/mastodon/locales/ur.json index 65b9beebfa..eb79724a0e 100644 --- a/app/javascript/mastodon/locales/ur.json +++ b/app/javascript/mastodon/locales/ur.json @@ -111,7 +111,6 @@ "compose_form.poll.duration": "مدتِ رائے", "compose_form.poll.switch_to_multiple": "متعدد انتخاب کی اجازت دینے کے لیے پول تبدیل کریں", "compose_form.poll.switch_to_single": "کسی ایک انتخاب کے لیے پول تبدیل کریں", - "compose_form.publish_form": "اشاعت کریں", "compose_form.spoiler.marked": "Text is hidden behind warning", "compose_form.spoiler.unmarked": "Text is not hidden", "confirmation_modal.cancel": "منسوخ", diff --git a/app/javascript/mastodon/locales/uz.json b/app/javascript/mastodon/locales/uz.json index 92673f9044..78888e108b 100644 --- a/app/javascript/mastodon/locales/uz.json +++ b/app/javascript/mastodon/locales/uz.json @@ -120,7 +120,6 @@ "compose_form.poll.duration": "So‘rov muddati", "compose_form.poll.switch_to_multiple": "Bir nechta tanlovga ruxsat berish uchun so'rovnomani o'zgartirish", "compose_form.poll.switch_to_single": "Yagona tanlovga ruxsat berish uchun so‘rovnomani o‘zgartirish", - "compose_form.publish_form": "Nashr qilish", "compose_form.spoiler.marked": "Kontent ogohlantirishini olib tashlang", "compose_form.spoiler.unmarked": "Kontent haqida ogohlantirish qo'shing", "confirmation_modal.cancel": "Bekor qilish", diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json index 747d02a473..1579b7db69 100644 --- a/app/javascript/mastodon/locales/vi.json +++ b/app/javascript/mastodon/locales/vi.json @@ -207,7 +207,6 @@ "compose_form.poll.switch_to_single": "Chỉ cho phép chọn duy nhất một lựa chọn", "compose_form.poll.type": "Loại", "compose_form.publish": "Đăng", - "compose_form.publish_form": "Đăng", "compose_form.reply": "Trả lời", "compose_form.save_changes": "Cập nhật", "compose_form.spoiler.marked": "Hủy nội dung ẩn", @@ -448,7 +447,7 @@ "ignore_notifications_modal.new_accounts_title": "Bỏ qua thông báo từ các tài khoản mới đăng ký?", "ignore_notifications_modal.not_followers_title": "Bỏ qua thông báo từ những người chưa theo dõi bạn?", "ignore_notifications_modal.not_following_title": "Bỏ qua thông báo từ những người bạn không theo dõi?", - "ignore_notifications_modal.private_mentions_title": "Bỏ qua thông báo từ những lượt Nhắn Riêng không mong muốn?", + "ignore_notifications_modal.private_mentions_title": "Bỏ qua thông báo từ những lượt nhắn riêng không mong muốn?", "info_button.label": "Trợ giúp", "info_button.what_is_alt_text": "

Văn bản thay thế là gì?

Văn bản thay thế giúp mô tả hình ảnh cho những người khiếm thị, kết nối mạng chậm hoặc những người muốn biết ngữ cảnh bổ sung.

Bạn có thể cải thiện khả năng tiếp cận và giải thích kỹ hơn cho mọi người bằng cách viết văn bản thay thế rõ ràng, ngắn gọn và khách quan.

  • Nắm bắt thành phần quan trọng
  • Tóm tắt văn bản trong hình
  • Dùng cấu trúc câu đơn
  • Tránh giải thích rối rắmn
  • Tập trung vào các xu hướng và phát hiện chính trong hình ảnh phức tạp (như biểu đồ hoặc bản đồ)
", "interaction_modal.action.favourite": "Để thích, bạn cần dùng tài khoản của bạn.", @@ -553,8 +552,10 @@ "mute_modal.you_wont_see_mentions": "Bạn sẽ không nhìn thấy tút có nhắc đến họ.", "mute_modal.you_wont_see_posts": "Bạn sẽ không nhìn thấy tút của họ.", "navigation_bar.about": "Giới thiệu", + "navigation_bar.account_settings": "Mật khẩu và bảo mật", "navigation_bar.administration": "Quản trị", "navigation_bar.advanced_interface": "Dùng bố cục nhiều cột", + "navigation_bar.automated_deletion": "Tự động xóa tút cũ", "navigation_bar.blocks": "Người đã chặn", "navigation_bar.bookmarks": "Tút lưu", "navigation_bar.community_timeline": "Cộng đồng", @@ -568,17 +569,22 @@ "navigation_bar.follow_requests": "Yêu cầu theo dõi", "navigation_bar.followed_tags": "Hashtag theo dõi", "navigation_bar.follows_and_followers": "Quan hệ", + "navigation_bar.import_export": "Nhập và xuất", "navigation_bar.lists": "Danh sách", "navigation_bar.logout": "Đăng xuất", "navigation_bar.moderation": "Kiểm duyệt", + "navigation_bar.more": "Khác", "navigation_bar.mutes": "Người đã ẩn", "navigation_bar.opened_in_classic_interface": "Tút, tài khoản và các trang cụ thể khác được mở theo mặc định trong giao diện web cổ điển.", "navigation_bar.personal": "Cá nhân", "navigation_bar.pins": "Tút ghim", "navigation_bar.preferences": "Cài đặt", + "navigation_bar.privacy_and_reach": "Riêng tư và tiếp cận", "navigation_bar.public_timeline": "Liên hợp", "navigation_bar.search": "Tìm kiếm", "navigation_bar.security": "Bảo mật", + "navigation_panel.collapse_lists": "Thu gọn menu danh sách", + "navigation_panel.expand_lists": "Mở rộng menu danh sách", "not_signed_in_indicator.not_signed_in": "Bạn cần đăng nhập để truy cập mục này.", "notification.admin.report": "{name} báo cáo {target}", "notification.admin.report_account": "{name} báo cáo {count, plural, other {# tút}} của {target} vì {category}", @@ -591,8 +597,8 @@ "notification.annual_report.view": "Xem #Wrapstodon", "notification.favourite": "{name} đã thích tút của bạn", "notification.favourite.name_and_others_with_link": "{name} và {count, plural, other {# người khác}} đã thích tút của bạn", - "notification.favourite_pm": "{name} đã thích lượt nhắn riêng của bạn", - "notification.favourite_pm.name_and_others_with_link": "{name} và {count, plural, other {# người khác}} đã thích lượt nhắn riêng của bạn", + "notification.favourite_pm": "{name} đã thích nhắn riêng từ bạn", + "notification.favourite_pm.name_and_others_with_link": "{name} và {count, plural, other {# người khác}} đã thích nhắn riêng từ bạn", "notification.follow": "{name} đã theo dõi bạn", "notification.follow.name_and_others": "{name} và {count, plural, other {# người khác}} theo dõi bạn", "notification.follow_request": "{name} yêu cầu theo dõi bạn", @@ -692,7 +698,7 @@ "notifications.policy.filter_not_following_hint": "Cho tới khi bạn duyệt họ", "notifications.policy.filter_not_following_title": "Những người bạn không theo dõi", "notifications.policy.filter_private_mentions_hint": "Trừ khi đó là trả lời lượt nhắc từ bạn hoặc nếu bạn có theo dõi người gửi", - "notifications.policy.filter_private_mentions_title": "Lượt nhắn riêng không mong muốn", + "notifications.policy.filter_private_mentions_title": "Nhắn riêng không mong muốn", "notifications.policy.title": "Quản lý thông báo từ…", "notifications_permission_banner.enable": "Cho phép thông báo trên màn hình", "notifications_permission_banner.how_to_control": "Hãy bật thông báo trên màn hình để không bỏ lỡ những thông báo từ Mastodon. Một khi đã bật, bạn có thể lựa chọn từng loại thông báo khác nhau thông qua {icon} nút bên dưới.", @@ -907,7 +913,10 @@ "subscribed_languages.save": "Lưu thay đổi", "subscribed_languages.target": "Đổi ngôn ngữ mong muốn cho {target}", "tabs_bar.home": "Trang chủ", + "tabs_bar.menu": "Menu", "tabs_bar.notifications": "Thông báo", + "tabs_bar.publish": "Soạn tút", + "tabs_bar.search": "Tìm kiếm", "terms_of_service.effective_as_of": "Có hiệu lực vào {date}", "terms_of_service.title": "Điều khoản Dịch vụ", "terms_of_service.upcoming_changes_on": "Sắp thay đổi vào {date}", diff --git a/app/javascript/mastodon/locales/zgh.json b/app/javascript/mastodon/locales/zgh.json index 3dd05a9fb6..1c5bc2d2d3 100644 --- a/app/javascript/mastodon/locales/zgh.json +++ b/app/javascript/mastodon/locales/zgh.json @@ -39,7 +39,6 @@ "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.", "compose_form.lock_disclaimer.lock": "ⵉⵜⵜⵓⵔⴳⵍ", "compose_form.placeholder": "ⵎⴰⵢⴷ ⵉⵍⵍⴰⵏ ⴳ ⵉⵅⴼ ⵏⵏⴽ?", - "compose_form.publish_form": "Publish", "compose_form.spoiler.marked": "Text is hidden behind warning", "compose_form.spoiler.unmarked": "Text is not hidden", "confirmation_modal.cancel": "ⵙⵔ", diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json index 4f4909ad7f..bbcbd28783 100644 --- a/app/javascript/mastodon/locales/zh-CN.json +++ b/app/javascript/mastodon/locales/zh-CN.json @@ -206,7 +206,6 @@ "compose_form.poll.switch_to_single": "将投票改为单选", "compose_form.poll.type": "类型", "compose_form.publish": "发布", - "compose_form.publish_form": "发嘟", "compose_form.reply": "回复", "compose_form.save_changes": "更改", "compose_form.spoiler.marked": "移除内容警告", diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json index f776439fcc..3f8de72d7b 100644 --- a/app/javascript/mastodon/locales/zh-HK.json +++ b/app/javascript/mastodon/locales/zh-HK.json @@ -159,7 +159,6 @@ "compose_form.poll.switch_to_single": "變更投票為限定單一選項", "compose_form.poll.type": "風格", "compose_form.publish": "發佈", - "compose_form.publish_form": "發佈", "compose_form.reply": "回覆", "compose_form.save_changes": "更新", "compose_form.spoiler.marked": "文字被警告隱藏", diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json index 6c83fb55ce..7f47e46f4d 100644 --- a/app/javascript/mastodon/locales/zh-TW.json +++ b/app/javascript/mastodon/locales/zh-TW.json @@ -207,7 +207,6 @@ "compose_form.poll.switch_to_single": "變更投票為允許單一選項", "compose_form.poll.type": "投票方式", "compose_form.publish": "發嘟", - "compose_form.publish_form": "嘟出去", "compose_form.reply": "回覆", "compose_form.save_changes": "更新", "compose_form.spoiler.marked": "移除內容警告", @@ -553,8 +552,10 @@ "mute_modal.you_wont_see_mentions": "您不會見到提及他們的嘟文。", "mute_modal.you_wont_see_posts": "他們仍可讀取您的嘟文，但您不會見到他們的。", "navigation_bar.about": "關於", + "navigation_bar.account_settings": "密碼與安全性", "navigation_bar.administration": "管理介面", "navigation_bar.advanced_interface": "以進階網頁介面開啟", + "navigation_bar.automated_deletion": "自動嘟文刪除", "navigation_bar.blocks": "已封鎖的使用者", "navigation_bar.bookmarks": "書籤", "navigation_bar.community_timeline": "本站時間軸", @@ -568,17 +569,22 @@ "navigation_bar.follow_requests": "跟隨請求", "navigation_bar.followed_tags": "已跟隨主題標籤", "navigation_bar.follows_and_followers": "跟隨中與跟隨者", + "navigation_bar.import_export": "匯入及匯出", "navigation_bar.lists": "列表", "navigation_bar.logout": "登出", "navigation_bar.moderation": "站務", + "navigation_bar.more": "更多", "navigation_bar.mutes": "已靜音的使用者", "navigation_bar.opened_in_classic_interface": "預設於經典網頁介面中開啟嘟文、帳號與其他特定頁面。", "navigation_bar.personal": "個人", "navigation_bar.pins": "釘選的嘟文", "navigation_bar.preferences": "偏好設定", + "navigation_bar.privacy_and_reach": "隱私權及觸及", "navigation_bar.public_timeline": "聯邦時間軸", "navigation_bar.search": "搜尋", "navigation_bar.security": "安全性", + "navigation_panel.collapse_lists": "收合列表選單", + "navigation_panel.expand_lists": "展開列表選單", "not_signed_in_indicator.not_signed_in": "您需要登入才能存取此資源。", "notification.admin.report": "{name} 已檢舉 {target}", "notification.admin.report_account": "{name} 已檢舉來自 {target} 關於 {category} 之 {count, plural, other {# 則嘟文}}", @@ -907,7 +913,10 @@ "subscribed_languages.save": "儲存變更", "subscribed_languages.target": "變更 {target} 的訂閱語言", "tabs_bar.home": "首頁", + "tabs_bar.menu": "選單", "tabs_bar.notifications": "通知", + "tabs_bar.publish": "新增嘟文", + "tabs_bar.search": "搜尋", "terms_of_service.effective_as_of": "{date} 起生效", "terms_of_service.title": "服務條款", "terms_of_service.upcoming_changes_on": "{date} 起即將發生之異動", From d1fb9573612c8c71c13082b33e4387e4644c4986 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Thu, 12 Jun 2025 10:29:42 +0200 Subject: [PATCH 06/10] Change "Explore" to "Trending" and remove explanation banners (#34985) --- app/javascript/mastodon/features/explore/index.tsx | 6 +++--- app/javascript/mastodon/features/explore/links.jsx | 10 ---------- app/javascript/mastodon/features/explore/statuses.jsx | 1 - app/javascript/mastodon/features/explore/tags.jsx | 10 ---------- .../mastodon/features/link_timeline/index.tsx | 4 ++-- .../features/ui/components/navigation_panel.tsx | 8 +++----- app/javascript/mastodon/locales/en.json | 5 +---- 7 files changed, 9 insertions(+), 35 deletions(-) diff --git a/app/javascript/mastodon/features/explore/index.tsx b/app/javascript/mastodon/features/explore/index.tsx index c6f65a09ac..e886627048 100644 --- a/app/javascript/mastodon/features/explore/index.tsx +++ b/app/javascript/mastodon/features/explore/index.tsx @@ -5,7 +5,7 @@ import { defineMessages, useIntl, FormattedMessage } from 'react-intl'; import { Helmet } from 'react-helmet'; import { NavLink, Switch, Route } from 'react-router-dom'; -import ExploreIcon from '@/material-icons/400-24px/explore.svg?react'; +import TrendingUpIcon from '@/material-icons/400-24px/trending_up.svg?react'; import { Column } from 'mastodon/components/column'; import type { ColumnRef } from 'mastodon/components/column'; import { ColumnHeader } from 'mastodon/components/column_header'; @@ -20,7 +20,7 @@ import Suggestions from './suggestions'; import Tags from './tags'; const messages = defineMessages({ - title: { id: 'explore.title', defaultMessage: 'Explore' }, + title: { id: 'explore.title', defaultMessage: 'Trending' }, }); const Explore: React.FC<{ multiColumn: boolean }> = ({ multiColumn }) => { @@ -41,7 +41,7 @@ const Explore: React.FC<{ multiColumn: boolean }> = ({ multiColumn }) => { > - - - ); - if (!isLoading && links.isEmpty()) { return (
- {banner} -
@@ -63,8 +55,6 @@ class Links extends PureComponent { return (
- {banner} - {isLoading ? () : links.map((link, i) => ( } alwaysPrepend timelineId='explore' statusIds={statusIds} diff --git a/app/javascript/mastodon/features/explore/tags.jsx b/app/javascript/mastodon/features/explore/tags.jsx index b803d5fa1b..683f95bfb4 100644 --- a/app/javascript/mastodon/features/explore/tags.jsx +++ b/app/javascript/mastodon/features/explore/tags.jsx @@ -42,17 +42,9 @@ class Tags extends PureComponent { render () { const { isLoading, hashtags } = this.props; - const banner = ( - - - - ); - if (!isLoading && hashtags.isEmpty()) { return (
- {banner} -
@@ -62,8 +54,6 @@ class Tags extends PureComponent { return (
- {banner} - {isLoading ? () : hashtags.map(hashtag => ( ))} diff --git a/app/javascript/mastodon/features/link_timeline/index.tsx b/app/javascript/mastodon/features/link_timeline/index.tsx index 1b3f287177..e6b8480a24 100644 --- a/app/javascript/mastodon/features/link_timeline/index.tsx +++ b/app/javascript/mastodon/features/link_timeline/index.tsx @@ -3,7 +3,7 @@ import { useRef, useEffect, useCallback } from 'react'; import { Helmet } from 'react-helmet'; import { useParams } from 'react-router-dom'; -import ExploreIcon from '@/material-icons/400-24px/explore.svg?react'; +import TrendingUpIcon from '@/material-icons/400-24px/trending_up.svg?react'; import { expandLinkTimeline } from 'mastodon/actions/timelines'; import { Column } from 'mastodon/components/column'; import type { ColumnRef } from 'mastodon/components/column'; @@ -50,7 +50,7 @@ export const LinkTimeline: React.FC<{ { transparent to='/explore' icon='explore' - iconComponent={ExploreIcon} - activeIconComponent={ExploreActiveIcon} + iconComponent={TrendingUpIcon} text={intl.formatMessage(messages.explore)} /> ); diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json index 7f608ead05..d4acdd257a 100644 --- a/app/javascript/mastodon/locales/en.json +++ b/app/javascript/mastodon/locales/en.json @@ -266,9 +266,6 @@ "disabled_account_banner.text": "Your account {disabledAccount} is currently disabled.", "dismissable_banner.community_timeline": "These are the most recent public posts from people whose accounts are hosted by {domain}.", "dismissable_banner.dismiss": "Dismiss", - "dismissable_banner.explore_links": "These news stories are being shared the most on the fediverse today. Newer news stories posted by more different people are ranked higher.", - "dismissable_banner.explore_statuses": "These posts from across the fediverse are gaining traction today. Newer posts with more boosts and favorites are ranked higher.", - "dismissable_banner.explore_tags": "These hashtags are gaining traction on the fediverse today. Hashtags that are used by more different people are ranked higher.", "dismissable_banner.public_timeline": "These are the most recent public posts from people on the fediverse that people on {domain} follow.", "domain_block_modal.block": "Block server", "domain_block_modal.block_account_instead": "Block @{name} instead", @@ -340,7 +337,7 @@ "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard", "errors.unexpected_crash.report_issue": "Report issue", "explore.suggested_follows": "People", - "explore.title": "Explore", + "explore.title": "Trending", "explore.trending_links": "News", "explore.trending_statuses": "Posts", "explore.trending_tags": "Hashtags", From 24d943fee00a06e5f558c999d6789ab74630b897 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Thu, 12 Jun 2025 10:53:02 +0200 Subject: [PATCH 07/10] Change media attachments in moderated posts to not be accessible (#34872) --- app/controllers/backups_controller.rb | 13 +---- app/controllers/media_proxy_controller.rb | 52 ++++++++++++++++--- app/helpers/media_component_helper.rb | 4 +- app/helpers/routing_helper.rb | 15 ++++++ app/models/media_attachment.rb | 4 ++ app/models/status_edit.rb | 2 +- app/policies/media_attachment_policy.rb | 13 +++++ .../rest/media_attachment_serializer.rb | 4 +- app/services/remove_status_service.rb | 8 ++- app/services/suspend_account_service.rb | 37 +------------ app/services/unsuspend_account_service.rb | 37 +------------ ...e_media_attachments_permissions_service.rb | 47 +++++++++++++++++ .../reports/_media_attachments.html.haml | 15 +----- 13 files changed, 140 insertions(+), 111 deletions(-) create mode 100644 app/policies/media_attachment_policy.rb create mode 100644 app/services/update_media_attachments_permissions_service.rb diff --git a/app/controllers/backups_controller.rb b/app/controllers/backups_controller.rb index 076d19874b..7580acd49b 100644 --- a/app/controllers/backups_controller.rb +++ b/app/controllers/backups_controller.rb @@ -12,18 +12,7 @@ class BackupsController < ApplicationController BACKUP_LINK_TIMEOUT = 1.hour.freeze def download - case Paperclip::Attachment.default_options[:storage] - when :s3, :azure - redirect_to @backup.dump.expiring_url(BACKUP_LINK_TIMEOUT.to_i), allow_other_host: true - when :fog - if Paperclip::Attachment.default_options.dig(:fog_credentials, :openstack_temp_url_key).present? - redirect_to @backup.dump.expiring_url(BACKUP_LINK_TIMEOUT.from_now), allow_other_host: true - else - redirect_to full_asset_url(@backup.dump.url), allow_other_host: true - end - when :filesystem - redirect_to full_asset_url(@backup.dump.url), allow_other_host: true - end + redirect_to expiring_asset_url(@backup.dump, BACKUP_LINK_TIMEOUT), allow_other_host: true end private diff --git a/app/controllers/media_proxy_controller.rb b/app/controllers/media_proxy_controller.rb index f68d85e44e..d55b90ad88 100644 --- a/app/controllers/media_proxy_controller.rb +++ b/app/controllers/media_proxy_controller.rb @@ -9,6 +9,7 @@ class MediaProxyController < ApplicationController skip_before_action :require_functional! before_action :authenticate_user!, if: :limited_federation_mode? + before_action :set_media_attachment rescue_from ActiveRecord::RecordInvalid, with: :not_found rescue_from Mastodon::UnexpectedResponseError, with: :not_found @@ -16,25 +17,36 @@ class MediaProxyController < ApplicationController rescue_from(*Mastodon::HTTP_CONNECTION_ERRORS, with: :internal_server_error) def show - with_redis_lock("media_download:#{params[:id]}") do - @media_attachment = MediaAttachment.remote.attached.find(params[:id]) - authorize @media_attachment.status, :show? - redownload! if @media_attachment.needs_redownload? && !reject_media? + if @media_attachment.needs_redownload? && !reject_media? + with_redis_lock("media_download:#{params[:id]}") do + @media_attachment.reload # Reload once we have acquired a lock, in case the file was downloaded in the meantime + redownload! if @media_attachment.needs_redownload? + end end - redirect_to full_asset_url(@media_attachment.file.url(version)), allow_other_host: true + if requires_file_streaming? + send_file(media_attachment_file.path, type: media_attachment_file.instance_read(:content_type), disposition: 'inline') + else + redirect_to media_attachment_file_path, allow_other_host: true + end end private + def set_media_attachment + @media_attachment = MediaAttachment.attached.find(params[:id]) + authorize @media_attachment, :download? + end + def redownload! @media_attachment.download_file! + @media_attachment.download_thumbnail! @media_attachment.created_at = Time.now.utc @media_attachment.save! end - def version - if request.path.end_with?('/small') + def attachment_style + if @media_attachment.thumbnail.blank? && preview_requested? :small else :original @@ -42,6 +54,30 @@ class MediaProxyController < ApplicationController end def reject_media? - DomainBlock.reject_media?(@media_attachment.account.domain) + @media_attachment.account.remote? && DomainBlock.reject_media?(@media_attachment.account.domain) + end + + def media_attachment_file_path + if @media_attachment.discarded? + expiring_asset_url(media_attachment_file, 10.minutes) + else + full_asset_url(media_attachment_file.url(attachment_style)) + end + end + + def media_attachment_file + if @media_attachment.thumbnail.present? && preview_requested? + @media_attachment.thumbnail + else + @media_attachment.file + end + end + + def preview_requested? + request.path.end_with?('/small') + end + + def requires_file_streaming? + Paperclip::Attachment.default_options[:storage] == :filesystem && @media_attachment.discarded? end end diff --git a/app/helpers/media_component_helper.rb b/app/helpers/media_component_helper.rb index 269566528a..194a19a457 100644 --- a/app/helpers/media_component_helper.rb +++ b/app/helpers/media_component_helper.rb @@ -11,9 +11,9 @@ module MediaComponentHelper src: full_asset_url(video.file.url(:original)), preview: full_asset_url(video.thumbnail.present? ? video.thumbnail.url : video.file.url(:small)), alt: video.description, + lang: status.language, blurhash: video.blurhash, frameRate: meta.dig('original', 'frame_rate'), - inline: true, aspectRatio: "#{meta.dig('original', 'width')} / #{meta.dig('original', 'height')}", media: [ serialize_media_attachment(video), @@ -34,6 +34,8 @@ module MediaComponentHelper src: full_asset_url(audio.file.url(:original)), poster: full_asset_url(audio.thumbnail.present? ? audio.thumbnail.url : status.account.avatar_static_url), alt: audio.description, + lang: status.language, + blurhash: audio.blurhash, backgroundColor: meta.dig('colors', 'background'), foregroundColor: meta.dig('colors', 'foreground'), accentColor: meta.dig('colors', 'accent'), diff --git a/app/helpers/routing_helper.rb b/app/helpers/routing_helper.rb index 1ff8b992c3..b5d090db49 100644 --- a/app/helpers/routing_helper.rb +++ b/app/helpers/routing_helper.rb @@ -20,6 +20,21 @@ module RoutingHelper URI.join(asset_host, source).to_s end + def expiring_asset_url(attachment, expires_in) + case Paperclip::Attachment.default_options[:storage] + when :s3, :azure + attachment.expiring_url(expires_in.to_i) + when :fog + if Paperclip::Attachment.default_options.dig(:fog_credentials, :openstack_temp_url_key).present? + attachment.expiring_url(expires_in.from_now) + else + full_asset_url(attachment.url) + end + when :filesystem + full_asset_url(attachment.url) + end + end + def asset_host Rails.configuration.action_controller.asset_host || root_url end diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb index 2f51da0255..2e60f732b8 100644 --- a/app/models/media_attachment.rb +++ b/app/models/media_attachment.rb @@ -228,6 +228,10 @@ class MediaAttachment < ApplicationRecord file.blank? && remote_url.present? end + def discarded? + status&.discarded? || (status_id.present? && status.nil?) + end + def significantly_changed? description_previously_changed? || thumbnail_updated_at_previously_changed? || file_meta_previously_changed? end diff --git a/app/models/status_edit.rb b/app/models/status_edit.rb index a64ef34905..25e2228873 100644 --- a/app/models/status_edit.rb +++ b/app/models/status_edit.rb @@ -32,7 +32,7 @@ class StatusEdit < ApplicationRecord :preview_remote_url, :text_url, :meta, :blurhash, :not_processed?, :needs_redownload?, :local?, :file, :thumbnail, :thumbnail_remote_url, - :shortcode, :video?, :audio?, to: :media_attachment + :shortcode, :video?, :audio?, :discarded?, to: :media_attachment end rate_limit by: :account, family: :statuses diff --git a/app/policies/media_attachment_policy.rb b/app/policies/media_attachment_policy.rb new file mode 100644 index 0000000000..bf108ae098 --- /dev/null +++ b/app/policies/media_attachment_policy.rb @@ -0,0 +1,13 @@ +# frozen_string_literal: true + +class MediaAttachmentPolicy < ApplicationPolicy + def download? + (record.discarded? && role.can?(:manage_reports)) || show_status? + end + + private + + def show_status? + record.status && StatusPolicy.new(current_account, record.status).show? + end +end diff --git a/app/serializers/rest/media_attachment_serializer.rb b/app/serializers/rest/media_attachment_serializer.rb index 90a2a97275..28fa0205f3 100644 --- a/app/serializers/rest/media_attachment_serializer.rb +++ b/app/serializers/rest/media_attachment_serializer.rb @@ -16,7 +16,7 @@ class REST::MediaAttachmentSerializer < ActiveModel::Serializer def url if object.not_processed? nil - elsif object.needs_redownload? + elsif object.needs_redownload? || object.discarded? media_proxy_url(object.id, :original) else full_asset_url(object.file.url(:original)) @@ -28,7 +28,7 @@ class REST::MediaAttachmentSerializer < ActiveModel::Serializer end def preview_url - if object.needs_redownload? + if object.needs_redownload? || object.discarded? media_proxy_url(object.id, :small) elsif object.thumbnail.present? full_asset_url(object.thumbnail.url(:original)) diff --git a/app/services/remove_status_service.rb b/app/services/remove_status_service.rb index 522437aeac..2adb8c1edb 100644 --- a/app/services/remove_status_service.rb +++ b/app/services/remove_status_service.rb @@ -147,9 +147,13 @@ class RemoveStatusService < BaseService end def remove_media - return if @options[:redraft] || !permanently? + return if @options[:redraft] - @status.media_attachments.destroy_all + if permanently? + @status.media_attachments.destroy_all + else + UpdateMediaAttachmentsPermissionsService.new.call(@status.media_attachments, :private) + end end def permanently? diff --git a/app/services/suspend_account_service.rb b/app/services/suspend_account_service.rb index 1b9d051b38..7ddf1a553d 100644 --- a/app/services/suspend_account_service.rb +++ b/app/services/suspend_account_service.rb @@ -64,42 +64,7 @@ class SuspendAccountService < BaseService end def privatize_media_attachments! - attachment_names = MediaAttachment.attachment_definitions.keys - - @account.media_attachments.find_each do |media_attachment| - attachment_names.each do |attachment_name| - attachment = media_attachment.public_send(attachment_name) - styles = MediaAttachment::DEFAULT_STYLES | attachment.styles.keys - - next if attachment.blank? - - styles.each do |style| - case Paperclip::Attachment.default_options[:storage] - when :s3 - # Prevent useless S3 calls if ACLs are disabled - next if ENV['S3_PERMISSION'] == '' - - begin - attachment.s3_object(style).acl.put(acl: 'private') - rescue Aws::S3::Errors::NoSuchKey - Rails.logger.warn "Tried to change acl on non-existent key #{attachment.s3_object(style).key}" - rescue Aws::S3::Errors::NotImplemented => e - Rails.logger.error "Error trying to change ACL on #{attachment.s3_object(style).key}: #{e.message}" - end - when :fog, :azure - # Not supported - when :filesystem - begin - FileUtils.chmod(0o600 & ~File.umask, attachment.path(style)) unless attachment.path(style).nil? - rescue Errno::ENOENT - Rails.logger.warn "Tried to change permission on non-existent file #{attachment.path(style)}" - end - end - - CacheBusterWorker.perform_async(attachment.url(style)) if Rails.configuration.x.cache_buster.enabled - end - end - end + UpdateMediaAttachmentsPermissionsService.new.call(@account.media_attachments, :private) end def remove_from_trends! diff --git a/app/services/unsuspend_account_service.rb b/app/services/unsuspend_account_service.rb index 8ad01737ae..180b2cd3f6 100644 --- a/app/services/unsuspend_account_service.rb +++ b/app/services/unsuspend_account_service.rb @@ -59,42 +59,7 @@ class UnsuspendAccountService < BaseService end def publish_media_attachments! - attachment_names = MediaAttachment.attachment_definitions.keys - - @account.media_attachments.find_each do |media_attachment| - attachment_names.each do |attachment_name| - attachment = media_attachment.public_send(attachment_name) - styles = MediaAttachment::DEFAULT_STYLES | attachment.styles.keys - - next if attachment.blank? - - styles.each do |style| - case Paperclip::Attachment.default_options[:storage] - when :s3 - # Prevent useless S3 calls if ACLs are disabled - next if ENV['S3_PERMISSION'] == '' - - begin - attachment.s3_object(style).acl.put(acl: Paperclip::Attachment.default_options[:s3_permissions]) - rescue Aws::S3::Errors::NoSuchKey - Rails.logger.warn "Tried to change acl on non-existent key #{attachment.s3_object(style).key}" - rescue Aws::S3::Errors::NotImplemented => e - Rails.logger.error "Error trying to change ACL on #{attachment.s3_object(style).key}: #{e.message}" - end - when :fog, :azure - # Not supported - when :filesystem - begin - FileUtils.chmod(0o666 & ~File.umask, attachment.path(style)) unless attachment.path(style).nil? - rescue Errno::ENOENT - Rails.logger.warn "Tried to change permission on non-existent file #{attachment.path(style)}" - end - end - - CacheBusterWorker.perform_async(attachment.url(style)) if Rails.configuration.x.cache_buster.enabled - end - end - end + UpdateMediaAttachmentsPermissionsService.new.call(@account.media_attachments, :public) end def signed_activity_json diff --git a/app/services/update_media_attachments_permissions_service.rb b/app/services/update_media_attachments_permissions_service.rb new file mode 100644 index 0000000000..311473afa5 --- /dev/null +++ b/app/services/update_media_attachments_permissions_service.rb @@ -0,0 +1,47 @@ +# frozen_string_literal: true + +class UpdateMediaAttachmentsPermissionsService < BaseService + def call(media_attachments_scope, direction) + # Only s3 and filesystem storage systems support modifying permissions + return unless %i(s3 filesystem).include?(Paperclip::Attachment.default_options[:storage]) + + # Prevent useless S3 calls if ACLs are disabled + return if Paperclip::Attachment.default_options[:storage] == :s3 && ENV['S3_PERMISSION'] == '' + + attachment_names = MediaAttachment.attachment_definitions.keys + + media_attachments_scope.find_each do |media_attachment| + attachment_names.each do |attachment_name| + attachment = media_attachment.public_send(attachment_name) + styles = MediaAttachment::DEFAULT_STYLES | attachment.styles.keys + + next if attachment.blank? + + styles.each do |style| + case Paperclip::Attachment.default_options[:storage] + when :s3 + acl = direction == :public ? Paperclip::Attachment.default_options[:s3_permissions] : 'private' + + begin + attachment.s3_object(style).acl.put(acl: acl) + rescue Aws::S3::Errors::NoSuchKey + Rails.logger.warn "Tried to change acl on non-existent key #{attachment.s3_object(style).key}" + rescue Aws::S3::Errors::NotImplemented => e + Rails.logger.error "Error trying to change ACL on #{attachment.s3_object(style).key}: #{e.message}" + end + when :filesystem + mask = direction == :public ? 0o666 : 0o600 + + begin + FileUtils.chmod(mask & ~File.umask, attachment.path(style)) unless attachment.path(style).nil? + rescue Errno::ENOENT + Rails.logger.warn "Tried to change permission on non-existent file #{attachment.path(style)}" + end + end + + CacheBusterWorker.perform_async(attachment.url(style)) if Rails.configuration.x.cache_buster.enabled + end + end + end + end +end diff --git a/app/views/admin/reports/_media_attachments.html.haml b/app/views/admin/reports/_media_attachments.html.haml index 45cc4c5aa3..aa82ec09a8 100644 --- a/app/views/admin/reports/_media_attachments.html.haml +++ b/app/views/admin/reports/_media_attachments.html.haml @@ -1,17 +1,6 @@ - if status.ordered_media_attachments.first.video? = render_video_component(status, visible: false) - elsif status.ordered_media_attachments.first.audio? - - audio = status.ordered_media_attachments.first - = react_component :audio, - alt: audio.description, - duration: audio.file.meta.dig(:original, :duration), - height: 110, - lang: status.language, - src: audio.file.url(:original) + = render_audio_component(status) - else - = react_component :media_gallery, - height: 343, - lang: status.language, - media: serialized_media_attachments(status.ordered_media_attachments), - sensitive: status.sensitive?, - visible: false + = render_media_gallery_component(status, visible: false) From ccf77602057510661492a70fc927513041391825 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Thu, 12 Jun 2025 14:26:24 +0200 Subject: [PATCH 08/10] Change viewport behaviour to cover (#34986) Co-authored-by: diondiondion --- app/javascript/styles/mastodon/basics.scss | 2 ++ app/views/layouts/application.html.haml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/javascript/styles/mastodon/basics.scss b/app/javascript/styles/mastodon/basics.scss index a699ee18e0..27b37b2925 100644 --- a/app/javascript/styles/mastodon/basics.scss +++ b/app/javascript/styles/mastodon/basics.scss @@ -48,6 +48,8 @@ body { &.app-body { padding: 0; + padding-left: env(safe-area-inset-left); + padding-right: env(safe-area-inset-right); &.layout-single-column { height: auto; diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index fbdffb0baa..15d08b3fcb 100755 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -2,7 +2,7 @@ %html{ lang: I18n.locale } %head %meta{ charset: 'utf-8' }/ - %meta{ name: 'viewport', content: 'width=device-width, initial-scale=1' }/ + %meta{ name: 'viewport', content: 'width=device-width, initial-scale=1, viewport-fit=cover' }/ - if cdn_host? %link{ rel: 'dns-prefetch', href: cdn_host }/ From 9f94ddcd402c0664961f3de77728ba9af9795176 Mon Sep 17 00:00:00 2001 From: diondiondion Date: Thu, 12 Jun 2025 15:29:55 +0200 Subject: [PATCH 09/10] fix: Fix error caused by attempt to fetch non-existent quote (#35022) --- app/javascript/mastodon/components/status_quoted.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/javascript/mastodon/components/status_quoted.tsx b/app/javascript/mastodon/components/status_quoted.tsx index 36bd618df5..d3d8b58c33 100644 --- a/app/javascript/mastodon/components/status_quoted.tsx +++ b/app/javascript/mastodon/components/status_quoted.tsx @@ -89,7 +89,7 @@ export const QuotedStatus: React.FC<{ ); useEffect(() => { - if (!status) { + if (!status && quotedStatusId) { dispatch(fetchStatus(quotedStatusId)); } }, [status, quotedStatusId, dispatch]); From 2254f47702368938bdfd0d997f2487fb2950d676 Mon Sep 17 00:00:00 2001 From: diondiondion Date: Thu, 12 Jun 2025 16:05:34 +0200 Subject: [PATCH 10/10] fix: Avatars too large on notifications page (#35023) --- app/javascript/styles/mastodon/components.scss | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index c4f174f1b3..6dca91a192 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -1980,6 +1980,13 @@ body > [data-popper-placement] { } } + &__avatar-wrapper .account__avatar { + @container (width < 360px) { + width: 35px !important; + height: 35px !important; + } + } + &__domain-pill { display: inline-flex; background: rgba($highlight-text-color, 0.2); @@ -2151,11 +2158,6 @@ body > [data-popper-placement] { border-radius: var(--avatar-border-radius); background: var(--surface-background-color); - @container (width < 360px) { - width: 35px !important; - height: 35px !important; - } - img { width: 100%; height: 100%;