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

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

diff --git a/config/locales/af.yml b/config/locales/af.yml
index f218ec1f80d8c8e36cc2961ed9560fd70dbef6af..62056daed1238e6a5c0b991f11b9a67252b1a98e 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
@@ -1725,7 +1726,6 @@ af:
       beginners_guide:
         title: Gids vir beginners
       help:
-        url: https://help.openstreetmap.org/
         title: Help Forum
       mailing_lists:
         title: Poslyste
@@ -1735,10 +1735,7 @@ af:
         title: IRC
       switch2osm:
         title: switch2osm
-      welcomemat:
-        url: https://welcome.openstreetmap.org/
       wiki:
-        url: https://wiki.openstreetmap.org/
         title: OpenStreetMap-wiki
     sidebar:
       search_results: Soekuitslae
@@ -1836,7 +1833,6 @@ af:
     new:
       upload_trace: Laai GPS-spore op
       visibility_help: wat beteken dit?
-      visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces‎
       help: Hulp
     create:
       upload_trace: Laai GPS-spore op
@@ -1886,10 +1882,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