Browse Source

Merge branch 'main' into glitch-soc/merge-upstream

main
Claire 3 weeks ago
parent
commit
d799fe2082
  1. 4
      Gemfile.lock
  2. 1
      app/controllers/api/v1/tags_controller.rb
  3. 18
      app/javascript/mastodon/components/hashtag.js
  4. 26
      app/javascript/mastodon/features/ui/components/image_loader.js
  5. 8
      app/javascript/mastodon/locales/defaultMessages.json
  6. 3
      app/javascript/mastodon/locales/en.json
  7. 6
      app/javascript/mastodon/locales/th.json
  8. 10
      app/javascript/mastodon/locales/zh-CN.json
  9. 13
      app/javascript/styles/mastodon/components.scss
  10. 2
      app/models/account.rb
  11. 2
      app/models/tag.rb
  12. 6
      config/locales/activerecord.af.yml
  13. 2
      config/locales/activerecord.ca.yml
  14. 1
      config/locales/activerecord.da.yml
  15. 6
      config/locales/activerecord.el.yml
  16. 2
      config/locales/activerecord.es-AR.yml
  17. 9
      config/locales/activerecord.es-MX.yml
  18. 2
      config/locales/activerecord.es.yml
  19. 2
      config/locales/activerecord.gl.yml
  20. 2
      config/locales/activerecord.hu.yml
  21. 2
      config/locales/activerecord.io.yml
  22. 2
      config/locales/activerecord.is.yml
  23. 2
      config/locales/activerecord.it.yml
  24. 2
      config/locales/activerecord.ko.yml
  25. 2
      config/locales/activerecord.lv.yml
  26. 9
      config/locales/activerecord.pl.yml
  27. 2
      config/locales/activerecord.pt-PT.yml
  28. 1
      config/locales/activerecord.ru.yml
  29. 2
      config/locales/activerecord.sl.yml
  30. 2
      config/locales/activerecord.sq.yml
  31. 9
      config/locales/activerecord.th.yml
  32. 2
      config/locales/activerecord.uk.yml
  33. 14
      config/locales/activerecord.zh-CN.yml
  34. 2
      config/locales/activerecord.zh-TW.yml
  35. 2
      config/locales/devise.ko.yml
  36. 9
      config/locales/doorkeeper.th.yml
  37. 24
      config/locales/eo.yml
  38. 22
      config/locales/is.yml
  39. 2
      config/locales/ko.yml
  40. 8
      config/locales/pl.yml
  41. 2
      config/locales/simple_form.is.yml
  42. 1
      config/locales/simple_form.ko.yml
  43. 8
      config/locales/simple_form.pl.yml
  44. 26
      config/locales/simple_form.th.yml
  45. 31
      config/locales/simple_form.zh-CN.yml
  46. 14
      config/locales/th.yml
  47. 69
      config/locales/zh-CN.yml
  48. 2
      config/routes.rb
  49. 24
      package.json
  50. 1227
      yarn.lock

4
Gemfile.lock

@ -407,7 +407,7 @@ GEM
net-ssh (>= 2.6.5, < 7.0.0)
net-ssh (6.1.0)
nio4r (2.5.8)
nokogiri (1.13.6)
nokogiri (1.13.7)
mini_portile2 (~> 2.8.0)
racc (~> 1.4)
nsa (0.2.8)
@ -415,7 +415,7 @@ GEM
concurrent-ruby (~> 1.0, >= 1.0.2)
sidekiq (>= 3.5)
statsd-ruby (~> 1.4, >= 1.4.0)
oj (3.13.16)
oj (3.13.17)
omniauth (1.9.1)
hashie (>= 3.4.6)
rack (>= 1.6.2, < 3)

1
app/controllers/api/v1/tags_controller.rb

