X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/613b748c5556139bdd04b6cda2f5ebf448e20aa2..2c1033f62d450b7ed82058ee89d99983b7d97829:/config/locales/en.yml
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 44fd977b5..6157fa517 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,6 +232,12 @@ 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"
@@ -249,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}"
@@ -256,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}"
@@ -1303,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
@@ -1386,7 +1411,7 @@ en:
text: Make a Donation
learn_more: "Learn More"
more: More
- notifier:
+ user_mailer:
diary_comment_notification:
subject: "[OpenStreetMap] %{user} commented on a diary entry"
hi: "Hi %{to_user},"
@@ -1614,7 +1639,7 @@ en:
full legal
code explains your rights and responsibilities.
intro_3_1_html: |
- Our documentation is licensed under the
+ Our documentation is licensed under the
Creative
Commons Attribution-ShareAlike 2.0 license (CC BY-SA 2.0).
credit_title_html: How to credit OpenStreetMap
@@ -1631,11 +1656,11 @@ en:
direct your readers to openstreetmap.org (perhaps by expanding
'OpenStreetMap' to this full address) and to opendatacommons.org.
credit_3_1_html: |
- The map tiles in the “standard style” at www.openstreetmap.org are a
- Produced Work by the OpenStreetMap Foundation using OpenStreetMap data
- under the Open Database License. If you are using these tiles please use
- the following attribution:
- “Base map and data from OpenStreetMap and OpenStreetMap Foundation”.
+ The map tiles in the “standard style” at www.openstreetmap.org are a
+ Produced Work by the OpenStreetMap Foundation using OpenStreetMap data
+ under the Open Database License. If you are using these tiles please use
+ the following attribution:
+ “Base map and data from OpenStreetMap and OpenStreetMap Foundation”.
credit_4_html: |
For a browsable electronic map, the credit should appear in the corner of the map.
For example:
@@ -2158,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"
@@ -2178,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:
@@ -2263,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?"