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

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

diff --git a/config/locales/af.yml b/config/locales/af.yml
index d3c6fc01b2da12ff174d812945c8c482c732e805..b3254f882f643d27e596399b1ac8039a0f6482b2 100644 (file)
--- a/config/locales/af.yml
+++ b/config/locales/af.yml
@@ -1524,16 +1524,18 @@ af:
     destroy:
       destroyed: Boodskap is verwyder
   passwords:
-    lost_password:
+    new:
       title: Wagwoord verloor
       heading: Wagwoord vergeet?
       email address: 'E-posadres:'
       new password button: Herstel wagwoord
+    create:
       notice email cannot find: E-posadres is ongelukkig onverkrygbaar, jammer.
-    reset_password:
+    edit:
       title: Herstel wagwoord
       heading: Herstel wagwoord vir %{user}
       reset: Herstel wagwoord
+    update:
       flash changed: U wagwoord is gewysig.
   preferences:
     show:
@@ -1719,27 +1721,23 @@ af:
           footway: Voetpad
           rail: Spoorweg
           subway: Ondergrondse spoorweg
-          tram:
-          - Ligte spoor
-          - trem
           cable:
           - Sweefspoor
           - stoelhyser
           runway:
           - Aanloopbaan
           - vliegtuigrybaan
-          apron:
-          - Lughaweplatform
-          - terminaal
+          apron_only: Lughaweplatform
           admin: Administratiewe grens
-          forest: Woud
-          wood: Bos
+          forest:
+          - Woud
+          - Bos
           golf: Gholfbaan
           park: Park
-          resident: Woongebied
           common:
           - Gemeen
           - weiland
+          resident: Woongebied
           retail: Kleinhandel-gebied
           industrial: Nywerheidsgebied
           commercial: Handelsgebied