diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-03-16 20:59:33 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-03-16 20:59:33 +0100 |
commit | 4aa6aba6ee95ba37df7ca1d9c65f360b1b00ec04 (patch) | |
tree | 7c90513d2576dba9d71ac069ca28ac7e4db72a28 /config/locales/cy.yml | |
parent | 6af2300454c960ef83f7b7d31e9b829e0d5a8e38 (diff) | |
parent | 735b8be2042a29fb10077aaab526832b95a041a9 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/services/remove_status_service.rb Conflict because we still handle the direct timeline. Took upstream changes, with that one extra function call. - config/locales/ca.yml Conflict because theme names were updated. Decided to *keep* the theme names even if they are useless to avoid future conflicts. - config/locales/oc.yml Decided to *keep* the theme names even if they are useless to avoid future conflicts. - config/locales/pl.yml Decided to *keep* the theme names even if they are useless to avoid future conflicts.
Diffstat (limited to 'config/locales/cy.yml')
-rw-r--r-- | config/locales/cy.yml | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/config/locales/cy.yml b/config/locales/cy.yml index 900aedd57..68a445e4c 100644 --- a/config/locales/cy.yml +++ b/config/locales/cy.yml @@ -311,6 +311,7 @@ cy: back_to_account: Nôl i'r gyfrif title: Dilynwyr %{acct} instances: + by_domain: Parth delivery_available: Mae'r cyflenwad ar gael known_accounts: few: "%{count} cyfrifon hysbys" @@ -482,6 +483,8 @@ cy: add_new: Ychwanegu newydd delete: Dileu edit: Golygu + edit_preset: Golygu rhagosodiad rhybudd + title: Rheoli rhagosodiadau rhybudd admin_mailer: new_report: body: Mae %{reporter} wedi cwyno am %{target} @@ -598,6 +601,10 @@ cy: lists: Rhestrau mutes: Yr ydych yn tawelu storage: Storio cyfryngau + featured_tags: + add_new: Ychwanegu + errors: + limit: Yr ydych yn barod wedi cynnwys yr uchafswm o hashnodau filters: contexts: home: Ffrwd gartref @@ -630,6 +637,9 @@ cy: two: Mae rhywbeth o'i le o hyd! Edrychwch ar y %{count} gwall isod os gwelwch yn dda zero: Mae rhywbeth o'i le o hyd! Edrychwch ar y %{count} gwall isod os gwelwch yn dda imports: + modes: + merge: Cyfuno + merge_long: Cadw'r cofnodau presennol ac ychwanegu rhai newydd preface: Mae modd mewnforio data yr ydych wedi allforio o achos arall, megis rhestr o bobl yr ydych yn ei ddilyn neu yn blocio. success: Uwchlwythwyd eich data yn llwyddiannus ac fe fydd yn cael ei brosesu mewn da bryd types: |