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

diff --combined config/locales/en.yml
index 5bc88547a043b3c2df63b7a74129fe712447fda6,66eba938d52ea13d53a7eed046603e45995ac9e5..fb1eb4f833dfa90d8e305abff29274e30fa5813b
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -1024,7 -1024,7 +1024,7 @@@ en
            other_label: Other
      create:
        successful_report: Your report has been registered sucessfully
-       provide_details: Please provide the required details      
+       provide_details: Please provide the required details
    layouts:
      project_name:
        # in <title>
@@@ -1700,7 -1700,6 +1700,7 @@@
      create:
        upload_trace: "Upload GPS Trace"
        trace_uploaded: "Your GPX file has been uploaded and is awaiting insertion in to the database. This will usually happen within half an hour, and an email will be sent to you on completion."
 +      upload_failed: "Sorry, the GPX upload failed. An administrator has been alerted to the error. Please try again"
        traces_waiting:
          one: "You have %{count} trace waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
          other: "You have %{count} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."