diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-01-18 17:38:11 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2023-01-18 17:38:11 +0100 |
| commit | 60abcb3c4c4ba899f0b4bb477c1629ecc2cd4a59 (patch) | |
| tree | 02c9edee1c75254299e5385966eb8508f6ec0670 /config/i18n-tasks.yml | |
| parent | 472fd4307f9c963aba57e537e3ca3a8f94dfa139 (diff) | |
| parent | 3588fbc76641311ab97ef530e2df4df4934805c5 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `config/i18n-tasks.yml`: Upstream added new ignored strings, glitch-soc has extra ignored strings because of the theming system. Added upstream's changes.
Diffstat (limited to 'config/i18n-tasks.yml')
| -rw-r--r-- | config/i18n-tasks.yml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml index 334511efe..a3b5e5c72 100644 --- a/config/i18n-tasks.yml +++ b/config/i18n-tasks.yml @@ -65,9 +65,11 @@ ignore_unused: - 'errors.429' - 'admin.accounts.roles.*' - 'admin.action_logs.actions.*' - - 'themes.*' + - 'admin.reports.summary.action_preambles.*' + - 'admin.reports.summary.actions.*' - 'admin_mailer.new_appeal.actions.*' - 'statuses.attached.*' + - 'themes.*' - 'move_handler.carry_{mutes,blocks}_over_text' - 'notification_mailer.*' |