Conflicts:
- `.github/workflows/build-image.yml`:
Upstream changed how docker images were built, including how
they were cached.
I don't know much about it, so applied upstream's changes.
- `app/controllers/admin/domain_blocks_controller.rb`:
The feature, that was in glitch-soc, got backported upstream.
It also had a few fixes upstream, so those have been ported!
- `app/javascript/packs/admin.js`:
Glitch-soc changes have been backported upstream. As a result,
some code from `app/javascript/core/admin.js` got added upstream.
Kept our version since our shared Javascript already has that feature.
- `app/models/user.rb`:
Upstream added something to distinguish unusable and unusable-because-moved
accounts, while glitch-soc considers moved accounts usable.
Took upstream's code for `functional_or_moved?` and made `functional?`
call it.
- `app/views/statuses/_simple_status.html.haml`:
Upstream cleaned up code style a bit, on a line that we had custom changes
for.
Applied upstream's change while keeping our change.
- `config/initializers/content_security_policy.rb`:
Upstream adopted one CSP directive we already had.
The conflict is because of our files being structurally different, but the
change itself was already part of glitch-soc.
Kept our version.
created_msg:Domain has been successfully allowed for federation
created_msg:Domain has been successfully allowed for federation
destroyed_msg:Domain has been disallowed from federation
destroyed_msg:Domain has been disallowed from federation
export:Export
import:Import
undo:Disallow federation with domain
undo:Disallow federation with domain
domain_blocks:
domain_blocks:
add_new:Add new domain block
add_new:Add new domain block
@ -382,15 +384,19 @@ en:
edit:Edit domain block
edit:Edit domain block
existing_domain_block:You have already imposed stricter limits on %{name}.
existing_domain_block:You have already imposed stricter limits on %{name}.
existing_domain_block_html:You have already imposed stricter limits on %{name}, you need to <a href="%{unblock_url}">unblock it</a> first.
existing_domain_block_html:You have already imposed stricter limits on %{name}, you need to <a href="%{unblock_url}">unblock it</a> first.
export:Export
import:Import
new:
new:
create:Create block
create:Create block
hint:The domain block will not prevent creation of account entries in the database, but will retroactively and automatically apply specific moderation methods on those accounts.
hint:The domain block will not prevent creation of account entries in the database, but will retroactively and automatically apply specific moderation methods on those accounts.
severity:
severity:
desc_html:"<strong>Silence</strong> will make the account's posts invisible to anyone who isn't following them. <strong>Suspend</strong> will remove all of the account's content, media, and profile data. Use <strong>None</strong> if you just want to reject media files."
desc_html:"<strong>Limit</strong> will make posts from accounts at this domain invisible to anyone who isn't following them. <strong>Suspend</strong> will remove all content, media, and profile data for this domain's accounts from your server. Use <strong>None</strong> if you just want to reject media files."
noop:None
noop:None
silence:Silence
silence:Limit
suspend:Suspend
suspend:Suspend
title:New domain block
title:New domain block
no_domain_block_selected:Nodomain blocks were changed as none were selected
not_permitted:You are not permitted to perform this action
obfuscate:Obfuscate domain name
obfuscate:Obfuscate domain name
obfuscate_hint:Partially obfuscate the domain name in the list if advertising the list of domain limitations is enabled
obfuscate_hint:Partially obfuscate the domain name in the list if advertising the list of domain limitations is enabled
private_comment:Private comment
private_comment:Private comment
@ -422,6 +428,20 @@ en:
resolved_dns_records_hint_html:The domain name resolves to the following MX domains, which are ultimately responsible for accepting e-mail. Blocking an MX domain will block sign-ups from any e-mail address which uses the same MX domain, even if the visible domain name is different. <strong>Be careful not to block major e-mail providers.</strong>
resolved_dns_records_hint_html:The domain name resolves to the following MX domains, which are ultimately responsible for accepting e-mail. Blocking an MX domain will block sign-ups from any e-mail address which uses the same MX domain, even if the visible domain name is different. <strong>Be careful not to block major e-mail providers.</strong>
resolved_through_html:Resolved through %{domain}
resolved_through_html:Resolved through %{domain}
title:Blocked e-mail domains
title:Blocked e-mail domains
export_domain_allows:
new:
title:Import domain allows
no_file:Nofile selected
export_domain_blocks:
import:
description_html:You are about to import a list of domain blocks. Please review this list very carefully, especially if you have not authored this list yourself.
private_comment_description_html: 'To help you track where imported blocks come from, imported blocks will be created with the following private comment:<q>%{comment}</q>'
private_comment_template:Imported from %{source} on %{date}
title:Import domain blocks
new:
title:Import domain blocks
no_file:Nofile selected
follow_recommendations:
follow_recommendations:
description_html:"<strong>Follow recommendations help new users quickly find interesting content</strong>. When a user has not interacted with others enough to form personalized follow recommendations, these accounts are recommended instead. They are re-calculated on a daily basis from a mix of accounts with the highest recent engagements and highest local follower counts for a given language."
description_html:"<strong>Follow recommendations help new users quickly find interesting content</strong>. When a user has not interacted with others enough to form personalized follow recommendations, these accounts are recommended instead. They are re-calculated on a daily basis from a mix of accounts with the highest recent engagements and highest local follower counts for a given language."
language:For language
language:For language
@ -914,7 +934,7 @@ en:
warning:Be very careful with this data. Never share it with anyone!
warning:Be very careful with this data. Never share it with anyone!
your_token:Your access token
your_token:Your access token
auth:
auth:
apply_for_account:Get on waitlist
apply_for_account:Request an account
change_password:Password
change_password:Password
delete_account:Delete account
delete_account:Delete account
delete_account_html:If you wish to delete your account, you can <a href="%{path}">proceed here</a>. You will be asked for confirmation.
delete_account_html:If you wish to delete your account, you can <a href="%{path}">proceed here</a>. You will be asked for confirmation.