diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-08-25 05:07:39 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-08-25 05:07:39 +0200 |
| commit | 2d1d4210f9d394ea8e7357df08f8ca2cc925384a (patch) | |
| tree | a5c69693d11b59a673b1981ea2d85bbc17991c42 /config/locales | |
| parent | 5a3d09dc8e30198b4d8d921ef0b1ba0a35fe01d9 (diff) | |
| parent | 861b35dd54d266bc0a40b3cacb28e5b82ff6faaa (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Diffstat (limited to 'config/locales')
| -rw-r--r-- | config/locales/en.yml | 15 | ||||
| -rw-r--r-- | config/locales/simple_form.en.yml | 2 |
2 files changed, 17 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index 2cd4f45ac..596cc1a28 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1181,6 +1181,8 @@ en: edit: add_keyword: Add keyword keywords: Keywords + statuses: Individual posts + statuses_hint_html: This filter applies to select individual posts regardless of whether they match the keywords below. You can review these posts and remove them from the filter by <a href="%{path}">clicking here</a>. title: Edit filter errors: deprecated_api_multiple_keywords: These parameters cannot be changed from this application because they apply to more than one filter keyword. Use a more recent application or the web interface. @@ -1194,10 +1196,23 @@ en: keywords: one: "%{count} keyword" other: "%{count} keywords" + statuses: + one: "%{count} post" + other: "%{count} posts" + statuses_long: + one: "%{count} individual post hidden" + other: "%{count} individual posts hidden" title: Filters new: save: Save new filter title: Add new filter + statuses: + back_to_filter: Back to filter + batch: + remove: Remove from filter + index: + hint: This filter applies to select individual posts regardless of other criteria. You can add more posts to this filter from the Web interface. + title: Filtered posts footer: developers: Developers more: More… diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index c17a62cbe..28f78d500 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -85,6 +85,7 @@ en: ip: Enter an IPv4 or IPv6 address. You can block entire ranges using the CIDR syntax. Be careful not to lock yourself out! severities: no_access: Block access to all resources + sign_up_block: New sign-ups will not be possible sign_up_requires_approval: New sign-ups will require your approval severity: Choose what will happen with requests from this IP rule: @@ -219,6 +220,7 @@ en: ip: IP severities: no_access: Block access + sign_up_block: Block sign-ups sign_up_requires_approval: Limit sign-ups severity: Rule notification_emails: |