diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-11-12 22:13:57 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-11-12 22:13:57 +0100 |
| commit | c077cdaba70eac154909cad412ece409acc2e688 (patch) | |
| tree | 7d13d319ce62475de15014406635f32a8742ca4b /config/locales/simple_form.zgh.yml | |
| parent | 67125534bc0fd48a45d6cb17a5c78712d8e87150 (diff) | |
| parent | 9870b175b477bbc984fc7945f1ebe07e3f2b0053 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/controllers/relationships_controller.rb`: Upstream changed a line too close to a glitch-soc only line related to glitch-soc's theming system. Applied upstream changes accordingly.
Diffstat (limited to 'config/locales/simple_form.zgh.yml')
| -rw-r--r-- | config/locales/simple_form.zgh.yml | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/config/locales/simple_form.zgh.yml b/config/locales/simple_form.zgh.yml index 827155466..ed9ea90f8 100644 --- a/config/locales/simple_form.zgh.yml +++ b/config/locales/simple_form.zgh.yml @@ -1 +1,41 @@ +--- zgh: + simple_form: + hints: + defaults: + setting_display_media_hide_all: ⵙⵏⵜⵍ ⵉⵙⵏⵖⵎⵉⵙⵏ ⴰⴱⴷⴰ + setting_display_media_show_all: ⵙⵎⴰⵍ ⵉⵙⵏⵖⵎⵉⵙⵏ ⴰⴱⴷⴰ + labels: + account_warning_preset: + title: ⴰⵣⵡⵍ + admin_account_action: + type: ⵜⵉⴳⴰⵡⵜ + defaults: + bot: ⵡⴰⴷ ⴰⵎⵉⴹⴰⵏ ⵏ ⵓⴱⵓⵜ + chosen_languages: ⵙⵜⵢ ⵜⵓⵜⵍⴰⵢⵉⵏ + confirm_new_password: ⵙⵏⵜⵎ ⵜⴰⴳⵓⵔⵉ ⵏ ⵓⵣⵔⴰⵢ ⵜⴰⵎⴰⵢⵏⵓⵜ + confirm_password: ⵙⵏⵜⵎ ⵜⴰⴳⵓⵔⵉ ⵏ ⵓⵣⵔⴰⵢ + data: ⵉⴼⵙⴽⴰ + email: ⵜⴰⵏⵙⴰ ⵉⵎⴰⵢⵍ + locale: ⵜⵓⵜⵍⴰⵢⵜ ⵏ ⵓⵏⴳⵔⵓⴷⵎ + locked: ⵔⴳⵍ ⴰⵎⵉⴹⴰⵏ + new_password: ⵜⴰⴳⵓⵔⵉ ⵏ ⵓⵣⵔⴰⵢ ⵜⴰⵎⴰⵢⵏⵓⵜ + note: ⵜⴰⵔⵉⴷⵉⵔⵜ + password: ⵜⴰⴳⵓⵔⵉ ⵏ ⵓⵣⵔⴰⵢ + setting_hide_network: ⴼⴼⵔ ⴰⵥⵟⵟⴰ ⵏⵏⴽ + setting_theme: ⴰⵙⴳⵓⵎ ⵏ ⵡⴰⵙⵉⵜ + username: ⵉⵙⵎ ⵏ ⵓⵏⵙⵙⵎⵔⵙ + username_or_email: ⵉⵙⵎ ⵏ ⵓⵏⵙⵙⵎⵔⵙ ⵏⵖ ⵉⵎⴰⵢⵍ + featured_tag: + name: ⵀⴰⵛⵟⴰⴳ + invite: + comment: ⴰⵖⴼⴰⵡⴰⵍ + ip_block: + comment: ⵖⴼⴰⵡⵍ + ip: ⵜⴰⵏⵙⴰ IP + tag: + name: ⵀⴰⵛⵟⴰⴳ + 'no': ⵓⵀⵓ + required: + mark: "*" + 'yes': ⵢⴰⵀ |