diff options
author | Claire <claire.github-309c@sitedethib.com> | 2020-12-19 00:55:12 +0100 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2020-12-19 00:55:12 +0100 |
commit | f9d000ebaec7732d5fcd46aa6685108a2619966b (patch) | |
tree | 9593841cf520b117ca4c3d5b68b19e9124c852da /config/locales/zgh.yml | |
parent | 92cfcf168cae094ece281b3cb6d0f5b1539a8c25 (diff) | |
parent | c6598b17d9212c2d48395da73fa9529025d704cc (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/services/resolve_url_service.rb`: The private toot search by URL hack has been revamped upstream. Took upstream's version.
Diffstat (limited to 'config/locales/zgh.yml')
-rw-r--r-- | config/locales/zgh.yml | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/config/locales/zgh.yml b/config/locales/zgh.yml index 8e4867b2f..0123836ec 100644 --- a/config/locales/zgh.yml +++ b/config/locales/zgh.yml @@ -5,15 +5,23 @@ zgh: api: API contact: ⴰⵎⵢⴰⵡⴰⴹ learn_more: ⵙⵙⵏ ⵓⴳⴳⴰⵔ + status_count_after: + one: ⴰⴷⴷⴰⴷ + other: ⴰⴷⴷⴰⴷⵏ unavailable_content_description: domain: ⴰⵎⴰⴽⴽⴰⵢ what_is_mastodon: ⵎⴰ'ⵢⴷ ⵉⴳⴰⵏ ⵎⴰⵙⵜⵔⴷⵓⵎ? accounts: follow: ⴹⴼⵕ + followers: + one: ⴰⵎⴹⴼⴰⵕ + other: ⵉⵎⴹⴼⴰⵕⵏ + media: ⵉⵙⵏⵖⵎⵉⵙⵏ never_active: ⵓⵙⴰⵔ roles: bot: ⴰⴱⵓⵜ group: ⵜⴰⵔⴰⴱⴱⵓⵜ + unfollow: ⴽⴽⵙ ⴰⴹⴼⴼⵓⵕ admin: account_moderation_notes: delete: ⴽⴽⵙ @@ -28,6 +36,7 @@ zgh: edit: ⵙⵏⴼⵍ email: ⵉⵎⴰⵢⵍ email_status: ⴰⴷⴷⴰⴷ ⵏ ⵢⵉⵍⴰⵢⵍ + followers: ⵉⵎⴹⴼⴰⵕⵏ location: all: ⵎⴰⵕⵕⴰ local: ⴰⴷⵖⴰⵔⴰⵏ @@ -137,8 +146,12 @@ zgh: notification_mailer: mention: action: ⵔⴰⵔ + relationships: + remove_selected_follows: ⴽⴽⵙ ⴰⴹⴼⴼⵓⵕ ⵉ ⵉⵏⵙⵙⵎⵔⵙⵏ ⵜⵜⵓⵙⵜⵢⵏⵉⵏ settings: account: ⴰⵎⵉⴹⴰⵏ account_settings: ⵜⵉⵙⵖⴰⵍ ⵏ ⵓⵎⵉⴹⴰⵏ + back: ⴰⵖⵓⵍ ⵖⵔ ⵎⴰⵙⵜⵓⴷⵓⵏ + edit_profile: ⵙⵏⴼⵍ ⵉⴼⵔⵙ notifications: ⵜⵉⵏⵖⵎⵉⵙⵉⵏ profile: ⵉⴼⵔⵙ |