diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-09-19 21:46:01 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-09-19 21:46:01 +0200 |
| commit | 91bef4759f40422b64d7990f9b90db0b493773b1 (patch) | |
| tree | 3211b1014a6d0a88737db16c44d210ef96a070e4 /config/locales/simple_form.cy.yml | |
| parent | 382cdd7f959480d59fee5646be320d6076cb18d8 (diff) | |
| parent | 554f659f2aa1eb9c0ca64ec1c9c177538434826c (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: Vagrantfile app/javascript/packs/public.js app/views/admin/settings/edit.html.haml app/views/settings/preferences/show.html.haml app/views/settings/profiles/show.html.haml config/locales/es.yml config/locales/simple_form.en.yml config/webpack/configuration.js config/webpack/loaders/babel.js package.json yarn.lock Split new additions to app/javascript/packs/public.js to app/javascript/core/settings.js
Diffstat (limited to 'config/locales/simple_form.cy.yml')
| -rw-r--r-- | config/locales/simple_form.cy.yml | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/config/locales/simple_form.cy.yml b/config/locales/simple_form.cy.yml index 4b1721b77..bc8f7e0e9 100644 --- a/config/locales/simple_form.cy.yml +++ b/config/locales/simple_form.cy.yml @@ -6,6 +6,32 @@ cy: confirm_password: Cadarnhau cyfrinair email: Cyfeiriad e-bost header: Pennyn + locale: Iaith y rhyngwyneb + max_uses: Uchafswm y nifer o ddefnyddiau new_password: Cyfrinair newydd password: Cyfrinair + phrase: Allweddair neu ymadrodd + setting_default_language: Cyhoeddi iaith + setting_hide_network: Cuddiwch eich rhwydwaith + setting_reduce_motion: '' + setting_system_font_ui: Defnyddiwch ffont rhagosodedig y system + setting_theme: Thema'r wefan + severity: Difrifoldeb + type: Modd mewnforio username: Enw defnyddiwr + username_or_email: Enw defnyddiwr neu e-bost + whole_word: Gair cyfan + interactions: + must_be_follower: Blociwch hysbysiadau o bobl nad ydynt yn eich dilyn + must_be_following: Blociwch hysbysiadau o bobl nad ydych yn eu dilyn + must_be_following_dm: Blociwch negeseuon uniongyrchol o bobl nad ydych yn eu dilyn + notification_emails: + favourite: Anfonwch e-bost pan mae rhywun yn ffefrynnu eich statws + follow: Anfonwch e-bost pan mae rhywun yn eich dilyn chi + follow_request: Anfonwch e-bost pan mae rhywun yn gofyn i chi i'w dilyn + mention: Anfonwch e-bost pan mae rhywun yn eich crybwyll + 'no': Na + required: + mark: "*" + text: gofynnol + 'yes': Ie |