From: Tom Hughes Date: Wed, 29 Aug 2018 07:43:28 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/pull/1963' X-Git-Tag: live~3427 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/43776279fb7bb1103a52ee72af2b3497a1274995?hp=-c Merge remote-tracking branch 'upstream/pull/1963' --- 43776279fb7bb1103a52ee72af2b3497a1274995 diff --combined config/locales/en.yml index 5bc88547a,66eba938d..fb1eb4f83 --- a/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 @@@ -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."