X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/7c98b41cc89068d049a18f8738276f19cd47095e..3a654c89197b40f4a623c0dd33b87b415623d97d:/config/locales/en.yml

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 5b6d575d3..63b15233f 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -121,6 +121,8 @@ en:
         next_relation_tooltip: "Next relation"
         prev_changeset_tooltip: "Previous changeset"
         next_changeset_tooltip: "Next changeset"
+        prev_note_tooltip: "Previous note"
+        next_note_tooltip: "Next note"
     changeset_details:
       created_at: "Created at:"
       closed_at: "Closed at:"
@@ -157,6 +159,11 @@ en:
         node: "View node on larger map"
         way: "View way on larger map"
         relation: "View relation on larger map"
+      edit:
+        area: "Edit area"
+        node: "Edit node"
+        way: "Edit way"
+        relation: "Edit relation"
     node_details:
       coordinates: "Coordinates:"
       part_of: "Part of:"
@@ -280,14 +287,12 @@ en:
     note:
       open_title: "Unresolved issue: %{note_name}"
       closed_title: "Resolved issue: %{note_name}"
-      created_at: "Created at:"
-      edited_at: "Edited at:"
-      closed_at: "Closed at:"
-      opened_by: "Opened by:"
+      opened: "Opened:"
+      last_modified: "Last modified:"
+      closed: "Closed:"
+      at_by: "%{when} ago by %{user}"
       description: "Description:"
-      comment_by: "Comment by: "
-      comment: "Comment:"
-      date: "Date:"
+      comments: "Comments:"
   changeset:
     changeset_paging_nav:
       showing_page: "Showing page %{page}"
@@ -942,9 +947,10 @@ en:
     tag_line: The Free Wiki World Map
     intro_1: "OpenStreetMap is a free editable map of the whole world. It is made by people like you."
     intro_2: "OpenStreetMap allows you to view, edit and use geographical data in a collaborative way from anywhere on Earth."
-    intro_3: "OpenStreetMap's hosting is kindly supported by the %{ucl} and %{bytemark}. Other supporters of the project are listed in the %{partners}."
-    intro_3_ucl: "UCL VR Centre"
-    intro_3_bytemark: "bytemark"
+    intro_3: "OpenStreetMap's hosting is kindly supported by %{ucl}, %{ic} and %{bytemark}. Other supporters of the project are listed in the %{partners}."
+    intro_3_ucl: "the UCL VR Centre"
+    intro_3_ic: "Imperial College London"
+    intro_3_bytemark: "Bytemark Hosting"
     intro_3_partners: "wiki"
     intro_3_partners_url: "http://wiki.openstreetmap.org/wiki/Partners"
     osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out."
@@ -1390,11 +1396,11 @@ en:
       heading: "The user %{user} does not exist"
       body: "Sorry, there is no user with the name %{user}. Please check your spelling, or maybe the link you clicked is wrong."
     trace_form:
-      upload_gpx: "Upload GPX File"
-      description: "Description"
-      tags: "Tags"
+      upload_gpx: "Upload GPX File:"
+      description: "Description:"
+      tags: "Tags:"
       tags_help: "comma delimited"
-      visibility: "Visibility"
+      visibility: "Visibility:"
       visibility_help: "what does this mean?"
       visibility_help_url: "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
       upload_button: "Upload"
@@ -1468,7 +1474,7 @@ en:
       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:
     oauthorize:
-      request_access: "The application %{app_name} is requesting access to your account. Please check whether you would like the application to have the following capabilities. You may choose as many or as few as you like."
+      request_access: "The application %{app_name} is requesting access to your account, %{user}. Please check whether you would like the application to have the following capabilities. You may choose as many or as few as you like."
       allow_to: "Allow the client application to:"
       allow_read_prefs:  "read your user preferences."
       allow_write_prefs: "modify your user preferences."
@@ -1622,7 +1628,7 @@ en:
             using your username and password and then associate the account
             with your OpenID in your user settings.
           </li>
-        </ul> 
+        </ul>
       continue: Continue
       flash create success message: "Thanks for signing up. We've sent a confirmation note to %{email} and as soon as you confirm your account you'll be able to get mapping.<br /><br />If you use an antispam system which sends confirmation requests then please make sure you whitelist webmaster@openstreetmap.org as we are unable to reply to any confirmation requests."
       terms accepted: "Thanks for accepting the new contributor terms!"
@@ -1916,6 +1922,11 @@ en:
       revoker: "Revoker:"
       needs_view: "The user needs to log in before this block will be cleared."
   note:
+    description:
+      opened_at_by: "Created %{when} ago by %{user}"
+      commented_at_by: "Updated %{when} ago by %{user}"
+      closed_at_by: "Resolved %{when} ago by %{user}"
+      reopened_at_by: "Reactivated %{when} ago by %{user}"
     rss:
       title: "OpenStreetMap Notes"
       description_area: "A list of notes, reported, commented on or closed in your area [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]"
@@ -1929,7 +1940,6 @@ en:
       description: "Notes submitted or commented on by %{user}"
       id: "Id"
       last_changed: "Last changed"
-
   javascripts:
     map:
       base:
@@ -1946,25 +1956,23 @@ en:
       history_tooltip: View edits for this area
       history_disabled_tooltip: Zoom in to view edits for this area
       history_zoom_alert: You must zoom in to view edits for this area
-    osb:
-      Fixed Error: Fixed Error
-      Unresolved Error: Unresolved Error
-      Description: Description
-      Comment: Comment
-      Has been fixed: This error has been fixed already. However, it might take a couple of days before the map image is updated.
-      Comment/Close: Comment/Close
-      Nickname: Nickname
-      Add comment: Add comment
-      Mark as fixed: Mark as fixed
-      Cancel: Cancel
-      Create OpenStreetBug: Create OpenStreetBug
-      Create bug: Report a problem with the map
-      Bug description: Problem description
-      Create: Report problem
-      Permalink: Permalink
-      Login: Login
-      Details: Details
+    note:
+      closed: Closed Note
+      open: Open Note
+      details: Details
+      permalink: Permalink
+      description: Description
+      comment: Comment
+      render_warning: This error has been fixed already. However, it might take a couple of days before the map image is updated.
+      update: Update
+      nickname: Nickname
+      login: Login
+      add_comment: Add Comment
+      close: Close
+      cancel: Cancel
+      create: Create Note
+      create_title: Report a problem with the map
+      create_help1: Please drag the marker to the location of the problem
+      create_help2: and descripe it as accurate as possible
+      report: Report Problem
       edityourself: You can also edit the map directly your self
-      draghelp1: Please drag the marker to the location of the problem
-      draghelp2: and descripe it as accurate as possible
-