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

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

diff --git a/config/locales/af.yml b/config/locales/af.yml
index f218ec1f80d8c8e36cc2961ed9560fd70dbef6af..27cb0a3cab3082a2e08c5434fb74bf26d2304b53 100644 (file)
--- a/config/locales/af.yml
+++ b/config/locales/af.yml
@@ -791,7 +791,6 @@ af:
           window_construction: Vensterraamwerk
           winery: Wynboer
           "yes": Handwerkwinkel
-        crossing: Kruis
         emergency:
           access_point: Reddingsdienstoegangspunt
           ambulance_station: Ambulansstasie
@@ -812,6 +811,7 @@ af:
           bus_stop: Bushalte
           construction: Weg in aanbou
           corridor: Korridor
+          crossing: Kruis
           cycleway: Fietspad
           elevator: Hysbak
           emergency_access_point: Noodtoeganspunt
@@ -896,7 +896,6 @@ af:
           commercial: Handelsgebied
           conservation: Natuurbewaring
           construction: In aanbou
-          farm: Plaas
           farmland: Landbougrond
           farmyard: Plaaswerf
           forest: Woud
@@ -1124,6 +1123,7 @@ af:
           platform: Spoorwegperron
           preserved: Historiese spoorweg
           proposed: Voorgestelde spoorlyn
+          rail: Spoorweg
           spur: Spoorweg spur
           station: Spoorwegstasie
           stop: Spoorweghalte
@@ -1225,6 +1225,7 @@ af:
           supermarket: Supermark
           tailor: Snyer
           tattoo: Tatoeëerder
+          tea: Teewinkel
           ticket: Kaartjiewinkel
           tobacco: Tabakwinkel
           toys: Speelgoedwinkel
@@ -1886,10 +1887,10 @@ af:
       in: in
     index:
       public_traces: Openbare GPS-spore
-      my_traces: My Spore
       public_traces_from: Openbare GPS-spore van %{user}
       tagged_with: gemerk met %{tags}
       upload_trace: Laai 'n GPS-spoor op
+      my_traces: My Spore
       traces_from: Openbare spore van %{user}
     destroy:
       scheduled_for_deletion: Spoor is vir verwydering geoormerk