diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-10-25 20:28:51 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2021-10-25 20:28:51 +0200 |
| commit | e855df149bd2f19729af48cd5f452fa3972273f8 (patch) | |
| tree | 4d9dab4fd4568f67b07642db61a2f382e8b1dcc0 /config/locales/cy.yml | |
| parent | c647fa99cab9b9db81d36223cf2c2c27e065b648 (diff) | |
| parent | 5ba46952af87e42a64962a34f7ec43bc710bdcaf (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `.env.production.sample`: Upstream added new configuration options, uncommented by default. Commented them. - `Gemfile.lock`: Upstream updated dependencies textually close to glitch-soc-specific dependencies. Updated those upstream dependencies.
Diffstat (limited to 'config/locales/cy.yml')
| -rw-r--r-- | config/locales/cy.yml | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/config/locales/cy.yml b/config/locales/cy.yml index 942be3b58..8e899ebd0 100644 --- a/config/locales/cy.yml +++ b/config/locales/cy.yml @@ -124,6 +124,7 @@ cy: confirm: Cadarnhau confirmed: Cadarnhawyd confirming: Cadarnhau + delete: Dileu data deleted: Wedi dileu demote: Diraddio disable: Diffodd @@ -166,6 +167,7 @@ cy: pending: Yn aros am adolygiad perform_full_suspension: Atal promote: Hyrwyddo + protocol: Protocol public: Cyhoeddus push_subscription_expires: Tanysgrifiad gwthiadwy yn dod i ben redownload: Adnewyddu proffil @@ -296,32 +298,9 @@ cy: updated_msg: Llwyddwyd i ddiweddaru'r emoji! upload: Uwchlwytho dashboard: - authorized_fetch_mode: Modd nôl awdurdodedig - backlog: tasgau heb eu cwblhau - config: Cyfluniad - feature_deletions: Dileadau cyfrif - feature_invites: Dolenni gwahodd - feature_profile_directory: Cyfeiriadur proffil - feature_registrations: Cofrestriadau - feature_relay: Relái ffederasiwn - feature_timeline_preview: Rhagolwg o'r ffrwd - features: Nodweddion - hidden_service: Ffederasiwn a gwasanaethau cudd - open_reports: adroddiadau agored - pending_tags: hashnodau yn aros am adolygiad - pending_users: defnyddwyr yn aros am adolygiad - recent_users: Defnyddwyr diweddar - search: Chwilio testun llawn - single_user_mode: Modd un defnyddiwr software: Meddalwedd space: Defnydd o ofod title: Dangosfwrdd - total_users: cyfanswm defnyddwyr - trends: Tueddiadau - week_interactions: ymadweithiau yr wythnos hon - week_users_active: gweithredol yr wythnos hon - week_users_new: defnyddwyr yr wythnos hon - whitelist_mode: Modd rhestr wen domain_allows: add_new: Rhestrwch parth created_msg: Rhestrwyd wen parth yn llwyddiannus |