diff options
| author | ThibG <thib@sitedethib.com> | 2018-11-27 16:26:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-27 16:26:18 +0100 |
| commit | 33be091f506242b136b0d4a65cf06a0babc4d757 (patch) | |
| tree | 0f9f6e40e40f4ecabfa1e5f906000abe756f42a9 /config/locales/cy.yml | |
| parent | 6b6e633c095485f95350c4308a942192e5fe8806 (diff) | |
| parent | 55edfd6e0e1cb5377f0c3406d94ddfd84ddb7b20 (diff) | |
Merge pull request #828 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/locales/cy.yml')
| -rw-r--r-- | config/locales/cy.yml | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/config/locales/cy.yml b/config/locales/cy.yml index a4df28b61..24ae6fa10 100644 --- a/config/locales/cy.yml +++ b/config/locales/cy.yml @@ -115,10 +115,6 @@ cy: most_recent_ip: IP diweddaraf no_limits_imposed: Dim terfynau wedi'i gosod not_subscribed: Heb danysgrifio - order: - alphabetic: Allfabetig - most_recent: Diweddaraf - title: Trefnu outbox_url: Allflwch URL perform_full_suspension: Atal profile_url: URL proffil @@ -762,7 +758,7 @@ cy: unlisted_long: Gall pawb weld, ond heb ei restru ar ffrydiau cyhoeddus stream_entries: pinned: Tŵt wedi'i binio - reblogged: bŵstiwyd + reblogged: hybwyd sensitive_content: Cynnwys sensitif terms: body_html: | |