X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c4988a69b4cd7b342d2828148eb20eca0d9a205f..18409c05ab43a2f818f6db911ae383eb0ebfb07d:/config/locales/cy.yml?ds=sidebyside

diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index 4e25e4fd8..9fb4f10d2 100644
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -60,6 +60,7 @@ cy:
       message: Neges
       node: Nod
       node_tag: Tag Nod
+      note: Nodyn
       old_node: Hen Nod
       old_node_tag: Tag Hen Nod
       old_relation: Hen Berthynas
@@ -366,7 +367,7 @@ cy:
     no_comment: (dim sylw)
     part_of: Rhan o
     part_of_relations:
-      zero: '%{count} perthnasoedd'
+      zero: '%{count} perthnasau'
       one: '%{count} perthynas'
       two: '%{count} berthynas'
       few: '%{count} pherthynas'
@@ -425,8 +426,7 @@ cy:
         way: Llwybr
         relation: Perthynas
     containing_relation:
-      entry_html: Perthynas %{relation_name}
-      entry_role_html: Perthynas %{relation_name} (fel %{relation_role})
+      entry_role_html: '%{relation_name} (fel %{relation_role})'
     not_found:
       title: Heb ei Ganfod
       sorry: 'Ymddiheurwn, ni ellir canfod %{type} #%{id}.'
@@ -571,8 +571,8 @@ cy:
       nodes_paginated: Nodau (%{x}-%{y} o %{count})
       ways: Llwybrau (%{count})
       ways_paginated: Llwybrau (%{x}-%{y} o %{count})
-      relations: Perthnasoedd (%{count})
-      relations_paginated: Perthnasoedd (%{x}-%{y} o %{count})
+      relations: Perthnasau (%{count})
+      relations_paginated: Perthnasau (%{x}-%{y} o %{count})
     timeout:
       sorry: Mae'n ddrwg gennym, cymerodd y rhestr o grwpiau newid y gofynnoch amdanynt
         rhy hir i'w hadalw.
@@ -1556,7 +1556,10 @@ cy:
         open: Agored
         resolved: Wedi datrys
     show:
-      title: '%{status} Gwall #%{issue_id}'
+      title:
+        open: 'Mater agored #%{issue_id}'
+        ignored: 'Mater wedi''i anwybyddu #%{issue_id}'
+        resolved: 'Mater wedi''i ddatrys #%{issue_id}'
       reports:
         zero: '%{count} adroddiad'
         one: '%{count} adroddiad'
@@ -1912,6 +1915,16 @@ cy:
       title: Dewisiadau
       preferred_editor: Hoff Olygydd
       preferred_languages: Ieithoedd
+      preferred_site_color_scheme: Dewis Lliw Gwefan
+      site_color_schemes:
+        auto: Awtomatig
+        light: Golau
+        dark: Tywyll
+      preferred_map_color_scheme: Dewis Lliw Map
+      map_color_schemes:
+        auto: Awtomatig
+        light: Golau
+        dark: Tywyll
       edit_preferences: Golygu Dewisiadau
     edit:
       title: Golygu Dewisiadau
@@ -2557,7 +2570,7 @@ cy:
       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
@@ -2895,6 +2908,9 @@ cy:
           few: '%{count} blynedd'
           many: '%{count} blynedd'
           other: '%{count} blynedd'
+      short:
+        time_in_future_title: '%{time_absolute}; ymhen %{time_relative}'
+        time_in_past_title: '%{time_absolute}; %{time_relative}'
     blocks_on:
       title: Blociau ar %{name}
       heading_html: Rhestr Blociau ar %{name}
@@ -2913,21 +2929,21 @@ cy:
       reason: 'Rheswm dros y bloc:'
       revoker: 'Dad-flociwr:'
     block:
-      not_revoked: (heb ei ddirymu)
       show: Dangos
       edit: Golygu
     page:
       display_name: Defnyddiwr wedi'i blocio
       creator_name: Crëwr
       reason: Rheswm dros flocio
+      start: Dechrau
+      end: Diwedd
       status: Statws
-      revoker_name: Dirymwyd gan
     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_user: Blociau gan %{user}
+      blocks_by_user_html: Blociau gan %{user}
       block: 'Bloc #%{id}'
       new_block: Bloc Newydd
   user_mutes: