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

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

diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 1870e19e95201b633c73d3f54631427ee0c8c4f5..b3ef3cd2ab972a984df7b843c14b90de099043fa 100644 (file)
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -843,7 +843,6 @@ gl:
           window_construction: Construtor de xanelas
           winery: Adega
           "yes": Tenda de artesanía
-        crossing: Paso
         emergency:
           access_point: Punto de acceso
           ambulance_station: Base de ambulancias
@@ -864,6 +863,7 @@ gl:
           bus_stop: Parada de bus
           construction: Autoestrada baixo construción
           corridor: Corredor
+          crossing: Paso
           cycleway: Senda ciclista
           elevator: Ascensor
           emergency_access_point: Punto de acceso de emerxencia
@@ -953,7 +953,6 @@ gl:
           commercial: Zona de oficinas
           conservation: Conservación
           construction: Terreo en construción
-          farm: Granxa
           farmland: Terra de labranza
           farmyard: Curral
           forest: Bosque