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

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index e142a6d4d4240c5ac73dd4e6c61cfec8d407a571..ec08012fe2d4a8acd4f5471f1db1aef6dd369cc5 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -126,6 +126,7 @@ en:
         description: "Description"
         languages: "Languages"
         pass_crypt: "Password"
         description: "Description"
         languages: "Languages"
         pass_crypt: "Password"

+        pass_crypt_confirmation: "Confirm Password"

     help:
       trace:
         tagstring: comma delimited
     help:
       trace:
         tagstring: comma delimited


@@ -231,10 +232,18 @@ en:
     anonymous: "anonymous"
     no_comment: "(no comment)"
     part_of: "Part of"
     anonymous: "anonymous"
     no_comment: "(no comment)"
     part_of: "Part of"

+    part_of_relations:
+      one: 1 relation
+      other: "%{count} relations"
+    part_of_ways:
+      one: 1 way
+      other: "%{count} ways"

     download_xml: "Download XML"
     view_history: "View History"
     view_details: "View Details"
     location: "Location:"
     download_xml: "Download XML"
     view_history: "View History"
     view_details: "View Details"
     location: "Location:"

+    common_details:
+      coordinates_html: "%{latitude}, %{longitude}"

     changeset:
       title: "Changeset: %{id}"
       belongs_to: "Author"
     changeset:
       title: "Changeset: %{id}"
       belongs_to: "Author"


@@ -262,6 +271,8 @@ en:
       title_html: "Way: %{name}"
       history_title_html: "Way History: %{name}"
       nodes: "Nodes"
       title_html: "Way: %{name}"
       history_title_html: "Way History: %{name}"
       nodes: "Nodes"

+      nodes_count:
+        other: "%{count} nodes"

       also_part_of_html:
         one: "part of way %{related_ways}"
         other: "part of ways %{related_ways}"
       also_part_of_html:
         one: "part of way %{related_ways}"
         other: "part of ways %{related_ways}"


@@ -269,6 +280,9 @@ en:
       title_html: "Relation: %{name}"
       history_title_html: "Relation History: %{name}"
       members: "Members"
       title_html: "Relation: %{name}"
       history_title_html: "Relation History: %{name}"
       members: "Members"

+      members_count:
+        one: 1 member
+        other: "%{count} members"

     relation_member:
       entry_html: "%{type} %{name}"
       entry_role_html: "%{type} %{name} as %{role}"
     relation_member:
       entry_html: "%{type} %{name}"
       entry_role_html: "%{type} %{name} as %{role}"


@@ -333,6 +347,7 @@ en:
       reopened_by_anonymous: "Reactivated by anonymous <abbr title='%{exact_time}'>%{when}</abbr>"
       hidden_by: "Hidden by %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
       report: Report this note
       reopened_by_anonymous: "Reactivated by anonymous <abbr title='%{exact_time}'>%{when}</abbr>"
       hidden_by: "Hidden by %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
       report: Report this note

+      coordinates_html: "%{latitude}, %{longitude}"

     query:
       title: "Query Features"
       introduction: "Click on the map to find nearby features."
     query:
       title: "Query Features"
       introduction: "Click on the map to find nearby features."


@@ -438,6 +453,7 @@ en:
       location: "Location:"
       view: "View"
       edit: "Edit"
       location: "Location:"
       view: "View"
       edit: "Edit"

+      coordinates: "%{latitude}; %{longitude}"

     feed:
       user:
         title: "OpenStreetMap diary entries for %{user}"
     feed:
       user:
         title: "OpenStreetMap diary entries for %{user}"


@@ -2056,6 +2072,7 @@ en:
       uploaded: "Uploaded:"
       points: "Points:"
       start_coordinates: "Start coordinate:"
       uploaded: "Uploaded:"
       points: "Points:"
       start_coordinates: "Start coordinate:"

+      coordinates_html: "%{latitude}; %{longitude}"

       map: "map"
       edit: "edit"
       owner: "Owner:"
       map: "map"
       edit: "edit"
       owner: "Owner:"


@@ -2252,8 +2269,6 @@ en:
     reset_password:
       title: "Reset password"
       heading: "Reset Password for %{user}"
     reset_password:
       title: "Reset password"
       heading: "Reset Password for %{user}"

-      password: "Password:"
-      confirm password: "Confirm Password:"

       reset: "Reset Password"
       flash changed: "Your password has been changed."
       flash token bad: "Did not find that token, check the URL maybe?"
       reset: "Reset Password"
       flash changed: "Your password has been changed."
       flash token bad: "Did not find that token, check the URL maybe?"