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

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

diff --git a/config/locales/af.yml b/config/locales/af.yml
index 6ab496365b30c444e120c1792e060ed657910468..24dc8c8d54c96076d23b16c412a171cd0a3b861a 100644 (file)
--- a/config/locales/af.yml
+++ b/config/locales/af.yml
@@ -30,7 +30,7 @@ af:
       client_application:
         create: Registreer
         update: Opdateer
-      doorkeeper_application:
+      oauth2_application:
         create: Registreer
         update: Opdateer
       redaction:
@@ -103,7 +103,7 @@ af:
         title: Onderwerp
         latitude: Breedtegraad
         longitude: Lengtegraad
-        language: Taal
+        language_code: Taal
       doorkeeper/application:
         name: Naam
         scopes: Regte
@@ -379,24 +379,6 @@ af:
       wikimedia_commons_link: Die item %{page} op Wikimedia Commons
       telephone_link: Skakel %{phone_number}
       colour_preview: Kleur %{colour_value}-voorskou
-    note:
-      title: 'Nota: %{id}'
-      new_note: Nuwe nota
-      description: Beskrywing
-      open_title: 'Onopgeloste nota #%{note_name}'
-      closed_title: 'Opgeloste nota #%{note_name}'
-      hidden_title: 'Verborge nota #%{note_name}'
-      opened_by_html: Geskep deur %{user} <abbr title ='%{exact_time}'>%{when}</abbr>
-      opened_by_anonymous_html: Geskep deur anoniem <abbr title='%{exact_time}'>%{when}
-        ago</abbr>
-      commented_by_html: Kommentaar van %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_anonymous_html: Kommentaar deur anoniem <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_html: Opgelos deur %{user} <abbr title ='%{exact_time}'>%{when}</abbr>
-      closed_by_anonymous_html: Opgelos deur anoniem <abbr title ='%{exact_time}'>%{when}</abbr>
-      reopened_by_html: Geheraktiveer deur %{user} <abbr title ='%{exact_time}'>%{when}</abbr>
-      reopened_by_anonymous_html: Geheraktiveer deur anoniem <abbr title='%{exact_time}'>%{when}</abbr>
-      hidden_by_html: Versteek deur %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      report: Rapporteer hierdie nota
     query:
       title: Soek bakens op
       introduction: Klik op die kaart om bakens naby te ontdek.
@@ -559,13 +541,10 @@ af:
     search:
       title:
         latlon_html: Resultate vanaf <a href="https://openstreetmap.org/">intern</a>
-        ca_postcode_html: Resultate vanaf <a href="https://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim_html: Resultate vanaf <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
-        geonames_html: Resultate vanaf <a href="http://www.geonames.org/">GeoNames</a>
         osm_nominatim_reverse_html: Resultate vanaf <a href="https://nominatim.openstreetmap.org/">
           OpenStreetMap Nominatim</a>
-        geonames_reverse_html: Uitslae vanaf <a href="http://www.geonames.org/">GeoNames</a>
     search_osm_nominatim:
       prefix:
         aerialway:
@@ -1123,6 +1102,7 @@ af:
           platform: Spoorwegperron
           preserved: Historiese spoorweg
           proposed: Voorgestelde spoorlyn
+          rail: Spoorweg
           spur: Spoorweg spur
           station: Spoorwegstasie
           stop: Spoorweghalte
@@ -1224,6 +1204,7 @@ af:
           supermarket: Supermark
           tailor: Snyer
           tattoo: Tatoeëerder
+          tea: Teewinkel
           ticket: Kaartjiewinkel
           tobacco: Tabakwinkel
           toys: Speelgoedwinkel
@@ -1724,7 +1705,6 @@ af:
       beginners_guide:
         title: Gids vir beginners
       help:
-        url: https://help.openstreetmap.org/
         title: Help Forum
       mailing_lists:
         title: Poslyste
@@ -1734,10 +1714,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
@@ -1835,7 +1812,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
@@ -1885,10 +1861,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
@@ -2176,6 +2152,28 @@ af:
       id: Id
       created_at: Geskep op
       last_changed: Laas gewysig
+    show:
+      title: 'Nota: %{id}'
+      description: Beskrywing
+      open_title: 'Onopgeloste nota #%{note_name}'
+      closed_title: 'Opgeloste nota #%{note_name}'
+      hidden_title: 'Verborge nota #%{note_name}'
+      opened_by_html: Geskep deur %{user} <abbr title ='%{exact_time}'>%{when}</abbr>
+      opened_by_anonymous_html: Geskep deur anoniem <abbr title='%{exact_time}'>%{when}
+        ago</abbr>
+      commented_by_html: Kommentaar van %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_anonymous_html: Kommentaar deur anoniem <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_html: Opgelos deur %{user} <abbr title ='%{exact_time}'>%{when}</abbr>
+      closed_by_anonymous_html: Opgelos deur anoniem <abbr title ='%{exact_time}'>%{when}</abbr>
+      reopened_by_html: Geheraktiveer deur %{user} <abbr title ='%{exact_time}'>%{when}</abbr>
+      reopened_by_anonymous_html: Geheraktiveer deur anoniem <abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_by_html: Versteek deur %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      report: Rapporteer hierdie nota
+      hide: Versteek
+      comment: Reageer
+    new:
+      title: Nuwe nota
+      add: Voeg nota by
   javascripts:
     close: Sluit
     share:
@@ -2223,12 +2221,6 @@ af:
         unsubscribe: Kanselleer subskripsie
         hide_comment: versteek
         unhide_comment: bring weer aan die lig
-    notes:
-      new:
-        add: Voeg nota by
-      show:
-        hide: Versteek
-        comment: Reageer
     directions:
       engines:
         fossgis_osrm_car: Kar (OSRM)