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

Merge commit '3a1a6ba39e' into kb_migration_development

Browse source
This commit is contained in:
KMY 2023-05-01 15:08:16 +09:00
commit 81a7272ce7
288 changed files with 1345 additions and 1343 deletions
Download patch file Download diff file Expand all files Collapse all files

32
config/locales/en.yml
View file

@ -414,8 +414,8 @@ en:
private_comment_hint: Comment about this domain limitation for internal use by the moderators.
public_comment: Public comment
public_comment_hint: Comment about this domain limitation for the general public, if advertising the list of domain limitations is enabled.
reject_favourite: Reject favourites
reject_favourite_hint: Reject favourites or emoji-reaction in the future
reject_favourite: Reject favorites
reject_favourite_hint: Reject favorites or emoji-reaction in the future
reject_hashtag: Reject hashtags
reject_hashtag_hint: Reject hashtags in the future
reject_media: Reject media files
@ -507,7 +507,7 @@ en:
description_html: You can define content policies that will be applied to all accounts from this domain and any of its subdomains.
limited_federation_mode_description_html: You can chose whether to allow federation with this domain.
policies:
reject_favourite: Reject favourite
reject_favourite: Reject favorite
reject_hashtag: Reject hashtags
reject_media: Reject media
reject_new_follow: Reject follows
@ -808,7 +808,7 @@ en:
remove_from_report: Remove from report
report: Report
deleted: Deleted
favourites: Favourites
favourites: Favorites
force_cw: Force CW
force_nsfw: Force NSFW
history: Version history
@ -895,14 +895,14 @@ en:
statuses:
allow: Allow post
allow_account: Allow author
description_html: These are posts that your server knows about that are currently being shared and favourited a lot at the moment. It can help your new and returning users to find more people to follow. No posts are displayed publicly until you approve the author, and the author allows their account to be suggested to others. You can also allow or reject individual posts.
description_html: These are posts that your server knows about that are currently being shared and favorited a lot at the moment. It can help your new and returning users to find more people to follow. No posts are displayed publicly until you approve the author, and the author allows their account to be suggested to others. You can also allow or reject individual posts.
disallow: Disallow post
disallow_account: Disallow author
no_status_selected: No trending posts were changed as none were selected
not_discoverable: Author has not opted-in to being discoverable
shared_by:
one: Shared or favourited one time
other: Shared and favourited %{friendly_count} times
one: Shared or favorited one time
other: Shared and favorited %{friendly_count} times
title: Trending posts
tags:
current_score: Current score %{score}
@ -1423,9 +1423,9 @@ en:
sign_up:
subject: "%{name} signed up"
favourite:
body: 'Your post was favourited by %{name}:'
subject: "%{name} favourited your post"
title: New favourite
body: 'Your post was favorited by %{name}:'
subject: "%{name} favorited your post"
title: New favorite
emoji_reaction:
body: 'Your post was reacted with emoji by %{name}:'
subject: "%{name} reacted your post with emoji"
@ -1673,10 +1673,10 @@ en:
exceptions: Exceptions
explanation: Because deleting posts is an expensive operation, this is done slowly over time when the server is not otherwise busy. For this reason, your posts may be deleted a while after they reach the age threshold.
ignore_emojis: Ignore emoji reactions
ignore_favs: Ignore favourites
ignore_favs: Ignore favorites
ignore_reblogs: Ignore boosts
interaction_exceptions: Exceptions based on interactions
interaction_exceptions_explanation: Note that there is no guarantee for posts to be deleted if they go below the favourite or boost threshold after having once gone over them.
interaction_exceptions_explanation: Note that there is no guarantee for posts to be deleted if they go below the favorite or boost threshold after having once gone over them.
keep_direct: Keep direct messages
keep_direct_hint: Doesn't delete any of your direct messages
keep_media: Keep posts with media attachments
@ -1687,8 +1687,8 @@ en:
keep_polls_hint: Doesn't delete any of your polls
keep_self_bookmark: Keep posts you bookmarked
keep_self_bookmark_hint: Doesn't delete your own posts if you have bookmarked them
keep_self_fav: Keep posts you favourited
keep_self_fav_hint: Doesn't delete your own posts if you have favourited them
keep_self_fav: Keep posts you favorited
keep_self_fav_hint: Doesn't delete your own posts if you have favorited them
min_age:
'1209600': 2 weeks
'15778476': 6 months
@ -1701,8 +1701,8 @@ en:
min_age_label: Age threshold
min_emojis: Keep posts emoji-reacted at least
min_emojis_hint: Doesn't delete any of your posts that has received at least this number of emoji reactions. Leave blank to delete posts regardless of their number of emojis
min_favs: Keep posts favourited at least
min_favs_hint: Doesn't delete any of your posts that has received at least this number of favourites. Leave blank to delete posts regardless of their number of favourites
min_favs: Keep posts favorited at least
min_favs_hint: Doesn't delete any of your posts that has received at least this number of favorites. Leave blank to delete posts regardless of their number of favorites
min_reblogs: Keep posts boosted at least
min_reblogs_hint: Doesn't delete any of your posts that has been boosted at least this number of times. Leave blank to delete posts regardless of their number of boosts
stream_entries: