diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index a0f8db0d50..98f797f277 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
# This configuration was generated by
# `rubocop --auto-gen-config --auto-gen-only-exclude --no-offense-counts --no-auto-gen-timestamp`
-# using RuboCop version 1.73.2.
+# using RuboCop version 1.75.0.
# The point is for the user to remove these configuration records
# one by one as the offenses are removed from the code base.
# Note that changes in the inspected code, or installation of new
@@ -45,7 +45,7 @@ Style/FetchEnvVar:
- 'lib/tasks/repo.rake'
# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, MaxUnannotatedPlaceholdersAllowed, AllowedMethods, AllowedPatterns.
+# Configuration parameters: EnforcedStyle, MaxUnannotatedPlaceholdersAllowed, Mode, AllowedMethods, AllowedPatterns.
# SupportedStyles: annotated, template, unannotated
# AllowedMethods: redirect
Style/FormatStringToken:
@@ -73,7 +73,6 @@ Style/MapToHash:
# AllowedMethods: respond_to_missing?
Style/OptionalBooleanParameter:
Exclude:
- - 'app/helpers/json_ld_helper.rb'
- 'app/lib/admin/system_check/message.rb'
- 'app/lib/request.rb'
- 'app/lib/webfinger.rb'
diff --git a/Gemfile.lock b/Gemfile.lock
index 0daa305f70..1ad5429d4b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -580,7 +580,7 @@ GEM
ox (2.14.22)
bigdecimal (>= 3.0)
parallel (1.26.3)
- parser (3.3.7.2)
+ parser (3.3.7.3)
ast (~> 2.4.1)
racc
parslet (2.0.0)
@@ -600,6 +600,7 @@ GEM
net-smtp
premailer (~> 1.7, >= 1.7.9)
prettyprint (0.2.0)
+ prism (1.4.0)
prometheus_exporter (2.2.0)
webrick
propshaft (1.1.0)
@@ -733,7 +734,7 @@ GEM
rspec-mocks (~> 3.0)
sidekiq (>= 5, < 9)
rspec-support (3.13.2)
- rubocop (1.74.0)
+ rubocop (1.75.1)
json (~> 2.3)
language_server-protocol (~> 3.17.0.2)
lint_roller (~> 1.1.0)
@@ -741,11 +742,12 @@ GEM
parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 2.9.3, < 3.0)
- rubocop-ast (>= 1.38.0, < 2.0)
+ rubocop-ast (>= 1.43.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 4.0)
- rubocop-ast (1.38.1)
- parser (>= 3.3.1.0)
+ rubocop-ast (1.43.0)
+ parser (>= 3.3.7.2)
+ prism (~> 1.4)
rubocop-capybara (2.22.1)
lint_roller (~> 1.1)
rubocop (~> 1.72, >= 1.72.1)
diff --git a/app/javascript/mastodon/components/edited_timestamp/index.jsx b/app/javascript/mastodon/components/edited_timestamp/index.jsx
index fbf14ec4bd..f8fa043259 100644
--- a/app/javascript/mastodon/components/edited_timestamp/index.jsx
+++ b/app/javascript/mastodon/components/edited_timestamp/index.jsx
@@ -6,6 +6,7 @@ import { FormattedMessage, injectIntl } from 'react-intl';
import { connect } from 'react-redux';
import { openModal } from 'mastodon/actions/modal';
+import { FormattedDateWrapper } from 'mastodon/components/formatted_date';
import InlineAccount from 'mastodon/components/inline_account';
import { RelativeTimestamp } from 'mastodon/components/relative_timestamp';
@@ -60,12 +61,12 @@ class EditedTimestamp extends PureComponent {
};
render () {
- const { timestamp, intl, statusId } = this.props;
+ const { timestamp, statusId } = this.props;
return (
<DropdownMenu statusId={statusId} renderItem={this.renderItem} scrollable renderHeader={this.renderHeader} onItemClick={this.handleItemClick}>
<button className='dropdown-menu__text-button'>
- <FormattedMessage id='status.edited' defaultMessage='Edited {date}' values={{ date: <span className='animated-number'>{intl.formatDate(timestamp, { month: 'short', day: '2-digit', hour: '2-digit', minute: '2-digit' })}</span> }} />
+ <FormattedMessage id='status.edited' defaultMessage='Edited {date}' values={{ date: <FormattedDateWrapper className='animated-number' value={timestamp} month='short' day='2-digit' hour='2-digit' minute='2-digit' /> }} />
</button>
</DropdownMenu>
);
diff --git a/app/javascript/mastodon/components/formatted_date.tsx b/app/javascript/mastodon/components/formatted_date.tsx
new file mode 100644
index 0000000000..cc927b0873
--- /dev/null
+++ b/app/javascript/mastodon/components/formatted_date.tsx
@@ -0,0 +1,26 @@
+import type { ComponentProps } from 'react';
+
+import { FormattedDate } from 'react-intl';
+
+export const FormattedDateWrapper = (
+ props: ComponentProps<typeof FormattedDate> & { className?: string },
+) => (
+ <FormattedDate {...props}>
+ {(date) => (
+ <time dateTime={tryIsoString(props.value)} className={props.className}>
+ {date}
+ </time>
+ )}
+ </FormattedDate>
+);
+
+const tryIsoString = (date?: string | number | Date): string => {
+ if (!date) {
+ return '';
+ }
+ try {
+ return new Date(date).toISOString();
+ } catch {
+ return date.toString();
+ }
+};
diff --git a/app/javascript/mastodon/features/account_timeline/components/account_header.tsx b/app/javascript/mastodon/features/account_timeline/components/account_header.tsx
index 968224bf79..9505d48010 100644
--- a/app/javascript/mastodon/features/account_timeline/components/account_header.tsx
+++ b/app/javascript/mastodon/features/account_timeline/components/account_header.tsx
@@ -37,6 +37,7 @@ import {
FollowingCounter,
StatusesCounter,
} from 'mastodon/components/counters';
+import { FormattedDateWrapper } from 'mastodon/components/formatted_date';
import { Icon } from 'mastodon/components/icon';
import { IconButton } from 'mastodon/components/icon_button';
import { LoadingIndicator } from 'mastodon/components/loading_indicator';
@@ -938,11 +939,12 @@ export const AccountHeader: React.FC<{
/>
</dt>
<dd>
- {intl.formatDate(account.created_at, {
- year: 'numeric',
- month: 'short',
- day: '2-digit',
- })}
+ <FormattedDateWrapper
+ value={account.created_at}
+ year='numeric'
+ month='short'
+ day='2-digit'
+ />
</dd>
</dl>
diff --git a/app/javascript/mastodon/features/privacy_policy/index.tsx b/app/javascript/mastodon/features/privacy_policy/index.tsx
index f0309c2712..cd6f9f3b2b 100644
--- a/app/javascript/mastodon/features/privacy_policy/index.tsx
+++ b/app/javascript/mastodon/features/privacy_policy/index.tsx
@@ -1,17 +1,13 @@
import { useState, useEffect } from 'react';
-import {
- FormattedMessage,
- FormattedDate,
- useIntl,
- defineMessages,
-} from 'react-intl';
+import { FormattedMessage, useIntl, defineMessages } from 'react-intl';
import { Helmet } from 'react-helmet';
import { apiGetPrivacyPolicy } from 'mastodon/api/instance';
import type { ApiPrivacyPolicyJSON } from 'mastodon/api_types/instance';
import { Column } from 'mastodon/components/column';
+import { FormattedDateWrapper } from 'mastodon/components/formatted_date';
import { Skeleton } from 'mastodon/components/skeleton';
const messages = defineMessages({
@@ -58,7 +54,7 @@ const PrivacyPolicy: React.FC<{
date: loading ? (
<Skeleton width='10ch' />
) : (
- <FormattedDate
+ <FormattedDateWrapper
value={response?.updated_at}
year='numeric'
month='short'
diff --git a/app/javascript/mastodon/features/status/components/detailed_status.tsx b/app/javascript/mastodon/features/status/components/detailed_status.tsx
index 1b605df067..1291c26159 100644
--- a/app/javascript/mastodon/features/status/components/detailed_status.tsx
+++ b/app/javascript/mastodon/features/status/components/detailed_status.tsx
@@ -6,7 +6,7 @@
import type { CSSProperties } from 'react';
import { useState, useRef, useCallback } from 'react';
-import { FormattedDate, FormattedMessage } from 'react-intl';
+import { FormattedMessage } from 'react-intl';
import classNames from 'classnames';
import { Link } from 'react-router-dom';
@@ -16,6 +16,7 @@ import { AnimatedNumber } from 'mastodon/components/animated_number';
import { ContentWarning } from 'mastodon/components/content_warning';
import EditedTimestamp from 'mastodon/components/edited_timestamp';
import { FilterWarning } from 'mastodon/components/filter_warning';
+import { FormattedDateWrapper } from 'mastodon/components/formatted_date';
import type { StatusLike } from 'mastodon/components/hashtag_bar';
import { getHashtagBarForStatus } from 'mastodon/components/hashtag_bar';
import { Icon } from 'mastodon/components/icon';
@@ -388,7 +389,7 @@ export const DetailedStatus: React.FC<{
target='_blank'
rel='noopener noreferrer'
>
- <FormattedDate
+ <FormattedDateWrapper
value={new Date(status.get('created_at') as string)}
year='numeric'
month='short'
diff --git a/app/javascript/mastodon/locales/fr-CA.json b/app/javascript/mastodon/locales/fr-CA.json
index 7852f478bf..d0bfec8229 100644
--- a/app/javascript/mastodon/locales/fr-CA.json
+++ b/app/javascript/mastodon/locales/fr-CA.json
@@ -119,7 +119,7 @@
"block_modal.show_less": "Afficher moins",
"block_modal.show_more": "Afficher plus",
"block_modal.they_cant_mention": "Il ne peut pas vous mentionner ou vous suivre.",
- "block_modal.they_cant_see_posts": "Il peut toujours voir vos messages, mais vous ne verrez pas les siens.",
+ "block_modal.they_cant_see_posts": "Il ne peut plus voir vos messages et vous ne verrez plus les siens.",
"block_modal.they_will_know": "Il peut voir qu'il est bloqué.",
"block_modal.title": "Bloquer le compte ?",
"block_modal.you_wont_see_mentions": "Vous ne verrez pas les messages qui le mentionne.",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index 9a53fd7628..101aeba211 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -119,7 +119,7 @@
"block_modal.show_less": "Afficher moins",
"block_modal.show_more": "Afficher plus",
"block_modal.they_cant_mention": "Il ne peut pas vous mentionner ou vous suivre.",
- "block_modal.they_cant_see_posts": "Il peut toujours voir vos messages, mais vous ne verrez pas les siens.",
+ "block_modal.they_cant_see_posts": "Il ne peut plus voir vos messages et vous ne verrez plus les siens.",
"block_modal.they_will_know": "Il peut voir qu'il est bloqué.",
"block_modal.title": "Bloquer le compte ?",
"block_modal.you_wont_see_mentions": "Vous ne verrez pas les messages qui le mentionne.",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index 5b93084c13..e9c5ef2133 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -874,6 +874,7 @@
"tabs_bar.notifications": "알림",
"terms_of_service.effective_as_of": "{date}부터 적용됨",
"terms_of_service.title": "이용 약관",
+ "terms_of_service.upcoming_changes_on": "{date}에 예정된 변경사항",
"time_remaining.days": "{number} 일 남음",
"time_remaining.hours": "{number} 시간 남음",
"time_remaining.minutes": "{number} 분 남음",
diff --git a/app/lib/request.rb b/app/lib/request.rb
index 8fda86f0e8..ad39f928db 100644
--- a/app/lib/request.rb
+++ b/app/lib/request.rb
@@ -260,7 +260,7 @@ class Request
outer_e = nil
port = args.first
- addresses = [] # rubocop:disable Lint/UselessAssignment -- TODO: https://github.com/rubocop/rubocop/issues/13395
+ addresses = []
begin
addresses = [IPAddr.new(host)]
rescue IPAddr::InvalidAddressError
diff --git a/app/models/trends/links.rb b/app/models/trends/links.rb
index 35ccf7744c..c24e069b51 100644
--- a/app/models/trends/links.rb
+++ b/app/models/trends/links.rb
@@ -33,7 +33,8 @@ class Trends::Links < Trends::Base
def register(status, at_time = Time.now.utc)
original_status = status.proper
- return unless (original_status.public_visibility? && status.public_visibility?) &&
+ return unless original_status.public_visibility? &&
+ status.public_visibility? &&
!(original_status.account.silenced? || status.account.silenced?) &&
!(original_status.spoiler_text? || original_status.sensitive?)
diff --git a/app/services/concerns/payloadable.rb b/app/services/concerns/payloadable.rb
index bd9d9d74b5..3eea3aa567 100644
--- a/app/services/concerns/payloadable.rb
+++ b/app/services/concerns/payloadable.rb
@@ -17,7 +17,7 @@ module Payloadable
payload = ActiveModelSerializers::SerializableResource.new(record, options.merge(serializer: serializer, adapter: ActivityPub::Adapter)).as_json
object = record.respond_to?(:virtual_object) ? record.virtual_object : record
- if (object.respond_to?(:sign?) && object.sign?) && signer && (always_sign || signing_enabled?)
+ if object.respond_to?(:sign?) && object.sign? && signer && (always_sign || signing_enabled?)
ActivityPub::LinkedDataSignature.new(payload).sign!(signer, sign_with: sign_with)
else
payload
diff --git a/app/workers/poll_expiration_notify_worker.rb b/app/workers/poll_expiration_notify_worker.rb
index b7a60fab84..fe7647024e 100644
--- a/app/workers/poll_expiration_notify_worker.rb
+++ b/app/workers/poll_expiration_notify_worker.rb
@@ -8,7 +8,7 @@ class PollExpirationNotifyWorker
def perform(poll_id)
@poll = Poll.find(poll_id)
- return if does_not_expire?
+ return if missing_expiration?
requeue! && return if not_due_yet?
notify_remote_voters_and_owner! if @poll.local?
@@ -24,7 +24,7 @@ class PollExpirationNotifyWorker
private
- def does_not_expire?
+ def missing_expiration?
@poll.expires_at.nil?
end
diff --git a/config/locales/activerecord.zh-CN.yml b/config/locales/activerecord.zh-CN.yml
index 0513c82a7c..af19014cfd 100644
--- a/config/locales/activerecord.zh-CN.yml
+++ b/config/locales/activerecord.zh-CN.yml
@@ -55,6 +55,8 @@ zh-CN:
too_soon: 日期太近，必须晚于 %{date}
user:
attributes:
+ date_of_birth:
+ below_limit: 低于年龄限制
email:
blocked: 使用了被封禁的电子邮件提供商
unreachable: 似乎不存在
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index f96f9a91c0..ca40a2abcd 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -931,6 +931,7 @@ ko:
chance_to_review_html: "<strong>생성된 이용 약관은 자동으로 게시되지 않을 것입니다.</strong> 결과를 확인할 기회가 있습니다. 진행하려면 필요한 정보들을 입력하세요."
explanation_html: 제공되는 이용약관 틀은 정보 제공만을 목적으로 하며 법률 조언으로 해석하면 안 됩니다. 귀하의 상황에 맞는 법률 자문을 받아주시기 바랍니다.
title: 이용 약관 설정
+ going_live_on_html: "%{date} 시행중"
history: 역사
live: 활성
no_history: 기록된 이용약관 변경이 아직 없습니다.
@@ -1903,6 +1904,8 @@ ko:
terms_of_service_changed:
agreement: "%{domain}을 계속 사용하는 것으로 약관에 동의하는 것으로 간주합니다. 약관에 동의하지 않는 경우 계정을 삭제함으로써 언제든 동의를 철회할 수 있습니다."
changelog: '이번 변경사항의 주요 내용입니다:'
+ description: "%{domain}의 이용 약관이 변경되었기 때문에 발송된 이메일입니다. 이 변경사항은 %{date}부터 효력을 발휘합니다. 변경된 전체 약관을 확인하시길 권합니다:"
+ description_html: '%{domain}의 이용 약관이 변경되었기 때문에 발송된 이메일입니다. 이 변경사항은 <strong>%{date}</strong>부터 효력을 발휘합니다. <a href="%{path}" target="_blank">변경된 전체 약관</a>을 확인하시길 권합니다.'
sign_off: "%{domain} 팀"
subject: 변경된 이용 약관
subtitle: "%{domain}의 이용 약관이 변경됩니다"
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 46e170244b..3dbfb0e2b2 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -145,7 +145,7 @@ lv:
only_password: Tikai parole
password_and_2fa: Parole un 2FA
sensitive: Uzspiest atzīmēšanu kā jūtīgu
- sensitized: Atzīmēts kā jūtīgu
+ sensitized: Atzīmēts kā jūtīgs
shared_inbox_url: Koplietotās iesūtnes URL
show:
created_reports: Sastādītie ziņojumi
@@ -282,12 +282,12 @@ lv:
resend_user_html: "%{name} atkārtoti nosūtīja %{target} apstiprinājuma e-pasta ziņojumu"
reset_password_user_html: "%{name} atiestatīja paroli lietotājam %{target}"
resolve_report_html: "%{name} atrisināja ziņojumu %{target}"
- sensitive_account_html: "%{name} atzīmēja %{target} multividi kā sensitīvu"
+ sensitive_account_html: "%{name} atzīmēja %{target} informācijas nesēju kā jūtīgu"
silence_account_html: "%{name} ierobežoja %{target} kontu"
suspend_account_html: "%{name} apturēja %{target} kontu"
unassigned_report_html: "%{name} nepiešķīra ziņojumu %{target}"
unblock_email_account_html: "%{name} atbloķēja %{target} e-pasta adresi"
- unsensitive_account_html: "%{name} atmarķēja %{target} multividi kā sensitīvu"
+ unsensitive_account_html: "%{name} atcēla %{target} informācijas nesēja atzīmēšanu kā jūtīgu"
unsilence_account_html: "%{name} atcēla ierobežojumu %{target} kontam"
unsuspend_account_html: "%{name} neapturēja %{target} kontu"
update_announcement_html: "%{name} atjaunināja paziņojumu %{target}"
@@ -610,7 +610,7 @@ lv:
action_taken_by: Veiktā darbība
actions:
delete_description_html: Raksti, par kurām ziņots, tiks dzēsti, un tiks reģistrēts brīdinājums, lai palīdzētu tev izvērst turpmākos pārkāpumus saistībā ar to pašu kontu.
- mark_as_sensitive_description_html: Multividesu faili ziņojumos, par kuriem ziņots, tiks atzīmēti kā sensitīvi, un tiks reģistrēts brīdinājums, lai palīdzētu tev izvērst turpmākus pārkāpumus saistībā ar to pašu kontu.
+ mark_as_sensitive_description_html: Informācijas nesēji ierakstos, par kuriem ziņots, tiks atzīmēti kā jūtīgi, un tiks iegrāmatots brīdinājums, lai palīdzētu ziņot par turpmākiem tā paša konta pārkāpumiem.
other_description_html: Skatīt vairāk iespēju kontrolēt konta uzvedību un pielāgot saziņu ar paziņoto kontu.
resolve_description_html: Pret norādīto kontu netiks veiktas nekādas darbības, netiks reģistrēts brīdinājums, un ziņojums tiks slēgts.
silence_description_html: Konts būs redzams tikai tiem, kas tam jau seko vai meklē to manuāli, ievērojami ierobežojot tā sasniedzamību. To vienmēr var atgriezt. Tiek aizvērti visi šī konta pārskati.
@@ -637,7 +637,7 @@ lv:
forwarded_replies_explanation: Šis ziņojums ir no attāla lietotāja un par attālu saturu. Tas tika pārvirzīts šeit, jo saturs, par kuru tika ziņots, ir atbilde vienam no šī servera lietotājiem.
forwarded_to: Pārsūtīti %{domain}
mark_as_resolved: Atzīmēt kā atrisinātu
- mark_as_sensitive: Atzīmēt kā sensitīvu
+ mark_as_sensitive: Atzīmēt kā jūtīgu
mark_as_unresolved: Atzīmēt kā neatrisinātu
no_one_assigned: Neviena
notes:
@@ -665,12 +665,12 @@ lv:
summary:
action_preambles:
delete_html: 'Jūs gatavojaties <strong>noņemt</strong> dažas no lietotāja <strong>@%{acct}</strong> ziņām. Tas:'
- mark_as_sensitive_html: 'Jūs gatavojaties <strong>atzīmēt</strong> dažas no lietotāja <strong>@%{acct}</strong> ziņām kā <strong>sensitīvas</strong>. Tas:'
+ mark_as_sensitive_html: 'Tu gatavojies <strong>atzīmēt</strong> dažus no lietotāja <strong>@%{acct}</strong> ierakstiem kā <strong>jūtīgus</strong>. Tas:'
silence_html: 'Jūs gatavojaties <strong>ierobežot</strong> <strong>@%{acct}</strong> kontu. Tas:'
suspend_html: 'Jūs gatavojaties <strong>apturēt</strong> <strong>@%{acct}</strong> kontu. Tas:'
actions:
delete_html: Noņemt aizskarošās ziņas
- mark_as_sensitive_html: Atzīmēt aizskarošo ziņu multivides saturu kā sensitīvu
+ mark_as_sensitive_html: Atzīmēt aizskarošo ierakstu informācijas nesējus kā jūtīgus
silence_html: Ievērojami ierobežo <strong>@%{acct}</strong> sasniedzamību, padarot viņa profilu un saturu redzamu tikai cilvēkiem, kas jau seko tam vai pašrocīgi uzmeklē profilu
suspend_html: Apturēt <strong>@%{acct}</strong>, padarot viņu profilu un saturu nepieejamu un neiespējamu mijiedarbību ar
close_report: 'Atzīmēt ziņojumu #%{id} kā atrisinātu'
@@ -854,9 +854,9 @@ lv:
actions:
delete_statuses: "%{name} izdzēsa %{target} publikācijas"
disable: "%{name} iesaldēja %{target} kontu"
- mark_statuses_as_sensitive: "%{name} atzīmēja %{target} ziņu kā sensitīvu"
+ mark_statuses_as_sensitive: "%{name} atzīmēja %{target} ierakstu kā jūtīgu"
none: "%{name} nosūtīja brīdinājumu %{target}"
- sensitive: "%{name} atzīmēja %{target} kontu kā sensitīvu"
+ sensitive: "%{name} atzīmēja %{target} kontu kā jūtīgu"
silence: "%{name} ierobežoja %{target} kontu"
suspend: "%{name} apturēja %{target} kontu"
appeal_approved: Pārsūdzēts
@@ -1052,9 +1052,9 @@ lv:
actions:
delete_statuses: lai izdzēstu viņu ierakstus
disable: lai iesaldētu viņu kontu
- mark_statuses_as_sensitive: lai atzīmētu viņu ziņas kā sensitīvas
+ mark_statuses_as_sensitive: lai atzīmētu viņu ierakstus kā jūtīgus
none: brīdinājums
- sensitive: lai atzīmētu viņu kontu kā sensitīvu
+ sensitive: lai atzīmētu viņu kontu kā jūtīgu
silence: lai ierobežotu viņu kontu
suspend: lai apturētu viņu kontu
body: "%{target} iebilst %{action_taken_by} satura pārraudzības lēmumam no %{date}, kas bija %{type}. Viņi rakstīja:"
@@ -1099,7 +1099,7 @@ lv:
body: Mastodon ir tulkojuši brīvprātīgie.
guide_link: https://crowdin.com/project/mastodon
guide_link_text: Ikviens var piedalīties.
- sensitive_content: Sensitīvs saturs
+ sensitive_content: Jūtīgs saturs
application_mailer:
notification_preferences: Mainīt e-pasta uztādījumus
salutation: "%{name},"
@@ -1263,9 +1263,9 @@ lv:
title_actions:
delete_statuses: Ziņas noņemšana
disable: Konta iesaldēšana
- mark_statuses_as_sensitive: Ziņu atzīmēšana kā sensitīvas
+ mark_statuses_as_sensitive: Ierakstu atzīmēšana kā jūtīgus
none: Brīdinājums
- sensitive: Konta atzīmēšana kā sensitīvs
+ sensitive: Konta atzīmēšana kā jūtīgu
silence: Konta ierobežošana
suspend: Konta apturēšana
your_appeal_approved: Jūsu apelācija ir apstiprināta
@@ -1807,7 +1807,7 @@ lv:
min_reblogs: Saglabāt ziņas izceltas vismaz
min_reblogs_hint: Neizdzēš nevienu no tavām ziņām, kas ir izceltas vismaz tik reižu. Atstāj tukšu, lai dzēstu ziņas neatkarīgi no to izcēlumu skaita
stream_entries:
- sensitive_content: Sensitīvs saturs
+ sensitive_content: Jūtīgs saturs
strikes:
errors:
too_late: Brīdinājuma apstrīdēšanas laiks ir nokavēts
@@ -1880,8 +1880,8 @@ lv:
explanation:
delete_statuses: Tika konstatēts, ka dažas no tavām ziņām pārkāpj vienu vai vairākas kopienas vadlīnijas, un rezultātā %{instance} moderatori tās noņēma.
disable: Tu vairs nevari izmantot savu kontu, taču tavs profils un citi dati paliek neskarti. Tu vari pieprasīt savu datu dublējumu, mainīt konta iestatījumus vai dzēst kontu.
- mark_statuses_as_sensitive: "%{instance} moderatori dažus no Taviem ierakstiem ir atzīmējuši kā jutīgus. Tas nozīmē, ka cilvēkiem būs jāpiesit ierakstos esošajiem informāijas nesējiem, pirms tiek attēlots priekšskatījums. Tu arī pats vari atzīmēt informācijas nesēju kā jutīgu, kad nākotnē tādu ievietosi."
- sensitive: No šī brīža visi augšupielādētie multivides faili tiks atzīmēti kā sensitīvi un paslēpti aiz klikšķa brīdinājuma.
+ mark_statuses_as_sensitive: "%{instance} satura pārraudzītāji dažus no Taviem ierakstiem ir atzīmējuši kā jūtīgus. Tas nozīmē, ka cilvēkiem būs jāpiesit ierakstos esošajiem informāijas nesējiem, pirms tiek attēlots priekšskatījums. Tu pats vari atzīmēt informācijas nesēju kā jūtīgu, kad nākotnē tādu ievietosi."
+ sensitive: Turpmāk visi augšupielādētās informācijas nesēju datnes tiks atzīmētas kā jūtīgas un paslēptas aiz klikšķināma brīdinājuma.
silence: Tu joprojām vari izmantot savu kontu, taču tikai tie cilvēki, kuri jau tev seko, redzēs tavas ziņas šajā serverī, un tev var tikt liegtas dažādas atklāšanas funkcijas. Tomēr citi joprojām var tev manuāli sekot.
suspend: Tu vairs nevari izmantot savu kontu, un tavs profils un citi dati vairs nav pieejami. Tu joprojām vari pieteikties, lai pieprasītu savu datu dublēšanu, līdz dati tiks pilnībā noņemti aptuveni 30 dienu laikā, taču mēs saglabāsim dažus pamata datus, lai neļautu tev izvairīties no apturēšanas.
reason: 'Iemesls:'
@@ -1889,17 +1889,17 @@ lv:
subject:
delete_statuses: Tavas ziņas %{acct} tika noņemtas
disable: Tavs konts %{acct} tika iesaldēts
- mark_statuses_as_sensitive: Tavas ziņas vietnē %{acct} ir atzīmētas kā sensitīvas
+ mark_statuses_as_sensitive: Tavi ieraksti %{acct} ir atzīmēti kā jūtīgi
none: Brīdinājums par %{acct}
- sensitive: Tavas ziņas vietnē %{acct} turpmāk tiks atzīmētas kā sensitīvas
+ sensitive: Tavi ieraksti %{acct} turpmāk tiks atzīmēti kā jūtīgi
silence: Tavs konts %{acct} tika ierobežots
suspend: Tava konta %{acct} darbība ir apturēta
title:
delete_statuses: Izdzēstās ziņas
disable: Konts iesaldēts
- mark_statuses_as_sensitive: Ziņas ir atzīmēts kā sensitīvas
+ mark_statuses_as_sensitive: Ieraksti atzīmēti kā jūtīgi
none: Brīdinājums
- sensitive: Konts ir atzīmēts kā sensitīvs
+ sensitive: Konts ir atzīmēts kā jūtīgs
silence: Konts ierobežots
suspend: Konts apturēts
welcome:
diff --git a/config/locales/simple_form.bg.yml b/config/locales/simple_form.bg.yml
index 9bd854222a..b3a5882562 100644
--- a/config/locales/simple_form.bg.yml
+++ b/config/locales/simple_form.bg.yml
@@ -75,6 +75,7 @@ bg:
filters:
action: Изберете кое действие да се извърши, прецеждайки съвпаденията на публикацията
actions:
+ blur: Скриване на мултимедия зад предупреждение, но без скриване на самия текст
hide: Напълно скриване на филтрираното съдържание, сякаш не съществува
warn: Скриване на филтрираното съдържание зад предупреждение, споменавайки заглавието на филтъра
form_admin_settings:
@@ -258,6 +259,7 @@ bg:
name: Хаштаг
filters:
actions:
+ blur: Скриване на мултимедията с предупреждение
hide: Напълно скриване
warn: Скриване зад предупреждение
form_admin_settings:
diff --git a/config/locales/simple_form.ca.yml b/config/locales/simple_form.ca.yml
index db2af6dc36..2f85738c32 100644
--- a/config/locales/simple_form.ca.yml
+++ b/config/locales/simple_form.ca.yml
@@ -75,6 +75,7 @@ ca:
filters:
action: Tria quina acció cal executar quan un apunt coincideixi amb el filtre
actions:
+ blur: Amaga el contingut multimèdia rere un avís, sense amagar el text en si
hide: Ocultar completament el contingut filtrat, comportant-se com si no existís
warn: Oculta el contingut filtrat darrere d'un avís mencionant el títol del filtre
form_admin_settings:
@@ -257,6 +258,7 @@ ca:
name: Etiqueta
filters:
actions:
+ blur: Amaga el contingut multimèdia amb un avís
hide: Oculta completament
warn: Oculta amb un avís
form_admin_settings:
diff --git a/config/locales/simple_form.cs.yml b/config/locales/simple_form.cs.yml
index c689f6bc4f..00abf91d3e 100644
--- a/config/locales/simple_form.cs.yml
+++ b/config/locales/simple_form.cs.yml
@@ -3,7 +3,7 @@ cs:
simple_form:
hints:
account:
- attribution_domains: Jeden na řádek. Chrání před falešným připisování autorství.
+ attribution_domains: Jeden na řádek. Chrání před falešným připisováním autorství.
discoverable: Vaše veřejné příspěvky a profil mohou být zobrazeny nebo doporučeny v různých oblastech Mastodonu a váš profil může být navrhován ostatním uživatelům.
display_name: Vaše celé jméno nebo přezdívka.
fields: Vaše domovská stránka, zájmena, věk, cokoliv chcete.
@@ -75,6 +75,7 @@ cs:
filters:
action: Vyberte, jakou akci provést, když příspěvek odpovídá filtru
actions:
+ blur: Skrýt média za varováním, bez skrytí samotného textu
hide: Úplně schovat filtrovaný obsah tak, jako by neexistoval
warn: Schovat filtrovaný obsah za varováním zmiňujicím název filtru
form_admin_settings:
@@ -260,6 +261,7 @@ cs:
name: Hashtag
filters:
actions:
+ blur: Skrýt média za varováním
hide: Zcela skrýt
warn: Skrýt s varováním
form_admin_settings:
diff --git a/config/locales/simple_form.cy.yml b/config/locales/simple_form.cy.yml
index 609943a204..c9c7862a91 100644
--- a/config/locales/simple_form.cy.yml
+++ b/config/locales/simple_form.cy.yml
@@ -75,6 +75,7 @@ cy:
filters:
action: Dewiswch pa weithred i'w chyflawni pan fydd postiad yn cyfateb i'r hidlydd
actions:
+ blur: Cuddio cyfryngau tu ôl i rybudd, heb guddio'r testun ei hun
hide: Cuddiwch y cynnwys wedi'i hidlo'n llwyr, gan ymddwyn fel pe na bai'n bodoli
warn: Cuddiwch y cynnwys wedi'i hidlo y tu ôl i rybudd sy'n sôn am deitl yr hidlydd
form_admin_settings:
@@ -260,6 +261,7 @@ cy:
name: Hashnod
filters:
actions:
+ blur: Cuddio cyfryngau gyda rhybudd
hide: Cuddio'n llwyr
warn: Cuddio â rhybudd
form_admin_settings:
diff --git a/config/locales/simple_form.da.yml b/config/locales/simple_form.da.yml
index 55b0281abd..91582e60c5 100644
--- a/config/locales/simple_form.da.yml
+++ b/config/locales/simple_form.da.yml
@@ -75,6 +75,7 @@ da:
filters:
action: Vælg handlingen til eksekvering, når et indlæg matcher filteret
actions:
+ blur: Skjul medier bag en advarsel, uden at skjule selve teksten
hide: Skjul filtreret indhold helt (adfærd som om, det ikke fandtes)
warn: Skjul filtreret indhold bag en advarsel, der nævner filterets titel
form_admin_settings:
@@ -260,6 +261,7 @@ da:
name: Hashtag
filters:
actions:
+ blur: Skjul medier med en advarsel
hide: Skjul helt
warn: Skjul bag en advarsel
form_admin_settings:
diff --git a/config/locales/simple_form.de.yml b/config/locales/simple_form.de.yml
index b7165b6a0c..016ed4b25a 100644
--- a/config/locales/simple_form.de.yml
+++ b/config/locales/simple_form.de.yml
@@ -75,6 +75,7 @@ de:
filters:
action: Gib an, welche Aktion ausgeführt werden soll, wenn ein Beitrag dem Filter entspricht
actions:
+ blur: Medien mit einer Warnung ausblenden, ohne den Text selbst auszublenden
hide: Den gefilterten Beitrag vollständig ausblenden, als hätte er nie existiert
warn: Den gefilterten Beitrag hinter einer Warnung, die den Filtertitel beinhaltet, ausblenden
form_admin_settings:
@@ -260,8 +261,9 @@ de:
name: Hashtag
filters:
actions:
+ blur: Medien mit einer Warnung ausblenden
hide: Vollständig ausblenden
- warn: Mit einer Inhaltswarnung ausblenden
+ warn: Mit einer Warnung ausblenden
form_admin_settings:
activity_api_enabled: Aggregierte Nutzungsdaten über die API veröffentlichen
app_icon: App-Symbol
diff --git a/config/locales/simple_form.eo.yml b/config/locales/simple_form.eo.yml
index 0f71753a29..1331ea7333 100644
--- a/config/locales/simple_form.eo.yml
+++ b/config/locales/simple_form.eo.yml
@@ -75,6 +75,7 @@ eo:
filters:
action: Elekti ago kiam mesaĝo kongruas la filtrilon
actions:
+ blur: Kaŝi amaskomunikilaron malantaŭ averto, sen kaŝi la tekston mem
hide: Tute kaŝigi la filtritajn enhavojn, kvazau ĝi ne ekzistis
warn: Kaŝi la enhavon filtritan malantaŭ averto mencianta la nomon de la filtro
form_admin_settings:
@@ -255,6 +256,7 @@ eo:
name: Kradvorto
filters:
actions:
+ blur: Kaŝi amaskomunikilaron kun averto
hide: Kaŝi komplete
warn: Kaŝi malantaŭ averto
form_admin_settings:
diff --git a/config/locales/simple_form.es-AR.yml b/config/locales/simple_form.es-AR.yml
index ad2c3ef668..4333db9fed 100644
--- a/config/locales/simple_form.es-AR.yml
+++ b/config/locales/simple_form.es-AR.yml
@@ -75,6 +75,7 @@ es-AR:
filters:
action: Elegir qué acción realizar cuando un mensaje coincide con el filtro
actions:
+ blur: Ocultar medios detrás de una advertencia, sin ocultar el texto en sí mismo
hide: Ocultar completamente el contenido filtrado, comportándose como si no existiera
warn: Ocultar el contenido filtrado detrás de una advertencia mencionando el título del filtro
form_admin_settings:
@@ -260,6 +261,7 @@ es-AR:
name: Etiqueta
filters:
actions:
+ blur: Ocultar medios con una advertencia
hide: Ocultar completamente
warn: Ocultar con una advertencia
form_admin_settings:
diff --git a/config/locales/simple_form.es-MX.yml b/config/locales/simple_form.es-MX.yml
index f0fdb0db35..63287a3989 100644
--- a/config/locales/simple_form.es-MX.yml
+++ b/config/locales/simple_form.es-MX.yml
@@ -75,6 +75,7 @@ es-MX:
filters:
action: Elegir qué acción realizar cuando una publicación coincide con el filtro
actions:
+ blur: Ocultar contenido multimedia detrás de una advertencia, sin ocultar el texto en sí
hide: Ocultar completamente el contenido filtrado, comportándose como si no existiera
warn: Ocultar el contenido filtrado detrás de una advertencia mencionando el título del filtro
form_admin_settings:
@@ -260,6 +261,7 @@ es-MX:
name: Etiqueta
filters:
actions:
+ blur: Ocultar contenido multimedia con una advertencia
hide: Ocultar completamente
warn: Ocultar con una advertencia
form_admin_settings:
diff --git a/config/locales/simple_form.es.yml b/config/locales/simple_form.es.yml
index 7404622978..d469c6ec3a 100644
--- a/config/locales/simple_form.es.yml
+++ b/config/locales/simple_form.es.yml
@@ -75,6 +75,7 @@ es:
filters:
action: Elegir qué acción realizar cuando una publicación coincide con el filtro
actions:
+ blur: Ocultar contenido multimedia detrás de una advertencia, sin ocultar el texto en sí
hide: Ocultar completamente el contenido filtrado, comportándose como si no existiera
warn: Ocultar el contenido filtrado detrás de una advertencia mencionando el título del filtro
form_admin_settings:
@@ -260,6 +261,7 @@ es:
name: Etiqueta
filters:
actions:
+ blur: Ocultar contenido multimedia con una advertencia
hide: Ocultar completamente
warn: Ocultar con una advertencia
form_admin_settings:
diff --git a/config/locales/simple_form.fi.yml b/config/locales/simple_form.fi.yml
index 502ac5fb48..5489780ec7 100644
--- a/config/locales/simple_form.fi.yml
+++ b/config/locales/simple_form.fi.yml
@@ -75,6 +75,7 @@ fi:
filters:
action: Valitse, mikä toiminto suoritetaan, kun julkaisu vastaa suodatinta
actions:
+ blur: Piilota media varoituksen taakse piilottamatta itse tekstiä
hide: Piilota suodatettu sisältö kokonaan, ikään kuin sitä ei olisi olemassa
warn: Piilota suodatettu sisältö varoituksen taakse, jossa mainitaan suodattimen nimi
form_admin_settings:
@@ -259,6 +260,7 @@ fi:
name: Aihetunniste
filters:
actions:
+ blur: Piilota media varoittaen
hide: Piilota kokonaan
warn: Piilota varoittaen
form_admin_settings:
diff --git a/config/locales/simple_form.fo.yml b/config/locales/simple_form.fo.yml
index 6db565dbd6..32d066ed18 100644
--- a/config/locales/simple_form.fo.yml
+++ b/config/locales/simple_form.fo.yml
@@ -75,6 +75,7 @@ fo:
filters:
action: Vel, hvat skal henda, tá eitt uppslag svarar til filtrið
actions:
+ blur: Fjal miðlar aftanfyri eina ávaring, uttan at fjala sjálvan tekstin
hide: Fjal filtreraða innihaldið fullkomiliga, ber seg at sum at tað ikki fanst
warn: Fjal filtreraða innihaldið aftan fyri eina ávaring, sum nevnir heitið á filtrinum
form_admin_settings:
@@ -260,6 +261,7 @@ fo:
name: Tvíkrossur
filters:
actions:
+ blur: Fjal miðlar við eini ávaring
hide: Fjal fullkomiliga
warn: Fjal við eini ávaring
form_admin_settings:
diff --git a/config/locales/simple_form.he.yml b/config/locales/simple_form.he.yml
index 0c183a8558..9c01b91638 100644
--- a/config/locales/simple_form.he.yml
+++ b/config/locales/simple_form.he.yml
@@ -75,6 +75,7 @@ he:
filters:
action: בחרו איזו פעולה לבצע כאשר הודעה מתאימה למסנן
actions:
+ blur: החבאת וידאו ותמונות מאחורי אזהרה, ללא החבאת המלל עצמו
hide: הסתרת התוכן המסונן, כאילו לא היה קיים
warn: הסתרת התוכן המסונן מאחורי אזהרה עם כותרת המסנן
form_admin_settings:
@@ -260,6 +261,7 @@ he:
name: תגית
filters:
actions:
+ blur: הסתרת מדיה עם אזהרה
hide: הסתרה כוללת
warn: הסתרה עם אזהרה
form_admin_settings:
diff --git a/config/locales/simple_form.hu.yml b/config/locales/simple_form.hu.yml
index 6963f75a0b..adcc3d5789 100644
--- a/config/locales/simple_form.hu.yml
+++ b/config/locales/simple_form.hu.yml
@@ -75,6 +75,7 @@ hu:
filters:
action: A végrehajtandó műveletet, ha a bejegyzés megfelel a szűrőnek
actions:
+ blur: Média elrejtése figyelmeztetéssel, a szöveg elrejtése nélkül
hide: A szűrt tartalom teljes elrejtése, mintha nem is létezne
warn: A szűrt tartalom a szűrő címét említő figyelmeztetés mögé rejtése
form_admin_settings:
@@ -260,6 +261,7 @@ hu:
name: Hashtag
filters:
actions:
+ blur: Média elrejtése figyelmeztetéssel
hide: Teljes elrejtés
warn: Elrejtés figyelmeztetéssel
form_admin_settings:
diff --git a/config/locales/simple_form.is.yml b/config/locales/simple_form.is.yml
index 0b1703be7d..bc68d14f2a 100644
--- a/config/locales/simple_form.is.yml
+++ b/config/locales/simple_form.is.yml
@@ -75,6 +75,7 @@ is:
filters:
action: Veldu hvaða aðgerð á að framkvæma þegar færsla samsvarar síunni
actions:
+ blur: Fela myndefni á bakvið aðvörun, án þess að fela sjálfann textann
hide: Fela síað efni algerlega, rétt eins og það sé ekki til staðar
warn: Fela síað efni á bakvið aðvörun sem tekur fram titil síunnar
form_admin_settings:
@@ -260,6 +261,7 @@ is:
name: Myllumerki
filters:
actions:
+ blur: Fela myndefni með aðvörun
hide: Fela alveg
warn: Fela með aðvörun
form_admin_settings:
diff --git a/config/locales/simple_form.it.yml b/config/locales/simple_form.it.yml
index 152d15c2e4..da203270fa 100644
--- a/config/locales/simple_form.it.yml
+++ b/config/locales/simple_form.it.yml
@@ -75,6 +75,7 @@ it:
filters:
action: Scegli quale azione eseguire quando un post corrisponde al filtro
actions:
+ blur: Nascondi i contenuti multimediali dietro un avviso, senza nascondere il testo stesso
hide: Nascondi completamente il contenuto filtrato, come se non esistesse
warn: Nascondi il contenuto filtrato e mostra invece un avviso, citando il titolo del filtro
form_admin_settings:
@@ -260,6 +261,7 @@ it:
name: Etichetta
filters:
actions:
+ blur: Nascondi i contenuti multimediali con un avviso
hide: Nascondi completamente
warn: Nascondi con avviso
form_admin_settings:
diff --git a/config/locales/simple_form.ko.yml b/config/locales/simple_form.ko.yml
index bd3fb32c1f..a823604584 100644
--- a/config/locales/simple_form.ko.yml
+++ b/config/locales/simple_form.ko.yml
@@ -75,6 +75,7 @@ ko:
filters:
action: 게시물이 필터에 걸러질 때 어떤 동작을 수행할 지 고르세요
actions:
+ blur: 텍스트는 숨기지 않고 그대로 둔 채 경고 뒤에 미디어를 숨김니다
hide: 필터에 걸러진 글을 처음부터 없었던 것처럼 완전히 가리기
warn: 필터 제목을 언급하는 경고 뒤에 걸러진 내용을 숨기기
form_admin_settings:
@@ -88,6 +89,7 @@ ko:
favicon: WEBP, PNG, GIF 또는 JPG. 기본 파비콘을 대체합니다.
mascot: 고급 웹 인터페이스의 그림을 대체합니다.
media_cache_retention_period: 원격 사용자가 작성한 글의 미디어 파일은 이 서버에 캐시됩니다. 양수로 설정하면 지정된 일수 후에 미디어가 삭제됩니다. 삭제된 후에 미디어 데이터를 요청하면 원본 콘텐츠를 사용할 수 있는 경우 다시 다운로드됩니다. 링크 미리 보기 카드가 타사 사이트를 폴링하는 빈도에 제한이 있으므로 이 값을 최소 14일로 설정하는 것이 좋으며, 그렇지 않으면 그 이전에는 링크 미리 보기 카드가 제때 업데이트되지 않을 것입니다.
+ min_age: 사용자들은 가입할 때 생일을 확인받게 됩니다
peers_api_enabled: 이 서버가 연합우주에서 만났던 서버들에 대한 도메인 네임의 목록입니다. 해당 서버와 어떤 연합을 했는지에 대한 정보는 전혀 포함되지 않고, 단순히 그 서버를 알고 있는지에 대한 것입니다. 이것은 일반적으로 연합에 대한 통계를 수집할 때 사용됩니다.
profile_directory: 프로필 책자는 발견되기를 희망하는 모든 사람들의 목록을 나열합니다.
require_invite_text: 가입이 수동 승인을 필요로 할 때, "왜 가입하려고 하나요?" 항목을 선택사항으로 두는 것보다는 필수로 두는 것이 낫습니다
@@ -256,6 +258,7 @@ ko:
name: 해시태그
filters:
actions:
+ blur: 경고와 함께 미디어 숨기기
hide: 완전히 숨기기
warn: 경고와 함께 숨기기
form_admin_settings:
diff --git a/config/locales/simple_form.lt.yml b/config/locales/simple_form.lt.yml
index f1d739f253..d3febceea9 100644
--- a/config/locales/simple_form.lt.yml
+++ b/config/locales/simple_form.lt.yml
@@ -72,6 +72,7 @@ lt:
filters:
action: Pasirink, kokį veiksmą atlikti, kai įrašas atitinka filtrą
actions:
+ blur: Slėpti mediją po įspėjimu, neslepiant paties teksto
hide: Visiškai paslėpti filtruotą turinį ir elgtis taip, tarsi jo neegzistuotų
warn: Slėpti filtruojamą turinį po įspėjimu, paminint filtro pavadinimą
form_admin_settings:
@@ -183,6 +184,7 @@ lt:
name: Saitažodis
filters:
actions:
+ blur: Slėpti mediją su įspėjimu
hide: Slėpti visiškai
warn: Slėpti su įspėjimu
form_admin_settings:
diff --git a/config/locales/simple_form.lv.yml b/config/locales/simple_form.lv.yml
index 28dbfcc08e..19e517340d 100644
--- a/config/locales/simple_form.lv.yml
+++ b/config/locales/simple_form.lv.yml
@@ -75,6 +75,7 @@ lv:
filters:
action: Izvēlies, kuru darbību veikt, ja ziņa atbilst filtram
actions:
+ blur: Paslēpt informācijas nesējus aiz brīdinājuma, nepaslēpjot tekstu
hide: Paslēp filtrēto saturu pilnībā, izturoties tā, it kā tas neeksistētu
warn: Paslēp filtrēto saturu aiz brīdinājuma, kurā minēts filtra nosaukums
form_admin_settings:
diff --git a/config/locales/simple_form.nl.yml b/config/locales/simple_form.nl.yml
index 6569562047..6029698bd7 100644
--- a/config/locales/simple_form.nl.yml
+++ b/config/locales/simple_form.nl.yml
@@ -75,6 +75,7 @@ nl:
filters:
action: Kies welke acties uitgevoerd moeten wanneer een bericht overeenkomt met het filter
actions:
+ blur: Media verbergen achter een waarschuwing, zonder de tekst zelf te verbergen
hide: Verberg de gefilterde inhoud volledig, alsof het niet bestaat
warn: Verberg de gefilterde inhoud achter een waarschuwing, met de titel van het filter als waarschuwingstekst
form_admin_settings:
@@ -260,6 +261,7 @@ nl:
name: Hashtag
filters:
actions:
+ blur: Media met een waarschuwing verbergen
hide: Volledig verbergen
warn: Met een waarschuwing verbergen
form_admin_settings:
diff --git a/config/locales/simple_form.nn.yml b/config/locales/simple_form.nn.yml
index 1463d8582d..1a33a4b91d 100644
--- a/config/locales/simple_form.nn.yml
+++ b/config/locales/simple_form.nn.yml
@@ -75,6 +75,7 @@ nn:
filters:
action: Velg kva som skal gjerast når eit innlegg samsvarar med filteret
actions:
+ blur: Gøym media bak ei åtvaring utan å gøyme sjølve teksten
hide: Skjul filtrert innhald fullstendig og lat som om det ikkje finst
warn: Skjul det filtrerte innhaldet bak ei åtvaring som nemner tittelen på filteret
form_admin_settings:
@@ -256,6 +257,7 @@ nn:
name: Emneknagg
filters:
actions:
+ blur: Gøym media med ei åtvaring
hide: Gøym heilt
warn: Gøym med ei åtvaring
form_admin_settings:
diff --git a/config/locales/simple_form.sq.yml b/config/locales/simple_form.sq.yml
index b482f17600..9f5ada184c 100644
--- a/config/locales/simple_form.sq.yml
+++ b/config/locales/simple_form.sq.yml
@@ -75,6 +75,7 @@ sq:
filters:
action: Zgjidhni cili veprim të kryhet, kur një postim ka përputhje me një filtër
actions:
+ blur: Fshihe median pas një sinjalizimi, pa fshehur vetë tekstin
hide: Fshihe plotësisht lëndën e filtruar, duke u sjellë sikur të mos ekzistonte
warn: Fshihe lëndën e filtruar pas një sinjalizimi që përmend titullin e filtrit
form_admin_settings:
@@ -259,6 +260,7 @@ sq:
name: Hashtag
filters:
actions:
+ blur: Fshihe median me një sinjalizim
hide: Fshihe plotësisht
warn: Fshihe me një sinjalizim
form_admin_settings:
diff --git a/config/locales/simple_form.tr.yml b/config/locales/simple_form.tr.yml
index efe5ab5add..22300ccec3 100644
--- a/config/locales/simple_form.tr.yml
+++ b/config/locales/simple_form.tr.yml
@@ -75,6 +75,7 @@ tr:
filters:
action: Bir gönderi filtreyle eşleştiğinde hangi eylemin yapılacağını seçin
actions:
+ blur: Medyayı, metnin kendisini gizlemeden bir uyarı arkasında gizle
hide: Filtrelenmiş içeriği tamamen gizle, sanki varolmamış gibi
warn: Süzgeçlenmiş içeriği, süzgecinin başlığından söz eden bir uyarının arkasında gizle
form_admin_settings:
@@ -260,6 +261,7 @@ tr:
name: Etiket
filters:
actions:
+ blur: Medyayı bir uyarıyla gizle
hide: Tamamen gizle
warn: Uyarıyla gizle
form_admin_settings:
diff --git a/config/locales/simple_form.uk.yml b/config/locales/simple_form.uk.yml
index 55906a2ac2..b43aaeb234 100644
--- a/config/locales/simple_form.uk.yml
+++ b/config/locales/simple_form.uk.yml
@@ -75,6 +75,7 @@ uk:
filters:
action: Виберіть дію для виконання коли допис збігається з фільтром
actions:
+ blur: Приховати медіа за попередженням, не приховуючи сам текст
hide: Повністю сховати фільтрований вміст, ніби його не існує
warn: Сховати відфільтрований вміст за попередженням, у якому вказано заголовок фільтра
form_admin_settings:
@@ -258,6 +259,7 @@ uk:
name: Хештеґ
filters:
actions:
+ blur: Приховати медіа з попередженням
hide: Сховати повністю
warn: Сховати за попередженням
form_admin_settings:
diff --git a/config/locales/simple_form.vi.yml b/config/locales/simple_form.vi.yml
index ca03eaac71..8b78787f86 100644
--- a/config/locales/simple_form.vi.yml
+++ b/config/locales/simple_form.vi.yml
@@ -75,6 +75,7 @@ vi:
filters:
action: Chọn hành động sẽ thực hiện khi một tút khớp với bộ lọc
actions:
+ blur: Ẩn sau một cảnh báo, mà không ảnh hưởng nội dung
hide: Ẩn hoàn toàn, như thể nó không tồn tại
warn: Hiện cảnh báo và bộ lọc
form_admin_settings:
@@ -260,6 +261,7 @@ vi:
name: Hashtag
filters:
actions:
+ blur: Ẩn kèm theo cảnh báo
hide: Ẩn toàn bộ
warn: Ẩn kèm theo cảnh báo
form_admin_settings:
diff --git a/config/locales/simple_form.zh-CN.yml b/config/locales/simple_form.zh-CN.yml
index d1857df502..5fd28497af 100644
--- a/config/locales/simple_form.zh-CN.yml
+++ b/config/locales/simple_form.zh-CN.yml
@@ -133,11 +133,15 @@ zh-CN:
name: 你只能改变字母的大小写，让它更易读
terms_of_service:
changelog: 可以使用 Markdown 语法。
+ effective_date: 合理的时间范围可以是从您通知用户之日起 10 到 30 天。
text: 可以使用 Markdown 语法。
terms_of_service_generator:
admin_email: 法务通知包括反通知、法院命令、内容下架要求与执法机关的要求。
+ arbitration_address: 可以与上面的实际地址相同，如果使用电子邮件则为“N/A”。
+ arbitration_website: 可以是网页表单，如果使用电子邮件则为“N/A”。
choice_of_law: 适用内部实质法律以管辖任何及所有索赔的城市、地区、领土或州。
dmca_address: 如果你是位于美国的运营者，请使用在 DMCA 指定代表名录中注册的地址。如果你需要使用邮政信箱，可以直接申请。请使用 DMCA 指定代表邮政信箱豁免申请表，通过电子邮件联系版权办公室，并声明你是居家内容审核员，因担心审核操作会招致报复或打击报复，需要使用邮政信箱以避免公开家庭住址。
+ dmca_email: 可以与上面“法律声明的电子邮件地址”使用相同的电子邮件地址。
domain: 你所提供的在线服务的唯一标识。
jurisdiction: 请列出支付运营费用者所在的国家/地区。如果为公司或其他实体，请列出其注册的国家/地区以及相应的城市、地区、领地或州。
min_age: 不应低于您所在地法律管辖权要求的最低年龄。
@@ -256,6 +260,7 @@ zh-CN:
name: 话题
filters:
actions:
+ blur: 隐藏媒体并显示警告
hide: 完全隐藏
warn: 隐藏时显示警告
form_admin_settings:
diff --git a/config/locales/simple_form.zh-TW.yml b/config/locales/simple_form.zh-TW.yml
index a3b57a090e..fc86c77b74 100644
--- a/config/locales/simple_form.zh-TW.yml
+++ b/config/locales/simple_form.zh-TW.yml
@@ -75,6 +75,7 @@ zh-TW:
filters:
action: 請選擇當嘟文符合該過濾器時將被執行之動作
actions:
+ blur: 將多媒體隱藏於警告之後，而不隱藏文字內容
hide: 完全隱藏過濾內容，當作它似乎不曾存在過
warn: 隱藏過濾內容於過濾器標題之警告後
form_admin_settings:
@@ -260,6 +261,7 @@ zh-TW:
name: "「#」主題標籤"
filters:
actions:
+ blur: 將多媒體隱藏於警告之後
hide: 完全隱藏
warn: 隱藏於警告之後
form_admin_settings:
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 2f8d03eec4..9b7ae7897d 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -1089,7 +1089,7 @@ th:
salutation: "%{name},"
settings: 'เปลี่ยนการกำหนดลักษณะอีเมล: %{link}'
unsubscribe: เลิกบอกรับ
- view: 'มุมมอง:'
+ view: 'ดู:'
view_profile: ดูโปรไฟล์
view_status: ดูโพสต์
applications: