X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/0b84885cfc566fb2d552c5681c11a2905d28f038..91a6ed60c1004f2d88cd49e1b3f2e9ef75dabc07:/config/locales/en.yml
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6e42e0306..077af5011 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -100,26 +100,32 @@ en:
version: "Version:"
in_changeset: "In changeset:"
containing_relation:
- relation: "Relation {{relation_name}}"
- relation_as: "(as {{relation_role}})"
+ entry: "Relation {{relation_name}}"
+ entry_role: "Relation {{relation_name}} (as {{relation_role}})"
map:
loading: "Loading..."
deleted: "Deleted"
- view_larger_map: "View Larger Map"
+ 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"
node_details:
coordinates: "Coordinates: "
part_of: "Part of:"
node_history:
node_history: "Node History"
+ node_history_title: "Node History: {{node_name}}"
download: "{{download_xml_link}} or {{view_details_link}}"
download_xml: "Download XML"
view_details: "view details"
node:
node: "Node"
node_title: "Node: {{node_name}}"
- download: "{{download_xml_link}} or {{view_history_link}}"
+ download: "{{download_xml_link}}, {{view_history_link}} or {{edit_link}}"
download_xml: "Download XML"
view_history: "view history"
+ edit: "edit"
not_found:
sorry: "Sorry, the {{type}} with the id {{id}}, could not be found."
type:
@@ -136,7 +142,12 @@ en:
relation_history: "Relation History"
relation_history_title: "Relation History: {{relation_name}}"
relation_member:
- as: "as"
+ entry: "{{type}} {{name}}"
+ entry_role: "{{type}} {{name}} as {{role}}"
+ type:
+ node: "Node"
+ way: "Way"
+ relation: "Relation"
relation:
relation: "Relation"
relation_title: "Relation: {{relation_name}}"
@@ -198,9 +209,10 @@ en:
way:
way: "Way"
way_title: "Way: {{way_name}}"
- download: "{{download_xml_link}} or {{view_history_link}}"
+ download: "{{download_xml_link}}, {{view_history_link}} or {{edit_link}}"
download_xml: "Download XML"
view_history: "view history"
+ edit: "edit"
changeset:
changeset_paging_nav:
showing_page: "Showing page"
@@ -247,6 +259,7 @@ en:
list:
title: "Users' diaries"
user_title: "{{user}}'s diary"
+ in_language_title: "Diary Entries in {{language}}"
new: New Diary Entry
new_title: Compose a new entry in your user diary
no_entries: No diary entries
@@ -272,6 +285,7 @@ en:
login: "Login"
save_button: "Save"
no_such_entry:
+ title: "No such diary entry"
heading: "No entry with the id: {{id}}"
body: "Sorry, there is no diary entry or comment with the id {{id}}. Please check your spelling, or maybe the link you clicked is wrong."
no_such_user:
@@ -279,7 +293,7 @@ en:
heading: "The user {{user}} does not exist"
body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."
diary_entry:
- posted_by: "Posted by {{link_user}} at {{created}} in {{language}}"
+ posted_by: "Posted by {{link_user}} at {{created}} in {{language_link}}"
comment_link: Comment on this entry
reply_link: Reply to this entry
comment_count:
@@ -375,7 +389,7 @@ en:
news_blog: "News blog"
news_blog_tooltip: "News blog about OpenStreetMap, free geographical data, etc."
shop: Shop
- shop_tooltip: Shop with branded OpenStreetMap
+ shop_tooltip: Shop with branded OpenStreetMap merchandise
shop_url: http://wiki.openstreetmap.org/wiki/Merchandise
sotm: 'Come to the 2009 OpenStreetMap Conference, The State of the Map, July 10-12 in Amsterdam!'
alt_donation: Make a Donation
@@ -537,6 +551,7 @@ en:
js_2: "OpenStreetMap uses javascript for its slippy map."
js_3: 'You may want to try the Tiles@Home static tile browser if you are unable to enable javascript.'
permalink: Permalink
+ shortlink: Shortlink
license:
notice: "Licensed under the {{license_name}} license by the {{project_name}} and its contributors."
license_name: "Creative Commons Attribution-Share Alike 2.0"
@@ -564,15 +579,84 @@ en:
key:
map_key: "Map key"
map_key_tooltip: "Map key for the mapnik rendering at this zoom level"
+ table:
+ heading: "Legend for z{{zoom_level}}"
+ entry:
+ motorway: "Motorway"
+ trunk: "Trunk road"
+ primary: "Primary road"
+ secondary: "Secondary road"
+ unclassified: "Unclassified road"
+ unsurfaced: "Unsurfaced road"
+ track: "Track"
+ byway: "Byway"
+ bridleway: "Bridleway"
+ cycleway: "Cycleway"
+ footway: "Footway"
+ rail: "Railway"
+ subway: "Subway"
+ tram:
+ - Light rail
+ - tram
+ cable:
+ - Cable car
+ - chair lift
+ runway:
+ - Airport Runway
+ - taxiway
+ apron:
+ - Airport apron
+ - terminal
+ admin: "Administrative boundary"
+ forest: "Forest"
+ wood: "Wood"
+ golf: "Golf course"
+ park: "Park"
+ resident: "Residential area"
+ tourist: "Tourist attraction"
+ common:
+ - Common
+ - meadow
+ retail: "Retail area"
+ industrial: "Industrial area"
+ commercial: "Commercial area"
+ heathland: "Heathland"
+ lake:
+ - Lake
+ - reservoir
+ farm: "Farm"
+ brownfield: "Brownfield site"
+ cemetery: "Cemetery"
+ allotments: "Allotments"
+ pitch: "Sports pitch"
+ centre: "Sports centre"
+ reserve: "Nature reserve"
+ military: "Military area"
+ school: "School; university"
+ building: "Significant building"
+ station: "Railway station"
+ summit:
+ - Summit
+ - peak
+ tunnel: "Dashed casing = tunnel"
+ bridge: "Black casing = bridge"
+ private: "Private access"
+ permissive: "Permissive access"
+ destination: "Destination access"
+ construction: "Roads under construction"
trace:
create:
upload_trace: "Upload GPS Trace"
trace_uploaded: "Your GPX file has been uploaded and is awaiting insertion in to the database. This will usually happen within half an hour, and an email will be sent to you on completion."
edit:
+ title: "Editing trace {{name}}"
+ heading: "Editing trace {{name}}"
filename: "Filename:"
+ download: "download"
uploaded_at: "Uploaded at:"
points: "Points:"
start_coord: "Start coordinate:"
+ map: "map"
edit: "edit"
owner: "Owner:"
description: "Description:"
@@ -587,6 +671,8 @@ en:
description: "Description"
tags: "Tags"
public: "Public?"
+ public_help: "what does this mean?"
+ public_help_url: "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
upload_button: "Upload"
help: "Help"
help_url: "http://wiki.openstreetmap.org/wiki/Upload"
@@ -598,6 +684,8 @@ en:
trace_optionals:
tags: "Tags"
view:
+ title: "Viewing trace {{name}}"
+ heading: "Viewing trace {{name}}"
pending: "PENDING"
filename: "Filename:"
download: "download"
@@ -608,12 +696,11 @@ en:
edit: "edit"
owner: "Owner:"
description: "Description:"
- tags: "Tags"
+ tags: "Tags:"
none: "None"
make_public: "Make this track public permanently"
edit_track: "Edit this track"
delete_track: "Delete this track"
- viewing_trace: "Viewing trace {{name}}"
trace_not_found: "Trace not found!"
trace_paging_nav:
showing: "Showing page"
@@ -670,7 +757,7 @@ en:
no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."
contact_webmaster: 'Please contact the webmaster to arrange for an account to be created - we will try and deal with the request as quickly as possible. '
fill_form: "Fill in the form and we'll send you a quick email to activate your account."
- license_agreement: 'By creating an account, you agree that all work uploaded to openstreetmap.org and all data created by use of any tools which connect to openstreetmap.org is to be (non-exclusively) licensed under this Creative Commons license (by-sa).'
+ license_agreement: 'By creating an account, you agree that all data you submit to the Openstreetmap project is to be (non-exclusively) licensed under this Creative Commons license (by-sa).'
email address: "Email Address: "
confirm email address: "Confirm Email Address: "
not displayed publicly: 'Not displayed publicly (see privacy policy)'
@@ -722,7 +809,7 @@ en:
public editing:
heading: "Public editing: "
enabled: "Enabled. Not anonymous and can edit data."
- enabled link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
+ enabled link: "http://wiki.openstreetmap.org/wiki/Anonymous_edits"
enabled link text: "what's this?"
disabled: "Disabled and cannot edit data, all previous edits are anonymous."
disabled link text: "why can't I edit?"