Merge pull request #4405 from tomhughes/normalize-display-name

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

diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index 8f7640348f78b2c474ae97b930223e02b68ec593..99a76fa5c4479fa7eb31df02e81ff3a563f90a4c 100644 (file)
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -3,6 +3,7 @@
 # Export driver: phpyaml
 # Author: Akerbeltz
 # Author: Amire80
+# Author: Dimitar
 # Author: GunChleoc
 # Author: Macofe
 ---
@@ -1397,30 +1398,24 @@ gd:
           footway: Àrainn-choisichean
           rail: Rèile
           subway: Meatro
-          cable:
-          - Carbad-càbaill
-          - Lioft-sèitheir
-          runway:
-          - Raon-laighe puirt-adhair
-          - Raon-cuairteachaidh
-          apron_only: Aparan puirt-adhair
+          cable_car: Carbad-càbaill
+          chair_lift: Lioft-sèitheir
+          runway: Raon-laighe puirt-adhair
+          taxiway: Raon-cuairteachaidh
+          apron: Aparan puirt-adhair
           admin: Crìoch rianachd
-          forest:
-          - Coille
-          - Coille
+          forest: Coille
+          wood: Coille
           golf: Raon goilf
           park: Pàirc
-          common:
-          - Coitcheann
-          - Faiche
+          common: Coitcheann
           resident: Raon-còmhnaidh
           retail: Raon bhuitean
           industrial: Raon gnìomhachais
           commercial: Raon malairt
           heathland: Aonach
-          lake:
-          - Loch
-          - Loch-tasgaidh
+          lake: Loch
+          reservoir: Loch-tasgaidh
           farm: Tuathanas
           brownfield: Fearann fàs
           cemetery: Cladh
@@ -1429,14 +1424,12 @@ gd:
           centre: Ionad-spòrs
           reserve: Tèarmann nàdair
           military: Raon an airm
-          school:
-          - Sgoil
-          - Oilthigh
+          school: Sgoil
+          university: Oilthigh
           building: Togalach cudromach
           station: Stèisean-rèile
-          summit:
-          - Mullach
-          - Sgurr
+          summit: Mullach
+          peak: Sgurr
           tunnel: Oir-strìochagan = tunail
           bridge: Oir-loidhnichean = drochaid
           private: Cead-inntrigidh prìobhaideach
@@ -1656,7 +1649,7 @@ gd:
       consider_pd: A bharrachd air an aonta gu h-àrd, aontaichidh mi gun dèid na bheir
         mi dhuibh 'nam cho-thabhartaiche a chur sa Public Domain
       consider_pd_why: Dè th`ann?
-      consider_pd_why_url: http://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain
+      consider_pd_why_url: https://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain
       decline: Cha ghabh mi ris
       you need to accept or decline: Feuch an leugh thu teirmichean ùra a' chom-pàirtiche
         agus an uairsin aontaich no nach gabh riutha mus lean thu air adhart.