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

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 9e8502f4a2ca8db818894f75539d33e1ab6214ac..a62f4d34fc6b5ecf279701d8fb609a098bcd1056 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1668,12 +1668,14 @@ en:
       see_their_profile_html: "You can see their profile at %{userurl}."
       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}."
       see_their_profile_html: "You can see their profile at %{userurl}."
       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:
+    gpx_details:

       details: "Your file details:"
       filename: Filename
       url: URL
       description: Description
       tags: Tags
       details: "Your file details:"
       filename: Filename
       url: URL
       description: Description
       tags: Tags

+      total_points: Total number of points
+      imported_points: Number of imported points

     gpx_failure:
       hi: "Hi %{to_user},"
       failed_to_import: "It looks like your file failed to be imported as a GPS trace."
     gpx_failure:
       hi: "Hi %{to_user},"
       failed_to_import: "It looks like your file failed to be imported as a GPS trace."


@@ -1684,9 +1686,7 @@ en:
       subject: "[OpenStreetMap] GPX Import failure"
     gpx_success:
       hi: "Hi %{to_user},"
       subject: "[OpenStreetMap] GPX Import failure"
     gpx_success:
       hi: "Hi %{to_user},"

-      loaded_successfully:
-        one: "It looks like your file loaded successfully with %{trace_points} out of a possible %{count} point."
-        other: "It looks like your file loaded successfully with %{trace_points} out of a possible %{count} points."
+      imported_successfully: "It looks like your file was imported successfully as a GPS trace."

       all_your_traces: "All your successfully uploaded GPX traces can be found at %{url}"
       all_your_traces_html: "All your successfully uploaded GPX traces can be found at %{url}."
       subject: "[OpenStreetMap] GPX Import success"
       all_your_traces: "All your successfully uploaded GPX traces can be found at %{url}"
       all_your_traces_html: "All your successfully uploaded GPX traces can be found at %{url}."
       subject: "[OpenStreetMap] GPX Import success"