diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2020-12-05 17:33:29 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2020-12-05 17:33:37 +0100 |
| commit | f8d867bac43e7e18d293ac32a9be597d1f46dce3 (patch) | |
| tree | b3d950a01a8dee5403081f56cf0c6b0571954e90 /config/locales/zgh.yml | |
| parent | 13df125b6c75923ccc21a5c57053e680cea75f38 (diff) | |
| parent | 44d5c6bc8ffd92cd201380dabe35748e50b6af68 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/services/remove_status_service.rb`: Conflict caused by us having a distinc Direct timeline. Ported upstream changes. - `app/javascript/mastodon/features/compose/components/compose_form.js`: Conflict between glitch-soc's variable character limit and upstream refactoring that part of the code. Ported upstream changes.
Diffstat (limited to 'config/locales/zgh.yml')
| -rw-r--r-- | config/locales/zgh.yml | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/config/locales/zgh.yml b/config/locales/zgh.yml index ceb475b91..8e4867b2f 100644 --- a/config/locales/zgh.yml +++ b/config/locales/zgh.yml @@ -2,6 +2,9 @@ zgh: about: about_this: ⵖⴼ + api: API + contact: ⴰⵎⵢⴰⵡⴰⴹ + learn_more: ⵙⵙⵏ ⵓⴳⴳⴰⵔ unavailable_content_description: domain: ⴰⵎⴰⴽⴽⴰⵢ what_is_mastodon: ⵎⴰ'ⵢⴷ ⵉⴳⴰⵏ ⵎⴰⵙⵜⵔⴷⵓⵎ? @@ -9,6 +12,7 @@ zgh: follow: ⴹⴼⵕ never_active: ⵓⵙⴰⵔ roles: + bot: ⴰⴱⵓⵜ group: ⵜⴰⵔⴰⴱⴱⵓⵜ admin: account_moderation_notes: @@ -19,23 +23,36 @@ zgh: submit: ⵙⵏⴼⵍ ⵉⵎⴰⵢⵍ confirm: ⵙⵏⵜⵎ delete: ⴽⴽⵙ ⵉⴼⵙⴽⴰ + deleted: ⵉⵜⵜⵡⴰⴽⴽⵙ + domain: ⵉⴳⵔ edit: ⵙⵏⴼⵍ email: ⵉⵎⴰⵢⵍ + email_status: ⴰⴷⴷⴰⴷ ⵏ ⵢⵉⵍⴰⵢⵍ location: all: ⵎⴰⵕⵕⴰ + local: ⴰⴷⵖⴰⵔⴰⵏ moderation: all: ⵎⴰⵕⵕⴰ public: ⴰⴳⴷⵓⴷⴰⵏ reject: ⴰⴳⵢ + roles: + user: ⵓⵏⵙⵙⵓⵎⵔⵙ title: ⵉⵎⵉⴹⴰⵏⵏ web: ⵡⵉⴱ + action_logs: + action_types: + update_status: ⵙⴷⵖⵉ ⴰⴷⴷⴰⴷ announcements: live: ⵓⵙⵔⵉⴷ custom_emojis: + by_domain: ⵉⴳⵔ copy: ⵙⵏⵖⵍ delete: ⴽⴽⵙ emoji: ⵉⵎⵓⵊⵉ + domain_blocks: + domain: ⵉⴳⵔ email_domain_blocks: + add_new: ⵔⵏⵓ ⴰⵎⴰⵢⵏⵓ delete: ⴽⴽⵙ instances: moderation: @@ -123,4 +140,5 @@ zgh: settings: account: ⴰⵎⵉⴹⴰⵏ account_settings: ⵜⵉⵙⵖⴰⵍ ⵏ ⵓⵎⵉⴹⴰⵏ + notifications: ⵜⵉⵏⵖⵎⵉⵙⵉⵏ profile: ⵉⴼⵔⵙ |