Merge remote-tracking branch 'upstream/pull/5381'

[rails.git] / config / locales / cy.yml

diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index 4e25e4fd8d793e5b75d5b937fde7a94bdc4a0f27..8116b511e3c0360b6e1574759bcd1dd60350c8fb 100644 (file)
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -425,7 +425,6 @@ cy:
         way: Llwybr
         relation: Perthynas
     containing_relation:
         way: Llwybr
         relation: Perthynas
     containing_relation:

-      entry_html: Perthynas %{relation_name}

       entry_role_html: Perthynas %{relation_name} (fel %{relation_role})
     not_found:
       title: Heb ei Ganfod
       entry_role_html: Perthynas %{relation_name} (fel %{relation_role})
     not_found:
       title: Heb ei Ganfod


@@ -2557,7 +2556,7 @@ cy:
       upload_trace: Uwchlwytho ôl
       all_traces: Pob Ôl
       my_traces: Fy Olion
       upload_trace: Uwchlwytho ôl
       all_traces: Pob Ôl
       my_traces: Fy Olion

-      traces_from: Olion Cyhoeddus gan %{user}
+      traces_from_html: Olion Cyhoeddus gan %{user}

       remove_tag_filter: Dileu Hidlydd Tagiau
     destroy:
       scheduled_for_deletion: Mae'r ôl wedi'i drefnu i'w ddileu
       remove_tag_filter: Dileu Hidlydd Tagiau
     destroy:
       scheduled_for_deletion: Mae'r ôl wedi'i drefnu i'w ddileu


@@ -2925,9 +2924,9 @@ cy:
     navigation:
       all_blocks: Pob Bloc
       blocks_on_me: Blociau arnaf i
     navigation:
       all_blocks: Pob Bloc
       blocks_on_me: Blociau arnaf i

-      blocks_on_user: Blociau ar %{user}
+      blocks_on_user_html: Blociau ar %{user}

       blocks_by_me: Blociau gennyf i
       blocks_by_me: Blociau gennyf i

-      blocks_by_user: Blociau gan %{user}
+      blocks_by_user_html: Blociau gan %{user}

       block: 'Bloc #%{id}'
       new_block: Bloc Newydd
   user_mutes:
       block: 'Bloc #%{id}'
       new_block: Bloc Newydd
   user_mutes: