diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-06-21 08:28:59 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-06-21 08:28:59 +0200 |
| commit | 0e74d4da592d6ac5e3c52b0f9c6b1906376aa707 (patch) | |
| tree | 66ae31bd3fd0228ebc6f92325cf43c7f02e4263d /config/locales/cy.yml | |
| parent | 7a75bce1b43df290baf6842e2bb3d3eb0acd76d5 (diff) | |
| parent | 27f41768e8d66d97c8d705d764e534e52ea13af9 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `.github/dependabot.yml`: Changed upstream, while we modified it in glitch-soc to not get spammed by dependabot. Kept it removed. - `README.md`: Changed upstream, which has a very different version. Discarded upstream changes.
Diffstat (limited to 'config/locales/cy.yml')
| -rw-r--r-- | config/locales/cy.yml | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/config/locales/cy.yml b/config/locales/cy.yml index 351067346..913753325 100644 --- a/config/locales/cy.yml +++ b/config/locales/cy.yml @@ -42,7 +42,6 @@ cy: two: statwsau zero: statwsau status_count_before: Ysgrifennwyd gan - tagline: Dilyn ffrindiau a darganfod rhai newydd terms: Telerau gwasanaeth unavailable_content: Cynnwys nad yw ar gael unavailable_content_description: @@ -587,7 +586,6 @@ cy: applications: created: Cais wedi ei greu'n llwyddiannus destroyed: Cais wedi ei ddileu'n llwyddiannus - invalid_url: Mae'r URL a ddarparwyd yn annilys regenerate_token: Adfywio tocyn mynediad token_regenerated: Adfywiwyd y tocyn mynediad yn llwyddiannus warning: Byddwch yn ofalus a'r data hyn. Peidiwch a'i rannu byth! |