diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-09-03 14:33:06 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-09-03 14:33:06 +0200 |
| commit | 6c233a04a04f674b1be75ce7c6c4547c7a006797 (patch) | |
| tree | 24b32d52e098fac57e91fd26be1311b7b677c9c9 /config/locales/cy.yml | |
| parent | e915bc3e9e32e34bf80d1bd66ee3f80d2ca37969 (diff) | |
| parent | ccc2f608c5c1caac2ea4796f4490f29d59d67068 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: README.md Discarded upstream changes to the README, kept our version.
Diffstat (limited to 'config/locales/cy.yml')
| -rw-r--r-- | config/locales/cy.yml | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/config/locales/cy.yml b/config/locales/cy.yml index affb560c3..84e8d9e2b 100644 --- a/config/locales/cy.yml +++ b/config/locales/cy.yml @@ -29,9 +29,9 @@ cy: network_hidden: Nid yw'r wybodaeth hon ar gael nothing_here: Does dim byd yma! posts: - one: Tŵt - other: Tŵtiau - posts_tab_heading: Tŵtiau + one: Twt + other: Twtiau + posts_tab_heading: Twtiau roles: admin: Gweinyddwr bot: Bot @@ -101,6 +101,11 @@ cy: trends: Tueddiadau instances: domain_name: Parth + settings: + contact_information: + email: E-bost busnes + auth: + change_password: Cyfrinair authorize_follow: follow: Dilynwch title: Dilynwch %{acct} |