Localisation updates from https://translatewiki.net.

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index d114e0a88865e5783979454282b676b782468399..b042370dccc3f0cef9cf9cb71ae5cfbf5d887881 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -122,7 +122,7 @@ en:
         longitude: "Longitude"
         public: "Public"
         description: "Description"
         longitude: "Longitude"
         public: "Public"
         description: "Description"

-        gpx_file: Upload GPX File
+        gpx_file: Choose GPS Trace File

         visibility: Visibility
         tagstring: Tags
       message:
         visibility: Visibility
         tagstring: Tags
       message:


@@ -369,7 +369,7 @@ en:
         note: note
     timeout:
       title: Timeout Error
         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
       type:
         node: node
         way: way


@@ -405,35 +405,33 @@ en:
       enclosing: "Enclosing features"
   nodes:
     timeout:
       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:
   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:
   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:
   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:
   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:
   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:
         comment: "New comment on changeset #%{changeset_id} by %{author}"
         commented_at_by_html: "Updated %{when} by %{user}"
   changeset_comments:
     feeds:
       comment:
         comment: "New comment on changeset #%{changeset_id} by %{author}"
         commented_at_by_html: "Updated %{when} by %{user}"

-      comments:
-        comment: "New comment on changeset #%{changeset_id} by %{author}"

       show:
         title_all: OpenStreetMap changeset discussion
         title_particular: "OpenStreetMap changeset #%{changeset_id} discussion"
       show:
         title_all: OpenStreetMap changeset discussion
         title_particular: "OpenStreetMap changeset #%{changeset_id} discussion"


@@ -441,7 +439,6 @@ en:
         sorry: "Sorry, the list of changeset comments you requested took too long to retrieve."
   changesets:
     changeset:
         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:
       no_edits: "(no edits)"
       view_changeset_details: "View changeset details"
     index:


@@ -473,7 +470,6 @@ en:
       title: "Changeset %{id}"
       created_by_html: "Created by %{link_user} on %{created}."
     no_such_entry:
       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:
       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 +578,6 @@ en:
       report: Report this comment
     location:
       location: "Location:"
       report: Report this comment
     location:
       location: "Location:"

-      view: "View"
-      edit: "Edit"

       coordinates: "%{latitude}; %{longitude}"
     feed:
       user:
       coordinates: "%{latitude}; %{longitude}"
     feed:
       user:


@@ -1462,7 +1456,6 @@ en:
       not_updated: Not Updated
       search: Search
       search_guidance: "Search Issues:"
       not_updated: Not Updated
       search: Search
       search_guidance: "Search Issues:"

-      link_to_reports: View Reports

       states:
         ignored: Ignored
         open: Open
       states:
         ignored: Ignored
         open: Open


@@ -1617,13 +1610,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:
       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},"
     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"
       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"


@@ -1859,7 +1852,6 @@ en:
       remember: "Remember me"
       lost password link: "Lost your password?"
       login_button: "Log in"
       remember: "Remember me"
       lost password link: "Lost your password?"
       login_button: "Log in"

-      register now: Register now

       with external: "or log in with a third party"
       or: "or"
       auth failure: "Sorry, could not log in with those details."
       with external: "or log in with a third party"
       or: "or"
       auth failure: "Sorry, could not log in with those details."


@@ -2693,7 +2685,6 @@ en:
         privacy_policy_title: OSMF privacy policy including section on email addresses
         contributor_terms_url: "https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms"
         contributor_terms: "contributor terms"
         privacy_policy_title: OSMF privacy policy including section on email addresses
         contributor_terms_url: "https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms"
         contributor_terms: "contributor terms"

-      tou: "terms of use"

       continue: Sign Up
       terms accepted: "Thanks for accepting the new contributor terms!"
       email_help:
       continue: Sign Up
       terms accepted: "Thanks for accepting the new contributor terms!"
       email_help:


@@ -2721,9 +2712,9 @@ en:
       guidance_info_html: "Information to help understand these terms: a %{readable_summary_link} and some %{informal_translations_link}"
       readable_summary: human readable summary
       informal_translations: informal translations
       guidance_info_html: "Information to help understand these terms: a %{readable_summary_link} and some %{informal_translations_link}"
       readable_summary: human readable summary
       informal_translations: informal translations

-      continue: Continue
+      continue: "Continue"

       declined: "https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined"
       declined: "https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined"

-      decline: "Decline"
+      cancel: "Cancel"

       you need to accept or decline: "Please read and then either accept or decline the new Contributor Terms to continue."
       legale_select: "Country of residence:"
       legale_names:
       you need to accept or decline: "Please read and then either accept or decline the new Contributor Terms to continue."
       legale_select: "Country of residence:"
       legale_names: