Revoking administrator role on current user should fail

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 70a16bce0e4ac6e0e88bc4fd86b235114db7c608..317dee88ea66b668b10e5510126da7bf5beb871d 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -131,6 +131,7 @@ en:
         title_comment: "Changeset %{id} - %{comment}"
       join_discussion: "Log in to join the discussion"
       discussion: Discussion
+      still_open: "Changeset still open - discussion will open once the changeset is closed."
     node:
       title: "Node: %{name}"
       history_title: "Node History: %{name}"
@@ -367,7 +368,6 @@ en:
     search:
       title:
         latlon: 'Results from <a href="http://openstreetmap.org/">Internal</a>'
-        us_postcode: 'Results from <a href="http://geocoder.us/">Geocoder.us</a>'
         uk_postcode: 'Results from <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>'
         ca_postcode: 'Results from <a href="http://geocoder.ca/">Geocoder.CA</a>'
         osm_nominatim: 'Results from <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>'
@@ -933,7 +933,7 @@ 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}, %{bytemark} and %{ic}, and other %{partners}."
+    partners_html: "Hosting is supported by %{ucl}, %{bytemark}, %{ic}, and other %{partners}."
     partners_ucl: "UCL"
     partners_ic: "Imperial College London"
     partners_bytemark: "Bytemark Hosting"
@@ -1006,9 +1006,7 @@ en:
       more_title_html: Finding out more
       more_1_html: |
         Read more about using our data, and how to credit us, at the <a
-        href="http://osmfoundation.org/Licence">OSMF Licence page</a> and the community <a
-        href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Legal
-        FAQ</a>.
+        href="http://osmfoundation.org/Licence">OSMF Licence page</a>.
       more_2_html: |
         Although OpenStreetMap is open data, we cannot provide a
         free-of-charge map API for third-parties.
@@ -1210,7 +1208,9 @@ en:
       Our contributors include enthusiast mappers, GIS professionals, engineers
       running the OSM servers, humanitarians mapping disaster-affected areas,
       and many more.
-      To learn more about the community, see the <a href='%{diary_path}'>user diaries</a>,
+      To learn more about the community, see the
+      <a href='https://blog.openstreetmap.org'>OpenStreetMap Blog</a>,
+      <a href='%{diary_path}'>user diaries</a>,
       <a href='http://blogs.openstreetmap.org/'>community blogs</a>, and
       the <a href='http://www.osmfoundation.org/'>OSM Foundation</a> website.
     open_data_title: Open Data
@@ -1377,6 +1377,7 @@ en:
       date: "Date"
       reply_button: "Reply"
       unread_button: "Mark as unread"
+      delete_button: "Delete"
       back: "Back"
       to: "To"
       wrong_user: "You are logged in as `%{user}' but the message you have asked to read was not sent by or to that user. Please login as the correct user in order to read it."
@@ -1421,7 +1422,7 @@ en:
       get_directions_title: "Find directions between two points"
       from: "From"
       to: "To"
-      where_am_i: "Where am I?"
+      where_am_i: "Where is this?"
       where_am_i_title: Describe the current location using the search engine
       submit_text: "Go"
     key:
@@ -2035,6 +2036,7 @@ en:
       not_a_role: "The string `%{role}' is not a valid role."
       already_has_role: "The user already has role %{role}."
       doesnt_have_role: "The user does not have role %{role}."
+      not_revoke_admin_current_user: "Cannot revoke administrator role from current user."
     grant:
       title: Confirm role granting
       heading: Confirm role granting
@@ -2239,7 +2241,8 @@ en:
         unhide_comment: "unhide"
     notes:
       new:
-        intro: "Spotted a mistake or something missing? Let other mappers know so we can fix it. Move the marker to the correct position and type a note to explain the problem. (Please don't enter personal information or information from copyrighted maps or directory listings.)"
+        intro: "Spotted a mistake or something missing? Let other mappers know so we can fix it. Move the marker to the correct position and type a note to explain the problem."
+        advice: "Your note is public and may be used to update the map, so don't enter personal information, or information from copyrighted maps or directory listings."
         add: Add Note
       show:
         anonymous_warning: This note includes comments from anonymous users which should be independently verified.
@@ -2253,6 +2256,7 @@ en:
       ascend: "Ascend"
       engines:
         graphhopper_bicycle: "Bicycle (GraphHopper)"
+        graphhopper_car: "Car (GraphHopper)"
         graphhopper_foot: "Foot (GraphHopper)"
         mapquest_bicycle: "Bicycle (MapQuest)"
         mapquest_car: "Car (MapQuest)"