X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d8cf49f0d7f0006bb8b5ccb16d3d236069e6821a..e73a770d8106a9fef000178ed8c97f7b8be0399f:/config/locales/en.yml?ds=sidebyside
diff --git a/config/locales/en.yml b/config/locales/en.yml
index d032c58f1..43c0c4ad1 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -95,40 +95,24 @@ en:
name: "Remote Control"
description: "Remote Control (JOSM or Merkaartor)"
browse:
+ created: "Created"
+ closed: "Closed"
+ created_html: "Created %{time} ago"
+ closed_html: "Closed %{time} ago"
+ created_by_html: "Created %{time} ago by %{user}"
+ deleted_by_html: "Deleted %{time} ago by %{user}"
+ edited_by_html: "Edited %{time} ago by %{user}"
+ closed_by_html: "Closed %{time} ago by %{user}"
+ version: "Version"
+ in_changeset: "Changeset"
+ anonymous: "anonymous"
+ no_comment: "(no comment)"
+ part_of: "Part of"
+ download_xml: "Download XML"
+ view_history: "View History"
+ view_details: "View Details"
changeset:
- title: "Changeset"
- changeset: "Changeset %{id}"
- changesetxml: "Changeset XML"
- osmchangexml: "osmChange XML"
- feed:
- title: "Changeset %{id}"
- title_comment: "Changeset %{id} - %{comment}"
- navigation:
- paging:
- user:
- prev: "« %{id}"
- next: "%{id} »"
- all:
- prev: "« %{id}"
- next: "%{id} »"
- user:
- name_changeset_tooltip: "View edits by %{user}"
- prev_changeset_tooltip: "Previous edit by %{user}"
- next_changeset_tooltip: "Next edit by %{user}"
- all:
- prev_node_tooltip: "Previous node"
- next_node_tooltip: "Next node"
- prev_way_tooltip: "Previous way"
- next_way_tooltip: "Next way"
- prev_relation_tooltip: "Previous relation"
- next_relation_tooltip: "Next relation"
- prev_changeset_tooltip: "Previous changeset"
- next_changeset_tooltip: "Next changeset"
- prev_note_tooltip: "Previous note"
- next_note_tooltip: "Next note"
- changeset_details:
- created_at: "Created"
- closed_at: "Closed"
+ title: "Changeset: %{id}"
belongs_to: "Author"
node: "Nodes (%{count})"
node_paginated: "Nodes (%{x}-%{y} of %{count})"
@@ -136,50 +120,37 @@ en:
way_paginated: "Ways (%{x}-%{y} of %{count})"
relation: "Relations (%{count})"
relation_paginated: "Relations (%{x}-%{y} of %{count})"
- no_comment: "(no comment)"
- ago: "%{ago} ago"
- by: "by"
- common_details:
- edited: "Edited"
- deleted: "Deleted"
- by: "by"
- version: "Version"
- in_changeset: "Changeset"
- changeset_comment: "Comment"
+ changesetxml: "Changeset XML"
+ osmchangexml: "osmChange XML"
+ feed:
+ title: "Changeset %{id}"
+ title_comment: "Changeset %{id} - %{comment}"
+ node:
+ title: "Node: %{name}"
+ history_title: "Node History: %{name}"
+ way:
+ title: "Way: %{name}"
+ history_title: "Way History: %{name}"
+ nodes: "Nodes"
+ also_part_of:
+ one: "part of way %{related_ways}"
+ other: "part of ways %{related_ways}"
+ relation:
+ title: "Relation: %{name}"
+ history_title: "Relation History: %{name}"
+ members: "Members"
+ relation_member:
+ entry: "%{type} %{name}"
+ entry_role: "%{type} %{name} as %{role}"
+ type:
+ node: "Node"
+ way: "Way"
+ relation: "Relation"
containing_relation:
entry: "Relation %{relation_name}"
entry_role: "Relation %{relation_name} (as %{relation_role})"
- map:
- loading: "Loading..."
- deleted: "Deleted"
- larger:
- area: "View area on larger map"
- node: "View node on larger map"
- way: "View way on larger map"
- relation: "View relation on larger map"
- note: "View note on larger map"
- edit:
- area: "Edit area"
- node: "Edit node"
- way: "Edit way"
- relation: "Edit relation"
- note: "Edit note"
- node_details:
- coordinates: "Coordinates:"
- part_of: "Part of:"
- node_history:
- node_history: "Node History"
- node_history_title: "Node History: %{node_name}"
- download_xml: "Download XML"
- view_details: "View details"
- node:
- node: "Node"
- node_title: "Node: %{node_name}"
- download_xml: "Download XML"
- view_history: "View history"
- edit: "Edit node"
not_found:
- sorry: "Sorry, the %{type} with the id %{id}, could not be found."
+ sorry: "Sorry, %{type} #%{id} could not be found."
type:
node: node
way: way
@@ -199,111 +170,40 @@ en:
node: "node"
way: "way"
relation: "relation"
- relation_details:
- members: "Members:"
- part_of: "Part of:"
- relation_history:
- relation_history: "Relation History"
- relation_history_title: "Relation History: %{relation_name}"
- download_xml: "Download XML"
- view_details: "View details"
- relation_member:
- entry: "%{type} %{name}"
- entry_role: "%{type} %{name} as %{role}"
- type:
- node: "Node"
- way: "Way"
- relation: "Relation"
- relation:
- relation: "Relation"
- relation_title: "Relation: %{relation_name}"
- download_xml: "Download XML"
- view_history: "View history"
start_rjs:
- notes_layer_name: "Browse Notes"
- data_layer_name: "Browse Map Data"
- data_frame_title: "Data"
- zoom_or_select: "Zoom in or select an area of the map to view"
- view_data: "View data for current map view"
- manually_select: "Manually select a different area"
- hide_areas: "Hide areas"
- show_areas: "Show areas"
- loaded_an_area_with_num_features: "You have loaded an area which contains %{num_features} features. In general, some browsers may not cope well with displaying this quantity of data. Generally, browsers work best at displaying less than %{max_features} features at a time: doing anything else may make your browser slow/unresponsive. If you are sure you want to display this data, you may do so by clicking the button below."
+ loaded_an_area_with_num_features: "Loading %{num_features} features, which may make your browser slow or unresponsive. Are sure you want to display this data?"
load_data: "Load Data"
- unable_to_load_size: "Unable to load: Bounding box size of %{bbox_size} is too large (must be smaller than %{max_bbox_size})"
+ unable_to_load_size: "Unable to load map data, too large of an area (%{bbox_size}). Area must be smaller than %{max_bbox_size} square degrees."
loading: "Loading..."
- show_history: "Show History"
- wait: "Wait..."
- history_for_feature: "History for %{feature}"
- details: "Details"
- private_user: "private user"
- edited_by_user_at_timestamp: "Edited by %{user} at %{timestamp}"
- object_list:
- heading: "Object list"
- back: "Back to object list"
- type:
- node: "Node"
- way: "Way"
- # There is no 'relation' type because it is not represented in OpenLayers
- api: "Retrieve this area from the API"
- details: "Details"
- selected:
- type:
- node: "Node %{id}"
- way: "Way %{id}"
- # There is no 'relation' type because it is not represented in OpenLayers
- history:
- type:
- node: "Node %{id}"
- way: "Way %{id}"
- # There is no 'relation' type because it is not represented in OpenLayers
tag_details:
tags: "Tags"
wiki_link:
key: "The wiki description page for the %{key} tag"
tag: "The wiki description page for the %{key}=%{value} tag"
wikipedia_link: "The %{page} article on Wikipedia"
- way_details:
- nodes: "Nodes:"
- part_of: "Part of:"
- also_part_of:
- one: "part of way %{related_ways}"
- other: "part of ways %{related_ways}"
- way_history:
- way_history: "Way History"
- way_history_title: "Way History: %{way_name}"
- download_xml: "Download XML"
- view_details: "View details"
- way:
- way: "Way"
- way_title: "Way: %{way_name}"
- download_xml: "Download XML"
- view_history: "View history"
- edit: "Edit way"
note:
- title: "Note"
- open_title: "Unresolved note: %{note_name}"
- closed_title: "Resolved note: %{note_name}"
- opened: "Opened"
- last_modified: "Last modified"
- closed: "Closed"
- at_html: "%{when} ago"
- at_by_html: "%{when} ago by %{user}"
- description: "Description"
- comments: "Comments"
- anonymous: "anonymous"
+ title: "Note: %{id}"
+ new_note: "New Note"
+ open_title: "Unresolved note #%{note_name}"
+ closed_title: "Resolved note #%{note_name}"
+ hidden_title: "Hidden note #%{note_name}"
+ open_by: "Created by %{user} %{when} ago"
+ open_by_anonymous: "Created by anonymous %{when} ago"
+ commented_by: "Comment from %{user} %{when} ago"
+ commented_by_anonymous: "Comment from anonymous %{when} ago"
+ closed_by: "Resolved by %{user} %{when} ago"
+ closed_by_anonymous: "Resolved by anonymous %{when} ago"
+ reopened_by: "Reactivated by %{user} %{when} ago"
+ reopened_by_anonymous: "Reactivated by anonymous %{when} ago"
+ hidden_by: "Hidden by %{user} %{when} ago"
changeset:
changeset_paging_nav:
showing_page: "Page %{page}"
next: "Next »"
previous: "« Previous"
changeset:
- still_editing: "(still editing)"
anonymous: "Anonymous"
- no_comment: "(no comment)"
no_edits: "(no edits)"
- show_area_box: "show area box"
- big_area: "(big)"
view_changeset_details: "View changeset details"
changesets:
id: "ID"
@@ -316,8 +216,12 @@ en:
title_user: "Changesets by %{user}"
title_friend: "Changesets by your friends"
title_nearby: "Changesets by nearby users"
- empty: "No changesets in this area."
- no_more: "No more changesets in this area."
+ empty: "No changesets found."
+ empty_area: "No changesets in this area."
+ empty_user: "No changesets by this user."
+ no_more: "No more changesets found."
+ no_more_area: "No more changesets in this area."
+ no_more_user: "No more changesets by this user."
load_more: "Load more"
timeout:
sorry: "Sorry, the list of changesets you requested took too long to retrieve."
@@ -396,6 +300,7 @@ en:
newer_comments: "Newer Comments"
older_comments: "Older Comments"
export:
+ title: "Export"
start:
area_to_export: "Area to Export"
manually_select: "Manually select a different area"
@@ -406,8 +311,7 @@ en:
licence: "Licence"
export_details: 'OpenStreetMap data is licensed under the Open Data Commons Open Database License (ODbL).'
too_large:
- heading: "Area Too Large"
- body: "This area is too large to be exported as OpenStreetMap XML Data. Please zoom in or select a smaller area, or use one of the following sources for bulk data downloads:"
+ body: "This area is too large to be exported as OpenStreetMap XML Data. Please zoom in or select a smaller area, or use one of the sources listed below for bulk data downloads."
planet:
title: "Planet OSM"
description: "Regularly-updated copies of the complete OpenStreetMap database"
@@ -432,16 +336,10 @@ en:
output: "Output"
paste_html: "Paste HTML to embed in website"
export_button: "Export"
- start_rjs:
- export: "Export"
- drag_a_box: "Drag a box on the map to select an area"
- manually_select: "Manually select a different area"
- click_add_marker: "Click on the map to add a marker"
- change_marker: "Change marker position"
- add_marker: "Add a marker to the map"
geocoder:
search:
title:
+ latlon: 'Results from Internal'
us_postcode: 'Results from Geocoder.us'
uk_postcode: 'Results from NPEMap / FreeThe Postcode'
ca_postcode: 'Results from Geocoder.CA'
@@ -978,10 +876,11 @@ en:
logo:
alt_text: OpenStreetMap logo
home: Go to Home Location
- logout: Logout
+ logout: Log Out
log_in: Log In
log_in_tooltip: Log in with an existing account
sign_up: Sign Up
+ start_mapping: Start Mapping
sign_up_tooltip: Create an account for editing
edit: Edit
history: History
@@ -995,7 +894,7 @@ en:
edit_with: Edit with %{editor}
tag_line: The Free Wiki World Map
intro_header: Welcome to OpenStreetMap!
- intro_text: OpenStreetMap is a free and editable map of the world maintained by an active community of contributors.
+ intro_text: OpenStreetMap is a map of the world, created by people like you and free to use under an open license.
intro_2_create_account: "Create a user account"
partners_html: "Hosting is supported by %{ucl}, %{ic} and %{bytemark}, and other %{partners}."
partners_ucl: "the UCL VR Centre"
@@ -1008,7 +907,7 @@ en:
donate: "Support OpenStreetMap by %{link} to the Hardware Upgrade Fund."
help: Help
about: About
- copyright: "Copyright & License"
+ copyright: Copyright
community: Community
community_blogs: "Community Blogs"
community_blogs_title: "Blogs from members of the OpenStreetMap community"
@@ -1182,7 +1081,7 @@ en:
OpenStreetMap has several resources for learning about the project, asking and answering questions,
and collaboratively discussing and documenting mapping topics.
welcome:
- url: http://www.openstreetmap.org/welcome
+ url: /welcome
title: Welcome to OSM
description: Start with this quick guide covering the OpenStreetMap basics.
help:
@@ -1198,19 +1097,20 @@ en:
copyright_html: ©OpenStreetMap
contributors
used_by: "%{name} powers map data on hundreds of web sites, mobile apps, and hardware devices"
lede_text: |
- OSM is built by a community of local mappers that keeps data about
- roads, cafés, subway stations, and much more up to date every day.
+ OpenStreetMap is built by a community of mappers that contribute and maintain data
+ about roads, trails, cafés, railway stations, and much more, all over the world.
local_knowledge_title: Local Knowledge
local_knowledge_html: |
OpenStreetMap emphasizes local knowledge. Contributors use
aerial imagery, GPS devices, and low-tech field maps to verify that OSM
- is up to date and accurate.
+ is accurate and up to date.
community_driven_title: Community Driven
community_driven_html: |
- From the engineers that tune OSM's servers to the Humanitarian OSM Team
- that maps disaster-affected areas, OSM's community is diverse,
- passionate, and growing every day. To learn more about the community,
- see the user diaries,
+ OpenStreetMap's community is diverse, passionate, and growing every day.
+ Our contributors include enthusiast mappers, GIS professionals, engineers
+ running the OSM servers, humanitarians mapping disaster-affected areas,
+ and many more.
+ To learn more about the community, see the user diaries,
community blogs, and
the OSM Foundation website.
open_data_title: Open Data
@@ -1220,26 +1120,7 @@ en:
build upon the data in certain ways, you may distribute the result only
under the same licence. See the Copyright and
License page for details.
- photo_caption_0_html: |
- @mikel working on
- Map Kibera, a project to map the
- largest slum in Nairobi, Kenya.
- © watato
- 2010
- photo_caption_1_html: |
- @lxbarth and
- @limareis survey Brasilia with
- walking papers.
- © mapbox
- 2012
- photo_caption_2_html: |
- @TODO caption (source)
- photo_caption_3_html: |
- @TODO caption (source)
- photo_caption_4_html: |
- @TODO caption (source)
- photo_caption_5_html: |
- @TODO caption (source)
+ partners_title: Partners
notifier:
diary_comment_notification:
subject: "[OpenStreetMap] %{user} commented on your diary entry"
@@ -1619,6 +1500,7 @@ en:
need_to_see_terms: "Your access to the API is temporarily suspended. Please log-in to the web interface to view the Contributor Terms. You do not need to agree, but you must view them."
oauth:
oauthorize:
+ title: "Authorize access to your account"
request_access: "The application %{app_name} is requesting access to your account, %{user}. Please check whether you would like the application to have the following capabilities. You may choose as many or as few as you like."
allow_to: "Allow the client application to:"
allow_read_prefs: "read your user preferences."
@@ -1628,6 +1510,14 @@ en:
allow_read_gpx: "read your private GPS traces."
allow_write_gpx: "upload GPS traces."
allow_write_notes: "modify notes."
+ oauthorize_success:
+ title: "Authorization request allowed"
+ allowed: "You have granted application %{app_name} access to your account."
+ verification: "The verification code is %{code}."
+ oauthorize_failure:
+ title: "Authorization request failed"
+ denied: "You have denied application %{app_name} access to your account."
+ invalid: "The authorization token is not valid."
revoke:
flash: "You've revoked the token for %{application}"
oauth_clients:
@@ -2171,12 +2061,14 @@ en:
overlays: Enable overlays for troubleshooting the map
title: "Layers"
copyright: "© OpenStreetMap contributors"
- donate_link_text: "Donate"
+ donate_link_text: "Make a Donation"
site:
edit_tooltip: Edit the map
edit_disabled_tooltip: Zoom in to edit the map
createnote_tooltip: Add a note to the map
createnote_disabled_tooltip: Zoom in to add a note to the map
+ map_notes_zoom_in_tooltip: Zoom in to see map notes
+ map_data_zoom_in_tooltip: Zoom in to see map data
notes:
new:
intro: "In order to improve the map the information you enter is shown to other mappers, so please be as descriptive and precise as possible when moving the marker to the correct position and entering your note below."