@ -24,6 +24,7 @@ class Api::V1::TagsController < Api::BaseController
private
def set_or_create_tag
return not_found unless /\A(#{Tag::HASHTAG_NAME_RE})\z/.match?(params[:id])
@tag = Tag.find_normalized(params[:id]) || Tag.new(name: Tag.normalize(params[:id]), display_name: params[:id])
end
end

18
app/javascript/mastodon/components/hashtag.js

@ -1,7 +1,7 @@
// @ts-check
import React from 'react';
import { Sparklines, SparklinesCurve } from 'react-sparklines';
import { FormattedMessage } from 'react-intl';
import { FormattedMessage, injectIntl, defineMessages } from 'react-intl';
import PropTypes from 'prop-types';
import ImmutablePropTypes from 'react-immutable-proptypes';
import Permalink from './permalink';
@ -9,6 +9,10 @@ import ShortNumber from 'mastodon/components/short_number';
import Skeleton from 'mastodon/components/skeleton';
import classNames from 'classnames';
const messages = defineMessages({
totalVolume: { id: 'hashtag.total_volume', defaultMessage: 'Total volume in the last {days, plural, one {day} other {{days} days}}' },
});
class SilentErrorBoundary extends React.Component {
static propTypes = {
@ -41,10 +45,11 @@ class SilentErrorBoundary extends React.Component {
export const accountsCountRenderer = (displayNumber, pluralReady) => (
<FormattedMessage
id='trends.counter_by_accounts'
defaultMessage='{count, plural, one {{counter} person} other {{counter} people}} talking'
defaultMessage='{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}'
values={{
count: pluralReady,
counter: <strong>{displayNumber}</strong>,
days: 2,
}}
/>
);
@ -64,7 +69,7 @@ ImmutableHashtag.propTypes = {
hashtag: ImmutablePropTypes.map.isRequired,
};
const Hashtag = ({ name, href, to, people, uses, history, className }) => (
const Hashtag = injectIntl(({ name, href, to, people, uses, history, className, intl }) => (
<div className={classNames('trends__item', className)}>
<div className='trends__item__name'>
<Permalink href={href} to={to}>
@ -74,9 +79,10 @@ const Hashtag = ({ name, href, to, people, uses, history, className }) => (
{typeof people !== 'undefined' ? <ShortNumber value={people} renderer={accountsCountRenderer} /> : <Skeleton width={100} />}
</div>
<div className='trends__item__current'>
<abbr className='trends__item__current' title={intl.formatMessage(messages.totalVolume, { days: 2 })}>
{typeof uses !== 'undefined' ? <ShortNumber value={uses} /> : <Skeleton width={42} height={36} />}
</div>
<span className='trends__item__current__asterisk'>*</span>
</abbr>
<div className='trends__item__sparkline'>
<SilentErrorBoundary>
@ -86,7 +92,7 @@ const Hashtag = ({ name, href, to, people, uses, history, className }) => (
</SilentErrorBoundary>
</div>
</div>
);
));
Hashtag.propTypes = {
name: PropTypes.string,

26
app/javascript/mastodon/features/ui/components/image_loader.js

@ -1,10 +1,10 @@
import React from 'react';
import PropTypes from 'prop-types';
import classNames from 'classnames';
import PropTypes from 'prop-types';
import React, { PureComponent } from 'react';
import { LoadingBar } from 'react-redux-loading-bar';
import ZoomableImage from './zoomable_image';
export default class ImageLoader extends React.PureComponent {
export default class ImageLoader extends PureComponent {
static propTypes = {
alt: PropTypes.string,
@ -43,7 +43,7 @@ export default class ImageLoader extends React.PureComponent {
this.loadImage(this.props);
}
componentWillReceiveProps (nextProps) {
UNSAFE_componentWillReceiveProps (nextProps) {
if (this.props.src !== nextProps.src) {
this.loadImage(nextProps);
}
@ -139,14 +139,18 @@ export default class ImageLoader extends React.PureComponent {
return (
<div className={className}>
<LoadingBar loading={loading ? 1 : 0} className='loading-bar' style={{ width: this.state.width || width }} />
{loading ? (
<canvas
className='image-loader__preview-canvas'
ref={this.setCanvasRef}
width={width}
height={height}
/>
<>
<div className='loading-bar__container' style={{ width: this.state.width || width }}>
<LoadingBar className='loading-bar' loading={1} />
</div>
<canvas
className='image-loader__preview-canvas'
ref={this.setCanvasRef}
width={width}
height={height}
/>
</>
) : (
<ZoomableImage
alt={alt}

8
app/javascript/mastodon/locales/defaultMessages.json

@ -290,7 +290,11 @@
{
"descriptors": [
{
"defaultMessage": "{count, plural, one {{counter} person} other {{counter} people}} talking",
"defaultMessage": "Total volume in the last {days, plural, one {day} other {{days} days}}",
"id": "hashtag.total_volume"
},
{
"defaultMessage": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
"id": "trends.counter_by_accounts"
}
],
@ -3765,4 +3769,4 @@
],
"path": "app/javascript/mastodon/features/video/index.json"
}
]
]

3
app/javascript/mastodon/locales/en.json

@ -224,6 +224,7 @@
"hashtag.column_settings.tag_mode.any": "Any of these",
"hashtag.column_settings.tag_mode.none": "None of these",
"hashtag.column_settings.tag_toggle": "Include additional tags for this column",
"hashtag.total_volume": "Total volume in the last {days, plural, one {day} other {{days} days}}",
"home.column_settings.basic": "Basic",
"home.column_settings.show_reblogs": "Show boosts",
"home.column_settings.show_replies": "Show replies",
@ -522,7 +523,7 @@
"timeline_hint.resources.followers": "Followers",
"timeline_hint.resources.follows": "Follows",
"timeline_hint.resources.statuses": "Older posts",
"trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
"trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
"trends.trending_now": "Trending now",
"ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
"units.short.billion": "{count}B",

6
app/javascript/mastodon/locales/th.json

@ -198,7 +198,7 @@
"explore.trending_tags": "แฮชแทก",
"follow_recommendations.done": "เสรจสน",
"follow_recommendations.heading": "ตดตามผคนทณตองการเหนโพสต! นอขอเสนอแนะบางสวน",
"follow_recommendations.lead": "Posts from people you follow will show up in chronological order on your home feed. Don't be afraid to make mistakes, you can unfollow people just as easily any time!",
"follow_recommendations.lead": "โพสตจากคนทณตดตามจะแสดงตามลำดบเวลาบนฟดหลกของคณ อยากลวทจะทำผดพลาด คณสามารถเลกตดตามผคนไดายๆ ทกเม!",
"follow_request.authorize": "อนญาต",
"follow_request.reject": "ปฏเสธ",
"follow_requests.unlocked_explanation": "แมาไมการลอคบญชของคณ พนกงานของ {domain} คดวาคณอาจตองการตรวจทานคำขอตดตามจากบญชเหลานวยตนเอง",
@ -268,7 +268,7 @@
"lightbox.next": "ถดไป",
"lightbox.previous": "กอนหนา",
"limited_account_hint.action": "แสดงโปรไฟลอไป",
"limited_account_hint.title": "This profile has been hidden by the moderators of your server.",
"limited_account_hint.title": "โปรไฟลกซอนไวโดยโมเดอเรเตอรของเซฟเวอรของค",
"lists.account.add": "เพมไปยงรายการ",
"lists.account.remove": "เอาออกจากรายการ",
"lists.delete": "ลบรายการ",
@ -360,7 +360,7 @@
"notifications.permission_denied_alert": "ไมสามารถเปดใชงานการแจงเตอนบนเดสกอป เนองจากมการปฏเสธสทธอนญาตเบราวเซอรอนหนาน",
"notifications.permission_required": "การแจงเตอนบนเดสกอปไมพรอมใชงานเนองจากไมไดใหทธอนญาตทจำเปน",
"notifications_permission_banner.enable": "เปดใชงานการแจงเตอนบนเดสกอป",
"notifications_permission_banner.how_to_control": "To receive notifications when Mastodon isn't open, enable desktop notifications. You can control precisely which types of interactions generate desktop notifications through the {icon} button above once they're enabled.",
"notifications_permission_banner.how_to_control": "หากตองการรบการแจงเตอนเมอไมไดเปด Mastodon ใหเปดใชการแจงเตอนบนเดสกอป คณสามารถควบคมไดตามความตองการดวยการโตตอบประเภททสรางการแจงเตอนบนเดสกอปผานปม {icon} ดานบนเมอเปดใชงาน",
"notifications_permission_banner.title": "ไมพลาดสงใด",
"picture_in_picture.restore": "นำกลบมา",
"poll.closed": "ปดแลว",

10
app/javascript/mastodon/locales/zh-CN.json

@ -314,7 +314,7 @@
"navigation_bar.preferences": "首选项",
"navigation_bar.public_timeline": "跨站公共时间轴",
"navigation_bar.security": "安全",
"notification.admin.report": "{name} reported {target}",
"notification.admin.report": "{name} 已报告 {target}",
"notification.admin.sign_up": "{name} 注册了",
"notification.favourite": "{name} 喜欢了你的嘟文",
"notification.follow": "{name} 开始关注你",
@ -327,7 +327,7 @@
"notification.update": "{name} 编辑了嘟文",
"notifications.clear": "清空通知列表",
"notifications.clear_confirmation": "你确定要永久清空通知列表吗?",
"notifications.column_settings.admin.report": "New reports:",
"notifications.column_settings.admin.report": "新报告",
"notifications.column_settings.admin.sign_up": "新注册:",
"notifications.column_settings.alert": "桌面通知",
"notifications.column_settings.favourite": "喜欢:",
@ -433,7 +433,7 @@
"report.thanks.title_actionable": "感谢提交举报,我们将会进行处理。",
"report.unfollow": "取消关注 @{name}",
"report.unfollow_explanation": "你正在关注此账户。如果要想在你的主页上不再看到他们的帖子,取消对他们的关注即可。",
"report_notification.attached_statuses": "{count, plural, one {{count} post} other {{count} posts}} attached",
"report_notification.attached_statuses": "{count, plural, one {{count} 嘟文} other {{count} 嘟文}} 附件",
"report_notification.categories.other": "其他",
"report_notification.categories.spam": "骚扰",
"report_notification.categories.violation": "违反规则",
@ -468,7 +468,7 @@
"status.embed": "嵌入",
"status.favourite": "喜欢",
"status.filtered": "已过滤",
"status.hide": "Hide toot",
"status.hide": "屏蔽嘟文",
"status.history.created": "{name} 创建于 {date}",
"status.history.edited": "{name} 编辑于 {date}",
"status.load_more": "加载更多",
@ -492,7 +492,7 @@
"status.report": "举报 @{name}",
"status.sensitive_warning": "敏感内容",
"status.share": "分享",
"status.show_filter_reason": "Show anyway",
"status.show_filter_reason": "继续显示",
"status.show_less": "隐藏内容",
"status.show_less_all": "隐藏全部内容",
"status.show_more": "显示更多",

13
app/javascript/styles/mastodon/components.scss

@ -1783,10 +1783,14 @@ a.account__display-name {
object-fit: contain;
}
.loading-bar {
.loading-bar__container {
position: relative;
}
.loading-bar {
position: absolute;
}
&.image-loader--amorphous .image-loader__preview-canvas {
display: none;
}
@ -7239,6 +7243,13 @@ noscript {
padding-right: 15px;
margin-left: 5px;
color: $secondary-text-color;
text-decoration: none;
&__asterisk {
color: $darker-text-color;
font-size: 18px;
vertical-align: super;
}
}
&__sparkline {

2
app/models/account.rb

@ -62,7 +62,7 @@ class Account < ApplicationRecord
)
USERNAME_RE = /[a-z0-9_]+([a-z0-9_\.-]+[a-z0-9_]+)?/i
MENTION_RE = /(?<=^|[^\/[:word:]])@((#{USERNAME_RE})(?:@[[:alnum:]\.\-]+[[:alnum:]]+)?)/i
MENTION_RE = /(?<=^|[^\/[:word:]])@((#{USERNAME_RE})(?:@[[:word:]\.\-]+[[:word:]]+)?)/i
URL_PREFIX_RE = /\Ahttp(s?):\/\/[^\/]+/
include Attachmentable

2
app/models/tag.rb

@ -27,7 +27,7 @@ class Tag < ApplicationRecord
has_many :followers, through: :passive_relationships, source: :account
HASHTAG_SEPARATORS = "_\u00B7\u200c"
HASHTAG_NAME_RE = "([[:alnum:]_][[:alnum:]#{HASHTAG_SEPARATORS}]*[[:alpha:]#{HASHTAG_SEPARATORS}][[:alnum:]#{HASHTAG_SEPARATORS}]*[[:alnum:]_])|([[:alnum:]_]*[[:alpha:]][[:alnum:]_]*)"
HASHTAG_NAME_RE = "([[:word:]_][[:word:]#{HASHTAG_SEPARATORS}]*[[:alpha:]#{HASHTAG_SEPARATORS}][[:word:]#{HASHTAG_SEPARATORS}]*[[:word:]_])|([[:word:]_]*[[:alpha:]][[:word:]_]*)"
HASHTAG_RE = /(?:^|[^\/\)\w])#(#{HASHTAG_NAME_RE})/i
validates :name, presence: true, format: { with: /\A(#{HASHTAG_NAME_RE})\z/i }

6
config/locales/activerecord.af.yml

@ -38,3 +38,9 @@ af:
email:
blocked: maak gebruik van 'n e-pos verskaffer wat nie toegelaat word nie
unreachable: blyk nie te bestaan nie
user_role:
attributes:
permissions_as_keys:
own_role: kan nie verander word met jou huidige rol nie
position:
own_role: kan nie verander word met jou huidige rol nie

2
config/locales/activerecord.ca.yml

@ -45,5 +45,7 @@ ca:
permissions_as_keys:
dangerous: inclou permisos que no són segurs per al rol base
elevated: no pot incloure permisos que el teu rol actual no té
own_role: no es pot canviar amb el teu rol actual
position:
elevated: no pot ser superior al teu rol actual
own_role: no pot ser canviat amb el teu rol actual

1
config/locales/activerecord.da.yml

@ -45,5 +45,6 @@ da:
permissions_as_keys:
dangerous: omfat tilladelser, som ikke er sikre for basisrollen
elevated: kan ikke omfatte tilladelser, din aktuelle rolle ikke besidder
own_role: kan ikke ændres med din aktuelle rolle
position:
elevated: kan ikke være højere end din aktuelle rolle

6
config/locales/activerecord.el.yml

@ -30,3 +30,9 @@ el:
email:
blocked: χρησιμοποιεί μη επιτρεπόμενο πάροχο e-mail
unreachable: δεν φαίνεται να υπάρχει
user_role:
attributes:
permissions_as_keys:
own_role: δεν μπορεί να αλλάξει με τον τρέχοντα ρόλο σας
position:
own_role: δεν μπορεί να αλλάξει με τον τρέχοντα ρόλο σας

2
config/locales/activerecord.es-AR.yml

@ -45,5 +45,7 @@ es-AR:
permissions_as_keys:
dangerous: incluir permisos que no son seguros para el rol base
elevated: no se pueden incluir permisos que tu rol actual no posea
own_role: no se puede cambiar con tu rol actual
position:
elevated: no puede ser mayor que tu rol actual
own_role: no se puede cambiar con tu rol actual

9
config/locales/activerecord.es-MX.yml

@ -38,3 +38,12 @@ es-MX:
email:
blocked: utiliza un proveedor de correo no autorizado
unreachable: no parece existir
role_id:
elevated: no puede ser mayor que tu rol actual
user_role:
attributes:
permissions_as_keys:
dangerous: incluir permisos que no son seguros para el rol base
elevated: no se pueden incluir permisos que tu rol actual no posea
position:
elevated: no puede ser mayor que tu rol actual

2
config/locales/activerecord.es.yml

@ -45,5 +45,7 @@ es:
permissions_as_keys:
dangerous: incluir permisos que no son seguros para el rol base
elevated: no se pueden incluir permisos que tu rol actual no posea
own_role: no se puede cambiar con tu rol actual
position:
elevated: no puede ser mayor que tu rol actual
own_role: no se puede cambiar con tu rol actual

2
config/locales/activerecord.gl.yml

@ -45,5 +45,7 @@ gl:
permissions_as_keys:
dangerous: inclúe permisos que non son seguros para o rol básico
elevated: non pode incluir permisos que o teu rol actual non posúe
own_role: non pode ser modificado co teu rol actual
position:
elevated: non pode superar ao teu rol actual
own_role: non pode ser modificado co teu rol actual

2
config/locales/activerecord.hu.yml

@ -45,5 +45,7 @@ hu:
permissions_as_keys:
dangerous: tartalmaz olyan engedélyeket is, melyek az alap szerephez nem biztonságosak
elevated: nem tartalmazhat olyan engedélyeket, melyek nincsenek benne a jelenlegi szerepedben
own_role: nem megváltoztatható a jelenlegi szerepköröddel
position:
elevated: nem lehet magasabb, mint a jelenlegi szereped
own_role: nem megváltoztatható a jelenlegi szerepköröddel

2
config/locales/activerecord.io.yml

@ -45,5 +45,7 @@ io:
permissions_as_keys:
dangerous: inkluzas permisi quo ne esas segura por bazrolo
elevated: ne povas inkluzar permisi quon vua nuna rolo ne havas
own_role: ne povas divenesar kun vua nuna rolo
position:
elevated: ne povas divenar plu alta kam vua nuna rolo
own_role: ne povas divenesar kun vua nuna rolo

2
config/locales/activerecord.is.yml

@ -45,5 +45,7 @@ is:
permissions_as_keys:
dangerous: hefur heimildir sem ekki eru öruggar fyrir grunnhlutverk
elevated: getur ekki haft heimildir sem núverandi hlutverk þitt er ekki með
own_role: er ekki hægt að breyta með þinu hlutverki
position:
elevated: getur ekki verið veigameiri en núverandi hlutverk þitt
own_role: er ekki hægt að breyta með þinu hlutverki

2
config/locales/activerecord.it.yml

@ -45,5 +45,7 @@ it:
permissions_as_keys:
dangerous: include i permessi non sicuri per il ruolo di base
elevated: non è possibile includere i permessi che il tuo ruolo attuale non possiede
own_role: non può essere modificato con il tuo ruolo attuale
position:
elevated: non può essere superiore al tuo ruolo attuale
own_role: non può essere modificato con il tuo ruolo attuale

2
config/locales/activerecord.ko.yml

@ -45,5 +45,7 @@ ko:
permissions_as_keys:
dangerous: 기본 역할로 사용하기에 안전하지 않은 권한을 포함하고 있습니다
elevated: 당신의 현재 역할이 가지고 있지 않은 권한은 포함할 수 없습니다
own_role: 당신의 현재 역할을 변경할 수 없습니다
position:
elevated: 당신의 현재 역할보다 높을 수 없습니다
own_role: 당신의 현재 역할을 변경할 수 없습니다

2
config/locales/activerecord.lv.yml

@ -45,5 +45,7 @@ lv:
permissions_as_keys:
dangerous: ietver atļaujas, kas nav drošas pamata lomai
elevated: nevar ietvert atļaujas, kas nepieder tavai pašreizējai lomai
own_role: nevar mainīt pert tavu pašreizējo lomu
position:
elevated: nevar būt augstāka par tavu pašreizējo lomu
own_role: nevar mainīt pert tavu pašreizējo lomu

9
config/locales/activerecord.pl.yml

@ -38,3 +38,12 @@ pl:
email:
blocked: używa niedozwolonego dostawcy poczty elektronicznej
unreachable: wydaje się nie istnieć
role_id:
elevated: nie może być wyższa niż twoja bieżąca rola
user_role:
attributes:
permissions_as_keys:
own_role: nie można zmienić z aktualną rolą
position:
elevated: nie może być wyższa niż twoja bieżąca rola
own_role: nie można zmienić z aktualną rolą

2
config/locales/activerecord.pt-PT.yml

@ -45,5 +45,7 @@ pt-PT:
permissions_as_keys:
dangerous: incluir permissões que não são seguras para a função base
elevated: não pode incluir permissões que a sua função atual não possui
own_role: não pode ser alterado com a sua função atual
position:
elevated: não pode ser maior que o da sua função atual
own_role: não pode ser alterado com a sua função atual

1
config/locales/activerecord.ru.yml

@ -44,3 +44,4 @@ ru:
attributes:
permissions_as_keys:
dangerous: включить разрешения, небезопасные для базовой роли
own_role: невозможно изменить с вашей текущей ролью

2
config/locales/activerecord.sl.yml

@ -45,5 +45,7 @@ sl:
permissions_as_keys:
dangerous: vključi pravice, ki niso varne za osnovno vlogo
elevated: ni mogoče vključiti pravic, ki jih vaša trenutna vloga ne vsebuje
own_role: ni mogoče spremeniti z vašo trenutno vlogo
position:
elevated: ne more biti višje od vaše trenutne vloge
own_role: ni mogoče spremeniti z vašo trenutno vlogo

2
config/locales/activerecord.sq.yml

@ -45,5 +45,7 @@ sq:
permissions_as_keys:
dangerous: përfshi leje që s’janë të parrezik për rolin bazë
elevated: s’mund të përfshijë leje të cilat roli juaj i tanishëm s’i përfshin
own_role: s’mund të ndryshohet me rolin tuaj të tanishëm
position:
elevated: s’mund të jetë më i lartë sesa roli juaj i tanishëm
own_role: s’mund të ndryshohet me rolin tuaj të tanishëm

9
config/locales/activerecord.th.yml

@ -38,3 +38,12 @@ th:
email:
blocked: ใชใหบรการอเมลทไมไดบอนญาต
unreachable: เหมอนวาจะไมอย
role_id:
elevated: ไมสามารถสงกวาบทบาทปจจนของค
user_role:
attributes:
permissions_as_keys:
dangerous: รวมสทธไมปลอดภยสำหรบบทบาทพนฐาน
elevated: ไมสามารถรวบรวมสทธในบทบาทปจจนของคณไมได
position:
elevated: ไมสามารถสงกวาบทบาทปจจนของค

2
config/locales/activerecord.uk.yml

@ -45,5 +45,7 @@ uk:
permissions_as_keys:
dangerous: включити небезпечні для базової ролі дозволи
elevated: не можна включити права, якими не володіє ваша поточна роль
own_role: не можна змінити у вашій поточній ролі
position:
elevated: не може бути вищою за поточну роль
own_role: не можна змінити у вашій поточній ролі

14
config/locales/activerecord.zh-CN.yml

@ -25,6 +25,10 @@ zh-CN:
attributes:
url:
invalid: 不是有效的 URL。
doorkeeper/application:
attributes:
website:
invalid: 网址无效
status:
attributes:
reblog:
@ -34,3 +38,13 @@ zh-CN:
email:
blocked: 使用了被封禁的电子邮件提供商
unreachable: 似乎不存在
role_id:
elevated: 不能高于您当前的角色
user_role:
attributes:
permissions_as_keys:
dangerous: 包含对基本角色不安全的权限
elevated: 不能包含您当前角色不拥有的权限
own_role: 无法以您当前的身份更改
position:
elevated: 不能高于您当前的角色

2
config/locales/activerecord.zh-TW.yml

@ -45,5 +45,7 @@ zh-TW:
permissions_as_keys:
dangerous: 包含對基本角色不安全的權限
elevated: 不能包含您目前角色不具備的權限
own_role: 無法被您目前的角色更改
position:
elevated: 不能高於您目前的角色
own_role: 無法被您目前的角色更改

2
config/locales/devise.ko.yml

@ -7,7 +7,7 @@ ko:
send_paranoid_instructions: 당신의 이메일이 우리의 DB에 있을 경우 몇 분 이내로 확인 메일이 발송 됩니다. 이메일을 받지 못 한 경우, 스팸 폴더를 확인하세요.
failure:
already_authenticated: 이미 로그인 된 상태입니다.
inactive: 계정이 활성화 되지 않았습니다.
inactive: 계정이 아직 활성화 되지 않았습니다.
invalid: 올바르지 않은 %{authentication_keys} 혹은 패스워드입니다.
last_attempt: 계정이 잠기기까지 한 번의 시도가 남았습니다.
locked: 계정이 잠겼습니다.

9
config/locales/doorkeeper.th.yml

@ -81,16 +81,25 @@ th:
errors:
messages:
access_denied: เจาของทรพยากรหรอเซฟเวอรการอนญาตปฏเสธคำขอ
credential_flow_not_configured: การไหลของขอมลรบรองรหสผานเจาของทรพยากรลมเหลวเนองจาก Doorkeeper.configure.resource_owner_from_credentials ไมไดกกำหนดค
invalid_client: การตรวจสอบสทธไคลเอนตมเหลวเนองจากไคลเอนตไมก ไมรวมการตรวจสอบไคลเอนต หรอวการตรวจสอบสทธไมรองร
invalid_grant: การใหทธระบไมกตอง หมดอาย เพกถอน ไมตรงกบ URI การเปลยนเสนทางทใชในคำขอการใหทธ หรอออกใหไคลเอนต
invalid_redirect_uri: URI การเปลยนเสนทางทรวมอยไมกตอง
invalid_request:
missing_param: 'พารามเตอรจำเปนขาดหายไป: %{value}'
request_not_authorized: คำขอตองไดบอนญาต พารามเตอรจำเปนสำหรบการใหทธคำขอขาดหายไปหรอไมกตอง
unknown: คำขอไมพารามเตอรจำเปน มาพารามเตอรไมรองรบ หรออยในรปแบบทไมกตอง
invalid_resource_owner: อมลรบรองเจาของทรพยากรทระบไมกตอง หรอไมพบเจาของทรพยากร
invalid_scope: ขอบเขตทขอไมกตอง ไมก หรอผดรปแบบ
invalid_token:
expired: โทเคนการเขาถงหมดอายแล
revoked: เพกถอนโทเคนการเขาถงแล
unknown: โทเคนการเขาถงไมกตอง
resource_owner_authenticator_not_configured: การคนหาเจาของทรพยากรลมเหลวเนองจากไมไดกำหนดคา Doorkeeper.configure.resource_owner_authenticator
server_error: เซฟเวอรการใหทธพบสภาวะทไมคาดคดซงทำใหไมสามารถดำเนนการตามคำขอได
temporarily_unavailable: ขณะนเซฟเวอรการใหทธไมสามารถจดการตามคำขอได เนองจากการโอเวอรโหลดหรอมการบำรงรกษาเซฟเวอรวคราว
unauthorized_client: ไคลเอนตไมไดบอนญาตใหทำคำขอนโดยใชการน
unsupported_grant_type: ประเภทการใหทธไมไดบการสนบสนนโดยเซฟเวอรการใหทธนะ
unsupported_response_type: เซฟเวอรการอนญาตไมรองรบชนดการตอบสนองน
flash:
applications:

24
config/locales/eo.yml

@ -2,15 +2,15 @@
eo:
about:
about_hashtag_html: Ĉi tiuj estas la publikaj mesaĝoj markitaj per <strong>#%{hashtag}</strong>. Vi povas interagi kun ili se vi havas konton ie ajn en la fediverse.
about_mastodon_html: Mastodon estas socia reto bazita sur malfermitaj retaj protokoloj kaj sur libera malfermitkoda programo. Ĝi estas sencentra kiel retmesaĝoj.
about_mastodon_html: 'Mastodon estas socia retejo de la estonteco: sen reklamo, sen kompania gvato, etika dezajno kaj malcentraligo! Vi regu viajn datumojn kun Mastodon!'
about_this: Pri
active_count_after: aktiva
active_count_after: aktivaj
active_footnote: Monate Aktivaj Uzantoj (MAU)
administered_by: 'Administrata de:'
api: API
apps: Poŝtelefonaj aplikaĵoj
apps_platforms: Uzu Mastodon ĉe iOS, Android kaj aliajn platformojn
browse_directory: Esplori profilujo kaj filtri per interesoj
apps_platforms: Uzu Mastodon de iOS, Android, kaj aliaj substratoj
browse_directory: Esplori la profilujon kaj filtri en interesoj
browse_local_posts: Vidi vivantan fluon de publikaj mesaĝoj al Mastodon
browse_public_posts: Vidi vivantan fluon de publikaj mesaĝoj al Mastodon
contact: Kontakto
@ -40,11 +40,12 @@ eo:
unavailable_content: Moderigitaj serviloj
unavailable_content_description:
domain: Servilo
reason: 'Kialo:'
reason: Motivo
rejecting_media: 'La aŭdovidaj dosieroj de ĉi tiuj serviloj ne estos prilaboritaj aŭ stokitaj, kaj neniu bildeto estos montrita, do necesas klaki permane por vidi la originalan afiŝon:'
rejecting_media_title: Filtritaj aŭdovidaĵoj
silenced: 'La mesaĝoj de tiuj serviloj estos kaŝitaj de publikaj templinio kaj konversacioj, kaj la interagoj de la uzantoj donas neniun sciigon, ĝis vi sekvos ilin:'
silenced_title: Silentigitaj serviloj
silenced_title: Limigitaj serviloj
suspended: 'Neniu datumo de ĉi tiuj serviloj estos prilaboritaj, stokitaj, aŭ interŝanĝitaj, neeble fari interagon aŭ komunikon kun la uzantoj de ĉi tiuj serviloj:'
suspended_title: Suspenditaj serviloj
user_count_after:
one: uzanto
@ -154,8 +155,9 @@ eo:
push_subscription_expires: Eksvalidiĝo de la abono al PuSH
redownload: Aktualigi profilon
reject: Malakcepti
remove_avatar: Forigi la rolfigron
remove_avatar: Forigi la rolfiguron
remove_header: Forigi kapan bildon
removed_avatar_msg: La bildo de la rolfiguro de %{username} estas sukcese forigita
resend_confirmation:
already_confirmed: Ĉi tiu uzanto jam estas konfirmita
send: Resendi konfirman retmesaĝon
@ -227,7 +229,7 @@ eo:
memorialize_account: Memorigu Konton
promote_user: Promocii Uzanton
reject_user: Malakcepti Uzanton
remove_avatar_user: Forigi la rolfigron
remove_avatar_user: Forigi la rolfiguron
reopen_report: Remalfermi signalon
reset_password_user: Restarigi pasvorton
resolve_report: Solvitaj reporto
@ -518,6 +520,8 @@ eo:
view_profile: Vidi profilon
roles:
everyone: Implicitaj permesoj
privileges:
delete_user_data: Forviŝi la datumojn de la uzanto
rules:
add_new: Aldoni regulon
delete: Forigi
@ -1117,7 +1121,7 @@ eo:
ios: iOS
linux: Linux
mac: Mac
other: nekonata platformo
other: nekonata substrato
windows: Windows
windows_mobile: Windows Mobile
windows_phone: Windows Phone
@ -1262,7 +1266,7 @@ eo:
suspend: Konto suspendita
welcome:
edit_profile_action: Agordi profilon
edit_profile_step: Vi povas proprigi vian profilon per alŝuto de profilbildo, fonbildo, ŝanĝo de via afiŝita nomo kaj pli. Se vi ŝatus kontroli novajn sekvantojn antaŭ ol ili rajtas sekvi vin, vi povas ŝlosi vian konton.
edit_profile_step: Vi povas personecigi vian profilon en alŝuto de rolfiguro, paĝokapa bildo, en ŝanĝo de via vidiga nomo kaj pli. Se vi volas ekzameni novajn sekvantojn antaŭ ol permesi al ili aboni vin, vi povas agordi vian konton kiel privata.
explanation: Jen kelkaj konsiloj por helpi vin komenci
final_action: Ekmesaĝi
final_step: 'Ekmesaĝu! Eĉ sen sekvantoj, viaj publikaj mesaĝoj povas esti vidataj de aliaj, ekzemple en la loka templinio kaj en la kradvortoj. Eble vi ŝatus prezenti vin per la kradvorto #introductions.'

22
config/locales/is.yml

@ -538,7 +538,7 @@ is:
public_comment: Opinber athugasemd
purge: Henda
purge_description_html: Ef þú heldur að þetta lén sé farið endanlega af netinu, geturðu eytt öllum færslum aðganga og tengdum gögnum frá þessu léni úr gagnageymslum þínum. Þetta gæti tekið þó nokkra stund.
title: Samband
title: Netþjónasambönd
total_blocked_by_us: Útilokað af okkur
total_followed_by_them: Fylgt af þeim
total_followed_by_us: Fylgt af okkur
@ -681,10 +681,30 @@ is:
manage_appeals_description: Leyfir notendum að yfirfara áfrýjanir vegna aðgerða umsjónarfólks
manage_blocks: Sýsla með útilokanir
manage_blocks_description: Leyfir notendum að loka á tölvupóstþjónustur og IP-vistföng
manage_custom_emojis: Sýsla með sérsniðin tjáningartákn
manage_custom_emojis_description: Leyfir notendum að sýsla með sérsniðin tjáningartákn á netþjóninum
manage_federation: Sýsla með netþjónasambönd
manage_federation_description: Leyfir notendum að loka á eða leyfa samþættingu við önnur lén (federation) og stýra afhendingu skilaboða
manage_invites: Sýsla með boðsgesti
manage_invites_description: Leyfir notendum að vafra um og gera boðstengla óvirka
manage_reports: Sýsla með kærur
manage_reports_description: Leyfir notendum að yfirfara kærur og framkvæma umsýsluaðgerðir sem byggjast á þeim
manage_roles: Sýsla með hlutverk
manage_roles_description: Leyfir notendum að sýsla með hlutverk og úthluta hlutverkum sem eru réttminni en þeirra eigið
manage_rules: Sýsla með reglur
manage_rules_description: Leyfir notendum að breyta reglum á netþjóninum
manage_settings: Sýsla með stillingar
manage_settings_description: Leyfir notendum að breyta stillingum vefsvæðisins
manage_taxonomies: Sýsla með vægi efnis
manage_taxonomies_description: Leyfir notendum að yfirfara vinsælt efni og uppfæra stillingar myllumerkja
manage_user_access: Sýsla með notendaaðgang
manage_user_access_description: Leyfir notendum að gera tveggja-þátta auðkenningu annarra notenda óvirka, breyta tölvupóstfangi þeirra og endurstilla lykilorð
manage_users: Sýsla með notendur
manage_users_description: Leyfir notendum að sýsla með nánari upplýsingar um aðra notendur og framkvæma umsýsluaðgerðir gagnvart þeim
manage_webhooks: Sýsla með Webhook-vefkrækjur
manage_webhooks_description: Leyfir notendum að setja upp webhook-vefkrækjur vagna stjórnunartengdra atburða
view_audit_log: Skoða atvikaskráningu
view_audit_log_description: Leyfir notendum að skoða feril stjórnunaraðgerða á netþjóninum
view_dashboard: Skoða stjórnborð
view_dashboard_description: Leyfir notendum að skoða stjórnborðið og sjá ýmsar mælingar
view_devops: Kerfisstjórar

2
config/locales/ko.yml

@ -648,8 +648,10 @@ ko:
moderation: 중재
special: 특수
delete: 삭제
description_html: "<strong>사용자 역할</strong>을 통해, 사용자들이 마스토돈의 어떤 기능과 영역에 접근할 수 있을지 설정할 수 있습니다."
edit: "%{name} 역할 수정"
everyone: 기본 권한
everyone_full_description_html: 이것은 <strong>모든 사용자</strong>에게 적용될 <strong>기본 역할</strong>이며, 역할을 지정하지 않아도 적용됩니다. 다른 모든 역할들은 여기에서 권한을 상속합니다.
permissions_count:
other: "%{count} 개의 권한"
privileges:

8
config/locales/pl.yml

@ -725,6 +725,14 @@ pl:
manage_taxonomies: Zarządzaj taksonomiami
manage_taxonomies_description: Pozwala użytkownikom przeglądać najpopularniejsze treści i aktualizować ustawienia hasztagów
manage_user_access: Zarządzaj dostępem użytkownika
manage_users: Zarządzanie użytkownikami
manage_webhooks: Zarządzanie webhookami
view_audit_log: Wyświetl dziennik zdarzeń
view_audit_log_description: Pozwala użytkownikom zobaczyć historię działań administracyjnych na serwerze
view_dashboard: Wyświetl panel
view_devops: Devops
view_devops_description: Pozwala użytkownikom na dostęp do paneli Sidekiq i pgHero
title: Role
rules:
add_new: Dodaj zasadę
delete: Usuń

2
config/locales/simple_form.is.yml

@ -98,9 +98,11 @@ is:
chosen_languages: Þegar merkt er við þetta, birtast einungis færslur á völdum tungumálum á opinberum tímalínum
role: Hlutverk stýrir hvaða heimildir notandinn hefur
user_role:
color: Litur sem notaður er fyrir hlutverkið allsstaðar í viðmótinu, sem RGB-gildi á hex-sniði
highlighted: Þetta gerir hlutverk sýnilegt opinberlega
name: Opinbert heiti hlutverks, ef birta á hlutverk sem merki
permissions_as_keys: Notendur með þetta hlutverk munu hafa aðgang að...
position: Rétthærra hlutverk ákvarðar lausn árekstra í ákveðnum tilfellum. Sumar aðgerðir er aðeins hægt að framkvæma á hlutverk með lægri forgangi
webhook:
events: Veldu atburði sem á að senda
url: Hvert atburðir verða sendir

1
config/locales/simple_form.ko.yml

@ -102,6 +102,7 @@ ko:
highlighted: 이 역할이 공개적으로 보이도록 설정합니다
name: 역할이 배지로 표시될 경우, 그 역할에 대한 공개적인 이름입니다
permissions_as_keys: 이 역할을 가진 사용자는 다음에 접근할 수 있게 됩니다...
position: 특정 상황에서 충돌이 발생할 경우 더 높은 역할이 충돌을 해결합니다. 특정 작업은 우선순위가 낮은 역할에 대해서만 수행될 수 있습니다
webhook:
events: 전송할 이벤트를 선택하세요
url: 이벤트가 어디로 전송될 지

8
config/locales/simple_form.pl.yml

@ -234,6 +234,14 @@ pl:
name: Hashtag
trendable: Pozwól na wyświetlanie tego hashtagu w „Na czasie”
usable: Pozwól na umieszczanie tego hashtagu we wpisach
user:
role: Rola
user_role:
color: Kolor odznaki
highlighted: Wyświetl rolę jako odznakę na profilach użytkowników
name: Nazwa
permissions_as_keys: Uprawnienia
position: Priorytet
webhook:
events: Włączone zdarzenia
url: Endpoint URL

26
config/locales/simple_form.th.yml

@ -64,9 +64,15 @@ th:
domain_allow:
domain: โดเมนนจะสามารถดงขอมลจากเซฟเวอรและจะประมวลผลและจดเกบขอมลขาเขาจากโดเมน
email_domain_block:
domain: อาจเปนชอโดเมนทแสดงในทอยเมลหรอทะเบยน MX ทใชอย พวกเขาอาจจะไดบการตรวจสอบเมอมการสมคร
with_dns_records: จะทำการพยายามแปลงทอยระเบยน DNS ของโดเมนทกำหนดและจะปดกนผลลพธเชนก
featured_tag:
name: 'คณอาจตองการใชหนงในน:'
filters:
action: เลอกการดำเนนการเมอโพสตตรงกบตวกรอง
actions:
hide: อนเนอหาทกกรองโดยสนเชง ทำตวราวกบวาไมอยจร
warn: อนเนอหาทกกรองไวานหลงคำเตอนทกลาวถงชอตวกรอง
form_challenge:
current_password: ณกำลงเขาสนทปลอดภ
imports:
@ -75,6 +81,7 @@ th:
text: จะชวยใหเราตรวจทานใบสมครของค
ip_block:
comment: ไมจำเปน จดจำเหตผลทณเพมกฎน
expires_in: อย IP เปนทรพยากร บางครงมการแบงปนและมกเปลยนมอ ดวยเหตผลนงไมแนะนำใหบลอก IP
ip: อนทอย IPv4 หรอ IPv6 คณสามารถปดกนทงชวงไดโดยใชไวยากรณ CIDR ระวงอยาลอคตวคณเองออก!
severities:
no_access: ดกนการเขาถงทรพยากรทงหมด
@ -84,12 +91,21 @@ th:
text: อธบายกฎหรอขอกำหนดสำหรบผใชในเซฟเวอร พยายามทำใหกฎหรอขอกำหนดสนและเรยบงาย
sessions:
otp: 'ปอนรหสสองปจจยทสรางโดยแอปในโทรศพทของคณหรอใชหนงในรหสกนของคณ:'
webauthn: หากเปนค USB อยาลมเสยบไว และหากจำเปน ใหแตะคนไวนะ
tag:
name: ณสามารถเปลยนไดเฉพาะตวพมพใหญเลกของตวอกษรเทานน ตวอยางเชน เพอทำใหวอกษรอานไดายข
user:
chosen_languages: เมอกาเครองหมาย จะแสดงเฉพาะโพสตในภาษาทเลอกในเสนเวลาสาธารณะเทาน
role: ควบคมบทบาท วาผใชทธใดบาง
user_role:
color: จะใชสำหรบบทบาทตลอดทง UI เปน RGB ในรปแบบฐานสบหก
highlighted: ทำใหบทบาทนปรากฏตอสสาธารณะ
name: อสาธารณะของบทบาท หากกำหนดบทบาทใหแสดงเปนตราสญลกษณ
permissions_as_keys: ใชบทบาทนจะมทธเขาถง...
position: บทบาททงขนอาจจะตดสนใจแกไขขอขดแยงในบางสถานการณ การดำเนนการบางอยางสามารถทำไดเฉพาะกบบทบาททลำดบความสำคญตำกว
webhook:
events: เลอกเหตการณจะส
url: จกรรมจะถกสงไปท
labels:
account:
fields:
@ -120,6 +136,8 @@ th:
scheduled_at: ดกำหนดการเผยแพร
starts_at: การเรมตนเหตการณ
text: ประกาศ
appeal:
text: อธบายวาเหตใดจงควรกลบคำตดสนน
defaults:
autofollow: เชญใหดตามบญชของค
avatar: ภาพประจำต
@ -184,6 +202,10 @@ th:
with_dns_records: รวมระเบยน MX และ IP ของโดเมน
featured_tag:
name: แฮชแท
filters:
actions:
hide: อนอยางสมบรณ
warn: อนพรอมคำเตอน
interactions:
must_be_follower: ดกนการแจงเตอนจากผไมใชดตาม
must_be_following: ดกนการแจงเตอนจากผคนทณไมไดดตาม
@ -220,9 +242,13 @@ th:
user:
role: บทบาท
user_role:
color: ของตรา
highlighted: แสดงบทบาทเปนเครองหมายบนโปรไฟลใช
name:
permissions_as_keys: ทธอนญาต
position: ระดบความสำค
webhook:
events: เปดใชงานอเว
url: URL ปลายทาง
'no': ไม
recommended: แนะนำ

31
config/locales/simple_form.zh-CN.yml

@ -68,6 +68,11 @@ zh-CN:
with_dns_records: Mastodon 会尝试解析所给域名的 DNS 记录,然后把解析结果一并封禁
featured_tag:
name: 你可能想要使用以下之一:
filters:
action: 选择在帖子匹配过滤器时要执行的操作
actions:
hide: 彻底屏蔽过滤内容,犹如它不曾存在过一般
warn: 在警告中提及过滤器标题后,隐藏过滤内容
form_challenge:
current_password: 你正在进入安全区域
imports:
@ -91,6 +96,16 @@ zh-CN:
name: 你只能改变字母的大小写,让它更易读
user:
chosen_languages: 仅选中语言的嘟文会出现在公共时间轴上(全不选则显示所有语言的嘟文)
role: 角色决定该用户拥有的权限
user_role:
color: 整个用户界面中,该角色使用的颜色,以RGB 十六进制格式
highlighted: 这使角色公开可见
name: 角色的公开名称,如果角色设置为展示的徽章
permissions_as_keys: 具有此角色的用户将有权访问...
position: 较高的角色决定在某些情况下解决冲突。某些行动只能对优先级较低的角色执行
webhook:
events: 选择要发送的事件
url: 事件将发送到哪个地点
labels:
account:
fields:
@ -178,6 +193,7 @@ zh-CN:
setting_use_pending_items: 慢速模式
severity: 级别
sign_in_token_attempt: 安全码
title: 标题
type: 导入数据类型
username: 用户名
username_or_email: 用户名或电子邮件地址
@ -186,6 +202,10 @@ zh-CN:
with_dns_records: 包括该域名的 MX 记录和 IP 地址
featured_tag:
name: 话题标签
filters:
actions:
hide: 完全隐藏
warn: 隐藏时显示警告信息
interactions:
must_be_follower: 屏蔽来自未关注我的用户的通知
must_be_following: 屏蔽来自我未关注的用户的通知
@ -219,6 +239,17 @@ zh-CN:
name: 话题标签
trendable: 允许在热门下显示此话题
usable: 允许嘟文使用此话题标签
user:
role: 角色
user_role:
color: 徽章颜色
highlighted: 用户配置中以徽章显示角色
name: 名称
permissions_as_keys: 权限设置
position: 优先权
webhook:
events: 已启用事件
url: 端点网址
'no':
recommended: 推荐
required:

14
config/locales/th.yml

@ -22,6 +22,9 @@ th:
federation_hint_html: วยบญช %{instance} คณจะสามารถตดตามผคนในเซฟเวอร Mastodon และอน ๆ
get_apps: ลองแอปมอถ
hosted_on: Mastodon ทโฮสต %{domain}
instance_actor_flash: 'บญชเปนนกแสดงเสมอนทใชเพอเปนตวแทนของเซฟเวอรเอง ไมใชใชรายบคคล แตนกกใชเพอวตถประสงคในการรวมกลมและไมควรถกบลอก เวนแตณตองการบลอกทงอนสแตนซน ซงในกรณณควรใชบลอกโดเมนนะ
'
learn_more: เรยนรเพมเต
logged_in_as_html: ณกำลงเขาสระบบเปน %{username} ในปจจ
logout_before_registering: ณไดเขาสระบบอยแล
@ -46,6 +49,7 @@ th:
silenced_title: เซฟเวอรจำกดอย
suspended: 'จะไมประมวลผล จดเกบ หรอแลกเปลยนขอมลจากเซฟเวอรเหลาน ทำใหการโตตอบหรอการสอสารใด ๆ กบผใชจากเซฟเวอรเหลานเปนไปไมได:'
suspended_title: เซฟเวอรระงบอย
unavailable_content_html: โดยทวไปแลว Mastodon อนญาตใหณดเนอหาและโตตอบกบผใชงานจากเซฟเวอรนใน fediverse เหลานเปนขอยกเวนทเกดขนบนเซฟเวอรโดยเฉพาะ
user_count_after:
other: ใช
user_count_before: านของ
@ -58,6 +62,7 @@ th:
followers:
other: ดตาม
following: กำลงตดตาม
instance_actor_flash: ญชเปนนกแสดงเสมอนทใชเพอเปนตวแทนของเซฟเวอรเอง แตไมใชใชรายบคคล แตนถกใชเพอวตถประสงคของการรวมกลมและไมควรถกระง
joined: เขารวมเม