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

diff --combined config/locales/en.yml
index e142a6d4d4240c5ac73dd4e6c61cfec8d407a571,44fd977b5fdb31a536e8f5464aeb39b1c4f0db9a..44501aa10ea6fb72ff031d8780d8dfd2571d97d9
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -20,7 -20,7 +20,7 @@@ en
          create: Send
        client_application:
          create: Register
 -        update: Edit
 +        update: Update
        redaction:
          create: Create redaction
          update: Save redaction
@@@ -75,18 -75,6 +75,18 @@@
      # Translates all the model attributes, which is used in error handling on the web site
      # Only the ones that are used on the web site are translated at the moment
      attributes:
 +      client_application:
 +        name: Name (Required)
 +        url: Main Application URL (Required)
 +        callback_url: Callback URL
 +        support_url: Support URL
 +        allow_read_prefs:  read their user preferences
 +        allow_write_prefs: modify their user preferences
 +        allow_write_diary: create diary entries, comments and make friends
 +        allow_write_api:   modify the map
 +        allow_read_gpx:    read their private GPS traces
 +        allow_write_gpx:   upload GPS traces
 +        allow_write_notes: modify notes
        diary_comment:
          body: "Body"
        diary_entry:
@@@ -116,9 -104,6 +116,9 @@@
          title: "Subject"
          body: "Body"
          recipient: "Recipient"
 +      report:
 +        category: Select a reason for your report
 +        details: Please provide some more details about the problem (required).
        user:
          email: "Email"
          active: "Active"
@@@ -235,6 -220,8 +235,8 @@@
      view_history: "View History"
      view_details: "View Details"
      location: "Location:"
+     common_details:
+       coordinates_html: "%{latitude}, %{longitude}"
      changeset:
        title: "Changeset: %{id}"
        belongs_to: "Author"
@@@ -333,6 -320,7 +335,7 @@@
        reopened_by_anonymous: "Reactivated by anonymous <abbr title='%{exact_time}'>%{when}</abbr>"
        hidden_by: "Hidden by %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
        report: Report this note
+       coordinates_html: "%{latitude}, %{longitude}"
      query:
        title: "Query Features"
        introduction: "Click on the map to find nearby features."
@@@ -438,6 -426,7 +441,7 @@@
        location: "Location:"
        view: "View"
        edit: "Edit"
+       coordinates: "%{latitude}; %{longitude}"
      feed:
        user:
          title: "OpenStreetMap diary entries for %{user}"
@@@ -1314,6 -1303,8 +1318,6 @@@
      new:
        title_html: "Report %{link}"
        missing_params: "Cannot create a new report"
 -      details: Please provide some more details about the problem (required).
 -      select: "Select a reason for your report:"
        disclaimer:
          intro: "Before sending your report to the site moderators, please ensure that:"
          not_just_mistake: You are certain that the problem is not just a mistake
@@@ -2056,6 -2047,7 +2060,7 @@@
        uploaded: "Uploaded:"
        points: "Points:"
        start_coordinates: "Start coordinate:"
+       coordinates_html: "%{latitude}; %{longitude}"
        map: "map"
        edit: "edit"
        owner: "Owner:"
@@@ -2166,6 -2158,13 +2171,6 @@@
        delete: "Delete Client"
        confirm: "Are you sure?"
        requests: "Requesting the following permissions from the user:"
 -      allow_read_prefs:  "read their user preferences."
 -      allow_write_prefs: "modify their user preferences."
 -      allow_write_diary: "create diary entries, comments and make friends."
 -      allow_write_api:   "modify the map."
 -      allow_read_gpx:    "read their private GPS traces."
 -      allow_write_gpx:   "upload GPS traces."
 -      allow_write_notes: "modify notes."
      index:
        title: "My OAuth Details"
        my_tokens: "My Authorised Applications"
@@@ -2179,7 -2178,19 +2184,7 @@@
        registered_apps: "You have the following client applications registered:"
        register_new: "Register your application"
      form:
 -      name: "Name"
 -      required: "Required"
 -      url: "Main Application URL"
 -      callback_url: "Callback URL"
 -      support_url: "Support URL"
        requests: "Request the following permissions from the user:"
 -      allow_read_prefs:  "read their user preferences."
 -      allow_write_prefs: "modify their user preferences."
 -      allow_write_diary: "create diary entries, comments and make friends."
 -      allow_write_api:   "modify the map."
 -      allow_read_gpx:    "read their private GPS traces."
 -      allow_write_gpx:   "upload GPS traces."
 -      allow_write_notes: "modify notes."
      not_found:
        sorry: "Sorry, that %{type} could not be found."
      create: