diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-08-19 19:31:32 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-08-19 21:49:35 +0200 |
| commit | 1488be7d9683fb3442c6f7bd4fd911d224f0c929 (patch) | |
| tree | 42548a596bb118e08c14c4d0ae9eacb3e8b2f36b /config/locales/cy.yml | |
| parent | b859eb001717dfc62aebb8eba47b84c75aebe4ef (diff) | |
| parent | d22f3a7d5140ef1c3ae6e9bd2241bbb5289af8d1 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/controllers/home_controller.rb - app/controllers/shares_controller.rb - app/javascript/packs/public.js - app/models/status.rb - app/serializers/initial_state_serializer.rb - app/views/home/index.html.haml - app/views/layouts/public.html.haml - app/views/public_timelines/show.html.haml - app/views/shares/show.html.haml - app/views/tags/show.html.haml - config/initializers/content_security_policy.rb - config/locales/en.yml - config/webpack/shared.js - package.json
Diffstat (limited to 'config/locales/cy.yml')
| -rw-r--r-- | config/locales/cy.yml | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/config/locales/cy.yml b/config/locales/cy.yml index fbeaa22b1..0763341a3 100644 --- a/config/locales/cy.yml +++ b/config/locales/cy.yml @@ -494,13 +494,7 @@ cy: title: Statysau cyfrif with_media: A chyfryngau tags: - accounts: Cyfrifon - hidden: Cudd - hide: Cuddio o gyfeiriadur - name: Hashnod title: Hashnodau - unhide: Dangoswch yn y cyfeiriadur - visible: Gweladwy title: Gweinyddiaeth warning_presets: add_new: Ychwanegu newydd @@ -541,7 +535,6 @@ cy: apply_for_account: Gofyn am wahoddiad change_password: Cyfrinair checkbox_agreement_html: Rydw i'n cytuno i'r <a href="%{rules_path}" target="_blank">rheolau'r gweinydd</a> a'r <a href="%{terms_path}" target="_blank">telerau gwasanaeth</a> - confirm_email: Cadarnhau e-bost delete_account: Dileu cyfrif delete_account_html: Os hoffech chi ddileu eich cyfrif, mae modd <a href="%{path}">parhau yma</a>. Bydd gofyn i chi gadarnhau. didnt_get_confirmation: Heb dderbyn cyfarwyddiadau cadarnhau? |