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

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index d114e0a88865e5783979454282b676b782468399..28698fa522787766f63afbd153c8de37c7a5d489 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -122,7 +122,7 @@ en:
         longitude: "Longitude"
         public: "Public"
         description: "Description"
-        gpx_file: Upload GPX File
+        gpx_file: Choose GPS Trace File
         visibility: Visibility
         tagstring: Tags
       message:
@@ -369,7 +369,7 @@ en:
         note: note
     timeout:
       title: Timeout Error
-      sorry: "Sorry, the data for the %{type} with the id %{id}, took too long to retrieve."
+      sorry: "Sorry, the data for the %{type} with the id %{id} took too long to retrieve."
       type:
         node: node
         way: way
@@ -405,28 +405,28 @@ en:
       enclosing: "Enclosing features"
   nodes:
     timeout:
-      sorry: "Sorry, the data for the node with the id %{id}, took too long to retrieve."
+      sorry: "Sorry, the data for the node with the id %{id} took too long to retrieve."
   old_nodes:
     not_found:
       sorry: "Sorry, node #%{id} version %{version} could not be found."
     timeout:
-      sorry: "Sorry, the history of the node with the id %{id}, took too long to retrieve."
+      sorry: "Sorry, the history of the node with the id %{id} took too long to retrieve."
   ways:
     timeout:
-      sorry: "Sorry, the data for the way with the id %{id}, took too long to retrieve."
+      sorry: "Sorry, the data for the way with the id %{id} took too long to retrieve."
   old_ways:
     not_found:
       sorry: "Sorry, way #%{id} version %{version} could not be found."
     timeout:
-      sorry: "Sorry, the history of the way with the id %{id}, took too long to retrieve."
+      sorry: "Sorry, the history of the way with the id %{id} took too long to retrieve."
   relations:
     timeout:
-      sorry: "Sorry, the data for the relation with the id %{id}, took too long to retrieve."
+      sorry: "Sorry, the data for the relation with the id %{id} took too long to retrieve."
   old_relations:
     not_found:
       sorry: "Sorry, relation #%{id} version %{version} could not be found."
     timeout:
-      sorry: "Sorry, the history of the relation with the id %{id}, took too long to retrieve."
+      sorry: "Sorry, the history of the relation with the id %{id} took too long to retrieve."
   changeset_comments:
     feeds:
       comment:
@@ -441,7 +441,6 @@ en:
         sorry: "Sorry, the list of changeset comments you requested took too long to retrieve."
   changesets:
     changeset:
-      anonymous: "Anonymous"
       no_edits: "(no edits)"
       view_changeset_details: "View changeset details"
     index:
@@ -473,7 +472,6 @@ en:
       title: "Changeset %{id}"
       created_by_html: "Created by %{link_user} on %{created}."
     no_such_entry:
-      title: "No such changeset"
       heading: "No entry with the id: %{id}"
       body: "Sorry, there is no changeset with the id %{id}. Please check your spelling, or maybe the link you clicked is wrong."
     show:
@@ -582,8 +580,6 @@ en:
       report: Report this comment
     location:
       location: "Location:"
-      view: "View"
-      edit: "Edit"
       coordinates: "%{latitude}; %{longitude}"
     feed:
       user:
@@ -1617,13 +1613,13 @@ en:
       befriend_them: "You can also add them as a friend at %{befriendurl}."
       befriend_them_html: "You can also add them as a friend at %{befriendurl}."
     gpx_description:
-      description_with_tags: "It looks like your GPX file %{trace_name} with the description %{trace_description} and the following tags: %{tags}"
-      description_with_tags_html: "It looks like your GPX file %{trace_name} with the description %{trace_description} and the following tags: %{tags}"
-      description_with_no_tags: "It looks like your GPX file %{trace_name} with the description %{trace_description} and no tags"
-      description_with_no_tags_html: "It looks like your GPX file %{trace_name} with the description %{trace_description} and no tags"
+      description_with_tags: "It looks like your file %{trace_name} with the description %{trace_description} and the following tags: %{tags}"
+      description_with_tags_html: "It looks like your file %{trace_name} with the description %{trace_description} and the following tags: %{tags}"
+      description_with_no_tags: "It looks like your file %{trace_name} with the description %{trace_description} and no tags"
+      description_with_no_tags_html: "It looks like your file %{trace_name} with the description %{trace_description} and no tags"
     gpx_failure:
       hi: "Hi %{to_user},"
-      failed_to_import: "failed to import. Here is the error:"
+      failed_to_import: "failed to be imported as a GPS trace file. Please verify that your file is a valid GPX file or an archive containing GPX file(s) in the supported format (.tar.gz, .tar.bz2, .tar, .zip, .gpx.gz, .gpx.bz2). Could there be a format or syntax issue with your file? Here is the importing error:"
       more_info: "More information about GPX import failures and how to avoid them can be found at %{url}."
       more_info_html: "More information about GPX import failures and how to avoid them can be found at %{url}."
       import_failures_url: "https://wiki.openstreetmap.org/wiki/GPX_Import_Failures"