diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-10-30 18:15:28 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-10-30 18:15:28 +0100 |
| commit | eee36267d627ae08898d2b3301f56ce729055e82 (patch) | |
| tree | dae581a9867b8dcdd2c3ab0154794a1ff10ad98e /config/locales/en.yml | |
| parent | 26ff48ee48a5c03a2a4b0bd03fd322529e6bd960 (diff) | |
| parent | ac9fb0d654440ce1179bab4071941450aa994d2c (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/javascript/mastodon/locales/ja.json`: Upstream change too close to a glitch-soc-specific string. The glitch-soc-specific string should not have been in this file, so it has been moved to `app/javascript/flavours/glitch/locales/ja.js`. - `app/javascript/packs/public.js`: Upstream refactored a part, that as usual is split and duplicated in various pack files. Updated those pack files accordingly. - `app/views/layouts/application.html.haml`: Upstream fixed custom.css path in a different way than we did, went with upstream's change.
Diffstat (limited to 'config/locales/en.yml')
| -rw-r--r-- | config/locales/en.yml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index fd845c3c2..547b19f07 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1249,6 +1249,8 @@ en: carry_blocks_over_text: This user moved from %{acct}, which you had blocked. carry_mutes_over_text: This user moved from %{acct}, which you had muted. copy_account_note_text: 'This user moved from %{acct}, here were your previous notes about them:' + navigation: + toggle_menu: Toggle menu notification_mailer: admin: report: |