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

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

diff --git a/config/locales/af.yml b/config/locales/af.yml
index 6f27102d5b8b658362a3c2b0200edef0454530ae..6ab496365b30c444e120c1792e060ed657910468 100644 (file)
--- a/config/locales/af.yml
+++ b/config/locales/af.yml
@@ -791,7 +791,6 @@ af:
           window_construction: Vensterraamwerk
           winery: Wynboer
           "yes": Handwerkwinkel
           window_construction: Vensterraamwerk
           winery: Wynboer
           "yes": Handwerkwinkel

-        crossing: Kruis

         emergency:
           access_point: Reddingsdienstoegangspunt
           ambulance_station: Ambulansstasie
         emergency:
           access_point: Reddingsdienstoegangspunt
           ambulance_station: Ambulansstasie


@@ -812,6 +811,7 @@ af:
           bus_stop: Bushalte
           construction: Weg in aanbou
           corridor: Korridor
           bus_stop: Bushalte
           construction: Weg in aanbou
           corridor: Korridor

+          crossing: Kruis

           cycleway: Fietspad
           elevator: Hysbak
           emergency_access_point: Noodtoeganspunt
           cycleway: Fietspad
           elevator: Hysbak
           emergency_access_point: Noodtoeganspunt