From: Tom Hughes <tom@compton.nu>
Date: Sat, 18 Feb 2017 16:20:20 +0000 (+0000)
Subject: Merge branch 'contextmenu'
X-Git-Tag: live~4654
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/0bdf29f10bd290cfb6943e6b64a027927ebb8248?ds=sidebyside;hp=-c

Merge branch 'contextmenu'
---

0bdf29f10bd290cfb6943e6b64a027927ebb8248
diff --combined config/locales/en.yml
index 1867a433f,58c21db00..b2ebffd61
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -933,11 -933,12 +933,11 @@@ en
      intro_header: Welcome to OpenStreetMap!
      intro_text: OpenStreetMap is a map of the world, created by people like you and free to use under an open license.
      intro_2_create_account: "Create a user account"
 -    partners_html: "Hosting is supported by %{ucl}, %{ic} and %{bytemark}, and other %{partners}."
 +    partners_html: "Hosting is supported by %{ucl}, %{bytemark} and %{ic}, and other %{partners}."
      partners_ucl: "the UCL VR Centre"
      partners_ic: "Imperial College London"
      partners_bytemark: "Bytemark Hosting"
      partners_partners: "partners"
 -    partners_url: "http://wiki.openstreetmap.org/wiki/Partners"
      osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out."
      osm_read_only: "The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out."
      donate: "Support OpenStreetMap by %{link} to the Hardware Upgrade Fund."
@@@ -1625,7 -1626,6 +1625,7 @@@
      require_moderator:
        not_a_moderator: "You need to be a moderator to perform that action."
      setup_user_auth:
 +      blocked_zero_hour: "You have an urgent message on the OpenStreetMap web site. You need to read the message before you will be able to save your edits."
        blocked: "Your access to the API has been blocked. Please log-in to the web interface to find out more."
        need_to_see_terms: "Your access to the API is temporarily suspended. Please log-in to the web interface to view the Contributor Terms. You do not need to agree, but you must view them."
    oauth:
@@@ -2305,6 -2305,13 +2305,13 @@@
        nothing_found: No features found
        error: "Error contacting %{server}: %{error}"
        timeout: "Timeout contacting %{server}"
+     context:
+       directions_from: Directions from here
+       directions_to: Directions to here
+       add_note: Add a note here
+       show_address: Show address
+       query_features: Query features
+       centre_map: Centre map here
    redaction:
      edit:
        description: "Description"