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

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 2fc8f8196a75a8607b98494e5b8ef1d268cf4e52..da346e8e89abb15497867e4e8fd30db39824d1a1 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -5,6 +5,8 @@ en:
     formats:
       friendly: "%e %B %Y at %H:%M"
       blog: "%e %B %Y"
     formats:
       friendly: "%e %B %Y at %H:%M"
       blog: "%e %B %Y"

+  count:
+    at_least_pattern: "%{count}+"

   helpers:
     file:
       prompt: Choose file
   helpers:
     file:
       prompt: Choose file


@@ -2697,6 +2699,7 @@ en:
       remove as friend: Unfriend
       add as friend: Add Friend
       mapper since: "Mapper since:"
       remove as friend: Unfriend
       add as friend: Add Friend
       mapper since: "Mapper since:"

+      uid: "User id:"

       ct status: "Contributor terms:"
       ct undecided: Undecided
       ct declined: Declined
       ct status: "Contributor terms:"
       ct undecided: Undecided
       ct declined: Declined


@@ -2965,6 +2968,7 @@ en:
         cyclosm: CyclOSM
         cycle_map: Cycle Map
         transport_map: Transport Map
         cyclosm: CyclOSM
         cycle_map: Cycle Map
         transport_map: Transport Map

+        tracestracktop_topo: Tracestrack Topo

         hot: Humanitarian
         opnvkarte: ÖPNVKarte
       layers:
         hot: Humanitarian
         opnvkarte: ÖPNVKarte
       layers:


@@ -2985,6 +2989,8 @@ en:
       andy_allan: Andy Allan
       opnvkarte_credit: "Tiles courtesy of %{memomaps_link}"
       memomaps: MeMoMaps
       andy_allan: Andy Allan
       opnvkarte_credit: "Tiles courtesy of %{memomaps_link}"
       memomaps: MeMoMaps

+      tracestrack_credit: "Tiles courtesy of %{tracestrack_link}"
+      tracestrack: Tracestrack

       hotosm_credit: "Tiles style by %{hotosm_link} hosted by %{osm_france_link}"
       hotosm_name: Humanitarian OpenStreetMap Team
     site:
       hotosm_credit: "Tiles style by %{hotosm_link} hosted by %{osm_france_link}"
       hotosm_name: Humanitarian OpenStreetMap Team
     site: