diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-11-20 13:27:48 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-11-20 13:27:48 +0100 |
| commit | 48f0f3ffeeb2b3dfb8af7d4d0fba3b64697d125c (patch) | |
| tree | 665a41c2543505b75b24b41761bc5d0ff9e9b458 /config/locales/en.yml | |
| parent | db01f8b942b72eaa2eacbb144261b002f8079c9c (diff) | |
| parent | 8b8004a9626442ae31e4dffd79e874e9cde050c6 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `.github/ISSUE_TEMPLATE/bug_report.md`: Upstream added the `bug` label to bug reports. Did the same. - `app/services/fan_out_on_write_service.rb`: Upstream put DMs back into timelines, glitch-soc was already doing it. Ignored upstream changes.
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 bec099082..263ffcdc7 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -842,6 +842,7 @@ en: request: Request your archive size: Size blocks: You block + bookmarks: Bookmarks csv: CSV domain_blocks: Domain blocks lists: Lists @@ -918,6 +919,7 @@ en: success: Your data was successfully uploaded and will now be processed in due time types: blocking: Blocking list + bookmarks: Bookmarks domain_blocking: Domain blocking list following: Following list muting: Muting list |