Merge remote-tracking branch 'upstream/pull/2996' into master

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

diff --git a/config/locales/af.yml b/config/locales/af.yml
index 863c7f3caa6224906d24d2f75acab327a5bdae57..8b66d92d97298ee634ed92f9dc2f08ea7aae1f95 100644 (file)
--- a/config/locales/af.yml
+++ b/config/locales/af.yml
@@ -1168,14 +1168,6 @@ af:
     friendship_notification:
       hi: Hallo %{to_user},
       subject: '[OpenStreetMap] %{user} het u as ''n vriend bygevoeg'
-    gpx_notification:
-      greeting: Hallo,
-      your_gpx_file: Dit lyk asof jou GPX-lêer
-      with_description: met die beskrywing
-      and_the_tags: 'en die volgende merkers:'
-      and_no_tags: en geen merkers nie.
-      failure:
-        more_info_2: 'hulle kan gevind word te:'
     signup_confirm:
       subject: '[OpenStreetMap] Welkom by OpenStreetMap'
       greeting: Hallo!
@@ -1789,9 +1781,9 @@ af:
       revoke: Herroep!
       flash: Hierdie versperring is herroep.
     helper:
-      time_future: Tyd oor %{time} verstreke.
+      time_future_html: Tyd oor %{time} verstreke.
       until_login: Aktief totdat die gebruiker aanmeld.
-      time_past: Tyd is %{time} gelede verstreke.
+      time_past_html: Tyd is %{time} gelede verstreke.
       block_duration:
         hours:
           one: 1 uur