X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f988a159238ec9425b8a9f0ed5085095629ee35a..633445b8173092fb9cbeef15122c88d0ba99ce9b:/config/locales/en.yml

diff --git a/config/locales/en.yml b/config/locales/en.yml
index f416f3259..ec08012fe 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -20,7 +20,7 @@ en:
         create: Send
       client_application:
         create: Register
-        update: Edit
+        update: Update
       redaction:
         create: Create redaction
         update: Save redaction
@@ -75,6 +75,18 @@ en:
     # Translates all the model attributes, which is used in error handling on the web site
     # Only the ones that are used on the web site are translated at the moment
     attributes:
+      client_application:
+        name: Name (Required)
+        url: Main Application URL (Required)
+        callback_url: Callback URL
+        support_url: Support URL
+        allow_read_prefs:  read their user preferences
+        allow_write_prefs: modify their user preferences
+        allow_write_diary: create diary entries, comments and make friends
+        allow_write_api:   modify the map
+        allow_read_gpx:    read their private GPS traces
+        allow_write_gpx:   upload GPS traces
+        allow_write_notes: modify notes
       diary_comment:
         body: "Body"
       diary_entry:
@@ -104,6 +116,9 @@ en:
         title: "Subject"
         body: "Body"
         recipient: "Recipient"
+      report:
+        category: Select a reason for your report
+        details: Please provide some more details about the problem (required).
       user:
         email: "Email"
         active: "Active"
@@ -111,6 +126,7 @@ en:
         description: "Description"
         languages: "Languages"
         pass_crypt: "Password"
+        pass_crypt_confirmation: "Confirm Password"
     help:
       trace:
         tagstring: comma delimited
@@ -216,10 +232,18 @@ en:
     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:"
+    common_details:
+      coordinates_html: "%{latitude}, %{longitude}"
     changeset:
       title: "Changeset: %{id}"
       belongs_to: "Author"
@@ -247,6 +271,8 @@ en:
       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}"
@@ -254,6 +280,9 @@ en:
       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}"
@@ -318,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
+      coordinates_html: "%{latitude}, %{longitude}"
     query:
       title: "Query Features"
       introduction: "Click on the map to find nearby features."
@@ -423,6 +453,7 @@ en:
       location: "Location:"
       view: "View"
       edit: "Edit"
+      coordinates: "%{latitude}; %{longitude}"
     feed:
       user:
         title: "OpenStreetMap diary entries for %{user}"
@@ -1299,8 +1330,6 @@ en:
     new:
       title_html: "Report %{link}"
       missing_params: "Cannot create a new report"
-      details: Please provide some more details about the problem (required).
-      select: "Select a reason for your report:"
       disclaimer:
         intro: "Before sending your report to the site moderators, please ensure that:"
         not_just_mistake: You are certain that the problem is not just a mistake
@@ -2043,6 +2072,7 @@ en:
       uploaded: "Uploaded:"
       points: "Points:"
       start_coordinates: "Start coordinate:"
+      coordinates_html: "%{latitude}; %{longitude}"
       map: "map"
       edit: "edit"
       owner: "Owner:"
@@ -2153,13 +2183,6 @@ en:
       delete: "Delete Client"
       confirm: "Are you sure?"
       requests: "Requesting the following permissions from the user:"
-      allow_read_prefs:  "read their user preferences."
-      allow_write_prefs: "modify their user preferences."
-      allow_write_diary: "create diary entries, comments and make friends."
-      allow_write_api:   "modify the map."
-      allow_read_gpx:    "read their private GPS traces."
-      allow_write_gpx:   "upload GPS traces."
-      allow_write_notes: "modify notes."
     index:
       title: "My OAuth Details"
       my_tokens: "My Authorised Applications"
@@ -2173,19 +2196,7 @@ en:
       registered_apps: "You have the following client applications registered:"
       register_new: "Register your application"
     form:
-      name: "Name"
-      required: "Required"
-      url: "Main Application URL"
-      callback_url: "Callback URL"
-      support_url: "Support URL"
       requests: "Request the following permissions from the user:"
-      allow_read_prefs:  "read their user preferences."
-      allow_write_prefs: "modify their user preferences."
-      allow_write_diary: "create diary entries, comments and make friends."
-      allow_write_api:   "modify the map."
-      allow_read_gpx:    "read their private GPS traces."
-      allow_write_gpx:   "upload GPS traces."
-      allow_write_notes: "modify notes."
     not_found:
       sorry: "Sorry, that %{type} could not be found."
     create:
@@ -2258,8 +2269,6 @@ en:
     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?"